Merge branch 'add_https_plugin' of https://github.com/bigtiger/wordpr…

…ess-heroku into bigtiger-add_https_plugin

wp-content/plugins/wordpress-https/admin/css/admin.css

@@ -0,0 +1,19 @@
+#adminmenu .menu-top.toplevel_page_wordpress-https.current .wp-menu-image,
+#adminmenu .menu-top.toplevel_page_wordpress-https.wp-has-current-submenu .wp-menu-image,
+#adminmenu .menu-top.toplevel_page_wordpress-https:hover .wp-menu-image, 
+#adminmenu .menu-top.toplevel_page_wordpress-https.focused .wp-menu-image {
+	/* background-position: -360px -1px; */
+	background-position: 0% 0%;
+}
+#adminmenu .menu-top.toplevel_page_wordpress-https .wp-menu-image img {
+	display: none;	
+}
+
+#adminmenu .menu-top.toplevel_page_wordpress-https div.wp-menu-image {
+	/* background: url('../../../../../wp-admin/images/menu.png') no-repeat scroll -360px -33px; */
+	background: url('images/admin-icon.png') no-repeat 0% 100%;;
+}
+#side-sortables #wordpress-https .inside {
+	padding: 0;
+	margin: 0;	
+}

wp-content/plugins/wordpress-https/admin/css/network.css

@@ -0,0 +1,28 @@
+#blog-table .blog-host {
+	width: 100%;
+}
+#blog-table input[type="checkbox"] {
+	float: none;
+	margin: 0;
+}
+#blog-table .blog-ssl_admin, #blog-table .blog-exclusive_https,
+#blog-table .blog-remove_unsecure, #blog-table .blog-debug,
+#blog-table .blog-proxy, #blog-table .blog-admin_menu {
+	width: 1%;
+	text-align: center;
+}
+#blog-table .blog-proxy select {
+	width: 50px;
+}
+#blog-table .blog-admin_menu select {
+	width: 78px;
+}
+#blog-table .blog-host input {
+	width: 100%;
+}
+table#blog-table tr td,
+table#blog-table tr th {
+	padding: 0 5px;
+	word-wrap: break-word;
+	overflow: hidden;
+}

wp-content/plugins/wordpress-https/admin/css/settings.css

@@ -0,0 +1,205 @@
+.wphttps-message-wrap {
+	position: fixed;
+	bottom: 50%;
+	left: 50%;
+	margin-left: -25%;
+	width: 50%;
+	z-index: 10;
+	text-align: center;
+}
+.wphttps-message-wrap ul {
+	margin: 0;
+}
+
+#wphttps-main #icon-options-https {
+	background: url(images/admin-icon32.png) no-repeat;
+}
+
+#wphttps-main .meta-box-sortables {
+	margin: 0 8px;
+}
+
+#wphttps-main #poststuff .column-primary {
+	width: 72%;
+	padding: 0;
+}
+#wphttps-main #poststuff .column-secondary {
+	width: 28%;
+	float: right;
+	padding: 0;
+}
+#wphttps-main #poststuff .postbox {
+	min-width: auto;
+}
+
+#wphttps-main #message {
+	margin: 15px 0 0 0;
+}
+#wphttps-main #message p {
+	line-height: 100%;
+}
+
+#wphttps-main img.loading {
+	display: block;
+	position: absolute;
+	top: 7px;
+	right: 7px;	
+}
+
+#wphttps-main img.waiting {
+	display: none;
+}
+#wphttps-main img.submit-waiting {
+	vertical-align: middle;
+	margin-left: 5px;
+}
+
+#wphttps-donate-link img {
+	display: block;
+	margin: 5px auto 13px auto;
+}
+
+#wphttps-main input[type="text"] {
+	margin: -5px 0 0 0;
+}
+#wphttps-main input[type="checkbox"] {
+	margin: 7px 0 0 0;
+	vertical-align: bottom;
+}
+#wphttps-main table tr td,
+#wphttps-main table tr th {
+	line-height: 1em;
+	padding: 10px;
+}
+#wphttps-main table tr td {
+	padding: 2px 0 0 0;
+}
+#wphttps-main table tr td:first-child {
+	padding-top: 0;
+}
+#wphttps-main table th {
+	width: 160px;
+	line-height: 32px;
+	padding: 0;
+}
+#wphttps-main label.label-radio {
+	display: block;
+	margin: 5px 5px 0 0;
+	float: left;
+}
+#wphttps-main #settings-reset,
+#wphttps-main #network-settings-reset,
+#wphttps-main #filters-reset,
+#wphttps-main #domain-mapping-reset {
+	float: left;
+	margin-right: 10px;
+}
+#wphttps-main #ssl_port_label {
+	display: inline-block;
+	padding-top: 10px;	
+}
+#wphttps-main #ssl_host {
+	width: 70%;
+}
+#wphttps-main #exclusive_https_row label {
+	padding-top: 5px;	
+}
+
+#wphttps-main #admin_menu_row label {
+	display: inline;
+}
+
+#wphttps-main #secure_filter_row textarea {
+	width: 95%;
+	height: 120px;
+}
+
+#wphttps-main #admin_menu_row fieldset {
+	margin-top: 5px;
+}
+
+#wphttps-main input[type="checkbox"] {
+	float: left;
+}
+#wphttps-main p.description {
+	margin: .5em 0 0 .5em;
+	width: 75%;
+	display: block;
+	float: left;
+	line-height: 1.2em;
+}
+#wphttps-main #secure_filter_row p.description {
+	margin: .5em 10px 0 0;
+	width: auto;
+}
+#wphttps-main #ssl_proxy_row p.description {
+	width: 65%;
+}
+#wphttps-main #domain_mapping td {
+	padding: 10px 0;
+}
+#wphttps-main #domain_mapping td.arrow {
+	padding: 8px 0;
+}
+#wphttps-main #domain_mapping .http_scheme,
+#wphttps-main #domain_mapping .https_scheme {
+	width: 30px;
+	padding: 10px;
+}
+#wphttps-main #domain_mapping .https_scheme {
+	width: 35px;
+}
+#wphttps-main #domain_mapping .http_domain .label,
+#wphttps-main #domain_mapping .https_domain .label {
+	display: block;
+	float: left;
+	text-align: right;
+	padding-right: 2%;
+} 
+#wphttps-main #domain_mapping input {
+	width: 96%;
+	padding-left: 2%;
+	padding-right: 2%;
+}
+#wphttps-main #domain_mapping .add {
+	display: block;
+	height: 16px;
+	width: 16px;
+	overflow: hidden;
+	text-indent: -1000em;
+	float: left;
+	background: url(images/add.png) no-repeat 50% 50%;	
+}
+#wphttps-main #domain_mapping .remove {
+	display: block;
+	height: 16px;
+	width: 16px;
+	overflow: hidden;
+	text-indent: -1000em;
+	float: left;
+	background: url(images/delete.png) no-repeat 50% 50%;	
+}
+#wphttps-main #domain_mapping .arrow .label {
+	display: block;
+	height: 16px;
+	width: 16px;
+	overflow: hidden;
+	text-indent: -1000em;
+	background: url(images/arrow_right.png) no-repeat 50% 50%;	
+	margin: 0 auto;
+}
+
+#wphttps-main #regex-help {
+	display: none;
+}
+table.regex-help {
+	border-collapse: collapse;
+}
+table.regex-help tr {
+	border: 1px solid #000;
+	border-width: 1px 1px 0 0;
+}
+table.regex-help td, table.regex-help th {
+	border: 1px solid #000;
+	border-width: 0 0 1px 1px;
+}

wp-content/plugins/wordpress-https/admin/js/metabox.php

@@ -0,0 +1,26 @@
+<?php
+
+require_once(realpath(dirname(__FILE__) . '/../../../../..') . '/wp-load.php');
+
+// Disable errors
+error_reporting(0);
+
+// Set headers
+header("Status: 200");
+header("HTTP/1.1 200 OK");
+header('Content-Type: text/html');
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', FALSE);
+header('Pragma: no-cache');
+header("Vary: Accept-Encoding");
+
+if ( ! wp_verify_nonce($_POST['_nonce'], 'wordpress-https') ) {
+	exit;
+}
+
+$content = WordPressHTTPS_Url::fromString( $_POST['url'] )->getContent();
+
+if ( $content ) {
+	echo $content;
+}
+?>

wp-content/plugins/wordpress-https/admin/templates/ajax_message.php

@@ -0,0 +1,19 @@
+<?php
+
+if ( isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest' ) {
+	error_reporting(0);
+	while(@ob_end_clean());
+	if ( sizeof( $errors ) > 0 ) {
+		echo "<div class=\"error below-h2 fade wphttps-message\" id=\"message\">\n\t<ul>\n";
+		foreach ( $errors as $error ) {
+			echo "\t\t<li><p>".$error."</p></li>\n";
+		}
+		echo "\t</ul>\n</div>\n";
+	} else {
+		echo "<div class=\"updated below-h2 fade wphttps-message\" id=\"message\"><p>" . $message . "</p></div>\n";
+		if ( $logout || $reload ) {
+			echo "<script type=\"text/javascript\">window.location.reload();</script>";
+		}
+	}
+	exit();
+}

wp-content/plugins/wordpress-https/admin/templates/metabox/ajax.php

@@ -0,0 +1,20 @@
+<?php 
+	$nonce = wp_create_nonce($this->getPlugin()->getSlug());
+?><script type="text/javascript">
+jQuery(document).ready(function($) {
+	var loading = $('<img alt="Loading..." src="<?php echo admin_url('/images/wpspin_light.gif'); ?>" class="loading" />');
+
+	$('#<?php echo $metabox['id']; ?> .handlediv').append( loading );
+	$('#<?php echo $metabox['id']; ?> .handlediv .loading').fadeIn('fast');
+
+	$.post(ajaxurl, {
+		action : '<?php echo $this->getPlugin()->getSlug(); ?>_ajax_metabox',
+		id : '<?php echo $metabox['id']; ?>',
+		url : '<?php echo $metabox['args']['url']; ?>',
+		_nonce : '<?php echo $nonce; ?>'
+	}, function(response) {
+		$('#<?php echo $metabox['id']; ?> .inside').html(response);
+		$('#<?php echo $metabox['id']; ?> .handlediv .loading').fadeIn(0).fadeOut('fast');
+	});
+});
+</script>