Index: trunk/kernel/startup.php =================================================================== diff -u -r41 -r105 --- trunk/kernel/startup.php (.../startup.php) (revision 41) +++ trunk/kernel/startup.php (.../startup.php) (revision 105) @@ -2,10 +2,11 @@ /* startup.php: this is the primary startup sequence for in-portal services */ -if( file_exists($pathtoroot.'debug.php') ) include_once($pathtoroot.'debug.php'); +if( file_exists($pathtoroot.'debug.php') && !defined('DEBUG_MODE') ) include_once($pathtoroot.'debug.php'); if( defined('DEBUG_MODE') ) { error_reporting(E_ALL & E_NOTICE); + ini_set('display_errors', 1); } else error_reporting(0); @@ -21,15 +22,15 @@ LogEntry("Initalizing System..\n"); /* for 64 bit timestamps */ -require_once("include/adodb/adodb-time.inc.php"); -require_once("include/dates.php"); +require_once($pathtoroot."kernel/include/adodb/adodb-time.inc.php"); +require_once($pathtoroot."kernel/include/dates.php"); /* create the global error object */ -require_once("include/error.php"); +require_once($pathtoroot."kernel/include/error.php"); $Errors = new clsErrorManager(); -require_once("include/itemdb.php"); -require_once("include/config.php"); +require_once($pathtoroot."kernel/include/itemdb.php"); +require_once($pathtoroot."kernel/include/config.php"); /* create the global configuration object */ LogEntry("Creating Config Object..\n"); $objConfig = new clsConfig(); @@ -38,50 +39,50 @@ if( defined('ADODB_EXTENSION') && constant('ADODB_EXTENSION') > 0 ) LogEntry("ADO Extension: ".ADODB_EXTENSION."\n"); -require_once("include/parseditem.php"); -require_once("include/item.php"); -require_once("include/syscache.php"); -require_once("include/modlist.php"); -require_once("include/searchconfig.php"); -require_once("include/banrules.php"); +require_once($pathtoroot."kernel/include/parseditem.php"); +require_once($pathtoroot."kernel/include/item.php"); +require_once($pathtoroot."kernel/include/syscache.php"); +require_once($pathtoroot."kernel/include/modlist.php"); +require_once($pathtoroot."kernel/include/searchconfig.php"); +require_once($pathtoroot."kernel/include/banrules.php"); $objModules = new clsModList(); $objSystemCache = new clsSysCacheList(); $objSystemCache->PurgeExpired(); $objBanList = new clsBanRuleList(); -require_once("include/image.php"); +require_once($pathtoroot."kernel/include/image.php"); -require_once("include/itemtypes.php"); +require_once($pathtoroot."kernel/include/itemtypes.php"); $objItemTypes = new clsItemTypeList(); -require_once("include/theme.php"); +require_once($pathtoroot."kernel/include/theme.php"); $objThemes = new clsThemeList(); -require_once("include/language.php"); +require_once($pathtoroot."kernel/include/language.php"); $objLanguages = new clsLanguageList(); $objImageList = new clsImageList(); /* Load session and user class definitions */ //require_once("include/customfield.php"); //require_once("include/custommetadata.php"); -require_once("include/usersession.php"); -require_once("include/favorites.php"); -require_once("include/portaluser.php"); -require_once("include/portalgroup.php"); +require_once($pathtoroot."kernel/include/usersession.php"); +require_once($pathtoroot."kernel/include/favorites.php"); +require_once($pathtoroot."kernel/include/portaluser.php"); +require_once($pathtoroot."kernel/include/portalgroup.php"); /* create the user management class */ $objFavorites = new clsFavoriteList(); $objUsers = new clsUserManager(); $objGroups = new clsGroupList(); -require_once("include/cachecount.php"); -require_once("include/customfield.php"); -require_once("include/custommetadata.php"); -require_once("include/permissions.php"); -require_once("include/relationship.php"); -require_once("include/category.php"); -require_once("include/statitem.php"); +require_once($pathtoroot."kernel/include/cachecount.php"); +require_once($pathtoroot."kernel/include/customfield.php"); +require_once($pathtoroot."kernel/include/custommetadata.php"); +require_once($pathtoroot."kernel/include/permissions.php"); +require_once($pathtoroot."kernel/include/relationship.php"); +require_once($pathtoroot."kernel/include/category.php"); +require_once($pathtoroot."kernel/include/statitem.php"); /* category base class, used by all the modules at some point */ $objPermissions = new clsPermList(); $objPermCache = new clsPermCacheList(); @@ -91,19 +92,19 @@ $objCustomDataList = new clsCustomDataList(); $objCountCache = new clsCacheCountList(); -require_once("include/smtp.php"); -require_once("include/emailmessage.php"); -require_once("include/events.php"); +require_once($pathtoroot."kernel/include/smtp.php"); +require_once($pathtoroot."kernel/include/emailmessage.php"); +require_once($pathtoroot."kernel/include/events.php"); LogEntry("Creating Mail Queue..\n"); $objMessageList = new clsEmailMessageList(); $objEmailQueue = new clsEmailQueue(); LogEntry("Done creating Mail Queue Objects\n"); -require_once("include/searchitems.php"); -require_once("include/advsearch.php"); +require_once($pathtoroot."kernel/include/searchitems.php"); +require_once($pathtoroot."kernel/include/advsearch.php"); -require_once("include/parse.php"); -require_once("include/socket.php"); +require_once($pathtoroot."kernel/include/parse.php"); +require_once($pathtoroot."kernel/include/socket.php"); /* responsible for including module code as required This script also creates an instance of the user session onject and