X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=05b33abd6ef93d1d4d3f5cea4e5e0e5d8e806065;hb=ffdcbd798f0253529fa373b59c769f9db49bf97c;hp=60fccc0ea18787d363d706eaed8ac7deae30d71f;hpb=a985ad4a5407c3cbc0d0a3919e19ddd99bf108af;p=friendica.git

diff --git a/boot.php b/boot.php
index 60fccc0ea1..05b33abd6e 100644
--- a/boot.php
+++ b/boot.php
@@ -2,13 +2,17 @@
 
 set_time_limit(0);
 
-define ( 'BUILD_ID',               1014   );
+define ( 'BUILD_ID',               1033   );
+define ( 'FRIENDIKA_VERSION',      '2.01.1005' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.0'  );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
-
-// log levels
+define ( 'DOWN_ARROW',             '&#x21e9;'       );
+         
+/**
+ * log levels
+ */
 
 define ( 'LOGGER_NORMAL',          0 );
 define ( 'LOGGER_TRACE',           1 );
@@ -16,37 +20,56 @@ define ( 'LOGGER_DEBUG',           2 );
 define ( 'LOGGER_DATA',            3 );
 define ( 'LOGGER_ALL',             4 );
 
-// registration policy
+/**
+ * registration policies
+ */
 
 define ( 'REGISTER_CLOSED',        0 );
 define ( 'REGISTER_APPROVE',       1 );
 define ( 'REGISTER_OPEN',          2 );
 
-// relationship types
+/**
+ * relationship types
+ */
 
 define ( 'REL_VIP',        1);
 define ( 'REL_FAN',        2);
 define ( 'REL_BUD',        3);
 
-
-// page/profile types
-// PAGE_NORMAL is a typical personal profile account
-// PAGE_SOAPBOX automatically approves all friend requests as REL_FAN, (readonly)
-// PAGE_COMMUNITY automatically approves all friend requests as REL_FAN, 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 (REL_BUD). 
+/**
+ * Hook array order
+ */
+ 
+define ( 'HOOK_HOOK',      0);
+define ( 'HOOK_FILE',      1);
+define ( 'HOOK_FUNCTION',  2);
+
+/**
+ *
+ * page/profile types
+ *
+ * PAGE_NORMAL is a typical personal profile account
+ * PAGE_SOAPBOX automatically approves all friend requests as REL_FAN, (readonly)
+ * PAGE_COMMUNITY automatically approves all friend requests as REL_FAN, 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 (REL_BUD). 
+ *
+ */
 
 define ( 'PAGE_NORMAL',            0 );
 define ( 'PAGE_SOAPBOX',           1 );
 define ( 'PAGE_COMMUNITY',         2 );
 define ( 'PAGE_FREELOVE',          3 );
 
-// Maximum number of "people who like (or don't like) this" 
-// that we will list by name
+/**
+ * Maximum number of "people who like (or don't like) this"  that we will list by name
+ */
 
 define ( 'MAX_LIKERS',    75);
 
-// email notification options
+/**
+ * email notification options
+ */
 
 define ( 'NOTIFY_INTRO',   0x0001 );
 define ( 'NOTIFY_CONFIRM', 0x0002 );
@@ -54,7 +77,9 @@ define ( 'NOTIFY_WALL',    0x0004 );
 define ( 'NOTIFY_COMMENT', 0x0008 );
 define ( 'NOTIFY_MAIL',    0x0010 );
 
-// various namespaces we may need to parse
+/**
+ * various namespaces we may need to parse
+ */
 
 define ( 'NAMESPACE_DFRN' ,           'http://purl.org/macgirvin/dfrn/1.0' ); 
 define ( 'NAMESPACE_THREAD' ,         'http://purl.org/syndication/thread/1.0' );
@@ -68,7 +93,9 @@ define ( 'NAMESPACE_GEORSS',          'http://www.georss.org/georss' );
 define ( 'NAMESPACE_POCO',            'http://portablecontacts.net/spec/1.0' );
 define ( 'NAMESPACE_FEED',            'http://schemas.google.com/g/2010#updates-from' );
 
-// activity stream defines
+/**
+ * activity stream defines
+ */
 
 define ( 'ACTIVITY_LIKE',        NAMESPACE_ACTIVITY_SCHEMA . 'like' );
 define ( 'ACTIVITY_DISLIKE',     NAMESPACE_DFRN            . '/dislike' );
@@ -76,9 +103,10 @@ define ( 'ACTIVITY_OBJ_HEART',   NAMESPACE_DFRN            . '/heart' );
 
 define ( 'ACTIVITY_FRIEND',      NAMESPACE_ACTIVITY_SCHEMA . 'make-friend' );
 define ( 'ACTIVITY_FOLLOW',      NAMESPACE_ACTIVITY_SCHEMA . 'follow' );
-define ( 'ACTIVITY_UNFOLLOW',    NAMESPACE_ACTIVITY_SCHEMA . 'unfollow' );
+define ( 'ACTIVITY_UNFOLLOW',    NAMESPACE_ACTIVITY_SCHEMA . 'stop-following' );
 define ( 'ACTIVITY_POST',        NAMESPACE_ACTIVITY_SCHEMA . 'post' );
 define ( 'ACTIVITY_UPDATE',      NAMESPACE_ACTIVITY_SCHEMA . 'update' );
+define ( 'ACTIVITY_TAG',         NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
 
 define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
 define ( 'ACTIVITY_OBJ_NOTE',    NAMESPACE_ACTIVITY_SCHEMA . 'note' );
@@ -87,24 +115,57 @@ define ( 'ACTIVITY_OBJ_PHOTO',   NAMESPACE_ACTIVITY_SCHEMA . 'photo' );
 define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' );
 define ( 'ACTIVITY_OBJ_ALBUM',   NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' );
 
-// item weight for query ordering
+/**
+ * item weight for query ordering
+ */
 
 define ( 'GRAVITY_PARENT',       0);
 define ( 'GRAVITY_LIKE',         3);
 define ( 'GRAVITY_COMMENT',      6);
 
-
-// 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 
-// stores our page contents and config storage
-// and anything else that might need to be passed around 
-// before we spit the page out. 
+/**
+ *
+ * Reverse the effect of magic_quotes_gpc if it is enabled.
+ * Please disable magic_quotes_gpc so we don't have to do this.
+ * See http://php.net/manual/en/security.magicquotes.disabling.php
+ *
+ */
+
+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);
+}
+
+
+/**
+ *
+ * class: App
+ *
+ * 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 
+ * stores our page contents and config storage
+ * and anything else that might need to be passed around 
+ * before we spit the page out. 
+ *
+ */
 
 if(! class_exists('App')) {
 class App {
 
 	public  $module_loaded = false;
+	public  $query_string;
 	public  $config;
 	public  $page;
 	public  $profile;
@@ -121,8 +182,11 @@ class App {
 	public  $pager;
 	public  $strings;   
 	public  $path;
+	public  $hooks;
+	public  $timezone;
 	public  $interactive = true;
 
+
 	private $scheme;
 	private $hostname;
 	private $baseurl;
@@ -137,6 +201,8 @@ class App {
 		$this->page = array();
 		$this->pager= array();
 
+		$this->query_string = '';
+
 		$this->scheme = ((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']))	?  'https' : 'http' );
 
 		if(x($_SERVER,'SERVER_NAME'))
@@ -144,11 +210,35 @@ class App {
 
 		set_include_path("include/$this->hostname" . PATH_SEPARATOR . 'include' . PATH_SEPARATOR . '.' );
 
-		if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) == "q=")
-			$_SERVER['QUERY_STRING'] = substr($_SERVER['QUERY_STRING'],2);
+		if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=")
+			$this->query_string = substr($_SERVER['QUERY_STRING'],2);
 		if(x($_GET,'q'))
-			$this->cmd = trim($_GET['q'],'/');
-
+			$this->cmd = trim($_GET['q'],'/\\');
+
+		/** 
+		 * 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;
+
+
+		/**
+		 *
+		 * 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);
@@ -159,9 +249,20 @@ class App {
 			$this->module = 'home';
 		}
 
+		/**
+		 * Special handling for the webfinger/lrdd host XRD file
+		 * Just spit out the contents and exit.
+		 */
+
 		if($this->cmd === '.well-known/host-meta')
 			require_once('include/hostxrd.php');
 
+
+		/**
+		 * 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'];
@@ -208,9 +309,11 @@ class App {
 	} 
 
 	function init_pagehead() {
+		$this->page['title'] = $this->config['sitename'];
 		$tpl = load_view_file("view/head.tpl");
 		$this->page['htmlhead'] = replace_macros($tpl,array(
-			'$baseurl' => $this->get_baseurl()
+			'$baseurl' => $this->get_baseurl() . '/',
+			'$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION
 		));
 	}
 
@@ -280,7 +383,8 @@ function system_unavailable() {
 
 // Primarily involved with database upgrade, but also sets the 
 // base url for use in cmdline programs which don't have
-// $_SERVER variables.
+// $_SERVER variables, and synchronising the state of installed plugins.
+
 
 if(! function_exists('check_config')) {
 function check_config(&$a) {
@@ -312,6 +416,70 @@ function check_config(&$a) {
 			set_config('system','build', BUILD_ID);
 		}
 	}
+
+	/**
+	 *
+	 * 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();
+
+	$plugins = get_config('system','addon');
+	$plugins_arr = array();
+
+	if($plugins)
+		$plugins_arr = explode(',',str_replace(' ', '',$plugins));
+
+	$installed_arr = array();
+
+	if(count($installed)) {
+		foreach($installed as $i) {
+			if(! in_array($i['name'],$plugins_arr)) {
+				logger("Addons: uninstalling " . $i['name']);
+				q("DELETE FROM `addon` WHERE `id` = %d LIMIT 1",
+					intval($i['id'])
+				);
+
+				@include_once('addon/' . $i['name'] . '/' . $i['name'] . '.php');
+				if(function_exists($i['name'] . '_uninstall')) {
+					$func = $i['name'] . '_uninstall';
+					$func();
+				}
+			}
+			else
+				$installed_arr[] = $i['name'];
+		}
+	}
+
+	if(count($plugins_arr)) {
+		foreach($plugins_arr as $p) {
+			if(! in_array($p,$installed_arr)) {
+				logger("Addons: installing " . $p);
+				@include_once('addon/' . $p . '/' . $p . '.php');
+				if(function_exists($p . '_install')) {
+					$func = $p . '_install';
+					$func();
+					$r = q("INSERT INTO `addon` (`name`, `installed`) VALUES ( '%s', 1 ) ",
+						dbesc($p)
+					);
+				}
+			}
+		}
+	}
+
 	return;
 }}
 
@@ -354,10 +522,10 @@ function load_translation_table($lang) {
 
 if(! function_exists('t')) {
 function t($s) {
-	
+
 	$a = get_app();
 
-	if($a->strings[$s])
+	if(x($a->strings,$s))
 		return $a->strings[$s];
 	return $s;
 }}
@@ -367,6 +535,9 @@ function t($s) {
 
 if(! function_exists('fetch_url')) {
 function fetch_url($url,$binary = false, &$redirects = 0) {
+
+	$a = get_app();
+
 	$ch = curl_init($url);
 	if(($redirects > 8) || (! $ch)) 
 		return false;
@@ -374,6 +545,10 @@ function fetch_url($url,$binary = false, &$redirects = 0) {
 	curl_setopt($ch, CURLOPT_HEADER, true);
 	curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
 
+
+	$curl_time = intval(get_config('system','curl_timeout'));
+	curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
+
 	// by default we will allow self-signed certs
 	// but you can override this
 
@@ -391,9 +566,14 @@ function fetch_url($url,$binary = false, &$redirects = 0) {
 	if($binary)
 		curl_setopt($ch, CURLOPT_BINARYTRANSFER,1);
 
-	$s = curl_exec($ch);
+	$a->set_curl_code(0);
+
+	// don't let curl abort the entire application
+	// if it throws any errors.
+
+	$s = @curl_exec($ch);
 
-	$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+	$http_code = intval(curl_getinfo($ch, CURLINFO_HTTP_CODE));
 	$header = substr($s,0,strpos($s,"\r\n\r\n"));
 	if(stristr($header,'100') && (strlen($header) < 30)) {
 		// 100 Continue has two headers, get the real one
@@ -410,7 +590,6 @@ function fetch_url($url,$binary = false, &$redirects = 0) {
             return fetch_url($url,$binary,$redirects);
         }
     }
-	$a = get_app();
 	$a->set_curl_code($http_code);
 	$body = substr($s,strlen($header)+4);
 	$a->set_curl_headers($header);
@@ -423,6 +602,7 @@ function fetch_url($url,$binary = false, &$redirects = 0) {
 
 if(! function_exists('post_url')) {
 function post_url($url,$params, $headers = null, &$redirects = 0) {
+	$a = get_app();
 	$ch = curl_init($url);
 	if(($redirects > 8) || (! $ch)) 
 		return false;
@@ -432,6 +612,9 @@ function post_url($url,$params, $headers = null, &$redirects = 0) {
 	curl_setopt($ch, CURLOPT_POST,1);
 	curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
 
+	$curl_time = intval(get_config('system','curl_timeout'));
+	curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
+
 	if(is_array($headers))
 		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 
@@ -446,9 +629,14 @@ function post_url($url,$params, $headers = null, &$redirects = 0) {
 			curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr);
 	}
 
-	$s = curl_exec($ch);
+	$a->set_curl_code(0);
+
+	// don't let curl abort the entire application
+	// if it throws any errors.
+
+	$s = @curl_exec($ch);
 
-	$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+	$http_code = intval(curl_getinfo($ch, CURLINFO_HTTP_CODE));
 	$header = substr($s,0,strpos($s,"\r\n\r\n"));
 	if(stristr($header,'100') && (strlen($header) < 30)) {
 		// 100 Continue has two headers, get the real one
@@ -465,7 +653,6 @@ function post_url($url,$params, $headers = null, &$redirects = 0) {
             return post_url($url,$binary,$headers,$redirects);
         }
     }
-	$a = get_app();
 	$a->set_curl_code($http_code);
 	$body = substr($s,strlen($header)+4);
 	$a->set_curl_headers($header);
@@ -481,16 +668,29 @@ function random_string() {
 	return(hash('sha256',uniqid(rand(),true)));
 }}
 
-// This is our primary input filter. The high bit hack only involved some old
-// IE browser, forget which. 
-// Use this on any text input where angle chars are not valid or permitted
-// They will be replaced with safer brackets. This may be filtered further
-// if these are not allowed either.   
+/**
+ * This is our primary input filter. 
+ *
+ * The high bit hack only involved some old IE browser, forget which (IE5/Mac?)
+ * that had an XSS attack vector due to stripping the high-bit on an 8-bit character
+ * after cleansing, and angle chars with the high bit set could get through as markup.
+ * 
+ * This is now disabled because it was interfering with some legitimate unicode sequences 
+ * and hopefully there aren't a lot of those browsers left. 
+ *
+ * Use this on any text input where angle chars are not valid or permitted
+ * They will be replaced with safer brackets. This may be filtered further
+ * if these are not allowed either.   
+ *
+ */
 
 if(! function_exists('notags')) {
 function notags($string) {
-	// protect against :<> with high-bit set
-	return(str_replace(array("<",">","\xBA","\xBC","\xBE"), array('[',']','','',''), $string));
+
+	return(str_replace(array("<",">"), array('[',']'), $string));
+
+//  High-bit filter no longer used
+//	return(str_replace(array("<",">","\xBA","\xBC","\xBE"), array('[',']','','',''), $string));
 }}
 
 // use this on "body" or "content" input where angle chars shouldn't be removed,
@@ -511,15 +711,40 @@ function login($register = false) {
 	$o = "";
 	$register_html = (($register) ? load_view_file("view/register-link.tpl") : "");
 
+	$noid = get_config('system','no_openid');
+	if($noid) {
+		$classname = 'no-openid';
+		$namelabel = t('Nickname or Email address: ');
+		$passlabel = t('Password: ');
+		$login     = t('Login');
+	}
+	else {
+		$classname = 'openid';
+		$namelabel = t('Nickname/Email/OpenID: ');
+		$passlabel = t("Password \x28if not OpenID\x29: ");
+		$login     = t('Login');
+	}
+	$lostpass = t('Forgot your password?');
+	$lostlink = t('Password Reset');
 
 	if(x($_SESSION,'authenticated')) {
-		$o = load_view_file("view/logout.tpl");
+		$tpl = load_view_file("view/logout.tpl");
 	}
 	else {
-		$o = load_view_file("view/login.tpl");
+		$tpl = load_view_file("view/login.tpl");
 
-		$o = replace_macros($o,array('$register_html' => $register_html ));
 	}
+	
+	$o = replace_macros($tpl,array(
+		'$register_html' => $register_html, 
+		'$classname' => $classname,
+		'$namelabel' => $namelabel,
+		'$passlabel' => $passlabel,
+		'$login' => $login,
+		'$lostpass' => $lostpass,
+		'$lostlink' => $lostlink 
+	));
+
 	return $o;
 }}
 
@@ -619,6 +844,9 @@ function xml_status($st, $message = '') {
 
 	$xml_message = ((strlen($message)) ? "\t<message>" . xmlify($message) . "</message>\r\n" : '');
 
+	if($st)
+		logger('xml_status returning non_zero: ' . $st . " message=" . $message);
+
 	header( "Content-type: text/xml" );
 	echo '<?xml version="1.0" encoding="UTF-8"?>'."\r\n";
 	echo "<result>\r\n\t<status>$st</status>\r\n$xml_message</result>\r\n";
@@ -682,7 +910,6 @@ function xmlify($str) {
 			case "'" :
 				$buffer .= '&apos;';
 				break;
-
 			case "\"" :
 				$buffer .= '&quot;';
 				break;
@@ -693,7 +920,7 @@ function xmlify($str) {
 				$buffer .= '&gt;';
 				break;
 			case "\n" :
-				$buffer .= ' ';
+				$buffer .= "\n";
 				break;
 			default :
 				$buffer .= $char;
@@ -718,6 +945,11 @@ function unxmlify($s) {
 
 if(! function_exists('hex2bin')) {
 function hex2bin($s) {
+	if(! ctype_xdigit($s)) {
+		logger('hex2bin: illegal input: ' . print_r(debug_backtrace(), true));
+		return($s);
+	}
+
 	return(pack("H*",$s));
 }}
 
@@ -734,7 +966,7 @@ function hex2bin($s) {
 if(! function_exists('paginate')) {
 function paginate(&$a) {
 	$o = '';
-	$stripped = ereg_replace("(&page=[0-9]*)","",$_SERVER['QUERY_STRING']);
+	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
 	$stripped = str_replace('q=','',$stripped);
 	$stripped = trim($stripped,'/');
 	$url = $a->get_baseurl() . '/' . $stripped;
@@ -871,7 +1103,6 @@ if(! function_exists('set_config')) {
 function set_config($family,$key,$value) {
 
 	global $a;
-	$a->config[$family][$key] = $value;
 
 	if(get_config($family,$key,true) === false) {
 		$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
@@ -888,11 +1119,125 @@ function set_config($family,$key,$value) {
 		dbesc($family),
 		dbesc($key)
 	);
+
+	$a->config[$family][$key] = $value;
+
+	if($ret)
+		return $value;
+	return $ret;
+}}
+
+
+if(! function_exists('load_pconfig')) {
+function load_pconfig($uid,$family) {
+	global $a;
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d",
+		dbesc($family),
+		intval($uid)
+	);
+	if(count($r)) {
+		foreach($r as $rr) {
+			$k = $rr['k'];
+			$a->config[$uid][$family][$k] = $rr['v'];
+		}
+	}
+}}
+
+
+
+if(! function_exists('get_pconfig')) {
+function get_pconfig($uid,$family, $key, $instore = false) {
+
+	global $a;
+
+	if(! $instore) {
+		if(isset($a->config[$uid][$family][$key])) {
+			if($a->config[$uid][$family][$key] === '!<unset>!') {
+				return false;
+			}
+			return $a->config[$uid][$family][$key];
+		}
+	}
+
+	$ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+		intval($uid),
+		dbesc($family),
+		dbesc($key)
+	);
+
+	if(count($ret)) {
+		$a->config[$uid][$family][$key] = $ret[0]['v'];
+		return $ret[0]['v'];
+	}
+	else {
+		$a->config[$uid][$family][$key] = '!<unset>!';
+	}
+	return false;
+}}
+
+if(! function_exists('del_config')) {
+function del_config($family,$key) {
+
+	global $a;
+	if(x($a->config[$family],$key))
+		unset($a->config[$family][$key]);
+	$ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
+		dbesc($cat),
+		dbesc($key)
+	);
+	return $ret;
+}}
+
+
+
+// Same as above functions except these are for personal config storage and take an
+// additional $uid argument.
+
+if(! function_exists('set_pconfig')) {
+function set_pconfig($uid,$family,$key,$value) {
+
+	global $a;
+
+	if(get_pconfig($uid,$family,$key,true) === false) {
+		$ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
+			intval($uid),
+			dbesc($family),
+			dbesc($key),
+			dbesc($value)
+		);
+		if($ret) 
+			return $value;
+		return $ret;
+	}
+	$ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+		dbesc($value),
+		intval($uid),
+		dbesc($family),
+		dbesc($key)
+	);
+
+	$a->config[$uid][$family][$key] = $value;
+
 	if($ret)
 		return $value;
 	return $ret;
 }}
 
+if(! function_exists('del_pconfig')) {
+function del_pconfig($uid,$family,$key) {
+
+	global $a;
+	if(x($a->config[$uid][$family],$key))
+		unset($a->config[$uid][$family][$key]);
+	$ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+		intval($uid),
+		dbesc($cat),
+		dbesc($key)
+	);
+	return $ret;
+}}
+
+
 // convert an XML document to a normalised, case-corrected array
 // used by webfinger
 
@@ -953,6 +1298,7 @@ function webfinger_dfrn($s) {
 		return $s;
 	}
 	$links = webfinger($s);
+	logger('webfinger_dfrn: ' . $s . ':' . print_r($links,true), LOGGER_DATA);
 	if(count($links)) {
 		foreach($links as $link)
 			if($link['@attributes']['rel'] === NAMESPACE_DFRN)
@@ -977,6 +1323,7 @@ function webfinger($s) {
 	}
 	if(strlen($host)) {
 		$tpl = fetch_lrdd_template($host);
+		logger('webfinger: lrdd template: ' . $tpl);
 		if(strlen($tpl)) {
 			$pxrd = str_replace('{uri}', urlencode('acct:'.$s), $tpl);
 			$links = fetch_xrd_links($pxrd);
@@ -1065,9 +1412,12 @@ function fetch_lrdd_template($host) {
 if(! function_exists('fetch_xrd_links')) {
 function fetch_xrd_links($url) {
 
+
 	$xml = fetch_url($url);
 	if (! $xml)
 		return array();
+
+	logger('fetch_xrd_links: ' . $xml, LOGGER_DATA);
 	$h = simplexml_load_string($xml);
 	$arr = convert_xml_element_to_array($h);
 
@@ -1144,13 +1494,25 @@ function validate_url(&$url) {
 		$url = 'http://' . $url;
 	$h = parse_url($url);
 
-	if(! $h) {
-		return false;
+	if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR))) {
+		return true;
 	}
-	if(! checkdnsrr($h['host'], 'ANY')) {
+	return false;
+}}
+
+// checks that email is an actual resolvable internet address
+
+if(! function_exists('validate_email')) {
+function validate_email($addr) {
+
+	if(! strpos($addr,'@'))
 		return false;
+	$h = substr($addr,strpos($addr,'@') + 1);
+
+	if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX))) {
+		return true;
 	}
-	return true;
+	return false;
 }}
 
 // Check $url against our list of allowed sites,
@@ -1267,7 +1629,9 @@ function load_view_file($s) {
 	$b = basename($s);
 	$d = dirname($s);
 	$lang = get_config('system','language');
-	if($lang && file_exists("$d/$lang/$b"))
+	if($lang === false)
+		$lang = 'en';
+	if(file_exists("$d/$lang/$b"))
 		return file_get_contents("$d/$lang/$b");
 	return file_get_contents($s);
 }}
@@ -1323,8 +1687,12 @@ function activity_match($haystack,$needle) {
 if(! function_exists('get_tags')) {
 function get_tags($s) {
 	$ret = array();
-	if(preg_match_all('/([@#][^ ,:?]*)([ ,:?]|$)/',$s,$match)) {
+	if(preg_match_all('/([@#][^ \x0D\x0A,:?]*)([ \x0D\x0A,:?]|$)/',$s,$match)) {
 		foreach($match[1] as $match) {
+			if(strstr($match,"]")) {
+				// we might be inside a bbcode color tag - leave it alone
+				continue;
+			}
 			if(substr($match,-1,1) === '.')
 				$ret[] = substr($match,0,-1);
 			else
@@ -1352,8 +1720,8 @@ function like_puller($a,$item,&$arr,$mode) {
 	$verb = (($mode === 'like') ? ACTIVITY_LIKE : ACTIVITY_DISLIKE);
 
 	if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
-		$url = $item['url'];
-		if(($item['network'] === 'dfrn') && (! $item['self'])) {
+		$url = $item['author-link'];
+		if(($item['network'] === 'dfrn') && (! $item['self']) && ($item['author-link'] == $item['url'])) {
 			$url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
 			$sparkle = ' class="sparkle" ';
 		}
@@ -1363,12 +1731,12 @@ function like_puller($a,$item,&$arr,$mode) {
 			$arr[$item['parent']] = 1;
 		else	
 			$arr[$item['parent']] ++;
-		$arr[$item['parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . $item['name'] . '</a>';
+		$arr[$item['parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . $item['author-name'] . '</a>';
 	}
 	return;
 }}
 
-
+if(! function_exists('get_mentions')) {
 function get_mentions($item) {
 	$o = '';
 	if(! strlen($item['tag']))
@@ -1381,4 +1749,464 @@ function get_mentions($item) {
 			$o .= "\t\t" . '<link rel="mentioned" href="' . $matches[1] . '" />' . "\r\n";
 	}
 	return $o;
-}
\ No newline at end of file
+}}
+
+if(! function_exists('contact_block')) {
+function contact_block() {
+	$o = '';
+	$a = get_app();
+
+	$shown = get_pconfig($a->profile['uid'],'system','display_friend_count');
+	if(! $shown)
+		$shown = 24;
+
+	if((! is_array($a->profile)) || ($a->profile['hide-friends']))
+		return $o;
+	$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0",
+			intval($a->profile['uid'])
+	);
+	if(count($r)) {
+		$total = intval($r[0]['total']);
+	}
+	if(! $total) {
+		$o .= '<h4 class="contact-h4">' . t('No contacts') . '</h4>';
+		return $o;
+	}
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 ORDER BY RAND() LIMIT %d",
+			intval($a->profile['uid']),
+			intval($shown)
+	);
+	if(count($r)) {
+		$o .= '<h4 class="contact-h4">' . $total . ' ' . t('Contacts') . '</h4><div id="contact-block">';
+		foreach($r as $rr) {
+			$redirect_url = $a->get_baseurl() . '/redir/' . $rr['id'];
+			if(local_user() && ($rr['uid'] == local_user())
+				&& ($rr['network'] === 'dfrn')) {
+				$url = $redirect_url;
+				$sparkle = ' sparkle';
+			}
+			else {
+				$url = $rr['url'];
+				$sparkle = '';
+			}
+
+			$o .= '<div class="contact-block-div"><a class="contact-block-link' . $sparkle . '" href="' . $url . '" ><img class="contact-block-img' . $sparkle . '" src="' . $rr['micro'] . '" title="' . $rr['name'] . ' [' . $rr['url'] . ']" alt="' . $rr['name'] . '" /></a></div>' . "\r\n";
+		}
+		$o .= '</div><div id="contact-block-end"></div>';
+		$o .=  '<div id="viewcontacts"><a id="viewcontacts-link" href="viewcontacts/' . $a->profile['nickname'] . '">' . t('View Contacts') . '</a></div>';
+		
+	}
+
+	$arr = array('contacts' => $r, 'output' => $o);
+
+	call_hooks('contact_block_end', $arr);
+	return $o;
+
+}}
+
+if(! function_exists('search')) {
+function search($s) {
+	$a = get_app();
+	$o  = '<div id="search-box">';
+	$o .= '<form action="' . $a->get_baseurl() . '/search' . '" method="get" >';
+	$o .= '<input type="text" name="search" id="search-text" value="' . $s .'" />';
+	$o .= '<input type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />'; 
+	$o .= '</form></div>';
+	return $o;
+}}
+
+if(! function_exists('valid_email')) {
+function valid_email($x){
+	if(preg_match('/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
+		return true;
+	return false;
+}}
+
+
+if(! function_exists('gravatar_img')) {
+function gravatar_img($email) {
+	$size = 175;
+	$opt = 'identicon';   // psuedo-random geometric pattern if not found
+	$rating = 'pg';
+	$hash = md5(trim(strtolower($email)));
+	
+	$url = 'http://www.gravatar.com/avatar/' . $hash . '.jpg' 
+		. '?s=' . $size . '&d=' . $opt . '&r=' . $rating;
+
+	logger('gravatar: ' . $email . ' ' . $url);
+	return $url;
+}}
+
+if(! function_exists('aes_decrypt')) {
+function aes_decrypt($val,$ky)
+{
+    $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+    for($a=0;$a<strlen($ky);$a++)
+      $key[$a%16]=chr(ord($key[$a%16]) ^ ord($ky[$a]));
+    $mode = MCRYPT_MODE_ECB;
+    $enc = MCRYPT_RIJNDAEL_128;
+    $dec = @mcrypt_decrypt($enc, $key, $val, $mode, @mcrypt_create_iv( @mcrypt_get_iv_size($enc, $mode), MCRYPT_DEV_URANDOM ) );
+    return rtrim($dec,(( ord(substr($dec,strlen($dec)-1,1))>=0 and ord(substr($dec, strlen($dec)-1,1))<=16)? chr(ord( substr($dec,strlen($dec)-1,1))):null));
+}}
+
+
+if(! function_exists('aes_encrypt')) {
+function aes_encrypt($val,$ky)
+{
+    $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+    for($a=0;$a<strlen($ky);$a++)
+      $key[$a%16]=chr(ord($key[$a%16]) ^ ord($ky[$a]));
+    $mode=MCRYPT_MODE_ECB;
+    $enc=MCRYPT_RIJNDAEL_128;
+    $val=str_pad($val, (16*(floor(strlen($val) / 16)+(strlen($val) % 16==0?2:1))), chr(16-(strlen($val) % 16)));
+    return mcrypt_encrypt($enc, $key, $val, $mode, mcrypt_create_iv( mcrypt_get_iv_size($enc, $mode), MCRYPT_DEV_URANDOM));
+}} 
+
+
+/**
+ *
+ * Function: linkify
+ *
+ * Replace naked text hyperlink with HTML formatted hyperlink
+ *
+ */
+
+if(! function_exists('linkify')) {
+function linkify($s) {
+	$s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <a href="$1" >$1</a>', $s);
+	return($s);
+}}
+
+
+/**
+ * 
+ * Function: smilies
+ *
+ * Description:
+ * Replaces text emoticons with graphical images
+ *
+ * @Parameter: string $s
+ *
+ * Returns string
+ */
+
+if(! function_exists('smilies')) {
+function smilies($s) {
+	$a = get_app();
+
+	return str_replace(
+	array( ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'),
+	array(
+		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":(" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />'
+	), $s);
+}}
+
+
+/**
+ *
+ * Function : profile_load
+ * @parameter App    $a
+ * @parameter string $nickname
+ * @parameter int    $profile
+ *
+ * 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.
+ *
+ * If the viewer is an authenticated remote viewer, the profile displayed is the
+ * one that has been configured for his/her viewing in the Contact manager.
+ * Passing a non-zero profile ID can also allow a preview of a selected profile
+ * by the owner.
+ *
+ * Profile information is placed in the App structure for later retrieval.
+ * 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'];
+	} 
+
+	$r = null;
+
+	if($profile) {
+		$profile_int = intval($profile);
+		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile` 
+			LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+			WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d LIMIT 1",
+			dbesc($nickname),
+			intval($profile_int)
+		);
+	}
+	if(! count($r)) {	
+		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile` 
+			LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+			WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 LIMIT 1",
+			dbesc($nickname)
+		);
+	}
+
+	if(($r === false) || (! count($r))) {
+		notice( t('No profile') . EOL );
+		$a->error = 404;
+		return;
+	}
+
+	$a->profile = $r[0];
+
+
+	$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
+	$_SESSION['theme'] = $a->profile['theme'];
+
+	if(! (x($a->page,'aside')))
+		$a->page['aside'] = '';
+
+	$a->page['aside'] .= profile_sidebar($a->profile);
+	$a->page['aside'] .= contact_block();
+
+	return;
+}}
+
+
+/**
+ *
+ * Function: profile_sidebar
+ *
+ * Formats a profile for display in the sidebar.
+ * It is very difficult to templatise the HTML completely
+ * because of all the conditional logic.
+ *
+ * @parameter: array $profile
+ *
+ * Returns HTML string stuitable for sidebar inclusion
+ * Exceptions: Returns empty string if passed $profile is wrong type or not populated
+ *
+ */
+
+
+if(! function_exists('profile_sidebar')) {
+function profile_sidebar($profile) {
+
+	$o = '';
+	$location = '';
+	$address = false;
+
+	if((! is_array($profile)) && (! count($profile)))
+		return $o;
+
+	call_hooks('profile_sidebar_enter', $profile);
+
+	$fullname = '<div class="fn">' . $profile['name'] . '</div>';
+
+	$pdesc = '<div class="title">' . $profile['pdesc'] . '</div>';
+
+	$tabs = '';
+
+	$photo = '<div id="profile=photo-wrapper"><img class="photo" src="' . $profile['photo'] . '" alt="' . $profile['name'] . '" /></div>';
+
+	$connect = (($profile['uid'] != local_user()) ? '<li><a id="dfrn-request-link" href="dfrn_request/' . $profile['nickname'] . '">' . t('Connect') . '</a></li>' : '');
+ 
+	if((x($profile,'address') == 1) 
+		|| (x($profile,'locality') == 1) 
+		|| (x($profile,'region') == 1) 
+		|| (x($profile,'postal-code') == 1) 
+		|| (x($profile,'country-name') == 1))
+		$address = true;
+
+	if($address) {
+		$location .= '<div class="location"><span class="location-label">' . t('Location:') . '</span> <div class="adr">';
+		$location .= ((x($profile,'address') == 1) ? '<div class="street-address">' . $profile['address'] . '</div>' : '');
+		$location .= (((x($profile,'locality') == 1) || (x($profile,'region') == 1) || (x($profile,'postal-code') == 1)) 
+			? '<span class="city-state-zip"><span class="locality">' . $profile['locality'] . '</span>' 
+			. ((x($profile['locality']) == 1) ? t(', ') : '') 
+			. '<span class="region">' . $profile['region'] . '</span>'
+			. ' <span class="postal-code">' . $profile['postal-code'] . '</span></span>' : '');
+		$location .= ((x($profile,'country-name') == 1) ? ' <span class="country-name">' . $profile['country-name'] . '</span>' : '');  
+		$location .= '</div></div><div class="profile-clear"></div>';
+
+	}
+
+	$gender = ((x($profile,'gender') == 1) ? '<div class="mf"><span class="gender-label">' . t('Gender:') . '</span> <span class="x-gender">' . $profile['gender'] . '</span></div><div class="profile-clear"></div>' : '');
+
+	$pubkey = ((x($profile,'pubkey') == 1) ? '<div class="key" style="display:none;">' . $profile['pubkey'] . '</div>' : '');
+
+	$marital = ((x($profile,'marital') == 1) ? '<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> ' . t('Status:') . ' </span><span class="marital-text">' . $profile['marital'] . '</span></div></div><div class="profile-clear"></div>' : '');
+
+	$homepage = ((x($profile,'homepage') == 1) ? '<div class="homepage"><span class="homepage-label">' . t('Homepage:') . ' </span><span class="homepage-url">' . linkify($profile['homepage']) . '</span></div></div><div class="profile-clear"></div>' : '');
+
+	$tpl = load_view_file('view/profile_vcard.tpl');
+
+	$o .= replace_macros($tpl, array(
+		'$fullname' => $fullname,
+		'$pdesc'    => $pdesc,
+		'$tabs'     => $tabs,
+		'$photo'    => $photo,
+		'$connect'  => $connect,		
+		'$location' => $location,
+		'$gender'   => $gender,
+		'$pubkey'   => $pubkey,
+		'$marital'  => $marital,
+		'$homepage' => $homepage
+	));
+
+
+	$arr = array('profile' => $profile, 'entry' => $o);
+
+	call_hooks('profile_sidebar', $arr);
+
+	return $o;
+}}
+
+
+if(! function_exists('register_hook')) {
+function register_hook($hook,$file,$function) {
+
+	$r = q("SELECT * FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1",
+		dbesc($hook),
+		dbesc($file),
+		dbesc($function)
+	);
+	if(count($r))
+		return true;
+
+	$r = q("INSERT INTO `hook` (`hook`, `file`, `function`) VALUES ( '%s', '%s', '%s' ) ",
+		dbesc($hook),
+		dbesc($file),
+		dbesc($function)
+	);
+	return $r;
+}}
+
+if(! function_exists('unregister_hook')) {
+function unregister_hook($hook,$file,$function) {
+
+	$r = q("DELETE FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1",
+		dbesc($hook),
+		dbesc($file),
+		dbesc($function)
+	);
+	return $r;
+}}
+
+
+if(! function_exists('load_hooks')) {
+function load_hooks() {
+	$a = get_app();
+	$r = q("SELECT * FROM `hook` WHERE 1");
+	if(count($r)) {
+		foreach($r as $rr) {
+			$a->hooks[] = array($rr['hook'], $rr['file'], $rr['function']);
+		}
+	}
+}}
+
+
+if(! function_exists('call_hooks')) {
+function call_hooks($name, &$data = null) {
+	$a = get_app();
+
+	if(count($a->hooks)) {
+		foreach($a->hooks as $hook) {
+			if($hook[HOOK_HOOK] === $name) {
+				@include_once($hook[HOOK_FILE]);
+				if(function_exists($hook[HOOK_FUNCTION])) {
+					$func = $hook[HOOK_FUNCTION];
+					$func($a,$data);
+				}
+			}
+		}
+	}
+}}
+
+
+if(! function_exists('day_translate')) {
+function day_translate($s) {
+	$ret = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'),
+		array( t('Monday'), t('Tuesday'), t('Wednesday'), t('Thursday'), t('Friday'), t('Saturday'), t('Sunday')),
+		$s);
+
+	$ret = str_replace(array('January','February','March','April','May','June','July','August','September','October','November','December'),
+		array( t('January'), t('February'), t('March'), t('April'), t('May'), t('June'), t('July'), t('August'), t('September'), t('October'), t('November'), t('December')),
+		$ret);
+
+	return $ret;
+}}
+
+if(! function_exists('get_birthdays')) {
+function get_birthdays() {
+
+	$a = get_app();
+	$o = '';
+
+	if(! local_user())
+		return $o;
+
+	$bd_format = get_config('system','birthday_format');
+	if(! $bd_format)
+		$bd_format = 'g A l F d' ; // 8 AM Friday January 18
+
+	$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` DESC ",
+		intval(local_user()),
+		dbesc(datetime_convert('UTC','UTC','now + 6 days')),
+		dbesc(datetime_convert('UTC','UTC','now'))
+	);
+
+	if($r && count($r)) {
+		$o .= '<div id="birthday-wrapper"><div id="birthday-title">' . t('Birthdays this week:') . '</div>'; 
+		$o .= '<div id="birthday-adjust">' . t("\x28Adjusted for local time\x29") . '</div>';
+		$o .= '<div id="birthday-title-end"></div>';
+
+		foreach($r as $rr) {
+			$now = strtotime('now');
+			$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); 
+
+			$o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="sparkle" href="' 
+			. $a->get_baseurl() . '/redir/'  . $rr['cid'] . '">' . $rr['name'] . '</a> ' 
+			. day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '')
+			. '</div>' ;
+		}
+
+		$o .= '</div>';
+	}
+
+  return $o;
+
+}}
+
+/**
+ *
+ * Compare two URLs to see if they are the same, but ignore
+ * slight but hopefully insignificant differences such as if one 
+ * is https and the other isn't, or if one is www.something and 
+ * the other isn't - and also ignore case differences.
+ *
+ * Return true if the URLs match, otherwise false.
+ *
+ */
+
+if(! function_exists('link_compare')) {
+function link_compare($a,$b) {
+	$a1 = str_replace(array('https:','//www.'), array('http:','//'), $a);
+	$b1 = str_replace(array('https:','//www.'), array('http:','//'), $b);
+	if(strcasecmp($a1,$b1) === 0)
+		return true;
+	return false;
+}}