Mambo > Projects > Mambo CMS > SVN

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

-revision 1058, Sat Apr 21 11:49:18 2007 UTC
+revision 1341, Mon Oct 15 05:17:14 2007 UTC
 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 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 1222
      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 1559
                  }
              }
          }
+         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 1971
+Line 1980
          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 2522
+Line 2542
              $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 2571
+Line 2591
                          <?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 3543
+Line 3618
                  //$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 3559
+Line 3634
          } // function DebugOutput
  } //class ends here
+ class mosHtmlHelper {
+         var $_docTypes = array(
+                 'html4-strict'  => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
+                 'html4-trans'  => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
+                 'html4-frame'  => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
+                 '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(
+                 'html4-strict'  => 'HTML 4.01 Strict',
+                 'html4-trans'  => 'HTML 4.01 Transitional',
+                 'html4-frame'  => 'HTML 4.01 Frameset',
+                 '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.1058
 


changed lines


 
Added in v.1341
 Legend:



Removed from v.1058
 


changed lines


 
Added in v.1341
-Removed from v.1058
+Added in v.1341

	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