Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x

framework/router.class.php

@@ -559,6 +559,12 @@ class router extends baseRouter
             $passedParams = array_reverse($passedParams);
         }
 
+        /* Fix bug #3267. Param 'words' is not validated when searching. */
+        if($this->rawModule == 'search' and $this->rawMethod == 'index')
+        {
+            unset($passedParams['words']);
+        }
+
         /* display参数用来标记请求是否来自禅道客户端的卡片展示页面，此处应该删掉以避免对方法调用产生影响。 */
         /* The display parameter is used to mark whether the request comes from the card display page of the ZenTao client. It should be deleted here to avoid affecting the method call. */
         unset($passedParams['display']);

module/install/view/step4.html.php

@@ -10,6 +10,7 @@
  */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
+<style>.modal-body table tr th{text-align: left}</style>
 <div class='container'>
   <div class='modal-dialog'>
   <?php if(isset($error)):?>
@@ -46,7 +47,7 @@
       <form method='post' target='hiddenwin'>
         <table class='table table-form mw-400px' style='margin: 0 auto'>
           <tr>
-            <th class='w-200px'><?php echo $lang->install->company;?></th>
+            <th class='w-80px'><?php echo $lang->install->company;?></th>
             <td class='w-300px'><?php echo html::input('company', '', "class='form-control'");?></td>
           </tr>
           <tr>

module/todo/control.php

@@ -558,10 +558,11 @@ class todo extends control
 
             $this->post->set('fields', $fields);
             $this->post->set('rows', $todos);
-            $this->post->set('kind', 'todo');
+            $this->post->set('kind', $this->lang->todo->common);
             $this->fetch('file', 'export2' . $this->post->fileType, $_POST);
         }
 
+        $this->view->fileName = $this->app->user->account . ' - ' . $this->lang->todo->common;
         $this->display();
     }