January 2014 - Wine-commits

Alexander Nicolaysen Sørnes : application_queue: Fix invocation of non-static function
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

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 : application: Fix invocations of non-static function
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

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 12 Jan '14

12 Jan '14

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 12 Jan '14

12 Jan '14

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 : comment: Declare static functions as such
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

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 : screenshots.php: Prevent use of unitialized variable
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

Module: appdb Branch: master Commit: e58d239b999b8526a7ccca181f00201f50c3fe91 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e58d239b999b8526a7ccca18… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sat Jan 11 17:51:04 2014 +0100 screenshots.php: Prevent use of unitialized variable --- screenshots.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/screenshots.php b/screenshots.php index d8ae285..160eefe 100644 --- a/screenshots.php +++ b/screenshots.php @@ -68,6 +68,8 @@ if($hResult && query_num_rows($hResult)) // display thumbnails $c = 1; + + $iCurrentVersionId = 0; // optimization so we don't have to perform as many database queries // only update this variable when $iCurrentVersionId changes

1 0

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

12 Jan '14

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 : appData: Mark some functions as static
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

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 12 Jan '14

12 Jan '14

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 12 Jan '14

12 Jan '14

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