Changeset 8606

Timestamp:

Oct 8, 2008, 11:45:35 AM (12 years ago)

Author:

shingo

Message:

#3004:関数名を適切な表現に変更し、説明コメント追加・重複処理の修正

Location:

OpenPNE/branches/stable-2.10.x/webapp

Files:

• lib/util/image.php (modified) (1 diff)
• modules/pc/do/c_edit_update_c_commu.php (modified) (1 diff)
• modules/pc/do/c_event_edit_update_c_commu_topic.php (modified) (1 diff)
• modules/pc/do/h_config_image.php (modified) (1 diff)

OpenPNE/branches/stable-2.10.x/webapp/lib/util/image.php

@@ -307 +307 @@
 }
 
-function image_insert_c_image_without_confirm($upfile_obj, $prefix, $uid)
+/**
+ * アップロードされた画像をワンアクションでc_imageに登録する時に使用
+ *
+ * @params array $upfile_obj
+ * @params string $prefix
+ * @params int $uid
+ * @return string 画像ファイル名 | 失敗時false
+ */
+function image_insert_c_image_direct($upfile_obj, $prefix, $uid)
 {
     if (!file_exists($upfile_obj['tmp_name'])) {
         return false;
     }
+
     $sessid = session_id();
     t_image_clear_tmp($sessid);
     $tmpfile = t_image_save2tmp($upfile_obj, $sessid, $prefix);
     if (!$tmpfile) {
-        t_image_clear_tmp(session_id());
+        t_image_clear_tmp($sessid);
         return false;
     }
     $image_filename = image_insert_c_image4tmp($prefix . '_' . $uid, $tmpfile);
-    t_image_clear_tmp(session_id());
+    t_image_clear_tmp($sessid);
 
     return $image_filename;

OpenPNE/branches/stable-2.10.x/webapp/modules/pc/do/c_edit_update_c_commu.php

@@ -89 +89 @@
 
         //画像アップデート
-        $image_filename = image_insert_c_image_without_confirm($upfile_obj, 'c', $target_c_commu_id);
+        $image_filename = image_insert_c_image_direct($upfile_obj, 'c', $target_c_commu_id);
 
         if ($image_filename) {

OpenPNE/branches/stable-2.10.x/webapp/modules/pc/do/c_event_edit_update_c_commu_topic.php

@@ -114 +114 @@
         t_image_clear_tmp(session_id());
 
-
         $update_c_commu_topic = array(
             'name'              => $event['title'],

OpenPNE/branches/stable-2.10.x/webapp/modules/pc/do/h_config_image.php

@@ -39 +39 @@
 
         //画像をDBに格納
-        $image_filename = image_insert_c_image_without_confirm($upfile_obj, 'm', $u);
+        $image_filename = image_insert_c_image_direct($upfile_obj, 'm', $u);
 
         if ($image_filename) {