Fixed Calendar Bug

Fixed problem with Calendar identifying if submitted event was a master or personal type.
Geeklog-Core · Mar 25, 2022 · dde5798 · dde5798
1 parent 3632516
commit dde5798
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/plugins/calendar/functions.inc b/plugins/calendar/functions.inc
@@ -649,7 +649,7 @@ function plugin_savesubmission_calendar($A)
     } elseif ($_CA_CONF['personalcalendars'] == 1) { // add to personal calendar
         if (COM_isAnonUser()) {
             // anonymous users don't have personal calendars - bail
-            COM_accessLog("Attempt to write to the personal calendar of user '{$A['uid']}'.");
+            COM_accessLog("Anonymous user attempted to write to a personal calendar which anonymous users do not have.");
             COM_redirect($_CONF['site_url'] . '/calendar/index.php');
         } else {
             DB_save($_TABLES['personal_events'],
@@ -692,15 +692,18 @@ function plugin_submit_calendar($mode = 'master')
         exit;
     }
 
-    $mode = Geeklog\Input::fPost('calendar_type', null);
+    $passed_mode = Geeklog\Input::fPost('calendar_type', null);
+	if ($passed_mode != null) {
+		$mode = $passed_mode;
+	}
 
     if ($mode !== null) {
         if (!in_array($mode, array('master', 'personal', 'quickadd'))) {
             $mode = 'master';
         }
     } elseif (Geeklog\Input::fRequest('mode') === 'personal') {
         $mode = 'personal';
-    }
+	}
 
     if (($_CA_CONF['personalcalendars'] == 1) && ($mode === 'quickadd')) {
         // check for missing event title field

diff --git a/public_html/calendar/index.php b/public_html/calendar/index.php
@@ -403,14 +403,14 @@ function isWithinCurrentWindow($year, $month, $day)
 // MAIN
 $mode = Geeklog\Input::fRequest('mode', '');
 if ($mode !== 'personal' && $mode !== 'quickadd') {
-    $mode = '';
+    $mode = 'master';
 }
 
 $pagetitle = ($mode === 'personal') ? $LANG_CAL_1[42] : $LANG_CAL_1[41];
 
 // Set mode back to master if user refreshes screen after their session expires
 if (($mode === 'personal') && COM_isAnonUser()) {
-    $mode = '';
+    $mode = 'master';
 }
 
 if ($mode === 'personal' && $_CA_CONF['personalcalendars'] == 0) {

diff --git a/system/lib-plugins.php b/system/lib-plugins.php
@@ -1231,7 +1231,7 @@ function PLG_getModerationValues($type)
 }
 
 /**
- * This function is resonsible for calling plugin_submit_<pluginname> so
+ * This function is responsible for calling plugin_submit_<pluginname> so
  * that the submission form for the plugin is displayed.
  *
  * @param        string $type Plugin to show submission form for