Calendar rg=0

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3727 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 524b9dd289cea2368c25d862a97e16b7a9232f26..975838adce46a54b695fce89ee0a668feb2b1ff6 100644 (file)
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -27,6 +27,22 @@ require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'include/load_prefs.php');
 require_once(SM_PATH . 'functions/html.php');
 
+/* get globals */
+
+if (isset($_GET['month'])) {
+    $month = $_GET['month'];
+}
+if (isset($_GET['year'])) {
+    $year = $_GET['year'];
+}
+if (isset($_POST['year'])) {
+    $year = $_POST['year'];
+}
+if (isset($_POST['month'])) {
+    $month = $_POST['month'];
+}
+/* got 'em */
+
 //display upper part of month calendar view
 function startcalendar() {
     global $year, $month, $day, $color;

diff --git a/plugins/calendar/day.php b/plugins/calendar/day.php
index 90bd9e3fc1eff80e424dd44a0f4380f041bb9690..4f43637b702ba6940f7e15f359b9b956c87cc94f 100644 (file)
--- a/plugins/calendar/day.php
+++ b/plugins/calendar/day.php
@@ -27,6 +27,28 @@ require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'include/load_prefs.php');
 require_once(SM_PATH . 'functions/html.php');
 
+/* get globals */
+if (isset($_GET['year'])) {
+    $year = $_GET['year'];
+}
+elseif (isset($_POST['year'])) {
+    $year = $_POST['year'];
+}
+if (isset($_GET['month'])) {
+    $month = $_GET['month'];
+}
+elseif (isset($_POST['month'])) {
+    $month = $_POST['month'];
+}
+if (isset($_GET['day'])) {
+    $day = $_GET['day'];
+}
+elseif (isset($_POST['day'])) {
+    $day = $_POST['day'];
+}
+
+/* got 'em */
+
 //displays head of day calendar view
 function day_header() {
     global $color, $month, $day, $year, $prev_year, $prev_month, $prev_day,

diff --git a/plugins/calendar/event_create.php b/plugins/calendar/event_create.php
index 978a03017cb92a38d198e1524ae7a7df36047bc9..01d1d4e3e7529accbc00e7b7a6ab131085c1a2eb 100644 (file)
--- a/plugins/calendar/event_create.php
+++ b/plugins/calendar/event_create.php
@@ -27,6 +27,55 @@ require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'include/load_prefs.php');
 require_once(SM_PATH . 'functions/html.php');
 
+/* get globals */
+
+if (isset($_POST['year'])) {
+    $year = $_POST['year'];
+}
+elseif (isset($_GET['year'])) {
+    $year = $_GET['year'];
+}
+if (isset($_POST['month'])) {
+    $month = $_POST['month'];
+}
+elseif (isset($_GET['month'])) {
+    $month = $_GET['month'];
+}
+if (isset($_POST['day'])) {
+    $day = $_POST['day'];
+}
+elseif (isset($_GET['day'])) {
+    $day = $_GET['day'];
+}
+if (isset($_POST['hour'])) {
+    $hour = $_POST['hour'];
+}
+elseif (isset($_GET['hour'])) {
+    $hour = $_GET['hour'];
+}
+if (isset($_POST['event_hour'])) {
+    $event_hour = $_POST['event_hour'];
+}
+if (isset($_POST['event_minute'])) {
+    $event_minute = $_POST['event_minute'];
+}
+if (isset($_POST['event_length'])) {
+    $event_length = $_POST['event_length'];
+}
+if (isset($_POST['event_priority'])) {
+    $event_priority = $_POST['event_priority'];
+}
+if (isset($_POST['event_title'])) {
+    $event_title = $_POST['event_title'];
+}
+if (isset($_POST['event_text'])) {
+    $event_text = $_POST['event_text'];
+}
+if (isset($_POST['send'])) {
+    $send = $_POST['send'];
+}
+/* got 'em */
+
 //main form to gather event info
 function show_event_form() {
     global $color, $editor_size, $year, $day, $month, $hour;

diff --git a/plugins/calendar/event_delete.php b/plugins/calendar/event_delete.php
index 09fe78fba27848d66dbb70f2d3427029a73c4a8a..92a1099f2b78956e40159b9c3fc3524d35387d83 100644 (file)
--- a/plugins/calendar/event_delete.php
+++ b/plugins/calendar/event_delete.php
@@ -26,6 +26,59 @@ require_once(SM_PATH . 'config/config.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'include/load_prefs.php');
 require_once(SM_PATH . 'functions/html.php');
+/* get globals */
+if (isset($_GET['month'])) {
+    $month = $_GET['month'];
+}
+elseif (isset($_POST['month'])) {
+    $month = $_POST['month'];
+}
+if (isset($_GET['year'])) {
+    $year = $_GET['year'];
+}
+elseif (isset($_POST['year'])) {
+    $year = $_POST['year'];
+}
+if (isset($_GET['day'])) {
+    $day = $_GET['day'];
+}
+elseif (isset($_POST['day'])) {
+    $day = $_POST['day'];
+}
+if (isset($_GET['dyear'])) {
+    $dyear = $_GET['dyear'];
+}
+elseif (isset($_POST['dyear'])) {
+    $dyear = $_POST['dyear'];
+}
+if (isset($_GET['dmonth'])) {
+    $dmonth = $_GET['dmonth'];
+}
+elseif (isset($_POST['dmonth'])) {
+    $dmonth = $_POST['dmonth'];
+}
+if (isset($_GET['dday'])) {
+    $dday = $_GET['dday'];
+}
+elseif (isset($_POST['dday'])) {
+    $dday = $_POST['dday'];
+}
+if (isset($_GET['dhour'])) {
+    $dhour = $_GET['dhour'];
+}
+elseif (isset($_POST['dhour'])) {
+    $dhour = $_POST['dhour'];
+}
+if (isset($_GET['dminute'])) {
+    $dminute = $_GET['dminute'];
+}
+elseif (isset($_POST['dminute'])) {
+    $dminute = $_POST['dminute'];
+}
+if (isset($_POST['confirmed'])) {
+    $confirmed = $_POST['confirmed'];
+}
+/* got 'em */
 
 function confirm_deletion()
 {

diff --git a/plugins/calendar/event_edit.php b/plugins/calendar/event_edit.php
index 098aeb6cd85969e7f6b0bb4a38f845a91763577b..098d65c0735928ee24075661a413f231039213e7 100644 (file)
--- a/plugins/calendar/event_edit.php
+++ b/plugins/calendar/event_edit.php
@@ -27,6 +27,77 @@ require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'include/load_prefs.php');
 require_once(SM_PATH . 'functions/html.php');
 
+
+/* get globals */
+
+if (isset($_POST['updated'])) {
+    $updated = $_POST['updated'];
+}
+if (isset($_POST['event_year'])) {
+    $event_year = $_POST['event_year'];
+}
+if (isset($_POST['event_month'])) {
+    $event_month = $_POST['event_month'];
+}
+if (isset($_POST['event_day'])) {
+    $event_day = $_POST['event_day'];
+}
+if (isset($_POST['event_hour'])) {
+    $event_hour = $_POST['event_hour'];
+}
+if (isset($_POST['event_minute'])) {
+    $event_minute = $_POST['event_minute'];
+}
+if (isset($_POST['event_length'])) {
+    $event_length = $_POST['event_length'];
+}
+if (isset($_POST['event_title'])) {
+    $event_title = $_POST['event_title'];
+}
+if (isset($_POST['event_text'])) {
+    $event_text = $_POST['event_text'];
+}
+if (isset($_POST['send'])) {
+    $send = $_POST['send'];
+}
+if (isset($_POST['event_priority'])) {
+    $event_priority = $_POST['event_priority'];
+}
+if (isset($_POST['confirmed'])) {
+    $confirmed = $_POST['confirmed'];
+}
+if (isset($_POST['year'])) {
+    $year = $_POST['year'];
+}
+elseif (isset($_GET['year'])) {
+    $year = $_GET['year'];
+}
+if (isset($_POST['month'])) {
+    $month = $_POST['month'];
+}
+elseif (isset($_GET['month'])) {
+    $month = $_GET['month'];
+}
+if (isset($_POST['day'])) {
+    $day = $_POST['day'];
+}
+elseif (isset($_GET['day'])) {
+    $day = $_GET['day'];
+}
+if (isset($_POST['hour'])) {
+    $hour = $_POST['hour'];
+}
+elseif (isset($_GET['hour'])) {
+    $hour = $_GET['hour'];
+}
+if (isset($_POST['minute'])) {
+    $minute = $_POST['minute'];
+}
+elseif (isset($_GET['minute'])) {
+    $minute = $_GET['minute'];
+}
+/* got 'em */
+
 // update event info
 function show_event_form() {
     global $color, $editor_size, $year, $day, $month, $hour, $minute, $calendardata;