Changeset 1056 for trunk/htdocs/common/common.php

Timestamp:

2012-07-27T09:40:43+02:00 (11 months ago)

Author:

moo

Message:

htdocs: updated language

File:

• trunk/htdocs/common/common.php (modified) (3 diffs)

trunk/htdocs/common/common.php

@@ -67 +67 @@
 function xcache_validateFileName($name)
 {
+    if (!preg_match('!^[a-zA-Z0-9._-]+$!', $name)) {
+        var_dump($name);
+    }
     return preg_match('!^[a-zA-Z0-9._-]+$!', $name);
 }
@@ -81 +84 @@
         $lang = $langMap[$lang];
     }
+    else if (!xcache_validateFileName($lang)) {
+        return null;
+    }
+
     $file = "$name-$lang.lang.php";
-    if (xcache_validateFileName($file) && file_exists($file)) {
+    if (file_exists($file)) {
         return $file;
     }
@@ -236 +243 @@
 }
 
-include(get_language_file("common"));
+include(get_language_file("../common/common"));
 
 $modules = array();