尝试修复 typecho#168

gnucode2012 · Jan 11, 2014 · db3bfaa · db3bfaa
1 parent 787c143
commit db3bfaa
Showing 1 changed file with 9 additions and 18 deletions.
diff --git a/var/Widget/Upload.php b/var/Widget/Upload.php
@@ -62,9 +62,14 @@ private static function makeUploadDir($path)
      * @access private
      * @return string
      */
-    private static function getSafeName($name)
+    private static function getSafeName(&$name)
     {
-        preg_split("/(\/|\\\|:)/"
+        $name = str_replace('\\', '/', $name);
+        $name = false === strpos($name, '/') ? ('a' . $name) : str_replace('/', '/a', $name);
+        $info = pathinfo($name);
+        $name = substr($info['basename'], 1);
+
+        return isset($info['extension']) ? $info['extension'] : '';
     }
 
     /**
@@ -85,14 +90,7 @@ public static function uploadHandle($file)
             return $result;
         }
 
-        $file['name'] = basename($file['name']);
-
-        //获取扩展名
-        $ext = '';
-        $part = explode('.', $file['name']);
-        if (($length = count($part)) > 1) {
-            $ext = strtolower($part[$length - 1]);
-        }
+        $ext = self::getSafeName($file['name']);
 
         if (!self::checkFileType($ext)) {
             return false;
@@ -164,15 +162,8 @@ public static function modifyHandle($content, $file)
             return $result;
         }
 
-        $file['name'] = basename($file['name']);
+        $ext = self::getSafeName($file['name']);
 
-        //获取扩展名
-        $ext = '';
-        $part = explode('.', $file['name']);
-        if (($length = count($part)) > 1) {
-            $ext = strtolower($part[$length - 1]);
-        }
-
         if ($content['attachment']->type != $ext) {
             return false;
         }