Changeset 784 for branches/1.3/admin/common.php

Timestamp:

2011-04-22T17:18:42+02:00 (2 years ago)

Author:

moo

Message:

merge from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• admin/common.php (modified) (5 diffs)

branches/1.3/admin/common.php

@@ -1 +1 @@
 <?php
+
+function xcache_validateFileName($name)
+{
+    return preg_match('!^[a-zA-Z0-9._-]+$!', $name);
+}
 
 function get_language_file_ex($name, $l, $s)
@@ -16 +21 @@
         $l = $lmap[$l];
     }
-    if (file_exists($file = "$name-$l-$s.lang.php")) {
+    $file = "$name-$l-$s.lang.php";
+    if (xcache_validateFileName($file) && file_exists($file)) {
         return $file;
     }
     if (isset($smap[$s])) {
         $s = $smap[$s];
-        if (file_exists($file = "$name-$l-$s.lang.php")) {
+        $file = "$name-$l-$s.lang.php";
+        if (xcache_validateFileName($file) && file_exists($file)) {
             return $file;
         }
     }
-    if (file_exists($file = "$name-$l.lang.php")) {
+    $file = "$name-$l.lang.php";
+    if (xcache_validateFileName($file) && file_exists($file)) {
         return $file;
     }
@@ -39 +47 @@
         $file = get_language_file_ex($name, $l, $s);
         if (!isset($file)) {
-            $l = strtok($l, '-');
+            $l = strtok($l, ':-');
             $file = get_language_file_ex($name, $l, $s);
         }
@@ -45 +53 @@
     else if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
         foreach (explode(',', str_replace(' ', '', $_SERVER['HTTP_ACCEPT_LANGUAGE'])) as $l) {
-            $l = strtok($l, ';');
+            $l = strtok($l, ':;');
             $file = get_language_file_ex($name, $l, $s);
             if (isset($file)) {
@@ -52 +60 @@
             }
             if (strpos($l, '-') !== false) {
-                $ll = strtok($l, '-');
+                $ll = strtok($l, ':-');
                 $file = get_language_file_ex($name, $ll, $s);
                 if (isset($file)) {