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

appdb/include user.php version.php
by WineHQ 21 Apr '07

21 Apr '07

ChangeSet ID: 31080 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 14:50:52 Modified files: include : user.php version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use version::mustBeQueued() instead of user function Patch: http://cvs.winehq.org/patch.py?id=31080 Old revision New revision Changes Path 1.91 1.92 +0 -12 appdb/include/user.php 1.117 1.118 +3 -6 appdb/include/version.php Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.91 appdb/include/user.php:1.92 --- appdb/include/user.php:1.91 21 Apr 2007 19:50:52 -0000 +++ appdb/include/user.php 21 Apr 2007 19:50:52 -0000 @@ -760,18 +760,6 @@ class User { return $this->isLoggedIn(); } - function versionCreatedMustBeQueued($oVersion) - { - if($this->hasPriv("admin")) - return false; - - if($this->isSupermaintainer($oVersion->iAppId)) - return false; - - return true; - } - - /** * Returns 'true' if the current user has the permission to delete * this version, 'false' otherwise Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.117 appdb/include/version.php:1.118 --- appdb/include/version.php:1.117 21 Apr 2007 19:50:52 -0000 +++ appdb/include/version.php 21 Apr 2007 19:50:52 -0000 @@ -87,10 +87,7 @@ class Version { if(!$_SESSION['current']->canCreateVersion()) return; - if($_SESSION['current']->versionCreatedMustBeQueued($this)) - $this->sQueued = 'true'; - else - $this->sQueued = 'false'; + $this->sQueued = $this->mustBeQueued() ? "true" : "false"; $hResult = query_parameters("INSERT INTO appVersion (versionName, description, maintainer_release, @@ -98,7 +95,7 @@ class Version { VALUES ('?', '?', '?', '?', '?', '?', '?', '?')", $this->sName, $this->sDescription, $this->sTestedRelease, $this->sTestedRating, $this->iAppId, - $_SESSION['current']->iUserId, $this->sQueued, + $_SESSION['current']->iUserId, $this->sQueued, $this->sLicense); if($hResult) @@ -1200,7 +1197,7 @@ class Version { if($_SESSION['current']->hasPriv("admin")) return FALSE; - else if($this->iVersionId) + if($this->iVersionId) { if(maintainer::isUserMaintainer($_SESSION['current'], $this->iVersionId)) return FALSE;

1 0

appdb/include downloadurl.php
by WineHQ 21 Apr '07

21 Apr '07

ChangeSet ID: 31079 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 14:46:17 Modified files: include : downloadurl.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix warnings in downloadurl::processForm(). Calling this method with inappropriate $aClean[] data is perfectly valid but in tht case the function should return silently Patch: http://cvs.winehq.org/patch.py?id=31079 Old revision New revision Changes Path 1.12 1.13 +6 -0 appdb/include/downloadurl.php Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.12 appdb/include/downloadurl.php:1.13 --- appdb/include/downloadurl.php:1.12 21 Apr 2007 19:46:17 -0000 +++ appdb/include/downloadurl.php 21 Apr 2007 19:46:17 -0000 @@ -301,6 +301,12 @@ class downloadurl /* Process a form made only for submitting one URL */ function processFormSingle($iVersionId, $aValues, $bUnQueue = FALSE) { + /* Calling this function without suitable input data is perfectly valid, + but in that case there is nothing to do here */ + if(empty($aValues['sDownloadUrlDescription']) || + empty($aValues['sDownloadUrlUrl'])) + return; + $iId = null; if($hResult = appData::getData($iVersionId, "downloadurl", TRUE, TRUE)) {

1 0

appdb/. contact.php
by WineHQ 21 Apr '07

21 Apr '07

ChangeSet ID: 31078 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 14:45:12 Modified files: . : contact.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Display user manager link in the contact form Patch: http://cvs.winehq.org/patch.py?id=31078 Old revision New revision Changes Path 1.1 1.2 +9 -0 appdb/contact.php Index: appdb/contact.php diff -u -p appdb/contact.php:1.1 appdb/contact.php:1.2 --- appdb/contact.php:1.1 21 Apr 2007 19:45:12 -0000 +++ appdb/contact.php 21 Apr 2007 19:45:12 -0000 @@ -36,6 +36,15 @@ if(!$aClean['sSubmit']) echo $error; echo "<form action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">"; + + /* User manager */ + if($_SESSION['current']->hasPriv("admin")) + { + echo "<p><a href=\"".BASE."preferences.php?iUserId=". + $oRecipient->iUserId."&sSearch=Administrator&iLimit". + "=100&sOrderBy=email\">User manager</a></p>"; + } + echo "<p>E-mail $oRecipient->sRealname.</p>"; echo html_table_begin("width\"100%\" border=\"0\" cellpadding=\"2\"". "cellspacing=\"2\"");

1 0

appdb/include appData.php screenshot.php user.php
by WineHQ 21 Apr '07

21 Apr '07

ChangeSet ID: 31077 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 14:44:10 Modified files: include : appData.php screenshot.php user.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Remove user::deleteAppData() and replace it with an appData function Patch: http://cvs.winehq.org/patch.py?id=31077 Old revision New revision Changes Path 1.15 1.16 +15 -0 appdb/include/appData.php 1.64 1.65 +3 -3 appdb/include/screenshot.php 1.90 1.91 +0 -17 appdb/include/user.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.15 appdb/include/appData.php:1.16 --- appdb/include/appData.php:1.15 21 Apr 2007 19:44:10 -0000 +++ appdb/include/appData.php 21 Apr 2007 19:44:10 -0000 @@ -37,6 +37,21 @@ class appData } } + function delete() + { + if(!$this->canEdit()) + return FALSE; + + $sQuery = "DELETE FROM appData WHERE id = '?'"; + + $hResult = query_parameters($sQuery, $this->iId); + + if(!$hResult) + return FALSE; + + return $hResult; + } + function listSubmittedBy($iUserId, $bQueued = true) { $hResult = query_parameters("SELECT * FROM appData WHERE Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.64 appdb/include/screenshot.php:1.65 --- appdb/include/screenshot.php:1.64 21 Apr 2007 19:44:10 -0000 +++ appdb/include/screenshot.php 21 Apr 2007 19:44:10 -0000 @@ -128,9 +128,9 @@ class Screenshot { */ function delete($bSilent=false) { - /* the user object should delete the app data entry */ - /* we can perform better permissions checking there */ - if($_SESSION['current']->deleteAppData($this->iScreenshotId)) + /* appData has a universal function for removing database entries */ + $oAppData = new appData($this->iScreenshotId); + if($oAppData->delete()) { /* make sure the screenshot and thumbnail is loaded */ /* up before we try to delete them */ Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.90 appdb/include/user.php:1.91 --- appdb/include/user.php:1.90 21 Apr 2007 19:44:10 -0000 +++ appdb/include/user.php 21 Apr 2007 19:44:10 -0000 @@ -316,23 +316,6 @@ class User { return ($this->isLoggedIn() && $this->getPref("send_email","yes")=="yes"); } - - /** - * Delete appData - */ - function deleteAppData($iAppDataId) - { - if(!$_SESSION['current']->canDeleteAppDataId($iAppDataId)) - return false; - - $hResult = query_parameters("DELETE from appData where id = '?' LIMIT 1", - $iAppDataId); - if($hResult) - return true; - - return false; - } - function getAppRejectQueueQuery($queryAppFamily) { /* escape input as we can't easily use query_parameters() */

1 0

appdb/include maintainer.php
by WineHQ 21 Apr '07

21 Apr '07

ChangeSet ID: 31076 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 13:23:11 Modified files: include : maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Display user name in the maintainer approval form Patch: http://cvs.winehq.org/patch.py?id=31076 Old revision New revision Changes Path 1.39 1.40 +8 -0 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.39 appdb/include/maintainer.php:1.40 --- appdb/include/maintainer.php:1.39 21 Apr 2007 18:23:11 -0000 +++ appdb/include/maintainer.php 21 Apr 2007 18:23:11 -0000 @@ -506,6 +506,14 @@ class maintainer echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; echo "<input type=\"hidden\" name=\"iMaintainerId\" ". "value=\"$this->iMaintainerId\" />"; + + /* User name */ + $oSubmitter = new user($this->iUserId); + echo html_tr(array( + array("<b>User name</b>", 'style="text-align:right" class="color0"'), + $oSubmitter->objectMakeLink() + )); + /** * Show the other maintainers of this application, if there are any */

1 0

appdb/include testData_queue.php
by WineHQ 21 Apr '07

21 Apr '07

ChangeSet ID: 31075 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 13:22:14 Modified files: include : testData_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix testData_queue's distribution handling. Only update the distribution if the name is set and avoid a misguiding message by not doing unQueue() on already unqueued distributions. Patch: http://cvs.winehq.org/patch.py?id=31075 Old revision New revision Changes Path 1.3 1.4 +11 -2 appdb/include/testData_queue.php Index: appdb/include/testData_queue.php diff -u -p appdb/include/testData_queue.php:1.3 appdb/include/testData_queue.php:1.4 --- appdb/include/testData_queue.php:1.3 21 Apr 2007 18:22:14 -0000 +++ appdb/include/testData_queue.php 21 Apr 2007 18:22:14 -0000 @@ -37,7 +37,10 @@ class testData_queue function unQueue() { $this->oTestData->unQueue(); - $this->oDistribution->unQueue(); + + /* Avoid a misguiding message about the distribution being unqueued */ + if($this->oDistribution->sQueued != "false") + $this->oDistribution->unQueue(); } function reject() @@ -48,7 +51,13 @@ class testData_queue function update() { $this->oTestData->update(); - $this->oDistribution->update(); + + /* If the distribution was already un-queued the form for editing it would + not have been displayed and getOutputEditorValues() wouldn't have + retrieved a valid sName for the distribution. If sName isn't valid + we shouldn't update the distribution */ + if($this->oDistribution->sName) + $this->oDistribution->update(); } function outputEditor()

1 0

appdb/include distribution.php
by WineHQ 21 Apr '07

21 Apr '07

ChangeSet ID: 31074 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 13:09:13 Modified files: include : distribution.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Repalce '"' with '"' in the distribution form. Otherwise we end up with broken <input> fields Patch: http://cvs.winehq.org/patch.py?id=31074 Old revision New revision Changes Path 1.25 1.26 +1 -0 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.25 appdb/include/distribution.php:1.26 --- appdb/include/distribution.php:1.25 21 Apr 2007 18: 9:13 -0000 +++ appdb/include/distribution.php 21 Apr 2007 18: 9:13 -0000 @@ -340,6 +340,7 @@ class distribution { { echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; + $this->sName = str_replace('"', '"', $this->sName); // Name echo html_tr(array( array("<b>Distribution Name</b>", 'class="color1"'),

1 0

appdb/include comment.php
by WineHQ 21 Apr '07

21 Apr '07

ChangeSet ID: 31073 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 13:05:32 Modified files: include : comment.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix comment creation. addcomment.php was passing a filled-in object to comment::create() which still expected values as parameters. Load data from the object instead Patch: http://cvs.winehq.org/patch.py?id=31073 Old revision New revision Changes Path 1.35 1.36 +8 -4 appdb/include/comment.php Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.35 appdb/include/comment.php:1.36 --- appdb/include/comment.php:1.35 21 Apr 2007 18: 5:32 -0000 +++ appdb/include/comment.php 21 Apr 2007 18: 5:32 -0000 @@ -55,11 +55,14 @@ class Comment { * Informs interested people about the creation. * Returns true on success, false on failure */ - function create($sSubject, $sBody, $iParentId=null, $iVersionId) + function create() { - $hResult = query_parameters("INSERT INTO appComments (parentId, versionId, subject, ". - "body, userId, time, hostname) VALUES ('?', '?', '?', '?', '?', ?, '?')", - $iParentId, $iVersionId, $sSubject, $sBody, + $hResult = query_parameters("INSERT INTO appComments + (parentId, versionId, subject, ". + "body, userId, time, hostname) + VALUES ('?', '?', '?', '?', '?', ?, '?')", + $this->iParentId, $this->iVersionId, + $this->sSubject, $this->sBody, $_SESSION['current']->iUserId, "NOW()", get_remote()); @@ -71,6 +74,7 @@ class Comment { // fetches e-mails from parent comments, all parents are notified that a // comment was added to the thread + $iParentId = $this->iParentId; while($iParentId) { $oParent = new Comment($iParentId);

1 0

appdb/include version_queue.php
by WineHQ 21 Apr '07

21 Apr '07

ChangeSet ID: 31072 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 13:03:25 Modified files: include : version_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Only display move test table for existing versions, not queued ones Patch: http://cvs.winehq.org/patch.py?id=31072 Old revision New revision Changes Path 1.4 1.5 +4 -1 appdb/include/version_queue.php Index: appdb/include/version_queue.php diff -u -p appdb/include/version_queue.php:1.4 appdb/include/version_queue.php:1.5 --- appdb/include/version_queue.php:1.4 21 Apr 2007 18: 3:25 -0000 +++ appdb/include/version_queue.php 21 Apr 2007 18: 3:25 -0000 @@ -71,7 +71,10 @@ class version_queue function outputEditor() { - $this->displayMoveTestTable(); + /* Display duplicate list if this is a an existing version */ + if($this->oVersion->iVersionId) + $this->displayMoveTestTable(); + $this->oVersion->outputEditor(); /* Allow the user to apply as maintainer if this is a new version.

1 0

appdb/ ./appsubmit.php include/sidebar_login.p ...
by WineHQ 21 Apr '07

21 Apr '07

ChangeSet ID: 31071 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/21 13:00:46 Modified files: . : appsubmit.php include : sidebar_login.php version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use objectManager to display a user's rejected versions Patch: http://cvs.winehq.org/patch.py?id=31071 Old revision New revision Changes Path 1.66 1.67 +0 -26 appdb/appsubmit.php 1.25 1.26 +13 -4 appdb/include/sidebar_login.php 1.116 1.117 +27 -44 appdb/include/version.php Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.66 appdb/appsubmit.php:1.67 --- appdb/appsubmit.php:1.66 21 Apr 2007 18: 0:46 -0000 +++ appdb/appsubmit.php 21 Apr 2007 18: 0:46 -0000 @@ -449,32 +449,6 @@ else // if ($aClean['sSub']) is not defi Application::showList($hResult); } - // get queued versions (only versions where application are not queued already) - $hResult = $_SESSION['current']->getAppRejectQueueQuery(false); // query for the app version - - if(!$hResult || !mysql_num_rows($hResult)) - { - //no apps in queue - echo html_frame_start("Version Queue","90%"); - echo '<p><b>The Resubmit Version Queue is empty.</b></p>',"\n"; - echo html_frame_end(" "); - } - else - { - //help - echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n"; - echo "<p>This is the list of versions waiting for re-submission or deletion.</p>\n"; - echo "<p>To view a submission, click on its name. From that page you can delete or edit and re-submit it into \n"; - echo "the AppDB .<br>\n"; - echo "<p>Note that versions linked to application that have not been approved yet are not displayed in this list.</p>\n"; - echo "the AppDB.<br>\n"; - echo "</td></tr></table></div>\n\n"; - - //show Version list - Version::showList($hResult); - - - } apidb_footer(); } Index: appdb/include/sidebar_login.php diff -u -p appdb/include/sidebar_login.php:1.25 appdb/include/sidebar_login.php:1.26 --- appdb/include/sidebar_login.php:1.25 21 Apr 2007 18: 0:46 -0000 +++ appdb/include/sidebar_login.php 21 Apr 2007 18: 0:46 -0000 @@ -39,12 +39,21 @@ function global_sidebar_login() { } } - /* Display the user's rejected applications/versions */ - $iAppsRejected = application::objectGetEntriesCount(true, true) + - version::objectGetEntriesCount(true, true); + /* Display the user's rejected applications */ + $iAppsRejected = application::objectGetEntriesCount(true, true); if($iAppsRejected && !$_SESSION['current']->hasPriv("admin")) { - $g->add("Review Rejected Apps ($iAppsRejected)", BASE."appsubmit.php", "center"); + $g->add("Review Rejected Apps ($iAppsRejected)", BASE."appsubmit.php", + "center"); + } + + /* Display the user's rejected versions */ + $iVersionsRejected = version::objectGetEntriesCount(true, true); + if($iVersionsRejected && !$_SESSION['current']->hasPriv("admin")) + { + $g->add("Review Rejected Versiosn ($iVersionsRejected)", + BASE."objectManager.php?sClass=version_queue&bIsRejected=true". + "&bIsQueue=true&sTitle=Rejected+Versions", "center"); } /* Display the user's rejected test results */ Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.116 appdb/include/version.php:1.117 --- appdb/include/version.php:1.116 21 Apr 2007 18: 0:46 -0000 +++ appdb/include/version.php 21 Apr 2007 18: 0:46 -0000 @@ -960,47 +960,6 @@ class Version { return $sLink; } - function showList($hResult) - { - //show applist - echo html_frame_start("","90%","",0); - echo "<table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\"> - <tr class=color4> - <td>Submission Date</td> - <td>Submitter</td> - <td>Vendor</td> - <td>Application</td> - <td>Version</td> - <td align=\"center\">Action</td> - </tr>"; - - $c = 1; - while($oRow = mysql_fetch_object($hResult)) - { - $oVersion = new Version($oRow->versionId); - $oApp = new Application($oVersion->iAppId); - $oSubmitter = new User($oVersion->iSubmitterId); - $oVendor = new Vendor($oApp->iVendorId); - $sVendor = $oVendor->sName; - if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } - echo "<tr class=\"$bgcolor\">\n"; - echo " <td>".print_date(mysqltimestamp_to_unixtimestamp($oVersion->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>".$sVendor."</td>\n"; - echo " <td>".$oApp->sName."</td>\n"; - echo " <td>".$oVersion->sName."</td>\n"; - echo " <td align=\"center\">[<a href=".$_SERVER['PHP_SELF']."?sAppType=version&sSub=view&iVersionId=".$oVersion->iVersionId.">process</a>]</td>\n"; - echo "</tr>\n\n"; - $c++; - } - echo "</table>\n\n"; - echo html_frame_end(" "); - } - // display the versions function display_approved($aVersionsIds) { @@ -1221,13 +1180,37 @@ class Version { { if($_SESSION['current']->hasPriv("admin")) return TRUE; - else if($this->iVersionId && - maintainer::isUserMaintainer($_SESSION['current'], $this->iVersionId)) - return TRUE; + + else if($this->iVersionId) + { + if(maintainer::isUserMaintainer($_SESSION['current'], $this->iVersionId)) + return TRUE; + + if($this->iSubmitterId == $_SESSION['current']->iUserId) + return TRUE; + + return FALSE; + } else return FALSE; } + function mustBeQueued() + { + if($_SESSION['current']->hasPriv("admin")) + return FALSE; + + else if($this->iVersionId) + { + if(maintainer::isUserMaintainer($_SESSION['current'], $this->iVersionId)) + return FALSE; + + return TRUE; + } + else + return TRUE; + } + function objectGetHeader() { $aCells = array(

1 0