Really Simple SSL - Version 2.5.26

Version Description

  • Fix: multisite menu not showing when main site is not SSL.
  • Fix: the admin_url and site_url filter get an empty blog_id when checking the URL for the current blog.
  • Tweak: added comment to encourage backing up to activation notice.
  • Tested the plugin with Gutenberg.
Download this release

Release Info

Developer RogierLankhorst
Plugin Icon 128x128 Really Simple SSL
Version 2.5.26
Comparing to
See all releases

Code changes from version 2.5.25 to 2.5.26

Files changed (4) hide show
  1. class-admin.php +8 -1
  2. class-multisite.php +8 -4
  3. readme.txt +9 -3
  4. rlrsssl-really-simple-ssl.php +1 -1
class-admin.php CHANGED
@@ -237,6 +237,7 @@ defined('ABSPATH') or die("you do not have access to this page!");
237
  if (!current_user_can($this->capability)) return;
238
 
239
  if (!$this->site_has_ssl) {
 
240
  global $wp;
241
  $current_url = "https://".$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"];
242
  ?>
@@ -255,7 +256,13 @@ defined('ABSPATH') or die("you do not have access to this page!");
255
  <p>
256
  <ul>
257
  <li><?php _e('Http references in your .css and .js files: change any http:// into //','really-simple-ssl');?></li>
258
- <li><?php _e('Images, stylesheets or scripts from a domain without an SSL certificate: remove them or move to your own server.','really-simple-ssl');?></li>
 
 
 
 
 
 
259
  </ul>
260
  </p>
261
  <?php $this->show_pro(); ?>
237
  if (!current_user_can($this->capability)) return;
238
 
239
  if (!$this->site_has_ssl) {
240
+
241
  global $wp;
242
  $current_url = "https://".$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"];
243
  ?>
256
  <p>
257
  <ul>
258
  <li><?php _e('Http references in your .css and .js files: change any http:// into //','really-simple-ssl');?></li>
259
+ <li><?php _e('Images, stylesheets or scripts from a domain without an SSL certificate: remove them or move to your own server.','really-simple-ssl');?></li><?php
260
+
261
+ $backup_link = "https://really-simple-ssl.com/knowledge-base/backing-up-your-site/";
262
+ $link_open = '<a target="_blank" href="'.$backup_link.'">';
263
+ $link_close = '</a>';
264
+
265
+ ?> <li> <?php printf(__("It is recommended to take a %sbackup%s of your site before activating SSL", 'really-simple-ssl'), $link_open, $link_close); ?> </li>
266
  </ul>
267
  </p>
268
  <?php $this->show_pro(); ?>
class-multisite.php CHANGED
@@ -30,7 +30,6 @@ if ( ! class_exists( 'rsssl_multisite' ) ) {
30
 
31
  self::$_this = $this;
32
 
33
-
34
  $this->load_options();
35
  register_activation_hook( dirname( __FILE__ )."/".rsssl_plugin, array($this,'activate') );
36
 
@@ -137,13 +136,13 @@ if ( ! class_exists( 'rsssl_multisite' ) ) {
137
 
138
  register_setting( $this->option_group, 'rsssl_options');
139
  add_settings_section('rsssl_network_settings', __("Settings","really-simple-ssl"), array($this,'section_text'), $this->page_slug);
140
-
141
- if (RSSSL()->really_simple_ssl->site_has_ssl) {
142
  add_settings_field('id_ssl_enabled_networkwide', __("Enable SSL", "really-simple-ssl"), array($this,'get_option_enable_multisite'), $this->page_slug, 'rsssl_network_settings');
143
  //if ($this->selected_networkwide_or_per_site) {
144
  RSSSL()->rsssl_network_admin_page = add_submenu_page('settings.php', "SSL", "SSL", 'manage_options', $this->page_slug, array( &$this, 'multisite_menu_page' ) );
145
  //}
146
- }
147
  }
148
 
149
  /*
@@ -478,6 +477,7 @@ public function settings_tab(){
478
  */
479
 
480
  public function check_admin_protocol($url, $path, $blog_id){
 
481
 
482
  //if the force_ssl_admin is defined, the admin_url should not be forced back to http: all admin panels should be https.
483
  if (defined('FORCE_SSL_ADMIN')) return $url;
@@ -507,6 +507,10 @@ public function check_admin_protocol($url, $path, $blog_id){
507
  */
508
 
509
  public function check_site_protocol($url, $path, $orig_scheme, $blog_id){
 
 
 
 
510
  if (!$this->ssl_enabled_networkwide) {
511
  $home_url = get_blog_option($blog_id, 'home');
512
  if (strpos($home_url, "https://")===false) {
30
 
31
  self::$_this = $this;
32
 
 
33
  $this->load_options();
34
  register_activation_hook( dirname( __FILE__ )."/".rsssl_plugin, array($this,'activate') );
35
 
136
 
137
  register_setting( $this->option_group, 'rsssl_options');
138
  add_settings_section('rsssl_network_settings', __("Settings","really-simple-ssl"), array($this,'section_text'), $this->page_slug);
139
+
140
+ //if (RSSSL()->really_simple_ssl->site_has_ssl) {
141
  add_settings_field('id_ssl_enabled_networkwide', __("Enable SSL", "really-simple-ssl"), array($this,'get_option_enable_multisite'), $this->page_slug, 'rsssl_network_settings');
142
  //if ($this->selected_networkwide_or_per_site) {
143
  RSSSL()->rsssl_network_admin_page = add_submenu_page('settings.php', "SSL", "SSL", 'manage_options', $this->page_slug, array( &$this, 'multisite_menu_page' ) );
144
  //}
145
+ // }
146
  }
147
 
148
  /*
477
  */
478
 
479
  public function check_admin_protocol($url, $path, $blog_id){
480
+ if (!$blog_id) $blog_id = get_current_blog_id();
481
 
482
  //if the force_ssl_admin is defined, the admin_url should not be forced back to http: all admin panels should be https.
483
  if (defined('FORCE_SSL_ADMIN')) return $url;
507
  */
508
 
509
  public function check_site_protocol($url, $path, $orig_scheme, $blog_id){
510
+ if (!$blog_id) $blog_id = get_current_blog_id();
511
+
512
+ if (get_current_blog_id()==$blog_id) return $url;
513
+
514
  if (!$this->ssl_enabled_networkwide) {
515
  $home_url = get_blog_option($blog_id, 'home');
516
  if (strpos($home_url, "https://")===false) {
readme.txt CHANGED
@@ -5,7 +5,7 @@ Tags: SSL, https, force SSL, mixed content, insecure content, secure website, we
5
  Requires at least: 4.2
6
  License: GPL2
7
  Tested up to: 4.9
8
- Stable tag: 2.5.25
9
 
10
  No setup required! You only need an SSL certificate, and this plugin will do the rest.
11
 
@@ -18,7 +18,7 @@ To keep it lightweight, the options are kept to a minimum. The entire site will
18
  * Activate this plugin
19
  * Enable SSL with one click
20
 
21
- Always backup before you go! If you do not have a sound backup policy, start having one! See https://really-simple-ssl.com/knowledge-base/backing-up-your-site/ for our recommendations.
22
 
23
  Really Simple SSL is on [GitHub](https://github.com/rlankhorst/really-simple-ssl) as well!
24
 
@@ -78,6 +78,12 @@ If you are experiencing redirect loops on your site, try these [instructions](ht
78
  Yes. There is a dedicated network settings page where you can switch between network activated SSL and per page SSL. In the dedicated pro for multisite plugin, you can override all site settings for SSL on the network level, and can activate and deactivate SSL in the network menu for each site.
79
 
80
  == Changelog ==
 
 
 
 
 
 
81
  = 2.5.25 =
82
  * Fix: "switch mixed content fixer hook" option not visible on the multisites settings page
83
  * Tweak: several typo's and uppercasing
@@ -273,7 +279,7 @@ fix: Adjusted selection order of .htaccess rules, preventing redirect loops
273
  * Fixed some bugs in deactivation and activation of multisite
274
 
275
  = 2.3.0 =
276
- * Gave more control over activation process by explicity asking to enable SSL.
277
  * Added a notice if .htaccess is not writable
278
 
279
  = 2.2.20 =
5
  Requires at least: 4.2
6
  License: GPL2
7
  Tested up to: 4.9
8
+ Stable tag: 2.5.26
9
 
10
  No setup required! You only need an SSL certificate, and this plugin will do the rest.
11
 
18
  * Activate this plugin
19
  * Enable SSL with one click
20
 
21
+ Always backup before you go! If you do not have a sound backup policy, start having one! See [our recommendations](https://really-simple-ssl.com/knowledge-base/backing-up-your-site/).
22
 
23
  Really Simple SSL is on [GitHub](https://github.com/rlankhorst/really-simple-ssl) as well!
24
 
78
  Yes. There is a dedicated network settings page where you can switch between network activated SSL and per page SSL. In the dedicated pro for multisite plugin, you can override all site settings for SSL on the network level, and can activate and deactivate SSL in the network menu for each site.
79
 
80
  == Changelog ==
81
+ = 2.5.26 =
82
+ * Fix: multisite menu not showing when main site is not SSL.
83
+ * Fix: the admin_url and site_url filter get an empty blog_id when checking the URL for the current blog.
84
+ * Tweak: added comment to encourage backing up to activation notice.
85
+ * Tested the plugin with Gutenberg.
86
+
87
  = 2.5.25 =
88
  * Fix: "switch mixed content fixer hook" option not visible on the multisites settings page
89
  * Tweak: several typo's and uppercasing
279
  * Fixed some bugs in deactivation and activation of multisite
280
 
281
  = 2.3.0 =
282
+ * Gave more control over activation process by explicitly asking to enable SSL.
283
  * Added a notice if .htaccess is not writable
284
 
285
  = 2.2.20 =
rlrsssl-really-simple-ssl.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: Really Simple SSL
4
  * Plugin URI: https://www.really-simple-ssl.com
5
  * Description: Lightweight plugin without any setup to make your site SSL proof
6
- * Version: 2.5.25
7
  * Text Domain: really-simple-ssl
8
  * Domain Path: /languages
9
  * Author: Rogier Lankhorst
3
  * Plugin Name: Really Simple SSL
4
  * Plugin URI: https://www.really-simple-ssl.com
5
  * Description: Lightweight plugin without any setup to make your site SSL proof
6
+ * Version: 2.5.26
7
  * Text Domain: really-simple-ssl
8
  * Domain Path: /languages
9
  * Author: Rogier Lankhorst