Changeset 2239 for branches

Timestamp:

11/26/10 12:11:27 (18 months ago)

Author:

nick_ramsay

Message:

[1.5] Libs updates from 1.4.2.

Location:

branches/1.5/libs

Files:

• AdminPages.php (modified) (1 diff)
• Announcements.php (modified) (1 diff)
• Initialize.php (modified) (4 diffs)

branches/1.5/libs/AdminPages.php

@@ -371 +371 @@
                                 DB_PREFIX . 'posts',
                                 DB_PREFIX . 'postvotes',
-                                DB_PREFIX . 'relates',
                                 DB_PREFIX . 'site',
                                 DB_PREFIX . 'tags',

branches/1.5/libs/Announcements.php

@@ -88 +88 @@
                 $announcements = array();
 
-                if (SITEID == 1) {
-                    // Check if install file has been deleted
-                    $filename = INSTALL . 'install.php';
-                    if (file_exists($filename)) {
-                            array_push($announcements, $h->lang['admin_announcement_delete_install']);
-                    }
+            // Check if install file has been deleted
+            $filename = INSTALL . 'install.php';
+            if (file_exists($filename)) {
+                    array_push($announcements, $h->lang['admin_announcement_delete_install']);
+            }
 
-                    // Check if install file has not been run
-                    $sql = "SELECT miscdata_value FROM " . TABLE_MISCDATA . " WHERE miscdata_key = %s";
-                    $hotaru_version = $h->db->get_var($h->db->prepare($sql, 'hotaru_version'));
-                    if (version_compare($h->version, $hotaru_version, '>')) {
-                            array_push($announcements, $h->lang['admin_announcement_run_install']);
-                    }
-                }
+            // Check if install file has not been run
+            $sql = "SELECT miscdata_value FROM " . TABLE_MISCDATA . " WHERE miscdata_key = %s";
+            $hotaru_version = $h->db->get_var($h->db->prepare($sql, 'hotaru_version'));
+            if (version_compare($h->version, $hotaru_version, '>')) {
+                    array_push($announcements, $h->lang['admin_announcement_run_install']);
+            }
                 
                 // Site is currently undergoing maintenance

branches/1.5/libs/Initialize.php

@@ -46 +46 @@
                 $this->setTableConstants();
 
+                $this->MakeCacheFolders();
                 $this->getFiles();
                 $this->cage = $this->initInspektCage();
                 $this->db = $this->initDatabase();
 
-                $this->getCurrentSiteID();
                 $this->errorReporting();
 
@@ -109 +109 @@
                         "TABLE_POSTVOTES" => "postvotes",
                         "TABLE_SETTINGS" => "settings",
-                        "TABLE_SITE" => "site",
                         "TABLE_TAGS" => "tags",
                         "TABLE_TEMPDATA" => "tempdata",
@@ -125 +124 @@
         }
 
-        /**
-         * Sets the current SiteID if multiple sites.
-         */
-        public function getCurrentSiteID()
-        {
-                $siteid = 1;
-                $siteurl = BASEURL;
-
-                if (!defined('SITEID')) {
-                        define('SITEID', $siteid);
-                }
-                if (!defined('SITEURL')) {
-                        define('SITEURL', $siteurl);
-                }
-                if (!defined('CACHE')) {
-
-                        define('CACHE', BASE.'cache/'.$siteid.'/');
-
-                        // 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) {
-                                if (!is_dir(CACHE.$dir)) {
-                                        mkdir(CACHE.$dir);
-                                }
-                        }
-                }
-
-                return FALSE;
-        }
 
         /**
@@ -248 +217 @@
         }
 
+
+        /**
+         * Make cache folders if they don't already exist
+         */
+        public function MakeCacheFolders()
+        {
+                // create a debug_logs folder if one doesn't exist.
+                if (!is_dir(CACHE . 'debug_logs')) { mkdir(CACHE . 'debug_logs'); }
+
+                // create a db_cache folder if one doesn't exist.
+                if (!is_dir(CACHE . 'db_cache')) { mkdir(CACHE . 'db_cache'); }
+
+                // create a css_js_cache folder if one doesn't exist.
+                if (!is_dir(CACHE . 'css_js_cache')) { mkdir(CACHE . 'css_js_cache'); }
+
+                // create a lang_cache folder if one doesn't exist.
+                if (!is_dir(CACHE . 'lang_cache')) { mkdir(CACHE . 'lang_cache'); }
+
+                // create an rss_cache folder if one doesn't exist.
+                if (!is_dir(CACHE . 'rss_cache')) { mkdir(CACHE . 'rss_cache'); }
+
+                // create an html_cache folder if one doesn't exist.
+                if (!is_dir(CACHE . 'html_cache')) { mkdir(CACHE . 'html_cache'); }
+        }
+
+
         /**
          * Set up database cache