pushing ready to switch to danielchatfield fork

admin_pages.yaml

@@ -7,3 +7,8 @@ settings:
 skins:
   type: skins
   title: Login Page Skin
+extensions:
+  type: extensions
+support:
+  type: support
+  support_forum_url: https://groups.google.com/forum/embed/?place=forum/privacy-plugin&showpopout=true&showsearch=true

extensions/vendor/settings.yaml

@@ -0,0 +1,3 @@
+enabled:
+	title: Enable Extension
+	type: checkbox

plugin.php

@@ -18,12 +18,16 @@ class Volcanic_Pixels_Private_Blog extends Lava_Plugin {
 	public $_plugin_version = 4.05;
 
 	public $_plugin_actions = array(
-		'do_authentication',
+		'do_logout',
+		'do_login',
 		'do_login_display'
 	);
 
 	public $_plugin_filters = array(
-		'is_authorised'
+		'get_query_args',
+		'is_authorised',
+		'is_logout_request',
+		'is_login_request'
 	);
 
 	###########################################
@@ -32,29 +36,84 @@ class Volcanic_Pixels_Private_Blog extends Lava_Plugin {
 
 	function _init() {
 		parent::_init();
+		$this->_set_fingerprint_cookie();
+		$this->_do_action_if( 'logout', 'logout_request' );
+		$this->_do_action_if( 'login', 'login_request' );
 	}
 
 	function _get_header() {
-		$this->_do_plugin_action( 'do_authentication' );
+		// [action], [condition], [default], [should_terminate] - make sure the page is terminated after printing the login template
+		$this->_do_action_unless( 'login_display', 'authorised', false, true );
 	}
 
 	###########################################
-	##	lava hooks
+	##	Plugin hooks
 	###########################################
 
+	function get_query_args( $args ) {
+		$new = array(
+			'logged_in',
+			'logged_out',
+			'incorrect_credentials'
+		);
+		return array_merge( $args, $new );
+	}
+
 	/*
-		Plugin hooks
+		Checks whether user is logging out
 	*/
-	function do_authentication() {
-		$is_authorised = $this->_apply_plugin_filters( 'is_authorised', false );
-		if( ! $is_authorised ) {
-			$this->_do_plugin_action( 'do_login_display' );
-			exit; //better to be safe
+	function is_logout_request( $current ) {
+		//die('gary');
+		if( $this->_request_var( 'logout', false ) or $this->_request_var( 'action', '' ) == 'logout' ) {
+			$current = true;
 		}
+		return $current;
 	}
 
+	function do_logout() {
+		die('test');
+	}
+
+	function is_login_request( $current ) {
+		if( $this->_request_var( 'login', false ) or $this->_request_var( 'action', '' ) == 'login' ) {
+			$current = true;
+		}
+		return $current;
+	}
+
+	function do_login() {
+		// check password against setting
+		$password = $this->_settings()->_get_value_for( 'password' );
+		if( $this->_request_var( 'password' ) == $password ) {
+			$fingerprint = array(
+				'password' => $password,
+				'_expiration'  => $this->_settings()->_get_value_for( 'login_duration', 60*60*24 )
+			);
+			$this->_merge_fingerprint( $fingerprint );
+			$args = $this->_apply_plugin_filters( 'get_query_args', array() );
+			$url = remove_query_arg( $args );
+			$url = add_query_arg( 'logged_in', '', $url );
+			wp_redirect( $url );
+			exit;
+		} else {
+			//details incorrect
+			$args = $this->_apply_plugin_filters( 'get_query_args', array() );
+			$url = remove_query_arg( $args );
+			$url = add_query_arg( 'incorrect_credentials', '', $url );
+			wp_redirect( $url );
+			exit;
+		}
+	}
+
+
 	function is_authorised( $current ) {
-		return false;
+		$fingerprint = $this->_get_fingerprint();
+		if( array_key_exists( 'password', $fingerprint ) ) {
+			if( $fingerprint['password'] == $this->_settings()->_get_value_for('password') ) {
+				$current = true;
+			}
+		}
+		return $current;
 	}
 
 

skins/default/styles.css

@@ -1 +1,45 @@
-.no-select{-webkit-user-select:none}body{background:#fbfbfb;color:#666;font-family:sans-serif}#logo{background-repeat:no-repeat;background-position:bottom center;min-height:200px;max-height:500px}#logo img{margin-left:-1000px;opacity:0;z-index:-1}#login_form_cntr{margin-left:auto;margin-right:auto;background:#fff;border:1px solid #BEBEBE;width:300px;padding:20px;-moz-box-shadow:0 1px 3px rgba(0,0,0,.2);-ms-box-shadow:0 1px 3px rgba(0,0,0,.2);-o-box-shadow:0 1px 3px rgba(0,0,0,.2);box-shadow:0 1px 3px rgba(0,0,0,.2);-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px}input:not([type="submit"]){width:100%;line-height:30px;height:30px;font-size:24px;font-weight:200}label{font-size:14px}
+.no-select {
+  -webkit-user-select: none;
+}
+body {
+  background: #fbfbfb;
+  color: #666;
+  font-family: sans-serif;
+}
+#logo {
+  background-repeat: no-repeat;
+  background-position: bottom center;
+  min-height: 200px;
+  max-height: 500px;
+}
+#logo img {
+  margin-left: -1000px;
+  opacity: 0;
+  z-index: -1;
+}
+#login_form_cntr {
+  margin-left: auto;
+  margin-right: auto;
+  background: white;
+  border: 1px solid #BEBEBE;
+  width: 300px;
+  padding: 20px;
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+  -ms-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+  -o-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+}
+input:not([type="submit"]) {
+  width: 100%;
+  line-height: 30px;
+  height: 30px;
+  font-size: 24px;
+  font-weight: 200;
+}
+label {
+  font-size: 14px;
+}

skins/default/templates/login.html → skins/default/templates/login.twig

@@ -19,15 +19,18 @@
 		</div>
 		<div id="login_form_cntr">
 				{% if widget_exists( 'form' ) %}
-					{{ widget( 'form' ) }}
+					{{ widget( 'form' ) }}{# This allows an extension to override the form #}
 				{% else %}
 					<form id="login_form" method="post">
-						<label>
-							{{ translate( 'Password' ) }}
-							<br />
-							<input type="password" />
-						</label>
-						<input type="submit" value="{{ translate( 'login' ) }}" />
+						<input type="hidden" name="{{ namespace( 'action' ) }}" value="login"  />
+						<p>
+							<label>
+								{{ translate( 'Password' ) }}
+								<br />
+								<input type="password" name="{{ namespace( 'password' ) }}" />
+							</label>
+						</p>
+						<input type="submit" value="{{ translate( 'Login' ) }}" />
 					</form>
 				{% endif %}
 		</div>

todo.txt

@@ -6,10 +6,12 @@ Add browser popup
 
 
 
-Add hook to flush defaults to database on activation, upgrade, rand etc.
-Hidden pages
 
 
+Hidden pages:
+	Welcome
+	Change log (update)
+
 
 
 
@@ -18,4 +20,64 @@ settings:
 	What to protect
 	RSS feeds
 	Login Duration
-	Multiple passwords
+	Multiple passwords
+
+extensions:
+	make case insensitive
+	protocol
+
+pages:
+	skins page:
+		If there is no skin settings hide the configure skin scene
+
+plugins:
+	editor
+	translator **
+	WP Debugger
+		Intelligent warnings
+			- Custom scripts loaded on non-plugin pages
+			- register_page called before init
+
+
+support:
+	Get help:
+		Chrome browser
+		Chrome remote
+		Click new tab
+		Click Remote 
+	Get debug info
+
+update:
+	Make sure extensions are copied accross
+
+
+Flags:
+	No extensions
+	Reset
+
+CLI interface for forms
+
+Protocols:
+	web+lava-plugin://
+		Used to send instructions to a wordpress installation
+		If protocol is handled by something else then display popup explaining with option to disable extension
+
+		e.g.
+			protocol://[plugin]/[verb]/[vars]
+			web+lava-plugin://private-blog/activate_extension/debug
+
+			 - safe patterns
+			 	- an array of regexs that match urls that do not need to be prompted
+
+			 - You have followed a link from groups.google.com which is trying to:
+			 	- Activate the 'debug' extension
+
+	web+lava-support://
+
+
+
+blog posts:
+	Making a skin
+	Making an extension
+	Why we have dropped IE7 support
+		< 0.2 % users using IE7