From fbfa7ec422d25d20978e2a2c8f3232aa91ad4409 Mon Sep 17 00:00:00 2001
From: "guotao@cnezsoft.com" <guotao@cnezsoft.com>
Date: Sun, 13 Mar 2011 01:12:43 +0000
Subject: [PATCH]  + bug #139

---
 module/user/control.php           |  7 +++-
 module/user/view/profile.html.php | 63 +++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/module/user/control.php b/module/user/control.php
index 0fa92d2ae7..a937dc18bc 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -180,9 +180,14 @@ class user extends control
         /* Set menu. */
         $this->user->setMenu($this->user->getPairs('noempty|noclosed'), $account);
 
+        $user = $this->user->getById($account);
+        $deptPath = $this->dept->getParents($user->dept);
+
         $this->view->header   = $header;
         $this->view->position = $position;
-        $this->view->user     = $this->user->getById($account);
+        $this->view->user     = $user;
+
+        $this->view->deptPath = $deptPath;
 
         $this->display();
     }
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index f746dfa19a..e90ee07e51 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -14,6 +14,25 @@
 <?php include '../../common/view/tablesorter.html.php';?>
 <table align='center' class='table-4'>
   <caption><?php echo $lang->user->profile;?></caption>
+  <tr>
+    <th class='rowhead'><?php echo $lang->user->dept;?></th>
+    <td>
+    <?php
+    if(empty($deptPath))
+    {
+        echo "/";
+    }
+    else
+    {
+        foreach($deptPath as $key => $dept)
+        {
+            if($dept->name) echo $dept->name;
+            if(isset($deptPath[$key + 1])) echo $lang->arrow;
+        }
+    }
+     ?>
+    </td>
+  </tr>
   <tr>
     <th class='rowhead'><?php echo $lang->user->account;?></th>
     <td><?php echo $user->account;?></td>
@@ -48,5 +67,49 @@
     <th class='rowhead'><?php echo $lang->user->last;?></th>
     <td><?php echo $user->last;?></td>
   </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->user->msn;?></th>
+    <td><?php echo $user->msn;?></td>
+  </tr>  
+  <tr>
+    <th class='rowhead'><?php echo $lang->user->qq;?></th>
+    <td><?php echo $user->qq;?></td>
+  </tr>  
+  <tr>
+    <th class='rowhead'><?php echo $lang->user->yahoo;?></th>
+    <td><?php echo $user->yahoo;?></td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->user->gtalk;?></th>
+    <td><?php echo $user->gtalk;?></td>
+  </tr>  
+  <tr>
+    <th class='rowhead'><?php echo $lang->user->wangwang;?></th>
+    <td><?php echo $user->wangwang;?></td>
+  </tr>  
+  <tr>
+    <th class='rowhead'><?php echo $lang->user->mobile;?></th>
+    <td><?php echo $user->mobile;?></td>
+  </tr>
+   <tr>
+    <th class='rowhead'><?php echo $lang->user->phone;?></th>
+    <td><?php echo $user->phone;?></td>
+  </tr>  
+  <tr>
+    <th class='rowhead'><?php echo $lang->user->address;?></th>
+    <td><?php echo $user->address;?></td>
+  </tr>  
+  <tr>
+    <th class='rowhead'><?php echo $lang->user->zipcode;?></th>
+    <td><?php echo $user->zipcode;?></td>
+  </tr>
+  <tr>
+    <td colspan='2' class='a-center'>
+      <?php 
+      echo html::a($this->createLink('user', 'edit', "userID=$user->id&from=company"), $lang->user->editProfile);
+      echo html::a($this->createLink('user', 'logout'),    $lang->logout);
+      ?>
+    </td>
+  </tr>
 </table>
 <?php include '../../common/view/footer.html.php';?>