Commit 9ca69342f89d90e078b6391a1ecac62b2fa6d034 to tedkulp's cmsmadesimple-2-0

tedkulp / cmsmadesimple-2-0

this repo is viewable by everyone

Description:	Git mirror of the CMS Made Simple 2.0 rewrite
Homepage:	http://cmsmadesimple.org
Clone URL:	git://github.com/tedkulp/cmsmadesimple-2-0.git Give this clone URL to anyone. `git clone git://github.com/tedkulp/cmsmadesimple-2-0.git`

Install cleanup.  Should be able to get a base site up and running 
quickly, so there are no more excuses.  :)

Signed-off-by: Ted Kulp <ted@cmsmadesimple.org>


git-svn-id: http://svn.cmsmadesimple.org/svn/cmsmadesimple/trunk@4255 
3d254a34-79dc-0310-9e5f-be208747d8a0

tedkulp (author)

6 months ago

commit 9ca69342f89d90e078b6391a1ecac62b2fa6d034
tree 4b658bbf71da41c9aefc4b2a9cadd4a8d2aa3690
parent ae8c45928232f690aa8713853d66df8b74759bf0

install/lib/class.cms_install_operations.php
install/schemas/initial.sql
install/schemas/schema.php
lib/classes/class.cms_database.php
version.php

install/lib/class.cms_install_operations.php

0
@@ -240,8 +240,15 @@ class CmsInstallOperations extends CmsObject
0
       $db = CmsDatabase::connect($driver, $hostname, $username, $password, $dbname, false, false, $prefix);
0
       if ($db != null && $db->IsConnected())
0
       {
0
-        include_once(cms_join_path(dirname(dirname(__FILE__)), 'schemas', 'schema.php'));
0
-        return true;
0
+        try
0
+        {
0
+          include_once(cms_join_path(dirname(dirname(__FILE__)), 'schemas', 'schema.php'));
0
+          return true;
0
+        }
0
+        catch (Exception $e)
0
+        {
0
+          var_dump('There was an error creating the database');
0
+        }
0
       }
0
     }
0

install/schemas/initial.sql

0
@@ -127,4 +127,4 @@ INSERT INTO {DB_PREFIX}userprefs ( USER_ID, PREFERENCE, VALUE, TYPE ) VALUES ( 1
0
 INSERT INTO {DB_PREFIX}userprefs ( USER_ID, PREFERENCE, VALUE, TYPE ) VALUES ( 1, 'collapse', null, null );
0
 INSERT INTO {DB_PREFIX}userprefs ( USER_ID, PREFERENCE, VALUE, TYPE ) VALUES ( 1, 'hide_help_links', '0', null );
0
 INSERT INTO {DB_PREFIX}users ( USER_ID, USERNAME, PASSWORD, ADMIN_ACCESS, FIRST_NAME, LAST_NAME, EMAIL, ACTIVE, CREATE_DATE, MODIFIED_DATE ) VALUES ( 1, 'admin', '6b903fbd0cb295eb1f4d589fefb435a5', 1, 'Admin', 'User', 'ted@cmsmadesimple.org', 1, '2006-07-25 21:22:33', '2006-07-25 21:22:33' );
0
-INSERT INTO {DB_PREFIX}version ( VERSION ) VALUES ( 28 );
0
+INSERT INTO {DB_PREFIX}version ( VERSION ) VALUES ( 1 );

install/schemas/schema.php

0
@@ -29,7 +29,7 @@ CmsInstallOperations::create_table($db, 'admin_recent_pages', "
0
   user_id I,
0
   title C(255),
0
   url C(255),
0
-  access_time DT
0
+  access_time T
0
 ");
0
 
0
 CmsInstallOperations::create_table($db, 'content', "
0
@@ -59,8 +59,8 @@ CmsInstallOperations::create_table($db, 'content', "
0
   tabindex C(10),
0
   accesskey C(5),
0
   last_modified_by I,
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 CmsInstallOperations::create_index($db, 'content', 'alias_and_active', 'content_alias,active');
0
 CmsInstallOperations::create_index($db, 'content', 'default_content', 'default_content');
0
@@ -73,8 +73,8 @@ CmsInstallOperations::create_table($db, 'content_props', "
0
   prop_name C(255),
0
   language C(50),
0
   content XL,
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 CmsInstallOperations::create_index($db, 'content_props', 'content_id', 'content_id');
0
 
0
@@ -83,8 +83,8 @@ CmsInstallOperations::create_table($db, 'crossref', "
0
   child_id I,
0
   parent_type C(100),
0
   parent_id I,
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 
0
 CmsInstallOperations::create_index($db, 'crossref', 'child_type_and_id', 'child_type,child_id');
0
@@ -95,8 +95,8 @@ CmsInstallOperations::create_table($db, 'css', "
0
   css_name C(255),
0
   css_text XL,
0
   media_type C(255),
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 CmsInstallOperations::create_index($db, 'css', 'css_name', 'css_name');
0
 
0
@@ -104,8 +104,8 @@ CmsInstallOperations::create_table($db, 'css_assoc', "
0
   assoc_to_id I,
0
   assoc_css_id I,
0
   assoc_type C(80),
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 CmsInstallOperations::create_index($db, 'css_assoc', 'assoc_to_id', 'assoc_to_id');
0
 CmsInstallOperations::create_index($db, 'css_assoc', 'assoc_css_id', 'assoc_css_id');
0
@@ -131,8 +131,8 @@ CmsInstallOperations::create_table($db, 'group_perms', "
0
   id I KEY AUTO,
0
   group_id I,
0
   permission_id I,
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 CmsInstallOperations::create_index($db, 'group_perms', 'group_and_permission', 'group_id,permission_id');
0
 
0
@@ -148,8 +148,8 @@ CmsInstallOperations::create_table($db, 'groups', "
0
   id I KEY AUTO,
0
   group_name C(25),
0
   active I1,
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 
0
 CmsInstallOperations::create_table($db, 'htmlblobs', "
0
@@ -158,8 +158,8 @@ CmsInstallOperations::create_table($db, 'htmlblobs', "
0
   html XL,
0
   owner I,
0
   version I,
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 CmsInstallOperations::create_index($db, 'htmlblobs', 'htmlblob_name', 'htmlblob_name');
0
 
0
@@ -182,16 +182,16 @@ CmsInstallOperations::create_table($db, 'module_deps', "
0
   parent_module C(25),
0
   child_module C(25),
0
   minimum_version C(25),
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 
0
 CmsInstallOperations::create_table($db, 'module_templates', "
0
   module_name C(200),
0
   template_name C(200),
0
   content XL,
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 CmsInstallOperations::create_index($db, 'module_templates', 'module_and_template', 'module_name,template_name');
0
 
0
@@ -203,16 +203,16 @@ CmsInstallOperations::create_table($db, 'multilanguage', "
0
   property_name C(100),
0
   language C(5),
0
   content XL,
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 
0
 CmsInstallOperations::create_table($db, 'permissions', "
0
   id I KEY AUTO,
0
   permission_name C(255),
0
   permission_text C(255),
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 
0
 CmsInstallOperations::create_table($db, 'permission_defns', "
0
@@ -230,15 +230,15 @@ CmsInstallOperations::create_table($db, 'serialized_versions', "
0
   object_id I,
0
   data B,
0
   type C(255),
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 
0
 CmsInstallOperations::create_table($db, 'siteprefs', "
0
   sitepref_name C(255) KEY,
0
   sitepref_value text,
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 
0
 CmsInstallOperations::create_table($db, 'templates', "
0
@@ -248,16 +248,16 @@ CmsInstallOperations::create_table($db, 'templates', "
0
   encoding C(25),
0
   active I1,
0
   default_template I1,
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 CmsInstallOperations::create_index($db, 'templates', 'template_name', 'template_name');
0
 
0
 CmsInstallOperations::create_table($db, 'user_groups', "
0
   group_id I,
0
   user_id I,
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 
0
 CmsInstallOperations::create_table($db, 'userprefs', "
0
@@ -279,16 +279,16 @@ CmsInstallOperations::create_table($db, 'users', "
0
   openid C(255),
0
   checksum C(255),
0
   active I1,
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 
0
 CmsInstallOperations::create_table($db, 'userplugins', "
0
   id I KEY AUTO,
0
   userplugin_name C(255),
0
   code X,
0
-  create_date DT,
0
-  modified_date DT
0
+  create_date T,
0
+  modified_date T
0
 ");
0
 
0
 CmsInstallOperations::create_table($db, 'version', "

lib/classes/class.cms_database.php

0
@@ -92,8 +92,8 @@ class CmsDatabase extends CmsObject
0
 
0
     $_GLOBALS['ADODB_CACHE_DIR'] = cms_join_path(ROOT_DIR,'tmp','cache');
0
 
0
-    require(cms_join_path(ROOT_DIR,'lib','adodb','adodb-exceptions.inc.php'));
0
-        require(cms_join_path(ROOT_DIR,'lib','adodb','adodb.inc.php'));
0
+    require_once(cms_join_path(ROOT_DIR,'lib','adodb','adodb-exceptions.inc.php'));
0
+        require_once(cms_join_path(ROOT_DIR,'lib','adodb','adodb.inc.php'));
0
 
0
     try
0
     {
0
@@ -103,21 +103,28 @@ class CmsDatabase extends CmsObject
0
   
0
       if ($persistent)
0
       {
0
-        $connect_result = $dbinstance->PConnect($hostname,$username,$password,$dbname);
0
+        $connect_result = @$dbinstance->PConnect($hostname,$username,$password,$dbname);
0
       }
0
       else
0
       {
0
-        $connect_result = $dbinstance->Connect($hostname,$username,$password,$dbname);
0
+        $connect_result = @$dbinstance->Connect($hostname,$username,$password,$dbname);
0
       }
0
     }
0
     catch (exception $e)
0
     {
0
-      echo "<strong>Database Connection Failed</strong><br />";
0
-      echo "Error: {$dbinstance->_errorMsg}<br />";
0
-      echo "Function Performed: {$e->fn}<br />";
0
-      echo "Host/DB: {$e->host}/{$e->database}<br />";
0
-      echo "Database Type: {$dbms}<br />";
0
-      die();
0
+      if ($die)
0
+      {
0
+        echo "<strong>Database Connection Failed</strong><br />";
0
+        echo "Error: {$dbinstance->_errorMsg}<br />";
0
+        echo "Function Performed: {$e->fn}<br />";
0
+        echo "Host/DB: {$e->host}/{$e->database}<br />";
0
+        echo "Database Type: {$dbms}<br />";
0
+        die();
0
+      }
0
+      else
0
+      {
0
+        return null;
0
+      }
0
     }
0
 
0
     $dbinstance->SetFetchMode(ADODB_FETCH_ASSOC);

version.php

0
@@ -20,7 +20,7 @@
0
 
0
 $CMS_VERSION = "2.0-svn";
0
 $CMS_VERSION_NAME = "Jamaica";
0
-$CMS_SCHEMA_VERSION = "28";
0
+$CMS_SCHEMA_VERSION = "1";
0
 
0
 define("CMS_VERSION", $CMS_VERSION);
0
 define("CMS_VERSION_NAME", $CMS_VERSION_NAME);

Comments

No one has commented yet.