[freeside-commits] branch master updated. 57d9974e8e0164453ad7e6b5df4cd8cd78897ef0

[Ivan]

The branch, master has been updated
       via  57d9974e8e0164453ad7e6b5df4cd8cd78897ef0 (commit)
      from  b10deb15ae594cc85eef8db967784fed1fa8ec8f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 57d9974e8e0164453ad7e6b5df4cd8cd78897ef0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Sep 6 01:51:11 2013 -0700

    fix agent-virtualization of logos and other images in self-service, RT#23218

diff --git a/fs_selfservice/FS-SelfService/cgi/header.html b/fs_selfservice/FS-SelfService/cgi/header.html
index 7bd5496..2c378a6 100644
--- a/fs_selfservice/FS-SelfService/cgi/header.html
+++ b/fs_selfservice/FS-SelfService/cgi/header.html
@@ -55,13 +55,13 @@
 
     <TABLE BORDER=0 WIDTH="100%" CELLPADDING=0 CELLSPACING=0>
       <TR STYLE="padding:0px">
-        <TD><%= $no_logo ? '' : '<IMG SRC="image.cgi?logo">' %></TD>
+        <TD><%= $no_logo ? '' : '<IMG SRC="image.cgi?name=logo;agentnum='. $agentnum. '">' %></TD>
         <TD WIDTH = "29%"
-            STYLE = "background: url(image.cgi?title_left_image) no-repeat left center; padding:0px">
+            STYLE = "background: url(image.cgi?name=title_left_image;agentnum=<%= $agentnum %>) no-repeat left center; padding:0px">
         </TD>
         <TD WIDTH = "49%"
             ALIGN="<%= $title_align || 'left' %>"
-            STYLE = "background: url(image.cgi?title_right_image) no-repeat right center; padding:0px">
+            STYLE = "background: url(image.cgi?name=title_right_image;agentnum=<%= $agentnum %>) no-repeat right center; padding:0px">
               <FONT SIZE  = "<%= $title_size || 5 %>"
                     COLOR = "<%= $title_color %>"
               ><%= $INCLUDE_ARGS[0] %>   </FONT>
diff --git a/fs_selfservice/FS-SelfService/cgi/image.cgi b/fs_selfservice/FS-SelfService/cgi/image.cgi
index e951dcd..ee17683 100755
--- a/fs_selfservice/FS-SelfService/cgi/image.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/image.cgi
@@ -8,10 +8,18 @@ use FS::SelfService qw( skin_info );
 my $cgi = new CGI;
 
 my($query) = $cgi->keywords;
-$query =~ /^(\w+)$/ or '' =~ /^()$/;
-my $name = $1;
+my( $name, $agentnum ) = ( '', '' );
+if ( $query =~ /^(\w+)$/ ) {
+  $name = $1;
+} else {
+  $cgi->param('name') =~ /^(\w+)$/ or '' =~ /^()$/;
+  $name = $1;
+  if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+    $agentnum = $1;
+  }
+}
 
-my $info = skin_info();
+my $info = skin_info( agentnum=>$agentnum );
 
 print $cgi->header( '-type'    => 'image/png', #for now
                     #'-expires' => 'now',
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
index 7d1a5f7..38e5257 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
@@ -7,7 +7,7 @@
 <%= 
 
 if ( $menu_top_image ) {
-  $OUT .= '<TR><TD STYLE="padding:0px"><IMG SRC="image.cgi?menu_top_image"></TD></TR>';
+  $OUT .= '<TR><TD STYLE="padding:0px"><IMG SRC="image.cgi?name=menu_top_image;agentnum='. $agentnum. '"></TD></TR>';
 }
 
 my @menu = (
@@ -106,11 +106,11 @@ foreach my $item ( @menu ) {
   if ( $menu_body_image ) {
     if ( exists $item->{'url'} && $action eq $item->{'url'} ) {
       $OUT .= #' BGCOLOR="'. ( $body_bgcolor || '#eeeeee' ). '" '.
-              ' STYLE="background: url(image.cgi?menu_body_image) 0 bottom; '.
+              ' STYLE="background: url(image.cgi?name=menu_body_image;agentnum='. $agentnum. ') 0 bottom; '.
               '        color:#3366CC"; '. #XXX config
               ' " ';
     } else {
-      $OUT .= ' STYLE="background: url(image.cgi?menu_body_image) 0 bottom" ';
+      $OUT .= ' STYLE="background: url(image.cgi?name=menu_body_imagei;agentnum='. $agentnum. ') 0 bottom" ';
     }
   } else {
     if ( exists $item->{'url'} && $action eq $item->{'url'} ) {
@@ -151,7 +151,7 @@ foreach my $item ( @menu ) {
 }
 
 if ( $menu_bottom_image ) {
-  $OUT .= '<TR><TD STYLE="padding:0px"><IMG SRC="image.cgi?menu_bottom_image"></TD></TR>';
+  $OUT .= '<TR><TD STYLE="padding:0px"><IMG SRC="image.cgi?name=menu_bottom_image;agentnum='. $agentnum. '"></TD></TR>';
 } else {
   $OUT .= '<TR><TD STYLE="border-right: 1px solid black" HEIGHT="100%"><BR><BR><BR><BR></TD></TR>';
 }

-----------------------------------------------------------------------

Summary of changes:
 fs_selfservice/FS-SelfService/cgi/header.html      |    6 +++---
 fs_selfservice/FS-SelfService/cgi/image.cgi        |   14 +++++++++++---
 .../FS-SelfService/cgi/myaccount_menu.html         |    8 ++++----
 3 files changed, 18 insertions(+), 10 deletions(-)