diff --git a/ChangeLog b/ChangeLog
index 4d627f6..5c71042 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,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.
@@ -21,13 +23,13 @@ Version 2.3.0 (devel), 2008-04-30
- greatly improved database performance, runs much better now, but there
is still room for further optimization
---------------------------------------------------------------------------
-Version 2.1.4 (devel), 2008-04-29
+Version 2.1.4 (beta), 2008-04-29
- Added missing facility 10 to 15 from RFC3164 into phhlogcon
---------------------------------------------------------------------------
-Version 2.1.3 (devel), 2008-04-28
+Version 2.1.3 (beta), 2008-04-28
- Fixed a bug in the installer, the table type was not written into the
configuration.
-Version 2.1.2 (devel), 2008-04-28
+Version 2.1.2 (beta), 2008-04-28
---------------------------------------------------------------------------
- Removed syslog sample logfile from samplelogs, fixed minor issue in the
installer
diff --git a/src/include/functions_common.php b/src/include/functions_common.php
index 4d1b3c1..39ff878 100644
--- a/src/include/functions_common.php
+++ b/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.
PHP5 or higher is needed. Current installed Version is: ' . $myPhpVer . '');
+// ---
+
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;
}
}
diff --git a/src/include/functions_frontendhelpers.php b/src/include/functions_frontendhelpers.php
index cd97413..65821f9 100644
--- a/src/include/functions_frontendhelpers.php
+++ b/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()
diff --git a/src/install.php b/src/install.php
index 7bf6dd0..10f79df 100644
--- a/src/install.php
+++ b/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!
If you want to reconfigure phpLogCon, either delete the current config.php or replace it with an empty file.
Click here to return to pgpLogCon start page.');
//InitPhpLogCon();
// Set some static values