July 2008 - Wine-commits - list.winehq.org

Alexander Nicolaysen Sørnes : contact: Prefix messages with [PM]
by Chris Morgan 08 Jul '08

08 Jul '08

Module: appdb Branch: master Commit: 63cf2128a3ba7f69fa1bf6abe727357eec3e1f65 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=63cf2128a3ba7f69fa1bf6ab… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 6 19:21:52 2008 +0200 contact: Prefix messages with [PM] --- contact.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contact.php b/contact.php index cafb40f..f1a2b0c 100644 --- a/contact.php +++ b/contact.php @@ -143,7 +143,7 @@ if(!$aClean['sSubmit']) $sMsg .= $aClean['sMessage']; } - mail_appdb($sRecipients, $aClean['sSubject'], $sMsg); + mail_appdb($sRecipients, '[PM] '.$aClean['sSubject'], $sMsg); util_redirect_and_exit(BASE."index.php"); }

1 0

Henti Smith : * add additional wine versions to bugzilla_tables.sql
by Chris Morgan 08 Jul '08

08 Jul '08

Module: appdb Branch: master Commit: 426af8298a0abeb398c3cbeb36255ec81ae5f2b9 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=426af8298a0abeb398c3cbeb… Author: Henti Smith <henti(a)lsd.co.za> Date: Mon Jul 7 09:16:09 2008 +0200 * add additional wine versions to bugzilla_tables.sql --- tables/bugzilla_tables.sql | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/tables/bugzilla_tables.sql b/tables/bugzilla_tables.sql index 002b7ea..316b365 100644 --- a/tables/bugzilla_tables.sql +++ b/tables/bugzilla_tables.sql @@ -129,6 +129,31 @@ INSERT INTO `versions` VALUES ('0.9.40.',1,102); INSERT INTO `versions` VALUES ('0.9.41.',1,103); INSERT INTO `versions` VALUES ('0.9.42.',1,104); INSERT INTO `versions` VALUES ('0.9.43.',1,105); +INSERT INTO `versions` VALUES ('0.9.44.',1,106); +INSERT INTO `versions` VALUES ('0.9.45.',1,107); +INSERT INTO `versions` VALUES ('0.9.46.',1,108); +INSERT INTO `versions` VALUES ('0.9.47.',1,109); +INSERT INTO `versions` VALUES ('0.9.48.',1,110); +INSERT INTO `versions` VALUES ('0.9.49.',1,111); +INSERT INTO `versions` VALUES ('0.9.50.',1,112); +INSERT INTO `versions` VALUES ('0.9.51.',1,113); +INSERT INTO `versions` VALUES ('0.9.52.',1,114); +INSERT INTO `versions` VALUES ('0.9.53.',1,115); +INSERT INTO `versions` VALUES ('0.9.54.',1,116); +INSERT INTO `versions` VALUES ('0.9.55.',1,117); +INSERT INTO `versions` VALUES ('0.9.56.',1,118); +INSERT INTO `versions` VALUES ('0.9.57.',1,119); +INSERT INTO `versions` VALUES ('0.9.58.',1,120); +INSERT INTO `versions` VALUES ('0.9.59.',1,121); +INSERT INTO `versions` VALUES ('0.9.60.',1,122); +INSERT INTO `versions` VALUES ('0.9.61.',1,123); +INSERT INTO `versions` VALUES ('1.0.rc1.',1,124); +INSERT INTO `versions` VALUES ('1.0.rc2.',1,125); +INSERT INTO `versions` VALUES ('1.0.rc3.',1,126); +INSERT INTO `versions` VALUES ('1.0.rc4.',1,127); +INSERT INTO `versions` VALUES ('1.0.rc5.',1,128); +INSERT INTO `versions` VALUES ('1.0.0.',1,129); +INSERT INTO `versions` VALUES ('1.1.0.',1,130); -- -- Table structure for table `bugs`

1 0

Henti Smith : * fix user grant syntax to correctly grant permissions
by Chris Morgan 08 Jul '08

08 Jul '08

Module: appdb Branch: master Commit: 8bc3b29bd49d45ed2a0438f76b0d02f1cce57990 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8bc3b29bd49d45ed2a0438f7… Author: Henti Smith <henti(a)lsd.co.za> Date: Mon Jul 7 09:20:24 2008 +0200 * fix user grant syntax to correctly grant permissions --- tables/bugzilla_tables.sql | 3 +-- tables/create_apidb_base.sql | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tables/bugzilla_tables.sql b/tables/bugzilla_tables.sql index 316b365..82bca0b 100644 --- a/tables/bugzilla_tables.sql +++ b/tables/bugzilla_tables.sql @@ -3,8 +3,7 @@ create database if not exists bugs; use bugs; /* make sure the wineowner user has access to the bugs database */ -grant all on bugs.* to wineowner; - +grant all on bugs.* to 'wineowner'@'localhost'; drop table if exists versions; diff --git a/tables/create_apidb_base.sql b/tables/create_apidb_base.sql index cb73f2e..dd33972 100644 --- a/tables/create_apidb_base.sql +++ b/tables/create_apidb_base.sql @@ -1,2 +1,2 @@ create database if not exists apidb; -grant all on apidb.* to wineowner; +grant all on apidb.* to 'wineowner'@'localhost';

1 0

Alexander Nicolaysen Sørnes : filter: Clear whitespace for input numbers
by Chris Morgan 08 Jul '08

08 Jul '08

Module: appdb Branch: master Commit: 017d2d68a0b202baac41f83bd1d661faba2651f7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=017d2d68a0b202baac41f83b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 6 16:19:59 2008 +0200 filter: Clear whitespace for input numbers --- include/filter.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/filter.php b/include/filter.php index 439e4e3..4daf875 100644 --- a/include/filter.php +++ b/include/filter.php @@ -66,6 +66,8 @@ function filter_gpc() $aClean[$aKeys[$i]] = $_REQUEST[$aKeys[$i]]; else if(empty($_REQUEST[$aKeys[$i]])) $aClean[$aKeys[$i]] = 0; + else if(is_numeric(trim($_REQUEST[$aKeys[$i]]))) // try clearing whitespace + $aClean[$aKeys[$i]] = trim($_REQUEST[$aKeys[$i]]); else return "Fatal error: ".$aKeys[$i]." should be a numeric value. ". $sErrorSuggestion;

1 0

Alexander Nicolaysen Sørnes : objectManager: Fix parameters passed to mail_appdb()
by Chris Morgan 08 Jul '08

08 Jul '08

Module: appdb Branch: master Commit: ea06e374b74c12d2060761dada091fe56bea7f6f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ea06e374b74c12d2060761da… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 6 17:03:16 2008 +0200 objectManager: Fix parameters passed to mail_appdb() --- include/objectManager.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index b1280ab..b351965 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1529,7 +1529,7 @@ class mail { var $sSubject; var $sMessage; - var $aRecipients; + var $sRecipients; function mail($aInput, $iRecipientId = null) { @@ -1539,7 +1539,7 @@ class mail /* $aInput is returned from objectGetMail(); an array with the following members 0: Mail subject 1: Mail text - 2: Array of recipients + 2: Space-separated list of recipients If iRecipientId is set the third array member is ignored. */ $this->sSubject = $aInput[0]; $this->sMessage = $aInput[1]; @@ -1547,10 +1547,10 @@ class mail if($iRecipientId) { $oRecipient = new user($iRecipientId); - $this->aRecipients = array($oRecipient->sEmail); + $this->sRecipients = $oRecipient->sEmail; } else { - $this->aRecipients = $aInput[2]; + $this->sRecipients = $aInput[2]; } } @@ -1573,7 +1573,7 @@ class mail $this->sMessage .= $sReplyText; - mail_appdb($this->aRecipients, $this->sSubject, $this->sMessage); + mail_appdb($this->sRecipients, $this->sSubject, $this->sMessage); } }

1 0

Alexander Nicolaysen Sørnes : objectManager: Don't print reasons given when there are none
by Chris Morgan 08 Jul '08

08 Jul '08

Module: appdb Branch: master Commit: 43b73d2faef84af2d4e3d736bf217670e971ee52 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=43b73d2faef84af2d4e3d736… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 6 17:07:37 2008 +0200 objectManager: Don't print reasons given when there are none --- include/objectManager.php | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index b351965..088746c 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1564,14 +1564,20 @@ class mail $this->sMessage .= "The action was performed by ".$_SESSION['current']->sRealname."\n"; - switch($sAction) + if($sReplyText) { - case "delete": - $this->sMessage .= "Reasons given\n"; - break; - } + switch($sAction) + { + case "delete": + $this->sMessage .= "Reasons given\n"; + break; + } - $this->sMessage .= $sReplyText; + $this->sMessage .= $sReplyText; + } else + { + $this->sMessage .= 'No reasons given'; + } mail_appdb($this->sRecipients, $this->sSubject, $this->sMessage); }

1 0

Alexander Nicolaysen Sørnes : screenshots: Add some space between title bars
by Chris Morgan 08 Jul '08

08 Jul '08

Module: appdb Branch: master Commit: 36de1a0d78a4d0ea9f6b62f8a5c3d6a4ad5a4031 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=36de1a0d78a4d0ea9f6b62f8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 6 18:23:02 2008 +0200 screenshots: Add some space between title bars --- screenshots.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/screenshots.php b/screenshots.php index b81c53d..aa55225 100644 --- a/screenshots.php +++ b/screenshots.php @@ -62,6 +62,7 @@ $oVersion = new Version($aClean['iVersionId']); if($hResult && query_num_rows($hResult)) { + echo '&nbsp'; // Add some space between title bars echo html_frame_start("Screenshot Gallery for ".$oApp->sName, 500); // display thumbnails @@ -72,6 +73,8 @@ if($hResult && query_num_rows($hResult)) $bUserIsMaintainerOfVersion = false; echo "<div align=center><table><tr>\n"; + echo '&nbsp'; // Add some space between title bars + while($oRow = query_fetch_object($hResult)) { // if the current version changed then update the current version

1 0

Alexander Nicolaysen Sørnes : maintainer : Fix deletion mail
by Chris Morgan 08 Jul '08

08 Jul '08

Module: appdb Branch: master Commit: 58a490baa2e36698c936dec0bf455bad3d299144 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=58a490baa2e36698c936dec0… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jun 20 10:14:55 2008 +0200 maintainer: Fix deletion mail --- include/maintainer.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 7ad0a86..66e1f6b 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -923,7 +923,7 @@ class maintainer function objectGetMail($sAction, $bMailSubmitter, $bParentAction) { - $oSubmitter = new user($this->iSubmitterId); + $oSubmitter = new user($this->iUserId); $sVerb = $this->sState == 'queued' ? 'rejected' : 'removed'; @@ -967,11 +967,11 @@ class maintainer $sSubject = "Maintainership for $sFor $sVerb"; if($this->sState == 'accepted') { - $sMsg = $oSubmitter->sRealName." has been removed as a ". + $sMsg = $oSubmitter->sRealname." has been removed as a ". "maintainer of $sFor."; } else { - $sMsg = $oSubmitter->sRealName." request to be a maintainer ". + $sMsg = $oSubmitter->sRealname."'s request to be a maintainer ". " of $sFor has been rejected."; } }

1 0

Alexander Nicolaysen Sørnes : Minor language improvements on the AppDB front page
by Chris Morgan 08 Jul '08

08 Jul '08

Module: appdb Branch: master Commit: 2afd981cda8f0aeac9eb899c80389c38c73ef753 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2afd981cda8f0aeac9eb899c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 29 16:44:46 2008 +0200 Minor language improvements on the AppDB front page --- index.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/index.php b/index.php index 27c0e9d..147045f 100644 --- a/index.php +++ b/index.php @@ -27,9 +27,9 @@ $str_benefits=" <li>Ability to customize the layout and behavior of the AppDB and comments system</li> <li>Take credit for your witty posts</li> <li>Ability to sign up to be an <a href=\"".BASE."help/?sTopic=maintainer_guidelines\" - title=\"information about application maintainers\" style=\"cursor: help\">application maintainer</a>.</li> - <li>Submit new applications and versions.</li> - <li>Submit new screenshots.</li> + title=\"information about application maintainers\" style=\"cursor: help\">application maintainer</a></li> + <li>Submit new applications and versions</li> + <li>Submit new screenshots</li> </ul> "; if(!$_SESSION['current']->isLoggedIn()) @@ -40,7 +40,7 @@ if(!$_SESSION['current']->isLoggedIn()) $str_benefits - <p>So what are you waiting for, [<a href=\"".login_url()."\">log in</a>] + <p>So, what are you waiting for? [<a href=\"".login_url()."\">Log in</a>] or [<a href=\"account.php?sCmd=new\">register</a>] now! Your help in stomping out Wine issues will be greatly appreciated.</p>"; } else @@ -66,7 +66,7 @@ if(!$_SESSION['current']->isLoggedIn()) $hResult = query_parameters($voteQuery); $oRow = query_fetch_object($hResult); - echo "There are <b>$iNumApps</b> applications currently in the database"; + echo "There are <b>$iNumApps</b> applications currently in the database,"; // don't mention the top application if there are no votes yet if( !empty($oRow) )

1 0

Henti Smith : * convert queue to state columns Changed column name from queue to state and changed enum from ('true','false') to ('accepted','queued') in buglinks. sql Changed column name from queue to state and changed enum from ('true', ' false','rejected','pending') to ('accepted','queued','pending') in maintainers.sql Changed field superMaintainer from bool to tinyint(1) in maintainers.sql
by Chris Morgan 08 Jul '08

08 Jul '08

Module: appdb Branch: master Commit: 63a42c5a2223105637f14d1eda78785939c13c20 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=63a42c5a2223105637f14d1e… Author: Henti Smith <henti(a)lsd.co.za> Date: Mon Jul 7 09:14:50 2008 +0200 * convert queue to state columns Changed column name from queue to state and changed enum from ('true','false') to ('accepted','queued') in buglinks.sql Changed column name from queue to state and changed enum from ('true','false','rejected','pending') to ('accepted','queued','pending') in maintainers.sql Changed field superMaintainer from bool to tinyint(1) in maintainers.sql --- tables/appdb_tables.sql | 5 +---- tables/buglinks.sql | 2 +- tables/maintainers.sql | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index 2347ea7..f481355 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -44,7 +44,6 @@ create table appFamily ( key(appId) ); - /* * a version of an application */ @@ -140,13 +139,11 @@ create table appData ( url varchar(255) default NULL, submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', - queued enum('true','false','rejected') NOT NULL default 'false', + state enum('accepted','queued','rejected') NOT NULL default 'accepted', KEY id (id), KEY versionId (versionId) ); - - /* * allow users to vote for apps, as in, request that an app gets better support */ diff --git a/tables/buglinks.sql b/tables/buglinks.sql index f00738d..f32ecc0 100644 --- a/tables/buglinks.sql +++ b/tables/buglinks.sql @@ -11,7 +11,7 @@ create table buglinks ( versionId int not null, submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', - queued enum('true','false') NOT NULL default 'false', + state enum('accepted','queued') NOT NULL default 'accepted', key(linkId), index(bug_id), index(versionId) diff --git a/tables/maintainers.sql b/tables/maintainers.sql index e149eda..92e846b 100644 --- a/tables/maintainers.sql +++ b/tables/maintainers.sql @@ -17,9 +17,9 @@ create table appMaintainers ( versionId int, userId int, maintainReason text, - superMaintainer bool, + superMaintainer tinyint(1), submitTime datetime, - queued enum('true','false','rejected','pending') NOT NULL default 'false', + state enum('accepted','queued','pending') NOT NULL default 'accepted', notificationLevel int not null default '0', notificationTime datetime, key(maintainerId)

1 0