X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fcalendar%2Fevent_delete.php;h=ca1c83aebafb73851b6ad49b268c6e523636acc3;hp=cd23d8d72cac3b16339f1d97c007f6937001a921;hb=5d0f90f4cf688a471e7d92893a37f0c8932909db;hpb=aa7fb30cfbfef6ef28ebde963f6312c79122f411

diff --git a/plugins/calendar/event_delete.php b/plugins/calendar/event_delete.php
index cd23d8d7..ca1c83ae 100644
--- a/plugins/calendar/event_delete.php
+++ b/plugins/calendar/event_delete.php
@@ -1,80 +1,107 @@
 <?php
 
 /**
- * event_delete.php
+ * Functions to delete a event.
  *
- * Copyright (c) 2002 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * Originally contrubuted by Michal Szczotka <michal@tuxy.org>
- *
- * Functions to delete a event. 
- *
- * $Id$
+ * @copyright 2002-2012 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage calendar
  */
 
-require_once('calendar_data.php');
-require_once('functions.php');
-chdir('..');
-define('SM_PATH','../');
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../../include/init.php');
+
+/* date_intl() */
+include_once(SM_PATH . 'functions/date.php');
+
+/* Calendar plugin required files. */
+include_once(SM_PATH . 'plugins/calendar/calendar_data.php');
+include_once(SM_PATH . 'plugins/calendar/functions.php');
+
+/* get globals */
+if (! sqGetGlobalVar('month',$month,SQ_FORM) || ! is_numeric($month)) {
+    unset($month);
+}
+if (! sqGetGlobalVar('year',$year,SQ_FORM) || ! is_numeric($year)) {
+    unset($year);
+}
+if (! sqGetGlobalVar('day',$day,SQ_FORM) || ! is_numeric($day)) {
+    unset($day);
+}
+if (! sqGetGlobalVar('dyear',$dyear,SQ_FORM) || ! is_numeric($dyear)) {
+    unset($dyear);
+}
+if (! sqGetGlobalVar('dmonth',$dmonth,SQ_FORM) || ! is_numeric($dmonth)) {
+    unset($dmonth);
+}
+if (! sqGetGlobalVar('dday',$dday,SQ_FORM) || ! is_numeric($dday)) {
+    unset($dday);
+}
+if (! sqGetGlobalVar('dhour',$dhour,SQ_FORM) || ! is_numeric($dhour)) {
+    unset($dhour);
+}
+if (! sqGetGlobalVar('dminute',$dminute,SQ_FORM) || ! is_numeric($dminute)) {
+    unset($dminute);
+}
+sqGetGlobalVar('confirmed',$confirmed,SQ_POST);
 
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-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 . 'include/load_prefs.php');
-require_once(SM_PATH . 'functions/html.php');
+/* got 'em */
 
-function confirm_deletion()
-{
+/**
+ * Displays confirmation form when event is deleted
+ * @return void
+ */
+function confirm_deletion() {
     global $calself, $dyear, $dmonth, $dday, $dhour, $dminute, $calendardata, $color, $year, $month, $day;
 
     $tmparray = $calendardata["$dmonth$dday$dyear"]["$dhour$dminute"];
 
     echo html_tag( 'table',
                html_tag( 'tr',
-                   html_tag( 'th', _("Do you really want to delete this event?") . '<br>', '', $color[4], 'colspan="2"' )
+                   html_tag( 'th', _("Do you really want to delete this event?") . '<br />', '', $color[4], 'colspan="2"' )
                ) .
                html_tag( 'tr',
                    html_tag( 'td', _("Date:"), 'right', $color[4] ) .
-                   html_tag( 'td', $dmonth.'/'.$dday.'/'.$dyear, 'left', $color[4] )
+                   html_tag( 'td', date_intl(_("m/d/Y"),mktime(0,0,0,$dmonth,$dday,$dyear)), 'left', $color[4] )
                ) .
                html_tag( 'tr',
                    html_tag( 'td', _("Time:"), 'right', $color[4] ) .
-                   html_tag( 'td', $dhour.':'.$dminute, 'left', $color[4] )
+                   html_tag( 'td', date_intl(_("H:i"),mktime($dhour,$dminute,0,$dmonth,$dday,$dyear)), 'left', $color[4] )
                ) .
                html_tag( 'tr',
                    html_tag( 'td', _("Title:"), 'right', $color[4] ) .
-                   html_tag( 'td', $tmparray[title], 'left', $color[4] )
+                   html_tag( 'td', htmlspecialchars($tmparray['title']), 'left', $color[4] )
                ) .
                html_tag( 'tr',
                    html_tag( 'td', _("Message:"), 'right', $color[4] ) .
-                   html_tag( 'td', $tmparray[message], 'left', $color[4] )
+                   html_tag( 'td', nl2br(htmlspecialchars($tmparray['message'])), 'left', $color[4] )
                ) .
                html_tag( 'tr',
                    html_tag( 'td',
-                       "    <FORM NAME=\"delevent\" METHOD=POST ACTION=\"$calself\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"dyear\" VALUE=\"$dyear\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"dmonth\" VALUE=\"$dmonth\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"dday\" VALUE=\"$dday\">\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=\"dhour\" VALUE=\"$dhour\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"dminute\" VALUE=\"$dminute\">\n".
-                       "       <INPUT TYPE=HIDDEN NAME=\"confirmed\" VALUE=\"yes\">\n".
-                       '       <INPUT TYPE=SUBMIT VALUE="' . _("Yes") . "\">\n".
-                       "    </FORM>\n" ,
+                       "    <form name=\"delevent\" method=\"post\" action=\"$calself\">\n".
+                       "       <input type=\"hidden\" name=\"dyear\" value=\"$dyear\" />\n".
+                       "       <input type=\"hidden\" name=\"dmonth\" value=\"$dmonth\" />\n".
+                       "       <input type=\"hidden\" name=\"dday\" value=\"$dday\" />\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=\"dhour\" value=\"$dhour\" />\n".
+                       "       <input type=\"hidden\" name=\"dminute\" value=\"$dminute\" />\n".
+                       "       <input type=\"hidden\" name=\"confirmed\" value=\"yes\" />\n".
+                       '       <input type="submit" value="' . _("Yes") . "\" />\n".
+                       "    </form>\n" ,
                    'right', $color[4] ) .
                    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] )
                ) ,
            '', $color[0], 'border="0" cellpadding="2" cellspacing="1"' );
@@ -92,7 +119,7 @@ if ($day <= 0){
 
 $calself=basename($PHP_SELF);
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 //load calendar menu
 calendar_header();
 
@@ -105,15 +132,15 @@ echo html_tag( 'tr', '', '', $color[0] ) .
 if (isset($dyear) && isset($dmonth) && isset($dday) && isset($dhour) && isset($dminute)){
     if (isset($confirmed)){
         delete_event("$dmonth$dday$dyear", "$dhour$dminute");
-        echo '<br><br>' . _("Event deleted!") . "<br>\n";
-        echo "<a href=\"day.php?year=$year&month=$month&day=$day\">" .
+        echo '<br /><br />' . _("Event deleted!") . "<br />\n";
+        echo "<a href=\"day.php?year=$year&amp;month=$month&amp;day=$day\">" .
           _("Day View") . "</a>\n";
     } else {
         readcalendardata();
         confirm_deletion();
     }
 } else {
-    echo '<br>' . _("Nothing to delete!");
+    echo '<br />' . _("Nothing to delete!");
 }
 
 ?>