From 7eef666151fff2003b08b6c359e6106cb994a60b Mon Sep 17 00:00:00 2001
From: Carlos Pacha <carlos@colosa.com>
Date: Fri, 28 Oct 2011 17:41:03 -0400
Subject: [PATCH] BUG 0000 improving the calendar code

---
 .../engine/classes/model/CalendarHolidays.php |  1 -
 workflow/engine/controllers/admin.php         | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/workflow/engine/classes/model/CalendarHolidays.php b/workflow/engine/classes/model/CalendarHolidays.php
index a7117afb4..fdf5a4390 100755
--- a/workflow/engine/classes/model/CalendarHolidays.php
+++ b/workflow/engine/classes/model/CalendarHolidays.php
@@ -55,7 +55,6 @@ class CalendarHolidays extends BaseCalendarHolidays {
 function deleteAllCalendarHolidays($CalendarUid){
     $toDelete=$this->getCalendarHolidays($CalendarUid);
     foreach($toDelete as $key => $holidayInfo){
-      print_r($holidayInfo);
       $CalendarUid = $holidayInfo['CALENDAR_UID'];
         $CalendarHolidayName = $holidayInfo['CALENDAR_HOLIDAY_NAME'];
         $CalendarHolidayStart = $holidayInfo['CALENDAR_HOLIDAY_START'];
diff --git a/workflow/engine/controllers/admin.php b/workflow/engine/controllers/admin.php
index 858e18b2c..e960af262 100644
--- a/workflow/engine/controllers/admin.php
+++ b/workflow/engine/controllers/admin.php
@@ -57,17 +57,18 @@ class Admin extends Controller
         
       }
     $fields['BUSINESS_DAY'] = $businessDayArray;   
-    
-    $holidayArray = array();
-      for($i=0;$i<sizeof($fields['HOLIDAY']);$i++) {
-        $holidayArray[$i] =  $fields['HOLIDAY'][$i+1];
-        
-      }
+    //validating if the calendar is new, it means that we don't have the $_GET array
+    $fields['HOLIDAY']=(isset ( $_GET['id'] )&&$_GET['id']!='')?$fields['HOLIDAY']:array();
+    $holidayArray     = array();
+    for($i=0;$i<sizeof($fields['HOLIDAY']);$i++) {
+      $holidayArray[$i] =  $fields['HOLIDAY'][$i+1];
+      
+    }
 
-    $_GET ['id']= is_null($_GET ['id'])?'':$_GET ['id'];
+    $_GET ['id']= (isset ( $_GET['id'] )&&$_GET['id']!='')?$_GET['id']:'';
     $fields['HOLIDAY'] = $holidayArray;
     $fields['NEWCALENDAR'] = 'NO';
-    if(isset ( $_GET ['id'] )&&$_GET ['id']=='') {
+    if(isset ( $_GET['id'] )&&$_GET['id']=='') {
        $fields['CALENDAR_UID'] =  G::GenerateUniqueID();
        $fields['NEWCALENDAR'] = 'YES';
     }
@@ -76,4 +77,4 @@ class Admin extends Controller
     
     G::RenderPage('publish', 'extJs');
   }
-}
\ No newline at end of file
+}