Changeset 1775494

Timestamp:

11/26/2017 11:35:13 AM (8 years ago)

Author:

rehmatworks

Message:

tagging version 1.3.2

Location:

wp-ssl-redirect/tags/1.3.2

Files:

• . (copied) (copied from wp-ssl-redirect/trunk) (1 prop)
• readme.txt (modified) (2 diffs)
• wp-ssl-redirect.php (modified) (3 diffs)

wp-ssl-redirect/tags/1.3.2/readme.txt

@@ -4 +4 @@
 Requires at least: 3.95
 Tested up to: 4.8.1
-Stable tag: 1.3.1
+Stable tag: 1.3.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -35 +35 @@
 == 1.3.1 ==
 * A minor bug fix regarding query vars
+== 1.3.2 ==
+* Fixed a major bug related to sub-directory installations

wp-ssl-redirect/tags/1.3.2/wp-ssl-redirect.php

@@ -4 +4 @@
 * Plugin Name: WP SSL Redirect
 * Description: A very tiny plugin to force SSL on WordPress websites (via 301 redirects for SEO purpose).
-* Version: 1.3.1
+* Version: 1.3.2
 * Author: Rehmat Alam
 * Author URI: https://supportivehands.net/
@@ -26 +26 @@
       <h3>WP SSL Redirect Options</h3>
       <hr>
+      <?php
+        if(is_plugin_active('all-in-one-seo-pack/all_in_one_seo_pack.php')) {?>
+          <div class="notice notice-error">
+            <p>All In One SEO Pack is known to create issues with WP SSL Redirect so WP SSL Redirect's features will not work unless you will deactivate <strong>All In One SEO Pack</strong> first.</p>
+        </div>
+      <?php }?>
+      <?php
+        if(is_plugin_active('wordpress-seo/wp-seo.php')) {?>
+          <div class="notice notice-error">
+            <p>Yoast SEO is known to create issues with WP SSL Redirect so WP SSL Redirect's features will not work unless you will deactivate <strong>Yoast SEO</strong> first.</p>
+        </div>
+      <?php }?>
       <form action="options.php" method="post">
  
@@ -59 +71 @@
 
 function do_the_ssl_redirect() {
-  $wpsslredir_requested_url = site_url().$_SERVER['REQUEST_URI'];
-  $wpsslredir_parse_url = parse_url($wpsslredir_requested_url);
-  if(get_option('wp_ssl_redirect_protocol') == 'www') {
-    if(strpos($wpsslredir_parse_url['host'], 'www.') === false) {
-      $wpsslredir_parse_url['host'] = 'www.'.$wpsslredir_parse_url['host'];
+  include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+  if(!is_plugin_active('all-in-one-seo-pack/all_in_one_seo_pack.php')) {
+    $request_uri = $_SERVER['REQUEST_URI'];
+    $requested_full = (isset($_SERVER['HTTPS']) ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
+    $wpsslredir_main_url = site_url();
+    $wpssl_parsed = parse_url($wpsslredir_main_url);
+    $wpsslredir_requested_url = rtrim($wpsslredir_main_url, '/').str_replace($wpssl_parsed['path'], '', $request_uri);
+    if(get_option('wp_ssl_redirect_protocol') == 'www') {
+      if(strpos($wpsslredir_main_url, '//www.') === false) {
+        $wpsslredir_main_url = str_replace('//', '//www.', $wpsslredir_main_url);
+      }
+    } else if(get_option('wp_ssl_redirect_protocol') == 'non-www') {
+      if(strpos($wpsslredir_main_url, '//www.') !== false) {
+        $wpsslredir_main_url = str_replace('//www.', '//', $wpsslredir_main_url);
+      }
     }
-  } else if(get_option('wp_ssl_redirect_protocol') == 'non-www') {
-    if(strpos($wpsslredir_parse_url['host'], 'www.') !== false) {
-      $wpsslredir_parse_url['host'] = str_replace('www.', '', $wpsslredir_parse_url['host']);
+
+    $wpsslredir_url = str_replace('http://', 'https://', $wpsslredir_requested_url);
+    $wpsslredir_new_siteurl = str_replace('http://', 'https://', $wpsslredir_main_url);
+    if($wpsslredir_new_siteurl !== site_url()) {
+      if(home_url() === site_url()) {
+        update_option('siteurl', $wpsslredir_new_siteurl);
+        update_option('home', $wpsslredir_new_siteurl);
+      }
     }
-  } else {
-    $wpssl_site_default_url = parse_url(site_url());
-    $wpsslredir_parse_url['host'] = $wpssl_site_default_url['host'];
-  }
-  $wpsslredir_parse_url['path'] = $_SERVER['REQUEST_URI'];
-  $wpsslredir_url = 'https://'.$wpsslredir_parse_url['host'].$wpsslredir_parse_url['path'];
-  $wpsslredir_new_siteurl = 'https://'.$wpsslredir_parse_url['host'];
-  if($wpsslredir_new_siteurl !== site_url()) {
-    update_option('siteurl', $wpsslredir_new_siteurl);
-    update_option('home', $wpsslredir_new_siteurl);
-  }
-  if($wpsslredir_requested_url !== $wpsslredir_url) {
-    header('Location: '.$wpsslredir_url, true, 301);
-    exit;
+
+    if($requested_full !== $wpsslredir_url) {
+      header('Location: '.$wpsslredir_url, true, 301);
+      exit;
+    }
   }
 }