X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fevents.php;h=b4516cded9279eeb4b7f001052d2eb83979e94f3;hb=61693419e8cf571a2ad26690423d356023badc2e;hp=7914b93d09ef9f0cb5fa875586ccbe0977434416;hpb=69300291f03fe85502df9907014f0ad68ee07c9c;p=friendica.git

diff --git a/mod/events.php b/mod/events.php
index 7914b93d09..b4516cded9 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -11,7 +11,7 @@ use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Event;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
@@ -21,7 +21,7 @@ use Friendica\Util\Temporal;
 require_once 'include/items.php';
 
 function events_init(App $a) {
-	if (! local_user()) {
+	if (!local_user()) {
 		return;
 	}
 
@@ -35,8 +35,6 @@ function events_init(App $a) {
 		$a->page['aside'] = '';
 	}
 
-	$a->data['user'] = $_SESSION['user'];
-
 	$cal_widget = CalendarExport::getHTML();
 
 	$a->page['aside'] .= $cal_widget;
@@ -48,12 +46,12 @@ function events_post(App $a) {
 
 	logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA);
 
-	if (! local_user()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$event_id = ((x($_POST, 'event_id')) ? intval($_POST['event_id']) : 0);
-	$cid = ((x($_POST, 'cid')) ? intval($_POST['cid']) : 0);
+	$event_id = (x($_POST, 'event_id') ? intval($_POST['event_id']) : 0);
+	$cid = (x($_POST, 'cid') ? intval($_POST['cid']) : 0);
 	$uid = local_user();
 
 	$start_text  = escape_tags($_REQUEST['start_text']);
@@ -78,12 +76,12 @@ function events_post(App $a) {
 
 	if ($adjust) {
 		$start = DateTimeFormat::convert($start, 'UTC', date_default_timezone_get());
-		if (! $nofinish) {
+		if (!$nofinish) {
 			$finish = DateTimeFormat::convert($finish, 'UTC', date_default_timezone_get());
 		}
 	} else {
 		$start = DateTimeFormat::utc($start);
-		if (! $nofinish) {
+		if (!$nofinish) {
 			$finish = DateTimeFormat::utc($finish);
 		}
 	}
@@ -110,7 +108,7 @@ function events_post(App $a) {
 		goaway($onerror_url);
 	}
 
-	if ((! $summary) || ($start === NULL_DATE)) {
+	if (!$summary || ($start === NULL_DATE)) {
 		notice(L10n::t('Event title and start time are required.') . EOL);
 		if (intval($_REQUEST['preview'])) {
 			echo L10n::t('Event title and start time are required.');
@@ -119,12 +117,13 @@ function events_post(App $a) {
 		goaway($onerror_url);
 	}
 
-	$share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0);
+	$share = (intval($_POST['share']) ? intval($_POST['share']) : 0);
 
 	$c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
 		intval(local_user())
 	);
-	if (count($c)) {
+
+	if (DBA::isResult($c)) {
 		$self = $c[0]['id'];
 	} else {
 		$self = 0;
@@ -132,10 +131,10 @@ function events_post(App $a) {
 
 
 	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']);
+		$str_group_allow   = !empty($_POST['group_allow'])   ? perms2str($_POST['group_allow'])   : '';
+		$str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
+		$str_group_deny    = !empty($_POST['group_deny'])    ? perms2str($_POST['group_deny'])    : '';
+		$str_contact_deny  = !empty($_POST['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 ) {
@@ -181,7 +180,7 @@ function events_post(App $a) {
 
 	$item_id = Event::store($datarray);
 
-	if (! $cid) {
+	if (!$cid) {
 		Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
 	}
 
@@ -190,7 +189,7 @@ function events_post(App $a) {
 
 function events_content(App $a) {
 
-	if (! local_user()) {
+	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
@@ -245,7 +244,7 @@ function events_content(App $a) {
 	$mode = 'view';
 	$y = 0;
 	$m = 0;
-	$ignored = ((x($_REQUEST, 'ignored')) ? intval($_REQUEST['ignored']) : 0);
+	$ignored = (x($_REQUEST, 'ignored') ? intval($_REQUEST['ignored']) : 0);
 
 	if ($a->argc > 1) {
 		if ($a->argc > 2 && $a->argv[1] == 'event') {
@@ -276,10 +275,10 @@ function events_content(App $a) {
 
 		$thisyear  = DateTimeFormat::localNow('Y');
 		$thismonth = DateTimeFormat::localNow('m');
-		if (! $y) {
+		if (!$y) {
 			$y = intval($thisyear);
 		}
-		if (! $m) {
+		if (!$m) {
 			$m = intval($thismonth);
 		}
 
@@ -346,11 +345,11 @@ function events_content(App $a) {
 
 		$links = [];
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$r = Event::sortByDate($r);
 			foreach ($r as $rr) {
 				$j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
-				if (! x($links,$j)) {
+				if (!x($links,$j)) {
 					$links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
 				}
 			}
@@ -359,7 +358,7 @@ function events_content(App $a) {
 		$events = [];
 
 		// transform the event in a usable array
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$r = Event::sortByDate($r);
 			$events = Event::prepareListForTemplate($r);
 		}
@@ -417,14 +416,17 @@ function events_content(App $a) {
 			intval($event_id),
 			intval(local_user())
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$orig_event = $r[0];
 		}
 	}
 
 	// Passed parameters overrides anything found in the DB
 	if (in_array($mode, ['edit', 'new', 'copy'])) {
-		if (!x($orig_event)) {$orig_event = [];}
+		if (empty($orig_event)) {
+			$orig_event = [];
+		}
+
 		// 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'];}
 		if (x($_REQUEST, 'adjust'))      {$orig_event['adjust']      = $_REQUEST['adjust'];}
@@ -438,50 +440,50 @@ function events_content(App $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);
-		$cid    = ((x($orig_event)) ? $orig_event['cid']      : 0);
-		$uri    = ((x($orig_event)) ? $orig_event['uri']      : '');
+		$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);
+		$cid    = (x($orig_event) ? $orig_event['cid']      : 0);
+		$uri    = (x($orig_event) ? $orig_event['uri']      : '');
 
 		$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" ');
+			$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 === 'edit') {
 			$sh_disabled = 'disabled="disabled"';
 		}
 
-		$sdt = ((x($orig_event)) ? $orig_event['start']  : 'now');
-		$fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
+		$sdt = (x($orig_event) ? $orig_event['start']  : 'now');
+		$fdt = (x($orig_event) ? $orig_event['finish'] : 'now');
 
 		$tz = date_default_timezone_get();
 		if (x($orig_event)) {
-			$tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
+			$tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC');
 		}
 
 		$syear  = DateTimeFormat::convert($sdt, $tz, 'UTC', 'Y');
 		$smonth = DateTimeFormat::convert($sdt, $tz, 'UTC', 'm');
 		$sday   = DateTimeFormat::convert($sdt, $tz, 'UTC', 'd');
 
-		$shour   = ((x($orig_event)) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : '00');
-		$sminute = ((x($orig_event)) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : '00');
+		$shour   = (x($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : '00');
+		$sminute = (x($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : '00');
 
 		$fyear  = DateTimeFormat::convert($fdt, $tz, 'UTC', 'Y');
 		$fmonth = DateTimeFormat::convert($fdt, $tz, 'UTC', 'm');
 		$fday   = DateTimeFormat::convert($fdt, $tz, 'UTC', 'd');
 
-		$fhour   = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00');
-		$fminute = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00');
+		$fhour   = (x($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00');
+		$fminute = (x($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00');
 
 		$perms = ACL::getDefaultUserPermissions($orig_event);
 
 		if ($mode === 'new' || $mode === 'copy') {
-			$acl = (($cid) ? '' : ACL::getFullSelectorHTML(((x($orig_event)) ? $orig_event : $a->user)));
+			$acl = ($cid ? '' : ACL::getFullSelectorHTML($a->user, false, $orig_event));
 		}
 
 		// If we copy an old event, we need to remove the ID and URI
@@ -545,7 +547,7 @@ function events_content(App $a) {
 		$ev = Event::getListById(local_user(), $event_id);
 
 		// Delete only real events (no birthdays)
-		if (DBM::is_result($ev) && $ev[0]['type'] == 'event') {
+		if (DBA::isResult($ev) && $ev[0]['type'] == 'event') {
 			$del = Item::deleteForUser(['id' => $ev[0]['itemid']], local_user());
 		}