Changeset 18519 for branches/version-2_4/data/class

Timestamp:

2010/02/01 12:52:38 (16 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/default/admin/contents/inquiry.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fcontents%2Finquiry.tpl
data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php 15662@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents_Inquiry.php

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

1890

bzr:revprop:branch-nick:

branches/version-2_4

bzr:root:

branches/version-2_4

bzr:text-parents:

data/Smarty/templates/default/admin/contents/inquiry.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/feature-module-update:16761
data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:17845

bzr:timestamp:

2010-02-01 12:52:35.042999983 +0900

bzr:user-agent:

bzr2.0.3+bzr-svn1.0.1

svn:original-date:

2010-02-01T03:52:35.043000Z

Message:

merged r18468:18470

• [アンケート管理]チェックボックスの回答に同じ回答を登録した場合に不具合となる場合がある(#535)

File:

• branches/version-2_4/data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php (modified) (2 diffs)

branches/version-2_4/data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php

@@ -110 +110 @@
                 for ( $j=0; $j<count( $_POST['question'][$i]['option'] ); $j++ ){
                     $_POST['question'][$i]['option'][$j] = mb_convert_kana( trim ( $_POST['question'][$i]['option'][$j] ) );
+                }
+            }
+
+            for( $i = 0; $i < count( $_POST["question"] ); $i++ ) {
+                if( $_POST["question"][$i]["kind"] == 3 || $_POST["question"][$i]["kind"] == 4  ) {
+                    $temp_data = array();
+                    // 項目間（テキストボックス）があいていたら詰めていく
+                    for( $j = 0; $j < count( $_POST["question"][$i]["option"] ); $j++ ) {
+                        if( strlen( $_POST["question"][$i]["option"][$j] ) > 0 ) $temp_data[] = mb_convert_kana( trim ( $_POST["question"][$i]["option"][$j]  ), "asKVn" );
+                    }
+                    $_POST["question"][$i]["option"] = $temp_data;
+                } else {
+                    $_POST["question"][$i]["option"] = NULL;
                 }
             }
@@ -294 +307 @@
             if( $_POST["question"][$i]["kind"] == 3 || $_POST["question"][$i]["kind"] == 4  ) {
 
-                $temp_data = array();
                 for( $j = 0; $j < count( $_POST["question"][$i]["option"] ); $j++ ) {
-
-                    // 項目間（テキストボックス）があいていたら詰めていく
-                    if( strlen( $_POST["question"][$i]["option"][$j] ) > 0 ) $temp_data[] = mb_convert_kana( trim ( $_POST["question"][$i]["option"][$j]  ), "asKVn" );
-
-                }
-
-                $_POST["question"][$i]["option"] = $temp_data;
+                    // 同じ回答がないかチェック
+                    if (strlen($_POST["question"][$i]["option"][$j]) > 0) {
+                        $checkArray = $_POST["question"][$i]["option"];
+                        // 自身の値をunset
+                        unset($checkArray[$j]);
+                        if (in_array($_POST["question"][$i]["option"][$j], $checkArray)) {
+                            $objErr->arrErr["question"][$i]["option"][$j] = "同じ質問に同じ回答は設定出来ません。";
+                        }
+                    }
+                }
 
                 if( ( strlen( $_POST["question"][$i] ["option"][0] ) == 0 ) || ( strlen( $_POST["question"][$i] ["option"][0] ) > 0
                                                                                  && strlen( $_POST["question"][$i] ["option"][1] ) == 0 ) ) $objErr->arrErr["question"][$i]['kind'] = "下記の2つ以上の項目に記入してください。";
+
             }
         }