Permalink
Browse files

membersonly.php fix for checking if it's on WPMS or not, control pane…

…l change to using wp_login_form

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>
  • Loading branch information...
1 parent 63036f7 commit 1c4c258e85067036d729128ed767ee0735d4a5b9 Philip M. Hofer (Frumph) committed Jan 12, 2011
Showing with 16 additions and 18 deletions.
  1. +8 −5 addons/membersonly.php
  2. +1 −0 changelog.txt
  3. +7 −13 widgets/controlpanel.php
View
@@ -63,11 +63,14 @@ function comicpress_profile_members_only() {
global $profileuser, $errormsg;
$comicpress_is_member = get_user_meta($profileuser->ID,'comicpress-is-member', true);
if (empty($comicpress_is_member)) $comicpress_is_member = 0;
- $current_site = get_current_site();
- if (!isset($current_site->site_name)) {
- $site_name = ucfirst( $current_site->domain );
- } else {
- $site_name = $current_site->site_name;
+ $site_name = get_option('blogname');
+ if (is_multisite()) {
+ $current_site = get_current_site();
+ if (!isset($current_site->site_name)) {
+ $site_name = ucfirst( $current_site->domain );
+ } else {
+ $site_name = $current_site->site_name;
+ }
}
?>
<div style="border: solid 1px #aaa; background: #eee; padding: 0 10px 10px;">
View
@@ -3,6 +3,7 @@ $is_comic needed to be set in the archive.php before hand, was giving notice
thanks to @generaltekno for finding bug with footer-text.php with the scroll to top, adjusted it to be enable_scroll_to_top
again thanks to @generaltekno for finding the facebook like widget needing one of the facebook likes active, now changed to check if the widget is active as well
fixed the archive.php to check for non-permalinked cat= properly
+change to wp_login_form in the control panel widget
2.9.2.29
revamped the syndication comic into the rss to allow for a filter that can be used to add info to the syndication
View
@@ -18,19 +18,13 @@ function comicpress_control_panel_widget($skip_widget_init = false) {
function comicpress_show_control_panel() {
global $user_login;
- ?>
- <?php if (!is_user_logged_in()) { ?>
- <form action="<?php echo home_url(); ?>/wp-login.php" method="post">
- <?php _e('UserName:','comicpress'); ?><br />
- <input type="text" name="log" id="sname" value="<?php echo esc_html(stripslashes($user_login), 1) ?>" size="22" /><br /><br />
- <?php _e('Password:','comicpress'); ?><br />
- <input type="password" name="pwd" id="spassword" size="22" /><br />
- <label for="rememberme"><input name="rememberme" id="rememberme" type="checkbox" checked="checked" value="forever" /> Remember me</label><br />
- <br />
- <button type="submit" class="button"><?php _e('Login','comicpress'); ?></button>
- <input type="hidden" name="redirect_to" value="<?php echo home_url(); ?>"/>
- </form>
- <br />
+ if (!is_user_logged_in()) {
+ $args = array(
+ 'label_username' => __('Username', 'easel'),
+ 'label_password' => __('Password', 'easel')
+ );
+ wp_login_form($args);
+ ?>
<ul>
<?php if (is_multisite()) { ?>
<li><a href="<?php echo home_url(); ?>/wp-signup.php"><?php _e('Register','comicpress'); ?></a></li>

0 comments on commit 1c4c258

Please sign in to comment.