[freeside-commits] branch master updated. f32ff6851340686b53a757dc56dc3c8831b50395

Mark Wells mark at 420.am
Wed Mar 12 14:09:11 PDT 2014


The branch, master has been updated
       via  f32ff6851340686b53a757dc56dc3c8831b50395 (commit)
       via  b0edcdbd9bbc710db3abd0340d925e0fa744d649 (commit)
      from  bfefb704d76fffc1ab82626c8dec03931457a1cb (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 f32ff6851340686b53a757dc56dc3c8831b50395
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Mar 12 14:08:54 2014 -0700

    allow utf8 characters in CDR details, #28102

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index a47cc8b..a684425 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -2497,8 +2497,10 @@ sub ut_text {
   #warn "msgcat ". \&msgcat. "\n";
   #warn "notexist ". \&notexist. "\n";
   #warn "AUTOLOAD ". \&AUTOLOAD. "\n";
+  # \p{Word} = alphanumerics, marks (diacritics), and connectors
+  # see perldoc perluniprops
   $self->getfield($field)
-    =~ /^([\wô \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]\<\>$money_char]+)$/
+    =~ /^([\p{Word} \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]\<\>$money_char]+)$/
       or return gettext('illegal_or_empty_text'). " $field: ".
                  $self->getfield($field);
   $self->setfield($field,$1);
@@ -2872,7 +2874,7 @@ May not be null.
 sub ut_name {
   my( $self, $field ) = @_;
 #  warn "ut_name allowed alphanumerics: +(sort grep /\w/, map { chr() } 0..255), "\n";
-  $self->getfield($field) =~ /^([\w \,\.\-\']+)$/
+  $self->getfield($field) =~ /^([\p{Word} \,\.\-\']+)$/
     or return gettext('illegal_name'). " $field: ". $self->getfield($field);
   my $name = $1;
   $name =~ s/^\s+//; 
@@ -3332,6 +3334,8 @@ sub _quote {
   my $column_type = $column_obj->type;
   my $nullable = $column_obj->null;
 
+  utf8::upgrade($value);
+
   warn "  $table.$column: $value ($column_type".
        ( $nullable ? ' NULL' : ' NOT NULL' ).
        ")\n" if $DEBUG > 2;
diff --git a/FS/FS/detail_format.pm b/FS/FS/detail_format.pm
index 665afdb..2417b3a 100644
--- a/FS/FS/detail_format.pm
+++ b/FS/FS/detail_format.pm
@@ -70,7 +70,7 @@ sub new {
   my $language_name = $locale_info{'name'};
 
   my $self = { conf => FS::Conf->new(locale => $locale),
-               csv  => Text::CSV_XS->new,
+               csv  => Text::CSV_XS->new({ binary => 1 }),
                inbound  => ($opt{'inbound'} ? 1 : 0),
                buffer   => ($opt{'buffer'} || []),
                _lh      => FS::L10N->get_handle($locale),

commit b0edcdbd9bbc710db3abd0340d925e0fa744d649
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Mar 12 14:08:33 2014 -0700

    restore Unclassified and Deprecated sections to config, from #27958

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 8472dd6..0d16c5d 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -415,10 +415,11 @@ my @config_items = grep { !defined($locale) or $_->per_locale }
 my @deleteable = qw( invoice_latexreturnaddress invoice_htmlreturnaddress );
 my %deleteable = map { $_ => 1 } @deleteable;
 
-my @sections = qw(
-  required billing invoicing notification UI API self-service ticketing
-  network_monitoring username password session shell BIND telephony
-), '', 'deprecated';
+my @sections = (qw(
+    required billing invoicing notification UI API self-service ticketing
+    network_monitoring username password session shell BIND telephony
+  ), '', 'deprecated'
+);
 
 my %section_items = ();
 foreach my $section (@sections) {

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

Summary of changes:
 FS/FS/Record.pm                   |    8 ++++++--
 FS/FS/detail_format.pm            |    2 +-
 httemplate/config/config-view.cgi |    9 +++++----
 3 files changed, 12 insertions(+), 7 deletions(-)




More information about the freeside-commits mailing list