Changeset 1725455

Timestamp:

09/06/2017 10:05:51 AM (8 years ago)

Author:

rehmatworks

Message:

Updating to version 1.3

Location:

wp-ssl-redirect

Files:

• tags/1.3/wp-ssl-redirect.php (modified) (1 diff)
• trunk/wp-ssl-redirect.php (modified) (4 diffs)

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

@@ -39 +39 @@
  
                     <select name="wp_ssl_redirect_protocol">
-                        <option value="auto-detect" <?php echo esc_attr( get_option('wp_ssl_redirect_protocol') ) == 'auto-detect' ? 'selected="selected"' : ''; ?>>Auto-detect</option>
+                        <option value="auto-detect" <?php echo esc_attr( get_option('wp_ssl_redirect_protocol') ) == 'auto-detect' ? 'selected="selected"' : ''; ?>>Use-detect (Uses site url)</option>
                         <option value="www" <?php echo esc_attr( get_option('wp_ssl_redirect_protocol') ) == 'www' ? 'selected="selected"' : ''; ?>>Force www version</option>
                         <option value="non-www" <?php echo esc_attr( get_option('wp_ssl_redirect_protocol') ) == 'non-www' ? 'selected="selected"' : ''; ?>>Force non-www version</option>

wp-ssl-redirect/trunk/wp-ssl-redirect.php

@@ -1 +1 @@
 <?php
-    
+  
 /**
 * Plugin Name: WP SSL Redirect
@@ -24 +24 @@
   ?>
     <div class="wrap">
-        <h3>WP SSL Redirect Options</h3>
-        <hr>
+      <h3>WP SSL Redirect Options</h3>
+      <hr>
       <form action="options.php" method="post">
  
@@ -39 +39 @@
  
                     <select name="wp_ssl_redirect_protocol">
-                        <option value="auto-detect" <?php echo esc_attr( get_option('wp_ssl_redirect_protocol') ) == 'auto-detect' ? 'selected="selected"' : ''; ?>>Auto-detect</option>
+                        <option value="auto-detect" <?php echo esc_attr( get_option('wp_ssl_redirect_protocol') ) == 'auto-detect' ? 'selected="selected"' : ''; ?>>Use-detect (Uses site url)</option>
                         <option value="www" <?php echo esc_attr( get_option('wp_ssl_redirect_protocol') ) == 'www' ? 'selected="selected"' : ''; ?>>Force www version</option>
                         <option value="non-www" <?php echo esc_attr( get_option('wp_ssl_redirect_protocol') ) == 'non-www' ? 'selected="selected"' : ''; ?>>Force non-www version</option>
@@ -59 +59 @@
 
 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'];
-        }
-    } 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']);
-        }
-    } else {
-        $wpssl_site_default_url = parse_url(site_url());
-        $wpsslredir_parse_url['host'] = $wpssl_site_default_url['host'];
-    }
-    $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;
-    }
+  $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'];
+    }
+  } 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']);
+    }
+  } else {
+    $wpssl_site_default_url = parse_url(site_url());
+    $wpsslredir_parse_url['host'] = $wpssl_site_default_url['host'];
+  }
+  $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;
+  }
 }