Mambo > Projects > Mambo CMS > SVN

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

-revision 1348, Thu Oct 18 14:53:38 2007 UTC
+revision 1541, Fri Jan 11 08:53:00 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 404
+Line 402
              session_name(md5($this->mosConfig_live_site));
              session_start();
              $session =& mosSession::getCurrent();
+             if (!isset($_SESSION['initiated'])) {
+                 session_regenerate_id();
+                     $_SESSION['initiated'] = true;
+                         }
              $my =& new mosUser();
              $my->getSessionData();
              if (mosSession::validate($my)) return;
-Line 482
+Line 484
       * @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 501
              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 509
              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 521
                  }
              }
          }
-         return $option;
+         return trim(htmlspecialchars($option));
      }
      /**
-Line 832
+Line 836
              if (file_exists( "$rootpath/$imgPath" )) $img = "<img src='$config->mosConfig_live_site/images/M_images/arrow.png' alt='arrow' />";
              else $img = '&gt;';
          }
+                 $uri =& mosUriHelper::getInstance();
          foreach ($this->_names as $i=>$name) {
+                         $uri->setUri($this->_urls[$i]);
              if ($i === $last AND count($customs) == 0) $result .= "$name</span>";
-             elseif (strstr($this->_urls[$i], 'view')) $result .= "";
+             elseif (strstr($uri->get('task'), 'view')) $result .= "";
              else {
                  $sefurl = sefRelToAbs($this->_urls[$i]);
                  $result .= "<a href='$sefurl' class='pathway'>$name</a>";
-Line 1580
+Line 1586
      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 1600
+Line 1607
          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 1699
+Line 1707
          */
      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->gid;
+         else $maxaccess = $my->getAccessGid();
          $rows =& $this->getByParentOrder(0, $params->get('menutype'), $maxaccess);
          foreach ($rows as $i=>$row) $crosslink[$row->id] = $i;
          // indent icons
-Line 1786
+Line 1794
      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->gid;
+         else $maxaccess = $my->getAccessGid();
          $rows =& $this->getByParentOrder(0, $params->get('menutype'), $maxaccess, true);
          $links = array();
-Line 2064
+Line 2072
          $this->grp = mosGetParam( $_SESSION, 'session_grp', 0);
      }
      /**
+          * User access level
+          */
+         function getAccessGid() {
+                 static $access;
+                 if (!isset($access)) {
+                         $acl = new gacl;
+                         $access = $this->id > 0 ? 1 : 0;
+                         $access += $acl->acl_check( 'action', 'access', 'users', $this->usertype, 'frontend', 'special' );
+                 }
+                 return $access;
+         }
+     /**
           * Validation and filtering
           * @return boolean True is satisfactory
           */
-Line 2636
+Line 2656
                  $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 3636
+Line 3656
  } //class ends here
- class mosHtmlHelper {
-         var $_docTypes = array(
-                 'xhtml-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
-                 'xhtml-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
-                 'xhtml-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
-                 'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'
-         );
-         var $_docTypesText = array(
-                 'xhtml-strict' => 'XHTML 1.0 Strict',
-                 'xhtml-trans' => 'XHTML 1.0 Transitional',
-                 'xhtml-frame' => 'XHTML 1.0 Frameset',
-                 'xhtml11' => 'XHTML 1.1'
-         );
-         var $doctype = 'xhtml-trans';
-     /**
-         * Singleton accessor
-         */
-     function &getInstance () {
-         static $instance;
-         if (!is_object($instance)) $instance = new mosHtmlHelper();
-         return $instance;
-     }
-         function __docType($type=null) {
-                 static $obj;
-                 if (!is_object($obj)) $obj =& mosHtmlHelper::getInstance();
-                 if (array_key_exists($type, $obj->_docTypes)) return $obj->_docTypes[$type];
-                 return $obj->_docTypes[$obj->doctype];
-         }
-         function renderDocType($type=null) {
-                 static $obj;
-                 if (!is_object($obj)) $obj =& mosHtmlHelper::getInstance();
-                 echo $obj->__docType($type)."\n";
-         }
-         function get($var) {
-                 static $obj;
-                 if (!is_object($obj)) $obj =& mosHtmlHelper::getInstance();
-                 if(isset($obj->$var)) return $obj->$var;
-                 return null;
-         }
-         function set($property, $value) {
-                 static $obj;
-                 if (!is_object($obj)) $obj =& mosHtmlHelper::getInstance();
-                 if($property{0} == '_') return; // dont set private properties
-                 if (isset($obj->$property)) $obj->$property = $value;
-         }
- } // end class mosHtmlHelper
  ?>

 Legend:



Removed from v.1348
 


changed lines


 
Added in v.1541
 Legend:



Removed from v.1348
 


changed lines


 
Added in v.1541
-Removed from v.1348
+Added in v.1541

	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