From c9e8a3e8febc512aee60db53d344fd2b1c606faa Mon Sep 17 00:00:00 2001
From: Thomas Willingham <beardyunixer@beardyunixer.com>
Date: Fri, 26 Sep 2014 17:05:22 +0100
Subject: [PATCH 01/12] Minor doco.  Add some clarity - that had me scratching
 my head.

---
 include/language.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/language.php b/include/language.php
index 855d94505..83e5e0f20 100644
--- a/include/language.php
+++ b/include/language.php
@@ -146,7 +146,7 @@ function load_translation_table($lang, $install = false) {
  *
  * @param $s string that should get translated
  * @param $ctx optional context to appear in po file
- * @return translated string if exsists, otherwise s
+ * @return translated string if exsists, otherwise return $s
  *
  */
 function t($s,$ctx = '') {

From 94fcf5885ee6543140884143afaba9a06adac3f9 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <beardyunixer@beardyunixer.com>
Date: Fri, 26 Sep 2014 17:16:55 +0100
Subject: [PATCH 02/12] So much so, in fact, that I didn't even notice the
 typo.

---
 include/language.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/language.php b/include/language.php
index 83e5e0f20..9db57dceb 100644
--- a/include/language.php
+++ b/include/language.php
@@ -146,7 +146,7 @@ function load_translation_table($lang, $install = false) {
  *
  * @param $s string that should get translated
  * @param $ctx optional context to appear in po file
- * @return translated string if exsists, otherwise return $s
+ * @return translated string if exists, otherwise return $s
  *
  */
 function t($s,$ctx = '') {

From f652fbdf74ca646679df52825a7604893eca13e5 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 26 Sep 2014 19:17:02 +0200
Subject: [PATCH 03/12] fix blockquote

---
 view/css/bootstrap-red.css        |  5 -----
 view/theme/redbasic/css/style.css | 20 +++++++++++++-------
 view/theme/redbasic/php/style.php |  6 +++---
 view/tpl/photo_albums.tpl         |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 0c004ee05..ba4cc08b0 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -74,8 +74,3 @@ nav .navbar-collapse .navbar-right {
 code {
 	white-space: normal;
 }
-
-
-blockquote {
-	font-size: 1em;
-}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 2cb2d917d..c908b9fc8 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -115,13 +115,7 @@ pre {
 	border:1px solid $pre_borderc;
 }
 
-blockquote {
-	background-color: $blockquote_bgcolour;
-	border-left: 4px solid $blockquote_bordercolour;
-	padding: 0.4em;
-	color: $blockquote_colour;
-	margin-left: 20px;
-}
+
 
 .ccollapse-wrapper {
 	border: 1px solid #CCC;
@@ -2248,6 +2242,18 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 }
 
 /* bootstrap overrides */
+
+
+blockquote {
+	font-size: $font_size;
+	font-style: italic;
+	background-color: $blockquote_bgcolour;
+	border-left: 3px solid $blockquote_bordercolour;
+	padding: 0.4em;
+	color: $blockquote_colour;
+	margin: 0px 0px 0px 20px;
+}
+
 .badge {
 	border-radius: $radiuspx;
 }
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index d6d77e961..edf77cb0b 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -142,11 +142,11 @@ if(! $a->install) {
 	if (! $widget_brdrcolour)
 		$widget_brdrcolour = "rgba(238,238,238,0.8)";
 	if (! $blockquote_colour)
-		$blockquote_colour = "#000";
+		$blockquote_colour = "#4d4d4d";
 	if (! $blockquote_bgcolour)
-		$blockquote_bgcolour = "#f4f8f9";
+		$blockquote_bgcolour = "";
 	if (! $blockquote_bordercolour)
-		$blockquote_bordercolour = "#dae4ee";
+		$blockquote_bordercolour = "#ccc";
 	if (! $code_borderc)
 		$code_borderc = "#444";
 	if (! $code_bgcolour)
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index 27f156c68..cbb07cac3 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,5 +1,5 @@
 <div id="side-bar-photos-albums" class="widget">
-	<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3>
+	<h3>{{$title}}</h3>
 	{{if $albums}}
 	<ul class="nav nav-pills nav-stacked">
 		{{foreach $albums as $al}}

From a7269e9d6edee9852da88d4388010536d47f416d Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 26 Sep 2014 19:28:28 +0200
Subject: [PATCH 04/12] upload should be first

---
 view/tpl/photo_albums.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index cbb07cac3..cc0890e26 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -2,6 +2,9 @@
 	<h3>{{$title}}</h3>
 	{{if $albums}}
 	<ul class="nav nav-pills nav-stacked">
+	{{if $upload}}
+		<li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li>
+	{{/if}}
 		{{foreach $albums as $al}}
 		{{if $al.text}}
 		<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}<span class="badge pull-right">{{$al.total}}</span></a></li>
@@ -9,8 +12,5 @@
 		{{/foreach}}
 
 	{{/if}}
-	{{if $upload}}
-		<li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li>
-	{{/if}}
 	</ul>
 </div>

From 04e460c8f8915be3b7911bf0b9c9c0bcd8703e25 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 26 Sep 2014 19:34:39 +0200
Subject: [PATCH 05/12] upload first but not inside another {{if}}

---
 view/tpl/photo_albums.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index cc0890e26..5602f8571 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,10 +1,10 @@
 <div id="side-bar-photos-albums" class="widget">
 	<h3>{{$title}}</h3>
-	{{if $albums}}
 	<ul class="nav nav-pills nav-stacked">
 	{{if $upload}}
 		<li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li>
 	{{/if}}
+	{{if $albums}}
 		{{foreach $albums as $al}}
 		{{if $al.text}}
 		<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}<span class="badge pull-right">{{$al.total}}</span></a></li>

From 2681071970b44cd25c890e7550e2c5e210e131df Mon Sep 17 00:00:00 2001
From: Klaus Weidenbach <Klaus.Weidenbach@gmx.net>
Date: Fri, 26 Sep 2014 22:28:35 +0200
Subject: [PATCH 06/12] Some documentation of include/config.php.

I hope my guesses are not completely wrong, anyway please take look
not that I tell complete bullshit.
---
 include/config.php | 374 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 269 insertions(+), 105 deletions(-)

diff --git a/include/config.php b/include/config.php
index add7b5f71..a77801717 100644
--- a/include/config.php
+++ b/include/config.php
@@ -1,30 +1,56 @@
-<?php /** @file */
-
+<?php
 /**
+ * @file include/config.php
+ * @brief Arbitrary configuration storage.
  *
- * Arbitrary configuration storage
  * Note:
  * Please do not store booleans - convert to 0/1 integer values
  * The get_?config() functions return boolean false for keys that are unset,
  * and this could lead to subtle bugs.
  *
- * There are a few places in the code (such as the admin panel) where boolean
- * configurations need to be fixed as of 10/08/2011.
+ * Arrays get stored as serialize strings.
+ *
+ * @todo There are a few places in the code (such as the admin panel) where
+ * boolean configurations need to be fixed as of 10/08/2011.
+ *
+ * - <b>config</b> is used for hub specific configurations. It overrides the
+ * configurations from .htconfig file. The storage is of size TEXT.
+ * - <b>pconfig</b> is used for channel specific configurations and takes a
+ * <i>channel_id</i> as identifier. It stores for example which features are
+ * enabled per channel. The storage is of size MEDIUMTEXT.
+ * @code $var = get_pconfig(local_user(), 'category', 'key');@endcode
+ * - <b>xconfig</b> is the same as pconfig, except that it uses <i>xchan</i> as
+ * an identifier. This is for example for people who do not have a local account.
+ * The storage is of size MEDIUMTEXT.
+ * @code $observer = $a->get_observer_hash();
+ * if ($observer) {
+ *     $var = get_xconfig($observer, 'category', 'key');
+ * }@endcode
+ *
+ * - get_config() and set_config() can also be done through the command line tool
+ * @ref util/config
+ * - get_pconfig() and set_pconfig() can also be done through the command line tool
+ * @ref util/pconfig and takes a channel_id as first argument. 
+ *
  */
 
-
-// retrieve a "family" of config variables from database to cached storage
-
+/**
+ * @brief Loads the hub's configuration from database to a cached storage.
+ *
+ * Retrieve a category ($family) of config variables from database to a cached
+ * storage in the global $a->config[$family].
+ *
+ * @param string $family
+ *  The category of the configuration value
+ */
 function load_config($family) {
 	global $a;
 
-	if(! array_key_exists($family,$a->config))
+	if(! array_key_exists($family, $a->config))
 		$a->config[$family] = array();
 
-	if(! array_key_exists('config_loaded',$a->config[$family])) {
-
+	if(! array_key_exists('config_loaded', $a->config[$family])) {
 		$r = q("SELECT * FROM config WHERE cat = '%s'", dbesc($family));
-
 		if($r !== false) {
 			if($r) {
 				foreach($r as $rr) {
@@ -37,24 +63,31 @@ function load_config($family) {
 	} 
 }
 
-// get a particular config variable given the family name
-// and key. Returns false if not set.
-// $instore is only used by the set_config function
-// to determine if the key already exists in the DB
-// If a key is found in the DB but doesn't exist in
-// local config cache, pull it into the cache so we don't have
-// to hit the DB again for this item.
-
-
+/**
+ * @brief Get a particular config variable given the category name ($family)
+ * and a key.
+ *
+ * Get a particular config variable from the given category ($family) and the
+ * $key from a cached storage in $a->config[$family]. If a key is found in the
+ * DB but does not exist in local config cache, pull it into the cache so we
+ * do not have to hit the DB again for this item.
+ * 
+ * Returns false if not set.
+ *
+ * @param string $family
+ *  The category of the configuration value
+ * @param string $key
+ *  The configuration key to query
+ * @return mixed Return value or false on error or if not set
+ */
 function get_config($family, $key) {
-
 	global $a;
 
-	if((! array_key_exists($family,$a->config)) || (! array_key_exists('config_loaded',$a->config[$family])))
+	if((! array_key_exists($family, $a->config)) || (! array_key_exists('config_loaded', $a->config[$family])))
 		load_config($family);
 
-	if(array_key_exists('config_loaded',$a->config[$family])) {
-		if(! array_key_exists($key,$a->config[$family])) {
+	if(array_key_exists('config_loaded', $a->config[$family])) {
+		if(! array_key_exists($key, $a->config[$family])) {
 			return false;		
 		}
 		return ((! is_array($a->config[$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$family][$key])) 
@@ -65,36 +98,59 @@ function get_config($family, $key) {
 	return false;
 }
 
-function get_config_from_storage($family,$key) {
-	$ret = q("select * from config where cat = '%s' and k = '%s' limit 1",
+/**
+ * @brief Returns a value directly from the database configuration storage.
+ *
+ * This function queries directly the database and bypasses the chached storage
+ * from get_config($family, $key).
+ *
+ * @param string $family
+ *  The category of the configuration value
+ * @param string $key
+ *  The configuration key to query
+ * @return mixed
+ */
+function get_config_from_storage($family, $key) {
+	$ret = q("SELECT * FROM config WHERE cat = '%s' AND k = '%s' LIMIT 1",
 		dbesc($family),
 		dbesc($key)
 	);
 	return $ret;
 }
 
-
-
-// Store a config value ($value) in the category ($family)
-// under the key ($key)
-// Return the value, or false if the database update failed
-
-function set_config($family,$key,$value) {
+/**
+ * @brief Sets a configuration value for the hub.
+ *
+ * Stores a config value ($value) in the category ($family) under the key ($key).
+ *
+ * Please do not store booleans - convert to 0/1 integer values!
+ *
+ * @param string $family
+ *  The category of the configuration value
+ * @param string $key
+ *  The configuration key to set
+ * @param mixed $value
+ *  The value to store in the configuration
+ * @return mixed
+ *  Return the set value, or false if the database update failed
+ */
+function set_config($family, $key, $value) {
 	global $a;
+
 	// manage array value
 	$dbvalue = ((is_array($value))  ? serialize($value) : $value);
 	$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
 
-	if(get_config($family,$key) === false || (! get_config_from_storage($family,$key))) {
-		$a->config[$family][$key] = $value;
-
+	if(get_config($family, $key) === false || (! get_config_from_storage($family, $key))) {
 		$ret = q("INSERT INTO config ( cat, k, v ) VALUES ( '%s', '%s', '%s' ) ",
 			dbesc($family),
 			dbesc($key),
 			dbesc($dbvalue)
 		);
-		if($ret)
-			return $value;
+		if($ret) {
+			$a->config[$family][$key] = $value;
+			$ret = $value;
+		}
 		return $ret;
 	}
 
@@ -104,18 +160,32 @@ function set_config($family,$key,$value) {
 		dbesc($key)
 	);
 
-	$a->config[$family][$key] = $value;
-
-	if($ret)
-		return $value;
+	if($ret) {
+		$a->config[$family][$key] = $value;
+		$ret = $value;
+	}
 	return $ret;
 }
 
-function del_config($family,$key) {
+/**
+ * @brief Deletes the given key from the hub's configuration database.
+ *
+ * Removes the configured value from the stored cache in $a->config[$family]
+ * and removes it from the database.
+ *
+ * @param string $family
+ *  The category of the configuration value
+ * @param string $key
+ *  The configuration key to delete
+ * @return mixed
+ */
+function del_config($family, $key) {
 	global $a;
-	if(array_key_exists($family,$a->config) && array_key_exists($key,$a->config[$family]))
+	$ret = false;
+
+	if(array_key_exists($family, $a->config) && array_key_exists($key, $a->config[$family]))
 		unset($a->config[$family][$key]);
-	$ret = q("DELETE FROM config WHERE cat = '%s' AND k = '%s' LIMIT 1",
+		$ret = q("DELETE FROM config WHERE cat = '%s' AND k = '%s' LIMIT 1",
 		dbesc($family),
 		dbesc($key)
 	);
@@ -123,17 +193,25 @@ function del_config($family,$key) {
 }
 
 
-function load_pconfig($uid,$family = '') {
+/**
+ * @brief Loads all configuration values of a channel into a cached storage.
+ *
+ * All configuration values of the given channel are stored in global cache
+ * which is available under the global variable $a->config[$uid].
+ *
+ * @param string $uid
+ *  The channel_id
+ * @return void|false Nothing or false if $uid is false
+ */
+function load_pconfig($uid) {
 	global $a;
 
 	if($uid === false)
 		return false;
 
-	if(! array_key_exists($uid,$a->config))
+	if(! array_key_exists($uid, $a->config))
 		$a->config[$uid] = array();
 
-	// family is no longer used - load entire user config
-
 	$r = q("SELECT * FROM `pconfig` WHERE `uid` = %d",
 		intval($uid)
 	);
@@ -142,59 +220,88 @@ function load_pconfig($uid,$family = '') {
 		foreach($r as $rr) {
 			$k = $rr['k'];
 			$c = $rr['cat'];
-			if(! array_key_exists($c,$a->config[$uid])) {
+			if(! array_key_exists($c, $a->config[$uid])) {
 				$a->config[$uid][$c] = array();
 				$a->config[$uid][$c]['config_loaded'] = true;
 			}
 			$a->config[$uid][$c][$k] = $rr['v'];
 		}
-	} 
+	}
 }
 
-
-
-
-function get_pconfig($uid,$family, $key, $instore = false) {
-
+/**
+ * @brief Get a particular channel's config variable given the category name
+ * ($family) and a key.
+ *
+ * Get a particular channel's config value from the given category ($family)
+ * and the $key from a cached storage in $a->config[$uid].
+ *
+ * Returns false if not set.
+ *
+ * @param string $uid
+ *  The channel_id
+ * @param string $family
+ *  The category of the configuration value
+ * @param string $key
+ *  The configuration key to query
+ * @param boolean $instore (deprecated, without function)
+ * @return mixed Stored value or false if it does not exist
+ */
+function get_pconfig($uid, $family, $key, $instore = false) {
+	logger('include/config.php: get_pconfig() deprecated instore param used', LOGGER_DEBUG);
 	global $a;
 
 	if($uid === false)
 		return false;
 
-	if(! array_key_exists($uid,$a->config))
+	if(! array_key_exists($uid, $a->config))
 		load_pconfig($uid);
 
-	if((! array_key_exists($family,$a->config[$uid])) || (! array_key_exists($key,$a->config[$uid][$family])))
+	if((! array_key_exists($family, $a->config[$uid])) || (! array_key_exists($key, $a->config[$uid][$family])))
 		return false;
-		
+
 	return ((! is_array($a->config[$uid][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$uid][$family][$key])) 
 		? unserialize($a->config[$uid][$family][$key])
 		: $a->config[$uid][$family][$key]
 	);
 }
 
-function set_pconfig($uid,$family,$key,$value) {
-
+/**
+ * @brief Sets a configuration value for a channel.
+ *
+ * Stores a config value ($value) in the category ($family) under the key ($key)
+ * for the channel_id $uid.
+ *
+ * Please do not store booleans - convert to 0/1 integer values!
+ *
+ * @param string $uid
+ *  The channel_id
+ * @param string $family
+ *  The category of the configuration value
+ * @param string $key
+ *  The configuration key to query
+ * @return mixed Stored $value or false
+ */
+function set_pconfig($uid, $family, $key, $value) {
 	global $a;
 
-
 	// manage array value
 	$dbvalue = ((is_array($value))  ? serialize($value) : $value);
 	$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
 
-	if(get_pconfig($uid,$family,$key) === false) {
-		if(! array_key_exists($uid,$a->config))
+	if(get_pconfig($uid, $family, $key) === false) {
+		if(! array_key_exists($uid, $a->config))
 			$a->config[$uid] = array();
-		if(! array_key_exists($family,$a->config[$uid]))
+		if(! array_key_exists($family, $a->config[$uid]))
 			$a->config[$uid][$family] = array();
 
 		// keep a separate copy for all variables which were
 		// set in the life of this page. We need this to
 		// synchronise channel clones.
 
-		if(! array_key_exists('transient',$a->config[$uid]))
+		if(! array_key_exists('transient', $a->config[$uid]))
 			$a->config[$uid]['transient'] = array();
-		if(! array_key_exists($family,$a->config[$uid]['transient']))
+		if(! array_key_exists($family, $a->config[$uid]['transient']))
 			$a->config[$uid]['transient'][$family] = array();
 
 		$a->config[$uid][$family][$key] = $value;
@@ -222,9 +329,9 @@ function set_pconfig($uid,$family,$key,$value) {
 	// set in the life of this page. We need this to
 	// synchronise channel clones.
 
-	if(! array_key_exists('transient',$a->config[$uid]))
+	if(! array_key_exists('transient', $a->config[$uid]))
 		$a->config[$uid]['transient'] = array();
-	if(! array_key_exists($family,$a->config[$uid]['transient']))
+	if(! array_key_exists($family, $a->config[$uid]['transient']))
 		$a->config[$uid]['transient'][$family] = array();
 
 	$a->config[$uid][$family][$key] = $value;
@@ -235,13 +342,27 @@ function set_pconfig($uid,$family,$key,$value) {
 	return $ret;
 }
 
-
-function del_pconfig($uid,$family,$key) {
-
+/**
+ * @brief Deletes the given key from the channel's configuration.
+ *
+ * Removes the configured value from the stored cache in $a->config[$uid]
+ * and removes it from the database.
+ *
+ * @param string $uid
+ *  The channel_id
+ * @param string $family
+ *  The category of the configuration value
+ * @param string $key
+ *  The configuration key to delete
+ * @return mixed
+ */
+function del_pconfig($uid, $family, $key) {
 	global $a;
-	if(x($a->config[$uid][$family],$key))
+	$ret = false;
+
+	if(x($a->config[$uid][$family], $key))
 		unset($a->config[$uid][$family][$key]);
-	$ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s' LIMIT 1",
+		$ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s' LIMIT 1",
 		intval($uid),
 		dbesc($family),
 		dbesc($key)
@@ -250,18 +371,25 @@ function del_pconfig($uid,$family,$key) {
 }
 
 
-
-function load_xconfig($xchan,$family = '') {
+/**
+ * @brief Loads a full xchan's configuration into a cached storage.
+ *
+ * All configuration values of the given observer hash are stored in global
+ * cache which is available under the global variable $a->config[$xchan].
+ *
+ * @param string $xchan
+ *  The observer's hash
+ * @return void|false Returns false if xchan is not set
+ */
+function load_xconfig($xchan) {
 	global $a;
 
 	if(! $xchan)
 		return false;
 
-	if(! array_key_exists($xchan,$a->config))
+	if(! array_key_exists($xchan, $a->config))
 		$a->config[$xchan] = array();
 
-	// family is no longer used. Entire config is loaded
-
 	$r = q("SELECT * FROM `xconfig` WHERE `xchan` = '%s'",
 		dbesc($xchan)
 	);
@@ -270,51 +398,77 @@ function load_xconfig($xchan,$family = '') {
 		foreach($r as $rr) {
 			$k = $rr['k'];
 			$c = $rr['cat'];
-			if(! array_key_exists($c,$a->config[$xchan])) {
+			if(! array_key_exists($c, $a->config[$xchan])) {
 				$a->config[$xchan][$c] = array();
 				$a->config[$xchan][$c]['config_loaded'] = true;
 			}
 			$a->config[$xchan][$c][$k] = $rr['v'];
 		}
-	} 
+	}
 }
 
-
-
-
-function get_xconfig($xchan,$family, $key) {
-
+/**
+ * @brief Get a particular observer's config variable given the category
+ * name ($family) and a key.
+ *
+ * Get a particular observer's config value from the given category ($family)
+ * and the $key from a cached storage in $a->config[$xchan].
+ *
+ * Returns false if not set.
+ *
+ * @param string $xchan
+ *  The observer's hash
+ * @param string $family
+ *  The category of the configuration value
+ * @param string $key
+ *  The configuration key to query
+ * @return mixed Stored $value or false if it does not exist
+ */
+function get_xconfig($xchan, $family, $key) {
 	global $a;
 
 	if(! $xchan)
 		return false;
 
-	if(! array_key_exists($xchan,$a->config))
+	if(! array_key_exists($xchan, $a->config))
 		load_xconfig($xchan);
 
-	if((! array_key_exists($family,$a->config[$xchan])) || (! array_key_exists($key,$a->config[$xchan][$family])))
+	if((! array_key_exists($family, $a->config[$xchan])) || (! array_key_exists($key, $a->config[$xchan][$family])))
 		return false;
 
 	return ((! is_array($a->config[$xchan][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$xchan][$family][$key])) 
 		? unserialize($a->config[$xchan][$family][$key])
 		: $a->config[$xchan][$family][$key]
 	);
-
 }
 
-
-function set_xconfig($xchan,$family,$key,$value) {
-
+/**
+ * @brief Sets a configuration value for an observer.
+ *
+ * Stores a config value ($value) in the category ($family) under the key ($key)
+ * for the observer's $xchan hash.
+ *
+ * Please do not store booleans - convert to 0/1 integer values!
+ *
+ * @param string $xchan
+ *  The observer's hash
+ * @param string $family
+ *  The category of the configuration value
+ * @param string $key
+ *  The configuration key to set
+ * @return mixed Stored $value or false
+ */
+function set_xconfig($xchan, $family, $key, $value) {
 	global $a;
 
 	// manage array value
 	$dbvalue = ((is_array($value))  ? serialize($value) : $value);
 	$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
 
-	if(get_xconfig($xchan,$family,$key) === false) {
-		if(! array_key_exists($xchan,$a->config))
+	if(get_xconfig($xchan, $family, $key) === false) {
+		if(! array_key_exists($xchan, $a->config))
 			$a->config[$xchan] = array();
-		if(! array_key_exists($family,$a->config[$xchan]))
+		if(! array_key_exists($family, $a->config[$xchan]))
 			$a->config[$xchan][$family] = array();
 
 		$a->config[$xchan][$family][$key] = $value;
@@ -341,22 +495,32 @@ function set_xconfig($xchan,$family,$key,$value) {
 	if($ret)
 		return $value;
 	return $ret;
-
 }
 
-
-function del_xconfig($xchan,$family,$key) {
-
+/**
+ * @brief Deletes the given key from the observer's config.
+ *
+ * Removes the configured value from the stored cache in $a->config[$xchan]
+ * and removes it from the database.
+ *
+ * @param string $xchan
+ *  The observer's hash
+ * @param string $family
+ *  The category of the configuration value
+ * @param string $key
+ *  The configuration key to delete
+ * @return mixed
+ */
+function del_xconfig($xchan, $family, $key) {
 	global $a;
-	if(x($a->config[$xchan][$family],$key))
+	$ret = false;
+
+	if(x($a->config[$xchan][$family], $key))
 		unset($a->config[$xchan][$family][$key]);
-	$ret = q("DELETE FROM `xconfig` WHERE `xchan` = '%s' AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+		$ret = q("DELETE FROM `xconfig` WHERE `xchan` = '%s' AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
 		dbesc($xchan),
 		dbesc($family),
 		dbesc($key)
 	);
 	return $ret;
 }
-
-
-

From fa019791fa4cd3f5ae4d3b0cf7b8cbef6483f6d6 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 27 Sep 2014 00:14:35 -0700
Subject: [PATCH 07/12] some background work for import/export of things and
 liked things/profiles

---
 include/identity.php | 16 ++++++++++++++++
 version.inc          |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/include/identity.php b/include/identity.php
index eaeb9f07f..d26eced2c 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -518,10 +518,26 @@ function identity_basic_export($channel_id, $items = false) {
 		$ret['photo'] = array('type' => $r[0]['type'], 'data' => base64url_encode($r[0]['data']));
 	}
 
+	$r = q("select * from obj where obj_channel = %d",
+		intval($channel_id)
+	);
+
+	if($r)
+		$ret['obj'] = $r;
+
+
 	if(! $items)
 		return $ret;
 
 
+	$r = q("select likes.*, item.mid from likes left join item on likes.iid = item.id where likes.channel_id = %d",
+		intval($channel_id)
+	);
+
+	if($r)
+		$ret['likes'] = $r;
+
+
 	$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d",
 		intval($channel_id)
 	);
diff --git a/version.inc b/version.inc
index a87b5d9bf..0947c89cf 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-09-26.810
+2014-09-27.811

From 913109796ef58339cf9ac4590e7e0e06e7a3ce02 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 27 Sep 2014 05:10:09 -0700
Subject: [PATCH 08/12] provide backup copy of post for diaspora reshare and
 re-fetch

---
 mod/p.php | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 mod/p.php

diff --git a/mod/p.php b/mod/p.php
new file mode 100644
index 000000000..227f9e24a
--- /dev/null
+++ b/mod/p.php
@@ -0,0 +1,52 @@
+<?php /** @file */
+
+require_once('include/bb2diaspora.php');
+
+// used in Diaspora communications to provide a server copy of a sent post in XML format.
+
+function p_init(&$a) {
+
+	if(argc() < 2)
+		http_status_exit(401);
+
+	$mid = str_replace('.xml','',argv(1));
+
+	$r = q("select * from item where mid = '%s' and (item_flags & %d) and item_private = 0 limit 1",
+		dbesc($mid),
+		intval(ITEM_WALL)
+	);
+
+
+	if((! $r) || (! perm_is_allowed($r[0]['uid'],'','view_stream')))
+		http_status_exit(404);
+
+
+	$c = q("select * from channel where channel_id = %d limit 1",
+		intval($r[0]['uid'])
+	);
+
+	if(! $c)
+		http_status_exit(404);
+
+	$myaddr = $c[0]['channel_address'] . '@' . $a->get_hostname();
+
+	$item = $r[0];
+   
+	$title = $item['title'];
+	$body = bb2diaspora_itembody($item);
+	$created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C');
+
+	$tpl = get_markup_template('diaspora_post.tpl');
+	$msg = replace_macros($tpl, array(
+		'$body' => xmlify($body),
+		'$guid' => $item['mid'],
+		'$handle' => xmlify($myaddr),
+		'$public' => 'true',
+		'$created' => $created,
+		'$provider' => (($item['app']) ? $item['app'] : 'redmatrix')
+	));
+
+	header('Content-type: text/xml');
+	echo $msg;
+	killme();
+}
\ No newline at end of file

From 38605eefdd10591f22ec6e1145924755bd22fefa Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Sat, 27 Sep 2014 15:41:49 +0200
Subject: [PATCH 09/12] more css shifting

---
 view/css/bootstrap-red.css        | 12 ------------
 view/css/conversation.css         |  4 ----
 view/theme/redbasic/css/style.css | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index ba4cc08b0..21d6781f5 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -1,17 +1,5 @@
 /* override some bootstrap settings */
 
-h1, h2 {
-   font-size: 1.583em;
-}
-
-h3, h4 {
-   font-size: 1.334em;
-}
-
-h5, h6 {
-   font-size: 0.75rem;
-}
-
 /* nav overrides */
 
 nav .badge {
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 80b5de250..7b0d87030 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -111,10 +111,6 @@
    font-size: 1.319em;
 }
 
-.wall-item-title {
-   font-size: $font_size;
-}
-
 .wall-item-title h3, .wall-item-content h3,  .wall-item-content h4 {
    font-size: 1.112em;
 }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c908b9fc8..8841260e3 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -23,6 +23,19 @@ body {
 	margin: 0px;
 	height: 100%;
 }
+
+h1, h2 {
+	font-size: 1.583em;
+}
+
+h3, h4 {
+	font-size: 1.334em;
+}
+
+h5, h6 {
+	font-size: 0.75rem;
+}
+
 .jslider {
 	font-family: arial,freesans,sans-serif;
 }
@@ -1966,6 +1979,10 @@ img.mail-list-sender-photo {
 
 /* conversation */
 
+.wall-item-title {
+   font-size: $font_size;
+}
+
 .hide-comments-outer,
 .thread-wrapper .wall-item-comment-wrapper,
 .wall-item-content-wrapper.comment {

From ffe6d20dc046fdfe490ba03b93a0bac32af7c4d8 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <beardyunixer@beardyunixer.com>
Date: Sun, 28 Sep 2014 03:20:49 +0100
Subject: [PATCH 10/12] BBCode - $1 wrote doesn't make sense as a spoiler.  $1
 spoiler does.

---
 include/bbcode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index a7055fc45..0803ed365 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -610,7 +610,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 
 	// Check for [spoiler=Author] text
 
-	$t_wrote = t('$1 wrote:');
+	$t_wrote = t('$1 spoiler');
 
 	// handle nested quotes
 	$endlessloop = 0;

From 9dee1779cf98fe4e97c069e1a1295af6c81197a9 Mon Sep 17 00:00:00 2001
From: tuscanhobbit <pynolo@tarine.net>
Date: Sun, 28 Sep 2014 19:31:04 +0200
Subject: [PATCH 11/12] added statistics to siteinfo json

---
 mod/siteinfo.php | 52 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 01355a51d..bdae14edb 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -48,6 +48,51 @@ function siteinfo_init(&$a) {
 
 		$site_info = get_config('system','info');
 		$site_name = get_config('system','sitename');
+		
+		// Statistics (from statistics.json plugin)
+		
+		$r = q("select count(channel_id) as channels_total from channel left join account on account_id = channel_account_id
+			where account_flags = 0 ");
+		if($r)
+			$channels_total = $r[0]['channels_total'];
+		
+		$r = q("select channel_id from channel left join account on account_id = channel_account_id
+			where account_flags = 0 and account_lastlog > UTC_TIMESTAMP - INTERVAL 6 MONTH");
+		if($r) {
+			$s = '';
+			foreach($r as $rr) {
+				if($s)
+					$s .= ',';
+				$s .= intval($rr['channel_id']);
+			}
+			$x = q("select uid from item where uid in ( $s ) and (item_flags & %d) and created > UTC_TIMESTAMP - INTERVAL 6 MONTH group by uid",
+				intval(ITEM_WALL)
+			);
+			if($x)
+				$channels_active_halfyear = count($x);
+		}
+
+		$r = q("select channel_id from channel left join account on account_id = channel_account_id
+			where account_flags = 0 and account_lastlog > UTC_TIMESTAMP - INTERVAL 1 MONTH");
+		if($r) {
+			$s = '';
+			foreach($r as $rr) {
+				if($s)
+					$s .= ',';
+				$s .= intval($rr['channel_id']);
+			}
+			$x = q("select uid from item where uid in ( $s ) and ( item_flags & %d ) and created > UTC_TIMESTAMP - INTERVAL 1 MONTH group by uid",
+				intval(ITEM_WALL)
+			);
+			if($x)
+				$channels_active_monthly = count($x);
+		}
+
+		$posts = q("SELECT COUNT(*) AS local_posts FROM `item` WHERE (item_flags & %d) ",
+			intval(ITEM_WALL)
+		);
+		if (is_array($posts))
+			$local_posts = $posts[0]["local_posts"];
 
 		$data = Array(
 			'version' => RED_VERSION,
@@ -61,9 +106,12 @@ function siteinfo_init(&$a) {
 			'admin' => $admin,
 			'site_name' => (($site_name) ? $site_name : ''),
 			'platform' => RED_PLATFORM,
-			'info' => (($site_info) ? $site_info : '')
+			'info' => (($site_info) ? $site_info : ''),
+			'channels_total' => $channels_total,
+			'channels_active_halfyear' => $channels_active_halfyear,
+			'channels_active_monthly' => $channels_active_monthly,
+			'local_posts' => $local_posts
 		);
-
 		json_return_and_die($data);
 	}
 }

From 97c6ba77c7cc09c646be9bb6b74a8d0907d9ecb1 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Sun, 28 Sep 2014 23:14:49 +0200
Subject: [PATCH 12/12] some more work on photos

---
 mod/photos.php                    |  4 ++--
 view/theme/redbasic/css/style.css | 30 ++++++++++++++++++++----------
 view/tpl/photo_albums.tpl         |  3 ++-
 view/tpl/photos_recent.tpl        |  6 +++++-
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index c2d90184e..0ff0e29c9 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -654,7 +654,7 @@ function photos_content(&$a) {
 		);
 		
 		$o .= '<div class="section-title-wrapper">';
-		$o .= '<h3>' . $album . '</h3>';
+		$o .= '<h2>' . $album . '</h2>';
 		$o .= '<div class="section-title-submenu">';
 		if($cmd === 'edit') {		
 			if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
@@ -1238,7 +1238,7 @@ function photos_content(&$a) {
 		$o .= replace_macros($tpl, array(
 			'$title' => t('Recent Photos'),
 			'$can_post' => $can_post,
-			'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
+			'$upload' => array(t('Upload'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
 			'$photos' => $photos,
 		));
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 8841260e3..1d43fe983 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -24,15 +24,15 @@ body {
 	height: 100%;
 }
 
-h1, h2 {
-	font-size: 1.583em;
+h1, .h1, h2, .h2 {
+	font-size: 1.667em;
 }
 
-h3, h4 {
+h3, .h3, h4, .h4 {
 	font-size: 1.334em;
 }
 
-h5, h6 {
+h5, .h5, h6, .h6 {
 	font-size: 0.75rem;
 }
 
@@ -73,6 +73,15 @@ a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; }
 	cursor: pointer;
 }
 
+a.btn-default {
+	color: #333;
+
+}
+
+a.btn-success {
+	color: #fff;
+font-weight: normal;
+}
 
 input[type="text"],
 input[type="password"],
@@ -2415,16 +2424,16 @@ blockquote {
 .btn-default {
     	background-color: $editbuttons_bgcolour;
     	border-color: $editbuttons_bordercolour;
-		color: $editbuttons_colour;
+	color: $editbuttons_colour;
     	text-shadow: none;
     	box-shadow: none;
 }
 
 .btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
-    	background-color: $editbuttons_bghover;
-		border-color: $editbuttons_bordercolourhover;
-		color: $input_colourhover;
-		text-decoration: $input_decohover;
+	background-color: $editbuttons_bghover;
+	border-color: $editbuttons_bordercolourhover;
+	color: $input_colourhover;
+	text-decoration: $input_decohover;
 }
 
 .btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
@@ -2451,7 +2460,7 @@ blockquote {
 	margin-bottom: 10px;
 }
 
-.section-title-wrapper h3 {
+.section-title-wrapper h2 {
 	margin-top: 0px;
 	margin-bottom: 0px;
 }
@@ -2464,6 +2473,7 @@ blockquote {
 	margin-right: 10px;
 }
 
+
 @media screen and (max-width: 767px) {
 	aside#region_1 {
 		background: rgba(0, 0, 0, .1);
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index 5602f8571..0f8b809ac 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -4,10 +4,11 @@
 	{{if $upload}}
 		<li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li>
 	{{/if}}
+		<li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li>
 	{{if $albums}}
 		{{foreach $albums as $al}}
 		{{if $al.text}}
-		<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}<span class="badge pull-right">{{$al.total}}</span></a></li>
+		<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.text}}</a></li>
 		{{/if}}
 		{{/foreach}}
 
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index b4094512c..6b0f555b6 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -1,5 +1,9 @@
 <div class="section-title-wrapper">
-	<h3>{{$title}}</h3>
+	{{if $can_post}}
+	<a class="btn btn-xs btn-success pull-right" href="{{$upload.1}}"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</a>
+	{{/if}}
+	<h2>{{$title}}</h2>
+	<div class="clear"></div>
 </div>
 <div id="photo-album-contents">
 	{{foreach $photos as $photo}}