Mambo > Projects > Mambo CMS > SVN

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

-revision 1512, Sat Dec 29 09:59:56 2007 UTC
+revision 1627, Thu Feb 28 03:14:33 2008 UTC
 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 821
+Line 824
          $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 1943
+Line 1946
          $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 2671
+Line 2675
                  $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 2720
+Line 2728
                  $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.1512
 


changed lines


 
Added in v.1627
 Legend:



Removed from v.1512
 


changed lines


 
Added in v.1627
-Removed from v.1512
+Added in v.1627

	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