Mambo > Projects > Mambo CMS > SVN

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

-revision 252, Sun Feb 12 19:37:34 2006 UTC
+revision 390, Mon Mar 13 18:15:11 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']));
+                 $subdir = dirname($_SERVER['PHP_SELF']);
+                 if ($adminside) $subdir = substr($subdir, 0, strrpos($subdir, '/'));
+                 if (strlen($subdir) == 1) $subdir = '';
                  $this->subdirectory = str_replace('\\', '/', $subdir);
                  $scheme = isset($_SERVER['HTTP_SCHEME']) ? $_SERVER['HTTP_SCHEME'] : ((isset($_SERVER['HTTPS']) AND strtolower($_SERVER['HTTPS'] != 'off')) ? 'https' : 'http');
                  if (isset($_SERVER['HTTP_HOST'])) {
-Line 150
+Line 156
                  $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 168
+Line 173
      }
      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();
-Line 179
+Line 184
      }
      function fixLanguage () {
-         require_once($this->mosConfig_absolute_path.'/includes/phpgettext/error.php');
          require_once($this->mosConfig_absolute_path.'/includes/phpgettext/phpgettext.class.php');
          ##########  DEPRECATED ############
          if (isset($this->mosConfig_lang) AND $this->mosConfig_lang);
          else $this->set('mosConfig_lang', 'english');
-Line 192
+Line 193
          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->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);
-Line 217
+Line 207
                  $this->language[$name] = $value['attributes']['default'];
              }
          }
          if (!defined('_ISO')) DEFINE('_ISO','charset='.$this->language['encoding']);
          if (!defined('_DATE_FORMAT_LC')) DEFINE('_DATE_FORMAT_LC', $this->language['dateformat']); //Uses PHP's strftime Command Format
          if (!defined('_DATE_FORMAT_LC2')) DEFINE('_DATE_FORMAT_LC2', $this->language['dateformat']." %H:%M");
-         //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);
-         /*dump($gettext->getlocale());
-         $gettext->bindtextdomain('administrator', $lang_path);/*dump($gettext->getlocale());
-         dump(setlocale(LC_CTYPE, ''));;
-         dump(array($gettext, $this));*/
      }
      function handleGlobals () {
-Line 433
+Line 413
  }
+ /* 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 463
  $configuration->handleGlobals();
  require_once ($configuration->rootPath().'/includes/database.php');
+ //new mosErrorHandler();
  /**
  * Mambo basic error object
-Line 649
+Line 673
      /**
          * @param database A database connector object
          */
-     function mosMenu( $dummy ) {
+     function mosMenu() {
          $db =& mamboDatabase::getInstance();
          $this->mosDBTable( '#__menu', 'id', $db );
      }
-Line 708
+Line 732
      }
      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 808
+Line 836
          $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 963
+Line 991
      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 1072
+Line 1100
                          $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 1354
+Line 1382
      * @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 1512
+Line 1540
      /**
          * @param database A database connector object
          */
-     function mosUser( $dummy ) {
+     function mosUser() {
          $database =& mamboDatabase::getInstance();
          $this->mosDBTable( '#__users', 'id', $database );
      }
-Line 1584
+Line 1612
      }
      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 2133
+Line 2162
      /**
          * @param database A database connector object
          */
-     function mosSession( &$db ) {
+     function mosSession() {
          $database =& mamboDatabase::getInstance();
          $this->mosDBTable( '#__session', 'session_id', $database );
          $this->time = time();
-Line 2142
+Line 2171
      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 2228
              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 2245
          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 2448
+Line 2477
      }
      // If this is not login, we should already have a valid admin session
      else {
+         ini_set('session.use_trans_sid', 0);
+         ini_set('session.use_cookies', 1);
+         ini_set('session.use_only_cookies', 1);
          session_name(md5(mamboCore::get('mosConfig_live_site')));
          session_start();
          // Handle the remaining special options
-Line 2475
+Line 2507
          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 2524
              $configuration->doGzip();
          }
          else {
-             if (!$popup) {
+             if (!isset($popup)) {
                  $pop = mosGetParam($_REQUEST, 'pop', '');
                  if ($pop) require_once($configuration->rootPath()."/administrator/popups/$pop");
                  else require_once($configuration->rootPath()."/administrator/popups/index3pop.php");
-Line 2551
+Line 2584
      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 2598
          $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 2614
      $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;

 Legend:



Removed from v.252
 


changed lines


 
Added in v.390
 Legend:



Removed from v.252
 


changed lines


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

	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