From 1dbeefcc9d19751c4a4e92672c959e53f07a04e3 Mon Sep 17 00:00:00 2001 From: pdontthink Date: Sat, 4 Jun 2022 17:50:55 +0000 Subject: [PATCH] Remove use of each() and make sense of poorly named variables git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14971 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/calendar/calendar_data.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/plugins/calendar/calendar_data.php b/plugins/calendar/calendar_data.php index d0d7a93f..56a5102e 100644 --- a/plugins/calendar/calendar_data.php +++ b/plugins/calendar/calendar_data.php @@ -104,22 +104,20 @@ function writecalendardata() { $filename = getHashedFile($username, $data_dir, "$username.$year.cal"); $fp = fopen ($filetmp,"w"); if ($fp) { - while ( $calfoo = each ($calendardata)) { - while ( $calbar = each ($calfoo['value'])) { - $calfoobar = $calendardata[$calfoo['key']][$calbar['key']]; - array_walk($calfoobar,'calendar_encodedata'); + foreach ( $calendardata as $datetime => $events ) { + foreach ( $events as $time_of_day => $event ) { + array_walk($event,'calendar_encodedata'); /** * Make sure that reminder field is set. Calendar forms don't implement it, * but it is still used for calendar data. Backwards compatibility. */ - if (!isset($calfoobar['reminder'])) $calfoobar['reminder']=''; + if (!isset($event['reminder'])) $event['reminder']=''; - $calstr = "$calfoo[key]|$calbar[key]|$calfoobar[length]|$calfoobar[priority]|$calfoobar[title]|$calfoobar[message]|$calfoobar[reminder]\n"; + $calstr = "$datetime|$time_of_day|$event[length]|$event[priority]|$event[title]|$event[message]|$event[reminder]\n"; if(sq_fwrite($fp, $calstr, 4096) === FALSE) { error_box(_("Could not write calendar file %s", "$username.$year.cal.tmp")); } } - } fclose ($fp); @unlink($filename); -- 2.25.1