Fixed merge issues

Merge branch 'devel'

Conflicts:

	ChangeLog

ChangeLog

@@ -1,7 +1,4 @@
 ---------------------------------------------------------------------------
-Version 2.1.5 (beta), 2008-05-05
-- Converted all files into UNIX format (^M has been removed)
----------------------------------------------------------------------------
 Version 2.3.1 (devel), 2008-05-02
 - The page title is now created with Source, and other useful informations. 
   It is also possible to configure a custom title string with the 
@@ -13,6 +10,8 @@ Version 2.3.1 (devel), 2008-05-02
 - Added new configuration variable to set the default SourceID. The source
   parameter will be appened to all necessary links and forms within 
   phplogcon, if the session sources differs from the default one. 
+Version 2.1.5 (beta), 2008-05-05
+- Converted all files into UNIX format (^M has been removed)
 ---------------------------------------------------------------------------
 Version 2.3.0 (devel), 2008-04-30
 - Added "Back to Listview" button in the detailview. 

src/include/functions_common.php

@@ -43,6 +43,7 @@ if ( !defined('IN_PHPLOGCON') )
 include($gl_root_path . 'include/constants_general.php');
 include($gl_root_path . 'include/constants_logstream.php');
 
+/*
 if ( is_file($gl_root_path . 'config.php') )
 	include($gl_root_path . 'config.php');
 else
@@ -51,6 +52,7 @@ else
 	if ( !defined('IN_PHPLOGCON_INSTALL') )
 		CheckForInstallPhp();
 }
+*/
 
 include($gl_root_path . 'classes/class_template.php');
 include($gl_root_path . 'include/functions_themes.php');
@@ -79,6 +81,13 @@ $content['EXTRA_JAVASCRIPT'] = "";
 $content['EXTRA_STYLESHEET'] = "";
 // --- 
 
+// --- Check PHP Version! If lower the 5, phplogcon will not work proberly!
+$myPhpVer = phpversion();
+$myPhpVerArray = explode('.', $myPhpVer);
+if ( $myPhpVerArray[0] < 5 )
+	DieWithErrorMsg( 'Error, the PHP Version on this Server does not meet the installation requirements.<br> <A HREF="http://www.php.net"><B>PHP5</B></A> or higher is needed. Current installed Version is: <B>' . $myPhpVer . '</B>');
+// ---
+
 function InitBasicPhpLogCon()
 {
 	// Needed to make global
@@ -97,7 +106,7 @@ function InitBasicPhpLogCon()
 	StartPHPSession();
 }
 
-function InitPhpLogConConfigFile()
+function InitPhpLogConConfigFile($bHandleMissing = true)
 {
 	// Needed to make global
 	global $CFG, $gl_root_path, $content;
@@ -124,11 +133,20 @@ function InitPhpLogConConfigFile()
 			$content['ShowPageRenderStats'] = "true";
 			InitPageRenderStats();
 		}
+		
+		// return result
+		return true;
 	}
 	else
 	{
-		// Check for installscript!
-		CheckForInstallPhp();
+		// if handled ourselfe, we die in CheckForInstallPhp.
+		if ( $bHandleMissing == true )
+		{
+			// Check for installscript!
+			CheckForInstallPhp();
+		}
+		else
+			return false;
 	}
 }
 

src/include/functions_frontendhelpers.php

@@ -51,7 +51,7 @@ function InitFrontEndDefaults()
 	// --- END Main Info Area
 	
 	// Check if install file still exists
-	InstallFileReminder();
+	// NOT NEEDED ANYMORE InstallFileReminder();
 }
 
 function InstallFileReminder()

src/install.php

@@ -45,6 +45,8 @@ include($gl_root_path . 'include/functions_frontendhelpers.php');
 IncludeLanguageFile( $gl_root_path . '/lang/' . $LANG . '/main.php' );
 
 InitBasicPhpLogCon();
+if ( InitPhpLogConConfigFile(false) ) 
+	DieWithErrorMsg( 'phpLogCon is already configured!<br><br> If you want to reconfigure phpLogCon, either delete the current <B>config.php</B> or replace it with an empty file.<br><br>Click <A HREF="index.php">here</A> to return to pgpLogCon start page.');
 //InitPhpLogCon();
 
 // Set some static values