June 2007 - Wine-commits - list.winehq.org

appdb/include util.php
by WineHQ 11 Jun '07

11 Jun '07

ChangeSet ID: 31178 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/10 19:04:29 Modified files: include : util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Switch some tabs to spaces Patch: http://cvs.winehq.org/patch.py?id=31178 Old revision New revision Changes Path 1.89 1.90 +4 -3 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.89 appdb/include/util.php:1.90 --- appdb/include/util.php:1.89 11 Jun 2007 0: 4:29 -0000 +++ appdb/include/util.php 11 Jun 2007 0: 4:29 -0000 @@ -37,15 +37,16 @@ function build_urlarg($vars) while(list($key, $val) = each($vars)) { if(is_array($val)) - { + { while(list($idx, $value) = each($val)) { //echo "Encoding $key / $value "; $arr[] = rawurlencode($key."[]")."=".rawurlencode($value); } - } - else + } else + { $arr[] = $key."=".rawurlencode($val); + } } return implode("&", $arr); }

1 0

appdb/include application.php url.php
by WineHQ 10 Jun '07

10 Jun '07

ChangeSet ID: 31177 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/10 18:58:11 Modified files: include : application.php url.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Prepend "http://" in front of urls that lack "://". Most urls tend to be websites and adding http:// where it is missing fixes a bunch of urls in the database Patch: http://cvs.winehq.org/patch.py?id=31177 Old revision New revision Changes Path 1.112 1.113 +3 -1 appdb/include/application.php 1.17 1.18 +42 -18 appdb/include/url.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.112 appdb/include/application.php:1.113 --- appdb/include/application.php:1.112 10 Jun 2007 23:58:11 -0000 +++ appdb/include/application.php 10 Jun 2007 23:58:11 -0000 @@ -70,7 +70,9 @@ class Application { $this->sName = $oRow->appName; $this->sKeywords = $oRow->keywords; $this->sDescription = $oRow->description; - $this->sWebpage = $oRow->webPage; + //TODO: we should move the url to the appData table + // and return an id into the appData table here + $this->sWebpage = Url::normalize($oRow->webPage); $this->sQueued = $oRow->queued; } Index: appdb/include/url.php diff -u -p appdb/include/url.php:1.17 appdb/include/url.php:1.18 --- appdb/include/url.php:1.17 10 Jun 2007 23:58:11 -0000 +++ appdb/include/url.php 10 Jun 2007 23:58:11 -0000 @@ -21,27 +21,32 @@ class Url { /** * Constructor, fetches the url $iUrlId is given. */ - function Url($iUrlId = null) + function Url($iUrlId = null, $oRow = null) { - // we are working on an existing url - if($iUrlId) + if(!$iUrlId && !$oRow) + return; + + if(!$oRow) { $sQuery = "SELECT appData.* FROM appData WHERE type = 'url' AND id = '?'"; - if($hResult = query_parameters($sQuery, $iUrlId)) - { - $oRow = mysql_fetch_object($hResult); - $this->iUrlId = $iUrlId; - $this->sDescription = $oRow->description; - $this->iAppId = $oRow->appId; - $this->iVersionId = $oRow->versionId; - $this->sUrl = $oRow->url; - $this->bQueued = $oRow->queued; - $this->sSubmitTime = $oRow->submitTime; - $this->iSubmitterId = $oRow->submitterId; - } + $hResult = query_parameters($sQuery, $iUrlId); + $oRow = mysql_fetch_object($hResult); + } + + // we are working on an existing url + if($oRow) + { + $this->iUrlId = $iUrlId; + $this->sDescription = $oRow->description; + $this->iAppId = $oRow->appId; + $this->iVersionId = $oRow->versionId; + $this->sUrl = Url::normalize($oRow->url); + $this->bQueued = $oRow->queued; + $this->sSubmitTime = $oRow->submitTime; + $this->iSubmitterId = $oRow->submitterId; } } @@ -423,8 +428,7 @@ class Url { if($aValues["iVersionId"]) $sEmail = User::get_notify_email_address_list($aValues['iVersionId']); else - $sEmail = User::get_notify_email_address_list($aValues['iAppId']) -; + $sEmail = User::get_notify_email_address_list($aValues['iAppId']); if($sWhatChanged && $sEmail) { $oApp = new Application($aValues["iAppId"]); @@ -482,13 +486,33 @@ class Url { for($i = 0; $oRow = mysql_fetch_object($hResult); $i++) { + // create a url object + $oUrl = new Url(null, $oRow); + $sReturn .= html_tr(array( "Link", - "<a href=\"$oRow->url\">$oRow->description</a>"), + "<a href=\"$oUrl->sUrl\">$oUrl->sDescription</a>"), "color1"); } return $sReturn; } + + // if a url lacks "://" assume the url is an http one + // and prepend "http://" + function normalize($sTheUrl) + { + // if we already have "://" in the url + // we can leave the url alone + if(strpos($sTheUrl, "://") === false) + { + // assume this is a website and prepend "http://" + return "http://".$sTheUrl; + } else + { + // leave the url alone + return $sTheUrl; + } + } } ?>

1 0

appdb/include appData.php screenshot.php
by WineHQ 10 Jun '07

10 Jun '07

ChangeSet ID: 31176 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/10 18:07:51 Modified files: include : appData.php screenshot.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Allow appData constructor to import appData derived objects Patch: http://cvs.winehq.org/patch.py?id=31176 Old revision New revision Changes Path 1.24 1.25 +15 -1 appdb/include/appData.php 1.69 1.70 +3 -3 appdb/include/screenshot.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.24 appdb/include/appData.php:1.25 --- appdb/include/appData.php:1.24 10 Jun 2007 23: 7:51 -0000 +++ appdb/include/appData.php 10 Jun 2007 23: 7:51 -0000 @@ -15,11 +15,25 @@ class appData var $sSubmitTime; var $sDescription; - function appData($iId = null, $oRow = null) + function appData($iId = null, $oRow = null, $oObject = null) { if(!$iId && !$oRow) return; + /* Since all objects stored in the appData table have a number of common + members, we can import such an object into an appData one without + making an SQL query */ + if($oObject && $iId) + { + $this->iSubmitterId = $oObject->iSubmitterId; + $this->sDescription = $oObject->sDescription; + $this->iAppId = $oObject->iAppId; + $this->iVersionId = $oObject->iVersionId; + $this->sSubmitTime = $oObject->sSubmitTime; + $this->iId = $iId; + return; + } + if(!$oRow) { $hResult = query_parameters("SELECT * FROM appData WHERE id = '?'", $iId); Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.69 appdb/include/screenshot.php:1.70 --- appdb/include/screenshot.php:1.69 10 Jun 2007 23: 7:51 -0000 +++ appdb/include/screenshot.php 10 Jun 2007 23: 7:51 -0000 @@ -131,7 +131,7 @@ class Screenshot { function delete($bSilent=false) { /* appData has a universal function for removing database entries */ - $oAppData = new appData($this->iScreenshotId); + $oAppData = new appData($this->iScreenshotId, null, $this); if($oAppData->delete()) { /* make sure the screenshot and thumbnail is loaded */ @@ -562,7 +562,7 @@ class Screenshot { /* arg1 = OM object, arg2 = CSS style, arg3 = text for edit link */ function objectOutputTableRow($oObject, $sClass, $sEditLinkLabel) { - $oAppData = new AppData(); + $oAppData = new AppData($this->iScreenshotId, null, $this); $oAppData->objectOutputTableRow($oObject, $sClass, $sEditLinkLabel); } @@ -573,7 +573,7 @@ class Screenshot { function outputEditor() { - $oAppData = new appData($this->iScreenshotId); + $oAppData = new appData($this->iScreenshotId, null, $this); $oAppData->outputEditorGeneric(); echo '<tr valign=top><td class=color0>Submited screenshot</td>',"\n";

1 0

appdb/include version.php
by WineHQ 10 Jun '07

10 Jun '07

ChangeSet ID: 31175 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/10 17:15:35 Modified files: include : version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Version::Version() was using $this->iVersionId before the value was set Patch: http://cvs.winehq.org/patch.py?id=31175 Old revision New revision Changes Path 1.129 1.130 +20 -21 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.129 appdb/include/version.php:1.130 --- appdb/include/version.php:1.129 10 Jun 2007 22:15:35 -0000 +++ appdb/include/version.php 10 Jun 2007 22:15:35 -0000 @@ -50,31 +50,28 @@ class Version { /* * We fetch the data related to this version. */ - if(!$this->iVersionId) + if(!$oRow) { - if(!$oRow) - { - $sQuery = "SELECT * + $sQuery = "SELECT * FROM appVersion WHERE versionId = '?'"; - if($hResult = query_parameters($sQuery, $iVersionId)) - $oRow = mysql_fetch_object($hResult); - } + if($hResult = query_parameters($sQuery, $iVersionId)) + $oRow = mysql_fetch_object($hResult); + } - if($oRow) - { - $this->iVersionId = $oRow->versionId; - $this->iAppId = $oRow->appId; - $this->iSubmitterId = $oRow->submitterId; - $this->sSubmitTime = $oRow->submitTime; - $this->sDate = $oRow->submitTime; - $this->sName = $oRow->versionName; - $this->sDescription = $oRow->description; - $this->sTestedRelease = $oRow->maintainer_release; - $this->sTestedRating = $oRow->maintainer_rating; - $this->sQueued = $oRow->queued; - $this->sLicense = $oRow->license; - } + if($oRow) + { + $this->iVersionId = $oRow->versionId; + $this->iAppId = $oRow->appId; + $this->iSubmitterId = $oRow->submitterId; + $this->sSubmitTime = $oRow->submitTime; + $this->sDate = $oRow->submitTime; + $this->sName = $oRow->versionName; + $this->sDescription = $oRow->description; + $this->sTestedRelease = $oRow->maintainer_release; + $this->sTestedRating = $oRow->maintainer_rating; + $this->sQueued = $oRow->queued; + $this->sLicense = $oRow->license; } } @@ -736,7 +733,9 @@ class Version { // URLs if($sUrls = url::display($this->iVersionId)) + { echo $sUrls; + } // rating Area echo "<tr class=\"$sMaintainerColor\" valign=\"top\"><td>Maintainer’s Rating</td><td>".$this->sTestedRating."</td></tr>\n";

1 0

appdb/include appData.php
by WineHQ 10 Jun '07

10 Jun '07

ChangeSet ID: 31174 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/10 17:11:31 Modified files: include : appData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix minor indenting issue Patch: http://cvs.winehq.org/patch.py?id=31174 Old revision New revision Changes Path 1.23 1.24 +2 -2 appdb/include/appData.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.23 appdb/include/appData.php:1.24 --- appdb/include/appData.php:1.23 10 Jun 2007 22:11:31 -0000 +++ appdb/include/appData.php 10 Jun 2007 22:11:31 -0000 @@ -163,8 +163,8 @@ class appData $sQueued = objectManager::getQueueString($bQueued, $bRejected); $hResult = query_parameters("SELECT * FROM appData WHERE appId = '?' AND - versionId = '?' AND TYPE = '?' AND queued = '?'", - $iAppId, $iVersionId, $sType, $sQueued); + versionId = '?' AND TYPE = '?' AND queued = '?'", + $iAppId, $iVersionId, $sType, $sQueued); if(!$hResult || !mysql_num_rows($hResult)) return FALSE;

1 0

appdb/ include/appData.php include/application ...
by WineHQ 10 Jun '07

10 Jun '07

ChangeSet ID: 31173 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/10 13:51:33 Modified files: include : appData.php application.php application_queue.php distribution.php downloadurl.php maintainer.php objectManager.php screenshot.php testData.php testData_queue.php vendor.php version.php version_queue.php unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Object constructors shouldn't require an id if passed a $oRow object. Gets rid of objectGetInstanceFromRow() since we can pass the row into the constructor instead. Patch: http://cvs.winehq.org/patch.py?id=31173 Old revision New revision Changes Path 1.22 1.23 +1 -1 appdb/include/appData.php 1.111 1.112 +41 -46 appdb/include/application.php 1.6 1.7 +3 -8 appdb/include/application_queue.php 1.31 1.32 +46 -51 appdb/include/distribution.php 1.17 1.18 +21 -21 appdb/include/downloadurl.php 1.42 1.43 +22 -22 appdb/include/maintainer.php 1.22 1.23 +3 -4 appdb/include/objectManager.php 1.68 1.69 +22 -25 appdb/include/screenshot.php 1.56 1.57 +31 -35 appdb/include/testData.php 1.8 1.9 +2 -7 appdb/include/testData_queue.php 1.29 1.30 +30 -35 appdb/include/vendor.php 1.128 1.129 +27 -32 appdb/include/version.php 1.12 1.13 +5 -7 appdb/include/version_queue.php 1.13 1.14 +153 -59 appdb/unit_test/test_om_objects.php

1 0

appdb/cron cleanup.php
by WineHQ 10 Jun '07

10 Jun '07

ChangeSet ID: 31172 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/10 12:13:49 Modified files: cron : cleanup.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Disable screenshot deletion and add screenshot ids to the cleanup email so we can verify that the cleanup script is removing the correct screenshots. Patch: http://cvs.winehq.org/patch.py?id=31172 Old revision New revision Changes Path 1.35 1.36 +14 -5 appdb/cron/cleanup.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.35 appdb/cron/cleanup.php:1.36 --- appdb/cron/cleanup.php:1.35 10 Jun 2007 17:13:49 -0000 +++ appdb/cron/cleanup.php 10 Jun 2007 17:13:49 -0000 @@ -285,6 +285,15 @@ function removeScreenshotsWithMissingFil $sMsg = "Found ".count($aMissingScreenshotIds)." screenshots with missing files.\r\n"; $sMsg.= "Deleting these screenshots.\r\n"; + // add the screenshot ids to the email so we can see which screenshots are + // going to be deleted + $sMsg.="\r\n"; + $sMsg.="Screenshot IDs:\r\n"; + foreach($aMissingScreenshotIds as $iScreenshotId) + { + $sMsg.=$iScreenshotId."\r\n"; + } + $sSubject = "Screenshots deleted\r\n"; $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ @@ -292,10 +301,10 @@ function removeScreenshotsWithMissingFil mail_appdb($sEmail, $sSubject, $sMsg); // remove the screenshots with missing files - foreach($aMissingScreenshotIds as $iScreenshotId) - { - $oScreenshot = new Screenshot($iScreenshotId); - $oScreenshot->delete(true); // delete the screenshot silently - } +// foreach($aMissingScreenshotIds as $iScreenshotId) +// { +// $oScreenshot = new Screenshot($iScreenshotId); +// $oScreenshot->delete(); // delete the screenshot +// } } ?>

1 0

appdb/include application.php
by WineHQ 10 Jun '07

10 Jun '07

ChangeSet ID: 31171 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/09 20:30:28 Modified files: include : application.php Log message: Ben Hodgetts (Enverex) <ben(a)atomnet.co.uk> Add more specifics about what is required on the application submission page. Changes the wording so hopefully people won't keep adding comments about how well the application works in the application or vrsion submission. Also adds comments about proper grammar and punctuation. Patch: http://cvs.winehq.org/patch.py?id=31171 Old revision New revision Changes Path 1.110 1.111 +8 -3 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.110 appdb/include/application.php:1.111 --- appdb/include/application.php:1.110 10 Jun 2007 1:30:28 -0000 +++ appdb/include/application.php 10 Jun 2007 1:30:28 -0000 @@ -935,10 +935,15 @@ class Application { echo " for Windows, we do not need placeholder entries in the database. Please enter as complete \n"; echo " as possible test results in the version template provided below</li>\n"; echo "</ul>"; - echo "Please do not forget to mention which Wine version you used, how well it worked\n"; - echo "and if any workarounds were needed. Having app descriptions just sponsoring the app\n"; + echo "Having app descriptions just sponsoring the app\n"; echo "(yes, some vendors want to use the appdb for this) or saying ‘I haven’t tried this app with Wine’ "; - echo "will not help Wine development or Wine users.\n"; + echo "will not help Wine development or Wine users. Application descriptions should be exactly that and only that, \n"; + echo "they should not contain any information about how well the app works, just what the app is. The same applies to the \n"; + echo "version information, it should be only information on what is unique or different about that version of the application, \n"; + echo "not how well that version works or how great you think a new feature is.\n"; + echo "When you reach the \"Test Form\" part (What works, What doesn't work, etc) please be detailed \n"; + echo "about how well it worked and if any workarounds were needed but do NOT paste chunks of terminal output.\n"; + echo "Please write information in proper English with correct grammar and punctuation!\n"; echo "Please only submit applications/versions that you have tested.\n"; echo "Submissions without test information or not using the provided template will be rejected.\n"; echo "If you are unable to see the in-browser editors below, please try Firefox, Mozilla or Opera browsers.\n";

1 0

appdb/include version.php
by WineHQ 10 Jun '07

10 Jun '07

ChangeSet ID: 31170 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/09 19:28:52 Modified files: include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Order versions by id Patch: http://cvs.winehq.org/patch.py?id=31170 Old revision New revision Changes Path 1.127 1.128 +7 -6 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.127 appdb/include/version.php:1.128 --- appdb/include/version.php:1.127 10 Jun 2007 0:28:52 -0000 +++ appdb/include/version.php 10 Jun 2007 0:28:52 -0000 @@ -1276,7 +1276,7 @@ class Version { return $aCells; } - function objectGetEntries($bQueued, $bRejected) + function objectGetEntries($bQueued, $bRejected, $sOrderBy = "versionId") { $sQueued = objectManager::getQueueString($bQueued, $bRejected); @@ -1293,7 +1293,7 @@ class Version { AND appVersion.submitterId = '?' AND - appVersion.queued = '?'"; + appVersion.queued = '?' ORDER BY '?'"; else $sQuery = "SELECT appVersion.* FROM appVersion, appMaintainers, appFamily WHERE @@ -1319,9 +1319,10 @@ class Version { AND appMaintainers.queued = 'false' AND - appVersion.queued = '?'"; + appVersion.queued = '?' ORDER BY '?'"; - $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, $sQueued); + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, $sQueued, + $sOrderBy); } else { $sQuery = "SELECT appVersion.* @@ -1330,8 +1331,8 @@ class Version { AND appFamily.queued = 'false' AND - appVersion.queued = '?'"; - $hResult = query_parameters($sQuery, $sQueued); + appVersion.queued = '?' ORDER BY '?'"; + $hResult = query_parameters($sQuery, $sQueued, $sOrderBy); } if(!$hResult)

1 0

appdb/include application.php
by WineHQ 10 Jun '07

10 Jun '07

ChangeSet ID: 31169 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/09 19:27:54 Modified files: include : application.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Sort applications by id Patch: http://cvs.winehq.org/patch.py?id=31169 Old revision New revision Changes Path 1.109 1.110 +5 -4 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.109 appdb/include/application.php:1.110 --- appdb/include/application.php:1.109 10 Jun 2007 0:27:54 -0000 +++ appdb/include/application.php 10 Jun 2007 0:27:54 -0000 @@ -808,7 +808,7 @@ class Application { return $sLink; } - function objectGetEntries($bQueued, $bRejected) + function objectGetEntries($bQueued, $bRejected, $sOrderBy = "appId") { $sQuery = "SELECT * FROM appFamily WHERE appFamily.queued = '?'"; @@ -821,12 +821,13 @@ class Application { if(!$bRejected) return FALSE; - $sQuery .= " AND appFamily.submitterId = '?'"; + $sQuery .= " AND appFamily.submitterId = '?' ORDER BY '?'"; $hResult = query_parameters($sQuery, $sQueued, - $_SESSION['current']->iUserId); + $_SESSION['current']->iUserId, $sOrderBy); } else { - $hResult = query_parameters($sQuery, $sQueued); + $sQuery .= " ORDER BY '?'"; + $hResult = query_parameters($sQuery, $sQueued, $sOrderBy); } if(!$hResult)

1 0