diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/ChangeLog zen-cart-v1.2.0-l10n-jp-3/ChangeLog --- zen-cart-v1.2.0-l10n-jp-2/ChangeLog Sat Apr 23 11:34:07 2005 +++ zen-cart-v1.2.0-l10n-jp-3/ChangeLog Fri May 6 17:43:04 2005 @@ -1,3 +1,84 @@ +2005-05-06 17:34 shida + + * INSTALL.TXT: v1.2.0-l10n-jp-3のリリース + +2005-05-06 17:31 shida + + * zc_install/: mysql_upgrade_zencart_120jp2_to_3.sql, + includes/modules/pages/database_upgrade/header_php.php, + includes/templates/template_default/templates/database_upgrade_default.php: + 個人情報保護法に対応する http://zen-cart.jp/pukiwiki/394.html + + に伴うデータベース拡張のためのデータベースアップグレードに対応 + +2005-05-06 17:17 shida + + * zc_install/includes/modules/pages/: + database_upgrade/header_php.php, inspect/header_php.php: + バージョン判定でconfigurationテーブルのtitle文言を手がかりにしている + ^^; + そこも翻訳しないと、正しくバージョン判定をしてくれないので修正 + +2005-05-06 17:13 shida + + * zc_install/includes/modules/pages/database_upgrade/: + header_php.php: + データベースアップグレードの際、DB_PREFIXがパラメータにわたっていなかった。 + 最新版(1.2.4.1)では直ってた。 + +2005-05-06 14:15 shida + + * includes/languages/japanese/contact_us.php, + includes/modules/pages/contact_us/header_php.php, + includes/templates/template_default/templates/tpl_contact_us_default.php, + zc_install/mysql_zencart.sql: 個人情報保護法に対応する + http://zen-cart.jp/pukiwiki/394.html + + の対応 + +2005-05-06 13:21 shida + + * admin/includes/languages/japanese/define_pages_editor.php, + includes/languages/japanese.php, + includes/languages/japanese/create_account.php, + includes/languages/japanese/login.php, + includes/languages/japanese/privacy.php, + includes/languages/japanese/unsubscribe.php, + zc_install/mysql_zencart.sql: 個人情報保護指針 -> + 個人情報保護方針 + +2005-05-06 12:18 shida + + * includes/functions/: functions_general.php: 生年月日の1970年問題 + http://zen-cart.jp/pukiwiki/155.html のバグフィクス + + takiさん本当にありがとうございます。 m(_ _)m + +2005-05-04 10:57 shida + + * admin/coupon_admin.php, admin/gv_mail.php, admin/gv_queue.php, + admin/mail.php, email/email_template_coupon.html, + email/email_template_direct_email.html, + email/email_template_gv_mail.html, + email/email_template_gv_queue.html, + email/email_template_newsletters.html, + email/email_template_product_notification.html, + admin/includes/classes/email.php, + admin/includes/languages/japanese/email_extras.php, + admin/includes/modules/newsletters/newsletter.php, + admin/includes/modules/newsletters/product_notification.php: + 管理画面からメールが送信される系の - Fromヘッダが姓名逆の件を修正 + - HTMLメールのDear firstname lastnameを修正 - + multipartのtext/plan側の文字コードをiso-2022に - + gv_queueのHTMLメールテンプレートがおかしかったのを修正(英語版1.2.4.1で修正されてたものを流用) + + http://www.zen-cart.jp/pukiwiki/186.html + +2005-04-23 13:29 shida + + * INSTALL.TXT: + バージョンをzen-cart-v1.2.0-l10n-jp-1からzen-cart-v1.2.0-l10n-jp-2にあげた + 2005-04-22 18:15 shida * zc_install/mysql_zencart.sql: diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/INSTALL.TXT zen-cart-v1.2.0-l10n-jp-3/INSTALL.TXT --- zen-cart-v1.2.0-l10n-jp-2/INSTALL.TXT Sat Apr 23 13:30:37 2005 +++ zen-cart-v1.2.0-l10n-jp-3/INSTALL.TXT Fri May 6 17:35:17 2005 @@ -1,6 +1,6 @@ Zen Cart - The Art of E-Commerce -Version 1.2.0-l10n-jp-2 +Version 1.2.0-l10n-jp-3 Zen Cartの導入は自動インストールシステムによって行います。 diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/admin/coupon_admin.php zen-cart-v1.2.0-l10n-jp-3/admin/coupon_admin.php --- zen-cart-v1.2.0-l10n-jp-2/admin/coupon_admin.php Wed Sep 1 13:47:03 2004 +++ zen-cart-v1.2.0-l10n-jp-3/admin/coupon_admin.php Wed May 4 10:57:40 2005 @@ -67,6 +67,7 @@ $html_msg['EMAIL_FIRST_NAME'] = $mail->fields['customers_firstname']; $html_msg['EMAIL_LAST_NAME'] = $mail->fields['customers_lastname']; + $html_msg['EMAIL_GREET'] = EMAIL_GREET; $html_msg['EMAIL_MESSAGE_HTML'] = zen_db_prepare_input($_POST['message_html']); $html_msg['COUPON_TEXT_TO_REDEEM'] = TEXT_TO_REDEEM; $html_msg['COUPON_TEXT_VOUCHER_IS'] = TEXT_VOUCHER_IS; diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/admin/gv_mail.php zen-cart-v1.2.0-l10n-jp-3/admin/gv_mail.php --- zen-cart-v1.2.0-l10n-jp-2/admin/gv_mail.php Wed Sep 1 13:47:05 2004 +++ zen-cart-v1.2.0-l10n-jp-3/admin/gv_mail.php Wed May 4 10:57:40 2005 @@ -79,11 +79,12 @@ $html_msg['GV_CODE_URL'] .= TEXT_OR_VISIT . '' . STORE_NAME . '' . TEXT_ENTER_CODE; $html_msg['EMAIL_FIRST_NAME'] = $mail->fields['customers_firstname']; $html_msg['EMAIL_LAST_NAME'] = $mail->fields['customers_lastname']; + $html_msg['EMAIL_GREET'] = EMAIL_GREET; // disclaimer $message .= "\n-----\n" . sprintf(EMAIL_DISCLAIMER, STORE_OWNER_EMAIL_ADDRESS) . "\n\n"; - zen_mail($mail->fields['customers_firstname'] . ' ' . $mail->fields['customers_lastname'], $mail->fields['customers_email_address'], $subject , $message, $from, $from, $html_msg, 'gv_mail'); + zen_mail($mail->fields['customers_lastname'] . ' ' . $mail->fields['customers_firstname'], $mail->fields['customers_email_address'], $subject , $message, $from, $from, $html_msg, 'gv_mail'); $recip_count++; if (SEND_EXTRA_DISCOUNT_COUPON_ADMIN_EMAILS_TO_STATUS== '1' and SEND_EXTRA_DISCOUNT_COUPON_ADMIN_EMAILS_TO != '') { zen_mail('', SEND_EXTRA_DISCOUNT_COUPON_ADMIN_EMAILS_TO, SEND_EXTRA_DISCOUNT_COUPON_ADMIN_EMAILS_TO_SUBJECT . ' ' . $subject, $message, $from, $from, $html_msg, 'gv_mail_extra'); diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/admin/gv_queue.php zen-cart-v1.2.0-l10n-jp-3/admin/gv_queue.php --- zen-cart-v1.2.0-l10n-jp-2/admin/gv_queue.php Wed Sep 1 13:46:57 2004 +++ zen-cart-v1.2.0-l10n-jp-3/admin/gv_queue.php Wed May 4 10:57:40 2005 @@ -75,6 +75,7 @@ $html_msg['EMAIL_FIRST_NAME'] = $mail->fields['customers_firstname']; $html_msg['EMAIL_LAST_NAME'] = $mail->fields['customers_lastname']; + $html_msg['EMAIL_GREET'] = EMAIL_GREET; $html_msg['GV_NOTICE_HEADER'] = TEXT_REDEEM_GV_MESSAGE_HEADER; $html_msg['GV_NOTICE_RELEASED'] = TEXT_REDEEM_GV_MESSAGE_RELEASED; $html_msg['GV_NOTICE_AMOUNT_REDEEM'] = sprintf(TEXT_REDEEM_GV_MESSAGE_AMOUNT, '' . $currencies->format($gv_amount) . ''); @@ -84,7 +85,7 @@ $html_msg['TEXT_REDEEM_GV_MESSAGE_FOOTER'] = TEXT_REDEEM_GV_MESSAGE_FOOTER; //send the message - zen_mail($mail->fields['customers_firstname'] . ' ' . $mail->fields['customers_lastname'], $mail->fields['customers_email_address'], TEXT_REDEEM_GV_SUBJECT . TEXT_REDEEM_GV_SUBJECT_ORDER . $gv_resulta->fields['order_id'] , $message, STORE_NAME, EMAIL_FROM, $html_msg, 'gv_queue'); + zen_mail($mail->fields['customers_lastname'] . ' ' . $mail->fields['customers_firstname'], $mail->fields['customers_email_address'], TEXT_REDEEM_GV_SUBJECT . TEXT_REDEEM_GV_SUBJECT_ORDER . $gv_resulta->fields['order_id'] , $message, STORE_NAME, EMAIL_FROM, $html_msg, 'gv_queue'); diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/admin/includes/classes/email.php zen-cart-v1.2.0-l10n-jp-3/admin/includes/classes/email.php --- zen-cart-v1.2.0-l10n-jp-2/admin/includes/classes/email.php Sat Apr 16 15:00:59 2005 +++ zen-cart-v1.2.0-l10n-jp-3/admin/includes/classes/email.php Wed May 4 10:57:41 2005 @@ -187,6 +187,7 @@ */ function add_html($html, $text = NULL, $images_dir = NULL) { + $text = mb_convert_encoding(mb_convert_kana($text, "KV"), 'JIS', 'EUC'); $this->html = zen_convert_linefeeds(array("\r\n", "\n", "\r"), '
', $html); $this->html_text = zen_convert_linefeeds(array("\r\n", "\n", "\r"), $this->lf, $text); diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/admin/includes/languages/japanese/define_pages_editor.php zen-cart-v1.2.0-l10n-jp-3/admin/includes/languages/japanese/define_pages_editor.php --- zen-cart-v1.2.0-l10n-jp-2/admin/includes/languages/japanese/define_pages_editor.php Wed Nov 3 16:24:01 2004 +++ zen-cart-v1.2.0-l10n-jp-3/admin/includes/languages/japanese/define_pages_editor.php Fri May 6 13:21:22 2005 @@ -28,7 +28,7 @@ define('TEXT_INFO_MAIN_PAGE', 'メインページ'); define('TEXT_INFO_SHIPPINGINFO', '配送・返品について'); -define('TEXT_INFO_PRIVACY', '個人情報保護指針'); +define('TEXT_INFO_PRIVACY', '個人情報保護方針'); define('TEXT_INFO_CONDITIONS', 'サイトのご利用について'); define('TEXT_INFO_CONTACT_US', 'お問い合わせ'); define('TEXT_INFO_CHECKOUT_SUCCESS', 'チェックアウト完了'); diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/admin/includes/languages/japanese/email_extras.php zen-cart-v1.2.0-l10n-jp-3/admin/includes/languages/japanese/email_extras.php --- zen-cart-v1.2.0-l10n-jp-2/admin/includes/languages/japanese/email_extras.php Wed Nov 3 16:24:01 2004 +++ zen-cart-v1.2.0-l10n-jp-3/admin/includes/languages/japanese/email_extras.php Wed May 4 10:57:41 2005 @@ -32,6 +32,8 @@ define('OFFICE_IP_ADDRESS','IPアドレス:'); define('OFFICE_HOST_ADDRESS','ホスト名:'); define('OFFICE_DATE_TIME','日付・時間:'); + + define('EMAIL_GREET', '様'); // email disclaimer define('EMAIL_DISCLAIMER', 'このメールアドレスは、あなたもしくはあなたのお客様からいただいたものです。このメールに心当たりがない方は、お手数ですが %s までお知らせください。'); diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/admin/includes/modules/newsletters/newsletter.php zen-cart-v1.2.0-l10n-jp-3/admin/includes/modules/newsletters/newsletter.php --- zen-cart-v1.2.0-l10n-jp-2/admin/includes/modules/newsletters/newsletter.php Wed Sep 1 13:47:13 2004 +++ zen-cart-v1.2.0-l10n-jp-3/admin/includes/modules/newsletters/newsletter.php Wed May 4 10:57:41 2005 @@ -109,8 +109,9 @@ $i++; $html_msg['EMAIL_FIRST_NAME'] = $audience->fields['customers_firstname']; $html_msg['EMAIL_LAST_NAME'] = $audience->fields['customers_lastname']; + $html_msg['EMAIL_GREET'] = EMAIL_GREET; $html_msg['EMAIL_MESSAGE_HTML'] = $this->content_html; - zen_mail($audience->fields['customers_firstname'] . ' ' . $audience->fields['customers_lastname'], $audience->fields['customers_email_address'], $this->title, $this->content, STORE_NAME, EMAIL_FROM, $html_msg, 'newsletters'); + zen_mail($audience->fields['customers_lastname'] . ' ' . $audience->fields['customers_firstname'], $audience->fields['customers_email_address'], $this->title, $this->content, STORE_NAME, EMAIL_FROM, $html_msg, 'newsletters'); echo zen_image(DIR_WS_ICONS . 'tick.gif', $audience->fields['customers_email_address']); $audience->MoveNext(); } diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/admin/includes/modules/newsletters/product_notification.php zen-cart-v1.2.0-l10n-jp-3/admin/includes/modules/newsletters/product_notification.php --- zen-cart-v1.2.0-l10n-jp-2/admin/includes/modules/newsletters/product_notification.php Wed Sep 1 13:47:13 2004 +++ zen-cart-v1.2.0-l10n-jp-3/admin/includes/modules/newsletters/product_notification.php Wed May 4 10:57:41 2005 @@ -270,8 +270,9 @@ $i++; $html_msg['EMAIL_FIRST_NAME'] = $value['firstname']; $html_msg['EMAIL_LAST_NAME'] = $value['lastname']; + $html_msg['EMAIL_GREET'] = EMAIL_GREET; $html_msg['EMAIL_MESSAGE_HTML'] = $this->content_html; - zen_mail($value['firstname'] . ' ' . $value['lastname'], $value['email_address'], $this->title, $this->content, STORE_NAME, EMAIL_FROM, $html_msg, 'product_notification',''); + zen_mail($value['lastname'] . ' ' . $value['firstname'], $value['email_address'], $this->title, $this->content, STORE_NAME, EMAIL_FROM, $html_msg, 'product_notification',''); echo zen_image(DIR_WS_ICONS . 'tick.gif', $value['email_address']); } diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/admin/mail.php zen-cart-v1.2.0-l10n-jp-3/admin/mail.php --- zen-cart-v1.2.0-l10n-jp-2/admin/mail.php Wed Sep 1 13:46:57 2004 +++ zen-cart-v1.2.0-l10n-jp-3/admin/mail.php Wed May 4 10:57:40 2005 @@ -64,7 +64,8 @@ while (!$mail->EOF) { $html_msg['EMAIL_FIRST_NAME'] = $mail->fields['customers_firstname']; $html_msg['EMAIL_LAST_NAME'] = $mail->fields['customers_lastname']; - zen_mail($mail->fields['customers_firstname'] . ' ' . $mail->fields['customers_lastname'], $mail->fields['customers_email_address'], $subject, $message, STORE_NAME, $from, $html_msg, 'direct_email', array('file' => $attachment_file, 'file_type'=>$attachment_filetype) ); + $html_msg['EMAIL_GREET'] = EMAIL_GREET; + zen_mail($mail->fields['customers_lastname'] . ' ' . $mail->fields['customers_firstname'], $mail->fields['customers_email_address'], $subject, $message, STORE_NAME, $from, $html_msg, 'direct_email', array('file' => $attachment_file, 'file_type'=>$attachment_filetype) ); $recip_count++; $mail->MoveNext(); } diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/email/email_template_coupon.html zen-cart-v1.2.0-l10n-jp-3/email/email_template_coupon.html --- zen-cart-v1.2.0-l10n-jp-2/email/email_template_coupon.html Sat Feb 5 15:18:09 2005 +++ zen-cart-v1.2.0-l10n-jp-3/email/email_template_coupon.html Wed May 4 10:57:40 2005 @@ -35,7 +35,7 @@
-
Dear $EMAIL_FIRST_NAME $EMAIL_LAST_NAME,
+
$EMAIL_LAST_NAME $EMAIL_FIRST_NAME $EMAIL_GREET
$EMAIL_MESSAGE_HTML
$COUPON_TEXT_TO_REDEEM
$COUPON_TEXT_VOUCHER_IS $COUPON_CODE - diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/email/email_template_direct_email.html zen-cart-v1.2.0-l10n-jp-3/email/email_template_direct_email.html --- zen-cart-v1.2.0-l10n-jp-2/email/email_template_direct_email.html Sat Feb 5 15:18:09 2005 +++ zen-cart-v1.2.0-l10n-jp-3/email/email_template_direct_email.html Wed May 4 10:57:40 2005 @@ -33,7 +33,7 @@
-
Dear $EMAIL_FIRST_NAME $EMAIL_LAST_NAME
+
$EMAIL_LAST_NAME $EMAIL_FIRST_NAME $EMAIL_GREET
$EMAIL_MESSAGE_HTML
diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/email/email_template_gv_mail.html zen-cart-v1.2.0-l10n-jp-3/email/email_template_gv_mail.html --- zen-cart-v1.2.0-l10n-jp-2/email/email_template_gv_mail.html Sat Feb 5 15:18:09 2005 +++ zen-cart-v1.2.0-l10n-jp-3/email/email_template_gv_mail.html Wed May 4 10:57:40 2005 @@ -34,7 +34,7 @@
-
Dear $EMAIL_FIRST_NAME $EMAIL_LAST_NAME
+
$EMAIL_LAST_NAME $EMAIL_FIRST_NAME $EMAIL_GREET
$EMAIL_MESSAGE_HTML
$GV_WORTH $GV_AMOUNT
$GV_REDEEM
$GV_CODE_URL
diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/email/email_template_gv_queue.html zen-cart-v1.2.0-l10n-jp-3/email/email_template_gv_queue.html --- zen-cart-v1.2.0-l10n-jp-2/email/email_template_gv_queue.html Sat Feb 5 15:18:09 2005 +++ zen-cart-v1.2.0-l10n-jp-3/email/email_template_gv_queue.html Wed May 4 10:57:40 2005 @@ -36,11 +36,14 @@
-
Dear $EMAIL_FIRST_NAME $EMAIL_LAST_NAME
-
$GV_NOTICE_AMOUNT_URL
-
$TEXT_REDEEM_COUPON_MESSAGE_BODY
-
$TEXT_REDEEM_COUPON_MESSAGE_FOOTER
-
+
$EMAIL_LAST_NAME $EMAIL_FIRST_NAME $EMAIL_GREET
+
$GV_NOTICE_HEADER
+
$GV_NOTICE_RELEASED
+
$GV_NOTICE_AMOUNT_REDEEM
+
$GV_NOTICE_VALUE
+
$TEXT_REDEEM_GV_MESSAGE_BODY
+
$TEXT_REDEEM_GV_MESSAGE_FOOTER
+
diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/email/email_template_newsletters.html zen-cart-v1.2.0-l10n-jp-3/email/email_template_newsletters.html --- zen-cart-v1.2.0-l10n-jp-2/email/email_template_newsletters.html Sat Feb 5 15:18:09 2005 +++ zen-cart-v1.2.0-l10n-jp-3/email/email_template_newsletters.html Wed May 4 10:57:40 2005 @@ -34,7 +34,7 @@
-
Dear $EMAIL_FIRST_NAME $EMAIL_LAST_NAME,
+
$EMAIL_LAST_NAME $EMAIL_FIRST_NAME $EMAIL_GREET
$EMAIL_MESSAGE_HTML
diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/email/email_template_product_notification.html zen-cart-v1.2.0-l10n-jp-3/email/email_template_product_notification.html --- zen-cart-v1.2.0-l10n-jp-2/email/email_template_product_notification.html Sat Feb 5 15:18:09 2005 +++ zen-cart-v1.2.0-l10n-jp-3/email/email_template_product_notification.html Wed May 4 10:57:40 2005 @@ -33,7 +33,7 @@
-
Dear $EMAIL_FIRST_NAME $EMAIL_LAST_NAME,
+
$EMAIL_LAST_NAME $EMAIL_FIRST_NAME $EMAIL_GREET
$EMAIL_MESSAGE_HTML
diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/includes/functions/functions_general.php zen-cart-v1.2.0-l10n-jp-3/includes/functions/functions_general.php --- zen-cart-v1.2.0-l10n-jp-2/includes/functions/functions_general.php Sat Apr 16 14:49:01 2005 +++ zen-cart-v1.2.0-l10n-jp-3/includes/functions/functions_general.php Fri May 6 12:19:32 2005 @@ -239,8 +239,8 @@ $minute = (int)substr($raw_date, 14, 2); $second = (int)substr($raw_date, 17, 2); - if (@date('Y', mktime($hour, $minute, $second, $month, $day, $year)) == $year) { - return date(DATE_FORMAT, mktime($hour, $minute, $second, $month, $day, $year)); + if (@date('Y', zen_mktime($hour, $minute, $second, $month, $day, $year)) == $year) { + return date(DATE_FORMAT, zen_mktime($hour, $minute, $second, $month, $day, $year)); } else { return ereg_replace('2037' . '$', $year, date(DATE_FORMAT, mktime($hour, $minute, $second, $month, $day, 2037))); } @@ -1295,6 +1295,65 @@ } return $zp_result; } + + +/////// +// This mktime function support before 1970. +// Author: rickenmeer at hotmail dot com (http://jp.php.net/manual/ja/function.mktime.php) + function zen_mktime($hour = false, $minute = false, $second = false, $month = false, $date = false, $year = false) + { + // For centuries, the Egyptians used a (12 * 30 + 5)-day calendar + // The Greek began using leap-years in around 400 BC + // Ceasar adjusted the Roman calendar to start with Januari rather than March + // All knowledge was passed on by the Arabians, who showed an error in leaping + // In 1232 Sacrobosco (Eng.) calculated the error at 1 day per 288 years + // In 1582, Pope Gregory XIII removed 10 days (Oct 15-24) to partially undo the + // error, and he instituted the 400-year-exception in the 100-year-exception, + // (notice 400 rather than 288 years) to undo the rest of the error + // From about 2044, spring will again coincide with the tropic of Cancer + // Around 4100, the calendar will need some adjusting again + + if ($hour === false) $hour = Date ("G"); + if ($minute === false) $minute = Date ("i"); + if ($second === false) $second = Date ("s"); + if ($month === false) $month = Date ("n"); + if ($date === false) $date = Date ("j"); + if ($year === false) $year = Date ("Y"); + + if ($year > 1970) return mktime ($hour, $minute, $second, $month, $date, $year); + + // date before 1-1-1970 (Win32 Fix) + $m_days = Array (31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); + if ($year % 4 == 0 && ($year % 100 > 0 || $year % 400 == 0)) + { + $m_days[1] = 29; // non leap-years can be: 1700, 1800, 1900, 2100, etc. + } + + // go backward (-), based on $year + $d_year = 1970 - $year; + $days = 0 - $d_year * 365; + $days -= ($d_year < 2 ? 0 : + floor (($d_year -2 ) / 4) + 1); // compensate for leap-years + $days += ($d_year < 70 ? 0 : + floor (($d_year - 70) / 100) + 1); // compensate for non-leap-years + $days -= ($d_year < 370 ? 0 : + floor (($d_year - 370) / 400) + 1); // compensate again for giant leap-years + + // go forward (+), based on $month and $date + for ($i = 1; $i < $month; $i++) + { + $days += $m_days [$i - 1]; + } + $days += $date - 1; + + // go forward (+) based on $hour, $minute and $second + $stamp = $days * 86400; + $stamp += $hour * 3600; + $stamp += $minute * 60; + $stamp += $second; + + return $stamp; + } ///////////////////////////////////////////// //// diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/contact_us.php zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese/contact_us.php --- zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/contact_us.php Sat Nov 20 14:54:47 2004 +++ zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese/contact_us.php Fri May 6 14:17:12 2005 @@ -30,4 +30,8 @@ define('ENTRY_ENQUIRY', '内容:'); define('SEND_TO_TEXT','メールを送る:'); + +define('TABLE_HEADING_PRIVACY_CONDITIONS', '個人情報保護方針について'); +define('TEXT_PRIVACY_CONDITIONS_DESCRIPTION', '個人情報保護方針に同意される場合はクリックしてください。内容はこちらでご覧いただけます。 個人情報保護方針.'); +define('TEXT_PRIVACY_CONDITIONS_CONFIRM', '個人情報保護方針に同意する'); ?> diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/create_account.php zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese/create_account.php --- zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/create_account.php Wed Jan 12 18:16:22 2005 +++ zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese/create_account.php Fri May 6 13:21:22 2005 @@ -71,7 +71,7 @@ // email disclaimer - this disclaimer is seperate from all other email disclaimers define('EMAIL_DISCLAIMER_NEW_CUSTOMER', 'このメールアドレスは、お客様ご自身によって当ショップに登録されました。もしアカウント登録をされた覚えがない場合には、お手数ですが、 %s までご連絡ください。'); -define('TABLE_HEADING_PRIVACY_CONDITIONS', '個人情報保護指針'); -define('TEXT_PRIVACY_CONDITIONS_DESCRIPTION', '当ショップの個人情報保護指針に同意される場合は、以下のチェックボックスをチェックしてください。 個人情報保護指針はこちらからご確認いただけます。'); -define('TEXT_PRIVACY_CONDITIONS_CONFIRM', '個人情報保護指針に同意する'); +define('TABLE_HEADING_PRIVACY_CONDITIONS', '個人情報保護方針'); +define('TEXT_PRIVACY_CONDITIONS_DESCRIPTION', '当ショップの個人情報保護方針に同意される場合は、以下のチェックボックスをチェックしてください。 個人情報保護方針はこちらからご確認いただけます。'); +define('TEXT_PRIVACY_CONDITIONS_CONFIRM', '個人情報保護方針に同意する'); ?> diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/login.php zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese/login.php --- zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/login.php Sat Nov 20 14:54:47 2004 +++ zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese/login.php Fri May 6 13:21:22 2005 @@ -33,7 +33,7 @@ define('TEXT_LOGIN_ERROR', 'エラー: メールアドレスまたはパスワードが一致しませんでした。'); define('TEXT_VISITORS_CART', '注:お客様の"ビジターズカート"の中身は、ログインされると"メンバーズカート"の中に自動的に入ります。[詳細]'); -define('TABLE_HEADING_PRIVACY_CONDITIONS', '個人情報保護指針について'); -define('TEXT_PRIVACY_CONDITIONS_DESCRIPTION', '個人情報保護指針に同意される場合はクリックしてください。内容はこちらでご覧いただけます。 個人情報保護指針.'); -define('TEXT_PRIVACY_CONDITIONS_CONFIRM', '個人情報保護指針に同意する'); +define('TABLE_HEADING_PRIVACY_CONDITIONS', '個人情報保護方針について'); +define('TEXT_PRIVACY_CONDITIONS_DESCRIPTION', '個人情報保護方針に同意される場合はクリックしてください。内容はこちらでご覧いただけます。 個人情報保護方針.'); +define('TEXT_PRIVACY_CONDITIONS_CONFIRM', '個人情報保護方針に同意する'); ?> diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/privacy.php zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese/privacy.php --- zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/privacy.php Sat Dec 4 10:58:16 2004 +++ zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese/privacy.php Fri May 6 13:21:22 2005 @@ -17,13 +17,17 @@ // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ -// $Id: privacy.php,v 1.4 2004/12/04 01:58:16 shidairiki Exp $ +// $Id: privacy.php,v 1.5 2005/05/06 04:21:22 shida Exp $ // -define('NAVBAR_TITLE', '個人情報保護指針'); -define('HEADING_TITLE', '個人情報保護指針'); +define('NAVBAR_TITLE', '個人情報保護方針'); +define('HEADING_TITLE', '個人情報保護方針'); -define('TEXT_INFORMATION', 'このページに個人情報保護などを入力してください。
+define('TEXT_INFORMATION', '【ショップ開店の前に - 個人情報保護方針について】
+
+2005年4月1日に施行された「個人情報保護法」では、個人情報保護方針を「本人が容易に知りうる状態」に置くことを定めています。
+したがって、ショップ開店前に「個人情報保護方針」を策定し、このページに開示することを薦めます。
+
この部分を変更するには、
/includes/languages/japanese/privacy.phpのdefine(\'TEXT_INFORMATION\',の右側の
シングルクォーテーション(\')の間を編集してください。
また、下部のテキストボックスのみを使用する場合は、
define(\'TEXT_IN FORMATION\',\'\')
のようにシングルクォーテーションの間には、何も記入せずに保存することで、この部分は非表示になります。 diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/unsubscribe.php zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese/unsubscribe.php --- zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/unsubscribe.php Sat Nov 20 14:54:47 2004 +++ zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese/unsubscribe.php Fri May 6 13:21:22 2005 @@ -16,7 +16,7 @@ define('NAVBAR_TITLE', '配信停止'); define('HEADING_TITLE', 'ニュースレター配信停止'); -define('UNSUBSCRIBE_TEXT_INFORMATION', '
ニュースレターの配信停止をご希望とのこと、誠に残念です。お客様の個人情報の取り扱いについては、当店の個人情報保護指針をご覧ください。

ニュースレターの購読をされている方には新製品情報、割引情報などショップからのお知らせをお届けしております。

配信停止をご希望でしたら下のボタンを押してください。 '); +define('UNSUBSCRIBE_TEXT_INFORMATION', '
ニュースレターの配信停止をご希望とのこと、誠に残念です。お客様の個人情報の取り扱いについては、当店の個人情報保護方針をご覧ください。

ニュースレターの購読をされている方には新製品情報、割引情報などショップからのお知らせをお届けしております。

配信停止をご希望でしたら下のボタンを押してください。 '); define('UNSUBSCRIBE_DONE_TEXT_INFORMATION', '
お客様のご要望により、以下のメールアドレスを配信リストから削除いたしました。

'); define('UNSUBSCRIBE_ERROR_INFORMATION', '
以下のメールアドレスは当ショップのニュースレター配信リストにないか、あるいは既に配信停止の手続きが完了しています。

'); ?> diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese.php zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese.php --- zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese.php Sat Apr 16 15:01:00 2005 +++ zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese.php Fri May 6 13:21:22 2005 @@ -192,7 +192,7 @@ define('ERROR_NO_PAYMENT_MODULE_SELECTED', 'お支払い方法を選択してください。'); define('ERROR_CONDITIONS_NOT_ACCEPTED', '下記のご利用規約を確認してください。'); -define('ERROR_PRIVACY_STATEMENT_NOT_ACCEPTED', '下記の個人情報保護指針をご確認・ご承諾ください。'); +define('ERROR_PRIVACY_STATEMENT_NOT_ACCEPTED', '下記の個人情報保護方針をご確認・ご承諾ください。'); define('CATEGORY_COMPANY', '会社の詳細'); define('CATEGORY_PERSONAL', '個人情報'); diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/includes/modules/pages/contact_us/header_php.php zen-cart-v1.2.0-l10n-jp-3/includes/modules/pages/contact_us/header_php.php --- zen-cart-v1.2.0-l10n-jp-2/includes/modules/pages/contact_us/header_php.php Mon Nov 22 17:53:24 2004 +++ zen-cart-v1.2.0-l10n-jp-3/includes/modules/pages/contact_us/header_php.php Fri May 6 14:17:13 2005 @@ -27,7 +27,14 @@ $email_address = zen_db_prepare_input($_POST['email']); $enquiry = zen_db_prepare_input(strip_tags($_POST['enquiry'])); - if (zen_validate_email($email_address)) { + + if (DISPLAY_CONTACT_US_PRIVACY_CONDITIONS == 'true' && + (! isset($_POST['privacy_conditions']) || ($_POST['privacy_conditions'] != '1'))) { + $error = true; + $messageStack->add('contact', ERROR_PRIVACY_STATEMENT_NOT_ACCEPTED, 'error'); + } + else if (zen_validate_email($email_address)) { + // auto complete when logged in if($_SESSION['customer_id']) { $check_customer = $db->Execute("select customers_id, customers_firstname, customers_lastname, customers_password, customers_email_address, customers_default_address_id from " . TABLE_CUSTOMERS . " where customers_id = '" . $customer_id . "'"); diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/includes/templates/template_default/templates/tpl_contact_us_default.php zen-cart-v1.2.0-l10n-jp-3/includes/templates/template_default/templates/tpl_contact_us_default.php --- zen-cart-v1.2.0-l10n-jp-2/includes/templates/template_default/templates/tpl_contact_us_default.php Wed Sep 1 13:47:57 2004 +++ zen-cart-v1.2.0-l10n-jp-3/includes/templates/template_default/templates/tpl_contact_us_default.php Fri May 6 14:17:13 2005 @@ -61,6 +61,20 @@ + + + + + + +
' . zen_draw_checkbox_field('privacy_conditions', '1', false, 'id="privacy"') . ''; ?> + + + Execute($sql); while (!$result->EOF) { if (ZC_UPG_DEBUG==true) echo "114patch-fields=" . $result->fields['configuration_title'] . '
'; - if ($result->fields['configuration_title'] == 'Package Tare Small to Medium - added percentage:weight') { + if ($result->fields['configuration_title'] == "パッケージの風袋 - 小・中の比率と重要\r\n") { $got_v1_1_4_patch1 = true; } $result->MoveNext(); @@ -136,7 +136,7 @@ $result = $db_test->Execute($sql); while (!$result->EOF) { if (ZC_UPG_DEBUG==true) echo "120c-cfggroup13=attrb ==" . $result->fields['configuration_group_title'] . '
'; - if ($result->fields['configuration_group_title'] == 'Attribute Settings') { + if ($result->fields['configuration_group_title'] == '商品属性の設定') { $got_v1_2_0c = true; } $result->MoveNext(); @@ -177,7 +177,16 @@ if ($got_v1_2_0a && $got_v1_2_0b && $got_v1_2_0c && $got_v1_2_0d && $got_v1_2_0e && $got_v1_2_0f) { $got_v1_2_0 = true; } - + // now test to see if the v1.2.0-10n-jp-2 -> v1.2.0-l10n-jp-3 upgrade has been completed + $sql = "SELECT count(*) as count " . + "FROM " . DB_PREFIX . "configuration " . + "WHERE configuration_key='DISPLAY_CONTACT_US_PRIVACY_CONDITIONS'"; + $result = $db_test->Execute($sql); + if ($result->fields['count'] > '0') { + if (ZC_UPG_DEBUG==true) echo 'v120-l10n-jp-3-count=' . $result->fields['count'] .'
'; + $got_v1_2_0_l10n_jp_3 = true; + $zdb_ver = '1.2.0-l10n-jp-3'; + } //*** FUTURE CHECKS GO ABOVE THIS LINE **** @@ -194,6 +203,10 @@ //display options based on what was found -- THESE SHOULD BE PROCESSED IN REVERSE ORDER, NEWEST VERSION FIRST... ! //that way only the "earliest-required" upgrade is suggested first. + if (!$got_v1_2_0_l10n_jp_3) { + $sniffer = ' upgrade v1.2.0 to v1.2.0-l10n-jp-3'; + $needs_v1_2_0_l10n_jp_3=true; + } if (!$got_v1_2_0) { $sniffer = ' upgrade v1.1.4 to v1.2.0'; $needs_v1_2_0=true; @@ -292,6 +305,13 @@ $got_v1_2_0 = true; //after processing this step, this will be the new version-level $db_upgraded_to_version='1.2.0'; break; + case '1.2.0jp': // upgrading from 1.2.0-l10n-jp-1 or 1.2.0-l10n-jp-2 TO 1.2.0-l10n-jp-3 + if (!$got_v1_2_0 || $got_v1_2_0_l10n_jp_3) continue; + $sniffer_file = '_upgrade_zencart_120jp2_to_3.sql'; + if (ZC_UPG_DEBUG2==true) echo $sniffer_file.'
'; + $got_v1_2_0 = true; //after processing this step, this will be the new version-level + $db_upgraded_to_version='1.2.0-l10n-jp-3'; + break; default: $nothing_to_process=true; } // end while @@ -311,7 +331,7 @@ $db = new queryFactory; $db->Connect(DB_SERVER, DB_SERVER_USERNAME, DB_SERVER_PASSWORD, DB_DATABASE) or die("Unable to connect to database"); if (!ini_get('safe_mode')) set_time_limit(300); - executeSql(DB_TYPE . $sniffer_file, DB_DATABASE); + executeSql(DB_TYPE . $sniffer_file, DB_DATABASE, DB_PREFIX); $db->Close(); } // end if } // end while diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/zc_install/includes/modules/pages/inspect/header_php.php zen-cart-v1.2.0-l10n-jp-3/zc_install/includes/modules/pages/inspect/header_php.php --- zen-cart-v1.2.0-l10n-jp-2/zc_install/includes/modules/pages/inspect/header_php.php Sat Feb 5 15:14:35 2005 +++ zen-cart-v1.2.0-l10n-jp-3/zc_install/includes/modules/pages/inspect/header_php.php Fri May 6 17:18:06 2005 @@ -148,7 +148,7 @@ $result = $db_test->Execute($sql); while (!$result->EOF) { if (ZC_UPG_DEBUG==true) echo "114patch-fields=" . $result->fields['configuration_title'] . '
'; - if ($result->fields['configuration_title'] == 'Package Tare Small to Medium - added percentage:weight') { + if ($result->fields['configuration_title'] == "パッケージの風袋 - 小・中の比率と重要\r\n") { $got_v1_1_4_patch1 = true; $zdb_ver = '1.1.4-patch1'; } @@ -180,7 +180,7 @@ $result = $db_test->Execute($sql); while (!$result->EOF) { if (ZC_UPG_DEBUG==true) echo "120c-cfggroup13=attrb ==" . $result->fields['configuration_group_title'] . '
'; - if ($result->fields['configuration_group_title'] == 'Attribute Settings') { + if ($result->fields['configuration_group_title'] == '商品属性の設定') { $got_v1_2_0c = true; } $result->MoveNext(); diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/zc_install/includes/templates/template_default/templates/database_upgrade_default.php zen-cart-v1.2.0-l10n-jp-3/zc_install/includes/templates/template_default/templates/database_upgrade_default.php --- zen-cart-v1.2.0-l10n-jp-2/zc_install/includes/templates/template_default/templates/database_upgrade_default.php Wed Sep 1 13:48:22 2004 +++ zen-cart-v1.2.0-l10n-jp-3/zc_install/includes/templates/template_default/templates/database_upgrade_default.php Fri May 6 17:32:48 2005 @@ -82,6 +82,11 @@ name="version[]" type="checkbox" id="checkbox6" value="1.1.4u" tabindex="6" >
+
+ name="version[]" type="checkbox" id="checkbox6" value="1.2.0jp" tabindex="6" > + +
+
diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/zc_install/mysql_upgrade_zencart_120jp2_to_3.sql zen-cart-v1.2.0-l10n-jp-3/zc_install/mysql_upgrade_zencart_120jp2_to_3.sql --- zen-cart-v1.2.0-l10n-jp-2/zc_install/mysql_upgrade_zencart_120jp2_to_3.sql Thu Jan 1 09:00:00 1970 +++ zen-cart-v1.2.0-l10n-jp-3/zc_install/mysql_upgrade_zencart_120jp2_to_3.sql Fri May 6 17:32:47 2005 @@ -0,0 +1,8 @@ +# This SQL script upgrades the core Zen Cart database structure from v1.2.0-l10n-jp-2 to v1.2.0-l10n-jp-3 +# +# 2005/05/06 shida@zen-cart.jp + + +UPDATE configuration SET configuration_title = 'アカウント作成時の個人情報確認画面表示', configuration_description = 'アカウントを作成する画面で個人情報の確認画面を表示します。
2005年4月1日に施行された「個人情報保護法」では、個人情報保護方針を開示することが求められています。
', configuration_value='true' WHERE configuration_key = 'DISPLAY_PRIVACY_CONDITIONS'; +INSERT INTO configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) VALUES ('お問い合わせ時の個人情報確認画面表示', 'DISPLAY_CONTACT_US_PRIVACY_CONDITIONS', 'true', 'お問い合わせする画面で個人情報の確認画面を表示します。
2005年4月1日に施行された「個人情報保護法」では、個人情報保護方針を開示することが求められています。
', '11', '3', 'zen_cfg_select_option(array(\'true\', \'false\'), ', now()); + diff -u -r -N -I $Id zen-cart-v1.2.0-l10n-jp-2/zc_install/mysql_zencart.sql zen-cart-v1.2.0-l10n-jp-3/zc_install/mysql_zencart.sql --- zen-cart-v1.2.0-l10n-jp-2/zc_install/mysql_zencart.sql Fri Apr 22 18:16:46 2005 +++ zen-cart-v1.2.0-l10n-jp-3/zc_install/mysql_zencart.sql Fri May 6 14:17:13 2005 @@ -3457,7 +3457,7 @@ UPDATE configuration SET configuration_title = '「メンテナンス中」 -メンテナンス期間を表示', configuration_description = 'メンテナンスの期間を表示しますか?

\r\n・true=on
\r\n・false=off' WHERE configuration_key = 'DISPLAY_MAINTENANCE_PERIOD'; UPDATE configuration SET configuration_title = 'メンテナンス期間', configuration_description = 'メンテナンス期間を設定します。
\r\n【書式】(hh:mm)' WHERE configuration_key = 'TEXT_MAINTENANCE_PERIOD_TIME'; UPDATE configuration SET configuration_title = '注文手続き時の確認画面表示', configuration_description = 'チェックアウト(清算処理)の際、料金や配送などの条件の確認画面を表示しますか?' WHERE configuration_key = 'DISPLAY_CONDITIONS_ON_CHECKOUT'; -UPDATE configuration SET configuration_title = 'アカウント作成時の個人情報確認画面表示', configuration_description = 'アカウントを作成する画面で個人情報の確認画面を表示します。' WHERE configuration_key = 'DISPLAY_PRIVACY_CONDITIONS'; +UPDATE configuration SET configuration_title = 'アカウント作成時の個人情報確認画面表示', configuration_description = 'アカウントを作成する画面で個人情報の確認画面を表示します。
2005年4月1日に施行された「個人情報保護法」では、個人情報保護方針を開示することが求められています。
', configuration_value='true' WHERE configuration_key = 'DISPLAY_PRIVACY_CONDITIONS'; UPDATE configuration SET configuration_title = '商品画像を表示', configuration_description = '商品画像を表示しますか?
\r\n
\r\n・0= off
\r\n・1桁目：左か右か
\r\n・2・3桁目：(他の表示項目との)ソート順
\r\n・4桁目：表示後の改行(br)数
' WHERE configuration_key = 'PRODUCT_NEW_LIST_IMAGE'; UPDATE configuration SET configuration_title = '商品の数量を表示', configuration_description = '商品数量を表示しますか?
\r\n
\r\n・0= off
\r\n・1桁目：左か右か
\r\n・2・3桁目：(他の表示項目との)ソート順
\r\n・4桁目：表示後の改行(br)数
' WHERE configuration_key = 'PRODUCT_NEW_LIST_QUANTITY'; UPDATE configuration SET configuration_title = '「今すぐ買う」ボタンの表示', configuration_description = '「今すぐ買う」ボタンを表示しますか?
\r\n
\r\n・0= off
\r\n・1桁目：左か右か
\r\n・2・3桁目：(他の表示項目との)ソート順
\r\n・4桁目：表示後の改行(br)数
' WHERE configuration_key = 'PRODUCT_NEW_BUY_NOW'; @@ -3516,7 +3516,7 @@ UPDATE configuration SET configuration_title = 'トップレベル(親)カテゴリの商品リスト表示 - フィルタ表示・全商品表示', configuration_description = '現在のメインカテゴリに商品リストが適用された際、商品をフィルタ表示しますか? それとも全カテゴリから商品を表示しますか?
\r\n・0= Filter\r\n・Off 1=Filter On ' WHERE configuration_key = 'SHOW_PRODUCT_INFO_ALL_PRODUCTS'; UPDATE configuration SET configuration_title = 'トップページの定義領域 - ステータス', configuration_description = '編集された領域の表示を行いますか?
\r\n・0= OFF
\r\n・1= ON' WHERE configuration_key = 'DEFINE_MAIN_PAGE_STATUS'; UPDATE configuration SET configuration_title = '「お問い合わせ」ページの表示 - ステータス', configuration_description = '編集された「お問い合わせ」テキストを表示しますか?
\r\n・0= OFF
\r\n・1= ON' WHERE configuration_key = 'DEFINE_CONTACT_US_STATUS'; -UPDATE configuration SET configuration_title = '「個人情報保護指針」表示 - ステータス', configuration_description = '編集された「個人情報保護指針」を表示しますか?
\r\n・0= OFF
\r\n・1= ON' WHERE configuration_key = 'DEFINE_PRIVACY_STATUS'; +UPDATE configuration SET configuration_title = '「個人情報保護方針」表示 - ステータス', configuration_description = '編集された「個人情報保護方針」を表示しますか?
\r\n・0= OFF
\r\n・1= ON' WHERE configuration_key = 'DEFINE_PRIVACY_STATUS'; UPDATE configuration SET configuration_title = '「配送・送料について」 ページ - ステータス', configuration_description = '編集された「配送・送料について」テキストを表示しますか?
\r\n・0= OFF
\r\n・1= ON' WHERE configuration_key = 'DEFINE_SHIPPINGINFO_STATUS'; UPDATE configuration SET configuration_title = '「ご利用規約」ページ - ステータス', configuration_description = '編集された「ご利用規約」ページを表示しますか?
\r\n・0= OFF
\r\n・1= ON' WHERE configuration_key = 'DEFINE_CONDITIONS_STATUS'; UPDATE configuration SET configuration_title = '「ご注文が完了しました」ページ - ステータス', configuration_description = '編集された「ご注文が完了しました」テキストを表示しますか?
\r\n・0= OFF
\r\n・1= ON' WHERE configuration_key = 'DEFINE_CHECKOUT_SUCCESS_STATUS'; @@ -3608,6 +3608,8 @@ UPDATE configuration SET configuration_value = 'false' WHERE configuration_key = 'MODULE_PAYMENT_CC_COLLECT_CVV'; UPDATE configuration SET configuration_value = '0' WHERE configuration_key = 'SHOW_CATEGORIES_ALWAYS'; UPDATE configuration SET configuration_value = '107' WHERE configuration_key = 'SHOW_CREATE_ACCOUNT_DEFAULT_COUNTRY'; + +INSERT INTO configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) VALUES ('お問い合わせ時の個人情報確認画面表示', 'DISPLAY_CONTACT_US_PRIVACY_CONDITIONS', 'true', 'お問い合わせする画面で個人情報の確認画面を表示します。
2005年4月1日に施行された「個人情報保護法」では、個人情報保護方針を開示することが求められています。
', '11', '3', 'zen_cfg_select_option(array(\'true\', \'false\'), ', now()); #マスターテーブル #住所フォーマット追加