X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fevents.php;h=5bc9807ed7b60e9f33c69f8ab351f8c9a0dcf697;hb=8bf6a29d4e05af5d461da3f01999785dc12ee7da;hp=b900eb29db198e06975ba1d6ed6cd6017859eeff;hpb=5105b3febc5619541a7a97032def5922690e9c02;p=friendica.git
diff --git a/mod/events.php b/mod/events.php
index b900eb29db..5bc9807ed7 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -45,13 +45,20 @@ function events_post(&$a) {
$finish = datetime_convert('UTC','UTC',$finish);
}
+ // Don't allow the event to finish before it begins.
+ // It won't hurt anything, but somebody will file a bug report
+ // and we'll waste a bunch of time responding to it. Time that
+ // could've been spent doing something else.
+
+ if(strcmp($finish,$start) < 0)
+ $finish = $start;
$desc = escape_tags(trim($_POST['desc']));
$location = escape_tags(trim($_POST['location']));
$type = 'event';
if((! $desc) || (! $start)) {
- notice('Event description and start time are required.');
+ notice( t('Event description and start time are required.') . EOL);
goaway($a->get_baseurl() . '/events/new');
}
@@ -103,8 +110,23 @@ function events_content(&$a) {
return;
}
+ $o ="";
+ // tabs
+ $tpl = get_markup_template('profile_tabs.tpl');
+ $o .= replace_macros($tpl,array(
+ '$url' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
+ '$phototab' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
+ '$status' => t('Status'),
+ '$profile' => t('Profile'),
+ '$photos' => t('Photos'),
+ '$events' => t('Events') ,
+ '$notes' => t('Personal Notes'),
+ '$activetab' => "events",
+ ));
+
$o .= '
' . t('Events') . '
';
+
$mode = 'view';
$y = 0;
$m = 0;
@@ -166,9 +188,10 @@ function events_content(&$a) {
$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
-dbg(1);
- $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`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 (( `adjust` = 0 AND `start` >= '%s' AND `start` <= '%s' )
OR ( `adjust` = 1 AND `start` >= '%s' AND `start` <= '%s' )) ",
@@ -178,7 +201,7 @@ dbg(1);
dbesc($adjust_start),
dbesc($adjust_finish)
);
-dbg(0);
+
$links = array();
if(count($r)) {
@@ -203,10 +226,6 @@ dbg(0);
-
-
-
-
$last_date = '';
$fmt = t('l, F j');
@@ -220,7 +239,7 @@ dbg(0);
$o .= '
' . $d . '
';
$last_date = $d;
$o .= format_event_html($rr);
- $o .= '';
+ $o .= ((! $rr['cid']) ? '' : '');
if($rr['plink'])
$o .= '';
@@ -267,20 +286,30 @@ dbg(0);
$sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
$fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
- $syear = datetime_convert('UTC', date_default_timezone_get(), $sdt, 'Y');
- $smonth = datetime_convert('UTC', date_default_timezone_get(), $sdt, 'm');
- $sday = datetime_convert('UTC', date_default_timezone_get(), $sdt, 'd');
+ $tz = ((x($orig_event) && $orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
+
+
- $shour = ((x($orig_event)) ? datetime_convert('UTC', date_default_timezone_get(), $sdt, 'H') : 0);
- $sminute = ((x($orig_event)) ? datetime_convert('UTC', date_default_timezone_get(), $sdt, 'i') : 0);
+ $syear = datetime_convert('UTC', $tz, $sdt, 'Y');
+ $smonth = datetime_convert('UTC', $tz, $sdt, 'm');
+ $sday = datetime_convert('UTC', $tz, $sdt, 'd');
- $fyear = datetime_convert('UTC', date_default_timezone_get(), $fdt, 'Y');
- $fmonth = datetime_convert('UTC', date_default_timezone_get(), $fdt, 'm');
- $fday = datetime_convert('UTC', date_default_timezone_get(), $fdt, 'd');
+ $shour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'H') : 0);
+ $sminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'i') : 0);
- $fhour = ((x($orig_event)) ? datetime_convert('UTC', date_default_timezone_get(), $fdt, 'H') : 0);
- $fminute = ((x($orig_event)) ? datetime_convert('UTC', date_default_timezone_get(), $fdt, 'i') : 0);
+ $fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
+ $fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
+ $fday = datetime_convert('UTC', $tz, $fdt, 'd');
+ $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');
+ if(! $f)
+ $f = 'ymd';
+
+ $dateformat = datesel_format($f);
+ $timeformat = t('hour:minute');
require_once('include/acl_selectors.php');
@@ -290,14 +319,14 @@ dbg(0);
'$cid' => $cid,
'$uri' => $uri,
'$e_text' => t('Event details'),
- '$e_desc' => t('Format is year-month-day hour:minute. Starting date and Description are required.'),
+ '$e_desc' => sprintf( t('Format is %s %s. Starting date and Description are required.'),$dateformat,$timeformat),
'$s_text' => t('Event Starts:') . ' * ',
- '$s_dsel' => datesel('start',$syear+5,$syear,false,$syear,$smonth,$sday),
+ '$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'),
'$n_checked' => $n_checked,
'$f_text' => t('Event Finishes:'),
- '$f_dsel' => datesel('finish',$fyear+5,$fyear,false,$fyear,$fmonth,$fday),
+ '$f_dsel' => datesel($f,'finish',$fyear+5,$fyear,false,$fyear,$fmonth,$fday),
'$f_tsel' => timesel('finish',$fhour,$fminute),
'$a_text' => t('Adjust for viewer timezone'),
'$a_checked' => $a_checked,
@@ -314,4 +343,4 @@ dbg(0);
return $o;
}
-}
\ No newline at end of file
+}