Changeset 11457 for temp/branches/mobile/data/class/GC_MobileImage.php

Timestamp:

2007/02/25 03:39:19 (16 years ago)

Author:

rebelt

Message:

修正です。

File:

• temp/branches/mobile/data/class/GC_MobileImage.php (modified) (4 diffs)

temp/branches/mobile/data/class/GC_MobileImage.php

@@ -2 +2 @@
 /**
  * üËö¤Î²èÌ̲òÁüÅ٤ˤ¢¤ï¤»¤Æ²èÁü¤òÊÑ´¹¤¹¤ë
- *
  */
 
-define("INC_PATH", realpath(dirname( __FILE__)) . "/../include");
-require_once(INC_PATH . "/image_converter.inc");
+define("MOBILE_IMAGE_INC_PATH", realpath(dirname( __FILE__)) . "/../include");
+require_once(MOBILE_IMAGE_INC_PATH . "/image_converter.inc");
 
 /**
- * ·ÈÂÓüËö¤Î¥¯¥é¥¹
+ * ²èÁüÊÑ´¹¥¯¥é¥¹
  */
 class GC_MobileImage {
@@ -25 +24 @@
         $model   = GC_MobileUserAgent::getModel();
 
-        // ·ÈÂÓÅÅÏäξì¹ç¤Î¤ß½èÍý¤ò¹Ô¤¦
+        // ·ÈÂÓÅÅÏäξì¹ç¤Î¤ß½èÍý¤ò¹Ô¤¦
         if ($carrier !== FALSE) {
 
-            // HTMLÃæ¤ÎIMG¥¿¥°¤ò¼èÆÀ¤¹¤ë
+            // HTMLÃæ¤ÎIMG¥¿¥°¤ò¼èÆÀ¤¹¤ë
             $pattern = '/<img\s+src=[\'"]([^>"]+)[\'"]\s*\/*>/i';
             preg_match_all($pattern, $buffer, $images);
 
-            // üËö¤Î¾ðÊó¤ò¼èÆÀ¤¹¤ë
-            $fp = @fopen(INC_PATH . "/mobile_image_map_$carrier.inc", "r");
-            flock($fp, LOCK_SH);
+            // üËö¤Î¾ðÊó¤ò¼èÆÀ¤¹¤ë
+            $fp = fopen(MOBILE_IMAGE_INC_PATH . "/mobile_image_map_$carrier.csv", "r");
             while (($data = fgetcsv($fp, 1000, ",")) !== FALSE) {
                 if ($data[1] == $model) {
@@ -41 +39 @@
                 }
             }
-            flock($fp, LOCK_UN);
             fclose($fp);
 
-            // ²èÁüÊÑ´¹¤Î¾ðÊó¤ò¥»¥Ã¥È¤¹¤ë
+            // ²èÁüÊÑ´¹¤Î¾ðÊó¤ò¥»¥Ã¥È¤¹¤ë
             $imageConverter = New ImageConverter();
             $imageConverter->setOutputDir(MOBILE_IMAGE_DIR);
@@ -50 +47 @@
             $imageConverter->setImageWidth($imageWidth);
 
-            // HTMLÃæ¤ÎIMG¥¿¥°¤òÊÑ´¹¸å¤Î¥Õ¥¡¥¤¥ë¥Ñ¥¹¤ËÃÖ´¹¤¹¤ë
+            // HTMLÃæ¤ÎIMG¥¿¥°¤òÊÑ´¹¸å¤Î¥Õ¥¡¥¤¥ë¥Ñ¥¹¤ËÃÖ´¹¤¹¤ë
             foreach ($images[1] as $key => $value) {
                 $converted = $imageConverter->execute(preg_replace('|^' . PC_URL_DIR . '|', PC_HTML_PATH, $value));
-                $buffer = str_replace($value, MOBILE_IMAGE_URL . '/' . $converted['outputImageName'], $buffer);
+                if (isset($converted['outputImageName'])) {
+                    $buffer = str_replace($value, MOBILE_IMAGE_URL . '/' . $converted['outputImageName'], $buffer);
+                } else {
+                    $buffer = str_replace($images[0][$key], '<!--No image-->', $buffer);
+                }
             }
         }