- add message catalog table & beginning of web interface

- add security_phrase and conf option to svc_acct.pm
- random other stuff

4 files changed, 64 insertions, 3 deletions

diff --git a/bin/freeside-session-kill b/bin/freeside-session-kill
index 9f11abd5b..d5fd703f6 100755
--- a/bin/freeside-session-kill
+++ b/bin/freeside-session-kill
@@ -98,3 +98,6 @@ foreach my $join ( @session ) {
 
 $dbh->commit or die $dbh->errstr;
 
+sub usage {
+  die "Usage:\n\n  freeside-session-kill user\n";
+}
diff --git a/bin/fs-setup b/bin/fs-setup
index 01e08f77d..55edeb6dd 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.84 2002-03-22 18:56:32 ivan Exp $
+# $Id: fs-setup,v 1.85 2002-04-05 23:51:17 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -752,6 +752,7 @@ sub tables_hash_hack {
         'svcnum',    'int',    '',   '',
         'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
         '_password', 'varchar',   '',   50, #13 for encryped pw's plus ' *SUSPENDED* (mp5 passwords can be 34)
+        'sec_phrase', 'varchar',  'NULL',   $char_d,
         'popnum',    'int',    'NULL',   '',
         'uid',       'int', 'NULL',   '',
         'gid',       'int', 'NULL',   '',
@@ -962,6 +963,18 @@ sub tables_hash_hack {
       'index'       => [ [ 'svcnum' ], [ 'groupname' ] ],
     },
 
+    'msgcat' => {
+      'columns' => [
+        'msgnum', 'int', '', '',
+        'msgcode', 'varchar', '', $char_d,
+        'locale', 'varchar', '', 16,
+        'msg', 'text', '', '',
+      ],
+      'primary_key' => 'msgnum',
+      'unique'      => [ [ 'msgcode', 'locale' ] ],
+      'index'       => [],
+    },
+
   );
 
   %tables;
diff --git a/bin/populate-msgcat b/bin/populate-msgcat
new file mode 100755
index 000000000..fa88732ce
--- /dev/null
+++ b/bin/populate-msgcat
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+
+use FS::UID qw(adminsuidsetup);
+use FS::msgcat;
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+foreach my $del_msgcat ( qsearchs('msgcat', {}) ) {
+  my $error = $del_msgcat->delete;
+  die $error if $error;
+}
+
+my %messages = messages();
+
+foreach $msgcode ( keys %messages ) {
+  foreach my $locale ( keys %{$messages{$msgcode}} ) {
+    my $msgcat = new FS::msgcat( {
+      'msgcode' => $msgcode,
+      'locale'  => $locale,
+    });
+    my $error = $msgcat->insert;
+    die $error if $error;
+  }
+}
+
+sub messages {
+
+  #  'msgcode' => {
+  #    'en_US' => 'Message',
+  #  },
+
+  (
+
+    'msgcode' => {
+      'en_US' => 'Message',
+    },
+
+  );
+}
+
+sub usage {
+  die "Usage:\n\n  populate-msgcat user\n";
+}
+
diff --git a/bin/sqlradius_reset b/bin/sqlradius_reset
index 501685449..da98fe6be 100644
--- a/bin/sqlradius_reset
+++ b/bin/sqlradius_reset
@@ -38,8 +38,8 @@ foreach my $export ( @exports ) {
 }
 
 sub usage {
-  #die "Usage:\n\n  icradius_reset user machine\n";
-  die "Usage:\n\n  icradius_reset user\n";
+  #die "Usage:\n\n  sqlradius_reset user machine\n";
+  die "Usage:\n\n  sqlradius_reset user\n";
 }