January 2014 - Wine-Commits

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