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

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

April 23, 2007

ChangeSet ID: 31100 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/23 19:35:51 Modified files: . : objectManager.php include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Support silent input checking. checkOutputEditorInput() can now return TRUE instead of a list of errors Patch: http://cvs.winehq.org/patch.py?id=31100 Old revision New revision Changes Path 1.7 1.8 +0 -2 appdb/objectManager.php 1.16 1.17 +7 -0 appdb/include/objectManager.php Index: appdb/objectManager.php diff -u -p appdb/objectManager.php:1.7 appdb/objectManager.php:1.8 --- appdb/objectManager.php:1.7 24 Apr 2007 0:35:51 -0000 +++ appdb/objectManager.php 24 Apr 2007 0:35:51 -0000 @@ -58,8 +58,6 @@ $oOtherObject = new $oObject->sClass($oO processForm return TRUE on success, or a user-readable list of errors on failure */ $sErrors = $oObject->processForm($aClean); -if($sErrors === TRUE) - $sErrors = ""; if($oObject->iId && $aClean['sAction'] == "delete") $oObject->delete_entry(); Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.16 appdb/include/objectManager.php:1.17 --- appdb/include/objectManager.php:1.16 24 Apr 2007 0:35:52 -0000 +++ appdb/include/objectManager.php 24 Apr 2007 0:35:52 -0000 @@ -436,6 +436,13 @@ class ObjectManager { if($sErrors) { + /* A class's checkOutputEditorInput() may simply return TRUE if + it wants the editor to be displayed again, without any error + messages. This is for example useful when gathering information + in several steps, such as with application submission */ + if($sErrors === TRUE) + return TRUE; + echo "<font color=\"red\">\n"; echo "The following errors were found<br />\n"; echo "<ul>$sErrors</ul>\n";

1 0

appdb/include vote.php
by WineHQ April 23, 2007

April 23, 2007

ChangeSet ID: 31099 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/23 19:22:36 Modified files: include : vote.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Warn user when pressing the vote button without selecting a slot Patch: http://cvs.winehq.org/patch.py?id=31099 Old revision New revision Changes Path 1.27 1.28 +5 -1 appdb/include/vote.php Index: appdb/include/vote.php diff -u -p appdb/include/vote.php:1.27 appdb/include/vote.php:1.28 --- appdb/include/vote.php:1.27 24 Apr 2007 0:22:36 -0000 +++ appdb/include/vote.php 24 Apr 2007 0:22:36 -0000 @@ -153,9 +153,13 @@ function vote_update($vars) if( !is_numeric($vars['iVersionId']) OR !is_numeric($vars['iSlot'])) { if(is_numeric($vars['iVersionId'])) + { + addmsg("You need to select a voting slot", "red"); util_redirect_and_exit($oVersion->objectMakeUrl()); - else + } else + { util_redirect_and_exit(apidb_fullurl("index.php")); + } return; }

1 0

appdb/include version.php
by WineHQ April 23, 2007

April 23, 2007

ChangeSet ID: 31098 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/23 18:40:41 Modified files: include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Prevent display of \n in version view that was caused by a typo Patch: http://cvs.winehq.org/patch.py?id=31098 Old revision New revision Changes Path 1.121 1.122 +1 -1 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.121 appdb/include/version.php:1.122 --- appdb/include/version.php:1.121 23 Apr 2007 23:40:41 -0000 +++ appdb/include/version.php 23 Apr 2007 23:40:41 -0000 @@ -852,7 +852,7 @@ class Version { echo '</form>'."\n"; echo '<form method="post" name="sMessage" action='. $this->objectMakeUrl().'>'."\n"; - echo '<input type=hidden name="sSub" value="StopMonitoring" />."\n"'; + echo '<input type=hidden name="sSub" value="StopMonitoring" />'."\n"; echo '<input type=submit value="Stop Monitoring Version" class="button" />'."\n"; echo "</form>\n"; echo "</td></tr>\n";

1 0

appdb/include testData_queue.php
by WineHQ April 23, 2007

April 23, 2007

ChangeSet ID: 31097 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/23 18:39:44 Modified files: include : testData_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix a case where the admins would see the wrong help text when submitting new testData. Add borders around the distribution form to match the rest of the editor Patch: http://cvs.winehq.org/patch.py?id=31097 Old revision New revision Changes Path 1.5 1.6 +6 -1 appdb/include/testData_queue.php Index: appdb/include/testData_queue.php diff -u -p appdb/include/testData_queue.php:1.5 appdb/include/testData_queue.php:1.6 --- appdb/include/testData_queue.php:1.5 23 Apr 2007 23:39:44 -0000 +++ appdb/include/testData_queue.php 23 Apr 2007 23:39:44 -0000 @@ -66,7 +66,8 @@ class testData_queue /* If we are processing queued test results with a queued distribution, we display some additional help here */ - if($this->oDistribution->sQueued != "false" && $this->canEdit()) + if($this->oDistribution->iDistributionId && + $this->oDistribution->sQueued != "false" && $this->canEdit()) { echo "The user submitted a new distribution, which will be un-queued ". "together with the test data unless you select an existing one ". @@ -78,7 +79,11 @@ class testData_queue distribution form here */ if(!$this->oTestData->iDistributionId or $this->oDistribution->sQueued != "false") + { + echo html_frame_start("New Distribution", "90%"); $this->oDistribution->outputEditor(); + echo html_frame_end(); + } } function getOutputEditorValues($aClean)

1 0

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

April 23, 2007

ChangeSet ID: 31096 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/23 18:38:30 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix typo in testData::update() causing the new release info to be absent from the mail sent Patch: http://cvs.winehq.org/patch.py?id=31096 Old revision New revision Changes Path 1.48 1.49 +1 -1 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.48 appdb/include/testData.php:1.49 --- appdb/include/testData.php:1.48 23 Apr 2007 23:38:30 -0000 +++ appdb/include/testData.php 23 Apr 2007 23:38:30 -0000 @@ -165,7 +165,7 @@ class testData{ if($this->sTestedRelease != $oOldTest->sTestedRelease) { $sWhatChanged .= "Tested release was changed from ". - $oOldTest->sTestedRelease." to $this->stestedRelease.\n"; + $oOldTest->sTestedRelease." to $this->sTestedRelease.\n"; } if(query_parameters("UPDATE testResults SET

1 0

appdb/include bugs.php
by WineHQ April 23, 2007

April 23, 2007

ChangeSet ID: 31095 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/23 18:37:30 Modified files: include : bugs.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix bug link creation email. We only need to fetch the link id so remove the other code that was resulting in missing values. Patch: http://cvs.winehq.org/patch.py?id=31095 Old revision New revision Changes Path 1.23 1.24 +1 -14 appdb/include/bugs.php Index: appdb/include/bugs.php diff -u -p appdb/include/bugs.php:1.23 appdb/include/bugs.php:1.24 --- appdb/include/bugs.php:1.23 23 Apr 2007 23:37:30 -0000 +++ appdb/include/bugs.php 23 Apr 2007 23:37:30 -0000 @@ -127,23 +127,10 @@ class Bug { $_SESSION['current']->iUserId); if($hResult) { - /* The following should work but it does not! */ $this->iLinkId = mysql_insert_id(); - $this->bug($this->iLinkId); - /* Start of hack to get around the previous not working */ - $sQuery = "SELECT buglinks.*, appVersion.appId AS appId - FROM buglinks, appVersion - WHERE buglinks.versionId = appVersion.versionId - AND buglinks.versionId = '?' - AND buglinks.bug_id = '?'"; - if($hResult = query_parameters($sQuery, $this->iVersionId, $this->iBug_id)) - { - $oRow = mysql_fetch_object($hResult); - $this->bug($oRow->linkId); - } - /*End of Hack */ $this->SendNotificationMail(); + return true; } else {

1 0

appdb/include config.php.sample mail.php
by WineHQ April 23, 2007

April 23, 2007

ChangeSet ID: 31094 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/23 18:36:32 Modified files: include : config.php.sample mail.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add debug option to output e-mail on screen. Useful for testing that mails look correct. Patch: http://cvs.winehq.org/patch.py?id=31094 Old revision New revision Changes Path 1.13 1.14 +6 -0 appdb/include/config.php.sample 1.7 1.8 +11 -0 appdb/include/mail.php Index: appdb/include/config.php.sample diff -u -p appdb/include/config.php.sample:1.13 appdb/include/config.php.sample:1.14 --- appdb/include/config.php.sample:1.13 23 Apr 2007 23:36:32 -0000 +++ appdb/include/config.php.sample 23 Apr 2007 23:36:32 -0000 @@ -23,6 +23,12 @@ define("BUGZILLA_ROOT","http://bugs.wine //if(!defined("DISABLE_EMAIL")) // define("DISABLE_EMAIL", true); // disable email, see mail_appdb() in include/mail.php +// AppDB developers: Use this define to print the contents of the e-mail instead +// of sending it, useful for testing e-mail notifications. Has no effect if +// DISABLE_EMAIL is set +//if(!defined("PRINT_EMAIL")) +// define("PRINT_EMAIL", true); // print email, see mail_appdb() in include/mail.php + /* * apps database info */ Index: appdb/include/mail.php diff -u -p appdb/include/mail.php:1.7 appdb/include/mail.php:1.8 --- appdb/include/mail.php:1.7 23 Apr 2007 23:36:32 -0000 +++ appdb/include/mail.php 23 Apr 2007 23:36:32 -0000 @@ -21,6 +21,17 @@ function mail_appdb($sEmailList,$sSubjec $sMsg .= "\n\nIf you don't want to receive any other e-mail, please change your preferences:\n"; $sMsg .= APPDB_ROOT."preferences.php\n"; + /* Print the message to the screen instead of sending it, if the PRINT_EMAIL + option is set. Output in purple to distinguish it from other messages */ + if(defined("PRINT_EMAIL")) + { + $sMsg = str_replace("\n", "<br />", $sMsg); + addmsg("This mail would have been sent<br /><br />". + "Subject: $sSubject<br /><br />". + "Body:<br />$sMsg", "purple"); + return; + } + $bResult = mail(str_replace(" ",",",$sEmailList), "[AppDB] ".$sSubject, $sMsg, $sHeaders, "-f".APPDB_OWNER_EMAIL); if($bResult) addmsg("Message sent to: ".$sEmailList, "green");

1 0

appdb/. appview.php
by WineHQ April 23, 2007

April 23, 2007

ChangeSet ID: 31093 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/23 18:33:48 Modified files: . : appview.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix typo in monitor creation preventing the userid value from being saved Patch: http://cvs.winehq.org/patch.py?id=31093 Old revision New revision Changes Path 1.100 1.101 +1 -1 appdb/appview.php Index: appdb/appview.php diff -u -p appdb/appview.php:1.100 appdb/appview.php:1.101 --- appdb/appview.php:1.100 23 Apr 2007 23:33:48 -0000 +++ appdb/appview.php 23 Apr 2007 23:33:48 -0000 @@ -113,7 +113,7 @@ if ($aClean['sSub']) if($aClean['sSub'] == 'StartMonitoring') { $oMonitor = new Monitor(); - $oMonitor->iuserId = $_SESSION['current']->iUserId; + $oMonitor->iUserId = $_SESSION['current']->iUserId; $oMonitor->iAppId = $aClean['iAppId']; $oMonitor->iVersionId = $aClean['iVersionId']; $oMonitor->create();

1 0

appdb/include vendor.php
by WineHQ April 23, 2007

April 23, 2007

ChangeSet ID: 31092 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/23 18:32:30 Modified files: include : vendor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add vendor->sQueued class variable. Not currently used but adding it keeps the vendor class consistent with other classes. Patch: http://cvs.winehq.org/patch.py?id=31092 Old revision New revision Changes Path 1.23 1.24 +2 -0 appdb/include/vendor.php Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.23 appdb/include/vendor.php:1.24 --- appdb/include/vendor.php:1.23 23 Apr 2007 23:32:30 -0000 +++ appdb/include/vendor.php 23 Apr 2007 23:32:30 -0000 @@ -10,6 +10,7 @@ class Vendor { var $iVendorId; var $sName; var $sWebpage; + var $sQueued; var $aApplicationsIds; // an array that contains the appId of every application linked to this vendor /** @@ -37,6 +38,7 @@ class Vendor { $this->iVendorId = $iVendorId; $this->sName = $oRow->vendorName; $this->sWebpage = $oRow->vendorURL; + $this->sQueued = $oRow->queued; } /*

1 0

appdb/ ./objectManager.php include/appData.php ...
by WineHQ April 23, 2007

April 23, 2007

ChangeSet ID: 31091 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/23 18:31:24 Modified files: . : objectManager.php include : appData.php objectManager.php version.php version_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add a moveChildren method to the objectManager and implement objectMoveChildren for version and version_queue. Use this to move versions. Patch: http://cvs.winehq.org/patch.py?id=31091 Old revision New revision Changes Path 1.6 1.7 +5 -0 appdb/objectManager.php 1.17 1.18 +23 -0 appdb/include/appData.php 1.15 1.16 +29 -0 appdb/include/objectManager.php 1.120 1.121 +43 -0 appdb/include/version.php 1.6 1.7 +9 -4 appdb/include/version_queue.php Index: appdb/objectManager.php diff -u -p appdb/objectManager.php:1.6 appdb/objectManager.php:1.7 --- appdb/objectManager.php:1.6 23 Apr 2007 23:31:24 -0000 +++ appdb/objectManager.php 23 Apr 2007 23:31:24 -0000 @@ -64,6 +64,11 @@ if($sErrors === TRUE) if($oObject->iId && $aClean['sAction'] == "delete") $oObject->delete_entry(); +/* Provided the necessary values are present, an object's children may be moved + without any confirmation */ +if($oObject->iId && $aClean['sAction'] == "moveChildren" && $aClean['iNewId']) + $oObject->move_children($aClean['iNewId']); + apidb_header($oObject->sTitle); /* display a particular element */ Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.17 appdb/include/appData.php:1.18 --- appdb/include/appData.php:1.17 23 Apr 2007 23:31:24 -0000 +++ appdb/include/appData.php 23 Apr 2007 23:31:24 -0000 @@ -52,6 +52,29 @@ class appData return $hResult; } + function update($bSilent = FALSE) + { + if(!$this->canEdit()) + return FALSE; + + $sQuery = "UPDATE appData SET versionId = '?', appId = '?', sDescription = '?' + WHERE id = '?'"; + $hResult = query_parameters($this->iVersionId, $this->iAppId, + $this->sDescription, $this->iId); + + if(!$hResult) + { + if(!$bResult) + addmsg("Failed to update add data", "red"); + return FALSE; + } + + if(!$bSilent) + addmsg("Updated app data successfully", "green"); + + return TRUE; + } + function listSubmittedBy($iUserId, $bQueued = true) { $hResult = query_parameters("SELECT * FROM appData WHERE Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.15 appdb/include/objectManager.php:1.16 --- appdb/include/objectManager.php:1.15 23 Apr 2007 23:31:24 -0000 +++ appdb/include/objectManager.php 23 Apr 2007 23:31:24 -0000 @@ -220,6 +220,35 @@ class ObjectManager echo "Failure.\n"; } + /* Move all the object's children to another object of the same type, and + delete the original object afterwards */ + function move_children($iNewId) + { + $oObject = new $this->sClass($this->iId); + $oNewObject = new $this->sClass($iNewId); + + /* The user needs to have edit rights to both the old and the new object + If you have edit rights to an object then you should have edit rights + to its child objects as well */ + if(!$oObject->canEdit() || !$oNewObject->canEdit()) + return FALSE; + + $iAffected = $oObject->objectMoveChildren($iNewId); + + if($iAffected) + { + $sPlural = ($iAffected == 1) ? "": "s"; + addmsg("Moved $iAffected child object$sPlural", "green"); + } else if($iAfffected === FALSE) + { + /* We don't want to delete this object if some children were not moved */ + addmsg("Failed to move child objects", "red"); + return FALSE; + } + + $this->delete_entry(); + } + /* Display screen for submitting a new entry of given type */ function add_entry($sBackLink, $sErrors = "") { Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.120 appdb/include/version.php:1.121 --- appdb/include/version.php:1.120 23 Apr 2007 23:31:24 -0000 +++ appdb/include/version.php 23 Apr 2007 23:31:24 -0000 @@ -1366,6 +1366,49 @@ class Version { echo "<p>To view a submission, click on its name. ". "From that page you can edit, delete or approve it into the AppDB.</p>\n"; } + + function objectMoveChildren($iNewId) + { + /* Keep track of how many items we have updated */ + $iCount = 0; + + /* Move test results */ + $sQuery = "SELECT * FROM testResults WHERE versionId = '?'"; + $hResult = query_parameters($sQuery, $this->iVersionId); + + if(!$hResult) + return FALSE; + + while($oRow = mysql_fetch_object($hResult)) + { + $oTestData = new testData($oRow->testingId); + $oTestData->iVersionId = $iNewId; + if($oTestData->update()) + $iCount++; + else + return FALSE; + } + + /* Move all app data */ + $sQuery = "SELECT * FROM appData WHERE versionId = '?'"; + $hResult = query_parameters($sQuery, $this->iVersionId); + + if(!$hResult) + return FALSE; + + while($oRow = mysql_fetch_object($hResult)) + { + $oAppData = new appData($oRow->testingId); + $oAppData->iVersionId = $iNewId; + if($oAppData->update(TRUE)) + $iCount++; + else + return FALSE; + } + + /* Return the number of updated objects if everything was successful */ + return $iCount; + } } ?> Index: appdb/include/version_queue.php diff -u -p appdb/include/version_queue.php:1.6 appdb/include/version_queue.php:1.7 --- appdb/include/version_queue.php:1.6 23 Apr 2007 23:31:24 -0000 +++ appdb/include/version_queue.php 23 Apr 2007 23:31:24 -0000 @@ -197,10 +197,10 @@ class version_queue array(Comment::get_comment_count_for_versionid( $oVersion->iVersionId), 'align="center"'), html_ahref("Move here", - "admin/adminAppQueue.php?sSub=movetest&sAppType=version&". - "iVersionId=" - .$this->oVersion->iVersionId."&iVersionIdMergeTo=". - $oVersion->iVersionId) + "objectManager.php?sClass=version_queue&bIsQueue=true&". + "sAction=moveChildren&iId=". + $this->oVersion->iVersionId."&iNewId=". + $oVersion->iVersionId."&sTitle=Version+Queue"), ), ($i % 2) ? "color0" : "color1"); @@ -215,6 +215,11 @@ class version_queue { version::objectDisplayQueueProcessingHelp(); } + + function objectMoveChildren($iNewId) + { + return $this->oVersion->objectMoveChildren($iNewId); + } } ?>

1 0