- Fixed export_vars brace vs. brackets

tcl/intranet-calendar-procs.tcl

@@ -427,7 +427,7 @@ ad_proc mini_calendar_widget {
 	calendar views.  It takes a base url, which is the url to which this 
 	mini calendar will navigate.  pass_in_vars, if defined, can be
 	url variables to be set in base_url.  They should be in the format
-	returned by export_url_vars
+	returned by export_vars
 	This proc will set 2 variables in that
 	url's environment: the current view and the current date.  Valid views 
 	are list, day, week, month, and year.  
@@ -1346,10 +1346,10 @@ proc day_view {current_date logged_in_user_id group_id {compress_day_view_p "f"}
 		set item_text "$pretty_start_time - $pretty_end_day $pretty_end_time"
 	    }
 
-	    append item_text " <a href=\"?[export_url_vars action calendar_id current_date group_id]\">$title</a>"
+	    append item_text " <a href=\"?[export_vars -url {action calendar_id current_date group_id}]\">$title</a>"
 	    
 	    if {($group_id != 0) || ([string compare $user_p "t"] == 0)} {
-		set grouped_link "/new-calendar/?[export_url_vars current_view current_date group_id]"
+		set grouped_link "/new-calendar/?[export_vars -url {current_view current_date group_id}]"
 		append item_text "
 		<a href=\"$grouped_link&delete_calendar_id=$calendar_id\">
 		<img border=0 width=16 height=16 src=\"/graphics/trash.gif\" title= \"Delete\" alt=\"Delete\"></a>
@@ -1447,7 +1447,7 @@ proc day_view {current_date logged_in_user_id group_id {compress_day_view_p "f"}
 	<a href=\"?action=item-edit&calendar_id=$calendar_id&current_view=day&current_date=$current_date\">$title</a>"
 
 	if {($group_id != 0) || ([string compare $user_p "t"] == 0)} {
-	    set grouped_link "/new-calendar/?[export_url_vars current_view current_date group_id]"
+	    set grouped_link "/new-calendar/?[export_vars -url {current_view current_date group_id}]"
 	    append all_day_items "
 	    <a href=\"$grouped_link&delete_calendar_id=$calendar_id\">
 	    <img border=0 width=16 height=16 src=\"/graphics/trash.gif\" title=\"Delete\" alt=\"Delete\"></a>

tcl/intranet-timesheet2-procs.tcl

@@ -249,11 +249,11 @@ ad_proc -public im_timesheet_home_component {user_id} {
     if {[im_permission $user_id view_hours_all]} {
         append hours_html "
 	    <ul>
-	    <li><a href=/intranet-timesheet2/hours/projects?[export_url_vars user_id]>
+	    <li><a href=/intranet-timesheet2/hours/projects?[export_vars -url {user_id}]>
 		[_ intranet-timesheet2.lt_View_your_hours_on_al]</a>
-	    <li><a href=/intranet-timesheet2/hours/total?[export_url_vars]>
+	    <li><a href=/intranet-timesheet2/hours/total?[export_vars -url {}]>
 		[_ intranet-timesheet2.lt_View_time_spent_on_al]</a>
-	    <li><a href=/intranet-timesheet2/hours/projects?[export_url_vars]>
+	    <li><a href=/intranet-timesheet2/hours/projects?[export_vars -url {}]>
 		[_ intranet-timesheet2.lt_View_the_hours_logged]</a>
 	    <li><a href=\"/intranet-timesheet2/weekly_report\">
 		[_ intranet-timesheet2.lt_View_hours_logged_dur]</a>
@@ -584,7 +584,7 @@ ad_proc im_force_user_to_log_hours { conn args why } {
 
     # Pull up the screen to log hours for yesterday
     set return_url [im_url_with_query]
-    ad_returnredirect "/intranet-timesheet2/hours/new?[export_url_vars return_url julian_date]"
+    ad_returnredirect "/intranet-timesheet2/hours/new?[export_vars -url {return_url julian_date}]"
     return filter_return
 }
 

www/hours/history.tcl

@@ -156,7 +156,7 @@ set selection_block "
     </form>"
 doc_body_append $selection_block
 doc_set_property author "koljalehmann@uni.de"
-doc_set_property navbar [list [list index?[export_url_vars on_which_table] "[_ intranet-timesheet2.Your_hours]"] "[_ intranet-timesheet2.Project_History]"]
+doc_set_property navbar [list [list index?[export_vars -url {on_which_table}] "[_ intranet-timesheet2.Your_hours]"] "[_ intranet-timesheet2.Project_History]"]
 doc_set_property title "[_ intranet-timesheet2.View_History]"
 
 if {[empty_string_p [ns_conn form]] || [empty_string_p $on_what_id]} {

www/hours/index.tcl

@@ -371,11 +371,11 @@ for { set current_date $first_julian_date} { $current_date <= $last_julian_date
 
 set prev_month_template "
 <font color=white>&lt;</font> 
-<a href=\"index?[export_url_vars user_id_from_search]&date=\$ansi_date\">
+<a href=\"index?[export_vars -url {user_id_from_search}]&date=\$ansi_date\">
   <font color=white>\[_ intranet-timesheet2.$prev_month_name] </font>
 </a>"
 set next_month_template "
-<a href=\"index?[export_url_vars user_id_from_search]&date=\$ansi_date\">
+<a href=\"index?[export_vars -url {user_id_from_search}]&date=\$ansi_date\">
   <font color=white>\[_ intranet-timesheet2.$next_month_name]</font>
 </a> 
 <font color=white>&gt;</font>"

www/hours/new-2.tcl

@@ -610,6 +610,6 @@ if { ![empty_string_p $return_url] } {
     ns_log Notice "ad_returnredirect $return_url"
     ad_returnredirect $return_url
 } else {
-    ns_log Notice "ad_returnredirect index?[export_url_vars julian_date]"
-    ad_returnredirect index?[export_url_vars julian_date]
+    ns_log Notice "ad_returnredirect index?[export_vars -url {julian_date}]"
+    ad_returnredirect index?[export_vars -url {julian_date}]
 }

www/hours/new.tcl

@@ -172,7 +172,7 @@ if {$internal_note_exists_p} {
 set bind_vars [list user_id $current_user_id user_id_from_search $user_id_from_search julian_date $julian_date return_url $return_url show_week_p $show_week_p]
 set menu_links_html [im_menu_ul_list -no_uls 1 "timesheet_hours_new_admin" $bind_vars]
 
-set different_project_url "other-projects?[export_url_vars julian_date user_id_from_search]"
+set different_project_url "other-projects?[export_vars -url {julian_date user_id_from_search}]"
 
 # Log Absences
 set add_absences_p [im_permission $current_user_id add_absences]

www/hours/one-project.tcl

@@ -86,7 +86,7 @@ set sql "
 db_foreach hours_on_one_projects $sql {
     set first_day_str "[util_AnsiDatetoPrettyDate $first_day]"
     set last_day_str "[util_AnsiDatetoPrettyDate $last_day]"
-    append page_body "<li><a href='/intranet/users/view?user_id=$user_id'>$user_name</a>,<a href=full?[export_url_vars project_id user_id]&date=$last_day>[_ intranet-timesheet2.lt_total_hours_units_bet]</a>\n"
+    append page_body "<li><a href='/intranet/users/view?user_id=$user_id'>$user_name</a>,<a href=full?[export_vars -url {project_id user_id}]&date=$last_day>[_ intranet-timesheet2.lt_total_hours_units_bet]</a>\n"
 } if_no_rows {
 	append page_body "<li>[_ intranet-timesheet2.lt_No_units_have_been_lo]\n"
 }

www/hours/projects.tcl

@@ -63,7 +63,7 @@ if { [empty_string_p $user_id] } {
     "
 
     db_foreach users_who_logged_hours $sql {
-        append page_body "<li><a href=projects?[export_url_vars user_id]>$user_name</a>\n"
+        append page_body "<li><a href=projects?[export_vars -url {user_id}]>$user_name</a>\n"
     } if_no_rows {
         append page_body "<em>[_ intranet-timesheet2.No_users_found]</em>"
     }
@@ -104,7 +104,7 @@ if { [empty_string_p $user_id] } {
     db_foreach hours_on_project $sql {
 	set first_day_str "[util_AnsiDatetoPrettyDate $first_day]"
 	set last_day_str "[util_AnsiDatetoPrettyDate $last_day]"
-        append page_body "<li><a href=full?project_id=$project_id&[export_url_vars user_id]&date=$last_day&item=[ad_urlencode $project_name]>$project_name</a>, [_ intranet-timesheet2.lt_total_hours_hours_bet]</em>"
+        append page_body "<li><a href=full?project_id=$project_id&[export_vars -url {user_id}]&date=$last_day&item=[ad_urlencode $project_name]>$project_name</a>, [_ intranet-timesheet2.lt_total_hours_hours_bet]</em>"
     } if_no_rows {
         append page_body "<em>[_ intranet-timesheet2.lt_No_time_logged_on_any]</em>"
     }

www/hours/week.tcl

@@ -141,7 +141,7 @@ if {[llength $items] > 0 } {
 	set project_name [lindex $row 1]
 	set total [lindex $row 2]
 	append hour_table "<tr bgcolor=#efefef>
-	<td><a href=/intranet/projects/view?[export_url_vars project_id]>
+	<td><a href=/intranet/projects/view?[export_vars -url {project_id}]>
 	    $project_name</a></td>
 	<td align=right>[format "%0.02f" $total]</td>
 	<td align=right>[format "%0.02f%%" \

www/weekly_report.tcl

@@ -308,7 +308,7 @@ if { $start_at == "" && $project_id != 0 } {
 	return
     }
 
-    ad_returnredirect "$return_url?[export_url_vars start_at duration project_id owner_id workflow_key]"
+    ad_returnredirect "$return_url?[export_vars -url {start_at duration project_id owner_id workflow_key}]"
     return
 }
 
@@ -677,7 +677,7 @@ set navig_sql "
     	dual"
 db_1row get_navig_dates $navig_sql
 
-set switch_link_html "<a href=\"weekly_report?[export_url_vars owner_id project_id duration display]"
+set switch_link_html "<a href=\"weekly_report?[export_vars -url {owner_id project_id duration display}]"
 
 set switch_past_html "$switch_link_html&start_at=$past_date&cost_center_id=$cost_center_id&department_id=$department_id&workflow_key=$workflow_key\">&laquo;</a>"
 set switch_future_html "$switch_link_html&start_at=$future_date&cost_center_id=$cost_center_id&department_id=$department_id&workflow_key=$workflow_key\">&raquo;"