Mambo > Projects > Mambo CMS > SVN

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

-revision 205, Sat Jan 28 17:06:06 2006 UTC
+revision 206, Mon Jan 30 14:14:36 2006 UTC
 Line 89
      function get ($property) {
          $config =& mamboCore::getMamboCore();
-         if ($property == 'mosConfig_absolute_path' AND realpath($config->mosConfig_absolute_path) === false) die ('Invalid program load path');
+         if ($property == 'mosConfig_absolute_path') {
+                         if (realpath($config->mosConfig_absolute_path) === false) die ('Invalid program load path');
+                         else return $config->rootPath;
+                 }
          if (isset($config->$property)) return $config->$property;
          trigger_error("Invalid property ($property) requested from mamboCore");
          return null;
-Line 134
+Line 137
                  $subdir = substr(dirname(__FILE__), strlen($_SERVER['DOCUMENT_ROOT']));
                  $subdir = str_replace('\\', '/', $subdir);
                  $this->mosConfig_live_site = 'http://'.$_SERVER['SERVER_NAME'].$subdir;
+                 $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;
                  if (!isset($this->mosConfig_register_globals)) {
-Line 267
+Line 271
          $iFilter =& new InputFilter();
          $url = $iFilter->process( $url );
          $message = trim($iFilter->process($msg));
-         if ($iFilter->badAttributeValue(array('href', $url))) $url = $GLOBALS['mosConfig_live_site'];
+         if ($iFilter->badAttributeValue(array('href', $url))) $url = mamboCore::get('mosConfig_live_site');
          if ($message) {
              if (strpos($url, '?')) $url .= '&mosmsg='.urlencode($message);
              else $url .= '?mosmsg='.urlencode($message);
-Line 406
+Line 410
  require_once ($configuration->rootPath().'/includes/database.php');
  /**
+ * Mambo basic error object
+ */
+ define ('_MOS_ERROR_INFORM', 0);
+ define ('_MOS_ERROR_WARN', 1);
+ define ('_MOS_ERROR_SEVERE', 2);
+ define ('_MOS_ERROR_FATAL', 3);
+ class mosError {
+         var $text = '';
+         var $level = 0;
+         function mosError ($text='', $level=_MOS_ERROR_INFORM) {
+                 $this->text = $text;
+                 $this->level = $level;
+         }
+ }
+ /**
+ * Mambo group of errors for some particular operation
+ */
+ class mosErrorSet {
+         var $errors = array();
+         var $maxlevel = 0;
+         // Parameter is an error object
+         function addError ($error) {
+                 $this->errors[] = $error;
+                 if ($error->level > $this->maxlevel) $this->maxlevel = $error->level;
+         }
+         function addErrorDetails ($text='', $level=_MOS_ERROR_INFORM) {
+                 $error = new mosError($text, $level);
+                 $this->addError($error);
+         }
+         function &getErrors () {
+                 return $this->errors;
+         }
+         function getMaxLevel () {
+                 return $this->maxlevel;
+         }
+         function getCount () {
+                 return count($this->errors);
+         }
+         function mergeAnother ($errorset) {
+                 $this->errors = array_merge($this->errors, $errorset->errors);
+         }
+ }
+ /**
  * Sorts an Array of objects
  */
  class mosObjectSorter {

 Legend:



Removed from v.205
 


changed lines


 
Added in v.206
 Legend:



Removed from v.205
 


changed lines


 
Added in v.206
-Removed from v.205
+Added in v.206

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

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