X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fcalendar%2Fevent_edit.php;h=1631033cb608788cb4b7b3e15bd63593005945a6;hb=170883a4a7c0b4c2ba10d9dfb65cc8b9007337d3;hp=c937e9aea9f0c1804c0e3bdfbc87cd3125fcc471;hpb=6c84ba1ec45ab854c37b6f65c5b4d84ab1c7aad4;p=squirrelmail.git
diff --git a/plugins/calendar/event_edit.php b/plugins/calendar/event_edit.php
index c937e9ae..1631033c 100644
--- a/plugins/calendar/event_edit.php
+++ b/plugins/calendar/event_edit.php
@@ -1,119 +1,98 @@
- *
* Functions to edit an event.
*
- * $Id$
+ * @copyright © 2002-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
* @package plugins
* @subpackage calendar
*/
-/** @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');
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../../include/init.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');
+/* date_intl() */
+include_once(SM_PATH . 'functions/date.php');
+/* form functions */
+include_once(SM_PATH . 'functions/forms.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 (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'];
+sqGetGlobalVar('updated',$updated,SQ_POST);
+
+/* get date values and make sure that they are numeric */
+if (! sqGetGlobalVar('event_year',$event_year,SQ_POST) || ! is_numeric($event_year)) {
+ unset($event_year);
}
-if (isset($_POST['confirmed'])) {
- $confirmed = $_POST['confirmed'];
+if (! sqGetGlobalVar('event_month',$event_month,SQ_POST) || ! is_numeric($event_month)) {
+ unset($event_month);
}
-if (isset($_POST['year'])) {
- $year = $_POST['year'];
+if (! sqGetGlobalVar('event_day',$event_day,SQ_POST) || ! is_numeric($event_day)) {
+ unset($event_day);
}
-elseif (isset($_GET['year'])) {
- $year = $_GET['year'];
+if (! sqGetGlobalVar('event_hour',$event_hour,SQ_POST) || ! is_numeric($event_hour)) {
+ unset($event_hour);
}
-if (isset($_POST['month'])) {
- $month = $_POST['month'];
+if (! sqGetGlobalVar('event_minute',$event_minute,SQ_POST) || ! is_numeric($event_minute)) {
+ unset($event_minute);
}
-elseif (isset($_GET['month'])) {
- $month = $_GET['month'];
+if (! sqGetGlobalVar('event_length',$event_length,SQ_POST) || ! is_numeric($event_length)) {
+ unset($event_length);
}
-if (isset($_POST['day'])) {
- $day = $_POST['day'];
+sqGetGlobalVar('event_title',$event_title,SQ_POST);
+sqGetGlobalVar('event_text',$event_text,SQ_POST);
+sqGetGlobalVar('send',$send,SQ_POST);
+
+if (! sqGetGlobalVar('event_priority',$event_priority,SQ_POST) || ! is_numeric($event_priority)) {
+ unset($event_priority);
}
-elseif (isset($_GET['day'])) {
- $day = $_GET['day'];
+
+sqGetGlobalVar('confirmed',$confirmed,SQ_POST);
+
+if (! sqGetGlobalVar('year',$year,SQ_FORM) || ! is_numeric($year)) {
+ unset($year);
}
-if (isset($_POST['hour'])) {
- $hour = $_POST['hour'];
+if (! sqGetGlobalVar('month',$month,SQ_FORM) || ! is_numeric($month)) {
+ unset($month);
}
-elseif (isset($_GET['hour'])) {
- $hour = $_GET['hour'];
+if (! sqGetGlobalVar('day',$day,SQ_FORM) || ! is_numeric($day)) {
+ unset($day);
}
-if (isset($_POST['minute'])) {
- $minute = $_POST['minute'];
+if (! sqGetGlobalVar('hour',$hour,SQ_FORM) || ! is_numeric($hour)) {
+ unset($hour);
}
-elseif (isset($_GET['minute'])) {
- $minute = $_GET['minute'];
+if (! sqGetGlobalVar('minute',$minute,SQ_FORM) || ! is_numeric($minute)) {
+ unset($minute);
}
/* got 'em */
-// update event info
+/**
+ * update event info
+ * @return void
+ * @access private
+ */
function update_event_form() {
global $color, $editor_size, $year, $day, $month, $hour, $minute, $calendardata;
$tmparray = $calendardata["$month$day$year"]["$hour$minute"];
+ $tab = ' ';
echo "\n\n";
}
-// self explenatory
+/**
+ * Confirms event update
+ * @return void
+ * @access private
+ */
function confirm_update() {
- global $calself, $year, $month, $day, $hour, $minute, $calendardata, $color, $event_year, $event_month, $event_day, $event_hour, $event_minute, $event_length, $event_priority, $event_title, $event_text;
+ global $calself, $year, $month, $day, $hour, $minute, $calendardata,
+ $color, $event_year, $event_month, $event_day, $event_hour,
+ $event_minute, $event_length, $event_priority, $event_title, $event_text;
$tmparray = $calendardata["$month$day$year"]["$hour$minute"];
+ $tab = ' ';
echo html_tag( 'table',
html_tag( 'tr',
@@ -182,11 +164,11 @@ function confirm_update() {
) .
html_tag( 'tr',
html_tag( 'td', _("Date:") , 'right', $color[4] ) ."\n" .
- html_tag( 'td', $month.'/'.$day.'/'.$year , 'left', $color[4] ) ."\n"
+ html_tag( 'td', date_intl(_("m/d/Y"),mktime(0,0,0,$month,$day,$year)), 'left', $color[4] ) ."\n"
) .
html_tag( 'tr',
html_tag( 'td', _("Time:") , 'right', $color[4] ) ."\n" .
- html_tag( 'td', $hour.':'.$minute , 'left', $color[4] ) ."\n"
+ html_tag( 'td', date_intl(_("H:i"),mktime($hour,$minute,0,$month,$day,$year)) , 'left', $color[4] ) ."\n"
) .
html_tag( 'tr',
html_tag( 'td', _("Priority:") , 'right', $color[4] ) ."\n" .
@@ -194,11 +176,11 @@ function confirm_update() {
) .
html_tag( 'tr',
html_tag( 'td', _("Title:") , 'right', $color[4] ) ."\n" .
- html_tag( 'td', $tmparray['title'] , 'left', $color[4] ) ."\n"
+ html_tag( 'td', htmlspecialchars($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', nl2br(htmlspecialchars($tmparray['message'])) , 'left', $color[4] ) ."\n"
) .
html_tag( 'tr',
html_tag( 'th', _("to:") . "
\n", '', $color[4], 'colspan="2"' ) ."\n"
@@ -206,11 +188,11 @@ function confirm_update() {
html_tag( 'tr',
html_tag( 'td', _("Date:") , 'right', $color[4] ) ."\n" .
- html_tag( 'td', $event_month.'/'.$event_day.'/'.$event_year , 'left', $color[4] ) ."\n"
+ html_tag( 'td', date_intl(_("m/d/Y"),mktime(0,0,0,$event_month,$event_day,$event_year)), 'left', $color[4] ) ."\n"
) .
html_tag( 'tr',
html_tag( 'td', _("Time:") , 'right', $color[4] ) ."\n" .
- html_tag( 'td', $event_hour.':'.$event_minute , 'left', $color[4] ) ."\n"
+ html_tag( 'td', date_intl(_("H:i"),mktime($event_hour,$event_minute,0,$event_month,$event_day,$event_year)), 'left', $color[4] ) ."\n"
) .
html_tag( 'tr',
html_tag( 'td', _("Priority:") , 'right', $color[4] ) ."\n" .
@@ -218,41 +200,41 @@ function confirm_update() {
) .
html_tag( 'tr',
html_tag( 'td', _("Title:") , 'right', $color[4] ) ."\n" .
- html_tag( 'td', $event_title , 'left', $color[4] ) ."\n"
+ html_tag( 'td', htmlspecialchars($event_title) , 'left', $color[4] ) ."\n"
) .
html_tag( 'tr',
html_tag( 'td', _("Message:") , 'right', $color[4] ) ."\n" .
- html_tag( 'td', $event_text , 'left', $color[4] ) ."\n"
+ html_tag( 'td', nl2br(htmlspecialchars($event_text)) , 'left', $color[4] ) ."\n"
) .
html_tag( 'tr',
html_tag( 'td',
- " \n" ,
+ "\n" ,
'right', $color[4] ) ."\n" .
html_tag( 'td',
- " \n" ,
+ "\n" ,
'left', $color[4] ) ."\n"
) ,
'', $color[0], 'border="0" cellpadding="2" cellspacing="1"' );
@@ -292,10 +274,6 @@ if (!isset($updated)){
if (!isset($confirmed)){
//confirm changes
readcalendardata();
- // strip event text so it fits in one line
- $event_text=nl2br($event_text);
- $event_text=ereg_replace ("\n", '', $event_text);
- $event_text=ereg_replace ("\r", '', $event_text);
confirm_update();
} else {
update_event("$month$day$year", "$hour$minute");
@@ -312,14 +290,20 @@ if (!isset($updated)){
$fixdate = date( 'mdY', mktime(0, 0, 0, $event_month, $event_day, $event_year));
//if event has been moved to different year then act accordingly
if ($year==$event_year){
- $calendardata["$fixdate"]["$event_hour$event_minute"] = array("length"=>"$event_length","priority"=>"$event_priority","title"=>"$event_title","message"=>"$event_text");
+ $calendardata["$fixdate"]["$event_hour$event_minute"] = array('length' => $event_length,
+ 'priority' => $event_priority,
+ 'title' => $event_title,
+ 'message' => $event_text);
writecalendardata();
} else {
writecalendardata();
$year=$event_year;
$calendardata = array();
readcalendardata();
- $calendardata["$fixdate"]["$event_hour$event_minute"] = array("length"=>"$event_length","priority"=>"$event_priority","title"=>"$event_title","message"=>"$event_text");
+ $calendardata["$fixdate"]["$event_hour$event_minute"] = array('length' => $event_length,
+ 'priority' => $event_priority,
+ 'title' => $event_title,
+ 'message' => $event_text);
writecalendardata();
}
}