optimise the commented date view

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index b0b54601fdf09f653b9d94d12935ec57bdeebb52..5bc9807ed7b60e9f33c69f8ab351f8c9a0dcf697 100644 (file)
--- 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');
        }
 
@@ -297,6 +304,12 @@ function events_content(&$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');
+               if(! $f)
+                       $f = 'ymd';
+
+               $dateformat = datesel_format($f);
+               $timeformat = t('hour:minute');
 
                require_once('include/acl_selectors.php');
 
@@ -306,14 +319,14 @@ function events_content(&$a) {
                        '$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:') . ' <span class="required">*</span> ',
-                       '$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,