X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fcalendar%2Fevent_delete.php;h=dc90191b4b4d18f667e5684403db21cfadd439ba;hp=0ae820a1310e05cdd281050c8ff55f2d7792b39d;hb=300ea85431defdabaa4c06bec1776790e096eb78;hpb=a11df61b949068712242d77e2c18311c93e63979
diff --git a/plugins/calendar/event_delete.php b/plugins/calendar/event_delete.php
index 0ae820a1..dc90191b 100644
--- a/plugins/calendar/event_delete.php
+++ b/plugins/calendar/event_delete.php
@@ -1,133 +1,107 @@
- *
- * Functions to delete a event.
- *
- * $Id$
+ * @copyright © 2002-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage calendar
+ */
+
+/**
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../../');
+require('../../include/init.php');
+
+/* date_intl() */
+include_once(SM_PATH . 'functions/date.php');
-/* Calender plugin required files. */
-require_once(SM_PATH . 'plugins/calendar/calendar_data.php');
-require_once(SM_PATH . 'plugins/calendar/functions.php');
+/* Calendar plugin required files. */
+include_once(SM_PATH . 'plugins/calendar/calendar_data.php');
+include_once(SM_PATH . 'plugins/calendar/functions.php');
-/* 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');
/* 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 (! sqGetGlobalVar('month',$month,SQ_FORM) || ! is_numeric($month)) {
+ unset($month);
}
-if (isset($_GET['day'])) {
- $day = $_GET['day'];
+if (! sqGetGlobalVar('year',$year,SQ_FORM) || ! is_numeric($year)) {
+ unset($year);
}
-elseif (isset($_POST['day'])) {
- $day = $_POST['day'];
+if (! sqGetGlobalVar('day',$day,SQ_FORM) || ! is_numeric($day)) {
+ unset($day);
}
-if (isset($_GET['dyear'])) {
- $dyear = $_GET['dyear'];
+if (! sqGetGlobalVar('dyear',$dyear,SQ_FORM) || ! is_numeric($dyear)) {
+ unset($dyear);
}
-elseif (isset($_POST['dyear'])) {
- $dyear = $_POST['dyear'];
+if (! sqGetGlobalVar('dmonth',$dmonth,SQ_FORM) || ! is_numeric($dmonth)) {
+ unset($dmonth);
}
-if (isset($_GET['dmonth'])) {
- $dmonth = $_GET['dmonth'];
+if (! sqGetGlobalVar('dday',$dday,SQ_FORM) || ! is_numeric($dday)) {
+ unset($dday);
}
-elseif (isset($_POST['dmonth'])) {
- $dmonth = $_POST['dmonth'];
+if (! sqGetGlobalVar('dhour',$dhour,SQ_FORM) || ! is_numeric($dhour)) {
+ unset($dhour);
}
-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'];
+if (! sqGetGlobalVar('dminute',$dminute,SQ_FORM) || ! is_numeric($dminute)) {
+ unset($dminute);
}
+sqGetGlobalVar('confirmed',$confirmed,SQ_POST);
+
/* 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?") . '
', '', $color[4], 'colspan="2"' )
+ html_tag( 'th', _("Do you really want to delete this event?") . '
', '', $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',
- " \n" ,
+ " \n" ,
'right', $color[4] ) .
html_tag( 'td',
- " \n" ,
+ " \n" ,
'left', $color[4] )
) ,
'', $color[0], 'border="0" cellpadding="2" cellspacing="1"' );
@@ -158,7 +132,7 @@ 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 '
' . _("Event deleted!") . "
\n";
+ echo '
' . _("Event deleted!") . "
\n";
echo "" .
_("Day View") . "\n";
} else {
@@ -166,9 +140,9 @@ if (isset($dyear) && isset($dmonth) && isset($dday) && isset($dhour) && isset($d
confirm_deletion();
}
} else {
- echo '
' . _("Nothing to delete!");
+ echo '
' . _("Nothing to delete!");
}
?>
-