[freeside-commits] branch master updated. 467e43fa07b998b5bae0d69f22a17955fe25ddd5

[Ivan Kohler]

The branch, master has been updated
       via  467e43fa07b998b5bae0d69f22a17955fe25ddd5 (commit)
       via  4de16eee62ab478b385ea3a9aeffcaf76d7357cb (commit)
       via  d21b372b9fbba2546d8a1b586c51a5eb6818ac8a (commit)
      from  51383e090e0e49c31a0f4a942a10f242b4061be2 (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 467e43fa07b998b5bae0d69f22a17955fe25ddd5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Dec 1 18:23:26 2017 -0800

    keeping up with the times

diff --git a/ng_selfservice/elements/card.php b/ng_selfservice/elements/card.php
index 765eb6c40..4d502c223 100644
--- a/ng_selfservice/elements/card.php
+++ b/ng_selfservice/elements/card.php
@@ -18,7 +18,7 @@
         <TD> / </TD>
         <TD>
           <SELECT NAME="year">
-            <? $years = array( '2015', '2016', '2017', '2018', '2019', '2020', '2021', '2022', '2023' );
+            <? $years = array( '2018', '2019', '2020', '2021', '2022', '2023', '2024', '2025', '2026' );
                foreach ( $years as $y ) {
             ?>
                   <OPTION <? if ($y == $year ) { echo 'SELECTED'; } ?>><? echo $y; ?>

commit 4de16eee62ab478b385ea3a9aeffcaf76d7357cb
Merge: d21b372b9 51383e090
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Dec 1 18:23:23 2017 -0800

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit d21b372b9fbba2546d8a1b586c51a5eb6818ac8a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Nov 30 15:12:04 2017 -0800

    sha512 crypt() export

diff --git a/FS/FS/part_export/passwdfile.pm b/FS/FS/part_export/passwdfile.pm
index 6713c8d82..0ee721214 100644
--- a/FS/FS/part_export/passwdfile.pm
+++ b/FS/FS/part_export/passwdfile.pm
@@ -10,7 +10,7 @@ use FS::part_export::null;
 tie %options, 'Tie::IxHash',
   'crypt' => { label=>'Password encryption',
                type=>'select', options=>[qw(crypt md5 sha512)],
-               default=>'md5',
+               default=>'sha512',
              },
 ;
 
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 7c280e5f8..09fa71b94 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -98,7 +98,7 @@ tie my %options, 'Tie::IxHash',
 
   'crypt' => { label   => 'Default password encryption',
                type=>'select', options=>[qw(crypt md5 sha512)],
-               default => 'md5',
+               default => 'sha512',
              },
   'groups_susp_reason' => { label =>
                              'Radius group mapping to reason (via template user)',
diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm
index b30713356..004c42133 100644
--- a/FS/FS/part_export/shellcommands_withdomain.pm
+++ b/FS/FS/part_export/shellcommands_withdomain.pm
@@ -64,7 +64,7 @@ tie my %options, 'Tie::IxHash',
            },
   'crypt' => { label   => 'Default password encryption',
                type=>'select', options=>[qw(crypt md5 sha512)],
-               default => 'md5',
+               default => 'sha512',
              },
   'fail_on_output' => {
       label => 'Treat any output from the command as an error',

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

Summary of changes:
 FS/FS/part_export/passwdfile.pm               | 2 +-
 FS/FS/part_export/shellcommands.pm            | 2 +-
 FS/FS/part_export/shellcommands_withdomain.pm | 2 +-
 ng_selfservice/elements/card.php              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)