Mambo > Projects > Mambo CMS > SVN

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

-revision 1369, Thu Nov  1 18:19:40 2007 UTC
+revision 1738, Tue Jun 17 11:23:40 2008 UTC
 Line 4
  * @author Mambo Foundation Inc see README.php
  * @copyright Mambo Foundation Inc.
  * See COPYRIGHT.php for copyright notices and details.
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see
+ * @license GNU/GPL Version 2, see LICENSE.php
- * LICENSE.php
  * Mambo is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2 of the
+ * as published by the Free Software Foundation; version 2 of the License.
- * License.
  */
  /**
-Line 231
+Line 229
          //$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->Itemid = (int)mosGetParam($_REQUEST, 'Itemid', 0);
          $this->getConfig();
          $this->fixLanguage();
          @set_magic_quotes_runtime( 0 );
-Line 338
+Line 336
          fclose($f);
          eval($code);
-         /*if (isset($_SERVER['DOCUMENT_ROOT']) AND strlen($_SERVER['DOCUMENT_ROOT'])) {
-             $docroot = str_replace('\\', '/', str_replace('\\\\', '\\', $_SERVER['DOCUMENT_ROOT']));
-         }
-         else {*/
-             // Find information about where execution started
              $origin = array_pop(debug_backtrace());
              // Find the PHP script at the start, with a fix for Windows slashes
              $absolutepath = str_replace('\\', '/', $origin['file']);
              $localpath = $_SERVER['PHP_SELF'];
+         $userdir= '';
+         if (strpos($localpath,'~') !== false){
+             $userdir = substr($localpath, 0, strpos(substr($localpath,1),'/')+1);
+             $localpath = substr($localpath,strpos(substr($localpath,1),'/')+1);
+         }
              $docroot = substr($absolutepath,0,strpos($absolutepath,$localpath));
-         /*}*/
          $mamboroot = str_replace('\\', '/', rtrim($this->rootPath, '\/'));
-         $this->subdirectory = substr($mamboroot, strlen($docroot));
+         $this->subdirectory = $userdir . 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'])) {
-Line 401
+Line 397
      global $adminside;
          if (($this->mosConfig_offline && !$adminside) OR file_exists($this->rootPath.'/installation/index.php')) {
              require_once($this->rootPath().'/administrator/includes/admin.php');
-             session_name(md5($this->mosConfig_live_site));
              session_start();
              $session =& mosSession::getCurrent();
+             if (!isset($_SESSION['initiated'])) {
+                 session_regenerate_id(true);
+                     $_SESSION['initiated'] = true;
+                         }
              $my =& new mosUser();
              $my->getSessionData();
              if (mosSession::validate($my)) return;
-Line 412
+Line 411
          }
      }
-     /**
+     function loadLanguage(){
-      * Enter description here...
-      *
-      */
-     function fixLanguage () {
-         require_once($this->mosConfig_absolute_path.'/includes/phpgettext/phpgettext.class.php');
-         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');
          if (!mosGetParam($_REQUEST, 'lang'));
          else $this->mosConfig_locale = mosGetParam($_REQUEST, 'lang', $this->mosConfig_locale);
          $language =& new mamboLanguage($this->mosConfig_locale, $this->rootPath.'/language/');
-Line 442
+Line 433
          if (file_exists($language_file)) require_once ($language_file);
          else require_once ("$this->mosConfig_absolute_path/language/english.php");
          ###################################
+     }
+     /**
+      * Enter description here...
+      *
+      */
+     function fixLanguage () {
+         require_once($this->mosConfig_absolute_path.'/includes/phpgettext/phpgettext.class.php');
+         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');
      }
      /**
-Line 482
+Line 479
       * @return unknown
       */
      function determineOptionAndItemid () {
-         $this->Itemid = mosGetParam($_REQUEST, 'Itemid', 0);
+         $this->Itemid = (int)mosGetParam($_REQUEST, 'Itemid', 0);
          if ($option = strtolower(mosGetParam($_REQUEST, 'option')));
          else {
              $menuhandler =& mosMenuHandler::getInstance();
              $menus =& $menuhandler->getByParentOrder($this->Itemid, 'mainmenu');
+             if (count($menus)) {
              $this->Itemid = $menus[0]->id;
              $_REQUEST['Itemid'] = $this->Itemid;
              $link = $menus[0]->link;
-Line 498
+Line 496
              if (isset($temp['option'])) $option = $temp['option'];
              else return '';
          }
+         }
          /** patch to lessen the impact on templates */
          if ($option == 'search') $option = 'com_search';
          // checking if we can find the Itemid thru the component
-Line 505
+Line 504
              if ( $option == 'com_content') {
                  require_once($this->rootPath().'/components/com_content/content.class.php');
                  $handler =& contentHandler::getInstance();
-                 $this->Itemid = $handler->getItemid(mosGetParam($_REQUEST, 'id', 0 ));
+                 $this->Itemid = (int)$handler->getItemid(mosGetParam($_REQUEST, 'id', 0 ));
                  $_REQUEST['Itemid'] = $this->Itemid;
              }
              else {
-Line 517
+Line 516
                  }
              }
          }
-         return $option;
+         return trim(htmlspecialchars($option));
      }
      /**
-Line 538
+Line 537
              if (strpos($url, '?')) $url .= '&mosmsg='.urlencode($message);
              else $url .= '?mosmsg='.urlencode($message);
          }
+         $url = preg_replace("/[\n]|[\r]/",'',$url);
          if (headers_sent()) echo "<script>document.location.href='$url';</script>\n";
          else {
              @ob_end_clean(); // clear output buffer
 Line 821
          $mainframe =& mosMainFrame::getInstance();
          $customs = $mainframe->getCustomPathWay();
          $last = count($this->_names) - 1;
-         if ($last == 0 AND count($customs == 0)) return '';
+         if (($last == 0) AND (count($customs) == 0)) return '';
          $result = "<span class='pathway'>";
          $config =& mamboCore::getMamboCore();
          $rootpath = $config->rootPath();
 Line 1393
          $checker = explode(',', $types);
          $result = null;
          foreach ($this->_menus as $menu) {
-             if (in_array($menu->menutype, $checker)) $result[] = $menu;
+             if (in_array($menu->type, $checker)) $result[] = $menu;
          }
          return $result;
      }
 Line 1455
          return null;
      }
+     function getSectionItemId($sectionid, $gbs = 1){
+         static $__sectionsItemds;
+         if (isset($__sectionsItemids[$sectionid])) return $__sectionsItemids[$sectionid];
+         $_Itemid = null;
+         if ($_Itemid == null ) {
+             // Search in sections
+             $_Itemid = $this->getIDByTypeCid ('content_section', $sectionid);
+         }
+         if ($_Itemid == null ) {
+             // Search in sections
+             $_Itemid = $this->getIDByTypeCid ('content_blog_section', $sectionid);
+         }
+         if ($_Itemid == null  && $gbs) {
+             // Search in global blog section
+             $_Itemid = $this->getIDByTypeCid('content_blog_section', 0);
+         }
+         if ($_Itemid != null) $__sectionsItemids[$sectionid] = $_Itemid;
+         return $_Itemid;
+     }
+     function getCategoryItemId($catid){
+         static $__categoriesItemids;
+         if (isset($__categoriesItemids[$catid])) return $__categoriesItemids[$catid];
+         $_Itemid = null;
+         if ($_Itemid == null) {
+             // Search in blog categories
+             $_Itemid = $this->getIDByTypeCid ('content_blog_category', $catid);
+         }
+         if ($_Itemid == null) {
+             // Search in categories
+             $_Itemid = $this->getIDByTypeCid ('content_category', $catid);
+         }
+         if ($_Itemid != null) $__categoriesItemids[$catid] = $_Itemid;
+         return $_Itemid;
+     }
      /**
       * Enter description here...
       *
-Line 1582
+Line 1625
      function setPathway ($Itemid) {
          if ($Itemid) {
              $menu =& $this->getMenuByID($Itemid);
+             if (!$menu) return;
              if ($menu->parent) $this->setPathway($menu->parent);
              $pathway =& mosPathway::getInstance();
              $pathway->addItem($menu->name, $menu->link."&Itemid=$Itemid");
-Line 1602
+Line 1646
          if ($this->getIDLikeLink($dblink) == 0) return true;
          if ($Itemid) {
              $menu =& $this->getMenuByID($Itemid);
+             if (!$menu) return false;
              if (strpos($menu->link,$dblink) ===0) {
                  $access = $menu->access;
              } elseif ($menu_option == 'com_content' AND $Itemid == 1) {
-Line 1701
+Line 1746
          */
      function mosShowVIMenu(  &$params ) {
          global $my, $cur_template, $Itemid;
-         if (mamboCore::get('mosConfig_shownoauth')) $maxaccess = 0;
+         if (mamboCore::get('mosConfig_shownoauth')) $maxaccess = 9999999;
          else $maxaccess = $my->getAccessGid();
          $rows =& $this->getByParentOrder(0, $params->get('menutype'), $maxaccess);
          foreach ($rows as $i=>$row) $crosslink[$row->id] = $i;
-Line 1788
+Line 1833
      function mosShowHFMenu(  &$params, $style=0 ) {
          global $my, $cur_template, $Itemid;
-         if (mamboCore::get('mosConfig_shownoauth')) $maxaccess = 0;
+         if (mamboCore::get('mosConfig_shownoauth')) $maxaccess = 9999999;
          else $maxaccess = $my->getAccessGid();
          $rows =& $this->getByParentOrder(0, $params->get('menutype'), $maxaccess, true);
-Line 1941
+Line 1986
          $result = array();
          if (isset( $this->_events[$event] )) {
              foreach ($this->_events[$event] as $func) {
+                 $botargs = $args;
                  if (is_callable( $func[0] )) {
                      $botparams = $this->_bots[$func[1]]->params;
-                     $args[] = new mosParameters($botparams);
+                     $botargs[] = new mosParameters($botparams);
-                     $args[] = $event;
+                     $botargs[] = $event;
                      if ($doUnpublished) {
-                         $args[0] = $this->_bots[$func[1]]->published;
+                         $botargs[0] = $this->_bots[$func[1]]->published;
-                         $result[] = call_user_func_array( $func[0], $args );
+                         $result[] = call_user_func_array( $func[0], $botargs );
                      } else if ($this->_bots[$func[1]]->published) {
-                         $result[] = call_user_func_array( $func[0], $args );
+                         $result[] = call_user_func_array( $func[0], $botargs );
                      }
                  }
              }
-Line 2442
+Line 2488
              if ($mos_change_template) {
                  // check that template exists in case it was deleted
                  $path = mamboCore::get('mosConfig_absolute_path')."/templates/$mos_change_template/index.php";
-                 if (strpos($mos_change_template,'..') == false AND strpos($mos_change_template,':') == false AND file_exists($path)) {
+                 if (strpos($mos_change_template,'..') === false AND strpos($mos_change_template,':') === false AND file_exists($path)) {
                      $lifetime = 60*10;
                      $cur_template = $mos_change_template;
                      setcookie( "mos_user_template", "$mos_change_template", time()+$lifetime);
-Line 2650
+Line 2696
                  $head['meta'] = implode( "\n", $head['meta'] );
          $my = mamboCore::get('currentUser');
-                 $head['mambojavascript'] = $my->id ? "<script language=\"JavaScript1.2\" src=".mamboCore::get('mosConfig_live_site')."/includes/js/mambojavascript.js\" type=\"text/javascript\"></script>" : '';
+                 $head['mambojavascript'] = $my->id ? '<script type="text/javascript" src="'.mamboCore::get('mosConfig_live_site').'/includes/js/mambojavascript.js"></script>' : '';
                  $head['custom'] = array();
                  foreach ($this->_head['custom'] as $html)
-Line 2669
+Line 2715
                  $configuration =& mamboCore::getMamboCore();
                  $head['favicon'] = "<link rel=\"shortcut icon\" href=\"".$configuration->getFavIcon()."\" />";
+                 if (mamboCore::get('mosConfig_sef')) {
+             $baseHref = sefRelToAbs('index.php?'.mosGetParam ($_SERVER,"QUERY_STRING",""));
+                         $head['base'] = "<base href=\"{$baseHref}/\" />";
+                 }
                  foreach($head as $key=>$value)
                                  $this->_head['output'][$key] = "$value";
-Line 2718
+Line 2769
                  $handler =& new contentHandler();
                  return $handler->getContentItemLinkCount();
          }
+         function formId($option='', $task='', $my='') {
+                 $option=trim($option);$task=trim($task);
+                 if (!$option) die('Illegal option for mainframe formId in core.classes.php');
+                 if (!$task) die('Illegal task for mainframe formId in core.classes.php');
+                 if (!is_object($my)) die('Illegal user object for mainframe formId in core.classes.php');
+                 mos_session_start();
+                 $hash = md5(microtime().mt_rand());
+                 $_SESSION['mosfid'] = md5($hash.$option.$task.$my->id.mamboCore::get('mosConfig_secret'));
+                 return $hash;
+         }
+         function validFormId($option='', $task='', $my='') {
+                 $option=trim($option);$task=trim($task);
+                 if (!$option) die('Illegal option for mainframe validFormId in core.classes.php');
+                 if (!$task) die('Illegal task for mainframe validFormId in core.classes.php');
+                 if (!is_object($my)) die('Illegal user object for mainframe validFormId in core.classes.php');
+                 if (!isset($_REQUEST['f'])) die('Missing hash for mainframe validFormId in core.classes.php');
+                 if (!isset($_SESSION['mosfid'])) return false;
+                 $valid = $_SESSION['mosfid'] == md5($_REQUEST['f'].$option.$task.$my->id.mamboCore::get('mosConfig_secret'));
+                 unset($_SESSION['mosfid']);
+                 return $valid;
+         }
          /**
          * retained for backward compatability
          */
-Line 2732
+Line 2807
      /**
          * @return object A function cache object
          */
-     function &getCache(  $group=''  ) {
+     function &getCache(  $group='', $plugin = 'Function' ) {
+         if (!in_array($plugin,array('Function','Output'))){
+             die('Cache plugin not available');
+         }
          $mosConfig_absolute_path = mamboCore::get('mosConfig_absolute_path');
-         require_once($mosConfig_absolute_path.'/includes/Cache/Lite/Function.php');
+         require_once($mosConfig_absolute_path.'/includes/Cache/Lite/'.$plugin.'.php');
          $path = mamboCore::get('mosConfig_cachepath');
          $caching = mamboCore::get('mosConfig_caching');
          $time = mamboCore::get('mosConfig_cachetime');
-Line 2744
+Line 2822
          'defaultGroup' => $group,
          'lifeTime' => $time
          );
-         $cache =& new Cache_Lite_Function( $options );
+         $className = 'Cache_Lite_'.$plugin;
+         $cache =& new $className( $options );
          return $cache;
      }
      /**

 Legend:



Removed from v.1369
 


changed lines


 
Added in v.1738
 Legend:



Removed from v.1369
 


changed lines


 
Added in v.1738
-Removed from v.1369
+Added in v.1738

	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