Mambo > Projects > Mambo CMS > SVN

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

-revision 1396, Tue Nov 13 09:59:41 2007 UTC
+revision 1561, Tue Jan 15 04:59:17 2008 UTC
 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 399
      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 480
+Line 483
       * @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 496
+Line 500
              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 503
+Line 508
              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 515
+Line 520
                  }
              }
          }
-         return $option;
+         return trim(htmlspecialchars($option));
      }
      /**
-Line 1580
+Line 1585
      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 1606
          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 2667
+Line 2674
                  $configuration =& mamboCore::getMamboCore();
                  $head['favicon'] = "<link rel=\"shortcut icon\" href=\"".$configuration->getFavIcon()."\" />";
+                 if (mamboCore::get('mosConfig_sef')) {
+                         $head['base'] = "<base href=\"".mamboCore::get('mosConfig_live_site')."/\" />";
+                 }
                  foreach($head as $key=>$value)
                                  $this->_head['output'][$key] = "$value";
-Line 2716
+Line 2727
                  $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
          */

 Legend:



Removed from v.1396
 


changed lines


 
Added in v.1561
 Legend:



Removed from v.1396
 


changed lines


 
Added in v.1561
-Removed from v.1396
+Added in v.1561

	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