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

diff --git a/include/event.php b/include/event.php
index 8aef0a2636..a87dba64fb 100644
--- 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 '';
@@ -19,28 +21,35 @@ function format_event_html($ev) {
 
 	$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']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), 
+		. '" >'
+		. (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
 			$ev['start'] , $bd_format ))
-			:  day_translate(datetime_convert('UTC', 'UTC', 
+			:  day_translate(datetime_convert('UTC', 'UTC',
 			$ev['start'] , $bd_format)))
 		. '</abbr></p>' . "\r\n";
 
 	if(! $ev['nofinish'])
 		$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']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), 
+			. '" >'
+			. (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
 				$ev['finish'] , $bd_format ))
-				:  day_translate(datetime_convert('UTC', 'UTC', 
+				:  day_translate(datetime_convert('UTC', 'UTC',
 				$ev['finish'] , $bd_format )))
 			. '</abbr></p>'  . "\r\n";
 
-	if(strlen($ev['location']))
-		$o .= '<p class="event-location"> ' . t('Location:') . ' <span class="location">' 
-			. bbcode($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;
 }
@@ -128,7 +137,7 @@ function format_event_bbcode($ev) {
 
 	if(($ev['finish']) && (! $ev['nofinish']))
 		$o .= '[event-finish]' . $ev['finish'] . '[/event-finish]';
- 
+
 	if($ev['location'])
 		$o .= '[event-location]' . $ev['location'] . '[/event-location]';
 
@@ -191,7 +200,7 @@ function ev_compare($a,$b) {
 
 	if($date_a === $date_b)
 		return strcasecmp($a['desc'],$b['desc']);
-	
+
 	return strcmp($date_a,$date_b);
 }
 
@@ -207,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);
@@ -263,7 +272,7 @@ 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']),
@@ -291,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']),
@@ -315,7 +324,7 @@ function event_store($arr) {
 	}
 	else {
 
-		// New event. Store it. 
+		// 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`)
@@ -353,6 +362,7 @@ function event_store($arr) {
 		$item_arr['contact-id']    = $arr['cid'];
 		$item_arr['uri']           = $arr['uri'];
 		$item_arr['parent-uri']    = $arr['uri'];
+		$item_arr['guid']          = $arr['guid'];
 		$item_arr['type']          = 'activity';
 		$item_arr['wall']          = (($arr['cid']) ? 0 : 1);
 		$item_arr['contact-id']    = $contact['id'];
@@ -385,13 +395,18 @@ 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)