Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/includes/core.classes.php

-revision 550, Mon May 29 17:21:00 2006 UTC
+revision 651, Sat Aug 26 15:34:47 2006 UTC
 Line 218
      function mamboCore () {
          global $adminside;
          $this->init_errorlevel = error_reporting(0);
-         $this->rootPath = str_replace('\\', '/', str_replace('includes', '', realpath(dirname(__FILE__))));
+         //$this->rootPath = str_replace('\\', '/', realpath(str_replace('includes', '', dirname(__FILE__))));
+         $this->rootPath = str_replace('\\', '/',str_replace('includes', '', dirname(__FILE__)));
          $this->checkConfig();
          $this->Itemid = mosGetParam($_REQUEST, 'Itemid', 0);
          $this->getConfig();
-Line 245
+Line 246
       * @return unknown
       */
      function rootPath () {
-         if (realpath($this->rootPath) === false) die ('Invalid program load path');
+         //if (realpath($this->rootPath) === false) die ('Invalid program load path');
+         if (file_exists($this->rootPath) === false) die ('Invalid program load path');
          return $this->rootPath;
      }
-Line 258
+Line 260
      function get ($property) {
          $config =& mamboCore::getMamboCore();
          if ($property == 'mosConfig_absolute_path') {
-             if (realpath($config->mosConfig_absolute_path) === false) die ('Invalid program load path');
+             //if (realpath($config->mosConfig_absolute_path) === false) die ('Invalid program load path');
+             if (file_exists($config->mosConfig_absolute_path) === false) die ('Invalid program load path');
              else return $config->rootPath;
          }
          if (isset($config->$property)) return $config->$property;
-Line 340
+Line 343
          $mamboroot = str_replace('\\', '/', rtrim($this->rootPath, '\/'));
          $this->subdirectory = substr($mamboroot, strlen($docroot));
          $scheme = isset($_SERVER['HTTP_SCHEME']) ? $_SERVER['HTTP_SCHEME'] : ((isset($_SERVER['HTTPS']) AND strtolower($_SERVER['HTTPS'] != 'off')) ? 'https' : 'http');
          if (isset($_SERVER['HTTP_HOST'])) {
              $withport = explode(':', $_SERVER['HTTP_HOST']);
-Line 417
+Line 419
          ###################################
-         $this->mosConfig_lang = mosGetParam($_POST, 'setLanguage', $this->mosConfig_lang);
+         $this->mosConfig_lang = mosGetParam($_POST, 'user_lang', $this->mosConfig_lang);
-         $language =& mamboLanguage::getInstance($this->mosConfig_lang, $this->rootPath.'/language/');
+         $language =& new mamboLanguage($this->mosConfig_lang, $this->rootPath.'/language/');
          $languages = $language->getLanguages();
          $charset = $language->get('charset');
          $dateformat = $language->get('dateformat');
-Line 429
+Line 431
          if (!defined('_DATE_FORMAT_LC')) DEFINE('_DATE_FORMAT_LC', $dateformat); //Uses PHP's strftime Command Format
          if (!defined('_DATE_FORMAT_LC2')) DEFINE('_DATE_FORMAT_LC2', $dateformat);
-         $gettext =& phpgettext();
-         $gettext->debug       = $this->mosConfig_locale_debug;
-         $gettext->has_gettext = $this->mosConfig_locale_use_gettext;
-         $gettext->setlocale($this->mosConfig_lang);
      }
      /**
-Line 2031
+Line 2030
           * @return boolean True is satisfactory
           */
      function check() {
+         Global $mosConfig_absolute_path;
+         include $mosConfig_absolute_path . ('language/english.php');
          $this->_error = '';
          if ($this->name == '') $this->_error = _REGWARN_NAME;
          elseif ($this->username == '') $this->_error = _REGWARN_UNAME;
-Line 2201
+Line 2202
      }
      /**
-         * Singleton get instance
+         * @param object
-         * @param object the mainframe instance (if called internally)
-         * Note that because of the need for creation parameters, this cannot
-         * be called successfully unless the mainframe object is already created
          */
      function &getInstance () {
-         static $mainframe;
+             global $mainframe;
-         if (func_num_args()) {
+             if (isset($mainframe)) {
-             $args = func_get_args();
+                 return $mainframe;
-             $mainframe = $args[0];
+             } else {
-         }
+                 $result = null;
-         if (isset($mainframe)) $result =& $mainframe;
-         else $result = null;
          return $result;
      }
+         }
      /**
          * @param string
          */
-Line 2337
+Line 2335
          * @param string The default value for the variable if not found
          */
      function getUserStateFromRequest( $var_name, $req_name, $var_default=null ) {
+                 if (is_array($this->_userstate)) {
          if (isset($_REQUEST[$req_name])) $this->setUserState($var_name, $_REQUEST[$req_name]);
-         elseif (isset($var_default) AND !isset($this->userstate[$var_name])) $this->setUserState($var_name, $var_default);
+                         else if (isset($var_default) AND !isset($this->_userstate[$var_name])) $this->setUserState($var_name, $var_default);
-         return $this->getUserState($var_name);
+                         return $this->_userstate[$var_name];
+                 } else {
+                         return null;
+                 }
      }
      /**
          * Initialises the user session

 Legend:



Removed from v.550
 


changed lines


 
Added in v.651
 Legend:



Removed from v.550
 


changed lines


 
Added in v.651
-Removed from v.550
+Added in v.651

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/includes/core.classes.php