Skip to content

I
intranet-core
Commit 45f87bf7 authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

- Fixed export_vars brace vs. brackets

parent f3922ad2
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 65 deletions
lib/user-admin-info.tcl
View file @ 45f87bf7
......@@ -58,15 +58,15 @@ set activate_delete_link ""
if {$admin} {
append activate_delete_link "("
if { "approved" != $member_state } {
append activate_delete_link "<a href=/acs-admin/users/member-state-change?member_state=approved&[export_url_vars user_id return_url]>[_ intranet-core.activate]</a>"
append activate_delete_link "<a href=/acs-admin/users/member-state-change?member_state=approved&[export_vars -url {user_id return_url}]>[_ intranet-core.activate]</a>"
}
if { "banned" != $member_state } {
append activate_delete_link "<a href=/intranet/users/member-state-change?member_state=banned&[export_url_vars user_id return_url]>[_ intranet-core.delete]</a>"
append activate_delete_link "<a href=/intranet/users/member-state-change?member_state=banned&[export_vars -url {user_id return_url}]>[_ intranet-core.delete]</a>"
}
append activate_delete_link ")"
}
set change_pwd_url "/intranet/users/password-update?[export_url_vars user_id return_url]"
set change_pwd_url "/intranet/users/password-update?[export_vars -url {user_id return_url}]"
set new_company_from_user_url [export_vars -base "/intranet/companies/new-company-from-user" {{user_id $user_id_from_search}}]
......
tcl/intranet-biz-object-procs.tcl
View file @ 45f87bf7
......@@ -668,7 +668,7 @@ ad_proc -public im_group_member_component {
<tr>
<td align=left>
<ul>
<li><A HREF=\"/intranet/member-add?[export_url_vars object_id also_add_to_group_id limit_to_users_in_group_id return_url]\">[_ intranet-core.Add_member]</A>
<li><A HREF=\"/intranet/member-add?[export_vars -url {object_id also_add_to_group_id limit_to_users_in_group_id return_url}]\">[_ intranet-core.Add_member]</A>
</ul>
</td>
"
......
tcl/intranet-company-procs.tcl
View file @ 45f87bf7
......@@ -943,7 +943,7 @@ ad_proc -public im_menu_companies_admin_links {
# Upload Companies
if { [im_is_user_site_wide_or_intranet_admin $current_user_id] } {
lappend result_list [list [_ intranet-core.Import_Company_CSV] "/intranet/companies/upload-companies?[export_url_vars return_url]"]
lappend result_list [list [_ intranet-core.Import_Company_CSV] "/intranet/companies/upload-companies?[export_vars -url {return_url}]"]
}
# Advanced Filtering
......
tcl/intranet-portrait-procs.tcl
View file @ 45f87bf7
......@@ -66,7 +66,7 @@ ad_proc -public im_random_employee_component { } {
# Get the current user id to not show the current user's portrait
set current_user_id [ad_conn user_id]
set subsite_url [subsite::get_element -element url]
set export_vars [export_url_vars user_id return_url]
set export_vars [export_vars -url {user_id return_url}]
# --------------------------------------------------------
......@@ -304,7 +304,7 @@ ad_proc im_portrait_component { user_id return_url read write admin} {
set current_user_id [ad_conn user_id]
set subsite_url [subsite::get_element -element url]
set export_vars [export_url_vars user_id return_url]
set export_vars [export_vars -url {user_id return_url}]
set portrait_p 0
set portrait_gif [im_portrait_html $user_id "Portrait"]
......
tcl/intranet-user-procs.tcl
View file @ 45f87bf7
......@@ -743,7 +743,7 @@ ad_proc -public im_user_registration_component { current_user_id { max_rows 8} }
# Allow to approve non-approved members
set approve_link ""
if {"approved" != $member_state} { set approve_link "<a href=\"/acs-admin/users/member-state-change?member_state=approved&amp;[export_url_vars user_id return_url]\">[_ intranet-core.activate]</a>"
if {"approved" != $member_state} { set approve_link "<a href=\"/acs-admin/users/member-state-change?member_state=approved&amp;[export_vars -url {user_id return_url}]\">[_ intranet-core.activate]</a>"
}
append rows_html "
......@@ -1149,9 +1149,9 @@ ad_proc im_print_employee {person rowspan} "print function for org chart" {
# Removed job title display
# if { $rowspan>=2 } {
# return "<a href=\"/intranet/users/view?[export_url_vars user_id]\">$employee_name</a><br><i>$job_title</i>\n"
# return "<a href=\"/intranet/users/view?[export_vars -url {user_id}]\">$employee_name</a><br><i>$job_title</i>\n"
# } else {
return "<a href=\"/intranet/users/view?[export_url_vars user_id]\">$employee_name</a><br>\n"
return "<a href=\"/intranet/users/view?[export_vars -url {user_id}]\">$employee_name</a><br>\n"
# }
} else {
return "<i>[_ intranet-core.Position_Vacant]</i>"
......@@ -1800,7 +1800,7 @@ ad_proc -public im_menu_users_admin_links {
if {[im_permission $current_user_id "add_users"]} {
lappend result_list [list [_ intranet-core.Add_a_new_User] "/intranet/users/new"]
lappend result_list [list [_ intranet-core.Advanced_Filtering] "/intranet/users/index?filter_advanced_p=1"]
lappend result_list [list [_ intranet-core.Import_User_CSV] "/intranet/users/upload-contacts?[export_url_vars return_url]"]
lappend result_list [list [_ intranet-core.Import_User_CSV] "/intranet/users/upload-contacts?[export_vars -url {return_url}]"]
}
# Append user-defined menus
......
www/admin/backup/upload-pgdump-2.tcl
View file @ 45f87bf7
......@@ -41,7 +41,7 @@ if ![regexp {([^//\\]+)$} $upload_file match company_filename] {
if {[regexp {\.\.} $company_filename]} {
set error "Filename contains forbidden characters"
ad_returnredirect "/error.tcl?[export_url_vars error]"
ad_returnredirect "/error.tcl?[export_vars -url {error}]"
}
if {![file readable $tmp_filename]} {
......
www/admin/categories/category-add-2.tcl
View file @ 45f87bf7
......@@ -135,4 +135,4 @@ im_permission_flush
db_release_unused_handles
ad_returnredirect "one?[export_url_vars category_id]"
ad_returnredirect "one?[export_vars -url {category_id}]"
www/admin/categories/category-add.tcl
View file @ 45f87bf7
......@@ -146,4 +146,4 @@ im_permission_flush
db_release_unused_handles
set select_category_type $category_type
ad_returnredirect "index.tcl?[export_url_vars select_category_type]"
ad_returnredirect "index.tcl?[export_vars -url {select_category_type}]"
www/admin/categories/category-nuke-2.tcl
View file @ 45f87bf7
......@@ -55,4 +55,4 @@ im_permission_flush
# Redirect
set select_category_type $category_type
ad_returnredirect "index.tcl?[export_url_vars select_category_type]"
ad_returnredirect "index.tcl?[export_vars -url {select_category_type}]"
www/admin/categories/category-update.tcl
View file @ 45f87bf7
......@@ -172,4 +172,4 @@ im_permission_flush
db_release_unused_handles
set select_category_type $category_type
ad_returnredirect "index.tcl?[export_url_vars select_category_type]"
ad_returnredirect "index.tcl?[export_vars -url {select_category_type}]"
www/admin/categories/index.tcl
View file @ 45f87bf7
......@@ -160,7 +160,7 @@ if {$show_add_new_category_p} {
<tr $bgcolor([expr $ctr % 2])>
<td>$category_id</td>
<td><a href='$toggle_url'>$enabled_p</a></td>
<td><a href=\"one.tcl?[export_url_vars category_id]\">$category</A></td>
<td><a href=\"one.tcl?[export_vars -url {category_id}]\">$category</A></td>
<td>$sort_order</td>
<td><A href=\"/intranet/admin/categories/one?category_id=$parent_id\">$parent</A></td>
<td>$aux_int1 $aux_int1_cat</td>
......
www/admin/categories/one-type.tcl
View file @ 45f87bf7
......@@ -58,10 +58,10 @@ db_foreach all_categories_of_type "
group by c.category, c.category_id
order by n_interested_users desc" {
append category_list_html "<li><a href=\"one?[export_url_vars category_id]\">$category</a>\n"
append category_list_html "<li><a href=\"one?[export_vars -url {category_id}]\">$category</a>\n"
if {$n_interested_users > 0} {
append category_list_html " (number of interested users: <a href=\"/admin/users/action-choose?[export_url_vars category_id]\">$n_interested_users</a>)\n"
append category_list_html " (number of interested users: <a href=\"/admin/users/action-choose?[export_vars -url {category_id}]\">$n_interested_users</a>)\n"
}
}
......@@ -81,7 +81,7 @@ doc_return 200 text/html "[ad_admin_header $page_title]
$category_list_html
<p>
<li><a href=\"category-add?[export_url_vars category_type]\">Add a category of this type</a>
<li><a href=\"category-add?[export_vars -url {category_type}]\">Add a category of this type</a>
</ul>
[ad_admin_footer]
......
www/admin/components/index.tcl
View file @ 45f87bf7
......@@ -201,11 +201,11 @@ db_foreach all_component_of_type $component_select_sql {
set action "add_readable"
set letter "r"
if {$read_p == "t"} {
set read "<A href=$toggle_url?object_id=$plugin_id&action=remove_readable&[export_url_vars horiz_group_id return_url]><b>R</b></A>\n"
set read "<A href=$toggle_url?object_id=$plugin_id&action=remove_readable&[export_vars -url {horiz_group_id return_url}]><b>R</b></A>\n"
set action "remove_readable"
set letter "<b>R</b>"
}
set read "<A href=$toggle_url?[export_url_vars horiz_group_id object_id action return_url]>$letter</A>\n"
set read "<A href=$toggle_url?[export_vars -url {horiz_group_id object_id action return_url}]>$letter</A>\n"
append table "
<td align=center>
......
www/admin/host.tcl
View file @ 45f87bf7
......@@ -39,7 +39,7 @@ set users_from_ip_sql "
"
set items ""
db_foreach users_from_ip $users_from_ip_sql {
append items "<li><a href=\"/intranet/users/view?[export_url_vars user_id]\">$user_name</a> ($email)\n"
append items "<li><a href=\"/intranet/users/view?[export_vars -url {user_id}]\">$user_name</a> ($email)\n"
}
if ![empty_string_p $items] {
append page_body "
......
www/admin/menus/index.tcl
View file @ 45f87bf7
......@@ -260,11 +260,11 @@ db_foreach menus $main_sql {
set action "add_readable"
set letter "r"
if {$read_p == "t"} {
set read "<A href=$toggle_url?object_id=$menu_id&action=remove_readable&[export_url_vars horiz_group_id return_url]><b>R</b></A>\n"
set read "<A href=$toggle_url?object_id=$menu_id&action=remove_readable&[export_vars -url {horiz_group_id return_url}]><b>R</b></A>\n"
set action "remove_readable"
set letter "<b>R</b>"
}
set read "<A href=$toggle_url?[export_url_vars horiz_group_id object_id action return_url]>$letter</A>\n"
set read "<A href=$toggle_url?[export_vars -url {horiz_group_id object_id action return_url}]>$letter</A>\n"
append table "
<td align=center>
......@@ -285,7 +285,7 @@ db_foreach menus $main_sql {
append table "
<tr>
<td colspan=[expr $num_profiles + 6] align=right>
<A href=new?[export_url_vars return_url]>New Menu</a>
<A href=new?[export_vars -url {return_url}]>New Menu</a>
</td>
<td>
<input type=submit value='Del'>
......@@ -327,7 +327,7 @@ set left_navbar_html "
<tr>
<td>
<ul>
<li><A href=new?[export_url_vars return_url]>New Menu</a></li>
<li><A href=new?[export_vars -url {return_url}]>New Menu</a></li>
</ul>
</td>
</tr>
......
www/admin/parameters/index.tcl
View file @ 45f87bf7
......@@ -82,7 +82,7 @@ db_foreach packages $sql {
<tr class=rowplain colspan=99><td>&nbsp;</td></tr>
<tr class=roweven>
<td colspan=2>
<b><A HREF=/shared/parameters?[export_url_vars package_id return_url]>$package_key</A></b></td>
<b><A HREF=/shared/parameters?[export_vars -url {package_id return_url}]>$package_key</A></b></td>
<td><b>$instance_name</b></td>
</tr>
"
......
www/companies/accounting-contact-2.tcl
View file @ 45f87bf7
......@@ -33,4 +33,4 @@ db_dml companies_set_accounting_contact \
db_release_unused_handles
ad_returnredirect view?[export_url_vars company_id]
\ No newline at end of file
ad_returnredirect view?[export_vars -url {company_id}]
\ No newline at end of file
www/companies/accounting-contact-users-2.tcl
View file @ 45f87bf7
......@@ -39,7 +39,7 @@ db_dml companies_set_accounting_contact \
db_release_unused_handles
ad_returnredirect view?[export_url_vars group_id]
ad_returnredirect view?[export_vars -url {group_id}]
......
www/companies/accounting-contact-users.tcl
View file @ 45f87bf7
......@@ -41,7 +41,7 @@ set company_name [db_string company_name \
db_release_unused_handles
set page_title "[_ intranet-core.lt_Select_accounting_con]"
set context_bar [im_context_bar [list ./ "[_ intranet-core.Companies]"] [list view?[export_url_vars group_id] "[_ intranet-core.One_company]"] "[_ intranet-core.Select_contact]"]
set context_bar [im_context_bar [list ./ "[_ intranet-core.Companies]"] [list view?[export_vars -url { group_id}] "[_ intranet-core.One_company]"] "[_ intranet-core.Select_contact]"]
set page_body "
......
www/companies/accounting-contact.tcl
View file @ 45f87bf7
......@@ -62,7 +62,7 @@ if {$company_id != [im_company_internal]} {
set contact_info ""
db_foreach address_book_info $sql {
append contact_info "<li>$name, $email </a>(<a href=accounting-contact-2?[export_url_vars company_id user_id]>[_ intranet-core.lt_make_accounting_conta]</a>)"
append contact_info "<li>$name, $email </a>(<a href=accounting-contact-2?[export_vars -url { company_id user_id}]>[_ intranet-core.lt_make_accounting_conta]</a>)"
}
db_release_unused_handles
......@@ -89,10 +89,10 @@ if { [empty_string_p $contact_info] } {
return
}
set return_url "[im_url_stub]/companies/view?[export_url_vars company_id]"
set return_url "[im_url_stub]/companies/view?[export_vars -url { company_id}]"
set page_title "[_ intranet-core.lt_Select_accounting_con]"
set context_bar [im_context_bar [list ./ "[_ intranet-core.Companies]"] [list view?[export_url_vars company_id] "[_ intranet-core.One_company]"] "[_ intranet-core.Select_contact]"]
set context_bar [im_context_bar [list ./ "[_ intranet-core.Companies]"] [list view?[export_vars -url { company_id}] "[_ intranet-core.One_company]"] "[_ intranet-core.Select_contact]"]
set page_body "
<ul>
......
www/companies/index.tcl
View file @ 45f87bf7
......@@ -358,8 +358,8 @@ if {[im_permission $current_user_id "add_companies"]} {
if {$user_is_admin_p} {
append admin_html "
<li><a href=/intranet/companies/upload-companies?[export_url_vars return_url]>[_ intranet-core.Import_Company_CSV]</a>
<!-- <li><a href=/intranet/companies/upload-contacts?[export_url_vars return_url]>[_ intranet-core.lt_Import_Company_Contac]</a> -->
<li><a href=/intranet/companies/upload-companies?[export_vars -url { return_url}]>[_ intranet-core.Import_Company_CSV]</a>
<!-- <li><a href=/intranet/companies/upload-contacts?[export_vars -url { return_url}]>[_ intranet-core.lt_Import_Company_Contac]</a> -->
"}
append admin_html "
......
www/companies/new.tcl
View file @ 45f87bf7
......@@ -47,7 +47,7 @@ set action_url "/intranet/companies/new-2"
set focus "menu.var_name"
set page_title "[_ intranet-core.Edit_Company]"
set context_bar [im_context_bar [list index "[_ intranet-core.Companies]"] [list "view?[export_url_vars company_id]" "[_ intranet-core.One_company]"] $page_title]
set context_bar [im_context_bar [list index "[_ intranet-core.Companies]"] [list "view?[export_vars -url {company_id}]" "[_ intranet-core.One_company]"] $page_title]
# Should we bother about State and ZIP fields?
set some_american_readers_p [parameter::get_from_package_key -package_key acs-subsite -parameter SomeAmericanReadersP -default 0]
......
www/companies/primary-contact-2.tcl
View file @ 45f87bf7
......@@ -37,4 +37,4 @@ where
db_release_unused_handles
ad_returnredirect view?[export_url_vars company_id]
\ No newline at end of file
ad_returnredirect view?[export_vars -url {company_id}]
\ No newline at end of file
www/companies/primary-contact-users-2.tcl
View file @ 45f87bf7
......@@ -39,7 +39,7 @@ db_dml companies_set_primary_contact \
db_release_unused_handles
ad_returnredirect view?[export_url_vars group_id]
ad_returnredirect view?[export_vars -url {group_id}]
......
www/companies/primary-contact-users.tcl
View file @ 45f87bf7
......@@ -40,7 +40,7 @@ set company_name [db_string company_name \
db_release_unused_handles
set page_title "Select primary contact for $company_name"
set context_bar [im_context_bar [list ./ "[_ intranet-core.Companies]"] [list view?[export_url_vars group_id] "[_ intranet-core.One_company]"] "[_ intranet-core.Select_contact]"]
set context_bar [im_context_bar [list ./ "[_ intranet-core.Companies]"] [list view?[export_vars -url {group_id}] "[_ intranet-core.One_company]"] "[_ intranet-core.Select_contact]"]
set page_body "
......
www/companies/primary-contact.tcl
View file @ 45f87bf7
......@@ -67,7 +67,7 @@ if {$company_id != [im_company_internal]} {
set contact_info ""
db_foreach address_book_info $sql {
append contact_info "<li>$name, $email </a>(<a href=primary-contact-2?[export_url_vars company_id user_id]>[_ intranet-core.make_primary_contact]</a>)"
append contact_info "<li>$name, $email </a>(<a href=primary-contact-2?[export_vars -url {company_id user_id}]>[_ intranet-core.make_primary_contact]</a>)"
}
db_release_unused_handles
......@@ -75,7 +75,7 @@ db_release_unused_handles
if { [empty_string_p $contact_info] } {
set profile "Customers"
set new_client_contact_link "<A HREF=/intranet/users/new?[export_url_vars return_url profile]>[_ intranet-core.new_client_contact]</A>"
set new_client_contact_link "<A HREF=/intranet/users/new?[export_vars -url { return_url profile}]>[_ intranet-core.new_client_contact]</A>"
set company_employee_link "<A HREF=\"/intranet/member-add?object_id=$company_id&also_add_to_group_id=461&return_url=/intranet/companies/view?company%5fid=$company_id\">[_ intranet-core.company_employee]</A>"
set page_body "
<H3>[_ intranet-core.lt_No_Company_Employees_]</H3>
......@@ -96,10 +96,10 @@ if { [empty_string_p $contact_info] } {
return
}
set return_url "[im_url_stub]/companies/view?[export_url_vars company_id]"
set return_url "[im_url_stub]/companies/view?[export_vars -url {company_id}]"
set page_title "[_ intranet-core.lt_Select_primary_contac]"
set context_bar [im_context_bar [list ./ "[_ intranet-core.Companies]"] [list view?[export_url_vars company_id] "[_ intranet-core.One_company]"] "[_ intranet-core.Select_contact]"]
set context_bar [im_context_bar [list ./ "[_ intranet-core.Companies]"] [list view?[export_vars -url {company_id}] "[_ intranet-core.One_company]"] "[_ intranet-core.Select_contact]"]
set page_body "
<ul>
......
www/companies/upload-companies-2.tcl
View file @ 45f87bf7
......@@ -72,7 +72,7 @@ if ![regexp {([^//\\]+)$} $upload_file match company_filename] {
if {[regexp {\.\.} $company_filename]} {
set error "Filename contains forbidden characters"
ad_returnredirect "/error.tcl?[export_url_vars error]"
ad_returnredirect "/error.tcl?[export_vars -url {error}]"
}
if {![file readable $tmp_filename]} {
......
www/companies/view.tcl
View file @ 45f87bf7
......@@ -176,7 +176,7 @@ if {$see_details} {
if { [empty_string_p $primary_contact_id] } {
if { $admin } {
set primary_contact_text "<a href=primary-contact?[export_url_vars company_id limit_to_users_in_group_id]>Add primary contact</a>\n"
set primary_contact_text "<a href=primary-contact?[export_vars -url { company_id limit_to_users_in_group_id}]>Add primary contact</a>\n"
} else {
set primary_contact_text "<i>[_ intranet-core.none]</i>"
}
......@@ -187,7 +187,7 @@ if {$see_details} {
if { $admin } {
append primary_contact_text "
(<a href=primary-contact?[export_url_vars company_id limit_to_users_in_group_id]>[im_gif -translate_p 1 turn "Change the primary contact"]</a> | <a href=primary-contact-delete?[export_url_vars company_id return_url]>[im_gif -translate_p 1 delete "Delete the primary contact"]</a>)\n"
(<a href=primary-contact?[export_vars -url { company_id limit_to_users_in_group_id}]>[im_gif -translate_p 1 turn "Change the primary contact"]</a> | <a href=primary-contact-delete?[export_vars -url { company_id return_url}]>[im_gif -translate_p 1 delete "Delete the primary contact"]</a>)\n"
}
}
......@@ -203,7 +203,7 @@ if {$see_details} {
if { [empty_string_p $accounting_contact_id] } {
if { $admin } {
set accounting_contact_text "<a href=accounting-contact?[export_url_vars company_id limit_to_users_in_group_id]>[_ intranet-core.lt_Add_accounting_contac]</a>\n"
set accounting_contact_text "<a href=accounting-contact?[export_vars -url { company_id limit_to_users_in_group_id}]>[_ intranet-core.lt_Add_accounting_contac]</a>\n"
} else {
set accounting_contact_text "<i>[_ intranet-core.none]</i>"
}
......@@ -212,7 +212,7 @@ if {$see_details} {
append accounting_contact_text "<a href=/intranet/users/view?user_id=$accounting_contact_id>$accounting_contact_name</a>"
if { $admin } {
append accounting_contact_text " (<a href=accounting-contact?[export_url_vars company_id limit_to_users_in_group_id]>[im_gif -translate_p 1 turn "Change the accounting contact"]</a> | <a href=accounting-contact-delete?[export_url_vars company_id return_url]>[im_gif -translate_p 1 delete "Delete the accounting contact"]</a>)\n"
append accounting_contact_text " (<a href=accounting-contact?[export_vars -url { company_id limit_to_users_in_group_id}]>[im_gif -translate_p 1 turn "Change the accounting contact"]</a> | <a href=accounting-contact-delete?[export_vars -url { company_id return_url}]>[im_gif -translate_p 1 delete "Delete the accounting contact"]</a>)\n"
}
}
......
www/offices/link-delete.tcl
View file @ 45f87bf7
......@@ -31,4 +31,4 @@ db_dml intranet_offices_delete_office_link "delete from im_office_links where li
db_release_unused_handles
ad_returnredirect view?[export_url_vars group_id]
ad_returnredirect "view?[export_vars -url {group_id}]"
www/offices/new.tcl
View file @ 45f87bf7
......@@ -48,7 +48,7 @@ ad_page_contract {
set user_id [ad_maybe_redirect_for_registration]
set user_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
set page_title [_ intranet-core.Office]
set context_bar [im_context_bar [list index "[_ intranet-core.Offices]"] [list "view?[export_url_vars office_id]" "[_ intranet-core.One_office]"] $page_title]
set context_bar [im_context_bar [list index "[_ intranet-core.Offices]"] [list "view?[export_vars -url {office_id}]" "[_ intranet-core.One_office]"] $page_title]
# -- ------------------------------------------------
# -- General Settings
......
www/projects/new.tcl
View file @ 45f87bf7
......@@ -467,7 +467,7 @@ if {[form is_request $form_id]} {
}
set page_title "[_ intranet-core.Edit_project]"
set context_bar [im_context_bar [list /intranet/projects/ "[_ intranet-core.Projects]"] [list "/intranet/projects/view?[export_url_vars project_id]" "One project"] $page_title]
set context_bar [im_context_bar [list /intranet/projects/ "[_ intranet-core.Projects]"] [list "/intranet/projects/view?[export_vars -url {project_id}]" "One project"] $page_title]
if { [empty_string_p $start_date] } { set start_date $todays_date }
if { [empty_string_p $end_date] } { set end_date $todays_date }
......
www/projects/nuke.tcl
View file @ 45f87bf7
......@@ -40,7 +40,7 @@ set context_bar [im_context_bar [list /intranet/projects/ "[_ intranet-core.Proj
set object_name $project_name
set object_type "project"
set delete_user_link "<a href=\"/acs-admin/users/member-state-change?member_state=banned&[export_url_vars project_id return_url]\">[_ intranet-core.lt_delete_this_user_inst]</a>"
set delete_user_link "<a href=\"/acs-admin/users/member-state-change?member_state=banned&[export_vars -url {project_id return_url}]\">[_ intranet-core.lt_delete_this_user_inst]</a>"
set project_url_org [export_vars -base "/intranet/projects/view" {project_id}]
......
www/projects/upload-projects-2.tcl
View file @ 45f87bf7
......@@ -58,7 +58,7 @@ if ![regexp {([^//\\]+)$} $upload_file match project_filename] {
if {[regexp {\.\.} $project_filename]} {
set error "Filename contains forbidden characters"
ad_returnredirect "/error.tcl?[export_url_vars error]"
ad_returnredirect "/error.tcl?[export_vars -url {error}]"
}
if {![file readable $tmp_filename]} {
......
www/users/contact-edit-2.tcl
View file @ 45f87bf7
......@@ -52,7 +52,7 @@ set bind_vars [lindex $sql_statement_and_bind_vars 1]
db_dml $statement_name $sql_statement -bind $bind_vars
db_release_unused_handles
ad_returnredirect "/intranet/users/view.tcl?[export_url_vars user_id]"
ad_returnredirect "/intranet/users/view.tcl?[export_vars -url {user_id}]"
......
www/users/index.tcl
View file @ 45f87bf7
......@@ -246,7 +246,7 @@ if {[im_permission $user_id "add_users"]} {
append admin_html_links "
<li><a href=/intranet/users/new>[_ intranet-core.Add_a_new_User]</a></li>
<li><a href=\"/intranet/users/index?filter_advanced_p=1\">[_ intranet-core.Advanced_Filtering]</a></li>
<li><a href=/intranet-csv-import/index?[export_url_vars return_url object_type]>[_ intranet-core.Import_User_CSV]</a></li>
<li><a href=/intranet-csv-import/index?[export_vars -url {return_url object_type}]>[_ intranet-core.Import_User_CSV]</a></li>
<!--<li><a href=/intranet/users/upload-users>[lang::message::lookup "" intranet-core.BulkUpdateUsers "CSV Bulk Update Users"]</a></li>-->
"
}
......
www/users/member-state-change.tcl
View file @ 45f87bf7
......@@ -65,7 +65,7 @@ switch $email_verified_p {
}
"f" {
set action "Require Email from $name"
# set email_message "Your email in [ad_system_name] needs approval. please go to [ad_url]/register/email-confirm?[export_url_vars row_id]"
# set email_message "Your email in [ad_system_name] needs approval. please go to [ad_url]/register/email-confirm?[export_vars -url { row_id}]"
set email_message "Your email in [ad_system_name] needs approval."
}
......@@ -100,13 +100,13 @@ set subject "$action"
set message $email_message
if [empty_string_p $return_url] {
set return_url "/acs-admin/users/one?[export_url_vars user_id]"
set return_url "/acs-admin/users/one?[export_vars -url { user_id}]"
} else {
ad_returnredirect $return_url
ad_script_abort
}
set context [list [list "./" "Users"] "$action"]
set export_vars [export_url_vars email email_from subject message return_url]
set export_vars [export_vars -url { email email_from subject message return_url}]
ad_return_template
www/users/nuke.tcl
View file @ 45f87bf7
......@@ -59,4 +59,4 @@ set object_type "user"
# set delete_user_link "<a href=\"delete?user_id=$user_id\">[_ intranet-core.lt_delete_this_user_inst]</a>"
set delete_user_link "<a href=\"/acs-admin/users/member-state-change?member_state=banned&[export_url_vars user_id return_url]\">[_ intranet-core.lt_delete_this_user_inst]</a>"
set delete_user_link "<a href=\"/acs-admin/users/member-state-change?member_state=banned&[export_vars -url { user_id return_url}]\">[_ intranet-core.lt_delete_this_user_inst]</a>"
www/users/password-update-2.tcl
View file @ 45f87bf7
......@@ -66,7 +66,7 @@ ad_change_password $user_id $password_1
set password $password_1
set offer_to_email_new_password_link ""
if {[im_parameter EmailChangedPasswordP "" 1]} {
set offer_to_email_new_password_link "<a href=\"email-changed-password?[export_url_vars user_id password]\">[_ intranet-core.lt_Send_user_new_passwor]</a>"
set offer_to_email_new_password_link "<a href=\"email-changed-password?[export_vars -url { user_id password}]\">[_ intranet-core.lt_Send_user_new_passwor]</a>"
}
set page_body "
......@@ -75,7 +75,7 @@ set page_body "
[_ intranet-core.in] [ad_site_home_link]
<hr>
[_ intranet-core.lt_You_must_inform_the_u]
[_ intranet-core.You_can_return_to] <a href=\"one?[export_url_vars user_id]\">$name</a>
[_ intranet-core.You_can_return_to] <a href=\"one?[export_vars -url { user_id}]\">$name</a>
<p> $offer_to_email_new_password_link
[ad_admin_footer]
"
......
www/users/upload-contacts-2.tcl
View file @ 45f87bf7
......@@ -756,7 +756,7 @@ foreach csv_line_fields $values_list_of_lists {
if {$profile_id == [im_profile_freelancers]} { set company_type_id [im_company_type_freelance]}
set company_status_id [im_company_status_potential]
ns_write "<li>'$first_name $last_name': Unable to find the users company '$company'. Please <A href=\"/intranet/companies/new-company-from-user?[export_url_vars user_id company_type_id company_status_id company_name]\">click here to create it</a>.\n"
ns_write "<li>'$first_name $last_name': Unable to find the users company '$company'. Please <A href=\"/intranet/companies/new-company-from-user?[export_vars -url { user_id company_type_id company_status_id company_name}]\">click here to create it</a>.\n"
}
}
......
www/users/user-add-3.tcl
View file @ 45f87bf7
......@@ -49,7 +49,7 @@ set admin_email [db_string unused "select email from parties where party_id = :a
set page_title [_ intranet-core.lt_New_user_notifiedset_]
set context [list [list "./" [_ intranet-core.Users]] $page_title]
set export_vars [export_url_vars user_id]
set export_vars [export_vars -url { user_id}]
if {$send_email_p} {
......
www/users/view.tcl
View file @ 45f87bf7
......@@ -209,7 +209,7 @@ if { [empty_string_p $companies_html] } {
if {$ctr > $max_companies} {
set status_id 0
set type_id 0
append companies_html "<li><A HREF='/intranet/companies/index?[export_url_vars user_id_from_search status_id type_id]'>[_ intranet-core.more_companies]</A>\n"
append companies_html "<li><A HREF='/intranet/companies/index?[export_vars -url { user_id_from_search status_id type_id}]'>[_ intranet-core.more_companies]</A>\n"
}
if {[im_permission $current_user_id view_companies_all]} {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment