Changeset 2311:b9ea646a3613 for admin/auth.php
- Timestamp:
- 10/08/13 09:31:33 (12 years ago)
- Branch:
- default
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/auth.php
r2160 r2311 196 196 { 197 197 # We check the user 198 $check_user = $core->auth->checkUser($user_id,$user_pwd,$user_key) === true; 198 $check_user = $core->auth->checkUser($user_id,$user_pwd,$user_key,false) === true; 199 if ($check_user) { 200 $check_perms = $core->auth->findUserBlog() !== false; 201 } else { 202 $check_perms = false; 203 } 199 204 200 205 $cookie_admin = http::browserUID(DC_MASTER_KEY.$user_id. 201 206 crypt::hmac(DC_MASTER_KEY,$user_pwd)).bin2hex(pack('a32',$user_id)); 202 207 203 if ($check_ user&& $core->auth->mustChangePassword())208 if ($check_perms && $core->auth->mustChangePassword()) 204 209 { 205 210 $login_data = join('/',array( … … 216 221 } 217 222 } 218 elseif ($check_ user&& !empty($_POST['safe_mode']) && !$core->auth->isSuperAdmin())223 elseif ($check_perms && !empty($_POST['safe_mode']) && !$core->auth->isSuperAdmin()) 219 224 { 220 225 $err = __('Safe Mode can only be used for super administrators.'); 221 226 } 222 elseif ($check_ user)227 elseif ($check_perms) 223 228 { 224 229 $core->session->start(); … … 246 251 setcookie('dc_admin',false,-600,'','',DC_ADMIN_SSL); 247 252 } 248 $err = __('Wrong username or password'); 253 if ($check_user) { 254 $err = __('Insufficient permissions'); 255 } else { 256 $err = __('Wrong username or password'); 257 } 249 258 } 250 259 }
Note: See TracChangeset
for help on using the changeset viewer.