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

appdb/include objectManager.php
by WineHQ 24 Jul '07

24 Jul '07

ChangeSet ID: 31272 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 20:49:40 Modified files: include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Return users to the submit page after logging in. Patch: http://cvs.winehq.org/patch.py?id=31272 Old revision New revision Changes Path 1.39 1.40 +2 -2 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.39 appdb/include/objectManager.php:1.40 --- appdb/include/objectManager.php:1.39 24 Jul 2007 1:49:40 -0000 +++ appdb/include/objectManager.php 24 Jul 2007 1:49:40 -0000 @@ -455,8 +455,8 @@ class ObjectManager if($oObject->allowAnonymousSubmissions() || $_SESSION['current']->isLoggedIn()) return; - util_show_error_page_and_exit("You need to be <a href=\"".BASE. - "account.php?sCmd=login\">logged in</a>. If you don’t have an ". + util_show_error_page_and_exit("You need to be <a href=\"".login_url(). + "\">logged in</a>. If you don’t have an ". "account you can <a href=\"".BASE."account.php?sCmd=new\">register ". "now</a>, it only takes a few seconds."); }

1 0

appdb/ ./appbrowse.php ./appview.php ./browse_ ...
by WineHQ 24 Jul '07

24 Jul '07

ChangeSet ID: 31271 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 20:45:19 Modified files: . : appbrowse.php appview.php browse_downloadable.php index.php objectManager.php preferences.php viewScreenshots.php admin : addCategory.php adminBugs.php adminCommentView.php adminMaintainers.php adminScreenshots.php adminUsers.php help : index.php include : appData.php application.php comment.php downloadurl.php error_log.php form_login.php form_new.php monitor.php objectManager.php screenshot.php testData.php util.php Log message: Edwin Smulders <edwin.smulders(a)gmail.com> Eliminate some php notices caused by use of uninitialized variables Patch: http://cvs.winehq.org/patch.py?id=31271 Old revision New revision Changes Path 1.26 1.27 +6 -5 appdb/appbrowse.php 1.101 1.102 +5 -6 appdb/appview.php 1.7 1.8 +9 -6 appdb/browse_downloadable.php 1.51 1.52 +11 -8 appdb/index.php 1.17 1.18 +7 -4 appdb/objectManager.php 1.37 1.38 +8 -7 appdb/preferences.php 1.13 1.14 +2 -7 appdb/viewScreenshots.php 1.16 1.17 +3 -2 appdb/admin/addCategory.php 1.16 1.17 +4 -7 appdb/admin/adminBugs.php 1.17 1.18 +2 -7 appdb/admin/adminCommentView.php 1.30 1.31 +1 -1 appdb/admin/adminMaintainers.php 1.20 1.21 +4 -9 appdb/admin/adminScreenshots.php 1.14 1.15 +52 -10 appdb/admin/adminUsers.php 1.12 1.13 +1 -1 appdb/help/index.php 1.29 1.30 +2 -0 appdb/include/appData.php 1.118 1.119 +2 -2 appdb/include/application.php 1.36 1.37 +1 -1 appdb/include/comment.php 1.20 1.21 +2 -0 appdb/include/downloadurl.php 1.4 1.5 +2 -1 appdb/include/error_log.php 1.11 1.12 +1 -1 appdb/include/form_login.php 1.12 1.13 +1 -1 appdb/include/form_new.php 1.15 1.16 +7 -5 appdb/include/monitor.php 1.38 1.39 +9 -16 appdb/include/objectManager.php 1.73 1.74 +3 -0 appdb/include/screenshot.php 1.71 1.72 +1 -1 appdb/include/testData.php 1.99 1.100 +3 -1 appdb/include/util.php

1 0

appdb/include incl.php
by WineHQ 24 Jul '07

24 Jul '07

ChangeSet ID: 31270 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 20:35:30 Modified files: include : incl.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Switching from timestamp to datetime means we have to specify the time we want stored in the field. In any case we want to be explicit so specify 'NOW()' for the timestamp/datetime field. Patch: http://cvs.winehq.org/patch.py?id=31270 Old revision New revision Changes Path 1.44 1.45 +2 -2 appdb/include/incl.php Index: appdb/include/incl.php diff -u -p appdb/include/incl.php:1.44 appdb/include/incl.php:1.45 --- appdb/include/incl.php:1.44 24 Jul 2007 1:35:30 -0000 +++ appdb/include/incl.php 24 Jul 2007 1:35:30 -0000 @@ -264,8 +264,8 @@ function addmsg($text, $color = "black") if($color) $text = "<font color='$color'> $text </font>\n"; - $sQuery = "INSERT INTO sessionMessages VALUES (null, null, '?', '?')"; - if (!query_parameters($sQuery, session_id(), $text)) + $sQuery = "INSERT INTO sessionMessages VALUES (null, ?, '?', '?')"; + if (!query_parameters($sQuery, "NOW()", session_id(), $text)) { echo "An error has occurred in addmsg()"; echo $text;

1 0

appdb/ ./objectManager.php include/testData.php
by WineHQ 24 Jul '07

24 Jul '07

ChangeSet ID: 31269 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 19:30:04 Modified files: . : objectManager.php include : testData.php Log message: Edwin Smulders <edwin.smulders(a)gmail.com> Switch to using $_SERVER variables from what appears to be deprecated super globals Patch: http://cvs.winehq.org/patch.py?id=31269 Old revision New revision Changes Path 1.16 1.17 +3 -3 appdb/objectManager.php 1.70 1.71 +1 -1 appdb/include/testData.php Index: appdb/objectManager.php diff -u -p appdb/objectManager.php:1.16 appdb/objectManager.php:1.17 --- appdb/objectManager.php:1.16 24 Jul 2007 0:30: 4 -0000 +++ appdb/objectManager.php 24 Jul 2007 0:30: 4 -0000 @@ -85,7 +85,7 @@ if($oObject->iId) break; case "edit": - $oObject->display_entry_for_editing($REQUEST_URI, $sErrors); + $oObject->display_entry_for_editing($_SERVER['REQUEST_URI'], $sErrors); break; case "showMoveChildren": @@ -93,12 +93,12 @@ if($oObject->iId) break; default: - $oObject->view($REQUEST_URI); + $oObject->view($_SERVER['REQUEST_URI']); break; } } else if ($aClean['sAction'] == "add") { - $oObject->add_entry($REQUEST_URI, $sErrors); + $oObject->add_entry($_SERVER['REQUEST_URI'], $sErrors); } else { // if displaying a queue display the help for the given queue Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.70 appdb/include/testData.php:1.71 --- appdb/include/testData.php:1.70 24 Jul 2007 0:30: 4 -0000 +++ appdb/include/testData.php 24 Jul 2007 0:30: 4 -0000 @@ -567,7 +567,7 @@ class testData{ echo '<br />',"\n"; // put a space after the test results table and the button - echo '<form method=get action="'.$PHP_SELF.'">'."\n"; + echo '<form method=get action="'.$_SERVER['PHP_SELF'].'">'."\n"; echo "\t".'<input name="iVersionId" type=hidden value="',$this->iVersionId,'" />'."\n"; if($rowsUsed >= $iDisplayLimit && !is_string($sShowAll)) echo "\t".'<input class="button" name="sShowAll" type=submit value="Show All Tests" />'."\n";

1 0

appdb/include version.php
by WineHQ 23 Jul '07

23 Jul '07

ChangeSet ID: 31268 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 17:03:02 Modified files: include : version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Create a new TableRow() so we aren't adding entries to a previously used TableRow Patch: http://cvs.winehq.org/patch.py?id=31268 Old revision New revision Changes Path 1.138 1.139 +1 -0 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.138 appdb/include/version.php:1.139 --- appdb/include/version.php:1.138 23 Jul 2007 22: 3: 2 -0000 +++ appdb/include/version.php 23 Jul 2007 22: 3: 2 -0000 @@ -635,6 +635,7 @@ class version { $oTable->AddRow($oTableRow); // version license + $oTableRow = new TableRow(); $oTableCell = new TableCell("License"); $oTableCell->SetBold(true); $oTableCell->SetClass("color0");

1 0

appdb/include table.php
by WineHQ 23 Jul '07

23 Jul '07

ChangeSet ID: 31267 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 17:01:34 Modified files: include : table.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add TableRow::SetValign() and add its output to TableRow::GetString() Patch: http://cvs.winehq.org/patch.py?id=31267 Old revision New revision Changes Path 1.2 1.3 +9 -4 appdb/include/table.php Index: appdb/include/table.php diff -u -p appdb/include/table.php:1.2 appdb/include/table.php:1.3 --- appdb/include/table.php:1.2 23 Jul 2007 22: 1:34 -0000 +++ appdb/include/table.php 23 Jul 2007 22: 1:34 -0000 @@ -190,7 +190,7 @@ class TableRow var $aTableCells; // array that contains the cells for the table row var $sStyle; // CSS style to be used var $sClass; // CSS class to be used - var $sExtra; // extra things to put into the table row + var $sValign; // valign="$sValign" - if this variable is set var $oTableRowClick; // information about whether the table row is clickable etc @@ -199,7 +199,7 @@ class TableRow $this->aTableCells = array(); $this->sStyle = null; $this->sClass = null; - $this->sExtra = null; + $this->sValign = null; $this->oTableRowClick = null; } @@ -233,6 +233,11 @@ class TableRow $this->sClass = $sClass; } + function SetValign($sValign) + { + $this->sValign = $sValign; + } + function SetRowClick($oTableRowClick) { $this->oTableRowClick = $oTableRowClick; @@ -251,8 +256,8 @@ class TableRow if($this->sStyle) $sStr.= " style=\"$this->sStyle\""; - if($this->sExtra) - $sStr.= " $this->sExtra"; + if($this->sValign) + $sStr.= " valign=\"$this->sValign\""; if($this->oTableRowClick) $sStr.= " ".$this->oTableRowClick->GetString();

1 0

appdb/include util.php
by WineHQ 23 Jul '07

23 Jul '07

ChangeSet ID: 31266 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 16:00:37 Modified files: include : util.php Log message: Edwin Smulders <edwin.smulders(a)gmail.com> Make searches use words as keywords Patch: http://cvs.winehq.org/patch.py?id=31266 Old revision New revision Changes Path 1.98 1.99 +5 -3 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.98 appdb/include/util.php:1.99 --- appdb/include/util.php:1.98 23 Jul 2007 21: 0:37 -0000 +++ appdb/include/util.php 23 Jul 2007 21: 0:37 -0000 @@ -466,15 +466,17 @@ function searchForApplication($search_wo } } + $search_words = str_replace(' ', '%', mysql_real_escape_string($search_words)); + /* base query */ $sQuery = "SELECT * FROM appFamily, vendor WHERE appName != 'NONAME' AND appFamily.vendorId = vendor.vendorId AND appFamily.queued = 'false' - AND (appName LIKE '%".mysql_real_escape_string($search_words)."%' - OR keywords LIKE '%".mysql_real_escape_string($search_words)."%'"; - + AND (appName LIKE '%" . $search_words . "%' + OR keywords LIKE '%" . $search_words . "%'"; + /* append to the query any vendors that we matched with */ foreach($vendorIdArray as $key=>$value) {

1 0

appdb/include testData.php
by WineHQ 23 Jul '07

23 Jul '07

ChangeSet ID: 31265 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 15:45:22 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix testData submission where the tested version is missing due to switching from a function that previously echoed data out to one that returns the string for the caller to optionally echo. The lack of echoing meant the version list html wasn't being output. Patch: http://cvs.winehq.org/patch.py?id=31265 Old revision New revision Changes Path 1.69 1.70 +1 -1 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.69 appdb/include/testData.php:1.70 --- appdb/include/testData.php:1.69 23 Jul 2007 20:45:22 -0000 +++ appdb/include/testData.php 23 Jul 2007 20:45:22 -0000 @@ -649,7 +649,7 @@ class testData{ // Version List echo '<tr><td class=color1><b>Tested release</b></td><td class=color0>',"\n"; - make_bugzilla_version_list("sTestedRelease", $this->sTestedRelease); + echo make_bugzilla_version_list("sTestedRelease", $this->sTestedRelease); // Give the user some information about our available versions echo "<ul>\n"; echo "<li>If you are testing with a newer release than listed please";

1 0

appdb/include version.php
by WineHQ 23 Jul '07

23 Jul '07

ChangeSet ID: 31264 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 15:39:49 Modified files: include : version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add check for empty tested ratings to the conditions upon which we will skip trying to color using the tested rating. Remove two unused variables. Patch: http://cvs.winehq.org/patch.py?id=31264 Old revision New revision Changes Path 1.137 1.138 +3 -4 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.137 appdb/include/version.php:1.138 --- appdb/include/version.php:1.137 23 Jul 2007 20:39:49 -0000 +++ appdb/include/version.php 23 Jul 2007 20:39:49 -0000 @@ -1112,20 +1112,19 @@ class version { $oTableRowHighlight = null; // if we have a valid tested rating - if($oVersion->sTestedRating && $oVersion->sTestedRating != "/") + if($oVersion->sTestedRating && ($oVersion->sTestedRating != "/") && + ($oVersion->sTestedRating != " ")) { - $sRatingColor = "class=\"$oVersion->sTestedRating\""; $sClass = $oVersion->sTestedRating; $oInactiveColor = new Color(); - $oInactiveColor->setColorByName($oVersion->sTestedRating); + $oInactiveColor->SetColorByName($oVersion->sTestedRating); $oHighlightColor = GetHighlightColorFromInactiveColor($oInactiveColor); $oTableRowHighlight = new TableRowHighlight($oHighlightColor, $oInactiveColor); } else { - $sRatingColor = "class=\"$bgcolor\""; $sClass = $bgcolor; $oTableRowHighlight = GetStandardRowHighlight($c);

1 0

appdb/include appData.php objectManager.php ta ...
by WineHQ 23 Jul '07

23 Jul '07

ChangeSet ID: 31263 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/23 15:30:57 Modified files: include : appData.php objectManager.php table.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix appData objectGetTableRow() to work with the new table classes Patch: http://cvs.winehq.org/patch.py?id=31263 Old revision New revision Changes Path 1.28 1.29 +10 -7 appdb/include/appData.php 1.37 1.38 +1 -1 appdb/include/objectManager.php 1.1 1.2 +1 -0 appdb/include/table.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.28 appdb/include/appData.php:1.29 --- appdb/include/appData.php:1.28 23 Jul 2007 20:30:57 -0000 +++ appdb/include/appData.php 23 Jul 2007 20:30:57 -0000 @@ -497,14 +497,17 @@ class appData $oApp = new Application($this->iAppId); $oUser = new User($this->iSubmitterId); - $aCells = array( - print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime)), - $oUser->objectMakeLink(), - $oApp->objectMakeLink(), - $this->iVersionId ? $oVersion->objectMakeLink() : "N/A"); - $oTableRow = new TableRow($aCells); - return $oTableRow; + $oTableRow = new TableRow(); + $oTableRow->AddTextCell(print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime))); + $oTableRow->AddTextCell($oUser->objectMakeLink()); + $oTableRow->AddTextCell($oApp->objectMakeLink()); + $oTableRow->AddTextCell($this->iVersionId ? $oVersion->objectMakeLink() : "N/A"); + + // create the object manager specific row + $oOMTableRow = new OMTableRow($oTableRow); + + return $oOMTableRow; } function objectDisplayQueueProcessingHelp() Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.37 appdb/include/objectManager.php:1.38 --- appdb/include/objectManager.php:1.37 23 Jul 2007 20:30:57 -0000 +++ appdb/include/objectManager.php 23 Jul 2007 20:30:57 -0000 @@ -153,7 +153,7 @@ class ObjectManager //TODO: we shouldn't access this method directly, should make an accessor for it if(!$this->oTableRow->oTableRow->sClass) { - $this->oTableRow->oTableRow->sClass = $sColor; + $this->oTableRow->oTableRow->SetClass($sColor); } // if this row is clickable, make it highlight appropirately Index: appdb/include/table.php diff -u -p appdb/include/table.php:1.1 appdb/include/table.php:1.2 --- appdb/include/table.php:1.1 23 Jul 2007 20:30:57 -0000 +++ appdb/include/table.php 23 Jul 2007 20:30:57 -0000 @@ -199,6 +199,7 @@ class TableRow $this->aTableCells = array(); $this->sStyle = null; $this->sClass = null; + $this->sExtra = null; $this->oTableRowClick = null; }

1 0