X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fevents.php;h=94e2ba6b40b597fde1f8a4e99d0d13406972009c;hb=016b6428a091e4d9067962e2d8931e7e51254621;hp=7940e79a420a6056ea9070010bdd93cc95745790;hpb=a3edbf7e5d0d89e99c2249cf30657b1fbc57982a;p=friendica.git

diff --git a/mod/events.php b/mod/events.php
index 7940e79a42..94e2ba6b40 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -28,7 +28,7 @@ function events_post(&$a) {
 	$adjust   = intval($_POST['adjust']);
 	$nofinish = intval($_POST['nofinish']);
 
-	// The default setting for the `private` field in event_store() is false, so mirror that	
+	// The default setting for the `private` field in event_store() is false, so mirror that
 	$private_event = false;
 
 
@@ -141,9 +141,36 @@ function events_content(&$a) {
 		return;
 	}
 
+	if(($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
+		$r = q("update event set ignore = 1 where id = %d and uid = %d",
+			intval($a->argv[2]),
+			intval(local_user())
+		);
+	}
+
+	if(($a->argc > 2) && ($a->argv[1] === 'unignore') && intval($a->argv[2])) {
+		$r = q("update event set ignore = 0 where id = %d and uid = %d",
+			intval($a->argv[2]),
+			intval(local_user())
+		);
+	}
+
+
+	$editselect = 'none';
+	if( feature_enabled(local_user(), 'richtext') )
+		$editselect = 'textareas';
 
 	$htpl = get_markup_template('event_head.tpl');
-	$a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
+	$a->page['htmlhead'] .= replace_macros($htpl,array(
+		'$baseurl' => $a->get_baseurl(),
+		'$editselect' => $editselect
+	));
+
+	$etpl = get_markup_template('event_end.tpl');
+	$a->page['end'] .= replace_macros($etpl,array(
+		'$baseurl' => $a->get_baseurl(),
+		'$editselect' => $editselect
+	));
 
 	$o ="";
 	// tabs
@@ -154,6 +181,7 @@ function events_content(&$a) {
 	$mode = 'view';
 	$y = 0;
 	$m = 0;
+	$ignored = ((x($_REQUEST,'ignored')) ? intval($_REQUEST['ignored']) : 0);
 
 	if($a->argc > 1) {
 		if($a->argc > 2 && $a->argv[1] == 'event') {
@@ -231,13 +259,16 @@ function events_content(&$a) {
 		} else {
 			$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
 				`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` 
-				WHERE `event`.`uid` = %d
-				AND (( `adjust` = 0 AND `finish` >= '%s' AND `start` <= '%s' ) 
-				OR  (  `adjust` = 1 AND `finish` >= '%s' AND `start` <= '%s' )) ",
+				WHERE `event`.`uid` = %d and event.ignore = %d
+				AND (( `adjust` = 0 AND ( `finish` >= '%s' OR ( nofinish AND start >= '%s' ) ) AND `start` <= '%s' ) 
+				OR  (  `adjust` = 1 AND ( `finish` >= '%s' OR ( nofinish AND start >= '%s' ) ) AND `start` <= '%s' )) ",
 				intval(local_user()),
+				intval($ignored),
+				dbesc($start),
 				dbesc($start),
 				dbesc($finish),
 				dbesc($adjust_start),
+				dbesc($adjust_start),
 				dbesc($adjust_finish)
 			);
 		}
@@ -280,10 +311,10 @@ function events_content(&$a) {
 					
 				$last_date = $d;
 				$edit = ((! $rr['cid']) ? array($a->get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
-				$title = strip_tags(bbcode($rr['summary']));
+				$title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
 				if(! $title) {
 					list($title, $_trash) = explode("<br",bbcode($rr['desc']),2);
-					$title = strip_tags($title);
+					$title = strip_tags(html_entity_decode($title,ENT_QUOTES,'UTF-8'));
 				}
 				$html = format_event_html($rr);
 				$rr['desc'] = bbcode($rr['desc']);
@@ -322,6 +353,17 @@ function events_content(&$a) {
 //				$tpl = get_markup_template("events.tpl");
 //			}
 		}
+
+		// Get rid of dashes in key names, Smarty3 can't handle them
+		foreach($events as $key => $event) {
+			$event_item = array();
+			foreach($event['item'] as $k => $v) {
+				$k = str_replace('-','_',$k);
+				$event_item[$k] = $v;
+			}
+			$events[$key]['item'] = $event_item;
+		}
+
 		$o = replace_macros($tpl, array(
 			'$baseurl'	=> $a->get_baseurl(),
 			'$tabs'		=> $tabs,
@@ -330,16 +372,16 @@ function events_content(&$a) {
 			'$previus'	=> array($a->get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
 			'$next'		=> array($a->get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
 			'$calendar' => cal($y,$m,$links, ' eventcal'),
-			
+
 			'$events'	=> $events,
-			
-			
+
+
 		));
-		
+
 		if (x($_GET,'id')){ echo $o; killme(); }
-		
+
 		return $o;
-		
+
 	}
 
 	if($mode === 'edit' && $event_id) {