Index: trunk/kernel/startup.php
===================================================================
diff -u -r3282 -r3287
--- trunk/kernel/startup.php	(.../startup.php)	(revision 3282)
+++ trunk/kernel/startup.php	(.../startup.php)	(revision 3287)
@@ -1,8 +1,8 @@
 <?php
 	if( !defined('FULL_PATH') ) define('FULL_PATH', realpath(dirname(__FILE__).'/..') );
-	
-	require_once FULL_PATH.'/globals.php'; 
-	
+
+	require_once FULL_PATH.'/globals.php';
+
 	if( !isset($FrontEnd) )	$FrontEnd = 0;
 
 	# New path detection method: begin
@@ -13,23 +13,23 @@
 		$ps = preg_replace("/".preg_quote(rtrim(REL_PATH, '/'), '/')."$/", '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF'])));
 		safeDefine('BASE_PATH', $ps); // in case in-portal has defined it before
 		# New path detection method: end
-		
+
 		// KENEL4 INIT: BEGIN
 		if($FrontEnd != 1 && !defined('ADMIN') ) define('ADMIN', 1);
-		
+
 		if( !defined('APPLICATION_CLASS') ) define('APPLICATION_CLASS', 'MyApplication');
 		include_once(FULL_PATH.'/kernel/kernel4/startup.php');
-		
+
 		// just to make sure that this is correctly detected
 		if( IsDebugMode() ) $debugger->appendHTML('FULL_PATH: <b>'.FULL_PATH.'</b>');
-		
+
 		$application =& kApplication::Instance();
 		$application->Init();
-		
+
 		// compatibility constants
 		$g_TablePrefix = TABLE_PREFIX;
 		$pathtoroot = FULL_PATH.'/';
-		
+
 	    $admin		=	'admin';
 		$rootURL	=	PROTOCOL.SERVER_NAME.(defined('PORT')?':'.PORT : '').BASE_PATH.'/';
 	    $localURL	=	$rootURL.'kernel/';
@@ -41,7 +41,7 @@
 		// KERNEL4 INIT: END
 		$k4_path_detection = true;
 	}
-	
+
 if(!get_magic_quotes_gpc())
 {
 	function addSlashesA($a)
@@ -60,7 +60,7 @@
 }
 
 /*
-    startup.php: this is the primary startup sequence for in-portal services    
+    startup.php: this is the primary startup sequence for in-portal services
 */
 
 if( file_exists(FULL_PATH.'/debug.php') && !defined('DEBUG_MODE') ) include_once(FULL_PATH.'/debug.php');
@@ -81,7 +81,7 @@
 	// put all non-checked checkboxes in $_POST & $_REQUEST with 0 values
 	if( GetVar('form_fields') )
 	{
-		$form_fields = GetVar('form_fields');	
+		$form_fields = GetVar('form_fields');
 		foreach($form_fields as $checkbox_name)
 		{
 			if( GetVar($checkbox_name) === false ) SetVar($checkbox_name,0);
@@ -109,7 +109,7 @@
 $objConfig->Load(); /* Populate our configuration data */
 LogEntry("Done Loading Configuration\n");
 if( defined('ADODB_EXTENSION') && constant('ADODB_EXTENSION') > 0 )
-	LogEntry("ADO Extension: ".ADODB_EXTENSION."\n");	
+	LogEntry("ADO Extension: ".ADODB_EXTENSION."\n");
 
 require_once(FULL_PATH.'/kernel/include/parseditem.php');
 
@@ -167,7 +167,7 @@
 $objCustomFieldList = new clsCustomFieldList();
 $objCustomDataList = new clsCustomDataList();
 $objCountCache = new clsCacheCountList();
- 
+
 require_once(FULL_PATH.'/kernel/include/smtp.php');
 require_once(FULL_PATH.'/kernel/include/emailmessage.php');
 require_once(FULL_PATH.'/kernel/include/events.php');
@@ -181,17 +181,17 @@
 
 require_once(FULL_PATH.'/kernel/include/parse.php');
 require_once(FULL_PATH.'/kernel/include/socket.php');
-  
-/* responsible for including module code as required 
+
+/* responsible for including module code as required
    This script also creates an instance of the user session onject and
    handles all session management.  The global session object is created
    and populated, then the global user object is created and populated
-   
+
    each module's parser functions and action code is included here
 */
 
 LogEntry("Startup complete\n");
-include_once("include/modules.php"); 
+include_once("include/modules.php");
 
 if( IsDebugMode() && function_exists('DebugByFile') ) DebugByFile();
 
@@ -200,18 +200,17 @@
 
           $ado=&GetADODBConnection();
           $rs = $ado->Execute("SELECT * FROM ".GetTablePrefix()."Modules WHERE LoadOrder = 0");
-          
+
           $kernel_version = $rs->fields['Version'];
-          
-          
+
+
 $adminDir = $objConfig->Get("AdminDirectory");
 if ($adminDir == '') {
 	$adminDir = 'admin';
 }
 
 if (strstr(__FILE__, $adminDir) && !GetVar('logout') && !strstr(__FILE__, "install") && !strstr(__FILE__, "index")) {
-	//echo "testz [".admin_login()."]<br>";
 	require_login(null, 'expired='.(int)GetVar('expired') );
-}          
+}
 
 ?>
\ No newline at end of file