diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-3/ChangeLog zen-cart-v1.2.0-l10n-jp-4/ChangeLog --- zen-cart-v1.2.0-l10n-jp-3/ChangeLog 2005-05-06 17:43:04.000000000 +0900 +++ zen-cart-v1.2.0-l10n-jp-4/ChangeLog 2006-01-09 16:20:21.000000000 +0900 @@ -1,3 +1,45 @@ +2006-01-09 15:56 shida + + * ChangeLog, INSTALL.TXT: + 1.2.0-l10n-jp-4のリリース + +2006-01-09 15:44 shida + + * admin/password_forgotten.php: + 2005/12/4に発表されたSQL INJECTIONの脆弱性の修正 + http://www.zen-cart.com/modules/mydownloads/singlefile.php?lid=544 + +2005-07-26 17:33 shida + + * includes/languages/japanese.php: + 佐々木2号さんがご指摘。 + + 実際は、クーポン券やギフト券が利用できる場合に表示されるので + あってないような気がします。 + 「Credit」には、(銀行の)預金(額)という意味もあるのでここで用いられる意味は、 + そちらの方ではないかと思います。 + + ありがとうございます。 m(_ _)m + +2005-07-24 17:06 shida + + * includes/languages/japanese/: create_account.php: + リンクをはる場所がちがっている + +2005-07-24 16:43 shida + + * includes/templates/template_default/templates/: + tpl_create_account_default.php: 姓、名の順が逆だった + +2005-06-02 13:24 shida + + * admin/includes/functions/general.php: 生年月日の1970年問題 + http://zen-cart.jp/pukiwiki/155.html のバグフィクス + + の対応洩れ。 http://zen-cart.jp/bbs/viewtopic.php?t=1260#7270 + にてhide-10さんよりご指摘いただきました。 + ありがとうございます。m(_ _)m + 2005-05-06 17:34 shida * INSTALL.TXT: v1.2.0-l10n-jp-3のリリース diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-3/INSTALL.TXT zen-cart-v1.2.0-l10n-jp-4/INSTALL.TXT --- zen-cart-v1.2.0-l10n-jp-3/INSTALL.TXT 2005-05-06 17:35:17.000000000 +0900 +++ zen-cart-v1.2.0-l10n-jp-4/INSTALL.TXT 2006-01-09 15:57:54.000000000 +0900 @@ -1,6 +1,6 @@ Zen Cart - The Art of E-Commerce -Version 1.2.0-l10n-jp-3 +Version 1.2.0-l10n-jp-4 Zen Cartの導入は自動インストールシステムによって行います。 diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-3/admin/includes/functions/general.php zen-cart-v1.2.0-l10n-jp-4/admin/includes/functions/general.php --- zen-cart-v1.2.0-l10n-jp-3/admin/includes/functions/general.php 2005-01-12 18:16:21.000000000 +0900 +++ zen-cart-v1.2.0-l10n-jp-4/admin/includes/functions/general.php 2005-06-02 13:24:44.000000000 +0900 @@ -171,8 +171,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))); } @@ -2898,4 +2898,62 @@ } } +/////// +// 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; + } + ?> \ No newline at end of file diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-3/admin/password_forgotten.php zen-cart-v1.2.0-l10n-jp-4/admin/password_forgotten.php --- zen-cart-v1.2.0-l10n-jp-3/admin/password_forgotten.php 2004-11-22 07:57:25.000000000 +0900 +++ zen-cart-v1.2.0-l10n-jp-4/admin/password_forgotten.php 2006-01-09 15:44:41.000000000 +0900 @@ -44,7 +44,7 @@ $admin_email = zen_db_prepare_input($_POST['admin_email']); - $sql = "select admin_id, admin_name, admin_email, admin_pass from " . TABLE_ADMIN . " where admin_email = '" . $admin_email . "'"; + $sql = "select admin_id, admin_name, admin_email, admin_pass from " . TABLE_ADMIN . " where admin_email = '" . zen_db_input($admin_email) . "'"; $result = $db->Execute($sql); diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese/create_account.php zen-cart-v1.2.0-l10n-jp-4/includes/languages/japanese/create_account.php --- zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese/create_account.php 2005-05-06 13:21:22.000000000 +0900 +++ zen-cart-v1.2.0-l10n-jp-4/includes/languages/japanese/create_account.php 2005-07-24 17:07:18.000000000 +0900 @@ -24,7 +24,7 @@ define('HEADING_TITLE', 'アカウント作成'); -define('TEXT_ORIGIN_LOGIN', '注意:すでに当ショップでのアカウントをお持ちの場合は、こちらからログインしてください。.'); +define('TEXT_ORIGIN_LOGIN', '注意:すでに当ショップでのアカウントをお持ちの場合は、こちらからログインしてください。'); // greeting salutation define('EMAIL_SUBJECT', STORE_NAME . 'へようこそ'); diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese.php zen-cart-v1.2.0-l10n-jp-4/includes/languages/japanese.php --- zen-cart-v1.2.0-l10n-jp-3/includes/languages/japanese.php 2005-05-06 13:21:22.000000000 +0900 +++ zen-cart-v1.2.0-l10n-jp-4/includes/languages/japanese.php 2005-07-26 17:33:01.000000000 +0900 @@ -356,7 +356,7 @@ define('CART_COUPON', 'クーポン:'); define('CART_COUPON_INFO', '追加情報'); -define('TABLE_HEADING_CREDIT_PAYMENT', 'ご利用可能なクレジットカード'); +define('TABLE_HEADING_CREDIT_PAYMENT', '下記のお支払いや割引も併用できます。'); define('TEXT_INVALID_REDEEM_COUPON', '無効なクーポンコード'); define('TEXT_INVALID_STARTDATE_COUPON', 'このクーポンはまだ使用できません'); diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-3/includes/templates/template_default/templates/tpl_create_account_default.php zen-cart-v1.2.0-l10n-jp-4/includes/templates/template_default/templates/tpl_create_account_default.php --- zen-cart-v1.2.0-l10n-jp-3/includes/templates/template_default/templates/tpl_create_account_default.php 2004-12-04 13:24:22.000000000 +0900 +++ zen-cart-v1.2.0-l10n-jp-4/includes/templates/template_default/templates/tpl_create_account_default.php 2005-07-24 16:45:12.000000000 +0900 @@ -69,13 +69,14 @@ } ?> - - ' . ENTRY_FIRST_NAME_TEXT . '': ''); ?> - - ' . ENTRY_LAST_NAME_TEXT . '': ''); ?> + + + ' . ENTRY_FIRST_NAME_TEXT . '': ''); ?> + +