claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up includes. Make 'path.php' and 'incl.php' required includes. Switch to using

Browse Source 
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
This commit is contained in:
Chris Morgan
2006-07-07 18:14:53 +00:00
committed by WineHQ
parent 64c1681e43
commit 854df987c6
38 changed files with 107 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
account.php
View File

@@ -18,10 +18,10 @@
*/ */
// application environment // application environment
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/filter.php"); require(BASE."include/filter.php");
require(BASE."include/mail.php"); require_once(BASE."include/mail.php");
// set http header to not cache // set http header to not cache
header("Pragma: no-cache"); header("Pragma: no-cache");

5
addcomment.php
View File

@@ -12,11 +12,10 @@
*/ */
// application environment // application environment
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/filter.php"); require(BASE."include/filter.php");
require(BASE."include/application.php"); require_once(BASE."include/comment.php");
require(BASE."include/mail.php");
// you must be logged in to submit comments // you must be logged in to submit comments
if(!$_SESSION['current']->isLoggedIn()) if(!$_SESSION['current']->isLoggedIn())

5
admin/addAppNote.php
View File

@@ -3,10 +3,9 @@
/* Add Application Note */ /* Add Application Note */
/************************/ /************************/
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/application.php"); require_once(BASE."include/note.php");
require(BASE."include/mail.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

4
admin/addCategory.php
View File

@@ -1,7 +1,7 @@
<?php <?php
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/category.php"); require_once(BASE."include/category.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

10
admin/adminAppDataQueue.php
View File

@@ -3,11 +3,13 @@
/* code to view and approve new application data */ /* code to view and approve new application data */
/********************************************************/ /********************************************************/
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/mail.php"); require_once(BASE."include/mail.php");
require(BASE."include/tableve.php"); require_once(BASE."include/tableve.php");
require(BASE."include/application.php"); require_once(BASE."include/application.php");
require_once(BASE."include/version.php");
require_once(BASE."include/user.php");
$aClean = array(); //array of user input $aClean = array(); //array of user input

7
admin/adminAppQueue.php
View File

@@ -3,11 +3,10 @@
/* code to View and approve new Apps */ /* code to View and approve new Apps */
/*************************************/ /*************************************/
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/tableve.php"); require_once(BASE."include/tableve.php");
require(BASE."include/application.php"); require_once(BASE."include/application.php");
require(BASE."include/mail.php");
require_once(BASE."include/testResults.php"); require_once(BASE."include/testResults.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

5
admin/adminBugs.php
View File

@@ -6,10 +6,9 @@
/* /*
* application environment * application environment
*/ */
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/application.php"); require_once(BASE."include/bug.php");
require(BASE."include/mail.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

12
admin/adminMaintainerQueue.php
View File

@@ -3,13 +3,13 @@
/* code to View and approve new application maintainers */ /* code to View and approve new application maintainers */
/********************************************************/ /********************************************************/
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/tableve.php"); require_once(BASE."include/tableve.php");
require(BASE."include/category.php"); require_once(BASE."include/category.php");
require(BASE."include/maintainer.php"); require_once(BASE."include/maintainer.php");
require(BASE."include/application.php"); require_once(BASE."include/application.php");
require(BASE."include/mail.php"); require_once(BASE."include/mail.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

2
admin/adminMaintainers.php
View File

@@ -6,7 +6,7 @@
/* /*
* application environment * application environment
*/ */
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

3
admin/adminScreenshots.php
View File

@@ -7,8 +7,7 @@
include("path.php"); include("path.php");
include(BASE."include/incl.php"); include(BASE."include/incl.php");
require_once(BASE."include/screenshot.php"); require_once(BASE."include/screenshot.php");
require(BASE."include/application.php"); require_once(BASE."include/application.php");
require(BASE."include/mail.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

8
admin/adminTestResults.php
View File

@@ -3,11 +3,11 @@
/* code to View and resubmit Apps */ /* code to View and resubmit Apps */
/*************************************/ /*************************************/
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/tableve.php"); require_once(BASE."include/tableve.php");
require(BASE."include/application.php"); require_once(BASE."include/application.php");
require(BASE."include/mail.php"); require_once(BASE."include/version.php");
require_once(BASE."include/testResults.php"); require_once(BASE."include/testResults.php");
require_once(BASE."include/distributions.php"); require_once(BASE."include/distributions.php");

5
admin/deleteAny.php
View File

@@ -6,11 +6,10 @@
/* /*
* application environment * application environment
*/ */
include("path.php"); require("path.php");
require_once(BASE."include/incl.php"); require(BASE."include/incl.php");
require_once(BASE."include/category.php"); require_once(BASE."include/category.php");
require_once(BASE."include/application.php"); require_once(BASE."include/application.php");
require_once(BASE."include/mail.php");
require_once(BASE."include/monitor.php"); require_once(BASE."include/monitor.php");
require_once(BASE."include/testResults.php"); require_once(BASE."include/testResults.php");

9
admin/editAppFamily.php
View File

@@ -3,12 +3,11 @@
/* Edit application family */ /* Edit application family */
/**********************************/ /**********************************/
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/tableve.php"); require_once(BASE."include/tableve.php");
require(BASE."include/application.php"); require_once(BASE."include/application.php");
require(BASE."include/category.php"); require_once(BASE."include/category.php");
require(BASE."include/mail.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

5
admin/editAppNote.php
View File

@@ -3,10 +3,9 @@
/* Edit AppNote */ /* Edit AppNote */
/****************/ /****************/
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/application.php"); require_once(BASE."include/note.php");
require(BASE."include/mail.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

8
admin/editAppVersion.php
View File

@@ -1,9 +1,9 @@
<?php <?php
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/tableve.php"); require_once(BASE."include/tableve.php");
require(BASE."include/application.php"); require_once(BASE."include/application.php");
require(BASE."include/mail.php"); require_once(BASE."include/version.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

4
admin/editDistribution.php
View File

@@ -1,7 +1,7 @@
<?php <?php
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/distributions.php"); require_once(BASE."include/distributions.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

4
admin/editVendor.php
View File

@@ -1,6 +1,6 @@
<?php <?php
include("path.php"); require("path.php");
require_once(BASE."include/incl.php"); require(BASE."include/incl.php");
require_once(BASE."include/vendor.php"); require_once(BASE."include/vendor.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

8
admin/moveAppVersion.php
View File

@@ -1,9 +1,9 @@
<?php <?php
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/tableve.php"); require_once(BASE."include/tableve.php");
require(BASE."include/application.php"); require_once(BASE."include/application.php");
require(BASE."include/mail.php"); require_once(BASE."include/version.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

8
admin/resubmitRejectedApps.php
View File

@@ -3,11 +3,9 @@
/* code to View and resubmit Apps */ /* code to View and resubmit Apps */
/*************************************/ /*************************************/
include("path.php"); require("path.php");
require_once(BASE."include/incl.php"); require(BASE."include/incl.php");
util_redirect_and_exit(BASE."appsubmit.php");
util_redirect_and_exit(BASE."appsubmit.php");
?> ?>

6
appbrowse.php
View File

@@ -7,11 +7,11 @@
*/ */
// application environment // application environment
include("path.php"); require("path.php");
require(BASE."include/"."incl.php"); require(BASE."include/"."incl.php");
require(BASE."include/filter.php"); require(BASE."include/filter.php");
require(BASE."include/"."appdb.php"); require_once(BASE."include/"."appdb.php");
require(BASE."include/"."category.php"); require_once(BASE."include/"."category.php");
function admin_menu() function admin_menu()
{ {

5
appdbStats.php
View File

@@ -3,10 +3,9 @@
/* Code to view all kinds of interesting statistics about appdb */ /* Code to view all kinds of interesting statistics about appdb */
/****************************************************************/ /****************************************************************/
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/category.php"); require_once(BASE."include/user.php");
require(BASE."include/maintainer.php");
apidb_header("Appdb Statistics"); apidb_header("Appdb Statistics");
echo html_frame_start("","60%","",0); echo html_frame_start("","60%","",0);

3
appimage.php
View File

@@ -12,11 +12,10 @@
* TODO: * TODO:
* - rename and document sREQUEST_METHOD * - rename and document sREQUEST_METHOD
* - replace iId with iScreenshotId * - replace iId with iScreenshotId
* - replace require_once with require after checking that it doesn't break anything
*/ */
// application environment // application environment
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/filter.php"); require(BASE."include/filter.php");
require_once(BASE."include/screenshot.php"); require_once(BASE."include/screenshot.php");

9
appsubmit.php
View File

@@ -1,4 +1,8 @@
<?php <?php
/************************************/
/* code to Submit and Resubmit Apps */
/************************************/
/** /**
* Submit new applications or versions. * Submit new applications or versions.
* *
@@ -23,11 +27,10 @@
*/ */
// application environment // application environment
include("path.php"); require("path.php");
require_once(BASE."include/incl.php"); require(BASE."include/incl.php");
require_once(BASE."include/tableve.php"); require_once(BASE."include/tableve.php");
require_once(BASE."include/application.php"); require_once(BASE."include/application.php");
require_once(BASE."include/mail.php");
require_once(BASE."include/testResults.php"); require_once(BASE."include/testResults.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

16
appview.php
View File

@@ -18,17 +18,15 @@
*/ */
// application environment // application environment
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/filter.php"); require(BASE."include/filter.php");
require(BASE."include/application.php"); require_once(BASE."include/application.php");
require(BASE."include/appdb.php"); require_once(BASE."include/appdb.php");
require(BASE."include/vote.php"); require_once(BASE."include/vote.php");
require(BASE."include/category.php"); require_once(BASE."include/category.php");
require(BASE."include/maintainer.php"); require_once(BASE."include/maintainer.php");
require(BASE."include/mail.php"); require_once(BASE."include/monitor.php");
require(BASE."include/monitor.php");
require_once(BASE."include/testResults.php");
$oApp = new Application($aClean['iAppId']); $oApp = new Application($aClean['iAppId']);
$oVersion = new Version($aClean['iVersionId']); $oVersion = new Version($aClean['iVersionId']);

6
cron/cleanup.php
View File

@@ -5,9 +5,9 @@
# it's purpose is to clean the user's table. # # it's purpose is to clean the user's table. #
################################################## ##################################################
include("path.php"); require("path.php");
include(BASE."include/incl.php"); require(BASE."include/incl.php");
include(BASE."include/mail.php"); require_once(BASE."include/mail.php");
/* /*
* Warn users that have been inactive for some number of months * Warn users that have been inactive for some number of months

5
deletecomment.php
View File

@@ -11,11 +11,10 @@
*/ */
// application environment // application environment
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/filter.php"); require(BASE."include/filter.php");
require(BASE."include/application.php"); require_once(BASE.'include/comment.php');
require(BASE."include/mail.php");
$oComment = new Comment($aClean['iCommentId']); $oComment = new Comment($aClean['iCommentId']);

6
distributionView.php
View File

@@ -6,11 +6,11 @@
/* /*
* application environment * application environment
*/ */
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/filter.php"); require(BASE."include/filter.php");
require(BASE."include/distributions.php"); require_once(BASE."include/distributions.php");
require(BASE."include/testResults.php"); require_once(BASE."include/testResults.php");
if ($aClean['sSub']) if ($aClean['sSub'])
{ {

4
help/index.php
View File

@@ -3,8 +3,8 @@
/* Application Database Documentation Center */ /* Application Database Documentation Center */
/*********************************************/ /*********************************************/
include("path.php"); require("path.php");
include(BASE."include/"."incl.php"); require(BASE."include/"."incl.php");
$help_path = BASE."/help"; $help_path = BASE."/help";

1
include/application.php
View File

@@ -7,6 +7,7 @@ require_once(BASE."include/version.php");
require_once(BASE."include/vendor.php"); require_once(BASE."include/vendor.php");
require_once(BASE."include/url.php"); require_once(BASE."include/url.php");
require_once(BASE."include/util.php"); require_once(BASE."include/util.php");
require_once(BASE."include/mail.php");
/** /**
* Application class for handling applications. * Application class for handling applications.

3
index.php
View File

@@ -8,9 +8,8 @@
*/ */
// application environment // application environment
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/application.php");
apidb_header("Wine Application Database"); apidb_header("Wine Application Database");
?> ?>

6
maintainerdelete.php
View File

@@ -18,10 +18,10 @@
*/ */
// application environment // application environment
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/category.php"); require_once(BASE."include/category.php");
require(BASE."include/application.php"); require_once(BASE."include/application.php");
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

6
maintainersubmit.php
View File

@@ -16,10 +16,10 @@
*/ */
// application environment // application environment
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/category.php"); require_once(BASE."include/application.php");
require(BASE."include/application.php"); require_once(BASE.'include/version.php');
$aClean = array(); //array of filtered user input $aClean = array(); //array of filtered user input

6
screenshots.php
View File

@@ -19,12 +19,12 @@
*/ */
// application environment // application environment
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/filter.php"); require(BASE."include/filter.php");
require_once(BASE."include/screenshot.php"); require_once(BASE."include/screenshot.php");
require(BASE."include/application.php"); require_once(BASE."include/application.php");
require(BASE."include/mail.php"); require_once(BASE."include/version.php");
// we issued a command // we issued a command
if($aClean['sCmd']) if($aClean['sCmd'])

3
search.php
View File

@@ -10,10 +10,9 @@
*/ */
// application environment // application environment
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/filter.php"); require(BASE."include/filter.php");
require(BASE."include/application.php");
apidb_header("Search Results"); apidb_header("Search Results");
perform_search_and_output_results($aClean['sSearchQuery']); perform_search_and_output_results($aClean['sSearchQuery']);

7
testResults.php
View File

@@ -3,12 +3,11 @@
/* code to submit, view and resubmit Test Results */ /* code to submit, view and resubmit Test Results */
/**************************************************/ /**************************************************/
include("path.php"); require("path.php");
require(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/filter.php"); require(BASE."include/filter.php");
require(BASE."include/tableve.php"); require_once(BASE."include/tableve.php");
require(BASE."include/application.php"); require_once(BASE."include/application.php");
require(BASE."include/mail.php");
require_once(BASE."include/testResults.php"); require_once(BASE."include/testResults.php");
require_once(BASE."include/distributions.php"); require_once(BASE."include/distributions.php");

6
vendorview.php
View File

@@ -6,9 +6,9 @@
/* /*
* application environment * application environment
*/ */
include("path.php"); require("path.php");
require_once(BASE."include/incl.php"); require(BASE."include/incl.php");
require_once(BASE."include/filter.php"); require(BASE."include/filter.php");
require_once(BASE."include/application.php"); require_once(BASE."include/application.php");
require_once(BASE."include/vendor.php"); require_once(BASE."include/vendor.php");

9
viewScreenshots.php
View File

@@ -4,12 +4,11 @@
/* Without having go into each application version to do so */ /* Without having go into each application version to do so */
/************************************************************/ /************************************************************/
include("path.php"); require("path.php");
include(BASE."include/incl.php"); require(BASE."include/incl.php");
include(BASE."include/filter.php"); require(BASE."include/filter.php");
require_once(BASE."include/screenshot.php"); require_once(BASE."include/screenshot.php");
require(BASE."include/application.php"); require_once(BASE."include/application.php");
require(BASE."include/mail.php");
apidb_header("View Screenshots"); apidb_header("View Screenshots");
/* display a range of 10 pages */ /* display a range of 10 pages */

4
votestats.php
View File

@@ -7,9 +7,9 @@
* application environment * application environment
*/ */
include("path.php"); include("path.php");
include(BASE."include/incl.php"); require(BASE."include/incl.php");
require(BASE."include/filter.php"); require(BASE."include/filter.php");
require(BASE."include/category.php"); require_once(BASE."include/category.php");
/* default to 25 apps, main categories */ /* default to 25 apps, main categories */
$topNumber = 25; $topNumber = 25;