Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/index.php

-revision 236, Mon Feb  6 15:35:49 2006 UTC
+revision 465, Wed Apr 12 21:14:39 2006 UTC
 Line 1
  <?php
  /**
- * @version $Id: index.php,v 1.47 2005/08/26 08:10:43 mambofoundation Exp $
+ * @package Mambo Open Source
- * @package Mambo
+ * @copyright (C) 2005 - 2006 Mambo Foundation Inc.
- * @copyright (C) 2000 - 2005 Miro International Pty Ltd
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+ *
+ * Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
+ * that Mambo remained free Open Source software owned and managed by the community.
  * Mambo is Free Software
  */
-Line 49
+Line 51
  }
  function sefRelToAbs ($string) {
-     $sef = mosSEF::getInstance();
+     $sef =& mosSEF::getInstance();
      return $sef->sefRelToAbs($string);
  }
-Line 60
+Line 62
      var $subdirectory;
      var $current_user = null;
      var $do_gzip_compress = false;
+     var $init_errorlevel = 0;
      function mamboCore () {
          global $adminside;
-         $this->rootPath = dirname(__FILE__);
+         $this->init_errorlevel = error_reporting(0);
+         $this->rootPath = str_replace('\\', '/', dirname(__FILE__));
          $this->checkConfig();
          $this->Itemid = mosGetParam($_REQUEST, 'Itemid', 0);
          $this->getConfig();
          $this->fixLanguage();
-         $this->secure();
          @set_magic_quotes_runtime( 0 );
-         if (@$this->mosConfig_error_reporting === 0) error_reporting(0);
+         if (@$this->mosConfig_error_reporting > 0 OR @$this->mosConfig_error_reporting ===0) error_reporting($this->mosConfig_error_reporting);
-         elseif (@$this->mosConfig_error_reporting > 0) error_reporting($this->mosConfig_error_reporting);
+         else error_reporting($this->init_errorlevel);
      }
      function &getMamboCore () {
-Line 118
+Line 120
      }
          function getConfig () {
+                 global $adminside;
                  $code = '';
                  $f = @fopen($this->rootPath.'/configuration.php','rb');
                  if ($f) {
-Line 133
+Line 136
                  }
                  fclose($f);
                  eval($code);
-                 $subdir = substr(dirname(__FILE__), strlen($_SERVER['DOCUMENT_ROOT']));
+                 if (isset($_SERVER['DOCUMENT_ROOT']) AND strlen($_SERVER['DOCUMENT_ROOT'])) $docroot = $_SERVER['DOCUMENT_ROOT'];
-                 $this->subdirectory = str_replace('\\', '/', $subdir);
+                 else {
-                 $this->mosConfig_live_site = 'http://'.$_SERVER['SERVER_NAME'].$this->subdirectory;
+                         // 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'];
+                         $docroot = substr($absolutepath,0,strpos($absolutepath,$localpath));
+                 }
+                 $mamboroot = str_replace('\\', '/', dirname(__FILE__));
+                 $this->subdirectory = 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'])) {
+                         $withport = explode(':', $_SERVER['HTTP_HOST']);
+                         $servername = $withport[0];
+                         if (isset($withport[1])) $port = ':'.$withport[1];
+                 }
+                 elseif (isset($_SERVER['SERVER_NAME'])) $servername = $_SERVER['SERVER_NAME'];
+                 else trigger_error(T_('Impossible to determine the name of this server'), E_USER_ERROR);
+                 if (!isset($port) AND !empty($_SERVER['SERVER_PORT'])) $port = ':'.$_SERVER['SERVER_PORT'];
+                 if (isset($port)) {
+                         if (($scheme == 'http' AND $port == ':80') OR ($scheme == 'https' AND $port == ':443')) $port = '';
+                 }
+                 else $port = '';
+                 $afterscheme = '://'.$servername.$port.$this->subdirectory;
+                 $this->mosConfig_live_site = $this->mosConfig_secure_site = $scheme.$afterscheme;
+                 $this->mosConfig_unsecure_site = 'http'.$afterscheme;
                  $this->mosConfig_absolute_path = $this->rootPath;
                  preg_match_all('/\$this\-\>([A-Za-z_][A-Za-z0-9_]*)/', $code, $matches);
                  foreach ($matches[1] as $match) $GLOBALS[$match] = $this->$match;
-Line 153
+Line 180
      }
      function offlineCheck (&$user, &$database) {
-         if ($this->mosConfig_offline) {
+         if ($this->mosConfig_offline 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();
-             if ($user =& checkAdminSession($database)) return;
+                     $session =& mosSession::getCurrent();
+                     $my =& new mosUser();
+                     $my->getSessionData();
+             if (mosSession::validate($my)) return;
              include("$this->mosConfig_absolute_path/offline.php");
              exit();
          }
      }
      function fixLanguage () {
-         require_once($this->mosConfig_absolute_path.'/includes/phpgettext/error.php');
          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');
+         error_reporting(E_ALL)        ;
          ##########  DEPRECATED ############
                  if (isset($this->mosConfig_lang) AND $this->mosConfig_lang);
                  else $this->set('mosConfig_lang', 'english');
-Line 177
+Line 206
                  if (file_exists($language_file)) require_once ($language_file);
                  ###################################
-         //set_error_handler('error_handler');
-         $lang = $this->mosConfig_lang;
+         $this->mosConfig_lang = mosGetParam($_POST, 'setLanguage', $this->mosConfig_lang);
-         $langfile = $this->rootPath.DIRECTORY_SEPARATOR.'language'.DIRECTORY_SEPARATOR.$lang.'.xml';
-         $p = xml_parser_create();
-         xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0);
-         xml_parser_set_option($p, XML_OPTION_SKIP_WHITE, 1);
-         xml_parse_into_struct($p, implode("", file($langfile)), $values);
-         xml_parser_free($p);
-         foreach($values as $key => $value)
-         {
-             if ($value['tag'] == 'param') {
-                 $name = $value['attributes']['name'];
-                 $this->language[$name] = $value['attributes']['default'];
-             }
-         }
-         if (!defined('_ISO')) DEFINE('_ISO','charset='.$this->language['encoding']);
+         $language =& mamboLanguage::getInstance($this->mosConfig_lang, $this->rootPath.'/language/');
-         if (!defined('_DATE_FORMAT_LC')) DEFINE('_DATE_FORMAT_LC', $this->language['dateformat']); //Uses PHP's strftime Command Format
+         $languages = $language->getLanguages();
-         if (!defined('_DATE_FORMAT_LC2')) DEFINE('_DATE_FORMAT_LC2', $this->language['dateformat']." %H:%M");
+         $charset = $language->get('charset');
+         $dateformat = $language->get('dateformat');
+         $this->current_language = $language;
+         if (!defined('_ISO')) DEFINE('_ISO','charset='.$charset);
+         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);
-         //header('Content-Type: text/html; charset=utf-8');
-         $domain = $this->mosConfig_lang;
-         $textdomain = $this->rootPath.'/language';
          $gettext =& phpgettext();
-         $gettext->debug = 0;
+         $gettext->debug       = $this->mosConfig_locale_debug;
-         $gettext->has_gettext = 0;
+         $gettext->has_gettext = $this->mosConfig_locale_use_gettext;
-         $gettext->setlocale($name);
+         $gettext->setlocale($this->mosConfig_lang);
-         setlocale(LC_ALL, $this->language['locale']);
-         setlocale(LC_CTYPE, $this->language['encoding']);
-         $gettext->bindtextdomain($domain, $textdomain);
-         $gettext->bind_textdomain_codeset($domain, $this->language['encoding']);
-         $gettext->textdomain($domain);
-         /**/
-     }
-     function secure () {
-         $this->mosConfig_unsecure_site = $this->mosConfig_live_site;
-         if ($_SERVER['SERVER_PORT'] == 443) {
-             if (!isset($this->mosConfig_secure_site)) $this->mosConfig_secure_site = str_replace('http://', 'https://', $this->mosConfig_live_site);
-             $this->mosConfig_live_site = $this->mosConfig_secure_site;
-         }
      }
      function handleGlobals () {
-Line 247
+Line 249
          $this->Itemid = mosGetParam($_REQUEST, 'Itemid', 0);
          if ($option = strtolower(mosGetParam($_REQUEST, 'option')));
          else {
-             $menuhandler = mosMenuHandler::getInstance();
+             $menuhandler =& mosMenuHandler::getInstance();
              $menus =& $menuhandler->getByParentOrder($this->Itemid, 'mainmenu');
              $this->Itemid = $menus[0]->id;
              $_REQUEST['Itemid'] = $this->Itemid;
-Line 266
+Line 268
          if ($this->Itemid === 0) {
              if ( $option == 'com_content') {
                  require_once($this->rootPath().'/components/com_content/content.class.php');
-                 $handler = contentHandler::getInstance();
+                 $handler =& contentHandler::getInstance();
                  $this->Itemid = $handler->getItemid(mosGetParam($_REQUEST, 'id', 0 ));
                  $_REQUEST['Itemid'] = $this->Itemid;
              }
              else {
-                 $menuhandler = mosMenuHandler::getInstance();
+                 $menuhandler =& mosMenuHandler::getInstance();
                  $this->Itemid = $menuhandler->getIdLikeLink("index.php?option=$option");
                  if ($this->Itemid === 0) {
-                     $menuhandler = mosMenuHandler::getInstance();
+                     $menuhandler =& mosMenuHandler::getInstance();
                      $menus =& $menuhandler->getByParentOrder($this->Itemid, 'mainmenu');
                  }
              }
-Line 323
+Line 325
      function handleLogin () {
          require_once($this->rootPath().'/includes/authenticator.php');
-         $authenticator = mamboAuthenticator::getInstance();
+         $authenticator =& mamboAuthenticator::getInstance();
          $loggedin = $authenticator->loginUser();
          if ($loggedin) $this->logMessage(_LOGIN_SUCCESS);
          else mamboCore::redirect('index.php');
-Line 331
+Line 333
      function handleLogout () {
          require_once($this->rootPath().'/includes/authenticator.php');
-         $authenticator = mamboAuthenticator::getInstance();
+         $authenticator =& mamboAuthenticator::getInstance();
          $authenticator->logoutUser();
          $this->logMessage(_LOGOUT_SUCCESS);
      }
-Line 342
+Line 344
          header( 'Cache-Control: no-store, no-cache, must-revalidate' );
          header( 'Cache-Control: post-check=0, pre-check=0', false );
          header( 'Pragma: no-cache' );
-         $mambothandler = mosMambotHandler::getInstance();
+         $mambothandler =& mosMambotHandler::getInstance();
          $mambothandler->loadBotGroup('system');
          $mambothandler->trigger('onHeaders', array($this));
      }
-Line 351
+Line 353
          $this->do_gzip_compress = FALSE;
          //zlib.output_compression and ob_gzhandler don't get along well so we'll check to make
          //that zlib.output_compression is not enable in the php.ini before turning on ob_gzhandler
-         if ( $this->mosConfig_gzip == 1 && (int)ini_get('zlib.output_compression') != 1 ) {
+         if ( $this->mosConfig_gzip == 1 AND (int)ini_get('zlib.output_compression') != 1 ) {
              $phpver = phpversion();
              $useragent = mosGetParam( $_SERVER, 'HTTP_USER_AGENT', '' );
              $canZip = mosGetParam( $_SERVER, 'HTTP_ACCEPT_ENCODING', '' );
-             if ( $phpver >= '4.0.4pl1' &&
+             if ( $phpver >= '4.0.4pl1' AND
              ( strpos($useragent,'compatible') !== false ||
              strpos($useragent,'Gecko')      !== false
              )
-Line 419
+Line 421
  }
+ /* This is the new error handler to store errors in the database
+ class mosErrorHandler {
+ var $types = array (
+ E_STRICT => 'Strict check',
+ E_USER_WARNING => 'User Warning',
+ E_USER_NOTICE => 'User Notice',
+ E_WARNING => 'Warning',
+ E_NOTICE => 'Notice',
+ E_CORE_WARNING => 'Core Warning',
+ E_COMPILE_WARNING => 'Compile Warning',
+ E_USER_ERROR => 'User Error',
+ E_ERROR => 'Error',
+ E_PARSE => 'Parse error',
+ E_CORE_ERROR => 'Core Error',
+ E_COMPILE_ERROR => 'Compile Error'
+ );
+ function mosErrorHandler () {
+ set_error_handler(array(&$this, 'handler'));
+ }
+ function handler ($errno, $errstr, $errfile, $errline, $errcontext) {
+ if ($errno = E_STRICT) return;
+ $string = $this->types[$errno].': '.$errstr.' in '.$errfile.' at '.$errline;
+ $database = mamboDatabase::getInstance();
+ if (eregi('^(sql)$', $errstr)) {
+ $extra = $database->getErrorMsg();
+ }
+ if (function_exists('debug_backtrace')) {
+ foreach(debug_backtrace() as $back) {
+ if (@$back['file']) {
+ $extra .= "\n".$back['file'].':'.$back['line'];
+ }
+ }
+ }
+ $database->setQuery("DELETE FROM #__errors WHERE file=$errfile AND line=$errline AND number=$errno");
+ $database->query();
+ $database->setQuery("INSERT INTO #__errors VALUES (0, $errno, '$errfile', $errline, '$string', '$extra')");
+ $database->query();
+ }
+ }
+ */
  if (!isset($adminside)) $adminside = 0;
  if (!isset($indextype)) $indextype = 1;
-Line 426
+Line 471
  $configuration->handleGlobals();
  require_once ($configuration->rootPath().'/includes/database.php');
+ //new mosErrorHandler();
  /**
  * Mambo basic error object
-Line 523
+Line 569
          * Constructor
          */
      function mosPathway () {
-         $menuhandler = mosMenuHandler::getInstance();
+         $menuhandler =& mosMenuHandler::getInstance();
          $menus =& $menuhandler->getByParentOrder(0,'mainmenu');
          $home = $menus[0];
          $this->_names[] = $home->name;
-Line 564
+Line 610
      function makePathway () {
          $last = count($this->_names) - 1;
          if ($last == 0) return '';
-         $mainframe = mosMainFrame::getInstance();
+         $mainframe =& mosMainFrame::getInstance();
          $result = "<span class='pathway'>";
-         $config = mamboCore::getMamboCore();
+         $config =& mamboCore::getMamboCore();
          $rootpath = $config->rootPath();
          $imgPath =  'templates/'.$mainframe->getTemplate().'/images/arrow.png';
          if (file_exists( "$rootpath/$imgPath" )) $img = "<img src='$config->mosConfig_live_site/$imgPath' border='0' alt='arrow' />";
-Line 635
+Line 681
      /**
          * @param database A database connector object
          */
-     function mosMenu( $dummy ) {
+     function mosMenu() {
-         $db = mamboDatabase::getInstance();
+         $db =& mamboDatabase::getInstance();
          $this->mosDBTable( '#__menu', 'id', $db );
      }
      /**
-Line 648
+Line 694
          $k = $this->_tbl_key;
          if ($oid !== null) $this->$k = $oid;
          if ($this->$k === null) return false;
-         $menuhandler = mosMenuHandler::getInstance();
+         $menuhandler =& mosMenuHandler::getInstance();
-         $menu = $menuhandler->getMenuById($this->$k);
+         $menu =& $menuhandler->getMenuById($this->$k);
          if ($menu) {
              foreach (get_object_vars($menu) as $key=>$data) $this->$key = $data;
              return true;
-Line 694
+Line 740
      }
      function createDirectory ($dir) {
+         if (file_exists($dir)) {
          if (is_dir($dir)) return true;
+             else return false;
+         }
                  list($upDirectory, $count) = $this->containingDirectory($dir);
-                 if ($count > 1 AND !is_dir($upDirectory)) if (!$this->createDirectory($upDirectory)) return false;
+         if ($count > 1 AND !file_exists($upDirectory)) if (!$this->createDirectory($upDirectory)) return false;
+         if (!is_dir($upDirectory)) return false;
                  $dirperms = mamboCore::get('mosConfig_dirperms');
                  if ($dirperms) {
                          $origmask = @umask(0);
                          $mode = octdec($dirperms);
                  }
-                 else $mode = 0777;
+         else $mode = 0755;
          if (!@mkdir($dir, $mode )) $result = false;
          else {
                          $result = true;
-Line 794
+Line 844
          $ret = true;
          if (is_dir($path)) {
              $topdir =& new mosDirectory($path);
-             $files = $topdir->listFiles ('', 'file', true);
+             $files =& $topdir->listFiles ('', 'file', true, true);
-             $dirs = $topdir->listFiles ('', 'dir', true);
+             $dirs =& $topdir->listFiles ('', 'dir', true, true);
          }
          else {
              $files = array($path);
-Line 863
+Line 913
              $subdirectory->deleteAll();
              unset($subdirectory);
          }
-         $filemanager = mosFileManager::getInstance();
+         $filemanager =& mosFileManager::getInstance();
          $files =& $this->listAll ('file', false, true);
          foreach ($files as $file) $filemanager->deleteFile($file);
          $filemanager->deleteDirectory($this->path);
-Line 871
+Line 921
      function createFresh () {
          $this->deleteAll();
-         $filemanager = mosFileManager::getInstance();
+         $filemanager =& mosFileManager::getInstance();
          $filemanager->createDirectory($this->path);
          return true;
      }
      function createIfNeeded () {
          if (!file_exists($this->path)) {
-             $filemanager = mosFileManager::getInstance();
+             $filemanager =& mosFileManager::getInstance();
              $filemanager->createDirectory($this->path);
          }
      }
-Line 896
+Line 946
      function getSize () {
          $totalsize = 0;
-         $files = $this->listFiles();
+         $files =& $this->listFiles();
          foreach ($files as $file) $totalsize += filesize($this->path.$file);
          return $totalsize;
      }
-Line 921
+Line 971
          * Constructor
          */
      function mosMenuHandler() {
-         global $my;
+         $database =& mamboDatabase::getInstance();
-         $database = mamboDatabase::getInstance();
          $sql = "SELECT * FROM #__menu ORDER BY name";
          $this->_menus =& $database->doSQLget($sql, 'mosMenu');
          if (!$this->_menus) $this->_menus = array();
-Line 949
+Line 998
      function &getMenuByID ($id) {
          if (isset($this->_idlinks[$id])) {
              $key = $this->_idlinks[$id];
-             return $this->_menus[$key];
+             $result = $this->_menus[$key];
          }
-         $result = null;
+         else $result = null;
          return $result;
      }
-Line 969
+Line 1018
          return $result;
      }
+     function &getMenuTypes () {
+                 $types = array();
+                 foreach ($this->_menus as $menu) {
+                         if (!isset($types[$menu->menutype])) $types[$menu->menutype] = 0;
+                         $types[$menu->menutype]++;
+                 }
+                 return $types;
+         }
      function getIDByTypeLink ($type, $link) {
          foreach ($this->_menus as $menu) {
              if ($menu->published == 1 AND ($type == '*' OR $menu->type == $type) AND $menu->link == $link) return $menu->id;
-Line 1058
+Line 1116
                          $menu = $this->_menus[$key];
                          if ($menutype AND $mtype != $menutype) continue;
                          if ($Itemid AND $Itemid != $menu->id) continue;
-                         if ($maxaccess AND $menu->access > $maxaccess) continue;
+                         if ($menu->access > $maxaccess) continue;
                          if ($noparent AND $parent != 0) continue;
                          $result[] = $this->_menus[$key];
                      }
-Line 1070
+Line 1128
      function setPathway ($Itemid) {
          if ($Itemid) {
-             $menu = $this->getMenuByID($Itemid);
+             $menu =& $this->getMenuByID($Itemid);
              if ($menu->parent) $this->setPathway($menu->parent);
-             $pathway = mosPathway::getInstance();
+             $pathway =& mosPathway::getInstance();
              $pathway->addItem($menu->name, $menu->link."&Itemid=$Itemid");
          }
      }
-Line 1086
+Line 1144
          * @return boolean True if the visitor's group at least equal to the menu access
          */
      function menuCheck( $Itemid, $menu_option, $task, $gid ) {
-         $exceptions = array ('com_banner', 'com_poll', 'com_registration', 'com_rss');
+         // Construct a link to this component - if no menu for it, assume it is OK
-         if (in_array($menu_option, $exceptions)) return true;
          $dblink="index.php?option=$menu_option";
+         if ($this->getIDLikeLink($dblink) == 0) return true;
          if ($Itemid) {
-             $menu = $this->getMenuByID($Itemid);
+             $menu =& $this->getMenuByID($Itemid);
              if (strpos($menu->link,$dblink) ===0) $access = $menu->access;
          }
          if (!isset($access)) {
              if ($task!='') $dblink .= "&task=$task";
-             $menu = $this->maxAccessLink($dblink);
+             $menu =& $this->maxAccessLink($dblink);
              if (isset($menu)) {
                  $access = $menu->access;
                  mamboCore::set('Itemid', $menu->id);
-Line 1115
+Line 1173
              $temp = split("&task=view&id=", $mitem->link);
              if (isset($temp[1])) {
                  require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
-                 $handler = contentHandler::getInstance();
+                 $handler =& contentHandler::getInstance();
                  $mitem->link .= '&Itemid='.$handler->getItemid($temp[1]);
              }
              break;
-Line 1177
+Line 1235
          */
      function mosShowVIMenu(  &$params ) {
          global $my, $cur_template, $Itemid;
          if (mamboCore::get('mosConfig_shownoauth')) $maxaccess = 0;
          else $maxaccess = $my->gid;
          $rows =& $this->getByParentOrder(0, $params->get('menutype'), $maxaccess);
-Line 1315
+Line 1372
          $my = mamboCore::is_set('currentUser') ? mamboCore::get('currentUser') : null;
          $gid = $my ? $my->gid : 0;
          $this->_events = array();
-         $database = mamboDatabase::getInstance();
+         $database =& mamboDatabase::getInstance();
          $database->setQuery( "SELECT folder, element, published, params, CONCAT_WS('/',folder,element) AS lookup"
          . "\nFROM #__mambots"
          . "\nWHERE published >= 1 AND access <= $gid"
-Line 1333
+Line 1390
          return $instance;
      }
      /**
+     * Register a class-type mambot, provided it has a perform method
+     * - can register for multiple events if desired
+     * @param object The mambot object
+     * @param mixed string or array of strings - the mambot events to be registered
+     * @param int the subscript for use in the main array of mambots
+     */
+     function _botRegister (&$botObject, &$selected, $i) {
+         $function = array(&$botObject, 'perform');
+         if (!is_callable($function)) return;
+         if (is_array($selected)) foreach ($selected as $select) $this->_botRegister($botObject, $select);
+         $this->_events[$selected][] = array ($function, $i);
+         $this->_registered[$i] = true;
+     }
+     /**
          * Loads all the bot files for a particular group
          * @param string The group name, relates to the sub-directory in the mambots directory
          */
-Line 1349
+Line 1421
                  require_once( $path );
                  if (!isset($this->_registered[$i])) {
                      $botclass = str_replace('.','_',$bot->element);
+                     if (class_exists($botclass)) {
                      $newbot = new $botclass();
-                     $function = array ($newbot, 'perform');
+                         if (is_callable(array(&$newbot, 'register'))) {
                      $selected = $newbot->register();
-                     if (is_array($selected)) foreach ($selected as $select) $this->_events[$select][] = array($function, $i);
+                             $this->_botRegister($newbot, $selected, $i);
-                     else $this->_events[$selected][] = array ($function, $i);
+                         }
-                     $this->_registered[$i] = true;
+                     }
                  }
                  $total++;
              }
-Line 1470
+Line 1543
      var $sendEmail=null;
      /** @var int The group id number */
      var $gid=null;
+     /** @var int Group number from ACL */
+     var $grp=null;
      /** @var datetime */
      var $registerDate=null;
      /** @var datetime */
-Line 1482
+Line 1557
      /**
          * @param database A database connector object
          */
-     function mosUser( $dummy ) {
+     function mosUser() {
-         $database = mamboDatabase::getInstance();
+         $database =& mamboDatabase::getInstance();
          $this->mosDBTable( '#__users', 'id', $database );
      }
      /**
+          * Return true if this user is an administrator, false otherwise
+          */
+     function isAdmin() {
+         return ( strtolower( $this->usertype ) == 'superadministrator' OR strtolower( $this->usertype ) == 'super administrator' OR (isset($this->grp) AND $this->grp == 16) ) ? true : false;
+     }
+     /**
           * Fill a user object with information from the current session
           */
      function getSessionData() {
-         $session = mosSession::getCurrent();
+         $session =& mosSession::getCurrent();
          $this->id = intval( $session->userid );
          $this->username = $session->username;
          $this->usertype = $session->usertype;
          $this->gid = intval( $session->gid );
      }
+     function getSession () {
+                 $this->id = mosGetParam( $_SESSION, 'session_user_id', 0 );
+                 $this->username = mosGetParam( $_SESSION, 'session_username', '' );
+                 $this->usertype = mosGetParam( $_SESSION, 'session_usertype', '' );
+                 $this->gid = mosGetParam( $_SESSION, 'session_gid', 0 );
+                 $this->grp = mosGetParam( $_SESSION, 'session_grp', 0);
+     }
      /**
           * Validation and filtering
           * @return boolean True is satisfactory
-Line 1554
+Line 1644
      }
      function delete($oid=null) {
+         global $acl;
+         $k = $this->_tbl_key;
          if ($oid) $this->id = intval( $oid );
          $aro_id = $acl->get_object_id( 'users', $this->$k, 'ARO' );
          $acl->del_object( $aro_id, 'ARO', true );
-Line 1658
+Line 1749
      */
      function logout() {
          require_once(mamboCore::get('mosConfig_absolute_path').'/includes/authenticator.php');
-         $authenticator = mamboAuthenticator::getInstance();
+         $authenticator =& mamboAuthenticator::getInstance();
          $authenticator->logoutUser();
      }
      /**
-Line 1666
+Line 1757
      */
      function login ($username=null,$passwd=null) {
          require_once(mamboCore::get('mosConfig_absolute_path').'/includes/authenticator.php');
-         $authenticator = mamboAuthenticator::getInstance();
+         $authenticator =& mamboAuthenticator::getInstance();
          return $authenticator->loginUser($username, $passwd);
      }
-Line 1735
+Line 1826
          * @param string The value of the content attibute to append to the existing
          * Tags ordered in with Site Keywords and Description first
          */
-     function appendMetaTag( $name, $content ) {
+     function appendMetaTag( $name, $content, $ifEmpty=false ) {
          list($name, $content) = $this->_tidyMetaData($name, $content);
          $tag = $this->_getMetaTag($name);
+         if ($tag[0] AND $ifEmpty) return;
          if ($tag[0] AND $content) $content .= ', ';
          $tag[0] = $content.$tag[0];
          $this->_head['meta'][$name] =  $tag;
-Line 1986
+Line 2078
          */
      function getItemid ($id, $typed=1, $link=1, $bs=1, $bc=1, $gbs=1) {
          require_once(mamboCore::get('mosConfig_absolute_path').'/components/com_content/content.class.php');
-         $handler = contentHandler::getInstance();
+         $handler =& contentHandler::getInstance();
          return $handler->getItemid($id, $typed, $link, $bs, $bc, $gbs);
      }
      function liveBookMark () {
          // support for Firefox Live Bookmarks ability for site syndication
-         $c_handler = mosComponentHandler::getInstance();
+         $c_handler =& mosComponentHandler::getInstance();
          $params = $c_handler->getParamsByName('Syndicate');
          $live_bookmark = $params->get( 'live_bookmark', 0 );
          if ($live_bookmark) {
-Line 2021
+Line 2113
      function mosShowHead () {
          global $_VERSION;
          $mosConfig_live_site = mamboCore::get('mosConfig_live_site');
-         $this->appendMetaTag( 'description', mamboCore::get('mosConfig_MetaDesc') );
+         $this->appendMetaTag( 'description', mamboCore::get('mosConfig_MetaDesc'), true );
-         $this->appendMetaTag( 'keywords', mamboCore::get('mosConfig_MetaKeys') );
+         $this->appendMetaTag( 'keywords', mamboCore::get('mosConfig_MetaKeys'), true );
-         $this->addMetaTag( 'Generator', $_VERSION->PRODUCT . " - " . $_VERSION->COPYRIGHT);
-         $this->addMetaTag( 'robots', 'index, follow' );
          echo $this->getHead();
          if (mamboCore::get('mosConfig_sef')) {
              echo "<base href=\"$mosConfig_live_site/\" />\r\n";
-Line 2037
+Line 2127
          }
          $this->liveBookMark();
          // outputs link tag for page
-         $configuration = mamboCore::getMamboCore();
+         $configuration =& mamboCore::getMamboCore();
                  ?>
                  <link rel="shortcut icon" href="<?php echo $configuration->getFavIcon();?>" />
                  <?php
-Line 2086
+Line 2176
  class mosSession extends mosDBTable {
      /** @var int Primary key */
      var $session_id=null;
-     /** @var string */
+     /** @var time */
      var $time=null;
-     /** @var string */
+     /** @var int User ID */
      var $userid=0;
      /** @var string */
      var $usertype=null;
      /** @var string */
      var $username='';
-     /** @var time */
+     /** @var int User group ID */
      var $gid=0;
      /** @var int */
      var $guest=1;
-Line 2104
+Line 2194
      /**
          * @param database A database connector object
          */
-     function mosSession( &$db ) {
+     function mosSession() {
-         $database = mamboDatabase::getInstance();
+         $database =& mamboDatabase::getInstance();
          $this->mosDBTable( '#__session', 'session_id', $database );
          $this->time = time();
      }
+     function validate ($user) {
+                 // check against db record of session
+                 $session_id = mosGetParam( $_SESSION, 'session_id', '' );
+                 $logintime = mosGetParam( $_SESSION, 'session_logintime', '' );
+                 if ($session_id == md5( $user->id.$user->username.$user->usertype.$logintime )) {
+                         $current_time = time();
+                         $database = mamboDatabase::getInstance();
+                         $database->setQuery ("UPDATE #__session"
+                         . "\nSET time='$current_time', guest=-3-guest"
+                         . "\nWHERE session_id='$session_id'"
+                         . " AND username = '" . $database->getEscaped( $user->username ) . "'"
+                         . " AND userid = " . intval( $user->id )
+                         );
+                         if (!$result = $database->query()) echo $database->stderr();
+                         elseif ($database->getAffectedRows() == 1) return true;
+                 }
+                 return false;
+         }
      function &getCurrent () {
          static $currentSession;
          if (!is_object($currentSession)) {
-             $currentSession = new mosSession($dummy);
+             $currentSession = new mosSession();
-             $currentSession->purge(intval(mamboCore::get('mosConfig_lifetime')));
+             mosSession::purge();
              $sessionCookieName = md5('site'.mamboCore::get('mosConfig_live_site'));
              $sessioncookie = mosGetParam($_COOKIE, $sessionCookieName, null);
              $usercookie = mosGetParam($_COOKIE, 'usercookie', null);
-Line 2132
+Line 2241
                  if ($usercookie) {
                      // Remember me cookie exists. Login with usercookie info.
                      require_once (mamboCore::get('mosConfig_absolute_path').'/includes/authenticator.php');
-                     $authenticator = mamboAuthenticator::getInstance();
+                     $authenticator =& mamboAuthenticator::getInstance();
                      $authenticator->authenticateUser ($message, $usercookie['username'], $usercookie['password'], null, $currentSession);
                  }
              }
-Line 2170
+Line 2279
              if ($randnum != "") {
                  $cryptrandnum = md5( $randnum );
                  $this->_db->setQuery( "SELECT $this->_tbl_key FROM $this->_tbl WHERE $this->_tbl_key=MD5('$randnum')" );
-                 if(!$result = $this->_db->query()) {
+                 if(!($result = $this->_db->query())) {
                      die( $this->_db->stderr( true ));
                      // todo: handle gracefully
                  }
-Line 2187
+Line 2296
          return $this->_session_cookie;
      }
-     function purge( $inc=1800 ) {
+     function purge () {
-         $past = time() - $inc;
+         $past = time() - intval(mamboCore::get('mosConfig_lifetime'));
-         $query = "DELETE FROM $this->_tbl"
+         $adminpast = time() - 3600;
-         . "\nWHERE (time < $past)";
+         $database = mamboDatabase::getInstance();
-         $this->_db->setQuery($query);
+         $database->setQuery("DELETE FROM #__session WHERE (time<$past AND guest>=0) OR (time<$adminpast AND guest<0)");
+         return $database->query();
-         return $this->_db->query();
      }
  }
  /**
-Line 2303
+Line 2412
          return $result;
      }
      /**
+         * @param string The name of the control, or the default text area if a setup file is not found
+         * @return string HTML
+         */
+     function render( $name='params' ) {
+         if (is_file($this->_path)) {
+             $parser = new mosXMLParams ($this->_path, $this, $name);
+             if (count($parser->html)) return implode("\n", $parser->html);
+         }
+         $raw = $this->_raw;
+         return "<textarea name='$name' cols='40' rows='10' class='text_area'>$raw</textarea>";
+     }
+     /**
          * special handling for textarea param
          */
      function textareaHandling( &$txt ) {
-Line 2334
+Line 2456
      }
  }
  require($configuration->rootPath().'/includes/version.php');
  $_VERSION =& new version();
-Line 2348
+Line 2471
  $local_backup_path = $configuration->rootPath().'/administrator/backups';
  $media_path = $configuration->rootPath().'/media/';
  $image_path = $configuration->rootPath().'/images/stories';
+ $lang_path = $configuration->rootPath().'/language';
  $image_size = 100;
- $database = mamboDatabase::getInstance();
+ $database =& mamboDatabase::getInstance();
  $database->debug(mamboCore::get('mosConfig_debug'));
+ //
+ $gettext =& phpgettext();
+ $gettext->bindtextdomain('common', $configuration->rootPath().'/language');
+ $gettext->textdomain('common');
+ //dump($gettext->textdomain(substr($option, 3)));
+ //$gettext->bindtextdomain('frontend',    $lang_path);
+ //$gettext->textdomain('frontend');
  if (!$adminside) {
      $sefcode = $configuration->rootPath().'/components/com_sef/sef.php';
      if (file_exists($sefcode)) require_once($sefcode);
      else require_once($configuration->rootPath().'/includes/sef.php');
      $urlerror = 0;
      if (mamboCore::get('mosConfig_sef') AND $indextype == 3) {
-         $sef = mosSEF::getInstance();
+         $sef =& mosSEF::getInstance();
          $urlerror = $sef->sefRetrieval(mamboCore::get('mosConfig_register_globals'));
          $indextype = 1;
      }
-Line 2374
+Line 2507
  $act = strtolower(mosGetParam($_REQUEST, 'act', ''));
  $section = mosGetParam($_REQUEST, 'section', '');
  $no_html = strtolower(mosGetParam($_REQUEST, 'no_html', ''));
+ $cid = (array) mosGetParam( $_POST, 'cid', array() );
+ ini_set('session.use_trans_sid', 0);
+ ini_set('session.use_cookies', 1);
+ ini_set('session.use_only_cookies', 1);
  if ($adminside) {
      // Start ACL
-Line 2382
+Line 2521
      $acl = new gacl_api();
      // Handle special admin side options
      $option = strtolower(mosGetParam($_REQUEST,'option','com_admin'));
-     // Login will, if it succeeds, start a new session and set $my
-     if ($option == 'login') {
+     $domain = substr($option, 4);
+     $gettext->bindtextdomain('administrator', $lang_path);
+     $gettext->bindtextdomain($domain, $lang_path);
+     $admindomain = $gettext->textdomain();
+     $gettext->textdomain('administrator');
+     session_name(md5(mamboCore::get('mosConfig_live_site')));
+     session_start();
+         // restore some session variables
+         $my = new mosUser();
+         $my->getSession();
+         if (mosSession::validate($my)) mosSession::purge();
+         else $my = null;
+     if (!$my AND $option == 'login') {
          require_once($configuration->rootPath().'/includes/authenticator.php');
-         $authenticator = mamboAuthenticator::getInstance();
+         $authenticator =& mamboAuthenticator::getInstance();
          $my = $authenticator->loginAdmin($acl);
      }
-     // If this is not login, we should already have a valid admin session
-     else {
-         session_name(md5(mamboCore::get('mosConfig_live_site')));
-         session_start();
          // Handle the remaining special options
-         if ($option == 'logout') {
+     elseif ($option == 'logout') {
              require($configuration->rootPath().'/administrator/logout.php');
              exit();
          }
-         if ($option == 'simple_mode') $admin_mode = 'on';
-         elseif ($option == 'advanced_mode') $admin_mode = 'off';
-         else $admin_mode = mosGetParam($_SESSION, 'simple_editing', '');
-         $_SESSION['simple_editing'] = mosGetParam($_POST, 'simple_editing', $admin_mode);
-         // Include admin side functions, check that we have a valid admin side session
-         require_once($configuration->rootPath().'/administrator/includes/admin.php');
-         $my = checkAdminSession($database);
-     }
      // We can now create the mainframe object
      $mainframe =& new mosMainFrame($database, $option, '..', true);
      // Provided $my is set, we have a valid admin side session and can include remaining code
      if ($my) {
          mamboCore::set('currentUser', $my);
+         if ($option == 'simple_mode') $admin_mode = 'on';
+         elseif ($option == 'advanced_mode') $admin_mode = 'off';
+         else $admin_mode = mosGetParam($_SESSION, 'simple_editing', '');
+         $_SESSION['simple_editing'] = mosGetParam($_POST, 'simple_editing', $admin_mode);
+         require_once($configuration->rootPath().'/administrator/includes/admin.php');
          require_once( $configuration->rootPath().'/includes/mambo.php' );
          require_once ($configuration->rootPath().'/includes/mambofunc.php');
          require_once ($configuration->rootPath().'/includes/mamboHTML.php');
          require_once( $configuration->rootPath().'/administrator/includes/mosAdminMenus.php');
          require_once($configuration->rootPath().'/administrator/includes/admin.php');
          require_once( $configuration->rootPath() . '/includes/cmtclasses.php' );
-         $_MAMBOTS = mosMambotHandler::getInstance();
+         require_once( $configuration->rootPath() . '/components/com_content/content.class.php' );
+         $_MAMBOTS =& mosMambotHandler::getInstance();
          // If no_html is set, we avoid starting the template, and go straight to the component
          if ($no_html) {
              if ($path = $mainframe->getPath( "admin" )) require $path;
-Line 2430
+Line 2577
              $configuration->doGzip();
          }
          else {
+             if (!isset($popup)) {
              $pop = mosGetParam($_REQUEST, 'pop', '');
-             if ($pop) require_once($configuration->rootPath()."/administrator/popups/$pop");
+                 if ($pop) require($configuration->rootPath()."/administrator/popups/$pop");
-             else require_once($configuration->rootPath()."/administrator/popups/index3pop.php");
+                 else require($configuration->rootPath()."/administrator/popups/index3pop.php");
              $configuration->doGzip();
          }
      }
-     // If $my was not set, the only possibility is to ask for an admin side login
+     }
+     // If $my was not set, the only possibility is to offer a login screen
      else {
          $configuration->initGzip();
          $path = $configuration->rootPath().'/administrator/templates/'.$mainframe->getTemplate().'/login.php';
-Line 2450
+Line 2599
      $configuration->handleGlobals();
      $Itemid = $configuration->get('Itemid');
+     // load frontend language file
+     $gettext->bindtextdomain(substr($option, 4), $configuration->rootPath().'/language');
+     $gettext->bindtextdomain('frontend', $configuration->rootPath().'/language');
+     $frontdomain = $gettext->textdomain();
+     $gettext->textdomain('frontend');
      $mainframe =& new mosMainFrame($database, $option, '.');
      if ($option == 'login') $configuration->handleLogin();
      elseif ($option == 'logout') $configuration->handleLogout();
-     $session = mosSession::getCurrent();
+     $session =& mosSession::getCurrent();
-     $my =& new mosUser($database);
+     $my =& new mosUser();
      $my->getSessionData();
      mamboCore::set('currentUser',$my);
      $configuration->offlineCheck($my, $database);
-Line 2477
+Line 2633
      $mainframe->detect();
      /** @global mosPlugin $_MAMBOTS */
-     $_MAMBOTS = mosMambotHandler::getInstance();
+     $_MAMBOTS =& mosMambotHandler::getInstance();
      require_once( $configuration->rootPath().'/editor/editor.php' );
      require_once( $configuration->rootPath() . '/includes/gacl.class.php' );
      require_once( $configuration->rootPath() . '/includes/gacl_api.class.php' );
+     require_once( $configuration->rootPath() . '/components/com_content/content.class.php' );
      $acl = new gacl_api();
      /** Get the component handler */
-Line 2489
+Line 2646
      $c_handler->startBuffer();
      if (!$urlerror AND $path = $mainframe->getPath( 'front' )) {
-         $menuhandler = mosMenuHandler::getInstance();
+         $menuhandler =& mosMenuHandler::getInstance();
          $ret = $menuhandler->menuCheck($Itemid, $option, $task, $gid);
          $menuhandler->setPathway($Itemid);
-         if ($ret) require_once( $path );
+         if ($ret) {
+             $gettext->textdomain(substr($option, 4));   // get the component lang file
+             require ($path);
+             $gettext->textdomain($frontdomain);
+         }
          else mosNotAuth();
      }
      else {
-Line 2506
+Line 2667
      $configuration->initGzip();
      $configuration->standardHeaders();
-     if ($indextype == 1) {
+     if (mosGetParam($_GET, 'syndstyle', '') == 'yes') mosMainBody();
+     elseif ($indextype == 1) {
          // loads template file
          if ( !file_exists( 'templates/'. $cur_template .'/index.php' ) ) {
              echo '<font color=\"red\"><b>'.T_('Template File Not Found! Looking for template').'</b></font>'.$cur_template;
          } else {
              require_once( 'templates/'. $cur_template .'/index.php' );
-             $mambothandler = mosMambotHandler::getInstance();
+             $mambothandler =& mosMambotHandler::getInstance();
              $mambothandler->loadBotGroup('system');
              $mambothandler->trigger('afterTemplate', array($configuration));
              echo "<!-- ".time()." -->";
-Line 2545
+Line 2707
      $configuration->doGzip();
  }
  // displays queries performed for page
- if ($configuration->get('mosConfig_debug')) $database->displayLogged();
+ if ($configuration->get('mosConfig_debug') AND $adminside != 3) $database->displayLogged();
  ?>

 Legend:



Removed from v.236
 


changed lines


 
Added in v.465
 Legend:



Removed from v.236
 


changed lines


 
Added in v.465
-Removed from v.236
+Added in v.465

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/index.php