wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

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("^.+@.+\\..+$", $aClean['sUserEmail'])) + if(!filter_var($aClean['sUserEmail'], FILTER_VALIDATE_EMAIL)) { $aClean['sUserEmail'] = ""; retry("new", "Invalid email address");

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

12 Jan '14

Module: appdb Branch: master Commit: 71ac4f0c838324748f17d8e2a526153318c9a849 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=71ac4f0c838324748f17d8e2… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:34:44 2014 +0100 distribution: Mark some functions as static --- include/distribution.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index 354e585..3031d6d 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -504,7 +504,7 @@ class distribution { } /* Get the total number of Distributions in the database */ - function objectGetEntriesCount($sState, $oFilter = null) + public static function objectGetEntriesCount($sState, $oFilter = null) { /* Not implemented */ if($sState == 'rejected') @@ -528,7 +528,7 @@ class distribution { } /* Make a dropdown list of distributions */ - function make_distribution_list($varname, $cvalue) + public static function make_distribution_list($varname, $cvalue) { $sQuery = "SELECT name, distributionId FROM distributions WHERE state = 'accepted' @@ -572,7 +572,7 @@ class distribution { return 'name'; } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "name", $bAscending = TRUE, $oFilter = null) + public static function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "name", $bAscending = TRUE, $oFilter = null) { /* Not implemented */ if($sState == 'rejected')

1 0

Alexander Nicolaysen Sørnes : downloadurl: Mark a function as static
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

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

12 Jan '14

Module: appdb Branch: master Commit: 7bbc11aba8edb84953ed691b96882db250fc14ef URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7bbc11aba8edb84953ed691b… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:32:51 2014 +0100 version_queue: Fix invocation of non-static function --- include/version_queue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/version_queue.php b/include/version_queue.php index d922adc..0b3f132 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -353,7 +353,7 @@ class version_queue function objectDisplayQueueProcessingHelp() { - version::objectDisplayQueueProcessingHelp(); + $this->oVersion->objectDisplayQueueProcessingHelp(); } function objectMoveChildren($iNewId)

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

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 : 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

← Newer
1
...
36
37
38
39
40
41
42
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014