From eaeab89f534028b43133ee33962e219b271635eb Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 10 Mar 2017 11:59:01 +0800
Subject: [PATCH]  * finish task #2927.

---
 module/bug/control.php                   |  2 +-
 module/common/lang/zh-cn.php             |  1 +
 module/common/model.php                  |  5 +++++
 module/story/control.php                 |  4 ++--
 module/task/control.php                  |  2 +-
 module/testcase/control.php              |  2 +-
 module/testcase/view/showimport.html.php | 10 +++++++++-
 module/todo/control.php                  |  2 +-
 8 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 4648e5d613..0a582a7947 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -653,7 +653,7 @@ class bug extends control
         $showSuhosinInfo = false;
         $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($bugs), count(explode(',', $this->config->bug->custom->batchEditFields)) + 2);
         $this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
-        if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
+        if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? $this->lang->suhosinInfo : $this->lang->maxVarsInfo;
 
         /* Set Custom*/
         foreach(explode(',', $this->config->bug->list->customBatchEditFields) as $field) $customFields[$field] = $this->lang->bug->$field;
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 0007dc6424..bea944905a 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -429,6 +429,7 @@ $lang->proVersion     = "<a href='http://api.zentao.net/goto.php?item=proversion
 $lang->downNotify     = "下载桌面提醒";
 
 $lang->suhosinInfo   = "警告：数据太多，请在php.ini中修改<font color=red>sohusin.post.max_vars</font>和<font color=red>sohusin.request.max_vars</font>（设置更大的数）。 保存并重新启动apache，否则会造成部分数据无法保存。";
+$lang->maxVarsInfo   = "警告：数据太多，请在php.ini中修改<font color=red>max_input_vars</font>（设置更大的数）。 保存并重新启动apache，否则会造成部分数据无法保存。";
 $lang->pasteTextInfo = "粘贴文本到文本域中，每行文字作为一条数据的标题。";
 $lang->noticeImport  = "<p style='font-size:14px'>导入数据中，含有已经存在系统的数据，请确认这些数据要覆盖或者全新插入</p><p><a href='javascript:submitForm(\"cover\")' class='btn btn-mini'>覆盖</a> <a href='javascript:submitForm(\"insert\")' class='btn btn-mini'>全新插入</a></p>";
 
diff --git a/module/common/model.php b/module/common/model.php
index a77e454107..f1b12724d9 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -926,6 +926,11 @@ class commonModel extends model
             $maxRequestVars = ini_get('suhosin.request.max_vars');
             if($numberOfItems * $columns > $maxPostVars or $numberOfItems * $columns > $maxRequestVars) return true;
         }
+        else
+        {
+            $maxInputVars = ini_get('max_input_vars');
+            if($maxInputVars and $numberOfItems * $columns > (int)$maxInputVars) return true;
+        }
 
         return false;
     }
diff --git a/module/story/control.php b/module/story/control.php
index 9e272babeb..03ac463603 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -460,7 +460,7 @@ class story extends control
         $showSuhosinInfo = false;
         $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($stories), count(explode(',', $this->config->story->custom->batchEditFields)) + 3);
         $this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
-        if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
+        if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? $this->lang->suhosinInfo : $this->lang->maxVarsInfo;
 
         $this->view->position[]        = $this->lang->story->common;
         $this->view->position[]        = $this->lang->story->batchEdit;
@@ -813,7 +813,7 @@ class story extends control
         $showSuhosinInfo = false;
         $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($stories), $this->config->story->batchClose->columns);
         $this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
-        if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
+        if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? $this->lang->suhosinInfo : $this->lang->maxVarsInfo;
 
         $this->view->position[]       = $this->lang->story->common;
         $this->view->position[]       = $this->lang->story->batchClose;
diff --git a/module/task/control.php b/module/task/control.php
index da8f56d2be..09f504c31d 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -373,7 +373,7 @@ class task extends control
         $showSuhosinInfo = false;
         $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($tasks), count(explode(',', $this->config->task->custom->batchEditFields)) + 3);
         $this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
-        if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
+        if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? $this->lang->suhosinInfo : $this->lang->maxVarsInfo;
 
         /* Set Custom*/
         foreach(explode(',', $this->config->task->customBatchEditFields) as $field) $customFields[$field] = $this->lang->task->$field;
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 21d8d27c5a..2e3210042a 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -751,7 +751,7 @@ class testcase extends control
         $showSuhosinInfo = false;
         $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($cases), count(explode(',', $this->config->testcase->custom->batchEditFields)) + 3);
         $this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
-        if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
+        if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? $this->lang->suhosinInfo : $this->lang->maxVarsInfo;
 
         $this->loadModel('story');
         $this->view->stories = $this->story->getProductStoryPairs($productID, $case->branch);
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index f34c22b13e..7fbfcb524a 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -30,7 +30,7 @@
     </tr>
   </thead>
   <tbody>
-  <?php $insert = true;?>
+  <?php $insert = true; $inputVars = 0;?>
   <?php foreach($caseData as $key => $case):?>
   <?php if(empty($case->title)) continue;?>
   <tr valign='top' align='center'>
@@ -69,11 +69,13 @@
           <td><?php echo html::textarea("desc[$key][$id]", htmlspecialchars($desc['content']), "class='form-control'")?></td>
           <td><?php if($desc['type'] == 'item') echo html::textarea("expect[$key][$id]", isset($stepData[$key]['expect'][$id]['content']) ? htmlspecialchars($stepData[$key]['expect'][$id]['content']) : '', "class='form-control'")?></td>
         </tr>
+        <?php $inputVars += $desc['type'] == 'item' ? 3 : 2;?>
       <?php endforeach;?>
       </table>
       <?php endif;?>
     </td>
   </tr>
+  <?php $inputVars += 12;?>
   <?php endforeach;?>
   </tbody>
   <tfoot>
@@ -97,6 +99,12 @@
 </table>
 </form>
 <script>
+<?php
+$maxInputVars = ini_get('max_input_vars');
+if($maxInputVars and (int)$maxInputVars < $inputVars):
+?>
+$(function(){$('.outer form table:first').before("<div class='alert alert-warning'><?php echo $lang->maxVarsInfo . " ($inputVars)"?></div>")})
+<?php endif;?>
 $(function(){affix('thead')})
 function affix(obj)
 {
diff --git a/module/todo/control.php b/module/todo/control.php
index 554287ea9d..2b0a19c9a5 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -203,7 +203,7 @@ class todo extends control
             $position[] = $this->lang->todo->common;
             $position[] = $this->lang->todo->batchEdit;
 
-            if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
+            if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? $this->lang->suhosinInfo : $this->lang->maxVarsInfo;
             $this->view->bugs        = $bugs;
             $this->view->tasks       = $tasks;
             $this->view->editedTodos = $editedTodos;