Mambo > Projects > Mambo CMS > SVN

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

-revision 1017, Fri Mar 16 12:10:37 2007 UTC
+revision 1561, Tue Jan 15 04:59:17 2008 UTC
 Line 1
  <?php
  /**
  * @package Mambo
- * @copyright  Refer to copyright.php
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
  * @author Mambo Foundation Inc see README.php
+ * @copyright Mambo Foundation Inc.
+ * See COPYRIGHT.php for copyright notices and details.
+ * @license GNU/GPL Version 2, see 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 License.
  */
  /**
-Line 225
+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 321
+Line 325
          if ($f) {
              while ($f AND !feof($f)) {
                  $line = fgets($f);
-                 $altered = str_replace('$', '$this->', $line);
+                 $altered = preg_replace('/^\$/', '$this->', $line);
                  if ($altered != $line) $code .= $altered;
              }
          }
-Line 395
+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 415
+Line 422
          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');
-         $this->mosConfig_locale = mosGetParam($_POST, 'lang', $this->mosConfig_locale);
+         if (!mosGetParam($_REQUEST, 'lang'));
+         else $this->mosConfig_locale = mosGetParam($_REQUEST, 'lang', $this->mosConfig_locale);
          $language =& new mamboLanguage($this->mosConfig_locale, $this->rootPath.'/language/');
          $languages = $language->getLanguages();
          $charset = $language->get('charset');
-Line 424
+Line 431
          $this->mosConfig_lang = $language->get('lang');
          $this->current_language = $language;
          if (!defined('_ISO')) DEFINE('_ISO','charset='.$charset);
+                 header('Content-type: text/html; '._ISO);
          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);
-Line 475
+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 491
+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 498
+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 510
+Line 520
                  }
              }
          }
-         return $option;
+         return trim(htmlspecialchars($option));
      }
      /**
-Line 825
+Line 835
              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 1188
+Line 1200
      function &listAll ($type='file', $recurse=false, $fullpath=false) {
          $results = array();
          if ($dir = @opendir($this->path)) {
-             while ($file = readdir($dir)) {
+             while (false !== ($file = readdir($dir))) {
                  if ($file == '.' OR $file == '..') continue;
                  if (is_dir($this->path.$file)) {
                      if ($recurse) {
-Line 1204
+Line 1216
              }
              closedir($dir);
          }
+         asort($results);
          return $results;
      }
-Line 1215
+Line 1228
      function soleDir () {
          $found = '';
          if ($dir = @opendir($this->path)) {
-             while ($file = readdir($dir)) {
+             while (false !== ($file = readdir($dir))) {
                  if ($file == '.' OR $file == '..') continue;
                  if (is_dir($this->path.$file)) {
                      if ($found) return '';
-Line 1552
+Line 1565
                  }
              }
          }
+         if ($Itemid == 0 && !count($result)){
+             $result[0] = new stdclass;
+             $result[0]->id = 1;
+             $result[0]->link = 'index.php?option=com_frontpage';
+             $result[0]->parent = 0;
+             $result[0]->type = 'components';
+             $result[0]->browserNav = 0;
+             $result[0]->name = 'Home';
+         }
          return $result;
      }
-Line 1563
+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 1583
+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 1682
+Line 1706
          */
      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 1769
+Line 1793
      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 1964
+Line 1988
          if (isset($result[0])) return $result[0];
          return null;
      }
+     function getBot($element, $folder) {
+         $returnBot = '';
+         foreach ($this->_bots as $i=>$bot) {
+             if ($bot->folder == $folder && $bot->element == $element){
+                 $returnBot = $bot;
+                 break;
+             }
+         }
+         return $returnBot;
+     }
  }
  /**
-Line 2036
+Line 2071
          $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 2515
+Line 2562
              $sql['os'] = "INSERT INTO #__stats_agents (agent,type) VALUES ('$os',1)";
              $sql['domain'] = "INSERT INTO #__stats_agents (agent,type) VALUES ('$tldomain',2)";
              if ($stats) foreach ($stats as $stat) {
-                 if ($stat->type == 0) $sql['agents'] = "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$browser' AND type=0";
+                 if ($stat->type == 0) $sql['browser'] = "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$browser' AND type=0";
                  if ($stat->type == 1) $sql['os'] = "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$os' AND type=1";
                  if ($stat->type == 2) $sql['domain'] = "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$tldomain' AND type=2";
              }
-Line 2564
+Line 2611
                          <?php
          }
      }
+     /**
+         * Render head tags
+         *   tags are assembled into an associative array with the following elements:
+         *     - title
+         *     - meta
+         *     - mambojavascript
+         *     - custom (custom head tags)
+         *     - livebookmark
+         *     - favicon
+         * @param unknown keys - array elements to output (null = output all)
+         * @param unknown exclude - array elements to exclude in output
+         *
+         * Usage:        mosShowHead() - to render all tags
+         *                       mosShowHead('title') - to render a single tag
+         *                       mosShowHead(array('title', 'meta')) - to selectively render tags (in order)
+         *                       mosShowHead(null, 'custom') - to exclude a single tag
+         *                       mosShowHead(null, array('custom','favicon')) - to exclude multiple tags
+         */
+     function mosShowHead($keys='', $exclude='') {
+                 if (!is_array($keys))
+                         if ($keys !== '' && !is_null($keys))
+                                 $keys = array($keys);
+                         else $keys = array();
+                 if (!is_array($exclude))
+                         if ($exclude !== '')
+                                 $exclude = array($exclude);
+                         else $exclude = array();
+                 $this->_head['output'] = array();
+                 $head = array();;
+                 $head['title'] = '<title>'.$this->_head['title'].'</title>';
-     function mosShowHead () {
-         global $_VERSION;
-         $mosConfig_live_site = mamboCore::get('mosConfig_live_site');
          $this->appendMetaTag( 'description', mamboCore::get('mosConfig_MetaDesc'), true );
          $this->appendMetaTag( 'keywords', mamboCore::get('mosConfig_MetaKeys'), true );
-         echo $this->getHead();
+                 $head['meta'] = array();
-         if (mamboCore::get('mosConfig_sef')) {
+         foreach ($this->_head['meta'] as $name=>$meta) {
-             echo "<base href=\"$mosConfig_live_site/\" />\r\n";
+             if ($meta[1]) $head['meta'][] = $meta[1];
+             $head['meta'][] = '<meta name="' . $name . '" content="' . $meta[0] . '" />';
+             if ($meta[2]) $head['meta'][] = $meta[2];
          }
+                 $head['meta'] = implode( "\n", $head['meta'] );
          $my = mamboCore::get('currentUser');
-         if ( $my->id ) {
+                 $head['mambojavascript'] = $my->id ? '<script type="text/javascript" src="'.mamboCore::get('mosConfig_live_site').'/includes/js/mambojavascript.js"></script>' : '';
-                         ?>
-                         <script language="JavaScript1.2" src="<?php echo $mosConfig_live_site;?>/includes/js/mambojavascript.js" type="text/javascript"></script>
+                 $head['custom'] = array();
-                         <?php
+                 foreach ($this->_head['custom'] as $html)
-         }
+                         if (trim($html) !== '')
+                                 $head['custom'][] = $html;
+                 if (count($head['custom']) !== 0)
+                         $head['custom'] = implode( "\n", $head['custom'] );
+                 else
+                         $head['custom'] = '';
+                 ob_start();
          $this->liveBookMark();
-         // outputs link tag for page
+                 $head['livebookmark'] = ob_get_contents();
+                 ob_end_clean();
          $configuration =& mamboCore::getMamboCore();
-                 ?>
+                 $head['favicon'] = "<link rel=\"shortcut icon\" href=\"".$configuration->getFavIcon()."\" />";
-                 <link rel="shortcut icon" href="<?php echo $configuration->getFavIcon();?>" />
-                 <?php
+                 if (mamboCore::get('mosConfig_sef')) {
+                         $head['base'] = "<base href=\"".mamboCore::get('mosConfig_live_site')."/\" />";
      }
+                 foreach($head as $key=>$value)
+                                 $this->_head['output'][$key] = "$value";
+                 $tags = $this->_head['output'];
+                 if (count($keys) == 0) {
+                         foreach($tags as $key=>$value)
+                                 if (!in_array($key, $exclude))
+                                         if ($value !== '')
+                                                 echo trim($value)."\n";
+                 } else {
+                         foreach($keys as $key)
+                                 if (isset($tags[$key]))
+                                         if(trim($tags[$key]) !== '')
+                                                 echo trim($tags[$key])."\n";
+                 }
+         }
      /**
          * retained for backward compatability
-Line 2621
+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
          */
-Line 3536
+Line 3666
                  //$Debug [$Group][$Number] = "Message, can by with $Value";
                  //$Group[0] - Errors
                  //$Group[1] - Notice
-                 $Debug[0][0] = "Error, can NOT read file: " . $Value . "<br>";
+                 $Debug[0][0] = "Error, can NOT read file: " . $Value . "<br />";
-                 $Debug[0][1] = "Error, can't find maching char \"". $Value ."\" in destination encoding table!" . "<br>";
+                 $Debug[0][1] = "Error, can't find maching char \"". $Value ."\" in destination encoding table!" . "<br />";
-                 $Debug[0][2] = "Error, can't find maching char \"". $Value ."\" in source encoding table!" . "<br>";
+                 $Debug[0][2] = "Error, can't find maching char \"". $Value ."\" in source encoding table!" . "<br />";
-                 $Debug[0][3] = "Error, you did NOT set variable " . $Value . " in Convert() function." . "<br>";
+                 $Debug[0][3] = "Error, you did NOT set variable " . $Value . " in Convert() function." . "<br />";
-                 $Debug[0][4] = "You can NOT convert string from " . $Value . " to " . $Value . "!" .  "<BR>";
+                 $Debug[0][4] = "You can NOT convert string from " . $Value . " to " . $Value . "!" .  "<br />";
-                 $Debug[1][0] = "Notice, you are trying to convert string from ". $Value ." to ". $Value .", don't you feel it's strange? ;-)" . "<br>";
+                 $Debug[1][0] = "Notice, you are trying to convert string from ". $Value ." to ". $Value .", don't you feel it's strange? ;-)" . "<br />";
-                 $Debug[1][1] = "Notice, both charsets " . $Value . " are identical! Check encoding tables files." . "<br>";
+                 $Debug[1][1] = "Notice, both charsets " . $Value . " are identical! Check encoding tables files." . "<br />";
-                 $Debug[1][2] = "Notice, there is no unicode char in the string you are trying to convert." . "<br>";
+                 $Debug[1][2] = "Notice, there is no unicode char in the string you are trying to convert." . "<br />";
                  if (DEBUG_MODE >= $Group)
                  {
-Line 3552
+Line 3682
          } // function DebugOutput
  } //class ends here
  ?>

 Legend:



Removed from v.1017
 


changed lines


 
Added in v.1561
 Legend:



Removed from v.1017
 


changed lines


 
Added in v.1561
-Removed from v.1017
+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