Index: trunk/kernel/startup.php =================================================================== diff -u -r2853 -r2882 --- trunk/kernel/startup.php (.../startup.php) (revision 2853) +++ trunk/kernel/startup.php (.../startup.php) (revision 2882) @@ -17,7 +17,6 @@ // KENEL4 INIT: BEGIN if($FrontEnd != 1 && !defined('ADMIN') ) define('ADMIN', 1); - define('APPLICATION_CLASS', 'MyApplication'); include_once(FULL_PATH.'/kernel/kernel4/startup.php'); @@ -63,7 +62,7 @@ startup.php: this is the primary startup sequence for in-portal services */ -if( file_exists($pathtoroot.'debug.php') && !defined('DEBUG_MODE') ) include_once($pathtoroot.'debug.php'); +if( file_exists(FULL_PATH.'/debug.php') && !defined('DEBUG_MODE') ) include_once(FULL_PATH.'/debug.php'); if( !defined('DEBUG_MODE') ) error_reporting(0); ini_set('memory_limit', '32M'); @@ -73,10 +72,10 @@ $FormError = array(); $FormValues = array(); /* include PHP version compatibility functions */ -require_once($pathtoroot."compat.php"); +require_once(FULL_PATH.'/compat.php'); /* set global variables and module lists */ -include_once($pathtoroot.'kernel/include/'.( IsDebugMode() ? 'debugger.php' : 'debugger_dummy.php') ); +include_once(FULL_PATH.'/kernel/include/'.( IsDebugMode() ? 'debugger.php' : 'debugger_dummy.php') ); // put all non-checked checkboxes in $_POST & $_REQUEST with 0 values if( GetVar('form_fields') ) @@ -90,15 +89,19 @@ LogEntry("Initalizing System..\n"); /* for 64 bit timestamps */ -require_once($pathtoroot."kernel/include/adodb/adodb-time.inc.php"); -require_once($pathtoroot."kernel/include/dates.php"); +require_once(FULL_PATH.'/kernel/include/adodb/adodb-time.inc.php'); +require_once(FULL_PATH.'/kernel/include/dates.php'); /* create the global error object */ -require_once($pathtoroot."kernel/include/error.php"); +require_once(FULL_PATH.'/kernel/include/error.php'); $Errors = new clsErrorManager(); -require_once($pathtoroot."kernel/include/itemdb.php"); -require_once($pathtoroot."kernel/include/config.php"); +require_once(FULL_PATH.'/kernel/include/itemdb.php'); + +require_once(FULL_PATH.'/kernel/include/db.class.php'); // moved from kernel/include/config.php +require_once(FULL_PATH.'/kernel/include/adodb/adodb.inc.php'); // moved from kernel/include/config.php + +require_once(FULL_PATH.'/kernel/include/config.php'); /* create the global configuration object */ LogEntry("Creating Config Object..\n"); $objConfig = new clsConfig(); @@ -107,50 +110,54 @@ if( defined('ADODB_EXTENSION') && constant('ADODB_EXTENSION') > 0 ) LogEntry("ADO Extension: ".ADODB_EXTENSION."\n"); -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"); +require_once(FULL_PATH.'/kernel/include/parseditem.php'); +require_once(FULL_PATH.'/kernel/include/itemreview.php'); // moved from kernel/include/item.php +require_once(FULL_PATH.'/kernel/include/itemrating.php'); // moved from kernel/include/item.php + +require_once(FULL_PATH.'/kernel/include/item.php'); +require_once(FULL_PATH.'/kernel/include/syscache.php'); +require_once(FULL_PATH.'/kernel/include/modlist.php'); +require_once(FULL_PATH.'/kernel/include/searchconfig.php'); +require_once(FULL_PATH.'/kernel/include/banrules.php'); + $objModules = new clsModList(); $objSystemCache = new clsSysCacheList(); $objSystemCache->PurgeExpired(); $objBanList = new clsBanRuleList(); -require_once($pathtoroot."kernel/include/image.php"); +require_once(FULL_PATH.'/kernel/include/image.php'); -require_once($pathtoroot."kernel/include/itemtypes.php"); +require_once(FULL_PATH.'/kernel/include/itemtypes.php'); $objItemTypes = new clsItemTypeList(); -require_once($pathtoroot."kernel/include/theme.php"); +require_once(FULL_PATH.'/kernel/include/theme.php'); $objThemes = new clsThemeList(); -require_once($pathtoroot."kernel/include/language.php"); +require_once(FULL_PATH.'/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($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"); +require_once(FULL_PATH.'/kernel/include/usersession.php'); +require_once(FULL_PATH.'/kernel/include/favorites.php'); +require_once(FULL_PATH.'/kernel/include/portaluser.php'); +require_once(FULL_PATH.'/kernel/include/portalgroup.php'); /* create the user management class */ $objFavorites = new clsFavoriteList(); $objUsers = new clsUserManager(); $objGroups = new clsGroupList(); -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"); +require_once(FULL_PATH.'/kernel/include/cachecount.php'); +require_once(FULL_PATH.'/kernel/include/customfield.php'); +require_once(FULL_PATH.'/kernel/include/custommetadata.php'); +require_once(FULL_PATH.'/kernel/include/permissions.php'); +require_once(FULL_PATH.'/kernel/include/relationship.php'); +require_once(FULL_PATH.'/kernel/include/category.php'); +require_once(FULL_PATH.'/kernel/include/statitem.php'); /* category base class, used by all the modules at some point */ $objPermissions = new clsPermList(); $objPermCache = new clsPermCacheList(); @@ -160,19 +167,19 @@ $objCustomDataList = new clsCustomDataList(); $objCountCache = new clsCacheCountList(); -require_once($pathtoroot."kernel/include/smtp.php"); -require_once($pathtoroot."kernel/include/emailmessage.php"); -require_once($pathtoroot."kernel/include/events.php"); +require_once(FULL_PATH.'/kernel/include/smtp.php'); +require_once(FULL_PATH.'/kernel/include/emailmessage.php'); +require_once(FULL_PATH.'/kernel/include/events.php'); LogEntry("Creating Mail Queue..\n"); $objMessageList = new clsEmailMessageList(); $objEmailQueue = new clsEmailQueue(); LogEntry("Done creating Mail Queue Objects\n"); -require_once($pathtoroot."kernel/include/searchitems.php"); -require_once($pathtoroot."kernel/include/advsearch.php"); +require_once(FULL_PATH.'/kernel/include/searchitems.php'); +require_once(FULL_PATH.'/kernel/include/advsearch.php'); -require_once($pathtoroot."kernel/include/parse.php"); -require_once($pathtoroot."kernel/include/socket.php"); +require_once(FULL_PATH.'/kernel/include/parse.php'); +require_once(FULL_PATH.'/kernel/include/socket.php'); /* responsible for including module code as required This script also creates an instance of the user session onject and