WordPress HTTPS (SSL) - Version 3.2.1

Version Description

Added Network settings for multisite installations.
Bug Fix - Elements should now be properly secured by the file extension check in the Parser.
Bug Fix - Pages being redirected should no longer always redirect to index.php for some server configurations.
Bug Fix - FORCE_SSL_ADMIN option should no longer cause redirect loops if the ssl_admin setting is set to false.

Release Info

Developer	Mvied
Plugin	WordPress HTTPS (SSL)
Version	3.2.1
Comparing to
See all releases

Code changes from version 3.2 to 3.2.1

Files changed (12) hide show

admin/css/network.css +28 -0
admin/templates/metabox/network.php +80 -9
admin/templates/metabox/settings.php +2 -2
admin/templates/network.php +1 -4
lib/Mvied/Model.php +62 -0
lib/Mvied/license.txt +674 -0
lib/WordPressHTTPS.php +26 -9
lib/WordPressHTTPS/Module/Core.php +12 -6
lib/WordPressHTTPS/Module/Network.php +46 -3
lib/WordPressHTTPS/Module/Parser.php +1 -1
readme.txt +6 -1
wordpress-https.php +2 -2

admin/css/network.css ADDED Viewed

	@@ -0,0 +1,28 @@


1	+ #blog-table .blog-host {
2	+ width: 100%;
3	+ }
4	+ #blog-table input[type="checkbox"] {
5	+ float: none;
6	+ margin: 0;
7	+ }
8	+ #blog-table .blog-ssl_admin, #blog-table .blog-exclusive_https,
9	+ #blog-table .blog-remove_unsecure, #blog-table .blog-debug,
10	+ #blog-table .blog-proxy, #blog-table .blog-admin_menu {
11	+ width: 1%;
12	+ text-align: center;
13	+ }
14	+ #blog-table .blog-proxy select {
15	+ width: 50px;
16	+ }
17	+ #blog-table .blog-admin_menu select {
18	+ width: 78px;
19	+ }
20	+ #blog-table .blog-host input {
21	+ width: 100%;
22	+ }
23	+ table#blog-table tr td,
24	+ table#blog-table tr th {
25	+ padding: 0 5px;
26	+ word-wrap: break-word;
27	+ overflow: hidden;
28	+ }

admin/templates/metabox/network.php CHANGED Viewed

@@ -1,11 +1,89 @@
             <form name="<?php echo $this->getPlugin()->getSlug(); ?>_settings_form" id="<?php echo $this->getPlugin()->getSlug(); ?>_settings_form" action="<?php echo $_SERVER['REQUEST_URI']; ?>" method="post">
             <?php settings_fields($this->getPlugin()->getSlug()); ?>
             <input type="hidden" name="action" value="wphttps-network" />
             <p class="button-controls">
-            -
            	<input type="submit" name="settings-save" value="Save Changes" class="button-primary" id="network-settings-save" />
-            -
            	<input type="submit" name="settings-reset" value="Reset" class="button-secondary" id="network-settings-reset" />
             	<img alt="Waiting..." src="<?php echo admin_url('/images/wpspin_light.gif'); ?>" class="waiting submit-waiting" />
             </p>
             </form>
@@ -20,12 +98,5 @@ jQuery(document).ready(function($) {
             			$('#message-body').html(responseText).fadeOut(0).fadeIn().delay(5000).fadeOut();
+            		}
             	});
-            -
-            -
            	$('#settings-reset').click(function(e, el) {
-            -
            	   if ( ! confirm('Are you sure you want to reset all WordPress HTTPS network settings?') ) {
-            -
            			e.preventDefault();
-            -
            			return false;
-            -
            	   }
-            -
            	});
             });
             </script>


1	<form name="<?php echo $this->getPlugin()->getSlug(); ?>_settings_form" id="<?php echo $this->getPlugin()->getSlug(); ?>_settings_form" action="<?php echo $_SERVER['REQUEST_URI']; ?>" method="post">
2	<?php settings_fields($this->getPlugin()->getSlug()); ?>
3
4	+ <table id="blog-table">
5	+ <thead>
6	+ <tr>
7	+ <th class="blog-blog">Blog</th>
8	+ <th class="blog-host">SSL Host</th>
9	+ <th class="blog-ssl_admin">Force SSL Admin</th>
10	+ <th class="blog-exclusive_https">Force SSL Exclusively</th>
11	+ <th class="blog-remove_unsecure">Remove Unsecure Elements</th>
12	+ <th class="blog-debug">Debug Mode</th>
13	+ <th class="blog-proxy">Proxy</th>
14	+ <th class="blog-admin_menu">Admin Menu Location</th>
15	+ </tr>
16	+ </thead>
17	+ <tbody>
18	+ <?php
19	+ global $wpdb;
20	+ $blogs = $wpdb->get_col($wpdb->prepare("SELECT blog_id FROM " . $wpdb->blogs));
21	+ foreach($blogs as $blog_id) {
22	+ $ssl_host = ($this->getPlugin()->getSetting('ssl_host', $blog_id) != '' ? $this->getPlugin()->getSetting('ssl_host', $blog_id) : get_site_url($blog_id, '', 'https'));
23	+ $ssl_host = preg_replace('/http[s]?:\/\//', '', $ssl_host);
24	+ $ssl_host = rtrim(str_replace(parse_url(get_site_url($blog_id, ''), PHP_URL_PATH), '', $ssl_host), '/');
25	+ ?>
26	+ <tr>
27	+ <td class="blog-blog"><strong><?=preg_replace('/http[s]?:\/\//', '', get_site_url($blog_id))?></strong></td>
28	+ <td class="blog-host"><input name="blog[<?=$blog_id?>][ssl_host]" type="text" class="regular-text code" value="<?=$ssl_host?>" /></td>
29	+ <td class="blog-ssl_admin"><input type="hidden" name="blog[<?=$blog_id?>][ssl_admin]" value="0" /><input name="blog[<?=$blog_id?>][ssl_admin]" type="checkbox" value="1"<?php echo ((force_ssl_admin()) ? ' checked="checked" disabled="disabled" title="FORCE_SSL_ADMIN is true in wp-config.php"' : (($this->getPlugin()->getSetting('ssl_admin', $blog_id)) ? ' checked="checked"' : '') ); ?> /></td>
30	+ <td class="blog-exclusive_https"><input type="hidden" name="blog[<?=$blog_id?>][exclusive_https]" value="0" /><input name="blog[<?=$blog_id?>][exclusive_https]" type="checkbox" value="1"<?php echo (($this->getPlugin()->getSetting('exclusive_https', $blog_id)) ? ' checked="checked"' : ''); ?> /></td>
31	+ <td class="blog-remove_unsecure"><input type="hidden" name="blog[<?=$blog_id?>][remove_unsecure]" value="0" /><input name="blog[<?=$blog_id?>][remove_unsecure]" type="checkbox" value="1"<?php echo (($this->getPlugin()->getSetting('remove_unsecure', $blog_id)) ? ' checked="checked"' : ''); ?> /></td>
32	+ <td class="blog-debug"><input type="hidden" name="blog[<?=$blog_id?>][debug]" value="0" /><input name="blog[<?=$blog_id?>][debug]" type="checkbox" value="1"<?php echo (($this->getPlugin()->getSetting('debug', $blog_id)) ? ' checked="checked"' : ''); ?> /></td>
33	+ <td class="blog-proxy">
34	+ <select name="blog[<?=$blog_id?>][ssl_proxy]">
35	+ <option value="0"<?php echo ((! $this->getPlugin()->getSetting('ssl_proxy', $blog_id)) ? ' selected="selected"' : ''); ?>>No</option>
36	+ <option value="auto"<?php echo (($this->getPlugin()->getSetting('ssl_proxy', $blog_id) === 'auto') ? ' selected="selected"' : ''); ?>>Auto</option>
37	+ <option value="1"<?php echo (($this->getPlugin()->getSetting('ssl_proxy', $blog_id) == 1) ? ' selected="selected"' : ''); ?>>Yes</option>
38	+ </select>
39	+ </td>
40	+ <td class="blog-admin_menu">
41	+ <select name="blog[<?=$blog_id?>][admin_menu]">
42	+ <option value="side"<?php echo (($this->getPlugin()->getSetting('admin_menu', $blog_id) === 'side') ? ' selected="selected"' : ''); ?>>Sidebar</option>
43	+ <option value="settings"<?php echo (($this->getPlugin()->getSetting('admin_menu', $blog_id) === 'settings') ? ' selected="selected"' : ''); ?>>Settings</option>
44	+ </select>
45	+ </td>
46	+ </tr>
47	+ <?php
48	+ }
49	+
50	+ $defaults = $this->getPlugin()->getSetting('network_defaults');
51	+ if ( sizeof($defaults) == 0 ) {
52	+ foreach( $this->getPlugin()->getSettings() as $setting => $default ) {
53	+ $defaults[$setting] = $default;
54	+ }
55	+ }
56	+ ?>
57	+
58	+ <tr>
59	+ <td class="blog-blog"><strong>New Site Defaults</strong></td>
60	+ <td class="blog-host"><input name="blog_default[ssl_host]" type="text" class="regular-text code" value="<?=$defaults['ssl_host']?>" /></td>
61	+ <td class="blog-ssl_admin"><input type="hidden" name="blog_default[ssl_admin]" value="0" /><input name="blog_default[ssl_admin]" type="checkbox" value="1"<?php echo ($defaults['ssl_admin'] ? ' checked="checked"' : ''); ?> /></td>
62	+ <td class="blog-exclusive_https"><input type="hidden" name="blog_default[exclusive_https]" value="0" /><input name="blog_default[exclusive_https]" type="checkbox" value="1"<?php echo ($defaults['exclusive_https'] ? ' checked="checked"' : ''); ?> /></td>
63	+ <td class="blog-remove_unsecure"><input type="hidden" name="blog_default[remove_unsecure]" value="0" /><input name="blog_default[remove_unsecure]" type="checkbox" value="1"<?php echo ($defaults['remove_unsecure'] ? ' checked="checked"' : ''); ?> /></td>
64	+ <td class="blog-debug"><input type="hidden" name="blog_default[debug]" value="0" /><input name="blog_default[debug]" type="checkbox" value="1"<?php echo ($defaults['debug'] ? ' checked="checked"' : ''); ?> /></td>
65	+ <td class="blog-proxy">
66	+ <select name="blog_default[ssl_proxy]">
67	+ <option value="0"<?php echo (! $defaults['ssl_proxy'] ? ' selected="selected"' : ''); ?>>No</option>
68	+ <option value="auto"<?php echo ($defaults['ssl_proxy'] === 'auto' ? ' selected="selected"' : ''); ?>>Auto</option>
69	+ <option value="1"<?php echo ($defaults['ssl_proxy'] === 1 ? ' selected="selected"' : ''); ?>>Yes</option>
70	+ </select>
71	+ </td>
72	+ <td class="blog-admin_menu">
73	+ <select name="blog_default[admin_menu]">
74	+ <option value="side"<?php echo ($defaults['admin_menu'] === 'side' ? ' selected="selected"' : ''); ?>>Sidebar</option>
75	+ <option value="settings"<?php echo ($defaults['admin_menu'] === 'settings' ? ' selected="selected"' : ''); ?>>Settings</option>
76	+ </select>
77	+ </td>
78	+ </tr>
79	+ </tbody>
80	+
81	+ </table>
82	+
83	<input type="hidden" name="action" value="wphttps-network" />
84
85	<p class="button-controls">
86	+ <input type="submit" name="network-settings-save" value="Save Changes" class="button-primary" id="network-settings-save" />

87	<img alt="Waiting..." src="<?php echo admin_url('/images/wpspin_light.gif'); ?>" class="waiting submit-waiting" />
88	</p>
89	</form>

98	$('#message-body').html(responseText).fadeOut(0).fadeIn().delay(5000).fadeOut();
99	}
100	});







101	});
102	</script>

admin/templates/metabox/settings.php CHANGED Viewed

	@@ -90,10 +90,10 @@
90	<td>
91	<fieldset>
92	<label for="admin_menu_side" class="label-radio">
93	- <input type="radio" name="admin_menu" id="admin_menu_side" value="side"<?php echo (($this->getPlugin()->getSetting('admin_menu') === 'side') ? ' checked="checked"' : ''); ?>> <span>~~Admin~~ Sidebar</span>
94	</label>
95	<label for="admin_menu_settings" class="label-radio">
96	- <input type="radio" name="admin_menu" id="admin_menu_settings" value="settings"<?php echo (($this->getPlugin()->getSetting('admin_menu') === 'settings') ? ' checked="checked"' : ''); ?>> <span>~~General~~ Settings</span>
97	</label>
98	</fieldset>
99	</td>


90	<td>
91	<fieldset>
92	<label for="admin_menu_side" class="label-radio">
93	+ <input type="radio" name="admin_menu" id="admin_menu_side" value="side"<?php echo (($this->getPlugin()->getSetting('admin_menu') === 'side') ? ' checked="checked"' : ''); ?>> <span>Sidebar</span>
94	</label>
95	<label for="admin_menu_settings" class="label-radio">
96	+ <input type="radio" name="admin_menu" id="admin_menu_settings" value="settings"<?php echo (($this->getPlugin()->getSetting('admin_menu') === 'settings') ? ' checked="checked"' : ''); ?>> <span>Settings</span>
97	</label>
98	</fieldset>
99	</td>

admin/templates/network.php CHANGED Viewed

	@@ -13,11 +13,8 @@ require_once('../includes/template.php'); // WordPress Dashboard Functions
13	wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false );
14	?>
15	<div id="poststuff" class="columns metabox-holder">
16	- <div class="postbox-container ~~column-primary~~">
17	<?php do_meta_boxes('toplevel_page_' . $this->getPlugin()->getSlug() . '_network', 'main', $this); ?>
18	</div>
19	- <div class="postbox-container column-secondary">
20	- <?php do_meta_boxes('toplevel_page_' . $this->getPlugin()->getSlug(), 'side', $this); // Use side from regular settings ?>
21	- </div>
22	</div>
23	</div>


13	wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false );
14	?>
15	<div id="poststuff" class="columns metabox-holder">
16	+ <div class="postbox-container">
17	<?php do_meta_boxes('toplevel_page_' . $this->getPlugin()->getSlug() . '_network', 'main', $this); ?>
18	</div>



19	</div>
20	</div>

lib/Mvied/Model.php ADDED Viewed

	@@ -0,0 +1,62 @@


1	+ <?php
2	+ /**
3	+ * Model class for a WordPress theme or plugin.
4	+ *
5	+ * @author Mike Ems
6	+ * @package Mvied
7	+ */
8	+ class Mvied_Model {
9	+
10	+ protected $_post;
11	+
12	+ public $ID;
13	+
14	+ public $name;
15	+
16	+ public function __construct( $id ) {
17	+ if ( ! isset($id) ) {
18	+ return $this;
19	+ }
20	+
21	+ $this->_post = get_post($id);
22	+ $this->ID = $this->_post->ID;
23	+ $this->name = $this->_post->post_title;
24	+
25	+ $reflect = new ReflectionClass($this);
26	+ $properties = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
27	+ foreach($properties as $property) {
28	+ $property = $property->getName();
29	+ if ( !isset($this->$property) ) {
30	+ $this->$property = get_post_meta($this->ID, $property, true);
31	+ }
32	+ }
33	+ }
34	+
35	+ public function __get( $property ) {
36	+ return get_post_meta($this->ID, $property, true);
37	+ }
38	+
39	+ public function getPost() {
40	+ return $this->_post;
41	+ }
42	+
43	+ public function load( $array = array() ) {
44	+ foreach($array as $key => $value) {
45	+ if ( property_exists($this, $key) ) {
46	+ $this->$key = $value;
47	+ }
48	+ }
49	+ }
50	+
51	+ public function save() {
52	+ $reflect = new ReflectionClass($this);
53	+ $properties = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
54	+ foreach($properties as $property) {
55	+ $property = $property->getName();
56	+ if ( strpos($property, '_') !== 0 ) {
57	+ update_post_meta($this->_post->ID, $property, $this->$property);
58	+ }
59	+ }
60	+ }
61	+
62	+ }

lib/Mvied/license.txt ADDED Viewed

	@@ -0,0 +1,674 @@


1	+ GNU GENERAL PUBLIC LICENSE
2	+ Version 3, 29 June 2007
3	+
4	+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
5	+ Everyone is permitted to copy and distribute verbatim copies
6	+ of this license document, but changing it is not allowed.
7	+
8	+ Preamble
9	+
10	+ The GNU General Public License is a free, copyleft license for
11	+ software and other kinds of works.
12	+
13	+ The licenses for most software and other practical works are designed
14	+ to take away your freedom to share and change the works. By contrast,
15	+ the GNU General Public License is intended to guarantee your freedom to
16	+ share and change all versions of a program--to make sure it remains free
17	+ software for all its users. We, the Free Software Foundation, use the
18	+ GNU General Public License for most of our software; it applies also to
19	+ any other work released this way by its authors. You can apply it to
20	+ your programs, too.
21	+
22	+ When we speak of free software, we are referring to freedom, not
23	+ price. Our General Public Licenses are designed to make sure that you
24	+ have the freedom to distribute copies of free software (and charge for
25	+ them if you wish), that you receive source code or can get it if you
26	+ want it, that you can change the software or use pieces of it in new
27	+ free programs, and that you know you can do these things.
28	+
29	+ To protect your rights, we need to prevent others from denying you
30	+ these rights or asking you to surrender the rights. Therefore, you have
31	+ certain responsibilities if you distribute copies of the software, or if
32	+ you modify it: responsibilities to respect the freedom of others.
33	+
34	+ For example, if you distribute copies of such a program, whether
35	+ gratis or for a fee, you must pass on to the recipients the same
36	+ freedoms that you received. You must make sure that they, too, receive
37	+ or can get the source code. And you must show them these terms so they
38	+ know their rights.
39	+
40	+ Developers that use the GNU GPL protect your rights with two steps:
41	+ (1) assert copyright on the software, and (2) offer you this License
42	+ giving you legal permission to copy, distribute and/or modify it.
43	+
44	+ For the developers' and authors' protection, the GPL clearly explains
45	+ that there is no warranty for this free software. For both users' and
46	+ authors' sake, the GPL requires that modified versions be marked as
47	+ changed, so that their problems will not be attributed erroneously to
48	+ authors of previous versions.
49	+
50	+ Some devices are designed to deny users access to install or run
51	+ modified versions of the software inside them, although the manufacturer
52	+ can do so. This is fundamentally incompatible with the aim of
53	+ protecting users' freedom to change the software. The systematic
54	+ pattern of such abuse occurs in the area of products for individuals to
55	+ use, which is precisely where it is most unacceptable. Therefore, we
56	+ have designed this version of the GPL to prohibit the practice for those
57	+ products. If such problems arise substantially in other domains, we
58	+ stand ready to extend this provision to those domains in future versions
59	+ of the GPL, as needed to protect the freedom of users.
60	+
61	+ Finally, every program is threatened constantly by software patents.
62	+ States should not allow patents to restrict development and use of
63	+ software on general-purpose computers, but in those that do, we wish to
64	+ avoid the special danger that patents applied to a free program could
65	+ make it effectively proprietary. To prevent this, the GPL assures that
66	+ patents cannot be used to render the program non-free.
67	+
68	+ The precise terms and conditions for copying, distribution and
69	+ modification follow.
70	+
71	+ TERMS AND CONDITIONS
72	+
73	+ 0. Definitions.
74	+
75	+ "This License" refers to version 3 of the GNU General Public License.
76	+
77	+ "Copyright" also means copyright-like laws that apply to other kinds of
78	+ works, such as semiconductor masks.
79	+
80	+ "The Program" refers to any copyrightable work licensed under this
81	+ License. Each licensee is addressed as "you". "Licensees" and
82	+ "recipients" may be individuals or organizations.
83	+
84	+ To "modify" a work means to copy from or adapt all or part of the work
85	+ in a fashion requiring copyright permission, other than the making of an
86	+ exact copy. The resulting work is called a "modified version" of the
87	+ earlier work or a work "based on" the earlier work.
88	+
89	+ A "covered work" means either the unmodified Program or a work based
90	+ on the Program.
91	+
92	+ To "propagate" a work means to do anything with it that, without
93	+ permission, would make you directly or secondarily liable for
94	+ infringement under applicable copyright law, except executing it on a
95	+ computer or modifying a private copy. Propagation includes copying,
96	+ distribution (with or without modification), making available to the
97	+ public, and in some countries other activities as well.
98	+
99	+ To "convey" a work means any kind of propagation that enables other
100	+ parties to make or receive copies. Mere interaction with a user through
101	+ a computer network, with no transfer of a copy, is not conveying.
102	+
103	+ An interactive user interface displays "Appropriate Legal Notices"
104	+ to the extent that it includes a convenient and prominently visible
105	+ feature that (1) displays an appropriate copyright notice, and (2)
106	+ tells the user that there is no warranty for the work (except to the
107	+ extent that warranties are provided), that licensees may convey the
108	+ work under this License, and how to view a copy of this License. If
109	+ the interface presents a list of user commands or options, such as a
110	+ menu, a prominent item in the list meets this criterion.
111	+
112	+ 1. Source Code.
113	+
114	+ The "source code" for a work means the preferred form of the work
115	+ for making modifications to it. "Object code" means any non-source
116	+ form of a work.
117	+
118	+ A "Standard Interface" means an interface that either is an official
119	+ standard defined by a recognized standards body, or, in the case of
120	+ interfaces specified for a particular programming language, one that
121	+ is widely used among developers working in that language.
122	+
123	+ The "System Libraries" of an executable work include anything, other
124	+ than the work as a whole, that (a) is included in the normal form of
125	+ packaging a Major Component, but which is not part of that Major
126	+ Component, and (b) serves only to enable use of the work with that
127	+ Major Component, or to implement a Standard Interface for which an
128	+ implementation is available to the public in source code form. A
129	+ "Major Component", in this context, means a major essential component
130	+ (kernel, window system, and so on) of the specific operating system
131	+ (if any) on which the executable work runs, or a compiler used to
132	+ produce the work, or an object code interpreter used to run it.
133	+
134	+ The "Corresponding Source" for a work in object code form means all
135	+ the source code needed to generate, install, and (for an executable
136	+ work) run the object code and to modify the work, including scripts to
137	+ control those activities. However, it does not include the work's
138	+ System Libraries, or general-purpose tools or generally available free
139	+ programs which are used unmodified in performing those activities but
140	+ which are not part of the work. For example, Corresponding Source
141	+ includes interface definition files associated with source files for
142	+ the work, and the source code for shared libraries and dynamically
143	+ linked subprograms that the work is specifically designed to require,
144	+ such as by intimate data communication or control flow between those
145	+ subprograms and other parts of the work.
146	+
147	+ The Corresponding Source need not include anything that users
148	+ can regenerate automatically from other parts of the Corresponding
149	+ Source.
150	+
151	+ The Corresponding Source for a work in source code form is that
152	+ same work.
153	+
154	+ 2. Basic Permissions.
155	+
156	+ All rights granted under this License are granted for the term of
157	+ copyright on the Program, and are irrevocable provided the stated
158	+ conditions are met. This License explicitly affirms your unlimited
159	+ permission to run the unmodified Program. The output from running a
160	+ covered work is covered by this License only if the output, given its
161	+ content, constitutes a covered work. This License acknowledges your
162	+ rights of fair use or other equivalent, as provided by copyright law.
163	+
164	+ You may make, run and propagate covered works that you do not
165	+ convey, without conditions so long as your license otherwise remains
166	+ in force. You may convey covered works to others for the sole purpose
167	+ of having them make modifications exclusively for you, or provide you
168	+ with facilities for running those works, provided that you comply with
169	+ the terms of this License in conveying all material for which you do
170	+ not control copyright. Those thus making or running the covered works
171	+ for you must do so exclusively on your behalf, under your direction
172	+ and control, on terms that prohibit them from making any copies of
173	+ your copyrighted material outside their relationship with you.
174	+
175	+ Conveying under any other circumstances is permitted solely under
176	+ the conditions stated below. Sublicensing is not allowed; section 10
177	+ makes it unnecessary.
178	+
179	+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
180	+
181	+ No covered work shall be deemed part of an effective technological
182	+ measure under any applicable law fulfilling obligations under article
183	+ 11 of the WIPO copyright treaty adopted on 20 December 1996, or
184	+ similar laws prohibiting or restricting circumvention of such
185	+ measures.
186	+
187	+ When you convey a covered work, you waive any legal power to forbid
188	+ circumvention of technological measures to the extent such circumvention
189	+ is effected by exercising rights under this License with respect to
190	+ the covered work, and you disclaim any intention to limit operation or
191	+ modification of the work as a means of enforcing, against the work's
192	+ users, your or third parties' legal rights to forbid circumvention of
193	+ technological measures.
194	+
195	+ 4. Conveying Verbatim Copies.
196	+
197	+ You may convey verbatim copies of the Program's source code as you
198	+ receive it, in any medium, provided that you conspicuously and
199	+ appropriately publish on each copy an appropriate copyright notice;
200	+ keep intact all notices stating that this License and any
201	+ non-permissive terms added in accord with section 7 apply to the code;
202	+ keep intact all notices of the absence of any warranty; and give all
203	+ recipients a copy of this License along with the Program.
204	+
205	+ You may charge any price or no price for each copy that you convey,
206	+ and you may offer support or warranty protection for a fee.
207	+
208	+ 5. Conveying Modified Source Versions.
209	+
210	+ You may convey a work based on the Program, or the modifications to
211	+ produce it from the Program, in the form of source code under the
212	+ terms of section 4, provided that you also meet all of these conditions:
213	+
214	+ a) The work must carry prominent notices stating that you modified
215	+ it, and giving a relevant date.
216	+
217	+ b) The work must carry prominent notices stating that it is
218	+ released under this License and any conditions added under section
219	+ 7. This requirement modifies the requirement in section 4 to
220	+ "keep intact all notices".
221	+
222	+ c) You must license the entire work, as a whole, under this
223	+ License to anyone who comes into possession of a copy. This
224	+ License will therefore apply, along with any applicable section 7
225	+ additional terms, to the whole of the work, and all its parts,
226	+ regardless of how they are packaged. This License gives no
227	+ permission to license the work in any other way, but it does not
228	+ invalidate such permission if you have separately received it.
229	+
230	+ d) If the work has interactive user interfaces, each must display
231	+ Appropriate Legal Notices; however, if the Program has interactive
232	+ interfaces that do not display Appropriate Legal Notices, your
233	+ work need not make them do so.
234	+
235	+ A compilation of a covered work with other separate and independent
236	+ works, which are not by their nature extensions of the covered work,
237	+ and which are not combined with it such as to form a larger program,
238	+ in or on a volume of a storage or distribution medium, is called an
239	+ "aggregate" if the compilation and its resulting copyright are not
240	+ used to limit the access or legal rights of the compilation's users
241	+ beyond what the individual works permit. Inclusion of a covered work
242	+ in an aggregate does not cause this License to apply to the other
243	+ parts of the aggregate.
244	+
245	+ 6. Conveying Non-Source Forms.
246	+
247	+ You may convey a covered work in object code form under the terms
248	+ of sections 4 and 5, provided that you also convey the
249	+ machine-readable Corresponding Source under the terms of this License,
250	+ in one of these ways:
251	+
252	+ a) Convey the object code in, or embodied in, a physical product
253	+ (including a physical distribution medium), accompanied by the
254	+ Corresponding Source fixed on a durable physical medium
255	+ customarily used for software interchange.
256	+
257	+ b) Convey the object code in, or embodied in, a physical product
258	+ (including a physical distribution medium), accompanied by a
259	+ written offer, valid for at least three years and valid for as
260	+ long as you offer spare parts or customer support for that product
261	+ model, to give anyone who possesses the object code either (1) a
262	+ copy of the Corresponding Source for all the software in the
263	+ product that is covered by this License, on a durable physical
264	+ medium customarily used for software interchange, for a price no
265	+ more than your reasonable cost of physically performing this
266	+ conveying of source, or (2) access to copy the
267	+ Corresponding Source from a network server at no charge.
268	+
269	+ c) Convey individual copies of the object code with a copy of the
270	+ written offer to provide the Corresponding Source. This
271	+ alternative is allowed only occasionally and noncommercially, and
272	+ only if you received the object code with such an offer, in accord
273	+ with subsection 6b.
274	+
275	+ d) Convey the object code by offering access from a designated
276	+ place (gratis or for a charge), and offer equivalent access to the
277	+ Corresponding Source in the same way through the same place at no
278	+ further charge. You need not require recipients to copy the
279	+ Corresponding Source along with the object code. If the place to
280	+ copy the object code is a network server, the Corresponding Source
281	+ may be on a different server (operated by you or a third party)
282	+ that supports equivalent copying facilities, provided you maintain
283	+ clear directions next to the object code saying where to find the
284	+ Corresponding Source. Regardless of what server hosts the
285	+ Corresponding Source, you remain obligated to ensure that it is
286	+ available for as long as needed to satisfy these requirements.
287	+
288	+ e) Convey the object code using peer-to-peer transmission, provided
289	+ you inform other peers where the object code and Corresponding
290	+ Source of the work are being offered to the general public at no
291	+ charge under subsection 6d.
292	+
293	+ A separable portion of the object code, whose source code is excluded
294	+ from the Corresponding Source as a System Library, need not be
295	+ included in conveying the object code work.
296	+
297	+ A "User Product" is either (1) a "consumer product", which means any
298	+ tangible personal property which is normally used for personal, family,
299	+ or household purposes, or (2) anything designed or sold for incorporation
300	+ into a dwelling. In determining whether a product is a consumer product,
301	+ doubtful cases shall be resolved in favor of coverage. For a particular
302	+ product received by a particular user, "normally used" refers to a
303	+ typical or common use of that class of product, regardless of the status
304	+ of the particular user or of the way in which the particular user
305	+ actually uses, or expects or is expected to use, the product. A product
306	+ is a consumer product regardless of whether the product has substantial
307	+ commercial, industrial or non-consumer uses, unless such uses represent
308	+ the only significant mode of use of the product.
309	+
310	+ "Installation Information" for a User Product means any methods,
311	+ procedures, authorization keys, or other information required to install
312	+ and execute modified versions of a covered work in that User Product from
313	+ a modified version of its Corresponding Source. The information must
314	+ suffice to ensure that the continued functioning of the modified object
315	+ code is in no case prevented or interfered with solely because
316	+ modification has been made.
317	+
318	+ If you convey an object code work under this section in, or with, or
319	+ specifically for use in, a User Product, and the conveying occurs as
320	+ part of a transaction in which the right of possession and use of the
321	+ User Product is transferred to the recipient in perpetuity or for a
322	+ fixed term (regardless of how the transaction is characterized), the
323	+ Corresponding Source conveyed under this section must be accompanied
324	+ by the Installation Information. But this requirement does not apply
325	+ if neither you nor any third party retains the ability to install
326	+ modified object code on the User Product (for example, the work has
327	+ been installed in ROM).
328	+
329	+ The requirement to provide Installation Information does not include a
330	+ requirement to continue to provide support service, warranty, or updates
331	+ for a work that has been modified or installed by the recipient, or for
332	+ the User Product in which it has been modified or installed. Access to a
333	+ network may be denied when the modification itself materially and
334	+ adversely affects the operation of the network or violates the rules and
335	+ protocols for communication across the network.
336	+
337	+ Corresponding Source conveyed, and Installation Information provided,
338	+ in accord with this section must be in a format that is publicly
339	+ documented (and with an implementation available to the public in
340	+ source code form), and must require no special password or key for
341	+ unpacking, reading or copying.
342	+
343	+ 7. Additional Terms.
344	+
345	+ "Additional permissions" are terms that supplement the terms of this
346	+ License by making exceptions from one or more of its conditions.
347	+ Additional permissions that are applicable to the entire Program shall
348	+ be treated as though they were included in this License, to the extent
349	+ that they are valid under applicable law. If additional permissions
350	+ apply only to part of the Program, that part may be used separately
351	+ under those permissions, but the entire Program remains governed by
352	+ this License without regard to the additional permissions.
353	+
354	+ When you convey a copy of a covered work, you may at your option
355	+ remove any additional permissions from that copy, or from any part of
356	+ it. (Additional permissions may be written to require their own
357	+ removal in certain cases when you modify the work.) You may place
358	+ additional permissions on material, added by you to a covered work,
359	+ for which you have or can give appropriate copyright permission.
360	+
361	+ Notwithstanding any other provision of this License, for material you
362	+ add to a covered work, you may (if authorized by the copyright holders of
363	+ that material) supplement the terms of this License with terms:
364	+
365	+ a) Disclaiming warranty or limiting liability differently from the
366	+ terms of sections 15 and 16 of this License; or
367	+
368	+ b) Requiring preservation of specified reasonable legal notices or
369	+ author attributions in that material or in the Appropriate Legal
370	+ Notices displayed by works containing it; or
371	+
372	+ c) Prohibiting misrepresentation of the origin of that material, or
373	+ requiring that modified versions of such material be marked in
374	+ reasonable ways as different from the original version; or
375	+
376	+ d) Limiting the use for publicity purposes of names of licensors or
377	+ authors of the material; or
378	+
379	+ e) Declining to grant rights under trademark law for use of some
380	+ trade names, trademarks, or service marks; or
381	+
382	+ f) Requiring indemnification of licensors and authors of that
383	+ material by anyone who conveys the material (or modified versions of
384	+ it) with contractual assumptions of liability to the recipient, for
385	+ any liability that these contractual assumptions directly impose on
386	+ those licensors and authors.
387	+
388	+ All other non-permissive additional terms are considered "further
389	+ restrictions" within the meaning of section 10. If the Program as you
390	+ received it, or any part of it, contains a notice stating that it is
391	+ governed by this License along with a term that is a further
392	+ restriction, you may remove that term. If a license document contains
393	+ a further restriction but permits relicensing or conveying under this
394	+ License, you may add to a covered work material governed by the terms
395	+ of that license document, provided that the further restriction does
396	+ not survive such relicensing or conveying.
397	+
398	+ If you add terms to a covered work in accord with this section, you
399	+ must place, in the relevant source files, a statement of the
400	+ additional terms that apply to those files, or a notice indicating
401	+ where to find the applicable terms.
402	+
403	+ Additional terms, permissive or non-permissive, may be stated in the
404	+ form of a separately written license, or stated as exceptions;
405	+ the above requirements apply either way.
406	+
407	+ 8. Termination.
408	+
409	+ You may not propagate or modify a covered work except as expressly
410	+ provided under this License. Any attempt otherwise to propagate or
411	+ modify it is void, and will automatically terminate your rights under
412	+ this License (including any patent licenses granted under the third
413	+ paragraph of section 11).
414	+
415	+ However, if you cease all violation of this License, then your
416	+ license from a particular copyright holder is reinstated (a)
417	+ provisionally, unless and until the copyright holder explicitly and
418	+ finally terminates your license, and (b) permanently, if the copyright
419	+ holder fails to notify you of the violation by some reasonable means
420	+ prior to 60 days after the cessation.
421	+
422	+ Moreover, your license from a particular copyright holder is
423	+ reinstated permanently if the copyright holder notifies you of the
424	+ violation by some reasonable means, this is the first time you have
425	+ received notice of violation of this License (for any work) from that
426	+ copyright holder, and you cure the violation prior to 30 days after
427	+ your receipt of the notice.
428	+
429	+ Termination of your rights under this section does not terminate the
430	+ licenses of parties who have received copies or rights from you under
431	+ this License. If your rights have been terminated and not permanently
432	+ reinstated, you do not qualify to receive new licenses for the same
433	+ material under section 10.
434	+
435	+ 9. Acceptance Not Required for Having Copies.
436	+
437	+ You are not required to accept this License in order to receive or
438	+ run a copy of the Program. Ancillary propagation of a covered work
439	+ occurring solely as a consequence of using peer-to-peer transmission
440	+ to receive a copy likewise does not require acceptance. However,
441	+ nothing other than this License grants you permission to propagate or
442	+ modify any covered work. These actions infringe copyright if you do
443	+ not accept this License. Therefore, by modifying or propagating a
444	+ covered work, you indicate your acceptance of this License to do so.
445	+
446	+ 10. Automatic Licensing of Downstream Recipients.
447	+
448	+ Each time you convey a covered work, the recipient automatically
449	+ receives a license from the original licensors, to run, modify and
450	+ propagate that work, subject to this License. You are not responsible
451	+ for enforcing compliance by third parties with this License.
452	+
453	+ An "entity transaction" is a transaction transferring control of an
454	+ organization, or substantially all assets of one, or subdividing an
455	+ organization, or merging organizations. If propagation of a covered
456	+ work results from an entity transaction, each party to that
457	+ transaction who receives a copy of the work also receives whatever
458	+ licenses to the work the party's predecessor in interest had or could
459	+ give under the previous paragraph, plus a right to possession of the
460	+ Corresponding Source of the work from the predecessor in interest, if
461	+ the predecessor has it or can get it with reasonable efforts.
462	+
463	+ You may not impose any further restrictions on the exercise of the
464	+ rights granted or affirmed under this License. For example, you may
465	+ not impose a license fee, royalty, or other charge for exercise of
466	+ rights granted under this License, and you may not initiate litigation
467	+ (including a cross-claim or counterclaim in a lawsuit) alleging that
468	+ any patent claim is infringed by making, using, selling, offering for
469	+ sale, or importing the Program or any portion of it.
470	+
471	+ 11. Patents.
472	+
473	+ A "contributor" is a copyright holder who authorizes use under this
474	+ License of the Program or a work on which the Program is based. The
475	+ work thus licensed is called the contributor's "contributor version".
476	+
477	+ A contributor's "essential patent claims" are all patent claims
478	+ owned or controlled by the contributor, whether already acquired or
479	+ hereafter acquired, that would be infringed by some manner, permitted
480	+ by this License, of making, using, or selling its contributor version,
481	+ but do not include claims that would be infringed only as a
482	+ consequence of further modification of the contributor version. For
483	+ purposes of this definition, "control" includes the right to grant
484	+ patent sublicenses in a manner consistent with the requirements of
485	+ this License.
486	+
487	+ Each contributor grants you a non-exclusive, worldwide, royalty-free
488	+ patent license under the contributor's essential patent claims, to
489	+ make, use, sell, offer for sale, import and otherwise run, modify and
490	+ propagate the contents of its contributor version.
491	+
492	+ In the following three paragraphs, a "patent license" is any express
493	+ agreement or commitment, however denominated, not to enforce a patent
494	+ (such as an express permission to practice a patent or covenant not to
495	+ sue for patent infringement). To "grant" such a patent license to a
496	+ party means to make such an agreement or commitment not to enforce a
497	+ patent against the party.
498	+
499	+ If you convey a covered work, knowingly relying on a patent license,
500	+ and the Corresponding Source of the work is not available for anyone
501	+ to copy, free of charge and under the terms of this License, through a
502	+ publicly available network server or other readily accessible means,
503	+ then you must either (1) cause the Corresponding Source to be so
504	+ available, or (2) arrange to deprive yourself of the benefit of the
505	+ patent license for this particular work, or (3) arrange, in a manner
506	+ consistent with the requirements of this License, to extend the patent
507	+ license to downstream recipients. "Knowingly relying" means you have
508	+ actual knowledge that, but for the patent license, your conveying the
509	+ covered work in a country, or your recipient's use of the covered work
510	+ in a country, would infringe one or more identifiable patents in that
511	+ country that you have reason to believe are valid.
512	+
513	+ If, pursuant to or in connection with a single transaction or
514	+ arrangement, you convey, or propagate by procuring conveyance of, a
515	+ covered work, and grant a patent license to some of the parties
516	+ receiving the covered work authorizing them to use, propagate, modify
517	+ or convey a specific copy of the covered work, then the patent license
518	+ you grant is automatically extended to all recipients of the covered
519	+ work and works based on it.
520	+
521	+ A patent license is "discriminatory" if it does not include within
522	+ the scope of its coverage, prohibits the exercise of, or is
523	+ conditioned on the non-exercise of one or more of the rights that are
524	+ specifically granted under this License. You may not convey a covered
525	+ work if you are a party to an arrangement with a third party that is
526	+ in the business of distributing software, under which you make payment
527	+ to the third party based on the extent of your activity of conveying
528	+ the work, and under which the third party grants, to any of the
529	+ parties who would receive the covered work from you, a discriminatory
530	+ patent license (a) in connection with copies of the covered work
531	+ conveyed by you (or copies made from those copies), or (b) primarily
532	+ for and in connection with specific products or compilations that
533	+ contain the covered work, unless you entered into that arrangement,
534	+ or that patent license was granted, prior to 28 March 2007.
535	+
536	+ Nothing in this License shall be construed as excluding or limiting
537	+ any implied license or other defenses to infringement that may
538	+ otherwise be available to you under applicable patent law.
539	+
540	+ 12. No Surrender of Others' Freedom.
541	+
542	+ If conditions are imposed on you (whether by court order, agreement or
543	+ otherwise) that contradict the conditions of this License, they do not
544	+ excuse you from the conditions of this License. If you cannot convey a
545	+ covered work so as to satisfy simultaneously your obligations under this
546	+ License and any other pertinent obligations, then as a consequence you may
547	+ not convey it at all. For example, if you agree to terms that obligate you
548	+ to collect a royalty for further conveying from those to whom you convey
549	+ the Program, the only way you could satisfy both those terms and this
550	+ License would be to refrain entirely from conveying the Program.
551	+
552	+ 13. Use with the GNU Affero General Public License.
553	+
554	+ Notwithstanding any other provision of this License, you have
555	+ permission to link or combine any covered work with a work licensed
556	+ under version 3 of the GNU Affero General Public License into a single
557	+ combined work, and to convey the resulting work. The terms of this
558	+ License will continue to apply to the part which is the covered work,
559	+ but the special requirements of the GNU Affero General Public License,
560	+ section 13, concerning interaction through a network will apply to the
561	+ combination as such.
562	+
563	+ 14. Revised Versions of this License.
564	+
565	+ The Free Software Foundation may publish revised and/or new versions of
566	+ the GNU General Public License from time to time. Such new versions will
567	+ be similar in spirit to the present version, but may differ in detail to
568	+ address new problems or concerns.
569	+
570	+ Each version is given a distinguishing version number. If the
571	+ Program specifies that a certain numbered version of the GNU General
572	+ Public License "or any later version" applies to it, you have the
573	+ option of following the terms and conditions either of that numbered
574	+ version or of any later version published by the Free Software
575	+ Foundation. If the Program does not specify a version number of the
576	+ GNU General Public License, you may choose any version ever published
577	+ by the Free Software Foundation.
578	+
579	+ If the Program specifies that a proxy can decide which future
580	+ versions of the GNU General Public License can be used, that proxy's
581	+ public statement of acceptance of a version permanently authorizes you
582	+ to choose that version for the Program.
583	+
584	+ Later license versions may give you additional or different
585	+ permissions. However, no additional obligations are imposed on any
586	+ author or copyright holder as a result of your choosing to follow a
587	+ later version.
588	+
589	+ 15. Disclaimer of Warranty.
590	+
591	+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
592	+ APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
593	+ HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
594	+ OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
595	+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
596	+ PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
597	+ IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
598	+ ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
599	+
600	+ 16. Limitation of Liability.
601	+
602	+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
603	+ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
604	+ THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
605	+ GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
606	+ USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
607	+ DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
608	+ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
609	+ EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
610	+ SUCH DAMAGES.
611	+
612	+ 17. Interpretation of Sections 15 and 16.
613	+
614	+ If the disclaimer of warranty and limitation of liability provided
615	+ above cannot be given local legal effect according to their terms,
616	+ reviewing courts shall apply local law that most closely approximates
617	+ an absolute waiver of all civil liability in connection with the
618	+ Program, unless a warranty or assumption of liability accompanies a
619	+ copy of the Program in return for a fee.
620	+
621	+ END OF TERMS AND CONDITIONS
622	+
623	+ How to Apply These Terms to Your New Programs
624	+
625	+ If you develop a new program, and you want it to be of the greatest
626	+ possible use to the public, the best way to achieve this is to make it
627	+ free software which everyone can redistribute and change under these terms.
628	+
629	+ To do so, attach the following notices to the program. It is safest
630	+ to attach them to the start of each source file to most effectively
631	+ state the exclusion of warranty; and each file should have at least
632	+ the "copyright" line and a pointer to where the full notice is found.
633	+
634	+ <one line to give the program's name and a brief idea of what it does.>
635	+ Copyright (C) <year> <name of author>
636	+
637	+ This program is free software: you can redistribute it and/or modify
638	+ it under the terms of the GNU General Public License as published by
639	+ the Free Software Foundation, either version 3 of the License, or
640	+ (at your option) any later version.
641	+
642	+ This program is distributed in the hope that it will be useful,
643	+ but WITHOUT ANY WARRANTY; without even the implied warranty of
644	+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
645	+ GNU General Public License for more details.
646	+
647	+ You should have received a copy of the GNU General Public License
648	+ along with this program. If not, see <http://www.gnu.org/licenses/>.
649	+
650	+ Also add information on how to contact you by electronic and paper mail.
651	+
652	+ If the program does terminal interaction, make it output a short
653	+ notice like this when it starts in an interactive mode:
654	+
655	+ <program> Copyright (C) <year> <name of author>
656	+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
657	+ This is free software, and you are welcome to redistribute it
658	+ under certain conditions; type `show c' for details.
659	+
660	+ The hypothetical commands `show w' and `show c' should show the appropriate
661	+ parts of the General Public License. Of course, your program's commands
662	+ might be different; for a GUI interface, you would use an "about box".
663	+
664	+ You should also get your employer (if you work as a programmer) or school,
665	+ if any, to sign a "copyright disclaimer" for the program, if necessary.
666	+ For more information on this, and how to apply and follow the GNU GPL, see
667	+ <http://www.gnu.org/licenses/>.
668	+
669	+ The GNU General Public License does not permit incorporating your program
670	+ into proprietary programs. If your program is a subroutine library, you
671	+ may consider it more useful to permit linking proprietary applications with
672	+ the library. If this is what you want to do, use the GNU Lesser General
673	+ Public License instead of this License. But first, please read
674	+ <http://www.gnu.org/philosophy/why-not-lgpl.html>.

lib/WordPressHTTPS.php CHANGED Viewed

	@@ -45,6 +45,7 @@ class WordPressHTTPS extends Mvied_Plugin {
45	'admin_menu' => 'side', // HTTPS Admin Menu location
46	'secure_filter' => array(), // Expressions to secure URL's against
47	'ssl_host_mapping' => array(), // External SSL Hosts whose HTTPS content is on another domain

48	);
49
50	/**
	@@ -140,12 +141,16 @@ class WordPressHTTPS extends Mvied_Plugin {
140	$blogs = array($wpdb->blogid);
141	}
142

143	foreach ( $blogs as $blog_id ) {
144	// Add Settings
145	foreach ( $this->getSettings() as $option => $value ) {
146	- if ( is_multisite() ~~&& get_blog_option($blog_id, $option~~) ~~=== false )~~ {
147	- add_blog_option($blog_id, $option, $value);
148	- } ~~else~~ ~~if ( get_option(~~$option~~) === false ) {~~



149	add_option($option, $value);
150	}
151	}
	@@ -214,8 +219,16 @@ class WordPressHTTPS extends Mvied_Plugin {
214	return false;
215	}
216
217	- ~~$url~~ = ~~WordPressHTTPS_Url::fromString(~~ ~~$string~~ );
218	- if ( $~~url~~ ) {








219	if ( $this->isUrlLocal($url) ) {
220	$has_host = ( $this->getHttpUrl()->getHost() == $this->getHttpsUrl()->getHost() ) \|\| strpos($url, $this->getHttpsUrl()->getHost()) !== false;
221	$has_path = ( $this->getHttpUrl()->getPath() == $this->getHttpsUrl()->getPath() ) \|\| strpos($url, $this->getHttpsUrl()->getPath()) !== false;
	@@ -234,7 +247,7 @@ class WordPressHTTPS extends Mvied_Plugin {
234	$updated->setPath(str_replace(rtrim($this->getHttpUrl()->getPath(), '/'), $this->getHttpsUrl()->getPath(), $updated->getPath()));
235	}
236	}
237	- if ( ( ( $this->isSsl() && !$this->getSetting('exclusive_https') ) \|\| $this->getSetting('ssl_admin') ) && strpos($url, 'wp-admin') !== false && preg_match('/redirect_to=([^&]+)/i', $updated->toString(), $redirect) && isset($redirect[1]) ) {
238	$redirect_url = $redirect[1];
239	$updated = str_replace($redirect_url, urlencode($this->makeUrlHttps(urldecode($redirect_url))), $updated->toString());
240	}
	@@ -279,8 +292,12 @@ class WordPressHTTPS extends Mvied_Plugin {
279	return false;
280	}
281
282	- ~~$url~~ = ~~WordPressHTTPS_Url::fromString( $string );~~
283	- if ( $~~url~~ ) {




284	if ( $this->isUrlLocal($url) ) {
285	if ( $url->getScheme() == 'https' ) {
286	$updated = clone $url;
	@@ -381,7 +398,7 @@ class WordPressHTTPS extends Mvied_Plugin {
381	* @return void
382	*/
383	public function redirect( $scheme = 'https' ) {
384	- $current_path = ( isset($_SERVER['REDIRECT_URL']) ? $_SERVER['REDIRECT_URL'] : $_SERVER['REQUEST_URI'] );
385	if ( strpos($_SERVER['REQUEST_URI'], '?') !== false && isset($_SERVER['REDIRECT_URL']) && strpos($_SERVER['REDIRECT_URL'], '?') === false ) {
386	$current_path .= substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], '?'));
387	}


45	'admin_menu' => 'side', // HTTPS Admin Menu location
46	'secure_filter' => array(), // Expressions to secure URL's against
47	'ssl_host_mapping' => array(), // External SSL Hosts whose HTTPS content is on another domain
48	+ 'network_defaults' => array(), // Default settings for new blogs on a multisite network
49	);
50
51	/**

141	$blogs = array($wpdb->blogid);
142	}
143
144	+ $defaults = $this->getSetting('network_defaults');
145	foreach ( $blogs as $blog_id ) {
146	// Add Settings
147	foreach ( $this->getSettings() as $option => $value ) {
148	+ if ( is_multisite() ) {
149	+ if ( add_blog_option($blog_id, $option, $value) && isset($defaults[$option]) ) {
150	+ $value = $defaults[$option];
151	+ $this->setSetting($option, $value, $blog_id);
152	+ }
153	+ } else {
154	add_option($option, $value);
155	}
156	}

219	return false;
220	}
221
222	+ // If relative, prepend appropriate path
223	+ if ( strpos($string, '/') === 0 ) {
224	+ if ( $this->getSetting('ssl_host_diff') && strpos($string, $this->getHttpsUrl()->getPath()) === false ) {
225	+ if ( $this->getHttpUrl()->getPath() == '/' ) {
226	+ $string = rtrim($this->getHttpsUrl()->getPath(), '/') . $string;
227	+ } else {
228	+ $string = str_replace($this->getHttpUrl()->getPath(), $this->getHttpsUrl()->getPath(), $string);
229	+ }
230	+ }
231	+ } else if ( $url = WordPressHTTPS_Url::fromString( $string ) ) {
232	if ( $this->isUrlLocal($url) ) {
233	$has_host = ( $this->getHttpUrl()->getHost() == $this->getHttpsUrl()->getHost() ) \|\| strpos($url, $this->getHttpsUrl()->getHost()) !== false;
234	$has_path = ( $this->getHttpUrl()->getPath() == $this->getHttpsUrl()->getPath() ) \|\| strpos($url, $this->getHttpsUrl()->getPath()) !== false;

247	$updated->setPath(str_replace(rtrim($this->getHttpUrl()->getPath(), '/'), $this->getHttpsUrl()->getPath(), $updated->getPath()));
248	}
249	}
250	+ if ( ( ( $this->isSsl() && !$this->getSetting('exclusive_https') ) \|\| ( defined('FORCE_SSL_ADMIN') && constant('FORCE_SSL_ADMIN') ) \|\| $this->getSetting('ssl_admin') ) && strpos($url, 'wp-admin') !== false && preg_match('/redirect_to=([^&]+)/i', $updated->toString(), $redirect) && isset($redirect[1]) ) {
251	$redirect_url = $redirect[1];
252	$updated = str_replace($redirect_url, urlencode($this->makeUrlHttps(urldecode($redirect_url))), $updated->toString());
253	}

292	return false;
293	}
294
295	+ // If relative
296	+ if ( strpos($string, '/') === 0 ) {
297	+ if ( $this->getSetting('ssl_host_diff') && strpos($string, $this->getHttpsUrl()->getPath()) !== false ) {
298	+ $string = str_replace($this->getHttpsUrl()->getPath(), $this->getHttpUrl()->getPath(), $string);
299	+ }
300	+ } else if ( $url = WordPressHTTPS_Url::fromString( $string ) ) {
301	if ( $this->isUrlLocal($url) ) {
302	if ( $url->getScheme() == 'https' ) {
303	$updated = clone $url;

398	* @return void
399	*/
400	public function redirect( $scheme = 'https' ) {
401	+ $current_path = ( isset($_SERVER['REDIRECT_URL']) && strpos($_SERVER['REDIRECT_URL'], 'index.php') === false ? $_SERVER['REDIRECT_URL'] : $_SERVER['REQUEST_URI'] );
402	if ( strpos($_SERVER['REQUEST_URI'], '?') !== false && isset($_SERVER['REDIRECT_URL']) && strpos($_SERVER['REDIRECT_URL'], '?') === false ) {
403	$current_path .= substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], '?'));
404	}

lib/WordPressHTTPS/Module/Core.php CHANGED Viewed

	@@ -58,6 +58,9 @@ class WordPressHTTPS_Module_Core extends Mvied_Plugin_Module {
58	add_filter($filter, array(&$this, 'secure_post_link'), 10);
59	}
60



61	if ( $this->getPlugin()->getSetting('ssl_host_diff') ) {
62	// Remove SSL Host authentication cookies on logout
63	add_action('clear_auth_cookie', array(&$this, 'clear_cookies'));
	@@ -93,7 +96,7 @@ class WordPressHTTPS_Module_Core extends Mvied_Plugin_Module {
93	}
94
95	// Check if the page needs to be redirected
96	- if ( is_admin() \|\| ~~( isset($GLOBALS['pagenow']) &&~~ preg_match('/wp-login\.php/', $~~GLOBALS~~['~~pagenow~~']) === 1 ) ) {
97	add_action($this->getPlugin()->getSlug() . '_init', array(&$this, 'redirect_check'));
98	add_action($this->getPlugin()->getSlug() . '_init', array(&$this, 'clear_redirect_count_cookie'), 9, 1);
99	} else {
	@@ -212,12 +215,15 @@ class WordPressHTTPS_Module_Core extends Mvied_Plugin_Module {
212	*/
213	public function secure_admin( $force_ssl, $post_id = 0, $url = '' ) {
214	if ( $url != '' && $this->getPlugin()->isUrlLocal($url) && ( strpos($url, 'wp-admin') !== false \|\| strpos($url, 'wp-login') !== false ) ) {
215	- if ( $this->getPlugin()->getSetting('exclusive_https') && !$this->getPlugin()->getSetting('ssl_admin') ) {
216	$force_ssl = false;
217	//TODO When logged in to HTTP and visiting an HTTPS page, admin links will always be forced to HTTPS, even if the user is not logged in via HTTPS. I need to find a way to detect this.
218	- } else if ( ( ( $this->getPlugin()->isSsl() && !$this->getPlugin()->getSetting('exclusive_https') ) \|\| $this->getPlugin()->getSetting('ssl_admin') ) ) {
219	$force_ssl = true;
220	}



221	}
222	return $force_ssl;
223	}
	@@ -254,7 +260,7 @@ class WordPressHTTPS_Module_Core extends Mvied_Plugin_Module {
254
255	if ( $url != '' && ($url_parts = parse_url($url)) ) {
256	if ( $this->getPlugin()->isUrlLocal($url) ) {
257	- if ( $this->getPlugin()->getHttpsUrl()->getPath() != '/' ) {
258	if ( $this->getPlugin()->getSetting('ssl_host_diff') ) {
259	$url_parts['path'] = str_replace($this->getPlugin()->getHttpsUrl()->getPath(), '', $url_parts['path']);
260	}
	@@ -264,7 +270,7 @@ class WordPressHTTPS_Module_Core extends Mvied_Plugin_Module {
264	}
265
266	// qTranslate integration - strips language from beginning of url path
267	- if ( defined('QTRANS_INIT') && constant('QTRANS_INIT') == true ) {
268	global $q_config;
269	if ( isset($q_config['enabled_languages']) ) {
270	foreach($q_config['enabled_languages'] as $language) {
	@@ -509,7 +515,7 @@ class WordPressHTTPS_Module_Core extends Mvied_Plugin_Module {
509	* @return void
510	*/
511	public function set_cookie($cookie, $expire, $expiration, $user_id, $scheme) {
512	- if ( ( $scheme == 'secure_auth' && $this->getPlugin()->isSsl() ) \|\| ( $this->getPlugin()->getSetting('ssl_admin') && ! $this->getPlugin()->getSetting('ssl_host_subdomain') ) ) {
513	$secure = true;
514	}
515	$secure = apply_filters('secure_auth_cookie', @$secure, $user_id);


58	add_filter($filter, array(&$this, 'secure_post_link'), 10);
59	}
60
61	+ // Run install when new blog is created
62	+ add_action('wpmu_new_blog', array($this->getPlugin(), 'install'), 10, 0);
63	+
64	if ( $this->getPlugin()->getSetting('ssl_host_diff') ) {
65	// Remove SSL Host authentication cookies on logout
66	add_action('clear_auth_cookie', array(&$this, 'clear_cookies'));

96	}
97
98	// Check if the page needs to be redirected
99	+ if ( is_admin() \|\| preg_match('/wp-login\.php/', $_SERVER['REQUEST_URI']) === 1 ) {
100	add_action($this->getPlugin()->getSlug() . '_init', array(&$this, 'redirect_check'));
101	add_action($this->getPlugin()->getSlug() . '_init', array(&$this, 'clear_redirect_count_cookie'), 9, 1);
102	} else {

215	*/
216	public function secure_admin( $force_ssl, $post_id = 0, $url = '' ) {
217	if ( $url != '' && $this->getPlugin()->isUrlLocal($url) && ( strpos($url, 'wp-admin') !== false \|\| strpos($url, 'wp-login') !== false ) ) {
218	+ if ( $this->getPlugin()->getSetting('exclusive_https') && !( ( defined('FORCE_SSL_ADMIN') && constant('FORCE_SSL_ADMIN') ) \|\| $this->getPlugin()->getSetting('ssl_admin') ) ) {
219	$force_ssl = false;
220	//TODO When logged in to HTTP and visiting an HTTPS page, admin links will always be forced to HTTPS, even if the user is not logged in via HTTPS. I need to find a way to detect this.
221	+ } else if ( ( ( $this->getPlugin()->isSsl() && !$this->getPlugin()->getSetting('exclusive_https') ) \|\| ( defined('FORCE_SSL_ADMIN') && constant('FORCE_SSL_ADMIN') ) \|\| $this->getPlugin()->getSetting('ssl_admin') ) ) {
222	$force_ssl = true;
223	}
224	+ if ( !$this->getPlugin()->isSsl() && strpos($url, 'admin-ajax.php') !== false ) {
225	+ $force_ssl = false;
226	+ }
227	}
228	return $force_ssl;
229	}

260
261	if ( $url != '' && ($url_parts = parse_url($url)) ) {
262	if ( $this->getPlugin()->isUrlLocal($url) ) {
263	+ if ( $this->getPlugin()->getHttpsUrl()->getPath() != '/' && isset($url_parts['path']) ) {
264	if ( $this->getPlugin()->getSetting('ssl_host_diff') ) {
265	$url_parts['path'] = str_replace($this->getPlugin()->getHttpsUrl()->getPath(), '', $url_parts['path']);
266	}

270	}
271
272	// qTranslate integration - strips language from beginning of url path
273	+ if ( defined('QTRANS_INIT') && constant('QTRANS_INIT') == true && isset($url_parts['path']) ) {
274	global $q_config;
275	if ( isset($q_config['enabled_languages']) ) {
276	foreach($q_config['enabled_languages'] as $language) {

515	* @return void
516	*/
517	public function set_cookie($cookie, $expire, $expiration, $user_id, $scheme) {
518	+ if ( ( $scheme == 'secure_auth' && $this->getPlugin()->isSsl() ) \|\| ( ( ( defined('FORCE_SSL_ADMIN') && constant('FORCE_SSL_ADMIN') ) \|\| $this->getPlugin()->getSetting('ssl_admin') ) && ! $this->getPlugin()->getSetting('ssl_host_subdomain') ) ) {
519	$secure = true;
520	}
521	$secure = apply_filters('secure_auth_cookie', @$secure, $user_id);

lib/WordPressHTTPS/Module/Network.php CHANGED Viewed

@@ -27,11 +27,14 @@ class WordPressHTTPS_Module_Network extends Mvied_Plugin_Module {
             				// Add meta boxes
             				add_action('admin_init', array(&$this, 'add_meta_boxes'));
+            			}
+            		}
             		if ( is_multisite() ) {
-            -
            			//add_action('network_admin_menu', array(&$this, 'network_admin_menu'));
+            		}
+            	}
@@ -87,6 +90,17 @@ class WordPressHTTPS_Module_Network extends Mvied_Plugin_Module {
             		self::render();
+            	}
             	/**
             	 * Render settings page
+            	 *
@@ -112,10 +126,39 @@ class WordPressHTTPS_Module_Network extends Mvied_Plugin_Module {
             		$errors = array();
             		$reload = false;
             		$logout = false;
-            -
            		if ( isset($_POST['network-settings-reset']) ) {
-            -
            		} else if ( isset($_POST['network-settings-save']) ) {
+            		}
             		if ( $logout ) {


27
28	// Add meta boxes
29	add_action('admin_init', array(&$this, 'add_meta_boxes'));
30	+
31	+ // Add scripts
32	+ add_action('admin_enqueue_scripts', array(&$this, 'admin_enqueue_scripts'));
33	}
34	}
35
36	if ( is_multisite() ) {
37	+ add_action('network_admin_menu', array(&$this, 'network_admin_menu'));
38	}
39	}
40

90	self::render();
91	}
92
93	+ /**
94	+ * Adds javascript and stylesheets to settings page in the admin panel.
95	+ * WordPress Hook - enqueue_scripts
96	+ *
97	+ * @param none
98	+ * @return void
99	+ */
100	+ public function admin_enqueue_scripts() {
101	+ wp_enqueue_style($this->getPlugin()->getSlug() . '-network-admin-page', $this->getPlugin()->getPluginUrl() . '/admin/css/network.css', array($this->getPlugin()->getSlug() . '-admin-page'), $this->getPlugin()->getVersion());
102	+ }
103	+
104	/**
105	* Render settings page
106	*

126	$errors = array();
127	$reload = false;
128	$logout = false;
129	+ if ( isset($_POST['network-settings-save']) ) {
130	+ if ( isset($_POST['blog']) && is_array($_POST['blog']) && sizeof($_POST['blog']) > 0 ) {
131	+ foreach( $_POST['blog'] as $blog_id => $setting ) {
132	+ foreach( $setting as $key => $value ) {
133	+ if ( $key == 'ssl_host' && $value != '' ) {
134	+ $blog_url = WordPressHTTPS_Url::fromString(get_site_url($blog_id, '', 'https'));
135	+ $value = strtolower($value);
136	+ // Add Scheme
137	+ if ( strpos($value, 'http://') === false && strpos($value, 'https://') === false ) {
138	+ $value = 'https://' . $value;
139	+ }
140	+
141	+ $ssl_host = WordPressHTTPS_Url::fromString($value);
142
143	+ // Add Port
144	+ $port = (($blog_url->getPort() && $blog_url->getPort() != 80 && $blog_url->getPort() != 443) ? $port : null);
145	+ $ssl_host->setPort($port);
146
147	+ // Add Path
148	+ if ( strpos($ssl_host->getPath(), $blog_url->getPath()) !== true ) {
149	+ $path = '/'. ltrim(str_replace(rtrim($blog_url->getPath(), '/'), '', $ssl_host->getPath()), '/');
150	+ $ssl_host->setPath(rtrim($path, '/') . $blog_url->getPath());
151	+ }
152	+ $ssl_host->setPath(rtrim($ssl_host->getPath(), '/') . '/');
153	+ $value = $ssl_host->toString();
154	+ }
155	+ $this->getPlugin()->setSetting($key, $value, $blog_id);
156	+ }
157	+ }
158	+ }
159	+ if ( isset($_POST['blog_default']) && is_array($_POST['blog_default']) && sizeof($_POST['blog_default']) > 0 ) {
160	+ $this->getPlugin()->setSetting('network_defaults', $_POST['blog_default']);
161	+ }
162	}
163
164	if ( $logout ) {

lib/WordPressHTTPS/Module/Parser.php CHANGED Viewed

	@@ -278,7 +278,7 @@ class WordPressHTTPS_Module_Parser extends Mvied_Plugin_Module {
278	continue;
279	}
280
281	- if ( ~~strpos~~(~~$filename,~~ '.' . $extension) ~~!==~~ ~~false~~ ) {
282	if ( $this->getPlugin()->isSsl() && ( $this->getPlugin()->getSetting('ssl_host_diff') \|\| ( !$this->getPlugin()->getSetting('ssl_host_diff') && strpos($url, 'http://') === 0 ) ) ) {
283	$this->secureElement($url, $type);
284	} else if ( !$this->getPlugin()->isSsl() && strpos($url, 'https://') === 0 ) {


278	continue;
279	}
280
281	+ if ( preg_match('/\.' . $extension . '(\?\|$)/', $filename) ) {
282	if ( $this->getPlugin()->isSsl() && ( $this->getPlugin()->getSetting('ssl_host_diff') \|\| ( !$this->getPlugin()->getSetting('ssl_host_diff') && strpos($url, 'http://') === 0 ) ) ) {
283	$this->secureElement($url, $type);
284	} else if ( !$this->getPlugin()->isSsl() && strpos($url, 'https://') === 0 ) {

readme.txt CHANGED Viewed

	@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
4	Tags: security, encryption, ssl, shared ssl, private ssl, public ssl, private ssl, http, https
5	Requires at least: 3.0
6	Tested up to: 3.4
7	- Stable tag: 3.2
8	License: GPLv3
9
10	WordPress HTTPS is intended to be an all-in-one solution to using SSL on WordPress sites.
	@@ -80,6 +80,11 @@ add_filter('force_ssl', 'store_force_ssl', 10, 3);`
80	2. Force SSL checkbox added to add/edit posts screen
81
82	== Changelog ==





83	= 3.2 =
84	* Added domain mapping. Domain mapping allows you to map external domains that host their HTTPS content on a different domain.
85	* Added Remove Unsecure Elements option. If possible, this option removes external elements from the page that can not be loaded over HTTPS, preventing insecure content errors without modifying any code.


4	Tags: security, encryption, ssl, shared ssl, private ssl, public ssl, private ssl, http, https
5	Requires at least: 3.0
6	Tested up to: 3.4
7	+ Stable tag: 3.2.1
8	License: GPLv3
9
10	WordPress HTTPS is intended to be an all-in-one solution to using SSL on WordPress sites.

80	2. Force SSL checkbox added to add/edit posts screen
81
82	== Changelog ==
83	+ = 3.2.1 =
84	+ * Added Network settings for multisite installations.
85	+ * Bug Fix - Elements should now be properly secured by the file extension check in the Parser.
86	+ * Bug Fix - Pages being redirected should no longer always redirect to index.php for some server configurations.
87	+ * Bug Fix - FORCE_SSL_ADMIN option should no longer cause redirect loops if the ssl_admin setting is set to false.
88	= 3.2 =
89	* Added domain mapping. Domain mapping allows you to map external domains that host their HTTPS content on a different domain.
90	* Added Remove Unsecure Elements option. If possible, this option removes external elements from the page that can not be loaded over HTTPS, preventing insecure content errors without modifying any code.

wordpress-https.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	Plugin URI: http://mvied.com/projects/wordpress-https/
5	Description: WordPress HTTPS is intended to be an all-in-one solution to using SSL on WordPress sites.
6	Author: Mike Ems
7	- Version: 3.2
8	Author URI: http://mvied.com/
9	*/
10
	@@ -41,7 +41,7 @@ spl_autoload_register('wphttps_autoloader');
41	if ( function_exists('get_bloginfo') && ! defined('WP_UNINSTALL_PLUGIN') ) {
42	$wordpress_https = new WordPressHTTPS;
43	$wordpress_https->setSlug('wordpress-https');
44	- $wordpress_https->setVersion('3.2');
45	$wordpress_https->setLogger(WordPressHTTPS_Logger::getInstance());
46	$wordpress_https->setDirectory(dirname(__FILE__));
47	$wordpress_https->setModuleDirectory(dirname(__FILE__) . '/lib/WordPressHTTPS/Module/');


4	Plugin URI: http://mvied.com/projects/wordpress-https/
5	Description: WordPress HTTPS is intended to be an all-in-one solution to using SSL on WordPress sites.
6	Author: Mike Ems
7	+ Version: 3.2.1
8	Author URI: http://mvied.com/
9	*/
10

41	if ( function_exists('get_bloginfo') && ! defined('WP_UNINSTALL_PLUGIN') ) {
42	$wordpress_https = new WordPressHTTPS;
43	$wordpress_https->setSlug('wordpress-https');
44	+ $wordpress_https->setVersion('3.2.1');
45	$wordpress_https->setLogger(WordPressHTTPS_Logger::getInstance());
46	$wordpress_https->setDirectory(dirname(__FILE__));
47	$wordpress_https->setModuleDirectory(dirname(__FILE__) . '/lib/WordPressHTTPS/Module/');