Frost-mobile: media query in css for tablets

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index e7b95d27ad8c6e4debfd72f4c858526ec6391a52..c448dc0f2e459a38d6d3ef4769476712437b5da7 100755 (executable)
--- a/mod/events.php
+++ b/mod/events.php
@@ -62,8 +62,8 @@ function events_post(&$a) {
        $location = escape_tags(trim($_POST['location']));
        $type     = 'event';
 
-       if((! $desc) || (! $start)) {
-               notice( t('Event description and start time are required.') . EOL);
+       if((! $summary) || (! $start)) {
+               notice( t('Event title and start time are required.') . EOL);
                goaway($a->get_baseurl() . '/events/new');
        }
 
@@ -120,7 +120,7 @@ function events_post(&$a) {
        $datarray['allow_gid'] = $str_group_allow;
        $datarray['deny_cid'] = $str_contact_deny;
        $datarray['deny_gid'] = $str_group_deny;
-       $datarray['private'] = $private_event;
+       $datarray['private'] = (($private_event) ? 1 : 0);
        $datarray['id'] = $event_id;
        $datarray['created'] = $created;
        $datarray['edited'] = $edited;
@@ -145,6 +145,9 @@ function events_content(&$a) {
        $htpl = get_markup_template('event_head.tpl');
        $a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
 
+       $etpl = get_markup_template('event_end.tpl');
+       $a->page['end'] .= replace_macros($etpl,array('$baseurl' => $a->get_baseurl()));
+
        $o ="";
        // tabs
        $tabs = profile_tabs($a, True); 
@@ -280,10 +283,10 @@ function events_content(&$a) {
                                        
                                $last_date = $d;
                                $edit = ((! $rr['cid']) ? array($a->get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
-                               $title = strip_tags(bbcode($rr['summary']));
+                               $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
                                if(! $title) {
                                        list($title, $_trash) = explode("<br",bbcode($rr['desc']),2);
-                                       $title = strip_tags($title);
+                                       $title = strip_tags(html_entity_decode($title,ENT_QUOTES,'UTF-8'));
                                }
                                $html = format_event_html($rr);
                                $rr['desc'] = bbcode($rr['desc']);
@@ -412,9 +415,9 @@ function events_content(&$a) {
                        '$uri' => $uri,
        
                        '$title' => t('Event details'),
-                       '$desc' => sprintf( t('Format is %s %s. Starting date and Description are required.'),$dateformat,$timeformat),
+                       '$desc' => sprintf( t('Format is %s %s. Starting date and Title are required.'),$dateformat,$timeformat),
                        
-                       '$s_text' => t('Event Starts:') . ' <span class="required">*</span> ',
+                       '$s_text' => t('Event Starts:') . ' <span class="required" title="' . t('Required') . '">*</span>',
                        '$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'),
@@ -424,11 +427,11 @@ function events_content(&$a) {
                        '$f_tsel' => timesel('finish',$fhour,$fminute),
                        '$a_text' => t('Adjust for viewer timezone'),
                        '$a_checked' => $a_checked,
-                       '$d_text' => t('Description:') . ' <span class="required">*</span>',
+                       '$d_text' => t('Description:'), 
                        '$d_orig' => $d_orig,
                        '$l_text' => t('Location:'),
                        '$l_orig' => $l_orig,
-                       '$t_text' => t('Title:'),
+                       '$t_text' => t('Title:') . ' <span class="required" title="' . t('Required') . '">*</span>',
                        '$t_orig' => $t_orig,
                        '$sh_text' => t('Share this event'),
                        '$sh_checked' => $sh_checked,