X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fevents.php;h=7a05274e233d8281f6ff673ddb66a28160fd374c;hb=2196a0577b29dcec1ba4d2c32be10fa5f0e91034;hp=0fdec5cbe4c0f01d1e59bff4fc6418230a8ce6ab;hpb=9c0d2c31e87a73f157b360c518eb059e9a2507de;p=friendica.git

diff --git a/mod/events.php b/mod/events.php
index 0fdec5cbe4..7a05274e23 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -5,6 +5,10 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
@@ -90,7 +94,7 @@ function events_post(App $a) {
 	$type     = 'event';
 
 	$action = ($event_id == '') ? 'new' : "event/" . $event_id;
-	$onerror_url = App::get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
+	$onerror_url = System::baseUrl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
 
 	if (strcmp($finish, $start) < 0 && !$nofinish) {
 		notice(t('Event can not end before it has started.') . EOL);
@@ -176,7 +180,7 @@ function events_post(App $a) {
 	$item_id = event_store($datarray);
 
 	if (! $cid) {
-		proc_run(PRIORITY_HIGH, "include/notifier.php", "event", $item_id);
+		Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
 	}
 
 	goaway($_SESSION['return_url']);
@@ -190,7 +194,7 @@ function events_content(App $a) {
 	}
 
 	if ($a->argc == 1) {
-		$_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
+		$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
 	}
 
 	if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
@@ -218,7 +222,7 @@ function events_content(App $a) {
 
 	$htpl = get_markup_template('event_head.tpl');
 	$a->page['htmlhead'] .= replace_macros($htpl, array(
-		'$baseurl' => App::get_baseurl(),
+		'$baseurl' => System::baseUrl(),
 		'$module_url' => '/events',
 		'$modparams' => 1,
 		'$i18n' => $i18n,
@@ -226,7 +230,7 @@ function events_content(App $a) {
 
 	$etpl = get_markup_template('event_end.tpl');
 	$a->page['end'] .= replace_macros($etpl, array(
-		'$baseurl' => App::get_baseurl(),
+		'$baseurl' => System::baseUrl(),
 	));
 
 	$o = '';
@@ -249,6 +253,10 @@ function events_content(App $a) {
 			$mode = 'drop';
 			$event_id = intval($a->argv[2]);
 		}
+		if ($a->argc > 2 && $a->argv[1] == 'copy') {
+			$mode = 'copy';
+			$event_id = intval($a->argv[2]);
+		}
 		if ($a->argv[1] === 'new') {
 			$mode = 'new';
 			$event_id = 0;
@@ -332,12 +340,12 @@ function events_content(App $a) {
 
 		$links = array();
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($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'));
 				if (! x($links,$j)) {
-					$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
+					$links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
 				}
 			}
 		}
@@ -345,7 +353,7 @@ function events_content(App $a) {
 		$events = array();
 
 		// transform the event in a usable array
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$r = sort_by_date($r);
 			$events = process_events($r);
 		}
@@ -372,13 +380,13 @@ function events_content(App $a) {
 		}
 
 		$o = replace_macros($tpl, array(
-			'$baseurl'   => App::get_baseurl(),
+			'$baseurl'   => System::baseUrl(),
 			'$tabs'      => $tabs,
 			'$title'     => t('Events'),
 			'$view'      => t('View'),
-			'$new_event' => array(App::get_baseurl() . '/events/new', t('Create New Event'), '', ''),
-			'$previous'  => array(App::get_baseurl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''),
-			'$next'      => array(App::get_baseurl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''),
+			'$new_event' => array(System::baseUrl() . '/events/new', t('Create New Event'), '', ''),
+			'$previous'  => array(System::baseUrl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''),
+			'$next'      => array(System::baseUrl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''),
 			'$calendar'  => cal($y, $m, $links, ' eventcal'),
 
 			'$events'    => $events,
@@ -398,18 +406,18 @@ function events_content(App $a) {
 		return $o;
 	}
 
-	if ($mode === 'edit' && $event_id) {
+	if (($mode === 'edit' || $mode === 'copy') && $event_id) {
 		$r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($event_id),
 			intval(local_user())
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$orig_event = $r[0];
 		}
 	}
 
 	// Passed parameters overrides anything found in the DB
-	if ($mode === 'edit' || $mode === 'new') {
+	if (in_array($mode, array('edit', 'new', 'copy'))) {
 		if (!x($orig_event)) {$orig_event = array();}
 		// In case of an error the browser is redirected back here, with these parameters filled in with the previous values
 		if (x($_REQUEST, 'nofinish'))    {$orig_event['nofinish']    = $_REQUEST['nofinish'];}
@@ -430,17 +438,18 @@ function events_content(App $a) {
 		$cid    = ((x($orig_event)) ? $orig_event['cid']      : 0);
 		$uri    = ((x($orig_event)) ? $orig_event['uri']      : '');
 
-		if (! x($orig_event)) {
-			$sh_checked = '';
-		} else {
+		$sh_disabled = '';
+		$sh_checked  = '';
+
+		if (x($orig_event)) {
 			$sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ');
 		}
 
-		if ($cid || ($mode !== 'new')) {
-			$sh_checked .= ' disabled="disabled" ';
+		if ($cid || $mode === 'edit') {
+			$sh_disabled = 'disabled="disabled"';
 		}
 
-		$sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
+		$sdt = ((x($orig_event)) ? $orig_event['start']  : 'now');
 		$fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
 
 		$tz = date_default_timezone_get();
@@ -462,24 +471,38 @@ function events_content(App $a) {
 		$fhour   = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0);
 		$fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0);
 
-		$f = get_config('system','event_input_format');
+		$f = Config::get('system','event_input_format');
 		if (! $f) {
 			$f = 'ymd';
 		}
 
 		require_once 'include/acl_selectors.php' ;
 
-		if ($mode === 'new') {
+		$perms = get_acl_permissions($orig_event);
+
+		if ($mode === 'new' || $mode === 'copy') {
 			$acl = (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user)));
 		}
 
+		// If we copy an old event, we need to remove the ID and URI
+		// from the original event.
+		if ($mode === 'copy') {
+			$eid = 0;
+			$uri = '';
+		}
+
 		$tpl = get_markup_template('event_form.tpl');
 
 		$o .= replace_macros($tpl,array(
-			'$post' => App::get_baseurl() . '/events',
-			'$eid' => $eid,
-			'$cid' => $cid,
-			'$uri' => $uri,
+			'$post' => System::baseUrl() . '/events',
+			'$eid'  => $eid,
+			'$cid'  => $cid,
+			'$uri'  => $uri,
+
+			'$allow_cid' => json_encode($perms['allow_cid']),
+			'$allow_gid' => json_encode($perms['allow_gid']),
+			'$deny_cid'  => json_encode($perms['deny_cid']),
+			'$deny_gid'  => json_encode($perms['deny_gid']),
 
 			'$title' => t('Event details'),
 			'$desc' => t('Starting date and Title are required.'),
@@ -499,7 +522,7 @@ function events_content(App $a) {
 			'$t_orig' => $t_orig,
 			'$summary' => array('summary', t('Title:'), $t_orig, '', '*'),
 			'$sh_text' => t('Share this event'),
-			'$share' => array('share', t('Share this event'), $sh_checked, ''),
+			'$share' => array('share', t('Share this event'), $sh_checked, '', $sh_disabled),
 			'$sh_checked' => $sh_checked,
 			'$nofinish' => array('nofinish', t('Finish date/time is not known or not relevant'), $n_checked),
 			'$adjust' => array('adjust', t('Adjust for viewer timezone'), $a_checked),
@@ -523,7 +546,7 @@ function events_content(App $a) {
 		$ev = event_by_id(local_user(), $params);
 
 		// Delete only real events (no birthdays)
-		if (dbm::is_result($ev) && $ev[0]['type'] == 'event') {
+		if (DBM::is_result($ev) && $ev[0]['type'] == 'event') {
 			$del = drop_item($ev[0]['itemid'], false);
 		}
 
@@ -533,6 +556,6 @@ function events_content(App $a) {
 			info(t('Event removed') . EOL);
 		}
 
-		goaway(App::get_baseurl() . '/events');
+		goaway(System::baseUrl() . '/events');
 	}
 }