Merge pull request #2172 from tobiasd/20151212-frosticons

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index c9c9b7d9f12ecc345def94e80a5dfd45ce56b643..653ae489b8f97c8022fe68fcd6f7513e4b5fe009 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -154,6 +154,7 @@ function events_post(&$a) {
        if(! $cid)
                proc_run('php',"include/notifier.php","event","$item_id");
 
+       goaway($_SESSION['return_url']);
 }
 
 
@@ -165,6 +166,9 @@ function events_content(&$a) {
                return;
        }
 
+       if($a->argc == 1)
+               $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
        if(($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
                $r = q("update event set ignore = 1 where id = %d and uid = %d",
                        intval($a->argv[2]),
@@ -189,8 +193,8 @@ function events_content(&$a) {
                $editselect = 'textareas';
 
        // First day of the week (0 = Sunday)
-       // To-Do: Needs to be configurable
-       $firstDay = 0;
+       $firstDay = get_pconfig(local_user(),'system','first_day_of_week');
+       if ($firstDay === false) $firstDay=0;
 
        $i18n = array(
                        "firstDay" => $firstDay,
@@ -290,7 +294,7 @@ function events_content(&$a) {
                        $m = intval($thismonth);
 
                // Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
-               // An upper limit was chosen to keep search engines from exploring links millions of years in the future. 
+               // An upper limit was chosen to keep search engines from exploring links millions of years in the future.
 
                if($y < 1901)
                        $y = 1900;
@@ -505,7 +509,7 @@ function events_content(&$a) {
                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)
+               if($cid OR ($mode !== 'new'))
                        $sh_checked .= ' disabled="disabled" ';
 
 
@@ -536,6 +540,9 @@ function events_content(&$a) {
 
                require_once('include/acl_selectors.php');
 
+               if ($mode === 'new')
+                       $acl = (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user)));
+
                $tpl = get_markup_template('event_form.tpl');
 
                $o .= replace_macros($tpl,array(
@@ -563,7 +570,7 @@ function events_content(&$a) {
                        '$sh_text' => t('Share this event'),
                        '$sh_checked' => $sh_checked,
                        '$preview' => t('Preview'),
-                       '$acl' => (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user))),
+                       '$acl' => $acl,
                        '$submit' => t('Submit')
 
                ));