From c9622737f40f57df8523a28accd6f2f68dfc6ff2 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Fri, 9 Apr 2010 09:43:35 +0000
Subject: [PATCH]  * add comment to action model.  + add login and logout
 action.

---
 module/action/lang/zh-cn.php |  7 +++++++
 module/action/model.php      | 22 +++++++++++++++++++++-
 module/index/lang/zh-cn.php  |  2 +-
 module/user/control.php      | 13 +++++++++----
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 6ae9f61275..53fc552b26 100644
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -21,6 +21,7 @@
  * @version     $Id$
  * @link        http://www.zentao.cn
  */
+/* 用来描述操作历史记录。*/
 $lang->action->desc->common    = '$date, <strong>$action</strong> by <strong>$actor</strong>';
 $lang->action->desc->extra     = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>';
 $lang->action->desc->opened    = '$date, 由 <strong>$actor</strong> 创建。';
@@ -34,6 +35,7 @@ $lang->action->desc->confirmed = '$date, 由 <strong>$actor</strong> 确认需
 $lang->action->desc->diff1     = '修改了 <strong><i>%s</i></strong>，旧值为 "%s"，新值为 "%s"。<br />';
 $lang->action->desc->diff2     = '修改了 <strong><i>%s</i></strong>，区别为：<blockquote>%s</blockquote>';
 
+/* 用来显示动态信息。*/
 $lang->action->label->opened    = '创建了';
 $lang->action->label->changed   = '变更了';
 $lang->action->label->edited    = '编辑了';
@@ -44,8 +46,13 @@ $lang->action->label->resolved  = '解决了';
 $lang->action->label->reviewed  = '评审了';
 $lang->action->label->moved     = '移动了';
 $lang->action->label->confirmed = '确认了需求，';
+$lang->action->label->login     = '登录系统';
+$lang->action->label->logout    = "退出登录";
+
+/* 用来生成相应对象的链接。*/
 $lang->action->label->story     = '需求|story|view|storyID=%s';
 $lang->action->label->task      = '任务|task|view|taskID=%s';
 $lang->action->label->bug       = 'Bug|bug|view|bugID=%s';
 $lang->action->label->case      = '用例|testcase|view|caseID=%s';
+
 $lang->action->label->space     = '　';
diff --git a/module/action/model.php b/module/action/model.php
index b46111d5cb..000b6385b5 100644
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -75,11 +75,16 @@ class actionModel extends model
         }
     }
 
-    /* 打印action标题。*/
+    /* 打印action标题，显示在每一个对象的详情界面。*/
     public function printAction($action)
     {
         $objectType = $action->objectType;
         $actionType = strtolower($action->action);
+
+        /**
+         * 判断使用哪一种描述。如果该模块有对应的描述，则取之，然后则取action模块中对应的方法的描述。
+         * 如果还没有，则判断当前action是否有extra信息，如果有，则取action模块的extra描述，最后使用通用的描述。
+         */
         if(isset($this->lang->$objectType->action->$actionType))
         {
             $desc = $this->lang->$objectType->action->$actionType;
@@ -93,9 +98,12 @@ class actionModel extends model
             $desc = $action->extra ? $this->lang->action->desc->extra : $this->lang->action->desc->common;
         }
 
+        /* 循环替换desc中对应的标签。*/
         foreach($action as $key => $value)
         {
             if($key == 'history') continue;
+
+            /* desc可能是数组，也有可能是一个字符串。*/
             if(is_array($desc))
             {
                 if($key == 'extra') continue;
@@ -106,6 +114,8 @@ class actionModel extends model
                 $desc = str_replace('$' . $key, $value, $desc);
             }
         }
+
+        /* 如果desc是数组，再处理extra变量。例子参考bug模块的语言设置。*/
         if(is_array($desc))
         {
             $extra = strtolower($action->extra);
@@ -136,6 +146,16 @@ class actionModel extends model
             $action->date        = date(DT_MONTHTIME2, strtotime($action->date));
             $action->actionLabel = isset($this->lang->action->label->$actionType) ? $this->lang->action->label->$actionType : $action->action;
             $action->objectLabel = isset($this->lang->action->label->$objectType) ? $this->lang->action->label->$objectType : $objectType;
+
+            /* 处理login和logout动作。*/
+            if($actionType == 'login' or $actionType == 'logout')
+            {
+                $action->objectLink = '';
+                $action->objectLabel = '';
+                continue;
+            }
+
+            /* 其他的动作生成相应的链接。*/
             if(strpos($action->objectLabel, '|') !== false)
             {
                 list($objectLabel, $moduleName, $methodName, $vars) = explode('|', $action->objectLabel);
diff --git a/module/index/lang/zh-cn.php b/module/index/lang/zh-cn.php
index fd5b94d5c6..416f420fd8 100644
--- a/module/index/lang/zh-cn.php
+++ b/module/index/lang/zh-cn.php
@@ -27,4 +27,4 @@ $lang->index->common = '首页';
 $lang->index->index  = '首页';
 $lang->index->ping   = '接口:同步session';
 $lang->index->latest = '最新动态';
-$lang->index->action = '%s, %s <i>%s</i> %s <strong>%s</strong>';
+$lang->index->action = '%s, %s <i>%s</i> %s <strong>%s</strong>。';
diff --git a/module/user/control.php b/module/user/control.php
index 2de0139577..43ad0c4cf1 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -291,12 +291,16 @@ class user extends control
         /* �û��ύ�˵�½��Ϣ�������û������ݡ�*/
         if(!empty($_POST))
         {
-            $user = $this->user->identify($_POST['account'], $_POST['password']);
+            $user = $this->user->identify($this->post->account, $this->post->password);
             if($user)
             {
-                $user->rights = $this->user->authorize($_POST['account']);
-                $_SESSION['user'] = $user;
-                $this->app->user = $_SESSION['user'];
+                /* ���û�������Ȩ�����Ǽ�session��*/
+                $user->rights = $this->user->authorize($this->post->account);
+                $this->session->set('user', $user);
+                $this->app->user = $this->session->user;
+
+                /* ��¼��¼��¼��*/
+                $this->loadModel('action')->create('user', $user->id, 'login');
 
                 /* POST������������referer��Ϣ���ҷ�user/login.html, ��user/deny.html�����Ұ�����ǰϵͳ��������*/
                 if(isset($_POST['referer'])  and 
@@ -350,6 +354,7 @@ class user extends control
      */
     public function logout($referer = 0)
     {
+        $this->loadModel('action')->create('user', $this->app->user->id, 'logout');
         session_destroy();
         $vars = !empty($referer) ? "referer=$referer" : '';
         $this->locate($this->createLink('user', 'login', $vars));