Mambo > Projects > Mambo CMS > SVN

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

-revision 183, Wed Jan 25 21:36:13 2006 UTC
+revision 221, Wed Feb  1 23:44:54 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 162
+Line 166
      function fixLanguage () {
          require_once($this->mosConfig_absolute_path.'/includes/phpgettext/error.php');
          require_once($this->mosConfig_absolute_path.'/includes/phpgettext/phpgettext.class.php');
-         DEFINE('_ISO','charset=utf-8');
-         DEFINE('_DATE_FORMAT_LC',"%A, %d %B %Y"); //Uses PHP's strftime Command Format
-         DEFINE('_DATE_FORMAT_LC2',"%A, %d %B %Y %H:%M");
+         ##########  DEPRECATED ############
+                 if (isset($this->mosConfig_lang) AND $this->mosConfig_lang);
+                 else $this->set('mosConfig_lang', 'english');
+                 $language_file = "$this->mosConfig_absolute_path/language/$this->mosConfig_lang.php";
+                 if (file_exists($language_file)) require_once ($language_file);
+                 ###################################
+         //set_error_handler('error_handler');
+         $lang = $this->mosConfig_lang;
-         /*/ the current character set
-         if (!isset($this->mosConfig_charset)) {
+         $langfile = $this->rootPath.DIRECTORY_SEPARATOR.'language'.DIRECTORY_SEPARATOR.$lang.'.xml';
-         $this->set('mosConfig_charset', 'iso-8859-1');/*'utf-8'* /
+         $p = xml_parser_create();
+         xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0);
+         xml_parser_set_option($p, XML_OPTION_SKIP_WHITE, 1);
+         xml_parse_into_struct($p, implode("", file($langfile)), $values);
+         xml_parser_free($p);
+         foreach($values as $key => $value)
+         {
+             if ($value['tag'] == 'param') {
+                 $name = $value['attributes']['name'];
+                 $this->language[$name] = $value['attributes']['default'];
+             }
          }
-         /**/
+         DEFINE('_ISO','charset='.$this->language['encoding']);
-         $language_file = "$this->mosConfig_absolute_path/language/$this->mosConfig_lang.php";
+         DEFINE('_DATE_FORMAT_LC', $this->language['dateformat']); //Uses PHP's strftime Command Format
-         if (file_exists($language_file)) require_once ($language_file);
+         DEFINE('_DATE_FORMAT_LC2', $this->language['dateformat']." %H:%M");
-         error_reporting(0);
-         set_error_handler('error_handler');
+         //header('Content-Type: text/html; charset=utf-8');
          $domain = $this->mosConfig_lang;
-         $textdomain = $this->mosConfig_absolute_path.'/language';
+         $textdomain = $this->rootPath.'/language';
          $gettext =& phpgettext();
-         $gettext->debug = 1;
+         $gettext->debug = 0;
          $gettext->has_gettext = 0;
-         $gettext->setlocale($this->mosConfig_lang);;
+         $gettext->setlocale($name);
+         setlocale(LC_ALL, $this->language['locale']);
+         setlocale(LC_CTYPE, $this->language['encoding']);
          $gettext->bindtextdomain($domain, $textdomain);
-         $gettext->bind_textdomain_codeset($domain, 'utf-8');
+         $gettext->bind_textdomain_codeset($domain, $this->language['encoding']);
          $gettext->textdomain($domain);
          /**/
-Line 267
+Line 290
          $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 429
  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 {
-Line 486
+Line 563
          * Make a pathway string for display
          */
      function makePathway () {
+         $last = count($this->_names) - 1;
+         if ($last == 0) return '';
          $mainframe = mosMainFrame::getInstance();
          $result = "<span class='pathway'>";
          $config = mamboCore::getMamboCore();
-Line 497
+Line 576
              if (file_exists( "$rootpath/$imgPath" )) $img = "<img src='$config->mosConfig_live_site/images/M_images/arrow.png' alt='arrow' />";
              else $img = '&gt;';
          }
-         $last = count($this->_names) - 1;
          foreach ($this->_names as $i=>$name) {
              if ($i === $last) $result .= "$name</span>";
              else {
-Line 508
+Line 586
          }
          $customs = $mainframe->getCustomPathWay();
          foreach ($customs as $custom) $result .= $custom;
+         $result .= '</span>';
          return $result;
      }
-Line 605
+Line 684
      }
      function createDirectory ($dir) {
+                 list($upDirectory, $count) = $this->containingDirectory($dir);
+                 if ($count > 1 AND !file_exists($upDirectory)) $this->createDirectory($upDirectory);
          mkdir($dir);
      }
+     function containingDirectory ($dir) {
+         $dirs = preg_split('*[/|\\\]*', $dir);
+         for ($i = count($dirs)-1; $i >= 0; $i--) {
+                 $text = trim($dirs[$i]);
+                         unset($dirs[$i]);
+                         if ($text) break;
+                 }
+         return array(implode('/',$dirs), count($dirs));
+     }
      function forceCopy ($from, $to) {
          $todir = dirname($to);
          if (!file_exists($todir)) $this->createDirectory($todir);
-         $name = mamboCore::getLastPart('/', $from);
+         if (!file_exists($todir)) return false;
+         $name = basename($from);
          $this->deleteFile($to.$name);
-         copy($from, $to);
+         return @copy($from, $to);
+     }
+     function lightCopy ($from, $to) {
+         $name = basename($from);
+         if (file_exists($to.$name)) return false;
+         $todir = dirname($to);
+         if (!file_exists($todir)) $this->createDirectory($todir);
+         if (!file_exists($todir)) return false;
+         return @copy($from, $to);
      }
-Line 1226
+Line 1328
                      $botclass = str_replace('.','_',$bot->element);
                      $newbot = new $botclass();
                      $function = array ($newbot, 'perform');
-                     $this->_events[$newbot->register()][] = array ($function, $i);
+                     $selected = $newbot->register();
+                     if (is_array($selected)) foreach ($selected as $select) $this->_events[$select][] = array($function, $i);
+                     else $this->_events[$selected][] = array ($function, $i);
                      $this->_registered[$i] = true;
                  }
                  $total++;
-Line 1276
+Line 1380
              foreach ($this->_events[$event] as $func) {
                  if (is_callable( $func[0] )) {
                      $botparams = $this->_bots[$func[1]]->params;
-                     $args[] =& new mosParameters($botparams);
+                     $args[] = new mosParameters($botparams);
+                     $args[] = $event;
                      if ($doUnpublished) {
                          $args[0] = $this->_bots[$func[1]]->published;
                          $result[] = call_user_func_array( $func[0], $args );
-Line 1381
+Line 1486
          elseif (($this->email == '') OR preg_match("/[\w\.\-]+@\w+[\w\.\-]*?\.\w{1,4}/", $this->email ) == 0) $this->_error = _REGWARN_MAIL;
          else {
              // check for existing username
+             $username = strtolower($this->username);
              $this->_db->setQuery( "SELECT COUNT(id) FROM #__users "
-             . "\nWHERE LOWER(username)=LOWER('$this->username') AND id!='$this->id'"
+             . "\nWHERE LOWER(username)='$username' AND id!='$this->id'"
              );
              if ($this->_db->loadResult()) $this->_error = _REGWARN_INUSE;
              elseif (mamboCore::get('mosConfig_uniquemail')) {
-Line 1398
+Line 1504
      }
      function store( $updateNulls=false ) {
-         global $migrate;
+         global $acl, $migrate;
-         if( $this->id AND !$migrate) $ret = $this->_db->updateObject( $this->_tbl, $this, $this->id, $updateNulls );
+                 $section_value = 'users';
-         else $ret = $this->_db->insertObject( $this->_tbl, $this, $this->id );
+         if( $this->id AND !$migrate) {
+                 // update existing record
+                         $ret = $this->_db->updateObject( $this->_tbl, $this, 'id', $updateNulls );
+                         // syncronise ACL
+                         // single group handled at the moment
+                         // trivial to expand to multiple groups
+                         $groups = $acl->get_object_groups( $section_value, $this->id, 'ARO' );
+                         $acl->del_group_object( $groups[0], $section_value, $this->id, 'ARO' );
+                         $acl->add_group_object( $this->gid, $section_value, $this->id, 'ARO' );
+                         $object_id = $acl->get_object_id( $section_value, $this->id, 'ARO' );
+                         $acl->edit_object( $object_id, $section_value, $this->_db->getEscaped( $this->name ), $this->id, 0, 0, 'ARO' );
+                 }
+         else {
+                         // new record
+                         $ret = $this->_db->insertObject( $this->_tbl, $this, 'id' );
+                         // syncronise ACL
+                         $acl->add_object( $section_value, $this->_db->getEscaped( $this->name ), $this->id, null, null, 'ARO' );
+                         $acl->add_group_object( $this->gid, $section_value, $this->id, 'ARO' );
+                 }
          if ($ret) return true;
          $this->_error = "mosUser::store failed <br />" . $this->_db->getErrorMsg();
          return false;
-Line 1432
+Line 1556
  }
  /**
+ * User login details class
+ * @package Mambo
+ */
+ class mosLoginDetails {
+         var $_user = '';
+         var $_password = '';
+         var $_remember = '';
+         function mosLoginDetails ($user, $password='', $remember='') {
+                 $this->_user = $user;
+                 $this->_password = $password;
+                 $this->_remember = $remember;
+         }
+         function getUser () {
+                 return $this->_user;
+         }
+         function getPassword () {
+                 return $this->_password;
+         }
+         function getRemember () {
+                 return $this->_remember;
+         }
+ }
+ /**
  * Mambo Mainframe class
  *
  * Provide many supporting API functions
-Line 1473
+Line 1625
      }
      /**
+     * Get the current user - deprecated - use mamboCore instead
+     */
+     function getUser() {
+         return mamboCore::get('currentUser');
+     }
+     /**
          * Singleton get instance
          * @param object the mainframe instance (if called internally)
          * Note that because of the need for creation parameters, this cannot
-Line 1933
+Line 2092
                  //$_COOKIE["sessioncookie"] = $session->getCookie();
                  if ($usercookie) {
                      // Remember me cookie exists. Login with usercookie info.
+                     require_once (mamboCore::get('mosConfig_absolute_path').'/includes/authenticator.php');
                      $authenticator = mamboAuthenticator::getInstance();
                      $authenticator->authenticateUser ($message, $usercookie['username'], $usercookie['password'], null, $currentSession);
                  }

 Legend:



Removed from v.183
 


changed lines


 
Added in v.221
 Legend:



Removed from v.183
 


changed lines


 
Added in v.221
-Removed from v.183
+Added in v.221

	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