* completed story #251:when creating resources,the resources which have been deleted are not list.

module/user/lang/zh-cn.php

@@ -42,6 +42,7 @@ $lang->user->relogin         = "重新登录";
 $lang->user->asGuest         = "游客访问";
 $lang->user->goback          = "返回前一页";
 $lang->user->allUsers        = '全部用户';
+$lang->user->deleted         = '(已删除)';
 
 $lang->user->profile     = '用户档案';
 $lang->user->project     = '用户项目';

module/user/model.php

@@ -44,10 +44,14 @@ class userModel extends model
         return $this->dao->select('*')->from(TABLE_USER)->where('deleted')->eq(0)->orderBy('account')->fetchAll();
     }
 
-    /* 获得account=>realname的列表。params: noletter|noempty|noclosed。*/
+    /* 获得account=>realname的列表。params: noletter|noempty|noclosed|nodeleted。*/
     public function getPairs($params = '')
     {
-        $users = $this->dao->select('account, realname')->from(TABLE_USER)->orderBy('account')->fetchPairs();
+        $users = $this->dao->select('account, realname')->from(TABLE_USER)
+            ->beginIF(strpos($params, 'nodeleted') !== false)
+            ->where('deleted')->eq(0)
+            ->fi()
+            ->orderBy('account')->fetchPairs();
         foreach($users as $account => $realName)
         {
             $firstLetter = ucfirst(substr($account, 0, 1)) . ':';
@@ -58,6 +62,17 @@ class userModel extends model
         if(strpos($params, 'noclosed') === false) $users = $users + array('closed' => 'Closed');
         return $users;
     }
+    
+    /* 追加已经删除的用户。*/
+    public function setDeleted($users, $deleteds = '')
+    {
+        $deleteds = explode(',', $deleteds);
+        foreach($deleteds as $deleted)
+        {
+            if(!isset($users[$deleted])) $users[$deleted] = $deleted . $this->lang->user->deleted;
+        }
+        return $users;
+    }
 
     /* 获得用户的真实姓名和email地址列表。*/
     public function getRealNameAndEmails($users)