X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fevent.php;h=fedbe24468ab67a4085422375974013e279bd77e;hb=642f3fca1a1e56bb1ed823538c0e7fb2ae0e1342;hp=29202baddf982417cdf3decedc3f0b69be539dc8;hpb=a2073bcfc05abadc3e967f40c66d1fa674bba0d3;p=friendica.git

diff --git a/include/event.php b/include/event.php
old mode 100755
new mode 100644
index 29202baddf..fedbe24468
--- a/include/event.php
+++ b/include/event.php
@@ -1,9 +1,11 @@
 <?php
 
+require_once('include/bbcode.php');
+require_once('include/map.php');
 
 function format_event_html($ev) {
 
-	require_once('include/bbcode.php');
+
 
 	if(! ((is_array($ev)) && count($ev)))
 		return '';
@@ -12,6 +14,9 @@ function format_event_html($ev) {
 
 	$o = '<div class="vevent">' . "\r\n";
 
+
+	$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="'
@@ -33,16 +38,23 @@ function format_event_html($ev) {
 				$ev['finish'] , $bd_format )))
 			. '</abbr></p>'  . "\r\n";
 
-	if(strlen($ev['location']))
+	if(strlen($ev['location'])){
 		$o .= '<p class="event-location"> ' . t('Location:') . ' <span class="location">' 
 			. bbcode($ev['location']) 
 			. '</span></p>' . "\r\n";
+		
+		if (strpos($ev['location'], "[map")===False) {
+			$map = generate_named_map($ev['location']);
+			if ($map!==$ev['location']) $o.=$map;
+		}
+		
+	}
 
 	$o .= '</div>' . "\r\n";
 	return $o;
 }
 
-
+/*
 function parse_event($h) {
 
 	require_once('include/Scrape.php');
@@ -108,12 +120,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]';
 
@@ -147,6 +162,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];
@@ -162,7 +180,6 @@ function bbtoevent($s) {
 	$match = '';
 	if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
 		$ev['adjust'] = $match[1];
-	$match = '';
 	$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
 	return $ev;
 
@@ -199,7 +216,7 @@ function event_store($arr) {
 
 	$arr['created'] = (($arr['created']) ? $arr['created'] : datetime_convert());
 	$arr['edited']  = (($arr['edited']) ? $arr['edited'] : datetime_convert());
-	$arr['type']    = (($arr['type']) ? $arr['type'] : 'event' );	
+	$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);
@@ -245,6 +262,7 @@ function event_store($arr) {
 			`edited` = '%s',
 			`start` = '%s',
 			`finish` = '%s',
+			`summary` = '%s',
 			`desc` = '%s',
 			`location` = '%s',
 			`type` = '%s',
@@ -254,11 +272,12 @@ function event_store($arr) {
 			`allow_gid` = '%s',
 			`deny_cid` = '%s',
 			`deny_gid` = '%s'
-			WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			WHERE `id` = %d AND `uid` = %d",
 
 			dbesc($arr['edited']),
 			dbesc($arr['start']),
 			dbesc($arr['finish']),
+			dbesc($arr['summary']),
 			dbesc($arr['desc']),
 			dbesc($arr['location']),
 			dbesc($arr['type']),
@@ -281,7 +300,7 @@ function event_store($arr) {
 			$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",
+			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",
 				dbesc(format_event_bbcode($arr)),
 				dbesc($object),
 				dbesc($arr['allow_cid']),
@@ -294,18 +313,22 @@ function event_store($arr) {
 				intval($arr['uid'])
 			);
 
-			return $r[0]['id'];
+			$item_id = $r[0]['id'];
 		}
 		else
-			return 0;
+			$item_id = 0;
+
+		call_hooks("event_updated", $arr['id']);
+
+		return $item_id;
 	}
 	else {
 
 		// New event. Store it. 
 
-		$r = q("INSERT INTO `event` ( `uid`,`cid`,`uri`,`created`,`edited`,`start`,`finish`,`desc`,`location`,`type`,
+		$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']),
@@ -313,6 +336,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']),
@@ -361,7 +385,7 @@ function event_store($arr) {
 		$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";
 
@@ -370,19 +394,26 @@ function event_store($arr) {
 		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($arr['uid'])
 		);
-		if(count($r))
-			$plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
+		//if(count($r))
+		//	$plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
 
 
 		if($item_id) {
-			q("UPDATE `item` SET `plink` = '%s', `event-id` = %d  WHERE `uid` = %d AND `id` = %d LIMIT 1",
-				dbesc($plink),
+			//q("UPDATE `item` SET `plink` = '%s', `event-id` = %d  WHERE `uid` = %d AND `id` = %d",
+			//	dbesc($plink),
+			//	intval($event['id']),
+			//	intval($arr['uid']),
+			//	intval($item_id)
+			//);
+			q("UPDATE `item` SET `event-id` = %d  WHERE `uid` = %d AND `id` = %d",
 				intval($event['id']),
 				intval($arr['uid']),
 				intval($item_id)
 			);
 		}
 
+		call_hooks("event_created", $event['id']);
+
 		return $item_id;
 	}
 }