Changeset 7287

Timestamp:

01/06/08 00:59:52 (1 year ago)

Author:

ion

Message:

Woops, I need to commit on this tag because that security fix wil be included in 0.7.4

Files:

• tags/0.7.4/html/include/JawsApplication.php (modified) (2 diffs)
• tags/0.7.4/html/languages/en/Global.php (modified) (1 diff)

tags/0.7.4/html/include/JawsApplication.php

@@ -242 +242 @@
-    function GetTheme()
-    {
+        // Check if valid theme name
+        if (strpos($this->_Theme, '..') !== false ||
+            strpos($this->_Theme, '%') !== false ||
+            strpos($this->_Theme, '\\') !== false ||
+            strpos($this->_Theme, '/') !== false) {
+                return new JawsError(_t('GLOBAL_ERROR_INVALID_NAME', 'GetTheme'), 'Getting theme name');
+        }
-        return $this->_Theme;
-    }
@@ -253 +260 @@
-    function GetLanguage()
-    {
+        // Check if valid language name
+        if (strpos($this->_Language, '..') !== false ||
+            strpos($this->_Language, '%') !== false ||
+            strpos($this->_Language, '\\') !== false ||
+            strpos($this->_Language, '/') !== false) {
+                return new JawsError(_t('GLOBAL_ERROR_INVALID_NAME', 'GetLanguage'), 'Getting language name');
+        }
-        return $this->_Language;
-    }
+
-
-    /**

tags/0.7.4/html/languages/en/Global.php

@@ -178 +178 @@
-define('_EN_GLOBAL_ERROR_FILE_DOES_NOT_EXIST', "The file {0} does not exist or is not readable.");
-define('_EN_GLOBAL_ERROR_FAILED_CREATING_INSTANCE', "There was a error while creating an instance from class {0} located at {1}");
+define('_EN_GLOBAL_ERROR_INVALID_NAME', "Invalid name in {0}");
-
-// Login error messages