From 0d60dbef31ea645b8495d8e28fca6c248d20048b Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Mon, 9 Apr 2012 00:45:10 +0200
Subject: [PATCH 1/7] added exceptions to dba class added exception handling to
 index.php, please mind that there is no recovery at the moment added
 transactions to db update. Please mind that they might not be supported by db
 table engines. added admin email on failed updates

added german translation for admin email
---
 boot.php                    |  23 ++
 include/dba.php             | 446 ++++++++++++++++++++----------------
 index.php                   |   7 +
 view/de/strings.php         |   1 +
 view/de/update_fail_eml.tpl |  12 +
 view/update_fail_eml.tpl    |  11 +
 6 files changed, 307 insertions(+), 193 deletions(-)
 create mode 100644 view/de/update_fail_eml.tpl
 create mode 100644 view/update_fail_eml.tpl

diff --git a/boot.php b/boot.php
index b1c378d344..c21cefa184 100644
--- a/boot.php
+++ b/boot.php
@@ -653,8 +653,31 @@ function check_config(&$a) {
 
 						// call the specific update
 
+						global $db; 
+						try {
+						$db->beginTransaction();  
 						$func = 'update_' . $x;
 						$func($a);
+						$db->commit(); 
+						} catch(Exception $ex) {
+							$db->rollback(); 
+							//send the administrator an e-mail
+							$email_tpl = get_intltext_template("update_fail_eml.tpl");
+		$email_tpl = replace_macros($email_tpl, array(
+				'$sitename' => $a->config['sitename'],
+				'$siteurl' =>  $a->get_baseurl(),
+				'$update' => $x,
+				'$error' => $ex->getMessage());
+							$subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); 
+							
+							mail($email, $subject, $text, 
+				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				. 'Content-type: text/plain; charset=UTF-8' . "\n"
+				. 'Content-transfer-encoding: 8bit' );
+				//try the logger
+				logger('update failed: '.$ex->getMessage().EOL); 
+						}
+						
 					}
 				}
 				set_config('system','build', DB_UPDATE_VERSION);
diff --git a/include/dba.php b/include/dba.php
index 76cc0bc7b9..cbf5922a79 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -8,189 +8,245 @@ require_once('include/datetime.php');
  *
  * For debugging, insert 'dbg(1);' anywhere in the program flow.
  * dbg(0); will turn it off. Logging is performed at LOGGER_DATA level.
- * When logging, all binary info is converted to text and html entities are escaped so that 
- * the debugging stream is safe to view within both terminals and web pages.
+ * When logging, all binary info is converted to
+ * text and html entities are escaped so that
+ * the debugging stream is safe to view
+ * within both terminals and web pages.
  *
  */
- 
-if(! class_exists('dba')) { 
-class dba {
 
-	private $debug = 0;
-	private $db;
-	public  $mysqli = true;
-	public  $connected = false;
-	public  $error = false;
+if(! class_exists('dba')) {
 
-	function __construct($server,$user,$pass,$db,$install = false) {
+	class dba {
 
-		$server = trim($server);
-		$user = trim($user);
-		$pass = trim($pass);
-		$db = trim($db);
+		private $debug = 0;
+		private $db;
+		public  $mysqli = true;
+		public  $connected = false;
+		public  $error = false;
 
-		if (!(strlen($server) && strlen($user))){
-			$this->connected = false;
-			$this->db = null;
-			return;			
-		}
-		
-		if($install) {
-			if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
-				if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
-					$this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
-					$this->connected = false;
-					$this->db = null;
-					return;
+		function __construct($server,$user,$pass,$db,$install = false) {
+
+			$server = trim($server);
+			$user = trim($user);
+			$pass = trim($pass);
+			$db = trim($db);
+
+			//we need both, server and username, so fail if one is missing
+			if (!(strlen($server) && strlen($user))){
+				$this->connected = false;
+				$this->db = null;
+				throw new InvalidArgumentException(t("Server name of user name are missing. "));
+			}
+
+			//when we are installing
+			if($install) {
+				if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
+					if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
+						$this->connected = false;
+						$this->db = null;
+						throw new InvalidArgumentException( t('Cannot locate DNS info for database server \'%s\''), $server);
+					}
+				}
+			}
+
+			if(class_exists('mysqli')) {
+				$this->db = new mysqli($server,$user,$pass,$db);
+				if(NULL === $this->db->connect_error()) {
+					$this->connected = true;
+				} else {
+					throw new RuntimeException($this->db->connect_error());
+				}
+			} else {
+				$this->mysqli = false;
+				$this->db = mysql_connect($server,$user,$pass);
+				if($this->db && mysql_select_db($db,$this->db)) {
+					$this->connected = true;
+				} else {
+					throw new RuntimeException(mysql_error());
 				}
 			}
 		}
 
-		if(class_exists('mysqli')) {
-			$this->db = @new mysqli($server,$user,$pass,$db);
-			if(! mysqli_connect_errno()) {
-				$this->connected = true;
+		public function getdb() {
+			return $this->db;
+		}
+
+		public function q($sql) {
+
+			if((! $this->db) || (! $this->connected)) {
+				throw new RuntimeException(t("There is no db connection. "));
 			}
-		}
-		else {
-			$this->mysqli = false;
-			$this->db = mysql_connect($server,$user,$pass);
-			if($this->db && mysql_select_db($db,$this->db)) {
-				$this->connected = true;
-			}
-		}
-		if(! $this->connected) {
-			$this->db = null;
-			if(! $install)
-				system_unavailable();
-		}
-	}
-
-	public function getdb() {
-		return $this->db;
-	}
-
-	public function q($sql) {
-		
-		if((! $this->db) || (! $this->connected))
-			return false;
-		
-		if($this->mysqli)
-			$result = @$this->db->query($sql);
-		else
-			$result = @mysql_query($sql,$this->db);
-
-		if($this->debug) {
-
-			$mesg = '';
 
 			if($this->mysqli) {
-				if($this->db->errno)
-					logger('dba: ' . $this->db->error);
+				$result = $this->db->query($sql);
+			} else {
+				$result = mysql_query($sql,$this->db);
 			}
-			elseif(mysql_errno($this->db))
-				logger('dba: ' . mysql_error($this->db));
 
-			if($result === false)
-				$mesg = 'false';
-			elseif($result === true)
-				$mesg = 'true';
-			else {
-				if($this->mysqli)
-					$mesg = $result->num_rows . ' results' . EOL;
-    			else
-					$mesg = mysql_num_rows($result) . ' results' . EOL;
+			//on debug mode or fail, the query is written to the log.
+			//this won't work if logger can not read it's logging level
+			//from the db.
+			if($this->debug || FALSE === $result) {
+
+				$mesg = '';
+
+				if($result === false) {
+					$mesg = 'false '.$this->error();
+				} elseif($result === true) {
+					$mesg = 'true';
+				} else {
+					if($this->mysqli) {
+						$mesg = $result->num_rows . t(' results') . EOL;
+					} else {
+						$mesg = mysql_num_rows($result) . t(' results') . EOL;
+					}
+				}
+
+				$str =  'SQL = ' . printable($sql) . EOL . t('SQL returned ') . $mesg . EOL;
+
+
+			 // If dbfail.out exists, we will write any failed calls directly to it,
+			 // regardless of any logging that may or may nor be in effect.
+			 // These usually indicate SQL syntax errors that need to be resolved.
+				if(file_exists('dbfail.out')) {
+					file_put_contents('dbfail.out', datetime_convert() . "\n" . $str . "\n", FILE_APPEND);
+				}
+				logger('dba: ' . $str );
+				if(FALSE===$result) {
+					throw new RuntimeException('dba: ' . $str);
+				}
 			}
-    
-			$str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL;
+				
 
-			logger('dba: ' . $str );
+			if($result === true) {
+				return $result;
+			}
+
+			$r = array();
+			if($this->mysqli) {
+				if($result->num_rows) {
+					while($x = $result->fetch_array(MYSQLI_ASSOC)) {
+						$r[] = $x;
+					}
+					$result->free_result();
+				}
+			} else {
+				if(mysql_num_rows($result)) {
+					while($x = mysql_fetch_array($result, MYSQL_ASSOC)) {
+						$r[] = $x;
+					}
+					mysql_free_result($result);
+				}
+			}
+
+
+			if($this->debug) {
+				logger('dba: ' . printable(print_r($r, true)));
+			}
+			return($r);
 		}
 
-		/**
-		 * If dbfail.out exists, we will write any failed calls directly to it,
-		 * regardless of any logging that may or may nor be in effect.
-		 * These usually indicate SQL syntax errors that need to be resolved.
-		 */
-
-		if($result === false) {
-			logger('dba: ' . printable($sql) . ' returned false.');
-			if(file_exists('dbfail.out'))
-				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n", FILE_APPEND);
-		}
-
-		if(($result === true) || ($result === false))
-			return $result;
-
-		$r = array();
-		if($this->mysqli) {
-			if($result->num_rows) {
-				while($x = $result->fetch_array(MYSQLI_ASSOC))
-					$r[] = $x;
-				$result->free_result();
+		private function error() {
+			if($this->mysqli) {
+				return $this->db->error;
+			} else {
+				return mysql_error($this->db);
 			}
 		}
-		else {
-			if(mysql_num_rows($result)) {
-				while($x = mysql_fetch_array($result, MYSQL_ASSOC))
-					$r[] = $x;
-				mysql_free_result($result);
+		
+		public function beginTransaction() {
+			if($this->mysqli) {
+				return $this->db->autocommit(false);
+			} else {
+				//no transaction support in mysql module...
+				mysql_query('SET AUTOCOMMIT = 0;', $db); 
+			}
+		}
+		
+		public function rollback() {
+			if($this->mysqli) {
+				return $this->db->rollback();
+			} else {
+				//no transaction support in mysql module...
+				mysql_query('ROLLBACK;', $db);
+			}
+			$this->stopTransaction(); 
+		}
+
+		public function commit() {
+			if($this->mysqli) {
+				return $this->db->commit();
+			} else {
+				//no transaction support in mysql module...
+				mysql_query('COMMIT;', $db);
+			}
+			$this->stopTransaction();
+		}
+		
+		private function stopTransaction() {
+			if($this->mysqli) {
+				return $this->db->autocommit(true);
+			} else {
+				//no transaction support in mysql module...
+				mysql_query('SET AUTOCOMMIT = 1;', $db);
+			}
+		}
+		
+		public function dbg($dbg) {
+			$this->debug = $dbg;
+		}
+
+		public function escape($str) {
+			if($this->db && $this->connected) {
+				if($this->mysqli) {
+					return $this->db->real_escape_string($str);
+				} else {
+					return mysql_real_escape_string($str,$this->db);
+				}
 			}
 		}
 
-    
-		if($this->debug)
-			logger('dba: ' . printable(print_r($r, true)));
-		return($r);
-	}
-
-	public function dbg($dbg) {
-		$this->debug = $dbg;
-	}
-
-	public function escape($str) {
-		if($this->db && $this->connected) {
-			if($this->mysqli)
-				return @$this->db->real_escape_string($str);
-			else
-				return @mysql_real_escape_string($str,$this->db);
-		}
-	}
-
-	function __destruct() {
-		if ($this->db) 
-			if($this->mysqli)
-				$this->db->close();
-			else
+		function __destruct() {
+			if ($this->db) {
+				if($this->mysqli) {
+					$this->db->close();
+				}
+			} else {
 				mysql_close($this->db);
+			}
+		}
 	}
-}}
+}
 
 if(! function_exists('printable')) {
-function printable($s) {
-	$s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s);
-	$s = str_replace("\x00",'.',$s);
-	if(x($_SERVER,'SERVER_NAME'))
-		$s = escape_tags($s);
-	return $s;
-}}
+	function printable($s) {
+		$s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s);
+		$s = str_replace("\x00",'.',$s);
+		if(x($_SERVER,'SERVER_NAME'))
+			$s = escape_tags($s);
+		return $s;
+	}
+}
 
 // Procedural functions
-if(! function_exists('dbg')) { 
-function dbg($state) {
-	global $db;
-	if($db)
-	$db->dbg($state);
-}}
+if(! function_exists('dbg')) {
+	function dbg($state) {
+		global $db;
+		if($db)
+			$db->dbg($state);
+	}
+}
 
-if(! function_exists('dbesc')) { 
-function dbesc($str) {
-	global $db;
-	if($db && $db->connected)
-		return($db->escape($str));
-	else
-		return(str_replace("'","\\'",$str));
-}}
+if(! function_exists('dbesc')) {
+	function dbesc($str) {
+		global $db;
+		if($db && $db->connected)
+			return($db->escape($str));
+		else
+			return(str_replace("'","\\'",$str));
+	}
+}
 
 
 
@@ -199,30 +255,31 @@ function dbesc($str) {
 // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
 //                   'user', 1);
 
-if(! function_exists('q')) { 
-function q($sql) {
+if(! function_exists('q')) {
+	function q($sql) {
 
-	global $db;
-	$args = func_get_args();
-	unset($args[0]);
+		global $db;
+		$args = func_get_args();
+		unset($args[0]);
+
+		if($db && $db->connected) {
+			$stmt = vsprintf($sql,$args);
+			if($stmt === false)
+				logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
+			return $db->q($stmt);
+		}
+
+		/**
+		 *
+		 * This will happen occasionally trying to store the
+		 * session data after abnormal program termination
+		 *
+		 */
+		logger('dba: no database: ' . print_r($args,true));
+		return false;
 
-	if($db && $db->connected) {
-		$stmt = vsprintf($sql,$args);
-		if($stmt === false)
-			logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
-		return $db->q($stmt);
 	}
-
-	/**
-	 *
-	 * This will happen occasionally trying to store the 
-	 * session data after abnormal program termination 
-	 *
-	 */
-	logger('dba: no database: ' . print_r($args,true));
-	return false; 
-
-}}
+}
 
 /**
  *
@@ -230,36 +287,39 @@ function q($sql) {
  *
  */
 
-if(! function_exists('dbq')) { 
-function dbq($sql) {
+if(! function_exists('dbq')) {
+	function dbq($sql) {
 
-	global $db;
-	if($db && $db->connected)
-		$ret = $db->q($sql);
-	else
-		$ret = false;
-	return $ret;
-}}
+		global $db;
+		if($db && $db->connected)
+			$ret = $db->q($sql);
+		else
+			$ret = false;
+		return $ret;
+	}
+}
 
 
-// Caller is responsible for ensuring that any integer arguments to 
+// Caller is responsible for ensuring that any integer arguments to
 // dbesc_array are actually integers and not malformed strings containing
-// SQL injection vectors. All integer array elements should be specifically 
-// cast to int to avoid trouble. 
+// SQL injection vectors. All integer array elements should be specifically
+// cast to int to avoid trouble.
 
 
 if(! function_exists('dbesc_array_cb')) {
-function dbesc_array_cb(&$item, $key) {
-	if(is_string($item))
-		$item = dbesc($item);
-}}
+	function dbesc_array_cb(&$item, $key) {
+		if(is_string($item))
+			$item = dbesc($item);
+	}
+}
 
 
 if(! function_exists('dbesc_array')) {
-function dbesc_array(&$arr) {
-	if(is_array($arr) && count($arr)) {
-		array_walk($arr,'dbesc_array_cb');
+	function dbesc_array(&$arr) {
+		if(is_array($arr) && count($arr)) {
+			array_walk($arr,'dbesc_array_cb');
+		}
 	}
-}}		
+}
 
 
diff --git a/index.php b/index.php
index 1cb16778a6..0cf74365c6 100644
--- a/index.php
+++ b/index.php
@@ -11,6 +11,7 @@
  * bootstrap the application
  *
  */
+try {
 
 require_once('boot.php');
 
@@ -370,3 +371,9 @@ else
 
 session_write_close();
 exit;
+} catch(Exception $ex) {
+// it may fail because logger uses the db, 
+// but give it a try: 
+logger('exception caught at index.php: '.$ex->getMessage()); 
+system_unavailable(); 
+}
\ No newline at end of file
diff --git a/view/de/strings.php b/view/de/strings.php
index 28567396bb..5339d8a12b 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -1511,3 +1511,4 @@ $a->strings["[today]"] = "[heute]";
 $a->strings["Event Reminders"] = "Veranstaltungserinnerungen";
 $a->strings["Events this week:"] = "Veranstaltungen diese Woche";
 $a->strings["[No description]"] = "[keine Beschreibung]";
+$a->strings['Update Error at %s'] = 'Fehler beim Updaten von %s'; 
diff --git a/view/de/update_fail_eml.tpl b/view/de/update_fail_eml.tpl
new file mode 100644
index 0000000000..26be1786fc
--- /dev/null
+++ b/view/de/update_fail_eml.tpl
@@ -0,0 +1,12 @@
+Hey, 
+Ich bin's,  $sitename.   
+Die Friendica-Entwickler haben gerade Update $update freigegeben, 
+aber als ich es installieren wollte, ist irgendetwas schief gegangen.  
+Das sollte schnell repariert werden und alleine schaffe ich es nicht. 
+Wende dich bitte an einen Friendica-Entwickler, wenn du mir nicht selbst helfen kannst. 
+Meine Datenbank könnte ziemlich durcheinander sein. 
+
+Die Fehlermeldung ist '$error'.   
+
+Tut mir leid, 
+dein Friendica Server unter $siteurl
\ No newline at end of file
diff --git a/view/update_fail_eml.tpl b/view/update_fail_eml.tpl
new file mode 100644
index 0000000000..f68a3dece1
--- /dev/null
+++ b/view/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Hey, 
+I'm $sitename.   
+The friendica developers released update $update recently, 
+but when I tried to install it, something went terribly wrong.  
+This needs to be fixed soon and I can't do it alone. Please contact a 
+friendica developer if you can not help me on your own. My database might be invalid. 
+
+The error message is '$error'.   
+
+I'm sorry, 
+your friendica server at $siteurl
\ No newline at end of file

From 7ac4b83c39d841c80c39ca034971aaaa4bdf0e59 Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Mon, 9 Apr 2012 14:04:49 +0200
Subject: [PATCH 2/7] made exceptions from the db optional set address for
 updae mails correctly

---
 boot.php        | 1775 ++++++++++++++++++++++++-----------------------
 include/dba.php |   32 +-
 index.php       |    7 -
 3 files changed, 930 insertions(+), 884 deletions(-)

diff --git a/boot.php b/boot.php
index c21cefa184..56476be0b9 100644
--- a/boot.php
+++ b/boot.php
@@ -20,14 +20,14 @@ define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 /**
  *
  * Image storage quality. Lower numbers save space at cost of image detail.
- * For ease of upgrade, please do not change here. Change jpeg quality with 
- * $a->config['system']['jpeg_quality'] = n; 
- * in .htconfig.php, where n is netween 1 and 100, and with very poor results 
- * below about 50 
+ * For ease of upgrade, please do not change here. Change jpeg quality with
+ * $a->config['system']['jpeg_quality'] = n;
+ * in .htconfig.php, where n is netween 1 and 100, and with very poor results
+ * below about 50
  *
  */
 
-define ( 'JPEG_QUALITY',            100  );         
+define ( 'JPEG_QUALITY',            100  );
 
 /**
  * SSL redirection policies
@@ -68,7 +68,7 @@ define ( 'CONTACT_IS_FRIEND',   3);
 /**
  * Hook array order
  */
- 
+
 define ( 'HOOK_HOOK',      0);
 define ( 'HOOK_FILE',      1);
 define ( 'HOOK_FUNCTION',  2);
@@ -79,9 +79,9 @@ define ( 'HOOK_FUNCTION',  2);
  *
  * PAGE_NORMAL is a typical personal profile account
  * PAGE_SOAPBOX automatically approves all friend requests as CONTACT_IS_SHARING, (readonly)
- * PAGE_COMMUNITY automatically approves all friend requests as CONTACT_IS_SHARING, but with 
+ * PAGE_COMMUNITY automatically approves all friend requests as CONTACT_IS_SHARING, but with
  *      write access to wall and comments (no email and not included in page owner's ACL lists)
- * PAGE_FREELOVE automatically approves all friend requests as full friends (CONTACT_IS_FRIEND). 
+ * PAGE_FREELOVE automatically approves all friend requests as full friends (CONTACT_IS_FRIEND).
  *
  */
 
@@ -93,7 +93,7 @@ define ( 'PAGE_BLOG',              4 );
 define ( 'PAGE_PRVGROUP',          5 );
 
 /**
- * Network and protocol family types 
+ * Network and protocol family types
  */
 
 define ( 'NETWORK_DFRN',             'dfrn');    // Friendica, Mistpark, other DFRN implementations
@@ -103,31 +103,31 @@ define ( 'NETWORK_FEED',             'feed');    // RSS/Atom feeds with no known
 define ( 'NETWORK_DIASPORA',         'dspr');    // Diaspora
 define ( 'NETWORK_MAIL',             'mail');    // IMAP/POP
 define ( 'NETWORK_MAIL2',            'mai2');    // extended IMAP/POP
-define ( 'NETWORK_FACEBOOK',         'face');    // Facebook API     
+define ( 'NETWORK_FACEBOOK',         'face');    // Facebook API
 define ( 'NETWORK_LINKEDIN',         'lnkd');    // LinkedIn
-define ( 'NETWORK_XMPP',             'xmpp');    // XMPP     
+define ( 'NETWORK_XMPP',             'xmpp');    // XMPP
 define ( 'NETWORK_MYSPACE',          'mysp');    // MySpace
 define ( 'NETWORK_GPLUS',            'goog');    // Google+
 
 /*
  * These numbers are used in stored permissions
- * and existing allocations MUST NEVER BE CHANGED
- * OR RE-ASSIGNED! You may only add to them.
- */
+* and existing allocations MUST NEVER BE CHANGED
+* OR RE-ASSIGNED! You may only add to them.
+*/
 
 $netgroup_ids = array(
-	NETWORK_DFRN     => (-1),
-	NETWORK_ZOT      => (-2),
-	NETWORK_OSTATUS  => (-3),
-	NETWORK_FEED     => (-4),
-	NETWORK_DIASPORA => (-5),
-	NETWORK_MAIL     => (-6),
-	NETWORK_MAIL2    => (-7),
-	NETWORK_FACEBOOK => (-8),
-	NETWORK_LINKEDIN => (-9),
-	NETWORK_XMPP     => (-10),
-	NETWORK_MYSPACE  => (-11),
-	NETWORK_GPLUS    => (-12),
+		NETWORK_DFRN     => (-1),
+		NETWORK_ZOT      => (-2),
+		NETWORK_OSTATUS  => (-3),
+		NETWORK_FEED     => (-4),
+		NETWORK_DIASPORA => (-5),
+		NETWORK_MAIL     => (-6),
+		NETWORK_MAIL2    => (-7),
+		NETWORK_FACEBOOK => (-8),
+		NETWORK_LINKEDIN => (-9),
+		NETWORK_XMPP     => (-10),
+		NETWORK_MYSPACE  => (-11),
+		NETWORK_GPLUS    => (-12),
 );
 
 
@@ -166,7 +166,7 @@ define ( 'NOTIFY_SYSTEM',   0x8000 );
  */
 
 define ( 'NAMESPACE_ZOT',             'http://purl.org/macgirvin/zot' );
-define ( 'NAMESPACE_DFRN' ,           'http://purl.org/macgirvin/dfrn/1.0' ); 
+define ( 'NAMESPACE_DFRN' ,           'http://purl.org/macgirvin/dfrn/1.0' );
 define ( 'NAMESPACE_THREAD' ,         'http://purl.org/syndication/thread/1.0' );
 define ( 'NAMESPACE_TOMB' ,           'http://purl.org/atompub/tombstones/1.0' );
 define ( 'NAMESPACE_ACTIVITY',        'http://activitystrea.ms/spec/1.0/' );
@@ -232,19 +232,19 @@ function startup() {
 
 
 	if (get_magic_quotes_gpc()) {
-    	$process = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
-	    while (list($key, $val) = each($process)) {
-    	    foreach ($val as $k => $v) {
-        	    unset($process[$key][$k]);
-            	if (is_array($v)) {
-                	$process[$key][stripslashes($k)] = $v;
-	                $process[] = &$process[$key][stripslashes($k)];
-    	        } else {
-        	        $process[$key][stripslashes($k)] = stripslashes($v);
-            	}
-	        }
-    	}
-	    unset($process);
+		$process = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
+		while (list($key, $val) = each($process)) {
+			foreach ($val as $k => $v) {
+				unset($process[$key][$k]);
+				if (is_array($v)) {
+					$process[$key][stripslashes($k)] = $v;
+					$process[] = &$process[$key][stripslashes($k)];
+				} else {
+					$process[$key][stripslashes($k)] = stripslashes($v);
+				}
+			}
+		}
+		unset($process);
 	}
 
 }
@@ -255,186 +255,186 @@ function startup() {
  *
  * Our main application structure for the life of this page
  * Primarily deals with the URL that got us here
- * and tries to make some sense of it, and 
+ * and tries to make some sense of it, and
  * stores our page contents and config storage
- * and anything else that might need to be passed around 
- * before we spit the page out. 
+ * and anything else that might need to be passed around
+ * before we spit the page out.
  *
  */
 
 if(! class_exists('App')) {
-class App {
+	class App {
 
-	public  $module_loaded = false;
-	public  $query_string;
-	public  $config;
-	public  $page;
-	public  $profile;
-	public  $user;
-	public  $cid;
-	public  $contact;
-	public  $contacts;
-	public  $page_contact;
-	public  $content;
-	public  $data = array();
-	public  $error = false;
-	public  $cmd;
-	public  $argv;
-	public  $argc;
-	public  $module;
-	public  $pager;
-	public  $strings;   
-	public  $path;
-	public  $hooks;
-	public  $timezone;
-	public  $interactive = true;
-	public  $plugins;
-	public  $apps = array();
-	public  $identities;
-	
-	public $nav_sel;
+		public  $module_loaded = false;
+		public  $query_string;
+		public  $config;
+		public  $page;
+		public  $profile;
+		public  $user;
+		public  $cid;
+		public  $contact;
+		public  $contacts;
+		public  $page_contact;
+		public  $content;
+		public  $data = array();
+		public  $error = false;
+		public  $cmd;
+		public  $argv;
+		public  $argc;
+		public  $module;
+		public  $pager;
+		public  $strings;
+		public  $path;
+		public  $hooks;
+		public  $timezone;
+		public  $interactive = true;
+		public  $plugins;
+		public  $apps = array();
+		public  $identities;
 
-	public $category;
+		public $nav_sel;
 
-	private $scheme;
-	private $hostname;
-	private $baseurl;
-	private $db;
+		public $category;
 
-	private $curl_code;
-	private $curl_headers;
+		private $scheme;
+		private $hostname;
+		private $baseurl;
+		private $db;
 
-	function __construct() {
+		private $curl_code;
+		private $curl_headers;
 
-		$this->config = array();
-		$this->page = array();
-		$this->pager= array();
+		function __construct() {
 
-		$this->query_string = '';
+			$this->config = array();
+			$this->page = array();
+			$this->pager= array();
 
-		startup();
+			$this->query_string = '';
 
-		$this->scheme = 'http';
-		if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
-			$this->scheme = 'https';
-		elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) 
+			startup();
+
+			$this->scheme = 'http';
+			if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
+				$this->scheme = 'https';
+			elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
 			$this->scheme = 'https';
 
 
-		if(x($_SERVER,'SERVER_NAME')) {
-			$this->hostname = $_SERVER['SERVER_NAME'];
-			if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
-				$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
-			/** 
-			 * Figure out if we are running at the top of a domain
-			 * or in a sub-directory and adjust accordingly
+			if(x($_SERVER,'SERVER_NAME')) {
+				$this->hostname = $_SERVER['SERVER_NAME'];
+				if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
+					$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
+				/**
+				 * Figure out if we are running at the top of a domain
+				 * or in a sub-directory and adjust accordingly
+				 */
+
+				$path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
+				if(isset($path) && strlen($path) && ($path != $this->path))
+					$this->path = $path;
+			}
+
+			set_include_path(
+					"include/$this->hostname" . PATH_SEPARATOR
+					. 'include' . PATH_SEPARATOR
+					. 'library' . PATH_SEPARATOR
+					. 'library/phpsec' . PATH_SEPARATOR
+					. '.' );
+
+			if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
+				$this->query_string = substr($_SERVER['QUERY_STRING'],2);
+				// removing trailing / - maybe a nginx problem
+				if (substr($this->query_string, 0, 1) == "/")
+					$this->query_string = substr($this->query_string, 1);
+			}
+			if(x($_GET,'q'))
+				$this->cmd = trim($_GET['q'],'/\\');
+
+			// unix style "homedir"
+
+			if(substr($this->cmd,0,1) === '~')
+				$this->cmd = 'profile/' . substr($this->cmd,1);
+
+			// Diaspora style profile url
+
+			if(substr($this->cmd,0,2) === 'u/')
+				$this->cmd = 'profile/' . substr($this->cmd,2);
+
+			/**
+			 *
+			 * Break the URL path into C style argc/argv style arguments for our
+			 * modules. Given "http://example.com/module/arg1/arg2", $this->argc
+			 * will be 3 (integer) and $this->argv will contain:
+			 *   [0] => 'module'
+			 *   [1] => 'arg1'
+			 *   [2] => 'arg2'
+			 *
+			 *
+			 * There will always be one argument. If provided a naked domain
+			 * URL, $this->argv[0] is set to "home".
+			 *
 			 */
 
-			$path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
-			if(isset($path) && strlen($path) && ($path != $this->path))
-				$this->path = $path;
-		}
-
-		set_include_path(
-			"include/$this->hostname" . PATH_SEPARATOR 
-			. 'include' . PATH_SEPARATOR 
-			. 'library' . PATH_SEPARATOR 
-			. 'library/phpsec' . PATH_SEPARATOR 
-			. '.' );
-
-		if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
-			$this->query_string = substr($_SERVER['QUERY_STRING'],2);
-			// removing trailing / - maybe a nginx problem
-			if (substr($this->query_string, 0, 1) == "/")
-				$this->query_string = substr($this->query_string, 1);
-		}
-		if(x($_GET,'q'))
-			$this->cmd = trim($_GET['q'],'/\\');
-
-		// unix style "homedir"
-
-		if(substr($this->cmd,0,1) === '~')
-			$this->cmd = 'profile/' . substr($this->cmd,1);
-
-		// Diaspora style profile url
-
-		if(substr($this->cmd,0,2) === 'u/')
-			$this->cmd = 'profile/' . substr($this->cmd,2);
-
-		/**
-		 *
-		 * Break the URL path into C style argc/argv style arguments for our
-		 * modules. Given "http://example.com/module/arg1/arg2", $this->argc
-		 * will be 3 (integer) and $this->argv will contain:
-		 *   [0] => 'module'
-		 *   [1] => 'arg1'
-		 *   [2] => 'arg2'
-		 *
-		 *
-		 * There will always be one argument. If provided a naked domain
-		 * URL, $this->argv[0] is set to "home".
-		 *
-		 */
-
-		$this->argv = explode('/',$this->cmd);
-		$this->argc = count($this->argv);
-		if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
-			$this->module = str_replace(".", "_", $this->argv[0]);
-			if(array_key_exists('2',$this->argv)) {
-			    $this->category = $this->argv[2];
+			$this->argv = explode('/',$this->cmd);
+			$this->argc = count($this->argv);
+			if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
+				$this->module = str_replace(".", "_", $this->argv[0]);
+				if(array_key_exists('2',$this->argv)) {
+					$this->category = $this->argv[2];
+				}
 			}
-		}
-		else {
-			$this->argc = 1;
-			$this->argv = array('home');
-			$this->module = 'home';
+			else {
+				$this->argc = 1;
+				$this->argv = array('home');
+				$this->module = 'home';
+			}
+
+			/**
+			 * Special handling for the webfinger/lrdd host XRD file
+			 */
+
+			if($this->cmd === '.well-known/host-meta') {
+				$this->argc = 1;
+				$this->argv = array('hostxrd');
+				$this->module = 'hostxrd';
+			}
+
+			/**
+			 * See if there is any page number information, and initialise
+			 * pagination
+			 */
+
+			$this->pager['page'] = ((x($_GET,'page')) ? $_GET['page'] : 1);
+			$this->pager['itemspage'] = 50;
+			$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
+			$this->pager['total'] = 0;
 		}
 
-		/**
-		 * Special handling for the webfinger/lrdd host XRD file
-		 */
+		function get_baseurl($ssl = false) {
 
-		if($this->cmd === '.well-known/host-meta') {
-			$this->argc = 1;
-			$this->argv = array('hostxrd');
-			$this->module = 'hostxrd';
-		}
+			$scheme = $this->scheme;
 
-		/**
-		 * See if there is any page number information, and initialise 
-		 * pagination
-		 */
+			if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
+				if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
+					$scheme = 'https';
 
-		$this->pager['page'] = ((x($_GET,'page')) ? $_GET['page'] : 1);
-		$this->pager['itemspage'] = 50;
-		$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
-		$this->pager['total'] = 0;
-	}
+				//			We need to populate the $ssl flag across the entire program before turning this on.
+				//			Basically, we'll have $ssl = true on any links which can only be seen by a logged in user
+				//			(and also the login link). Anything seen by an outsider will have it turned off.
+				//			At present, setting SSL_POLICY_SELFSIGN will only force remote contacts to update their
+				//			contact links to this site with "http:" if they are currently using "https:"
 
-	function get_baseurl($ssl = false) {
+				//			if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
+				//				if($ssl)
+					//					$scheme = 'https';
+				//				else
+					//					$scheme = 'http';
+				//			}
+			}
 
-		$scheme = $this->scheme;
-
-		if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
-			if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) 
-				$scheme = 'https';
-
-//			We need to populate the $ssl flag across the entire program before turning this on.
-//			Basically, we'll have $ssl = true on any links which can only be seen by a logged in user
-//			(and also the login link). Anything seen by an outsider will have it turned off.
-//			At present, setting SSL_POLICY_SELFSIGN will only force remote contacts to update their 
-//			contact links to this site with "http:" if they are currently using "https:"
-
-//			if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
-//				if($ssl)
-//					$scheme = 'https';
-//				else
-//					$scheme = 'http';
-//			}
-		}
-
-		$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
-		return $this->baseurl;
+			$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
+			return $this->baseurl;
 	}
 
 	function set_baseurl($url) {
@@ -442,7 +442,7 @@ class App {
 
 		$this->baseurl = $url;
 
-		if($parsed) {		
+		if($parsed) {
 			$this->scheme = $parsed['scheme'];
 
 			$this->hostname = $parsed['host'];
@@ -464,7 +464,7 @@ class App {
 
 	function set_path($p) {
 		$this->path = trim(trim($p),'/');
-	} 
+	}
 
 	function get_path() {
 		return $this->path;
@@ -478,7 +478,7 @@ class App {
 		$this->pager['itemspage'] = intval($n);
 		$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
 
-	} 
+	}
 
 	function init_pagehead() {
 		$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
@@ -488,13 +488,13 @@ class App {
 		$this->page['title'] = $this->config['sitename'];
 		$tpl = file_get_contents('view/head.tpl');
 		$this->page['htmlhead'] = replace_macros($tpl,array(
-			'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
-			'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
-			'$delitem' => t('Delete this item?'),
-			'$comment' => t('Comment'),
-			'$showmore' => t('show more'),
-			'$showfewer' => t('show fewer'),
-			'$update_interval' => $interval
+				'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
+				'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
+				'$delitem' => t('Delete this item?'),
+				'$comment' => t('Comment'),
+				'$showmore' => t('show more'),
+				'$showfewer' => t('show fewer'),
+				'$update_interval' => $interval
 		));
 	}
 
@@ -515,16 +515,18 @@ class App {
 	}
 
 
-}}
+}
+}
 
 // retrieve the App structure
 // useful in functions which require it but don't get it passed to them
 
 if(! function_exists('get_app')) {
-function get_app() {
-	global $a;
-	return $a;
-}};
+	function get_app() {
+		global $a;
+		return $a;
+	}
+};
 
 
 // Multi-purpose function to check variable state.
@@ -534,42 +536,44 @@ function get_app() {
 // e.g. x('') or x(0) returns 0;
 
 if(! function_exists('x')) {
-function x($s,$k = NULL) {
-	if($k != NULL) {
-		if((is_array($s)) && (array_key_exists($k,$s))) {
-			if($s[$k])
-				return (int) 1;
-			return (int) 0;
-		}
-		return false;
-	}
-	else {		
-		if(isset($s)) {
-			if($s) {
-				return (int) 1;
+	function x($s,$k = NULL) {
+		if($k != NULL) {
+			if((is_array($s)) && (array_key_exists($k,$s))) {
+				if($s[$k])
+					return (int) 1;
+				return (int) 0;
 			}
-			return (int) 0;
+			return false;
+		}
+		else {
+			if(isset($s)) {
+				if($s) {
+					return (int) 1;
+				}
+				return (int) 0;
+			}
+			return false;
 		}
-		return false;
 	}
-}}
+}
 
 // called from db initialisation if db is dead.
 
 if(! function_exists('system_unavailable')) {
-function system_unavailable() {
-	include('system_unavailable.php');
-	system_down();
-	killme();
-}}
+	function system_unavailable() {
+		include('system_unavailable.php');
+		system_down();
+		killme();
+	}
+}
 
 
 
 function clean_urls() {
 	global $a;
-//	if($a->config['system']['clean_urls'])
-		return true;
-//	return false;
+	//	if($a->config['system']['clean_urls'])
+	return true;
+		//	return false;
 }
 
 function z_path() {
@@ -596,148 +600,150 @@ function is_ajax() {
 }
 
 
-// Primarily involved with database upgrade, but also sets the 
+// Primarily involved with database upgrade, but also sets the
 // base url for use in cmdline programs which don't have
 // $_SERVER variables, and synchronising the state of installed plugins.
 
 
 if(! function_exists('check_config')) {
-function check_config(&$a) {
+	function check_config(&$a) {
 
-	$build = get_config('system','build');
-	if(! x($build))
-		$build = set_config('system','build',DB_UPDATE_VERSION);
+		$build = get_config('system','build');
+		if(! x($build))
+			$build = set_config('system','build',DB_UPDATE_VERSION);
 
-	$url = get_config('system','url');
+		$url = get_config('system','url');
 
-	// if the url isn't set or the stored url is radically different 
-	// than the currently visited url, store the current value accordingly.
-	// "Radically different" ignores common variations such as http vs https 
-	// and www.example.com vs example.com.
+		// if the url isn't set or the stored url is radically different
+		// than the currently visited url, store the current value accordingly.
+		// "Radically different" ignores common variations such as http vs https
+		// and www.example.com vs example.com.
 
-	if((! x($url)) || (! link_compare($url,$a->get_baseurl())))
-		$url = set_config('system','url',$a->get_baseurl());
+		if((! x($url)) || (! link_compare($url,$a->get_baseurl())))
+			$url = set_config('system','url',$a->get_baseurl());
 
-	if($build != DB_UPDATE_VERSION) {
-		$stored = intval($build);
-		$current = intval(DB_UPDATE_VERSION);
-		if(($stored < $current) && file_exists('update.php')) {
+		if($build != DB_UPDATE_VERSION) {
+			$stored = intval($build);
+			$current = intval(DB_UPDATE_VERSION);
+			if(($stored < $current) && file_exists('update.php')) {
 
-			load_config('database');
+				load_config('database');
 
-			// We're reporting a different version than what is currently installed.
-			// Run any existing update scripts to bring the database up to current.
+				// We're reporting a different version than what is currently installed.
+				// Run any existing update scripts to bring the database up to current.
 
-			require_once('update.php');
+				require_once('update.php');
 
-			// make sure that boot.php and update.php are the same release, we might be
-			// updating right this very second and the correct version of the update.php
-			// file may not be here yet. This can happen on a very busy site.
+				// make sure that boot.php and update.php are the same release, we might be
+				// updating right this very second and the correct version of the update.php
+				// file may not be here yet. This can happen on a very busy site.
 
-			if(DB_UPDATE_VERSION == UPDATE_VERSION) {
+				if(DB_UPDATE_VERSION == UPDATE_VERSION) {
 
-				for($x = $stored; $x < $current; $x ++) {
-					if(function_exists('update_' . $x)) {
+					for($x = $stored; $x < $current; $x ++) {
+						if(function_exists('update_' . $x)) {
 
-						// There could be a lot of processes running or about to run.
-						// We want exactly one process to run the update command.
-						// So store the fact that we're taking responsibility
-						// after first checking to see if somebody else already has.
+							// There could be a lot of processes running or about to run.
+							// We want exactly one process to run the update command.
+							// So store the fact that we're taking responsibility
+							// after first checking to see if somebody else already has.
 
-						// If the update fails or times-out completely you may need to 
-						// delete the config entry to try again.
+							// If the update fails or times-out completely you may need to
+							// delete the config entry to try again.
 
-						if(get_config('database','update_' . $x))
-							break;
-						set_config('database','update_' . $x, '1');
+							if(get_config('database','update_' . $x))
+								break;
+							set_config('database','update_' . $x, '1');
 
-						// call the specific update
+							// call the specific update
 
-						global $db; 
-						try {
-						$db->beginTransaction();  
-						$func = 'update_' . $x;
-						$func($a);
-						$db->commit(); 
-						} catch(Exception $ex) {
-							$db->rollback(); 
-							//send the administrator an e-mail
-							$email_tpl = get_intltext_template("update_fail_eml.tpl");
-		$email_tpl = replace_macros($email_tpl, array(
-				'$sitename' => $a->config['sitename'],
-				'$siteurl' =>  $a->get_baseurl(),
-				'$update' => $x,
-				'$error' => $ex->getMessage());
-							$subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); 
-							
-							mail($email, $subject, $text, 
-				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
-				. 'Content-type: text/plain; charset=UTF-8' . "\n"
-				. 'Content-transfer-encoding: 8bit' );
-				//try the logger
-				logger('update failed: '.$ex->getMessage().EOL); 
+							global $db;
+							$db->excep(TRUE);
+							try {
+								$db->beginTransaction();
+								$func = 'update_' . $x;
+								$func($a);
+								$db->commit();
+							} catch(Exception $ex) {
+								$db->rollback();
+								//send the administrator an e-mail
+								$email_tpl = get_intltext_template("update_fail_eml.tpl");
+								$email_tpl = replace_macros($email_tpl, array(
+										'$sitename' => $a->config['sitename'],
+										'$siteurl' =>  $a->get_baseurl(),
+										'$update' => $x,
+										'$error' => $ex->getMessage());
+								$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
+									
+								mail($a->config['admin_email'], $subject, $text,
+										'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+										. 'Content-type: text/plain; charset=UTF-8' . "\n"
+										. 'Content-transfer-encoding: 8bit' );
+								//try the logger
+								logger('update failed: '.$ex->getMessage().EOL);
+							}
+							$db->excep(FALSE);
 						}
-						
 					}
+					set_config('system','build', DB_UPDATE_VERSION);
 				}
-				set_config('system','build', DB_UPDATE_VERSION);
 			}
 		}
-	}
 
-	/**
-	 *
-	 * Synchronise plugins:
-	 *
-	 * $a->config['system']['addon'] contains a comma-separated list of names
-	 * of plugins/addons which are used on this system. 
-	 * Go through the database list of already installed addons, and if we have
-	 * an entry, but it isn't in the config list, call the uninstall procedure
-	 * and mark it uninstalled in the database (for now we'll remove it).
-	 * Then go through the config list and if we have a plugin that isn't installed,
-	 * call the install procedure and add it to the database.
-	 *
-	 */
+		/**
+		 *
+		 * Synchronise plugins:
+		 *
+		 * $a->config['system']['addon'] contains a comma-separated list of names
+		 * of plugins/addons which are used on this system.
+		 * Go through the database list of already installed addons, and if we have
+		 * an entry, but it isn't in the config list, call the uninstall procedure
+		 * and mark it uninstalled in the database (for now we'll remove it).
+		 * Then go through the config list and if we have a plugin that isn't installed,
+		 * call the install procedure and add it to the database.
+		 *
+		 */
 
-	$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-	if(count($r))
-		$installed = $r;
-	else
-		$installed = array();
+		$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
+		if(count($r))
+			$installed = $r;
+		else
+			$installed = array();
 
-	$plugins = get_config('system','addon');
-	$plugins_arr = array();
+		$plugins = get_config('system','addon');
+		$plugins_arr = array();
 
-	if($plugins)
-		$plugins_arr = explode(',',str_replace(' ', '',$plugins));
+		if($plugins)
+			$plugins_arr = explode(',',str_replace(' ', '',$plugins));
 
-	$a->plugins = $plugins_arr;
+		$a->plugins = $plugins_arr;
 
-	$installed_arr = array();
+		$installed_arr = array();
 
-	if(count($installed)) {
-		foreach($installed as $i) {
-			if(! in_array($i['name'],$plugins_arr)) {
-				uninstall_plugin($i['name']);
-			}
-			else
-				$installed_arr[] = $i['name'];
-		}
-	}
-
-	if(count($plugins_arr)) {
-		foreach($plugins_arr as $p) {
-			if(! in_array($p,$installed_arr)) {
-				install_plugin($p);
+		if(count($installed)) {
+			foreach($installed as $i) {
+				if(! in_array($i['name'],$plugins_arr)) {
+					uninstall_plugin($i['name']);
+				}
+				else
+					$installed_arr[] = $i['name'];
 			}
 		}
+
+		if(count($plugins_arr)) {
+			foreach($plugins_arr as $p) {
+				if(! in_array($p,$installed_arr)) {
+					install_plugin($p);
+				}
+			}
+		}
+
+
+		load_hooks();
+
+		return;
 	}
-
-
-	load_hooks();
-
-	return;
-}}
+}
 
 
 function get_guid($size=16) {
@@ -758,116 +764,124 @@ function get_guid($size=16) {
 // returns the complete html for inserting into the page
 
 if(! function_exists('login')) {
-function login($register = false, $hiddens=false) {
-	$a = get_app();
-	$o = "";
-	$reg = false;
-	if ($register) {
-		$reg = array(
-			'title' => t('Create a New Account'),
-			'desc' => t('Register')
-		);
+	function login($register = false, $hiddens=false) {
+		$a = get_app();
+		$o = "";
+		$reg = false;
+		if ($register) {
+			$reg = array(
+					'title' => t('Create a New Account'),
+					'desc' => t('Register')
+			);
+		}
+
+		$noid = get_config('system','no_openid');
+
+		$dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
+
+		if(local_user()) {
+			$tpl = get_markup_template("logout.tpl");
+		}
+		else {
+			$tpl = get_markup_template("login.tpl");
+			$_SESSION['return_url'] = $a->query_string;
+		}
+
+
+		$o .= replace_macros($tpl,array(
+
+				'$dest_url'     => $dest_url,
+				'$logout'       => t('Logout'),
+				'$login'        => t('Login'),
+
+				'$lname'	 	=> array('username', t('Nickname or Email address: ') , '', ''),
+				'$lpassword' 	=> array('password', t('Password: '), '', ''),
+
+				'$openid'		=> !$noid,
+				'$lopenid'      => array('openid_url', t('Or login using OpenID: '),'',''),
+
+				'$hiddens'      => $hiddens,
+
+				'$register'     => $reg,
+
+				'$lostpass'     => t('Forgot your password?'),
+				'$lostlink'     => t('Password Reset'),
+		));
+
+		call_hooks('login_hook',$o);
+
+		return $o;
 	}
+}
 
-	$noid = get_config('system','no_openid');
-	
-	$dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
-
-	if(local_user()) {
-		$tpl = get_markup_template("logout.tpl");
-	}
-	else {
-		$tpl = get_markup_template("login.tpl");
-		$_SESSION['return_url'] = $a->query_string;
-	}
-
-
-	$o .= replace_macros($tpl,array(
-
-		'$dest_url'     => $dest_url,
-		'$logout'       => t('Logout'),
-		'$login'        => t('Login'),
-		
-		'$lname'	 	=> array('username', t('Nickname or Email address: ') , '', ''),
-		'$lpassword' 	=> array('password', t('Password: '), '', ''),
-		
-		'$openid'		=> !$noid,
-		'$lopenid'      => array('openid_url', t('Or login using OpenID: '),'',''),
-		
-		'$hiddens'      => $hiddens,
-		
-		'$register'     => $reg,
-		
-		'$lostpass'     => t('Forgot your password?'),
-		'$lostlink'     => t('Password Reset'),
-	));
-
-	call_hooks('login_hook',$o);
-
-	return $o;
-}}
-
-// Used to end the current process, after saving session state. 
+// Used to end the current process, after saving session state.
 
 if(! function_exists('killme')) {
-function killme() {
-	session_write_close();
-	exit;
-}}
+	function killme() {
+		session_write_close();
+		exit;
+	}
+}
 
 // redirect to another URL and terminate this process.
 
 if(! function_exists('goaway')) {
-function goaway($s) {
-	header("Location: $s");
-	killme();
-}}
+	function goaway($s) {
+		header("Location: $s");
+		killme();
+	}
+}
 
 
 // Returns the uid of locally logged in user or false.
 
 if(! function_exists('local_user')) {
-function local_user() {
-	if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid')))
-		return intval($_SESSION['uid']);
-	return false;
-}}
+	function local_user() {
+		if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid')))
+			return intval($_SESSION['uid']);
+		return false;
+	}
+}
 
 // Returns contact id of authenticated site visitor or false
 
 if(! function_exists('remote_user')) {
-function remote_user() {
-	if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
-		return intval($_SESSION['visitor_id']);
-	return false;
-}}
+	function remote_user() {
+		if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
+			return intval($_SESSION['visitor_id']);
+		return false;
+	}
+}
 
 // contents of $s are displayed prominently on the page the next time
 // a page is loaded. Usually used for errors or alerts.
 
 if(! function_exists('notice')) {
-function notice($s) {
-	$a = get_app();
-	if(! x($_SESSION,'sysmsg'))	$_SESSION['sysmsg'] = array();
-	if($a->interactive)
-		$_SESSION['sysmsg'][] = $s;
-}}
+	function notice($s) {
+		$a = get_app();
+		if(! x($_SESSION,'sysmsg'))	$_SESSION['sysmsg'] = array();
+		if($a->interactive)
+			$_SESSION['sysmsg'][] = $s;
+	}
+}
 if(! function_exists('info')) {
-function info($s) {
-	$a = get_app();
-	if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
-	if($a->interactive)
-		$_SESSION['sysmsg_info'][] = $s;
-}}
+	function info($s) {
+		$a = get_app();
+		if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
+		if($a->interactive)
+			$_SESSION['sysmsg_info'][] = $s;
+	}
+}
 
 
 // wrapper around config to limit the text length of an incoming message
 
 if(! function_exists('get_max_import_size')) {
-function get_max_import_size() {
-	global $a;
-	return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 );
-}}
+	function get_max_import_size() {
+		global $a;
+		return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 );
+	}
+}
 
 
 
@@ -878,7 +892,7 @@ function get_max_import_size() {
  * @parameter string $nickname
  * @parameter int    $profile
  *
- * Summary: Loads a profile into the page sidebar. 
+ * Summary: Loads a profile into the page sidebar.
  * The function requires a writeable copy of the main App structure, and the nickname
  * of a registered local account.
  *
@@ -888,88 +902,89 @@ function get_max_import_size() {
  * by the owner.
  *
  * Profile information is placed in the App structure for later retrieval.
- * Honours the owner's chosen theme for display. 
+ * Honours the owner's chosen theme for display.
  *
  */
 
 if(! function_exists('profile_load')) {
-function profile_load(&$a, $nickname, $profile = 0) {
-	if(remote_user()) {
-		$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
-			intval($_SESSION['visitor_id']));
-		if(count($r))
-			$profile = $r[0]['profile-id'];
-	} 
+	function profile_load(&$a, $nickname, $profile = 0) {
+		if(remote_user()) {
+			$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
+					intval($_SESSION['visitor_id']));
+			if(count($r))
+				$profile = $r[0]['profile-id'];
+		}
 
-	$r = null;
-                          
-	if($profile) {
-		$profile_int = intval($profile);
-		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` 
-			left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
-			WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d and `contact`.`self` = 1 LIMIT 1",
-			dbesc($nickname),
-			intval($profile_int)
-		);
-	}
-	if((! $r) && (!  count($r))) {	
-		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` 
-			left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
-			WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1",
-			dbesc($nickname)
-		);
-	}
+		$r = null;
+
+		if($profile) {
+			$profile_int = intval($profile);
+			$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+					left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+					WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d and `contact`.`self` = 1 LIMIT 1",
+					dbesc($nickname),
+					intval($profile_int)
+			);
+		}
+		if((! $r) && (!  count($r))) {
+			$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+					left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+					WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1",
+					dbesc($nickname)
+			);
+		}
+
+		if(($r === false) || (! count($r))) {
+			notice( t('Requested profile is not available.') . EOL );
+			$a->error = 404;
+			return;
+		}
+
+		// fetch user tags if this isn't the default profile
+
+		if(! $r[0]['is-default']) {
+			$x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1",
+					intval($profile_uid)
+			);
+			if($x && count($x))
+				$r[0]['pub_keywords'] = $x[0]['pub_keywords'];
+		}
+
+		$a->profile = $r[0];
+
+
+		$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
+		$_SESSION['theme'] = $a->profile['theme'];
+
+		/**
+		 * load/reload current theme info
+		 */
+
+		$theme_info_file = "view/theme/".current_theme()."/theme.php";
+		if (file_exists($theme_info_file)){
+			require_once($theme_info_file);
+		}
+
+		if(! (x($a->page,'aside')))
+			$a->page['aside'] = '';
+
+		if(local_user() && local_user() == $a->profile['uid']) {
+			$a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
+					'$editprofile' => t('Edit profile'),
+					'$profid' => $a->profile['id']
+			));
+		}
+
+		$block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+
+		$a->page['aside'] .= profile_sidebar($a->profile, $block);
+
+		/*if(! $block)
+		 $a->page['aside'] .= contact_block();*/
 
-	if(($r === false) || (! count($r))) {
-		notice( t('Requested profile is not available.') . EOL );
-		$a->error = 404;
 		return;
 	}
-	
-	// fetch user tags if this isn't the default profile
-
-	if(! $r[0]['is-default']) {
-		$x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1",
-			intval($profile_uid)
-		);
-		if($x && count($x))
-			$r[0]['pub_keywords'] = $x[0]['pub_keywords'];
-	}
-
-	$a->profile = $r[0];
-
-
-	$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
-	$_SESSION['theme'] = $a->profile['theme'];
-
-	/**
-	 * load/reload current theme info
-	 */
-
-	$theme_info_file = "view/theme/".current_theme()."/theme.php";
-	if (file_exists($theme_info_file)){
-		require_once($theme_info_file);
-	}
-
-	if(! (x($a->page,'aside')))
-		$a->page['aside'] = '';
-
-	if(local_user() && local_user() == $a->profile['uid']) {
-		$a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
-			'$editprofile' => t('Edit profile'),
-			'$profid' => $a->profile['id']
-		));
-	}
-
-	$block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
-
-	$a->page['aside'] .= profile_sidebar($a->profile, $block);
-
-	/*if(! $block)
-		$a->page['aside'] .= contact_block();*/
-
-	return;
-}}
+}
 
 
 /**
@@ -989,478 +1004,488 @@ function profile_load(&$a, $nickname, $profile = 0) {
 
 
 if(! function_exists('profile_sidebar')) {
-function profile_sidebar($profile, $block = 0) {
+	function profile_sidebar($profile, $block = 0) {
 
-	$a = get_app();
+		$a = get_app();
 
-	$o = '';
-	$location = false;
-	$address = false;
-	$pdesc = true;
+		$o = '';
+		$location = false;
+		$address = false;
+		$pdesc = true;
 
-	if((! is_array($profile)) && (! count($profile)))
-		return $o;
+		if((! is_array($profile)) && (! count($profile)))
+			return $o;
 
-	$profile['picdate'] = urlencode($profile['picdate']);
+		$profile['picdate'] = urlencode($profile['picdate']);
 
-	call_hooks('profile_sidebar_enter', $profile);
+		call_hooks('profile_sidebar_enter', $profile);
 
-	
-	// don't show connect link to yourself
-	$connect = (($profile['uid'] != local_user()) ? t('Connect')  : False);
 
-	// don't show connect link to authenticated visitors either
+		// don't show connect link to yourself
+		$connect = (($profile['uid'] != local_user()) ? t('Connect')  : False);
 
-	if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
-		$connect = False; 
+		// don't show connect link to authenticated visitors either
 
-	if(get_my_url() && $profile['unkmail'])
-		$wallmessage = t('Message');
-	else
-		$wallmessage = false;
+		if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
+			$connect = False;
+
+		if(get_my_url() && $profile['unkmail'])
+			$wallmessage = t('Message');
+		else
+			$wallmessage = false;
 
 
 
-	// show edit profile to yourself
-	if ($profile['uid'] == local_user()) {
-		$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
-		
-		$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
-				local_user());
-		
-		$profile['menu'] = array(
-			'chg_photo' => t('Change profile photo'),
-			'cr_new' => t('Create New Profile'),
-			'entries' => array(),
-		);
-				
-		if(count($r)) {
+		// show edit profile to yourself
+		if ($profile['uid'] == local_user()) {
+			$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
+
+			$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
+					local_user());
+
+			$profile['menu'] = array(
+					'chg_photo' => t('Change profile photo'),
+					'cr_new' => t('Create New Profile'),
+					'entries' => array(),
+			);
+
+			if(count($r)) {
+
+				foreach($r as $rr) {
+					$profile['menu']['entries'][] = array(
+							'photo' => $rr['thumb'],
+							'id' => $rr['id'],
+							'alt' => t('Profile Image'),
+							'profile_name' => $rr['profile-name'],
+							'isdefault' => $rr['is-default'],
+							'visibile_to_everybody' =>  t('visible to everybody'),
+							'edit_visibility' => t('Edit visibility'),
+								
+					);
+				}
+
 
-			foreach($r as $rr) {
-				$profile['menu']['entries'][] = array(
-					'photo' => $rr['thumb'],
-					'id' => $rr['id'],
-					'alt' => t('Profile Image'),
-					'profile_name' => $rr['profile-name'],
-					'isdefault' => $rr['is-default'],
-					'visibile_to_everybody' =>  t('visible to everybody'),
-					'edit_visibility' => t('Edit visibility'),
-					
-				);
 			}
 
 
 		}
-		
-		
+
+
+
+
+		if((x($profile,'address') == 1)
+				|| (x($profile,'locality') == 1)
+				|| (x($profile,'region') == 1)
+				|| (x($profile,'postal-code') == 1)
+				|| (x($profile,'country-name') == 1))
+			$location = t('Location:');
+
+		$gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
+
+
+		$marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
+
+		$homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
+
+		if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
+			$location = $pdesc = $gender = $marital = $homepage = False;
+		}
+
+		$firstname = ((strpos($profile['name'],' '))
+				? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
+		$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
+
+		$diaspora = array(
+				'podloc' => $a->get_baseurl(),
+				'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
+				'nickname' => $profile['nickname'],
+				'fullname' => $profile['name'],
+				'firstname' => $firstname,
+				'lastname' => $lastname,
+				'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
+				'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
+				'photo50' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
+		);
+
+		if (!$block){
+			$contact_block = contact_block();
+		}
+
+
+		$tpl = get_markup_template('profile_vcard.tpl');
+
+		$o .= replace_macros($tpl, array(
+				'$profile' => $profile,
+				'$connect'  => $connect,
+				'$wallmessage' => $wallmessage,
+				'$location' => template_escape($location),
+				'$gender'   => $gender,
+				'$pdesc'	=> $pdesc,
+				'$marital'  => $marital,
+				'$homepage' => $homepage,
+				'$diaspora' => $diaspora,
+				'$contact_block' => $contact_block,
+		));
+
+
+		$arr = array('profile' => &$profile, 'entry' => &$o);
+
+		call_hooks('profile_sidebar', $arr);
+
+		return $o;
 	}
-
-
-
-	
-	if((x($profile,'address') == 1) 
-		|| (x($profile,'locality') == 1) 
-		|| (x($profile,'region') == 1) 
-		|| (x($profile,'postal-code') == 1) 
-		|| (x($profile,'country-name') == 1))
-		$location = t('Location:');
-
-	$gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
-
-
-	$marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
-
-	$homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
-
-	if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
-		$location = $pdesc = $gender = $marital = $homepage = False;
-	}
-
-	$firstname = ((strpos($profile['name'],' ')) 
-		? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
-	$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
-
-	$diaspora = array(
-		'podloc' => $a->get_baseurl(),
-		'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
-		'nickname' => $profile['nickname'],
-		'fullname' => $profile['name'],
-		'firstname' => $firstname,
-		'lastname' => $lastname,
-		'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
-		'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
-		'photo50' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
-	);
-
-	if (!$block){
-		$contact_block = contact_block();
-	}
-
-
-	$tpl = get_markup_template('profile_vcard.tpl');
-
-	$o .= replace_macros($tpl, array(
-		'$profile' => $profile,
-		'$connect'  => $connect,		
-		'$wallmessage' => $wallmessage,
-		'$location' => template_escape($location),
-		'$gender'   => $gender,
-		'$pdesc'	=> $pdesc,
-		'$marital'  => $marital,
-		'$homepage' => $homepage,
-		'$diaspora' => $diaspora,
-		'$contact_block' => $contact_block,
-	));
-
-
-	$arr = array('profile' => &$profile, 'entry' => &$o);
-
-	call_hooks('profile_sidebar', $arr);
-
-	return $o;
-}}
+}
 
 
 if(! function_exists('get_birthdays')) {
-function get_birthdays() {
+	function get_birthdays() {
 
-	$a = get_app();
-	$o = '';
+		$a = get_app();
+		$o = '';
 
-	if(! local_user())
-		return $o;
+		if(! local_user())
+			return $o;
 
-	$bd_format = t('g A l F d') ; // 8 AM Friday January 18
-	$bd_short = t('F d');
+		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
+		$bd_short = t('F d');
 
-	$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event` 
-		LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid` 
-		WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s' 
-		ORDER BY `start` ASC ",
-		intval(local_user()),
-		dbesc(datetime_convert('UTC','UTC','now + 6 days')),
-		dbesc(datetime_convert('UTC','UTC','now'))
-	);
+		$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
+				LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid`
+				WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
+				ORDER BY `start` ASC ",
+				intval(local_user()),
+				dbesc(datetime_convert('UTC','UTC','now + 6 days')),
+				dbesc(datetime_convert('UTC','UTC','now'))
+		);
 
-	if($r && count($r)) {
-		$total = 0;
-		$now = strtotime('now');
-		$cids = array();
+		if($r && count($r)) {
+			$total = 0;
+			$now = strtotime('now');
+			$cids = array();
 
-		$istoday = false;
-		foreach($r as $rr) {
-			if(strlen($rr['name']))
-				$total ++;
+			$istoday = false;
+			foreach($r as $rr) {
+				if(strlen($rr['name']))
+					$total ++;
 				if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
 					$istoday = true;
+			}
+			$classtoday = $istoday ? ' birthday-today ' : '';
+			if($total) {
+				$o .= '<div id="birthday-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>';
+				$o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>';
+				$o .= '<div id="birthday-title-end"></div>';
+
+				foreach($r as $rr) {
+					if(! strlen($rr['name']))
+						continue;
+
+					// avoid duplicates
+
+					if(in_array($rr['cid'],$cids))
+						continue;
+					$cids[] = $rr['cid'];
+
+					$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
+					$sparkle = '';
+					$url = $rr['url'];
+					if($rr['network'] === NETWORK_DFRN) {
+						$sparkle = " sparkle";
+						$url = $a->get_baseurl() . '/redir/'  . $rr['cid'];
+					}
+
+					$o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="birthday-link$sparkle" target="redir" href="'
+					. $url . '">' . $rr['name'] . '</a> '
+					. day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ?  ' ' . t('[today]') : '')
+					. '</div>' ;
+				}
+				$o .= '</div></div>';
+			}
 		}
-		$classtoday = $istoday ? ' birthday-today ' : '';
-		if($total) {
-			$o .= '<div id="birthday-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>'; 
-			$o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>'; 
-			$o .= '<div id="birthday-title-end"></div>';
+		return $o;
+	}
+}
+
+
+if(! function_exists('get_events')) {
+	function get_events() {
+
+		require_once('include/bbcode.php');
+
+		$a = get_app();
+		$o = '';
+
+		if(! local_user())
+			return $o;
+
+		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
+		$bd_short = t('F d');
+
+		$r = q("SELECT `event`.* FROM `event`
+				WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` > '%s'
+				ORDER BY `start` ASC ",
+				intval(local_user()),
+				dbesc(datetime_convert('UTC','UTC','now + 6 days')),
+				dbesc(datetime_convert('UTC','UTC','now - 1 days'))
+		);
+
+		if($r && count($r)) {
+			$now = strtotime('now');
+			$istoday = false;
+			foreach($r as $rr) {
+				if(strlen($rr['name']))
+					$total ++;
+
+				$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
+				if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
+					$istoday = true;
+			}
+			$classtoday = (($istoday) ? ' event-today ' : '');
+
+			$o .= '<div id="event-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'event-wrapper\'); >' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '</div>';
+			$o .= '<div id="event-wrapper" style="display: none;" ><div id="event-title">' . t('Events this week:') . '</div>';
+			$o .= '<div id="event-title-end"></div>';
 
 			foreach($r as $rr) {
-				if(! strlen($rr['name']))
-					continue;
 
-				// avoid duplicates
+				if($rr['adjust'])
+					$md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m\#\l\i\n\k\-j');
+				else
+					$md = datetime_convert('UTC','UTC',$rr['start'],'Y/m\#\l\i\n\k\-j');
 
-				if(in_array($rr['cid'],$cids))
-					continue;
-				$cids[] = $rr['cid'];
+				$title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
+				if(! $title)
+					$title = t('[No description]');
 
-				$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); 
-				$sparkle = '';
-				$url = $rr['url'];
-				if($rr['network'] === NETWORK_DFRN) {
-					$sparkle = " sparkle";
-					$url = $a->get_baseurl() . '/redir/'  . $rr['cid'];
-				}
-	
-				$o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="birthday-link$sparkle" target="redir" href="' 
-				. $url . '">' . $rr['name'] . '</a> ' 
-				. day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ?  ' ' . t('[today]') : '')
+				$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
+				$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
+
+				$o .= '<div class="event-list" id="event-' . $rr['eid'] . '"></a> <a href="events/' . $md . '">' . $title . '</a>'
+				. day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '')
 				. '</div>' ;
 			}
 			$o .= '</div></div>';
 		}
-	}
-	return $o;
-}}
 
-
-if(! function_exists('get_events')) {
-function get_events() {
-
-	require_once('include/bbcode.php');
-
-	$a = get_app();
-	$o = '';
-
-	if(! local_user())
 		return $o;
-
-	$bd_format = t('g A l F d') ; // 8 AM Friday January 18
-	$bd_short = t('F d');
-
-	$r = q("SELECT `event`.* FROM `event` 
-		WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` > '%s'
-		ORDER BY `start` ASC ",
-		intval(local_user()),
-		dbesc(datetime_convert('UTC','UTC','now + 6 days')),
-		dbesc(datetime_convert('UTC','UTC','now - 1 days'))
-	);
-
-	if($r && count($r)) {
-		$now = strtotime('now');
-		$istoday = false;
-		foreach($r as $rr) {
-			if(strlen($rr['name']))
-				$total ++;
-
-			$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
-			if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
-				$istoday = true;
-		}
-		$classtoday = (($istoday) ? ' event-today ' : '');
-
-		$o .= '<div id="event-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'event-wrapper\'); >' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '</div>'; 
-		$o .= '<div id="event-wrapper" style="display: none;" ><div id="event-title">' . t('Events this week:') . '</div>'; 
-		$o .= '<div id="event-title-end"></div>';
-
-		foreach($r as $rr) {
-
-			if($rr['adjust'])
-				$md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m\#\l\i\n\k\-j');
-			else
-				$md = datetime_convert('UTC','UTC',$rr['start'],'Y/m\#\l\i\n\k\-j');
-
-			$title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
-			if(! $title)
-				$title = t('[No description]');
-
-			$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
-			$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);	
-
-			$o .= '<div class="event-list" id="event-' . $rr['eid'] . '"></a> <a href="events/' . $md . '">' . $title . '</a>' 
-			. day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '')
-			. '</div>' ;
-		}
-		$o .= '</div></div>';
 	}
-
-	return $o;
-}}
+}
 
 
 /**
- * 
+ *
  * Wrap calls to proc_close(proc_open()) and call hook
  * so plugins can take part in process :)
- * 
+ *
  * args:
  * $cmd program to run
  *  next args are passed as $cmd command line
- * 
+ *
  * e.g.: proc_run("ls","-la","/tmp");
- * 
+ *
  * $cmd and string args are surrounded with ""
  */
 
 if(! function_exists('proc_run')) {
-function proc_run($cmd){
+	function proc_run($cmd){
 
-	$a = get_app();
+		$a = get_app();
 
-	$args = func_get_args();
-	$arr = array('args' => $args, 'run_cmd' => true);
+		$args = func_get_args();
+		$arr = array('args' => $args, 'run_cmd' => true);
 
-	call_hooks("proc_run", $arr);
-	if(! $arr['run_cmd'])
-		return;
+		call_hooks("proc_run", $arr);
+		if(! $arr['run_cmd'])
+			return;
 
-	if(count($args) && $args[0] === 'php')
-        $args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-	foreach ($args as $arg){
-		$arg = escapeshellarg($arg);
+		if(count($args) && $args[0] === 'php')
+			$args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+		foreach ($args as $arg){
+			$arg = escapeshellarg($arg);
+		}
+		$cmdline = implode($args," ");
+		proc_close(proc_open($cmdline." &",array(),$foo));
 	}
-	$cmdline = implode($args," ");
-	proc_close(proc_open($cmdline." &",array(),$foo));
-}}
+}
 
 if(! function_exists('current_theme')) {
-function current_theme(){
-	$app_base_themes = array('duepuntozero', 'loozah');
-	
-	$a = get_app();
-	
-	$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
-	$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
-	
-	if($theme_name && 
-		(file_exists('view/theme/' . $theme_name . '/style.css') ||
-		file_exists('view/theme/' . $theme_name . '/style.php')))
-		return($theme_name);
-	
-	foreach($app_base_themes as $t) {
-		if(file_exists('view/theme/' . $t . '/style.css')||
-		   file_exists('view/theme/' . $t . '/style.php'))
-			return($t);
-	}
-	
-	$fallback = glob('view/theme/*/style.[css|php]');
-	if(count($fallback))
-		return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
+	function current_theme(){
+		$app_base_themes = array('duepuntozero', 'loozah');
 
-}}
+		$a = get_app();
+
+		$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
+		$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
+
+		if($theme_name &&
+				(file_exists('view/theme/' . $theme_name . '/style.css') ||
+						file_exists('view/theme/' . $theme_name . '/style.php')))
+			return($theme_name);
+
+		foreach($app_base_themes as $t) {
+			if(file_exists('view/theme/' . $t . '/style.css')||
+		   file_exists('view/theme/' . $t . '/style.php'))
+				return($t);
+		}
+
+		$fallback = glob('view/theme/*/style.[css|php]');
+		if(count($fallback))
+			return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
+
+	}
+}
 
 /*
-* Return full URL to theme which is currently in effect.
+ * Return full URL to theme which is currently in effect.
 * Provide a sane default if nothing is chosen or the specified theme does not exist.
 */
 if(! function_exists('current_theme_url')) {
-function current_theme_url() {
-	global $a;
-	$t = current_theme();
-	if (file_exists('view/theme/' . $t . '/style.php'))
-		return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss');
-	return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
-}}
+	function current_theme_url() {
+		global $a;
+		$t = current_theme();
+		if (file_exists('view/theme/' . $t . '/style.php'))
+			return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss');
+		return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
+	}
+}
 
 if(! function_exists('feed_birthday')) {
-function feed_birthday($uid,$tz) {
+	function feed_birthday($uid,$tz) {
 
-	/**
-	 *
-	 * Determine the next birthday, but only if the birthday is published
-	 * in the default profile. We _could_ also look for a private profile that the
-	 * recipient can see, but somebody could get mad at us if they start getting
-	 * public birthday greetings when they haven't made this info public. 
-	 *
-	 * Assuming we are able to publish this info, we are then going to convert
-	 * the start time from the owner's timezone to UTC. 
-	 *
-	 * This will potentially solve the problem found with some social networks
-	 * where birthdays are converted to the viewer's timezone and salutations from
-	 * elsewhere in the world show up on the wrong day. We will convert it to the
-	 * viewer's timezone also, but first we are going to convert it from the birthday
-	 * person's timezone to GMT - so the viewer may find the birthday starting at
-	 * 6:00PM the day before, but that will correspond to midnight to the birthday person.
-	 *
-	 */
+		/**
+		 *
+		 * Determine the next birthday, but only if the birthday is published
+		 * in the default profile. We _could_ also look for a private profile that the
+		 * recipient can see, but somebody could get mad at us if they start getting
+		 * public birthday greetings when they haven't made this info public.
+		 *
+		 * Assuming we are able to publish this info, we are then going to convert
+		 * the start time from the owner's timezone to UTC.
+		 *
+		 * This will potentially solve the problem found with some social networks
+		 * where birthdays are converted to the viewer's timezone and salutations from
+		 * elsewhere in the world show up on the wrong day. We will convert it to the
+		 * viewer's timezone also, but first we are going to convert it from the birthday
+		 * person's timezone to GMT - so the viewer may find the birthday starting at
+		 * 6:00PM the day before, but that will correspond to midnight to the birthday person.
+		 *
+		 */
 
-	
-	$birthday = '';
 
-	if(! strlen($tz))
-		$tz = 'UTC';
+		$birthday = '';
 
-	$p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
-		intval($uid)
-	);
+		if(! strlen($tz))
+			$tz = 'UTC';
 
-	if($p && count($p)) {
-		$tmp_dob = substr($p[0]['dob'],5);
-		if(intval($tmp_dob)) {
-			$y = datetime_convert($tz,$tz,'now','Y');
-			$bd = $y . '-' . $tmp_dob . ' 00:00';
-			$t_dob = strtotime($bd);
-			$now = strtotime(datetime_convert($tz,$tz,'now'));
-			if($t_dob < $now)
-				$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
-			$birthday = datetime_convert($tz,'UTC',$bd,ATOM_TIME); 
+		$p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
+				intval($uid)
+		);
+
+		if($p && count($p)) {
+			$tmp_dob = substr($p[0]['dob'],5);
+			if(intval($tmp_dob)) {
+				$y = datetime_convert($tz,$tz,'now','Y');
+				$bd = $y . '-' . $tmp_dob . ' 00:00';
+				$t_dob = strtotime($bd);
+				$now = strtotime(datetime_convert($tz,$tz,'now'));
+				if($t_dob < $now)
+					$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
+				$birthday = datetime_convert($tz,'UTC',$bd,ATOM_TIME);
+			}
 		}
-	}
 
-	return $birthday;
-}}
+		return $birthday;
+	}
+}
 
 if(! function_exists('is_site_admin')) {
-function is_site_admin() {
-	$a = get_app();
-	if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
-		return true;
-	return false;
-}}
+	function is_site_admin() {
+		$a = get_app();
+		if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
+			return true;
+		return false;
+	}
+}
 
 
 if(! function_exists('load_contact_links')) {
-function load_contact_links($uid) {
+	function load_contact_links($uid) {
 
-	$a = get_app();
+		$a = get_app();
 
-	$ret = array();
+		$ret = array();
 
-	if(! $uid || x($a->contacts,'empty'))
-		return;
+		if(! $uid || x($a->contacts,'empty'))
+			return;
 
-	$r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
-			intval($uid)
-	);
-	if(count($r)) {
-		foreach($r as $rr){
-			$url = normalise_link($rr['url']);
-			$ret[$url] = $rr;
+		$r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
+				intval($uid)
+		);
+		if(count($r)) {
+			foreach($r as $rr){
+				$url = normalise_link($rr['url']);
+				$ret[$url] = $rr;
+			}
 		}
+		else
+			$ret['empty'] = true;
+		$a->contacts = $ret;
+		return;
 	}
-	else 
-		$ret['empty'] = true;	
-	$a->contacts = $ret;
-	return;		
-}}
+}
 
 if(! function_exists('profile_tabs')){
-function profile_tabs($a, $is_owner=False, $nickname=Null){
-	//echo "<pre>"; var_dump($a->user); killme();
-	
-	if (is_null($nickname))
-		$nickname  = $a->user['nickname'];
-		
-	if(x($_GET,'tab'))
-		$tab = notags(trim($_GET['tab']));
-	
-	$url = $a->get_baseurl() . '/profile/' . $nickname;
+	function profile_tabs($a, $is_owner=False, $nickname=Null){
+		//echo "<pre>"; var_dump($a->user); killme();
 
-	$tabs = array(
-		array(
-			'label'=>t('Status'),
-			'url' => $url,
-			'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
-		),
-		array(
-			'label' => t('Profile'),
-			'url' 	=> $url.'/?tab=profile',
-			'sel'	=> ((isset($tab) && $tab=='profile')?'active':''),
-		),
-		array(
-			'label' => t('Photos'),
-			'url'	=> $a->get_baseurl() . '/photos/' . $nickname,
-			'sel'	=> ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
-		),
-	);
-	
-	if ($is_owner){
+		if (is_null($nickname))
+			$nickname  = $a->user['nickname'];
+
+		if(x($_GET,'tab'))
+			$tab = notags(trim($_GET['tab']));
+
+		$url = $a->get_baseurl() . '/profile/' . $nickname;
+
+		$tabs = array(
+				array(
+						'label'=>t('Status'),
+						'url' => $url,
+						'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
+				),
+				array(
+						'label' => t('Profile'),
+						'url' 	=> $url.'/?tab=profile',
+						'sel'	=> ((isset($tab) && $tab=='profile')?'active':''),
+				),
+				array(
+						'label' => t('Photos'),
+						'url'	=> $a->get_baseurl() . '/photos/' . $nickname,
+						'sel'	=> ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
+				),
+		);
+
+		if ($is_owner){
 		 $tabs[] = array(
-			'label' => t('Events'),
-			'url'	=> $a->get_baseurl() . '/events',
-			'sel' 	=>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
-		);
-		$tabs[] = array(
-			'label' => t('Personal Notes'),
-			'url'	=> $a->get_baseurl() . '/notes',
-			'sel' 	=>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
-		);
+		 		'label' => t('Events'),
+		 		'url'	=> $a->get_baseurl() . '/events',
+		 		'sel' 	=>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
+		 );
+		 $tabs[] = array(
+		 		'label' => t('Personal Notes'),
+		 		'url'	=> $a->get_baseurl() . '/notes',
+		 		'sel' 	=>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
+		 );
+		}
+
+
+		$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
+		call_hooks('profile_tabs', $arr);
+
+		$tpl = get_markup_template('common_tabs.tpl');
+
+		return replace_macros($tpl,array('$tabs' => $arr['tabs']));
 	}
-
-
-	$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
-	call_hooks('profile_tabs', $arr);
-	
-	$tpl = get_markup_template('common_tabs.tpl');
-
-	return replace_macros($tpl,array('$tabs' => $arr['tabs']));
-}}	
+}
 
 function get_my_url() {
 	if(x($_SESSION,'my_url'))
@@ -1472,7 +1497,7 @@ function zrl($s) {
 	if(! strlen($s))
 		return $s;
 	if(! strpos($s,'/profile/'))
-		return $s;	
+		return $s;
 	$achar = strpos($s,'?') ? '&' : '?';
 	$mine = get_my_url();
 	if($mine and ! link_compare($mine,$s))
diff --git a/include/dba.php b/include/dba.php
index cbf5922a79..8a9d599c4a 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -21,6 +21,8 @@ if(! class_exists('dba')) {
 
 		private $debug = 0;
 		private $db;
+		private $exceptions; 
+		
 		public  $mysqli = true;
 		public  $connected = false;
 		public  $error = false;
@@ -68,6 +70,10 @@ if(! class_exists('dba')) {
 			}
 		}
 
+		public function excep($excep) {
+			$this->exceptions=$excep; 
+		}
+		
 		public function getdb() {
 			return $this->db;
 		}
@@ -75,7 +81,8 @@ if(! class_exists('dba')) {
 		public function q($sql) {
 
 			if((! $this->db) || (! $this->connected)) {
-				throw new RuntimeException(t("There is no db connection. "));
+				throwOrLog(new RuntimeException(t("There is no db connection. ")));
+				return;
 			}
 
 			if($this->mysqli) {
@@ -114,7 +121,8 @@ if(! class_exists('dba')) {
 				}
 				logger('dba: ' . $str );
 				if(FALSE===$result) {
-					throw new RuntimeException('dba: ' . $str);
+					throwOrLog(new RuntimeException('dba: ' . $str));
+					return; 
 				}
 			}
 				
@@ -155,6 +163,19 @@ if(! class_exists('dba')) {
 			}
 		}
 		
+		private function throwOrLog(Exception $ex) {
+			if($this->exceptions) {
+				throw $ex; 
+			} else {
+				logger('dba: '.$ex->getMessage()); 
+			}
+		}
+		
+		/**
+		 * starts a transaction. Transactions need to be finished with 
+		 * commit() or rollback(). Please mind that the db table engine may
+		 * not support this. 
+		 */
 		public function beginTransaction() {
 			if($this->mysqli) {
 				return $this->db->autocommit(false);
@@ -164,6 +185,10 @@ if(! class_exists('dba')) {
 			}
 		}
 		
+		/**
+		 * rollback a transaction. So, rollback anything that was done since the last call 
+		 * to beginTransaction(). 
+		 */
 		public function rollback() {
 			if($this->mysqli) {
 				return $this->db->rollback();
@@ -174,6 +199,9 @@ if(! class_exists('dba')) {
 			$this->stopTransaction(); 
 		}
 
+		/**
+		 * commit a transaction. So, write any query to the database. 
+		 */
 		public function commit() {
 			if($this->mysqli) {
 				return $this->db->commit();
diff --git a/index.php b/index.php
index 0cf74365c6..1cb16778a6 100644
--- a/index.php
+++ b/index.php
@@ -11,7 +11,6 @@
  * bootstrap the application
  *
  */
-try {
 
 require_once('boot.php');
 
@@ -371,9 +370,3 @@ else
 
 session_write_close();
 exit;
-} catch(Exception $ex) {
-// it may fail because logger uses the db, 
-// but give it a try: 
-logger('exception caught at index.php: '.$ex->getMessage()); 
-system_unavailable(); 
-}
\ No newline at end of file

From 7187516718639fe93a9fb8fa78960bce85c7eaca Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Mon, 9 Apr 2012 14:27:52 +0200
Subject: [PATCH 3/7] fixed some typos

---
 boot.php            | 2 +-
 include/dba.php     | 8 ++++----
 view/de/strings.php | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/boot.php b/boot.php
index 56476be0b9..eb2805f5fe 100644
--- a/boot.php
+++ b/boot.php
@@ -672,7 +672,7 @@ if(! function_exists('check_config')) {
 										'$sitename' => $a->config['sitename'],
 										'$siteurl' =>  $a->get_baseurl(),
 										'$update' => $x,
-										'$error' => $ex->getMessage());
+										'$error' => $ex->getMessage()));
 								$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
 									
 								mail($a->config['admin_email'], $subject, $text,
diff --git a/include/dba.php b/include/dba.php
index 8a9d599c4a..1421a703dc 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -54,10 +54,10 @@ if(! class_exists('dba')) {
 
 			if(class_exists('mysqli')) {
 				$this->db = new mysqli($server,$user,$pass,$db);
-				if(NULL === $this->db->connect_error()) {
+				if(NULL === $this->db->connect_error) {
 					$this->connected = true;
 				} else {
-					throw new RuntimeException($this->db->connect_error());
+					throw new RuntimeException($this->db->connect_error);
 				}
 			} else {
 				$this->mysqli = false;
@@ -81,7 +81,7 @@ if(! class_exists('dba')) {
 		public function q($sql) {
 
 			if((! $this->db) || (! $this->connected)) {
-				throwOrLog(new RuntimeException(t("There is no db connection. ")));
+				$this->throwOrLog(new RuntimeException(t("There is no db connection. ")));
 				return;
 			}
 
@@ -121,7 +121,7 @@ if(! class_exists('dba')) {
 				}
 				logger('dba: ' . $str );
 				if(FALSE===$result) {
-					throwOrLog(new RuntimeException('dba: ' . $str));
+					$this->throwOrLog(new RuntimeException('dba: ' . $str));
 					return; 
 				}
 			}
diff --git a/view/de/strings.php b/view/de/strings.php
index 5339d8a12b..59c939ca04 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -777,7 +777,7 @@ $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schl
 $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurĂźckgegeben.";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet.";
-$a->strings["Login failed."] = "Annmeldung fehlgeschlagen.";
+$a->strings["Login failed."] = "Anmeldung fehlgeschlagen.";
 $a->strings["Connect URL missing."] = "Connect-URL fehlt";
 $a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann.";
 $a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden.";

From c27c340de186631858763e630166d6fa24543e2f Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 9 Apr 2012 16:41:23 +0200
Subject: [PATCH 4/7] diabook-nav-icons with gradient

---
 view/theme/diabook/icons/contacts.png       | Bin 559 -> 735 bytes
 view/theme/diabook/icons/contacts3.png      | Bin 0 -> 559 bytes
 view/theme/diabook/icons/messages.png       | Bin 488 -> 773 bytes
 view/theme/diabook/icons/messages3.png      | Bin 0 -> 488 bytes
 view/theme/diabook/icons/notifications.png  | Bin 714 -> 1072 bytes
 view/theme/diabook/icons/notifications3.png | Bin 0 -> 714 bytes
 view/theme/diabook/icons/notify.png         | Bin 534 -> 931 bytes
 view/theme/diabook/icons/notify3.png        | Bin 0 -> 534 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 view/theme/diabook/icons/contacts3.png
 mode change 100755 => 100644 view/theme/diabook/icons/messages.png
 create mode 100644 view/theme/diabook/icons/messages3.png
 create mode 100755 view/theme/diabook/icons/notifications3.png
 create mode 100755 view/theme/diabook/icons/notify3.png

diff --git a/view/theme/diabook/icons/contacts.png b/view/theme/diabook/icons/contacts.png
index 8a3e69ec1f55d283e7e352b723e0b3ca66877b0e..f1c3649ef1bf4afb6ac8f7e645e42c7766b6d1eb 100644
GIT binary patch
delta 652
zcmV;70(1SZ1m6XaUw;G%4jUg20Cd{`00Li0L_t(I%k7oFYg17i#n1V^_tK`xGe|Jd
z!Hx<Rx(N;v3kt0`=vZ7T*(7s8kZvxmI%yY!&<+ZsLm@+dkg0>9e}SuupdCz`*rqQp
z_c-`co7mQZxb=+Rci!iI?|I*QA8@KfJgm6BzCM=E=U=DO>3>lGXfztD^?Lo@#Kgqc
zlY;&J!ph2uUnmr+0|Nsi&N-1p7>1LQmH<q4eYINcayFZtHM60eot-!1<KvZM!6Yq}
zN{vX8nGpb-bIRp%6J5{R+S>Wy;o<jY=1W2thSxVXHZBy4#hI?h`oWUA3+%^aX6)7h
zAe~O%C+R0XNPkiohPPK&SF=ZgPohjFbE|Kc^gORXGB`2{Nr>YZlGN?mIkz7R0JPg}
zF9?F3_ndQ?IF6$u!R@FWZ*FeZGDAZ*L;wN^aBF+}DF9Tf)vFLjo6V-ojDkQAl6>C}
z<^hzC9Jl4=<%ij9_7OmkfCSXHzF&lpI&&uXk;I_UD1RV%E(j87Y&IJ6Q4~G!4+HN-
zd!FrhVA8Q5M0-&{GS%AM4PZ$|`qi2w380Z^wOU`Mrl!;bUR+!}XJ&Wfc0B!~)5L+n
zfOGCer_*^JMNyvQO*5PIJnvHS9T-K?jHI{I)6<`OqNr3VB{O?M@~kBE&v7zxlC%xr
zjwH{_YJc6uOQljztXx=FC`x+foEz)T<uQ^ZCcbx`=RJ1Ly>!lvl5Ck-8NgDxTy~tB
zo7*Kh_&c$`>%d{D2SM;Ej^nZ<kd&Ey2!i06pFnX^Xy2~VBtIok0HAa3N~_iSX8&?E
mCY^hKWJTsqe;of`KLN)}7gU<y!XN+u002ovP6b4+LSTXr*gTa0

delta 474
zcmV<00VV$51+N5<Uw;Du5i&XXrG9?^00FN_L_t(I%k7oFYZPG^gr6sO3GoMrh<2tG
z45Sk*L<<WeB3j!h7Q2YGAV@l^L@RB+6N?lIqMeOJYC-=3TN^<uu~9@E3wOh2?=A_5
zU8Y&~<zv2?d52xtLjxxbODRjhb6^obeFNO6s_OG@iH8$Nhkxp8U?E9Vk}L!3z;b(T
zG#Z@(R)GD$i>j)gba`gREa*&<1t6-8tEd+`mmg2^7Py?`JTNMytZhr2WGp7t&K%%Y
z>-O*6M7>f<IXIPgSBue0{ZW!*>g?2v8wCJqRX17NaW&|?wm6XF=XQ#J0UP}&fQL=K
zXVk^?vH^zb>VHmky9eCwsXCElPJN$b-f_ukB3T9Q4yR-|n6S`Ub*_0jzVpqrKGk)d
zVNdB%^;(ka-MpJFkCHrAj{p~wtf(g&*8+Edmvvo#+!948<)-=oINT`Ql+clrB;VAl
zNd~}1dwEq=TU=O5IjcTOveawEBqT|D;FY=tJWaBw{!;*MCt0uS`nRQ&@9KQFUOS;v
zh_C9ih7dKtyCmm^4Jo@N?YY_qd}v5pj?=)GnSc2-Hp&MR>TziA$MOI12Oc55m1y+o
Qm;e9(07*qoM6N<$f;`~eZU6uP

diff --git a/view/theme/diabook/icons/contacts3.png b/view/theme/diabook/icons/contacts3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a3e69ec1f55d283e7e352b723e0b3ca66877b0e
GIT binary patch
literal 559
zcmV+~0?_@5P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyYz
z5i&XXrG9?^00FN_L_t(I%k7oFYZPG^gr6sO3GoMrh<2tG45Sk*L<<WeB3j!h7Q2YG
zAV@l^L@RB+6N?lIqMeOJYC-=3TN^<uu~9@E3wOh2?=A_5U8Y&~<zv2?d52xtLjxxb
zODRjhb6^obeFNO6s_OG@iH8$Nhw5u!AxTt{ECcJna(iwx8l3`Gfc?OWs;ZuJd1l5e
z=uDCYAgYb4s24hyA5ZcYxSZrXFe;_2ZA+YFEGE^?9N<>#_V3+9y;4d!IF)!;i_uH{
zQIcco?9_}K1psMPH(A?pHR!yyIFRJ$c8Y%i8~rGNhfTg`)W!6&0fy@8PIbEn-0!J6
zkz`JNpJd)~$!Q{41?~=~WH^|x&{=h^c{;xH&9pw%b)8{P=~4AslIz{Pn=X%%JXVhY
z7n7{0CmYuScYv35U4PsXMJeT``T#iGDBP6Lk&`6f)T>Dbz(#v{RaIMDSV}poK1#CG
zYsDlaNqgXxx&}N=vZ($5ZYNo<>-x8)l<(?%w_ZD;Q;4tXvxX2gz`G>ph7BpZCGEM|
x2YhHqTaMGfmzjV0G&afy6Y6nj@5k}~@dq9uzLjY7>6icj002ovPDHLkV1h8h?m++m

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png
old mode 100755
new mode 100644
index 38e11ef8885670e74bfaeff1ee789448837a8b6d..fb77caf0ee5dd2dbc117162b1ec57a38d6cf3517
GIT binary patch
delta 690
zcmV;j0!{ts1BC{VUw;G%4hIkPz&YXo00M<cL_t(I%k7oTY7{{fh0m?Jm3CqvGq2+d
z2reXum=MKG2$Comf;hU8C@w_ZNEZGeQ4<6Wf{3{B1@bPgI@3B`T|ZsdMY`iKAOyvo
zcUAPg=j*<w4m9w;nxg&v{a3wSZy5kYM2Lv~1T?PA^Zd0cihp7)&+}aXAR-bG`Ag_-
zQ50+3?RNJL4h}8?kY2C1)WVPZ<rC1IqA0F)yWKs`vTUx?>1^kDzV5xp?Ck6kfMdbO
zXNJS!&S*3m%*@PeXIVDKr7dBY7nr#k9t<~~^O!j~eVG(dN{x^R5CI5){K5i60?26e
zW7n2;v(xE3GJl2_N^8MYX@wLK8`D?b+3!D!2R=A8-I=~b1QLOOK#-P7fQYoc(%QGq
zR}ZqOsoQM0U)c&tM7VP9Xl)|33V|<2<yP<^%d+gkq%GrT=iG-7!j{(hDv?^PY<1LU
zYc0maN<>yd2w%MS%g#AA#++;WZE^r0gzz!OxJ*Q+lz&nyRaL3+m$I!aAdn^vsjlm7
z5pe*Wi6P$g-m_NvEJ*0kWT39=&ncz5AUXq)Z!yMgt@U*fDI__x)|PgB%@+Wk0k{L;
z9DpZ?*Z`0b(dlO9D}W6Uu0XH>;3I(h0H%oOYP%gf=crlnjZ*4iO6i`6EFRtx21+Rq
zQ9q^h4u1fYQhgCwPbm!mFn~oOib|=?lu}1T`T!0+X6E-=>s#LY$1%pGHcyRkV2mN9
z)cMBSn<0doO|OXwmY5k@>p@-DCt{2XthN5c%qua*rxVaNUmQXh7-P_Y2LSZM47FNj
zUJ;QKY>b(YF}{p3UY>wrOsGQ$H=1YqH#04qj4Lto9AkX`8z?4(Q^%O0hE@Onas2!G
Y2^xo<<{p=I8vp<R07*qoM6N<$g4TRQP5=M^

delta 403
zcmV;E0c`$-2IvEjUw;A|4i_zh<v3aZ00C%8L_t(I%k9-YYZXBl#qr<n9W-|NT&Yrs
zNmMkFBGDp<cw?znqIMQ)uEdv%pg{<dE}twa>a{r=hQUaT*kxd0=Q-#6cV>8o<!oeh
zlgZ>YZe%_~cS=^BebZwD)8Rug{0nr7je=cViFmz&cc*~9!+$O87A#^1n-Tv8-a^M=
zEtV9Q@dfuYzjgxntny5geG-;Z8CG$KN9b|&5AYiLKAC%Az^pXkb$r7!oX4f#!0Y!<
z@!m}KNbj3&=&^?RwBTN&*U-Iq=9B4by>C|WGl%~b3wVJ23O+#hqb<a{lk8Eu_RT7`
z@gm!rVg<KxP=B58L24`UtS7Tw@2*tPw|I<)xSaYp+A2O&@0-y|yx-Fm7ovAVyM4qK
zo~Dn7<0%1jxS0CgJatD6nK9<DT<|%E|Ga^A4O|r-HJ%#2hPi?zyvn6$+i3`na3{6V
xF`llvwMzvrkAZ4}=T6}1!uoOc<M{vM7mL1Yii~-kRSW<C002ovPDHLkV1i?R%R2x7

diff --git a/view/theme/diabook/icons/messages3.png b/view/theme/diabook/icons/messages3.png
new file mode 100644
index 0000000000000000000000000000000000000000..838231fce95643727f10c39c7830dd1b24c1908b
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb+
z4hk=N0B2_a00C%8L_t(I%k9-YYZXBl#qr<n9W-|NT&YrsNmMkFBGDp<cw?znqIMQ)
zuEdv%pg{<dE}twa>a{r=hQUaT*kxd0=Q-#6cV>8o<!oehlgZ>YZe%_~cS=^BebZwD
z)8Rug{0nr7je=cViFmz&cc*~9!!7I<EMf<n5&s6>LdRh(mK2xq1@|+*b^`dU@=TL`
z5|&aKR&j_&=yCNA@EZC)nR{WttTf?ue8V%G$EDxE>-SIb-c0sL@0)Juv4;7y;9jHG
z(7kx(lj&={Z&vX$hyN7|c!2#1K0x=QEyTN%>`}Y+%__F>BHNl`1-Effo$o<vEAgx+
zvt945RM5A0jEA_K`Z(GuK2-0U(Mr7E(-jw@cSE~<#1@{WkB8$a0d%;S`rSNrM-7=V
z=CEAwIfwtefp!gC6&^L78oq|Pf+f7lrD)q}2##<kwb3!2uDZ2L1uu_*YJ%rZ;OWBp
earWc*|Kk^nzH5q%d7V`N0000<MNUMnLSTY_IoqfJ

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 2709977406afc940f8e7a3376db1c6828aa2b151..f35c621dffd44edd71f8dfa05c138ca4d9c94059 100755
GIT binary patch
delta 991
zcmV<510ej$1+WN^Uw;G%4i+c^6R(*700Xc|L_t(I%e9qFXjE4e$A9;}_cAXtX){A2
z#)UzwAW}=9)LpIGjUS^ZQA%5wYLePrNp@Yk7g4$q3#J-~O_8*v8Dc=GO}n!~i*#eH
zprBD|B+1O1dGFn?E|M8yo7TAStj;~>{QvjdbI&~&UXqB0QhzF2Pe?Wb=Hgy?_eDrP
znzS1M&spw{6r}->%^f7`^Bs)mI~XsOZDF;frLrwFa6+=aVV8|;!z@E#R%}h`OapPL
zY=ctSdjCV{mC7~%;-t=Wm=#;YEJF>9T*|gP-ysI0io0H`asr53LXP_Z`<KA~Bn|w4
z{VgHKfw)%XM1NFq*Yh1>P)NF)#F>x*=bVWnMn{Tr)(<#T=;UN;jsYR~S6PIh(3)eQ
z(8)<Z;Lu1>&c+d=&N-6_8E9VK&@c8+2X^i+_FKo}SK1kFYZr%}JaYXi;Y%TC^L*Y0
zFq)s8qZ(v5*4ZV_SLWR})p`1*U~PU469VMvx8!RQAb-fP!6+VB%WY4xIn1#ms<>-9
zWeO14HqNwnaJIdJv)MLIj})cTDN|9!U2Dy;)01qrmfJ@0Ajq(xSqkS6)?r49(jjQ`
zJyB2zH!tp!52Z&>m}6H<Ms&AiM0c3u-J@6Rn-}-VhbrNw?~4M0wvnQA4oss8K0sUt
zmEZtWihrutoY9IkAAD<bD&bxdqZhr9CK#1)@5AqG&KTCDu`@=a0JOrXbXmK_HEKGg
z{k_Y!Q>8qt&hwk_*y}7?Mi0uTPam;2s=B$T>gHx2vuE_6oVAuMQnF`Zj$hM+nfJ$S
zr&hGb5w#|9b&g4`*<=hoUmuotq6!m6i7p5Iy?<ZX{Mcc6C#jPrb<(k3dFSw$%?m-l
z(PCX~f$~_d{KFV}tY%YXj>#r*Jz`j;<elXRKvL&Yb>3Z7DO#(g62!<fUX0fYRD!O~
zyQ^`XO8_{IsFZvyVz}9E`_9{J5O70Cx^>FYi9R`AJa5+_SSa_&s5orbWitE@kR-fb
z?thar#bKKRUM=^@nFAMWZzkk|b=*&5woM$9wdN4oea`Nd9%bja;VcKHK9NrvzCGvc
z8`9?|0T{#fE63%nrtb^e>G^yw1lx?JIQg-hYIeoa@upFH286)E@|UJHYthYtwHCOw
z%(q}P6ToF)dd0!A<BS#mVJ~ezWutda*;r`j8CzN@X4mJ>V*TZd9|xsd38YiHv|7yA
z59nGc=7&$8#rmrnx{fZuTc$r(Rz>U_-3{U;{kbAn`BC^Ue9D(4e*?;rx#=dkZ><0T
N002ovPDHLkV1iO)>m>jH

delta 630
zcmV-+0*U>w2+9SJUw;D%05&a6_8~w300K%$L_t(I%eB-`sLpv5$MM(wqZH-dqI>Vc
zlTfmll(M72h6yEEUYf|+O%}75EG-p9Hq%+SR@X*mF*GUaW@aa4x-|)-ERaGsA>nat
z&U5{GdelQX_3in6zvrCy@AI7V{T;rO4Rjtda|o-^j)(_e1AocP)fmEqh-kxL!@m-j
za49oKzXCei$t%WZ#ijNXj^ZqS!v}oqDChwkDq+JofnRV2zeYs6qqtSj863x39Kr6)
zT+{=)2)irhZRN}qqtz_MVYD$F5zny~C+oadSw_ou5_>CWx)_I>rT8BoOT|-675os+
zV<|Ql^dG#!&wn_FKPqkvmoXR-YdVTo;Sug)9e%`hT&<U%!SA(BN5p*ju48NE+%3kc
zW+?{hn$4HGQQV4%$Jl^vRl63pXXeK8-KyB7mD}!Ap?Tfr>-T*HtjNqIcvv^2V{JSv
z--_D5?_w-~-(Xp0F2`g1i=VJQB3{(<T&<neto7K5+kbdcxyy>R0R9VWu^}SvR};o@
zC^JXu>>b`k#Qn@1sfJD9N<`eNlC3S)0(c4|*kAh#xYkvI!LHJMsF(}2-(QTWCU^$_
zVKOuKMZ_H(#IcB&%gl+I1w)xR5fO7ZhJz7tCo}h9vKTYnLud!C;3oD&#IuI)2mD>z
zEfF!>@NX^0pV)+55ph+0=N-FIGh#7bc717Mjej?W*@o|B_2gnPdJdL>FPtC9%-6LJ
z^po3EtS)&k8*eBc?-kIUJKX2k9k1qn5!`M4f?Ex6tDl6yKEcD^Am;nnC#0a#=tRKk
QyZ`_I07*qoM6N<$g3OjV`2YX_

diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png
new file mode 100755
index 0000000000000000000000000000000000000000..2709977406afc940f8e7a3376db1c6828aa2b151
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY+
z05&a6_8~w300K%$L_t(I%eB-`sLpv5$MM(wqZH-dqI>VclTfmll(M72h6yEEUYf|+
zO%}75EG-p9Hq%+SR@X*mF*GUaW@aa4x-|)-ERaGsA>nat&U5{GdelQX_3in6zvrCy
z@AI7V{T;rO4Rjtda|o-^j)(_e1If(Q7{Y^yXv1K`zY>>lDKkgE0y^5sE5>KVrS=q#
z;w*l{2Yl=(=m8umVZ%6qUvLJ$Mnt=#xK+>@9LHN6!S2jl)C0N*yDR2x<;)bL)hxwf
zv@snK&#@OL>%3Q4M$2~+dn;$U7>Aps_#Yoj#Zycb{1DD#DK;1MAH2fPIEOzfZVZ<(
z7!hkaidW$g?qVH&#C2S)m!HA!wN6LGeEF_pYvtT6#;Rs12I`v4m%35hiipS9fNfQ~
z7Pe>R#`4{&*rk=*?o^?9-RA4}eFdz@%q4hOH>6{2JS^Xe+Q08&EP&r&S!OQBWBiMs
zus$MQ)bm`eoz<-M*ooVCQn|~DwE+GLYq23B?pG7WaVRrK>g*lfMa2Eg9I1v);7UZ?
ztCFoP)&h76BiLX23%J%*g2ArReW;iVwclTisU~;^|6wvS_eI1V9K^ARn9IzGngv6d
zIS~<aIEI4}aVInPVX_!A-9u;xuHYv2M8va(?+5%{+bt0>+wd*NpV)+55ph+0=N-FI
zGh#7bc717Mjej?W*@o|B_2gnPdJdL>FPtC9%-6LJ^po3EtS)&k8*eBc?-kIUJKX2k
w9k1qn5!`M4f?Ex6tDl6yKEcD^Am;nnC#0a#=tRKkyZ`_I07*qoM6N<$f|u(`K>z>%

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png
index 9b852d05b2007ecb7508f9de807f8b5be8a9412c..cf94ea7c54198881305edadf29c8d7d20d11a8a6 100755
GIT binary patch
delta 849
zcmV-X1Frm*1fvI#Uw;G%4jL?}%Os2d00SdQL_t(I%Z*hrPa8`R{$_744n|ml80j_W
zDHT#GH`GWJCrbW6q$o8yLxtoY5Q&Nd(L{QpOPWwbLP+4k3Q9>s%gd{h4jhmy;k#pJ
zcT)Jyob7X7PP)6%?CiHQv){}RraWh7X9S?4l&X84w+x_?Eq|rf+H2=r7eKnczAk0^
zsZ7~!x0ih14{EjAX0=*vl-czA{i|NDcW8`h2SM=Te}Oxl&PJ_PYt7EiuH-rq5h9{-
z82}z09xi*m-n+H6wa-(5FD@>278VwEwAS-EfQUFEQboJMnh+5&^Zni3-R|n@>h1(^
zr_<S3TwFZTT7S=vM{#p=(@N9y69Af-nR!#M*IVN@%zS@)d;2!`T;(~f)oQIWPyjH-
zTm(VzUl0V}(lj}R2p|F}yq@RH&&|!X&d<-606?Ffo)QrSp7vIfBo=_E1X!MAmLyFF
zDS-e&14%@br&a(8PEJmav|+APXRDiOl0c+{B?2(>^M69f&*L~AcuWL{jHK1~^=7~S
z@IhPVIs}b4PD=SK5Ljzp9v>fn0RU_5%OpvLhk_)#(4nefnd{nGyPPBm#EFmsNeSJp
zwXc}j0{|j=l><xul~J}>=aw}yS29B?L_gdhgYX;17@Yw(;y9j+O90CJH^%t-@$qqp
zHn@j@1%G6Ow~d0w4Q4JbLMEyAw`S(lIX6~O@|3fI{)KbyF95N%_QiPhl@!ju+8A@~
zoFMb}ch5&6>bi`>qt`pgK^7}K&-<pCxy#H~&bh`I%ZA2Ud+&+pD*)x3`)RFxJ?(T-
z>gpM!t3@OwqC;!#KRMo{x%Z*jY<>lRD2l#2=YL+8G83R@S|5raRbdzk5w(?4m($uP
z09!1?>CUQ4B5H?W_>|WuiZ+ZfM<O!OFMQu`DWyIEAm`j0W6VSoBBFcW_up=9ZGE0-
zn|phEJIuV3f#+#)d9xZ1JO2~Wz1DhndwY9#YNL;$XoHzs&bgHmpm7;WsY|W(yWG>?
zj!LHe{rx2o37C0voGk^wE3Ne*5w)Am=8r#`c>r*5a6kYmB2pKTkzq<i*F@9>kcMGc
bI!u27&NSxW-S~j-00000NkvXXu0mjfzgU+(

delta 449
zcmV;y0Y3ht2bKhoUw;A|4k!igj=G!x00EXsL_t(I%e|GMP6I&@hQB?Q6x&dNAp`+U
zP-prI)w}=+L5!+zau3j?zJ^V}kYX?xOcexKQwzmmODai2;A&>W=F+{Zpp4nM+nIlN
z|DE~Q5HaVR0ct=4XsQpe0A7F@un>`aRlbRU?gMS01Ei6)Cx5^I7>USxC9reu6v%*9
z@H-D;^FrPj=!wXE6xcb}1-d{z0Qdot!uo#Bk8_|eB7Gl_6n5%C!$lK4!4Yr_^ny7*
z)`6~K`~oYdSpZtJClPrQkty&HiKzpbVv*?Wx0Ta8l9WgMVoVEYJLgQIWz;FF5@09d
zuez@eP_tU6v44{CcIcdY^nOKb3N)-1|Ee+y?F85gd`jprK+^^tWh!=I1D^^ywk_*f
z8tgb-BmTf@@0U@L1G~T;@Tq=TtN~uF3Q83f0JkbUtU<-pYVf4whz7U>p0%MqfU^?t
z2{22Pia|y34@G1sA~(QQMH3BxMWT8-Qk9C)@g4YIB|0Y?tBmHRAVSv>y~uz&O+MG}
rqRoK|FP|He&HoYljXq6(^_VUJdNGgCC0!Vv00000NkvXXu0mjfLM+AG

diff --git a/view/theme/diabook/icons/notify3.png b/view/theme/diabook/icons/notify3.png
new file mode 100755
index 0000000000000000000000000000000000000000..9b852d05b2007ecb7508f9de807f8b5be8a9412c
GIT binary patch
literal 534
zcmV+x0_pvUP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyW2
z4k!igj=G!x00EXsL_t(I%e|GMP6I&@hQB?Q6x&dNAp`+UP-prI)w}=+L5!+zau3j?
zzJ^V}kYX?xOcexKQwzmmODai2;A&>W=F+{Zpp4nM+nIlN|DE~Q5HaVR0ct=4XsQpe
z0A7F@un>`aRlbRU?gMS01Ei6)C%^z0iO72;uygJd$beSxI}c*>Lf#nYiO78v*g4k)
zx<EYu_yLl_`hL!jbD%FGeIJk%cIrXHMH4;25pWFjf;m6dfv#fw0xPFk09v#s5qT4l
zDew@9sRNl}k?8HWmD4<ult=txObci`=S-qy)G4bHU?<|Qx~~pUvs$OIlJa)woO|?s
zMQjQ*tQP;OG79Yk*b00~=rBOj1|4N8c3}gb3Ocqe>scD?I9((Dz-sT8QIP|?z#j0a
zep##mUabmB6%_!tDm<(~#nfu>q~wSOxCEZHp+11K67UHyOO%R1Mez?sWGEsxz*R*P
z4S+?WdOA{-iqY{M_+KR_8>@`wrXWJs5xvNOJ54^<@1o6t3ooA=lg<AT`i(wKfAyFy
Y0eUfy&?Q|Mo&W#<07*qoM6N<$f+;4~8UO$Q

literal 0
HcmV?d00001


From 018727aa152884af70a1ad1064e380489e04fc99 Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Mon, 9 Apr 2012 16:56:01 +0200
Subject: [PATCH 5/7] source beautifarming to make review easier

---
 boot.php | 378 +++++++++++++++++++++++++++----------------------------
 1 file changed, 189 insertions(+), 189 deletions(-)

diff --git a/boot.php b/boot.php
index c3990c18b0..fc6d6da898 100644
--- a/boot.php
+++ b/boot.php
@@ -109,25 +109,25 @@ define ( 'NETWORK_XMPP',             'xmpp');    // XMPP
 define ( 'NETWORK_MYSPACE',          'mysp');    // MySpace
 define ( 'NETWORK_GPLUS',            'goog');    // Google+
 
-/*
+/**
  * These numbers are used in stored permissions
-* and existing allocations MUST NEVER BE CHANGED
-* OR RE-ASSIGNED! You may only add to them.
-*/
+ * and existing allocations MUST NEVER BE CHANGED
+ * OR RE-ASSIGNED! You may only add to them.
+ */
 
 $netgroup_ids = array(
-		NETWORK_DFRN     => (-1),
-		NETWORK_ZOT      => (-2),
-		NETWORK_OSTATUS  => (-3),
-		NETWORK_FEED     => (-4),
-		NETWORK_DIASPORA => (-5),
-		NETWORK_MAIL     => (-6),
-		NETWORK_MAIL2    => (-7),
-		NETWORK_FACEBOOK => (-8),
-		NETWORK_LINKEDIN => (-9),
-		NETWORK_XMPP     => (-10),
-		NETWORK_MYSPACE  => (-11),
-		NETWORK_GPLUS    => (-12),
+	NETWORK_DFRN     => (-1),
+	NETWORK_ZOT      => (-2),
+	NETWORK_OSTATUS  => (-3),
+	NETWORK_FEED     => (-4),
+	NETWORK_DIASPORA => (-5),
+	NETWORK_MAIL     => (-6),
+	NETWORK_MAIL2    => (-7),
+	NETWORK_FACEBOOK => (-8),
+	NETWORK_LINKEDIN => (-9),
+	NETWORK_XMPP     => (-10),
+	NETWORK_MYSPACE  => (-11),
+	NETWORK_GPLUS    => (-12),
 );
 
 
@@ -291,7 +291,7 @@ if(! class_exists('App')) {
 		public  $plugins;
 		public  $apps = array();
 		public  $identities;
-
+	
 		public $nav_sel;
 
 		public $category;
@@ -427,67 +427,67 @@ if(! class_exists('App')) {
 
 				//			if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
 				//				if($ssl)
-					//					$scheme = 'https';
+				//					$scheme = 'https';
 				//				else
-					//					$scheme = 'http';
-				//			}
-			}
-
-			$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
-			return $this->baseurl;
-	}
-
-	function set_baseurl($url) {
-		$parsed = @parse_url($url);
-
-		$this->baseurl = $url;
-
-		if($parsed) {
-			$this->scheme = $parsed['scheme'];
-
-			$this->hostname = $parsed['host'];
-			if(x($parsed,'port'))
-				$this->hostname .= ':' . $parsed['port'];
-			if(x($parsed,'path'))
-				$this->path = trim($parsed['path'],'\\/');
+				//					$scheme = 'http';
+					//			}
 		}
 
-	}
+				$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
+				return $this->baseurl;
+		}
 
-	function get_hostname() {
-		return $this->hostname;
-	}
+		function set_baseurl($url) {
+			$parsed = @parse_url($url);
 
-	function set_hostname($h) {
-		$this->hostname = $h;
-	}
+			$this->baseurl = $url;
 
-	function set_path($p) {
-		$this->path = trim(trim($p),'/');
-	}
+			if($parsed) {
+				$this->scheme = $parsed['scheme'];
 
-	function get_path() {
-		return $this->path;
-	}
+				$this->hostname = $parsed['host'];
+				if(x($parsed,'port'))
+					$this->hostname .= ':' . $parsed['port'];
+				if(x($parsed,'path'))
+					$this->path = trim($parsed['path'],'\\/');
+			}
 
-	function set_pager_total($n) {
-		$this->pager['total'] = intval($n);
-	}
+		}
 
-	function set_pager_itemspage($n) {
-		$this->pager['itemspage'] = intval($n);
-		$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
+		function get_hostname() {
+			return $this->hostname;
+		}
 
-	}
+		function set_hostname($h) {
+			$this->hostname = $h;
+		}
 
-	function init_pagehead() {
-		$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
-		if($interval < 10000)
-			$interval = 40000;
+		function set_path($p) {
+			$this->path = trim(trim($p),'/');
+		}
 
-		$this->page['title'] = $this->config['sitename'];
-		$tpl = file_get_contents('view/head.tpl');
-		$this->page['htmlhead'] = replace_macros($tpl,array(
+		function get_path() {
+			return $this->path;
+		}
+
+		function set_pager_total($n) {
+			$this->pager['total'] = intval($n);
+		}
+
+		function set_pager_itemspage($n) {
+			$this->pager['itemspage'] = intval($n);
+			$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
+
+		}
+
+		function init_pagehead() {
+			$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
+			if($interval < 10000)
+				$interval = 40000;
+
+			$this->page['title'] = $this->config['sitename'];
+			$tpl = file_get_contents('view/head.tpl');
+			$this->page['htmlhead'] = replace_macros($tpl,array(
 				'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
 				'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
 				'$delitem' => t('Delete this item?'),
@@ -495,27 +495,27 @@ if(! class_exists('App')) {
 				'$showmore' => t('show more'),
 				'$showfewer' => t('show fewer'),
 				'$update_interval' => $interval
-		));
+			));
+		}
+
+		function set_curl_code($code) {
+			$this->curl_code = $code;
+		}
+
+		function get_curl_code() {
+			return $this->curl_code;
+		}
+
+		function set_curl_headers($headers) {
+			$this->curl_headers = $headers;
+		}
+
+		function get_curl_headers() {
+			return $this->curl_headers;
+		}
+
+
 	}
-
-	function set_curl_code($code) {
-		$this->curl_code = $code;
-	}
-
-	function get_curl_code() {
-		return $this->curl_code;
-	}
-
-	function set_curl_headers($headers) {
-		$this->curl_headers = $headers;
-	}
-
-	function get_curl_headers() {
-		return $this->curl_headers;
-	}
-
-
-}
 }
 
 // retrieve the App structure
@@ -542,7 +542,7 @@ if(! function_exists('x')) {
 				if($s[$k])
 					return (int) 1;
 				return (int) 0;
-			}
+		}
 			return false;
 		}
 		else {
@@ -573,7 +573,7 @@ function clean_urls() {
 	global $a;
 	//	if($a->config['system']['clean_urls'])
 	return true;
-		//	return false;
+	//	return false;
 }
 
 function z_path() {
@@ -669,10 +669,10 @@ if(! function_exists('check_config')) {
 								//send the administrator an e-mail
 								$email_tpl = get_intltext_template("update_fail_eml.tpl");
 								$email_tpl = replace_macros($email_tpl, array(
-										'$sitename' => $a->config['sitename'],
-										'$siteurl' =>  $a->get_baseurl(),
-										'$update' => $x,
-										'$error' => $ex->getMessage()));
+									'$sitename' => $a->config['sitename'],
+									'$siteurl' =>  $a->get_baseurl(),
+									'$update' => $x,
+									'$error' => $ex->getMessage()));
 								$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
 									
 								mail($a->config['admin_email'], $subject, $text,
@@ -724,7 +724,7 @@ if(! function_exists('check_config')) {
 			foreach($installed as $i) {
 				if(! in_array($i['name'],$plugins_arr)) {
 					uninstall_plugin($i['name']);
-				}
+			}
 				else
 					$installed_arr[] = $i['name'];
 			}
@@ -770,13 +770,13 @@ if(! function_exists('login')) {
 		$reg = false;
 		if ($register) {
 			$reg = array(
-					'title' => t('Create a New Account'),
-					'desc' => t('Register')
+				'title' => t('Create a New Account'),
+				'desc' => t('Register')
 			);
 		}
 
 		$noid = get_config('system','no_openid');
-
+	
 		$dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
 
 		if(local_user()) {
@@ -790,22 +790,22 @@ if(! function_exists('login')) {
 
 		$o .= replace_macros($tpl,array(
 
-				'$dest_url'     => $dest_url,
-				'$logout'       => t('Logout'),
-				'$login'        => t('Login'),
-
-				'$lname'	 	=> array('username', t('Nickname or Email address: ') , '', ''),
-				'$lpassword' 	=> array('password', t('Password: '), '', ''),
-
-				'$openid'		=> !$noid,
-				'$lopenid'      => array('openid_url', t('Or login using OpenID: '),'',''),
-
-				'$hiddens'      => $hiddens,
-
-				'$register'     => $reg,
-
-				'$lostpass'     => t('Forgot your password?'),
-				'$lostlink'     => t('Password Reset'),
+			'$dest_url'     => $dest_url,
+			'$logout'       => t('Logout'),
+			'$login'        => t('Login'),
+	
+			'$lname'	 	=> array('username', t('Nickname or Email address: ') , '', ''),
+			'$lpassword' 	=> array('password', t('Password: '), '', ''),
+	
+			'$openid'		=> !$noid,
+			'$lopenid'      => array('openid_url', t('Or login using OpenID: '),'',''),
+	
+			'$hiddens'      => $hiddens,
+	
+			'$register'     => $reg,
+	
+			'$lostpass'     => t('Forgot your password?'),
+			'$lostlink'     => t('Password Reset'),
 		));
 
 		call_hooks('login_hook',$o);
@@ -916,7 +916,7 @@ if(! function_exists('profile_load')) {
 		}
 
 		$r = null;
-
+                          
 		if($profile) {
 			$profile_int = intval($profile);
 			$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
@@ -939,7 +939,7 @@ if(! function_exists('profile_load')) {
 			$a->error = 404;
 			return;
 		}
-
+	
 		// fetch user tags if this isn't the default profile
 
 		if(! $r[0]['is-default']) {
@@ -970,8 +970,8 @@ if(! function_exists('profile_load')) {
 
 		if(local_user() && local_user() == $a->profile['uid']) {
 			$a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
-					'$editprofile' => t('Edit profile'),
-					'$profid' => $a->profile['id']
+				'$editprofile' => t('Edit profile'),
+				'$profid' => $a->profile['id']
 			));
 		}
 
@@ -1020,7 +1020,7 @@ if(! function_exists('profile_sidebar')) {
 
 		call_hooks('profile_sidebar_enter', $profile);
 
-
+	
 		// don't show connect link to yourself
 		$connect = (($profile['uid'] != local_user()) ? t('Connect')  : False);
 
@@ -1039,28 +1039,28 @@ if(! function_exists('profile_sidebar')) {
 		// show edit profile to yourself
 		if ($profile['uid'] == local_user()) {
 			$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
-
+		
 			$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
 					local_user());
-
+		
 			$profile['menu'] = array(
-					'chg_photo' => t('Change profile photo'),
-					'cr_new' => t('Create New Profile'),
-					'entries' => array(),
+				'chg_photo' => t('Change profile photo'),
+				'cr_new' => t('Create New Profile'),
+				'entries' => array(),
 			);
 
 			if(count($r)) {
 
 				foreach($r as $rr) {
 					$profile['menu']['entries'][] = array(
-							'photo' => $rr['thumb'],
-							'id' => $rr['id'],
-							'alt' => t('Profile Image'),
-							'profile_name' => $rr['profile-name'],
-							'isdefault' => $rr['is-default'],
-							'visibile_to_everybody' =>  t('visible to everybody'),
-							'edit_visibility' => t('Edit visibility'),
-								
+						'photo' => $rr['thumb'],
+						'id' => $rr['id'],
+						'alt' => t('Profile Image'),
+						'profile_name' => $rr['profile-name'],
+						'isdefault' => $rr['is-default'],
+						'visibile_to_everybody' =>  t('visible to everybody'),
+						'edit_visibility' => t('Edit visibility'),
+
 					);
 				}
 
@@ -1072,7 +1072,7 @@ if(! function_exists('profile_sidebar')) {
 
 
 
-
+	
 		if((x($profile,'address') == 1)
 				|| (x($profile,'locality') == 1)
 				|| (x($profile,'region') == 1)
@@ -1096,15 +1096,15 @@ if(! function_exists('profile_sidebar')) {
 		$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
 
 		$diaspora = array(
-				'podloc' => $a->get_baseurl(),
-				'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
-				'nickname' => $profile['nickname'],
-				'fullname' => $profile['name'],
-				'firstname' => $firstname,
-				'lastname' => $lastname,
-				'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
-				'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
-				'photo50' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
+			'podloc' => $a->get_baseurl(),
+			'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
+			'nickname' => $profile['nickname'],
+			'fullname' => $profile['name'],
+			'firstname' => $firstname,
+			'lastname' => $lastname,
+			'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
+			'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
+			'photo50' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
 		);
 
 		if (!$block){
@@ -1115,16 +1115,16 @@ if(! function_exists('profile_sidebar')) {
 		$tpl = get_markup_template('profile_vcard.tpl');
 
 		$o .= replace_macros($tpl, array(
-				'$profile' => $profile,
-				'$connect'  => $connect,
-				'$wallmessage' => $wallmessage,
-				'$location' => template_escape($location),
-				'$gender'   => $gender,
-				'$pdesc'	=> $pdesc,
-				'$marital'  => $marital,
-				'$homepage' => $homepage,
-				'$diaspora' => $diaspora,
-				'$contact_block' => $contact_block,
+			'$profile' => $profile,
+			'$connect'  => $connect,
+			'$wallmessage' => $wallmessage,
+			'$location' => template_escape($location),
+			'$gender'   => $gender,
+			'$pdesc'	=> $pdesc,
+			'$marital'  => $marital,
+			'$homepage' => $homepage,
+			'$diaspora' => $diaspora,
+			'$contact_block' => $contact_block,
 		));
 
 
@@ -1193,7 +1193,7 @@ if(! function_exists('get_birthdays')) {
 						$sparkle = " sparkle";
 						$url = $a->get_baseurl() . '/redir/'  . $rr['cid'];
 					}
-
+	
 					$o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="birthday-link$sparkle" target="redir" href="'
 					. $url . '">' . $rr['name'] . '</a> '
 					. day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ?  ' ' . t('[today]') : '')
@@ -1311,27 +1311,27 @@ if(! function_exists('proc_run')) {
 if(! function_exists('current_theme')) {
 	function current_theme(){
 		$app_base_themes = array('duepuntozero', 'loozah');
-
+	
 		$a = get_app();
-
+	
 		$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
 		$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
-
+	
 		if($theme_name &&
 				(file_exists('view/theme/' . $theme_name . '/style.css') ||
 						file_exists('view/theme/' . $theme_name . '/style.php')))
 			return($theme_name);
-
+	
 		foreach($app_base_themes as $t) {
 			if(file_exists('view/theme/' . $t . '/style.css')||
-		   file_exists('view/theme/' . $t . '/style.php'))
+					file_exists('view/theme/' . $t . '/style.php'))
 				return($t);
 		}
-
+	
 		$fallback = glob('view/theme/*/style.[css|php]');
 		if(count($fallback))
 			return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
-
+	
 	}
 }
 
@@ -1371,7 +1371,7 @@ if(! function_exists('feed_birthday')) {
 		 *
 		 */
 
-
+	
 		$birthday = '';
 
 		if(! strlen($tz))
@@ -1437,50 +1437,50 @@ if(! function_exists('load_contact_links')) {
 if(! function_exists('profile_tabs')){
 	function profile_tabs($a, $is_owner=False, $nickname=Null){
 		//echo "<pre>"; var_dump($a->user); killme();
-
+	
 		if (is_null($nickname))
 			$nickname  = $a->user['nickname'];
-
+		
 		if(x($_GET,'tab'))
 			$tab = notags(trim($_GET['tab']));
-
+	
 		$url = $a->get_baseurl() . '/profile/' . $nickname;
 
 		$tabs = array(
-				array(
-						'label'=>t('Status'),
-						'url' => $url,
-						'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
-				),
-				array(
-						'label' => t('Profile'),
-						'url' 	=> $url.'/?tab=profile',
-						'sel'	=> ((isset($tab) && $tab=='profile')?'active':''),
-				),
-				array(
-						'label' => t('Photos'),
-						'url'	=> $a->get_baseurl() . '/photos/' . $nickname,
-						'sel'	=> ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
-				),
+			array(
+				'label'=>t('Status'),
+				'url' => $url,
+				'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
+			),
+			array(
+				'label' => t('Profile'),
+				'url' 	=> $url.'/?tab=profile',
+				'sel'	=> ((isset($tab) && $tab=='profile')?'active':''),
+			),
+			array(
+				'label' => t('Photos'),
+				'url'	=> $a->get_baseurl() . '/photos/' . $nickname,
+				'sel'	=> ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
+			),
 		);
-
+	
 		if ($is_owner){
-		 $tabs[] = array(
-		 		'label' => t('Events'),
-		 		'url'	=> $a->get_baseurl() . '/events',
-		 		'sel' 	=>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
-		 );
-		 $tabs[] = array(
-		 		'label' => t('Personal Notes'),
-		 		'url'	=> $a->get_baseurl() . '/notes',
-		 		'sel' 	=>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
-		 );
+			$tabs[] = array(
+				'label' => t('Events'),
+				'url'	=> $a->get_baseurl() . '/events',
+				'sel' 	=>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
+			);
+			$tabs[] = array(
+				'label' => t('Personal Notes'),
+				'url'	=> $a->get_baseurl() . '/notes',
+				'sel' 	=>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
+			);
 		}
 
 
 		$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
 		call_hooks('profile_tabs', $arr);
-
+	
 		$tpl = get_markup_template('common_tabs.tpl');
 
 		return replace_macros($tpl,array('$tabs' => $arr['tabs']));

From d25a9df99600b0ce204d88114f07f5ed1db9d5d3 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 9 Apr 2012 19:56:53 +0200
Subject: [PATCH 6/7] diabook-themes: small icon fix

---
 view/theme/diabook-aerith/icons/contacts.png   | Bin 568 -> 803 bytes
 view/theme/diabook-aerith/icons/contacts3.png  | Bin 0 -> 568 bytes
 view/theme/diabook-aerith/icons/messages.png   | Bin 579 -> 901 bytes
 view/theme/diabook-aerith/icons/messages3.png  | Bin 0 -> 579 bytes
 .../diabook-aerith/icons/notifications.png     | Bin 754 -> 1033 bytes
 .../diabook-aerith/icons/notifications3.png    | Bin 0 -> 754 bytes
 view/theme/diabook-aerith/icons/notify.png     | Bin 795 -> 1100 bytes
 view/theme/diabook-aerith/icons/notify3.png    | Bin 0 -> 795 bytes
 view/theme/diabook/icons/contacts.png          | Bin 735 -> 773 bytes
 view/theme/diabook/icons/messages.png          | Bin 773 -> 777 bytes
 view/theme/diabook/icons/messages3.png         | Bin 488 -> 488 bytes
 view/theme/diabook/icons/notifications.png     | Bin 1072 -> 926 bytes
 view/theme/diabook/icons/notifications3.png    | Bin 714 -> 714 bytes
 view/theme/diabook/icons/notify.png            | Bin 931 -> 1001 bytes
 14 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 view/theme/diabook-aerith/icons/contacts3.png
 create mode 100755 view/theme/diabook-aerith/icons/messages3.png
 create mode 100755 view/theme/diabook-aerith/icons/notifications3.png
 create mode 100755 view/theme/diabook-aerith/icons/notify3.png

diff --git a/view/theme/diabook-aerith/icons/contacts.png b/view/theme/diabook-aerith/icons/contacts.png
index cd0e289a772f5a6f90f1774e7ee77d300b72976f..79f6d497cbe50e41faabac3748eb1e9e45a8e0af 100644
GIT binary patch
delta 720
zcmV;>0x$iz1fvF!Uw;G%5fwMHOcmk)00N^)L_t(I%k7oDi<MUp#-Ew@eecKaUb4}+
zU2Fp`u@gjsA*P6uh$bKb1tTGiSr8-&6152_f*-|_R9BOrpdwlbHWpTb29tjvt&Ly`
zqr2|vd(O-}Dem3%-qkB<?40VHIWxb*d1i(Kys^H?%bYupTz_2OS+)9NvpqHq08gLH
z-B@`1Xy3J;_B{B%;Buv7`{DED<eI7LRinAqBd989jd!+2@Em}xOL3one`!N|qH|nS
z#_Gkz%U6Hcb!L#GE5Rf+plee~ba%0Al2T@~J@&~`%x8zrzuQ?gb*Ir9-(FPhk0&PI
z>3(tS%E?!P&3_y@Wth2Ga^&m?52;gro>W%*&8*Bh!_ARWX4z=%*mm&uiIGx-2P_*z
zWaUei*G1L*G!MmycyKBrs*zwaVCEo65fOlhAXRnwrkt#R45voKxSOYuQn-gL&d=Sn
zY?5<EP6l_Eg~tz11HhJVyB|P{>AFs|Y{=PQ*<j{nQGYg1yt3Us+TT4|wL3qG=yFs&
z|L=PQ8_kKyKN)Bhg$f4%OE0V!=TC&yN6MFhJy@tYfB--Q0W+&qwPDFC5s~m1)SnQD
zK;UNgZ*^xl1m3i7c8wI}ZV&w`Qiei603rai>bj?2{K>=BqPh**I4(uCu2%<$*9(UM
zzjFJx1Aq61q}aH3_G_uyrvQDMBtTM%Ucu<mTazSXPW;(Uk_F1~o6@i8A7{TAl2tbB
zIlY<M{F&7C03a%(r=BGH4q?8k@RK2pUrCu3k!Qks2J~}(UHC5K{V!*qs%Q%c_8L<F
zjw-DHV85pYKs+iWE(EF>FaQxM;;tfnSh{)35lJIEWPtaAPr$aQ{hggl!y*7SlEpt|
z&eltkQMAE>-hTNW2Bcz<tv`kA^^ic{dh>C-e)|v2`C^tJ6r{NT0000<MNUMnLSTYk
C%wN3#

delta 483
zcmV<90UZ9L2Dk)}Uw;E03OE+9lA!be00Fp3L_t(I%k7o1YZOr!#D8<Q2{92wf_A12
zc#tlzf@qN<5fN=SjUk;_3qo$IO_gY+Rm37i?g-l1Sfut&{{mYZK`XII2;!vhZFt$+
zOAdlvrdjsmF>hwRVHYkCpt@n26>~rbXaPw22(0uv?H{8OCx11hiKGv}jBQK8_7boS
zES2YOEw9f5IWP(A_B!o1F;8Q_g4D1*16Y!RD@$68F27;>6Y#+H0<e{4#pbERwg+O8
zq-YNCq;&i5ZY=3xniZFa5|6YP>3(%&`?{pDp&17S04`OBtQEOxMz1BNY#*Mc_z$pG
zjRJTX^1Uso<$p>xKq6`5th%iM>lIbAw#OxXu|1(d$qtch0MC;l88&McIwom6JT<uU
z<Fvl_ySbB!(rc2IZ9k6l4qe`|{aVsAaL;xw>1J>(;2H3)-_5_Bh$793RY@;^t3lzh
zgh-BU|CaQ~b`#huFYk5QCtN7aiaU~C*`BMkq7JrQ9$a`YX%l#ByCvxWcxrpQ-_8Fj
z&5C_V6LG!HLR5%fl6C?ik_>#deK!fDj7nN@bqV+yNK1|s_}Mtmr!gpR*3{$5#gF6v
Z;|SeLx=SPm7ncA4002ovPDHLkV1i4X-@pI>

diff --git a/view/theme/diabook-aerith/icons/contacts3.png b/view/theme/diabook-aerith/icons/contacts3.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd0e289a772f5a6f90f1774e7ee77d300b72976f
GIT binary patch
literal 568
zcmV-80>}M{P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyZ5
z3OE+9lA!be00Fp3L_t(I%k7o1YZOr!#D8<Q2{92wf_A12c#tlzf@qN<5fN=SjUk;_
z3qo$IO_gY+Rm37i?g-l1Sfut&{{mYZK`XII2;!vhZFt$+OAdlvrdjsmF>hwRVHYkC
zpt@n26>~rbXaPw22(0uv?H{8OCpDyrqz}N1ZA-%T60i*{mFI3Pug?QHFbVATI_)<x
zPh-G>)UZ7RSdxM(OInOBzhV0m@WA#0u$5-T=BdQC2V#<>Xb$kCbo=jaEa_pI6_<w+
zkF*%+esyH~x}>q883zRbE>(xD6}f6guO+5zAD*W853pB_0(cqny)CKbN;W_uY2&QA
ztpV#5RkOCoC4I3yp+U(Gk!%3ZlOY*4YZf{tX*@hNxbx$*zW2MilZw)7l9p{hj`I#(
z-m?8#(ll_-b}s2=a4p~&@UGv@znzF8&5Bh?FMz8-;jx5Bj&1*z^vHG-*efsZb=oIf
zD9wsHl3v-KtF)pHwp|{0FKH8aYr7@s0C;M9yWh?KD$R<0NfU9s&O%g(Uy^nLA(9My
zwtY7Vq>M^hadip!8c0iy6!_UV&!;gcZ`Rb~%Egc4|KkYVOS(%W1{aqA0000<MNUMn
GLSTX^+3>so

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png
index e2bf7d24d3c0fcdd4d97d46731194b0e24a6918f..c83ba186ab4a05587a8300866ce68050aee44e1c 100755
GIT binary patch
delta 819
zcmV-31I+xx1ce8XUw;G%5fUJO-Ui|T00RX{L_t(I%k5P=Z(Kzb{?6RF-h0=!%!1^9
z5Zt=ng31kv#1;w0l?yk<1(u>TX{?C2iD)93!q8ZdDk2Zbk!%_yL_<xB=u*1KzW46j
zIS-0`IJ>OHAIOo;JinRw^v#?zzy})}eRX{P^U6oHT}Lz;F@FH`9>ONb1*@l6x&|81
zYd4?ye!I12hP8ZUwL#?OcKcsm<I-Rtm>P<H=e*x;?)kKmpY~eswpH{ZTVCB7Aq}uO
ziZf$2COO+Ly4~N3US~V2E}wdzt?b3f&3?Oik3}ylS+!1%7E54@B~ewxVex0tZQb*g
z{5Z{5_PmHBX@6z;kRvyXPHRV4-&C@E^CnH_WmPjs8U7mdT04nfI!LqS!&q|Sg#~7o
zrFr$?u-AE4bX&V-_QLsegNPQ~;4Ez}!{6ngvrCEpJgrtAs%ZvQIF1Zqfv~OlrRuSo
z-731R{jw<Da%7BL#?I3^mJwx9ye+z|eKp*2K08*%8h@7~tYaR5MFeVCcWM4qL{RiQ
z_sbBjI5L<Sak4QpVvHz5xEl65_e~Atv!`lUj}s!ya2y4ZC(K4JqSZfs{Q7kmbRUNh
z+A#`*uMdc2Y?npv@$WzEzZSJB$ML}|Qw)7}@RI?6832<jDF+8c)P+mGfrdjOzXP8?
zBBBg1n15jiF1|J6=Wvx1X#5_)D*61>CCU0kd(WfG17K~7#Sx(Ykk4Nb`3-}8VzIbQ
zYBjjZ0}ucXC#K~o`TUZ|*VXJ(vhXF!!I31{cjVj}0Qgu&nAwmtJR!1QmC`pP*nlty
zR9EvaT^!zl)7mIb;*lb~Af-B#p@t0y{|pkoFn^Yh%~c+ODD$z5;t)?9=_#APG{Pnk
zUq4-=Er;Y6C&Rl$glNetIJX78#<1BYnS1UKZ<}b%Xz77B31{T=D2l&OP#uu}#D#zw
z3Ar;fgTgf+yeMzf3GQX;_>QX8Xmk5X!jimVr3Q%Jd;If3F=@@l_{^*+ywh{<<gO3F
x&Mcxx1JlfQliiRg=JG28jWnUN4?oh>{so?62UH#C_jmvR002ovPDHLkV1heOk;DK1

delta 494
zcmV<K0TKR%2g3xAUw;E03NkdG9SNEM00F~EL_t(I%k7oFOVwc%ho9&A9mGW}=s&Pl
zN4fJ|RLDUKT^#NbE`hi>bP2qRv<NPD6LP396%?*5&ehl|ZH_MC=3smpdKK|UDLQ)K
zJH6*Te9rlt_x-{{lyG>u{T`T6?~}V$Q=95`k~`B1V>?N+mVcxJyj1t@LFry$bt<5l
z<d-^`WEZI4b}U8dS70(pTWwZA5AeFcr;_XdL$`sdKaxxVvxU`DE9!dHg(M@u46uKT
zneP|#N7MziSEUA^lB8d41B1XT;NS-BAC%m|ByFJo^t^VqcYl>X0hUYA9B}v#=pisy
zL@k$EE`cvZ-+%Xytu0_N$<d|d*CTcD+lMz>K;Kn>+BGUphNs&*Kv!K#a-4+n9Ro{1
zx8$6tm%6LYIeV0(1^fg)tIvSPNk-KHV7}C>B<ZNTYCXwQ^@Z93-kr|5DoT%&EU910
zx;-n9I<S#stiS<UK)0Mxa@UeP2Oa@$f!+%E4Xmi0a%Vv<?r=k0Pcl)A+Eg3oO;0ie
zd;&&+0d>9tR!bXQwSI+B0ORUv8QJ(XIrStP>KHIksk6XllE#0o@=adA2C$xFqDrz_
k6y5y|KG)sDAL%Uq00q9=#MmFP`2YX_07*qoM6N<$f;jr=-2eap

diff --git a/view/theme/diabook-aerith/icons/messages3.png b/view/theme/diabook-aerith/icons/messages3.png
new file mode 100755
index 0000000000000000000000000000000000000000..e2bf7d24d3c0fcdd4d97d46731194b0e24a6918f
GIT binary patch
literal 579
zcmV-J0=)f+P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyZ5
z3NkdG9SNEM00F~EL_t(I%k7oFOVwc%ho9&A9mGW}=s&PlN4fJ|RLDUKT^#NbE`hi>
zbP2qRv<NPD6LP396%?*5&ehl|ZH_MC=3smpdKK|UDLQ)KJH6*Te9rlt_x-{{lyG>u
z{T`T6?~}V$Q=95`k~`B1V>?N+mZSr`RQK*d>0V)VDxjI<mpYkb7pUKMEJf*8U@}Qt
zZB{@J@VdaKlI#FOw}GlZl1u@!h1F9l>U!0MBqP8Kuz!o0?-%n&)CILyr3Rpqq+e|V
zgTO1`;0Em<l-$82ZJ_`3ymq#Cf0aK0mP^qbaQF}CAuv}&Etgs@fiFbg_m8bDU@^(j
zrRCQnb@AJWH(Nm8Re;(xDo%!{+dDv4T}pDCgz_B&OF*~eoT!(&tIj!ll%xgx1U{?J
zfX7Kj)d66>)T|`wsJm)C$y4=(+5+C4&bcZ|kCQB^U&^{YE08*{kz}mE0a`$}oKbSu
zk~{|<0dIlc3iu7IsGV{_F79wcT~9JmjM`Ki=S@#C1bhNUfdO^C0#-{KUA2CNQ2^uW
zY8l!1H97Sp8|oM^P^q)PW|GE#uJTP@zy`3MWTHy4S`^*=4L;Z1!yoA^{s0BO+r-!(
RvH1W1002ovPDHLkV1nOP`rrTn

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png
index 2b4fbb818783399ef1b7697045f41fe73544760b..2bcd749275c49029f3f5afa3115005645c322878 100755
GIT binary patch
delta 952
zcmV;p14sPw1&IidUw;G%5g8s`OTvNx00W6hL_t(I%iWaUYg|PX$G>;(&F*G5n;)At
zTAHG75@@4^7A2&nFQ!7ZCeb_u6oSw+8j0JMCX$j85%S<mFkqWds7*JEDQHcERxngj
zB8gS{2S^L82En$mX_DQ$d+(fc#)q|~HwJ7#eDJ)@`Of*A?|%$u2KX<d<@ou=rVrB9
z8>xA%cf7i}Z=&(RTCLsC+&58Q@x+!(B^8Ma2YOQKai9l!QYxOPyimDi>!s$tiFyFA
z0$qDju~>QHVsS~l;g8>cYn&Wxn|@r!O?{ugRQcrAZ}ZvAm6fH%{m!GJz^W;VL>rbD
z?+#B6woSi!?0;NktSs@ByK?`nuRnhCm$k50j-7idUY1B@mhUxB4z^9d-v7mLNqM4M
zS*j**R3{Wp5|Oy8EByfAgrh@FII;&ywXWw<*-onyj_h&5#X|s)%dYklv#3xc8Munp
zk1l5XoIB&Yt4#)Yx-?NW$4pCKe%SO30PH_9R_}yDO@F@UO@1@f{yhM^F);PBQg%gV
z>294d=2j>gpNvGKdjpPzCB~$0v4|LhDuK1x&8!Roz{|<cUMw!(H0wm-N2BGNX7_cU
zc>w^jtII=du$kFZ5wR5N5etBs1x&1%7$Q<cnn1q31^@=?dC~-C1``8H?E?Vv^)=E2
z15+d-Ab(9t`#LyoOblYNVE|^y5;2TrwG;sP^Q3)`h(KEV+RL8-086PBA_5U-MFe7C
zGfNPhciroN+Q}k{nHId9d&4e@cJ1vP*>?Hlp<gpgi_Z};viBFC{q9ufLPN)?ZLlL<
z+VgIR@Pdd@2G&k5=Uxwhwdalt)NV1R`pW3Lw|{lsO$$pLPzM3Pi17;7Azs0)eNe>2
z{aiLZGxE-D5mPNj?bdmBJP7u^G_wG9WC{RgMmh%a*_GonBONCIKn!+iO%O4={?bo)
z1%03}uaPMt25CPXd?3s>buKdsJAA0_?USDx_Pb|KcMd+(Mam2@#F(-Nx!Kd5gLUnn
z*ngHC8a77NQa(Fsh;9ZP&yOXA{d_MI-7#Wf^J7U4G!|^vT0;ceAI;C5eV>UqM!t84
z{Cw}+SW^D>$^4Kyyv*Ke&HUM}_O%+3lrjmJq;#!zb?m)%(QeJv)Zt|SaMpXOKc$b}
zTQ9F!c7QdMWp=Em|2Tf+VV$#)KUdg<*fB6{%Y^=E?}orWNiARu8`S=*VDbsDV8Iyt
a|Kd-*0R&Pr-LH250000<MNUMnLSTZHfy+1m

delta 671
zcmV;Q0$}}#2=WDxUw;E03kES&pJdel00MGJL_t(I%iUGaOB8V&eQ*77SyUqQv{JWN
zP)ksn4a+Xsp^FI~W+Ct*9Rv|NcxXn1UA!&`9lCVMouP~AArE;ejAkzV0imGfNe_mQ
z2LtzY`7EsCSP9Xg?`6K9&-=XhdGp~r-vR#RDiq5jg<?5(5r2;3mU50;8mY&b6wx6`
zYm$~7x0Lxq(F}lPl52%xc?bZQ5Y0+@17H}yNF4g>7jS$Jz*~~<B|T_v1SRDG43k`p
z0&l%gEMErj8o;9{@V=yoT_O1rz{4o;)*ZLBC~2BxKKZIMBx{m<Yg7SnThjPBM#l}W
zSnL~rh6xAX0e`$BIV$NY$&Zr0#i4(#K7RnCl2+o-|6sY#04@Qz1z<<g3dy@k$61m)
z0BQib0CbY9n7|zX8<L&?*l^sEW1NblPDx#oYR1o=5+(@%8A$-pV(CxzyjicYy8Ded
z$rc-5M$*~iCaKAYM;4D6^a{YS?SBAxVf!(wJF*5%B!5o}OWGvaZ|8eg(iX|7Lb2Q(
z1>RRlH>~t}9QwPCTk4iHMRJSeuJQUMZ6-&tBxw*pE)M-Yl2rh0045EuJ3h8}l4Kiz
zY7}^T0CJKBNiHQFS8WWd01yS<Jb<TB;LTadfFwv7FnrGNdBa!jS#3^?cpJcTNsk@3
z^bEjs6n}UN4S0t&?x-iCz*{I3%S`|l0rVMv`;_B2^lOr4N$!)(#-V?bXxw8brl&C(
z1>T9ItfYNOvvKIx&YX%k^baNFqrjU;`O@0WaeE4Hf@D4p{lnDT&591v@{)SZac>$P
z1>V8A*XFMl$yVF8{;oE2!GAy>NlEJatHL%0;uybNKLIi6F9Dnx@{9lg002ovPDHLk
FV1m+HGDZLZ

diff --git a/view/theme/diabook-aerith/icons/notifications3.png b/view/theme/diabook-aerith/icons/notifications3.png
new file mode 100755
index 0000000000000000000000000000000000000000..2b4fbb818783399ef1b7697045f41fe73544760b
GIT binary patch
literal 754
zcmV<O0uB9%P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyZ5
z3kES&pJdel00MGJL_t(I%iUGaOB8V&eQ*77SyUqQv{JWNP)ksn4a+Xsp^FI~W+Ct*
z9Rv|NcxXn1UA!&`9lCVMouP~AArE;ejAkzV0imGfNe_mQ2LtzY`7EsCSP9Xg?`6K9
z&-=XhdGp~r-vR#RDiq5jg<?5(5su@Qa*kUXsmGZV(IH7|l9nB}l=(x^41i^lYlUKY
z2mqK6%}RO$U>Lwi9Qx}QaC{HITaxc3J!ozOCFKDOlU$4fZ@o|~Uk30Rz@sSezNCm<
zA^8%(!zl399k;Y7X_{m{`KmJ{Ym$6xQ~_{X()c+>#|^Jo>>GcE2?yT+ydya(=_<*O
zlD@^Ef2}@$0Hcyt;?VzKxz7MD0k{QVN74$(yGh4ck~;uu0J;EllB}4(9RM4Wo&eZz
z+>&FQilk0SU6N|X&z=${2>=;M0MKITPxic7ud%xOjX22`8(&7!+2bau$%sc5j~Vm|
zz_IOr0C-{hF{?YW22CVS3rpH0*>C52SJD>AsY0>b9R=Q3NjI$YdK~(@j$7)MG(~cY
z<gW4hC2b~0u_S2_KrRmbJ(5)bZ2%?>uRA`rc#>orfNB(YdjN8h21za@9an7(s{jxM
z-aLS(QQ*y4$$%tC8Zdm$@Oi^m?OAP3jCdQsb4iaKxAY9abQE|C4S0t&?x-iCz*{I3
z%S`|l0rVMv`;_B2^lOr4N$!)(#-V?bXxw8brl&C(1>T9ItfYNOvvKIx&YX%k^baNF
zqrjU;`O@0WaeE4Hf@D4p{lnDT&591v@{)SZac>$P1>V8A*XFMl$yVF8{;oE2!GAy>
kNlEJatHL%0;=f!!0Ws+>0h}4~i~s-t07*qoM6N<$f-hS_WdHyG

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png
index 9765bfd53ec06190f61bcc0a6904b3f6566233ed..159cd2c59fcbb2aec1ce104f6f29f8e59de76bd1 100755
GIT binary patch
delta 1019
zcmV<X0|fk=2FwVMUw;G%5f?j%%sWc}00YcPL_t(I%XL*jXkAqhJ#*jv`9HC({Wc3l
zf)p2liuher?6%O*jglf*tS#2ATx3zKHS(z|Yc&+nMHWgm8=IC|#S|$*grXEtnuXEo
zBG#35Bc!A)X_A+B=NuRB|M=7X4m{q#%sn%A=G+-WhwRvQ9DhHZIR*fD{>{(L%&KPA
zZy^ktg(?6@%tg*gng@_y7~3xZc=n}t@blTX*RZS`=<r*U10lwt4VyNPRQviGxJxJ@
zUs{@7S-d@-ieh@|{g?l_8{F;zZJr(O?c3O_ZP>8A4J1is!2q>%v+}60a_7#>(&DWX
z7v9@9)d_B$pnrRs=SFKA9~{kMtQ#ORm{T;f006<PBaoSsGBcC=!qV-VV_%=xJJtqY
zE5&n1PY*w^`Jss{#yY7I!~jxQym_O^RGcSiJ+<D0eVgjdb`YxcEmE<td~4y*Hz)T`
z0YCtN-G?UzvTARWLcJ&wNFuo-B`@`2^@oceyz<w#AAi1jZ8cxH=<cQ6OM8(L%tAfZ
z`kK2BPYeJ+*fny>U|}d$s@pxe=!7SS7Y<L3R3wN}`)2Nxr_$E`=tL@#ve>iTLN>H(
z<dj88)!5TJl9I1uNvF7bZLN`HEhUH9J+1}-Ay!AUnomXv{gzc4?hdHKMQe<JWLtN>
z_VM=?41Yk_O0u+fNh8FbhKT-1Y0#5{l0ug>%0RY_VrDcTXj>{$w~Qf40F2ULq_bL-
zj>aySk|2bJgh&#hk~Q3k`-n*bos}p7yuTwPfwYFm3_z)OX53M>HvI%V7TrBJcZie)
zGpOxZ@>rB$*y7Z~W>|)>1@5iahjq1XKO8#$jDMofd2#?Uurr0$1E9k!0HJz@@_Ci)
z!F}3c0N^QIi*%o7zA|gE(ty?zqotVA@+YESHXwNN8=+D=(2W(MVDMQ;^N~~z<l~Zk
z3PEeB7yz|Sr+ji|^7YFA@XY>?{!Z`%C8z+k=Me=2gD;O8n1?HqM?_E4UgR^$les6j
zCx3X6;7+(ZB>Ml&WRX&Wrvy)>-IK#z#+1)MoW64Uh}JIi^xl)hZaou#)g`T~VTPg^
z!1I!f$PUsf&3oCyg^1$NFXxU<0a!mapL+4+XyIYhEY#Z_lt>_iPEMJjyf)bWFT~(u
zzkYFatUcee>sK#f$G+pZe)SUm{o}hIA9Q(Q=Nw&+JMkzfKrpu6wFFR<2%|eFm?_O<
zR=n}sm!qGp8}!{)(~~cp7!Yk})iL6<MmKt8L9@{~9x_Z{{i@l0HFX8w^R5A?QtAh6
pP*SxOAUDGtTFdnJsbgK2>3_qEoKhs7pMU@W002ovPDHLkV1iTQ_b&hd

delta 712
zcmV;(0yq842%83wUw;E03N$soK%R;K00NsyL_t(I%Y~IOXj4%bg};+VQYR_xAlM?s
zp-`-3DKvwF73$haNI($hj)g)<ri4QGE`qw53@%+<IuxZyf>{EY+UlYi1S<izAoe))
zzVPz;Qvc=N_uhTyp8x#k{#V4JP^!~vQ~+2j)+8wh%-LQFbAN0PC7l50z_8V*IIO4L
ztd6jh23jc97i@1x+5++<!Ztux(mrt5YE-@_!Ic8KX}c_GHI5Y{5uanb1MIe&)q^;=
z5}-S_cYqm524wpJ$N)$h+sK#HC20WcwHlSZ2s|#uCh!KBu{{C_X_qCvvn@%_Lq?<T
zlCV9H^rF?M9Dfio37VE|kAX%kC4Fo)Dqq^o>KX7pu6F=M(hN{8l<ErrnYCg~p-`)m
z90!dtcI?^7VupVVtO6Tr#hNmba-sTTE=e$&j=h>DJrp+Hl9bB=b7_`JFkW0M);<Jg
zi(C_u^1xg+nE#565@{~mo(dZ+CmfRCVF627AQ!}+w0{ywc}dx5ejVX3-pEeCOM>Sm
zO$EL4*D#LaZpQX7X8JVE49wcT4cr1|!@E=t!Jent&`?qx5i1^&8n(~>lU(GCvus%0
zoupmR{v~iMDP#K=@a&p;bS0f<fnn%UuO>Oe_S<%|dK^yaw+X<OB-{JIFw<^U4IJ9;
z1goUQ-+$QrPs-toWavmbY&WZy-t6~|e$TJ0|CICuxS7%~zAmh+|Cqo3Xcl-X>0wG%
z17N$|tbPW_6iRgfLO<OLU25bK+ZVQXZJz<BKsn~1XdFn|i+XaQRA;K+JEBmk)9)S8
z?;U+wc<}fHxCh*ciWi!bf|a6P92K@>d%NANzCj*q^pmb8V8iz4YDzf}UEBMTCSOex
uz!i@BoTMe&xv;?yI0-f#hT>njO#cA`Fn+DBpVS@z0000<MNUMnLSTY1>QS%&

diff --git a/view/theme/diabook-aerith/icons/notify3.png b/view/theme/diabook-aerith/icons/notify3.png
new file mode 100755
index 0000000000000000000000000000000000000000..9765bfd53ec06190f61bcc0a6904b3f6566233ed
GIT binary patch
literal 795
zcmV+$1LXXPP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyZ5
z3N$soK%R;K00NsyL_t(I%Y~IOXj4%bg};+VQYR_xAlM?sp-`-3DKvwF73$haNI($h
zj)g)<ri4QGE`qw53@%+<IuxZyf>{EY+UlYi1S<izAoe))zVPz;Qvc=N_uhTyp8x#k
z{#V4JP^!~vQ~+2j)+8wh%-LQFb8HVKodD;+u+^wItf$?qj<A#lS}4^QY;Q=~0`ern
zHb7U>K5*D-RK6#{l>)kHyDVunjuj&jpJTfN?6#ZLgE+VnpgXpAfEh^!Wcvch07x3!
z$d}Y5X#niC8kM~WJTAp1@CKN%Jpu`7mnFTkElJNqMx*bNusx9UqSdGz5HSgwmTixL
zMl2<LY&9xh+Rf@2@IJ1007cRaP%f0}3jmq5Vojk?tCAcCjWKrY*~wyte+;Yw8*9ay
zGLmwk`eQChFq)3NnkGFIHr|qy%K~$0mP#;QTr1W-1ZIm|6O!`4TsD~hij5L!F58|8
z8!aaslHg$hOIaWn#GkYhNqI@xXnq~xFy6>cz)OPXB~1mr^Vcwr;%>(FFlPER%?!-i
zz75<0X2ZKw4#A$M+0al@9T6)Yk{Y(p|C3zgjI(T5+?}Ld(EcTGEGc9A7x3(wdUPe7
zXMthpQm-aC!}i;Dvw9p(>9+~MmL%Kzz%bKpRt+55?gXo(#oyTcPs-toWavmbY&WZy
z-t6~|e$TJ0|CICuxS7%~zAmh+|Cqo3Xcl-X>0wG%17N$|tbPW_6iRgfLO<OLU25bK
z+ZVQXZJz<BKsn~1XdFn|i+XaQRA;K+JEBmk)9)S8?;U+wc<}fHxCh*ciWi!bf|a6P
z92K@>d%NANz8-7zlddLU!}jQEN;wc++xwCxUriIh6^{Fyq$S(Au)z>G2{s*u;$OK;
Z{{aIqeyy&b)E)o;002ovPDHLkV1h6HVYvVR

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/icons/contacts.png b/view/theme/diabook/icons/contacts.png
index f1c3649ef1bf4afb6ac8f7e645e42c7766b6d1eb..1fb6d695b34d9ec545058dc305c825bf0bcc8d81 100644
GIT binary patch
delta 688
zcmV;h0#E(l1%(EXVSf+_4h#IMfB*mjg-Jv~R5;7+RljQ#Q4pS)-M!ttyF`p=XIjBP
zI>AD;P`DEjt!)%LIZ}EEM>?DQYNAyR2`LohgcJvdfz*Qj1-3SVR*9F~dvEvc`z*3&
z_QIW}vCDKjJNtd#elznP(OKld<B~f&JM%L$Gw<SZJVzkv_kRyQ?(gqCsn_d2P7Cax
zOmw?le|mblD<ZR6X%G<wK~RsQXp4yI!@6Ftcdb&XEHZOhDfPZqtF?<bauV2DE6!!J
zN+}p)*cih~4d4esZCJCty?uFVYU-2k`}alUcC}jF==FLl{{kkh3?)gzS{u^FP@1Hy
zls@*4`I#}s*MC}(Hiia+0hswgr_-rUw8C0T+Gt`f+7EIL#j<<am|}z2X4xfcZ7>ly
z%Q7;?kb?uWFcFc<GKk0@9Ak`^W!cDg&bdmOrpaW*skH|Ohr6C9cZ$<vtz9D`+T7f{
zVXd7@l4OJofDd4qh#C{et=(?7MC4`B4(Hqz03{aw0)J2>eDro`5FEh5?3`N$@WLMl
zY_0VG6#OL;;eeS-&beTWAOOgz=zF8lzzFdA`uas8dZd(k3}B>zOuQkUycUrQ0Pdz~
zx=2J<a}xGE@44rBorQ&kZzEQ$t*$*y(qt9D`CKiSn2`(0Yr)LFq9}Uk08cBuJLGP)
zS|fkKOMgpCH;pl`(lnjVXY_BI3cxWy6o%o4Fbr3;R&SCdof8pVE|(i3vej%h9XFdz
zMMP2F2R_X?0OyF9iCOmIIDR`A95!<6P%4!^S1OfTzA+{me;|QCe3V4a${-Z?ggFkw
z@T*daM1+XITI=ime*dShwLXcLOULkWXaa$mI4QRqd{kJDV^8bjP0h#S+}XwP|Km5?
WhE@)&huv%d0000<MNUMnLSTYe(MneU

delta 650
zcmV;50(Jd`2HypcVSf%A9}fU@+W-IpUr9tkR5;7+mA`9KQ5?n3`M&qkrpYr%Fwnt{
z3KqHv4iXCrtvKjdTq@Zlb3u@9F0DFg7lY6a3Zg?HLw}H|gP?zbtBar=Oq<xIFE95v
z_)?qL)`Gb8jNf<O=YH>b-+Lc$szf}jxW2wVme1#3r_<?C0DovS8msks{ocgH#MhI8
z{r<wr%8Fko6siLQ10&8kkwh4VlaiJIOm=;>TJ3T+o1HbYp`D$bH{;{um1DsqEtN`*
zNRpWm0GxBm<#H2U&)VAB`QhQ=_h#lxLKueEH#Rmd6pO`~uE+YplDZ4*$7E*g)&U@$
zPTwc#Cq7707=MPhS65fFM}kkHOeS-yZ<q8uuRt<5G73qE;~0|E?b<oF9}57q+ifoh
zf}Z!BbD21fqa(rXs2y)^Zq_nGLpMYK0tj$xd;2K>RIAmi5JsELrp%0jKoF9A-w);i
zl#d*@<>lpv*=+U^K#+h0)VIE0gpfLOCijuVpwTEGd4Dbl5@~EU8uL*UJ@5|$??ro_
z?Ra3)u^>cyQ9v@)+T9IcNk;nBnj{IJk!ZDAU#6y})B|2zTs&uHcjI<E{iD;wfx&=t
z?nS55c^*Ykp5#q4oAo^JQt}-bMbV6;x6{+ppL?RHR4OGidqVQ8B=pa5GIEl%4d9L>
z&&+Dw#eYksQctX0SXd}Zdgh!P>(1pdk|ZX+cb?}xcFw(Y&W)06nOPaYQn_4qoSU25
zB{}#zvA^rUVW|f}@G6euvLuj{nSBU?;F_O6aZ+gCuF@nwB~SpMbM8v3)%s@tay2HM
kdw*m_=1zYc|6e}=$4eJfn&84900000NkvXXt^-0~f{9x^U;qFB

diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png
index fb77caf0ee5dd2dbc117162b1ec57a38d6cf3517..ab7b0f491e5429e9c899c2291a3d279b7033c946 100644
GIT binary patch
delta 692
zcmV;l0!#gc28jlcVSf+@B{{=>P5=M`iAh93R5;7+)y--YK@<hxbE~SWJ2R7nypAs*
zxR4M;gGy#X5Tl?3$>>TFaUtqPT=;{;KLiyah`8|u@-A+Y$xLUeZdG?*7fwqXR8(;1
z+1_)%rmMSY;D08eot>Shb8~ac03aelMD#aMb9ZlV@0r=%-G5yTA?VrJ*(Ct<H+XYr
ze}DgFp69D3%d)qF!Qe~?L8hmtyMKx|yQ9(Q#dtiv*y(iM8m;wwk|bNB(dcpr0qu7C
zxAA7@;Nai|GxxJB+tOOk8|NH|Xpx9~p644O1f*%YL`1*D>zRlMGrtTWY*=gW5YeJ@
z4#s;g^ff&I&VM;~E5@jjBsu#tyotsbUlm1hOKW|Nh<eNn5fS6Pr$+I7S(YKjc%PY5
zW6a5K#{weI_qSgZ#k;Di?klA(066cQ`!+Y;do<2eiO7nGd<3u@V>CpxP|pFNMnz;>
zM3w;@A)=L{C{**JH7o!KKt)7b02shA0GlFW034sp>wkP8qRmO?Gk`4-xdcGfmhs-#
zD74m(l~NC@s=8j5<$~7wo>FS9EX%a2s-pm)l=`H#UaP9=Tv?WDTI+44)Xl1@Y+05U
zCYBiI905R*B+midX673)#?zBR-&zY}OfSax8UU=dJ@5VH5JDe-0dP7=lEN6XQ53~g
zjIjrR41Y5tP183-bk#X`mzlfu!v|oPxj!{EMaGyD0N}k}ch0R(Pys;9+)dLI*4jRR
zjF}gWh`d)yt>k(BU_2f-QL1t0T)*9JWAY*N0q8>=a?W*ItroH@TM?1WSZhxWhr=g%
zo-Z9j(OA^Xd}Z=B=$~}Rd*AJJI@D^lPMN`A@GWRK9R3K!p+)-}9rE5U&CJY{|9>3+
aK3@Q=jiGDGMRSP&0000<MNUMnLSTa4Zc9D@

delta 688
zcmV;h0#E&k289NYVSf$>5A?t};s5{wg-Jv~R5;7+mCb4tK@^40t-6(VVjwfG;|mBb
zB#4+0#Y_m2C>Vk`x{@d^MBPXh{vc5k1Py|SxbX$@F0MM$I$d2qUDrjr<1iou#hrIm
z^u6cnzNZc}@V}a({r&w{y<Tq_07OKHi2ejLuFdoOwJM5YEq~ART>u~=5)t`J=x$LI
zYuxR2_YMvYE&`BVuea2~kNf2l(4C?vu64WJJ<hUhuG8sk=Xt*Fy~phA>=J-u!N+HY
z!{N?oG#bpz%xq^_HpitcVVD<~xf&h}H=XmCIXQiq6j4fzkO&X~2!Q;;0z?AHX!K*(
zmUgq#={z!q7k^4?!BuI66cHQKSKit0KZ*xFI5pjwzC;8Pfq+1emP&w#w7t^Wx6W4&
zvZ<-tY`9<93Q0t`a_(qtBDD&EFGuB8@FB~x?82li<7emGhY-S+*7_=uTCHq#)Mslg
z#>7fQRze70y!Xq_IX1?eYx`|-03d|$F~+z|M5mNeD}Pm0sqvSxtt=prCJm{s>unKn
z0G){;-u2$IR{AVR=+I=KuItY!rMn<H1Cehr#%-<jbr2~eIkeW6c6`kj0G<K31K=Eh
zCy3YpkP*@8X67q^4G^wCumRvBfcpTZi0Ep&9Xsc!S@Dfh>S0Rho`@_S-Vz2%DG*UV
zrSuK}lz&ov5m`?u4FE8JMIwqysm+v9M@0Gn4n1b(_gd>)-uuTf#-%n-jc{O$A*Iy$
z#@m}AgquyTi3ygN8CvT>UDqdKj0>!_{>02HF~+A8&^BKjLKqlh(0~U3^u!FcT4r7m
zkrQl;nU68Pj4@uGfMQIjLkKsTXZklYEu4%o^C=u-eEu6KCWKSRn4yMM|Nn9P`}zqQ
Who0shmvtKe0000<MNUMnLSTZr&qL(^

diff --git a/view/theme/diabook/icons/messages3.png b/view/theme/diabook/icons/messages3.png
index 838231fce95643727f10c39c7830dd1b24c1908b..4f3ce3693e8f62e0a9ae028ad53e3b5be09db40f 100644
GIT binary patch
delta 18
ZcmaFC{DOHxBD(;)NQP`($;ONZMgTlb1`7ZH

delta 18
ZcmaFC{DOHxB0C?KeicJ{`o@d~MgTlQ1^55}

diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index f35c621dffd44edd71f8dfa05c138ca4d9c94059..347f1519ef4c227164f487a3ac7066c64d891e8a 100755
GIT binary patch
delta 842
zcmV-Q1GW6H2%ZO!VSf-A7`5sRfB*mk9!W$&R5;7Uluu|BR~*Mb@6C*f>&9e5B%2l&
zQ9*(hq2Q&o)E1$Zs$@#AG$C|M@Z>>ny?E(eq#lG`YNnKIP)g>|ND&&4)SD<RQVLcD
zTTCeECT6pn*`1m9dYHGv61EVbr2~(7^ZWh2pZW29f8alQM1O1I1<C^U0*UX+C$9qW
z0<{;gfG55y69Czk-wn(Gb6%hduK+EybcR6&Hr-wTaR^uhLN8E`iT@MO@&e@mVX6^_
zfD0{6tK$-g^Pq17Uzp;vzzHMX40V7LrY1}^`gY2o)DE5kod9Lul`nu1;8Gf=lPv|4
zy9A6FP1!J}vVX<%0`(YBri;ITX%HizCjlSG18*DX9bg^sKwJYI0F%HVFb_!ImHS#9
z?*X0x4}k-~yPy|<Tju9ifUnH>(s!j!b9w<dYBUcGV^6yk!fZ30b|(tJJ>Qi}z+vD$
z5T$hRz89!BP41ql%^Pjfa-n^@Y4eVZSG&AG?EszvaerG~0z5UjU8XkL#K^#Ppw|o3
z0I&r70(=Mz`>w2{bG@1lj+@0A295(i1ItF+Ygifh2Vg&N*mvclbP+@mnDheGXJSpD
z>AUig7pT5;!Nd@7(|6_X#<Kl}g$<BI;k1gQQ6a5SU?GXZS*?<{K*U0(XC&IFX0|0!
z1Fe!6^nZ^+TC)Igqduxt(kE?aI@@kzGb_0`tl!ltDcRk*&t@kE=Ei0!Lm<}5<AvJT
zOl2tASpOBk*`7aG9`9csn_1ZbdS`jOfBDmIpMM;O^>2i<{;<1qN6O=cdUgq&{`$`k
z8r8~8%jv%B<a$nCKl9r2EO+hM8;xq^CxEV={(pCFOuqi0mHT9RX&|aszfYp@NLNq)
zM>nQ+-^#22P)WQfZRc~P;_f7BthFDrxKSI7>Z=mK+SWA)JZQ6JO{sWZ+Rk?>i5ELw
zEbi6cM5p+v%l9XaU7W8SyEtDvb@~3pR<w5eM{sUfcM?S#)nc=@B2$lhik)gUYwfMv
zxkJtR%VJ}F)dFyGy~V9)wge8>UX+^a6$_xTJzx6Qz;Rf$o3)o{t=X0@*!-W*-+7oz
U#B7c)B>(^b07*qoM6N<$f|MDTW&i*H

delta 989
zcmV<310wvM2e1f`VSf%5C;}6&nE(I-ut`KgR5;7El}%_=R}{y8_rCWsFEeQ~Ln6k7
zL98HBOQ6(Ut=f$rqbN~ITbOE++FeO@UAq@ix)BSe8i-Aiw51thK&ef;vqFn>W38Z|
zQEDW~%$s@d-LEc^8Dg8(xbUpbJ?H%Y_uO;OJr`b*h=x)sTYpbTHUj42UU~OLNIsgh
z8v)N*?v50t0g%ldB<u4XjORNTFO_X!wWOu8Ei`aKvc6%Ljcmg#Lt$2IP3lYoaj9&B
zQrUX{L+F*tHUQ$J&UBa+Tf;0v4UAmMwmaV;2BV6*UaN8fh+9IA`vLox!2cu-{DA!}
zA;*EZR^>!gaevqI9b!;Ox|_tAkOAkMi6cfwigMNuI8^B5WNVHAA^2BWgrLxxW1!H<
zNk8DwNKwwl5u?sIlL;AUUf$3z_D=_P?l1OR$KzMp8E$JAhn_rg{VL&0A!ze_-Ucw5
zpPi!`WH{E@CC*po-8a>F`lVoPehm`><mtEMYZ4&Huz$fQ9$3q5PqI18u_LOuYdU2L
z5ZN})w0Cf}y@RvaHcpQerPC=>QN>+r&9T#yY_^u$M)4rXu%THB=MdImMvBrQX!AW$
zPzg6L?voFtM^BhzS4&28w`4?jnB(1}SL~Y?_sNGU;im740)n=YqI3>SqY6GiTnCll
z091;q*MFSRiZvg6YjY~$UJ|1hy^tmtm2mIF?`+N()}*mBMxy|<!l`swyTvtXI;H)+
z%eGUcJgm<1oAB7{EL%no%BN2su{Wx^xv1*qW*@U>^q`!zmMv1UXJL+C(}bD#$8D!p
zw8s&(CUJF+Nv+vr3_V{TmUp5G6Gn+H2mQTY*?;`lVR<L1lO}c2v0i!S@R-dDLBG*r
zU2TE#Sg-uU7<#N`Q)Q0HCUHGtSf%8h<p@Ah=TddvT~#SstECde$TVJz*9ugEuFkuw
zah*#5IF6{4d@W+Q*>3yJ+iVbULrA)H%F&5FIbJ+(*CALa_sOU@Y}aKn{0@*Lyk72;
zGk?Wln*&}g_sN+97i@1P<brkFPh+-C9Fw)?5ZZmt?v@^9=eXf42c|xePa3{G=j<EO
z=O+Oe!}cr3<*lag3)|`Wd@lssjHWpGv7Bml#nSPnQG5o3z{2vErZsEP&4INRxV6l;
zU^ElJWng;6!Ls9w75`x`Z9iqBcTU-8=T;e8S}A7N=g(sO<%=H&rCSN4Q@XTT%-9d;
zS}Ep-PoKs5s~WnFF2Gx+KUY>o>>S+<;wAmLB3JoQ_%D3QmnDA#%96S1Cb@5|00000
LNkvXXu0mjffF$bf

diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png
index 2709977406afc940f8e7a3376db1c6828aa2b151..2c9c791c06e495491c81ef52edab531bb706c7cf 100755
GIT binary patch
delta 20
bcmX@bdWv;IJSPjM0Kc4rpls5{j3g!iI+z76

delta 20
bcmX@bdWv;IJSQ_3gPE@HH${hy8A(h4LJbBe

diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png
index cf94ea7c54198881305edadf29c8d7d20d11a8a6..355abb1ebb4bb76790a1f4fc056a2bc2f64906b5 100755
GIT binary patch
delta 918
zcmV;H18MxD2k8fpVSf+`Ct_n^F8}}oX-PyuR5;6xRWVE>R}g*kch?4c4Tp{*QiP%?
z1=3Y+Xp$D$G#4T6+DNCXY2YFuA#(+`A|X-IL`rDTMY4_{M1@`Da=J7$v?N_<iGbMV
z*uQ^fQh3)fu!M}X+R^{>=f8RLc873}9UdMMfV?qg((}A&0Dt*pD`Mso5jg`8&CShe
z)_KZWY_(cbxm>PNDwP%sg+e(i=IZL|xYOxuS!>(XYW4KN#O-!_J`BUvLZL8|uBoaL
z5#9Cy!qrvpsN3y+SE*F??@iolwN^@{(u(i<6KMif6(TajaYK7bMC6=1?{qpF)oOL)
zPU3@ugZc6C@qca4^CoUrad~;U8prWl0F=w+UW|>6t==x2#hqVX{{8anr%(3>iFbE*
zr;5em&-r|QCX3IDi;J%o78ZU3fW5uFFCR@j`T*@8RsaM72#Btuqh7E3?Ai0@r+%~9
zBmfm6nu(%lh`)c$Ij6(EjqIJv6Ix~zs5G0+ZJ(L*L4Ob|T5IoB2{Vrj`$=p9nUJ)V
zQ~~38i`LpVJ~K~>NO=&PVIuPR&d$y+ssCTG0Lsif=`-_m6h${>l#-XY?A#L(@jwJs
zeG*xFvor!o0f8!kNLZ$Q=Qs~lC_rfwhL{7CASz{5^#MRs$|BNl83C#~ObG#iV-9=~
z2P>2U%zq{sC<E~NB%_Rn?K3})UDQX=R}Lk&>j1neK#z?vp8)tMB98|u1CYQ@VJS$-
zBky-#L{8#32DC57r20F^jWIs~bfzNEq`rPf2m@4UjsSo7B68-OI~I}qN~9nNzE{=v
zs$xXsFX!Ah_i<p1IX1?e`RrUogsmvDKTvvca({JNukZVBmX?;@1Hk6y=AYKuti%d{
zMn^}tm^m`buU@Gr+JGKeYstnIv5jG^MQkmswP0o*`aoivtlxS_RgYA)y}Z1v11cMh
z#(byK*%r}>eh*TC0$~`g`o8}b0L5|qqSx!KW>9b*hT+Rvt+szhU9Z<(uXKCe6%n53
zOMe~&KmeGmveS2xbYp#eeem1#hNIv8`tHN*?Cgni?u#gjK4oSwGcmI!Z`|@J2!f+x
zvG{GhUjOmI(X_U<HWk~r((QE@uRmUwv!X^uMvlWU+zNuAU9Z<q|JTd|fLg6a0P-R-
s$;>x~spoko#+WkzQKQkw9H##Oc%lo<>kn9dAOHXW07*qoM6N<$g7vt+X#fBK

delta 847
zcmV-V1F-z*2crj&VSf%9EUC*Ri~s-wBS}O-R5;6xRWVN+OA!8MZ!Zo;Sb`YoHRvf7
zQYtspNE9bZ{y?NCH9A9u<R1`;iUZL^dZJ63P((sV;KB+@NkhxatC9{JkSyW5V`q0#
z_|BZ|b6!rmyV30Iw==Wf%n+tLXJ=;wprVwjd!Dxpppq@6)_>Y-=Uf*+y1u?HW&5d2
z*>1O&eBTdhwc2L2T5Xis^!xp*Uaxm(jA;i!@Z*1hJDtu(tyXKz&d#pnIuQ{fqH!4j
z9v&Vpd%fPfwY9a+Q-LooE_N0c7Iw7O^ErTsI3iL-yTY0f5i#@q-QC^p>gww51aPO*
z*;rg$JknavkAFvTb92*5)ASPnnwgn-Q?J)s<2KBEe|vlTHuqfRIjz-dtujymFveU2
zLGWJ?1mDs$IfV!y0x7(n=grT}&9%<Y&zAr|pPrr)5e1(1R+1zZfT#pmo@ACJO$RA~
z073&vM3kpi018e{PL8x;u2g5Mn`x3jq=Y2`F!S?5$bZk{I39RR1c;2J)%W#gzyI(-
zTjn|hjW|w9`797vYhNB8AAbP=YwgP<Nrs1lB)ia|s$rSy+FHAuBniZckOD~w-L18+
znArmWB6^hrOa7HnwpizuH8WQ-Ln=f++#rMS8^#!&0XO0}o{UQX%KSIR`1<kjafmj!
zhk*rTgnze<g2xSJE-peQsrR>L=F~YiR#Eblvw{AFbM7wyv9<Qac=eSO&cE6ibM2fU
z^Y?epM<VLFjKibXJIFy6D?HEprkT0R%va92#u&?n##(#tiRdc;<(&Izt$jW1bW-Z-
z8KkR4BqgFlYwbTd-lVzrq1kMH1%N1uzB}h$mwz%7pl4biiXc^C7zz=!l~R|}+9&{9
zEX3)~s!Jkjhhg}X*C>iMj4?+dGSM%5-)||UJ^>)-+#6%eL=z&Sd*AopZf$LSo@kqU
zdwV;~ypw_FX>ob88V@`F6VbiadUtz!dv|K1kD_RUnOn}el@g$F8A_>3t@XRy)8CG!
z{Yd@&B@qdjd2^gC1;8t<^&t_po6Y8rKbm;}aBy%y04gF<7m<-+N<`O0)CG`+VOTm$
Ze*w-k=HT7<fbReR002ovPDHLkV1l!%mxllV


From 0d4fab4ee3cba6db669d6b7e608bfbbba8e8d3dc Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Tue, 10 Apr 2012 00:55:39 +0200
Subject: [PATCH 7/7] bbcode toolbar attached to the comment text field minor
 css-fixes

---
 view/theme/diabook-aerith/comment_item.tpl    |  39 ++++++++++++++++++
 view/theme/diabook-aerith/icons/bb-image.png  | Bin 0 -> 697 bytes
 view/theme/diabook-aerith/icons/bb-video.png  | Bin 0 -> 917 bytes
 view/theme/diabook-aerith/icons/bold.png      | Bin 0 -> 699 bytes
 view/theme/diabook-aerith/icons/italic.png    | Bin 0 -> 577 bytes
 view/theme/diabook-aerith/icons/underline.png | Bin 0 -> 604 bytes
 view/theme/diabook-aerith/style-network.css   |   3 +-
 view/theme/diabook-aerith/style-profile.css   |   3 +-
 view/theme/diabook-aerith/style.css           |  25 ++++++++++-
 view/theme/diabook-aerith/theme.php           |  33 +++++++++++++--
 view/theme/diabook-blue/comment_item.tpl      |  39 ++++++++++++++++++
 view/theme/diabook-blue/icons/bb-image.png    | Bin 0 -> 697 bytes
 view/theme/diabook-blue/icons/bb-video.png    | Bin 0 -> 917 bytes
 view/theme/diabook-blue/icons/bold.png        | Bin 0 -> 699 bytes
 view/theme/diabook-blue/icons/italic.png      | Bin 0 -> 577 bytes
 view/theme/diabook-blue/icons/underline.png   | Bin 0 -> 604 bytes
 view/theme/diabook-blue/style-network.css     |   3 +-
 view/theme/diabook-blue/style-profile.css     |   3 +-
 view/theme/diabook-blue/style.css             |  25 ++++++++++-
 view/theme/diabook-blue/theme.php             |  31 +++++++++++++-
 view/theme/diabook-red/comment_item.tpl       |  39 ++++++++++++++++++
 view/theme/diabook-red/icons/bb-image.png     | Bin 0 -> 697 bytes
 view/theme/diabook-red/icons/bb-video.png     | Bin 0 -> 917 bytes
 view/theme/diabook-red/icons/bold.png         | Bin 0 -> 699 bytes
 view/theme/diabook-red/icons/italic.png       | Bin 0 -> 577 bytes
 view/theme/diabook-red/icons/underline.png    | Bin 0 -> 604 bytes
 view/theme/diabook-red/style-network.css      |   3 +-
 view/theme/diabook-red/style-profile.css      |   3 +-
 view/theme/diabook-red/style.css              |  25 ++++++++++-
 view/theme/diabook-red/theme.php              |  33 +++++++++++++--
 view/theme/diabook/comment_item.tpl           |  39 ++++++++++++++++++
 view/theme/diabook/icons/bb-image.png         | Bin 0 -> 697 bytes
 view/theme/diabook/icons/bb-video.png         | Bin 0 -> 917 bytes
 view/theme/diabook/icons/bold.png             | Bin 0 -> 699 bytes
 view/theme/diabook/icons/italic.png           | Bin 0 -> 577 bytes
 view/theme/diabook/icons/underline.png        | Bin 0 -> 604 bytes
 view/theme/diabook/style-network.css          |   3 +-
 view/theme/diabook/style-profile.css          |   3 +-
 view/theme/diabook/style.css                  |  24 ++++++++++-
 view/theme/diabook/theme.php                  |  33 +++++++++++++--
 40 files changed, 383 insertions(+), 26 deletions(-)
 create mode 100644 view/theme/diabook-aerith/comment_item.tpl
 create mode 100644 view/theme/diabook-aerith/icons/bb-image.png
 create mode 100644 view/theme/diabook-aerith/icons/bb-video.png
 create mode 100644 view/theme/diabook-aerith/icons/bold.png
 create mode 100644 view/theme/diabook-aerith/icons/italic.png
 create mode 100644 view/theme/diabook-aerith/icons/underline.png
 create mode 100644 view/theme/diabook-blue/comment_item.tpl
 create mode 100644 view/theme/diabook-blue/icons/bb-image.png
 create mode 100644 view/theme/diabook-blue/icons/bb-video.png
 create mode 100644 view/theme/diabook-blue/icons/bold.png
 create mode 100644 view/theme/diabook-blue/icons/italic.png
 create mode 100644 view/theme/diabook-blue/icons/underline.png
 create mode 100644 view/theme/diabook-red/comment_item.tpl
 create mode 100644 view/theme/diabook-red/icons/bb-image.png
 create mode 100644 view/theme/diabook-red/icons/bb-video.png
 create mode 100644 view/theme/diabook-red/icons/bold.png
 create mode 100644 view/theme/diabook-red/icons/italic.png
 create mode 100644 view/theme/diabook-red/icons/underline.png
 create mode 100644 view/theme/diabook/comment_item.tpl
 create mode 100644 view/theme/diabook/icons/bb-image.png
 create mode 100644 view/theme/diabook/icons/bb-video.png
 create mode 100644 view/theme/diabook/icons/bold.png
 create mode 100644 view/theme/diabook/icons/italic.png
 create mode 100644 view/theme/diabook/icons/underline.png

diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl
new file mode 100644
index 0000000000..4668b9ce39
--- /dev/null
+++ b/view/theme/diabook-aerith/comment_item.tpl
@@ -0,0 +1,39 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>													
+				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>										
+				<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
+				<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+				<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+				{{ if $qcomment }}
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
+					</select>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/diabook-aerith/icons/bb-image.png b/view/theme/diabook-aerith/icons/bb-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a1b32113ee777036adb913693ff54156d8423f6
GIT binary patch
literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10yarRK~y-6m6Od&lu;DMf9Kx&zK+v4scDRbMMYA%D?z3<f{>eb
zEdrPBTSbfhfS~_DXyIybDG}u+TxD(gf&vpA$|S{M#`&<Bc|T5znNbs=df?%551jLy
z=iYM!I0f_q!v8^mk^^oOi^XSA6d7X-B7zu$!2XFyD}E?jMB-#JdB?SGc(o7rj@Rh$
z2!<w}TL1@$5rNuUh6gPK4oE_^3SoSZY}$12eJjF<0T9=22m7mn6fKNigQN%RKD=H%
zNcMp4RsmZ(=w!b@W5e*J;^Eh;T)ci0>Dh!}72=kKN?j<_1!JJ5FeK7;4^x#&`Neeh
zEL~0r!<dt4N5XRi&4}$i%U-BxtawK84Ah$ei=TI~)=s(BTM7A6Ogi1o<#UD$XDlll
z4Swtx!U%#;38EOp;5kbWnm;WVV<<^Ko*2$wYBDgWY*s8gc}um?g>{aRD<jO!&0(!&
zetw>Xg@sk%tLykkrBWo4F-`R;mFrXkNO;hU9NnoDxm=Fiw^^(cW@he_$z-Ngb=`D+
z+4p@kR$Q#~Sc^nHO_EGZPO`MLL^_@3{nk4^ZGXh`JPL)vA}}Vv?M9>VGKyoYG3-y{
zAwGQdfVIL31O2^NE0im{j1FGq(fE^H2jsKa>|Iqob{CeHm!GZ`^68bIYi#cMBs?Vy
zBTo3q)`Y0)-#D(SMOD?|$EWqy?1;8eQq`<GPW1@h0DVC5qL=CQ8hrq}v^JQ3>7c{0
fwrW{bvz_>F7G5O{14>~L00000NkvXXu0mjfvu`%Q

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-aerith/icons/bb-video.png b/view/theme/diabook-aerith/icons/bb-video.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd323531ec179d740995c936c77eb440632b55de
GIT binary patch
literal 917
zcmV;G18V$<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)(H*`Dhc}&rw;%C10qR8
zK~y-)U6b8wTXh_VpL3FPPF~iN#%8h0v`dyIxV*KnX(>f&M+fR)3`NngTLr=W0T#il
z!Pvl|Aj;|xHqdspOsEB0yc4_WOglzLZM%gg!KBtCtzDa!ljQuoP^9Vi{_|WspU+of
z-(9+V(I$jAb^pP`FB*p7lOzCv5CAlddLv(NG(Y{}`{^qH(!Q_@cw_GFz0c2_e$^Td
zhY5$m0OayH0OsfCnVFrTS~JF`zMFd6vKKIPa_G&arIpX#d-omf=|i0)7Z%87vqU2i
zrlzOKWU|<8c7}&fvAFmk)*TM5$$J5%&F!<NUwPT#5BN#1Wk@|vvAn!YCYvFhPLocj
zNu^Ts_VjS>t#e3l#kv=;{p3k78jAwZ-`__x76Bp9b)64KMgYiUGXV7V_F}Qfo)*9#
zx%Kek;zRoSUf|B1Us$-mK(o={!iD$w`07;v91c4tPCQSoTBY7Fr4|Q)P<JSk$s~e-
zfE16%$gi){)%7fXzaPV><MnzO7#KjYS{c1QijXWu3!ppHJ(7sWpZW6IHQa7Du~?L2
z&mF^Tn&>VakEerV@;7eWyupFCHVVbkd`pdk!^7uIAuehbxofjn;>gh>*ljipqlWjO
z7l4h80>Ps}eqUWOEV7)H_7CZJ|G@DMxBkIqvGjU*cb9xFhY*5hvx)Dpk2Y7kh(#i6
ziJpW$H}}&4Y4D{Ng=Vv%sVX+R4FFx&QB@UHRk2zX0P6KR0Do_9*K3ukQm$4SnyMfJ
zB=02wm>8b~;QHuSI2}%IjeU!|y`4uZtGIL*f39yJ3rW#54aI7afV_0}wKKx$bYhw&
z@kE?jtwwpLOduG*Yzj)n5*-~+k;~^XO_O4wM5VgR&d$!J)oQ&gi~qi)Zq)zxV6psL
zj-n`-rb(et1R$SZN7WRzwzkY>lbaLclb0->gPxD(e!eUD4*SfpZ*EBrhuxf={ZTs9
z+1Z$xnUw<pzqzuyYTE6#YPDL~EfoIxL{-)Ew<m9p14u(B2Zf@lEfN()!KJ&<G>vkl
rQj%q<SS%KQ1-=H>fZW9R<QBj`mqSc)o>0-{00000NkvXXu0mjf>I|}A

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-aerith/icons/bold.png b/view/theme/diabook-aerith/icons/bold.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fab2a10f83657ccab15743230469170189fdad7
GIT binary patch
literal 699
zcmV;s0!00ZP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10ys%TK~y-6m6E?t6hRcnKgaH}GwbDcFPw#y3Rb5C5E4w(M9{*-
zh)AqWY`jE_tr4ZLHE3^TwDTV@U?~bAbW&l&UyxwTUAWUQd(7_aT8K*yvEa4ydEb2A
zdy|`<d3C*7tv(4u)ge6(PkKlx@jMS9B<+rajv|`P5Tz7h7@|Uj-rA}beE*jH`OBxN
z%a=wwN~IF}scNlST3lRsYOk+<KbX(wX*Qet3dkSGv;1MXXlt!Wk_3Q@BO_=XwSbP}
z;1>$?_4Y7csZb~svbQLTu(j5tX$pYr3fkH%CMWLUI_&^7e*I*6<~6hL<_N<k4<{e&
z1nBL6zXrl}u`P@4av9I_0LbNX^!N61<7S1`wY7`|(2>U0I?4>B6vS~%k|Y_ZwPt={
z0VxF+hR$W|AA=ZMZ|xXJ;S$FdckfSRkTHfdP3i0D;o8_(tAW<LMi4H>*qk34#&H|~
z(lljLZSsC;iARs8xO!!jV_jW)FHs1AF@{rvg9ssZEMi0V@e@3I@tikrXX)zfY&9^(
zWFr`3uq_*_&B_9-b_?J4k;0|fR2jc*(7Hrp4D$<fEdfy+^KJDjQVPzVK9li!_Zg)t
zFo|Jh<zvfdl2UT?@DWb-_2c^iQ55aHgWKbG$mMeEt|Uo_;~1qBTI<#;L^@hmN*!`t
zms+j%PxJpOj$>@g{*fCP7#J>>%P*Bur633>7K;QyfbaVRL4fCZD5a>^>ogh->h(Gs
h8ylo)T9Z;%egi1<JC1HQsGk4;002ovPDHLkV1kKpHhcg8

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-aerith/icons/italic.png b/view/theme/diabook-aerith/icons/italic.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf4b2b81d8817fd280d8374ea078466b843d1972
GIT binary patch
literal 577
zcmV-H0>1r;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10lrB@K~y-6m61<t)Ib=<pQfqXjKNHHBW#OGse-!a{RCc1v9KbF
zAW9KM5cGS9R}noZc#+Z`ML&Y{Aib2X2lZgdTGLH7E;HG8CW(i2*KV7DeP9kR@4w&s
z%+!aE?{5b|@Jvckvls)j7%a;IV+^yi7Ea8}fRsX#NC+VyrG$_IG#CV@9Ot3=?fciK
z%S$UY&+~8`1^a=wx%ugZ>HD42wrwLxl4A|9PuggIX}cy7A<MFf<l6cMp1*u`r0IIA
zg$MUm$FWihCJ`ae^U1<%E!?_!17R5A(c>q0`{p$OKx>UOP5%v`zXJ{vWLXBSH9l``
z;o{{>kWv<&L5g4!sUrj<{n*{b;=)2{UXg}DgCRlD>-av-ojp^UC!*pLM%oL0VSaAD
zG+$~W0QCEP7zR+QR!dJ96C8AQq|VO{E-aoe-F|?e*u-wPi+a6Yx_wAc@Qv#mYlwfx
z<9MgNjjCJ2)#a5kf=LhV-dTlV7!!qQnj((l!~H`K6e(W_F;}Tn#_0betu@SPb8o8I
zY+h+J8t;S<9_Jjc>w<F*$8o?p2V)FE2t-kYUayBJiV%h&@;u+SEbIOsmVPKWyRUw9
P00000NkvXXu0mjf-R1ZW

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-aerith/icons/underline.png b/view/theme/diabook-aerith/icons/underline.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1b4d3574179d600b436995c4d4fa0c906f9107b
GIT binary patch
literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10oh4JK~y-6m6Abg)Ib=9-_)tQGaJmLjSF4$P>+lBv`|4PR!?oI
z`U|`Y-Ua;y3W`TX|ABu%^iWg;sq`1rgL+$8(`>dbljNIB#)G>tq3c3F_zo}M%sVg7
zH_qF4Z|;O)_$*1(G8Y1Z3vkXMgg~>&advSLq&3nsfl>-dl0YR2lx5*L&%4LI|M>QF
zcjxwU5Ck|)g-2m<aPZ|N>-T@2cU>20nx4wQZMiu7dgw0@5sIQH`^MIGO;>yC<}GAd
zR%)#^7!ko*TROLdsOf5n$!t2;G%+ZOqGG^nx^B=cUk3ov1V*Im30nV8&=LXwDhYBh
z%IXQkoCKV6SZn_!Ai@cVmsVF1MbQa>Q550gg$^9YsX<(rLY(%M^>uvw^a01ek70~~
zF$QrQWAFVQHm+{e&JxjIh{l*Q=Gx^obXGdp-~WukuK@s{-EL#^+9sC#CFFTto}H|*
z4pD0jU;5bD-UVX})>;^2kftfL)-@(HYmER<6a~iP@l24_n)#9LKYTFv(vwGzD+vfp
zlkO{}RvL{40N~a07jq4wC;|ZFc@B1l4V+%DcfH%~zE(;FQcC!~4=E))&x4c_LI^0O
q5XUh_qY>gb#&9@<wf2Z}e)kUy)?Oj#=1(&K0000<MNUMnLSTX#F9f&%

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index 07bda6a24a..385b58ac4a 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -1298,6 +1298,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #3465A4;
@@ -1447,7 +1448,7 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-comment-wrapper {
-  margin: 1px 0px 0px 80px;
+  margin: 1px 5px 17px 80px;
   background-color: #fff;
   width: 500px;
 }
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index 8909f08701..078b6d01f6 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -1291,6 +1291,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #3465A4;
@@ -1439,7 +1440,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index 23ae05940d..2089090f18 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -82,7 +82,27 @@
 #adminpage table tr:hover { background-color: #eeeeee; }
 #adminpage .selectall { text-align: right; }
 /* icons */
-
+.icon.bold{
+  background-image: url("../../../view/theme/diabook-aerith/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook-aerith/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook-aerith/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook-aerith/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook-aerith/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
 .icon.contacts {
   background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");}
 .icon.notifications {
@@ -1331,6 +1351,7 @@ body .pageheader{
   padding: 5px;
   margin-bottom: 0px;
   width: 775px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #3465A4;
@@ -1592,7 +1613,7 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index 40093e5458..1b26e47f83 100755
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-aerith
  * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.015)
+ * Version: (Version: 1.016)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.015)";
+$diabook_version = "Diabook-aerith (Version: 1.016)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 
@@ -507,4 +507,31 @@ function restore_boxes(){
 	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
 	alert("Right-hand column was restored. Please refresh your browser");
   }
-</script>';}
\ No newline at end of file
+</script>';}
+
+$a->page['htmlhead'] .= ' 
+
+<script type="text/javascript">
+function insertFormatting(BBcode,id) {
+	
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == "Kommentar") {
+			tmpStr = "";
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+											}
+
+	textarea = document.getElementById("comment-edit-text-" +id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+	}
+	return true;
+}
+</script> ';
\ No newline at end of file
diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl
new file mode 100644
index 0000000000..4668b9ce39
--- /dev/null
+++ b/view/theme/diabook-blue/comment_item.tpl
@@ -0,0 +1,39 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>													
+				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>										
+				<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
+				<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+				<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+				{{ if $qcomment }}
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
+					</select>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/diabook-blue/icons/bb-image.png b/view/theme/diabook-blue/icons/bb-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a1b32113ee777036adb913693ff54156d8423f6
GIT binary patch
literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10yarRK~y-6m6Od&lu;DMf9Kx&zK+v4scDRbMMYA%D?z3<f{>eb
zEdrPBTSbfhfS~_DXyIybDG}u+TxD(gf&vpA$|S{M#`&<Bc|T5znNbs=df?%551jLy
z=iYM!I0f_q!v8^mk^^oOi^XSA6d7X-B7zu$!2XFyD}E?jMB-#JdB?SGc(o7rj@Rh$
z2!<w}TL1@$5rNuUh6gPK4oE_^3SoSZY}$12eJjF<0T9=22m7mn6fKNigQN%RKD=H%
zNcMp4RsmZ(=w!b@W5e*J;^Eh;T)ci0>Dh!}72=kKN?j<_1!JJ5FeK7;4^x#&`Neeh
zEL~0r!<dt4N5XRi&4}$i%U-BxtawK84Ah$ei=TI~)=s(BTM7A6Ogi1o<#UD$XDlll
z4Swtx!U%#;38EOp;5kbWnm;WVV<<^Ko*2$wYBDgWY*s8gc}um?g>{aRD<jO!&0(!&
zetw>Xg@sk%tLykkrBWo4F-`R;mFrXkNO;hU9NnoDxm=Fiw^^(cW@he_$z-Ngb=`D+
z+4p@kR$Q#~Sc^nHO_EGZPO`MLL^_@3{nk4^ZGXh`JPL)vA}}Vv?M9>VGKyoYG3-y{
zAwGQdfVIL31O2^NE0im{j1FGq(fE^H2jsKa>|Iqob{CeHm!GZ`^68bIYi#cMBs?Vy
zBTo3q)`Y0)-#D(SMOD?|$EWqy?1;8eQq`<GPW1@h0DVC5qL=CQ8hrq}v^JQ3>7c{0
fwrW{bvz_>F7G5O{14>~L00000NkvXXu0mjfvu`%Q

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-blue/icons/bb-video.png b/view/theme/diabook-blue/icons/bb-video.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd323531ec179d740995c936c77eb440632b55de
GIT binary patch
literal 917
zcmV;G18V$<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)(H*`Dhc}&rw;%C10qR8
zK~y-)U6b8wTXh_VpL3FPPF~iN#%8h0v`dyIxV*KnX(>f&M+fR)3`NngTLr=W0T#il
z!Pvl|Aj;|xHqdspOsEB0yc4_WOglzLZM%gg!KBtCtzDa!ljQuoP^9Vi{_|WspU+of
z-(9+V(I$jAb^pP`FB*p7lOzCv5CAlddLv(NG(Y{}`{^qH(!Q_@cw_GFz0c2_e$^Td
zhY5$m0OayH0OsfCnVFrTS~JF`zMFd6vKKIPa_G&arIpX#d-omf=|i0)7Z%87vqU2i
zrlzOKWU|<8c7}&fvAFmk)*TM5$$J5%&F!<NUwPT#5BN#1Wk@|vvAn!YCYvFhPLocj
zNu^Ts_VjS>t#e3l#kv=;{p3k78jAwZ-`__x76Bp9b)64KMgYiUGXV7V_F}Qfo)*9#
zx%Kek;zRoSUf|B1Us$-mK(o={!iD$w`07;v91c4tPCQSoTBY7Fr4|Q)P<JSk$s~e-
zfE16%$gi){)%7fXzaPV><MnzO7#KjYS{c1QijXWu3!ppHJ(7sWpZW6IHQa7Du~?L2
z&mF^Tn&>VakEerV@;7eWyupFCHVVbkd`pdk!^7uIAuehbxofjn;>gh>*ljipqlWjO
z7l4h80>Ps}eqUWOEV7)H_7CZJ|G@DMxBkIqvGjU*cb9xFhY*5hvx)Dpk2Y7kh(#i6
ziJpW$H}}&4Y4D{Ng=Vv%sVX+R4FFx&QB@UHRk2zX0P6KR0Do_9*K3ukQm$4SnyMfJ
zB=02wm>8b~;QHuSI2}%IjeU!|y`4uZtGIL*f39yJ3rW#54aI7afV_0}wKKx$bYhw&
z@kE?jtwwpLOduG*Yzj)n5*-~+k;~^XO_O4wM5VgR&d$!J)oQ&gi~qi)Zq)zxV6psL
zj-n`-rb(et1R$SZN7WRzwzkY>lbaLclb0->gPxD(e!eUD4*SfpZ*EBrhuxf={ZTs9
z+1Z$xnUw<pzqzuyYTE6#YPDL~EfoIxL{-)Ew<m9p14u(B2Zf@lEfN()!KJ&<G>vkl
rQj%q<SS%KQ1-=H>fZW9R<QBj`mqSc)o>0-{00000NkvXXu0mjf>I|}A

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-blue/icons/bold.png b/view/theme/diabook-blue/icons/bold.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fab2a10f83657ccab15743230469170189fdad7
GIT binary patch
literal 699
zcmV;s0!00ZP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10ys%TK~y-6m6E?t6hRcnKgaH}GwbDcFPw#y3Rb5C5E4w(M9{*-
zh)AqWY`jE_tr4ZLHE3^TwDTV@U?~bAbW&l&UyxwTUAWUQd(7_aT8K*yvEa4ydEb2A
zdy|`<d3C*7tv(4u)ge6(PkKlx@jMS9B<+rajv|`P5Tz7h7@|Uj-rA}beE*jH`OBxN
z%a=wwN~IF}scNlST3lRsYOk+<KbX(wX*Qet3dkSGv;1MXXlt!Wk_3Q@BO_=XwSbP}
z;1>$?_4Y7csZb~svbQLTu(j5tX$pYr3fkH%CMWLUI_&^7e*I*6<~6hL<_N<k4<{e&
z1nBL6zXrl}u`P@4av9I_0LbNX^!N61<7S1`wY7`|(2>U0I?4>B6vS~%k|Y_ZwPt={
z0VxF+hR$W|AA=ZMZ|xXJ;S$FdckfSRkTHfdP3i0D;o8_(tAW<LMi4H>*qk34#&H|~
z(lljLZSsC;iARs8xO!!jV_jW)FHs1AF@{rvg9ssZEMi0V@e@3I@tikrXX)zfY&9^(
zWFr`3uq_*_&B_9-b_?J4k;0|fR2jc*(7Hrp4D$<fEdfy+^KJDjQVPzVK9li!_Zg)t
zFo|Jh<zvfdl2UT?@DWb-_2c^iQ55aHgWKbG$mMeEt|Uo_;~1qBTI<#;L^@hmN*!`t
zms+j%PxJpOj$>@g{*fCP7#J>>%P*Bur633>7K;QyfbaVRL4fCZD5a>^>ogh->h(Gs
h8ylo)T9Z;%egi1<JC1HQsGk4;002ovPDHLkV1kKpHhcg8

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-blue/icons/italic.png b/view/theme/diabook-blue/icons/italic.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf4b2b81d8817fd280d8374ea078466b843d1972
GIT binary patch
literal 577
zcmV-H0>1r;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10lrB@K~y-6m61<t)Ib=<pQfqXjKNHHBW#OGse-!a{RCc1v9KbF
zAW9KM5cGS9R}noZc#+Z`ML&Y{Aib2X2lZgdTGLH7E;HG8CW(i2*KV7DeP9kR@4w&s
z%+!aE?{5b|@Jvckvls)j7%a;IV+^yi7Ea8}fRsX#NC+VyrG$_IG#CV@9Ot3=?fciK
z%S$UY&+~8`1^a=wx%ugZ>HD42wrwLxl4A|9PuggIX}cy7A<MFf<l6cMp1*u`r0IIA
zg$MUm$FWihCJ`ae^U1<%E!?_!17R5A(c>q0`{p$OKx>UOP5%v`zXJ{vWLXBSH9l``
z;o{{>kWv<&L5g4!sUrj<{n*{b;=)2{UXg}DgCRlD>-av-ojp^UC!*pLM%oL0VSaAD
zG+$~W0QCEP7zR+QR!dJ96C8AQq|VO{E-aoe-F|?e*u-wPi+a6Yx_wAc@Qv#mYlwfx
z<9MgNjjCJ2)#a5kf=LhV-dTlV7!!qQnj((l!~H`K6e(W_F;}Tn#_0betu@SPb8o8I
zY+h+J8t;S<9_Jjc>w<F*$8o?p2V)FE2t-kYUayBJiV%h&@;u+SEbIOsmVPKWyRUw9
P00000NkvXXu0mjf-R1ZW

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-blue/icons/underline.png b/view/theme/diabook-blue/icons/underline.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1b4d3574179d600b436995c4d4fa0c906f9107b
GIT binary patch
literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10oh4JK~y-6m6Abg)Ib=9-_)tQGaJmLjSF4$P>+lBv`|4PR!?oI
z`U|`Y-Ua;y3W`TX|ABu%^iWg;sq`1rgL+$8(`>dbljNIB#)G>tq3c3F_zo}M%sVg7
zH_qF4Z|;O)_$*1(G8Y1Z3vkXMgg~>&advSLq&3nsfl>-dl0YR2lx5*L&%4LI|M>QF
zcjxwU5Ck|)g-2m<aPZ|N>-T@2cU>20nx4wQZMiu7dgw0@5sIQH`^MIGO;>yC<}GAd
zR%)#^7!ko*TROLdsOf5n$!t2;G%+ZOqGG^nx^B=cUk3ov1V*Im30nV8&=LXwDhYBh
z%IXQkoCKV6SZn_!Ai@cVmsVF1MbQa>Q550gg$^9YsX<(rLY(%M^>uvw^a01ek70~~
zF$QrQWAFVQHm+{e&JxjIh{l*Q=Gx^obXGdp-~WukuK@s{-EL#^+9sC#CFFTto}H|*
z4pD0jU;5bD-UVX})>;^2kftfL)-@(HYmER<6a~iP@l24_n)#9LKYTFv(vwGzD+vfp
zlkO{}RvL{40N~a07jq4wC;|ZFc@B1l4V+%DcfH%~zE(;FQcC!~4=E))&x4c_LI^0O
q5XUh_qY>gb#&9@<wf2Z}e)kUy)?Oj#=1(&K0000<MNUMnLSTX#F9f&%

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index 9baa83e8ad..b37d829687 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -1260,6 +1260,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #1872A2;
@@ -1409,7 +1410,7 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-comment-wrapper {
-  margin: 1px 0px 0px 80px;
+  margin: 1px 5px 17px 80px;
   background-color: #fff;
   width: 500px;
 }
diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
index 1a0674771b..ae7fa8d148 100644
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -1258,6 +1258,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #1872A2;
@@ -1406,7 +1407,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index a0202856c1..2f2369c46a 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -82,7 +82,27 @@
 #adminpage table tr:hover { background-color: #eeeeee; }
 #adminpage .selectall { text-align: right; }
 /* icons */
-
+.icon.bold{
+  background-image: url("../../../view/theme/diabook-blue/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook-blue/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook-blue/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook-blue/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook-blue/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
 .icon.contacts {
   background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");}
 .icon.notifications {
@@ -1287,6 +1307,7 @@ body .pageheader{
   padding: 5px;
   margin-bottom: 0px;
   width: 775px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #1872A2;
@@ -1550,7 +1571,7 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 190533d176..f63f15fd97 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-blue
  * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.015)
+ * Version: (Version: 1.016)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-blue (Version: 1.015)";
+$diabook_version = "Diabook-blue (Version: 1.016)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -509,3 +509,30 @@ function restore_boxes(){
 	alert("Right-hand column was restored. Please refresh your browser");
   }
 </script>';}
+
+$a->page['htmlhead'] .= ' 
+
+<script type="text/javascript">
+function insertFormatting(BBcode,id) {
+	
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == "Kommentar") {
+			tmpStr = "";
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+											}
+
+	textarea = document.getElementById("comment-edit-text-" +id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+	}
+	return true;
+}
+</script> ';
diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl
new file mode 100644
index 0000000000..4668b9ce39
--- /dev/null
+++ b/view/theme/diabook-red/comment_item.tpl
@@ -0,0 +1,39 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>													
+				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>										
+				<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
+				<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+				<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+				{{ if $qcomment }}
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
+					</select>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/diabook-red/icons/bb-image.png b/view/theme/diabook-red/icons/bb-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a1b32113ee777036adb913693ff54156d8423f6
GIT binary patch
literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10yarRK~y-6m6Od&lu;DMf9Kx&zK+v4scDRbMMYA%D?z3<f{>eb
zEdrPBTSbfhfS~_DXyIybDG}u+TxD(gf&vpA$|S{M#`&<Bc|T5znNbs=df?%551jLy
z=iYM!I0f_q!v8^mk^^oOi^XSA6d7X-B7zu$!2XFyD}E?jMB-#JdB?SGc(o7rj@Rh$
z2!<w}TL1@$5rNuUh6gPK4oE_^3SoSZY}$12eJjF<0T9=22m7mn6fKNigQN%RKD=H%
zNcMp4RsmZ(=w!b@W5e*J;^Eh;T)ci0>Dh!}72=kKN?j<_1!JJ5FeK7;4^x#&`Neeh
zEL~0r!<dt4N5XRi&4}$i%U-BxtawK84Ah$ei=TI~)=s(BTM7A6Ogi1o<#UD$XDlll
z4Swtx!U%#;38EOp;5kbWnm;WVV<<^Ko*2$wYBDgWY*s8gc}um?g>{aRD<jO!&0(!&
zetw>Xg@sk%tLykkrBWo4F-`R;mFrXkNO;hU9NnoDxm=Fiw^^(cW@he_$z-Ngb=`D+
z+4p@kR$Q#~Sc^nHO_EGZPO`MLL^_@3{nk4^ZGXh`JPL)vA}}Vv?M9>VGKyoYG3-y{
zAwGQdfVIL31O2^NE0im{j1FGq(fE^H2jsKa>|Iqob{CeHm!GZ`^68bIYi#cMBs?Vy
zBTo3q)`Y0)-#D(SMOD?|$EWqy?1;8eQq`<GPW1@h0DVC5qL=CQ8hrq}v^JQ3>7c{0
fwrW{bvz_>F7G5O{14>~L00000NkvXXu0mjfvu`%Q

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-red/icons/bb-video.png b/view/theme/diabook-red/icons/bb-video.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd323531ec179d740995c936c77eb440632b55de
GIT binary patch
literal 917
zcmV;G18V$<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)(H*`Dhc}&rw;%C10qR8
zK~y-)U6b8wTXh_VpL3FPPF~iN#%8h0v`dyIxV*KnX(>f&M+fR)3`NngTLr=W0T#il
z!Pvl|Aj;|xHqdspOsEB0yc4_WOglzLZM%gg!KBtCtzDa!ljQuoP^9Vi{_|WspU+of
z-(9+V(I$jAb^pP`FB*p7lOzCv5CAlddLv(NG(Y{}`{^qH(!Q_@cw_GFz0c2_e$^Td
zhY5$m0OayH0OsfCnVFrTS~JF`zMFd6vKKIPa_G&arIpX#d-omf=|i0)7Z%87vqU2i
zrlzOKWU|<8c7}&fvAFmk)*TM5$$J5%&F!<NUwPT#5BN#1Wk@|vvAn!YCYvFhPLocj
zNu^Ts_VjS>t#e3l#kv=;{p3k78jAwZ-`__x76Bp9b)64KMgYiUGXV7V_F}Qfo)*9#
zx%Kek;zRoSUf|B1Us$-mK(o={!iD$w`07;v91c4tPCQSoTBY7Fr4|Q)P<JSk$s~e-
zfE16%$gi){)%7fXzaPV><MnzO7#KjYS{c1QijXWu3!ppHJ(7sWpZW6IHQa7Du~?L2
z&mF^Tn&>VakEerV@;7eWyupFCHVVbkd`pdk!^7uIAuehbxofjn;>gh>*ljipqlWjO
z7l4h80>Ps}eqUWOEV7)H_7CZJ|G@DMxBkIqvGjU*cb9xFhY*5hvx)Dpk2Y7kh(#i6
ziJpW$H}}&4Y4D{Ng=Vv%sVX+R4FFx&QB@UHRk2zX0P6KR0Do_9*K3ukQm$4SnyMfJ
zB=02wm>8b~;QHuSI2}%IjeU!|y`4uZtGIL*f39yJ3rW#54aI7afV_0}wKKx$bYhw&
z@kE?jtwwpLOduG*Yzj)n5*-~+k;~^XO_O4wM5VgR&d$!J)oQ&gi~qi)Zq)zxV6psL
zj-n`-rb(et1R$SZN7WRzwzkY>lbaLclb0->gPxD(e!eUD4*SfpZ*EBrhuxf={ZTs9
z+1Z$xnUw<pzqzuyYTE6#YPDL~EfoIxL{-)Ew<m9p14u(B2Zf@lEfN()!KJ&<G>vkl
rQj%q<SS%KQ1-=H>fZW9R<QBj`mqSc)o>0-{00000NkvXXu0mjf>I|}A

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-red/icons/bold.png b/view/theme/diabook-red/icons/bold.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fab2a10f83657ccab15743230469170189fdad7
GIT binary patch
literal 699
zcmV;s0!00ZP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10ys%TK~y-6m6E?t6hRcnKgaH}GwbDcFPw#y3Rb5C5E4w(M9{*-
zh)AqWY`jE_tr4ZLHE3^TwDTV@U?~bAbW&l&UyxwTUAWUQd(7_aT8K*yvEa4ydEb2A
zdy|`<d3C*7tv(4u)ge6(PkKlx@jMS9B<+rajv|`P5Tz7h7@|Uj-rA}beE*jH`OBxN
z%a=wwN~IF}scNlST3lRsYOk+<KbX(wX*Qet3dkSGv;1MXXlt!Wk_3Q@BO_=XwSbP}
z;1>$?_4Y7csZb~svbQLTu(j5tX$pYr3fkH%CMWLUI_&^7e*I*6<~6hL<_N<k4<{e&
z1nBL6zXrl}u`P@4av9I_0LbNX^!N61<7S1`wY7`|(2>U0I?4>B6vS~%k|Y_ZwPt={
z0VxF+hR$W|AA=ZMZ|xXJ;S$FdckfSRkTHfdP3i0D;o8_(tAW<LMi4H>*qk34#&H|~
z(lljLZSsC;iARs8xO!!jV_jW)FHs1AF@{rvg9ssZEMi0V@e@3I@tikrXX)zfY&9^(
zWFr`3uq_*_&B_9-b_?J4k;0|fR2jc*(7Hrp4D$<fEdfy+^KJDjQVPzVK9li!_Zg)t
zFo|Jh<zvfdl2UT?@DWb-_2c^iQ55aHgWKbG$mMeEt|Uo_;~1qBTI<#;L^@hmN*!`t
zms+j%PxJpOj$>@g{*fCP7#J>>%P*Bur633>7K;QyfbaVRL4fCZD5a>^>ogh->h(Gs
h8ylo)T9Z;%egi1<JC1HQsGk4;002ovPDHLkV1kKpHhcg8

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-red/icons/italic.png b/view/theme/diabook-red/icons/italic.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf4b2b81d8817fd280d8374ea078466b843d1972
GIT binary patch
literal 577
zcmV-H0>1r;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10lrB@K~y-6m61<t)Ib=<pQfqXjKNHHBW#OGse-!a{RCc1v9KbF
zAW9KM5cGS9R}noZc#+Z`ML&Y{Aib2X2lZgdTGLH7E;HG8CW(i2*KV7DeP9kR@4w&s
z%+!aE?{5b|@Jvckvls)j7%a;IV+^yi7Ea8}fRsX#NC+VyrG$_IG#CV@9Ot3=?fciK
z%S$UY&+~8`1^a=wx%ugZ>HD42wrwLxl4A|9PuggIX}cy7A<MFf<l6cMp1*u`r0IIA
zg$MUm$FWihCJ`ae^U1<%E!?_!17R5A(c>q0`{p$OKx>UOP5%v`zXJ{vWLXBSH9l``
z;o{{>kWv<&L5g4!sUrj<{n*{b;=)2{UXg}DgCRlD>-av-ojp^UC!*pLM%oL0VSaAD
zG+$~W0QCEP7zR+QR!dJ96C8AQq|VO{E-aoe-F|?e*u-wPi+a6Yx_wAc@Qv#mYlwfx
z<9MgNjjCJ2)#a5kf=LhV-dTlV7!!qQnj((l!~H`K6e(W_F;}Tn#_0betu@SPb8o8I
zY+h+J8t;S<9_Jjc>w<F*$8o?p2V)FE2t-kYUayBJiV%h&@;u+SEbIOsmVPKWyRUw9
P00000NkvXXu0mjf-R1ZW

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-red/icons/underline.png b/view/theme/diabook-red/icons/underline.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1b4d3574179d600b436995c4d4fa0c906f9107b
GIT binary patch
literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10oh4JK~y-6m6Abg)Ib=9-_)tQGaJmLjSF4$P>+lBv`|4PR!?oI
z`U|`Y-Ua;y3W`TX|ABu%^iWg;sq`1rgL+$8(`>dbljNIB#)G>tq3c3F_zo}M%sVg7
zH_qF4Z|;O)_$*1(G8Y1Z3vkXMgg~>&advSLq&3nsfl>-dl0YR2lx5*L&%4LI|M>QF
zcjxwU5Ck|)g-2m<aPZ|N>-T@2cU>20nx4wQZMiu7dgw0@5sIQH`^MIGO;>yC<}GAd
zR%)#^7!ko*TROLdsOf5n$!t2;G%+ZOqGG^nx^B=cUk3ov1V*Im30nV8&=LXwDhYBh
z%IXQkoCKV6SZn_!Ai@cVmsVF1MbQa>Q550gg$^9YsX<(rLY(%M^>uvw^a01ek70~~
zF$QrQWAFVQHm+{e&JxjIh{l*Q=Gx^obXGdp-~WukuK@s{-EL#^+9sC#CFFTto}H|*
z4pD0jU;5bD-UVX})>;^2kftfL)-@(HYmER<6a~iP@l24_n)#9LKYTFv(vwGzD+vfp
zlkO{}RvL{40N~a07jq4wC;|ZFc@B1l4V+%DcfH%~zE(;FQcC!~4=E))&x4c_LI^0O
q5XUh_qY>gb#&9@<wf2Z}e)kUy)?Oj#=1(&K0000<MNUMnLSTX#F9f&%

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index 8d5e3fec98..8be39e3740 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -1295,6 +1295,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: red;
@@ -1444,7 +1445,7 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-comment-wrapper {
-  margin: 1px 0px 0px 80px;
+  margin: 1px 5px 17px 80px;
   background-color: #fff;
   width: 500px;
 }
diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index 570057b47a..242c08c680 100644
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -1271,6 +1271,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: red;
@@ -1419,7 +1420,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index 883f113740..0cf034a562 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -82,7 +82,27 @@
 #adminpage table tr:hover { background-color: #eeeeee; }
 #adminpage .selectall { text-align: right; }
 /* icons */
-
+.icon.bold{
+  background-image: url("../../../view/theme/diabook-red/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook-red/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook-red/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook-red/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook-red/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
 .icon.contacts {
   background-image: url("../../../view/theme/diabook-red/icons/contacts.png");}
 .icon.notifications {
@@ -1317,6 +1337,7 @@ body .pageheader{
   padding: 5px;
   margin-bottom: 0px;
   width: 775px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: red;
@@ -1579,7 +1600,7 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index 85206baec9..aec3ab95da 100755
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-red
  * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.015)
+ * Version: (Version: 1.016)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-red (Version: 1.015)";
+$diabook_version = "Diabook-red (Version: 1.016)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -509,4 +509,31 @@ function restore_boxes(){
 	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
 	alert("Right-hand column was restored. Please refresh your browser");
   }
-</script>';}
\ No newline at end of file
+</script>';}
+
+$a->page['htmlhead'] .= ' 
+
+<script type="text/javascript">
+function insertFormatting(BBcode,id) {
+	
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == "Kommentar") {
+			tmpStr = "";
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+											}
+				
+	textarea = document.getElementById("comment-edit-text-" +id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+	}
+	return true;
+}
+</script> ';
\ No newline at end of file
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
new file mode 100644
index 0000000000..4668b9ce39
--- /dev/null
+++ b/view/theme/diabook/comment_item.tpl
@@ -0,0 +1,39 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>													
+				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>										
+				<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
+				<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
+				<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
+				{{ if $qcomment }}
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
+					</select>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/diabook/icons/bb-image.png b/view/theme/diabook/icons/bb-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a1b32113ee777036adb913693ff54156d8423f6
GIT binary patch
literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10yarRK~y-6m6Od&lu;DMf9Kx&zK+v4scDRbMMYA%D?z3<f{>eb
zEdrPBTSbfhfS~_DXyIybDG}u+TxD(gf&vpA$|S{M#`&<Bc|T5znNbs=df?%551jLy
z=iYM!I0f_q!v8^mk^^oOi^XSA6d7X-B7zu$!2XFyD}E?jMB-#JdB?SGc(o7rj@Rh$
z2!<w}TL1@$5rNuUh6gPK4oE_^3SoSZY}$12eJjF<0T9=22m7mn6fKNigQN%RKD=H%
zNcMp4RsmZ(=w!b@W5e*J;^Eh;T)ci0>Dh!}72=kKN?j<_1!JJ5FeK7;4^x#&`Neeh
zEL~0r!<dt4N5XRi&4}$i%U-BxtawK84Ah$ei=TI~)=s(BTM7A6Ogi1o<#UD$XDlll
z4Swtx!U%#;38EOp;5kbWnm;WVV<<^Ko*2$wYBDgWY*s8gc}um?g>{aRD<jO!&0(!&
zetw>Xg@sk%tLykkrBWo4F-`R;mFrXkNO;hU9NnoDxm=Fiw^^(cW@he_$z-Ngb=`D+
z+4p@kR$Q#~Sc^nHO_EGZPO`MLL^_@3{nk4^ZGXh`JPL)vA}}Vv?M9>VGKyoYG3-y{
zAwGQdfVIL31O2^NE0im{j1FGq(fE^H2jsKa>|Iqob{CeHm!GZ`^68bIYi#cMBs?Vy
zBTo3q)`Y0)-#D(SMOD?|$EWqy?1;8eQq`<GPW1@h0DVC5qL=CQ8hrq}v^JQ3>7c{0
fwrW{bvz_>F7G5O{14>~L00000NkvXXu0mjfvu`%Q

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/icons/bb-video.png b/view/theme/diabook/icons/bb-video.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd323531ec179d740995c936c77eb440632b55de
GIT binary patch
literal 917
zcmV;G18V$<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)(H*`Dhc}&rw;%C10qR8
zK~y-)U6b8wTXh_VpL3FPPF~iN#%8h0v`dyIxV*KnX(>f&M+fR)3`NngTLr=W0T#il
z!Pvl|Aj;|xHqdspOsEB0yc4_WOglzLZM%gg!KBtCtzDa!ljQuoP^9Vi{_|WspU+of
z-(9+V(I$jAb^pP`FB*p7lOzCv5CAlddLv(NG(Y{}`{^qH(!Q_@cw_GFz0c2_e$^Td
zhY5$m0OayH0OsfCnVFrTS~JF`zMFd6vKKIPa_G&arIpX#d-omf=|i0)7Z%87vqU2i
zrlzOKWU|<8c7}&fvAFmk)*TM5$$J5%&F!<NUwPT#5BN#1Wk@|vvAn!YCYvFhPLocj
zNu^Ts_VjS>t#e3l#kv=;{p3k78jAwZ-`__x76Bp9b)64KMgYiUGXV7V_F}Qfo)*9#
zx%Kek;zRoSUf|B1Us$-mK(o={!iD$w`07;v91c4tPCQSoTBY7Fr4|Q)P<JSk$s~e-
zfE16%$gi){)%7fXzaPV><MnzO7#KjYS{c1QijXWu3!ppHJ(7sWpZW6IHQa7Du~?L2
z&mF^Tn&>VakEerV@;7eWyupFCHVVbkd`pdk!^7uIAuehbxofjn;>gh>*ljipqlWjO
z7l4h80>Ps}eqUWOEV7)H_7CZJ|G@DMxBkIqvGjU*cb9xFhY*5hvx)Dpk2Y7kh(#i6
ziJpW$H}}&4Y4D{Ng=Vv%sVX+R4FFx&QB@UHRk2zX0P6KR0Do_9*K3ukQm$4SnyMfJ
zB=02wm>8b~;QHuSI2}%IjeU!|y`4uZtGIL*f39yJ3rW#54aI7afV_0}wKKx$bYhw&
z@kE?jtwwpLOduG*Yzj)n5*-~+k;~^XO_O4wM5VgR&d$!J)oQ&gi~qi)Zq)zxV6psL
zj-n`-rb(et1R$SZN7WRzwzkY>lbaLclb0->gPxD(e!eUD4*SfpZ*EBrhuxf={ZTs9
z+1Z$xnUw<pzqzuyYTE6#YPDL~EfoIxL{-)Ew<m9p14u(B2Zf@lEfN()!KJ&<G>vkl
rQj%q<SS%KQ1-=H>fZW9R<QBj`mqSc)o>0-{00000NkvXXu0mjf>I|}A

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/icons/bold.png b/view/theme/diabook/icons/bold.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fab2a10f83657ccab15743230469170189fdad7
GIT binary patch
literal 699
zcmV;s0!00ZP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10ys%TK~y-6m6E?t6hRcnKgaH}GwbDcFPw#y3Rb5C5E4w(M9{*-
zh)AqWY`jE_tr4ZLHE3^TwDTV@U?~bAbW&l&UyxwTUAWUQd(7_aT8K*yvEa4ydEb2A
zdy|`<d3C*7tv(4u)ge6(PkKlx@jMS9B<+rajv|`P5Tz7h7@|Uj-rA}beE*jH`OBxN
z%a=wwN~IF}scNlST3lRsYOk+<KbX(wX*Qet3dkSGv;1MXXlt!Wk_3Q@BO_=XwSbP}
z;1>$?_4Y7csZb~svbQLTu(j5tX$pYr3fkH%CMWLUI_&^7e*I*6<~6hL<_N<k4<{e&
z1nBL6zXrl}u`P@4av9I_0LbNX^!N61<7S1`wY7`|(2>U0I?4>B6vS~%k|Y_ZwPt={
z0VxF+hR$W|AA=ZMZ|xXJ;S$FdckfSRkTHfdP3i0D;o8_(tAW<LMi4H>*qk34#&H|~
z(lljLZSsC;iARs8xO!!jV_jW)FHs1AF@{rvg9ssZEMi0V@e@3I@tikrXX)zfY&9^(
zWFr`3uq_*_&B_9-b_?J4k;0|fR2jc*(7Hrp4D$<fEdfy+^KJDjQVPzVK9li!_Zg)t
zFo|Jh<zvfdl2UT?@DWb-_2c^iQ55aHgWKbG$mMeEt|Uo_;~1qBTI<#;L^@hmN*!`t
zms+j%PxJpOj$>@g{*fCP7#J>>%P*Bur633>7K;QyfbaVRL4fCZD5a>^>ogh->h(Gs
h8ylo)T9Z;%egi1<JC1HQsGk4;002ovPDHLkV1kKpHhcg8

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/icons/italic.png b/view/theme/diabook/icons/italic.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf4b2b81d8817fd280d8374ea078466b843d1972
GIT binary patch
literal 577
zcmV-H0>1r;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10lrB@K~y-6m61<t)Ib=<pQfqXjKNHHBW#OGse-!a{RCc1v9KbF
zAW9KM5cGS9R}noZc#+Z`ML&Y{Aib2X2lZgdTGLH7E;HG8CW(i2*KV7DeP9kR@4w&s
z%+!aE?{5b|@Jvckvls)j7%a;IV+^yi7Ea8}fRsX#NC+VyrG$_IG#CV@9Ot3=?fciK
z%S$UY&+~8`1^a=wx%ugZ>HD42wrwLxl4A|9PuggIX}cy7A<MFf<l6cMp1*u`r0IIA
zg$MUm$FWihCJ`ae^U1<%E!?_!17R5A(c>q0`{p$OKx>UOP5%v`zXJ{vWLXBSH9l``
z;o{{>kWv<&L5g4!sUrj<{n*{b;=)2{UXg}DgCRlD>-av-ojp^UC!*pLM%oL0VSaAD
zG+$~W0QCEP7zR+QR!dJ96C8AQq|VO{E-aoe-F|?e*u-wPi+a6Yx_wAc@Qv#mYlwfx
z<9MgNjjCJ2)#a5kf=LhV-dTlV7!!qQnj((l!~H`K6e(W_F;}Tn#_0betu@SPb8o8I
zY+h+J8t;S<9_Jjc>w<F*$8o?p2V)FE2t-kYUayBJiV%h&@;u+SEbIOsmVPKWyRUw9
P00000NkvXXu0mjf-R1ZW

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/icons/underline.png b/view/theme/diabook/icons/underline.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1b4d3574179d600b436995c4d4fa0c906f9107b
GIT binary patch
literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10oh4JK~y-6m6Abg)Ib=9-_)tQGaJmLjSF4$P>+lBv`|4PR!?oI
z`U|`Y-Ua;y3W`TX|ABu%^iWg;sq`1rgL+$8(`>dbljNIB#)G>tq3c3F_zo}M%sVg7
zH_qF4Z|;O)_$*1(G8Y1Z3vkXMgg~>&advSLq&3nsfl>-dl0YR2lx5*L&%4LI|M>QF
zcjxwU5Ck|)g-2m<aPZ|N>-T@2cU>20nx4wQZMiu7dgw0@5sIQH`^MIGO;>yC<}GAd
zR%)#^7!ko*TROLdsOf5n$!t2;G%+ZOqGG^nx^B=cUk3ov1V*Im30nV8&=LXwDhYBh
z%IXQkoCKV6SZn_!Ai@cVmsVF1MbQa>Q550gg$^9YsX<(rLY(%M^>uvw^a01ek70~~
zF$QrQWAFVQHm+{e&JxjIh{l*Q=Gx^obXGdp-~WukuK@s{-EL#^+9sC#CFFTto}H|*
z4pD0jU;5bD-UVX})>;^2kftfL)-@(HYmER<6a~iP@l24_n)#9LKYTFv(vwGzD+vfp
zlkO{}RvL{40N~a07jq4wC;|ZFc@B1l4V+%DcfH%~zE(;FQcC!~4=E))&x4c_LI^0O
q5XUh_qY>gb#&9@<wf2Z}e)kUy)?Oj#=1(&K0000<MNUMnLSTX#F9f&%

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 9e57c17d2c..ed7c76cbe9 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1241,6 +1241,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .wall-item-decor {
   position: absolute;
@@ -1385,7 +1386,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 95e9061bab..51eb612533 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -1235,6 +1235,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .wall-item-decor {
   position: absolute;
@@ -1379,7 +1380,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index d11e3191ab..229076484f 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -83,6 +83,27 @@
 #adminpage .selectall { text-align: right; }
 /* icons */
 
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
 .icon.contacts {
   background-image: url("../../../view/theme/diabook/icons/contacts.png");}
 .icon.notifications {
@@ -1269,6 +1290,7 @@ body .pageheader{
   padding: 5px;
   margin-bottom: 0px;
   width: 775px;
+  padding-top: 10px;
 }
 
 .wall-item-decor {
@@ -1516,7 +1538,7 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 17px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 924639625e..bf31c08ebb 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.015)
+ * Version: (Version: 1.016)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.015)";
+$diabook_version = "Diabook (Version: 1.016)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -519,4 +519,31 @@ function restore_boxes(){
 	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
 	alert("Right-hand column was restored. Please refresh your browser");
   }
-</script>';}
\ No newline at end of file
+</script>';}
+
+$a->page['htmlhead'] .= ' 
+
+<script type="text/javascript">
+function insertFormatting(BBcode,id) {
+	
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == "Kommentar") {
+			tmpStr = "";
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+											}
+
+	textarea = document.getElementById("comment-edit-text-" +id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+	}
+	return true;
+}
+</script> ';
\ No newline at end of file