Mambo > Projects > Mambo CMS > SVN

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

-revision 252, Sun Feb 12 19:37:34 2006 UTC
+revision 487, Sat Apr 22 08:49:01 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 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();
          @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 117
+Line 120
      }
          function getConfig () {
+                 global $adminside;
                  $code = '';
                  $f = @fopen($this->rootPath.'/configuration.php','rb');
                  if ($f) {
-Line 132
+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 {
+                         // 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']);
-Line 150
+Line 163
                  $afterscheme = '://'.$servername.$port.$this->subdirectory;
                  $this->mosConfig_live_site = $this->mosConfig_secure_site = $scheme.$afterscheme;
                  $this->mosConfig_unsecure_site = 'http'.$afterscheme;
- //              $this->mosConfig_live_site = 'http://'.$_SERVER['SERVER_NAME'].$this->subdirectory;
                  $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 164
+Line 176
          // favourites icon
          if (!isset($this->mosConfig_favicon)) $this->mosConfig_favicon = 'favicon.ico';
          if (!file_exists($this->rootPath.'/images/'.$this->mosConfig_favicon)) $this->mosConfig_favicon = 'favicon.ico';
-         return $this->rootPath.'/images/'.$this->mosConfig_favicon;
+         return $this->mosConfig_live_site.'/images/'.$this->mosConfig_favicon;
      }
      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 192
+Line 206
          if (file_exists($language_file)) require_once ($language_file);
          ###################################
-         #set_error_handler('error_handler');
-         $lang = $this->mosConfig_lang;
-         $langfile = $this->rootPath.DIRECTORY_SEPARATOR.'language'.DIRECTORY_SEPARATOR.$lang.'.xml';
+         $this->mosConfig_lang = mosGetParam($_POST, 'setLanguage', $this->mosConfig_lang);
-         /*$this->language[$this->mosConfig_language] = array(
-         'locale' => 'pt, pt.utf-8',
-         'encoding' => 'utf-8',
-         'direction' => 'rtl',
-         'dateformat' => '%A, %d %B %Y',
-         'offset' => '+00:00'
-         );
-         */
-         $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');
          $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($this->mosConfig_lang, $this->mosConfig_locale);
+         $gettext->setlocale($this->mosConfig_lang);
-         /*dump($gettext->getlocale());
-         $gettext->bindtextdomain('administrator', $lang_path);/*dump($gettext->getlocale());
-         dump(setlocale(LC_CTYPE, ''));;
-         dump(array($gettext, $this));*/
      }
      function handleGlobals () {
-Line 433
+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 440
+Line 471
  $configuration->handleGlobals();
  require_once ($configuration->rootPath().'/includes/database.php');
+ //new mosErrorHandler();
  /**
  * Mambo basic error object
-Line 649
+Line 681
      /**
          * @param database A database connector object
          */
-     function mosMenu( $dummy ) {
+     function mosMenu() {
          $db =& mamboDatabase::getInstance();
          $this->mosDBTable( '#__menu', 'id', $db );
      }
-Line 707
+Line 739
          return true;
      }
-     function createDirectory ($dir) {
+     function setPermissions ($fileSysObject) {
-         if (is_dir($dir)) return true;
+         if (file_exists($fileSysObject))  {
-         list($upDirectory, $count) = $this->containingDirectory($dir);
+                 if (is_dir($fileSysObject)) $perms = mamboCore::get('mosConfig_dirperms');
-         if ($count > 1 AND !is_dir($upDirectory)) if (!$this->createDirectory($upDirectory)) return false;
+                 else $perms = mamboCore::get('mosConfig_fileperms');
-         $dirperms = mamboCore::get('mosConfig_dirperms');
+                 if ($perms) {
-         if ($dirperms) {
              $origmask = @umask(0);
-             $mode = octdec($dirperms);
+                         $mode = octdec($perms);
+                         @chmod($fileSysObject, $mode);
+                                 @umask($origmask);
+                         }
          }
-         else $mode = 0777;
-         if (!@mkdir($dir, $mode )) $result = false;
-         else {
-             $result = true;
-             @chmod ($dir, $mode);
          }
-         if (isset($origmask)) @umask($origmask);
+         function makeDirectory ($dir) {
+                 $perms = mamboCore::get('mosConfig_dirperms');
+                 $origmask = @umask(0);
+                 if ($perms) $result = @mkdir($dir, octdec($perms));
+                 else $result = @mkdir($dir, 0755);
+                 if ($result) $this->setPermissions($dir);
+                 @umask($origmask);
          return $result;
      }
+         function createDirectory ($dir, $onlyCheck=false) {
+         if (file_exists($dir)) {
+             if (is_dir($dir) AND is_writable($dir)) return true;
+             else return false;
+         }
+         list($upDirectory, $count) = $this->containingDirectory($dir);
+         if ($count > 1 AND !file_exists($upDirectory) AND !($result = $this->createDirectory($upDirectory, $onlyCheck))) return false;
+         if ($onlyCheck AND isset($result)) return true;
+         if (!is_dir($upDirectory) OR !is_writable($upDirectory)) return false;
+         if ($onlyCheck) return true;
+         else return $this->makeDirectory($dir);
+     }
      function containingDirectory ($dir) {
          $dirs = preg_split('*[/|\\\]*', $dir);
          for ($i = count($dirs)-1; $i >= 0; $i--) {
-Line 733
+Line 783
              unset($dirs[$i]);
              if ($text) break;
          }
-         return array(implode('/',$dirs), count($dirs));
+         $result2 = count($dirs);
+         $result1 = implode('/',$dirs).($result2 > 1 ? '' : '/');
+         return array($result1, $result2);
      }
+     function simpleCopy ($from, $to) {
+         if (@copy($from, $to)) {
+                 $this->setPermissions($to);
+                 return true;
+         }
+         else return false;
+         }
      function forceCopy ($from, $to) {
          $todir = dirname($to);
-Line 743
+Line 802
          if (!file_exists($todir)) return false;
          $name = basename($from);
          $this->deleteFile($to.$name);
-         return @copy($from, $to);
+         return $this->simpleCopy ($from, $to);
      }
      function lightCopy ($from, $to) {
-Line 752
+Line 811
          $todir = dirname($to);
          if (!file_exists($todir)) $this->createDirectory($todir);
          if (!file_exists($todir)) return false;
-         return @copy($from, $to);
+                 return $this->simpleCopy ($from, $to);
+     }
+         function acceptCopy ($to) {
+                 $todir = dirname($to);
+                 return $this->createDirectory($todir, true);
      }
-Line 808
+Line 872
          $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 935
+Line 999
          * Constructor
          */
      function mosMenuHandler() {
-         global $my;
          $database =& mamboDatabase::getInstance();
          $sql = "SELECT * FROM #__menu ORDER BY name";
          $this->_menus =& $database->doSQLget($sql, 'mosMenu');
-Line 963
+Line 1026
      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 983
+Line 1046
          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 1072
+Line 1144
                          $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 1100
+Line 1172
          * @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 ($menu_option == 'com_content' AND $Itemid == 1) return true;
+         if ($this->getIDLikeLink($dblink) == 0) return true;
          if ($Itemid) {
              $menu =& $this->getMenuByID($Itemid);
              if (strpos($menu->link,$dblink) ===0) $access = $menu->access;
-Line 1191
+Line 1264
          */
      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 1354
+Line 1426
      * @param int the subscript for use in the main array of mambots
      */
      function _botRegister (&$botObject, &$selected, $i) {
-         $function = array(&$newbot, 'perform');
+         $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);
-Line 1500
+Line 1572
      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 1512
+Line 1586
      /**
          * @param database A database connector object
          */
-     function mosUser( $dummy ) {
+     function mosUser() {
          $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() {
-Line 1527
+Line 1608
          $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 1584
+Line 1673
      }
      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 2115
+Line 2205
  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 2133
+Line 2223
      /**
          * @param database A database connector object
          */
-     function mosSession( &$db ) {
+     function mosSession() {
          $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 2199
+Line 2308
              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 2216
+Line 2325
          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 2341
+Line 2450
                          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>";
+         return "<textarea name='$name' cols='40' rows='10' class='text_area'>$raw</textarea>";
          }
      /**
-Line 2376
+Line 2485
      }
  }
  require($configuration->rootPath().'/includes/version.php');
  $_VERSION =& new version();
-Line 2426
+Line 2536
  $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 2440
+Line 2556
      $gettext->bindtextdomain($domain, $lang_path);
      $admindomain = $gettext->textdomain();
      $gettext->textdomain('administrator');
-     // Login will, if it succeeds, start a new session and set $my
+     session_name(md5(mamboCore::get('mosConfig_live_site')));
-     if ($option == 'login') {
+     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();
          $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' );
+         require_once( $configuration->rootPath() . '/components/com_content/content.class.php' );
          $_MAMBOTS =& mosMambotHandler::getInstance();
-Line 2491
+Line 2606
              $configuration->doGzip();
          }
          else {
-             if (!$popup) {
+             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 2525
+Line 2640
      elseif ($option == 'logout') $configuration->handleLogout();
      $session =& mosSession::getCurrent();
-     $my =& new mosUser($database);
+     $my =& new mosUser();
      $my->getSessionData();
      mamboCore::set('currentUser',$my);
      $configuration->offlineCheck($my, $database);
-Line 2551
+Line 2666
      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 */
      require_once( $configuration->rootPath() . '/includes/cmtclasses.php' );
      $c_handler =& mosComponentHandler::getInstance();
-Line 2565
+Line 2680
          $menuhandler->setPathway($Itemid);
          if ($ret) {
              $gettext->textdomain(substr($option, 4));   // get the component lang file
-             require_once( $path );
+             require ($path);
              $gettext->textdomain($frontdomain);
          }
          else mosNotAuth();
-Line 2581
+Line 2696
      $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;
-Line 2620
+Line 2736
      $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.252
 


changed lines


 
Added in v.487
 Legend:



Removed from v.252
 


changed lines


 
Added in v.487
-Removed from v.252
+Added in v.487

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

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