projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
phpDocumentor updates
[squirrelmail.git]
/
plugins
/
calendar
/
calendar_data.php
diff --git
a/plugins/calendar/calendar_data.php
b/plugins/calendar/calendar_data.php
index b7934606a1cf466d005c08bbecc3a86b4b2e04b0..1ae6ff62720a18270de4b2800ce80052144cce63 100644
(file)
--- a/
plugins/calendar/calendar_data.php
+++ b/
plugins/calendar/calendar_data.php
@@
-3,26
+3,29
@@
/**
* calendar_data.php
*
/**
* calendar_data.php
*
- * 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 operate on calendar data files.
*
* Originally contrubuted by Michal Szczotka <michal@tuxy.org>
*
* functions to operate on calendar data files.
*
- * $Id$
+ * @copyright © 2002-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage calendar
*/
*/
-/
/
this is array that contains all events
-
//
it is three dimensional array with fallowing structure
-// $calendardata[date][time] = array(length,priority,title,message);
+/
**
this is array that contains all events
+
*
it is three dimensional array with fallowing structure
+ * $calendardata[date][time] = array(length,priority,title,message); */
$calendardata = array();
$calendardata = array();
-//read events into array
-//data is | delimited, just like addresbook
-//files are structured like this:
-//date|time|length|priority|title|message);
-//files are divide by year for performance increase
+/**
+ * read events into array
+ *
+ * data is | delimited, just like addressbook
+ * files are structured like this:
+ * date|time|length|priority|title|message
+ * files are divided by year for performance increase */
function readcalendardata() {
global $calendardata, $username, $data_dir, $year;
function readcalendardata() {
global $calendardata, $username, $data_dir, $year;
@@
-35,18
+38,25
@@
function readcalendardata() {
while ($fdata = fgetcsv ($fp, 4096, '|')) {
$calendardata[$fdata[0]][$fdata[1]] = array( 'length' => $fdata[2],
'priority' => $fdata[3],
while ($fdata = fgetcsv ($fp, 4096, '|')) {
$calendardata[$fdata[0]][$fdata[1]] = array( 'length' => $fdata[2],
'priority' => $fdata[3],
- 'title' =>
$fdata[4]
,
- 'message' =>
$fdata[5]
,
+ 'title' =>
htmlspecialchars($fdata[4],ENT_NOQUOTES)
,
+ 'message' =>
htmlspecialchars($fdata[5],ENT_NOQUOTES)
,
'reminder' => $fdata[6] );
}
fclose ($fp);
'reminder' => $fdata[6] );
}
fclose ($fp);
+ // this is to sort the events within a day on starttime
+ $new_calendardata = array();
+ foreach($calendardata as $day => $data) {
+ ksort($data, SORT_NUMERIC);
+ $new_calendardata[$day] = $data;
+ }
+ $calendardata = $new_calendardata;
}
}
}
//makes events persistant
function writecalendardata() {
}
}
}
//makes events persistant
function writecalendardata() {
- global $calendardata, $username, $data_dir, $year;
+ global $calendardata, $username, $data_dir, $year
, $color
;
$filetmp = getHashedFile($username, $data_dir, "$username.$year.cal.tmp");
$filename = getHashedFile($username, $data_dir, "$username.$year.cal");
$filetmp = getHashedFile($username, $data_dir, "$username.$year.cal.tmp");
$filename = getHashedFile($username, $data_dir, "$username.$year.cal");
@@
-56,11
+66,14
@@
function writecalendardata() {
while ( $calbar = each ($calfoo['value'])) {
$calfoobar = $calendardata[$calfoo['key']][$calbar['key']];
$calstr = "$calfoo[key]|$calbar[key]|$calfoobar[length]|$calfoobar[priority]|$calfoobar[title]|$calfoobar[message]|$calfoobar[reminder]\n";
while ( $calbar = each ($calfoo['value'])) {
$calfoobar = $calendardata[$calfoo['key']][$calbar['key']];
$calstr = "$calfoo[key]|$calbar[key]|$calfoobar[length]|$calfoobar[priority]|$calfoobar[title]|$calfoobar[message]|$calfoobar[reminder]\n";
- fwrite($fp, $calstr, 4096);
+ if(sq_fwrite($fp, $calstr, 4096) === FALSE) {
+ error_box(_("Could not write calendar file %s", "$username.$year.cal.tmp"), $color);
+ }
}
}
fclose ($fp);
}
}
fclose ($fp);
+ @unlink($filename);
rename($filetmp,$filename);
}
}
rename($filetmp,$filename);
}
}
@@
-113,4
+126,4
@@
function update_event($date, $time) {
}
}
-?>
+?>
\ No newline at end of file