From e89466212bba459a3f6f58425abdbb3fdda09207 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Thu, 25 Mar 2010 12:29:43 +0000
Subject: [PATCH]  + add the require fields of user module.

---
 module/user/config.php           |  3 +++
 module/user/model.php            |  4 ++--
 module/user/view/create.html.php | 18 ++++++++----------
 module/user/view/edit.html.php   | 25 ++++++++++---------------
 4 files changed, 23 insertions(+), 27 deletions(-)
 create mode 100644 module/user/config.php

diff --git a/module/user/config.php b/module/user/config.php
new file mode 100644
index 0000000000..ac33415cb8
--- /dev/null
+++ b/module/user/config.php
@@ -0,0 +1,3 @@
+<?php
+$config->user->create->requiredFields = 'account,realname,password,password1,password2';
+$config->user->edit->requiredFields   = 'account,realname';
diff --git a/module/user/model.php b/module/user/model.php
index c6374b4e11..c2832cbf06 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -96,7 +96,7 @@ class userModel extends model
 
         $this->dao->insert(TABLE_USER)->data($user)
             ->autoCheck()
-            ->batchCheck('account, realname, password', 'notempty')
+            ->batchCheck($this->config->user->create->requiredFields, 'notempty')
             ->check('account', 'unique')
             ->check('account', 'account')
             ->checkIF($this->post->email != false, 'email', 'email')
@@ -119,7 +119,7 @@ class userModel extends model
 
         $this->dao->update(TABLE_USER)->data($user)
             ->autoCheck()
-            ->batchCheck('account, realname', 'notempty')
+            ->batchCheck($this->config->user->edit->requiredFields, 'notempty')
             ->check('account', 'unique', "id != '$userID'")
             ->check('account', 'account')
             ->checkIF($this->post->email != false, 'email', 'email')
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index ec6bffeb30..d789822d56 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -30,23 +30,23 @@
       <caption><?php echo $lang->user->create;?></caption>
       <tr>
         <th class='rowhead'><?php echo $lang->user->dept;?></th>
-        <td><?php echo html::select('dept', $depts, $deptID);?>
+        <td><?php echo html::select('dept', $depts, $deptID, "class='select-3'");?>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->account;?></th>
-        <td><input type='text' name='account' /></td>
+        <td><?php echo html::input('account', '', "class='text-3'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->realname;?></th>
-        <td><input type='text' name='realname' /></td>
+        <td><?php echo html::input('realname', '', "class='text-3'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->email;?></th>
-        <td><input type='text' name='email' /></td>
+        <td><?php echo html::input('email', '', "class='text-3'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->join;?></th>
-        <td><input type='text' name='join' class='date' /></td>
+        <td><?php echo html::input('join', '', "class='text-3 date'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->gendar;?></th>
@@ -54,15 +54,13 @@
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->password;?></th>
-        <td><input type='password' name='password1' /></td>
+        <td><?php echo html::password('password1', '', "class='text-3'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->password2;?></th>
-        <td><input type='password' name='password2' /></td>
+        <td><?php echo html::password('password2', '', "class='text-3'");?></td>
       </tr>  
-      <tr>
-        <td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?></td>
-      </tr>
+      <tr><td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?></td></tr>
     </table>
   </form>
 </div>  
diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php
index cb1c390b4c..393ab23971 100644
--- a/module/user/view/edit.html.php
+++ b/module/user/view/edit.html.php
@@ -26,46 +26,41 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <div class='yui-d0'>
   <form method='post' target='hiddenwin'>
-    <table align='center' class='table-4 a-left'> 
+    <table align='center' class='table-5'> 
       <caption><?php echo $lang->user->edit;?></caption>
       <tr>
         <th class='rowhead'><?php echo $lang->user->dept;?></th>
-        <td><?php echo html::select('dept', $depts, $user->dept);?>
+        <td><?php echo html::select('dept', $depts, $user->dept, "class='select-3'");?>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->account;?></th>
-        <td><input type='text' name='account' value='<?php echo $user->account;?>' /></td>
+        <td><?php echo html::input('account', $user->account, "class='text-3'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->realname;?></th>
-        <td><input type='text' name='realname' value='<?php echo $user->realname;?>' /></td>
+        <td><?php echo html::input('realname', $user->realname, "class='text-3'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->email;?></th>
-        <td><input type='text' name='email' value='<?php echo $user->email;?>' /></td>
+        <td><?php echo html::input('email', $user->email, "class='text-3'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->join;?></th>
-        <td><input type='text' name='join' value='<?php echo $user->join;?>' class='date' /></td>
+        <td><?php echo html::input('join', '', "class='text-3 date'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->gendar;?></th>
-        <td><?php echo html::radio('gendar', $lang->user->gendarList, $user->gendar)?></td>
+        <td><?php echo html::radio('gendar', (array)$lang->user->gendarList, $user->gendar);?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->password;?></th>
-        <td><input type='password' name='password1' /></td>
+        <td><?php echo html::password('password1', '', "class='text-3'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->password2;?></th>
-        <td><input type='password' name='password2' /></td>
+        <td><?php echo html::password('password2', '', "class='text-3'");?></td>
       </tr>  
-
-      <tr>
-        <td colspan='2' class='a-center'>
-          <?php echo html::submitButton() . html::resetButton();?>
-        </td>
-      </tr>
+      <tr><td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?></td></tr>
     </table>
   </form>
 </div>