← All changes | tpl/loginBar.php +28 -23 1.0 → 1.2.6.2 View file →

		@@ -8,41 +8,46 @@
8	8	*
9	9	* @category UserAccessManager
10	10	* @package UserAccessManager
11	11	* @author Alexander Schneider <alexanderschneider85@googlemail.com>
12		- * @copyright 2008-2010 Alexander Schneider
	12	+ * @copyright 2008-2013 Alexander Schneider
13	13	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2
14	14	* @version SVN: $Id$
15	15	* @link http://wordpress.org/extend/plugins/user-access-manager/
16	16	*/
17	17
18		-if (!is_single()) {
	18	+if (!is_single() && !is_page()) {
	19	+ $sLoginUrl = get_bloginfo('wpurl').'/wp-login.php?redirect_to='.urlencode($_SERVER['REQUEST_URI']);
	20	+ $sLoginUrl = apply_filters('uam_login_url', $sLoginUrl);
	21	+
19	22	?>
20		- <a class="uam_login_link" href="<?php echo get_bloginfo('wpurl') ?>/wp-login.php?redirect_to=<?php echo urlencode($_SERVER['REQUEST_URI'])?>"><?php echo __('Login', 'user-access-manager'); ?></a>
	23	+ <a class="uam_login_link" href="<?php echo $sLoginUrl; ?>"><?php echo __('Login', 'user-access-manager'); ?></a>
21	24	<?php
22	25	} else {
23	26	if (!isset($userLogin)) {
24	27	$userLogin = '';
25	28	}
26		- ?>
27		- <form action="<?php echo get_bloginfo('wpurl') ?>/wp-login.php" method="post" class="uam_login_form">
28		- <label class="input_label" for="user_login"><?php echo __('Username:', 'user-access-manager') ?></label>
29		- <input name="log" value="<?php echo esc_html(stripslashes($userLogin), 1); ?>" class="input" id="user_login" type="text" />
30		- <label class="input_label" for="user_pass"><?php echo __('Password:', 'user-access-manager') ?></label>
31		- <input name="pwd" class="input" id="user_pass" type="password" />
32		- <input name="rememberme" class="checkbox" id="rememberme" value="forever" type="checkbox" />
33		- <label class="checkbox_label" for="rememberme"><?php echo __('Remember me', 'user-access-manager'); ?></label>
34		- <input class="button" type="submit" name="wp-submit" id="wp-submit" value="<?php echo __('Login', 'user-access-manager'); ?> &raquo;" />
35		- <input type="hidden" name="redirect_to" value="<?php echo $_SERVER['REQUEST_URI']; ?>" />
36		- </form>
37		- <div class="uam_login_options">
38		- <?php
	29	+
	30	+ $sLoginUrl = get_bloginfo('wpurl').'/wp-login.php';
	31	+ $sLoginUrl = apply_filters('uam_login_form_url', $sLoginUrl);
	32	+
	33	+ $sLoginForm = '<form action="'.$sLoginUrl.'" method="post" class="uam_login_form">';
	34	+ $sLoginForm .= '<label class="input_label" for="user_login">'.__('Username:', 'user-access-manager').'</label>';
	35	+ $sLoginForm .= '<input name="log" value="'.esc_html(stripslashes($userLogin), 1).'" class="input" id="user_login" type="text" />';
	36	+ $sLoginForm .= '<label class="input_label" for="user_pass">'.__('Password:', 'user-access-manager').'</label>';
	37	+ $sLoginForm .= '<input name="pwd" class="input" id="user_pass" type="password" />';
	38	+ $sLoginForm .= '<input name="rememberme" class="checkbox" id="rememberme" value="forever" type="checkbox" />';
	39	+ $sLoginForm .= '<label class="checkbox_label" for="rememberme">'.__('Remember me', 'user-access-manager').'</label>';
	40	+ $sLoginForm .= '<input class="button" type="submit" name="wp-submit" id="wp-submit" value="'.__('Login', 'user-access-manager').' &raquo;" />';
	41	+ $sLoginForm .= '<input type="hidden" name="redirect_to" value="'.$_SERVER['REQUEST_URI'].'" />';
	42	+ $sLoginForm .= '</form>';
	43	+ $sLoginForm .= '<div class="uam_login_options">';
	44	+
39	45	if (get_option('users_can_register')) {
40		- ?>
41		- <a href="<?php echo get_bloginfo('wpurl') ?>/wp-login.php?action=register"><?php echo __('Register', 'user-access-manager'); ?></a>
42		- <?php
	46	+ $sLoginForm .= '<a href="'.get_bloginfo('wpurl').'/wp-login.php?action=register">'.__('Register', 'user-access-manager').'</a>';
43	47	}
44		- ?>
45		- <a href="<?php echo get_bloginfo('wpurl') ?>/wp-login.php?action=lostpassword" title="<?php __('Password Lost and Found', 'user-access-manager') ?>"><?php echo __('Lost your password?', 'user-access-manager') ?></a>
46		- </div>
47		- <?php
	48	+
	49	+ $sLoginForm .= '<a href="'.get_bloginfo('wpurl').'/wp-login.php?action=lostpassword" title="'.__('Password Lost and Found', 'user-access-manager').'">'.__('Lost your password?', 'user-access-manager').'</a>';
	50	+ $sLoginForm .= '</div>';
	51	+
	52	+ echo apply_filters('uam_login_form', $sLoginForm);
48	53	}