Changeset 467
- Timestamp:
- 02/01/08 21:41:40 (11 months ago)
- Location:
- trunk
- Files:
-
- 5 modified
-
modules/base/classes/userManager.php (modified) (1 diff)
-
modules/base/usersAdd.php (modified) (4 diffs)
-
modules/base/usersDelete.php (modified) (1 diff)
-
modules/base/usersNewAccount.php (modified) (1 diff)
-
owa_view.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/modules/base/classes/userManager.php
r466 r467 66 66 } 67 67 68 function deleteUser($user_id) { 69 70 $u = owa_coreAPI::entityFactory('base.user'); 71 72 $ret = $u->delete($user_id, 'user_id'); 73 74 if ($ret == true): 75 return true; 76 else: 77 return false; 78 endif; 79 80 } 81 68 82 } 69 83 -
trunk/modules/base/usersAdd.php
r238 r467 17 17 // 18 18 19 require_once(OWA_BASE_DIR.'/owa_lib.php');20 19 require_once(OWA_BASE_DIR.'/owa_view.php'); 21 20 require_once(OWA_BASE_DIR.'/owa_controller.php'); 22 require_once(OWA_BASE_DIR.'/owa_auth.php');23 21 require_once(OWA_BASE_DIR.'/eventQueue.php'); 24 require_once(OWA_BASE_CLASSES_DIR.'owa_coreAPI.php');25 22 /** 26 23 * Add User View … … 83 80 function action() { 84 81 85 $u = new owa_user; 86 $auth = &owa_auth::get_instance(); 82 $u = owa_coreApi::entityFactory('base.user'); 87 83 88 84 //Check to see if user name already exists … … 96 92 if (empty($id)): 97 93 98 //Generate Initial Passkey and new account email 99 $auth->setInitialPasskey($this->params['user_id']); 94 $userManager = owa_coreApi::supportClassFactory('base', 'userManager'); 95 96 97 $user_params = array( 'user_id' => $this->params['user_id'], 98 'real_name' => $this->params['real_name'], 99 'role' => $this->params['role'], 100 'email_address' => $this->params['email_address']); 101 102 $temp_passkey = $userManager->createNewUser($user_params); 100 103 101 104 // log account creation event to event queue … … 104 107 'real_name' => $this->params['real_name'], 105 108 'role' => $this->params['role'], 106 'email_address' => $this->params['email_address']), 109 'email_address' => $this->params['email_address'], 110 'temp_passkey' => $temp_passkey), 107 111 'base.new_user_account'); 108 112 -
trunk/modules/base/usersDelete.php
r238 r467 40 40 function action() { 41 41 42 $u = owa_coreAPI::entityFactory('base.user'); 43 44 $u->delete($this->params['user_id'], 'user_id'); 45 42 $userManager = owa_coreApi::supportClassFactory('base', 'userManager'); 43 $userManager->deleteUser($this->params['user_id']); 44 46 45 $data['view_method'] = 'redirect'; 47 46 $data['view'] = 'base.options'; -
trunk/modules/base/usersNewAccount.php
r466 r467 42 42 function action() { 43 43 44 if ($this->params['just_email') == false): 45 // save new user to db 46 $auth = &owa_auth::get_instance(); 47 $u = owa_coreAPI::entityFactory('base.user'); 48 $u->set('user_id', $this->params['user_id']); 49 $u->set('role', $this->params['role']); 50 $u->set('real_name', $this->params['real_name']); 51 $u->set('email_address', $this->params['email_address']); 52 $u->set('temp_passkey', $auth->generateTempPasskey($this->params['user_id'])); 53 $u->set('creation_date', time()); 54 $u->set('last_update_date', time()); 55 $u->create(); 56 endif; 57 // return email view 44 // return email view 58 45 $data['user_id']= $this->params['user_id']; 59 46 $data['email_address']= $this->params['email_address']; 60 $data['temp_passkey'] = $ u->get('temp_passkey');47 $data['temp_passkey'] = $this->params['temp_passkey']; 61 48 $data['subject'] = 'OWA User Account Setup'; 62 49 $data['view'] = 'base.usersNewAccount'; -
trunk/owa_view.php
r282 r467 143 143 144 144 // auth user 145 $ this->auth->authenticateUser($this->priviledge_level);145 $auth_data = $this->auth->authenticateUser($this->priviledge_level); 146 146 147 147 // Assign status msg … … 160 160 //print_r($this->data); 161 161 // authentication status 162 if (!empty($this->data['params']['p'])):162 if ($auth_data['auth_status'] == true): 163 163 $this->t->set('authStatus', true); 164 164 endif;
