Merge branch 'g5'

lib/latest.lib.php

@@ -2,10 +2,11 @@
 if (!defined('_GNUBOARD_')) exit;
 
 // 최신글 추출
-function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40)
+// $cache_time 캐시 갱신시간
+function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=1)
 {
     global $g5;
-    static $css = array();
+    //static $css = array();
 
     if (!$skin_dir) $skin_dir = 'basic';
 
@@ -17,12 +18,32 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40)
         $latest_skin_url  = G5_SKIN_URL.'/latest/'.$skin_dir;
     }
 
-    $cache_file = G5_DATA_PATH."/cache/latest-{$bo_table}-{$skin_dir}-{$rows}-{$subject_len}.php";
+    $cache_fwrite = false;
-    if (!G5_USE_CACHE || !file_exists($cache_file)) {
+    if(G5_USE_CACHE) {
+        $cache_file = G5_DATA_PATH."/cache/latest-{$bo_table}-{$skin_dir}-{$rows}-{$subject_len}.php";
+
+        if(!file_exists($cache_file)) {
+            $cache_fwrite = true;
+        } else {
+            if($cache_time > 0) {
+                $filetime = filemtime($cache_file);
+                if($filetime && $filetime < (G5_SERVER_TIME - 3600 * $cache_time)) {
+                    @unlink($cache_file);
+                    $cache_fwrite = true;
+                }
+            }
+
+            if(!$cache_fwrite)
+                include_once($cache_file);
+        }
+    }
+
+    if(!G5_USE_CACHE || $cache_fwrite) {
         $list = array();
 
         $sql = " select * from {$g5['board_table']} where bo_table = '{$bo_table}' ";
         $board = sql_fetch($sql);
+        $bo_subject = get_text($board['bo_subject']);
 
         $tmp_write_table = $g5['write_prefix'] . $bo_table; // 게시판 테이블 전체이름
         $sql = " select * from {$tmp_write_table} where wr_is_comment = 0 order by wr_num limit 0, {$rows} ";
@@ -31,14 +52,14 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40)
             $list[$i] = get_list($row, $board, $latest_skin_url, $subject_len);
         }
 
-        $handle = fopen($cache_file, 'w');
+        if($cache_fwrite) {
-        $cache_content = "<?php\nif (!defined('_GNUBOARD_')) exit;\n\$bo_subject=\"".get_text($board['bo_subject'])."\";\n\$list=".var_export($list, true)."?>";
+            $handle = fopen($cache_file, 'w');
-        fwrite($handle, $cache_content);
+            $cache_content = "<?php\nif (!defined('_GNUBOARD_')) exit;\n\$bo_subject=\"".$bo_subject."\";\n\$list=".var_export($list, true)."?>";
-        fclose($handle);
+            fwrite($handle, $cache_content);
+            fclose($handle);
+        }
     }
 
-    include_once($cache_file);
-
     /*
     // 같은 스킨은 .css 를 한번만 호출한다.
     if (!in_array($skin_dir, $css) && is_file($latest_skin_path.'/style.css')) {

lib/thumbnail.lib.php

@@ -108,7 +108,7 @@ function get_view_thumbnail($contents, $thumb_width=0)
                 continue;
 
             // jpg 이면 exif 체크
-            if($size[2] == 2) {
+            if($size[2] == 2 && function_exists('exif_read_data')) {
                 $degree = 0;
                 $exif = @exif_read_data($srcfile);
                 if(!empty($exif['Orientation'])) {
@@ -218,30 +218,33 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h
         $src = imagecreatefromgif($source_file);
     } else if ($size[2] == 2) {
         $src = imagecreatefromjpeg($source_file);
-        // exif 정보를 기준으로 회전각도 구함
-        $exif = @exif_read_data($source_file);
-        if(!empty($exif['Orientation'])) {
-            switch($exif['Orientation']) {
-                case 8:
-                    $degree = 90;
-                    break;
-                case 3:
-                    $degree = 180;
-                    break;
-                case 6:
-                    $degree = -90;
-                    break;
-            }
 
-            // 회전각도 있으면 이미지 회전
+        if(function_exists('exif_read_data')) {
-            if($degree) {
+            // exif 정보를 기준으로 회전각도 구함
-                $src = imagerotate($src, $degree, 0);
+            $exif = @exif_read_data($source_file);
+            if(!empty($exif['Orientation'])) {
+                switch($exif['Orientation']) {
+                    case 8:
+                        $degree = 90;
+                        break;
+                    case 3:
+                        $degree = 180;
+                        break;
+                    case 6:
+                        $degree = -90;
+                        break;
+                }
 
-                // 세로사진의 경우 가로, 세로 값 바꿈
+                // 회전각도 있으면 이미지 회전
-                if($degree == 90 || $degree == -90) {
+                if($degree) {
-                    $tmp = $size;
+                    $src = imagerotate($src, $degree, 0);
-                    $size[0] = $tmp[1];
+
-                    $size[1] = $tmp[0];
+                    // 세로사진의 경우 가로, 세로 값 바꿈
+                    if($degree == 90 || $degree == -90) {
+                        $tmp = $size;
+                        $size[0] = $tmp[1];
+                        $size[1] = $tmp[0];
+                    }
                 }
             }
         }