Author: josx Date: 2007-09-26 14:33:44 -0300 (Wed, 26 Sep 2007) New Revision: 5164 Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/date_functions.php prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/ical_parser.php prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/init.inc.php Log: Arreglo de algunos problemas en la visualizacion del calendario Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php 2007-09-26 17:25:37 UTC (rev 5163) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php 2007-09-26 17:33:44 UTC (rev 5164) @@ -122,13 +122,13 @@ $prev_week = date("Ymd", strtotime("-1 week", $unix_time)); - $globals_local = array(); - $globals_local['daysofweek_lang'] = $daysofweek_lang; - $globals_local['daysofweekshort_lang'] = $daysofweekshort_lang; $globals_local['daysofweekreallyshort_lang'] = $daysofweekreallyshort_lang; - $globals_local['monthsofyear_lang'] = $monthsofyear_lang; - $globals_local['monthsofyearshort_lang'] = $monthsofyearshort_lang; +// $globals_local = array(); +// $globals_local['daysofweek_lang'] = $daysofweek_lang; +// $globals_local['daysofweekshort_lang'] = $daysofweekshort_lang; $globals_local['daysofweekreallyshort_lang'] = $daysofweekreallyshort_lang; +// $globals_local['monthsofyear_lang'] = $monthsofyear_lang; +// $globals_local['monthsofyearshort_lang'] = $monthsofyearshort_lang; +// $globals_local['monthsofyear_lang'] = $monthsofyear_lang; - $sidebar_date = localizeDate($dateFormat_week_list, $unix_time, $globals_local); $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); $end_week_time = $start_week_time + (($week_length - 1) * 25 * 60 * 60); Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/date_functions.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/date_functions.php 2007-09-26 17:25:37 UTC (rev 5163) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/date_functions.php 2007-09-26 17:33:44 UTC (rev 5164) @@ -103,6 +103,7 @@ $daysofweekreallyshort_lang = $globals['daysofweekreallyshort_lang']; $monthsofyear_lang = $globals['monthsofyear_lang']; $monthsofyearshort_lang = $globals['monthsofyearshort_lang']; + $monthsofyear_lang = $globals['monthsofyear_lang']; // echo $daysofweek_lang .',' . $daysofweekshort_lang.','. $daysofweekreallyshort_lang.',' .$monthsofyear_lang .','.$monthsofyear_lang.','. $monthsofyearshort_lang;die; $year = date("Y", $timestamp); $month = date("n", $timestamp)-1; Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/ical_parser.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/ical_parser.php 2007-09-26 17:25:37 UTC (rev 5163) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/ical_parser.php 2007-09-26 17:33:44 UTC (rev 5164) @@ -463,7 +463,7 @@ $abs_until = $until; ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})', $until, $regs); $until = mktime($regs[4],$regs[5],$regs[6],$regs[2],$regs[3],$regs[1]); - $master_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = localizeDate($dateFormat_week,$until); + $master_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = localizeDate($dateFormat_week, $until, $globals_local); break; case 'INTERVAL': if ($val > 0){ @@ -538,7 +538,13 @@ $end_date_time = $until; $start_range_time_tmp = $start_range_time; $end_range_time_tmp = $end_range_time; - + +/* + echo date("d m Y", $end_range_time); + echo date("d m Y",$until); + echo date("d m Y",$start_range_time_tmp); + echo date("d m Y",$end_range_time_tmp );*/ + // If the $end_range_time is less than the $start_date_time, or $start_range_time is greater // than $end_date_time, we may as well forget the whole thing // It doesn't do us any good to spend time adding data we aren't even looking at @@ -799,7 +805,6 @@ $recur_data_month = date('m', $recur_data_time); $recur_data_day = date('d', $recur_data_time); $recur_data_date = $recur_data_year.$recur_data_month.$recur_data_day; - if (($recur_data_time > $start_date_time) && ($recur_data_time <= $end_date_time) && ($count_to != $count) && !in_array($recur_data_date, $except_dates)) { if (isset($allday_start) && $allday_start != '') { $start_time2 = $recur_data_time; Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/init.inc.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/init.inc.php 2007-09-26 17:25:37 UTC (rev 5163) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/lib/init.inc.php 2007-09-26 17:33:44 UTC (rev 5164) @@ -296,5 +296,10 @@ // echo "cal_displaynames"; // print_r($cal_displaynames); // echo "</pre><hr>"; - + $globals_local = array(); + $globals_local['daysofweek_lang'] = $daysofweek_lang; + $globals_local['daysofweekshort_lang'] = $daysofweekshort_lang; $globals_local['daysofweekreallyshort_lang'] = $daysofweekreallyshort_lang; + $globals_local['monthsofyear_lang'] = $monthsofyear_lang; + $globals_local['monthsofyearshort_lang'] = $monthsofyearshort_lang; + $globals_local['monthsofyear_lang'] = $monthsofyear_lang; ?>