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

appdb/. distributionView.php
by WineHQ 09 Jul '06

09 Jul '06

ChangeSet ID: 26361 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/09 17:56:14 Modified files: . : distributionView.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix a comment Patch: http://cvs.winehq.org/patch.py?id=26361 Old revision New revision Changes Path 1.17 1.18 +1 -1 appdb/distributionView.php Index: appdb/distributionView.php diff -u -p appdb/distributionView.php:1.17 appdb/distributionView.php:1.18 --- appdb/distributionView.php:1.17 9 Jul 2006 22:56:14 -0000 +++ appdb/distributionView.php 9 Jul 2006 22:56:14 -0000 @@ -26,7 +26,7 @@ if ($aClean['sSub']) } $oDistribution = new distribution($aClean['iDistributionId']); -//exit with error if no vendor +//exit with error if no distribution if(!$oDistribution->iDistributionId) { apidb_header("View Distributions");

1 0

appdb/ include/distributions.php tables/testRe ...
by WineHQ 09 Jul '06

09 Jul '06

ChangeSet ID: 26360 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/09 01:08:00 Modified files: include : distributions.php tables : testResults.sql Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Sort test results by rating Patch: http://cvs.winehq.org/patch.py?id=26360 Old revision New revision Changes Path 1.11 1.12 +4 -2 appdb/include/distributions.php 1.2 1.3 +1 -1 appdb/tables/testResults.sql Index: appdb/include/distributions.php diff -u -p appdb/include/distributions.php:1.11 appdb/include/distributions.php:1.12 --- appdb/include/distributions.php:1.11 9 Jul 2006 6: 8: 0 -0000 +++ appdb/include/distributions.php 9 Jul 2006 6: 8: 0 -0000 @@ -50,7 +50,8 @@ class distribution{ { $sQuery = "SELECT testingId FROM testResults - WHERE distributionId = '?'"; + WHERE distributionId = '?' + ORDER BY testedRating;" ; } else /* only let users view test results that aren't queued and for apps that */ /* aren't queued or versions that aren't queued */ { @@ -61,7 +62,8 @@ class distribution{ appFamily.appId = appVersion.appId AND appFamily.queued = 'false' AND appVersion.queued = 'false' AND - distributionId = '?'"; + distributionId = '?' + ORDER BY testedRating;"; } if($hResult = query_parameters($sQuery, $iDistributionId)) Index: appdb/tables/testResults.sql diff -u -p appdb/tables/testResults.sql:1.2 appdb/tables/testResults.sql:1.3 --- appdb/tables/testResults.sql:1.2 9 Jul 2006 6: 8: 0 -0000 +++ appdb/tables/testResults.sql 9 Jul 2006 6: 8: 0 -0000 @@ -16,7 +16,7 @@ create table testResults ( testedRelease tinytext, installs enum('Yes','No','N/A') NOT NULL default 'Yes', runs enum('Yes','No','Not Installable') NOT NULL default 'Yes', - testedRating tinytext, + testedRating enum('Platinum','Gold','Silver','Bronze','Garbage') NOT NULL, comments text, submitTime timestamp(14) NOT NULL, submitterId int(11) NOT NULL default '0',

1 0

appdb/. commentview.php
by WineHQ 09 Jul '06

09 Jul '06

ChangeSet ID: 26359 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/08 20:36:17 Modified files: . : commentview.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix commentview.php, missed an instance of view_app_comments() -> Comment::view_app_comments() Patch: http://cvs.winehq.org/patch.py?id=26359 Old revision New revision Changes Path 1.13 1.14 +1 -1 appdb/commentview.php Index: appdb/commentview.php diff -u -p appdb/commentview.php:1.13 appdb/commentview.php:1.14 --- appdb/commentview.php:1.13 9 Jul 2006 1:36:17 -0000 +++ appdb/commentview.php 9 Jul 2006 1:36:17 -0000 @@ -15,7 +15,7 @@ require_once(BASE."include/comment.php") apidb_header("Comments"); -view_app_comments($aClean['iVersionId'], $aClean['iThreadId']); +Comment::view_app_comments($aClean['iVersionId'], $aClean['iThreadId']); apidb_footer(); ?>

1 0

appdb/ admin/adminAppQueue.php include/applica ...
by WineHQ 09 Jul '06

09 Jul '06

ChangeSet ID: 26358 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/08 19:48:33 Modified files: admin : adminAppQueue.php include : application.php comment.php screenshot.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Performance improvements to version and application classes. Reduce the amount of queries to what is necessary during object creation. The only use of all but one of the arrays we were fetching during version and application construction was in ::delete() so we can just retrieve them there. Speed screenshot class up by only querying for necessary columns, not select * Patch: http://cvs.winehq.org/patch.py?id=26358 Old revision New revision Changes Path 1.66 1.67 +1 -1 appdb/admin/adminAppQueue.php 1.63 1.64 +18 -20 appdb/include/application.php 1.26 1.27 +10 -0 appdb/include/comment.php 1.43 1.44 +4 -3 appdb/include/screenshot.php 1.71 1.72 +115 -114 appdb/include/version.php

1 0

appdb/. appimage.php
by WineHQ 09 Jul '06

09 Jul '06

ChangeSet ID: 26357 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/08 19:39:43 Modified files: . : appimage.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> appimage should use the image sUrl instead of the iId when trying to stat() the file. We can't always be sure that the iId will be the name of the file Patch: http://cvs.winehq.org/patch.py?id=26357 Old revision New revision Changes Path 1.25 1.26 +4 -3 appdb/appimage.php Index: appdb/appimage.php diff -u -p appdb/appimage.php:1.25 appdb/appimage.php:1.26 --- appdb/appimage.php:1.25 9 Jul 2006 0:39:43 -0000 +++ appdb/appimage.php 9 Jul 2006 0:39:43 -0000 @@ -73,12 +73,13 @@ if ($aClean['sREQUEST_METHOD']='HEAD') header("Expires: "); header("Last-Modified: ".fHttpDate($iModTime)); } + $oScreenshot = new Screenshot($aClean['iId']); -/* at this point, we know that .../screenshots/$id and - * .../screenshots/thumbnails/$id both exist as normally +/* at this point, we know that .../screenshots/$oScreenshot->sUrl and + * .../screenshots/thumbnails/$oScreenshot->sUrl both exist as normally * they would both be created at the same time. */ -$fstat_val = stat(appdb_fullpath("data/screenshots/".$aClean['iId'])); +$fstat_val = stat(appdb_fullpath("data/screenshots/".$oScreenshot->sUrl)); $iModTime = $fstat_val['mtime']; header("Cache-Control: public");

1 0

appdb/admin adminAppQueue.php
by WineHQ 08 Jul '06

08 Jul '06

ChangeSet ID: 26356 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/08 17:45:40 Modified files: admin : adminAppQueue.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix moving version to existing application, variable wasn't prefixed correctly Patch: http://cvs.winehq.org/patch.py?id=26356 Old revision New revision Changes Path 1.65 1.66 +1 -1 appdb/admin/adminAppQueue.php Index: appdb/admin/adminAppQueue.php diff -u -p appdb/admin/adminAppQueue.php:1.65 appdb/admin/adminAppQueue.php:1.66 --- appdb/admin/adminAppQueue.php:1.65 8 Jul 2006 22:45:40 -0000 +++ appdb/admin/adminAppQueue.php 8 Jul 2006 22:45:40 -0000 @@ -61,7 +61,7 @@ function outputSearchTableForDuplicateFl //display row echo "<tr class=$sBgColor>\n"; /* map the merging of the current app to the app we are displaying in the table */ - echo " <td>".html_ahref($oRow->appName,"adminAppQueue.php?sSub=duplicate&sAppType=application&iAppId=".$currentAppId."&appIdMergeTo=".$oRow->appId)."</td>\n"; + echo " <td>".html_ahref($oRow->appName,"adminAppQueue.php?sSub=duplicate&sAppType=application&iAppId=".$currentAppId."&iAppIdMergeTo=".$oRow->appId)."</td>\n"; echo " <td>$oVersionCount->versions versions  </td>\n"; echo "</tr>\n\n";

1 0

appdb/admin adminMaintainerQueue.php
by WineHQ 08 Jul '06

08 Jul '06

ChangeSet ID: 26355 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/08 17:12:08 Modified files: admin : adminMaintainerQueue.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix variable naming in adminMaintainerQueue.php to match the current naming convention Patch: http://cvs.winehq.org/patch.py?id=26355 Old revision New revision Changes Path 1.31 1.32 +34 -34 appdb/admin/adminMaintainerQueue.php Index: appdb/admin/adminMaintainerQueue.php diff -u -p appdb/admin/adminMaintainerQueue.php:1.31 appdb/admin/adminMaintainerQueue.php:1.32 --- appdb/admin/adminMaintainerQueue.php:1.31 8 Jul 2006 22:12: 8 -0000 +++ appdb/admin/adminMaintainerQueue.php 8 Jul 2006 22:12: 8 -0000 @@ -64,22 +64,22 @@ if ($aClean['sSub']) // Show the other maintainers of this application, if there are any echo '<tr valign=top><td class=color0>Other maintainers of this app:</td>',"\n"; - $foundMaintainers = false; + $bFoundMaintainers = false; - $firstDisplay = true; /* if false we need to fix up table rows appropriately */ + $bFirstDisplay = true; /* if false we need to fix up table rows appropriately */ $oVersion = new Version($oRow->versionId); - $other_users = $oVersion->getMaintainersUserIds(); - if($other_users) + $aOtherUsers = $oVersion->getMaintainersUserIds(); + if($aOtherUsers) { - $foundMaintainers = true; - while(list($index, $userIdValue) = each($other_users)) + $bFoundMaintainers = true; + while(list($index, $iUserId) = each($aOtherUsers)) { - $oUser = new User($userIdValue); - if($firstDisplay) + $oUser = new User($iUserId); + if($bFirstDisplay) { echo "<td>".$oUser->sRealname."</td></tr>\n"; - $firstDisplay = false; + $bFirstDisplay = false; } else { echo "<tr><td class=\"color0\"></td><td>".$oUser->sRealname."</td></tr>\n"; @@ -87,17 +87,17 @@ if ($aClean['sSub']) } } - $other_users = getSuperMaintainersUserIdsFromAppId($oRow->appId); - if($other_users) + $aOtherUsers = getSuperMaintainersUserIdsFromAppId($oRow->appId); + if($aOtherUsers) { - $foundMaintainers = true; - while(list($index, $userIdValue) = each($other_users)) + $bFoundMaintainers = true; + while(list($index, $iUserId) = each($aOtherUsers)) { - $oUser = new User($userIdValue); - if($firstDisplay) + $oUser = new User($iUserId); + if($bFirstDisplay) { echo "<td>".$oUser->sRealname."*</td></tr>\n"; - $firstDisplay = false; + $bFirstDisplay = false; } else { echo "<tr><td class=\"color0\"></td><td>".$oUser->sRealname."*</td></tr>\n"; @@ -105,7 +105,7 @@ if ($aClean['sSub']) } } - if(!$foundMaintainers) + if(!$bFoundMaintainers) { echo "<td>No other maintainers</td></tr>\n"; } @@ -113,25 +113,25 @@ if ($aClean['sSub']) // Show which other apps the user maintains echo '<tr valign="top"><td class="color0">This user also maintains these apps:</td>',"\n"; - $firstDisplay = true; + $bFirstDisplay = true; $oUser = new User($oRow->userId); - $other_apps = $oUser->getAppsMaintained(); - if($other_apps) + $aOtherApps = $oUser->getAppsMaintained(); + if($aOtherApps) { - while(list($index, list($appIdOther, $versionIdOther, $superMaintainerOther)) = each($other_apps)) + while(list($index, list($iAppIdOther, $iVersionIdOther, $bSuperMaintainerOther)) = each($aOtherApps)) { - $oApp = new Application($appIdOther); - $oVersion = new Version($versionIdOther); - if($firstDisplay) + $oApp = new Application($iAppIdOther); + $oVersion = new Version($iVersionIdOther); + if($bFirstDisplay) { - $firstDisplay = false; - if($superMaintainerOther) + $bFirstDisplay = false; + if($bSuperMaintainerOther) echo "<td>".$oApp->sName."*</td></tr>\n"; else echo "<td>".$oApp->sName." ".$oVersion->sName."</td></tr>\n"; } else { - if($superMaintainerOther) + if($bSuperMaintainerOther) echo "<td class=color0></td><td>".$oApp->sName."*</td></tr>\n"; else echo "<td class=color0></td><td>".$oApp->sName." ".$oVersion->sName."</td></tr>\n"; @@ -183,14 +183,14 @@ if ($aClean['sSub']) else if ($aClean['sAdd'] && $aClean['iQueueId']) { /* create a new user object for the maintainer */ - $maintainerUser = new User($oRow->userId); + $oMaintainerUser = new User($oRow->userId); /* add the user as a maintainer and return the statusMessage */ - $statusMessage = $maintainerUser->addAsMaintainer($oRow->appId, $oRow->versionId, + $sStatusMessage = $oMaintainerUser->addAsMaintainer($oRow->appId, $oRow->versionId, $oRow->superMaintainer, $aClean['iQueueId']); //done - addmsg("$statusMessage", 'green'); + addmsg("$sStatusMessage", 'green'); } else if (($aClean['sReject'] || ($aClean['sSub'] == 'sReject')) && $aClean['iQueueId']) { @@ -269,14 +269,14 @@ if ($aClean['sSub']) echo " <td>Action</td>\n"; echo "</tr>\n\n"; - $c = 1; + $iRowCount = 1; while($oRow = mysql_fetch_object($hResult)) { $oUser = new User($oRow->userId); $oApp = new Application($oRow->appId); $oVersion = new Version($oRow->versionId); - if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } - echo "<tr class=$bgcolor>\n"; + if ($iRowCount % 2 == 1) { $sBGColor = 'color0'; } else { $sBGColor = 'color1'; } + echo "<tr class=$sBGColor>\n"; echo " <td>".print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))."  </td>\n"; echo " <td>".$oApp->sName."</td>\n"; @@ -293,7 +293,7 @@ if ($aClean['sSub']) echo " <td><a href=\"mailto:".$oUser->sEmail."\">".$oUser->sRealname."</a></td>\n"; echo " <td>[<a href=\"adminMaintainerQueue.php?sSub=view&iQueueId=$oRow->queueId\">answer</a>]</td>\n"; echo "</tr>\n\n"; - $c++; + $iRowCount++; } echo "</table>\n\n"; echo html_frame_end(" ");

1 0

appdb/ ./appview.php include/version.php
by WineHQ 08 Jul '06

08 Jul '06

ChangeSet ID: 26354 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/08 17:10:56 Modified files: . : appview.php include : version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Pass $iTestingId into Version::display() instead of reading it from $_REQUEST. We don't want classes to depend on $_REQUEST if possible Patch: http://cvs.winehq.org/patch.py?id=26354 Old revision New revision Changes Path 1.93 1.94 +2 -1 appdb/appview.php 1.70 1.71 +2 -6 appdb/include/version.php Index: appdb/appview.php diff -u -p appdb/appview.php:1.93 appdb/appview.php:1.94 --- appdb/appview.php:1.93 8 Jul 2006 22:10:56 -0000 +++ appdb/appview.php 8 Jul 2006 22:10:56 -0000 @@ -33,6 +33,7 @@ $aClean['iAppId'] = makeSafe($_REQUEST[' $aClean['iVersionId'] = makeSafe($_REQUEST['iVersionId']); $aClean['sSub'] = makeSafe($_REQUEST['sSub']); $aClean['iBuglinkId'] = makeSafe($_REQUEST['iBuglinkId']); +$aClean['iTestingId'] = makeSafe($_REQUEST['iTestingId']); $oApp = new Application($aClean['iAppId']); $oVersion = new Version($aClean['iVersionId']); @@ -157,7 +158,7 @@ if($aClean['iAppId']) } else if($aClean['iVersionId']) // We want to see a particular version. { $oVersion = new Version($aClean['iVersionId']); - $oVersion->display(); + $oVersion->display($aClean['iTestingId']); } else { // Oops! Called with no params, bad llamah! Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.70 appdb/include/version.php:1.71 --- appdb/include/version.php:1.70 8 Jul 2006 22:10:57 -0000 +++ appdb/include/version.php 8 Jul 2006 22:10:57 -0000 @@ -603,12 +603,8 @@ class Version { $this->sTestedRelease = $aValues['sMaintainerRelease']; } - function display() + function display($iTestingId) { - $aClean = array(); //array of filtered user input - $aClean['iTestingId'] = makeSafe($_REQUEST['iTestingId']); - - /* is this user supposed to view this version? */ if(!$_SESSION['current']->canViewVersion($this)) util_show_error_page_and_exit("Something went wrong with the application or version id"); @@ -786,7 +782,7 @@ class Version { echo $this->sDescription; // Show testing data - $oTest = new TestData($aClean['iTestingId']); + $oTest = new TestData($iTestingId); $iCurrentTest = $oTest->ShowTestResult($oTest->iTestingId, $this->iVersionId); if($iCurrentTest) {

1 0

appdb/ admin/adminCommentView.php include/comm ...
by WineHQ 08 Jul '06

08 Jul '06

ChangeSet ID: 26353 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/08 17:09:14 Modified files: admin : adminCommentView.php include : comment.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Move function in include/comment.php inside of the comment class. This lets us refer to these functions like Comment:: making it clear they are static functions of the comment class Patch: http://cvs.winehq.org/patch.py?id=26353 Old revision New revision Changes Path 1.14 1.15 +1 -1 appdb/admin/adminCommentView.php 1.25 1.26 +211 -217 appdb/include/comment.php 1.69 1.70 +1 -1 appdb/include/version.php

1 0

appdb/ ./appsubmit.php ./testResults.php admin ...
by WineHQ 08 Jul '06

08 Jul '06

ChangeSet ID: 26352 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/08 17:06:28 Modified files: . : appsubmit.php testResults.php admin : addAppNote.php adminAppQueue.php adminTestResults.php editAppNote.php editDistribution.php include : application.php distributions.php note.php testResults.php util.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Pass input arrays into GetOutputEditoValues() and CheckOutputEditorInput(). We don't want classes to be hardcoded to read directly from $_REQUEST Patch: http://cvs.winehq.org/patch.py?id=26352 Old revision New revision Changes Path 1.54 1.55 +6 -6 appdb/appsubmit.php 1.13 1.14 +2 -2 appdb/testResults.php 1.29 1.30 +1 -1 appdb/admin/addAppNote.php 1.64 1.65 +6 -6 appdb/admin/adminAppQueue.php 1.11 1.12 +1 -1 appdb/admin/adminTestResults.php 1.28 1.29 +2 -2 appdb/admin/editAppNote.php 1.9 1.10 +1 -1 appdb/admin/editDistribution.php 1.62 1.63 +15 -33 appdb/include/application.php 1.10 1.11 +5 -12 appdb/include/distributions.php 1.14 1.15 +6 -12 appdb/include/note.php 1.29 1.30 +27 -52 appdb/include/testResults.php 1.67 1.68 +2 -2 appdb/include/util.php 1.68 1.69 +11 -23 appdb/include/version.php

1 0