April 2007 - Wine-Commits - list.winehq.org

appdb/ ./application.css include/application.p ...
by WineHQ April 22, 2007

April 22, 2007

ChangeSet ID: 31090 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/22 21:33:19 Modified files: . : application.css include : application.php testData.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Clean up the layout of the version and application pages and add some css classes to define the formatting Patch: http://cvs.winehq.org/patch.py?id=31090 Old revision New revision Changes Path 1.6 1.7 +7 -0 appdb/application.css 1.105 1.106 +9 -3 appdb/include/application.php 1.47 1.48 +22 -15 appdb/include/testData.php 1.119 1.120 +105 -69 appdb/include/version.php

1 0

appdb/include testData.php
by WineHQ April 22, 2007

April 22, 2007

ChangeSet ID: 31089 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/22 14:38:48 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> State what was changed in the e-mail when testData is updated Patch: http://cvs.winehq.org/patch.py?id=31089 Old revision New revision Changes Path 1.46 1.47 +60 -1 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.46 appdb/include/testData.php:1.47 --- appdb/include/testData.php:1.46 22 Apr 2007 19:38:48 -0000 +++ appdb/include/testData.php 22 Apr 2007 19:38:48 -0000 @@ -109,6 +109,65 @@ class testData{ if($this == $oOldTest) return TRUE; + /* Provide some feedback as to what was changed. Not all fields are + interesting */ + $sWhatChanged = ""; + if($this->shWhatWorks != $oOldTest->shWhatWorks) + { + $sWhatChanged .= "What works was changed from\n'$oOldTest->shWhatWorks'\n". + "to\n'$this->shWhatWorks'.\n"; + } + + if($this->shWhatDoesnt != $oOldTest->shWhatDoesnt) + { + $sWhatChanged .= "What does not work was changed from\n'" + .$oOldTest->shWhatDoesnt."'\n to\n'$this->shWhatDoesnt'.\n"; + } + + if($this->shWhatNotTested != $oOldTest->shWhatNotTested) + { + $sWhatChanged .= "What was not tested was changed from\n'". + $oOldTest->shWhatNotTested."'\nto\n'$this->shWhatNotTested'.\n"; + } + + if($this->sComments != $oOldTest->sComments) + { + $sWhatChanged .= "Extra comments was changed from\n'". + $oOldTest->sComments."'\nto\n'$this->sComments'.\n"; + } + + if($this->iDistributionId != $oOldTest->iDistributionId) + { + $oNewDist = new distribution($this->iDistributionId); + $oOldDist = new distribution($oOldTest->iDistributionId); + $sWhatChanged .= "Distribution was changed from $oOldDist->sName ". + "to $oNewDist->sName.\n"; + } + + if($this->sInstalls != $oOldTest->sInstalls) + { + $sWhatChanged .= "Installs? was changed from $oOldTest->sInstalls to ". + "$this->sInstalls.\n"; + } + + if($this->sRuns != $oOldTest->sRuns) + { + $sWhatChanged .= "Runs? was changed from $oOldTest->sRuns to ". + "$this->sRuns.\n"; + } + + if($this->sTestedRating != $oOldTest->sTestedRating) + { + $sWhatChanged .= "Rating was changed from $oOldTest->sTestedRating ". + "to $this->sTestedRating.\n"; + } + + if($this->sTestedRelease != $oOldTest->sTestedRelease) + { + $sWhatChanged .= "Tested release was changed from ". + $oOldTest->sTestedRelease." to $this->stestedRelease.\n"; + } + if(query_parameters("UPDATE testResults SET versionId = '?', whatWorks = '?', @@ -136,7 +195,7 @@ class testData{ $this->iTestingId)) { if(!$bSilent) - $this->SendNotificationMail("edit"); + $this->SendNotificationMail("edit", $sWhatChanged); return true; } else

1 0

appdb/include appData.php
by WineHQ April 22, 2007

April 22, 2007

ChangeSet ID: 31088 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/22 11:17:36 Modified files: include : appData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix appData::mustBeQueued() Patch: http://cvs.winehq.org/patch.py?id=31088 Old revision New revision Changes Path 1.16 1.17 +2 -2 appdb/include/appData.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.16 appdb/include/appData.php:1.17 --- appdb/include/appData.php:1.16 22 Apr 2007 16:17:36 -0000 +++ appdb/include/appData.php 22 Apr 2007 16:17:36 -0000 @@ -370,14 +370,14 @@ class appData if($this->iVersionId) { $oVersion = new version($this->iVersionId); - if($oVersion->canEdit()) + if($oVersion->canEdit() && $oVersion->sQueued == "false") return FALSE; else return TRUE; } else if($this->iAppId) { $oApp = new application($this->iAppId); - if($oApp->canEdit()) + if($oApp->canEdit() && $oApp->sQueued == "false") return FALSE; else return TRUE;

1 0

appdb/include testData.php version.php
by WineHQ April 22, 2007

April 22, 2007

ChangeSet ID: 31087 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/22 11:15:12 Modified files: include : testData.php version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix testData/version::mustBeQueued() Patch: http://cvs.winehq.org/patch.py?id=31087 Old revision New revision Changes Path 1.45 1.46 +15 -2 appdb/include/testData.php 1.118 1.119 +18 -4 appdb/include/version.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.45 appdb/include/testData.php:1.46 --- appdb/include/testData.php:1.45 22 Apr 2007 16:15:12 -0000 +++ appdb/include/testData.php 22 Apr 2007 16:15:12 -0000 @@ -922,9 +922,22 @@ class testData{ function mustBeQueued() { if($_SESSION['current']->hasPriv("admin")) + { return FALSE; - - return TRUE; + } else if($this->iVersionId) + { + // if the user can edit the version and the version isn't queued then + // they can also submit test results without them being queued + // this is the case where they maintain the version and the version isn't queued + $oVersion = new version($this->iVersionId); + if($oVersion->canEdit() && $oVersion->sQueued == "false") + return FALSE; + else + return TRUE; + } else + { + return TRUE; + } } } Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.118 appdb/include/version.php:1.119 --- appdb/include/version.php:1.118 22 Apr 2007 16:15:12 -0000 +++ appdb/include/version.php 22 Apr 2007 16:15:12 -0000 @@ -1197,15 +1197,29 @@ class Version { if($_SESSION['current']->hasPriv("admin")) return FALSE; - if($this->iVersionId) + // if we have a valid iAppId or iVersionId we should + // check the status of these objects to determine whether + // we need to queue this version object + if($this->iVersionId or $this->iAppId) { - if(maintainer::isUserMaintainer($_SESSION['current'], $this->iVersionId)) + // if the user is the super maintainer of the application then + // they are authorized to unqueue versions of this application + // so the version doesn't have to be queued + if($this->iAppId && + maintainer::isUserSuperMaintainer($_SESSION['current'], $this->iAppId)) + return FALSE; + + // if the user is a maintainer of this version then + // this version doesn't have to be queued + if($this->iVersionId && + maintainer::isUserMaintainer($_SESSION['current'], $this->iVersionId)) return FALSE; return TRUE; - } - else + } else + { return TRUE; + } } function objectGetHeader()

1 0

appdb/ ./objectManager.php include/objectManag ...
by WineHQ April 22, 2007

April 22, 2007

ChangeSet ID: 31086 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/22 10:52:06 Modified files: . : objectManager.php include : objectManager.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix some inconsistent braces and add a comment to the objectManager code Patch: http://cvs.winehq.org/patch.py?id=31086 Old revision New revision Changes Path 1.5 1.6 +2 -1 appdb/objectManager.php 1.14 1.15 +5 -2 appdb/include/objectManager.php Index: appdb/objectManager.php diff -u -p appdb/objectManager.php:1.5 appdb/objectManager.php:1.6 --- appdb/objectManager.php:1.5 22 Apr 2007 15:52: 6 -0000 +++ appdb/objectManager.php 22 Apr 2007 15:52: 6 -0000 @@ -84,8 +84,9 @@ if($oObject->iId) break; } } else if ($aClean['sAction'] == "add") +{ $oObject->add_entry($REQUEST_URI, $sErrors); -else +} else { // if displaying a queue display the help for the given queue if($oObject->bIsQueue) Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.14 appdb/include/objectManager.php:1.15 --- appdb/include/objectManager.php:1.14 22 Apr 2007 15:52: 6 -0000 +++ appdb/include/objectManager.php 22 Apr 2007 15:52: 6 -0000 @@ -300,6 +300,8 @@ class ObjectManager switch($aClean['sSubmit']) { case "Submit": + // if we have a valid iId then we are displaying an existing entry + // otherwise we should create the entry in the 'else' case if($this->iId) { if(!$oObject->canEdit()) @@ -312,9 +314,10 @@ class ObjectManager $oObject->unQueue(); $oObject->update(); - } - else + } else + { $oObject->create(); + } break; case "Reject":

1 0

appdb/include testData.php
by WineHQ April 22, 2007

April 22, 2007

ChangeSet ID: 31085 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/22 00:21:12 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Work around bug where submitting versions resulted in testData not being properly queued Patch: http://cvs.winehq.org/patch.py?id=31085 Old revision New revision Changes Path 1.44 1.45 +2 -9 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.44 appdb/include/testData.php:1.45 --- appdb/include/testData.php:1.44 22 Apr 2007 5:21:12 -0000 +++ appdb/include/testData.php 22 Apr 2007 5:21:12 -0000 @@ -923,15 +923,8 @@ class testData{ { if($_SESSION['current']->hasPriv("admin")) return FALSE; - else if($this->iVersionId) - { - $oVersion = new version($this->iVersionId); - if($oVersion->canEdit()) - return FALSE; - else - return TRUE; - } else - return TRUE; + + return TRUE; } }

1 0

appdb/include testData.php
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31084 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 23:23:57 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix test result issue with incorrect name causing an error when 'Limit to 5 tests' was selected Patch: http://cvs.winehq.org/patch.py?id=31084 Old revision New revision Changes Path 1.43 1.44 +8 -8 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.43 appdb/include/testData.php:1.44 --- appdb/include/testData.php:1.43 22 Apr 2007 4:23:57 -0000 +++ appdb/include/testData.php 22 Apr 2007 4:23:57 -0000 @@ -380,7 +380,7 @@ class testData{ $link = mysql_real_escape_string($link); $iDisplayLimit = mysql_real_escape_string($iDisplayLimit); - $showAll = $aClean['showAll']; + $sShowAll = $aClean['sShowAll']; $sQuery = "SELECT * FROM testResults @@ -389,7 +389,7 @@ class testData{ queued = '?' ORDER BY testedDate DESC"; - if(!$showAll) + if(!$sShowAll) $sQuery.=" LIMIT 0,".$iDisplayLimit; $hResult = query_parameters($sQuery, $this->iVersionId, "false"); @@ -433,8 +433,8 @@ class testData{ html_tr_highlight_clickable($link.$oTest->iTestingId, $bgcolor, "", "color2", "underline"); echo ' <td align="center" class="color2">[<a href="'.$link.$oTest->iTestingId; - if(is_string($showAll)) - echo '&showAll='.$showAll.'">Show</a>]</td>',"\n"; + if(is_string($sShowAll)) + echo '&sShowAll='.$sShowAll.'">Show</a>]</td>',"\n"; else echo '">Show</a>]</td>',"\n"; } @@ -462,12 +462,12 @@ class testData{ echo '<form method=get action="'.$PHP_SELF.'">'; echo '<input name="iVersionId" type=hidden value="',$this->iVersionId,'" />'; - if($rowsUsed >= $iDisplayLimit && !is_string($showAll)) - echo '<input class="button" name="showAll" type=submit value="Show All Tests" />'; + if($rowsUsed >= $iDisplayLimit && !is_string($sShowAll)) + echo '<input class="button" name="sShowAll" type=submit value="Show All Tests" />'; - if(is_string($showAll)) + if(is_string($sShowAll)) { - echo '<input class="button" name="hideAll" type=submit value="Limit to '.$iDisplayLimit.' Tests" />'; + echo '<input class="button" name="sHideAll" type=submit value="Limit to '.$iDisplayLimit.' Tests" />'; } echo '</form>'; }

1 0

appdb/ include/vendor.php tables/appdb_tables.sql
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31083 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 19:57:41 Modified files: include : vendor.php tables : appdb_tables.sql Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Support vendor queuing Patch: http://cvs.winehq.org/patch.py?id=31083 Old revision New revision Changes Path 1.22 1.23 +21 -6 appdb/include/vendor.php 1.31 1.32 +5 -4 appdb/tables/appdb_tables.sql Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.22 appdb/include/vendor.php:1.23 --- appdb/include/vendor.php:1.22 22 Apr 2007 0:57:41 -0000 +++ appdb/include/vendor.php 22 Apr 2007 0:57:41 -0000 @@ -61,12 +61,10 @@ class Vendor { */ function create() { - if(!$this->canEdit()) - return FALSE; - - $hResult = query_parameters("INSERT INTO vendor (vendorName, vendorURL) ". - "VALUES ('?', '?')", - $this->sName, $this->sWebpage); + $hResult = query_parameters("INSERT INTO vendor (vendorName, vendorURL, queued) ". + "VALUES ('?', '?', '?')", + $this->sName, $this->sWebpage, + $this->mustBeQueued() ? "true" : "false"); if($hResult) { $this->iVendorId = mysql_insert_id(); @@ -80,6 +78,23 @@ class Vendor { } } + /** + * Un-queue vendor + * Returns TRUE or FALSE + */ + function unQueue() + { + if(!$this->canEdit()) + return FALSE; + + $hResult = query_parameters("UPDATE vendor SET queued = '?' WHERE vendorId = '?'", + 'false', $this->iVendorId); + + if(!$hResult) + return FALSE; + + return TRUE; + } /** * Update vendor. Index: appdb/tables/appdb_tables.sql diff -u -p appdb/tables/appdb_tables.sql:1.31 appdb/tables/appdb_tables.sql:1.32 --- appdb/tables/appdb_tables.sql:1.31 22 Apr 2007 0:57:41 -0000 +++ appdb/tables/appdb_tables.sql 22 Apr 2007 0:57:41 -0000 @@ -20,9 +20,10 @@ drop table if exists sessionMessages; * vendor information */ create table vendor ( - vendorId int not null auto_increment, - vendorName varchar(100) not null, - vendorURL varchar(200), + vendorId int not null auto_increment, + vendorName varchar(100) not null, + vendorURL varchar(200), + queued enum('true','false') NOT NULL default 'false', key(vendorId) ); @@ -31,7 +32,7 @@ create table vendor ( * application */ create table appFamily ( - appId int not null auto_increment, + appId int not null auto_increment, appName varchar(100) not null, vendorId int not null, keywords text,

1 0

appdb/ include/objectManager.php include/testD ...
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31082 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 19:39:53 Modified files: include : objectManager.php testData_queue.php vendor.php version_queue.php unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use mustBeQueued() to determine unqueueing in objectManager Patch: http://cvs.winehq.org/patch.py?id=31082 Old revision New revision Changes Path 1.13 1.14 +1 -1 appdb/include/objectManager.php 1.4 1.5 +5 -0 appdb/include/testData_queue.php 1.21 1.22 +8 -0 appdb/include/vendor.php 1.5 1.6 +5 -0 appdb/include/version_queue.php 1.9 1.10 +1 -0 appdb/unit_test/test_om_objects.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.13 appdb/include/objectManager.php:1.14 --- appdb/include/objectManager.php:1.13 22 Apr 2007 0:39:53 -0000 +++ appdb/include/objectManager.php 22 Apr 2007 0:39:53 -0000 @@ -308,7 +308,7 @@ class ObjectManager if($this->bIsRejected) $oObject->ReQueue(); - if($this->bIsQueue) + if($this->bIsQueue && !$oObject->mustBeQueued()) $oObject->unQueue(); $oObject->update(); Index: appdb/include/testData_queue.php diff -u -p appdb/include/testData_queue.php:1.4 appdb/include/testData_queue.php:1.5 --- appdb/include/testData_queue.php:1.4 22 Apr 2007 0:39:53 -0000 +++ appdb/include/testData_queue.php 22 Apr 2007 0:39:53 -0000 @@ -97,6 +97,11 @@ class testData_queue return $this->oTestData->canEdit(); } + function mustBeQueued() + { + return $this->oTestData->mustBeQueued(); + } + function objectDisplayAddItemHelp() { $this->oTestData->objectDisplayAddItemHelp(); Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.21 appdb/include/vendor.php:1.22 --- appdb/include/vendor.php:1.21 22 Apr 2007 0:39:53 -0000 +++ appdb/include/vendor.php 22 Apr 2007 0:39:53 -0000 @@ -217,6 +217,14 @@ class Vendor { return FALSE; } + function mustBeQueued() + { + if($_SESSION['current']->hasPriv("admin")) + return FALSE; + else + return TRUE; + } + function getOutputEditorValues($aClean) { $this->sName = $aClean['sVendorName']; Index: appdb/include/version_queue.php diff -u -p appdb/include/version_queue.php:1.5 appdb/include/version_queue.php:1.6 --- appdb/include/version_queue.php:1.5 22 Apr 2007 0:39:53 -0000 +++ appdb/include/version_queue.php 22 Apr 2007 0:39:53 -0000 @@ -119,6 +119,11 @@ class version_queue return $this->oVersion->canEdit(); } + function mustBeQueued() + { + return $this->oVersion->mustBeQueued(); + } + function objectDisplayAddItemHelp() { /* $this->oVersion->displayAddItemHelp(); */ Index: appdb/unit_test/test_om_objects.php diff -u -p appdb/unit_test/test_om_objects.php:1.9 appdb/unit_test/test_om_objects.php:1.10 --- appdb/unit_test/test_om_objects.php:1.9 22 Apr 2007 0:39:53 -0000 +++ appdb/unit_test/test_om_objects.php 22 Apr 2007 0:39:53 -0000 @@ -131,6 +131,7 @@ function test_object_methods() "objectMakeLink", "objectMakeUrl", "outputEditor", + "mustBeQueued" ); $aTestClasses = array("application",

1 0

appdb/ ./appsubmit.php include/application.php ...
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31081 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 19:02:30 Modified files: . : appsubmit.php include : application.php sidebar_login.php user.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use objectManager to list a user's rejected apps Patch: http://cvs.winehq.org/patch.py?id=31081 Old revision New revision Changes Path 1.67 1.68 +3 -26 appdb/appsubmit.php 1.104 1.105 +30 -49 appdb/include/application.php 1.26 1.27 +3 -2 appdb/include/sidebar_login.php 1.92 1.93 +0 -35 appdb/include/user.php

1 0