X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fcalendar%2Fcalendar.php;h=30736bc83ebff97e97adf2cdd0f3390f4d030b08;hp=975838adce46a54b695fce89ee0a668feb2b1ff6;hb=c4faef335b2362c81b8ebf026d4066c12d70536c;hpb=95dcee50e4d7ffe1d0b686377042ff3b735bc81c
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 975838ad..30736bc8 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -1,51 +1,43 @@
- *
* Displays the main calendar page (month view).
*
- * $Id$
+ * @copyright 2002-2020 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage calendar
*/
-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');
+/* load date_intl() */
+include_once(SM_PATH . 'functions/date.php');
-/* get globals */
+/* Calendar plugin required files. */
+include_once(SM_PATH . 'plugins/calendar/calendar_data.php');
+include_once(SM_PATH . 'plugins/calendar/functions.php');
-if (isset($_GET['month'])) {
- $month = $_GET['month'];
-}
-if (isset($_GET['year'])) {
- $year = $_GET['year'];
-}
-if (isset($_POST['year'])) {
- $year = $_POST['year'];
+/* get globals */
+if (! sqgetGlobalVar('month',$month,SQ_FORM) || ! is_numeric($month)) {
+ unset($month);
}
-if (isset($_POST['month'])) {
- $month = $_POST['month'];
+if (! sqgetGlobalVar('year',$year,SQ_FORM) || ! is_numeric($year)) {
+ unset($year);
}
/* got 'em */
-//display upper part of month calendar view
+/**
+ * display upper part of month calendar view
+ * @return void
+ * @access private
+ */
function startcalendar() {
- global $year, $month, $day, $color;
+ global $year, $month, $color;
$prev_date = mktime(0, 0, 0, $month - 1, 1, $year);
$act_date = mktime(0, 0, 0, $month, 1, $year);
@@ -61,19 +53,19 @@ function startcalendar() {
html_tag( 'table', '', '', $color[0], 'width="100%" border="0" cellpadding="2" cellspacing="1"' ) .
html_tag( 'tr', "\n".
html_tag( 'th',
- "<< ".($year-1).""
+ "<< ".($year-1).""
) . "\n".
html_tag( 'th',
- "< " .
+ "< " .
date_intl( 'M', $prev_date). ""
) . "\n".
html_tag( 'th', date_intl( 'F Y', $act_date ), '', $color[0], 'colspan="3"') .
html_tag( 'th',
- "" .
+ "" .
date_intl( 'M', $next_date) . " >"
) . "\n".
html_tag( 'th',
- "".($year+1)." >>"
+ "".($year+1)." >>"
)
) . "\n".
html_tag( 'tr',
@@ -89,9 +81,13 @@ function startcalendar() {
'', $color[0] ) ."\n";
}
-//main logic for month view of calendar
+/**
+ * main logic for month view of calendar
+ * @return void
+ * @access private
+ */
function drawmonthview() {
- global $year, $month, $day, $color, $calendardata, $todayis;
+ global $year, $month, $color, $calendardata, $todayis;
$aday = 1 - date('w', mktime(0, 0, 0, $month, 1, $year));
$days_in_month = date('t', mktime(0, 0, 0, $month, 1, $year));
@@ -104,8 +100,8 @@ function drawmonthview() {
if ( $aday <= $days_in_month && $aday > 0){
echo html_tag( 'td', '', 'left', $color[4], 'height="50" valign="top"' ) ."\n".
html_tag( 'div', '', 'right' );
- echo(($cdate==$todayis) ? "[ " . _("TODAY") . " ] " : "");
- echo "[ ' . _("TODAY") . " ] " : '');
+ echo "$aday";
} else {
@@ -116,7 +112,13 @@ function drawmonthview() {
$i=0;
while ($calfoo = each($calendardata[$cdate])) {
$calbar = $calendardata[$cdate][$calfoo['key']];
- echo ($calbar['priority']==1) ? "$calbar[title]
\n" : "$calbar[title]
\n";
+ // FIXME: how to display multiline task
+ $title = '['. $calfoo['key']. '] ' .
+ str_replace(array("\r","\n"),array(' ',' '),sm_encode_html_special_chars($calbar['message']));
+ // FIXME: link to nowhere
+ echo "".sm_encode_html_special_chars($calbar['title'])."
\n";
$i=$i+1;
if($i==2){
break;
@@ -130,23 +132,27 @@ function drawmonthview() {
}
}
-//end of monthly view and form to jump to any month and year
+/**
+ * end of monthly view and form to jump to any month and year
+ * @return void
+ * @access private
+ */
function endcalendar() {
- global $year, $month, $day, $color;
+ global $year, $month;
echo html_tag( 'tr' ) ."\n" .
html_tag( 'td', '', 'left', '', 'colspan="7"' ) ."\n" .
- " \n".
+ " \n".
+ "\n";
}
@@ -163,7 +169,7 @@ if( !isset($day) || $day <= 0){
$todayis = date( 'mdY' );
$calself=basename($PHP_SELF);
-displayPageHeader($color, 'None');
+displayPageHeader($color);
calendar_header();
readcalendardata();
startcalendar();