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

appdb/include application.php user.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31005 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/25 11:03:35 Modified files: include : application.php user.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add user::objectMakeLink(), used by appData and testData objectOutputTableRow() Patch: http://cvs.winehq.org/patch.py?id=31005 Old revision New revision Changes Path 1.96 1.97 +1 -2 appdb/include/application.php 1.84 1.85 +12 -0 appdb/include/user.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.96 appdb/include/application.php:1.97 --- appdb/include/application.php:1.96 25 Mar 2007 16: 3:35 -0000 +++ appdb/include/application.php 25 Mar 2007 16: 3:35 -0000 @@ -888,8 +888,7 @@ class Application { $aCells = array( print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime)), - "<a href=\"contact.php?iRecipientId=$oUser->iUserId\">". - "$oUser->sRealname</a>", + $oUser->objectMakeLink(), $sVendor, $this->sName); Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.84 appdb/include/user.php:1.85 --- appdb/include/user.php:1.84 25 Mar 2007 16: 3:35 -0000 +++ appdb/include/user.php 25 Mar 2007 16: 3:35 -0000 @@ -1043,6 +1043,18 @@ class User { return false; } + + function objectMakeUrl() + { + $sUrl = BASE."contact.php?iRecipientId=$this->iUserId"; + return $sUrl; + } + + function objectMakeLink() + { + $sLink = "<a href=\"".$this->objectMakeUrl()."\">$this->sRealname</a>"; + return $sLink; + } } ?>

1 0

appdb/include vendor.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31004 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/24 23:21:34 Modified files: include : vendor.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Refer to the Vendor version of objectGetEntriesCount() via Vendor::objectGetEntriesCount() Patch: http://cvs.winehq.org/patch.py?id=31004 Old revision New revision Changes Path 1.19 1.20 +1 -1 appdb/include/vendor.php Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.19 appdb/include/vendor.php:1.20 --- appdb/include/vendor.php:1.19 25 Mar 2007 4:21:34 -0000 +++ appdb/include/vendor.php 25 Mar 2007 4:21:34 -0000 @@ -159,7 +159,7 @@ class Vendor { return FALSE; if(!$iRows) - $iRows = objectGetEntriesCount($bQueued, $bRejected); + $iRows = Vendor::objectGetEntriesCount($bQueued, $bRejected); $hResult = query_parameters("SELECT * FROM vendor ORDER BY vendorName LIMIT ?,?",

1 0

appdb/include sidebar.php vendor.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31003 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/24 22:59:58 Modified files: include : sidebar.php vendor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add and use vendor::objectGetEntriesCount() Patch: http://cvs.winehq.org/patch.py?id=31003 Old revision New revision Changes Path 1.29 1.30 +1 -1 appdb/include/sidebar.php 1.18 1.19 +20 -10 appdb/include/vendor.php Index: appdb/include/sidebar.php diff -u -p appdb/include/sidebar.php:1.29 appdb/include/sidebar.php:1.30 --- appdb/include/sidebar.php:1.29 25 Mar 2007 3:59:58 -0000 +++ appdb/include/sidebar.php 25 Mar 2007 3:59:58 -0000 @@ -29,7 +29,7 @@ function global_sidebar_menu() $g->add("Help & Documentation", BASE."help/"); $g->add("AppDB Stats", BASE."appdbStats.php"); $g->add("View Distributions (".distribution::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=distribution&bIsQueue=false&sTitle=View%20Distributions"); - $g->add("View Vendors (".getNumberOfvendors().")", BASE."objectManager.php?sClass=vendor&bIsQueue=false&sTitle=View%20Vendors"); + $g->add("View Vendors (".vendor::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=vendor&bIsQueue=false&sTitle=View%20Vendors"); $g->add("Email your suggestions for improving the AppDB", "mailto:appdb(a)winehq.org"); $g->done(); Index: appdb/include/vendor.php diff -u -p appdb/include/vendor.php:1.18 appdb/include/vendor.php:1.19 --- appdb/include/vendor.php:1.18 25 Mar 2007 3:59:58 -0000 +++ appdb/include/vendor.php 25 Mar 2007 3:59:58 -0000 @@ -159,7 +159,7 @@ class Vendor { return FALSE; if(!$iRows) - $iRows = getNumberOfVendors(); + $iRows = objectGetEntriesCount($bQueued, $bRejected); $hResult = query_parameters("SELECT * FROM vendor ORDER BY vendorName LIMIT ?,?", @@ -263,17 +263,27 @@ class Vendor { { return "<a href=\"".$this->objectMakeUrl()."\">$this->sName</a>"; } -} -/* Get the total number of Vendors in the database */ -function getNumberOfVendors() -{ - $hResult = query_parameters("SELECT count(*) as num_vendors FROM vendor"); - if($hResult) + function objectGetEntriesCount($bQueued, $bRejected) { - $oRow = mysql_fetch_object($hResult); - return $oRow->num_vendors; + /* Not implemented */ + if($bQueued) + return FALSE; + + /* Not implemented */ + if($bRejected) + return FALSE; + + $hResult = query_parameters("SELECT COUNT(vendorId) as count FROM vendor"); + + if(!$hResult) + return FALSE; + + if(!$oRow = mysql_fetch_object($hResult)) + return FALSE; + + return $oRow->count; } - return 0; } + ?>

1 0

appdb/include testData.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31002 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/24 22:58:25 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> testData: remove un-needed functions now that admin/adminTestResults.php has been removed Patch: http://cvs.winehq.org/patch.py?id=31002 Old revision New revision Changes Path 1.29 1.30 +0 -68 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.29 appdb/include/testData.php:1.30 --- appdb/include/testData.php:1.29 25 Mar 2007 3:58:25 -0000 +++ appdb/include/testData.php 25 Mar 2007 3:58:25 -0000 @@ -623,74 +623,6 @@ class testData{ $this->sComments = $aValues['sComments']; } - - function getTestingQueue($sQueued='true') - { - if($_SESSION['current']->hasPriv("admin")) - { - $hResult = query_parameters("SELECT * - FROM testResults - WHERE queued = '?'", $sQueued); - if(!$hResult || mysql_num_rows($hResult) == 0) - return; - } else - { - $hResult = query_parameters("SELECT * - FROM testResults - WHERE queued = '?' - AND submitterId = '?'", - $sQueued, $_SESSION['current']->iUserId); - if(!$hResult || mysql_num_rows($hResult) == 0) - return; - } - return $hResult; - } - - function ShowListofTests($hResult, $heading="") - { - //show applist - echo html_frame_start($heading,"90%","",0); - echo "<table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\"> - <tr class=color4> - <td>Submission Date</td> - <td>Submitter</td> - <td>Application</td> - <td>Version</td> - <td>Release</td> - <td>Rating</td> - <td align=\"center\">Action</td> - </tr>"; - - while($oRow = mysql_fetch_object($hResult)) - { - $oTest = new testData($oRow->testingId); - $oVersion = new Version($oTest->iVersionId); - // don't show test results of versions that are still queued. - if ($oVersion->sQueued == 'false') - { - $oApp = new Application($oVersion->iAppId); - $oSubmitter = new User($oTest->iSubmitterId); - $bgcolor = $oTest->sTestedRating; - echo '<tr class='.$bgcolor.'>',"\n"; - echo " <td>".print_date(mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime))."</td>\n"; - echo " <td>\n"; - echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":""; - echo $oSubmitter->sRealname; - echo $oSubmitter->sEmail ? "</a>":""; - echo " </td>\n"; - echo ' <td><a href="'.BASE.'appview.php?iAppId='.$oApp->iAppId.'">'.$oApp->sName.'</a></td>'; - echo ' <td><a href="'.BASE.'appview.php?iVersionId='.$oVersion->iVersionId.'&iTestingId='.$oTest->iTestingId.'">'.$oVersion->sName.'</a></td>'; - echo " <td>".$oTest->sTestedRelease."</td>\n"; - echo " <td>".$oTest->sTestedRating."</td>\n"; - echo " <td align=\"center\">[<a href=".$_SERVER['PHP_SELF']."?sSub=view&iTestingId=".$oTest->iTestingId.">process</a>]</td>\n"; - echo "</tr>\n\n"; - } - } - echo "</table>","\n"; - - echo html_frame_end(); - } - function make_Installs_list($sVarname, $sSelectedValue) { echo "<select name='$sVarname'>\n";

1 0

appdb/include testData.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31001 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/24 22:57:10 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add more links in testData::objectOutputTableRow() Patch: http://cvs.winehq.org/patch.py?id=31001 Old revision New revision Changes Path 1.28 1.29 +1 -1 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.28 appdb/include/testData.php:1.29 --- appdb/include/testData.php:1.28 25 Mar 2007 3:57:10 -0000 +++ appdb/include/testData.php 25 Mar 2007 3:57:10 -0000 @@ -868,7 +868,7 @@ class testData{ $oUser = new user($this->iSubmitterId); $aCells = array( print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime)), - $oUser->sRealname, + $oUser->objectMakeLink(), $oApp->objectMakeLink(), $oVersion->objectMakeLink(), $this->sTestedRelease,

1 0

appdb/ include/distribution.php include/object ...
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 31000 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/24 22:56:20 Modified files: include : distribution.php objectManager.php sidebar_admin.php testData.php Removed files: admin : adminTestResults.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Let objectManager handle rejected testData Patch: http://cvs.winehq.org/patch.py?id=31000 Old revision New revision Changes Path 1.20 Removed +0 -0 appdb/admin/adminTestResults.php 1.19 1.20 +1 -1 appdb/include/distribution.php 1.8 1.9 +22 -10 appdb/include/objectManager.php 1.34 1.35 +4 -2 appdb/include/sidebar_admin.php 1.27 1.28 +2 -2 appdb/include/testData.php

1 0

appdb/include maintainer.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 30999 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/24 22:54:10 Modified files: include : maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add links to maintainer::objectOutputTableRow() Patch: http://cvs.winehq.org/patch.py?id=30999 Old revision New revision Changes Path 1.34 1.35 +3 -3 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.34 appdb/include/maintainer.php:1.35 --- appdb/include/maintainer.php:1.34 25 Mar 2007 3:54:10 -0000 +++ appdb/include/maintainer.php 25 Mar 2007 3:54:10 -0000 @@ -438,10 +438,10 @@ class maintainer $aCells = array( print_date(mysqldatetime_to_unixtimestamp($this->aSubmitTime)), - $oApp->sName, - ($this->bSuperMaintainer) ? "N/A" : $oVersion->sName, + $oApp->objectMakeLink(), + ($this->bSuperMaintainer) ? "N/A" : $oVersion->objectMakeLink(), ($this->bSuperMaintainer) ? "Yes" : "No", - "<a href=\"mailto:".$oUser->sEmail."\">".$oUser->sRealname."</a>"); + $oUser->objectMakeLink()); if(maintainer::canEdit()) $aCells[sizeof($aCells)] = "[ <a href=\"".$oObject->makeUrl("edit",

1 0

appdb/include appData.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 30998 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/24 22:53:01 Modified files: include : appData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add more links in appData::objectOutputTableRow Patch: http://cvs.winehq.org/patch.py?id=30998 Old revision New revision Changes Path 1.13 1.14 +3 -3 appdb/include/appData.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.13 appdb/include/appData.php:1.14 --- appdb/include/appData.php:1.13 25 Mar 2007 3:53: 1 -0000 +++ appdb/include/appData.php 25 Mar 2007 3:53: 1 -0000 @@ -355,9 +355,9 @@ class appData $oUser = new User($this->iSubmitterId); $aCells = array( print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime)), - $oUser->sRealname, - $oApp->sName, - $this->iVersionId ? $oVersion->sName : "N/A"); + $oUser->objectMakeLink(), + $oApp->objectMakeLink(), + $this->iVersionId ? $oVersion->objectMakeLink() : "N/A"); if(appData::canEdit($oObject->sClass)) $aCells[] = "[ <a href=\"".$oObject->makeUrl("edit",

1 0

appdb/include application.php
by WineHQ 25 Mar '07

25 Mar '07

ChangeSet ID: 30997 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/24 22:51:20 Modified files: include : application.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add more links in application::objectOutputTableRow(), now vendors and users are clickable Patch: http://cvs.winehq.org/patch.py?id=30997 Old revision New revision Changes Path 1.95 1.96 +6 -3 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.95 appdb/include/application.php:1.96 --- appdb/include/application.php:1.95 25 Mar 2007 3:51:20 -0000 +++ appdb/include/application.php 25 Mar 2007 3:51:20 -0000 @@ -882,12 +882,15 @@ class Application { $oUser = new user($this->iSubmitterId); $oVendor = new vendor($this->iVendorId); if(!$oVendor->sName) - $oVendor->sName = get_vendor_from_keywords($this->sKeywords); + $sVendor = get_vendor_from_keywords($this->sKeywords); + else + $sVendor = $oVendor->objectMakeLink(); $aCells = array( print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime)), - $oUser->sRealname, - $oVendor->sName, + "<a href=\"contact.php?iRecipientId=$oUser->iUserId\">". + "$oUser->sRealname</a>", + $sVendor, $this->sName); if($this->canEdit() || $oObject->bQueued)

1 0

appdb/include appData.php
by WineHQ 24 Mar '07

24 Mar '07

ChangeSet ID: 30996 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/24 13:49:26 Modified files: include : appData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix date display in appData lists Patch: http://cvs.winehq.org/patch.py?id=30996 Old revision New revision Changes Path 1.12 1.13 +1 -1 appdb/include/appData.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.12 appdb/include/appData.php:1.13 --- appdb/include/appData.php:1.12 24 Mar 2007 18:49:26 -0000 +++ appdb/include/appData.php 24 Mar 2007 18:49:26 -0000 @@ -354,7 +354,7 @@ class appData $oApp = new Application($this->iAppId); $oUser = new User($this->iSubmitterId); $aCells = array( - print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime)), + print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime)), $oUser->sRealname, $oApp->sName, $this->iVersionId ? $oVersion->sName : "N/A");

1 0