[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 07cf4759def9bfb9da5b94075257ea03f664877c

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  07cf4759def9bfb9da5b94075257ea03f664877c (commit)
       via  e31e521e1dc88b3a936023e5e3f8b52de42bb78f (commit)
       via  049f013e7e6409edcc3997f2496784573be3de3e (commit)
       via  1cf322d28999561d08c02a7273425dd9dab08476 (commit)
      from  74c9281d11d7f92e6da3dc00b795e50493c11258 (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 07cf4759def9bfb9da5b94075257ea03f664877c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jun 3 10:17:04 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 e31e521e1dc88b3a936023e5e3f8b52de42bb78f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jun 1 02:26:24 2013 -0700

    fix XSS

diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index dd1ed33..e6a7d4b 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -34,7 +34,7 @@
     <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>
 % } 
 
@@ -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 ++ ;

commit 049f013e7e6409edcc3997f2496784573be3de3e
Merge: 1cf322d 74c9281
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jun 1 02:24:02 2013 -0700

    Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_2_3_BRANCH


commit 1cf322d28999561d08c02a7273425dd9dab08476
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri May 31 22:27:12 2013 -0700

    add raw date to invoice templates, RT#21007

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index d803152..c9b03c0 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2726,6 +2726,7 @@ sub print_generic {
 
     #invoice info
     'invnum'          => $self->invnum,
+    '_date'           => $self->_date,
     'date'            => time2str($date_format, $self->_date),
     'today'           => time2str($date_format_long, $today),
     'terms'           => $self->terms,

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

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