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

appdb/include objectManager.php
by WineHQ Aug. 5, 2007

Aug. 5, 2007

ChangeSet ID: 31315 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/05 15:14:07 Modified files: include : objectManager.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Clean up error handling in processForm() to only check for errors when submitting an entry. This enables the deletion or rejection of entries that produce errors. While we can't always know why errors in objects make it this far we don't want to make it impossible to delete or reject malformed entries. Patch: http://cvs.winehq.org/patch.py?id=31315 Old revision New revision Changes Path 1.46 1.47 +21 -4 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.46 appdb/include/objectManager.php:1.47 --- appdb/include/objectManager.php:1.46 5 Aug 2007 20:14: 7 -0000 +++ appdb/include/objectManager.php 5 Aug 2007 20:14: 7 -0000 @@ -524,13 +524,20 @@ class ObjectManager if(method_exists(new $this->sClass, "checkOutputEditorInput")) { $sErrors = $oObject->checkOutputEditorInput($aClean); - if($sErrors) - return $sErrors; } + // NOTE: we only check for errors when submitting + // because there is always the possibility that we can + // get into some error state but we don't want to be stuck, unable + // to delete an entry because of an error that we don't want to + // have to correct switch($aClean['sSubmit']) { case "Submit": + // if we have errors, return them + if($sErrors) + return $sErrors; + // 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) @@ -551,16 +558,24 @@ class ObjectManager $oObject->create(); } - break; + break; case "Reject": if(!$oObject->canEdit()) return FALSE; $oObject->reject(); - break; + break; + case "Delete": $this->delete_entry(); + break; + + default: + // shouldn't end up here, log the submit type that landed us here + error_log::log_error(ERROR_GENERAL, "processForm() received ". + "unknown aClean[sSubmit] of: ".$aClean['sSubmit']); + return false; } /* Displaying the entire un-queued list for a class is not a good idea, @@ -762,7 +777,9 @@ class ObjectManager echo " "; return TRUE; } else + { return FALSE; + } } }

1 0

appdb/include objectManager.php
by WineHQ Aug. 5, 2007

Aug. 5, 2007

ChangeSet ID: 31314 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/05 14:26:02 Modified files: include : objectManager.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Switch from spaces to   to prevent the entries in the processing column from wrapping Patch: http://cvs.winehq.org/patch.py?id=31314 Old revision New revision Changes Path 1.45 1.46 +4 -4 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.45 appdb/include/objectManager.php:1.46 --- appdb/include/objectManager.php:1.45 5 Aug 2007 19:26: 2 -0000 +++ appdb/include/objectManager.php 5 Aug 2007 19:26: 2 -0000 @@ -172,12 +172,12 @@ class ObjectManager $shDeleteLink = ""; if($this->oTableRow->bHasDeleteLink) { - $shDeleteLink = ' [ <a href="'.$this->makeUrl("delete", $oObject->objectGetId()). - '">delete</a> ]'; + $shDeleteLink = ' [ <a href="'.$this->makeUrl("delete", $oObject->objectGetId()). + '">delete</a> ]'; } - $oTableCell = new TableCell('[ <a href="'.$this->makeUrl("edit", - $oObject->objectGetId()).'">'.$sEditLinkLabel.'</a> ]'.$shDeleteLink); + $oTableCell = new TableCell('[ <a href="'.$this->makeUrl("edit", + $oObject->objectGetId()).'">'.$sEditLinkLabel.'</a> ]'.$shDeleteLink); $this->oTableRow->AddCell($oTableCell); }

1 0

appdb/include objectManager.php
by WineHQ Aug. 5, 2007

Aug. 5, 2007

ChangeSet ID: 31313 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/05 14:02:59 Modified files: include : objectManager.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Limit the current page to the available pages Patch: http://cvs.winehq.org/patch.py?id=31313 Old revision New revision Changes Path 1.44 1.45 +5 -0 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.44 appdb/include/objectManager.php:1.45 --- appdb/include/objectManager.php:1.44 5 Aug 2007 19: 2:59 -0000 +++ appdb/include/objectManager.php 5 Aug 2007 19: 2:59 -0000 @@ -709,6 +709,11 @@ class ObjectManager $iPage = isset($aClean['iPage']) ? $aClean['iPage'] : 1; $iCurrentPage = min($iPage, $iNumPages); + // if iPage is beyond the maximum number of pages, make it the + // highest page number + if($iPage > $iNumPages) + $iPage = $iNumPages; + /* Display selectors and info */ echo '<div align="center">'; echo "Page $iPage of $iNumPages ";

1 0

appdb/include maintainer.php
by WineHQ Aug. 5, 2007

Aug. 5, 2007

ChangeSet ID: 31312 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/05 12:34:42 Modified files: include : maintainer.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Maintainer notification improvements. Add some spaces to the notification emails, fix the url for the test results queue and screenshots queue. Add an email for the third level where we are removing the maintainership for the user to explain to the user why we are removing their maintainership. Factor out a few lines of common code. Patch: http://cvs.winehq.org/patch.py?id=31312 Old revision New revision Changes Path 1.53 1.54 +32 -17 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.53 appdb/include/maintainer.php:1.54 --- appdb/include/maintainer.php:1.53 5 Aug 2007 17:34:42 -0000 +++ appdb/include/maintainer.php 5 Aug 2007 17:34:42 -0000 @@ -938,13 +938,13 @@ class maintainer { $oApp = new Application($this->iAppId); $sSubject.= $oApp->sName; - $sMsg.='application, '.$oApp->sName.'('.$oApp->objectMakeUrl().'), that you maintain.'."\n"; + $sMsg.='application, '.$oApp->sName.'('.$oApp->objectMakeUrl().'), that you maintain.'."\n\n"; } else { $sFullname = version::fullName($this->iVersionId); $oVersion = new Version($this->iVersionId); $sSubject.= $sFullname; - $sMsg.='version, '.$sFullname.'('.$oVersion->objectMakeUrl().'), that you maintain.'."\n"; + $sMsg.='version, '.$sFullname.'('.$oVersion->objectMakeUrl().'), that you maintain.'."\n\n"; } $sSubject.=" ready for your processing"; @@ -983,7 +983,7 @@ class maintainer // FIXME: should use a function to generate these urls and use it here and // in sidebar_maintainer.php and sidebar_admin.php $sMsg = 'Please visit the test data queue ('.APPDB_ROOT."objectManager.php?sClass=version_queue&bIsQueue=true&sTitle=". - "Version%20Queue".') to process queued versions for applications you maintain.\n'; + 'Version%20Queue) to process queued versions for applications you maintain.'."\n"; } ////////////////// @@ -1022,8 +1022,10 @@ class maintainer // FIXME: should use a function to generate these urls and use it here and // in sidebar_maintainer.php and sidebar_admin.php - $sMsg .= 'Please visit <a href="'.BASE."objectManager.php?sClass=testData_queue&bIsQueue=true&sTitle=". - "Test%20Results%20Queue".'">AppDB Test Data queue</a> to process queued test data for versions you maintain.\r\n'; + $sMsg .= 'Please visit the AppDB Test Data Queue'. + '('.APPDB_ROOT.'objectManager.php?sClass=testData_queue&'. + 'bIsQueue=true&sTitle=Test%20Results%20Queue)'. + ' to process queued test data for versions you maintain.'."\n"; } // queued testdata ////////////////// @@ -1057,8 +1059,9 @@ class maintainer { // FIXME: should use a function to generate these urls and use it here and // in sidebar_maintainer.php and sidebar_admin.php - $sMsg .= 'Please visit <a href="'.BASE."objectManager.php?sClass=screenshot_queue&bIsQueue=true&sTitle=". - "Screenshot%20Queue".'">Screenshot queue</a> to process queued screenshots for versions you maintain.\r\n'; + $sMsg.= 'Please visit the screenshot queue('; + $sMsg.= APPDB_ROOT.'objectManager.php?sClass=screenshot_queue&bIsQueue=true&sTitle=Screenshot%20Queue) '; + $sMsg.= 'to process queued screenshots for versions you maintain.'."\n"; } // queued screenshots @@ -1121,24 +1124,34 @@ class maintainer break; case 1: // send the first notification // nothing to do here, the first notification is just a reminder - $oNotificationUpdate->sMsg.= "\n\nThanks,\n"; - $oNotificationUpdate->sMsg.= "Appdb Admins"; break; case 2: // send the second notification, notify them that if the queued entries aren't // processed after another $iNotificationIntervalDays that // we'll have to remove their maintainership for this application/version // so a more active person can fill the spot - $oNotificationUpdate->sMsg.= "\nThis your second notification of queued entries. If the queued entries are"; - $oNotificationUpdate->sMsg.= " not processed within the next ".iNotificationIntervalDays. "we will remove"; - $oNotificationUpdate->sMsg.= " your maintainership for this application/version so a more active person"; - $oNotificationUpdate->sMsg.= " can fill the spot."; - $oNotificationUpdate->sMsg.= "\n\nThanks,\n"; - $oNotificationUpdate->sMsg.= "Appdb Admins"; + $oNotificationUpdate->sMsg.= "\nThis your second notification of queued entries."; + $oNotificationUpdate->sMsg.= " If the queued entries are not processsed within"; + $oNotificationUpdate->sMsg.= " the next ".iNotificationIntervalDays. "we will remove"; + $oNotificationUpdate->sMsg.= " your maintainership for this application/version"; + $oNotificationUpdate->sMsg.= " so a more active person can fill the spot."; break; - case 3: // remove their maintainership + case 3: // remove their maintainership and notify the maintainer why we are doing so + $oNotificationUpdate->sMsg.= "\nThis your third notification of queued entries."; + $oNotificationUpdate->sMsg.= " Because your queued entries have not been processed"; + $oNotificationUpdate->sMsg.= " after two notifications we are removing your maintainer"; + $oNotificationUpdate->sMsg.= " role for this application/version. Removing inactive"; + $oNotificationUpdate->sMsg.= " maintainers lets us free up slots for other potential"; + $oNotificationUpdate->sMsg.= " maintainers.\n"; + $oNotificationUpdate->sMsg.= " If you are still interested in being a maintainer please"; + $oNotificationUpdate->sMsg.= " submit a maintainer request."; $this->delete(); // delete ourselves from the database break; } + + // common end of our message + $oNotificationUpdate->sMsg.= "\n\nThanks,\n"; + $oNotificationUpdate->sMsg.= "Appdb Admins\n"; + $oNotificationUpdate->sMsg.= "<appdb(a)winehq.org>"; // save the notification level and notification time back into the database $sQuery = "update appMaintainers set notificationLevel = '?', notificationTime = ?". @@ -1148,6 +1161,7 @@ class maintainer //TODO: we probably want to copy the mailing list on each of these emails $oNotificationUpdate->sEmail.=" cmorgan(a)alum.wpi.edu"; // FIXME: for debug append my email address + // we don't send any emails if the notification level is zero if($this->iNotificationLevel == 0) { if($bDebugOutputEnabled) @@ -1161,7 +1175,8 @@ class maintainer echo "Msg: ".$oNotificationUpdate->sMsg."\n\n"; } - mail_appdb($oNotificationUpdate->sEmail, $oNotificationUpdate->sSubject, $oNotificationUpdate->sMsg); + mail_appdb($oNotificationUpdate->sEmail, $oNotificationUpdate->sSubject, + $oNotificationUpdate->sMsg); } }

1 0

appdb/include version.php
by WineHQ Aug. 4, 2007

Aug. 4, 2007

ChangeSet ID: 31311 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/04 11:56:27 Modified files: include : version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix odd table formatting when editing versions Patch: http://cvs.winehq.org/patch.py?id=31311 Old revision New revision Changes Path 1.145 1.146 +5 -2 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.145 appdb/include/version.php:1.146 --- appdb/include/version.php:1.145 4 Aug 2007 16:56:27 -0000 +++ appdb/include/version.php 4 Aug 2007 16:56:27 -0000 @@ -608,10 +608,13 @@ class version { $oTableRow = new TableRow(); $oTableRow->SetValign("top"); + $oTableCell = new TableCell("Application"); + $oTableCell->SetBold(true); + $oTableRow->AddCell($oTableCell); + $sOptionList = $x->make_option_list("iAppId", $this->iAppId, "appFamily", "appId", "appName"); - $oTableCell = new TableCell("Application".$sOptionList); - $oTableCell->SetBold(true); + $oTableCell = new TableCell($sOptionList); $oTableCell->SetClass("color0"); $oTableRow->AddCell($oTableCell);

1 0

appdb/include objectManager.php
by WineHQ Aug. 4, 2007

Aug. 4, 2007

ChangeSet ID: 31310 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/03 23:52:59 Modified files: include : objectManager.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix case of object::objectGetId() Patch: http://cvs.winehq.org/patch.py?id=31310 Old revision New revision Changes Path 1.43 1.44 +1 -1 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.43 appdb/include/objectManager.php:1.44 --- appdb/include/objectManager.php:1.43 4 Aug 2007 4:52:59 -0000 +++ appdb/include/objectManager.php 4 Aug 2007 4:52:59 -0000 @@ -172,7 +172,7 @@ class ObjectManager $shDeleteLink = ""; if($this->oTableRow->bHasDeleteLink) { - $shDeleteLink = ' [ <a href="'.$this->makeUrl("delete", $oObject->objectGetid()). + $shDeleteLink = ' [ <a href="'.$this->makeUrl("delete", $oObject->objectGetId()). '">delete</a> ]'; }

1 0

appdb/unit_test test_testData.php
by WineHQ Aug. 4, 2007

Aug. 4, 2007

ChangeSet ID: 31309 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/03 23:51:14 Modified files: unit_test : test_testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Check for failure returned from testData::create() Patch: http://cvs.winehq.org/patch.py?id=31309 Old revision New revision Changes Path 1.2 1.3 +5 -2 appdb/unit_test/test_testData.php Index: appdb/unit_test/test_testData.php diff -u -p appdb/unit_test/test_testData.php:1.2 appdb/unit_test/test_testData.php:1.3 --- appdb/unit_test/test_testData.php:1.2 4 Aug 2007 4:51:14 -0000 +++ appdb/unit_test/test_testData.php 4 Aug 2007 4:51:14 -0000 @@ -18,10 +18,13 @@ function test_testData_getNewestTestidFr $oOldTestData = new testData(); $oOldTestData->iVersionId = $iVersionId; - $oOldTestData->create(); + if(!$oOldTestData->create()) + error("oOldTestData->create() failed"); + $oNewTestData = new testData(); $oNewTestData->iVersionId = $iVersionId; - $oNewTestData->create(); + if(!$oNewTestData->create()) + error("oNewTestData->create() failed"); $oUser->addPriv("admin"); $oOldTestData->unQueue();

1 0

appdb/unit_test test_common.php
by WineHQ Aug. 4, 2007

Aug. 4, 2007

ChangeSet ID: 31308 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/03 23:50:14 Modified files: unit_test : test_common.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Check for error codes returned from application::create() and version::create() Patch: http://cvs.winehq.org/patch.py?id=31308 Old revision New revision Changes Path 1.4 1.5 +9 -2 appdb/unit_test/test_common.php Index: appdb/unit_test/test_common.php diff -u -p appdb/unit_test/test_common.php:1.4 appdb/unit_test/test_common.php:1.5 --- appdb/unit_test/test_common.php:1.4 4 Aug 2007 4:50:14 -0000 +++ appdb/unit_test/test_common.php 4 Aug 2007 4:50:14 -0000 @@ -13,11 +13,18 @@ function create_version_and_parent_app($ { $oApp = new application(); $oApp->sName = "OM App ".$sId; - $oApp->create(); + if(!$oApp->create()) + { + error("oApp->create() failed\n"); + } + $oVersion = new version(); $oVersion->sName = "OM version ".$sId; $oVersion->iAppId = $oApp->iAppId; - $oVersion->create(); + if(!$oVersion->create()) + { + error("oVersion->create() failed"); + } return $oVersion->iVersionId; }

1 0

appdb/tables bugzilla_tables.sql
by WineHQ Aug. 4, 2007

Aug. 4, 2007

ChangeSet ID: 31307 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/03 23:44:28 Modified files: tables : bugzilla_tables.sql Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Create the bugzilla bugs table necessary for the unit tests to run properly. Patch: http://cvs.winehq.org/patch.py?id=31307 Old revision New revision Changes Path 1.2 1.3 +65 -0 appdb/tables/bugzilla_tables.sql Index: appdb/tables/bugzilla_tables.sql diff -u -p appdb/tables/bugzilla_tables.sql:1.2 appdb/tables/bugzilla_tables.sql:1.3 --- appdb/tables/bugzilla_tables.sql:1.2 4 Aug 2007 4:44:28 -0000 +++ appdb/tables/bugzilla_tables.sql 4 Aug 2007 4:44:28 -0000 @@ -63,3 +63,68 @@ INSERT INTO versions VALUES ('20040914', INSERT INTO versions VALUES ('20041019', 1 ); INSERT INTO versions VALUES ('20041201', 1 ); INSERT INTO versions VALUES ('CVS', 1 ); + + +-- +-- Table structure for table `bugs` +-- + +DROP TABLE IF EXISTS `bugs`; +CREATE TABLE `bugs` ( + `bug_id` mediumint(9) NOT NULL auto_increment, + `assigned_to` mediumint(9) NOT NULL default '0', + `bug_file_loc` text, + `bug_severity` enum('blocker','critical','major','normal','minor','trivial','enhancement') +NOT NULL default 'blocker', + `bug_status` enum('UNCONFIRMED','NEW','ASSIGNED','REOPENED','RESOLVED','VERIFIED','CLOSED') +NOT NULL default 'UNCONFIRMED', + `creation_ts` datetime NOT NULL default '0000-00-00 00:00:00', + `delta_ts` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `short_desc` mediumtext, + `op_sys` enum('All','Windows 3.1','Windows 95','Windows 98','Windows ME','Windows +2000','Windows NT','Windows XP','Mac System 7','Mac System 7.5','Mac System 7.6.1','Mac System +8.0','Mac System 8.5','Mac System 8.6','Mac System 9.x','Mac OS X 10.0','Mac OS X 10.1','Mac OS +X +10.2','Linux','BSDI','FreeBSD','NetBSD','OpenBSD','AIX','BeOS','HP-UX','IRIX','Neutrino','OpenVMS','OS/2','OSF/1','Solaris','SunOS','other') +NOT NULL default 'All', + `priority` enum('P1','P2','P3','P4','P5') NOT NULL default 'P1', + `rep_platform` enum('All','DEC','HP','Macintosh','PC','PC-x86-64','SGI','Sun','Other') +default NULL, + `reporter` mediumint(9) NOT NULL default '0', + `version` varchar(64) NOT NULL default '', + `resolution` +enum('','FIXED','INVALID','WONTFIX','LATER','REMIND','DUPLICATE','WORKSFORME','MOVED','ABANDONED') +NOT NULL default '', + `target_milestone` varchar(20) NOT NULL default '---', + `qa_contact` mediumint(9) NOT NULL default '0', + `status_whiteboard` mediumtext NOT NULL, + `votes` mediumint(9) NOT NULL default '0', + `keywords` mediumtext NOT NULL, + `lastdiffed` datetime NOT NULL default '0000-00-00 00:00:00', + `everconfirmed` tinyint(4) NOT NULL default '0', + `environment` varchar(80) default NULL, + `reporter_accessible` tinyint(4) NOT NULL default '1', + `cclist_accessible` tinyint(4) NOT NULL default '1', + `estimated_time` decimal(5,2) NOT NULL default '0.00', + `remaining_time` decimal(5,2) NOT NULL default '0.00', + `alias` varchar(20) default NULL, + `product_id` smallint(6) NOT NULL default '0', + `component_id` smallint(6) NOT NULL default '0', + PRIMARY KEY (`bug_id`), + UNIQUE KEY `alias` (`alias`), + KEY `assigned_to` (`assigned_to`), + KEY `creation_ts` (`creation_ts`), + KEY `delta_ts` (`delta_ts`), + KEY `bug_severity` (`bug_severity`), + KEY `bug_status` (`bug_status`), + KEY `op_sys` (`op_sys`), + KEY `priority` (`priority`), + KEY `reporter` (`reporter`), + KEY `version` (`version`), + KEY `resolution` (`resolution`), + KEY `target_milestone` (`target_milestone`), + KEY `qa_contact` (`qa_contact`), + KEY `votes` (`votes`), + KEY `product_id` (`product_id`), + KEY `component_id` (`component_id`) +);

1 0

appdb/include application.php
by WineHQ Aug. 4, 2007

Aug. 4, 2007

ChangeSet ID: 31306 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/03 21:02:04 Modified files: include : application.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> application::create() should return false upon failure Patch: http://cvs.winehq.org/patch.py?id=31306 Old revision New revision Changes Path 1.124 1.125 +1 -1 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.124 appdb/include/application.php:1.125 --- appdb/include/application.php:1.124 4 Aug 2007 2: 2: 4 -0000 +++ appdb/include/application.php 4 Aug 2007 2: 2: 4 -0000 @@ -119,7 +119,7 @@ class Application { function create() { if(!$_SESSION['current']->canCreateApplication()) - return; + return false; $hResult = query_parameters("INSERT INTO appFamily (appName, description, ". "keywords, webPage, vendorId, catId, ".

1 0