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

account.php

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

addcomment.php

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

admin/addAppNote.php

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

admin/addCategory.php

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

admin/adminAppDataQueue.php

@@ -3,11 +3,13 @@
 /* code to view and approve new application data        */
 /********************************************************/
 
-include("path.php");
+require("path.php");
 require(BASE."include/incl.php");
-require(BASE."include/mail.php");
-require(BASE."include/tableve.php");
-require(BASE."include/application.php");
+require_once(BASE."include/mail.php");
+require_once(BASE."include/tableve.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
 

admin/adminAppQueue.php

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

admin/adminBugs.php

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

admin/adminMaintainerQueue.php

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

admin/adminMaintainers.php

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

admin/adminScreenshots.php

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

admin/adminTestResults.php

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

admin/deleteAny.php

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

admin/editAppFamily.php

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

admin/editAppNote.php

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

admin/editAppVersion.php

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

admin/editDistribution.php

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

admin/editVendor.php

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

admin/moveAppVersion.php

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

admin/resubmitRejectedApps.php

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

appbrowse.php

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

appdbStats.php

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

appimage.php

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

appsubmit.php

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

appview.php

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

cron/cleanup.php

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

deletecomment.php

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

distributionView.php

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

help/index.php

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

include/application.php

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

index.php

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

maintainerdelete.php

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

maintainersubmit.php

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

screenshots.php

@@ -19,12 +19,12 @@
  */
 
 // application environment
-include("path.php");
+require("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");
+require_once(BASE."include/application.php");
+require_once(BASE."include/version.php");
 
 // we issued a command
 if($aClean['sCmd'])

search.php

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

testResults.php

@@ -3,12 +3,11 @@
 /* code to submit, view and resubmit Test Results */
 /**************************************************/
  
-include("path.php");
+require("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/tableve.php");
+require_once(BASE."include/application.php");
 require_once(BASE."include/testResults.php");
 require_once(BASE."include/distributions.php");
 

vendorview.php

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

viewScreenshots.php

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

votestats.php

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