Index: openacs-4/packages/calendar/www/view-week-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/calendar/www/view-week-display.tcl	10 Oct 2009 22:38:09 -0000	1.25
+++ openacs-4/packages/calendar/www/view-week-display.tcl	27 Oct 2014 16:41:09 -0000	1.26
@@ -29,13 +29,13 @@
     set show_calendar_name_p 1
 }
 
-if {[exists_and_not_null calendar_id_list]} {
+if {([info exists calendar_id_list] && $calendar_id_list ne "")} {
     set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar] 
 } else {
     set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] 
 }
 
-if {[empty_string_p $date]} {
+if {$date eq ""} {
     # Default to todays date in the users (the connection) timezone
     set server_now_time [dt_systime]
     set user_now_time [lc_time_system_to_conn $server_now_time]
@@ -52,7 +52,7 @@
 
 set first_day_of_week [lc_get firstdayofweek]
 set first_us_weekday [lindex [lc_get -locale en_US day] $first_day_of_week]
-set last_us_weekday [lindex [lc_get -locale en_US day] [expr [expr $first_day_of_week + 6] % 7]]
+set last_us_weekday [lindex [lc_get -locale en_US day] [expr {[expr {$first_day_of_week + 6}] % 7}]]
 
 db_1row select_weekday_info {}
 db_1row select_week_info {}
@@ -89,7 +89,7 @@
 set interval_limitation_clause [db_map dbqd.calendar.www.views.week_interval_limitation]
 set additional_limitations_clause ""
 set additional_select_clause [db_map dow]
-if { [exists_and_not_null cal_system_type] } {
+if { ([info exists cal_system_type] && $cal_system_type ne "") } {
     append additional_limitations_clause " and system_type = :cal_system_type "
 }
 
@@ -113,7 +113,7 @@
     scan [lc_time_fmt $ansi_start_date "%H"] %d start_hour
     scan [lc_time_fmt $ansi_end_date "%H"] %d end_hour
 
-    set ansi_this_date [dt_julian_to_ansi [expr $first_weekday_julian + $current_weekday]]
+    set ansi_this_date [dt_julian_to_ansi [expr {$first_weekday_julian + $current_weekday}]]
 
     if { $start_time eq $end_time } {
         set no_time_p t
@@ -166,7 +166,7 @@
                  + ($top_minutes*$hour_height_inside/60)]
     set bottom [expr ($bottom_hour * ($hour_height_inside+$hour_height_sep)) \
                     + ($bottom_minutes*$hour_height_inside/60)]
-    set height [expr $bottom - $top - 3]
+    set height [expr {$bottom - $top - 3}]
 
     set left $event_left_base
 
@@ -192,8 +192,8 @@
             set max_bumps $bumps
         }
     }
-    incr top [expr $bumps*5]
-    incr left [expr $bumps*$event_bump_delta]
+    incr top [expr {$bumps*5}]
+    incr left [expr {$bumps*$event_bump_delta}]
 
     set event_url [export_vars -base [site_node::get_url_from_object_id -object_id $cal_package_id]cal-item-view {return_url {cal_item_id $item_id}}]
 
@@ -236,15 +236,15 @@
     } else {
         set currval [multirow get items $i top]
         multirow set items $i top \
-            [expr $currval - ($adjusted_start_display_hour*($hour_height_inside+$hour_height_sep))]
+            [expr {$currval - ($adjusted_start_display_hour*($hour_height_inside+$hour_height_sep))}]
     }
 }
 
 # Navigation Bar
 set dates "[lc_time_fmt $first_weekday_date "%q"] - [lc_time_fmt $last_weekday_date "%q"]"
-set prev_date_ansi [ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian - 7]]]
+set prev_date_ansi [ad_urlencode [dt_julian_to_ansi [expr {$first_weekday_julian - 7}]]]
 set previous_week_url ?[export_vars {page_num {view week} {date $prev_date_ansi}}]\#calendar
-set next_date_ansi [ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian + 7]]]
+set next_date_ansi [ad_urlencode [dt_julian_to_ansi [expr {$first_weekday_julian + 7}]]]
 set next_week_url ?[export_vars {page_num {view week} {date $next_date_ansi}}]\#calendar
 
 #Calendar grid.
@@ -268,15 +268,15 @@
 
 set week_days [lc_get abday]
 set first_weekday_date_secs [clock scan "-24 hours" -base [clock scan "1 day" -base [clock scan $first_weekday_date]]]
-set next_week [clock format [expr $first_weekday_date_secs + (7*86400)] -format "%Y-%m-%d"]
-set last_week [clock format [expr $first_weekday_date_secs - (7*86400)] -format "%Y-%m-%d"]
+set next_week [clock format [expr {$first_weekday_date_secs + (7*86400)}] -format "%Y-%m-%d"]
+set last_week [clock format [expr {$first_weekday_date_secs - (7*86400)}] -format "%Y-%m-%d"]
 
 multirow create days_of_week width day_short monthday weekday_date weekday_url day_num
 
 set nav_url_base [ad_conn url]?[export_vars -url -entire_form -exclude {date view}]
 
 for {set i 0} {$i < 7} {incr i} {
-    set weekday_secs [expr $first_weekday_date_secs + ($i*86400)]
+    set weekday_secs [expr {$first_weekday_date_secs + ($i*86400)}]
     set trimmed_month \
         [string trimleft [clock format $weekday_secs -format "%m"] 0]
     set trimmed_day \
@@ -294,7 +294,7 @@
     incr week_width [set day_width_$i]
 }
 
-if { [info exists export] && [string equal $export print] } {
+if { [info exists export] && $export eq "print" } {
     set print_html [template::adp_parse [acs_root_dir]/packages/calendar/www/view-print-display [list &items items show_calendar_name_p $show_calendar_name_p]]
     ns_return 200 text/html $print_html
     ad_script_abort