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/5] 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/5] 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/5] 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 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 4/5] 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 2072fabc7891a7c659e4e7c1bac926535c265a23 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 9 Apr 2012 16:54:39 -0700
Subject: [PATCH 5/5] rev update

---
 boot.php         |  2 +-
 util/messages.po | 58 ++++++++++++++++++++++++------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/boot.php b/boot.php
index 1815d37e27..c8f3e0b72a 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1306' );
+define ( 'FRIENDICA_VERSION',      '2.3.1307' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1137      );
 
diff --git a/util/messages.po b/util/messages.po
index 2749281a9c..d4d2e5d82f 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1306\n"
+"Project-Id-Version: 2.3.1307\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-08 10:00-0700\n"
+"POT-Creation-Date: 2012-04-09 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Contact update failed."
 msgstr ""
 
-#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43
+#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866
 #: ../../mod/editpost.php:10 ../../mod/install.php:171
@@ -50,7 +50,7 @@ msgstr ""
 #: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
 #: ../../mod/profile_photo.php:163 ../../mod/message.php:38
 #: ../../mod/message.php:91 ../../mod/allfriends.php:9
-#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
+#: ../../mod/wall_upload.php:46 ../../mod/follow.php:8 ../../mod/common.php:9
 #: ../../mod/display.php:138 ../../mod/profiles.php:7
 #: ../../mod/profiles.php:232 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
@@ -173,12 +173,12 @@ msgstr ""
 msgid "Page not found."
 msgstr ""
 
-#: ../../mod/wall_attach.php:57
+#: ../../mod/wall_attach.php:58
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/wall_attach.php:85 ../../mod/wall_attach.php:96
+#: ../../mod/wall_attach.php:86 ../../mod/wall_attach.php:97
 msgid "File upload failed."
 msgstr ""
 
@@ -420,12 +420,12 @@ msgid "Image file is empty."
 msgstr ""
 
 #: ../../mod/photos.php:654 ../../mod/profile_photo.php:124
-#: ../../mod/wall_upload.php:65
+#: ../../mod/wall_upload.php:69
 msgid "Unable to process image."
 msgstr ""
 
 #: ../../mod/photos.php:674 ../../mod/profile_photo.php:257
-#: ../../mod/wall_upload.php:84
+#: ../../mod/wall_upload.php:88
 msgid "Image upload failed."
 msgstr ""
 
@@ -2753,8 +2753,8 @@ msgstr ""
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:373 ../../mod/wall_upload.php:81
-#: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
+#: ../../mod/item.php:373 ../../mod/wall_upload.php:85
+#: ../../mod/wall_upload.php:94 ../../mod/wall_upload.php:101
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
@@ -2805,7 +2805,7 @@ msgstr ""
 msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:56
+#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:60
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
@@ -5339,7 +5339,7 @@ msgstr ""
 msgid "j F"
 msgstr ""
 
-#: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
+#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
 #: ../../include/items.php:1392
 msgid "Birthday:"
 msgstr ""
@@ -6097,71 +6097,71 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../../include/datetime.php:121 ../../include/datetime.php:253
+#: ../../include/datetime.php:131 ../../include/datetime.php:263
 msgid "year"
 msgstr ""
 
-#: ../../include/datetime.php:126 ../../include/datetime.php:254
+#: ../../include/datetime.php:136 ../../include/datetime.php:264
 msgid "month"
 msgstr ""
 
-#: ../../include/datetime.php:131 ../../include/datetime.php:256
+#: ../../include/datetime.php:141 ../../include/datetime.php:266
 msgid "day"
 msgstr ""
 
-#: ../../include/datetime.php:244
+#: ../../include/datetime.php:254
 msgid "never"
 msgstr ""
 
-#: ../../include/datetime.php:250
+#: ../../include/datetime.php:260
 msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/datetime.php:253
+#: ../../include/datetime.php:263
 msgid "years"
 msgstr ""
 
-#: ../../include/datetime.php:254
+#: ../../include/datetime.php:264
 msgid "months"
 msgstr ""
 
-#: ../../include/datetime.php:255
+#: ../../include/datetime.php:265
 msgid "week"
 msgstr ""
 
-#: ../../include/datetime.php:255
+#: ../../include/datetime.php:265
 msgid "weeks"
 msgstr ""
 
-#: ../../include/datetime.php:256
+#: ../../include/datetime.php:266
 msgid "days"
 msgstr ""
 
-#: ../../include/datetime.php:257
+#: ../../include/datetime.php:267
 msgid "hour"
 msgstr ""
 
-#: ../../include/datetime.php:257
+#: ../../include/datetime.php:267
 msgid "hours"
 msgstr ""
 
-#: ../../include/datetime.php:258
+#: ../../include/datetime.php:268
 msgid "minute"
 msgstr ""
 
-#: ../../include/datetime.php:258
+#: ../../include/datetime.php:268
 msgid "minutes"
 msgstr ""
 
-#: ../../include/datetime.php:259
+#: ../../include/datetime.php:269
 msgid "second"
 msgstr ""
 
-#: ../../include/datetime.php:259
+#: ../../include/datetime.php:269
 msgid "seconds"
 msgstr ""
 
-#: ../../include/datetime.php:267
+#: ../../include/datetime.php:277
 #, php-format
 msgid "%1$d %2$s ago"
 msgstr ""