Changeset 220
- Timestamp:
- 12/09/07 00:28:32 (1 year ago)
- Files:
-
- trunk/Framework/Module/Accounts.php (modified) (1 diff)
- trunk/Framework/Module/Accounts/Modify.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Framework/Module/Accounts.php
r219 r220 65 65 $accounts[$count]['comment'] = $val['comment']; 66 66 $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"); 68 68 $accounts[$count]['delete_url'] = htmlspecialchars("./?module=Accounts&domain={$this->domain}&account=$key&event=delete"); 69 69 $count++; trunk/Framework/Module/Accounts/Modify.php
r219 r220 58 58 $account = $_REQUEST['account']; 59 59 if ($this->user->isDomainAdmin($this->domain)) { 60 $account_info = $this->user->userInfo($ account, $this->domain);60 $account_info = $this->user->userInfo($this->domain, $account); 61 61 } else { 62 62 $account_info = $this->user->loginUser; … … 146 146 // See what user_info to use 147 147 if ($this->user->isDomainAdmin($this->domain)) { 148 $account_info = $this->user->userInfo($ account, $this->domain);148 $account_info = $this->user->userInfo($this->domain, $account); 149 149 } else { 150 150 $account_info = $this->user->loginUser; … … 180 180 $this->user->modUser($this->domain, $_REQUEST['account'], $changeArray); 181 181 } 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']) { 183 185 $crypt = new Crypt_Blowfish((string)Framework::$site->config->mcryptKey); 184 186 $this->session->password = $crypt->encrypt($changeArray['clear_text_password']);
