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

appdb/. deletecomment.php commentview.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26331 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 12:16:42 Modified files: . : deletecomment.php commentview.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Enable filtering in commentview.php and deletecomment.php Patch: http://cvs.winehq.org/patch.py?id=26331 Old revision New revision Changes Path 1.28 1.29 +1 -6 appdb/deletecomment.php 1.12 1.13 +1 -10 appdb/commentview.php Index: appdb/deletecomment.php diff -u -p appdb/deletecomment.php:1.28 appdb/deletecomment.php:1.29 --- appdb/deletecomment.php:1.28 7 Jul 2006 17:16:42 -0000 +++ appdb/deletecomment.php 7 Jul 2006 17:16:42 -0000 @@ -13,15 +13,10 @@ // application environment include("path.php"); require(BASE."include/incl.php"); +require(BASE."include/filter.php"); require(BASE."include/application.php"); require(BASE."include/mail.php"); -$aClean = array(); //array of filtered user input - -$aClean['sWhy'] = makeSafe($_REQUEST['sWhy']); -$aClean['iCommentId'] = makeSafe($_REQUEST['iCommentId']); -$aClean['iDeleteIt'] = makeSafe($_REQUEST['iDeleteIt']); - $oComment = new Comment($aClean['iCommentId']); /** Index: appdb/commentview.php diff -u -p appdb/commentview.php:1.12 appdb/commentview.php:1.13 --- appdb/commentview.php:1.12 7 Jul 2006 17:16:42 -0000 +++ appdb/commentview.php 7 Jul 2006 17:16:42 -0000 @@ -10,20 +10,11 @@ */ include("path.php"); include(BASE."include/incl.php"); +include(BASE."include/filter.php"); require_once(BASE."include/comment.php"); -$aClean = array(); //array of filtered user input - -$aClean['iAppId'] = makeSafe($_REQUEST['iAppId']); -$aClean['iVersionId'] = makeSafe($_REQUEST['iVersionId']); -$aClean['iThreadId'] = makeSafe($_REQUEST['iThreadId']); - apidb_header("Comments"); - -if(!is_numeric($aClean['iAppId']) OR !is_numeric($aClean['iVersionId']) OR (!empty($aClean['iThreadId']) AND !is_numeric($aClean['iThreadId']))) - util_show_error_page_and_exit("Wrong IDs"); - view_app_comments($aClean['iVersionId'], $aClean['iThreadId']); apidb_footer();

1 0

appdb/. screenshots.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26330 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 12:06:26 Modified files: . : screenshots.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Enable filtering in screenshots.php Patch: http://cvs.winehq.org/patch.py?id=26330 Old revision New revision Changes Path 1.37 1.38 +1 -8 appdb/screenshots.php Index: appdb/screenshots.php diff -u -p appdb/screenshots.php:1.37 appdb/screenshots.php:1.38 --- appdb/screenshots.php:1.37 7 Jul 2006 17: 6:26 -0000 +++ appdb/screenshots.php 7 Jul 2006 17: 6:26 -0000 @@ -21,18 +21,11 @@ // application environment include("path.php"); require(BASE."include/incl.php"); +require(BASE."include/filter.php"); require_once(BASE."include/screenshot.php"); require(BASE."include/application.php"); require(BASE."include/mail.php"); -$aClean = array(); //array of filtered user input - -$aClean['sCmd'] = makeSafe($_REQUEST['sCmd']); -$aClean['iVersionId'] = makeSafe($_REQUEST['iVersionId']); -$aClean['sScreenshotDesc'] = makeSafe($_REQUEST['sScreenshotDesc']); -$aClean['iImageId'] = makeSafe($_REQUEST['iImageId']); -$aClean['iAppId'] = makeSafe($_REQUEST['iAppId']); - // we issued a command if($aClean['sCmd']) {

1 0

appdb/. testResults.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26329 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 12:05:08 Modified files: . : testResults.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Enable filtering in testResults.php Patch: http://cvs.winehq.org/patch.py?id=26329 Old revision New revision Changes Path 1.10 1.11 +1 -10 appdb/testResults.php Index: appdb/testResults.php diff -u -p appdb/testResults.php:1.10 appdb/testResults.php:1.11 --- appdb/testResults.php:1.10 7 Jul 2006 17: 5: 8 -0000 +++ appdb/testResults.php 7 Jul 2006 17: 5: 8 -0000 @@ -5,22 +5,13 @@ include("path.php"); require(BASE."include/incl.php"); +require(BASE."include/filter.php"); require(BASE."include/tableve.php"); require(BASE."include/application.php"); require(BASE."include/mail.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/. search.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26328 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 12:02:07 Modified files: . : search.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Enable filtering in search.php Patch: http://cvs.winehq.org/patch.py?id=26328 Old revision New revision Changes Path 1.19 1.20 +1 -4 appdb/search.php Index: appdb/search.php diff -u -p appdb/search.php:1.19 appdb/search.php:1.20 --- appdb/search.php:1.19 7 Jul 2006 17: 2: 7 -0000 +++ appdb/search.php 7 Jul 2006 17: 2: 7 -0000 @@ -12,12 +12,9 @@ // application environment include("path.php"); require(BASE."include/incl.php"); +require(BASE."include/filter.php"); require(BASE."include/application.php"); -$aClean = array(); //array of filtered user input - -$aClean['sSearchQuery'] = makeSafe($_REQUEST['sSearchQuery']); - apidb_header("Search Results"); perform_search_and_output_results($aClean['sSearchQuery']); apidb_footer();

1 0

appdb/ admin/adminMaintainerQueue.php include/ ...
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26327 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 11:44:41 Modified files: admin : adminMaintainerQueue.php include : maintainer.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Move getMaintainersUserIds...() to version::getMaintainersUserIds() and fixup callers of this function Patch: http://cvs.winehq.org/patch.py?id=26327 Old revision New revision Changes Path 1.29 1.30 +2 -1 appdb/admin/adminMaintainerQueue.php 1.11 1.12 +0 -24 appdb/include/maintainer.php 1.66 1.67 +24 -2 appdb/include/version.php Index: appdb/admin/adminMaintainerQueue.php diff -u -p appdb/admin/adminMaintainerQueue.php:1.29 appdb/admin/adminMaintainerQueue.php:1.30 --- appdb/admin/adminMaintainerQueue.php:1.29 7 Jul 2006 16:44:41 -0000 +++ appdb/admin/adminMaintainerQueue.php 7 Jul 2006 16:44:41 -0000 @@ -68,7 +68,8 @@ if ($aClean['sSub']) $firstDisplay = true; /* if false we need to fix up table rows appropriately */ - $other_users = getMaintainersUserIdsFromAppIdVersionId($oRow->versionId); + $oVersion = new Version($oRow->versionId); + $other_users = $oVersion->getMaintainersUserIds(); if($other_users) { $foundMaintainers = true; Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.11 appdb/include/maintainer.php:1.12 --- appdb/include/maintainer.php:1.11 7 Jul 2006 16:44:41 -0000 +++ appdb/include/maintainer.php 7 Jul 2006 16:44:41 -0000 @@ -4,30 +4,6 @@ /*****************************/ /* - * get the userIds of maintainers for a versionId - */ -function getMaintainersUserIdsFromAppIdVersionId($versionId) -{ - $retval = array(); - - /* early out if the versionId isn't valid */ - if($versionId == 0) - return $retval; - - $sQuery = "SELECT userId FROM ". - "appMaintainers WHERE versionId = '?';"; - $hResult = query_parameters($sQuery, $versionId); - $c = 0; - while($oRow = mysql_fetch_object($hResult)) - { - $retval[$c] = $oRow->userId; - $c++; - } - - return $retval; -} - -/* * get the userIds of super maintainers for this appId */ function getSuperMaintainersUserIdsFromAppId($appId) Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.66 appdb/include/version.php:1.67 --- appdb/include/version.php:1.66 7 Jul 2006 16:44:41 -0000 +++ appdb/include/version.php 7 Jul 2006 16:44:41 -0000 @@ -32,7 +32,7 @@ class Version { var $aTestingIds; // an array that contains the testingId of every test result linked to this version var $aMonitorIds; // an array that contains the monitorId of every monitor linked to this version - /** + /** * constructor, fetches the data. */ function Version($iVersionId = null) @@ -677,7 +677,7 @@ class Version { // display all maintainers of this application echo "<tr class=\"color0\"><td align=\"left\" colspan=\"2\"><b>Maintainers of this version:</b>\n"; echo "<table width=\"250\" border=\"0\">"; - $aMaintainers = getMaintainersUserIdsFromAppIdVersionId($this->iVersionId); + $aMaintainers = $this->getMaintainersUserIds(); $aSupermaintainers = getSuperMaintainersUserIdsFromAppId($this->iAppId); $aAllMaintainers = array_merge($aMaintainers,$aSupermaintainers); $aAllMaintainers = array_unique($aAllMaintainers); @@ -926,6 +926,28 @@ class Version { echo html_frame_end("Click the Version Name to view the details of that Version"); } } + + /* returns the maintainers of this version in an array */ + function getMaintainersUserIds() + { + $aMaintainers = array(); + + /* early out if the versionId isn't valid */ + if($this->iVersionId == 0) + return $aMaintainers; + + $sQuery = "SELECT userId FROM ". + "appMaintainers WHERE versionId = '?';"; + $hResult = query_parameters($sQuery, $this->iVersionId); + $iCount = 0; + while($oRow = mysql_fetch_object($hResult)) + { + $aMaintainers[$iCount] = $oRow->userId; + $iCount++; + } + + return $aMaintainers; + } } ?>

1 0

appdb/include filter.php config.php.sample
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26326 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 11:39:27 Modified files: include : filter.php config.php.sample Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Add an option to prevent filtering of cookies in the case where multiple web apps are hosted on the same virtualhost Patch: http://cvs.winehq.org/patch.py?id=26326 Old revision New revision Changes Path 1.5 1.6 +4 -11 appdb/include/filter.php 1.11 1.12 +1 -0 appdb/include/config.php.sample Index: appdb/include/filter.php diff -u -p appdb/include/filter.php:1.5 appdb/include/filter.php:1.6 --- appdb/include/filter.php:1.5 7 Jul 2006 16:39:27 -0000 +++ appdb/include/filter.php 7 Jul 2006 16:39:27 -0000 @@ -44,16 +44,8 @@ function filter_gpc() util_show_error_page_and_exit("Fatal error: ".$aKeys[$i]." should be an array."); break; default: - if($aKeys[$i]!="whq_appdb" && // don't filter the appdb session cookie - - // or any bugzilla cookies - $aKeys[$i]!="BUGLIST" && - $aKeys[$i]!="DEFAULTFORMAT" && - $aKeys[$i]!="Bugzilla_login" && - $aKeys[$i]!="LASTORDER" && - $aKeys[$i]!="Bugzilla_logincookie" && - $aKeys[$i]!="DEFAULTFORMAT" && - $aKeys[$i]!="MAX_FILE_SIZE") + // don't filter the AppDB session cookie and MAX_FILE_SIZE + if($aKeys[$i]!="whq_appdb" && $aKeys[$i]!="MAX_FILE_SIZE") { util_show_error_page_and_exit("Fatal error: type of variable ".$aKeys[$i]." is not recognized."); } @@ -66,6 +58,7 @@ function filter_gpc() $_REQUEST = array(); $_POST = array(); $_GET = array(); - $_COOKIES = array(); + if(APPDB_DONT_CLEAR_COOKIES_VAR != "1") + $_COOKIES = array(); } ?> Index: appdb/include/config.php.sample diff -u -p appdb/include/config.php.sample:1.11 appdb/include/config.php.sample:1.12 --- appdb/include/config.php.sample:1.11 7 Jul 2006 16:39:27 -0000 +++ appdb/include/config.php.sample 7 Jul 2006 16:39:27 -0000 @@ -8,6 +8,7 @@ * global params */ define("APPDB_DEBUG","0"); //turns debugging on/off +define("APPDB_DONT_CLEAR_COOKIES_VAR","0"); // set to 1 if you have more than one Web application on the same virtual host define("APPDB_THUMBNAIL_WIDTH","128"); // width of the screenshot's thumbnails define("APPDB_THUMBNAIL_HEIGHT","128"); // height of the screenshot's thumbnails define("APPDB_SCREENSHOT_MAXWIDTH","1024"); // width of the screenshot's thumbnails

1 0

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

07 Jul '06

ChangeSet ID: 26325 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 11:26:59 Modified files: . : appimage.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Enable filtering in appimage.php Patch: http://cvs.winehq.org/patch.py?id=26325 Old revision New revision Changes Path 1.23 1.24 +1 -6 appdb/appimage.php Index: appdb/appimage.php diff -u -p appdb/appimage.php:1.23 appdb/appimage.php:1.24 --- appdb/appimage.php:1.23 7 Jul 2006 16:26:59 -0000 +++ appdb/appimage.php 7 Jul 2006 16:26:59 -0000 @@ -18,14 +18,9 @@ // application environment include("path.php"); require(BASE."include/incl.php"); +require(BASE."include/filter.php"); require_once(BASE."include/screenshot.php"); -$aClean = array(); //array of filtered user input - -$aClean['iId'] = makeSafe($_REQUEST['iId']); -$aClean['sREQUEST_METHOD'] = makeSafe($_REQUEST['sREQUEST_METHOD']); -$aClean['bThumbnail'] = makeSafe($_REQUEST['bThumbnail']); - // an image doesn't have a link, so a cookie makes no sense header("Set-Cookie: "); header("Pragma: ");

1 0

appdb/include screenshot.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26324 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 11:25:43 Modified files: include : screenshot.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Fix showing of full size screenshots Patch: http://cvs.winehq.org/patch.py?id=26324 Old revision New revision Changes Path 1.42 1.43 +1 -1 appdb/include/screenshot.php Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.42 appdb/include/screenshot.php:1.43 --- appdb/include/screenshot.php:1.42 7 Jul 2006 16:25:43 -0000 +++ appdb/include/screenshot.php 7 Jul 2006 16:25:43 -0000 @@ -415,7 +415,7 @@ function get_thumbnail($id) $img = '<a href="'.apidb_fullurl("appimage.php"). '?iId='.$id. '" onclick="javascript:openWin(\''.apidb_fullurl("appimage.php"). - '?id='.$id.'\',\''.$randName.'\','. + '?iId='.$id.'\',\''.$randName.'\','. ($oScreenshot->oScreenshotImage->get_width() + 20).','. ($oScreenshot->oScreenshotImage->get_height() + 6). ');return false;">'.$imgSRC.'</a>';

1 0

appdb/include category.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26323 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 11:24:33 Modified files: include : category.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Fix a comment in category.php Patch: http://cvs.winehq.org/patch.py?id=26323 Old revision New revision Changes Path 1.20 1.21 +1 -1 appdb/include/category.php Index: appdb/include/category.php diff -u -p appdb/include/category.php:1.20 appdb/include/category.php:1.21 --- appdb/include/category.php:1.20 7 Jul 2006 16:24:33 -0000 +++ appdb/include/category.php 7 Jul 2006 16:24:33 -0000 @@ -20,7 +20,7 @@ class Category { */ function Category($iCatId = null) { - // we are working on an existing vendor + // we are working on an existing category if($iCatId=="0" || $iCatId) { /*

1 0

appdb/. appbrowse.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26322 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 11:23:42 Modified files: . : appbrowse.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Enable filtering in appbrowse.php Patch: http://cvs.winehq.org/patch.py?id=26322 Old revision New revision Changes Path 1.19 1.20 +5 -17 appdb/appbrowse.php Index: appdb/appbrowse.php diff -u -p appdb/appbrowse.php:1.19 appdb/appbrowse.php:1.20 --- appdb/appbrowse.php:1.19 7 Jul 2006 16:23:42 -0000 +++ appdb/appbrowse.php 7 Jul 2006 16:23:42 -0000 @@ -9,36 +9,24 @@ // application environment include("path.php"); require(BASE."include/"."incl.php"); +require(BASE."include/filter.php"); require(BASE."include/"."appdb.php"); require(BASE."include/"."category.php"); -$aClean = array(); //array of filtered user input - -$aClean['iCatId'] = makeSafe($_REQUEST['iCatId']); - function admin_menu() { - if(isset($_REQUEST['iCatId'])) $iCatId=$_REQUEST['iCatId']; - else $iCatId=""; + global $aClean; $m = new htmlmenu("Admin"); - $m->add("Edit this Category", BASE."admin/addCategory.php?iCatId=$iCatId"); - $url = BASE."admin/deleteAny.php?sWhat=category&iCatId=$iCatId&confirmed=yes"; + $m->add("Edit this Category", BASE."admin/addCategory.php?iCatId=".$aClean['iCatId']); + $url = BASE."admin/deleteAny.php?sWhat=category&iCatId=".$aClean['iCatId']."&sConfirmed=yes"; $m->add("Delete this Category", "javascript:deleteURL(\"Are you sure?\", \"".$url."\")"); $m->done(); } -if( empty( $aClean['iCatId'] ) ) -{ - $aClean['iCatId'] = 0; // ROOT -} - -if(!is_numeric($aClean['iCatId'])) - util_show_error_page_and_exit("Something went wrong with the category ID"); - // list sub categories -$cat = new Category($aClean['iCatId']); +$cat = new Category($aClean['iCatId']?$aClean['iCatId']:"0"); $catFullPath = make_cat_path($cat->getCategoryPath()); $subs = $cat->aSubcatsIds;

1 0