January 2014 - Wine-Commits

Alexander Nicolaysen Sørnes : application: Fix invocations of non-static function
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 7c4f0af9008d6e6fefaa1d19da9deb5ce9c546a9 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7c4f0af9008d6e6fefaa1d19… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:36:27 2014 +0100 application: Fix invocations of non-static function --- include/application.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/application.php b/include/application.php index 106fa19..32fbf51 100644 --- a/include/application.php +++ b/include/application.php @@ -1054,7 +1054,8 @@ class Application { AND appFamily.state = '?'$sWhereFilter"; - if($sState != 'accepted' && !application::canEdit()) + $oApp = new Application(); + if($sState != 'accepted' && !$oApp->canEdit()) { /* Without global edit rights a user can only view his rejected apps */ if($sState != 'rejected') @@ -1288,7 +1289,8 @@ class Application { $sWhereFilter .= ' AND ' . $oCategory->getSqlQueryPart(); } - if($sState != 'accepted' && !application::canEdit()) + $oApp = new Application(); + if($sState != 'accepted' && !$oApp->canEdit()) { /* Without edit rights users can only resubmit their rejected entries */ if($sState != 'rejected')

1 0

Alexander Nicolaysen Sørnes : testData : Avoid deprecated mktime()
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: d526734565606ddba50cd0c51783a719d9bd5b91 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d526734565606ddba50cd0c5… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:44:36 2014 +0100 testData: Avoid deprecated mktime() --- include/testData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/testData.php b/include/testData.php index b30709f..005ea8a 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1484,7 +1484,7 @@ class testData{ if(!$this->iTestingId) return false; - return ((mktime() - mysqltimestamp_to_unixtimestamp($this->sSubmitTime)) > (60 * 60 * 24 * TESTDATA_AGED_THRESHOLD)); + return ((time() - mysqltimestamp_to_unixtimestamp($this->sSubmitTime)) > (60 * 60 * 24 * TESTDATA_AGED_THRESHOLD)); } public function objectSetParent($iNewId, $sClass = 'version')

1 0

Alexander Nicolaysen Sørnes : account: Use PHP's filter_var to validate email address
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: c4232cd424f586cd7e98d56a199117e0b2b8a6a4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c4232cd424f586cd7e98d56a… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:55:39 2014 +0100 account: Use PHP's filter_var to validate email address --- account.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account.php b/account.php index eaeadf2..8ac1baa 100644 --- a/account.php +++ b/account.php @@ -90,7 +90,7 @@ function cmd_do_new() { global $aClean; - if(!ereg("^.+(a).+\\..+$", $aClean['sUserEmail'])) + if(!filter_var($aClean['sUserEmail'], FILTER_VALIDATE_EMAIL)) { $aClean['sUserEmail'] = ""; retry("new", "Invalid email address");

1 0

Alexander Nicolaysen Sørnes : application_queue: Fix invocation of non-static function
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 6f488328b74681139621c1c300e03126bb5e311b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6f488328b74681139621c1c3… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:35:17 2014 +0100 application_queue: Fix invocation of non-static function --- include/application_queue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/application_queue.php b/include/application_queue.php index b1bdc69..05acd35 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -442,7 +442,7 @@ class application_queue function objectDisplayQueueProcessingHelp() { - return application::objectDisplayQueueProcessingHelp(); + return $this->oApp->objectDisplayQueueProcessingHelp(); } function objectDisplayAddItemHelp()

1 0

Alexander Nicolaysen Sørnes : note: Mark a function as static
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: fc64b16db1979d12a2457da366039e50ee73c47a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fc64b16db1979d12a2457da3… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:25:53 2014 +0100 note: Mark a function as static --- include/note.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/note.php b/include/note.php index 96cfcbb..0cb24a4 100644 --- a/include/note.php +++ b/include/note.php @@ -310,7 +310,7 @@ class Note { echo $shOutput; } - function displayNotesForEntry($iVersionId, $iAppId = null) + public static function displayNotesForEntry($iVersionId, $iAppId = null) { $aNotes = array();

1 0

Alexander Nicolaysen Sørnes : testData : Mark some functions as static
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 71291dd030367bc6b4364c14686a723e805d3a13 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=71291dd030367bc6b4364c14… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:29:32 2014 +0100 testData: Mark some functions as static --- include/testData.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/testData.php b/include/testData.php index a3413db..b30709f 100644 --- a/include/testData.php +++ b/include/testData.php @@ -754,7 +754,7 @@ class testData{ 0 - Rating 1 - Wine version The $sDate parameter can be used to calculate the rating at a given point in time */ - public function getRatingInfoForVersionId($iVersionId, $sDate = 'NOW()') + public static function getRatingInfoForVersionId($iVersionId, $sDate = 'NOW()') { $sQuery = "SELECT testedRating,testedDate,testedRelease,versions.id as versionId FROM testResults, ?.versions WHERE @@ -828,7 +828,7 @@ class testData{ } /* retrieve the latest test result for a given version id */ - function getNewestTestIdFromVersionId($iVersionId, $sState = 'accepted') + public static function getNewestTestIdFromVersionId($iVersionId, $sState = 'accepted') { $sQuery = "SELECT testingId FROM testResults, ?.versions WHERE versions.value = testResults.testedRelease @@ -1083,7 +1083,7 @@ class testData{ echo "</select>\n"; } - function getTestResultsForUser($iUserId, $iVersionId) + public static function getTestResultsForUser($iUserId, $iVersionId) { $oVersion = new version($iVersionId); $hResult = query_parameters("SELECT * FROM testResults WHERE @@ -1107,7 +1107,7 @@ class testData{ } /* List test data submitted by a given user. Ignore test results for queued applications/versions */ - function listSubmittedBy($iUserId, $bQueued = true) + public static function listSubmittedBy($iUserId, $bQueued = true) { $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.submitTime, testResults.testingId, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted'); @@ -1157,7 +1157,7 @@ class testData{ } // return the number of test data entries for a particular version id - function get_testdata_count_for_versionid($iVersionId) + public static function get_testdata_count_for_versionid($iVersionId) { $sQuery = "SELECT count(*) as cnt FROM testResults @@ -1186,7 +1186,7 @@ class testData{ return $oFilter; } - function objectGetEntriesCount($sState, $oFilters = null) + public static function objectGetEntriesCount($sState, $oFilters = null) { $sExtraTables = ''; $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); @@ -1274,7 +1274,7 @@ class testData{ return 'testingId'; } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "testingId", $bAscending = true, $oFilters = null) + public static function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "testingId", $bAscending = true, $oFilters = null) { $sExtraTables = ''; $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); @@ -1560,7 +1560,7 @@ class testData{ return mysqltimestamp_to_unixtimestamp($this->sSubmitTime); } - function objectGetItemsPerPage($sState = 'accepted') + public static function objectGetItemsPerPage($sState = 'accepted') { $aItemsPerPage = array(25, 50, 100, 200); $iDefaultPerPage = 25;

1 0

Alexander Nicolaysen Sørnes : user: Mark some functions as static
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 059ddaa60ec92a59e25625bf952a8e658cd69ed3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=059ddaa60ec92a59e25625bf… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:30:54 2014 +0100 user: Mark some functions as static --- include/user.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/user.php b/include/user.php index 4ebd925..1ec149d 100644 --- a/include/user.php +++ b/include/user.php @@ -449,7 +449,7 @@ class User { /** * Creates a new random password. */ - function generate_passwd($pass_len = 10) + public static function generate_passwd($pass_len = 10) { $nps = ""; mt_srand ((double) microtime() * 1000000); @@ -465,7 +465,7 @@ class User { * Check if a user exists. * returns the userid if the user exists */ - function exists($sEmail) + public static function exists($sEmail) { $hResult = query_parameters("SELECT userid FROM user_list WHERE email = '?'", $sEmail); @@ -483,7 +483,7 @@ class User { * Get the number of users in the database * The parameters are only included for compatibility; we don't queue users */ - function objectGetEntriesCount($bQueued = null, $bRejected = null) + public static function objectGetEntriesCount($bQueued = null, $bRejected = null) { $hResult = query_parameters("SELECT count(*) as num_users FROM user_list;"); $oRow = query_fetch_object($hResult); @@ -493,7 +493,7 @@ class User { /** * Get the number of active users within $days of the current day */ - function active_users_within_days($days) + public static function active_users_within_days($days) { $hResult = query_parameters("SELECT count(*) as num_users FROM user_list WHERE stamp >= DATE_SUB(CURDATE(), interval '?' day);", $days); @@ -505,7 +505,7 @@ class User { * Get the count of users who have been warned for inactivity and are * pending deletion after the X month grace period */ - function get_inactive_users_pending_deletion() + public static function get_inactive_users_pending_deletion() { /* retrieve the number of users that have been warned and are pending deletion */ $hResult = query_parameters("select count(*) as count from user_list where inactivity_warned = 'true'"); @@ -516,7 +516,7 @@ class User { /** * Get the email address of people to notify for this appId and versionId. */ - function get_notify_email_address_list($iAppId = null, $iVersionId = null) + public static function get_notify_email_address_list($iAppId = null, $iVersionId = null) { $aUserId = array(); $sRetval = "";

1 0

Alexander Nicolaysen Sørnes : downloadurl: Mark a function as static
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 16b8b1ef8024a76cabb69e64ffe70ee189f6262e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=16b8b1ef8024a76cabb69e64… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:33:27 2014 +0100 downloadurl: Mark a function as static --- include/downloadurl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/downloadurl.php b/include/downloadurl.php index d4d4b03..312c542 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -45,7 +45,7 @@ class downloadurl } /* Display download links for a given version */ - function display($iVersionId) + public static function display($iVersionId) { if(!($hResult = appData::getData($iVersionId, "downloadurl"))) return FALSE;

1 0

Alexander Nicolaysen Sørnes : comment: Declare static functions as such
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: d91eef59cf1f5c967d4e6896be229867674519c2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d91eef59cf1f5c967d4e6896… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sat Jan 11 17:45:18 2014 +0100 comment: Declare static functions as such --- include/comment.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/comment.php b/include/comment.php index 3532e2c..a364d76 100644 --- a/include/comment.php +++ b/include/comment.php @@ -197,7 +197,7 @@ class Comment { return false; } - function get_comment_count_for_versionid($iVersionId) + public static function get_comment_count_for_versionid($iVersionId) { $sQuery = "SELECT count(*) as cnt from appComments where versionId = '?'"; $hResult = query_parameters($sQuery, $iVersionId); @@ -226,7 +226,7 @@ class Comment { /** * Displays the body of one comment. */ - function view_comment_body($iCommentId) + public static function view_comment_body($iCommentId) { $hResult = Comment::grab_comment($iCommentId); @@ -240,7 +240,7 @@ class Comment { /** * display a single comment (in $oRow) */ - function view_app_comment($oRow, $bShowAppName = false) + public static function view_app_comment($oRow, $bShowAppName = false) { $oComment = new comment(null, $oRow); $oComment->output_comment($bShowAppName); @@ -411,7 +411,7 @@ class Comment { /** * grab single comment for commentId */ - function grab_comment($iCommentId) + public static function grab_comment($iCommentId) { $iCommentId = query_escape_string($iCommentId); @@ -433,7 +433,7 @@ class Comment { * grab comments for appId / versionId * if parentId is not -1 only comments for that thread are returned */ - function grab_comments($iVersionId, $iParentId = null) + public static function grab_comments($iVersionId, $iParentId = null) { /* TODO: remove the logging when we figure out where the */ /* invalid $iVersionId is coming */ @@ -475,7 +475,7 @@ class Comment { * display nested comments * handle is a db result set */ - function do_display_comments_nested($hResult) + public static function do_display_comments_nested($hResult) { while($oRow = query_fetch_object($hResult)) { @@ -490,7 +490,7 @@ class Comment { } } - function display_comments_nested($versionId, $threadId) + public static function display_comments_nested($versionId, $threadId) { $hResult = Comment::grab_comments($versionId, $threadId); Comment::do_display_comments_nested($hResult); @@ -499,7 +499,7 @@ class Comment { /** * Generates the link to show the comment. */ - function comment_link($oRow) + public static function comment_link($oRow) { $sLink = "commentview.php?iAppId={$oRow->appId}&iVersionId=". "{$oRow->versionId}&iThreadId={$oRow->parentId}"; @@ -519,7 +519,7 @@ class Comment { * display threaded comments * handle is a db result set */ - function do_display_comments_threaded($hResult, $is_main) + public static function do_display_comments_threaded($hResult, $is_main) { if (!$is_main) echo "<ul>\n"; @@ -676,7 +676,7 @@ class Comment { return $aObjects; } - function display_comments_threaded($versionId, $threadId = 0) + public static function display_comments_threaded($versionId, $threadId = 0) { $hResult = Comment::grab_comments($versionId, $threadId); @@ -686,7 +686,7 @@ class Comment { /** * display flat comments */ - function display_comments_flat($versionId) + public static function display_comments_flat($versionId) { $hResult = Comment::grab_comments($versionId); if ($hResult) @@ -698,7 +698,7 @@ class Comment { } } - function view_app_comments($versionId, $threadId = 0) + public static function view_app_comments($versionId, $threadId = 0) { global $aClean;

1 0

Alexander Nicolaysen Sørnes : version: Mark some functions as static
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: f4f040118d3314822f3552023b66e3b717e36805 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f4f040118d3314822f355202… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:32:05 2014 +0100 version: Mark some functions as static --- include/version.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/version.php b/include/version.php index b042939..7f5d7db 100644 --- a/include/version.php +++ b/include/version.php @@ -1196,7 +1196,7 @@ class version { return $ob->versionName; } - function fullName($iVersionId) + public static function fullName($iVersionId) { if(!$iVersionId) return FALSE; @@ -1401,14 +1401,14 @@ class version { } /* Returns an array containg the different software licences */ - public function getLicenses() + public static function getLicenses() { return array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE, LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE); } // returns a string containing the html for a selection list - public function makeLicenseList($sLicense = NULL) + public static function makeLicenseList($sLicense = NULL) { if(!$sLicense) $sLicense = $this->sLicense;

1 0