Changeset 23502

Timestamp:

2014/06/03 14:00:32 (10 years ago)

Author:

shutta

Message:

#2448 typo修正・ソース整形・ソースコメントの改善 for 2.13.3

Location:

branches/version-2_13-dev/data/class

Files:

• pages/shopping/LC_Page_Shopping.php (modified) (2 diffs)
• util/SC_Utils.php (modified) (10 diffs)

branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php

@@ -49 +49 @@
         $this->tpl_onload = 'eccube.toggleDeliveryForm();';
 
-        $objDate = new SC_Date_Ex(BIRTH_YEAR, date('Y',strtotime('now')));
+        $objDate = new SC_Date_Ex(BIRTH_YEAR, date('Y', strtotime('now')));
         $this->arrYear = $objDate->getYear('', START_BIRTH_YEAR, '');
         $this->arrMonth = $objDate->getMonth(true);
@@ -299 +299 @@
     {
         $objFormParam->addParam('記憶する', 'login_memory', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-        $objFormParam->addParam('メールアドレス', 'login_email', '' , 'a', array('EXIST_CHECK', 'EMAIL_CHECK', 'SPTAB_CHECK' ,'EMAIL_CHAR_CHECK'));
+        $objFormParam->addParam('メールアドレス', 'login_email', '', 'a', array('EXIST_CHECK', 'EMAIL_CHECK', 'SPTAB_CHECK', 'EMAIL_CHAR_CHECK'));
         $objFormParam->addParam('パスワード', 'login_pass', PASSWORD_MAX_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
 

branches/version-2_13-dev/data/class/util/SC_Utils.php

@@ -343 +343 @@
 
         if (mb_internal_encoding() == CHAR_CODE) {
-            $data = mb_convert_encoding($data,'SJIS-Win',CHAR_CODE);
+            $data = mb_convert_encoding($data, 'SJIS-Win', CHAR_CODE);
         }
 
@@ -619 +619 @@
         $error = 0;
         if ($start_month || $start_day || $start_year) {
-            if (! checkdate($start_month, $start_day , $start_year)) $error = 1;
+            if (! checkdate($start_month, $start_day, $start_year)) $error = 1;
         } else {
             $error = 1;
         }
         if ($end_month || $end_day || $end_year) {
-            if (! checkdate($end_month ,$end_day ,$end_year)) $error = 2;
+            if (! checkdate($end_month, $end_day, $end_year)) $error = 2;
         }
         if (! $error) {
-            $date1 = $start_year .'/'.sprintf('%02d',$start_month) .'/'.sprintf('%02d',$start_day) .' 000000';
-            $date2 = $end_year   .'/'.sprintf('%02d',$end_month)   .'/'.sprintf('%02d',$end_day)   .' 235959';
+            $date1 = $start_year .'/'.sprintf('%02d', $start_month) .'/'.sprintf('%02d', $start_day) .' 000000';
+            $date2 = $end_year   .'/'.sprintf('%02d', $end_month)   .'/'.sprintf('%02d', $end_day)   .' 235959';
             if ($date1 > $date2) $error = 3;
         } else {
@@ -733 +733 @@
     public function sfRound($value, $pow = 0)
     {
-        $adjust = pow(10 ,$pow-1);
+        $adjust = pow(10, $pow-1);
 
         // 整数且つ0でなければ桁数指定を行う
@@ -1103 +1103 @@
     public static function sfDBDatetoTime($db_date)
     {
-        $date = preg_replace("|\..*$|",'',$db_date);
+        $date = preg_replace("|\..*$|", '', $db_date);
         $time = strtotime($date);
 
@@ -1230 +1230 @@
 
                 $matches = array();
-                mb_ereg("^(.*[\/])(.*)",$data_, $matches);
+                mb_ereg("^(.*[\/])(.*)", $data_, $matches);
                 $data=$matches[2];
                 if (is_dir($data_)) {
@@ -1320 +1320 @@
         foreach ($arrConvList as $key => $val) {
             if (isset($array[$key])) {
-                $array[$key] = mb_convert_kana($array[$key] ,$val);
+                $array[$key] = mb_convert_kana($array[$key], $val);
             }
         }
@@ -1549 +1549 @@
 
         // 郵便番号検索文作成
-        $zipcode = mb_convert_kana($zipcode ,'n');
+        $zipcode = mb_convert_kana($zipcode, 'n');
         $sqlse = 'SELECT state, city, town FROM mtb_zip WHERE zipcode = ?';
 
@@ -1571 +1571 @@
          */
         $town =  $data_list[0]['town'];
-        $town = preg_replace("/（.*）$/",'',$town);
-        $town = preg_replace('/以下に掲載がない場合/','',$town);
-        $town = preg_replace('/(.*?)の次に番地がくる場合/','',$town);
+        $town = preg_replace("/（.*）$/", '', $town);
+        $town = preg_replace('/以下に掲載がない場合/', '', $town);
+        $town = preg_replace('/(.*?)の次に番地がくる場合/', '', $town);
         $data_list[0]['town'] = $town;
         $data_list[0]['state'] = $arrREV_PREF[$data_list[0]['state']];
@@ -2110 +2110 @@
      * @return bool true = exists / false does not exist
      */
-    public static function checkFileExistsWithInBasePath($file,$base_path)
-    {
-        $arrPath = explode('/', str_replace('\\', '/',$file));
-        $arrBasePath = explode('/', str_replace('\\', '/',$base_path));
-        $path_diff = implode("/",array_diff_assoc($arrPath, $arrBasePath));
-        return file_exists(realpath(str_replace('..','',$base_path . $path_diff))) ? true : false;
+    public static function checkFileExistsWithInBasePath($file, $base_path)
+    {
+        $arrPath = explode('/', str_replace('\\', '/', $file));
+        $arrBasePath = explode('/', str_replace('\\', '/', $base_path));
+        $path_diff = implode("/", array_diff_assoc($arrPath, $arrBasePath));
+        return file_exists(realpath(str_replace('..', '', $base_path . $path_diff))) ? true : false;
     }
 
@@ -2126 +2126 @@
     {
         $micro = explode(" ", microtime());
-        $micro_string = explode('.',$micro[0]);
-        return date('Y-m-d H:i:s') . "." . substr($micro_string[1],0,5);
+        $micro_string = explode('.', $micro[0]);
+        return date('Y-m-d H:i:s') . "." . substr($micro_string[1], 0, 5);
     }
 }