Changeset 18:3b981ecb888d for admin/auth.php
- Timestamp:
- 04/27/11 16:32:48 (13 years ago)
- Branch:
- userprefs
- Parents:
- 16:40836c17e96a (diff), 17:6fc4226eaebd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/auth.php
r11 r18 32 32 $login_data = !empty($_POST['login_data']) ? $_POST['login_data'] : null; 33 33 $recover = $core->auth->allowPassChange() && !empty($_REQUEST['recover']); 34 $safe_mode = !empty($_REQUEST['safe_mode']);35 34 $akey = $core->auth->allowPassChange() && !empty($_GET['akey']) ? $_GET['akey'] : null; 36 35 $user_id = $user_pwd = $user_key = $user_email = null; … … 206 205 } 207 206 } 208 elseif ($check_user && !empty($_POST['safe_mode']) && !$core->auth->isSuperAdmin())209 {210 $err = __('Safe Mode can only be used for super administrators.');211 }212 207 elseif ($check_user) 213 208 { … … 218 213 if (!empty($_POST['blog'])) { 219 214 $_SESSION['sess_blog_id'] = $_POST['blog']; 220 }221 222 if (!empty($_POST['safe_mode']) && $core->auth->isSuperAdmin()) {223 $_SESSION['sess_safe_mode'] = true;224 215 } 225 216 … … 355 346 echo 356 347 '<fieldset>'; 357 if ($safe_mode) {358 echo '<legend>'.__('Safe mode login').'</legend>';359 }360 348 echo 361 349 '<p><label for="user_id">'.__('Username:').' '. … … 374 362 echo form::hidden('blog',html::escapeHTML($_REQUEST['blog'])); 375 363 } 376 if($safe_mode) {377 echo form::hidden('safe_mode',1);378 }379 364 380 365 echo … … 382 367 383 368 '<p>'.__('You must accept cookies in order to use the private area.').'</p>'; 384 385 if ($safe_mode) {386 echo387 '<p><a href="auth.php" id="normal_mode_link">'.__('Get back to normal authentication').'</a></p>';388 } else {389 echo390 '<p><a href="auth.php?safe_mode=1" id="safe_mode_link">'.__('I have a connection problem').'</a></p>';391 }392 369 393 370 if ($core->auth->allowPassChange()) { -
admin/auth.php
r17 r18 310 310 echo 311 311 '<fieldset><legend>'.__('Request a new password').'</legend>'. 312 '<p><label >'.__('Username:').' '.313 form::field(array('user_id' ),20,32,html::escapeHTML($user_id),'',1).'</label></p>'.314 315 '<p><label >'.__('Email:').' '.316 form::field(array('user_email' ),20,255,html::escapeHTML($user_email),'',2).'</label></p>'.312 '<p><label for="user_id">'.__('Username:').' '. 313 form::field(array('user_id','user_id'),20,32,html::escapeHTML($user_id),'',1).'</label></p>'. 314 315 '<p><label for="user_email">'.__('Email:').' '. 316 form::field(array('user_email','user_email'),20,255,html::escapeHTML($user_email),'',2).'</label></p>'. 317 317 318 318 '<p><input type="submit" value="'.__('recover').'" tabindex="3" />'. … … 326 326 echo 327 327 '<fieldset><legend>'.__('Change your password').'</legend>'. 328 '<p><label >'.__('New password:').' '.329 form::password(array('new_pwd' ),20,255,'','',1).'</label></p>'.330 331 '<p><label >'.__('Confirm password:').' '.332 form::password(array('new_pwd_c' ),20,255,'','',2).'</label></p>'.328 '<p><label for="new_pwd">'.__('New password:').' '. 329 form::password(array('new_pwd','new_pwd'),20,255,'','',1).'</label></p>'. 330 331 '<p><label for="new_pwd_c">'.__('Confirm password:').' '. 332 form::password(array('new_pwd_c','new_pwd_c'),20,255,'','',2).'</label></p>'. 333 333 '</fielset>'. 334 334 … … 347 347 '<fieldset>'; 348 348 echo 349 '<p><label >'.__('Username:').' '.350 form::field(array('user_id' ),20,32,html::escapeHTML($user_id),'',1).'</label></p>'.351 352 '<p><label >'.__('Password:').' '.353 form::password(array('user_pwd' ),20,255,'','',2).'</label></p>'.349 '<p><label for="user_id">'.__('Username:').' '. 350 form::field(array('user_id','user_id'),20,32,html::escapeHTML($user_id),'',1).'</label></p>'. 351 352 '<p><label for="user_pwd">'.__('Password:').' '. 353 form::password(array('user_pwd','user_pwd'),20,255,'','',2).'</label></p>'. 354 354 355 355 '<p><label class="classic">'. 356 form::checkbox(array('user_remember'),1,'','',3).''.357 __('Remember my ID on this computer').'</label></p>'.356 '<p><label for="user_remember" class="classic">'. 357 form::checkbox(array('user_remember','user_remember'),1,'','',3).' '. 358 358 359 359 '<p><input type="submit" value="'.__('login').'" tabindex="4" /></p>';
Note: See TracChangeset
for help on using the changeset viewer.