Mambo > Projects > Mambo CMS > SVN

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

-revision 941, Thu Feb  1 05:54:14 2007 UTC
+revision 1075, Mon Apr 23 23:53:33 2007 UTC
 Line 1
  <?php
  /**
- * @package Mambo Open Source
+ * @package Mambo
- * @copyright (C) 2005 - 2007 Mambo Foundation Inc.
+ * @author Mambo Foundation Inc see README.php
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+ * @copyright Mambo Foundation Inc.
- *
+ * See COPYRIGHT.php for copyright notices and details.
- * 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
+ * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see
- * that Mambo remained free Open Source software owned and managed by the community.
+ * LICENSE.php
- * Mambo is Free Software
+ * Mambo is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2 of the
+ * License.
  */
  /**
-Line 336
+Line 339
          eval($code);
-         if (isset($_SERVER['DOCUMENT_ROOT']) AND strlen($_SERVER['DOCUMENT_ROOT'])) {
+         /*if (isset($_SERVER['DOCUMENT_ROOT']) AND strlen($_SERVER['DOCUMENT_ROOT'])) {
              $docroot = str_replace('\\', '/', str_replace('\\\\', '\\', $_SERVER['DOCUMENT_ROOT']));
          }
-         else {
+         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('\\', '/', rtrim($this->rootPath, '\/'));
          $this->subdirectory = substr($mamboroot, strlen($docroot));
-Line 395
+Line 398
       * @param unknown_type $database
       */
      function offlineCheck (&$user, &$database) {
-         if ($this->mosConfig_offline OR file_exists($this->rootPath.'/installation/index.php')) {
+     global $adminside;
+         if (($this->mosConfig_offline && !$adminside) OR file_exists($this->rootPath.'/installation/index.php')) {
              require_once($this->rootPath().'/administrator/includes/admin.php');
              session_name(md5($this->mosConfig_live_site));
              session_start();
-Line 417
+Line 421
          require_once($this->mosConfig_absolute_path.'/includes/phpgettext/error.php');
          require_once($this->mosConfig_absolute_path.'/includes/mambofunc.php');
          require_once($this->mosConfig_absolute_path.'/includes/mambolanguage.class.php');
-         $this->mosConfig_locale = mosGetParam($_POST, 'lang', $this->mosConfig_locale);
+         $this->mosConfig_locale = mosGetParam($_REQUEST, 'lang', $this->mosConfig_locale);
          $language =& new mamboLanguage($this->mosConfig_locale, $this->rootPath.'/language/');
          $languages = $language->getLanguages();
-Line 426
+Line 430
          $this->mosConfig_lang = $language->get('lang');
          $this->current_language = $language;
          if (!defined('_ISO')) DEFINE('_ISO','charset='.$charset);
+                 header('Content-type: text/html; '._ISO);
          if (!defined('_DATE_FORMAT_LC')) DEFINE('_DATE_FORMAT_LC', $dateformat); //Uses PHP's strftime Command Format
          if (!defined('_DATE_FORMAT_LC2')) DEFINE('_DATE_FORMAT_LC2', $dateformat);
-Line 1966
+Line 1971
          if (isset($result[0])) return $result[0];
          return null;
      }
+     function getBot($element, $folder) {
+         $returnBot = '';
+         foreach ($this->_bots as $i=>$bot) {
+             if ($bot->folder == $folder && $bot->element == $element){
+                 $returnBot = $bot;
+                 break;
+             }
+         }
+         return $returnBot;
+     }
  }
  /**
-Line 2043
+Line 2059
           */
      function check() {
          Global $mosConfig_absolute_path;
-         include $mosConfig_absolute_path . ('/language/english.php');
+         //include $mosConfig_absolute_path . ('/language/english.php');
          $this->_error = '';
          if ($this->name == '') $this->_error = _REGWARN_NAME;
          elseif ($this->username == '') $this->_error = _REGWARN_UNAME;

 Legend:



Removed from v.941
 


changed lines


 
Added in v.1075
 Legend:



Removed from v.941
 


changed lines


 
Added in v.1075
-Removed from v.941
+Added in v.1075

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

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