Merge branch 'xss_fixes' of https://github.com/mcreenan/Freeside

[freeside.git] / httemplate / elements / progress-init.html

diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index 9f17370..cef54b8 100644 (file)
--- a/httemplate/elements/progress-init.html
+++ b/httemplate/elements/progress-init.html
@@ -54,7 +54,7 @@ sub process_whatever { #class method
            )
 %>
 
-<% include('/elements/init_overlib.html') %>
+<& /elements/init_overlib.html &>
 
 <SCRIPT TYPE="text/javascript">
 
@@ -108,7 +108,7 @@ function <%$key%>process () {
 
 function <%$key%>myCallback( jobnum ) {
 
-  overlib( OLiframeContent('<%$p%>elements/progress-popup.html?jobnum=' + jobnum + ';<%$url_or_message_link%>;formname=<%$formname%>' , 444, 168, '<% $popup_name %>'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
+  overlib( OLiframeContent('<%$fsurl%>elements/progress-popup.html?jobnum=' + jobnum + ';<%$url_or_message_link%>;formname=<%$formname%>' , 444, 168, '<% $popup_name %>'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
 
 }
 
@@ -126,6 +126,7 @@ if ( ref($url_or_message) ) { #its a message or something
     if $url_or_message->{'url'};
   $url_or_message_link = 'popup_url=' .uri_escape( $url_or_message->{'popup_url'} )
     if $url_or_message->{'popup_url'};
+
 } else {
   $url_or_message_link = "url=$url_or_message";
 }