From 35edf79abe08bcc1833dc695cb9aebfa5d4a78c0 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 9 Jul 2011 15:06:53 -0700
Subject: [PATCH 01/29] bug #102

---
 boot.php          | 2 +-
 mod/parse_url.php | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 8ff029a5c..3f64310fc 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1034' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1036' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1075      );
 
diff --git a/mod/parse_url.php b/mod/parse_url.php
index ec28d7411..bf6639b30 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -39,6 +39,12 @@ function parse_url_content(&$a) {
 		killme();
 	}
 
+	if(strpos($s,'<title>')) {
+		$title = substr($s,strpos($s,'<title>')+7,64);
+		if(strpos($title,'<') !== false)
+			$title = substr($title,0,strpos($title,'<'));
+	}
+
 	$config = HTMLPurifier_Config::createDefault();
 	$config->set('Cache.DefinitionImpl', null);
 

From eb604deff5da8262f4b32e5a7ac70c9991b0284d Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 10 Jul 2011 20:46:00 -0700
Subject: [PATCH 02/29] log twitter post result

---
 addon/twitter/twitter.php | 7 +++++--
 boot.php                  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index 1dce9d2f6..7f2b2e1c7 100644
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -243,8 +243,11 @@ function twitter_post_hook(&$a,&$b) {
 					$msg .= '... ' . $shortlink;
 				}
                 // and now tweet it :-)
-				if(strlen($msg))
-					$tweet->post('statuses/update', array('status' => $msg));
+				if(strlen($msg)) {
+					$result = $tweet->post('statuses/update', array('status' => $msg));
+					logger('twitter_post returns: ' . $result);
+				}
+
 			}
 		}
 	}
diff --git a/boot.php b/boot.php
index 3f64310fc..0a98399cd 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1036' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1037' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1075      );
 

From 2a65d01ce29eff486dcffc47c9d297e1eb7472ea Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 11 Jul 2011 17:23:42 -0700
Subject: [PATCH 03/29] several fixes to parse_url

---
 boot.php          |  2 +-
 mod/parse_url.php | 34 ++++++++++++++++++++++------------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/boot.php b/boot.php
index 0a98399cd..ae7d94dac 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1037' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1038' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1075      );
 
diff --git a/mod/parse_url.php b/mod/parse_url.php
index bf6639b30..46c6b46e9 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -13,7 +13,7 @@ function parse_url_content(&$a) {
 
 	$text = null;
 
-	$template = "<a href=\"%s\" >%s</a>\n%s";
+	$template = "<br /><a href=\"%s\" >%s</a>%s<br />";
 
 
 	$arr = array('url' => $url, 'text' => '');
@@ -42,7 +42,7 @@ function parse_url_content(&$a) {
 	if(strpos($s,'<title>')) {
 		$title = substr($s,strpos($s,'<title>')+7,64);
 		if(strpos($title,'<') !== false)
-			$title = substr($title,0,strpos($title,'<'));
+			$title = strip_tags(substr($title,0,strpos($title,'<')));
 	}
 
 	$config = HTMLPurifier_Config::createDefault();
@@ -51,6 +51,8 @@ function parse_url_content(&$a) {
 	$purifier = new HTMLPurifier($config);
 	$s = $purifier->purify($s);
 
+//	logger('parse_url: purified: ' . $s, LOGGER_DATA);
+
 	$dom = @HTML5_Parser::parse($s);
 
 	if(! $dom) {
@@ -71,21 +73,27 @@ function parse_url_content(&$a) {
 	if($divs) {
 		foreach($divs as $div) {
 			$class = $div->getAttribute('class');
-			if($class && stristr($class,'article')) {
+			if($class && (stristr($class,'article') || stristr($class,'content'))) {
 				$items = $div->getElementsByTagName('p');
 				if($items) {
 					foreach($items as $item) {
-						if($item->getElementsByTagName('script'))
-							continue;
 						$text = $item->textContent;
-						$text = strip_tags($text);
-						if(strlen($text) < 100)
+						if(stristr($text,'<script')) {
+							$text = '';
 							continue;
+						}
+						$text = strip_tags($text);
+						if(strlen($text) < 100) {
+							$text = '';
+							continue;
+						}
 						$text = substr($text,0,250) . '...' ;
 						break;
 					}
 				}
 			}
+			if($text)
+				break;
 		}
 	}
 
@@ -93,12 +101,14 @@ function parse_url_content(&$a) {
 		$items = $dom->getElementsByTagName('p');
 		if($items) {
 			foreach($items as $item) {
-				if($item->getElementsByTagName('script'))
-					continue;
 				$text = $item->textContent;
-				$text = strip_tags($text);
-				if(strlen($text) < 100)
+				if(stristr($text,'<script'))
 					continue;
+				$text = strip_tags($text);
+				if(strlen($text) < 100) {
+					$text = '';
+					continue;
+				}
 				$text = substr($text,0,250) . '...' ;
 				break;
 			}
@@ -106,7 +116,7 @@ function parse_url_content(&$a) {
 	}
 
 	if(strlen($text)) {
-		$text = '<br />' . $text;
+		$text = '<br /><br />' . $text;
 	}
 
 	echo sprintf($template,$url,($title) ? $title : $url,$text);

From 180c15cdf86172edf58b071149e10af648ec90d4 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 11 Jul 2011 18:28:13 -0700
Subject: [PATCH 04/29] zot scraper

---
 boot.php           |  2 ++
 include/Scrape.php | 24 +++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index ae7d94dac..88d72dec3 100644
--- a/boot.php
+++ b/boot.php
@@ -89,6 +89,7 @@ define ( 'PAGE_FREELOVE',          3 );
  * Network and protocol family types 
  */
 
+define ( 'NETWORK_ZOT',              'zot!');    // Zot!
 define ( 'NETWORK_DFRN',             'dfrn');    // Friendika, Mistpark, other DFRN implementations
 define ( 'NETWORK_OSTATUS',          'stat');    // status.net, identi.ca, GNU-social, other OStatus implementations
 define ( 'NETWORK_FEED',             'feed');    // RSS/Atom feeds with no known "post/notify" protocol
@@ -117,6 +118,7 @@ define ( 'NOTIFY_MAIL',    0x0010 );
  * various namespaces we may need to parse
  */
 
+define ( 'NAMESPACE_ZOT',             'http://purl.org/macgirvin/zot' );
 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' );
diff --git a/include/Scrape.php b/include/Scrape.php
index fbfec176f..3599d7df3 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -300,6 +300,8 @@ function probe_url($url) {
 		if(count($links)) {
 			logger('probe_url: found lrdd links: ' . print_r($links,true), LOGGER_DATA);
 			foreach($links as $link) {
+				if($link['@attributes']['rel'] === NAMESPACE_ZOT)
+					$zot = unamp($link['@attributes']['href']);
 				if($link['@attributes']['rel'] === NAMESPACE_DFRN)
 					$dfrn = unamp($link['@attributes']['href']);
 				if($link['@attributes']['rel'] === 'salmon')
@@ -379,6 +381,25 @@ function probe_url($url) {
 		}
 	}	
 
+	if(strlen($zot)) {
+		$s = fetch_url($zot);
+		if($s) {
+			$j = json_decode($s);
+			if($j) {
+				$network = NETWORK_ZOT;
+				$vcard   = array(
+					'fn'    => $j->name, 
+					'nick'  => $j->username, 
+					'photo' => $j->photo
+				);
+				$profile  = $j->url;
+				$notify   = $j->post;
+				$key      = $j->pubkey;
+				$poll     = 'N/A';
+			}
+		}
+	}
+
 	if(strlen($dfrn)) {
 		$ret = scrape_dfrn($dfrn);
 		if(is_array($ret) && x($ret,'dfrn-request')) {
@@ -390,7 +411,7 @@ function probe_url($url) {
 		}
 	}
 
-	if($network !== NETWORK_DFRN && $network !== NETWORK_MAIL) {
+	if($network !== NETWORK_ZOT && $network !== NETWORK_DFRN && $network !== NETWORK_MAIL) {
 		$network  = NETWORK_OSTATUS;
 		$priority = 0;
 
@@ -549,6 +570,7 @@ function probe_url($url) {
 	$result['priority'] = $priority;
 	$result['network'] = $network;
 	$result['alias'] = $alias;
+	$result['key'] = $key;
 
 	logger('probe_url: ' . print_r($result,true), LOGGER_DEBUG);
 

From 55bbe2108abeb69d55eb2fa8a9a472af7b2251b1 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 12 Jul 2011 01:24:07 -0700
Subject: [PATCH 05/29] event ownership from remote feeds messed up, this is
 one step - may require more

---
 mod/item.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index 8a4f8293c..f6f665a18 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -184,12 +184,10 @@ function item_post(&$a) {
 
 	if($post_type === 'net-comment') {
 		if($parent_item !== null) {
-			if($parent_item['type'] === 'remote') {
-				$post_type = 'remote-comment';
-			} 
-			else {		
+			if($parent_item['wall'] == 1)
 				$post_type = 'wall-comment';
-			}
+			else
+				$post_type = 'remote-comment';
 		}
 	}
 

From 706b6e8c84be332ff8310fffe13c83e784e46904 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 12 Jul 2011 05:09:07 -0700
Subject: [PATCH 06/29] email notifications not working - unable to change
 notification settings

---
 mod/settings.php           | 15 +++++----------
 view/field_intcheckbox.tpl |  6 ++++++
 view/settings.tpl          | 10 +++++-----
 3 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 view/field_intcheckbox.tpl

diff --git a/mod/settings.php b/mod/settings.php
index e11555687..844b06a71 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -435,11 +435,6 @@ function settings_content(&$a) {
 	));
 
 
-
-
-
-
-
 	$invisible = (((! $profile['publish']) && (! $profile['net-publish']))
 		? true : false);
 
@@ -527,11 +522,11 @@ function settings_content(&$a) {
 		
 		'$h_not' 	=> t('Notification Settings'),
 		'$lbl_not' 	=> t('Send a notification email when:'),
-		'$notify1'	=> array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), ''),
-		'$notify2'	=> array('notify1', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), ''),
-		'$notify3'	=> array('notify1', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), ''),
-		'$notify4'	=> array('notify1', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), ''),
-		'$notify5'	=> array('notify1', t('You receive a private message'), ($notify & NOTIFY_MAIL), ''),
+		'$notify1'	=> array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''),
+		'$notify2'	=> array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''),
+		'$notify3'	=> array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''),
+		'$notify4'	=> array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''),
+		'$notify5'	=> array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''),
 		
 		
 		
diff --git a/view/field_intcheckbox.tpl b/view/field_intcheckbox.tpl
new file mode 100644
index 000000000..47a513a55
--- /dev/null
+++ b/view/field_intcheckbox.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field checkbox'>
+		<label for='id_$field.0'>$field.1</label>
+		<input type="checkbox" name='$field.0' id='id_$field.0' value="$field.3" {{ if $field.2 }}checked="true"{{ endif }}>
+		<span class='field_help'>$field.4</span>
+	</div>
diff --git a/view/settings.tpl b/view/settings.tpl
index 5e8b90769..fb35c8e45 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -82,11 +82,11 @@ $hide_wall
 <div id="settings-notify-desc">$lbl_not </div>
 
 <div class="group">
-{{inc field_checkbox.tpl with $field=$notify1 }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$notify2 }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$notify3 }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$notify4 }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
 </div>
 
 

From 74a608e1c77ab1d378ed6f09c8d70df3ea61cbca Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 12 Jul 2011 23:14:38 -0700
Subject: [PATCH 07/29] openid settings appearing when disabled, don't tag
 numbers, install admin not getting set

---
 boot.php            | 5 ++++-
 mod/install.php     | 2 +-
 mod/settings.php    | 1 +
 view/install_db.tpl | 2 +-
 view/settings.tpl   | 3 ++-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/boot.php b/boot.php
index 88d72dec3..5f0898a53 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1038' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1039' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1075      );
 
@@ -2058,6 +2058,9 @@ function get_tags($s) {
 				// we might be inside a bbcode color tag - leave it alone
 				continue;
 			}
+			// ignore strictly numeric tags like #1
+			if((strpos($mtch,'#') === 0) && ctype_digit(substr($mtch,1)))
+				continue;
 			if(substr($mtch,-1,1) === '.')
 				$ret[] = substr($mtch,0,-1);
 			else
diff --git a/mod/install.php b/mod/install.php
index 301630528..970ff6af8 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -140,7 +140,7 @@ function install_content(&$a) {
 		'$dbpass' => notags(trim($_POST['dbpass'])),
 		'$dbdata' => notags(trim($_POST['dbdata'])),
 		'$phpath' => $phpath,
-		'$adminemail' => notags(trim($_POST['adminemail']))
+		'$adminmail' => notags(trim($_POST['adminmail']))
 	));
 
 	return $o;
diff --git a/mod/settings.php b/mod/settings.php
index 844b06a71..1b4098de8 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -490,6 +490,7 @@ function settings_content(&$a) {
 		'$h_pass' 	=> t('Password Settings'),
 		'$password1'=> array('npassword', t('New Password:'), '', ''),
 		'$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
+		'$oid_enable' => (! get_config('system','no_openid')),
 		'$openid'	=> $openid_field,
 		
 		'$h_basic' 	=> t('Basic Settings'),
diff --git a/view/install_db.tpl b/view/install_db.tpl
index 6a4d1e2a2..ff4e11ab1 100644
--- a/view/install_db.tpl
+++ b/view/install_db.tpl
@@ -27,7 +27,7 @@ $lbl_03 $lbl_04 $lbl_05
 <div id="install-dbdata-end"></div>
 
 <label for="install-admin" id="install-admin-label">$lbl_11</label>
-<input type="text" name="adminemail" id="install-admin"  value="$adminemail" />
+<input type="text" name="adminmail" id="install-admin"  value="$adminmail" />
 <div id="install-admin-end"></div>
 
 <div id="install-tz-desc">
diff --git a/view/settings.tpl b/view/settings.tpl
index fb35c8e45..b79fbfe43 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -15,8 +15,9 @@ $nickname_block
 {{inc field_password.tpl with $field=$password1 }}{{endinc}}
 {{inc field_password.tpl with $field=$password2 }}{{endinc}}
 
+{{ if $oid_enable }}
 {{inc field_input.tpl with $field=$openid }}{{endinc}}
-
+{{ endif }}
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="$submit" />

From 7534b8873b7d0e857dbfe4c8085957f8a826ec03 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 14 Jul 2011 03:05:54 -0700
Subject: [PATCH 08/29] link tips on nav bar

---
 boot.php           |  2 +-
 include/Scrape.php |  4 ++--
 include/nav.php    | 38 +++++++++++++++++++-------------------
 view/nav.tpl       | 34 +++++++++++++++++-----------------
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/boot.php b/boot.php
index 5f0898a53..699328201 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1039' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1040' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1075      );
 
diff --git a/include/Scrape.php b/include/Scrape.php
index 3599d7df3..e0075d44d 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -388,8 +388,8 @@ function probe_url($url) {
 			if($j) {
 				$network = NETWORK_ZOT;
 				$vcard   = array(
-					'fn'    => $j->name, 
-					'nick'  => $j->username, 
+					'fn'    => $j->fullname, 
+					'nick'  => $j->nickname, 
 					'photo' => $j->photo
 				);
 				$profile  = $j->url;
diff --git a/include/nav.php b/include/nav.php
index 3b15c2b8a..b3e1aa8e8 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -30,7 +30,7 @@ function nav(&$a) {
 	$sitelocation = $myident . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 );
 
 
-	// nav links: array of array('href', 'text', 'extra css classes')
+	// nav links: array of array('href', 'text', 'extra css classes', 'title')
 	$nav = Array();
 
 	/**
@@ -38,10 +38,10 @@ function nav(&$a) {
 	 */
 
 	if(local_user()) {
-		$nav['logout'] = Array('logout',t('Logout'), "");
+		$nav['logout'] = Array('logout',t('Logout'), "", t('End this session'));
 	}
 	else {
-		$nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'nav-selected':''));
+		$nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'nav-selected':''), t('Sign in'));
 	}
 
 
@@ -52,21 +52,21 @@ function nav(&$a) {
 	$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
 
 	if(($a->module != 'home') && (! (local_user()))) 
-		$nav['home'] = array($homelink, t('Home'), "");
+		$nav['home'] = array($homelink, t('Home'), "", t('Home Page'));
 
 
 	if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user()))
-		$nav['register'] = array('register',t('Register'), "");
+		$nav['register'] = array('register',t('Register'), "", t('Create an account'));
 
 	$help_url = $a->get_baseurl() . '/help';
 
 	if(! get_config('system','hide_help'))
-		$nav['help'] = array($help_url, t('Help'), "");
+		$nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
 
 	if($a->apps)
-		$nav['apps'] = array('apps', t('Apps'), "");
+		$nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
 
-	$nav['search'] = array('search', t('Search'), "");
+	$nav['search'] = array('search', t('Search'), "", t('Search site content'));
 
 	$gdirpath = 'directory';
 
@@ -76,9 +76,9 @@ function nav(&$a) {
 			$gdirpath = $gdir;
 	}
 	elseif(! get_config('system','no_community_page'))
-		$nav['community'] = array('community', t('Community'), "");
+		$nav['community'] = array('community', t('Community'), "", t('Conversations on this site'));
 
-	$nav['directory'] = array($gdirpath, t('Directory'), ""); 
+	$nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory')); 
 
 	/**
 	 *
@@ -88,33 +88,33 @@ function nav(&$a) {
 
 	if(local_user()) {
 
-		$nav['network'] = array('network', t('Network'), "");
+		$nav['network'] = array('network', t('Network'), "", t('Conversations from my friends'));
 
-		$nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "");
+		$nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "", t('My posts and conversations'));
 
 
 		/* only show friend requests for normal pages. Other page types have automatic friendship. */
 
 		if($_SESSION['page_flags'] == PAGE_NORMAL) {
-			$nav['notifications'] = array('notifications',	t('Notifications'), "");
+			$nav['notifications'] = array('notifications',	t('Notifications'), "", t('Friend requests'));
 		}
 
-		$nav['messages'] = array('message', t('Messages'), "");
+		$nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
 		
 		if(is_array($a->identities) && count($a->identities) > 1) {
-			$nav['manage'] = array('manage', t('Manage'), "");
+			$nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages'));
 		}
 
-		$nav['settings'] = array('settings', t('Settings'),"");
-		$nav['profiles'] = array('profiles', t('Profiles'),"");
-		$nav['contacts'] = array('contacts', t('Contacts'),"");
+		$nav['settings'] = array('settings', t('Settings'),"", t('Account settings'));
+		$nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/edit profiles'));
+		$nav['contacts'] = array('contacts', t('Contacts'),"", t('Manage/edit friends and contacts'));
 	}
 
 	/**
 	 * Admin page
 	 */
 	 if (is_site_admin()){
-		 $nav['admin'] = array('admin/', t('Admin'), "");
+		 $nav['admin'] = array('admin/', t('Admin'), "", t('Site setup and configuration'));
 	 }
 
 
diff --git a/view/nav.tpl b/view/nav.tpl
index 008278dc4..09a25ac83 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -2,48 +2,48 @@ $langselector
 
 <div id="site-location">$sitelocation</div>
 
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0">$nav.login.1</a> {{ endif }}
+{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
 
 <span id="nav-link-wrapper" >
 
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0">$nav.register.1</a>{{ endif }}
+{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
 	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0">$nav.help.1</a>
+<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
 	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0">$nav.apps.1</a>{{ endif }}
+{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
 
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0">$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0">$nav.directory.1</a>
+<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
 
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a>{{ endif }}
+{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
 
 {{ if $nav.network }}
-<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a>
+<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
 <span id="net-update" class="nav-ajax-left"></span>
 {{ endif }}
 {{ if $nav.home }}
-<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a>
+<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
 <span id="home-update" class="nav-ajax-left"></span>
 {{ endif }}
 {{ if $nav.community }}
-<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0">$nav.community.1</a>
+<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
 {{ endif }}
 {{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a>
+<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
 <span id="notify-update" class="nav-ajax-left"></span>
 {{ endif }}
 {{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a>
+<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
 <span id="mail-update" class="nav-ajax-left"></span>
 {{ endif }}
 
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a>{{ endif }}
+{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
 
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a>{{ endif }}
+{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
 
-{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a>{{ endif }}
+{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
 </span>
 <span id="nav-end"></span>
 <span id="banner">$banner</span>

From c8d969e84c06b210001bc6e4cabc646c47077147 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 14 Jul 2011 03:08:48 -0700
Subject: [PATCH 09/29] my -> your

---
 include/nav.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/nav.php b/include/nav.php
index b3e1aa8e8..895c321e6 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -88,9 +88,9 @@ function nav(&$a) {
 
 	if(local_user()) {
 
-		$nav['network'] = array('network', t('Network'), "", t('Conversations from my friends'));
+		$nav['network'] = array('network', t('Network'), "", t('Conversations from your friends'));
 
-		$nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "", t('My posts and conversations'));
+		$nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
 
 
 		/* only show friend requests for normal pages. Other page types have automatic friendship. */

From ed940288946801cabc6ed715444f23652e3023b1 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 14 Jul 2011 03:38:25 -0700
Subject: [PATCH 10/29] template for statusnet api config.xml

---
 view/apiconfig.tpl | 67 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 view/apiconfig.tpl

diff --git a/view/apiconfig.tpl b/view/apiconfig.tpl
new file mode 100644
index 000000000..71ab241ce
--- /dev/null
+++ b/view/apiconfig.tpl
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+ <site>
+  <name>$sitedesc</name>
+  <server>$sitename</server>
+  <theme>default</theme>
+  <path></path>
+  <logo>$sitelogo</logo>
+
+  <fancy>true</fancy>
+  <language>en</language>
+  <email>$adminemail</email>
+  <broughtby></broughtby>
+  <broughtbyurl></broughtbyurl>
+  <timezone>UTC</timezone>
+  <closed>$siteclosed</closed>
+
+  <inviteonly>false</inviteonly>
+  <private>$siteprivate</private>
+  <textlimit>$textlimit</textlimit>
+  <ssl>$has_ssl</ssl>
+  <sslserver>$ssl_server</sslserver>
+  <shorturllength>30</shorturllength>
+
+</site>
+ <license>
+  <type>cc</type>
+  <owner></owner>
+  <url>http://creativecommons.org/licenses/by/3.0/</url>
+  <title>Creative Commons Attribution 3.0</title>
+  <image>http://i.creativecommons.org/l/by/3.0/80x15.png</image>
+
+</license>
+ <nickname>
+  <featured></featured>
+</nickname>
+ <profile>
+  <biolimit></biolimit>
+</profile>
+ <group>
+  <desclimit></desclimit>
+</group>
+ <notice>
+
+  <contentlimit></contentlimit>
+</notice>
+ <throttle>
+  <enabled>false</enabled>
+  <count>20</count>
+  <timespan>600</timespan>
+</throttle>
+ <xmpp>
+
+  <enabled>false</enabled>
+  <server>INVALID SERVER</server>
+  <port>5222</port>
+  <user>update</user>
+</xmpp>
+ <integration>
+  <source>StatusNet</source>
+
+</integration>
+ <attachments>
+  <uploads>false</uploads>
+  <file_quota>0</file_quota>
+</attachments>
+</config>

From 2efb59e4396c711c52996296d6717ab05144d8cb Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 14 Jul 2011 15:34:00 -0700
Subject: [PATCH 11/29] make lighttpd patch specific to lighttpd, intros don't
 work on apache

---
 boot.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/boot.php b/boot.php
index 699328201..2bd7830d7 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1040' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1041' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1075      );
 
@@ -758,11 +758,13 @@ function post_url($url,$params, $headers = null, &$redirects = 0) {
 	$curl_time = intval(get_config('system','curl_timeout'));
 	curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
 
-	if(!is_array($headers)) {
-		$headers = array('Expect:');
-	} else {
-		if(!in_array('Expect:', $headers)) {
-			array_push($headers, 'Expect:');
+	if(defined('LIGHTTPD')) {
+		if(!is_array($headers)) {
+			$headers = array('Expect:');
+		} else {
+			if(!in_array('Expect:', $headers)) {
+				array_push($headers, 'Expect:');
+			}
 		}
 	}
 

From 69f4db9e1229e9dacd0d71ecd3ac13c1647bc36d Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 15 Jul 2011 03:08:43 -0700
Subject: [PATCH 12/29] zot stuff

---
 boot.php           |   7 ++
 include/Scrape.php |   4 +-
 include/zotfns.php | 192 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 201 insertions(+), 2 deletions(-)
 create mode 100644 include/zotfns.php

diff --git a/boot.php b/boot.php
index 2bd7830d7..9866077d2 100644
--- a/boot.php
+++ b/boot.php
@@ -104,6 +104,13 @@ define ( 'NETWORK_FACEBOOK',         'face');    // Facebook API
 
 define ( 'MAX_LIKERS',    75);
 
+/**
+ * Communication timeout
+ */
+
+define ( 'ZCURL_TIMEOUT' , (-1));
+
+
 /**
  * email notification options
  */
diff --git a/include/Scrape.php b/include/Scrape.php
index e0075d44d..6726d0b15 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -394,7 +394,7 @@ function probe_url($url) {
 				);
 				$profile  = $j->url;
 				$notify   = $j->post;
-				$key      = $j->pubkey;
+				$pubkey   = $j->pubkey;
 				$poll     = 'N/A';
 			}
 		}
@@ -570,7 +570,7 @@ function probe_url($url) {
 	$result['priority'] = $priority;
 	$result['network'] = $network;
 	$result['alias'] = $alias;
-	$result['key'] = $key;
+	$result['pubkey'] = $pubkey;
 
 	logger('probe_url: ' . print_r($result,true), LOGGER_DEBUG);
 
diff --git a/include/zotfns.php b/include/zotfns.php
new file mode 100644
index 000000000..a95a064cd
--- /dev/null
+++ b/include/zotfns.php
@@ -0,0 +1,192 @@
+<?php
+
+require_once('include/text.php');
+
+function zot_get($url,$args) {
+	$argstr = '';
+	foreach($args as $k => $v) {
+		if($argstr)
+			$argstr .= '&';
+		$argstr .= $k . '=' . $v;
+	}	
+	$s = fetch_url($url . '?' . $argstr);
+	if($s) {
+		$j = json_decode($s);
+		if($j)
+			return($j);
+	}
+	return false;
+}
+
+function zot_post($url,$args) {
+	$s = post_url($url,$args);
+	if($s) {
+		$j = json_decode($s);
+		if($j)
+			return($j);
+	}
+	return false;
+}
+
+
+function zot_prv_encode($s,$prvkey) {
+	$x = '';
+	$res = openssl_private_encrypt($s,$x,$prvkey);
+	return base64url_encode($y);
+}
+function zot_pub_encode($s,$pubkey) {
+	$x = '';
+	$res = openssl_public_encrypt($s,$x,$pubkey);
+	return base64url_encode($x);
+}
+
+function zot_prv_decode($s,$prvkey) {
+	$s = base64url_decode($s);
+	$x = '';
+	openssl_private_decrypt($s,$x,$prvkey);
+	return $x;
+}
+
+function zot_pub_decode($s,$pubkey) {
+	$s = base64url_decode($s);
+	$x = '';
+	openssl_public_decrypt($s,$x,$pubkey);
+	return $x;
+}
+
+
+function zot_getzid($url,$myaddress,$myprvkey) {
+	$ret = array();
+	$j = zot_get($url,array('sender' => $myaddress));
+	if($j->zid_encoded)
+		$ret['zid'] = zot_prv_decode($j->zid_encoded,$myprvkey);
+	if($j->zkey_encoded)
+		$ret['zkey'] = zot_prv_decode($j->zkey_encoded,$myprvkey);
+	return $ret;
+}
+
+function zot_post_init($url,$zid,$myprvkey,$theirpubkey) {
+	$ret = array();
+
+	$zinit = random_string(32);
+
+	$j = zot_get($url,array('zid' => $zid,'zinit' => $zinit));
+	
+	$a = get_app();
+	if(! $a->get_curl_code())
+		return ZCURL_TIMEOUT;
+	if(! $j->zinit) {
+		logger('zot_post_init: no zinit returned.');
+		return false;
+	}
+	if(zot_pub_decode($j->zinit,$thierpubkey) !== $zinit) {
+		logger('zot_post_init: incorrect zinit returned.');
+		return false;
+	}
+
+	if($j->challenge) {
+		$s = zot_prv_decode($j->challenge,$myprvkey);
+		$s1 = substr($s,0,strpos($s,'.'));
+		if($s1 != $zid) {
+			logger("zot_post_init: incorrect zid returned");
+			return false;
+		}
+		$ret['result'] = substr($s,strpos($s,'.') + 1);
+		$ret['perms'] = $j->perms;
+	}
+	return $ret;
+}
+
+
+function zot_encrypt_data($data,&$key) {
+	$key = random_string();
+	return aes_encrypt($data,$key);
+}
+
+
+// encrypt the data prior to calling this function so it only need be done once per message
+// regardless of the number of recipients.
+
+function zot_post_data($url,$zid,$myprvkey,$theirpubkey,$encrypted_data,$key, $intro = false) {
+	$i = zot_post_init($url,$zid,$myprvkey,$theirpubkey);
+	if($i === ZCURL_TIMEOUT)
+		return ZCURL_TIMEOUT;
+
+	if((! $i) || (! array_key_exists('perms',$i)) || (! array_key_exists('result',$i)))
+		return false;
+	if((! stristr($i['perms'],'post')) && ($intro === false)) {
+		logger("zot_post_data: no permission to post: url=$url zid=$zid");
+		return false;
+	} 
+	$p = array();
+	$p['zid'] = $zid;
+	$p['result'] = zot_pub_encode($i['result'],$theirpubkey);
+	$p['aes_key'] = zot_prv_encode($key,$myprvkey);
+	$p['data'] = $encrypted_data;
+	$s = zot_post($url,$p);
+	$a = get_app();
+	if(! $a->get_curl_code())
+		return ZCURL_TIMEOUT;
+
+	if($s) {
+		$j = json_decode($s); 
+		return $j;
+	}
+	return false;
+}
+	
+function zot_deliver($recipients,$myprvkey,$data) {
+
+	if(is_array($recipients) && count($recipients)) {
+
+		$key = '';
+		$encrypted = zot_encrypt_data($data,$key);
+
+
+		foreach($recipients as $r) {
+			$result = zot_post_data(
+				$r['post'],
+				$r['zid'],
+				$myprvkey,
+				$r['pubkey'],
+				$encrypted,
+				$key
+			);
+			if($result === false) {
+				// post failed
+				logger('zot_deliver: failed: ' . print_r($r,true));
+			}
+			elseif($result === ZCURL_TIMEOUT) {
+				// queue for redelivery
+			}
+			elseif($result->error) {
+				// failed at other end
+				logger('zot_deliver: remote failure: ' . $result->error . ' ' . print_r($r,true));
+			}
+			elseif($result->success) {
+				logger('zot_deliver: success ' . print_r($r,true, LOGGER_DEBUG));
+			}
+			else
+				logger('zot_deliver: unknown failure.');
+		}
+	}
+}
+
+
+function zot_new_contact($user,$cc) {
+
+	$zid = random_string(32);
+	$zkey = random_string(32);
+
+	logger("zot_new_contact: zid=$zid zkey=$zkey uid={$user['uid']} " . print_r($cc,true));
+
+	$ret = array();
+	$ret['zid_encoded'] = zot_pub_encode($zid,$cc['pubkey']);
+	$ret['zkey_encoded'] = zot_pub_encode($zkey,$cc['pubkey']);
+	return $ret;
+
+
+	
+
+
+}
\ No newline at end of file

From 542585f62e070aa096685a7bd834501d8433ec83 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 15 Jul 2011 21:43:23 +0200
Subject: [PATCH 13/29] fix for login problems with StatusNet

---
 addon/statusnet/statusnet.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php
index 9357b0ebd..63cdd28df 100644
--- a/addon/statusnet/statusnet.php
+++ b/addon/statusnet/statusnet.php
@@ -260,7 +260,7 @@ function statusnet_settings(&$a,&$s) {
 			$s .= '<input id="statusnet-token" type="hidden" name="statusnet-token" value="'.$token.'" />';
 			$s .= '<input id="statusnet-token2" type="hidden" name="statusnet-token2" value="'.$request_token['oauth_token_secret'].'" />';
 			$s .= '</div><div class="clear"></div>';
-			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
+			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
 			$s .= '<h4>'.t('Cancel Connection Process').'</h4>';
 			$s .= '<div id="statusnet-cancel-wrapper">';
 			$s .= '<p>'.t('Current StatusNet API is').': '.$api.'</p>';

From d31f7203857ff96b7ffd2350a5aea9dd73e92de1 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 15 Jul 2011 15:20:16 -0700
Subject: [PATCH 14/29] revup

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 9866077d2..634c2b926 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1041' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1042' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1075      );
 

From 2f0ab97fd75c269b77dd7164a6ab96394f1bc0ec Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 16 Jul 2011 15:57:47 -0700
Subject: [PATCH 15/29] header fix post_url

---
 boot.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/boot.php b/boot.php
index 634c2b926..6a622dbc0 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1042' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1043' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1075      );
 
@@ -774,8 +774,8 @@ function post_url($url,$params, $headers = null, &$redirects = 0) {
 			}
 		}
 	}
-
-	curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+	if($headers)
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 
 	$check_cert = get_config('system','verifyssl');
 	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));

From 944f03d3675779e32a6ed8bed28609ca59a66554 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 17 Jul 2011 03:34:16 -0700
Subject: [PATCH 16/29] change license

---
 LICENSE           | 42 ------------------------------------------
 mod/friendika.php |  1 -
 2 files changed, 43 deletions(-)
 delete mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 1bb086146..000000000
--- a/LICENSE
+++ /dev/null
@@ -1,42 +0,0 @@
-* Friendika
-* Copyright (c) 2010, 2011 Mike Macgirvin
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of Friendika nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY Mike Macgirvin ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL Mike Macgirvin BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Friendika incorporates other software which may be licensed under different 
-terms and conditions. Some system libraries which are supplied with and
-incorporated into Friendika were provided by their respective authors under
-the LGPL (Lesser GNU Public License) and may result in legal encumberance if 
-you make any code changes to these libraries. 
-
-Addon or "plugin" modules (projects by other authors and fully contained within
-the 'addon' and 'theme' directories) are licensed under terms provided by the
-respective software author or authors of those works, and MAY include copyleft 
-licenses such as GPLv3, AGPL, and/or commercial licenses. For the purposes of
-licensing, addon modules and themes are considered separate standalone works,
-where the "work as a whole" is defined as the embodiment of the theme or 
-addon module.
-  
-  
-
diff --git a/mod/friendika.php b/mod/friendika.php
index 8c034c4ac..753a9f478 100644
--- a/mod/friendika.php
+++ b/mod/friendika.php
@@ -39,7 +39,6 @@ function friendika_content(&$a) {
 
 	$o .= '<p></p><p>';
 
-	$o .= 'View <a href="LICENSE">License</a>' . '<br /><br />';
 	$o .= t('This is Friendika version') . ' ' . FRIENDIKA_VERSION . ' ';
 	$o .= t('running at web location') . ' ' . $a->get_baseurl() . '</p><p>';
 

From 43110db749850e49d309ad8b3e72266bd373a2a8 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 17 Jul 2011 16:08:47 -0700
Subject: [PATCH 17/29] begin invites, fb setup changes

---
 addon/facebook/README        |  2 ++
 addon/facebook/facebook.php  |  3 +++
 boot.php                     |  2 +-
 doc/Installing-Connectors.md |  4 ++++
 include/zotfns.php           |  2 --
 mod/contacts.php             | 17 +++++++++++++--
 mod/invite.php               | 40 +++++++++++++++++++++++++++++++++---
 7 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/addon/facebook/README b/addon/facebook/README
index 42ec01383..19c594886 100644
--- a/addon/facebook/README
+++ b/addon/facebook/README
@@ -15,6 +15,8 @@ Installing the Friendika/Facebook connector
         $a->config['facebook']['appid'] = 'xxxxxxxxxxx';
         $a->config['facebook']['appsecret'] = 'xxxxxxxxxxxxxxx';
      Replace with the settings Facebook gives you.
+  d. Navigate to Set Web->Site URL & Domain -> Website Settings.  Set Site URL 
+     to yoursubdomain.yourdomain.com.  Set Site Domain to your yourdomain.com.
 2. Enable the facebook plugin by including it in .htconfig.php - e.g. 
     $a->config['system']['addon'] = 'plugin1,plugin2,facebook';
 3. Visit the Facebook Settings section of the "Settings->Plugin Settings" page.
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index c54d5b5f0..73518afb2 100644
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -23,6 +23,9 @@
  *         $a->config['facebook']['appid'] = 'xxxxxxxxxxx';
  *         $a->config['facebook']['appsecret'] = 'xxxxxxxxxxxxxxx';
  *      Replace with the settings Facebook gives you.
+ *   d. Navigate to Set Web->Site URL & Domain -> Website Settings.  Set 
+ *      Site URL to yoursubdomain.yourdomain.com. Set Site Domain to your 
+ *      yourdomain.com.
  * 2. Enable the facebook plugin by including it in .htconfig.php - e.g. 
  *     $a->config['system']['addon'] = 'plugin1,plugin2,facebook';
  * 3. Visit the Facebook Settings section of the "Settings->Plugin Settings" page.
diff --git a/boot.php b/boot.php
index 6a622dbc0..af510a808 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1043' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1044' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1075      );
 
diff --git a/doc/Installing-Connectors.md b/doc/Installing-Connectors.md
index e43f17fe3..c8fc8e790 100644
--- a/doc/Installing-Connectors.md
+++ b/doc/Installing-Connectors.md
@@ -129,6 +129,10 @@ $a->config['facebook']['appsecret'] = 'xxxxxxxxxxxxxxx';
 
 Replace with the settings Facebook gives you.
 
+d. Navigate to Set Web->Site URL & Domain -> Website Settings.  Set Site URL
+to yoursubdomain.yourdomain.com.  Set Site Domain to your yourdomain.com.
+
+
 Visit the Facebook Settings section of the "Settings->Plugin Settings" page.
 and click 'Install Facebook Connector'.
 
diff --git a/include/zotfns.php b/include/zotfns.php
index a95a064cd..1ec39aefc 100644
--- a/include/zotfns.php
+++ b/include/zotfns.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once('include/text.php');
-
 function zot_get($url,$args) {
 	$argstr = '';
 	foreach($args as $k => $v) {
diff --git a/mod/contacts.php b/mod/contacts.php
index 7a97b53d2..388bf08e6 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -3,13 +3,26 @@
 require_once('include/Contact.php');
 
 function contacts_init(&$a) {
+	if(! local_user())
+		return;
+
 	require_once('include/group.php');
 	if(! x($a->page,'aside'))
 		$a->page['aside'] = '';
 	$a->page['aside'] .= group_side();
 
-	if($a->config['register_policy'] != REGISTER_CLOSED)
-		$a->page['aside'] .= '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
+	$inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
+
+	if(get_config('system','invitations_only')) {
+		$x = get_pconfig(local_user(),'system','invites_remaining');
+		if($x || is_site_admin()) {
+			$a->page['aside'] .= '<div class="side-link" id="side-invite-remain">' 
+			. sprintf( tt('%d invitation available','%d invitations available',$x), $x) 
+			. '</div>' . $inv;
+		}
+	}
+	elseif($a->config['register_policy'] != REGISTER_CLOSED)
+		$a->page['aside'] .= $inv;
 
 
 	$a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >' 
diff --git a/mod/invite.php b/mod/invite.php
index b52aa19f6..5a6745436 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -20,6 +20,13 @@ function invite_post(&$a) {
 
 	$total = 0;
 
+	if(get_config('system','invitations_only')) {
+		$invonly = true;
+		$x = get_pconfig(local_user(),'system','invites_remaining');
+		if((! $x) && (! is_site_admin()))
+			return;
+	}
+
 	foreach($recips as $recip) {
 
 		$recip = trim($recip);
@@ -28,9 +35,25 @@ function invite_post(&$a) {
 			notice(  sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
 			continue;
 		}
+		
+		if($invonly && ($x || is_site_admin())) {
+			$code = autoname(8) . srand(1000,9999);
+			$nmessage = str_replace('$invite_code',$code,$message);
+			// store in db
+
+			if(! is_site_admin()) {
+				$x --;
+				if($x >= 0)
+					set_pconfig(local_user(),'system','invites_remaining,$x);
+				else
+					return;
+			}
+		}
+		else
+			$nmessage = $message;
 
 		$res = mail($recip, sprintf( t('Please join my network on %s'), $a->config['sitename']), 
-			$message, 
+			$nmessage, 
 			"From: " . $a->user['email'] . "\n"
 			. 'Content-type: text/plain; charset=UTF-8' . "\n"
 			. 'Content-transfer-encoding: 8bit' );
@@ -56,14 +79,25 @@ function invite_content(&$a) {
 	}
 
 	$tpl = get_markup_template('invite.tpl');
-	
+	$invonly = false;
+
+	if(get_config('system','invitations_only')) {
+		$invonly = true;
+		$x = get_pconfig(local_user(),'system','invites_remaining');
+		if((! $x) && (! is_site_admin())) {
+			notice( t('You have no more invitations available') . EOL);
+			return '';
+		}
+	}			
+
+
 	$o = replace_macros($tpl, array(
 		'$invite' => t('Send invitations'),
 		'$addr_text' => t('Enter email addresses, one per line:'),
 		'$msg_text' => t('Your message:'),
 		'$default_message' => sprintf(t('Please join my social network on %s'), $a->config['sitename']) . "\r\n" . "\r\n"
 			. t('To accept this invitation, please visit:') . "\r\n" . "\r\n" . $a->get_baseurl()
-			. "\r\n" . "\r\n" . t('Once you have registered, please connect with me via my profile page at:') 
+			. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:') 
 			. "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname'] ,
 		'$submit' => t('Submit')
 	));

From 1fa2231c20db99c78f0c8681ebae04b6eecf0954 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 17 Jul 2011 21:12:31 -0700
Subject: [PATCH 18/29] invite system

---
 include/zotfns.php |  3 +++
 mod/contacts.php   |  2 +-
 mod/invite.php     | 12 ++++++++----
 mod/register.php   | 32 ++++++++++++++++++++++++++++++++
 view/register.tpl  | 11 +++++++++++
 5 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/include/zotfns.php b/include/zotfns.php
index 1ec39aefc..b695b6fcb 100644
--- a/include/zotfns.php
+++ b/include/zotfns.php
@@ -1,5 +1,8 @@
 <?php
 
+
+require_once('include/salmon.php');
+
 function zot_get($url,$args) {
 	$argstr = '';
 	foreach($args as $k => $v) {
diff --git a/mod/contacts.php b/mod/contacts.php
index 388bf08e6..2fc01a0d8 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -13,7 +13,7 @@ function contacts_init(&$a) {
 
 	$inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
 
-	if(get_config('system','invitations_only')) {
+	if(get_config('system','invitation_only')) {
 		$x = get_pconfig(local_user(),'system','invites_remaining');
 		if($x || is_site_admin()) {
 			$a->page['aside'] .= '<div class="side-link" id="side-invite-remain">' 
diff --git a/mod/invite.php b/mod/invite.php
index 5a6745436..d4eb9c5ef 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -20,7 +20,7 @@ function invite_post(&$a) {
 
 	$total = 0;
 
-	if(get_config('system','invitations_only')) {
+	if(get_config('system','invitation_only')) {
 		$invonly = true;
 		$x = get_pconfig(local_user(),'system','invites_remaining');
 		if((! $x) && (! is_site_admin()))
@@ -39,12 +39,16 @@ function invite_post(&$a) {
 		if($invonly && ($x || is_site_admin())) {
 			$code = autoname(8) . srand(1000,9999);
 			$nmessage = str_replace('$invite_code',$code,$message);
-			// store in db
+
+			$r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ",
+				dbesc($code),
+				dbesc(datetime_convert())
+			);
 
 			if(! is_site_admin()) {
 				$x --;
 				if($x >= 0)
-					set_pconfig(local_user(),'system','invites_remaining,$x);
+					set_pconfig(local_user(),'system','invites_remaining',$x);
 				else
 					return;
 			}
@@ -81,7 +85,7 @@ function invite_content(&$a) {
 	$tpl = get_markup_template('invite.tpl');
 	$invonly = false;
 
-	if(get_config('system','invitations_only')) {
+	if(get_config('system','invitation_only')) {
 		$invonly = true;
 		$x = get_pconfig(local_user(),'system','invites_remaining');
 		if((! $x) && (! is_site_admin())) {
diff --git a/mod/register.php b/mod/register.php
index 5fac9d79c..549d07a91 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -32,7 +32,11 @@ function register_post(&$a) {
 		break;
 	}
 
+	$using_invites = get_config('system','invitation_only');
+	$num_invites = get_config('system','number_invites');
 
+
+	$invite_id  = ((x($_POST,'invite_id'))  ? notags(trim($_POST['invite_id']))  : '');
 	$username   = ((x($_POST,'username'))   ? notags(trim($_POST['username']))   : '');
 	$nickname   = ((x($_POST,'nickname'))   ? notags(trim($_POST['nickname']))   : '');
 	$email      = ((x($_POST,'email'))      ? notags(trim($_POST['email']))      : '');
@@ -43,6 +47,19 @@ function register_post(&$a) {
 	$netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0);
 		
 	$tmp_str = $openid_url;
+
+	if($using_invites) {
+		if(! $invite_id) {
+			notice( t('An invitation is required.') . EOL);
+			return;
+		}
+		$r = q("select * from register where `hash` = '%s' limit 1", dbesc($invite_id));
+		if(! results($r)) {
+			notice( t('Invitation could not be verified.') . EOL);
+			return;
+		}
+	} 
+
 	if((! x($username)) || (! x($email)) || (! x($nickname))) {
 		if($openid_url) {
 			if(! validate_url($tmp_str)) {
@@ -329,6 +346,12 @@ function register_post(&$a) {
 
 
 	if( $a->config['register_policy'] == REGISTER_OPEN ) {
+
+		if($using_invites && $invite_id) {
+			q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
+			set_pconfig($newuid,'system','invites_remaining',$num_invites);
+		}
+
 		$email_tpl = get_intltext_template("register_open_eml.tpl");
 		$email_tpl = replace_macros($email_tpl, array(
 				'$sitename' => $a->config['sitename'],
@@ -376,6 +399,10 @@ function register_post(&$a) {
 		else
 			push_lang('en');
 
+		if($using_invites && $invite_id) {
+			q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
+			set_pconfig($newuid,'system','invites_remaining',$num_invites);
+		}
 
 		$email_tpl = get_intltext_template("register_verify_eml.tpl");
 		$email_tpl = replace_macros($email_tpl, array(
@@ -434,6 +461,7 @@ function register_content(&$a) {
 	$openid_url   = ((x($_POST,'openid_url'))   ? $_POST['openid_url']   : ((x($_GET,'openid_url'))   ? $_GET['openid_url']            : ''));
 	$nickname     = ((x($_POST,'nickname'))     ? $_POST['nickname']     : ((x($_GET,'nickname'))     ? $_GET['nickname']              : ''));
 	$photo        = ((x($_POST,'photo'))        ? $_POST['photo']        : ((x($_GET,'photo'))        ? hex2bin($_GET['photo'])        : ''));
+	$invite_id    = ((x($_POST,'invite_id'))    ? $_POST['invite_id']    : ((x($_GET,'invite_id'))    ? $_GET['invite_id']             : ''));
 
 	$noid = get_config('system','no_openid');
 
@@ -476,6 +504,10 @@ function register_content(&$a) {
 	$o = get_markup_template("register.tpl");
 	$o = replace_macros($o, array(
 		'$oidhtml' => $oidhtml,
+		'$invitations' => get_config('system','invitation_only'),
+		'$invite_desc' => t('Membership on this site is by invitation only.'),
+		'$invite_label' => t('Your invitation ID: '),
+		'$invite_id' => $invite_id,
 		'$realpeople' => $realpeople,
 		'$regtitle'  => t('Registration'),
 		'$registertext' =>((x($a->config,'register_text'))
diff --git a/view/register.tpl b/view/register.tpl
index ac8388de4..16e8ba767 100644
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -16,6 +16,17 @@
 	</div>
 	<div id="register-openid-end" ></div>
 
+{{ if $invitations }}
+
+	<p id="register-invite-desc">$invite_desc</p>
+	<div id="register-invite-wrapper" >
+		<label for="register-invite" id="label-register-invite" >$invite_label</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
+	</div>
+	<div id="register-name-end" ></div>
+
+{{ endif }}
+
 
 	<div id="register-name-wrapper" >
 		<label for="register-name" id="label-register-name" >$namelabel</label>

From f3bd21611204d849c3d28d0c2011f1dc602187da Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 17 Jul 2011 21:34:02 -0700
Subject: [PATCH 19/29] bug #104

---
 boot.php  | 42 ++++++++++++++++++++++++------------------
 index.php |  2 --
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/boot.php b/boot.php
index af510a808..001e3a540 100644
--- a/boot.php
+++ b/boot.php
@@ -1,9 +1,5 @@
 <?php
 
-set_time_limit(0);
-ini_set('pcre.backtrack_limit', 250000);
-
-
 define ( 'FRIENDIKA_VERSION',      '2.2.1044' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1075      );
@@ -179,20 +175,28 @@ define ( 'GRAVITY_COMMENT',      6);
  *
  */
 
-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);
+function startup() {
+	error_reporting(E_ERROR | E_WARNING | E_PARSE);
+	set_time_limit(0);
+	ini_set('pcre.backtrack_limit', 250000);
+
+
+	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);
+	}
+
 }
 
 /*
@@ -260,6 +264,8 @@ class App {
 
 		$this->query_string = '';
 
+		startup();
+
 		$this->scheme = ((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']))	?  'https' : 'http' );
 
 		if(x($_SERVER,'SERVER_NAME')) {
diff --git a/index.php b/index.php
index 2e24c5b01..3e72baddc 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,5 @@
 <?php
 
-error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
 /**
  *
  * Friendika

From 25b4aacf3b53d4f82f7dc817bb1e022b2a61c1a3 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 18 Jul 2011 16:42:39 -0700
Subject: [PATCH 20/29] green icons for greenzero

---
 boot.php                            |   2 +-
 view/theme/greenzero/greenicons.png | Bin 0 -> 11888 bytes
 view/theme/greenzero/style.css      |   7 +++++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 view/theme/greenzero/greenicons.png

diff --git a/boot.php b/boot.php
index 001e3a540..0bf92c99e 100644
--- a/boot.php
+++ b/boot.php
@@ -1,6 +1,6 @@
 <?php
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1044' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1045' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1075      );
 
diff --git a/view/theme/greenzero/greenicons.png b/view/theme/greenzero/greenicons.png
new file mode 100644
index 0000000000000000000000000000000000000000..b20ac5c0db037cf0c621c79cc92f7205cf51ef32
GIT binary patch
literal 11888
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

literal 0
HcmV?d00001

diff --git a/view/theme/greenzero/style.css b/view/theme/greenzero/style.css
index 51fcc09ae..ab309930c 100644
--- a/view/theme/greenzero/style.css
+++ b/view/theme/greenzero/style.css
@@ -12,6 +12,13 @@ a:hover {text-decoration: underline; }
 	color: #ffffff;
 }
 
+.icon {
+	display: block; width: 16px; height: 16px;
+	background-image: url('greenicons.png');
+}
+
+
+
 body { 	background-image: url(head.jpg); }
 aside( 	background-image: url(border.jpg); }
 section { 	background-image: url(border.jpg); }

From c0b8e63a3fe600326e0f18c03207ba9fd30c8126 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 18 Jul 2011 18:13:46 -0700
Subject: [PATCH 21/29] basic diaspora discovery

---
 boot.php              | 14 +++++++++++++-
 database.sql          |  1 +
 mod/register.php      |  5 +++--
 mod/xrd.php           | 15 +++++++++++++++
 update.php            | 25 ++++++++++++++++++++++++-
 view/xrd_diaspora.tpl |  3 +++
 view/xrd_person.tpl   |  1 +
 7 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 view/xrd_diaspora.tpl

diff --git a/boot.php b/boot.php
index 0bf92c99e..abb043036 100644
--- a/boot.php
+++ b/boot.php
@@ -2,7 +2,7 @@
 
 define ( 'FRIENDIKA_VERSION',      '2.2.1045' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1075      );
+define ( 'DB_UPDATE_VERSION',      1076      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -2957,3 +2957,15 @@ function return_bytes ($size_str) {
     }
 }}
 
+function generate_guid() {
+	$found = true;
+	do {
+		$guid = substr(random_string(),0,16);
+		$x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
+			dbesc($guid)
+		);
+		if(! count($x))
+			$found = false;
+	} while ($found == true );
+	return $guid;
+}
\ No newline at end of file
diff --git a/database.sql b/database.sql
index 8ea3e42de..50697845a 100644
--- a/database.sql
+++ b/database.sql
@@ -379,6 +379,7 @@ CREATE TABLE IF NOT EXISTS `session` (
 
 CREATE TABLE IF NOT EXISTS `user` (
   `uid` int(11) NOT NULL AUTO_INCREMENT,
+  `guid` char(16) NOT NULL,
   `username` char(255) NOT NULL,
   `password` char(255) NOT NULL,
   `nickname` char(255) NOT NULL,
diff --git a/mod/register.php b/mod/register.php
index 549d07a91..94eac7a14 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -198,9 +198,10 @@ function register_post(&$a) {
 	$spkey = openssl_pkey_get_details($sres);
 	$spubkey = $spkey["key"];
 
-	$r = q("INSERT INTO `user` ( `username`, `password`, `email`, `openid`, `nickname`,
+	$r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
 		`pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked` )
-		VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+		VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+		dbesc(generate_guid()),
 		dbesc($username),
 		dbesc($new_password_encoded),
 		dbesc($email),
diff --git a/mod/xrd.php b/mod/xrd.php
index de0c20ea5..accc2f68e 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -27,6 +27,20 @@ function xrd_content(&$a) {
 	header('Access-Control-Allow-Origin: *');
 	header("Content-type: text/xml");
 
+	$dspr_enabled = get_config('system','diaspora_enabled');
+
+	if($dspr_enabled) {
+		$tpl = file_get_contents('view/xrd_diaspora.tpl');
+		$dspr = replace_macros($tpl,array(
+			'$baseurl' => $a->get_baseurl(),
+			'$dspr_guid' => $r[0]['guid'],
+			'$dspr_key' => base64_encode($r[0]['pubkey'])
+		));
+	}
+	else
+		$dspr = '';
+
+
 	$tpl = file_get_contents('view/xrd_person.tpl');
 
 	$o = replace_macros($tpl, array(
@@ -34,6 +48,7 @@ function xrd_content(&$a) {
 		'$profile_url' => $a->get_baseurl() . '/profile/'       . $r[0]['nickname'],
 		'$atom'        => $a->get_baseurl() . '/dfrn_poll/'     . $r[0]['nickname'],
 		'$photo'       => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid']      . '.jpg',
+		'$dspr'        => $dspr,
 		'$salmon'      => $a->get_baseurl() . '/salmon/'        . $r[0]['nickname'],
 		'$salmen'      => $a->get_baseurl() . '/salmon/'        . $r[0]['nickname'] . '/mention',
 		'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key
diff --git a/update.php b/update.php
index f2cd5573f..9c55f15cf 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1075 );
+define( 'UPDATE_VERSION' , 1076 );
 
 /**
  *
@@ -601,3 +601,26 @@ function update_1074() {
 	}
 	q("ALTER TABLE `profile` DROP `hidewall`");
 }
+
+function update_1075() {
+	q("ALTER TABLE `user` ADD `guid` CHAR( 16 ) NOT NULL AFTER `uid` ");
+	$r = q("SELECT `uid` FROM `user` WHERE 1");
+	if(count($r)) {
+		foreach($r as $rr) {
+			$found = true;
+			do {
+				$guid = substr(random_string(),0,16);
+				$x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
+					dbesc($guid)
+				);
+				if(! count($x))
+					$found = false;
+			} while ($found == true );
+
+			q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d LIMIT 1",
+				dbesc($guid),
+				intval($rr['uid'])
+			);
+		}
+	}
+}
\ No newline at end of file
diff --git a/view/xrd_diaspora.tpl b/view/xrd_diaspora.tpl
new file mode 100644
index 000000000..25cda533c
--- /dev/null
+++ b/view/xrd_diaspora.tpl
@@ -0,0 +1,3 @@
+	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="$baseurl/" />
+	<Link rel="http://joindiaspora.com/guid" type="text/html" href="$dspr_guid" />
+	<Link rel="diaspora-public-key" type="RSA" href="$dspr_key" />
diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl
index b99f7c1fc..0dabaa5a3 100644
--- a/view/xrd_person.tpl
+++ b/view/xrd_person.tpl
@@ -19,6 +19,7 @@
     <Link rel="http://webfinger.net/rel/avatar"
           type="image/jpeg"
           href="$photo" />
+	$dspr
     <Link rel="salmon" 
           href="$salmon" />
     <Link rel="http://salmon-protocol.org/ns/salmon-replies" 

From 7008bec045e296422a85553de1266dc864f041bc Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 18 Jul 2011 19:17:16 -0700
Subject: [PATCH 22/29] improved code blocks

---
 include/bbcode.php                | 14 ++++++++++++++
 view/theme/duepuntozero/style.css |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index 7fc1eac1c..3619015ca 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -3,6 +3,13 @@
 require_once("include/oembed.php");
 require_once('include/event.php');
 
+
+
+function stripcode_br_cb($s) {
+	return '[code]' . str_replace('<br />', '', $s[1]) . '[/code]';
+}
+
+
 	// BBcode 2 HTML was written by WAY2WEB.net
 	// extended to work with Mistpark/Friendika - Mike Macgirvin
 
@@ -89,9 +96,16 @@ function bbcode($Text,$preserve_nl = false) {
 	$Text = preg_replace("(\[font=(.*?)\](.*?)\[\/font\])","<span style=\"font-family: $1;\">$2</span>",$Text);
 
 	// Declare the format for [code] layout
+
+	$Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/is",'stripcode_br_cb',$Text);
+
 	$CodeLayout = '<code>$1</code>';
 	// Check for [code] text
 	$Text = preg_replace("/\[code\](.*?)\[\/code\]/is","$CodeLayout", $Text);
+
+
+
+
 	// Declare the format for [quote] layout
 	$QuoteLayout = '<blockquote>$1</blockquote>';                     
 	// Check for [quote] text
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 78a0bff5b..5ee3761ef 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -45,8 +45,8 @@ code {
 	border: 1px solid #444;
 	background: #EEE;
 	color: #444;
-	padding: 10px;
-	margin-top: 20px;
+	padding: 0px 10px 10px 10px;
+	margin-top: 20px; 
 }
 /*blockquote:before {
 	content: '>> ';

From 114a728009eaac5b882b303dbd2374f66f4bfc38 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 18 Jul 2011 20:52:35 -0700
Subject: [PATCH 23/29] created license with which to renounce the license

---
 LICENSE       | 23 +++++++++++++++++++++++
 addon/LICENSE |  2 --
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..728140f75
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,23 @@
+The Friendika project is distributed under the following license terms:
+
+* This software is provided for any use with no license terms or restrictions.
+* No guarantee is provided. Use at your own risk.
+
+Components packaged with this software may fall under different license terms.
+
+cropper      - BSD
+TwitterOAuth - BSD
+markdown     - BSD
+slinky       - BSD
+ajax-upload  - MIT
+simplepie    - MIT
+LightOpenID  - MIT
+HTML5        - MIT
+TinyMCE      - LGPL
+phpsec       - LGPL
+HTMLPurifer  - LGPL
+Facebook SDK - Apache
+
+Addons, plugins, and themes are also provided under their own license terms.
+
+
diff --git a/addon/LICENSE b/addon/LICENSE
index 2e6e056e8..02cff9320 100644
--- a/addon/LICENSE
+++ b/addon/LICENSE
@@ -1,5 +1,3 @@
-
-
 Friendika addons/plugins license terms are under the control of the project 
 author or authors. 
 

From 07a77a4d272582e0d0eea96390201e080a3b549c Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 18 Jul 2011 21:25:49 -0700
Subject: [PATCH 24/29] resize editor

---
 LICENSE             | 2 +-
 view/jot-header.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 728140f75..48c88f7df 100644
--- a/LICENSE
+++ b/LICENSE
@@ -18,6 +18,6 @@ phpsec       - LGPL
 HTMLPurifer  - LGPL
 Facebook SDK - Apache
 
-Addons, plugins, and themes are also provided under their own license terms.
+Addons, plugins, and themes may also be provided under their own license terms.
 
 
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index d7a429512..b03c1b4f5 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -9,7 +9,7 @@ tinyMCE.init({
 	theme : "advanced",
 	mode : "specific_textareas",
 	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode,paste",
+	plugins : "bbcode,paste,autoresize",
 	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 	theme_advanced_buttons2 : "",
 	theme_advanced_buttons3 : "",

From 0b8aaef09cd9ff455a027b082c79d1590bce9da9 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 19 Jul 2011 04:24:20 -0700
Subject: [PATCH 25/29] lack of guarantee is not a license term, but a
 disclaimer

---
 LICENSE | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 48c88f7df..33579fe08 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,8 @@
 The Friendika project is distributed under the following license terms:
 
 * This software is provided for any use with no license terms or restrictions.
-* No guarantee is provided. Use at your own risk.
+
+No guarantee is provided. Use at your own risk.
 
 Components packaged with this software may fall under different license terms.
 
@@ -13,6 +14,7 @@ ajax-upload  - MIT
 simplepie    - MIT
 LightOpenID  - MIT
 HTML5        - MIT
+jQuery       - MIT
 TinyMCE      - LGPL
 phpsec       - LGPL
 HTMLPurifer  - LGPL

From 6ce5bcee9f73cd526633cc30228c13972ee9ddb0 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 19 Jul 2011 17:24:44 -0700
Subject: [PATCH 26/29] revup

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index abb043036..7effe3087 100644
--- a/boot.php
+++ b/boot.php
@@ -1,6 +1,6 @@
 <?php
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1045' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1046' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1076      );
 

From e2f22a1827d0aed7a49ccada66ef476120444b42 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 19 Jul 2011 21:23:47 -0700
Subject: [PATCH 27/29] diaspora salmon endpoint (decryption not yet provided)

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

diff --git a/mod/receive.php b/mod/receive.php
new file mode 100644
index 000000000..6e36109b3
--- /dev/null
+++ b/mod/receive.php
@@ -0,0 +1,215 @@
+<?php
+
+/**
+ * Diaspora endpoint
+ */
+
+
+
+require_once('include/salmon.php');
+require_once('library/simplepie/simplepie.inc');
+
+function receive_return($val) {
+
+	if($val >= 400)
+		$err = 'Error';
+	if($val >= 200 && $val < 300)
+		$err = 'OK';
+
+	logger('mod-diaspora returns ' . $val);	
+	header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err);
+	killme();
+
+}
+
+function receive_post(&$a) {
+
+	if($a->argc != 3 || $a->argv[1] !== 'users')
+		receive_return(500);
+
+	$guid = $a->argv[2];
+
+	$r = q("SELECT * FROM `user` WHERE `guid` = '%s' LIMIT 1",
+		dbesc($guid)
+	);
+	if(! count($r))
+		salmon_return(500);
+
+	$importer = $r[0];
+
+	$xml = $_POST['xml'];
+
+	logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA);
+
+	if(! $xml)
+		receive_return(500);
+
+	// parse the xml
+
+	$dom = simplexml_load_string($xml,'SimpleXMLElement',0,NAMESPACE_SALMON_ME);
+
+	// figure out where in the DOM tree our data is hiding
+
+	if($dom->provenance->data)
+		$base = $dom->provenance;
+	elseif($dom->env->data)
+		$base = $dom->env;
+	elseif($dom->data)
+		$base = $dom;
+	
+	if(! $base) {
+		logger('mod-diaspora: unable to locate salmon data in xml ');
+		receive_return(400);
+	}
+
+	// Stash the signature away for now. We have to find their key or it won't be good for anything.
+	$signature = base64url_decode($base->sig);
+
+	// unpack the  data
+
+	// strip whitespace so our data element will return to one big base64 blob
+	$data = str_replace(array(" ","\t","\r","\n"),array("","","",""),$base->data);
+
+	// stash away some other stuff for later
+
+	$type = $base->data[0]->attributes()->type[0];
+	$keyhash = $base->sig[0]->attributes()->keyhash[0];
+	$encoding = $base->encoding;
+	$alg = $base->alg;
+
+	$signed_data = $data  . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg);
+
+	// decode the data
+	$data = base64url_decode($data);
+
+	// Remove the xml declaration
+	$data = preg_replace('/\<\?xml[^\?].*\?\>/','',$data);
+
+	// Create a fake feed wrapper so simplepie doesn't choke
+
+	$tpl = get_markup_template('fake_feed.tpl');
+	
+	$base = substr($data,strpos($data,'<entry'));
+
+	$feedxml = $tpl . $base . '</feed>';
+
+	logger('mod-diaspora: Processed feed: ' . $feedxml);
+
+	// Now parse it like a normal atom feed to scrape out the author URI
+	
+    $feed = new SimplePie();
+    $feed->set_raw_data($feedxml);
+    $feed->enable_order_by_date(false);
+    $feed->init();
+
+	logger('mod-diaspora: Feed parsed.');
+
+	if($feed->get_item_quantity()) {
+		foreach($feed->get_items() as $item) {
+			$author = $item->get_author();
+			$author_link = unxmlify($author->get_link());
+			break;
+		}
+	}
+
+	if(! $author_link) {
+		logger('mod-diaspora: Could not retrieve author URI.');
+		receive_return(400);
+	}
+
+	// Once we have the author URI, go to the web and try to find their public key
+
+	logger('mod-salmon: Fetching key for ' . $author_link );
+
+
+	$key = get_salmon_key($author_link,$keyhash);
+
+	if(! $key) {
+		logger('mod-salmon: Could not retrieve author key.');
+		receive_return(400);
+	}
+
+	// Setup RSA stuff to verify the signature
+
+	set_include_path(get_include_path() . PATH_SEPARATOR . 'library' . PATH_SEPARATOR . 'phpsec');
+
+	require_once('library/phpsec/Crypt/RSA.php');
+
+	$key_info = explode('.',$key);
+
+	$m = base64url_decode($key_info[1]);
+	$e = base64url_decode($key_info[2]);
+
+	logger('mod-salmon: key details: ' . print_r($key_info,true));
+
+    $rsa = new CRYPT_RSA();
+    $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
+    $rsa->setHash('sha256');
+
+    $rsa->modulus = new Math_BigInteger($m, 256);
+    $rsa->k = strlen($rsa->modulus->toBytes());
+    $rsa->exponent = new Math_BigInteger($e, 256);
+
+    $verify = $rsa->verify($signed_data,$signature);
+
+	if(! $verify) {
+		logger('mod-diaspora: Message did not verify. Discarding.');
+		receive_return(400);
+	}
+
+	logger('mod-diaspora: Message verified.');
+
+	/* decrypt the sucker */
+	/*
+		// TODO
+	*/
+
+	/*
+	*
+	* If we reached this point, the message is good. Now let's figure out if the author is allowed to send us stuff.
+	*
+	*/
+
+	$r = q("SELECT * FROM `contact` WHERE `network` = 'dspr' AND ( `url` = '%s' OR `alias` = '%s') 
+		AND `uid` = %d LIMIT 1",
+		dbesc($author_link),
+		dbesc($author_link),
+		intval($importer['uid'])
+	);
+	if(! count($r)) {
+		logger('mod-diaspora: Author unknown to us.');
+	}	
+
+	// is this a follower? Or have we ignored the person?
+	// If so we can not accept this post.
+
+	if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == REL_VIP) || ($r[0]['blocked']))) {
+		logger('mod-diaspora: Ignoring this author.');
+		receive_return(202);
+		// NOTREACHED
+	}
+
+	require_once('include/items.php');
+
+	// Placeholder for hub discovery. We shouldn't find any hubs
+	// since we supplied the fake feed header - and it doesn't have any.
+
+	$hub = '';
+
+	/**
+	 *
+	 * anti-spam measure: consume_feed will accept a follow activity from 
+	 * this person (and nothing else) if there is no existing contact record.
+	 *
+	 */
+
+	$contact_rec = ((count($r)) ? $r[0] : null);
+
+	consume_feed($feedxml,$importer,$contact_rec,$hub);
+
+	receive_return(200);
+}
+
+
+
+

From 9048ecd85c908715c3e2980ca7f8a3e9fecf8dcb Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 19 Jul 2011 22:58:38 -0700
Subject: [PATCH 28/29] diaspora encryption xml template

---
 view/diasp_dec_hdr.tpl | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 view/diasp_dec_hdr.tpl

diff --git a/view/diasp_dec_hdr.tpl b/view/diasp_dec_hdr.tpl
new file mode 100644
index 000000000..e87c61888
--- /dev/null
+++ b/view/diasp_dec_hdr.tpl
@@ -0,0 +1,8 @@
+<decrypted_hdeader>
+  <iv>$inner_iv</iv>
+  <aes_key>$inner_key</aes_key>
+  <author>
+    <name>$author_name</name>
+    <uri>$author_uri</uri>
+  </author>
+</decrypted_header>

From b27d68633be6219c3f65d830178e3dc96c1c91e9 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 19 Jul 2011 23:10:09 -0700
Subject: [PATCH 29/29] register hook

---
 mod/register.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mod/register.php b/mod/register.php
index 94eac7a14..0906395d2 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -346,6 +346,8 @@ function register_post(&$a) {
 	}
 
 
+	call_hooks('register_account', $newuid);
+
 	if( $a->config['register_policy'] == REGISTER_OPEN ) {
 
 		if($using_invites && $invite_id) {