January 2014 - Wine-Commits

Alexander Nicolaysen Sørnes : mail: Replace deprecated ereg_replace with str_replace
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 9c5b79818e753049001bd0b4553c4c7781e67682 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9c5b79818e753049001bd0b4… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 17:59:30 2014 +0100 mail: Replace deprecated ereg_replace with str_replace --- include/mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mail.php b/include/mail.php index 1c8fb65..90223aa 100644 --- a/include/mail.php +++ b/include/mail.php @@ -16,7 +16,7 @@ function mail_appdb($sEmailList,$sSubject,$sMsg) $sHeaders .= "Bcc: $sEmailListComma\r\n"; $sHeaders .= "X-Priority: 3\r\n"; $sHeaders .= "X-Mailer: ".APPDB_OWNER." mailer\r\n"; - $sMsg = trim(ereg_replace("\r\n","\n",$sMsg)); + $sMsg = trim(str_replace("\r\n","\n",$sMsg)); $sMsg = $sSubject."\n-------------------------------------------------------\n".$sMsg."\n\n"; $sMsg .= "Best regards.\n"; $sMsg .= "The AppDB team\n";

1 0

Alexander Nicolaysen Sørnes : parsedate.php: Remove unused file
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: bbd72f3aa6472513e066613215be03b7d36e117b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bbd72f3aa6472513e0666132… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 18:03:09 2014 +0100 parsedate.php: Remove unused file --- include/parsedate.php | 84 ------------------------------------------------- 1 file changed, 84 deletions(-) diff --git a/include/parsedate.php b/include/parsedate.php deleted file mode 100644 index 01bc585..0000000 --- a/include/parsedate.php +++ /dev/null @@ -1,84 +0,0 @@ -<?php - -function parsedate($datestr) -{ - $daynames = array("monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"); - $monthnames = array("jan" => 1, "feb" => 2, "mar" => 3, "apr" => 4, "may" => 5, "jun" => 6, - "jul" => 7, "aug" => 8, "sep" => 9, "oct" => 10, "nov" => 11, "dec" => 12); - $ampm = array("am" => 00, "pm" => 12); - - if(!$datestr) - return -1; - - $datestr = strtolower($datestr); - $datestr = ereg_replace("[,]", "", $datestr); - $dp = explode(' ', $datestr); - while(list($idx, $part) = each($dp)) - { - //echo "PART($part)<br>"; - - /* 23:59:59 */ - if(ereg("^([0-9]+):([0-9]+):([0-9]+)$", $part, $arr)) - { - $hour = $arr[1]; - $minute = $arr[2]; - $second = $arr[3]; - continue; - } - - /* 23:59 */ - if(ereg("^([0-9]+):([0-9]+)$", $part, $arr)) - { - $hour = $arr[1]; - $minute = $arr[2]; - $second = 0; - continue; - } - - /* 2000-12-31 (mysql date format) */ - if(ereg("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$", $part, $arr)) - { - $year = $arr[1]; - $month = $arr[2]; - $day = $arr[3]; - continue; - } - - if(defined($ampm[$part])) - { - $hour += $ampm[$part]; - continue; - } - - if($monthnames[substr($part, 0, 3)]) - { - $month = $monthnames[substr($part, 0, 3)]; - continue; - } - - if($part > 1900) - { - $year = $part; - continue; - } - - if($part > 31) - { - $year = 1900 + $part; - continue; - } - - if($part >= 1 && $part <= 31) - { - $day = $part; - continue; - } - - //echo "Unparsed: '$part'<br>\n"; - - } - - return mktime($hour, $minute, $second, $month, $day, $year); -} - -?>

1 0

Alexander Nicolaysen Sørnes : comment: Replace eregi with stripos
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 59a5b978e8c1e9bb49966c2f7513cf25dcac333c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=59a5b978e8c1e9bb49966c2f… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 17:56:09 2014 +0100 comment: Replace eregi with stripos --- include/comment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/comment.php b/include/comment.php index a364d76..21c6a14 100644 --- a/include/comment.php +++ b/include/comment.php @@ -835,7 +835,7 @@ class Comment { if(!$this->sSubject) { // Only add RE: once - if(eregi("RE:", $oRow->subject)) + if(stripos($oRow->subject, "RE:") !== false) $this->sSubject = $oRow->subject; else $this->sSubject = "RE: ".$oRow->subject;

1 0

Alexander Nicolaysen Sørnes : html: Replace ereg_replace with str_replace
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: decbd736c4ada6172bcef8955e333a7d68b6d533 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=decbd736c4ada6172bcef895… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 17:58:19 2014 +0100 html: Replace ereg_replace with str_replace --- include/html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/html.php b/include/html.php index 21992ae..b015f9f 100644 --- a/include/html.php +++ b/include/html.php @@ -237,7 +237,7 @@ function p() function add_br($text = "") { - $text = ereg_replace("\n","<br>\n",$text); + $text = str_replace("\n","<br>\n",$text); return $text; }

1 0

Alexander Nicolaysen Sørnes : TableRowSortable: Override TableRow::AddCell()
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: bf7127801b1fa08795c92de076844854b2ac6683 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bf7127801b1fa08795c92de0… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 16:53:46 2014 +0100 TableRowSortable: Override TableRow::AddCell() --- include/table.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/table.php b/include/table.php index 362d605..f0c31fb 100644 --- a/include/table.php +++ b/include/table.php @@ -313,7 +313,7 @@ class TableRowSortable extends TableRow } /* Adds a table cell without sorting */ - function AddTableCell(TableCell $oCell) + function AddCell(TableCell $oCell) { $this->aTableCells[] = $oCell; $this->aSortVars[] = ''; @@ -322,7 +322,7 @@ class TableRowSortable extends TableRow /* Adds a text cell without sorting */ function AddTextCell($shText) { - $this->AddTableCell(new TableCell($shText)); + $this->AddCell(new TableCell($shText)); } /* Adds a text cell with a sorting var */

1 0

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

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

Jan. 12, 2014

Module: appdb Branch: master Commit: 6d54925913dca1dc3c7840cf04030c6316b19233 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6d54925913dca1dc3c7840cf… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:30:10 2014 +0100 url: Mark some functions as static --- include/url.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/url.php b/include/url.php index 15d33ef..9f0e3fc 100644 --- a/include/url.php +++ b/include/url.php @@ -474,7 +474,7 @@ class Url { } /* Display links for a given version/application */ - function display($iVersionId, $iAppId = NULL) + public static function display($iVersionId, $iAppId = NULL) { if($iVersionId) { @@ -543,7 +543,7 @@ class Url { // if a url lacks "://" assume the url is an http one // and prepend "http://" - function normalize($sTheUrl) + public static function normalize($sTheUrl) { // return if we have an empty string if($sTheUrl == "")

1 0

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

Jan. 12, 2014

Module: appdb Branch: master Commit: 36fb1d97de5cdd02dcdfda5708f2f949373e03e6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=36fb1d97de5cdd02dcdfda57… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:28:31 2014 +0100 screenshot: Mark some functions as static --- include/screenshot.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index dc49935..adb0658 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -464,7 +464,7 @@ class screenshot mail_appdb($sEmail, $sSubject ,$sMsg); } - function get_zoomicon_overlay() + public static function get_zoomicon_overlay() { /* if the user is using mozilla or firefox show the zoom icon over images */ /* otherwise because IE doesn't support transparent PNGs or proper css we have to */ @@ -485,7 +485,7 @@ class screenshot * * $bFormatting == false turns off all extranious formatting applied to the returned image html */ - function get_random_screenshot_img($iAppId = null, $iVersionId = null, + public static function get_random_screenshot_img($iAppId = null, $iVersionId = null, $bFormatting = true) { // initialize variables to avoid notices when appending to them @@ -554,7 +554,14 @@ class screenshot return $sImg; } - function get_screenshots($iAppId = null, $iVersionId = null, $bQueued = "false") + /** + * Get all screenshots for an application or a specific version + * @param type $iAppId + * @param type $iVersionId + * @param type $bQueued + * @return boolean + */ + public static function get_screenshots($iAppId = null, $iVersionId = null, $bQueued = "false") { /* * We want all screenshots for this app. @@ -703,13 +710,13 @@ class screenshot return $oFilter; } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $oFilters = null) + public static function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $oFilters = null) { return appData::objectGetEntries($sState, $iRows, $iStart, $sOrderBy, $bAscending, 'screenshot', $oFilters); } - function objectGetEntriesCount($sState, $oFilters = null) + public static function objectGetEntriesCount($sState, $oFilters = null) { return appData::objectGetEntriesCount($sState, 'screenshot', $oFilters); }

1 0

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

Jan. 12, 2014

Module: appdb Branch: master Commit: e9d8143fac41f709d1d594cae853c769d8644612 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e9d8143fac41f709d1d594ca… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:26:49 2014 +0100 objectManager: Mark some functions as static --- include/objectManager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index d6be2aa..c956707 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1766,7 +1766,7 @@ class ObjectManager return $sQueueString; } - public function getSqlLimitClause($iRows, $iStart, $sClass) + public static function getSqlLimitClause($iRows, $iStart, $sClass) { $sLimit = ''; @@ -1792,7 +1792,7 @@ class ObjectManager return $sLimit; } - public function getStateString($bQueued, $bRejected) + public static function getStateString($bQueued, $bRejected) { if($bQueued) {

1 0

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

Jan. 12, 2014

Module: appdb Branch: master Commit: e3709e80cfd88be2661ab80db8c2d836d1bd760c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e3709e80cfd88be2661ab80d… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:24:41 2014 +0100 monitor: Mark a function as static --- include/monitor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/monitor.php b/include/monitor.php index f8a95cf..ab72fc3 100644 --- a/include/monitor.php +++ b/include/monitor.php @@ -369,7 +369,7 @@ class Monitor { } /* Retrieve the user's monitored versions */ - function getVersionsMonitored($oUser) + public static function getVersionsMonitored($oUser) { $hResult = query_parameters("SELECT appId, versionId FROM appMonitors WHERE userId = '?'", $oUser->iUserId);

1 0

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

Jan. 12, 2014

Module: appdb Branch: master Commit: 62e956692f28181d8d6a26329bbc36e2d99a4d16 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=62e956692f28181d8d6a2632… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:23:11 2014 +0100 Bug: Mark some functions as static --- include/bugs.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index c2447bb..d933b7c 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -411,7 +411,7 @@ class Bug return $oFilter; } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $oFilters = null) + public static function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $oFilters = null) { $sExtraTables = ''; $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); @@ -483,7 +483,7 @@ class Bug return $hResult; } - function objectGetEntriesCount($sState, $oFilters = null) + public static function objectGetEntriesCount($sState, $oFilters = null) { $sExtraTables = ''; $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false');

1 0

Alexander Nicolaysen Sørnes : screenshots.php: Prevent use of undefined input variable
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 56ca22a8d4ede8c417ffb29e4cdba02b3ed2fca7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=56ca22a8d4ede8c417ffb29e… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:17:34 2014 +0100 screenshots.php: Prevent use of undefined input variable --- screenshots.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screenshots.php b/screenshots.php index 160eefe..c077cee 100644 --- a/screenshots.php +++ b/screenshots.php @@ -26,7 +26,7 @@ require_once(BASE."include/application.php"); require_once(BASE."include/version.php"); // we issued a command -if($aClean['sCmd']) +if(array_key_exists('sCmd', $aClean) && $aClean['sCmd']) { // process screenshot upload if($aClean['sCmd'] == "screenshot_upload")

1 0

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

Jan. 12, 2014

Module: appdb Branch: master Commit: 2a4c512dc1758f850e0d46688098474dcd15c506 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2a4c512dc1758f850e0d4668… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:24:13 2014 +0100 maintainer: Mark some functions as static --- include/maintainer.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 00ff90d..910aaca 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -470,7 +470,7 @@ class maintainer return $sRecipients; } - function ObjectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true) + public static function ObjectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true) { /* Not implemented */ if($sState == 'rejected') @@ -529,7 +529,7 @@ class maintainer } // returns the number of applications/versions a particular user maintains - function getMaintainerCountForUserId($iUserId, $bSuperMaintainer) + public static function getMaintainerCountForUserId($iUserId, $bSuperMaintainer) { $sQuery = "SELECT count(*) as cnt from appMaintainers WHERE userid = '?' AND superMaintainer = '?'". " AND state ='?'"; @@ -541,7 +541,7 @@ class maintainer } // returns the number of applications/versions a particular user maintains - function getMaintainerCountForUser($oUser, $bSuperMaintainer) + public static function getMaintainerCountForUser($oUser, $bSuperMaintainer) { return self::getMaintainerCountForUserId($oUser->iUserId, $bSuperMaintainer); } @@ -549,7 +549,7 @@ class maintainer /** * get the applications and versions that this user maintains */ - function getAppsMaintained($oUser) + public static function getAppsMaintained($oUser) { /* retrieve the list of application and order them by application name */ $hResult = query_parameters("SELECT appMaintainers.appId, versionId, superMaintainer, appName FROM ". @@ -570,7 +570,7 @@ class maintainer return $aAppsMaintained; } - function objectGetEntriesCount($sState) + public static function objectGetEntriesCount($sState) { /* Not implemented */ if($sState == 'rejected') @@ -593,13 +593,13 @@ class maintainer } /* see how many unique maintainers we actually have */ - function getNumberOfMaintainers() + public static function getNumberOfMaintainers() { $hResult = query_parameters("SELECT DISTINCT userId FROM appMaintainers WHERE state='accepted';"); return query_num_rows($hResult); } - function isUserMaintainer($oUser, $iVersionId = null) + public static function isUserMaintainer($oUser, $iVersionId = null) { /* if we are a super maintainer, we are a maintainer of this version as well */ $oVersion = new Version($iVersionId); @@ -622,7 +622,7 @@ class maintainer return query_num_rows($hResult); } - function isUserSuperMaintainer($oUser, $iAppId = null) + public static function isUserSuperMaintainer($oUser, $iAppId = null) { if($iAppId) { @@ -665,7 +665,7 @@ class maintainer /* if given an appid or a version id return a handle for a query that has */ /* the user ids that are maintainers for this particular appid or version id */ - function getMaintainersForAppIdVersionId($iAppId = null, $iVersionId = null) + public static function getMaintainersForAppIdVersionId($iAppId = null, $iVersionId = null) { $hResult = null; @@ -703,7 +703,7 @@ class maintainer /* * get the userIds of super maintainers for this appId */ - function getSuperMaintainersUserIdsFromAppId($iAppId) + public static function getSuperMaintainersUserIdsFromAppId($iAppId) { $sQuery = "SELECT userId FROM ". "appMaintainers WHERE appId = '?' " .

1 0

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

Jan. 12, 2014

Module: appdb Branch: master Commit: 4590b08c433a6b339873538af36ed2be17145220 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4590b08c433a6b339873538a… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:18:08 2014 +0100 appData: Mark some functions as static --- include/appData.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/appData.php b/include/appData.php index caaa827..87f751d 100644 --- a/include/appData.php +++ b/include/appData.php @@ -204,7 +204,7 @@ class appData } /* Get appData for a given version/application, optionally filter by type */ - function getData($iId, $sType, $bIsVersion = TRUE, $bQueued = FALSE, $bRejected = FALSE) + public static function getData($iId, $sType, $bIsVersion = TRUE, $bQueued = FALSE, $bRejected = FALSE) { $iAppId = 0; $iVersionId = 0; @@ -226,7 +226,7 @@ class appData return $hResult; } - function objectGetEntriesCount($sState, $sType = null, $oFilters = null) + public static function objectGetEntriesCount($sState, $sType = null, $oFilters = null) { /* Not implemented for appData */ if($sState == 'rejected') @@ -366,7 +366,7 @@ class appData return $iCount; } - function objectGetHeader($sType) + public static function objectGetHeader($sType) { $oTableRow = new TableRow(); $oTableRow->AddTextCell("Submission date"); @@ -377,7 +377,7 @@ class appData return $oTableRow; } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $sType = null, $oFilters = null) + public static function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $sType = null, $oFilters = null) { /* Not implemented for appData */ if($sState == 'rejected')

1 0

Alexander Nicolaysen Sørnes : db_filter_ui: Prevent use of undefined input variable
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 3919d97df4af3dfae2a4a12099a4e216ad6c2e75 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3919d97df4af3dfae2a4a120… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:20:38 2014 +0100 db_filter_ui: Prevent use of undefined input variable --- include/db_filter_ui.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/db_filter_ui.php b/include/db_filter_ui.php index 9df1f63..fc16546 100644 --- a/include/db_filter_ui.php +++ b/include/db_filter_ui.php @@ -451,7 +451,7 @@ class FilterInterface { $sColumn = $this->escapeChars($oOption->getColumn()); $i = sizeof($aReturn); - $sData = query_escape_string($aClean["s{$sColumn}Data"]); + $sData = query_escape_string(getInput("s{$sColumn}Data", $aClean)); $iOp = $aClean["i{$sColumn}Op"];

1 0

Alexander Nicolaysen Sørnes : db_filter_ui: Prevent use of undefined variable
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: f914e0aefe58a99cfaa27881b5b9e6358ca13a08 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f914e0aefe58a99cfaa27881… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:21:10 2014 +0100 db_filter_ui: Prevent use of undefined variable --- include/db_filter_ui.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/db_filter_ui.php b/include/db_filter_ui.php index fc16546..4aabfcb 100644 --- a/include/db_filter_ui.php +++ b/include/db_filter_ui.php @@ -455,7 +455,7 @@ class FilterInterface $iOp = $aClean["i{$sColumn}Op"]; - if($iOp && $sData && ($oOption->getValueType() != FILTER_VALUES_OPTION_BOOL || !$bChangedOoption)) + if($iOp && $sData && ($oOption->getValueType() != FILTER_VALUES_OPTION_BOOL || !$bChangedOption)) { $oFilter = new Filter($oOption->getColumn(), $iOp, $sData); $aReturn[] = $oFilter;

1 0