Mambo > Projects > Mambo CMS > SVN

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

-revision 1699, Wed May 14 11:32:45 2008 UTC
+revision 1769, Wed Nov 17 11:20:55 2010 UTC
 Line 2
  /**
  * @package Mambo
  * @author Mambo Foundation Inc see README.php
- * @copyright Mambo Foundation Inc.
+ * @copyright (C) 2000 - 2009 Mambo Foundation Inc.
  * See COPYRIGHT.php for copyright notices and details.
  * @license GNU/GPL Version 2, see LICENSE.php
+ *
+ * Redistributions of files must retain the above copyright notice.
+ *
  * 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 411
+Line 414
          }
      }
-     /**
+     function loadLanguage(){
-      * Enter description here...
-      *
-      */
-     function fixLanguage () {
-         require_once($this->mosConfig_absolute_path.'/includes/phpgettext/phpgettext.class.php');
-         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');
          if (!mosGetParam($_REQUEST, 'lang'));
          else $this->mosConfig_locale = mosGetParam($_REQUEST, 'lang', $this->mosConfig_locale);
          $language =& new mamboLanguage($this->mosConfig_locale, $this->rootPath.'/language/');
-Line 441
+Line 436
          if (file_exists($language_file)) require_once ($language_file);
          else require_once ("$this->mosConfig_absolute_path/language/english.php");
          ###################################
+     }
+     /**
+      * Enter description here...
+      *
+      */
+     function fixLanguage () {
+         require_once($this->mosConfig_absolute_path.'/includes/phpgettext/phpgettext.class.php');
+         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');
      }
      /**
-Line 539
+Line 540
              if (strpos($url, '?')) $url .= '&mosmsg='.urlencode($message);
              else $url .= '?mosmsg='.urlencode($message);
          }
+         $url = preg_replace("/[\n]|[\r]/",'',$url);
          if (headers_sent()) echo "<script>document.location.href='$url';</script>\n";
          else {
              @ob_end_clean(); // clear output buffer
-Line 1394
+Line 1396
          $checker = explode(',', $types);
          $result = null;
          foreach ($this->_menus as $menu) {
-             if (in_array($menu->menutype, $checker)) $result[] = $menu;
+             if (in_array($menu->type, $checker)) $result[] = $menu;
          }
          return $result;
      }
-Line 2435
+Line 2437
          */
      function getUserStateFromRequest( $var_name, $req_name, $var_default=null ) {
                  if (is_array($this->_userstate)) {
-                         if (isset($_REQUEST[$req_name])) $this->setUserState($var_name, $_REQUEST[$req_name]);
+                         if (isset($_REQUEST[$req_name])) $this->setUserState($var_name, preg_replace('/[^\w\s\.,-_\(\)]/','',mosGetParam($_REQUEST,$req_name)));
                          else if (isset($var_default) AND !isset($this->_userstate[$var_name])) $this->setUserState($var_name, $var_default);
                          return $this->_userstate[$var_name];
                  } else {
-Line 2489
+Line 2491
              if ($mos_change_template) {
                  // check that template exists in case it was deleted
                  $path = mamboCore::get('mosConfig_absolute_path')."/templates/$mos_change_template/index.php";
-                 if (strpos($mos_change_template,'..') == false AND strpos($mos_change_template,':') == false AND file_exists($path)) {
+                 if (strpos($mos_change_template,'..') === false AND strpos($mos_change_template,':') === false AND file_exists($path)) {
                      $lifetime = 60*10;
                      $cur_template = $mos_change_template;
                      setcookie( "mos_user_template", "$mos_change_template", time()+$lifetime);
-Line 2788
+Line 2790
                  if (!$task) die('Illegal task for mainframe validFormId in core.classes.php');
                  if (!is_object($my)) die('Illegal user object for mainframe validFormId in core.classes.php');
                  if (!isset($_REQUEST['f'])) die('Missing hash for mainframe validFormId in core.classes.php');
+         mos_session_start();
                  if (!isset($_SESSION['mosfid'])) return false;
                  $valid = $_SESSION['mosfid'] == md5($_REQUEST['f'].$option.$task.$my->id.mamboCore::get('mosConfig_secret'));
                  unset($_SESSION['mosfid']);

 Legend:



Removed from v.1699
 


changed lines


 
Added in v.1769
 Legend:



Removed from v.1699
 


changed lines


 
Added in v.1769
-Removed from v.1699
+Added in v.1769

	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