0
@@ -2,4 +2,5 @@
0
 define("CONFIG_FILE_LOCATION", dirname(__FILE__) . DIRECTORY_SEPARATOR . 'config.php');
0
 define("TMP_CACHE_LOCATION", dirname(__FILE__) . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'cache');
0
 define("TMP_TEMPLATES_C_LOCATION", dirname(__FILE__) . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'templates_c');
0
+include('version.php'); //More defines
0
 ?>
0
\ No newline at end of file

0
@@ -24,9 +24,6 @@ require_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'cm
0
 //Where are we?
0
 $dirname = ROOT_DIR;
0
 
0
-//Load the version defines
0
-require_once(cms_join_path($dirname,'version.php'));
0
-
0
 //Load stuff that hasn't been moved to static methods yet
0
 require_once(cms_join_path($dirname,'lib','misc.functions.php'));
0
 require_once(cms_join_path($dirname,'lib','page.functions.php'));

0
@@ -37,18 +37,23 @@ require_once($dirname.DIRECTORY_SEPARATOR.'fileloc.php');
0
 list( $usec, $sec ) = explode( ' ', microtime() );
0
 $start_time = ((float)$usec + (float)$sec);
0
 
0
+//Load necessary global functions.  This allows us to load a few
0
+//things before hand... like the configuration
0
+require_once($dirname.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'cmsms.api.php');
0
+
0
 //If we have a missing or empty config file, then we should think
0
 //about redirecting to the installer.  Also, check to see if the SITEDOWN
0
 //file is there.  That means we're probably in mid-upgrade.
0
-if (!file_exists(CONFIG_FILE_LOCATION) || filesize(CONFIG_FILE_LOCATION) < 800)
0
+$config_location = CmsConfig::get_config_filename();
0
+if (!file_exists($config_location) || filesize($config_location) < 800)
0
 {
0
-    require_once($dirname.'/lib/cmsms.api.php');
0
     if (FALSE == is_file($dirname.'/install/install.php'))
0
   {
0
         die ('There is no config.php file or install/install.php please correct one these errors!');
0
     }
0
   else
0
   {
0
+    die('Do a redirect - ' . $config_location);
0
         CmsResponse::redirect('install/index.php');
0
     }
0
 }
0
@@ -72,10 +77,6 @@ if (!is_writable(TMP_TEMPLATES_C_LOCATION) || !is_writable(TMP_CACHE_LOCATION))
0
   exit;
0
 }
0
 
0
-//Load necessary global functions.  This allows us to load a few
0
-//things before hand... like the configuration
0
-require_once($dirname.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'cmsms.api.php');
0
-
0
 //Start up a profiler for getting render times for this page.  Use
0
 //the start time we generated way up at the top.
0
 $profiler = CmsProfiler::get_instance('', $start_time);

0
@@ -32,6 +32,7 @@ class CmsConfig extends CmsObject implements ArrayAccess
0
 {
0
   var $params;
0
   static private $instance = NULL;
0
+  static private $config_file_location = '';
0
 
0
   function __construct()
0
   {
0
@@ -49,6 +50,23 @@ class CmsConfig extends CmsObject implements ArrayAccess
0
     return self::$instance;
0
   }
0
   
0
+  static public function get_config_filename()
0
+  {
0
+    if (self::$config_file_location == '')
0
+    {
0
+      $filename = dirname(CONFIG_FILE_LOCATION) . DS . 'config-' . CMS_VERSION . '.php';
0
+      if (file_exists($filename))
0
+      {
0
+        self::$config_file_location = $filename;
0
+      }
0
+      else
0
+      {
0
+        self::$config_file_location = CONFIG_FILE_LOCATION;
0
+      }
0
+    }
0
+    return self::$config_file_location;
0
+  }
0
+  
0
   static public function exists($key)
0
   {
0
     $config = CmsConfig::get_instance();
0
@@ -136,9 +154,9 @@ class CmsConfig extends CmsObject implements ArrayAccess
0
     if ($loadLocal == true)
0
     {
0
       //if (file_exists(CONFIG_FILE_LOCATION) && !cms_config_check_old_config())
0
-      if (file_exists(CONFIG_FILE_LOCATION))
0
+      if (file_exists(self::get_config_filename()))
0
       {
0
-        include(CONFIG_FILE_LOCATION);
0
+        include(self::get_config_filename());
0
       }
0
     }
0
 
0
@@ -179,8 +197,8 @@ class CmsConfig extends CmsObject implements ArrayAccess
0
   
0
   function save()
0
   {
0
-    $newfiledir = dirname(CONFIG_FILE_LOCATION);
0
-    $newfilename = CONFIG_FILE_LOCATION;
0
+    $newfiledir = dirname(self::get_config_filename());
0
+    $newfilename = self::get_config_filename();
0
     if (is_writable($newfilename) || is_writable($newfiledir))
0
     {
0
       $handle = fopen($newfilename, "w");

0
@@ -16,7 +16,6 @@
0
 #along with this program; if not, write to the Free Software
0
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
0
 
0
-
0
 function smarty_cms_block_tr($params,$content,&$smarty)
0
 {
0
   if( is_null($content) ) return;

0
@@ -22,5 +22,9 @@ $CMS_VERSION = "2.0-svn";
0
 $CMS_VERSION_NAME = "Jamaica";
0
 $CMS_SCHEMA_VERSION = "28";
0
 
0
+define("CMS_VERSION", $CMS_VERSION);
0
+define("CMS_VERSION_NAME", $CMS_VERSION_NAME);
0
+define("CMS_SCHEMA_VERSION", $CMS_SCHEMA_VERSION);
0
+
0
 # vim:ts=4 sw=4 noet
0
 ?>
0
\ No newline at end of file