Merge branch 'master' of github.com:gnuboard/yc4s

2013-06-14 09:25:08 +09:00
parent 2bec7ffeea c02409fdd2
commit a455e4881c
24 changed files with 586 additions and 495 deletions
--- a/lib/thumbnail.lib.php
+++ b/lib/thumbnail.lib.php
@ -34,6 +34,9 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
            else
                $data_path = $p['path'];

+            if(!preg_match('/^\/'.G4_DATA_DIR.'/', $data_path))
+                continue;
+
            $srcfile = G4_PATH.$data_path;

            if(preg_match("/\.({$config['cf_image_extension']})$/i", $srcfile) && is_file($srcfile)) {
@ -109,6 +112,9 @@ function get_view_thumbnail($contents, $thumb_width=0)
        else
            $data_path = $p['path'];

+        if(!preg_match('/^\/'.G4_DATA_DIR.'/', $data_path))
+            continue;
+
        $srcfile = G4_PATH.$data_path;

        if(is_file($srcfile)) {