January 2014 - Wine-commits

Alexander Nicolaysen Sørnes : Bug: Mark some functions as static
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

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

12 Jan '14

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 : monitor: Mark a function as static
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

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 : note: Mark a function as static
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

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

12 Jan '14

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

12 Jan '14

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

12 Jan '14

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

12 Jan '14

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

12 Jan '14

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

12 Jan '14

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