Mambo > Projects > Mambo CMS > SVN

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

-revision 533, Mon May 22 14:32:01 2006 UTC
+revision 861, Tue Jan  2 19:16:35 2007 UTC
 Line 1
  <?php
+ /**
+ * @package Mambo Open Source
+ * @copyright (C) 2005 - 2006 Mambo Foundation Inc.
+ * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+ *
+ * Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+ * that Mambo remained free Open Source software owned and managed by the community.
+ * Mambo is Free Software
+ */
  /**
  * Mambo basic error object
-Line 218
+Line 225
      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 253
       * @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 267
      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 313
+Line 323
          $f = @fopen($this->rootPath.'/configuration.php','rb');
          if ($f) {
              while ($f AND !feof($f)) {
-                 $line = fgets($f, 256);
+                 $line = fgets($f);
                  $altered = str_replace('$', '$this->', $line);
                  if ($altered != $line) $code .= $altered;
              }
-Line 340
+Line 350
          $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 355
+Line 364
          }
          else $port = '';
          $afterscheme = '://'.$servername.$port.$this->subdirectory;
-         $this->mosConfig_live_site = $this->mosConfig_secure_site = $scheme.$afterscheme;
+         //$this->mosConfig_live_site = $this->mosConfig_secure_site = $scheme.$afterscheme;
          $this->mosConfig_unsecure_site = 'http'.$afterscheme;
          $this->mosConfig_absolute_path = $this->rootPath;
          preg_match_all('/\$this\-\>([A-Za-z_][A-Za-z0-9_]*)/', $code, $matches);
-Line 408
+Line 417
          require_once($this->mosConfig_absolute_path.'/includes/phpgettext/error.php');
          require_once($this->mosConfig_absolute_path.'/includes/mambofunc.php');
          require_once($this->mosConfig_absolute_path.'/includes/mambolanguage.class.php');
-         error_reporting(E_ALL)        ;
+         #error_reporting(E_ALL)        ;
          ##########  DEPRECATED ############
          if (isset($this->mosConfig_lang) AND $this->mosConfig_lang);
          else $this->set('mosConfig_lang', 'english');
-Line 417
+Line 426
          ###################################
-         $this->mosConfig_lang = mosGetParam($_POST, 'setLanguage', $this->mosConfig_lang);
+         $this->mosConfig_locale = mosGetParam($_POST, 'lang', $this->mosConfig_locale);
-         $language =& mamboLanguage::getInstance($this->mosConfig_lang, $this->rootPath.'/language/');
+         $language =& new mamboLanguage($this->mosConfig_locale, $this->rootPath.'/language/');
          $languages = $language->getLanguages();
          $charset = $language->get('charset');
          $dateformat = $language->get('dateformat');
+         $this->mosConfig_lang = $language->get('lang');
          $this->current_language = $language;
          if (!defined('_ISO')) DEFINE('_ISO','charset='.$charset);
          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 457
+Line 463
              foreach ( $superglobals as $superglobal ) {
                  foreach ( $superglobal as $key => $value) {
                      unset( $GLOBALS[$key]);
+                     unset( $GLOBALS[$key]);
                  }
              }
          }
-Line 480
+Line 487
              if ($pos !== false) $link = substr( $link, $pos+1 ). '&Itemid='.$this->Itemid;
              parse_str( $link, $temp );
              /** this is a patch, need to rework when globals are handled better */
-             foreach ($temp as $k=>$v) $_GET[$k] = $v;
+                         foreach ($temp as $k=>$v) $_GET[$k] = $_REQUEST[$k] = $v;
              if (isset($temp['option'])) $option = $temp['option'];
              else return '';
          }
-Line 564
+Line 571
          require_once($this->rootPath().'/includes/authenticator.php');
          $authenticator =& mamboAuthenticator::getInstance();
          $loggedin = $authenticator->loginUser();
-         if ($loggedin) $this->logMessage(_LOGIN_SUCCESS);
+         if ($loggedin) $this->logMessage('_LOGIN_SUCCESS');
          else mamboCore::redirect('index.php');
      }
-Line 576
+Line 583
          require_once($this->rootPath().'/includes/authenticator.php');
          $authenticator =& mamboAuthenticator::getInstance();
          $authenticator->logoutUser();
-         $this->logMessage(_LOGOUT_SUCCESS);
+         $this->logMessage('_LOGOUT_SUCCESS');
      }
      /**
-Line 804
+Line 811
          * Make a pathway string for display
          */
      function makePathway () {
-         $last = count($this->_names) - 1;
-         if ($last == 0) return '';
          $mainframe =& mosMainFrame::getInstance();
+         $customs = $mainframe->getCustomPathWay();
+         $last = count($this->_names) - 1;
+         if ($last == 0 AND count($customs == 0)) return '';
          $result = "<span class='pathway'>";
          $config =& mamboCore::getMamboCore();
          $rootpath = $config->rootPath();
-Line 818
+Line 826
              else $img = '&gt;';
          }
          foreach ($this->_names as $i=>$name) {
-             if ($i === $last) $result .= "$name</span>";
+             if ($i === $last AND count($customs) == 0) $result .= "$name</span>";
+             elseif (strstr($this->_urls[$i], 'view')) $result .= "";
              else {
                  $sefurl = sefRelToAbs($this->_urls[$i]);
                  $result .= "<a href='$sefurl' class='pathway'>$name</a>";
                  $result .= "&nbsp;$img&nbsp;";
              }
          }
-         $customs = $mainframe->getCustomPathWay();
          foreach ($customs as $custom) $result .= $custom;
-         $result .= '</span>';
+         if (count($customs)) $result .= '</span>';
          return $result;
      }
-Line 1866
+Line 1874
                              $selected = $newbot->register();
                              $this->_botRegister($newbot, $selected, $i);
                          }
+                                                 unset($newbot);
                      }
                  }
                  $total++;
-Line 2031
+Line 2040
           * @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 2212
      }
      /**
-         * 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 2345
          * @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
-Line 2523
+Line 2535
      function liveBookMark () {
          // support for Firefox Live Bookmarks ability for site syndication
+         $live_bookmark = 0;
          $c_handler =& mosComponentHandler::getInstance();
-         $params = $c_handler->getParamsByName('Syndicate');
+         $params =& $c_handler->getParamsByName('Syndicate');
+         if (!is_null($params)){
          $live_bookmark = $params->get( 'live_bookmark', 0 );
+         }
          if ($live_bookmark) {
              // custom bookmark file name
              $bookmark_file = $params->get( 'bookmark_file', $live_bookmark );
-Line 2572
+Line 2588
                  <?php
      }
+     /**
+         * retained for backward compatability
+         */
+         function getBlogSectionCount() {
+                 require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+                 $handler =& new contentHandler();
+                 return $handler->getBlogSectionCount();
+         }
+         function getBlogCategoryCount() {
+                 require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+                 $handler =& new contentHandler();
+                 return $handler->getBlogCategoryCount();
+         }
+         function getGlobalBlogSectionCount() {
+                 require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+                 $handler =& new contentHandler();
+                 return $handler->getGlobalBlogSectionCount();
+         }
+         function getStaticContentCount() {
+                 require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+                 $handler =& new contentHandler();
+                 return $handler->getStaticContentCount();
+         }
+         function getContentItemLinkCount() {
+                 require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
+                 $handler =& new contentHandler();
+                 return $handler->getContentItemLinkCount();
+         }
+         /**
+         * retained for backward compatability
+         */
  }
  /**

 Legend:



Removed from v.533
 


changed lines


 
Added in v.861
 Legend:



Removed from v.533
 


changed lines


 
Added in v.861
-Removed from v.533
+Added in v.861

	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