X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fevent.php;h=8aef0a263613cd8db9afaadf8cfa34361e9cec3d;hb=ad5a47aecfe843199c50fb394cca6a77d5c12f3d;hp=2cfc524087f56ab6fec296db15cb130f35a3c6e6;hpb=b1184f3fdeb4dcc6126b7ea8d7ac1a2980c9cbac;p=friendica.git

diff --git a/include/event.php b/include/event.php
index 2cfc524087..8aef0a2636 100644
--- a/include/event.php
+++ b/include/event.php
@@ -8,11 +8,14 @@ function format_event_html($ev) {
 	if(! ((is_array($ev)) && count($ev)))
 		return '';
 
-	$bd_format = t('l F d, Y \@ g A') ; // Friday January 18, 2011 @ 8 AM
+	$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
 
-	$o = '<div class="vevent">';
+	$o = '<div class="vevent">' . "\r\n";
 
-	$o .= '<p class="description event-description">' . bbcode($ev['desc']) .  '</p>';
+
+	$o .= '<p class="summary event-summary">' . bbcode($ev['summary']) .  '</p>' . "\r\n";
+
+	$o .= '<p class="description event-description">' . bbcode($ev['desc']) .  '</p>' . "\r\n";
 
 	$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' ))
@@ -21,7 +24,7 @@ function format_event_html($ev) {
 			$ev['start'] , $bd_format ))
 			:  day_translate(datetime_convert('UTC', 'UTC', 
 			$ev['start'] , $bd_format)))
-		. '</abbr></p>';
+		. '</abbr></p>' . "\r\n";
 
 	if(! $ev['nofinish'])
 		$o .= '<p class="event-end" >' . t('Finishes:') . ' <abbr class="dtend" title="'
@@ -31,18 +34,18 @@ function format_event_html($ev) {
 				$ev['finish'] , $bd_format ))
 				:  day_translate(datetime_convert('UTC', 'UTC', 
 				$ev['finish'] , $bd_format )))
-			. '</abbr></p>';
+			. '</abbr></p>'  . "\r\n";
 
 	if(strlen($ev['location']))
 		$o .= '<p class="event-location"> ' . t('Location:') . ' <span class="location">' 
 			. bbcode($ev['location']) 
-			. '</span></p>';
+			. '</span></p>' . "\r\n";
 
-	$o .= '</div>';
+	$o .= '</div>' . "\r\n";
 	return $o;
 }
 
-
+/*
 function parse_event($h) {
 
 	require_once('include/Scrape.php');
@@ -53,7 +56,12 @@ function parse_event($h) {
 
 	$ret = array();
 
-	$dom = HTML5_Parser::parse($h);
+
+	try {
+		$dom = HTML5_Parser::parse($h);
+	} catch (DOMException $e) {
+		logger('parse_event: parse error: ' . $e);
+	}
 
 	if(! $dom)
  		return $ret;
@@ -103,12 +111,15 @@ function parse_event($h) {
 
 	return $ret;
 }
-
+*/
 
 function format_event_bbcode($ev) {
 
 	$o = '';
 
+	if($ev['summary'])
+		$o .= '[event-summary]' . $ev['summary'] . '[/event-summary]';
+
 	if($ev['desc'])
 		$o .= '[event-description]' . $ev['desc'] . '[/event-description]';
 
@@ -142,6 +153,9 @@ function bbtoevent($s) {
 
 	$ev = array();
 
+	$match = '';
+	if(preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is",$s,$match))
+		$ev['summary'] = $match[1];
 	$match = '';
 	if(preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is",$s,$match))
 		$ev['desc'] = $match[1];
@@ -157,8 +171,7 @@ function bbtoevent($s) {
 	$match = '';
 	if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
 		$ev['adjust'] = $match[1];
-	$match = '';
-	$ev['nofinish'] = (($ev['start'] && (! $ev['finish'])) ? 1 : 0);
+	$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
 	return $ev;
 
 }
@@ -175,6 +188,9 @@ function ev_compare($a,$b) {
 
 	$date_a = (($a['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$a['start']) : $a['start']);
 	$date_b = (($b['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$b['start']) : $b['start']);
+
+	if($date_a === $date_b)
+		return strcasecmp($a['desc'],$b['desc']);
 	
 	return strcmp($date_a,$date_b);
 }
@@ -190,10 +206,11 @@ function event_store($arr) {
 	$a = get_app();
 
 	$arr['created'] = (($arr['created']) ? $arr['created'] : datetime_convert());
-	$arr['edited'] = (($arr['edited']) ? $arr['edited'] : datetime_convert());
-	$arr['type'] = (($arr['type']) ? $arr['type'] : 'event' );	
-	$arr['cid'] = ((intval($arr['cid'])) ? intval($arr['cid']) : 0);
-	$arr['uri'] = (x($arr,'uri') ? $arr['uri'] : item_new_uri($a->get_hostname(),$arr['uid']));
+	$arr['edited']  = (($arr['edited']) ? $arr['edited'] : datetime_convert());
+	$arr['type']    = (($arr['type']) ? $arr['type'] : 'event' );	
+	$arr['cid']     = ((intval($arr['cid'])) ? intval($arr['cid']) : 0);
+	$arr['uri']     = (x($arr,'uri') ? $arr['uri'] : item_new_uri($a->get_hostname(),$arr['uid']));
+	$arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0);
 
 	if($arr['cid'])
 		$c = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -209,11 +226,34 @@ function event_store($arr) {
 		$contact = $c[0];
 
 
+	// Existing event being modified
+
 	if($arr['id']) {
+
+		// has the event actually changed?
+
+		$r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			intval($arr['id']),
+			intval($arr['uid'])
+		);
+		if((! count($r)) || ($r[0]['edited'] === $arr['edited'])) {
+
+			// Nothing has changed. Grab the item id to return.
+
+			$r = q("SELECT * FROM `item` WHERE `event-id` = %d AND `uid` = %d LIMIT 1",
+				intval($arr['id']),
+				intval($arr['uid'])
+			);
+			return((count($r)) ? $r[0]['id'] : 0);
+		}
+
+		// The event changed. Update it.
+
 		$r = q("UPDATE `event` SET
 			`edited` = '%s',
 			`start` = '%s',
 			`finish` = '%s',
+			`summary` = '%s',
 			`desc` = '%s',
 			`location` = '%s',
 			`type` = '%s',
@@ -228,6 +268,7 @@ function event_store($arr) {
 			dbesc($arr['edited']),
 			dbesc($arr['start']),
 			dbesc($arr['finish']),
+			dbesc($arr['summary']),
 			dbesc($arr['desc']),
 			dbesc($arr['location']),
 			dbesc($arr['type']),
@@ -244,16 +285,41 @@ function event_store($arr) {
 			intval($arr['id']),
 			intval($arr['uid'])
 		);
-		if(count($r))
-			return $r[0]['id'];
+		if(count($r)) {
+			$object = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
+			$object .= '<content>' . xmlify(format_event_bbcode($arr)) . '</content>';
+			$object .= '</object>' . "\n";
+
+
+			q("UPDATE `item` SET `body` = '%s', `object` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `edited` = '%s', `private` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
+				dbesc(format_event_bbcode($arr)),
+				dbesc($object),
+				dbesc($arr['allow_cid']),
+				dbesc($arr['allow_gid']),
+				dbesc($arr['deny_cid']),
+				dbesc($arr['deny_gid']),
+				dbesc($arr['edited']),
+				intval($arr['private']),
+				intval($r[0]['id']),
+				intval($arr['uid'])
+			);
+
+			$item_id = $r[0]['id'];
+		}
 		else
-			return 0;
+			$item_id = 0;
+
+		call_hooks("event_updated", $arr['id']);
+
+		return $item_id;
 	}
 	else {
 
-		$r = q("INSERT INTO `event` ( `uid`,`cid`,`uri`,`created`,`edited`,`start`,`finish`,`desc`,`location`,`type`,
+		// New event. Store it. 
+
+		$r = q("INSERT INTO `event` ( `uid`,`cid`,`uri`,`created`,`edited`,`start`,`finish`,`summary`, `desc`,`location`,`type`,
 			`adjust`,`nofinish`,`allow_cid`,`allow_gid`,`deny_cid`,`deny_gid`)
-			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ",
+			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ",
 			intval($arr['uid']),
 			intval($arr['cid']),
 			dbesc($arr['uri']),
@@ -261,6 +327,7 @@ function event_store($arr) {
 			dbesc($arr['edited']),
 			dbesc($arr['start']),
 			dbesc($arr['finish']),
+			dbesc($arr['summary']),
 			dbesc($arr['desc']),
 			dbesc($arr['location']),
 			dbesc($arr['type']),
@@ -274,7 +341,7 @@ function event_store($arr) {
 		);
 
 		$r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-			dbesc($uri),
+			dbesc($arr['uri']),
 			intval($arr['uid'])
 		);
 		if(count($r))
@@ -284,10 +351,10 @@ function event_store($arr) {
 
 		$item_arr['uid']           = $arr['uid'];
 		$item_arr['contact-id']    = $arr['cid'];
-		$item_arr['uri']           = $uri;
-		$item_arr['parent-uri']    = $uri;
+		$item_arr['uri']           = $arr['uri'];
+		$item_arr['parent-uri']    = $arr['uri'];
 		$item_arr['type']          = 'activity';
-		$item_arr['wall']          = 1;
+		$item_arr['wall']          = (($arr['cid']) ? 0 : 1);
 		$item_arr['contact-id']    = $contact['id'];
 		$item_arr['owner-name']    = $contact['name'];
 		$item_arr['owner-link']    = $contact['url'];
@@ -296,19 +363,20 @@ function event_store($arr) {
 		$item_arr['author-link']   = $contact['url'];
 		$item_arr['author-avatar'] = $contact['thumb'];
 		$item_arr['title']         = '';
-		$item_arr['allow_cid']     = $str_contact_allow;
-		$item_arr['allow_gid']     = $str_group_allow;
-		$item_arr['deny_cid']      = $str_contact_deny;
-		$item_arr['deny_gid']      = $str_group_deny;
+		$item_arr['allow_cid']     = $arr['allow_cid'];
+		$item_arr['allow_gid']     = $arr['allow_gid'];
+		$item_arr['deny_cid']      = $arr['deny_cid'];
+		$item_arr['deny_gid']      = $arr['deny_gid'];
+		$item_arr['private']       = $arr['private'];
 		$item_arr['last-child']    = 1;
 		$item_arr['visible']       = 1;
 		$item_arr['verb']          = ACTIVITY_POST;
 		$item_arr['object-type']   = ACTIVITY_OBJ_EVENT;
-
+		$item_arr['origin']        = ((intval($arr['cid']) == 0) ? 1 : 0);
 		$item_arr['body']          = format_event_bbcode($event);
 
 
-		$item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($uri) . '</id>';
+		$item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
 		$item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
 		$item_arr['object'] .= '</object>' . "\n";
 
@@ -329,6 +397,9 @@ function event_store($arr) {
 				intval($item_id)
 			);
 		}
+
+		call_hooks("event_created", $event['id']);
+
 		return $item_id;
 	}
 }