Changeset 2243 for branches

Timestamp:

11/26/10 12:53:16 (18 months ago)

Author:

nick_ramsay

Message:

[1.5] Merged installation changes from 1.4.2 into 1.5.

Location:

branches/1.5/install

Files:

• index.php (modified) (8 diffs)
• install-upgrade.php (modified) (4 diffs)
• install_functions.php (modified) (1 diff)
• install_language.php (modified) (2 diffs)
• install_tables.php (modified) (21 diffs)

branches/1.5/install/index.php

@@ -47 +47 @@
     "ADMIN" => "/../admin/",
     "INSTALL" => "/",
-    "CACHE" => "/../cache/1/",
+    "CACHE" => "/../cache/",
     "LIBS" => "/../libs/",
     "EXTENSIONS" => "/../libs/extensions/",
@@ -504 +504 @@
         else {     
             
-            $tables = array('blocked', 'categories', 'comments', 'commentvotes', 'friends', 'messaging', 'miscdata', 'plugins', 'pluginhooks', 'pluginsettings', 'posts', 'postmeta', 'postvotes', 'relates', 'settings', 'site', 'tags', 'tempdata', 'tokens', 'users', 'usermeta', 'useractivity', 'widgets');
+            $tables = array('blocked', 'categories', 'comments', 'commentvotes', 'friends', 'messaging', 'miscdata', 'plugins', 'pluginhooks', 'pluginsettings', 'posts', 'postmeta', 'postvotes', 'settings', 'tags', 'tempdata', 'tokens', 'users', 'usermeta', 'useractivity', 'widgets');
 
             // delete *all* tables in db:
@@ -574 +574 @@
         // Make sure that the cache folders have been created before we call $h for the first time
         // Since we have defined CACHE in install script, the normal Initialize script will think folders are already present
-        $dirs = array('', 'debug_logs/' , 'db_cache/', 'css_js_cache/', 'html_cache/', 'rss_cache/', 'lang_cache/');  // first array item is needed to create the SITEID base folder
+        $dirs = array('debug_logs/' , 'db_cache/', 'css_js_cache/', 'html_cache/', 'rss_cache/', 'lang_cache/');
 
         foreach ($dirs as $dir) {
@@ -593 +593 @@
 
         // Step content
-        echo "<div class='install_content'>" . $lang['install_step3_instructions'] . ":<br />\n";
+        echo "<div class='install_content'>" . $lang['install_step3_instructions'] . ":<br /><br />\n";
 
         $error = 0;
@@ -747 +747 @@
         $h  = new Hotaru(); // overwrites current global with fully initialized Hotaru object
         
-        $phpinfo = $cage->post->getAlpha('phpinfo');        // delete install folder.
-        $delete = $cage->post->getAlpha('delete');        // delete install folder.
-        
-        $folder_deleted = 0;
-
-        if ($delete) {
-            // try to delete the folder
-            //$folder_deleted = delTree('install');
-            $folder_deleted = 2;
-            // if was deleted then redirect to baseurl
-            if ($folder_deleted == 1) header("Location: /index.php" );
-        }
-
-        if (!$delete && !$phpinfo) {
+        $phpinfo = $cage->post->getAlpha('phpinfo');
+
+        if (!$phpinfo) {
             //send feedback report          
             $systeminfo = new SystemInfo();
@@ -773 +762 @@
         // Step content
         
-        if ($folder_deleted == 0) echo "<div class='install_content'>" . $lang['install_step4_installation_complete'] . "</div>\n";
+        echo "<div class='install_content'>" . $lang['install_step4_installation_complete'] . "</div>\n";
         echo "<div class='install_content'>" . $lang['install_step4_installation_delete'] . "</div>\n";
 
@@ -811 +800 @@
         }
 
-        if ($folder_deleted == 0) {
-            // Confirm delete and continue install
-            echo "<div class='install_content'>" . $lang['install_step4_installation_delete_folder'] . "</div>\n";
-            echo "<form name='install_admin_reg_form' action='index.php?step=4' method='post'>\n";          
-            echo "<input type='hidden' name='delete' value='folder' />";
-            echo "<input type='hidden' name='step' value='4' />";
-
-            echo "<input class='update button' type='submit' value='" . $lang['install_step4_form_delete_folder'] . "' />";
-            echo "</div></form>\n";
-        } else {
-            echo "<br/><img src='../content/admin_themes/admin_default/images/delete.png' style='float:left; margin-left:12px;'>";
-            echo "<div class='install_content'><span style='color: red;'>" . $lang['install_step1_warning'] . "</span>: " . $lang['install_step4_installation_delete_failed'] . "</div>\n";
-        }
-
         echo "<br/><div class='install_content'>" . $lang['install_step4_installation_go_play'] . "</div><br/><br/>\n";
 
@@ -853 +828 @@
         $systeminfo = new SystemInfo();
         $systeminfo->hotaru_feedback($h);
-
-        //refresh database to get all recent plugin versions
-        $systeminfo->plugin_version_getAll($h);
-        
-//      $plugins = $h->allPluginDetails;
-//
-//      foreach ($plugins as $plugin) {
-//          if (key($plugin) != 'hooks') {
-//              if ($plugin->plugin_latestversion > $plugin->plugin_version) {
-//                  echo "<b>" . $plugin->plugin_name . "</b> requires an update to <span class='red'>version " . $plugin->plugin_latestversion . "</span><br/>";
-//              } else {
-//                  echo "<b>" . $plugin->plugin_name . "</b> is up to date at version " . $plugin->plugin_version . " <br/>";
-//              }
-//          }
-//      }
 
         echo "<br/>" . $lang['upgrade_step3_instructions'] . "<br/><br/>\n";

branches/1.5/install/install-upgrade.php

@@ -378 +378 @@
         if ($old_version == "1.1.2") {
 
-                // System Feedback
-                $sql = "SELECT settings_name FROM " . TABLE_SETTINGS . " WHERE settings_name = %s";
-                $result = $h->db->get_var($h->db->prepare($sql, 'SYS_FEEDBACK'));
-                if(!$result) {
-                        $sql = "INSERT INTO " . TABLE_SETTINGS . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
-                        $h->db->query($h->db->prepare($sql, 'SYS_FEEDBACK', 'true', 'true', 'Send system report'));
-                }
-
                 // Remove ON from constant names
                 $sql = "UPDATE " . TABLE_SETTINGS . " SET settings_name = %s WHERE settings_name = %s";
@@ -532 +524 @@
                         }
                 }
-
-                // SITE TABLE - for multiple sites
-                if (!$exists = $h->db->table_exists('site')) {
-                        $sql = "CREATE TABLE `" . DB_PREFIX . "site` (
-                                `site_id` int(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                                `site_adminuser_id` varchar(64) NULL,
-                                `site_url` varchar(128) NOT NULL DEFAULT '',
-                                `site_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                                `site_updateby` int(20) NOT NULL DEFAULT 0
-                        ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Site Table';";
-                        $h->db->query($sql);
-                }
-
-                //Add site_id column and index to each table
+        
+                // reorder the admin settings
+                $desired_order = array('SITE_OPEN', 'SITE_NAME', 'THEME', 'ADMIN_THEME', 'DEBUG', 'FRIENDLY_URLS', 'DB_CACHE', 'DB_CACHE_DURATION', 'CSS_JS_CACHE', 'HTML_CACHE', 'LANG_CACHE', 'RSS_CACHE', 'RSS_CACHE_DURATION', 'SITE_EMAIL', 'SMTP', 'SMTP_HOST', 'SMTP_PORT', 'SMTP_USERNAME', 'SMTP_PASSWORD'); 
+                $sql = "SELECT * FROM " . TABLE_SETTINGS;
+                $results = $h->db->get_results($sql);
+                $h->db->query("TRUNCATE TABLE " . TABLE_SETTINGS);
+
+                if ($results) {
+                        $i = 0;
+                        while (!empty($desired_order)) {
+                                foreach ($results as $row) {
+                                        if (count($desired_order) == 0) { break; }
+                                        if ($row->settings_name == $desired_order[0]) {
+                                                $sql = "INSERT INTO " . TABLE_SETTINGS . " (settings_name, settings_value, settings_default, settings_note, settings_show) VALUES(%s, %s, %s, %s, %s)";
+                                                $h->db->query($h->db->prepare($sql, $row->settings_name, $row->settings_value, $row->settings_default, $row->settings_note, $row->settings_show));
+                                                array_shift($desired_order);
+                                        }
+                                        $i++;
+                                        if ($i > 10000) { break; } // got stuck in a loop
+                                }
+                        }
+                }
+
+                // update "old version" for next set of upgrades
+                $old_version = "1.3.0";
+        }
+
+         // 1.3.0 to 1.4.0
+        if ($old_version == "1.3.0") {
+    
+            // Drop token_id column from the tokens table
+            if ($h->db->column_exists('tokens', 'token_id')) {
+                    $h->db->query("ALTER TABLE " . DB_PREFIX . "tokens DROP token_id");
+            }
+
+                // update "old version" for next set of upgrades
+                $old_version = "1.4.0";
+        }
+
+         // 1.4.0 to 1.4.1
+        if ($old_version == "1.4.0") {
+                // update "old version" for next set of upgrades
+                $old_version = "1.4.1";
+        }
+
+         // 1.4.1 to 1.4.2
+        if ($old_version == "1.4.1")
+        {
+
+                // Change post_title column from `post_title` varchar(255) NULL, to `post_title` text NULL,
+                $exists = $h->db->column_exists('posts', 'post_title');
+                if ($exists) {
+                        $sql = "ALTER TABLE " . TABLE_POSTS . " MODIFY post_title text NULL";
+                        $h->db->query($h->db->prepare($sql));
+                }
+
+                // remove multi-site option from settings 
+                $sql = "DELETE FROM " . TABLE_SETTINGS . " WHERE settings_name = %s"; 
+                $h->db->query($h->db->prepare($sql, 'MULTI_SITE'));
+
+                //tables to remove site_id from:
                 $tables = array(
                         'blocked'=>'blocked','categories'=>'category',
@@ -554 +593 @@
                 );
 
-                foreach ($tables as $table => $column) {
-
-                        if (!$exists = $h->db->column_exists($table, $column . '_siteid')) {
-                                // Create a column for index first
-                                $sql = "ALTER TABLE " . DB_PREFIX . $table . " ADD " . $column . "_siteid INT NOT NULL DEFAULT 1";
+                // Remove site_id columns
+                foreach ($tables as $table => $column)
+                {
+                        if ($exists = $h->db->column_exists($table, $column . '_siteid')) {
+                                // Remove column
+                                $sql = "ALTER TABLE " . DB_PREFIX . $table . " DROP " . $column . "_siteid";
                                 $h->db->query($sql);
-                        } else {
-                                // fix to make sure siteid=0 columns are changed to siteid=1
-                                $sql = "ALTER TABLE " . DB_PREFIX . $table . " MODIFY " . $column . "_siteid INT NOT NULL DEFAULT 1";
-                                $h->db->query($sql);
-
-                                $sql = "UPDATE " . DB_PREFIX . $table . " SET " . $column . "_siteid=1 WHERE " . $column . "_siteid=0";
-                                $h->db->query($sql);
-                        }
-
-                        
+                        }
+
+                        // Remove site_id indices
                         $sql = "SHOW INDEX FROM `" . DB_PREFIX . $table . "` WHERE KEY_NAME = '" . $column . "_siteid'";
                         $result = $h->db->query($sql);
-                        if (!$result) {
-                                $sql = "ALTER TABLE `" . DB_PREFIX . $table . "` ADD INDEX (" . $column . "_siteid)";
+                        if ($result) {
+                                $sql = "DROP INDEX " . $column . "_siteid ON " . DB_PREFIX . $table;
                                 $h->db->query($sql);
                         }
-
-                        // Unique Keys
-                        /*
-                         *
-                         */
-                        if ($exists = $h->db->column_exists('categories', 'category_siteid')) {
-                            $sql = "ALTER TABLE `" . TABLE_CATEGORIES . "` DROP KEY `key`";
-                            $h->db->query($sql);
-                            $sql = "ALTER TABLE `" . TABLE_CATEGORIES . "` ADD UNIQUE KEY `key` (`category_name`, `category_siteid`)";
-                            $h->db->query($sql);
-                        }
-                        if ($exists = $h->db->column_exists('plugins', 'plugin_siteid')) {
-                            $sql = "ALTER TABLE `" . TABLE_PLUGINS . "` DROP KEY `key`";
-                            $h->db->query($sql);
-                            $sql = "ALTER TABLE `" . TABLE_PLUGINS . "` ADD UNIQUE KEY `key` (`plugin_folder`, `plugin_siteid`)";
-                            $h->db->query($sql);
-                        }
-                        if ($exists = $h->db->column_exists('settings', 'settings_siteid')) {
-                            $sql = "ALTER TABLE `" . TABLE_SETTINGS . "` DROP KEY `key`";
-                            $h->db->query($sql);
-                            $sql = "ALTER TABLE `" . TABLE_SETTINGS . "` ADD UNIQUE KEY `key` (`settings_name`, `settings_siteid`)";
-                            $h->db->query($sql);
-                        }
-                        if ($exists = $h->db->column_exists('tags', 'tags_siteid')) {
-                            $sql = "ALTER TABLE `" . TABLE_TAGS . "` DROP KEY `key`";
-                            $h->db->query($sql);
-                            $sql = "ALTER TABLE `" . TABLE_TAGS . "` ADD UNIQUE KEY `key` (`tags_post_id`, `tags_word`, `tags_siteid`)";
-                            $h->db->query($sql);
-                        }
-                        if ($exists = $h->db->column_exists('users', 'user_siteid')) {
-                            $sql = "ALTER TABLE `" . TABLE_USERS . "` DROP KEY `key`";
-                            $h->db->query($sql);
-                            $sql = "ALTER TABLE `" . TABLE_USERS . "` ADD UNIQUE KEY `key` (`user_username`, `user_siteid`)";
-                            $h->db->query($sql);
-                        }
-                }
-                
-                
-                // reorder the admin settings
-                $desired_order = array('SITE_OPEN', 'SITE_NAME', 'THEME', 'ADMIN_THEME', 'DEBUG', 'FRIENDLY_URLS', 'DB_CACHE', 'DB_CACHE_DURATION', 'CSS_JS_CACHE', 'HTML_CACHE', 'LANG_CACHE', 'RSS_CACHE', 'RSS_CACHE_DURATION', 'SITE_EMAIL', 'SMTP', 'SMTP_HOST', 'SMTP_PORT', 'SMTP_USERNAME', 'SMTP_PASSWORD', 'SYS_FEEDBACK'); 
-                $sql = "SELECT * FROM " . TABLE_SETTINGS;
-                $results = $h->db->get_results($sql);
-                $h->db->query("TRUNCATE TABLE " . TABLE_SETTINGS);
-
-                if ($results) {
-                        $i = 0;
-                        while (!empty($desired_order)) {
-                                foreach ($results as $row) {
-                                        if (count($desired_order) == 0) { break; }
-                                        if ($row->settings_name == $desired_order[0]) {
-                                                $sql = "INSERT INTO " . TABLE_SETTINGS . " (settings_name, settings_value, settings_default, settings_note, settings_show, settings_siteid) VALUES(%s, %s, %s, %s, %s, %d)";
-                                                $h->db->query($h->db->prepare($sql, $row->settings_name, $row->settings_value, $row->settings_default, $row->settings_note, $row->settings_show, $row->settings_siteid));
-                                                array_shift($desired_order);
-                                        }
-                                        $i++;
-                                        if ($i > 10000) { break; } // got stuck in a loop
-                                }
-                        }
-                }
-
-                // update "old version" for next set of upgrades
-                $old_version = "1.3.0";
-        }
-
-         // 1.3.0 to 1.4.0
-        if ($old_version == "1.3.0") {
-
-            // Version Info Auto Update
-            $sql = "UPDATE  " . TABLE_SETTINGS . " SET settings_note = %s, settings_name = %s WHERE settings_name = %s";
-            $h->db->query($h->db->prepare($sql, 'Hotaru updates', 'SYS_UPDATES', 'SYS_FEEDBACK'));
-
-            // Version Info Auto Update
-            $sql = "UPDATE  " . TABLE_SETTINGS . " SET settings_note = %s, settings_name = %s WHERE settings_name = %s";
-            $h->db->query($h->db->prepare($sql, 'Hotaru updates', 'SYS_UPDATES', 'SYS_FEEDBACK'));
-
-            // MULTI_SITE for SETTINGS table for siteid=1 only (admin)
-            $sql = "SELECT settings_siteid FROM " . TABLE_SETTINGS . " WHERE settings_name = %s AND settings_siteid = %d";
-            $result = $h->db->get_var($h->db->prepare($sql, 'MULTI_SITE', 1));
-
-            if (!$result) {
-                $sql = "INSERT INTO " . TABLE_SETTINGS . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
-                $h->db->query($h->db->prepare($sql, 'MULTI_SITE', 'false', 'false', 'Multiple sites'));
-            }
-
-            // Add siteid to pluginhooks table
-            if (!$exists = $h->db->column_exists('pluginhooks', 'pluginhooks_siteid')) {
-                    // Create a column for index first
-                    $sql = "ALTER TABLE " . TABLE_PLUGINHOOKS . " ADD pluginhooks_siteid INT NOT NULL DEFAULT 1";
-                    $h->db->query($sql);
-            }
-
-            // Add index for siteid on pluginhooks table
-            $sql = "SHOW INDEX FROM `" . TABLE_PLUGINHOOKS . "` WHERE KEY_NAME = 'pluginhooks_siteid'";
-            $result = $h->db->query($sql);
-            if (!$result) {
-                    $sql = "ALTER TABLE `" . TABLE_PLUGINHOOKS . "` ADD INDEX (pluginhooks_siteid)";
-                    $h->db->query($sql);
-            }
-
-            // Change post_title column from `post_title` varchar(255) NULL, to `post_title` text NULL,
-            $exists = $h->db->column_exists('posts', 'post_title');
-            if ($exists) {
-                    $sql = "ALTER TABLE " . TABLE_POSTS . " MODIFY post_title text NULL";
-                    $h->db->query($h->db->prepare($sql));
-            }
-            
-            // Drop token_id column from the tokens table
-            if ($h->db->column_exists('tokens', 'token_id')) {
-                    $h->db->query("ALTER TABLE " . DB_PREFIX . "tokens DROP token_id");
-            }
-
-                // update "old version" for next set of upgrades
-                $old_version = "1.4.0";
-        }
-
-         // 1.4.0 to 1.4.1
-        if ($old_version == "1.4.0") {
-                // update "old version" for next set of upgrades
-                $old_version = "1.4.1";
-        }
-
-         // 1.4.1 to 1.4.2
-        if ($old_version == "1.4.1")
-        {
-            // RELATES TABLE - moved here because it wasn't included in fresh installs prior to 1.4.2
-            if (!$exists = $h->db->table_exists('relates')) {
-                //echo "table doesn't exist. Stopping before creation."; exit;
-                $sql = "CREATE TABLE `" . DB_PREFIX .  "relates` (
-                        `relates_id` int(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        `relates_user_id` int(20) NOT NULL default '0',
-                        `relates_post_id` int(20) NOT NULL default '0',
-                        `relates_type` varchar(64) default '',
-                        `relates_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                        INDEX  (`relates_user_id`),
-                        INDEX  (`relates_post_id`),
-                        INDEX  (`relates_type`)
-                ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Relates';";           
-                $h->db->query($sql);
-                }
-
-                // Change post_title column from `post_title` varchar(255) NULL, to `post_title` text NULL,
-                $exists = $h->db->column_exists('posts', 'post_title');
-                if ($exists) {
-                        $sql = "ALTER TABLE " . TABLE_POSTS . " MODIFY post_title text NULL";
-                        $h->db->query($h->db->prepare($sql));
-                }
-
-                // remove language pack option from settings
-                $sql = "DELETE FROM " . TABLE_SETTINGS . " WHERE settings_name = %s";
-                $h->db->query($h->db->prepare($sql, 'MULTI_SITE'));
-
-                // update "old version" for next set of upgrades
-                //$old_version = "1.4.2";
+                }
+
+                // Drop unique site_id keys
+                $sql = "ALTER TABLE `" . TABLE_CATEGORIES . "` DROP INDEX `key`";
+                $h->db->query($sql);
+                $sql = "ALTER TABLE `" . TABLE_CATEGORIES . "` ADD UNIQUE KEY `key` (`category_name`)";
+                $h->db->query($sql);
+                
+                $sql = "ALTER TABLE `" . TABLE_PLUGINS . "` DROP INDEX `key`";
+                $h->db->query($sql);
+                $sql = "ALTER TABLE `" . TABLE_PLUGINS . "` ADD UNIQUE KEY `key` (`plugin_folder`)";
+                $h->db->query($sql);
+                
+                $sql = "ALTER TABLE `" . TABLE_SETTINGS . "` DROP INDEX `key`";
+                $h->db->query($sql);
+                $sql = "ALTER TABLE `" . TABLE_SETTINGS . "` ADD UNIQUE KEY `key` (`settings_name`)";
+                $h->db->query($sql);
+                
+                $sql = "ALTER TABLE `" . TABLE_TAGS . "` DROP INDEX `key`";
+                $h->db->query($sql);
+                $sql = "ALTER TABLE `" . TABLE_TAGS . "` ADD UNIQUE KEY `key` (`tags_post_id`, `tags_word`)";
+                $h->db->query($sql);
+                
+                $sql = "ALTER TABLE `" . TABLE_USERS . "` DROP INDEX `key`";
+                $h->db->query($sql);
+                $sql = "ALTER TABLE `" . TABLE_USERS . "` ADD UNIQUE KEY `key` (`user_username`)";
+                $h->db->query($sql);
+
+                // Drop Site table
+                $sql = 'DROP TABLE IF EXISTS `' . DB_PREFIX . 'site`;';
+                $h->db->query($sql);
+
+                // Drop Relates table
+                $sql = 'DROP TABLE IF EXISTS `' . DB_PREFIX . 'relates`;';
+                $h->db->query($sql);
+
+                // remove the "1" cache folder if permissions allow, otherwise error messages supressed.
+                if (is_dir(CACHE . '1'))
+                {
+                        if (is_dir(CACHE . '1/db_cache')) {
+                                $h->deleteFiles(CACHE . '1/db_cache');
+                                @rmdir(CACHE . '1/db_cache');
+                        }
+
+                        if (is_dir(CACHE . '1/css_js_cache')) {
+                                $h->deleteFiles(CACHE . '1/css_js_cache');
+                                @rmdir(CACHE . '1/css_js_cache');
+                        }
+
+                        if (is_dir(CACHE . '1/rss_cache')) {
+                                $h->deleteFiles(CACHE . '1/rss_cache');
+                                @rmdir(CACHE . '1/rss_cache');
+                        }
+
+                        if (is_dir(CACHE . '1/lang_cache')) {
+                                $h->deleteFiles(CACHE . '1/lang_cache');
+                                @rmdir(CACHE . '1/lang_cache');
+                        }
+
+                        if (is_dir(CACHE . '1/html_cache')) {
+                                $h->deleteFiles(CACHE . '1/html_cache');
+                                @rmdir(CACHE . '1/html_cache');
+                        }
+
+                        if (is_dir(CACHE . '1/debug_logs')) {
+                                $h->deleteFiles(CACHE . '1/debug_logs');
+                                @rmdir(CACHE . '1/debug_logs');
+                        }
+
+                        if (file_exists(CACHE . '1/smartloader_cache.php')) {
+                                @unlink(CACHE . '1/smartloader_cache.php');
+                        }
+
+                        @rmdir(CACHE . '1');
+                }
+                // update "old version" for next set of upgrades
+                $old_version = "1.4.2";
         }
 
@@ -736 +693 @@
 }
 
-
-
-
-
-
 ?>

branches/1.5/install/install_functions.php

@@ -140 +140 @@
             delTree( $file );
         else
-            unlink( $file );
+            @unlink( $file );
     }
 
-    if (is_dir($dir)) return rmdir( $dir );
+    if (is_dir($dir)) return @rmdir( $dir );
 }

branches/1.5/install/install_language.php

@@ -48 +48 @@
 $lang["install_next"] = "Next";
 $lang["install_back"] = "Back";
-$lang["install_trouble"] = "Having trouble? Read the <a href='http://hotarudocs.com'>Documentation</a> or ask for help in the <a href='http://hotarucms.org/forum.php'>Forums</a>.";
+$lang["install_trouble"] = "Having trouble? Read the <a href='http://docs.hotarucms.org'>Documentation</a> or ask for help in the <a href='http://hotarucms.org/forum.php'>Forums</a>.";
 
 /* Install Step 1 */
@@ -139 +139 @@
 $lang["install_step4"] = "Step 4/4: Completion";
 $lang["install_step4_installation_complete"] = "Installation has been successfully completed.";
-$lang["install_step4_installation_delete"] = "You <b>must</b> delete the install folder or someone else could run the install script and wipe everything!";
-$lang["install_step4_installation_delete_folder"] = "Shall we try and delete the 'install' folder for you?";
-$lang["install_step4_form_delete_folder"] = "Delete Folder";
-$lang["install_step4_installation_delete_failed"] = "We were not able to delete the install folder. Please delete it manually.";
+$lang["install_step4_installation_delete"] = "<span style='color: red;'><b>WARNING:</b> You <b>must</b> delete the install folder or someone else could run the install script and wipe everything!</span>";
 $lang["install_step4_form_check_php"] = "Check PHP Setup";
 $lang["install_step4_form_check_php_warning"] = "Note: Your server is missing the PHP module: ";

branches/1.5/install/install_tables.php

@@ -52 +52 @@
                         `blocked_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
                         `blocked_updateby` int(20) NOT NULL DEFAULT 0,
-                        `blocked_siteid` int(20) NOT NULL DEFAULT 1,
-                        INDEX (`blocked_siteid`),
                         INDEX  (`blocked_type`)
                 ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Blocked IPs, users, emails, etc';";
@@ -75 +73 @@
                         `category_order` int(11) NOT NULL DEFAULT '0',
                         `category_desc` text NULL,
-                        `category_keywords` varchar(255) NOT NULL,
+                        `category_keywords` varchar(255) NULL,
                         `category_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
                         `category_updateby` int(20) NOT NULL DEFAULT 0,
-                        `category_siteid` int(20) NOT NULL DEFAULT 1,
-                        INDEX (`category_siteid`),
-                        UNIQUE KEY `key` (`category_name`, `category_siteid`)
+                        UNIQUE KEY `key` (`category_name`)
                 ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Categories';";
                 echo $lang['install_step2_creating_table'] . ": '" . DB_PREFIX . $table_name . "'...<br />\n";
@@ -101 +97 @@
                         `comment_user_id` int(20) NOT NULL DEFAULT '0',
                         `comment_parent` int(20) DEFAULT '0',
-                        `comment_date` timestamp NOT NULL,
+                        `comment_date` timestamp NULL,
                         `comment_status` varchar(32) NOT NULL DEFAULT 'approved',
-                        `comment_content` text NOT NULL,
+                        `comment_content` text NULL,
                         `comment_votes_up` smallint(11) NOT NULL DEFAULT '0',
                         `comment_votes_down` smallint(11) NOT NULL DEFAULT '0',
                         `comment_subscribe` tinyint(1) NOT NULL DEFAULT '0',
                         `comment_updateby` int(20) NOT NULL DEFAULT 0,
-                        `comment_siteid` int(20) NOT NULL DEFAULT 1,
-                        INDEX (`comment_siteid`),
                         FULLTEXT (`comment_content`),
                         INDEX  (`comment_archived`),
@@ -131 +125 @@
                         `cvote_user_id` int(11) NOT NULL DEFAULT '0',
                         `cvote_user_ip` varchar(32) NOT NULL DEFAULT '0',
-                        `cvote_date` timestamp NOT NULL,
+                        `cvote_date` timestamp NULL,
                         `cvote_rating` smallint(11) NOT NULL DEFAULT '0',
                         `cvote_reason` tinyint(3) NOT NULL DEFAULT 0,
@@ -166 +160 @@
                         `message_from` int(20) NOT NULL DEFAULT 0,
                         `message_to` int(20) NOT NULL DEFAULT 0,
-                        `message_date` timestamp NOT NULL,
+                        `message_date` timestamp NULL,
                         `message_subject` varchar(255) NOT NULL DEFAULT '',
                         `message_content` text NULL,
@@ -185 +179 @@
                 $sql = "CREATE TABLE `" . DB_PREFIX . $table_name . "` (
                         `miscdata_id` int(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        `miscdata_key` varchar(64) NOT NULL,
-                        `miscdata_value` text NOT NULL DEFAULT '',
-                        `miscdata_default` text NOT NULL DEFAULT '',
+                        `miscdata_key` varchar(64) NULL,
+                        `miscdata_value` text NULL,
+                        `miscdata_default` text NULL,
                         `miscdata_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                        `miscdata_updateby` int(20) NOT NULL DEFAULT 0,
-                        `miscdata_siteid` int(20) NOT NULL DEFAULT 1,
-                        INDEX (`miscdata_siteid`)
+                        `miscdata_updateby` int(20) NOT NULL DEFAULT 0
                 ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Miscellaneous Data';";
                 echo $lang['install_step2_creating_table'] . ": '" . DB_PREFIX . $table_name . "'...<br />\n";
@@ -241 +233 @@
                         `plugin_updateby` int(20) NOT NULL DEFAULT 0,
                         `plugin_latestversion` varchar(8) NOT NULL DEFAULT '0.0',
-                        `plugin_siteid` int(20) NOT NULL DEFAULT 1,
-                        INDEX (`plugin_siteid`),
-                        UNIQUE KEY `key` (`plugin_folder`, `plugin_siteid`)
+                        UNIQUE KEY `key` (`plugin_folder`)
                 ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Application Plugins';";
                 echo $lang['install_step2_creating_table'] . ": '" . DB_PREFIX . $table_name . "'...<br />\n";
@@ -258 +248 @@
                         `plugin_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
                         `plugin_updateby` int(20) NOT NULL DEFAULT 0,
-                        `pluginhooks_siteid` int(20) NOT NULL DEFAULT 1,
-                        INDEX  (`plugin_folder`),
-                        INDEX (`pluginhooks_siteid`)
+                        INDEX  (`plugin_folder`)
                 ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Plugins Hooks';";
                 echo $lang['install_step2_creating_table'] . ": '" . DB_PREFIX . $table_name . "'...<br />\n";
@@ -271 +259 @@
                 $sql = "CREATE TABLE `" . DB_PREFIX . $table_name . "` (
                         `psetting_id` int(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        `plugin_folder` varchar(64) NOT NULL,
+                        `plugin_folder` varchar(64) NULL,
                         `plugin_setting` varchar(64) NULL,
                         `plugin_value` text NULL,
                         `plugin_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
                         `plugin_updateby` int(20) NOT NULL DEFAULT 0,
-                        `plugin_siteid` int(20) NOT NULL DEFAULT 1,
-                        INDEX (`plugin_siteid`),
                         INDEX  (`plugin_folder`)
                 ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Plugins Settings';";
@@ -294 +280 @@
                         `post_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
                         `post_author` int(20) NOT NULL DEFAULT 0,
-                        `post_date` timestamp NOT NULL,
-                        `post_pub_date` timestamp NOT NULL,
+                        `post_date` timestamp NULL,
+                        `post_pub_date` timestamp NULL,
                         `post_status` varchar(32) NOT NULL DEFAULT 'processing',
                         `post_type` varchar(32) NULL,
@@ -310 +296 @@
                         `post_subscribe` tinyint(1) NOT NULL DEFAULT '0',
                         `post_updateby` int(20) NOT NULL DEFAULT 0,
-                        `post_siteid` int(20) NOT NULL DEFAULT 1,
-                        INDEX (`post_siteid`),
                         FULLTEXT (`post_title`, `post_domain`, `post_url`, `post_content`, `post_tags`),
                         INDEX  (`post_archived`),
@@ -351 +335 @@
                         `vote_user_id` int(11) NOT NULL DEFAULT '0',
                         `vote_user_ip` varchar(32) NOT NULL DEFAULT '0',
-                        `vote_date` timestamp NOT NULL,
+                        `vote_date` timestamp NULL,
                         `vote_type` varchar(32) NULL,
                         `vote_rating` smallint(11) NOT NULL DEFAULT '0',
@@ -362 +346 @@
         } 
 
-
-        // RELATES TABLE
-
-                if ($table_name == "relates") {
-                //echo "table doesn't exist. Stopping before creation."; exit;
-                $sql = "CREATE TABLE `" . DB_PREFIX . $table_name . "` (
-                        `relates_id` int(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        `relates_user_id` int(20) NOT NULL default '0',
-                        `relates_post_id` int(20) NOT NULL default '0',
-                        `relates_type` varchar(64) default '',
-                        `relates_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                        INDEX  (`relates_user_id`),
-                        INDEX  (`relates_post_id`),
-                        INDEX  (`relates_type`)
-                ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Relates';";
-                echo $lang['install_step2_creating_table'] . ": '" . DB_PREFIX . $table_name . "'...<br />\n";
-                $db->query($sql);
-                }
-
-
         
         // SETTINGS TABLE
@@ -388 +352 @@
                 $sql = "CREATE TABLE `" . DB_PREFIX . $table_name . "` (
                         `settings_id` int(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        `settings_name` varchar(64) NOT NULL,
-                        `settings_value` text NOT NULL DEFAULT '',
-                        `settings_default` text NOT NULL DEFAULT '',
-                        `settings_note` text NOT NULL DEFAULT '',
+                        `settings_name` varchar(64) NULL,
+                        `settings_value` text NULL,
+                        `settings_default` text NULL,
+                        `settings_note` text NULL,
                         `settings_show` enum('Y','N') NOT NULL DEFAULT 'Y',
                         `settings_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
                         `settings_updateby` int(20) NOT NULL DEFAULT 0,
-                        `settings_siteid` int(20) NOT NULL DEFAULT 1,
-                        UNIQUE KEY `key` (`settings_name`, `settings_siteid`),
-                        INDEX (`settings_siteid`)
+                        UNIQUE KEY `key` (`settings_name`)
                 ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Application Settings';";
                 echo $lang['install_step2_creating_table'] . ": '" . DB_PREFIX . $table_name . "'...<br />\n";
@@ -480 +442 @@
                 $db->query($db->prepare($sql, 'SMTP_PASSWORD', '', '', ''));
                 
-                // Sys Feedback
-                $sql = "INSERT INTO " . DB_PREFIX . $table_name . " (settings_name, settings_value, settings_default, settings_note) VALUES (%s, %s, %s, %s)";
-                $db->query($db->prepare($sql, 'SYS_UPDATES', 'true', 'true', 'Hotaru updates'));
-
                 echo $lang['install_step2_adding_data'] . ": '" . DB_PREFIX . $table_name . "'...<br />\n";
 
-        }
-        
-        
-        // SITE TABLE - for multiple sites
-
-        if ($table_name == "site") {
-                $sql = "CREATE TABLE `" . DB_PREFIX . $table_name . "` (
-                        `site_id` int(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        `site_adminuser_id` varchar(64) NULL,
-                        `site_url` varchar(128) NOT NULL DEFAULT '',
-                        `site_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                        `site_updateby` int(20) NOT NULL DEFAULT 0
-                ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Site Table';";
-                echo $lang['install_step2_creating_table'] . ": '" . DB_PREFIX . $table_name . "'...<br />\n";
-                $db->query($sql);
         }
         
@@ -512 +455 @@
                         `tags_archived` enum('Y','N') NOT NULL DEFAULT 'N',
                         `tags_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
-                        `tags_date` timestamp NOT NULL,
+                        `tags_date` timestamp NULL,
                         `tags_word` varchar(64) NOT NULL DEFAULT '',
                         `tags_updateby` int(20) NOT NULL DEFAULT 0,
-                        `tags_siteid` int(20) NOT NULL DEFAULT 1,
-                        INDEX (`tags_siteid`),
-                        UNIQUE KEY `tags_post_id` (`tags_post_id`,`tags_word`,`tags_siteid`),
+                        UNIQUE KEY `tags_post_id` (`tags_post_id`,`tags_word`),
                         INDEX  (`tags_archived`)
                 ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Post Tags';";
@@ -545 +486 @@
         if ($table_name == "tokens") {
                 $sql = "CREATE TABLE `" . DB_PREFIX . $table_name . "` (
-                        `token_sid` varchar(32) NOT NULL,
-                        `token_key` CHAR(32) NOT NULL,
+                        `token_sid` varchar(32) NULL,
+                        `token_key` CHAR(32) NULL,
                         `token_stamp` INT(11) NOT NULL default '0',
                         `token_action` varchar(64),
@@ -562 +503 @@
                         `user_id` int(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                         `user_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                        `user_username` varchar(32) NOT NULL,
+                        `user_username` varchar(32) NULL,
                         `user_role` varchar(32) NOT NULL DEFAULT 'member',
-                        `user_date` timestamp NOT NULL,
+                        `user_date` timestamp NULL,
                         `user_password` varchar(64) NOT NULL DEFAULT '',
                         `user_password_conf` varchar(128) NULL,
@@ -570 +511 @@
                         `user_email_valid` tinyint(3) NOT NULL DEFAULT 0,
                         `user_email_conf` varchar(128) NULL,
-                        `user_permissions` text NOT NULL DEFAULT '',
+                        `user_permissions` text NULL,
                         `user_ip` varchar(32) NOT NULL DEFAULT '0',
                         `user_lastlogin` timestamp NULL,
                         `user_lastvisit` timestamp NULL,
                         `user_updateby` int(20) NOT NULL DEFAULT 0,
-                        `user_siteid` int(20) NOT NULL DEFAULT 1,
-                        INDEX (`user_siteid`),
-                        UNIQUE KEY `key` (`user_username`, `user_siteid`),
+                        UNIQUE KEY `key` (`user_username`),
                         KEY `user_email` (`user_email`)                 
                 ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Users and Roles';";
@@ -618 +557 @@
                         `useract_key2` varchar(255) NULL,
                         `useract_value2` text NULL,
-                        `useract_date` timestamp NOT NULL,
+                        `useract_date` timestamp NULL,
                         `useract_updateby` int(20) NOT NULL DEFAULT 0, 
                         INDEX  (`useract_userid`)
@@ -637 +576 @@
                         `widget_function` varchar(255) NULL, 
                         `widget_args` varchar(255) NULL, 
-                        `widget_updateby` int(20) NOT NULL DEFAULT 0,
-                        `widget_siteid` int(20) NOT NULL DEFAULT 1,
-                        INDEX (`widget_siteid`)
+                        `widget_updateby` int(20) NOT NULL DEFAULT 0
                 ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Widgets';";
                 echo $lang['install_step2_creating_table'] . ": '" . DB_PREFIX . $table_name . "'...<br />\n";