Changeset 18007 for branches/version-2/data/class/pages/frontparts

Timestamp:

2009/05/15 16:30:40 (17 years ago)

Author:

kajiwara

Message:

2.4.0 正式版のコミット。コミット内容の詳細はこちら（http://svn.ec-cube.net/open_trac/query?status=closed&milestone=EC-CUBE2.4.0）

Location:

branches/version-2/data/class/pages/frontparts

Files:

• LC_Page_FrontParts_LoginCheck.php (modified) (2 diffs)
• bloc/LC_Page_FrontParts_Bloc_Calendar.php (modified) (3 diffs)

branches/version-2/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php

@@ -67 +67 @@
         // パラメータ情報の初期化
         $this->lfInitParam();
+        //パスワード・Eメールにある空白をトリム
+        $_POST["login_email"] = preg_replace('/^[ 　\r\n]*(.*?)[ 　\r\n]*$/u', '$1', $_POST["login_email"]);
+        $_POST["login_pass"] = trim($_POST["login_pass"]); //認証用
+        $_POST["login_pass1"] = $_POST["login_pass"];      //最小桁数比較用
+        $_POST["login_pass2"] = $_POST["login_pass"];      //最大桁数比較用
         // POST値の取得
         $this->objFormParam->setParam($_POST);
@@ -139 +144 @@
         $this->objFormParam->addParam("記憶する", "login_memory", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("メールアドレス", "login_email", MTEXT_LEN, "a", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "EMAIL_CHECK", "NO_SPTAB" ,"EMAIL_CHAR_CHECK"));
-        $this->objFormParam->addParam("パスワード", "login_pass", MTEXT_LEN, "", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("パスワード", "login_pass", PASSWORD_LEN1, "", array("EXIST_CHECK"));
+        $this->objFormParam->addParam("パスワード", "login_pass1", PASSWORD_LEN1, "", array("EXIST_CHECK", "MIN_LENGTH_CHECK"));
+        $this->objFormParam->addParam("パスワード", "login_pass2", PASSWORD_LEN2, "", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
     }
 }

branches/version-2/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php

@@ -63 +63 @@
         }
 
+        // 休日取得取得
+        $this->arrHoliday = $this->lfGetHoliday();
+
         // 定休日取得取得
-        $this->arrHoliday = $this->lfGetHoliday();
+        $this->arrRegularHoliday = $this->lfGetRegularHoliday();
 
         // カレンダーデータ取得
@@ -127 +130 @@
                 $arrCalendar[$j][$i]['month'] = $month;
                 $arrCalendar[$j][$i]['day'] = $Day->day;
-                if ($this->lfCheckHoliday($month, $Day->day) || $Day->first || $Day->last) {
+                if ($this->lfCheckHoliday($year, $month, $Day->day)) {
                     $arrCalendar[$j][$i]['holiday'] = true;
                 } else {
@@ -152 +155 @@
     }
 
+    // 定休日取得
+    function lfGetRegularHoliday() {
+        $objSIteInfo = new SC_SiteInfo();
+        $arrRegularHoliday = explode('|', $objSIteInfo->data['regular_holiday_ids']);
+        return $arrRegularHoliday;
+    }
     // 休日チェック
-    function lfCheckHoliday($month, $day) {
+    function lfCheckHoliday($year, $month, $day) {
         if (!empty($this->arrHoliday[$month])) {
             if (in_array($day, $this->arrHoliday[$month])) {
+                return true;
+            }
+        }
+        if (!empty($this->arrRegularHoliday)) {
+            $w = date('w', mktime(0,0,0 ,$month, $day, $year));
+            if (in_array($w, $this->arrRegularHoliday)) {
                 return true;
             }