Updates to 1.11.30

pronamic · May 22, 2024 · 3f1dc05 · 3f1dc05
1 parent 121db5c
commit 3f1dc05
Show file tree

Hide file tree

Showing 11 changed files with 106 additions and 88 deletions.
diff --git a/app/controllers/MeprLoginCtrl.php b/app/controllers/MeprLoginCtrl.php
@@ -17,24 +17,17 @@ public function logout_link($atts) {
     $current_post = MeprUtils::get_current_post();
     $mepr_options = MeprOptions::fetch();
     $permalink = !empty($current_post->ID) ? MeprUtils::get_permalink($current_post->ID) : '';
-    $arglist = '';
-
-    if(isset($atts) && !empty($atts)) {
-      foreach($atts as $att_key => $att_val) {
-        $arglist .= " {$att_key}=\"{$att_val}\"";
-      }
-    }
 
     ob_start();
 
     if(MeprUtils::is_user_logged_in()) {
       ?>
-      <a href="<?php echo MeprHooks::apply_filters('mepr-logout-url', wp_logout_url($mepr_options->login_page_url("redirect_to=".urlencode($permalink)))); ?>"<?php echo $arglist; ?>><?php _e('Logout', 'memberpress'); ?></a>
+      <a href="<?php echo esc_url(MeprHooks::apply_filters('mepr-logout-url', wp_logout_url($mepr_options->login_page_url("redirect_to=".urlencode($permalink))))); ?>"><?php _e('Logout', 'memberpress'); ?></a>
       <?php
     }
     else {
       ?>
-      <a href="<?php echo $mepr_options->login_page_url("redirect_to=".urlencode($permalink)); ?>"<?php echo $arglist; ?>><?php _e('Login', 'memberpress'); ?></a>
+      <a href="<?php echo esc_url($mepr_options->login_page_url("redirect_to=".urlencode($permalink))); ?>"><?php _e('Login', 'memberpress'); ?></a>
       <?php
     }
 

diff --git a/app/controllers/MeprReadyLaunchCtrl.php b/app/controllers/MeprReadyLaunchCtrl.php
@@ -173,6 +173,7 @@ public function override_page_templates( $template ) {
     $logo                 = esc_url( wp_get_attachment_url( $mepr_options->design_logo_img ) );
     $user                 = MeprUtils::get_currentuserinfo();
     $wrapper_classes      = '';
+    $enable_rl_wp_footer  = MeprHooks::apply_filters('mepr-rl-enable-wp-footer', isset($mepr_options->rl_enable_wp_footer) && 'enabled' === $mepr_options->rl_enable_wp_footer, $post, $user);
 
     if ( self::template_enabled( '#' ) ) {
       $user              = MeprUtils::get_currentuserinfo();

diff --git a/app/lib/MeprUtils.php b/app/lib/MeprUtils.php
@@ -2006,7 +2006,7 @@ public static function logout_url() {
   }
 
   public static function site_domain() {
-    return preg_replace('#^https?://(www\.)?([^\?\/]*)#', '$2', home_url());
+    return preg_replace('#^https?://(www\.)?([^\?\/]*)#', '$2', get_option('home'));
   }
 
   public static function is_curl_enabled() {

diff --git a/app/models/MeprOptions.php b/app/models/MeprOptions.php
@@ -465,6 +465,10 @@ public function set_defaults() {
     if(!isset( $this->rl_enable_coaching_template ) ){
       $this->rl_enable_coaching_template = true;
     }
+
+    if(!isset( $this->rl_enable_wp_footer) ) {
+      $this->rl_enable_wp_footer = 'enabled';
+    }
   }
 
   public function set_strings() {
@@ -579,6 +583,7 @@ public function set_strings() {
     $this->design_#_subheadline_str           = 'mepr-design-#-subheadline';
     $this->rl_enable_coaching_template_str          = 'mepr-rl-enable-coaching-template';
     $this->design_show_checkout_price_terms_str     = 'mepr-design-show-checkout-price-terms';
+    $this->rl_enable_wp_footer_str                  = 'mepr-rl-enable-wp-footer';
   }
 
   public function validate($params, $errors = array()) {
@@ -806,6 +811,7 @@ public function update($params) {
     $this->design_#_subheadline         = wp_kses_post(stripslashes($params[$this->design_#_subheadline_str]));
     $this->rl_enable_coaching_template        = isset($params[$this->rl_enable_coaching_template_str]);
     $this->design_show_checkout_price_terms   = isset($params[$this->design_show_checkout_price_terms_str]);
+    $this->rl_enable_wp_footer                = sanitize_text_field($params[$this->rl_enable_wp_footer_str]);
   }
 
   public function update_address_fields_required() {

diff --git a/app/views/admin/readylaunch/courses.php b/app/views/admin/readylaunch/courses.php
@@ -230,28 +230,6 @@
                 </td>
               </tr>
 
-              <tr>
-                <td colspan="2">
-                  <label class="mepr-modal-options-pane-label" for="mpcs-options[classroom-wp-footer]">
-                    <span>
-                      <?php _e('WP Footer Hook', 'memberpress-courses', 'memberpress'); ?>
-                    </span>
-                    <?php MeprAppHelper::info_tooltip(
-                      'mpcs-complete-link-css',
-                      __('WP Footer Hook', 'memberpress-courses', 'memberpress'),
-                      __('Use this field to enable/disable the WP Footer hook. In classroom mode, \'wp_footer\' hook is disabled by default.', 'memberpress-courses', 'memberpress')
-                    );
-                    ?>
-                  </label>
-                  <select id="mpcs-options[classroom-wp-footer]" name="mpcs-options[classroom-wp-footer]">
-                    <option value="disabled" <?php selected(helpers\Options::val($courses_options, 'classroom-wp-footer'), 'disabled'); ?>>
-                      <?php esc_html_e('Disabled', 'memberpress-courses', 'memberpress'); ?></option>
-                    <option value="enabled" <?php selected(helpers\Options::val($courses_options, 'classroom-wp-footer'), 'enabled'); ?>>
-                      <?php esc_html_e('Enabled', 'memberpress-courses', 'memberpress'); ?></option>
-                  </select>
-                </td>
-              </tr>
-
               <?php do_action('mpc_admin_general_options'); ?>
 
             </tbody>

diff --git a/app/views/admin/readylaunch/options.php b/app/views/admin/readylaunch/options.php
@@ -49,6 +49,26 @@
         <input type="text" name="<?php echo esc_attr($mepr_options->design_primary_color_str); ?>" value="<?php echo esc_html($mepr_options->design_primary_color); ?>" class="color-field" data-default-color="#06429E" />
       </div>
     </div>
+    <div class="mp-row">
+      <div class="mepr-flex-row" style="width: 50%;">
+        <p>
+          <strong>
+            <?php esc_html_e('Footer Settings', 'memberpress'); ?>
+          </strong>
+        </p>
+      </div>
+      <div class="mp-col-2">
+        <?php esc_html_e('WP Footer Hook', 'memberpress'); ?>
+      </div>
+      <div class="mp-col-3">
+        <select id="<?php echo esc_attr($mepr_options->rl_enable_wp_footer_str); ?>" name="<?php echo esc_attr($mepr_options->rl_enable_wp_footer_str); ?>">
+          <option value="enabled" <?php selected($mepr_options->rl_enable_wp_footer, 'enabled'); ?>>
+            <?php esc_html_e('Enabled', 'memberpress'); ?></option>
+          <option value="disabled" <?php selected($mepr_options->rl_enable_wp_footer, 'disabled'); ?>>
+            <?php esc_html_e('Disabled', 'memberpress'); ?></option>
+        </select>
+      </div>
+    </div>
     <h3>
       <?php esc_html_e('Pro Mode Templates', 'memberpress'); ?>
     </h3>

diff --git a/app/views/readylaunch/layout/app.php b/app/views/readylaunch/layout/app.php
@@ -103,7 +103,11 @@
 
     </main>
 
-    <?php wp_footer(); ?>
+    <?php
+    if($enable_rl_wp_footer) {
+      wp_footer();
+    }
+    ?>
 </body>
 
 </html>
diff --git a/app/views/readylaunch/layout/guest.php b/app/views/readylaunch/layout/guest.php
@@ -51,7 +51,11 @@
     </main>
 
 
-    <?php wp_footer(); ?>
+    <?php
+    if($enable_rl_wp_footer) {
+      wp_footer();
+    }
+    ?>
   </body>
 
 </html>
diff --git a/app/views/readylaunch/#/reset_password.php b/app/views/readylaunch/#/reset_password.php
@@ -1,6 +1,5 @@
 <?php if(!defined('ABSPATH')) {die('You are not allowed to call this page directly.');} ?>
 
-
 <div id="mepro-login-hero">
   <div class="mepro-boxed">
     <div class="mepro-login-contents">
@@ -37,13 +36,13 @@
           <div class="submit">
             <input type="submit" name="wp-submit" id="wp-submit" class="button-primary mepr-share-button " value="<?php _ex('Update Password', 'ui', 'memberpress'); ?>" tabindex="720" />
             <input type="hidden" name="action" value="mepr_process_reset_password_form" />
-            <input type="hidden" name="mepr_screenname" value="<?php echo $mepr_screenname; ?>" />
-            <input type="hidden" name="mepr_key" value="<?php echo $mepr_key; ?>" />
+            <input type="hidden" name="mepr_screenname" value="<?php echo esc_attr($mepr_screenname); ?>" />
+            <input type="hidden" name="mepr_key" value="<?php echo esc_attr($mepr_key); ?>" />
             <input type="hidden" name="mepr_is_login_page" value="true" />
           </div>
         </form>
       </div>
 
     </div>
   </div>
-</div>
+</div>