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

appdb/ cron/cleanup.php include/session.php
by WineHQ July 8, 2006

July 8, 2006

ChangeSet ID: 26351 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/08 16:49:49 Modified files: cron : cleanup.php include : session.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add cron cleanup function to purge expired sessions from session_list table Patch: http://cvs.winehq.org/patch.py?id=26351 Old revision New revision Changes Path 1.28 1.29 +32 -1 appdb/cron/cleanup.php 1.12 1.13 +7 -3 appdb/include/session.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.28 appdb/cron/cleanup.php:1.29 --- appdb/cron/cleanup.php:1.28 8 Jul 2006 21:49:49 -0000 +++ appdb/cron/cleanup.php 8 Jul 2006 21:49:49 -0000 @@ -72,9 +72,14 @@ notifyAdminsOfCleanupExecution($usersWar /* check to see if there are orphaned versions in the database */ orphanVersionCheck(); -/* check to see if we have any orphaned messages stuck in sessionMessages table */ +/* check and purge any orphaned messages stuck in sessionMessages table */ orphanSessionMessagesCheck(); +/* check and purge any expired sessions from the session_list table */ +orphanSessionListCheck(); + + + /* Users that are unwarned and inactive since $iMonths */ function unwarnedAndInactiveSince($iMonths) @@ -197,3 +202,29 @@ function orphanSessionMessagesCheck() $sQuery = "DELETE from sessionMessages where TO_DAYS(NOW()) - TO_DAYS(time) > ?"; $hResult = query_parameters($sQuery, $iSessionMessageDayLimit); } + +/* this function checks to see if we have any orphaned sessions */ +/* sessions need to be expired or the session_list table will grow */ +/* by one row each time a user logs */ +function orphanSessionListCheck() +{ + /* get a count of the messages older than $iSessionListDayLimit */ + $sQuery = "SELECT count(*) as cnt from session_list where TO_DAYS(NOW()) - TO_DAYS(stamp) > ?"; + $hResult = query_parameters($sQuery, SESSION_DAYS_TO_EXPIRE + 2); + + $oRow = mysql_fetch_object($hResult); + $iMessages = $oRow->cnt; + + $sMsg = "Found ".$iMessages." sessions that have expired after ".(SESSION_DAYS_TO_EXPIRE + 2)." days\r\n"; + $sMsg.= " Purging these sessions.\r\n"; + + $sSubject = "Sessions expired\r\n"; + + $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ + if($sEmail) + mail_appdb($sEmail, $sSubject, $sMsg); + + /* purge the messages older than $iSessionMessageDayLimit */ + $sQuery = "DELETE from session_list where TO_DAYS(NOW()) - TO_DAYS(stamp) > ?"; + $hResult = query_parameters($sQuery, SESSION_DAYS_TO_EXPIRE + 2); +} Index: appdb/include/session.php diff -u -p appdb/include/session.php:1.12 appdb/include/session.php:1.13 --- appdb/include/session.php:1.12 8 Jul 2006 21:49:49 -0000 +++ appdb/include/session.php 8 Jul 2006 21:49:49 -0000 @@ -5,6 +5,9 @@ * sessions are stored in a mysql table */ +/* the number of days a session cookie is flaged to last */ +define(SESSION_DAYS_TO_EXPIRE, 2); + class session { // create session object @@ -28,9 +31,9 @@ class session array(&$this, "_gc") ); - // default lifetime on session cookie (90 days) + // default lifetime on session cookie (SESSION_DAYS_TO_EXPIRE days) session_set_cookie_params( - (60*60*24*90), + (60*60*24*SESSION_DAYS_TO_EXPIRE), '/' ); @@ -95,7 +98,8 @@ class session // clear old sessions (moved into a separate cron process) function _gc ($maxlifetime) { - query_parameters("DELETE FROM session_list WHERE to_days(now()) - to_days(stamp) >= 7"); + query_parameters("DELETE FROM session_list WHERE to_days(now()) - to_days(stamp) >= '?'", + SESSION_DAYS_TO_EXPIRE); return true; }

1 0

appdb/include incl.php
by WineHQ July 8, 2006

July 8, 2006

ChangeSet ID: 26350 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/08 14:05:28 Modified files: include : incl.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix backward compatibility for bug ids. bug_id from bugzilla is the bug number not the internal buglinkid Patch: http://cvs.winehq.org/patch.py?id=26350 Old revision New revision Changes Path 1.34 1.35 +3 -3 appdb/include/incl.php Index: appdb/include/incl.php diff -u -p appdb/include/incl.php:1.34 appdb/include/incl.php:1.35 --- appdb/include/incl.php:1.34 8 Jul 2006 19: 5:28 -0000 +++ appdb/include/incl.php 8 Jul 2006 19: 5:28 -0000 @@ -53,10 +53,10 @@ if(isset($_REQUEST['appId'])) $_REQUEST['iAppId'] = $_REQUEST['appId']; unset($_REQUEST['appId']); } -if(isset($_REQUEST['buglinkId'])) +if(isset($_REQUEST['bug_id'])) { - $_REQUEST['iBuglinkId'] = $_REQUEST['buglinkId']; - unset($_REQUEST['buglinkId']); + $_REQUEST['iBugId'] = $_REQUEST['bug_id']; + unset($_REQUEST['bug_id']); } if(isset($_REQUEST['catId'])) {

1 0

appdb/admin adminBugs.php
by WineHQ July 8, 2006

July 8, 2006

ChangeSet ID: 26349 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/08 14:03:38 Modified files: admin : adminBugs.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix incorrect include, should be 'bugs.php' not 'bug.php' Patch: http://cvs.winehq.org/patch.py?id=26349 Old revision New revision Changes Path 1.10 1.11 +1 -1 appdb/admin/adminBugs.php Index: appdb/admin/adminBugs.php diff -u -p appdb/admin/adminBugs.php:1.10 appdb/admin/adminBugs.php:1.11 --- appdb/admin/adminBugs.php:1.10 8 Jul 2006 19: 3:38 -0000 +++ appdb/admin/adminBugs.php 8 Jul 2006 19: 3:38 -0000 @@ -8,7 +8,7 @@ */ require("path.php"); require(BASE."include/incl.php"); -require_once(BASE."include/bug.php"); +require_once(BASE."include/bugs.php"); $aClean = array(); //array of filtered user input

1 0

appdb/. testResults.php
by WineHQ July 8, 2006

July 8, 2006

ChangeSet ID: 26348 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/08 00:02:22 Modified files: . : testResults.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Revert test result filtering changes until we can figure out how to deal with xinha variable names that don't match our internal ones Patch: http://cvs.winehq.org/patch.py?id=26348 Old revision New revision Changes Path 1.12 1.13 +9 -1 appdb/testResults.php Index: appdb/testResults.php diff -u -p appdb/testResults.php:1.12 appdb/testResults.php:1.13 --- appdb/testResults.php:1.12 8 Jul 2006 5: 2:22 -0000 +++ appdb/testResults.php 8 Jul 2006 5: 2:22 -0000 @@ -5,12 +5,20 @@ require("path.php"); require(BASE."include/incl.php"); -require(BASE."include/filter.php"); require_once(BASE."include/tableve.php"); require_once(BASE."include/application.php"); require_once(BASE."include/testResults.php"); require_once(BASE."include/distributions.php"); +$aClean = array(); //array of filtered user input + +$aClean['sSub'] = makeSafe($_REQUEST['sSub']); +$aClean['iTestingId'] = makeSafe($_REQUEST['iTestingId']); +$aClean['iVersionId'] = makeSafe($_REQUEST['iVersionId']); +$aClean['iDistributionId'] = makeSafe($_REQUEST['iDistributionId']); +$aClean['sDistribution'] = makeSafe($_REQUEST['sDistribution']); + + if ($aClean['sSub']) { $oTest = new testData($aClean['iTestingId']);

1 0

appdb/. appview.php
by WineHQ July 7, 2006

July 7, 2006

ChangeSet ID: 26347 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 14:24:33 Modified files: . : appview.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Variable is $iAppId, not $appId Patch: http://cvs.winehq.org/patch.py?id=26347 Old revision New revision Changes Path 1.92 1.93 +1 -1 appdb/appview.php Index: appdb/appview.php diff -u -p appdb/appview.php:1.92 appdb/appview.php:1.93 --- appdb/appview.php:1.92 7 Jul 2006 19:24:33 -0000 +++ appdb/appview.php 7 Jul 2006 19:24:33 -0000 @@ -56,7 +56,7 @@ function display_catpath($catId, $appId, */ function display_bundle($iAppId) { - $oApp = new Application($appId); + $oApp = new Application($iAppId); $hResult = query_parameters("SELECT appFamily.appId, appName, description FROM appBundle, appFamily ". "WHERE appFamily.queued='false' AND bundleId = '?' AND appBundle.appId = appFamily.appId", $iAppId);

1 0

appdb/include application.php
by WineHQ July 7, 2006

July 7, 2006

ChangeSet ID: 26346 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 14:23:58 Modified files: include : application.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> application::display() should use the class internal iAppId instead of any $_REQUEST data Patch: http://cvs.winehq.org/patch.py?id=26346 Old revision New revision Changes Path 1.61 1.62 +2 -6 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.61 appdb/include/application.php:1.62 --- appdb/include/application.php:1.61 7 Jul 2006 19:23:58 -0000 +++ appdb/include/application.php 7 Jul 2006 19:23:58 -0000 @@ -514,10 +514,6 @@ class Application { /* display this application */ function display() { - $aClean = array(); //array of filtered user input - - $aClean['iAppId'] = makeSafe($_REQUEST['iAppId']); - /* is this user supposed to view this version? */ if(!$_SESSION['current']->canViewApplication($this)) util_show_error_page_and_exit("Something went wrong with the application or version id"); @@ -557,7 +553,7 @@ class Application { // optional links $result = query_parameters("SELECT * FROM appData WHERE appId = '?' AND versionID = 0 AND type = 'url'", - $aClean['iAppId']); + $this->iAppId); if($result && mysql_num_rows($result) > 0) { echo " <tr class=\"color1\"><td> <b>Links</b></td><td>\n"; @@ -614,7 +610,7 @@ class Application { if($_SESSION['current']->isSuperMaintainer($this->iAppId) || $_SESSION['current']->hasPriv("admin")) { - echo ' <form method="post" name="sEdit" action="admin/editAppFamily.php"><input type="hidden" name="iAppId" value="'.$aClean['iAppId'].'"><input type="submit" value="Edit Application" class="button"></form>'; + echo ' <form method="post" name="sEdit" action="admin/editAppFamily.php"><input type="hidden" name="iAppId" value="'.$this->iAppId.'"><input type="submit" value="Edit Application" class="button"></form>'; } if($_SESSION['current']->isLoggedIn()) {

1 0

appdb/include version.php
by WineHQ July 7, 2006

July 7, 2006

ChangeSet ID: 26345 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 14:22:33 Modified files: include : version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> class version uses testResults so include it in version.php Patch: http://cvs.winehq.org/patch.py?id=26345 Old revision New revision Changes Path 1.67 1.68 +1 -0 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.67 appdb/include/version.php:1.68 --- appdb/include/version.php:1.67 7 Jul 2006 19:22:33 -0000 +++ appdb/include/version.php 7 Jul 2006 19:22:33 -0000 @@ -9,6 +9,7 @@ require_once(BASE."include/url.php"); require_once(BASE."include/screenshot.php"); require_once(BASE."include/bugs.php"); require_once(BASE."include/util.php"); +require_once(BASE."include/testResults.php"); /** * Version class for handling versions.

1 0

appdb/. appview.php
by WineHQ July 7, 2006

July 7, 2006

ChangeSet ID: 26344 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 13:50:45 Modified files: . : appview.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Revert filtering changes in appview.php as they impact all of the classes downstream that haven't been updated Patch: http://cvs.winehq.org/patch.py?id=26344 Old revision New revision Changes Path 1.91 1.92 +7 -1 appdb/appview.php Index: appdb/appview.php diff -u -p appdb/appview.php:1.91 appdb/appview.php:1.92 --- appdb/appview.php:1.91 7 Jul 2006 18:50:45 -0000 +++ appdb/appview.php 7 Jul 2006 18:50:45 -0000 @@ -20,7 +20,6 @@ // application environment require("path.php"); require(BASE."include/incl.php"); -require(BASE."include/filter.php"); require_once(BASE."include/application.php"); require_once(BASE."include/appdb.php"); require_once(BASE."include/vote.php"); @@ -28,6 +27,13 @@ require_once(BASE."include/category.php" require_once(BASE."include/maintainer.php"); require_once(BASE."include/monitor.php"); +$aClean = array(); //array of filtered user input + +$aClean['iAppId'] = makeSafe($_REQUEST['iAppId']); +$aClean['iVersionId'] = makeSafe($_REQUEST['iVersionId']); +$aClean['sSub'] = makeSafe($_REQUEST['sSub']); +$aClean['iBuglinkId'] = makeSafe($_REQUEST['iBuglinkId']); + $oApp = new Application($aClean['iAppId']); $oVersion = new Version($aClean['iVersionId']);

1 0

appdb/. preferences.php
by WineHQ July 7, 2006

July 7, 2006

ChangeSet ID: 26343 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 13:18:09 Modified files: . : preferences.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Stop using global variables. Reorder functions so we don't have functions in the middle of executing code. Rename a couple of variables to match our current naming convention Patch: http://cvs.winehq.org/patch.py?id=26343 Old revision New revision Changes Path 1.31 1.32 +46 -49 appdb/preferences.php Index: appdb/preferences.php diff -u -p appdb/preferences.php:1.31 appdb/preferences.php:1.32 --- appdb/preferences.php:1.31 7 Jul 2006 18:18: 9 -0000 +++ appdb/preferences.php 7 Jul 2006 18:18: 9 -0000 @@ -25,48 +25,8 @@ include("path.php"); include(BASE."include/incl.php"); -$aClean = array(); //array of filtered user input - -$aClean['iUserId'] = makeSafe($_REQUEST['iUserId']); -$aClean['iLimit'] = makeSafe($_REQUEST['iLimit']); -$aClean['sOrderBy'] = makeSafe($_REQUEST['sOrderBy']); -$aClean['sUserPassword'] = makeSafe($_REQUEST['sUserPassword']); -$aClean['sUserPassword2'] = makeSafe($_REQUEST['sUserPassword2']); -$aClean['sUserEmail'] = makeSafe($_REQUEST['sUserEmail']); -$aClean['sUserRealname'] = makeSafe($_REQUEST['sUserRealname']); -$aClean['sWineRelease'] = makeSafe($_REQUEST['sWineRelease']); -$aClean['sHasAdmin'] = makeSafe($_POST['sHasAdmin']); - -/* filter all of the preferences */ -while(list($key, $value) = each($_REQUEST)) +function build_prefs_list($oUser) { - if(ereg("^pref_(.+)$", $key, $arr)) - $aClean[$key] = makeSafe($value); -} - - - - -if(!$_SESSION['current']->isLoggedIn()) - util_show_error_page_and_exit("You must be logged in to edit preferences"); - -// we come from the administration to edit an user -if($_SESSION['current']->hasPriv("admin") && - is_numeric($aClean['iUserId']) && - is_numeric($aClean['iLimit']) && - in_array($aClean['sOrderBy'],array("email","realname","created")) -) -{ - $oUser = new User($aClean['iUserId']); -} else -{ - $oUser = &$_SESSION['current']; -} - - -function build_prefs_list() -{ - global $oUser; $hResult = query_parameters("SELECT * FROM prefs_list ORDER BY id"); while($hResult && $r = mysql_fetch_object($hResult)) { @@ -93,10 +53,8 @@ function build_prefs_list() } } -function show_user_fields() +function show_user_fields($oUser) { - global $oUser; - $sUserRealname = $oUser->sRealname; $sUserEmail = $oUser->sEmail; $sWineRelease = $oUser->sWineRelease; @@ -112,15 +70,54 @@ function show_user_fields() echo "</td></tr>"; } + +$aClean = array(); //array of filtered user input + +$aClean['iUserId'] = makeSafe($_REQUEST['iUserId']); +$aClean['iLimit'] = makeSafe($_REQUEST['iLimit']); +$aClean['sOrderBy'] = makeSafe($_REQUEST['sOrderBy']); +$aClean['sUserPassword'] = makeSafe($_REQUEST['sUserPassword']); +$aClean['sUserPassword2'] = makeSafe($_REQUEST['sUserPassword2']); +$aClean['sUserEmail'] = makeSafe($_REQUEST['sUserEmail']); +$aClean['sUserRealname'] = makeSafe($_REQUEST['sUserRealname']); +$aClean['sWineRelease'] = makeSafe($_REQUEST['sWineRelease']); +$aClean['sHasAdmin'] = makeSafe($_POST['sHasAdmin']); + +/* filter all of the preferences */ +while(list($sKey, $sValue) = each($_REQUEST)) +{ + if(ereg("^pref_(.+)$", $sKey, $arr)) + $aClean[$sKey] = makeSafe($sValue); +} + + + + +if(!$_SESSION['current']->isLoggedIn()) + util_show_error_page_and_exit("You must be logged in to edit preferences"); + +// we come from the administration to edit an user +if($_SESSION['current']->hasPriv("admin") && + is_numeric($aClean['iUserId']) && + is_numeric($aClean['iLimit']) && + in_array($aClean['sOrderBy'],array("email","realname","created")) +) +{ + $oUser = new User($aClean['iUserId']); +} else +{ + $oUser = &$_SESSION['current']; +} + if($_POST) { - while(list($key, $value) = each($aClean)) + while(list($sKey, $sValue) = each($aClean)) { /* if a parameter lacks 'pref_' at its head it isn't a */ /* preference so skip over processing it */ - if(!ereg("^pref_(.+)$", $key, $arr)) + if(!ereg("^pref_(.+)$", $sKey, $arr)) continue; - $oUser->setPref($arr[1], $value); + $oUser->setPref($arr[1], $sValue); } /* make sure the user enters the same password twice */ @@ -180,10 +177,10 @@ if($oUser->iUserId == $aClean['iUserId'] echo html_frame_start("Preferences for ".$oUser->sRealname, "80%"); echo html_table_begin("width='100%' border=0 align=left cellspacing=0 class='box-body'"); -show_user_fields(); +show_user_fields($oUser); // if we don't manage another user -if($oUser->iUserId != $aClean['iUserId']) build_prefs_list(); +if($oUser->iUserId != $aClean['iUserId']) build_prefs_list($oUser); echo html_table_end(); echo html_frame_end();

1 0

appdb/ ./account.php ./addcomment.php ./appbro ...
by WineHQ July 7, 2006

July 7, 2006

ChangeSet ID: 26342 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 13:14:54 Modified files: . : account.php addcomment.php appbrowse.php appdbStats.php appimage.php appsubmit.php appview.php deletecomment.php distributionView.php index.php maintainerdelete.php maintainersubmit.php screenshots.php search.php testResults.php vendorview.php viewScreenshots.php votestats.php admin : addAppNote.php addCategory.php adminAppDataQueue.php adminAppQueue.php adminBugs.php adminMaintainerQueue.php adminMaintainers.php adminScreenshots.php adminTestResults.php deleteAny.php editAppFamily.php editAppNote.php editAppVersion.php editDistribution.php editVendor.php moveAppVersion.php resubmitRejectedApps.php cron : cleanup.php help : index.php include : application.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Clean up includes. Make 'path.php' and 'incl.php' required includes. Switch to using require_once() for including files in /include so we can have include/*.php files include their own dependencies rather than figuring out that to include A.php we need to include B.php Patch: http://cvs.winehq.org/patch.py?id=26342 Old revision New revision Changes Path 1.33 1.34 +2 -2 appdb/account.php 1.32 1.33 +2 -3 appdb/addcomment.php 1.20 1.21 +3 -3 appdb/appbrowse.php 1.10 1.11 +2 -3 appdb/appdbStats.php 1.24 1.25 +1 -2 appdb/appimage.php 1.53 1.54 +6 -3 appdb/appsubmit.php 1.90 1.91 +7 -9 appdb/appview.php 1.29 1.30 +2 -3 appdb/deletecomment.php 1.16 1.17 +3 -3 appdb/distributionView.php 1.36 1.37 +1 -2 appdb/index.php 1.22 1.23 +3 -3 appdb/maintainerdelete.php 1.30 1.31 +3 -3 appdb/maintainersubmit.php 1.38 1.39 +3 -3 appdb/screenshots.php 1.20 1.21 +1 -2 appdb/search.php 1.11 1.12 +3 -4 appdb/testResults.php 1.21 1.22 +3 -3 appdb/vendorview.php 1.5 1.6 +4 -5 appdb/viewScreenshots.php 1.24 1.25 +2 -2 appdb/votestats.php 1.28 1.29 +2 -3 appdb/admin/addAppNote.php 1.14 1.15 +2 -2 appdb/admin/addCategory.php 1.28 1.29 +6 -4 appdb/admin/adminAppDataQueue.php 1.63 1.64 +3 -4 appdb/admin/adminAppQueue.php 1.9 1.10 +2 -3 appdb/admin/adminBugs.php 1.30 1.31 +6 -6 appdb/admin/adminMaintainerQueue.php 1.25 1.26 +1 -1 appdb/admin/adminMaintainers.php 1.12 1.13 +1 -2 appdb/admin/adminScreenshots.php 1.10 1.11 +4 -4 appdb/admin/adminTestResults.php 1.20 1.21 +2 -3 appdb/admin/deleteAny.php 1.41 1.42 +4 -5 appdb/admin/editAppFamily.php 1.27 1.28 +2 -3 appdb/admin/editAppNote.php 1.39 1.40 +4 -4 appdb/admin/editAppVersion.php 1.8 1.9 +2 -2 appdb/admin/editDistribution.php 1.14 1.15 +2 -2 appdb/admin/editVendor.php 1.8 1.9 +4 -4 appdb/admin/moveAppVersion.php 1.6 1.7 +3 -5 appdb/admin/resubmitRejectedApps.php 1.27 1.28 +3 -3 appdb/cron/cleanup.php 1.9 1.10 +2 -2 appdb/help/index.php 1.60 1.61 +1 -0 appdb/include/application.php

1 0