Mambo > Projects > Mambo CMS > SVN

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

-revision 891, Thu Jan 18 14:05:15 2007 UTC
+revision 1348, Thu Oct 18 14:53:38 2007 UTC
 Line 1
  <?php
  /**
- * @package Mambo Open Source
+ * @package Mambo
- * @copyright (C) 2005 - 2006 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 324
+Line 327
          if ($f) {
              while ($f AND !feof($f)) {
                  $line = fgets($f);
-                 $altered = str_replace('$', '$this->', $line);
+                 $altered = preg_replace('/^\$/', '$this->', $line);
                  if ($altered != $line) $code .= $altered;
              }
          }
-Line 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);
+         if (!mosGetParam($_REQUEST, 'lang'));
+         else $this->mosConfig_locale = mosGetParam($_REQUEST, 'lang', $this->mosConfig_locale);
          $language =& new mamboLanguage($this->mosConfig_locale, $this->rootPath.'/language/');
          $languages = $language->getLanguages();
          $charset = $language->get('charset');
-Line 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 573
+Line 578
          require_once($this->rootPath().'/includes/authenticator.php');
          $authenticator =& mamboAuthenticator::getInstance();
          $loggedin = $authenticator->loginUser();
-         if ($loggedin) $this->logMessage('_LOGIN_SUCCESS');
+         if ($loggedin) $this->logMessage(T_('You have Logged In succesfully'));
          else mamboCore::redirect('index.php');
      }
-Line 585
+Line 590
          require_once($this->rootPath().'/includes/authenticator.php');
          $authenticator =& mamboAuthenticator::getInstance();
          $authenticator->logoutUser();
-         $this->logMessage('_LOGOUT_SUCCESS');
+         $this->logMessage(T_('You have Logged Out successfully'));
      }
      /**
-Line 1190
+Line 1195
      function &listAll ($type='file', $recurse=false, $fullpath=false) {
          $results = array();
          if ($dir = @opendir($this->path)) {
-             while ($file = readdir($dir)) {
+             while (false !== ($file = readdir($dir))) {
                  if ($file == '.' OR $file == '..') continue;
                  if (is_dir($this->path.$file)) {
                      if ($recurse) {
-Line 1206
+Line 1211
              }
              closedir($dir);
          }
+         asort($results);
          return $results;
      }
-Line 1217
+Line 1223
      function soleDir () {
          $found = '';
          if ($dir = @opendir($this->path)) {
-             while ($file = readdir($dir)) {
+             while (false !== ($file = readdir($dir))) {
                  if ($file == '.' OR $file == '..') continue;
                  if (is_dir($this->path.$file)) {
                      if ($found) return '';
-Line 1554
+Line 1560
                  }
              }
          }
+         if ($Itemid == 0 && !count($result)){
+             $result[0] = new stdclass;
+             $result[0]->id = 1;
+             $result[0]->link = 'index.php?option=com_frontpage';
+             $result[0]->parent = 0;
+             $result[0]->type = 'components';
+             $result[0]->browserNav = 0;
+             $result[0]->name = 'Home';
+         }
          return $result;
      }
-Line 1966
+Line 1981
          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 2069
           */
      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;
-Line 2517
+Line 2543
              $sql['os'] = "INSERT INTO #__stats_agents (agent,type) VALUES ('$os',1)";
              $sql['domain'] = "INSERT INTO #__stats_agents (agent,type) VALUES ('$tldomain',2)";
              if ($stats) foreach ($stats as $stat) {
-                 if ($stat->type == 0) $sql['agents'] = "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$browser' AND type=0";
+                 if ($stat->type == 0) $sql['browser'] = "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$browser' AND type=0";
                  if ($stat->type == 1) $sql['os'] = "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$os' AND type=1";
                  if ($stat->type == 2) $sql['domain'] = "UPDATE #__stats_agents SET hits=(hits+1) WHERE agent='$tldomain' AND type=2";
              }
-Line 2566
+Line 2592
                          <?php
          }
      }
+     /**
+         * Render head tags
+         *   tags are assembled into an associative array with the following elements:
+         *     - title
+         *     - meta
+         *     - mambojavascript
+         *     - custom (custom head tags)
+         *     - livebookmark
+         *     - favicon
+         * @param unknown keys - array elements to output (null = output all)
+         * @param unknown exclude - array elements to exclude in output
+         *
+         * Usage:        mosShowHead() - to render all tags
+         *                       mosShowHead('title') - to render a single tag
+         *                       mosShowHead(array('title', 'meta')) - to selectively render tags (in order)
+         *                       mosShowHead(null, 'custom') - to exclude a single tag
+         *                       mosShowHead(null, array('custom','favicon')) - to exclude multiple tags
+         */
+     function mosShowHead($keys='', $exclude='') {
+                 if (!is_array($keys))
+                         if ($keys !== '' && !is_null($keys))
+                                 $keys = array($keys);
+                         else $keys = array();
+                 if (!is_array($exclude))
+                         if ($exclude !== '')
+                                 $exclude = array($exclude);
+                         else $exclude = array();
+                 $this->_head['output'] = array();
+                 $head = array();;
+                 $head['title'] = '<title>'.$this->_head['title'].'</title>';
-     function mosShowHead () {
-         global $_VERSION;
-         $mosConfig_live_site = mamboCore::get('mosConfig_live_site');
          $this->appendMetaTag( 'description', mamboCore::get('mosConfig_MetaDesc'), true );
          $this->appendMetaTag( 'keywords', mamboCore::get('mosConfig_MetaKeys'), true );
-         echo $this->getHead();
+                 $head['meta'] = array();
-         if (mamboCore::get('mosConfig_sef')) {
+         foreach ($this->_head['meta'] as $name=>$meta) {
-             echo "<base href=\"$mosConfig_live_site/\" />\r\n";
+             if ($meta[1]) $head['meta'][] = $meta[1];
+             $head['meta'][] = '<meta name="' . $name . '" content="' . $meta[0] . '" />';
+             if ($meta[2]) $head['meta'][] = $meta[2];
          }
+                 $head['meta'] = implode( "\n", $head['meta'] );
          $my = mamboCore::get('currentUser');
-         if ( $my->id ) {
+                 $head['mambojavascript'] = $my->id ? "<script language=\"JavaScript1.2\" src=".mamboCore::get('mosConfig_live_site')."/includes/js/mambojavascript.js\" type=\"text/javascript\"></script>" : '';
-                         ?>
-                         <script language="JavaScript1.2" src="<?php echo $mosConfig_live_site;?>/includes/js/mambojavascript.js" type="text/javascript"></script>
+                 $head['custom'] = array();
-                         <?php
+                 foreach ($this->_head['custom'] as $html)
-         }
+                         if (trim($html) !== '')
+                                 $head['custom'][] = $html;
+                 if (count($head['custom']) !== 0)
+                         $head['custom'] = implode( "\n", $head['custom'] );
+                 else
+                         $head['custom'] = '';
+                 ob_start();
          $this->liveBookMark();
-         // outputs link tag for page
+                 $head['livebookmark'] = ob_get_contents();
+                 ob_end_clean();
          $configuration =& mamboCore::getMamboCore();
-                 ?>
+                 $head['favicon'] = "<link rel=\"shortcut icon\" href=\"".$configuration->getFavIcon()."\" />";
-                 <link rel="shortcut icon" href="<?php echo $configuration->getFavIcon();?>" />
-                 <?php
-     }
+                 foreach($head as $key=>$value)
+                                 $this->_head['output'][$key] = "$value";
+                 $tags = $this->_head['output'];
+                 if (count($keys) == 0) {
+                         foreach($tags as $key=>$value)
+                                 if (!in_array($key, $exclude))
+                                         if ($value !== '')
+                                                 echo trim($value)."\n";
+                 } else {
+                         foreach($keys as $key)
+                                 if (isset($tags[$key]))
+                                         if(trim($tags[$key]) !== '')
+                                                 echo trim($tags[$key])."\n";
+                 }
+         }
      /**
          * retained for backward compatability
-Line 2960
+Line 3041
   *
   **/
  $PATH_TO_CLASS = dirname(ereg_replace("\\\\","/",__FILE__)) . "/" . "ConvertTables" . "/";
+ @require_once($PATH_TO_CLASS."/charsetmapping.php");
  define ("CONVERT_TABLES_DIR", $PATH_TO_CLASS);
  define ("DEBUG_MODE", 1);
-Line 3346
+Line 3428
                  /**
                   * Check are there all variables
                   **/
-                  if ($StringToChange == "")
+                  /*if ($StringToChange == "")
                   {
                                  print $this->DebugOutput(0, 3, "\$StringToChange");
                   }
-                  else if ($FromCharset == "")
+                  else*/
+                 if ($FromCharset == "")
                   {
                                  print $this->DebugOutput(0, 3, "\$FromCharset");
                   }
-Line 3536
+Line 3619
                  //$Debug [$Group][$Number] = "Message, can by with $Value";
                  //$Group[0] - Errors
                  //$Group[1] - Notice
-                 $Debug[0][0] = "Error, can NOT read file: " . $Value . "<br>";
+                 $Debug[0][0] = "Error, can NOT read file: " . $Value . "<br />";
-                 $Debug[0][1] = "Error, can't find maching char \"". $Value ."\" in destination encoding table!" . "<br>";
+                 $Debug[0][1] = "Error, can't find maching char \"". $Value ."\" in destination encoding table!" . "<br />";
-                 $Debug[0][2] = "Error, can't find maching char \"". $Value ."\" in source encoding table!" . "<br>";
+                 $Debug[0][2] = "Error, can't find maching char \"". $Value ."\" in source encoding table!" . "<br />";
-                 $Debug[0][3] = "Error, you did NOT set variable " . $Value . " in Convert() function." . "<br>";
+                 $Debug[0][3] = "Error, you did NOT set variable " . $Value . " in Convert() function." . "<br />";
-                 $Debug[0][4] = "You can NOT convert string from " . $Value . " to " . $Value . "!" .  "<BR>";
+                 $Debug[0][4] = "You can NOT convert string from " . $Value . " to " . $Value . "!" .  "<br />";
-                 $Debug[1][0] = "Notice, you are trying to convert string from ". $Value ." to ". $Value .", don't you feel it's strange? ;-)" . "<br>";
+                 $Debug[1][0] = "Notice, you are trying to convert string from ". $Value ." to ". $Value .", don't you feel it's strange? ;-)" . "<br />";
-                 $Debug[1][1] = "Notice, both charsets " . $Value . " are identical! Check encoding tables files." . "<br>";
+                 $Debug[1][1] = "Notice, both charsets " . $Value . " are identical! Check encoding tables files." . "<br />";
-                 $Debug[1][2] = "Notice, there is no unicode char in the string you are trying to convert." . "<br>";
+                 $Debug[1][2] = "Notice, there is no unicode char in the string you are trying to convert." . "<br />";
                  if (DEBUG_MODE >= $Group)
                  {
-Line 3552
+Line 3635
          } // function DebugOutput
  } //class ends here
+ class mosHtmlHelper {
+         var $_docTypes = array(
+                 'xhtml-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+                 'xhtml-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
+                 'xhtml-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
+                 'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'
+         );
+         var $_docTypesText = array(
+                 'xhtml-strict' => 'XHTML 1.0 Strict',
+                 'xhtml-trans' => 'XHTML 1.0 Transitional',
+                 'xhtml-frame' => 'XHTML 1.0 Frameset',
+                 'xhtml11' => 'XHTML 1.1'
+         );
+         var $doctype = 'xhtml-trans';
+     /**
+         * Singleton accessor
+         */
+     function &getInstance () {
+         static $instance;
+         if (!is_object($instance)) $instance = new mosHtmlHelper();
+         return $instance;
+     }
+         function __docType($type=null) {
+                 static $obj;
+                 if (!is_object($obj)) $obj =& mosHtmlHelper::getInstance();
+                 if (array_key_exists($type, $obj->_docTypes)) return $obj->_docTypes[$type];
+                 return $obj->_docTypes[$obj->doctype];
+         }
+         function renderDocType($type=null) {
+                 static $obj;
+                 if (!is_object($obj)) $obj =& mosHtmlHelper::getInstance();
+                 echo $obj->__docType($type)."\n";
+         }
+         function get($var) {
+                 static $obj;
+                 if (!is_object($obj)) $obj =& mosHtmlHelper::getInstance();
+                 if(isset($obj->$var)) return $obj->$var;
+                 return null;
+         }
+         function set($property, $value) {
+                 static $obj;
+                 if (!is_object($obj)) $obj =& mosHtmlHelper::getInstance();
+                 if($property{0} == '_') return; // dont set private properties
+                 if (isset($obj->$property)) $obj->$property = $value;
+         }
+ } // end class mosHtmlHelper
  ?>

 Legend:



Removed from v.891
 


changed lines


 
Added in v.1348
 Legend:



Removed from v.891
 


changed lines


 
Added in v.1348
-Removed from v.891
+Added in v.1348

	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