From df8ac668b800ecf64ab2c240678eb87b225cb513 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 8 Jun 2011 21:06:02 -0700
Subject: [PATCH 1/5] more calendar work, undo strict_privacy flag to use
 different approach

---
 boot.php                          |  18 +----
 database.sql                      |   1 +
 images/calendar.png               | Bin 0 -> 853 bytes
 include/event.php                 | 106 +++++++++++++++++++++++++-----
 include/notifier.php              |   7 +-
 mod/dfrn_request.php              |   8 +--
 mod/follow.php                    |   3 -
 mod/salmon.php                    |   5 --
 update.php                        |   7 +-
 view/theme/duepuntozero/style.css |  15 +++++
 10 files changed, 119 insertions(+), 51 deletions(-)
 create mode 100644 images/calendar.png

diff --git a/boot.php b/boot.php
index 0eccb8498..1c7a15705 100644
--- a/boot.php
+++ b/boot.php
@@ -4,9 +4,9 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1004' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1005' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1062      );
+define ( 'DB_UPDATE_VERSION',      1063      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -527,20 +527,8 @@ function check_config(&$a) {
 	$plugins = get_config('system','addon');
 	$plugins_arr = array();
 
-	if($plugins) {
+	if($plugins)
 		$plugins_arr = explode(',',str_replace(' ', '',$plugins));
-		if(get_config('system','strict_privacy')) {
-			unset($a->config['system']['huburl']);
-			for($x = 0; $x < count($plugins_arr); $x ++) {
-				if(    $plugins_arr[$x] === 'facebook' 
-					|| $plugins_arr[$x] === 'twitter' 
-					|| $plugins_arr[$x] === 'statusnet') {
-					unset($plugins_arr[$x]);
-				}
-			}
-		}
-	}
-
 
 	$a->plugins = $plugins_arr;
 
diff --git a/database.sql b/database.sql
index fd7ccf87f..fa18c50dc 100644
--- a/database.sql
+++ b/database.sql
@@ -389,6 +389,7 @@ CREATE TABLE IF NOT EXISTS `user` (
   `blockwall` tinyint(1) unsigned NOT NULL DEFAULT '0',
   `notify-flags` int(11) unsigned NOT NULL DEFAULT '65535', 
   `page-flags` int(11) unsigned NOT NULL DEFAULT '0',
+  `prvnets` tinyint(1) NOT NULL DEFAULT '0',
   `pwdreset` char(255) NOT NULL,
   `maxreq` int(11) NOT NULL DEFAULT '10',
   `expire` int(11) unsigned NOT NULL DEFAULT '0',
diff --git a/images/calendar.png b/images/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbf52933de7f7cf9303e03e4d94f222a4400bca0
GIT binary patch
literal 853
zcmV-b1FHOqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;%Sl8*RCwB?k<DvdWfaDL@4dH^jHxIxrTOrqDb^;^
zQa9D2DXAsePKrgug=jY-B7!BIO=&@b_(ehggK;5<rdR|QT6HBt#j(wzX_7igtdU?w
z)5u&q#F;zyecy9j+!*58vpLV=@Z&tsV^o#@Gtv7OR{uk=4%${}rAo7{G&k)eg~aNn
zTO|V6-n|VkiW9{-#X2RmO4}-lRZ=Thr?efURyF{WSLZXp&6QQcz#sxvpqVO-zlHjm
z@YkA<q@V@@1L-<k6vSIN|J9_5h>D2LF4Q*k+~UfHzB0Y2sTFOtMZdc;r++q_F4wK@
zFTSL~<`8epPcuF~PN`Jl(~my@Kost{J<r82zu=XZUnHLkagx~th)`v!y3FJc-*WlK
zOB9R8_~z@2%+5^n*4yuJaCn5zE_}km{2Xx{V~lY1+D|mrni;@4$G(9+`U*!GK0Ly%
z9X)j9BFg15eZ4&lJ^Ba(gM&Q#^eEO^wsv)~t*4)6l7$&K=Kv@a3V02uR4PnNOb|s8
z#nEGkf^`mSE#7-{{eA1#EqL##O#Mn28gA>{!lmyk#Bofk)#Ahp&r|;JJYg8%oWpyM
zs4_b<#jQqWArKJ`?AyWqJ@=ssrP3H<r%E&$4eIqe-P;SGinSJNEvm}S2lldS@531&
zFj)iD>Kr$JUqS>99Xd=tpU+wlFvcJvsA{Iw;QzH?49xyq<Gpj|sMVH<Up>jt!C{gl
zVdRM;)c#l@-<d-s3vEjjvUp>L)%q<0V+d50-Tl1`3=R;-F>k){I%iIoI68Wqv*Yiw
zwDcQKKK>Zqd%X7)M~3L!dKWt%Jb(!dk#!#Dm9bN&dFq)H+;ev?)+^Vm3p83n|L%t<
zfAl%`_TP^e<(GvjU3Ye~mIx|JB%&O7?ltoH4mxu=0GyXBH0KG!fR0>_j$8yl(oSh5
fDM`DHsPfMM54g5G4Iu5%00000NkvXXu0mjf+&Y7_

literal 0
HcmV?d00001

diff --git a/include/event.php b/include/event.php
index 33970efff..9d9717a78 100644
--- a/include/event.php
+++ b/include/event.php
@@ -1,47 +1,121 @@
 <?php
 
 
-function format_event_html($ev) {
+function format_event_html($ev,$pre = '') {
 
 	require_once('include/bbcode.php');
 
 	if(! ((is_array($ev)) && count($ev)))
 		return '';
 
+	$bd_format = t('l F d, Y \@ g A') ; // Friday January 18, 2011 @ 8 AM
+
 	$o = '<div class="vevent">';
 
-	$o .= '<p class="description">' . bbcode($ev['desc']) .  '</p>';
+	$o .= '<p class="description event-description">' . bbcode($ev['desc']) .  '</p>';
 
-	$o .= '<p>' . t('Starts:') . ' <abbr class="dtstart" title="'
-		. datetime_convert('UTC','UTC',$ev['start'], $ev['adjust'] ? ATOM_TIME : 'Y-m-d\TH:i:s' )
+	$o .= '<p class="event-start">' . t('Starts:') . ' <abbr class="dtstart" title="'
+		. datetime_convert('UTC','UTC',$ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
 		. '" >' 
-		. (($ev['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), 
-			$ev['start'] /*, format */ )
-			:  datetime_convert('UTC', 'UTC', 
-			$ev['start'] /*, format */ ))
+		. (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), 
+			$ev['start'] , $bd_format ))
+			:  day_translate(datetime_convert('UTC', 'UTC', 
+			$ev['start'] , $bd_format)))
 		. '</abbr></p>';
 
 	if(! $ev['nofinish'])
-		$o .= '<p>' . t('Finishes:') . ' <abbr class="dtend" title="'
-			. datetime_convert('UTC','UTC',$ev['finish'], $ev['adjust'] ? ATOM_TIME : 'Y-m-d\TH:i:s' )
+		$o .= '<p class="event-end" >' . t('Finishes:') . ' <abbr class="dtend" title="'
+			. datetime_convert('UTC','UTC',$ev['finish'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
 			. '" >' 
-			. (($ev['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), 
-				$ev['finish'] /*, format */ )
-				:  datetime_convert('UTC', 'UTC', 
-				$ev['finish'] /*, format */ ))
+			. (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), 
+				$ev['finish'] , $bd_format ))
+				:  day_translate(datetime_convert('UTC', 'UTC', 
+				$ev['finish'] , $bd_format )))
 			. '</abbr></p>';
 
 	if(strlen($ev['location']))
-		$o .= '<p> ' . t('Location:') . '<span class="location">' 
+		$o .= '<p class="event-location"> ' . t('Location:') . '<span class="location">' 
 			. bbcode($ev['location']) 
 			. '</span></p>';
 
 	$o .= '</div>';
-
 	return $o;
 }
 
 
+function parse_event($h) {
+
+	require_once('include/Scrape.php');
+	require_once('library/HTMLPurifier.auto.php');
+	require_once('include/html2bbcode');
+
+	$h = '<html><body>' . $h . '</body></html>';
+
+	$ret = array();
+
+	$dom = HTML5_Parser::parse($h);
+
+	if(! $dom)
+ 		return $ret;
+
+	$items = $dom->getElementsByTagName('*');
+
+	foreach($items as $item) {
+		if(attribute_contains($item->getAttribute('class'), 'vevent')) {
+			$level2 = $item->getElementsByTagName('*');
+			foreach($level2 as $x) {
+				if(attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) {
+					$ret['start'] = $x->getAttribute('title');
+					if(! strpos($ret['start'],'Z'))
+						$ret['adjust'] = true;
+				}
+				if(attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title'))
+					$ret['finish'] = $x->getAttribute('title');
+
+				if(attribute_contains($x->getAttribute('class'),'description'))
+					$ret['desc'] = $x->textContent;
+				if(attribute_contains($x->getAttribute('class'),'location'))
+					$ret['location'] = $x->textContent;
+			}
+		}
+	}
+
+	// sanitise
+
+	if((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) {
+		$config = HTMLPurifier_Config::createDefault();
+		$config->set('Cache.DefinitionImpl', null);
+		$purifier = new HTMLPurifier($config);
+		$ret['desc'] = html2bbcode($purifier->purify($ret['desc']));
+	}
+
+	if((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) {
+		$config = HTMLPurifier_Config::createDefault();
+		$config->set('Cache.DefinitionImpl', null);
+		$purifier = new HTMLPurifier($config);
+		$ret['location'] = html2bbcode($purifier->purify($ret['location']));
+	}
+
+	if(x($ret,'start'))
+		$ret['start'] = datetime_convert('UTC','UTC',$ret['start']);
+	if(x($ret,'finish'))
+		$ret['finish'] = datetime_convert('UTC','UTC',$ret['finish']);
+
+	return $ret;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 function sort_by_date($a) {
 
diff --git a/include/notifier.php b/include/notifier.php
index 98e38fb11..cb4dfe025 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -27,8 +27,6 @@ function notifier_run($argv, $argc){
 
 	$a->set_baseurl(get_config('system','url'));
 
-	$prv = get_config('system','strict_privacy');
-
 	logger('notifier: invoked: ' . print_r($argv,true));
 
 	$cmd = $argv[1];
@@ -332,9 +330,6 @@ function notifier_run($argv, $argc){
 					break;
 				case 'stat':
 
-					if($prv)
-						break;
-
 					if($followup && $contact['notify']) {
 						logger('notifier: slapdelivery: ' . $contact['name']);
 						$deliver_status = slapper($owner,$contact['notify'],$slap);
@@ -465,7 +460,7 @@ function notifier_run($argv, $argc){
 
 	if($slap && count($url_recipients) && $followup && $notify_hub && (! $expire)) {
 		foreach($url_recipients as $url) {
-			if($url && (! $prv)) {
+			if($url) {
 				logger('notifier: urldelivery: ' . $url);
 				$deliver_status = slapper($owner,$url,$slap);
 				// TODO: redeliver/queue these items on failure, though there is no contact record
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 338dc9cf1..c9811fa60 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -626,11 +626,9 @@ function dfrn_request_content(&$a) {
 		else
 			$tpl = get_markup_template('auto_request.tpl');
 
-		$prv = get_config('system','strict_privacy');
-
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Friend/Connection Request'),
-			'$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo') . (($prv) ? ', testuser@identi.ca' : ''),
+			'$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'),
 			'$pls_answer' => t('Please answer the following:'),
 			'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']),
 			'$yes' => t('Yes'),
@@ -638,9 +636,9 @@ function dfrn_request_content(&$a) {
 			'$add_note' => t('Add a personal note:'),
 			'$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"),
 			'$friendika' => t('Friendika'),
-			'$statusnet' => (($prv) ? t('StatusNet/Federated Social Web') : ''),
+			'$statusnet' => t('StatusNet/Federated Social Web'),
 			'$private_net' => t("Private \x28secure\x29 network"),
-			'$public_net' => (($prv) ? t("Public \x28insecure\x29 network") : ''),
+			'$public_net' => t("Public \x28insecure\x29 network"),
 			'$your_address' => t('Your Identity Address:'),
 			'$submit' => t('Submit Request'),
 			'$cancel' => t('Cancel'),
diff --git a/mod/follow.php b/mod/follow.php
index 31cfcfb64..a354b3457 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -34,9 +34,6 @@ function follow_post(&$a) {
 		
 		// NOTREACHED
 	}
-	elseif(get_config('system','strict_privacy')) {
-		unset($ret['notify']);
-	}
 
 	// do we have enough information?
 	
diff --git a/mod/salmon.php b/mod/salmon.php
index bf33033d8..c2f76aa0a 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -192,11 +192,6 @@ function salmon_post(&$a) {
 		// NOTREACHED
 	}
 
-	// Check if we're allowed to talk to insecure networks
-
-	if(get_config('system','strict_privacy'))
-		salmon_return(400);
-
 	require_once('include/items.php');
 
 	// Placeholder for hub discovery. We shouldn't find any hubs
diff --git a/update.php b/update.php
index dfc5f88c9..e1bc73619 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1062 );
+define( 'UPDATE_VERSION' , 1063 );
 
 /**
  *
@@ -513,3 +513,8 @@ function update_1060() {
 function update_1061() {
 	q("ALTER TABLE `event` ADD `nofinish` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `type` ");
 }
+
+function update_1062() {
+	q("ALTER TABLE `user` ADD `prvnets` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `page-flags` ");
+}
+
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index c5e441bfd..61a897904 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2227,6 +2227,21 @@ a.mail-list-link {
 	font-size: 24px;
 }
 
+.event-description:before {
+	content: url('../../../images/calendar.png');
+	margin-right: 15px;
+}
+
+.event-start, .event-end {
+	margin-left: 10px;
+	width: 330px;
+	clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+	float: right;
+}
+ 
 .calendar {
 	font-family: Courier, monospace;
 }

From dea721a3f866956e0d0b86316679e05498b1d81c Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 8 Jun 2011 21:43:32 -0700
Subject: [PATCH 2/5] minor fixes to apps (don't show notes if not logged in)
 and photos (tag delete link is leaking to unauthorised users)

---
 mod/apps.php   | 14 ++++++++++++--
 mod/photos.php |  3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/mod/apps.php b/mod/apps.php
index 58752de32..f25722df7 100644
--- a/mod/apps.php
+++ b/mod/apps.php
@@ -5,10 +5,20 @@ function apps_content(&$a) {
 
 	$o .= '<h3>' . t('Applications') . '</h3>';
 
-	$o .= '<div class="app-title"><a href="notes">' . t('Private Notes') . '</a></div>';
+	$apps = false;
 
-	if($a->apps)
+	if(local_user()) {
+		$apps = true;
+		$o .= '<div class="app-title"><a href="notes">' . t('Private Notes') . '</a></div>';
+	}
+
+	if($a->apps) {
+		$apps = true;
 		$o .= $a->apps;
+	}
+
+	if(! $apps)
+		notice( t('No installed applications.') . EOL);
 
 	return $o;
 
diff --git a/mod/photos.php b/mod/photos.php
index f1a2d635c..f8749f5f7 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1106,9 +1106,10 @@ function photos_content(&$a) {
 				$tag_str .= bbcode($t);
 			} 
 			$tags = array(t('Tags: '), $tag_str);
-			if($cmd === 'edit')
+			if($cmd === 'edit') {
 				$tags[] = $a->get_baseurl() . '/tagrm/' . $link_item['id'];
 				$tags[] = t('[Remove any tag]');
+			}
 		}
 
 

From 894dfde122639cbcb90e4a07143fbe2f1d5c124a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 8 Jun 2011 22:34:22 -0700
Subject: [PATCH 3/5] set permalink on photo tags

---
 mod/photos.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mod/photos.php b/mod/photos.php
index f8749f5f7..18fff703e 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -510,8 +510,15 @@ foreach($_FILES AS $key => $val) {
 					$arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="image/jpeg" href="' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.jpg' . '" />') . '</link></target>';
 
 					$item_id = item_store($arr);
-					if($item_id)
+					if($item_id) {
+						q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+							dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id),
+							intval($page_owner_uid),
+							intval($item_id)
+						);
+
 						proc_run('php',"include/notifier.php","tag","$item_id");
+					}
 				}
 
 			}

From d371241e66c4a68ef45415ac7c4ffe5283b3bff0 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 9 Jun 2011 00:58:45 -0700
Subject: [PATCH 4/5] events

---
 include/event.php                 | 2 +-
 mod/events.php                    | 2 +-
 view/theme/duepuntozero/style.css | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/event.php b/include/event.php
index 9d9717a78..6962a2f1b 100644
--- a/include/event.php
+++ b/include/event.php
@@ -34,7 +34,7 @@ function format_event_html($ev,$pre = '') {
 			. '</abbr></p>';
 
 	if(strlen($ev['location']))
-		$o .= '<p class="event-location"> ' . t('Location:') . '<span class="location">' 
+		$o .= '<p class="event-location"> ' . t('Location:') . ' <span class="location">' 
 			. bbcode($ev['location']) 
 			. '</span></p>';
 
diff --git a/mod/events.php b/mod/events.php
index f19a438fd..b480b7f6b 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -169,7 +169,7 @@ function events_content(&$a) {
 			$prevyear --;
 		}
 			
-
+		$o .= '<div id="new-event-link"><a href="' . $a->get_baseurl() . '/events/new' . '" >' . t('Create New Event') . '</a></div>';
 		$o .= '<a href="' . $a->get_baseurl() . '/events/' . $prevyear . '/' . $prevmonth . '" class="prevcal">' . t('&lt;&lt; Previous') . '</a> | <a href="' . $a->get_baseurl() . '/events/' . $nextyear . '/' . $nextmonth . '" class="nextcal">' . t('Next &gt;&gt;') . '</a>'; 
 		$o .= cal($y,$m,false, ' eventcal');
 
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 61a897904..68edd02b9 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2227,6 +2227,10 @@ a.mail-list-link {
 	font-size: 24px;
 }
 
+#new-event-link {
+	margin-bottom: 10px;
+}
+
 .event-description:before {
 	content: url('../../../images/calendar.png');
 	margin-right: 15px;

From 9203b48527050b0b4a17120a95b2b3202842d56d Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 9 Jun 2011 01:01:29 -0700
Subject: [PATCH 5/5] default event publish permissions = personal

---
 mod/events.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mod/events.php b/mod/events.php
index b480b7f6b..af829c28d 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -54,6 +54,9 @@ function events_post(&$a) {
 	$str_contact_deny  = perms2str($_POST['contact_deny']);
 
 
+	// until publishing is ready
+	$str_contact_allow = '<' . local_user() . '>';
+
 	if($event_id) {
 		$r = q("UPDATE `event` SET
 			`edited` = '%s',