ChangeSet ID: 26695 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner@winehq.org 2006/07/20 14:35:14
Modified files: . : commentview.php preferences.php updatevote.php viewbugs.php votestats.php admin : adminCommentView.php adminScreenshots.php adminUsers.php editBundle.php
Log message: Chris Morgan cmorgan@alum.wpi.edu Use require() and not include() since we can't continue if critical files aren't present in the locations we expect to find them
Patch: http://cvs.winehq.org/patch.py?id=26695
Old revision New revision Changes Path 1.14 1.15 +3 -3 appdb/commentview.php 1.32 1.33 +2 -2 appdb/preferences.php 1.6 1.7 +3 -3 appdb/updatevote.php 1.9 1.10 +1 -1 appdb/viewbugs.php 1.26 1.27 +1 -1 appdb/votestats.php 1.15 1.16 +2 -2 appdb/admin/adminCommentView.php 1.14 1.15 +2 -2 appdb/admin/adminScreenshots.php 1.12 1.13 +2 -2 appdb/admin/adminUsers.php 1.14 1.15 +2 -2 appdb/admin/editBundle.php
Index: appdb/commentview.php diff -u -p appdb/commentview.php:1.14 appdb/commentview.php:1.15 --- appdb/commentview.php:1.14 20 Jul 2006 19:35:14 -0000 +++ appdb/commentview.php 20 Jul 2006 19:35:14 -0000 @@ -8,9 +8,9 @@ /* * application environment */ -include("path.php"); -include(BASE."include/incl.php"); -include(BASE."include/filter.php"); +require("path.php"); +require(BASE."include/incl.php"); +require(BASE."include/filter.php"); require_once(BASE."include/comment.php");
apidb_header("Comments"); Index: appdb/preferences.php diff -u -p appdb/preferences.php:1.32 appdb/preferences.php:1.33 --- appdb/preferences.php:1.32 20 Jul 2006 19:35:14 -0000 +++ appdb/preferences.php 20 Jul 2006 19:35:14 -0000 @@ -22,8 +22,8 @@ */
// application environment -include("path.php"); -include(BASE."include/incl.php"); +require("path.php"); +require(BASE."include/incl.php");
function build_prefs_list($oUser) { Index: appdb/updatevote.php diff -u -p appdb/updatevote.php:1.6 appdb/updatevote.php:1.7 --- appdb/updatevote.php:1.6 20 Jul 2006 19:35:14 -0000 +++ appdb/updatevote.php 20 Jul 2006 19:35:14 -0000 @@ -6,9 +6,9 @@ /* * application environment */ -include("path.php"); -include(BASE."include/incl.php"); -include(BASE."include/vote.php"); +require("path.php"); +require(BASE."include/incl.php"); +require(BASE."include/vote.php");
vote_update($_POST);
Index: appdb/viewbugs.php diff -u -p appdb/viewbugs.php:1.9 appdb/viewbugs.php:1.10 --- appdb/viewbugs.php:1.9 20 Jul 2006 19:35:14 -0000 +++ appdb/viewbugs.php 20 Jul 2006 19:35:14 -0000 @@ -10,7 +10,7 @@ */
// application environment -include("path.php"); +require("path.php"); require(BASE."include/incl.php"); require(BASE."include/filter.php");
Index: appdb/votestats.php diff -u -p appdb/votestats.php:1.26 appdb/votestats.php:1.27 --- appdb/votestats.php:1.26 20 Jul 2006 19:35:14 -0000 +++ appdb/votestats.php 20 Jul 2006 19:35:14 -0000 @@ -8,7 +8,7 @@ */
// application environment -include("path.php"); +require("path.php"); require(BASE."include/incl.php"); require(BASE."include/filter.php"); require_once(BASE."include/category.php"); Index: appdb/admin/adminCommentView.php diff -u -p appdb/admin/adminCommentView.php:1.15 appdb/admin/adminCommentView.php:1.16 --- appdb/admin/adminCommentView.php:1.15 20 Jul 2006 19:35:14 -0000 +++ appdb/admin/adminCommentView.php 20 Jul 2006 19:35:14 -0000 @@ -4,8 +4,8 @@ /* Without having go into each application version to do so */ /************************************************************/
-include("path.php"); -include(BASE."include/incl.php"); +require("path.php"); +require(BASE."include/incl.php");
apidb_header("Comments");
Index: appdb/admin/adminScreenshots.php diff -u -p appdb/admin/adminScreenshots.php:1.14 appdb/admin/adminScreenshots.php:1.15 --- appdb/admin/adminScreenshots.php:1.14 20 Jul 2006 19:35:14 -0000 +++ appdb/admin/adminScreenshots.php 20 Jul 2006 19:35:14 -0000 @@ -4,8 +4,8 @@ /* Without having go into each application version to do so */ /************************************************************/
-include("path.php"); -include(BASE."include/incl.php"); +require("path.php"); +require(BASE."include/incl.php"); require_once(BASE."include/screenshot.php"); require_once(BASE."include/application.php");
Index: appdb/admin/adminUsers.php diff -u -p appdb/admin/adminUsers.php:1.12 appdb/admin/adminUsers.php:1.13 --- appdb/admin/adminUsers.php:1.12 20 Jul 2006 19:35:15 -0000 +++ appdb/admin/adminUsers.php 20 Jul 2006 19:35:15 -0000 @@ -3,8 +3,8 @@ /* Users Management */ /********************/
-include("path.php"); -include(BASE."include/incl.php"); +require("path.php"); +require(BASE."include/incl.php");
$aClean = array(); //filtered user input
Index: appdb/admin/editBundle.php diff -u -p appdb/admin/editBundle.php:1.14 appdb/admin/editBundle.php:1.15 --- appdb/admin/editBundle.php:1.14 20 Jul 2006 19:35:15 -0000 +++ appdb/admin/editBundle.php 20 Jul 2006 19:35:15 -0000 @@ -1,7 +1,7 @@ <?php
-include("path.php"); -include(BASE."include/"."incl.php"); +require("path.php"); +require(BASE."include/incl.php");
if(!$_SESSION['current']->hasPriv("admin")) util_show_error_page_and_exit();