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

appdb/admin adminAppQueue.php
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31070 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 12:55:33 Modified files: admin : adminAppQueue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Redirect to version-queue after moving tests. admin/adminAppQueue.php should redirect to 'version_queue' instead of 'version' Patch: http://cvs.winehq.org/patch.py?id=31070 Old revision New revision Changes Path 1.76 1.77 +1 -1 appdb/admin/adminAppQueue.php Index: appdb/admin/adminAppQueue.php diff -u -p appdb/admin/adminAppQueue.php:1.76 appdb/admin/adminAppQueue.php:1.77 --- appdb/admin/adminAppQueue.php:1.76 21 Apr 2007 17:55:33 -0000 +++ appdb/admin/adminAppQueue.php 21 Apr 2007 17:55:33 -0000 @@ -189,7 +189,7 @@ if ($aClean['sSub']) } // redirect back to the main page - util_redirect_and_exit(BASE."objectManager.php?sClass=version&". + util_redirect_and_exit(BASE."objectManager.php?sClass=version_queue&". "bIsQueue=true&sTitle=Version%20Queue"); } else if ($aClean['sSub'] == 'Delete')

1 0

appdb/include application.php user.php
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31069 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 12:51:42 Modified files: include : application.php user.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add and use application::mustBeQueued() Patch: http://cvs.winehq.org/patch.py?id=31069 Old revision New revision Changes Path 1.103 1.104 +12 -7 appdb/include/application.php 1.89 1.90 +0 -9 appdb/include/user.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.103 appdb/include/application.php:1.104 --- appdb/include/application.php:1.103 21 Apr 2007 17:51:42 -0000 +++ appdb/include/application.php 21 Apr 2007 17:51:42 -0000 @@ -119,17 +119,13 @@ class Application { if(!$_SESSION['current']->canCreateApplication()) return; - if($_SESSION['current']->appCreatedMustBeQueued()) - $this->sQueued = 'true'; - else - $this->sQueued = 'false'; - $hResult = query_parameters("INSERT INTO appFamily (appName, description, keywords, ". "webPage, vendorId, catId, submitterId, queued) VALUES (". "'?', '?', '?', '?', '?', '?', '?', '?')", $this->sName, $this->sDescription, $this->sKeywords, $this->sWebpage, $this->iVendorId, $this->iCatId, - $_SESSION['current']->iUserId, $this->sQueued); + $_SESSION['current']->iUserId, + $this->mustBeQueued() ? "true" : "false"); if($hResult) { $this->iAppId = mysql_insert_id(); @@ -906,11 +902,20 @@ class Application { if($_SESSION['current']->hasPriv("admin")) return TRUE; else if($this) - return maintainer::isUserSuperMaintainer($_SESSION['current'], $this->iAppId); + return maintainer::isUserSuperMaintainer($_SESSION['current'], + $this->iAppId); else return FALSE; } + function mustBeQueued() + { + if($_SESSION['current']->hasPriv("admin")) + return FALSE; + else + return TRUE; + } + function objectDisplayQueueProcessingHelp() { echo "<p>This is the list of applications waiting for your approval, ". Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.89 appdb/include/user.php:1.90 --- appdb/include/user.php:1.89 21 Apr 2007 17:51:42 -0000 +++ appdb/include/user.php 21 Apr 2007 17:51:42 -0000 @@ -721,15 +721,6 @@ class User { return $this->hasPriv("admin"); } - /** - * Does the created application have to be queued for admin processing? - */ - function appCreatedMustBeQueued() - { - return !$this->hasPriv("admin"); - } - - /***********************/ /* version permissions */

1 0

appdb/include distribution.php
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31068 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 12:50:44 Modified files: include : distribution.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add and use distribution::mustBeQueued() Patch: http://cvs.winehq.org/patch.py?id=31068 Old revision New revision Changes Path 1.24 1.25 +11 -8 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.24 appdb/include/distribution.php:1.25 --- appdb/include/distribution.php:1.24 21 Apr 2007 17:50:44 -0000 +++ appdb/include/distribution.php 21 Apr 2007 17:50:44 -0000 @@ -92,16 +92,11 @@ class distribution { return false; } - // Security, if we are not an administrator the Distributions must be queued. - if(!$_SESSION['current']->hasPriv("admin")) - $this->sQueued = 'true'; - else - $this->sQueued = 'false'; - $hResult = query_parameters("INSERT INTO distributions (name, url, submitterId, queued) ". "VALUES ('?', '?', '?', '?')", - $this->sName, $this->sUrl, $_SESSION['current']->iUserId, - $this->sQueued); + $this->sName, $this->sUrl, + $_SESSION['current']->iUserId, + $this->mustBeQueued() ? "true" : "false"); if($hResult) { $this->iDistributionId = mysql_insert_id(); @@ -488,6 +483,14 @@ class distribution { return FALSE; } + function mustBeQueued() + { + if($_SESSION['current']->hasPriv("admin")) + return FALSE; + else + return TRUE; + } + function objectHideDelete() { return TRUE;

1 0

appdb/ ./screenshots.php include/appData.php i ...
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31067 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 12:49:43 Modified files: . : screenshots.php include : appData.php screenshot.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add appData/screenshot::mustBeQueued() Patch: http://cvs.winehq.org/patch.py?id=31067 Old revision New revision Changes Path 1.42 1.43 +4 -1 appdb/screenshots.php 1.14 1.15 +43 -15 appdb/include/appData.php 1.63 1.64 +36 -22 appdb/include/screenshot.php

1 0

appdb/ ./appdbStats.php include/user.php
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31066 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 12:06:50 Modified files: . : appdbStats.php include : user.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Rename user::count() to objectGetEntriesCount() for consistency with the other generic object methods Patch: http://cvs.winehq.org/patch.py?id=31066 Old revision New revision Changes Path 1.17 1.18 +3 -2 appdb/appdbStats.php 1.88 1.89 +3 -2 appdb/include/user.php Index: appdb/appdbStats.php diff -u -p appdb/appdbStats.php:1.17 appdb/appdbStats.php:1.18 --- appdb/appdbStats.php:1.17 21 Apr 2007 17: 6:50 -0000 +++ appdb/appdbStats.php 21 Apr 2007 17: 6:50 -0000 @@ -14,7 +14,7 @@ echo "<table width='100%' border=1 cellp /* Display the number of users */ echo "<tr class=color4>\n"; echo " <td>Users:</td>\n"; -echo " <td>".User::count()."</td>\n"; +echo " <td>".User::objectGetEntriesCount()."</td>\n"; echo "</tr>\n\n"; /* Display the active users in the last 30 days */ @@ -38,7 +38,8 @@ echo "</tr>\n\n"; /* Display the inactive users */ echo "<tr class=color4>\n"; echo " <td>Inactive users (not logged in since six months):</td>\n"; -echo " <td>".(User::count()-User::active_users_within_days(183))."</td>\n"; +echo " <td>".(User::objectGetEntriesCount()- + User::active_users_within_days(183))."</td>\n"; echo "</tr>\n\n"; /* Display the users who were warned and pending deletion */ Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.88 appdb/include/user.php:1.89 --- appdb/include/user.php:1.88 21 Apr 2007 17: 6:50 -0000 +++ appdb/include/user.php 21 Apr 2007 17: 6:50 -0000 @@ -480,9 +480,10 @@ class User { } /** - * Get the number of users in the database + * Get the number of users in the database + * The parameters are only included for compatibility; we don't queue users */ - function count() + function objectGetEntriesCount($bQueued = null, $bRejected = null) { $hResult = query_parameters("SELECT count(*) as num_users FROM user_list;"); $oRow = mysql_fetch_object($hResult);

1 0

appdb/include user.php
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31065 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 12:05:54 Modified files: include : user.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Remove unused appData functions from the user class Patch: http://cvs.winehq.org/patch.py?id=31065 Old revision New revision Changes Path 1.87 1.88 +0 -81 appdb/include/user.php Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.87 appdb/include/user.php:1.88 --- appdb/include/user.php:1.87 21 Apr 2007 17: 5:54 -0000 +++ appdb/include/user.php 21 Apr 2007 17: 5:54 -0000 @@ -316,62 +316,6 @@ class User { return ($this->isLoggedIn() && $this->getPref("send_email","yes")=="yes"); } - /** - * Return an app query based on the user permissions and an iAppDataId - * Used to display appropriate appdata entries based upon admin vs. maintainer - * as well as to determine if the maintainer has permission to delete an appdata entry - */ - function getAppDataQuery($iAppDataId, $queryQueuedCount, $queryQueued) - { - /* escape all of the input variables */ - /* code is too complex to easily use query_parameters() */ - $iAppDataId = mysql_real_escape_string($iAppDataId); - $queryQueuedCount = mysql_real_escape_string($queryQueuedCount); - $queryQueued = mysql_real_escape_string($queryQueued); - - /* either look for queued app data entries */ - /* or ones that match the given id */ - if($queryQueuedCount) - { - $selectTerms = "count(*) as queued_appdata"; - $additionalTerms = "AND appData.queued='true'"; - } else if($queryQueued) - { - $selectTerms = "appData.*, appVersion.appId AS appId"; - $additionalTerms = "AND appData.queued='true'"; - } else - { - $selectTerms = "appData.*, appVersion.appId AS appId"; - $additionalTerms = "AND id='".$iAppDataId."'"; - } - - if($this->hasPriv("admin")) - { - $sQuery = "SELECT ".$selectTerms." - FROM appData,appVersion - WHERE appVersion.versionId = appData.versionId - ".$additionalTerms.";"; - } else - { - /* select versions where we supermaintain the application or where */ - /* we maintain the appliation, and where the versions we supermaintain */ - /* or maintain are in the appData list */ - /* then apply some additional terms */ - $sQuery = "select ".$selectTerms." from appMaintainers, appVersion, appData where - ( - ((appMaintainers.appId = appVersion.appId) AND - (appMaintainers.superMaintainer = '1')) - OR - ((appMaintainers.versionId = appVersion.versionId) - AND (appMaintainers.superMaintainer = '0')) - ) - AND appData.versionId = appVersion.versionId - AND appMaintainers.userId = '".mysql_real_escape_string($this->iUserId)."' - ".$additionalTerms.";"; - } - - return query_appdb($sQuery); - } /** * Delete appData @@ -684,31 +628,6 @@ class User { return false; } - function canDeleteAppDataId($iAppDataId) - { - /* admins can delete anything */ - if($this->hasPriv("admin")) - return true; - - $isMaintainer = false; - - /* if we aren't an admin we should see if we can find any results */ - /* for a query based on this appDataId, if we can then */ - /* we have permission to delete the entry */ - $hResult = $this->getAppDataQuery($iAppDataId, false, false); - if(!$hResult) - return false; - - if(mysql_num_rows($hResult) > 0) - $isMaintainer = true; - - /* if this user maintains the app data, they can delete it */ - if($isMaintainer) - return true; - - return false; - } - /***************************/ /* application permissions */ function canViewApplication($oApp)

1 0

appdb/include menu.php
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31064 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 11:54:17 Modified files: include : menu.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Include <a> links for menu items. This is necessary for browsers without JavaScript and it makes it possible to see the url the link is pointing to Patch: http://cvs.winehq.org/patch.py?id=31064 Old revision New revision Changes Path 1.7 1.8 +7 -5 appdb/include/menu.php Index: appdb/include/menu.php diff -u -p appdb/include/menu.php:1.7 appdb/include/menu.php:1.8 --- appdb/include/menu.php:1.7 21 Apr 2007 16:54:17 -0000 +++ appdb/include/menu.php 21 Apr 2007 16:54:17 -0000 @@ -33,7 +33,7 @@ class htmlmenu { <tr class="topMenu"><td> <table width="100%" border="0" cellspacing="0" cellpadding="5"> '; - + } /* add a table row */ @@ -41,14 +41,16 @@ class htmlmenu { { if($shUrl) { - // we have a valid url, make the entire table row clickable and provide some highlighting - // for visual feedback + // we have a valid url, make the entire table row clickable and provide + // some highlighting for visual feedback html_tr_highlight_clickable($shUrl, "sideMenu", "#e0e6ff", "#ffffff"); - echo "<td width='100%' align=$sAlign><span class=MenuItem> <u>$sName</u></span></td>"; + echo "<td width='100%' align=$sAlign><span class=MenuItem> <u>". + "<a href=\"$shUrl\">$sName</a></u></span></td>"; echo "</tr>\n"; } else { - echo " <tr class=sideMenu><td width='100%' align=$sAlign><span class=menuItem> $sName</span></td></tr>\n"; + echo " <tr class=sideMenu><td width='100%' align=$sAlign><span ". + "class=menuItem> $sName</span></td></tr>\n"; } }

1 0

appdb/ ./addcomment.php ./appview.php include/ ...
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31063 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/20 21:30:22 Modified files: . : addcomment.php appview.php include : bugs.php comment.php monitor.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Objects should set class variables and call create() instead of passing the parameters into the create() function. Patch: http://cvs.winehq.org/patch.py?id=31063 Old revision New revision Changes Path 1.35 1.36 +7 -1 appdb/addcomment.php 1.99 1.100 +7 -2 appdb/appview.php 1.22 1.23 +19 -12 appdb/include/bugs.php 1.34 1.35 +8 -3 appdb/include/comment.php 1.14 1.15 +6 -3 appdb/include/monitor.php

1 0

appdb/ admin/adminAppQueue.php include/version ...
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31062 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/20 20:20:43 Modified files: admin : adminAppQueue.php include : version_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Display move test results table when processing a version Patch: http://cvs.winehq.org/patch.py?id=31062 Old revision New revision Changes Path 1.75 1.76 +2 -61 appdb/admin/adminAppQueue.php 1.3 1.4 +53 -0 appdb/include/version_queue.php Index: appdb/admin/adminAppQueue.php diff -u -p appdb/admin/adminAppQueue.php:1.75 appdb/admin/adminAppQueue.php:1.76 --- appdb/admin/adminAppQueue.php:1.75 21 Apr 2007 1:20:43 -0000 +++ appdb/admin/adminAppQueue.php 21 Apr 2007 1:20:43 -0000 @@ -64,49 +64,6 @@ function outputSearchTableForDuplicateFl } } -function display_move_test_to_versions_table($aVersionsIds,$icurrentVersionId) -{ - if ($aVersionsIds) - { - echo html_frame_start("","98%","",0); - echo "<table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"1\">\n\n"; - - echo "<tr class=color4>\n"; - echo " <td width=\"80\">Version</td>\n"; - echo " <td>Description</td>\n"; - echo " <td width=\"80\">Rating</td>\n"; - echo " <td width=\"80\">Wine version</td>\n"; - echo " <td width=\"40\">Comments</td>\n"; - echo "</tr>\n\n"; - - $c = 0; - foreach($aVersionsIds as $iVersionId) - { - $oVersion = new Version($iVersionId); - if ($oVersion->sQueued == 'false') - { - // set row color - $sBgColor = ($c % 2 == 0) ? "color0" : "color1"; - - //display row - echo "<tr class=$sBgColor>\n"; - echo " <td>".html_ahref($oVersion->sName,"adminAppQueue.php?sSub=movetest&sAppType=version&iVersionId=".$icurrentVersionId."&iVersionIdMergeTo=".$oVersion->iVersionId)."</td>\n"; - - echo " <td>".util_trim_description($oVersion->sDescription)."</td>\n"; - echo " <td align=center>".$oVersion->sTestedRating."</td>\n"; - echo " <td align=center>".$oVersion->sTestedRelease."</td>\n"; - echo " <td align=center>".Comment::get_comment_count_for_versionid($oVersion->iVersionId)."</td>\n"; - echo "</tr>\n\n"; - - $c++; - } - } - echo "</table>\n"; - echo html_frame_end("Click the Version Name to view the details of that Version"); - } -} - - //deny access if not logged in or not a super maintainer of any applications if(!$_SESSION['current']->hasPriv("admin") && !$_SESSION['current']->isSuperMaintainer()) util_show_error_page_and_exit("Insufficient privileges."); @@ -294,25 +251,9 @@ if ($aClean['sSub']) "bIsRejected=$sIsRejected&sTitle=".$aClean['sAppType']."%20Queue"); if (!$oApp) //app version - { - echo html_frame_start("Potential duplicate versions in the database","90%","",0); - $oAppForVersion = new Application($oVersion->iAppId); - Version::display_approved($oAppForVersion->aVersionsIds); - echo html_frame_end(" "); - - echo html_frame_start("Move test to version","90%","",0); - display_move_test_to_versions_table($oAppForVersion->aVersionsIds,$oVersion->iVersionId); - echo html_frame_end(" "); - - //help - echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n"; - echo "<p>This is the full view of the application version waiting to be approved. \n"; - echo "If you approve this application version an email will be sent to the author of the submission.<p>\n"; + { + // Version handling moved to objectManager - echo "<b>App Version</b> This type of application will be nested under the selected application parent.\n"; - echo "<p>Click delete to remove the selected item from the queue an email will automatically be sent to the\n"; - echo "submitter to let him know the item was deleted.</p>\n\n"; - echo "</td></tr></table></div>\n\n"; } else // application { echo html_frame_start("Potential duplicate applications in the database", "90%", "", 0); Index: appdb/include/version_queue.php diff -u -p appdb/include/version_queue.php:1.3 appdb/include/version_queue.php:1.4 --- appdb/include/version_queue.php:1.3 21 Apr 2007 1:20:43 -0000 +++ appdb/include/version_queue.php 21 Apr 2007 1:20:43 -0000 @@ -71,6 +71,7 @@ class version_queue function outputEditor() { + $this->displayMoveTestTable(); $this->oVersion->outputEditor(); /* Allow the user to apply as maintainer if this is a new version. @@ -154,6 +155,58 @@ class version_queue { return TRUE; } + + function displayMoveTestTable() + { + $oApp = new application($this->oVersion->iAppId); + + echo html_frame_start("Move test to version","90%","",0); + echo "<table width=\"100%\" border=\"0\" cellpadding=\"3\" ". + "cellspacing=\"1\">\n\n"; + + echo html_tr(array( + array("Version", 'width="80"'), + "Description", + array("Rating", 'width="80"'), + array("Wine version", 'width="80"'), + array("Comments", 'width="40"'), + array("Move test results", 'width="80"') + ), + "color4"); + + $i = 0; + foreach($oApp->aVersionsIds as $iVersionId) + { + $oVersion = new Version($iVersionId); + if ($oVersion->sQueued == 'false') + { + //display row + echo html_tr(array( + $oVersion->objectMakeLink(), + util_trim_description($oVersion->sDescription), + array($oVersion->sTestedRating, 'align="center"'), + array($oVersion->sTestedRelease, 'align="center"'), + array(Comment::get_comment_count_for_versionid( + $oVersion->iVersionId), 'align="center"'), + html_ahref("Move here", + "admin/adminAppQueue.php?sSub=movetest&sAppType=version&". + "iVersionId=" + .$this->oVersion->iVersionId."&iVersionIdMergeTo=". + $oVersion->iVersionId) + ), + ($i % 2) ? "color0" : "color1"); + + $i++; + } + } + echo "</table>\n"; + echo html_frame_end(" "); + } + + function objectDisplayQueueProcessingHelp() + { + version::objectDisplayQueueProcessingHelp(); + } } ?>

1 0

appdb/include downloadurl.php version_queue.php
by WineHQ April 21, 2007

April 21, 2007

ChangeSet ID: 31061 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/20 20:17:38 Modified files: include : downloadurl.php version_queue.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Correct a few undefined variable errors brought out by the unit tests Patch: http://cvs.winehq.org/patch.py?id=31061 Old revision New revision Changes Path 1.11 1.12 +1 -0 appdb/include/downloadurl.php 1.2 1.3 +2 -1 appdb/include/version_queue.php Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.11 appdb/include/downloadurl.php:1.12 --- appdb/include/downloadurl.php:1.11 21 Apr 2007 1:17:38 -0000 +++ appdb/include/downloadurl.php 21 Apr 2007 1:17:38 -0000 @@ -301,6 +301,7 @@ class downloadurl /* Process a form made only for submitting one URL */ function processFormSingle($iVersionId, $aValues, $bUnQueue = FALSE) { + $iId = null; if($hResult = appData::getData($iVersionId, "downloadurl", TRUE, TRUE)) { $oObject = mysql_fetch_object($hResult); Index: appdb/include/version_queue.php diff -u -p appdb/include/version_queue.php:1.2 appdb/include/version_queue.php:1.3 --- appdb/include/version_queue.php:1.2 21 Apr 2007 1:17:38 -0000 +++ appdb/include/version_queue.php 21 Apr 2007 1:17:38 -0000 @@ -9,11 +9,12 @@ class version_queue function version_queue($iVersionId = null) { $this->oVersion = new version($iVersionId); + $iTestingId = null; if($iVersionId) { $iTestingId = testData::getNewestTestIdFromVersionId($iVersionId, - $this->oVersion->sQueued); + $this->oVersion->sQueued); } $this->oTestDataQueue = new testData_queue($iTestingId);

1 0