Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/calendar/www/cal-item-new.tcl	8 Sep 2008 20:13:37 -0000	1.38
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	27 Oct 2014 16:41:08 -0000	1.39
@@ -7,9 +7,9 @@
     @creation-date May 29, 2002
     @cvs-id $Id$
 } {
-    {calendar_id:integer ""}
-    cal_item_id:integer,optional
-    item_type_id:integer,optional
+    {calendar_id:naturalnum ""}
+    cal_item_id:naturalnum,optional
+    item_type_id:naturalnum,optional
     {date ""}
     {julian_date ""}
     {start_time ""}
@@ -44,10 +44,10 @@
         where  cal_item_id = :cal_item_id
     } -default ""]
 } else {
-    set calendar_id [lindex [lindex $calendar_options 0] 1]
+    set calendar_id [lindex $calendar_options 0 1]
 }
 # TODO: Move into ad_form
-if { [exists_and_not_null cal_item_id] } {
+if { ([info exists cal_item_id] && $cal_item_id ne "") } {
     set page_title [_ calendar.Calendar_Edit_Item]
     set ad_form_mode display
 } else {
@@ -121,7 +121,7 @@
 
 multirow create time_format_elms name
 
-while { ![empty_string_p $format_string] } {
+while { $format_string ne "" } {
     # Snip off the next token
     regexp {([^/\-.: ]*)([/\-.: ]*)(.*)} \
           $format_string match word sep format_string
@@ -174,11 +174,11 @@
     
     set date [calendar::from_sql_datetime -sql_date $ansi_date  -format "YYY-MM-DD"]
     set repeat_p 0
-    if {[info exists start_time] && ![empty_string_p $start_time] && $start_time != 0} {
+    if {[info exists start_time] && $start_time ne "" && $start_time != 0} {
 	# Set the start time
 	set start_hour $start_time
 	set start_time "{} {} {} $start_time 0 {} {HH24:MI}"
-	set end_time "{} {} {} [expr $start_hour + 1] 0 {} {HH24:MI}"
+	set end_time "{} {} {} [expr {$start_hour + 1}] 0 {} {HH24:MI}"
 	set time_p 1 
     } else {
 	set time_p 0 
@@ -188,7 +188,7 @@
         set js "disableTime('cal_item');"
     }
     # set the calendar_id before setting item_types form element (see top of script) DAVEB
-    set calendar_id [lindex [lindex $calendar_options 0] 1]
+    set calendar_id [lindex $calendar_options 0 1]
 } -edit_request {
     calendar::item::get -cal_item_id $cal_item_id -array cal_item
 
@@ -214,7 +214,7 @@
     } else {
 	set js "enableTime('cal_item');"
     }
-    if { [empty_string_p $repeat_p] } {
+    if { $repeat_p eq "" } {
         set repeat_p 0
     } else {
         set repeat_p 1
@@ -263,7 +263,7 @@
     if {$repeat_p} {
         ad_returnredirect [export_vars -base cal-item-create-recurrence { return_url cal_item_id}]
     } else {
-        if { [string compare $return_url "./"] } {
+        if {$return_url ne "./"  } {
     		ad_returnredirect $return_url
     	} else {
 		ad_returnredirect [export_vars -base cal-item-view { cal_item_id }]	
@@ -320,7 +320,7 @@
         -edit_past_events_p $edit_past_events_p \
         -calendar_id $calendar_id
 
-    if { [string compare $return_url "./"] } {
+    if {$return_url ne "./"  } {
     	ad_returnredirect $return_url
     } else {
 	ad_returnredirect [export_vars -base cal-item-view { cal_item_id }]