X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fevents.php;h=0fdec5cbe4c0f01d1e59bff4fc6418230a8ce6ab;hb=dd0a1cf586fc37fe9a3d84af277c7504136a3bf9;hp=d66ae764cff31c792fecc170cf10579087316e0d;hpb=c785eb29c67d0bf4e1cb6d2c252348305bc0fcfe;p=friendica.git

diff --git a/mod/events.php b/mod/events.php
index d66ae764cf..0fdec5cbe4 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -3,6 +3,9 @@
  * @file mod/events.php
  * @brief The events module
  */
+
+use Friendica\App;
+
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
 require_once 'include/event.php';
@@ -14,7 +17,7 @@ function events_init(App $a) {
 	}
 
 	if ($a->argc == 1) {
-		// if it's a json request abort here becaus we don't
+		// If it's a json request abort here because we don't
 		// need the widget data
 		if ($a->argv[1] === 'json') {
 			return;
@@ -34,7 +37,7 @@ function events_init(App $a) {
 
 function events_post(App $a) {
 
-	logger('post: ' . print_r($_REQUEST, true));
+	logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA);
 
 	if (! local_user()) {
 		return;
@@ -53,20 +56,15 @@ function events_post(App $a) {
 	// The default setting for the `private` field in event_store() is false, so mirror that
 	$private_event = false;
 
+	$start  = NULL_DATE;
+	$finish = NULL_DATE;
+
 	if ($start_text) {
 		$start = $start_text;
-	} else {
-		$start = sprintf('%d-%d-%d %d:%d:0', $startyear, $startmonth, $startday, $starthour, $startminute);
-	}
-
-	if ($nofinish) {
-		$finish = '0000-00-00 00:00:00';
 	}
 
 	if ($finish_text) {
 		$finish = $finish_text;
-	} else {
-		$finish = sprintf('%d-%d-%d %d:%d:0', $finishyear, $finishmonth, $finishday, $finishhour, $finishminute);
 	}
 
 	if ($adjust) {
@@ -103,7 +101,7 @@ function events_post(App $a) {
 		goaway($onerror_url);
 	}
 
-	if ((! $summary) || (! $start)) {
+	if ((! $summary) || ($start === NULL_DATE)) {
 		notice(t('Event title and start time are required.') . EOL);
 		if (intval($_REQUEST['preview'])) {
 			echo t('Event title and start time are required.');
@@ -184,8 +182,6 @@ function events_post(App $a) {
 	goaway($_SESSION['return_url']);
 }
 
-
-
 function events_content(App $a) {
 
 	if (! local_user()) {
@@ -239,19 +235,17 @@ function events_content(App $a) {
 		$tabs = profile_tabs($a, true);
 	}
 
-
-
 	$mode = 'view';
 	$y = 0;
 	$m = 0;
 	$ignored = ((x($_REQUEST, 'ignored')) ? intval($_REQUEST['ignored']) : 0);
 
-	if($a->argc > 1) {
+	if ($a->argc > 1) {
 		if ($a->argc > 2 && $a->argv[1] == 'event') {
 			$mode = 'edit';
 			$event_id = intval($a->argv[2]);
 		}
-		if($a->argc > 2 && $a->argv[1] == 'drop') {
+		if ($a->argc > 2 && $a->argv[1] == 'drop') {
 			$mode = 'drop';
 			$event_id = intval($a->argv[2]);
 		}
@@ -330,7 +324,7 @@ function events_content(App $a) {
 		);
 
 		// get events by id or by date
-		if (x($_GET, 'id')){
+		if (x($_GET, 'id')) {
 			$r = event_by_id(local_user(), $event_params);
 		} else {
 			$r = events_by_date(local_user(), $event_params);
@@ -361,7 +355,7 @@ function events_content(App $a) {
 			killme();
 		}
 
-		if (x($_GET, 'id')){
+		if (x($_GET, 'id')) {
 			$tpl =  get_markup_template("event.tpl");
 		} else {
 			$tpl = get_markup_template("events_js.tpl");
@@ -425,9 +419,6 @@ function events_content(App $a) {
 		if (x($_REQUEST, 'location'))    {$orig_event['location']    = $_REQUEST['location'];}
 		if (x($_REQUEST, 'start'))       {$orig_event['start']       = $_REQUEST['start'];}
 		if (x($_REQUEST, 'finish'))      {$orig_event['finish']      = $_REQUEST['finish'];}
-	}
-
-	if ($mode === 'edit' || $mode === 'new') {
 
 		$n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
 		$a_checked = ((x($orig_event) && $orig_event['adjust'])   ? ' checked="checked" ' : '');
@@ -439,18 +430,16 @@ 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_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ');
 		}
 
-		if ($cid OR ($mode !== 'new')) {
+		if ($cid || ($mode !== 'new')) {
 			$sh_checked .= ' disabled="disabled" ';
 		}
 
-
 		$sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
 		$fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');