Changeset 22278 for branches/version-2_12-multilang/data

Timestamp:

2013/01/18 17:04:44 (11 years ago)

Author:

m_uehara

Message:

#1955 r22097 - r22098 , r22104 - r22107 , r22111 - r22120 , r22123 - r22129 , r22133 , r22135 - r22143 , r22145 - r22146 , r22158 , r22164 - r22165 , r22167 - r22169 , r22187 - r22196 , r22199 - r22204, r22219 - r22261 間のコミットをマージします。

Location:

branches/version-2_12-multilang

Files:

• . (modified) (1 prop)
• data (modified) (1 prop)
• data/Smarty/templates/default/contact/confirm.tpl (modified) (2 diffs)
• data/Smarty/templates/default/products/review_confirm.tpl (modified) (2 diffs)
• data/Smarty/templates/default_en-US/contact/confirm.tpl (modified) (2 diffs)
• data/Smarty/templates/default_en-US/products/review_confirm.tpl (modified) (2 diffs)
• data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php (modified) (1 diff)
• data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php (modified) (1 diff)
• data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php (modified) (1 diff)

branches/version-2_12-multilang/data/Smarty/templates/default/contact/confirm.tpl

@@ -38 +38 @@
             <col width="70%" />
             <tr>
-                <th>お名前<span class="attention">※</span></th>
+                <th>お名前</th>
                 <td><!--{$arrForm.name01.value|h}-->　<!--{$arrForm.name02.value|h}--></td>
             </tr>
             <tr>
-                <th>お名前(フリガナ)<span class="attention">※</span></th>
+                <th>お名前(フリガナ)</th>
                 <td><!--{$arrForm.kana01.value|h}-->　<!--{$arrForm.kana02.value|h}--></td>
             </tr>
@@ -71 +71 @@
             </tr>
             <tr>
-                <th>メールアドレス<span class="attention">※</span></th>
+                <th>メールアドレス</th>
                 <td><a href="mailto:<!--{$arrForm.email.value|escape:'hex'}-->"><!--{$arrForm.email.value|escape:'hexentity'}--></a></td>
             </tr>
             <tr>
-                <th>お問い合わせ内容<span class="attention">※</span></th>
+                <th>お問い合わせ内容</th>
                 <td><!--{$arrForm.contents.value|h|nl2br}--></td>
             </tr>

branches/version-2_12-multilang/data/Smarty/templates/default/products/review_confirm.tpl

@@ -42 +42 @@
         </tr>
         <tr>
-            <th>投稿者名<span class="attention">※</span></th>
+            <th>投稿者名</th>
             <td><!--{$arrForm.reviewer_name|h}--></td>
         </tr>
@@ -54 +54 @@
         </tr>
         <tr>
-            <th>おすすめレベル<span class="attention">※</span></th>
+            <th>おすすめレベル</th>
             <td><span class="recommend_level"><!--{$arrRECOMMEND[$arrForm.recommend_level]}--></span></td>
         </tr>
         <tr>
-            <th>タイトル<span class="attention">※</span></th>
+            <th>タイトル</th>
             <td><!--{$arrForm.title|h}--></td>
         </tr>
         <tr>
-            <th>コメント<span class="attention">※</span></th>
+            <th>コメント</th>
             <td><!--{$arrForm.comment|h|nl2br}--></td>
         </tr>

branches/version-2_12-multilang/data/Smarty/templates/default_en-US/contact/confirm.tpl

@@ -38 +38 @@
             <col width="70%" />
             <tr>
-                <th>First Name<span class="attention">*</span></th>
+                <th>First Name</th>
                 <td><!--{$arrForm.name01.value|h}--> <!--{$arrForm.name02.value|h}--></td>
             </tr>
@@ -67 +67 @@
             </tr>
             <tr>
-                <th>E-mail address<span class="attention">*</span></th>
+                <th>E-mail address</th>
                 <td><a href="mailto:<!--{$arrForm.email.value|escape:'hex'}-->"><!--{$arrForm.email.value|escape:'hexentity'}--></a></td>
             </tr>
             <tr>
-                <th>Details of inquiry<span class="attention">*</span></th>
+                <th>Details of inquiry</th>
                 <td><!--{$arrForm.contents.value|h|nl2br}--></td>
             </tr>

branches/version-2_12-multilang/data/Smarty/templates/default_en-US/products/review_confirm.tpl

@@ -42 +42 @@
         </tr>
         <tr>
-            <th>Poster name<span class="attention">*</span></th>
+            <th>Poster name</th>
             <td><!--{$arrForm.reviewer_name|h}--></td>
         </tr>
@@ -54 +54 @@
         </tr>
         <tr>
-            <th>Recommendation level<span class="attention">*</span></th>
+            <th>Recommendation level</th>
             <td><span class="recommend_level"><!--{$arrRECOMMEND[$arrForm.recommend_level]}--></span></td>
         </tr>
         <tr>
-            <th>Title<span class="attention">*</span></th>
+            <th>Title</th>
             <td><!--{$arrForm.title|h}--></td>
         </tr>
         <tr>
-            <th>Comment<span class="attention">*</span></th>
+            <th>Comment</th>
             <td><!--{$arrForm.comment|h|nl2br}--></td>
         </tr>

branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php

@@ -221 +221 @@
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
-        if (!SC_Utils_Ex::sfIsInt($objFormParam->getValue('template_id'))) {
-            trigger_error('テンプレートが指定されていません。', E_USER_ERROR);
-        }
-
-        $where = 'template_id = ?';
-        $arrWhereVal = array($objFormParam->getValue('template_id'));
-        $mailTemplates = $objQuery->getRow('subject, header, footer', 'dtb_mailtemplate', $where, $arrWhereVal);
+        $template_id = $objFormParam->getValue('template_id');
+
+        // 未選択時
+        if (strlen($template_id) === 0) {
+            $mailTemplates = null;
+        }
+        // 有効選択時
+        elseif (SC_Utils_Ex::sfIsInt($template_id)) {
+            $where = 'template_id = ?';
+            $arrWhereVal = array($template_id);
+            $mailTemplates = $objQuery->getRow('subject, header, footer', 'dtb_mailtemplate', $where, $arrWhereVal);
+        }
+        // 不正選択時
+        else {
+            trigger_error('テンプレートの指定が不正。', E_USER_ERROR);
+        }
+
         if (empty($mailTemplates)) {
             foreach (array('subject','header','footer') as $key) {

branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php

@@ -88 +88 @@
                 $this->arrErr = $objFormParam->checkError();
                 // エラー無し
-                if (!SC_Utils_Ex::isBlank($this->arrErr)) {
+                if (SC_Utils_Ex::isBlank($this->arrErr)) {
                     // レビュー情報の更新
                     $this->lfRegistReviewData($this->arrForm['review_id'], $objFormParam);

branches/version-2_12-multilang/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php

@@ -584 +584 @@
 
         // 在庫無制限フラグ列を利用する場合、
-        if (array_key_exists('stock_unlimited', $sqlval)) {
+        if (array_key_exists('stock_unlimited', $sqlval) and $sqlval['stock_unlimited'] != '') {
             // 在庫無制限フラグ = 無制限の場合、
             if ($sqlval['stock_unlimited'] == UNLIMITED_FLG_UNLIMITED) {