[freeside-commits] branch FREESIDE_3_BRANCH updated. 46c68293e3e9a0bec7b7141b200708512199e0a8

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  46c68293e3e9a0bec7b7141b200708512199e0a8 (commit)
       via  39f23d982625e321123a60157b2e887519dc34ac (commit)
      from  e08d7155f59c6a8123ce0b2a478ec12dec911540 (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 46c68293e3e9a0bec7b7141b200708512199e0a8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jun 3 10:17:01 2013 -0700

    fix per-day radius usage, RT#22699

diff --git a/FS/FS/part_pkg/sqlradacct_daily.pm b/FS/FS/part_pkg/sqlradacct_daily.pm
index d0d3e10..27fc1df 100644
--- a/FS/FS/part_pkg/sqlradacct_daily.pm
+++ b/FS/FS/part_pkg/sqlradacct_daily.pm
@@ -96,15 +96,15 @@ sub calc_recur {
   # bill that day, we didn't have a full picture of the day's usage)
   # and ending with sdate exclusive (same reason)
 
-  my($l_day, $l_mon, $l_year) = (localtime($last_bill))[3,5];
+  my($l_day, $l_mon, $l_year) = (localtime($last_bill))[3..5];
   my $day_start = timelocal(0,0,0, $l_day, $l_mon, $l_year);
 
-  my($s_day, $s_mon, $s_year) = (localtime($$sdate))[3,5];
+  my($s_day, $s_mon, $s_year) = (localtime($$sdate))[3..5];
   my $billday_start = timelocal(0,0,0, $s_day, $s_mon, $s_year);
 
   while ( $day_start < $billday_start ) {
 
-    my($day, $mon, $year) = (localtime($day_start))[3,5];
+    my($day, $mon, $year) = (localtime($day_start))[3..5];
     my $tomorrow = timelocal_nocheck(0,0,0, $day+1, $mon, $year);
 
     #afact the usage methods already use the lower bound inclusive and the upper

commit 39f23d982625e321123a60157b2e887519dc34ac
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jun 1 02:26:20 2013 -0700

    fix XSS

diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index 88e9254..d860499 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -27,13 +27,13 @@
     <TR>
       <TD><INPUT TYPE="checkbox" NAME="remove_pkg" VALUE="<% $pkgnum %>"<% $checked %>></TD>
       <TD ALIGN="right"><% $pkgnum %>:</TD>
-      <TD><% $all_pkg{$pkgpart} %> - <% $all_comment{$pkgpart} %></TD>
+      <TD><% $all_pkg{$pkgpart} |h %> - <% $all_comment{$pkgpart} |h %></TD>
     </TR>
 %   foreach my $supp_pkg ( @{ $supp_pkgs_of{$pkgnum} } ) {
     <TR>
       <TD></TD>
       <TD></TD>
-      <TD>+ <% $all_pkg{$supp_pkg->pkgpart} %> - <% $all_comment{$supp_pkg->pkgpart} %></TD>
+      <TD>+ <% $all_pkg{$supp_pkg->pkgpart} |h %> - <% $all_comment{$supp_pkg->pkgpart} |h %></TD>
     </TR>
 %   }
 % } 
@@ -79,7 +79,7 @@ Order new packages
       <INPUT TYPE="text" NAME="<% "pkg$pkgpart" %>" VALUE="<% $value %>" SIZE="2" MAXLENGTH="2">
     </TD>
     <TD ALIGN="right"><% $pkgpart %>:</TD>
-    <TD><% $pkg{$pkgpart} %> - <% $comment{$pkgpart}%></TD>
+    <TD><% $pkg{$pkgpart} |h %> - <% $comment{$pkgpart} |h %></TD>
   </TR>
 %
 %  $count ++ ;

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

Summary of changes:
 FS/FS/part_pkg/sqlradacct_daily.pm |    6 +++---
 httemplate/edit/cust_pkg.cgi       |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)