From 6670b94cafe0d5ba5685483e14b7bed103bd3309 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 26 Nov 2015 09:20:53 +0800
Subject: [PATCH]  * adjust for user getById.

---
 module/admin/view/checkweak.html.php | 2 +-
 module/company/view/browse.html.php  | 2 +-
 module/user/control.php              | 5 ++---
 module/user/model.php                | 7 +++----
 module/user/view/profile.html.php    | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/module/admin/view/checkweak.html.php b/module/admin/view/checkweak.html.php
index 85deef3914..680ad48042 100644
--- a/module/admin/view/checkweak.html.php
+++ b/module/admin/view/checkweak.html.php
@@ -39,7 +39,7 @@
         <td><?php echo $user->mobile?></td>
         <td><?php echo $user->birthday?></td>
         <td><?php echo $lang->admin->safe->reasonList[$user->weakReason];?></td>
-        <td><?php common::printIcon('user', 'edit', "userID=" . helper::safe64Encode($user->account), '', 'list');?></td>
+        <td><?php common::printIcon('user', 'edit', "userID=$user->id", '', 'list');?></td>
       </tr>
       <?php endforeach;?>
     </tbody>
diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index d1dbffb34b..c56947cf4a 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -78,7 +78,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
       <td><?php echo $user->visits;?></td>
       <td class='text-left'>
         <?php 
-        common::printIcon('user', 'edit',      "userID=" . helper::safe64Encode($user->account) . "&from=company", '', 'list');
+        common::printIcon('user', 'edit',      "userID=$user->id&from=company", '', 'list');
         if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete'))
         {
             echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '<i class="icon-remove"></i>', '', "title='{$lang->user->delete}' class='btn-icon iframe'");
diff --git a/module/user/control.php b/module/user/control.php
index 68f4a1215c..6d99fb8a89 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -471,7 +471,6 @@ class user extends control
      */
     public function edit($userID)
     {
-        $userID = helper::safe64Decode($userID);
         $this->lang->set('menugroup.user', 'company');
         $this->lang->user->menu      = $this->lang->company->menu;
         $this->lang->user->menuOrder = $this->lang->company->menuOrder;
@@ -482,7 +481,7 @@ class user extends control
             die(js::locate($this->session->userList ? $this->session->userList : $this->createLink('company', 'browse'), 'parent'));
         }
 
-        $user       = $this->user->getById($userID);
+        $user       = $this->user->getById($userID, 'id');
         $userGroups = $this->loadModel('group')->getByAccount($user->account);
 
         $title      = $this->lang->company->common . $this->lang->colon . $this->lang->user->edit;
@@ -535,7 +534,7 @@ class user extends control
      */
     public function delete($userID)
     {
-        $user = $this->user->getByID($userID);
+        $user = $this->user->getByID($userID, 'id');
         if(strpos($this->app->company->admins, ",{$this->app->user->account},") !== false and $this->app->user->account == $user->account) return;
         if($_POST)
         {
diff --git a/module/user/model.php b/module/user/model.php
index 5db35800bf..3ddbcdeb39 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -165,10 +165,9 @@ class userModel extends model
      * @access public
      * @return object|bool
      */
-    public function getById($userID)
+    public function getById($userID, $field = 'account')
     {
-        $user = $this->dao->select('*')->from(TABLE_USER)->where('account')->eq($userID)->fetch();
-        if(!$user) $user = $this->dao->select('*')->from(TABLE_USER)->where('id')->eq($userID)->fetch();
+        $user = $this->dao->select('*')->from(TABLE_USER)->where($field)->eq($userID)->fetch();
         if(!$user) return false;
         $user->last = date(DT_DATETIME1, $user->last);
         return $user;
@@ -324,7 +323,7 @@ class userModel extends model
     {
         if(!$this->checkPassword(true)) return;
 
-        $oldUser = $this->getById($userID);
+        $oldUser = $this->getById($userID, 'id');
 
         $userID = $oldUser->id;
         $user = fixer::input('post')
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index c7c1635a70..df03bc6926 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -21,7 +21,7 @@
       <small class='text-muted'> <?php echo $lang->user->profile;?> <?php echo html::icon('eye-open');?></small>
     </div>
     <div class='actions'>
-      <?php echo html::a($this->createLink('user', 'edit', "userID=" . helper::safe64Encode($user->account)), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?>
+      <?php echo html::a($this->createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?>
     </div>
   </div>
   <table class='table table-borderless table-data'>