- modified the system incidents

www/new-system-incident.tcl

@@ -19,7 +19,8 @@ ad_page_contract {
 
     @author frank.bergmann@project-open.com
 } {
-    { error_url:trim}
+    { error_url:trim ""}
+    { error_location:trim ""}
     { error_info:trim,html ""}
     { error_first_names:trim ""}
     { error_last_name:trim ""}
@@ -53,14 +54,72 @@ set system_owner_id [db_string user_id "select party_id from parties where lower
 # Get more debug information
 # -----------------------------------------------------------------
 
+set more_info ""
+
+# Extract variables from form and HTTP header
 set form_vars [ns_conn form]
+set header_vars [ns_conn headers]
+set url [ns_conn url]
+
+# Convert the form vars into a list
+
+append more_info "Form Vars:\n"
 if {"" != $form_vars} {
     foreach var [ad_ns_set_keys $form_vars] {
 	set value [ns_set get $form_vars $var]
 	ns_log Notice "new-system-incident: $var=$value"
+	append more_info "$var: $value\n"
     }
 }
 
+# UserId probably 0, except for returning users
+set user_id [ad_get_user_id]
+
+set client_ip [ns_set get $header_vars "Client-ip"]
+set referer_url [ns_set get $header_vars "Referer"]
+set peer_ip [ns_conn peeraddr]
+
+set ip $peer_ip
+if {"" != $client_ip} { set ip $client_ip }
+
+# Extract cookies
+set cookie_string [ns_set get $header_vars "Cookie"]
+set cookies [split $cookie_string ";"]
+set cookie_vars [ns_set create]
+foreach cookie $cookies {
+    set cookie [string trim $cookie]
+    set cookie_parts [split $cookie "="]
+    set cookie_name [lindex $cookie_parts 0]
+    set cookie_value [ns_urldecode [lindex $cookie_parts 1]]
+        ns_set put $cookie_vars $cookie_name $cookie_value
+}
+
+ns_log Notice "var:     url     =       $url\n"
+ns_log Notice "var:     user_id =       $user_id\n"
+ns_log Notice "var:     client_ip       =       $client_ip\n"
+ns_log Notice "var:     peer_ip =       $peer_ip\n"
+ns_log Notice "var:     ip      =       $ip\n"
+
+
+append more_info "Header Vars:\n"
+foreach var [ad_ns_set_keys $header_vars] {
+    set value [ns_set get $header_vars $var]
+    append more_info ns_log Notice "$var: $value\n"
+}
+
+#foreach var [ad_ns_set_keys $cookie_vars] {
+#    set value [ns_set get $cookie_vars $var]
+#    ns_log Notice "cookie:      $var    =       $value\n"
+#}
+
+# Are we behind a firewall or behind a reverse proxy?
+# set x_forwarded_for [ns_set get $header_vars "X-Forwarded-For"]
+# if {"" != $x_forwarded_for} {
+#         set ip $x_forwarded_for
+# }
+
+
+
 # -----------------------------------------------------------------
 # Lookup user_id or create entry
 # -----------------------------------------------------------------
@@ -133,6 +192,7 @@ set scope "group"
 set subject $error_url
 set message "
 Error URL: $error_url
+Error Location: $error_location
 System URL: $system_url
 User Name: $error_first_names $error_last_name
 User Email: $error_user_email

www/page-error.adp

@@ -10,6 +10,7 @@
 
 
 <% set error_url [im_url_with_query] %>
+<% set error_location "[ns_info address] on [ns_info platform]" %>
 <% set report_url [ad_parameter -package_id [im_package_core_id] "ErrorReportURL" "" ""] %>
 <% set system_url [ad_parameter -package_id [ad_acs_kernel_id] SystemURL "" ""] %>
 <% db_1row user_info "select * from cc_users where user_id=[ad_get_user_id]" %>
@@ -19,6 +20,7 @@
 
 <form action="@report_url;noquote@" method=POST>
 <input type=hidden name=error_url value=@error_url@>
+<input type=hidden name=error_location value=@error_location@>
 <input type=hidden name=system_url value=@system_url@>
 <input type=hidden name=error_first_names value=@first_names;noquote@>
 <input type=hidden name=error_last_name value=@last_name;noquote@>