Changeset 1908

Timestamp:

06/07/10 04:52:20 (3 years ago)

Author:

shibuya246

Message:

[Branch 1.4] multi-site check on initialize. checks siteid=1's settings table for presence of MULTI_SITE constant. If not found do nothing. if false do nothing. If true, check which site to show.

File:

• branches/1.4/libs/Initialize.php (modified) (4 diffs)

branches/1.4/libs/Initialize.php

@@ -53 +53 @@
                 $this->getCurrentSiteID();
                 $this->errorReporting();
-                
+
                 $this->readSettings();
                 $this->setUpDatabaseCache();
@@ -153 +153 @@
         public function getCurrentSiteID()
         {
-//              if isActive($result) {
-//                  $url =  $this->cage->server->getRaw('HTTP_HOST');   // wanted to use sanitizeTags
-//                  $sql = "SELECT site_id, site_adminuser_id FROM " . TABLE_SITE . " WHERE site_url = %s";
-//                  $settings = $this->db->get_row($this->db->prepare($sql, $url));
-//                  var_dump( $settings);
-//
-//                  if ($settings) {
-//                      $siteid = $settings->site_id;
-//                  } else {
-//                      $siteid = 1;
-//                  }
-//              } else {
+                // read settings for default siteid=1 first to check whether MULTISITE is TRUE
+                $sql = "SELECT settings_value FROM " . TABLE_SETTINGS . " WHERE settings_name = %s AND settings_siteid = %d";
+                $multi_site = $this->db->get_var($this->db->prepare($sql, 'MULTI_SITE', 1));
+
+                if ($multi_site == 'true') {            
+                    $url =  $this->cage->server->getRaw('HTTP_HOST');   // wanted to use sanitizeTags
+                    $sql = "SELECT site_id, site_adminuser_id FROM " . TABLE_SITE . " WHERE site_url = %s";
+                    $settings = $this->db->get_row($this->db->prepare($sql, $url));              
+
+                    if ($settings) {
+                        $siteid = $settings->site_id;
+                        $siteurl = "http://" . $url;
+                    } else {
+                        $siteid = 1;
+                        $siteurl = BASEURL;
+                    }
+
+                } else {
                     $siteid = 1;
-//              }
-                if (!defined('SITEID')) {
-                    define('SITEID', $siteid);
-                    if (!defined('CACHE')) { define("CACHE", BASE . "cache/" . $siteid . "/"); }
+                    $siteurl = BASEURL;
+                }
+
+                if (!defined('SITEID')) { define('SITEID', $siteid); }
+                if (!defined('SITEURL')) { define("SITEURL", $siteurl . "/"); }
+                
+                if (!defined('CACHE')) {
+
+                    define("CACHE", BASE . "cache/" . $siteid . "/");
 
                     $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
@@ -178 +189 @@
                         }
                     }
+                    
                 }
 
@@ -256 +268 @@
         /**
          * Returns all site settings
-         * @param int $multisite - site id
-         *
-         * @return bool
-         */
-        public function readSettings($multisite = 0)
-        { 
-                if (!$multisite) { 
-                        $sql = "SELECT settings_name, settings_value FROM " . TABLE_SETTINGS;
-                        $settings = $this->db->get_results($this->db->prepare($sql));
-                } else {
-                        $sql = "SELECT settings_name, settings_value FROM " . TABLE_SETTINGS . " WHERE settings_siteid = %d";
-                        $settings = $this->db->get_results($this->db->prepare($sql, $multisite));
-                }
-                
-                if(!$settings) { return false; }
-                
+         * @param <int> $siteid
+         * 
+         * @return <bool>
+         */
+        public function readSettings() {
+            $sql = "SELECT settings_name, settings_value FROM " . TABLE_SETTINGS . " WHERE settings_siteid = %d";
+            $settings = $this->db->get_results($this->db->prepare($sql, SITEID));
+
+            if(!$settings) { return false; }
+
                 // Make Hotaru settings global constants
                 foreach ($settings as $setting)
                 {
-                        if (!defined($setting->settings_name)) { 
+                        if (!defined($setting->settings_name)) {
                                 define($setting->settings_name, $setting->settings_value);
                         }
                 }
-                                
+
                 return true;
         }