Changeset 9272

Timestamp:

Nov 20, 2008, 11:17:02 AM (14 years ago)

Author:

akamine

Message:

#3113 各ファイルのコードの書き方を修正

Location:

OpenPNE/branches/stable-2.10.x/webapp/modules

Files:

• admin/do/csv_member.php (modified) (1 diff)
• pc/do/c_file_download.php (modified) (2 diffs)

OpenPNE/branches/stable-2.10.x/webapp/modules/admin/do/csv_member.php

@@ -43 +43 @@
         $member_csv_data = $this->create_csv_data($member_key_string, $c_member_list);
         //IE以外の場合、キャッシュをさせないヘッダを出力
-        if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') == false) {
+        if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') === false) {
             send_nocache_headers(true);
         }

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

@@ -50 +50 @@
             // IE の場合のみ、ファイル名を SJIS に変換し、キャッシュをさせないヘッダを出力しない
             $original_filename = mb_convert_encoding($original_filename, 'SJIS', 'UTF-8');
+        } else {
+            send_nocache_headers(true);
+        }
             $original_filename = str_replace(array("\r", "\n"), '', $original_filename);
 
@@ -55 +58 @@
             header('Content-Length: '. strlen($file['bin']));
             header('Content-Type: application/octet-stream');
-
-        } else {
-            $original_filename = str_replace(array("\r", "\n"), '', $original_filename);
-
-            send_nocache_headers(true);
-            header('Content-Disposition: attachment; filename="' . $original_filename . '"');
-            header('Content-Length: '. strlen($file['bin']));
-            header('Content-Type: application/octet-stream');
-        }
         echo $file['bin'];
         exit;