Index: openacs-4/packages/acs-tcl/lib/page-error.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/page-error.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/lib/page-error.tcl 27 Oct 2014 16:40:04 -0000 1.8
+++ openacs-4/packages/acs-tcl/lib/page-error.tcl 22 May 2015 08:54:42 -0000 1.9
@@ -15,8 +15,6 @@
set error_info $stacktrace
set comment_action 0
-
-
set return_url $prev_url
if {$user_id eq 0} {
@@ -37,12 +35,12 @@
--------------------------------------------------------
[_ acs-tcl.Error_Report]
--------------------------------------------------------
-[_ acs-tcl.Previus] $return_url
-[_ acs-tcl.Page] $error_url
-[_ acs-tcl.File] $error_file
-[_ acs-tcl.User_Name] $user_name
-[_ acs-tcl.lt_User_Id_of_the_user_t] $user_id
-IP: [ns_conn peeraddr]
+[_ acs-tcl.Previus] [ad_quotehtml $return_url]
+[_ acs-tcl.Page] [ad_quotehtml $error_url]
+[_ acs-tcl.File] [ad_quotehtml $error_file]
+[_ acs-tcl.User_Name] [ad_quotehtml $user_name]
+[_ acs-tcl.lt_User_Id_of_the_user_t] [ad_quotehtml $user_id]
+IP: [ad_quotehtml [ns_conn peeraddr]]
[_ acs-tcl.Browser_of_the_user] [ad_quotehtml [ns_set get [ns_conn headers] User-Agent]]
-----------------------------
@@ -56,7 +54,10 @@
[_ acs-tcl.lt_NB_This_error_was_sub]"
if { $bug_number eq "" && $send_email_p} {
- acs_mail_lite::send -send_immediately -to_addr $send_to -from_addr $public_userm_email -subject $subject -body $error_desc_email
+ acs_mail_lite::send -send_immediately \
+ -to_addr $send_to -from_addr $public_userm_email \
+ -subject $subject \
+ -body $error_desc_email
}
set bt_instance [parameter::get -package_id [ad_acs_kernel_id] \
-parameter BugTrackerInstance -default ""]
@@ -256,29 +257,20 @@
array set row [list]
-# if { $enabled_action_id ne "" } {
-# foreach field [workflow::action::get_element -action_id $action_id -element edit_fields] {
-# set row($field) [element get_value bug_edit $field]
-# }
-# foreach {category_id category_name} [bug_tracker::category_types] {
-# set row($category_id) [element get_value bug_edit $category_id]
-# }
-# }
-
set description [element get_value bug_edit description]
set error_desc_html "
--------------------------------------------------------
[_ acs-tcl.Error_Report]
--------------------------------------------------------
-
[_ acs-tcl.Previus] $prev_url
-
[_ acs-tcl.Page] $error_url
-
[_ acs-tcl.File] $error_file
-
[_ acs-tcl.User_Name] $user_name
-
[_ acs-tcl.lt_User_Id_of_the_user_t] $user_id
+
[_ acs-tcl.Previus] [ad_quotehtml $prev_url]
+
[_ acs-tcl.Page] [ad_quotehtml $error_url]
+
[_ acs-tcl.File] [ad_quotehtml $error_file]
+
[_ acs-tcl.User_Name] [ad_quotehtml $user_name]
+
[_ acs-tcl.lt_User_Id_of_the_user_t] [ad_quotehtml $user_id]
[_ acs-tcl.Browser_of_the_user] [ad_quotehtml [ns_set get [ns_conn headers] User-Agent]]
[_ acs-tcl.User_comments]
-[template::util::richtext::get_property contents $description]
+[ad_quotehtml [template::util::richtext::get_property contents $description]]
"
foreach available_enabled_action_id [workflow::case::get_available_enabled_action_ids -case_id $case_id] {
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.115 -r1.116
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 15 May 2015 14:30:02 -0000 1.115
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 22 May 2015 08:54:42 -0000 1.116
@@ -828,10 +828,8 @@
ns_return 500 text/html $rendered_page
set headers [ns_conn headers]
- ns_log Error "[ns_conn method] http://[ns_set iget $headers host][ns_conn url]?[ns_conn query]
-referred by \"[ns_set iget $headers referer]\"
-$error_message"
-
+ ns_log Error "[ns_conn method] http://[ns_set iget $headers host][ns_conn url]?[ns_conn query]\
+ referred by '$prev_url'\n$error_message"
}
ad_proc -private rp_path_prefixes {path} {