X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fevents.php;h=94e2ba6b40b597fde1f8a4e99d0d13406972009c;hb=2f89a9b3e8c8028ef9dd0bdc8cd8611e5d67903d;hp=fb68d53dbc020593ca5cdd282a85735af0a165f6;hpb=caf18164f0f7bd336e61d4393dabf6d93c739879;p=friendica.git

diff --git a/mod/events.php b/mod/events.php
old mode 100644
new mode 100755
index fb68d53dbc..94e2ba6b40
--- a/mod/events.php
+++ b/mod/events.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once('include/bbcode.php');
 require_once('include/datetime.php');
 require_once('include/event.php');
 require_once('include/items.php');
@@ -27,6 +28,9 @@ 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
+	$private_event = false;
+
 
 	$start    = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
 	if($nofinish)
@@ -53,25 +57,50 @@ function events_post(&$a) {
 	if(strcmp($finish,$start) < 0)
 		$finish = $start;
 
+	$summary  = escape_tags(trim($_POST['summary']));
 	$desc     = escape_tags(trim($_POST['desc']));
 	$location = escape_tags(trim($_POST['location']));
 	$type     = 'event';
 
-	if((! $desc) || (! $start)) {
-		notice( t('Event description and start time are required.') . EOL);
+	if((! $summary) || (! $start)) {
+		notice( t('Event title and start time are required.') . EOL);
 		goaway($a->get_baseurl() . '/events/new');
 	}
 
 	$share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0);
 
+	$c = q("select id from contact where uid = %d and self = 1 limit 1",
+		intval(local_user())
+	);
+	if(count($c))
+		$self = $c[0]['id'];
+	else
+		$self = 0;
+
+
 	if($share) {
 		$str_group_allow   = perms2str($_POST['group_allow']);
 		$str_contact_allow = perms2str($_POST['contact_allow']);
 		$str_group_deny    = perms2str($_POST['group_deny']);
 		$str_contact_deny  = perms2str($_POST['contact_deny']);
+
+		// Undo the pseudo-contact of self, since there are real contacts now
+		if( strpos($str_contact_allow, '<' . $self . '>') !== false )
+		{
+			$str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow);
+		}
+		// Make sure to set the `private` field as true. This is necessary to
+		// have the posts show up correctly in Diaspora if an event is created
+		// as visible only to self at first, but then edited to display to others.
+		if( strlen($str_group_allow) or strlen($str_contact_allow) or strlen($str_group_deny) or strlen($str_contact_deny) )
+		{
+			$private_event = true;
+		}
 	}
 	else {
-		$str_contact_allow = '<' . local_user() . '>';
+		// Note: do not set `private` field for self-only events. It will
+		// keep even you from seeing them!
+		$str_contact_allow = '<' . $self . '>';
 		$str_group_allow = $str_contact_deny = $str_group_deny = '';
 	}
 
@@ -79,6 +108,7 @@ function events_post(&$a) {
 	$datarray = array();
 	$datarray['start'] = $start;
 	$datarray['finish'] = $finish;
+	$datarray['summary'] = $summary;
 	$datarray['desc'] = $desc;
 	$datarray['location'] = $location;
 	$datarray['type'] = $type;
@@ -90,6 +120,7 @@ function events_post(&$a) {
 	$datarray['allow_gid'] = $str_group_allow;
 	$datarray['deny_cid'] = $str_contact_deny;
 	$datarray['deny_gid'] = $str_group_deny;
+	$datarray['private'] = (($private_event) ? 1 : 0);
 	$datarray['id'] = $event_id;
 	$datarray['created'] = $created;
 	$datarray['edited'] = $edited;
@@ -110,16 +141,47 @@ 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(),
+		'$editselect' => $editselect
+	));
+
+	$etpl = get_markup_template('event_end.tpl');
+	$a->page['end'] .= replace_macros($etpl,array(
+		'$baseurl' => $a->get_baseurl(),
+		'$editselect' => $editselect
+	));
+
 	$o ="";
 	// tabs
-	$o .= profile_tabs($a, True);	
+	$tabs = profile_tabs($a, True);	
 
-	$o .= '<h2>' . t('Events') . '</h2>';
 
 
 	$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') {
@@ -138,6 +200,8 @@ function events_content(&$a) {
 	}
 
 	if($mode == 'view') {
+		
+		
 	    $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
     	$thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
 		if(! $y)
@@ -167,11 +231,16 @@ function events_content(&$a) {
 			$prevmonth = 12;
 			$prevyear --;
 		}
-
 			
 		$dim    = get_dim($y,$m);
 		$start  = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0);
 		$finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59);
+
+
+		if ($a->argv[1] === 'json'){
+			if (x($_GET,'start'))	$start = date("Y-m-d h:i:s", $_GET['start']);
+			if (x($_GET,'end'))	$finish = date("Y-m-d h:i:s", $_GET['end']);
+		}
 	
 		$start  = datetime_convert('UTC','UTC',$start);
 		$finish = datetime_convert('UTC','UTC',$finish);
@@ -180,17 +249,29 @@ function events_content(&$a) {
 		$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
 
 
-		$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 `start` >= '%s' AND `start` <= '%s' ) 
-			OR  (  `adjust` = 1 AND `start` >= '%s' AND `start` <= '%s' )) ",
-			intval(local_user()),
-			dbesc($start),
-			dbesc($finish),
-			dbesc($adjust_start),
-			dbesc($adjust_finish)
-		);
+		if (x($_GET,'id')){
+			$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 `event`.`id` = %d",
+				intval(local_user()),
+				intval($_GET['id'])
+			);
+		} 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 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)
+			);
+		}
 
 		$links = array();
 
@@ -204,17 +285,7 @@ function events_content(&$a) {
 		}
 
 
-		$o .= '<div id="new-event-link"><a href="' . $a->get_baseurl() . '/events/new' . '" >' . t('Create New Event') . '</a></div>';
-		$o .= '<div id="event-calendar-wrapper">';
-
-		$o .= '<a href="' . $a->get_baseurl() . '/events/' . $prevyear . '/' . $prevmonth . '" class="prevcal"><div id="event-calendar-prev" class="icon prev" title="' . t('Previous') . '"></div></a>';
-		$o .= cal($y,$m,$links, ' eventcal');
-
-		$o .= '<a href="' . $a->get_baseurl() . '/events/' . $nextyear . '/' . $nextmonth . '" class="nextcal"><div id="event-calendar-next" class="icon next" title="' . t('Next') . '"></div></a>';
-		$o .= '</div>';
-		$o .= '<div class="event-calendar-end"></div>';
-
-
+		$events=array();
 
 		$last_date = '';
 		$fmt = t('l, F j');
@@ -222,22 +293,95 @@ function events_content(&$a) {
 		if(count($r)) {
 			$r = sort_by_date($r);
 			foreach($r as $rr) {
+				
+				
 				$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
 				$d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], $fmt) : datetime_convert('UTC','UTC',$rr['start'],$fmt));
 				$d = day_translate($d);
-				if($d !== $last_date)
-					$o .= '<hr /><a name="link-' . $j . '" ><div class="event-list-date">' . $d . '</div></a>';
+				
+				$start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'c') : datetime_convert('UTC','UTC',$rr['start'],'c'));
+				if ($rr['nofinish']){
+					$end = null;
+				} else {
+					$end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['finish'], 'c') : datetime_convert('UTC','UTC',$rr['finish'],'c'));
+				}
+				
+				
+				$is_first = ($d !== $last_date);
+					
 				$last_date = $d;
-				$o .= format_event_html($rr);
-				$o .= ((! $rr['cid']) ? '<a href="' . $a->get_baseurl() . '/events/event/' . $rr['id'] . '" title="' . t('Edit event') . '" class="edit-event-link icon pencil"></a>' : '');
-				if($rr['plink'])
-					$o .= '<a href="' . $rr['plink'] . '" title="' . t('link to source') . '" target="external-link" class="plink-event-link icon remote-link"></a></div>';
+				$edit = ((! $rr['cid']) ? array($a->get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
+				$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(html_entity_decode($title,ENT_QUOTES,'UTF-8'));
+				}
+				$html = format_event_html($rr);
+				$rr['desc'] = bbcode($rr['desc']);
+				$rr['location'] = bbcode($rr['location']);
+				$events[] = array(
+					'id'=>$rr['id'],
+					'start'=> $start,
+					'end' => $end,
+					'allDay' => false,
+					'title' => $title,
+					
+					'j' => $j,
+					'd' => $d,
+					'edit' => $edit,
+					'is_first'=>$is_first,
+					'item'=>$rr,
+					'html'=>$html,
+					'plink' => array($rr['plink'],t('link to source'),'',''),
+				);
 
-				$o .= '<div class="clear"></div>';
 
 			}
 		}
+		 
+		if ($a->argv[1] === 'json'){
+			echo json_encode($events); killme();
+		}
+		
+		// links: array('href', 'text', 'extra css classes', 'title')
+		if (x($_GET,'id')){
+			$tpl =  get_markup_template("event.tpl");
+		} else {
+//			if (get_config('experimentals','new_calendar')==1){
+				$tpl = get_markup_template("events-js.tpl");
+//			} else {
+//				$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,
+			'$title'	=> t('Events'),
+			'$new_event'=> array($a->get_baseurl().'/events/new',t('Create New Event'),'',''),
+			'$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) {
@@ -253,6 +397,7 @@ function events_content(&$a) {
 
 		$n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
 		$a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : '');
+		$t_orig = ((x($orig_event)) ? $orig_event['summary'] : '');
 		$d_orig = ((x($orig_event)) ? $orig_event['desc'] : '');
 		$l_orig = ((x($orig_event)) ? $orig_event['location'] : '');
 		$eid = ((x($orig_event)) ? $orig_event['id'] : 0);
@@ -268,17 +413,16 @@ function events_content(&$a) {
 		if($cid)
 			$sh_checked .= ' disabled="disabled" ';
 
-		$htpl = get_markup_template('event_head.tpl');
-		$a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
+
 
 		$tpl = get_markup_template('event_form.tpl');
 
 		$sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
 		$fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
 
-		$tz = ((x($orig_event) && $orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
- 
-
+		$tz = date_default_timezone_get();
+		if(x($orig_event))
+			$tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
 
 		$syear = datetime_convert('UTC', $tz, $sdt, 'Y');
 		$smonth = datetime_convert('UTC', $tz, $sdt, 'm');
@@ -308,9 +452,11 @@ function events_content(&$a) {
 			'$eid' => $eid, 
 			'$cid' => $cid,
 			'$uri' => $uri,
-			'$e_text' => t('Event details'),
-			'$e_desc' => sprintf( t('Format is %s %s. Starting date and Description are required.'),$dateformat,$timeformat),
-			'$s_text' => t('Event Starts:') . ' <span class="required">*</span> ',
+	
+			'$title' => t('Event details'),
+			'$desc' => sprintf( t('Format is %s %s. Starting date and Title are required.'),$dateformat,$timeformat),
+			
+			'$s_text' => t('Event Starts:') . ' <span class="required" title="' . t('Required') . '">*</span>',
 			'$s_dsel' => datesel($f,'start',$syear+5,$syear,false,$syear,$smonth,$sday),
 			'$s_tsel' => timesel('start',$shour,$sminute),
 			'$n_text' => t('Finish date/time is not known or not relevant'),
@@ -320,10 +466,12 @@ function events_content(&$a) {
 			'$f_tsel' => timesel('finish',$fhour,$fminute),
 			'$a_text' => t('Adjust for viewer timezone'),
 			'$a_checked' => $a_checked,
-			'$d_text' => t('Description:') . ' <span class="required">*</span>',
+			'$d_text' => t('Description:'), 
 			'$d_orig' => $d_orig,
 			'$l_text' => t('Location:'),
 			'$l_orig' => $l_orig,
+			'$t_text' => t('Title:') . ' <span class="required" title="' . t('Required') . '">*</span>',
+			'$t_orig' => $t_orig,
 			'$sh_text' => t('Share this event'),
 			'$sh_checked' => $sh_checked,
 			'$acl' => (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user),false)),