September 2007 - Wine-Commits

appdb/include application.php comment.php dist ...
by WineHQ Sept. 8, 2007

Sept. 8, 2007

ChangeSet ID: 31362 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/09/08 17:38:20 Modified files: include : application.php comment.php distribution.php version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add and use objectGetChildren() method. Add support for initializing comment class from SQL result. Patch: http://cvs.winehq.org/patch.py?id=31362 Old revision New revision Changes Path 1.125 1.126 +63 -42 appdb/include/application.php 1.40 1.41 +9 -2 appdb/include/comment.php 1.45 1.46 +39 -13 appdb/include/distribution.php 1.150 1.151 +140 -133 appdb/include/version.php

1 0

appdb/include bugs.php comment.php downloadurl ...
by WineHQ Sept. 8, 2007

Sept. 8, 2007

ChangeSet ID: 31361 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/09/08 17:29:18 Modified files: include : bugs.php comment.php downloadurl.php maintainer.php monitor.php note.php screenshot.php testData.php url.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add objectGetChildren() method to classes without child objects Patch: http://cvs.winehq.org/patch.py?id=31361 Old revision New revision Changes Path 1.31 1.32 +5 -0 appdb/include/bugs.php 1.39 1.40 +5 -0 appdb/include/comment.php 1.24 1.25 +6 -0 appdb/include/downloadurl.php 1.56 1.57 +6 -0 appdb/include/maintainer.php 1.19 1.20 +6 -0 appdb/include/monitor.php 1.28 1.29 +5 -0 appdb/include/note.php 1.77 1.78 +6 -0 appdb/include/screenshot.php 1.78 1.79 +6 -0 appdb/include/testData.php 1.22 1.23 +5 -0 appdb/include/url.php Index: appdb/include/bugs.php diff -u -p appdb/include/bugs.php:1.31 appdb/include/bugs.php:1.32 --- appdb/include/bugs.php:1.31 8 Sep 2007 22:29:18 -0000 +++ appdb/include/bugs.php 8 Sep 2007 22:29:18 -0000 @@ -269,6 +269,11 @@ class Bug } } + function objectGetChildren() + { + return array(); + } + /* Get a list of bugs submitted by a given user */ function listSubmittedBy($iUserId, $bQueued = true) { Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.39 appdb/include/comment.php:1.40 --- appdb/include/comment.php:1.39 8 Sep 2007 22:29:18 -0000 +++ appdb/include/comment.php 8 Sep 2007 22:29:18 -0000 @@ -379,6 +379,11 @@ class Comment { echo "</ul>\n"; } + function objectGetChildren() + { + return array(); + } + function display_comments_threaded($versionId, $threadId = 0) { $hResult = Comment::grab_comments($versionId, $threadId); Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.24 appdb/include/downloadurl.php:1.25 --- appdb/include/downloadurl.php:1.24 8 Sep 2007 22:29:18 -0000 +++ appdb/include/downloadurl.php 8 Sep 2007 22:29:18 -0000 @@ -63,6 +63,12 @@ class downloadurl return $sReturn; } + function objectGetChildren() + { + /* We have none */ + return array(); + } + /* Output an editor for Download URL fields */ function outputEditor($oVersion = null, $sFormAction = null) { Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.56 appdb/include/maintainer.php:1.57 --- appdb/include/maintainer.php:1.56 8 Sep 2007 22:29:18 -0000 +++ appdb/include/maintainer.php 8 Sep 2007 22:29:18 -0000 @@ -819,6 +819,12 @@ class maintainer return array($aItemsPerPage, $iDefaultPerPage); } + function objectGetChildren() + { + /* We have none */ + return array(); + } + function update() { /* STUB: No updating possible at the moment */ Index: appdb/include/monitor.php diff -u -p appdb/include/monitor.php:1.19 appdb/include/monitor.php:1.20 --- appdb/include/monitor.php:1.19 8 Sep 2007 22:29:18 -0000 +++ appdb/include/monitor.php 8 Sep 2007 22:29:18 -0000 @@ -61,6 +61,12 @@ class Monitor { } } + function objectGetChildren() + { + /* We have none */ + return array(); + } + /* * Creates a new Monitor. * Informs interested people about the creation. Index: appdb/include/note.php diff -u -p appdb/include/note.php:1.28 appdb/include/note.php:1.29 --- appdb/include/note.php:1.28 8 Sep 2007 22:29:18 -0000 +++ appdb/include/note.php 8 Sep 2007 22:29:18 -0000 @@ -311,6 +311,11 @@ class Note { return $oManager->makeUrl("view", $this->objectGetId()); } + function objectGetChildren() + { + return array(); + } + //TODO: not sure if we want to use sTitle here or what function objectMakeLink() { Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.77 appdb/include/screenshot.php:1.78 --- appdb/include/screenshot.php:1.77 8 Sep 2007 22:29:18 -0000 +++ appdb/include/screenshot.php 8 Sep 2007 22:29:18 -0000 @@ -297,6 +297,12 @@ class screenshot return $this->oScreenshotImage->get_width(); } + function objectGetChildren() + { + /* We have none */ + return array(); + } + function get_screenshot_height() { $this->load_image(false); Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.78 appdb/include/testData.php:1.79 --- appdb/include/testData.php:1.78 8 Sep 2007 22:29:18 -0000 +++ appdb/include/testData.php 8 Sep 2007 22:29:18 -0000 @@ -1079,6 +1079,12 @@ class testData{ return TRUE; } + function objectGetChildren() + { + /* We have none */ + return array(); + } + function objectDisplayAddItemHelp() { echo "<p>This is the screen for inputing test information so that others "; Index: appdb/include/url.php diff -u -p appdb/include/url.php:1.22 appdb/include/url.php:1.23 --- appdb/include/url.php:1.22 8 Sep 2007 22:29:18 -0000 +++ appdb/include/url.php 8 Sep 2007 22:29:18 -0000 @@ -499,6 +499,11 @@ class Url { return $sReturn; } + function objectGetChildren() + { + return array(); + } + // if a url lacks "://" assume the url is an http one // and prepend "http://" function normalize($sTheUrl)

1 0

appdb/unit_test test_om_objects.php
by WineHQ Sept. 8, 2007

Sept. 8, 2007

ChangeSet ID: 31360 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/09/08 17:25:52 Modified files: unit_test : test_om_objects.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Set a specific name for the vendor object created during the unit tests Patch: http://cvs.winehq.org/patch.py?id=31360 Old revision New revision Changes Path 1.24 1.25 +4 -1 appdb/unit_test/test_om_objects.php Index: appdb/unit_test/test_om_objects.php diff -u -p appdb/unit_test/test_om_objects.php:1.24 appdb/unit_test/test_om_objects.php:1.25 --- appdb/unit_test/test_om_objects.php:1.24 8 Sep 2007 22:25:52 -0000 +++ appdb/unit_test/test_om_objects.php 8 Sep 2007 22:25:52 -0000 @@ -92,7 +92,7 @@ function test_class($sClassName, $aTestM if(!$oTestObject->delete()) { - error("sClassName of $sClassName oTestObject->delete() failed!"); + error("sClassName of '".$sClassName."' oTestObject->delete() failed!"); $oUser->delete(); return false; } @@ -221,6 +221,9 @@ function create_object($sClassName, $oUs $oTestObject->oVersion->iAppId = $oApp->iAppId; $oTestObject->oVersion->sName = "OM Version"; break; + case "vendor": + $oTestObject->sName = "OM vendor"; + break; } /* We cannot use screenshot::create() because it requires an image */

1 0

appdb/include bugs.php
by WineHQ Sept. 7, 2007

Sept. 7, 2007

ChangeSet ID: 31359 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/09/07 23:42:34 Modified files: include : bugs.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> bug::objectGetTableRow() should reference $this and not the non-existant $oRow. Fixes bug where buglink urls are broken due to a missing bug id. Patch: http://cvs.winehq.org/patch.py?id=31359 Old revision New revision Changes Path 1.30 1.31 +1 -1 appdb/include/bugs.php Index: appdb/include/bugs.php diff -u -p appdb/include/bugs.php:1.30 appdb/include/bugs.php:1.31 --- appdb/include/bugs.php:1.30 8 Sep 2007 4:42:34 -0000 +++ appdb/include/bugs.php 8 Sep 2007 4:42:34 -0000 @@ -394,7 +394,7 @@ class Bug $oTableCell = new TableCell($this->iBug_id); $oTableCell->SetAlign("center"); - $oTableCell->SetCellLink(BUGZILLA_ROOT.'show_bug.cgi?id='.$oRow->bug_id); + $oTableCell->SetCellLink(BUGZILLA_ROOT.'show_bug.cgi?id='.$this->iBug_id); $oTableRow->AddCell($oTableCell); $oTableCell = new TableCell($this->sBug_status);

1 0

appdb/include testData.php util.php
by WineHQ Sept. 7, 2007

Sept. 7, 2007

ChangeSet ID: 31358 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/09/07 20:48:53 Modified files: include : testData.php util.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> make_maintainer_rating_list() should return a string containing the html for the list. Update users of make_maintainer_rating_list() to echo its return value. Patch: http://cvs.winehq.org/patch.py?id=31358 Old revision New revision Changes Path 1.77 1.78 +1 -1 appdb/include/testData.php 1.104 1.105 +8 -6 appdb/include/util.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.77 appdb/include/testData.php:1.78 --- appdb/include/testData.php:1.77 8 Sep 2007 1:48:53 -0000 +++ appdb/include/testData.php 8 Sep 2007 1:48:53 -0000 @@ -677,7 +677,7 @@ class testData{ echo '</td></tr>',"\n"; // Rating echo '<tr><td class="color0"><b>Rating</b></td><td class="color0">',"\n"; - make_maintainer_rating_list("sTestedRating", $this->sTestedRating); + echo make_maintainer_rating_list("sTestedRating", $this->sTestedRating); echo '<a href="'.BASE.'/help/?sTopic=maintainer_ratings" target="_blank">Rating definitions</a></td></tr>',"\n"; // extra comments echo '<tr valign=top><td class="color1"><b>Extra comments</b></td>',"\n"; Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.104 appdb/include/util.php:1.105 --- appdb/include/util.php:1.104 8 Sep 2007 1:48:53 -0000 +++ appdb/include/util.php 8 Sep 2007 1:48:53 -0000 @@ -200,22 +200,24 @@ function make_bugzilla_version_list($sVa return $sStr; } +// returns a string containing the html for the maintainer rating list function make_maintainer_rating_list($varname, $cvalue) { - - echo "<select name='$varname'>\n"; - echo "<option value=\"\">Choose ...</option>\n"; + $sTxt = "<select name='$varname'>\n"; + $sTxt .= "<option value=\"\">Choose ...</option>\n"; $aRating = array("Platinum", "Gold", "Silver", "Bronze", "Garbage"); $iMax = count($aRating); for($i=0; $i < $iMax; $i++) { if($aRating[$i] == $cvalue) - echo "<option class=$aRating[$i] value=$aRating[$i] selected>$aRating[$i]\n"; + $sTxt .= "<option class=$aRating[$i] value=$aRating[$i] selected>$aRating[$i]\n"; else - echo "<option class=$aRating[$i] value=$aRating[$i]>$aRating[$i]\n"; + $sTxt .= "<option class=$aRating[$i] value=$aRating[$i]>$aRating[$i]\n"; } - echo "</select>\n"; + $sTxt .= "</select>\n"; + + return $sTxt; } /* Get the number of users in the database */

1 0

appdb/include version.php
by WineHQ Sept. 7, 2007

Sept. 7, 2007

ChangeSet ID: 31357 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/09/07 20:41:24 Modified files: include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add a missing Table::AddRow() call and clean up some whitespace Patch: http://cvs.winehq.org/patch.py?id=31357 Old revision New revision Changes Path 1.149 1.150 +4 -5 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.149 appdb/include/version.php:1.150 --- appdb/include/version.php:1.149 8 Sep 2007 1:41:24 -0000 +++ appdb/include/version.php 8 Sep 2007 1:41:24 -0000 @@ -680,7 +680,7 @@ class version { $oTable->SetCellSpacing(0); $oTableRow = new TableRow(); - + $oTableCell = new TableCell("Rating"); $oTableCell->SetClass("color4"); $oTableRow->AddCell($oTableCell); @@ -690,19 +690,18 @@ class version { $oTableCell->SetClass("color0"); $oTableRow->AddCell($oTableCell); - + $oTable->AddRow($oTableRow); $oTableRow = new TableRow(); - + $oTableCell = new TableCell("Release"); $oTableCell->SetClass("color1"); $oTableRow->AddCell($oTableCell); - $oTableCell = new TableCell(make_bugzilla_version_list("sMaintainerRelease", $this->sTestedRelease)); $oTableCell->SetClass("color0"); $oTableRow->AddCell($oTableCell); - + $oTable->AddRow($oTableRow); // output the table

1 0

appdb/. objectManager.php
by WineHQ Sept. 7, 2007

Sept. 7, 2007

ChangeSet ID: 31356 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/09/07 20:38:36 Modified files: . : objectManager.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add a couple of brackets to flush out a minor code change that has been sitting for a while. Patch: http://cvs.winehq.org/patch.py?id=31356 Old revision New revision Changes Path 1.19 1.20 +4 -0 appdb/objectManager.php Index: appdb/objectManager.php diff -u -p appdb/objectManager.php:1.19 appdb/objectManager.php:1.20 --- appdb/objectManager.php:1.19 8 Sep 2007 1:38:36 -0000 +++ appdb/objectManager.php 8 Sep 2007 1:38:36 -0000 @@ -55,7 +55,9 @@ if($aClean['bIsRejected'] == 'true') $oObject->bIsRejected = true; $oObject->bIsQueue = true; } else +{ $oObject->bIsRejected = false; +} $oObject->oMultiPage->getDataFromInput($aClean); @@ -67,7 +69,9 @@ $oOtherObject = new $oObject->sClass($oO $sErrors = $oObject->processForm($aClean); if($oObject->iId && $aClean['sAction'] == "delete") +{ $oObject->delete_entry(); +} if(isset($aClean['sAction']) && $aClean['sAction'] == "add") $oObject->handle_anonymous_submission();

1 0