Changeset 20961

Timestamp:

2011/05/28 17:35:29 (13 years ago)

Author:

Seasoft

Message:

#144 (郵便番号DB のアップデート)

• http://svn.ec-cube.net/open_trac/ticket/144#comment:12 対応

Location:

branches/version-2_11-dev/data

Files:

• Smarty/templates/admin/basis/zip_install.tpl (modified) (1 diff)
• class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php (modified) (2 diffs)

branches/version-2_11-dev/data/Smarty/templates/admin/basis/zip_install.tpl

@@ -59 +59 @@
             <!--{if $tpl_skip_update_csv}-->
                 ご利用頂けません。
-                <!--{if strlen($smarty.const.ZIP_DOWNLOAD_URL) === 0}-->
+                <!--{if $tpl_zip_download_url_empty}-->
                     <p class="attention">※ パラメータ ZIP_DOWNLOAD_URL が未設定です。</p>
+                <!--{/if}-->
+                <!--{if $tpl_zip_function_not_exists}-->
+                    <p class="attention">※ PHP 拡張モジュール「zip」が無効です。</p>
                 <!--{/if}-->
             <!--{else}-->

branches/version-2_11-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php

@@ -103 +103 @@
         $this->arrErr = $objFormParam->checkError();
         $this->arrForm = $objFormParam->getHashArray();
-        $this->tpl_skip_update_csv = !defined('ZIP_DOWNLOAD_URL') || strlen(ZIP_DOWNLOAD_URL) === 0 || ZIP_DOWNLOAD_URL === false;
+        $this->tpl_zip_download_url_empty = !defined('ZIP_DOWNLOAD_URL') || strlen(ZIP_DOWNLOAD_URL) === 0 || ZIP_DOWNLOAD_URL === false;
+        $this->tpl_zip_function_not_exists = !function_exists('zip_open');
+        $this->tpl_skip_update_csv = $this->tpl_zip_download_url_empty || $this->tpl_zip_function_not_exists;
 
         if ($this->exec) {
@@ -394 +396 @@
      */
     function lfExtractZipFile() {
-        if (!function_exists('zip_open')) {
-            SC_Utils_Ex::sfDispException('PHP 拡張モジュール「zip」を有効にしてください。');
-        }
-
         $zip = zip_open($this->zip_csv_temp_realfile);
         if (!is_resource($zip)) {