Changeset 220

Show
Ignore:
Timestamp:
12/09/07 00:28:32 (1 year ago)
Author:
shupp
Message:

fix password changing for other accounts, fix edit account url

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/Framework/Module/Accounts.php

    r219 r220  
    6565            $accounts[$count]['comment'] = $val['comment']; 
    6666            $accounts[$count]['quota'] = $this->user->getQuota($val['quota']); 
    67             $accounts[$count]['edit_url'] = htmlspecialchars("./?module=Accounts&domain={$this->domain}&account=$key&event=modifyAccount"); 
     67            $accounts[$count]['edit_url'] = htmlspecialchars("./?module=Accounts&class=Modify&domain={$this->domain}&account=$key&event=modifyAccount"); 
    6868            $accounts[$count]['delete_url'] = htmlspecialchars("./?module=Accounts&domain={$this->domain}&account=$key&event=delete"); 
    6969            $count++; 
  • trunk/Framework/Module/Accounts/Modify.php

    r219 r220  
    5858        $account = $_REQUEST['account']; 
    5959        if ($this->user->isDomainAdmin($this->domain)) { 
    60             $account_info = $this->user->userInfo($account, $this->domain); 
     60            $account_info = $this->user->userInfo($this->domain, $account); 
    6161        } else { 
    6262            $account_info = $this->user->loginUser; 
     
    146146        // See what user_info to use 
    147147        if ($this->user->isDomainAdmin($this->domain)) { 
    148             $account_info = $this->user->userInfo($account, $this->domain); 
     148            $account_info = $this->user->userInfo($this->domain, $account); 
    149149        } else { 
    150150            $account_info = $this->user->loginUser; 
     
    180180            $this->user->modUser($this->domain, $_REQUEST['account'], $changeArray); 
    181181        } 
    182         if (isset($changeArray['clear_text_password'])) { 
     182        if (isset($changeArray['clear_text_password'])  
     183            && $account == $this->user->loginUser['name']  
     184            && $this->domain == $this->user->loginUser['domain']) { 
    183185            $crypt = new Crypt_Blowfish((string)Framework::$site->config->mcryptKey); 
    184186            $this->session->password = $crypt->encrypt($changeArray['clear_text_password']);