From 0b55a7a70328f716dcf2d51c3c757b2b3f76f7a0 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 25 Oct 2011 00:32:28 -0700
Subject: [PATCH 1/8] only notify for events that are starting soon - ignore
 long-running events that are in progress

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

diff --git a/boot.php b/boot.php
index 636062136c..45e02d1ed8 100644
--- a/boot.php
+++ b/boot.php
@@ -1046,11 +1046,10 @@ function get_events() {
 	$bd_short = t('F d');
 
 	$r = q("SELECT `event`.* FROM `event` 
-		WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `finish` > '%s' 
+		WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' 
 		ORDER BY `start` DESC ",
 		intval(local_user()),
-		dbesc(datetime_convert('UTC','UTC','now + 6 days')),
-		dbesc(datetime_convert('UTC','UTC','now'))
+		dbesc(datetime_convert('UTC','UTC','now + 6 days'))
 	);
 
 	if($r && count($r)) {

From 323a7e4c9c96ae2101dacf2f6c06197bd83fbecf Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 25 Oct 2011 00:36:23 -0700
Subject: [PATCH 2/8] need a lower bound for events

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

diff --git a/boot.php b/boot.php
index 45e02d1ed8..32ed3e40a3 100644
--- a/boot.php
+++ b/boot.php
@@ -1046,10 +1046,11 @@ function get_events() {
 	$bd_short = t('F d');
 
 	$r = q("SELECT `event`.* FROM `event` 
-		WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' 
+		WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` > '%s'
 		ORDER BY `start` DESC ",
 		intval(local_user()),
-		dbesc(datetime_convert('UTC','UTC','now + 6 days'))
+		dbesc(datetime_convert('UTC','UTC','now + 6 days')),
+		dbesc(datetime_convert('UTC','UTC','now - 1 days'))
 	);
 
 	if($r && count($r)) {

From 1d325f6e76bea72b81eb6706e59acd1f9cb7c827 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 25 Oct 2011 00:38:43 -0700
Subject: [PATCH 3/8] change event display order

---
 boot.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index 32ed3e40a3..cb4ccb6d81 100644
--- a/boot.php
+++ b/boot.php
@@ -989,7 +989,7 @@ function get_birthdays() {
 	$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 ",
+		ORDER BY `start` ASC ",
 		intval(local_user()),
 		dbesc(datetime_convert('UTC','UTC','now + 6 days')),
 		dbesc(datetime_convert('UTC','UTC','now'))
@@ -1047,7 +1047,7 @@ function get_events() {
 
 	$r = q("SELECT `event`.* FROM `event` 
 		WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` > '%s'
-		ORDER BY `start` DESC ",
+		ORDER BY `start` ASC ",
 		intval(local_user()),
 		dbesc(datetime_convert('UTC','UTC','now + 6 days')),
 		dbesc(datetime_convert('UTC','UTC','now - 1 days'))

From 52038c6b8812ea6eeac4dc3fdfc0f7315b4ecd72 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 25 Oct 2011 15:36:49 -0700
Subject: [PATCH 4/8] event notification stuff

---
 boot.php                          | 34 +++++++++++++++++++++++--------
 view/theme/duepuntozero/style.css | 13 ++++++++++++
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/boot.php b/boot.php
index cb4ccb6d81..b60411625a 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDIKA_PLATFORM',     'Free Friendika');
-define ( 'FRIENDIKA_VERSION',      '2.3.1144' );
+define ( 'FRIENDIKA_VERSION',      '2.3.1145' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1098      );
 
@@ -997,20 +997,23 @@ function get_birthdays() {
 
 	if($r && count($r)) {
 		$total = 0;
-		foreach($r as $rr)
+		$now = strtotime('now');
+		$istoday = false;
+		foreach($r as $rr) {
 			if(strlen($rr['name']))
 				$total ++;
-
+				if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
+					$istoday = true;
+		}
+		$classtoday = $istoday ? ' birthday-today ' : '';
 		if($total) {
-			$o .= '<div id="birthday-notice" class="birthday-notice fakelink" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>'; 
+			$o .= '<div id="birthday-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>'; 
 			$o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>'; 
-//			$o .= '<div id="birthday-adjust">' . t("\x28Adjusted for local time\x29") . '</div>';
 			$o .= '<div id="birthday-title-end"></div>';
 
 			foreach($r as $rr) {
 				if(! strlen($rr['name']))
 					continue;
-				$now = strtotime('now');
 				$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); 
 				$sparkle = '';
 				$url = $rr['url'];
@@ -1054,7 +1057,19 @@ function get_events() {
 	);
 
 	if($r && count($r)) {
-		$o .= '<div id="event-notice" class="birthday-notice fakelink" onclick=openClose(\'event-wrapper\'); >' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '</div>'; 
+		$now = strtotime('now');
+		$istoday = false;
+		foreach($r as $rr) {
+			if(strlen($rr['name']))
+				$total ++;
+
+			$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
+			if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
+				$istoday = true;
+		}
+		$classtoday = (($istoday) ? ' event-today ' : '');
+
+		$o .= '<div id="event-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'event-wrapper\'); >' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '</div>'; 
 		$o .= '<div id="event-wrapper" style="display: none;" ><div id="event-title">' . t('Events this week:') . '</div>'; 
 		$o .= '<div id="event-title-end"></div>';
 
@@ -1068,8 +1083,9 @@ function get_events() {
 			$title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
 			if(! $title)
 				$title = t('[No description]');
-			$now = strtotime('now');
-			$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); 
+
+			$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
+			$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);	
 
 			$o .= '<div class="event-list" id="event-' . $rr['eid'] . '"></a> <a href="events/' . $md . '">' . $title . '</a>' 
 			. day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '')
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 378e0da1e9..b870f6bd5b 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -228,6 +228,9 @@ footer {
 
 }
 
+.birthday-today, .event-today {
+	font-weight: bold;
+}
 
 div.wall-item-content-wrapper.shiny {
   background-image: url('shiny.png');
@@ -2539,6 +2542,16 @@ a.mail-list-link {
 	margin-top: 10px;
 }
 
+.body-tag {
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+
+.body-tag:hover {
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
+
 .item-select {
 	opacity: 0.1;
 	filter:alpha(opacity=10);

From 1aa1cd2cf5c5f7b7dd21bc3c67becfdfc7d41974 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 25 Oct 2011 15:52:54 -0700
Subject: [PATCH 5/8] soften the content-types

---
 images/content-types.png | Bin 801 -> 3892 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/images/content-types.png b/images/content-types.png
index be2ccbf01191ab56bb6b7d4edf3f816207cf56a2..e46eba610f56217e5fdb660f4cea080decab6fa5 100644
GIT binary patch
delta 3854
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
QIsgCw07*qoM6N<$f-=`=8vp<R

delta 739
zcmV<90v!Fc9-#)1Hwo?l?f~wJY48-0Ko@@i2XskIMF-mj8Up|zdO_e;0007^Nkl<Z
zXx{Bvy~^r95IqUOMw_Iz^9^ogX=`H;JHgV**51}eECul$?5qWShFAsc1eFB*X>4+v
z&&wueO?G!y1K%A8nCQ;T&Y3f_69FKix?I<#(36zH`4>geA430PVgW!91W*;nasGdO
z7S+eD{c+M@AAHllgl_;48HOS4Uz$F4zb1+)QPCXoeV^1no<2+GChXU2004xXj0%E)
z&7c>iP>aLykC*wr@1s_$#r!LkN=l$4^_i@5S(nVFM1>8)PtDg7?5C}FS5{`bt{YV<
z6*8u{t{YidL3y_^YA`rV$qanb-)Db7li!K%fnCdFa=Z%Iw$vVZ`YaJA*$wIdLsVzl
z?^z)7fTDU}NMp!$yTxL$z-F_-^?F6MT1BVR!EiXt)MttHQX>%v?PWd#jJSOfAo4PU
zr{mrFR;v}e-|zRBOeQ#=&zbs6`7Dk|OH@|<e(h(GQmGT|9Xz?+ZZFU3^*Vp%^Er0A
z9S(;BX0sUpV7Xk1GKBUt8fMmS8$l3~*w521RLUbycNo6<zgn$g_l-s)w;c;#634M6
zL7_j*sYn__Sh-v-==b{ofNr;2OhBGs$TQ{h2M8XJkH>@i+tcZUcDoJF^U!QIF&d4i
z0Wp+^)g%~Vps3rYX2?4k3<iJjJP*BI57X%srfKSAh#?#l9vE^=iQ89vf2IY%^?D5e
z7>~!fz>oqYK8F~BYeTY(PO~r4*gwIL<MAlG#^RR*nrYfjVMR#LFVgI@$)Yl$Qvvz3
zA+p9&$(SrqY)*-?9a|eH$+ro?n-`h7<bJ=STrNwkwJ3t}O-b6%%MwqWJwz6aug)Rg
zo-;m?NHR9G0ulzHwjNTHIfPoYGo%Q?*Bw~OH{TYu!r!QmnjwbDKXYjl+kbuX@)ri9
V^@6;YMYR9`002ovPDHLkV1iy|Ur_)6


From 72d74b88be0e9a25920d336c7eab0aeb09342f63 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 25 Oct 2011 19:59:57 -0700
Subject: [PATCH 6/8] some dspr fixes

---
 include/bb2diaspora.php | 4 ++++
 include/bbcode.php      | 1 +
 include/diaspora.php    | 7 ++++++-
 include/text.php        | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index e2711755b7..f7398067b9 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -11,8 +11,12 @@ function diaspora2bb($s) {
 	$s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
 	$s = Markdown($s);
 	$s = html2bbcode($s);
+	$s = str_replace('&#42;','*',$s);
     $s = preg_replace("/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism",'[youtube]$2[/youtube]',$s); 
+    $s = preg_replace("/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism",'[youtube]$1[/youtube]',$s); 
 	$s = preg_replace("/\[url\=?(.*?)\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism",'[vimeo]$2[/vimeo]',$s); 
+	$s = preg_replace("/\[url\=https?:\/\/vimeo.com\/([0-9]+)\](.*?)\[\/url\]/ism",'[vimeo]$1[/vimeo]',$s); 
+	$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)(vimeo|youtu|www\.youtube|soundcloud)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url]$2$3$4[/url]',$s);
 
 	return $s;
 }
diff --git a/include/bbcode.php b/include/bbcode.php
index e20b2478d3..a60d09ce8b 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -57,6 +57,7 @@ function bbcode($Text,$preserve_nl = false) {
 
 
 	// Perform URL Search
+
 	$Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="external-link">$2</a>', $Text);
 	
 	$Text = preg_replace_callback("/\[bookmark\=([^\]]*)\].*?\[\/bookmark\]/ism",'tryoembed',$Text);
diff --git a/include/diaspora.php b/include/diaspora.php
index 2379ae8e3e..ad5e2adb2a 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -92,12 +92,14 @@ function find_diaspora_person_by_handle($handle) {
 		dbesc($handle)
 	);
 	if(count($r)) {
+		logger('find_diaspora_person_by handle: in cache ' . print_r($r,true), LOGGER_DEBUG);
 		// update record occasionally so it doesn't get stale
 		$d = strtotime($r[0]['updated'] . ' +00:00');
 		if($d > strtotime('now - 14 days'))
 			return $r[0];
 		$update = true;
 	}
+	logger('find_diaspora_person_by_handle: refresh',LOGGER_DEBUG);
 	require_once('include/Scrape.php');
 	$r = probe_url($handle, PROBE_DIASPORA);
 	if((count($r)) && ($r['network'] === NETWORK_DIASPORA)) {
@@ -947,7 +949,10 @@ function diaspora_comment($importer,$xml,$msg) {
 	$datarray['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']);
 	$datarray['body'] = $body;
 	$datarray['tag'] = $str_tags;
-	$datarray['app']  = 'Diaspora';
+
+	// We can't be certain what the original app is if the message is relayed.
+	if(($parent_item['origin']) && (! $parent_author_signature)) 
+		$datarray['app']  = 'Diaspora';
 
 	$message_id = item_store($datarray);
 
diff --git a/include/text.php b/include/text.php
index a9763fd211..e0f38a3a0d 100644
--- a/include/text.php
+++ b/include/text.php
@@ -481,7 +481,7 @@ function get_tags($s) {
 	// Otherwise pull out single word tags. These can be @nickname, @first_last
 	// and #hash tags.
 
-	if(preg_match_all('/([@#][^ \x0D\x0A,:?]+)([ \x0D\x0A,:?]|$)/',$s,$match)) {
+	if(preg_match_all('/([@#][^ \x0D\x0A,;:?]+)([ \x0D\x0A,;:?]|$)/',$s,$match)) {
 		foreach($match[1] as $mtch) {
 			if(strstr($mtch,"]")) {
 				// we might be inside a bbcode color tag - leave it alone

From d9f64deda0192a85265f5913877fc3adf95aa177 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 25 Oct 2011 20:05:21 -0700
Subject: [PATCH 7/8] sql error

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

diff --git a/include/items.php b/include/items.php
index 4e7674a2e9..1b4b524911 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1264,7 +1264,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 			}
 			if($deleted && is_array($contact)) {
 				$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.id` 
-					WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1",
+					WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
 					dbesc($uri),
 					intval($importer['uid']),
 					intval($contact['id'])

From 6d6136cdb5a2149037c3cf315b3fa81a72bd7d55 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 25 Oct 2011 20:30:01 -0700
Subject: [PATCH 8/8] fix diaspora cache

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

diff --git a/include/network.php b/include/network.php
index c6f5fd909f..a9ee3f0a54 100644
--- a/include/network.php
+++ b/include/network.php
@@ -732,7 +732,6 @@ function add_fcontact($arr,$update = false) {
 			dbesc($arr['notify']),
 			dbesc($arr['poll']),
 			dbesc($arr['confirm']),
-			dbesc($arr['network']),
 			dbesc($arr['alias']),
 			dbesc($arr['pubkey']),
 			dbesc(datetime_convert()),
@@ -760,5 +759,6 @@ function add_fcontact($arr,$update = false) {
 			dbesc(datetime_convert())
 		);
 	}
+
 	return $r;
 }