X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fcalendar%2Fevent_edit.php;h=8a8397571478f80232a96d1fe1489120de27458f;hp=f1ce4ce46f6a4f23a3378dc903ac4569a78e885a;hb=a6d3eff675f7ace3d69f6d9788489ca930333315;hpb=cf1efdce52fce19388a74b85903cbeb7fd5e31ad

diff --git a/plugins/calendar/event_edit.php b/plugins/calendar/event_edit.php
index f1ce4ce4..8a839757 100644
--- a/plugins/calendar/event_edit.php
+++ b/plugins/calendar/event_edit.php
@@ -3,7 +3,7 @@
 /**
  * event_edit.php
  *
- * Copyright (c) 2002 The SquirrelMail Project Team
+ * Copyright (c) 2002-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Originally contrubuted by Michal Szczotka <michal@tuxy.org>
@@ -11,12 +11,16 @@
  * Functions to edit an event.
  *
  * $Id$
+ * @package plugins
+ * @subpackage calendar
  */
 
-require_once('calendar_data.php');
-require_once('functions.php');
-chdir('..');
-define('SM_PATH','../');
+/** @ignore */
+define('SM_PATH','../../');
+
+/* Calender plugin required files. */
+require_once(SM_PATH . 'plugins/calendar/calendar_data.php');
+require_once(SM_PATH . 'plugins/calendar/functions.php');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
@@ -24,75 +28,158 @@ require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/date.php');
 require_once(SM_PATH . 'config/config.php');
 require_once(SM_PATH . 'functions/page_header.php');
-require_once(SM_PATH . 'src/load_prefs.php');
+require_once(SM_PATH . 'include/load_prefs.php');
 require_once(SM_PATH . 'functions/html.php');
 
+
+/* get globals */
+
+// undo rg = on effects
+if (isset($month)) unset($month);
+if (isset($year))  unset($year);
+if (isset($day))  unset($day);
+if (isset($hour))  unset($hour);
+if (isset($minute))  unset($minute);
+if (isset($event_year))  unset($event_year);
+if (isset($event_month))  unset($event_month);
+if (isset($event_day))  unset($event_day);
+if (isset($event_hour))  unset($event_hour);
+if (isset($event_minute))  unset($event_minute);
+if (isset($event_length))  unset($event_length);
+if (isset($event_priority))  unset($event_priority);
+
+if (isset($_POST['updated'])) {
+    $updated = $_POST['updated'];
+}
+
+if (isset($_POST['event_year']) && is_numeric($_POST['event_year'])) {
+    $event_year = $_POST['event_year'];
+}
+if (isset($_POST['event_month']) && is_numeric($_POST['event_month'])) {
+    $event_month = $_POST['event_month'];
+}
+if (isset($_POST['event_day']) && is_numeric($_POST['event_day'])) {
+    $event_day = $_POST['event_day'];
+}
+if (isset($_POST['event_hour']) && is_numeric($_POST['event_hour'])) {
+    $event_hour = $_POST['event_hour'];
+}
+if (isset($_POST['event_minute']) && is_numeric($_POST['event_minute'])) {
+    $event_minute = $_POST['event_minute'];
+}
+if (isset($_POST['event_length']) && is_numeric($_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']) && is_numeric($_POST['event_priority'])) {
+    $event_priority = $_POST['event_priority'];
+}
+if (isset($_POST['confirmed'])) {
+    $confirmed = $_POST['confirmed'];
+}
+
+if (isset($_POST['year']) && is_numeric($_POST['year'])) {
+    $year = $_POST['year'];
+} elseif (isset($_GET['year']) && is_numeric($_GET['year'])) {
+    $year = $_GET['year'];
+}
+if (isset($_POST['month']) && is_numeric($_POST['month'])) {
+    $month = $_POST['month'];
+} elseif (isset($_GET['month']) && is_numeric($_GET['month'])) {
+    $month = $_GET['month'];
+}
+if (isset($_POST['day']) && is_numeric($_POST['day'])) {
+    $day = $_POST['day'];
+} elseif (isset($_GET['day']) && is_numeric($_GET['day'])) {
+    $day = $_GET['day'];
+}
+if (isset($_POST['hour']) && is_numeric($_POST['hour'])) {
+    $hour = $_POST['hour'];
+} elseif (isset($_GET['hour']) && is_numeric($_GET['hour'])) {
+    $hour = $_GET['hour'];
+}
+if (isset($_POST['minute']) && is_numeric($_POST['minute'])) {
+    $minute = $_POST['minute'];
+}
+elseif (isset($_GET['minute']) && is_numeric($_GET['minute'])) {
+    $minute = $_GET['minute'];
+}
+/* got 'em */
+
 // update event info
-function show_event_form() {
+function update_event_form() {
     global $color, $editor_size, $year, $day, $month, $hour, $minute, $calendardata;
 
     $tmparray = $calendardata["$month$day$year"]["$hour$minute"];
-    echo "\n<FORM name=eventupdate action=\"event_edit.php\" METHOD=POST >\n".
-         "      <INPUT TYPE=hidden NAME=\"year\" VALUE=\"$year\">\n".
-         "      <INPUT TYPE=hidden NAME=\"month\" VALUE=\"$month\">\n".
-         "      <INPUT TYPE=hidden NAME=\"day\" VALUE=\"$day\">\n".
-         "      <INPUT TYPE=hidden NAME=\"hour\" VALUE=\"$hour\">\n".
-         "      <INPUT TYPE=hidden NAME=\"minute\" VALUE=\"$minute\">\n".
-         "      <INPUT TYPE=hidden NAME=\"updated\" VALUE=\"yes\">\n".
+    echo "\n<form name=\"eventupdate\" action=\"event_edit.php\" method=\"post\">\n".
+         "      <input type=\"hidden\" name=\"year\" value=\"$year\" />\n".
+         "      <input type=\"hidden\" name=\"month\" value=\"$month\" />\n".
+         "      <input type=\"hidden\" name=\"day\" value=\"$day\" />\n".
+         "      <input type=\"hidden\" name=\"hour\" value=\"$hour\" />\n".
+         "      <input type=\"hidden\" name=\"minute\" value=\"$minute\" />\n".
+         "      <input type=\"hidden\" name=\"updated\" value=\"yes\" />\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Date:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) .
-         "      <SELECT NAME=\"event_year\">\n";
+         "      <select name=\"event_year\">\n";
     select_option_year($year);
-    echo "      </SELECT>\n" .
+    echo "      </select>\n" .
          "      &nbsp;&nbsp;\n" .
-         "      <SELECT NAME=\"event_month\">\n";
+         "      <select name=\"event_month\">\n";
     select_option_month($month);
-    echo "      </SELECT>\n".
+    echo "      </select>\n".
          "      &nbsp;&nbsp;\n".
-         "      <SELECT NAME=\"event_day\">\n";
+         "      <select name=\"event_day\">\n";
     select_option_day($day);
-    echo "      </SELECT>\n".
+    echo "      </select>\n".
          "      </td></tr>\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Time:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) .
-         "      <SELECT NAME=\"event_hour\">\n";
+         "      <select name=\"event_hour\">\n";
     select_option_hour($hour);
-    echo "      </SELECT>\n".
+    echo "      </select>\n".
          "      &nbsp;:&nbsp;\n".
-         "      <SELECT NAME=\"event_minute\">\n";
+         "      <select name=\"event_minute\">\n";
     select_option_minute($minute);
-    echo "      </SELECT>\n".
+    echo "      </select>\n".
          "      </td></tr>\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Length:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) .
-         "      <SELECT NAME=\"event_length\">\n";
-    select_option_length($tmparray[length]);
-    echo "      </SELECT>\n".
+         "      <select name=\"event_length\">\n";
+    select_option_length($tmparray['length']);
+    echo "      </select>\n".
          "      </td></tr>\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Priority:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) .
-         "      <SELECT NAME=\"event_priority\">\n";
-    select_option_priority($tmparray[priority]);
-    echo "      </SELECT>\n".
+         "      <select name=\"event_priority\">\n";
+    select_option_priority($tmparray['priority']);
+    echo "      </select>\n".
          "      </td></tr>\n".
          html_tag( 'tr' ) .
          html_tag( 'td', _("Title:"), 'right', $color[4] ) . "\n" .
          html_tag( 'td', '', 'left', $color[4] ) .
-         "      <INPUT TYPE=text NAME=\"event_title\" VALUE=\"$tmparray[title]\" SIZE=30 MAXLENGTH=50><BR>\n".
+         "      <input type=\"text\" name=\"event_title\" value=\"$tmparray[title]\" size=\"30\" maxlenght=\"50\" /><br />\n".
          "      </td></tr>\n".
          html_tag( 'td',
-             "      <TEXTAREA NAME=\"event_text\" ROWS=5 COLS=\"$editor_size\" WRAP=HARD>$tmparray[message]</TEXTAREA>\n" ,
+             "      <textarea name=\"event_text\" rows=\"5\" cols=\"$editor_size\" wrap=\"hard\">$tmparray[message]</textarea>\n" ,
          'left', $color[4], 'colspan="2"' ) .
          '</tr>' . html_tag( 'tr' ) .
          html_tag( 'td',
-             "<INPUT TYPE=SUBMIT NAME=send VALUE=\"" .
-             _("Update Event") . "\">\n" ,
+             '<input type="submit" name="send" value="' .
+             _("Update Event") . "\" />\n" ,
          'left', $color[4], 'colspan="2"' ) .
-         "</tr></FORM>\n";
+         "</tr></form>\n";
 }
 
 // self explenatory
@@ -103,7 +190,7 @@ function confirm_update() {
 
     echo html_tag( 'table',
                 html_tag( 'tr',
-                    html_tag( 'th', _("Do you really want to change this event from:") . "<br>\n", '', $color[4], 'colspan="2"' ) ."\n"
+                    html_tag( 'th', _("Do you really want to change this event from:") . "<br />\n", '', $color[4], 'colspan="2"' ) ."\n"
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td', _("Date:") , 'right', $color[4] ) ."\n" .
@@ -115,18 +202,18 @@ function confirm_update() {
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td', _("Priority:") , 'right', $color[4] ) ."\n" .
-                    html_tag( 'td', $tmparray[priority] , 'left', $color[4] ) ."\n"
+                    html_tag( 'td', $tmparray['priority'] , 'left', $color[4] ) ."\n"
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td', _("Title:") , 'right', $color[4] ) ."\n" .
-                    html_tag( 'td', $tmparray[title] , 'left', $color[4] ) ."\n"
+                    html_tag( 'td', $tmparray['title'] , 'left', $color[4] ) ."\n"
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td', _("Message:") , 'right', $color[4] ) ."\n" .
-                    html_tag( 'td', $tmparray[message] , 'left', $color[4] ) ."\n"
+                    html_tag( 'td', $tmparray['message'] , 'left', $color[4] ) ."\n"
                 ) .
                 html_tag( 'tr',
-                    html_tag( 'th', _("to:") . "<br>\n", '', $color[4], 'colspan="2"' ) ."\n"
+                    html_tag( 'th', _("to:") . "<br />\n", '', $color[4], 'colspan="2"' ) ."\n"
                 ) .
 
                 html_tag( 'tr',
@@ -151,33 +238,33 @@ function confirm_update() {
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td',
-                        "    <FORM NAME=\"updateevent\" METHOD=POST ACTION=\"$calself\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"year\" VALUE=\"$year\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"month\" VALUE=\"$month\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"day\" VALUE=\"$day\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"hour\" VALUE=\"$hour\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"minute\" VALUE=\"$minute\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_year\" VALUE=\"$event_year\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_month\" VALUE=\"$event_month\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_day\" VALUE=\"$event_day\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_hour\" VALUE=\"$event_hour\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_minute\" VALUE=\"$event_minute\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_priority\" VALUE=\"$event_priority\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_length\" VALUE=\"$event_length\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_title\" VALUE=\"$event_title\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"event_text\" VALUE=\"$event_text\">\n".
-                        "       <INPUT TYPE=hidden NAME=\"updated\" VALUE=\"yes\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"confirmed\" VALUE=\"yes\">\n".
-                        '       <INPUT TYPE=SUBMIT VALUE="' . _("Yes") . "\">\n".
-                        "    </FORM>\n" ,
+                        "    <form name=\"updateevent\" method=\"post\" action=\"$calself\">\n".
+                        "       <input type=\"hidden\" name=\"year\" value=\"$year\" />\n".
+                        "       <input type=\"hidden\" name=\"month\" value=\"$month\" />\n".
+                        "       <input type=\"hidden\" name=\"day\" value=\"$day\" />\n".
+                        "       <input type=\"hidden\" name=\"hour\" value=\"$hour\" />\n".
+                        "       <input type=\"hidden\" name=\"minute\" value=\"$minute\" />\n".
+                        "       <input type=\"hidden\" name=\"event_year\" value=\"$event_year\" />\n".
+                        "       <input type=\"hidden\" name=\"event_month\" value=\"$event_month\" />\n".
+                        "       <input type=\"hidden\" name=\"event_day\" value=\"$event_day\" />\n".
+                        "       <input type=\"hidden\" name=\"event_hour\" value=\"$event_hour\" />\n".
+                        "       <input type=\"hidden\" name=\"event_minute\" value=\"$event_minute\" />\n".
+                        "       <input type=\"hidden\" name=\"event_priority\" value=\"$event_priority\" />\n".
+                        "       <input type=\"hidden\" name=\"event_length\" value=\"$event_length\" />\n".
+                        "       <input type=\"hidden\" name=\"event_title\" value=\"$event_title\" />\n".
+                        "       <input type=\"hidden\" name=\"event_text\" value=\"$event_text\" />\n".
+                        "       <input type=\"hidden\" name=\"updated\" value=\"yes\" />\n".
+                        "       <input type=\"hidden\" name=\"confirmed\" value=\"yes\" />\n".
+                        '       <input type="submit" value="' . _("Yes") . "\" />\n".
+                        "    </form>\n" ,
                     'right', $color[4] ) ."\n" .
                     html_tag( 'td',
-                        "    <FORM NAME=\"nodelevent\" METHOD=POST ACTION=\"day.php\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"year\" VALUE=\"$year\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"month\" VALUE=\"$month\">\n".
-                        "       <INPUT TYPE=HIDDEN NAME=\"day\" VALUE=\"$day\">\n".
-                        '       <INPUT TYPE=SUBMIT VALUE="' . _("No") . "\">\n".
-                        "    </FORM>\n" ,
+                        "    <form name=\"nodelevent\" method=\"post\" action=\"day.php\">\n".
+                        "       <input type=\"hidden\" name=\"year\" value=\"$year\" />\n".
+                        "       <input type=\"hidden\" name=\"month\" value=\"$month\" />\n".
+                        "       <input type=\"hidden\" name=\"day\" value=\"$day\" />\n".
+                        '       <input type="submit" value="' . _("No") . "\" />\n".
+                        "    </form>\n" ,
                     'left', $color[4] ) ."\n"
                 ) ,
             '', $color[0], 'border="0" cellpadding="2" cellspacing="1"' );
@@ -212,7 +299,7 @@ echo html_tag( 'tr', '', '', $color[0] ) .
 if (!isset($updated)){
     //get changes to event
     readcalendardata();
-    show_event_form();
+    update_event_form();
 } else {
     if (!isset($confirmed)){
         //confirm changes
@@ -229,7 +316,7 @@ if (!isset($updated)){
                 ) . "\n";
         echo html_tag( 'tr',
                    html_tag( 'td',
-                       "<a href=\"day.php?year=$year&month=$month&day=$day\">" . 
+                       "<a href=\"day.php?year=$year&amp;month=$month&amp;day=$day\">" .
                        _("Day View") ."</a>",
                    'left' )
                 ) . "\n";
@@ -252,4 +339,4 @@ if (!isset($updated)){
 
 ?>
 </table></td></tr></table>
-</body></html>
+</body></html>
\ No newline at end of file