Use new module, don't make cross-text calls

diff --git a/usermin/change_access.cgi b/usermin/change_access.cgi
index b22ecb6..87fec90 100755 (executable)
--- a/usermin/change_access.cgi
+++ b/usermin/change_access.cgi
@@ -6,7 +6,7 @@ require './usermin-lib.pl';
 $access{'access'} || &error($text{'acl_ecannot'});
 use Socket;
 &ReadParse();
-&error_setup($webmin::text{'access_err'});
+&error_setup($text{'access_err'});
 
 @hosts = split(/\s+/, $in{"ip"});
 &lock_file($usermin_miniserv_config);

diff --git a/usermin/change_advanced.cgi b/usermin/change_advanced.cgi
index 6b46374..a297388 100755 (executable)
--- a/usermin/change_advanced.cgi
+++ b/usermin/change_advanced.cgi
@@ -3,7 +3,7 @@
 
 require './usermin-lib.pl';
 &ReadParse();
-&error_setup($webmin::text{'advanced_err'});
+&error_setup($text{'advanced_err'});
 &get_usermin_miniserv_config(\%miniserv);
 &get_usermin_config(\%uconfig);
 
@@ -12,7 +12,7 @@ if ($in{'tempdir_def'}) {
        delete($uconfig{'tempdir'});
        }
 else {
-       -d $in{'tempdir'} || &error($webmin::text{'advanced_etemp'});
+       -d $in{'tempdir'} || &error($text{'advanced_etemp'});
        $uconfig{'tempdir'} = $in{'tempdir'};
        }
 
@@ -21,7 +21,7 @@ for($i=0; defined($tmod = $in{'tmod_'.$i}); $i++) {
        next if (!$tmod);
        $tdir = $in{'tdir_'.$i};
        %minfo = &get_usermin_module_info($tmod);
-       -d $tdir || &error(&webmin::text('advanced_etdir', $minfo{'desc'}));
+       -d $tdir || &error(&text('advanced_etdir', $minfo{'desc'}));
        push(@tdirs, [ $tmod, $tdir ]);
        }
 &webmin::save_tempdirs(\%uconfig, \@tdirs);
@@ -35,7 +35,7 @@ if ($in{'umask_def'}) {
        }
 else {
        $in{'umask'} =~ /^[0-7]{3}$/ ||
-               &error($webmin::text{'advanced_eumask'});
+               &error($text{'advanced_eumask'});
        $uconfig{'umask'} = $in{'umask'};
        }
 

diff --git a/usermin/change_anon.cgi b/usermin/change_anon.cgi
index 1e0c81b..d324d6a 100755 (executable)
--- a/usermin/change_anon.cgi
+++ b/usermin/change_anon.cgi
@@ -5,13 +5,13 @@
 require './usermin-lib.pl';
 &ReadParse();
 &get_usermin_miniserv_config(\%miniserv);
-&error_setup($webmin::text{'anon_err'});
+&error_setup($text{'anon_err'});
 
 # Check inputs
 &read_acl(undef, \%acl);
 for($i=0; defined($in{"url_$i"}); $i++) {
        next if (!$in{"url_$i"});
-       $in{"url_$i"} =~ /^\/\S+$/ || &error(&webmin::text('anon_eurl', $in{"url_$i"}));
+       $in{"url_$i"} =~ /^\/\S+$/ || &error(&text('anon_eurl', $in{"url_$i"}));
        getpwnam($in{"user_$i"}) || &error(&text('anon_euser', $in{"url_$i"}));
        push(@anon, $in{"url_$i"}."=".$in{"user_$i"});
        }

diff --git a/usermin/change_bind.cgi b/usermin/change_bind.cgi
index f8e84d7..7e2f6b7 100755 (executable)
--- a/usermin/change_bind.cgi
+++ b/usermin/change_bind.cgi
@@ -8,7 +8,7 @@ use Socket;
 &ReadParse();
 &get_usermin_miniserv_config(\%miniserv);
 %oldminiserv = %miniserv;
-&error_setup($webmin::text{'bind_err'});
+&error_setup($text{'bind_err'});
 
 # Validate inputs
 for($i=0; defined($in{"ip_def_$i"}); $i++) {
@@ -18,21 +18,21 @@ for($i=0; defined($in{"ip_def_$i"}); $i++) {
                }
        else {
                $ip = $in{"ip_$i"};
-               &check_ipaddress($ip) || &error(&webmin::text('bind_eip2', $ip));
+               &check_ipaddress($ip) || &error(&text('bind_eip2', $ip));
                }
        if ($in{"port_def_$i"} == 1) {
                $port = $in{"port_$i"};
                $port =~ /^\d+$/ && $port < 65536 ||
-                       &error(&webmin::text('bind_eport2', $port));
+                       &error(&text('bind_eport2', $port));
                }
        else {
                $port = "*";
                }
        push(@sockets, [ $ip, $port ]);
        }
-@sockets || &error($webmin::text{'bind_enone'});
+@sockets || &error($text{'bind_enone'});
 $in{'hostname_def'} || $in{'hostname'} =~ /^[a-z0-9\.\-]+$/i ||
-       &error($webmin::text{'bind_ehostname'});
+       &error($text{'bind_ehostname'});
 
 # Update config file
 &lock_file($usermin_miniserv_config);

diff --git a/usermin/change_mobile.cgi b/usermin/change_mobile.cgi
index 31bb9e6..34c0fbe 100755 (executable)
--- a/usermin/change_mobile.cgi
+++ b/usermin/change_mobile.cgi
@@ -3,7 +3,7 @@
 
 require './usermin-lib.pl';
 &ReadParse();
-&error_setup($webmin::text{'mobile_err'});
+&error_setup($text{'mobile_err'});
 
 &lock_file($usermin_miniserv_config);
 &lock_file("$config{'usermin_dir'}/config");

diff --git a/usermin/change_os.cgi b/usermin/change_os.cgi
index a7a0442..c86d371 100755 (executable)
--- a/usermin/change_os.cgi
+++ b/usermin/change_os.cgi
@@ -24,12 +24,12 @@ elsif ($in{'type'} ne $uconfig{'real_os_type'} ||
        $in{'iversion'} ne $uconfig{'os_version'}) {
        # Manually change
        $uconfig{'real_os_type'} = $in{'type'};
-       $in{'version'} || &error($webmin::text{'os_eversion'});
+       $in{'version'} || &error($text{'os_eversion'});
        $uconfig{'real_os_version'} = $in{'version'};
        ($os) = grep { $_->{'realtype'} eq $in{'type'} }
                     &webmin::list_operating_systems($osfile);
        $uconfig{'os_type'} = $in{'itype'};
-       $in{'iversion'} || &error($webmin::text{'os_eiversion'});
+       $in{'iversion'} || &error($text{'os_eiversion'});
        $uconfig{'os_version'} = $in{'iversion'};
        }
 $uconfig{'path'} = join(":", split(/[\r\n]+/, $in{'path'}));

diff --git a/usermin/change_session.cgi b/usermin/change_session.cgi
index 25390c1..78bb612 100755 (executable)
--- a/usermin/change_session.cgi
+++ b/usermin/change_session.cgi
@@ -15,9 +15,9 @@ $miniserv{'passdelay'} = $in{'passdelay'};
 # Save blocked hosts
 if ($in{'blockhost_on'}) {
        $in{'blockhost_time'} =~ /^\d+$/ && $in{'blockhost_time'} > 0 ||
-               &error($webmin::text{'session_eblockhost_time'});
+               &error($text{'session_eblockhost_time'});
        $in{'blockhost_failures'} =~ /^\d+$/ && $in{'blockhost_failures'} > 0 ||
-               &error($webmin::text{'session_eblockhost_failures'});
+               &error($text{'session_eblockhost_failures'});
        $miniserv{'blockhost_time'} = $in{'blockhost_time'};
        $miniserv{'blockhost_failures'} = $in{'blockhost_failures'};
        }
@@ -28,9 +28,9 @@ else {
 # Save blocked users
 if ($in{'blockuser_on'}) {
        $in{'blockuser_time'} =~ /^\d+$/ && $in{'blockuser_time'} > 0 ||
-               &error($webmin::text{'session_eblockuser_time'});
+               &error($text{'session_eblockuser_time'});
        $in{'blockuser_failures'} =~ /^\d+$/ && $in{'blockuser_failures'} > 0 ||
-               &error($webmin::text{'session_eblockuser_failures'});
+               &error($text{'session_eblockuser_failures'});
        $miniserv{'blockuser_time'} = $in{'blockuser_time'};
        $miniserv{'blockuser_failures'} = $in{'blockuser_failures'};
        }
@@ -40,17 +40,17 @@ else {
 
 $miniserv{'syslog'} = $in{'syslog'};
 if ($in{'session'} && $ENV{'HTTP_COOKIE'} !~ /sessiontest=1/i) {
-       &error($webmin::text{'session_ecookie'});
+       &error($text{'session_ecookie'});
        }
 $miniserv{'session'} = $in{'session'};
 if ($in{'logouttime_on'}) {
        $in{'logouttime'} =~ /^\d+$/ && $in{'logouttime'} > 0 ||
-               &error($webmin::text{'session_elogouttime'});
+               &error($text{'session_elogouttime'});
        }
 $miniserv{'logouttime'} = $in{'logouttime_on'} ? $in{'logouttime'} : undef;
 if ($in{'localauth'}) {
        $lsof = &has_command("lsof");
-       &error($webmin::text{'session_elsof'}) if (!$lsof);
+       &error($text{'session_elsof'}) if (!$lsof);
        $miniserv{'localauth'} = $lsof;
        }
 else {
@@ -58,11 +58,11 @@ else {
        }
 if ($in{'passwd_file'}) {
        $in{'passwd_file'} =~ /\|$/ || -r $in{'passwd_file'} ||
-               &error($webmin::text{'session_epasswd_file'});
+               &error($text{'session_epasswd_file'});
        $in{'passwd_uindex'} =~ /^\d+$/ ||
-               &error($webmin::text{'session_epasswd_uindex'});
+               &error($text{'session_epasswd_uindex'});
        $in{'passwd_pindex'} =~ /^\d+$/ ||
-               &error($webmin::text{'session_epasswd_pindex'});
+               &error($text{'session_epasswd_pindex'});
        $miniserv{'passwd_file'} = $in{'passwd_file'};
        $miniserv{'passwd_uindex'} = $in{'passwd_uindex'};
        $miniserv{'passwd_pindex'} = $in{'passwd_pindex'};
@@ -124,7 +124,7 @@ if ($in{'cmd_def'}) {
        }
 else {
        $in{'cmd'} =~ /\S/ && &has_command($in{'cmd'}) ||
-               &error($webmin::text{'session_ecmd'});
+               &error($text{'session_ecmd'});
        $gconfig{'passwd_cmd'} = $in{'cmd'};
        }
 if ($ver >= 1.153) {
@@ -154,7 +154,7 @@ if ($in{'banner_def'}) {
        delete($uconfig{'loginbanner'});
        }
 else {
-       -r $in{'banner'} || &error($webmin::text{'session_ebanner'});
+       -r $in{'banner'} || &error($text{'session_ebanner'});
        $uconfig{'loginbanner'} = $in{'banner'};
        }
 $uconfig{'create_homedir'} = $in{'create_homedir'};

diff --git a/usermin/change_ssl.cgi b/usermin/change_ssl.cgi
index bdc0f32..9507bd1 100755 (executable)
--- a/usermin/change_ssl.cgi
+++ b/usermin/change_ssl.cgi
@@ -11,17 +11,17 @@ $access{'ssl'} || &error($text{'acl_ecannot'});
 $miniserv{'ssl'} = $in{'ssl'};
 $key = `cat '$in{'key'}' 2>&1`;
 $key =~ /BEGIN RSA PRIVATE KEY/i ||
-       &error(&webmin::text('ssl_ekey', $in{'key'}));
+       &error(&text('ssl_ekey', $in{'key'}));
 $miniserv{'keyfile'} = $in{'key'};
 if ($in{'cert_def'}) {
        $key =~ /BEGIN CERTIFICATE/ ||
-               &error(&webmin::text('ssl_ecert', $in{'key'}));
+               &error(&text('ssl_ecert', $in{'key'}));
        delete($miniserv{'certfile'});
        }
 else {
        $cert = `cat '$in{'cert'}' 2>&1`;
        $cert =~ /BEGIN CERTIFICATE/ ||
-               &error(&webmin::text('ssl_ecert',$in{'cert'}));
+               &error(&text('ssl_ecert',$in{'cert'}));
        $miniserv{'certfile'} = $in{'cert'};
        }
 $miniserv{'ssl_redirect'} = $in{'ssl_redirect'};
@@ -37,11 +37,11 @@ if ($in{'cipher_list_def'}) {
        }
 else {
        $in{'cipher_list'} =~ /^\S+$/ ||
-               &error($webmin::text{'ssl_ecipher_list'});
+               &error($text{'ssl_ecipher_list'});
        $miniserv{'ssl_cipher_list'} = $in{'cipher_list'};
        }
 foreach $ec (split(/[\r\n]+/, $in{'extracas'})) {
-       -r $ec && !-d $ec || &error(&webmin::text('ssl_eextraca', $ec));
+       -r $ec && !-d $ec || &error(&text('ssl_eextraca', $ec));
        push(@extracas, $ec);
        }
 $miniserv{'extracas'} = join("\t", @extracas);

diff --git a/usermin/change_ui.cgi b/usermin/change_ui.cgi
index e854cfe..2eff19c 100755 (executable)
--- a/usermin/change_ui.cgi
+++ b/usermin/change_ui.cgi
@@ -18,7 +18,7 @@ for($i=0; $i<@webmin::cs_names; $i++) {
        $cd = $webmin::cs_codes[$i];
        if ($in{"${cd}_def"}) { delete($uconfig{$cd}); }
        elsif ($in{"${cd}"} !~ /^[0-9a-fA-F]{6}$/) {
-               &error(&webmin::text('ui_ergb', $webmin::cs_names[$i] . $in{"${cd}_rgb"}));
+               &error(&text('ui_ergb', $webmin::cs_names[$i] . $in{"${cd}_rgb"}));
                }
        else { $uconfig{$cd} = $in{"${cd}"}; }
        }

diff --git a/usermin/edit_access.cgi b/usermin/edit_access.cgi
index 5594015..5802312 100755 (executable)
--- a/usermin/edit_access.cgi
+++ b/usermin/edit_access.cgi
@@ -10,25 +10,25 @@ $access{'access'} || &error($text{'acl_ecannot'});
 print $text{'access_desc'},"<p>\n";
 
 print &ui_form_start("change_access.cgi", "post");
-print &ui_table_start($webmin::text{'access_header'}, undef, 2, [ "width=30%" ]);
+print &ui_table_start($text{'access_header'}, undef, 2, [ "width=30%" ]);
 
 $access = $miniserv{"allow"} ? 1 : $miniserv{"deny"} ? 2 : 0;
-print &ui_table_row($webmin::text{'access_ip'},
+print &ui_table_row($text{'access_ip'},
   &ui_radio("access", $access,
-      [ [ 0, $webmin::text{'access_all'} ],
-        [ 1, $webmin::text{'access_allow'} ],
-        [ 2, $webmin::text{'access_deny'} ] ])."<br>\n".
+      [ [ 0, $text{'access_all'} ],
+        [ 1, $text{'access_allow'} ],
+        [ 2, $text{'access_deny'} ] ])."<br>\n".
   &ui_textarea("ip",
     $access == 1 ? join("\n", split(/\s+/, $miniserv{"allow"})) :
     $access == 2 ? join("\n", split(/\s+/, $miniserv{"deny"})) : "",
     6, 30));
 
-print &ui_table_row($webmin::text{'access_always'},
+print &ui_table_row($text{'access_always'},
   &ui_yesno_radio("alwaysresolve", int($miniserv{'alwaysresolve'})));
 
 eval "use Authen::Libwrap qw(hosts_ctl STRING_UNKNOWN)";
 if (!$@) {
-  print &ui_table_row($webmin::text{'access_libwrap'},
+  print &ui_table_row($text{'access_libwrap'},
     &ui_yesno_radio("libwrap", int($miniserv{'libwrap'})));
   }
 

diff --git a/usermin/edit_advanced.cgi b/usermin/edit_advanced.cgi
index 67223c9..55a8d38 100755 (executable)
--- a/usermin/edit_advanced.cgi
+++ b/usermin/edit_advanced.cgi
@@ -7,17 +7,17 @@ require './usermin-lib.pl';
 &get_usermin_config(\%uconfig);
 
 print &ui_form_start("change_advanced.cgi", "post");
-print &ui_table_start($webmin::text{'advanced_header'}, undef, 2);
+print &ui_table_start($text{'advanced_header'}, undef, 2);
 
 # Global temp directory
-print &ui_table_row($webmin::text{'advanced_temp'},
+print &ui_table_row($text{'advanced_temp'},
                    &ui_opt_textbox("tempdir", $uconfig{'tempdir'},
-                                   30, $webmin::text{'advanced_tempdef'}));
+                                   30, $text{'advanced_tempdef'}));
 
 # Per-module temp directories
 @mods = sort { $a->{'desc'} cmp $b->{'desc'} } &list_modules();
-$ttable = &ui_columns_start([ $webmin::text{'advanced_tmod'},
-                             $webmin::text{'advanced_tdir'} ]);
+$ttable = &ui_columns_start([ $text{'advanced_tmod'},
+                             $text{'advanced_tdir'} ]);
 $i = 0;
 foreach $d (&webmin::get_tempdirs(\%uconfig), [ ]) {
        $ttable .= &ui_columns_row([
@@ -29,10 +29,10 @@ foreach $d (&webmin::get_tempdirs(\%uconfig), [ ]) {
        $i++;
        }
 $ttable .= &ui_columns_end();
-print &ui_table_row($webmin::text{'advanced_tempmods'}, $ttable);
+print &ui_table_row($text{'advanced_tempmods'}, $ttable);
 
 # Show call stack on error
-print &ui_table_row($webmin::text{'advanced_stack'},
+print &ui_table_row($text{'advanced_stack'},
                    &ui_yesno_radio("stack", int($uconfig{'error_stack'})));
 
 # Pass passwords to CGI programs
@@ -40,7 +40,7 @@ print &ui_table_row($text{'advanced_pass'},
                    &ui_yesno_radio("pass", int($miniserv{'pass_password'})));
 
 # Umask for created files
-print &ui_table_row($webmin::text{'advanced_umask'},
+print &ui_table_row($text{'advanced_umask'},
            &ui_opt_textbox("umask", $uconfig{'umask'}, 5, $text{'default'}));
 
 print &ui_table_end();

diff --git a/usermin/edit_anon.cgi b/usermin/edit_anon.cgi
index 837537c..c3e46d9 100755 (executable)
--- a/usermin/edit_anon.cgi
+++ b/usermin/edit_anon.cgi
@@ -3,10 +3,10 @@
 # Display anonymous access form
 
 require './usermin-lib.pl';
-&ui_print_header(undef, $webmin::text{'anon_title'}, "");
+&ui_print_header(undef, $text{'anon_title'}, "");
 &get_usermin_miniserv_config(\%miniserv);
 
-print $webmin::text{'anon_desc'},"<p>\n";
+print $text{'anon_desc'},"<p>\n";
 foreach $a (split(/\s+/, $miniserv{'anonymous'})) {
        if ($a =~ /^([^=]+)=(\S+)$/) {
                push(@anon, [ $1, $2 ]);
@@ -14,7 +14,7 @@ foreach $a (split(/\s+/, $miniserv{'anonymous'})) {
        }
 
 print &ui_form_start("change_anon.cgi");
-print &ui_columns_start([ $webmin::text{'anon_url'},
+print &ui_columns_start([ $text{'anon_url'},
                           $text{'anon_user'} ]);
 
 push(@anon, scalar(@anon)%2 == 0 ? ( [ ], [ ] ) : ( [ ] ));

diff --git a/usermin/edit_bind.cgi b/usermin/edit_bind.cgi
index f9f5b59..8ea978e 100755 (executable)
--- a/usermin/edit_bind.cgi
+++ b/usermin/edit_bind.cgi
@@ -10,13 +10,13 @@ $access{'bind'} || &error($text{'acl_ecannot'});
 print $text{'bind_desc2'},"<p>\n";
 
 print &ui_form_start("change_bind.cgi", "post");
-print &ui_table_start($webmin::text{'bind_header'}, undef, 2, [ "width=30%" ]);
+print &ui_table_start($text{'bind_header'}, undef, 2, [ "width=30%" ]);
 
 # Build list of sockets
 my @sockets = &webmin::get_miniserv_sockets(\%miniserv);
 
 # Show table of all bound IPs and ports
-my $stable = &ui_columns_start([ $webmin::text{'bind_sip'}, $webmin::text{'bind_sport'} ]);
+my $stable = &ui_columns_start([ $text{'bind_sip'}, $text{'bind_sport'} ]);
 my $i = 0;
 foreach $s (@sockets, [ undef, "*" ]) {
        use Data::Dumper;
@@ -27,25 +27,25 @@ foreach $s (@sockets, [ undef, "*" ]) {
                               $s->[0] eq "" ? 0 :
                              $s->[0] eq "*" ? 1 : 2,
                               [ [ 0, "&nbsp;" ],
-                              [ 1, $webmin::text{'bind_sip1'} ],
-                              [ 2, $webmin::text{'bind_sip2'} ] ])." ".
+                              [ 1, $text{'bind_sip1'} ],
+                              [ 2, $text{'bind_sip2'} ] ])." ".
                               &ui_textbox("ip_$i", $s->[0] eq "*" ? undef : $s->[0], 20));
 
        # Port
        push(@cols, &ui_select("port_def_$i", $s->[1] eq "*" ? 0 : 1,
-                 [ $i ? ( [ 0, $webmin::text{'bind_sport0'} ] ) : ( ),
-            [ 1, $webmin::text{'bind_sport1'} ] ])." ".
+                 [ $i ? ( [ 0, $text{'bind_sport0'} ] ) : ( ),
+            [ 1, $text{'bind_sport1'} ] ])." ".
              &ui_textbox("port_$i", $s->[1] eq "*" ? undef : $s->[1],5));
        $stable .= &ui_columns_row(\@cols, [ "nowrap", "nowrap" ]);
        $i++;
        }
 $stable .= &ui_columns_end();
-print &ui_table_row($webmin::text{'bind_sockets'}, $stable);
+print &ui_table_row($text{'bind_sockets'}, $stable);
 
 # Show web server hostname
-print &ui_table_row($webmin::text{'bind_hostname'},
+print &ui_table_row($text{'bind_hostname'},
       &ui_radio("hostname_def", $miniserv{"host"} ? 0 : 1,
-      [ [ 1, $webmin::text{'bind_auto'} ],
+      [ [ 1, $text{'bind_auto'} ],
       [ 0, &ui_textbox("hostname", $miniserv{"host"}, 25) ] ]));
 
 print &ui_table_end();

diff --git a/usermin/edit_blocked.cgi b/usermin/edit_blocked.cgi
index ac04e62..d4f375b 100644 (file)
--- a/usermin/edit_blocked.cgi
+++ b/usermin/edit_blocked.cgi
@@ -7,10 +7,10 @@ require './usermin-lib.pl';
 @blocked = &webmin::get_blocked_users_hosts(\%miniserv);
 
 if (@blocked) {
-       print &ui_columns_start([ $webmin::text{'blocked_type'},
+       print &ui_columns_start([ $text{'blocked_type'},
                                  $text{'blocked_who'},
-                                 $webmin::text{'blocked_fails'},
-                                 $webmin::text{'blocked_when'},
+                                 $text{'blocked_fails'},
+                                 $text{'blocked_when'},
                                ]);
        foreach $b (@blocked) {
                print &ui_columns_row([
@@ -24,7 +24,7 @@ if (@blocked) {
        print &ui_hr();
        print &ui_buttons_start();
        print &ui_buttons_row("clear_blocked.cgi",
-                             $webmin::text{'blocked_clear'},
+                             $text{'blocked_clear'},
                              $text{'blocked_cleardesc'});
        print &ui_buttons_end();
        }

diff --git a/usermin/edit_descs.cgi b/usermin/edit_descs.cgi
index 4edf674..d0c2151 100755 (executable)
--- a/usermin/edit_descs.cgi
+++ b/usermin/edit_descs.cgi
@@ -7,8 +7,8 @@ print "$text{'descs_info'}<p>\n";
 
 &read_file("$config{'usermin_dir'}/webmin.descs", \%descs);
 print &ui_form_start("save_descs.cgi");
-print &ui_columns_start([ $webmin::text{'descs_mod'},
-                         $webmin::text{'descs_desc'} ]);
+print &ui_columns_start([ $text{'descs_mod'},
+                         $text{'descs_desc'} ]);
 $i = 0;
 @mods = sort { $a->{'realdesc'} cmp $b->{'realdesc'} } &list_modules();
 foreach $d ((sort { $a cmp $b } (keys %descs)), undef, undef, undef) {

diff --git a/usermin/edit_ipkey.cgi b/usermin/edit_ipkey.cgi
index 6ed34e0..a57ce4a 100755 (executable)
--- a/usermin/edit_ipkey.cgi
+++ b/usermin/edit_ipkey.cgi
@@ -5,10 +5,10 @@ require './usermin-lib.pl';
 &ReadParse();
 &get_usermin_miniserv_config(\%miniserv);
 if ($in{'new'}) {
-       &ui_print_header(undef, $webmin::text{'ipkey_title1'}, "");
+       &ui_print_header(undef, $text{'ipkey_title1'}, "");
        }
 else {
-       &ui_print_header(undef, $webmin::text{'ipkey_title2'}, "");
+       &ui_print_header(undef, $text{'ipkey_title2'}, "");
        @ipkeys = &webmin::get_ipkeys(\%miniserv);
        $ipkey = $ipkeys[$in{'idx'}];
        }
@@ -16,19 +16,19 @@ else {
 print &ui_form_start("save_ipkey.cgi", "post");
 print &ui_hidden("new", $in{'new'}),"\n";
 print &ui_hidden("idx", $in{'idx'}),"\n";
-print &ui_table_start($webmin::text{'ipkey_header'}, undef, 2);
+print &ui_table_start($text{'ipkey_header'}, undef, 2);
 
-print &ui_table_row($webmin::text{'ipkey_ips'},
+print &ui_table_row($text{'ipkey_ips'},
                    &ui_textarea("ips", join("\n", @{$ipkey->{'ips'}}),
                                 3, 20));
 
-print &ui_table_row($webmin::text{'ssl_key'},
+print &ui_table_row($text{'ssl_key'},
                    &ui_textbox("key", $ipkey->{'key'}, 40)."\n".
                    &file_chooser_button("key"));
 
-print &ui_table_row($webmin::text{'ssl_cert'},
+print &ui_table_row($text{'ssl_cert'},
                    &ui_opt_textbox("cert", $ipkey->{'cert'}, 40,
-                               $webmin::text{'ssl_cert_def'})."\n".
+                               $text{'ssl_cert_def'})."\n".
                    &file_chooser_button("cert"));
 
 print &ui_table_end();
@@ -40,5 +40,5 @@ else {
                             [ "delete", $text{'delete'} ] ]);
        }
 
-&ui_print_footer("edit_ssl.cgi", $webmin::text{'ssl_return'});
+&ui_print_footer("edit_ssl.cgi", $text{'ssl_return'});
 

diff --git a/usermin/edit_lang.cgi b/usermin/edit_lang.cgi
index 4343cc7..1a3e2bc 100755 (executable)
--- a/usermin/edit_lang.cgi
+++ b/usermin/edit_lang.cgi
@@ -10,21 +10,21 @@ $access{'lang'} || &error($text{'acl_ecannot'});
 print $text{'lang_intro'},"<p>\n";
 
 print &ui_form_start("change_lang.cgi", "post");
-print &ui_table_start($webmin::text{'lang_title2'}, undef, 2, [ "width=30%" ]);
+print &ui_table_start($text{'lang_title2'}, undef, 2, [ "width=30%" ]);
 
 # Language
 $clang = $uconfig{'lang'} ? $uconfig{'lang'} : $default_lang;
-print &ui_table_row($webmin::text{'lang_lang'},
+print &ui_table_row($text{'lang_lang'},
         &ui_select("lang", $clang,
            [ map { [ $_->{'lang'}, "$_->{'desc'} (".uc($_->{'lang'}).")" ] }
                  &list_languages() ]));
 
 # Use language from browser?
-print &ui_table_row($webmin::text{'lang_accept'},
+print &ui_table_row($text{'lang_accept'},
         &ui_yesno_radio("acceptlang", int($uconfig{'acceptlang'})));
 
 print &ui_table_end();
-print &ui_form_end([ [ "", $webmin::text{'lang_ok'} ] ]);
+print &ui_form_end([ [ "", $text{'lang_ok'} ] ]);
 
 &ui_print_footer("", $text{'index_return'});
 

diff --git a/usermin/edit_mobile.cgi b/usermin/edit_mobile.cgi
index 4f76bca..a180c03 100755 (executable)
--- a/usermin/edit_mobile.cgi
+++ b/usermin/edit_mobile.cgi
@@ -7,28 +7,28 @@ require './usermin-lib.pl';
 &get_usermin_miniserv_config(\%miniserv);
 
 print &ui_form_start("change_mobile.cgi");
-print &ui_table_start($webmin::text{'mobile_header'}, undef, 2);
+print &ui_table_start($text{'mobile_header'}, undef, 2);
 
 # Custom theme for mobile devices
 @themes = &list_themes();
 $m = $miniserv{'mobile_preroot'};
-print &ui_table_row($webmin::text{'mobile_theme'},
+print &ui_table_row($text{'mobile_theme'},
            &ui_select("theme", defined($m) ? $m : "*",
-                      [ [ "*", $webmin::text{'mobile_themeglob'} ],
-                        [ "", $webmin::text{'themes_default'} ],
+                      [ [ "*", $text{'mobile_themeglob'} ],
+                        [ "", $text{'themes_default'} ],
                         map { [ $_->{'dir'}, $_->{'desc'} ] } @themes ]));
 
 # Skip session login for mobile devices
-print &ui_table_row($webmin::text{'mobile_nosession'},
+print &ui_table_row($text{'mobile_nosession'},
            &ui_yesno_radio("nosession", int($miniserv{'mobile_nosession'})));
 
 # Extra user agents
-print &ui_table_row($webmin::text{'mobile_agents'},
+print &ui_table_row($text{'mobile_agents'},
            &ui_textarea("agents",
                join("\n", split(/\t+/, $miniserv{'mobile_agents'})), 5, 50));
 
 # Hostname prefixes for mobile
-print &ui_table_row($webmin::text{'mobile_prefixes'},
+print &ui_table_row($text{'mobile_prefixes'},
            &ui_textbox("prefixes", $miniserv{'mobile_prefixes'}, 50));
 
 print &ui_table_end();

diff --git a/usermin/edit_mods.cgi b/usermin/edit_mods.cgi
index d271441..369e17b 100755 (executable)
--- a/usermin/edit_mods.cgi
+++ b/usermin/edit_mods.cgi
@@ -101,20 +101,20 @@ print &ui_hr();
 print "$text{'mods_desc4'}<p>\n";
 
 print &ui_form_start("export_mod.cgi/module.wbm.gz");
-print &ui_table_start($webmin::text{'mods_header4'}, undef, 2);
+print &ui_table_start($text{'mods_header4'}, undef, 2);
 
-print &ui_table_row($webmin::text{'mods_exportmods'},
+print &ui_table_row($text{'mods_exportmods'},
          &ui_select("mod", undef,
                [ map { [ $_->{'dir'}, $_->{'desc'} ] } @mlist ], 10, 1));
 
-print &ui_table_row($webmin::text{'mods_exportto'},
+print &ui_table_row($text{'mods_exportto'},
          &ui_radio("to", 0,
-               [ [ 0, $webmin::text{'mods_exportshow'}."<br>" ],
-                 [ 1, &webmin::text('mods_exportfile',
+               [ [ 0, $text{'mods_exportshow'}."<br>" ],
+                 [ 1, &text('mods_exportfile',
                             &ui_textbox("file", undef, 40)) ] ]));
 
 print &ui_table_end();
-print &ui_form_end([ [ "ok", $webmin::text{'mods_exportok'} ] ]);
+print &ui_form_end([ [ "ok", $text{'mods_exportok'} ] ]);
 
 &ui_print_footer("", $text{'index_return'});
 

diff --git a/usermin/edit_os.cgi b/usermin/edit_os.cgi
index 7916f6d..4bfe4b4 100755 (executable)
--- a/usermin/edit_os.cgi
+++ b/usermin/edit_os.cgi
@@ -13,7 +13,7 @@ print $text{'os_desc2'},"<br>\n";
 &get_usermin_miniserv_config(\%miniserv);
 
 print &ui_form_start("change_os.cgi", "post");
-print &ui_table_start($webmin::text{'os_header'}, undef, 2, [ "width=30%" ]);
+print &ui_table_start($text{'os_header'}, undef, 2, [ "width=30%" ]);
 
 # OS according to Usermin
 $osfile = "$miniserv{'root'}/os_list.txt";
@@ -34,30 +34,30 @@ print &ui_table_row($text{'os_iusermin'},
 %osinfo = &webmin::detect_operating_system($osfile);
 if ($osinfo{'real_os_type'}) {
        print &ui_table_row(
-               $webmin::text{'os_detect'},
+               $text{'os_detect'},
                "$osinfo{'real_os_type'} $osinfo{'real_os_version'}\n".
                 ($osinfo{'os_type'} ne $uconfig{'os_type'} ||
                  $osinfo{'os_version'} ne $uconfig{'os_version'} ?
-                 "<br>".&ui_checkbox("update", 1, $webmin::text{'os_update'}) :
+                 "<br>".&ui_checkbox("update", 1, $text{'os_update'}) :
                  ""));
        }
 else {
        print &ui_table_row($text{'os_detect'},
-                           "<i>$webmin::text{'os_cannot'}</i>");
+                           "<i>$text{'os_cannot'}</i>");
        }
 print &ui_table_hr();
 
 # Search path
-print &ui_table_row($webmin::text{'os_path'},
+print &ui_table_row($text{'os_path'},
        &ui_textarea("path",
          join("\n", split($path_separator, $uconfig{'path'})),
          5, 30)."<br>".
        &ui_checkbox(
-         "syspath", 1, $webmin::text{'os_syspath'}, !$uconfig{'syspath'}));
+         "syspath", 1, $text{'os_syspath'}, !$uconfig{'syspath'}));
 
 # Shared library path
 if ($uconfig{'ld_env'}) {
-       print &ui_table_row($webmin::text{'os_ld_path'},
+       print &ui_table_row($text{'os_ld_path'},
                &ui_textarea("ld_path",
                  join("\n", split($path_separator, $uconfig{'ld_path'})),
                  5, 30));
@@ -65,8 +65,8 @@ if ($uconfig{'ld_env'}) {
 
 # Global environment variables
 &get_miniserv_config(\%miniserv);
-$atable = &ui_columns_start([ $webmin::text{'os_name'},
-                              $webmin::text{'os_value'} ]);
+$atable = &ui_columns_start([ $text{'os_name'},
+                              $text{'os_value'} ]);
 $i = 0;
 foreach $e (keys %miniserv) {
         if ($e =~ /^env_(\S+)$/ &&
@@ -81,10 +81,10 @@ foreach $e (keys %miniserv) {
 $atable .= &ui_columns_row([ &ui_textbox("name_$i", undef, 20),
                              &ui_textbox("value_$i", undef, 30) ]);
 $atable .= &ui_columns_end();
-print &ui_table_row($webmin::text{'os_envs'}, $atable);
+print &ui_table_row($text{'os_envs'}, $atable);
 
 print &ui_table_end();
-print &ui_form_end([ [ "", $webmin::text{'save'} ] ]);
+print &ui_form_end([ [ "", $text{'save'} ] ]);
 
 &ui_print_footer("", $text{'index_return'});
 

diff --git a/usermin/edit_referers.cgi b/usermin/edit_referers.cgi
index ddea26e..3f3eddd 100755 (executable)
--- a/usermin/edit_referers.cgi
+++ b/usermin/edit_referers.cgi
@@ -3,25 +3,25 @@
 # Display a list of trusted referers
 
 require './usermin-lib.pl';
-&ui_print_header(undef, $webmin::text{'referers_title'}, "");
+&ui_print_header(undef, $text{'referers_title'}, "");
 &get_usermin_config(\%ugconfig);
 
 print $text{'referers_desc'},"<br>\n";
 print "<form action=change_referers.cgi>\n";
 print "<table>\n";
 
-print "<tr> <td><b>$webmin::text{'referers_referer'}</b></td>\n";
+print "<tr> <td><b>$text{'referers_referer'}</b></td>\n";
 printf "<td><input type=radio name=referer value=0 %s> %s\n",
        $ugconfig{'referer'} ? '' : 'checked', $text{'yes'};
 printf "<input type=radio name=referer value=1 %s> %s</td> </tr>\n",
        $ugconfig{'referer'} ? 'checked' : '', $text{'no'};
 
-print "<tr> <td valign=top><b>$webmin::text{'referers_list'}</b></td>\n";
+print "<tr> <td valign=top><b>$text{'referers_list'}</b></td>\n";
 print "<td><textarea name=referers rows=5 cols=30>",
       join("\n", split(/\s+/, $ugconfig{'referers'})),"</textarea><br>\n";
 printf "<input type=checkbox name=referers_none value=1 %s> %s</td> </tr>\n",
        $ugconfig{'referers_none'} ? '' : 'checked',
-       $webmin::text{'referers_none'};
+       $text{'referers_none'};
 
 print "</table>\n";
 print "<input type=submit value='$text{'save'}'></form>\n";

diff --git a/usermin/edit_session.cgi b/usermin/edit_session.cgi
index 765ee71..d6e1984 100755 (executable)
--- a/usermin/edit_session.cgi
+++ b/usermin/edit_session.cgi
@@ -15,26 +15,26 @@ print "$text{'session_desc2'}<p>\n";
 
 print "<form action=change_session.cgi>\n";
 print "<table border>\n";
-print "<tr $tb> <td><b>$webmin::text{'session_header'}</b></td> </tr>\n";
+print "<tr $tb> <td><b>$text{'session_header'}</b></td> </tr>\n";
 print "<tr $cb> <td nowrap>\n";
 
 # Bad password delay
 printf "<input type=radio name=passdelay value=0 %s> %s<br>\n",
-       $miniserv{'passdelay'} ? '' : 'checked', $webmin::text{'session_pdisable'};
+       $miniserv{'passdelay'} ? '' : 'checked', $text{'session_pdisable'};
 printf "<input type=radio name=passdelay value=1 %s> %s<br>\n",
-       $miniserv{'passdelay'} ? 'checked' : '', $webmin::text{'session_penable'};
+       $miniserv{'passdelay'} ? 'checked' : '', $text{'session_penable'};
 
 # Block hosts
 printf "&nbsp;&nbsp;&nbsp;<input type=checkbox name=blockhost_on value=1 %s>\n",
        $miniserv{'blockhost_failures'} ? "checked" : "";
-print &webmin::text('session_blockhost',
+print &text('session_blockhost',
     &ui_textbox("blockhost_failures", $miniserv{'blockhost_failures'}, 4),
     &ui_textbox("blockhost_time", $miniserv{'blockhost_time'}, 4)),"<br>\n";
 
 # Block users
 printf "&nbsp;&nbsp;&nbsp;<input type=checkbox name=blockuser_on value=1 %s>\n",
        $miniserv{'blockuser_failures'} ? "checked" : "";
-print &webmin::text('session_blockuser',
+print &text('session_blockuser',
     &ui_textbox("blockuser_failures", $miniserv{'blockuser_failures'}, 4),
     &ui_textbox("blockuser_time", $miniserv{'blockuser_time'}, 4)),"<br>\n";
 
@@ -42,7 +42,7 @@ print &webmin::text('session_blockuser',
 eval "use Sys::Syslog qw(:DEFAULT setlogsock)";
 if (!$@) {
        printf "<input type=checkbox name=syslog value=1 %s> %s\n",
-               $miniserv{'syslog'} ? "checked" : "", $webmin::text{'session_syslog2'};
+               $miniserv{'syslog'} ? "checked" : "", $text{'session_syslog2'};
        }
 else {
        print "<input type=hidden name=syslog value='$miniserv{'syslog'}'>\n";
@@ -50,40 +50,40 @@ else {
 print "<p>\n";
 
 printf "<input type=radio name=session value=0 %s> %s<br>\n",
-       !$miniserv{'session'} ? "checked" : "", $webmin::text{'session_disable'};
+       !$miniserv{'session'} ? "checked" : "", $text{'session_disable'};
 printf "<input type=radio name=session value=1 %s> %s<br>\n",
-       $miniserv{'session'} ? "checked" : "", $webmin::text{'session_enable'};
+       $miniserv{'session'} ? "checked" : "", $text{'session_enable'};
 printf "&nbsp;&nbsp;&nbsp;<input type=checkbox name=logouttime_on value=1 %s>\n",
        $miniserv{'logouttime'} ? "checked" : "";
-print &webmin::text('session_logout',
+print &text('session_logout',
        "<input name=logouttime value='$miniserv{'logouttime'}' size=10>"),"<br>\n";
 #printf "&nbsp;&nbsp;&nbsp;<input type=checkbox name=locking value=1 %s>\n",
 #      $gconfig{'locking'} ? "checked" : "";
-#print "$webmin::text{'session_locking'}<br>\n";
+#print "$text{'session_locking'}<br>\n";
 printf "&nbsp;&nbsp;&nbsp;<input type=checkbox name=remember value=1 %s>\n",
        $uconfig{'noremember'} ? "" : "checked";
-print "$webmin::text{'session_remember'}<br>\n";
+print "$text{'session_remember'}<br>\n";
 print "&nbsp;&nbsp;&nbsp;";
 printf "<input type=checkbox name=realname value=1 %s>\n",
        $uconfig{'realname'} ? "checked" : "";
-print "$webmin::text{'session_realname'}<br>\n";
+print "$text{'session_realname'}<br>\n";
 if ($ver >= 1.153) {
        printf "&nbsp;&nbsp;&nbsp;<input type=checkbox name=utmp value=1 %s>\n",
                $miniserv{'utmp'} ? "checked" : "";
-       print "$webmin::text{'session_utmp'}<br>\n";
+       print "$text{'session_utmp'}<br>\n";
        }
 printf "&nbsp;&nbsp;&nbsp;<input type=radio name=banner_def value=1 %s> %s\n",
-       $uconfig{'loginbanner'} ? "" : "checked", $webmin::text{'session_banner1'};
+       $uconfig{'loginbanner'} ? "" : "checked", $text{'session_banner1'};
 printf "<input type=radio name=banner_def value=0 %s> %s\n",
-       $uconfig{'loginbanner'} ? "checked" : "", $webmin::text{'session_banner0'};
+       $uconfig{'loginbanner'} ? "checked" : "", $text{'session_banner0'};
 printf "<input name=banner size=30 value='%s'> %s<br>\n",
        $uconfig{'loginbanner'}, &file_chooser_button("banner");
 print "<p>\n";
 
 printf "<input type=radio name=localauth value=0 %s> %s<br>\n",
-       !$miniserv{'localauth'} ? "checked" : "", $webmin::text{'session_localoff'};
+       !$miniserv{'localauth'} ? "checked" : "", $text{'session_localoff'};
 printf "<input type=radio name=localauth value=1 %s> %s<br>\n",
-       $miniserv{'localauth'} ? "checked" : "", $webmin::text{'session_localon'};
+       $miniserv{'localauth'} ? "checked" : "", $text{'session_localon'};
 print "<p>\n";
 
 # Authentication mode
@@ -93,7 +93,7 @@ $authmode = $users[0]->{'pass'} eq 'e' ? 2 :
 printf "<input type=radio name=authmode value=0 %s> %s<br>\n",
        $authmode == 0 ? "checked" : "", $text{'session_authmode0'};
 print "&nbsp;&nbsp;&nbsp;",
-       &ui_checkbox("pam_conv", 1, $webmin::text{'session_pamconv'},
+       &ui_checkbox("pam_conv", 1, $text{'session_pamconv'},
                     $miniserv{'pam_conv'}),"<br>\n";
 printf "<input type=radio name=authmode value=1 %s>\n",
        $authmode == 1 ? "checked" : "";
@@ -108,9 +108,9 @@ printf "<input name=extauth size=30 value='%s'><p>\n",
        $miniserv{'extauth'};
 
 # Unix password change
-print &ui_oneradio("cmd_def", 1, $webmin::text{'session_cmddef1'},
+print &ui_oneradio("cmd_def", 1, $text{'session_cmddef1'},
                   !$gconfig{'passwd_cmd'}),"<br>\n";
-print &ui_oneradio("cmd_def", 0, $webmin::text{'session_cmddef0'},
+print &ui_oneradio("cmd_def", 0, $text{'session_cmddef0'},
                   $gconfig{'passwd_cmd'})," ",
       &ui_textbox("cmd", $gconfig{'passwd_cmd'}, 40),"<p>\n";
 
@@ -119,7 +119,7 @@ if ($ver >= 1.047 && $miniserv{'passwd_cindex'} ne '') {
        foreach $m (0 .. 2) {
                printf "<input type=radio name=passwd_mode value=%d %s> %s\n",
                        $m, $miniserv{'passwd_mode'} == $m ? "checked" : "",
-                       $webmin::text{'session_pmode'.$m};
+                       $text{'session_pmode'.$m};
                print $m == 2 ? "<p>\n" : "<br>\n";
                }
        }

diff --git a/usermin/edit_ssl.cgi b/usermin/edit_ssl.cgi
index f082a97..7f6b87c 100755 (executable)
--- a/usermin/edit_ssl.cgi
+++ b/usermin/edit_ssl.cgi
@@ -18,45 +18,45 @@ else {
 
        print "<form action=change_ssl.cgi>\n";
        print "<table border>\n";
-       print "<tr $tb> <td><b>$webmin::text{'ssl_header'}</b></td> </tr>\n";
+       print "<tr $tb> <td><b>$text{'ssl_header'}</b></td> </tr>\n";
        print "<tr $cb> <td><table>\n";
 
-       print "<tr> <td><b>$webmin::text{'ssl_on'}</b></td>\n";
+       print "<tr> <td><b>$text{'ssl_on'}</b></td>\n";
        printf "<td><input type=radio name=ssl value=1 %s> %s\n",
                $miniserv{'ssl'} ? "checked" : "", $text{'yes'};
        printf "<input type=radio name=ssl value=0 %s> %s</td> </tr>\n",
                $miniserv{'ssl'} ? "" : "checked", $text{'no'};
 
-       print "<tr> <td><b>$webmin::text{'ssl_key'}</b></td>\n";
+       print "<tr> <td><b>$text{'ssl_key'}</b></td>\n";
        printf "<td><input name=key size=40 value='%s'> %s</td> </tr>\n",
                $miniserv{'keyfile'}, &file_chooser_button("key");
 
-       print "<tr> <td valign=top><b>$webmin::text{'ssl_cert'}</b></td>\n";
+       print "<tr> <td valign=top><b>$text{'ssl_cert'}</b></td>\n";
        printf "<td><input type=radio name=cert_def value=1 %s> %s<br>\n",
                $miniserv{'certfile'} ? "" : "checked",
-               $webmin::text{'ssl_cert_def'};
+               $text{'ssl_cert_def'};
        printf "<input type=radio name=cert_def value=0 %s> %s\n",
                $miniserv{'certfile'} ? "checked" : "",
-               $webmin::text{'ssl_cert_oth'};
+               $text{'ssl_cert_oth'};
        printf "<input name=cert size=40 value='%s'> %s</td> </tr>\n",
                $miniserv{'certfile'}, &file_chooser_button("cert");
 
-       print "<tr> <td><b>$webmin::text{'ssl_redirect'}</b></td>\n";
+       print "<tr> <td><b>$text{'ssl_redirect'}</b></td>\n";
        printf "<td><input type=radio name=ssl_redirect value=1 %s> %s\n",
                $miniserv{'ssl_redirect'} ? "checked" : "", $text{'yes'};
        printf "<input type=radio name=ssl_redirect value=0 %s> %s</td></tr>\n",
                $miniserv{'ssl_redirect'} ? "" : "checked", $text{'no'};
 
-       print "<tr> <td><b>$webmin::text{'ssl_version'}</b></td>\n";    
+       print "<tr> <td><b>$text{'ssl_version'}</b></td>\n";    
        print "<td>",&ui_opt_textbox("version", $miniserv{'ssl_version'}, 4,
-                                    $webmin::text{'ssl_auto'}),"</td> </tr>\n";
+                                    $text{'ssl_auto'}),"</td> </tr>\n";
 
-       print "<tr> <td><b>$webmin::text{'ssl_cipher_list'}</b></td>\n";
+       print "<tr> <td><b>$text{'ssl_cipher_list'}</b></td>\n";
        print "<td>",&ui_opt_textbox("cipher_list",
                        $miniserv{'ssl_cipher_list'}, 30,
-                       $webmin::text{'ssl_auto'})."</td> </tr>\n";
+                       $text{'ssl_auto'})."</td> </tr>\n";
 
-       print "<tr> <td valign=top><b>$webmin::text{'ssl_extracas'}</b></td>\n";
+       print "<tr> <td valign=top><b>$text{'ssl_extracas'}</b></td>\n";
        print "<td><textarea name=extracas rows=3 cols=40>";
        foreach $e (split(/\s+/, $miniserv{'extracas'})) {
                print "$e\n";
@@ -69,12 +69,12 @@ else {
        print &ui_hr();
 
        # Table listing per-IP SSL certs
-       print "$webmin::text{'ssl_ipkeys'}<p>\n";
+       print "$text{'ssl_ipkeys'}<p>\n";
        @ipkeys = &webmin::get_ipkeys(\%miniserv);
        if (@ipkeys) {
-               print &ui_columns_start([ $webmin::text{'ssl_ips'},
-                                         $webmin::text{'ssl_key'},
-                                         $webmin::text{'ssl_cert'} ]);
+               print &ui_columns_start([ $text{'ssl_ips'},
+                                         $text{'ssl_key'},
+                                         $text{'ssl_cert'} ]);
                foreach $k (@ipkeys) {
                        print &ui_columns_row([
                                "<a href='edit_ipkey.cgi?idx=$k->{'index'}'>".
@@ -86,9 +86,9 @@ else {
                print &ui_columns_end();
                }
        else {
-               print "<b>$webmin::text{'ssl_ipkeynone'}</b><p>\n";
+               print "<b>$text{'ssl_ipkeynone'}</b><p>\n";
                }
-       print "<a href='edit_ipkey.cgi?new=1'>$webmin::text{'ssl_addipkey'}</a><p>\n";
+       print "<a href='edit_ipkey.cgi?new=1'>$text{'ssl_addipkey'}</a><p>\n";
 
        # SSL key generation form
        print &ui_hr();
@@ -103,57 +103,57 @@ else {
 
        print "<form action=newkey.cgi>\n";
        print "<table border>\n";
-       print "<tr $tb> <td><b>$webmin::text{'ssl_header1'}</b></td> </tr>\n";
+       print "<tr $tb> <td><b>$text{'ssl_header1'}</b></td> </tr>\n";
        print "<tr $cb> <td><table>\n";
-       print "<tr> <td><b>$webmin::text{'ssl_cn'}</b></td>\n";
+       print "<tr> <td><b>$text{'ssl_cn'}</b></td>\n";
        print "<td><input type=radio name=commonName_def value=1 checked> ",
-             "$webmin::text{'ssl_all'}\n";
+             "$text{'ssl_all'}\n";
        print "<input type=radio name=commonName_def value=0>\n";
        $host = $ENV{'HTTP_HOST'};
        $host =~ s/:.*//;
        print "<input name=commonName size=30 value='$host'></td> </tr>\n";
 
-       print "<tr> <td><b>$webmin::text{'ca_email'}</b></td>\n";
+       print "<tr> <td><b>$text{'ca_email'}</b></td>\n";
        printf "<td><input name=emailAddress size=30 value='%s'></td> </tr>\n",
                "usermin\@".&get_system_hostname();
 
-       print "<tr> <td><b>$webmin::text{'ca_ou'}</b></td>\n";
+       print "<tr> <td><b>$text{'ca_ou'}</b></td>\n";
        print "<td><input name=organizationalUnitName size=30></td> </tr>\n";
 
        $hostname = &get_system_hostname();
-       print "<tr> <td><b>$webmin::text{'ca_o'}</b></td>\n";
+       print "<tr> <td><b>$text{'ca_o'}</b></td>\n";
        print "<td><input name=organizationName size=30 ",
              "value='Usermin Webserver on $hostname'></td> </tr>\n";
 
-       print "<tr> <td><b>$webmin::text{'ca_city'}</b></td>\n";
+       print "<tr> <td><b>$text{'ca_city'}</b></td>\n";
        print "<td><input name=cityName size=30></td> </tr>\n";
 
-       print "<tr> <td><b>$webmin::text{'ca_sp'}</b></td>\n";
+       print "<tr> <td><b>$text{'ca_sp'}</b></td>\n";
        print "<td><input name=stateOrProvinceName size=15></td> </tr>\n";
 
-       print "<tr> <td><b>$webmin::text{'ca_c'}</b></td>\n";
+       print "<tr> <td><b>$text{'ca_c'}</b></td>\n";
        print "<td><input name=countryName size=2></td> </tr>\n";
 
-       print "<tr> <td><b>$webmin::text{'ssl_size'}</b></td>\n";
+       print "<tr> <td><b>$text{'ssl_size'}</b></td>\n";
        print "<td><input type=radio name=size_def value=1 checked> ",
              "$text{'default'} ($default_key_size)\n";
        print "<input type=radio name=size_def value=0> ",
-             "$webmin::text{'ssl_custom'}\n";
-       print "<input name=size size=6> $webmin::text{'ssl_bits'}</td> </tr>\n";
+             "$text{'ssl_custom'}\n";
+       print "<input name=size size=6> $text{'ssl_bits'}</td> </tr>\n";
 
-       print "<tr> <td><b>$webmin::text{'ssl_days'}</b></td>\n";
+       print "<tr> <td><b>$text{'ssl_days'}</b></td>\n";
        print "<td><input name=days size=8 value='1825'></td> </tr>\n";
 
-       print "<tr> <td><b>$webmin::text{'ssl_newfile'}</b></td>\n";
+       print "<tr> <td><b>$text{'ssl_newfile'}</b></td>\n";
        printf "<td><input name=newfile size=40 value='%s'></td> </tr>\n",
                "$config{'usermin_dir'}/miniserv.pem";
 
-       print "<tr> <td><b>$webmin::text{'ssl_usenew'}</b></td> <td>\n";
+       print "<tr> <td><b>$text{'ssl_usenew'}</b></td> <td>\n";
        print "<input type=radio name=usenew value=1 checked> $text{'yes'}\n";
        print "<input type=radio name=usenew value=0> $text{'no'}</td> </tr>\n";
 
        print "</table></td></tr></table>\n";
-       print "<input type=submit value='$webmin::text{'ssl_create'}'></form>\n";
+       print "<input type=submit value='$text{'ssl_create'}'></form>\n";
        }
 
 &ui_print_footer("", $text{'index_return'});

diff --git a/usermin/edit_themes.cgi b/usermin/edit_themes.cgi
index 5373e34..82d5326 100755 (executable)
--- a/usermin/edit_themes.cgi
+++ b/usermin/edit_themes.cgi
@@ -66,19 +66,19 @@ print "$text{'themes_desc4'}<p>\n";
 print &ui_form_start("export_mod.cgi/theme.ubt.gz");
 print "<table>\n";
 
-print "<tr> <td valign=top><b>$webmin::text{'themes_exportmods'}</b></td>\n";
+print "<tr> <td valign=top><b>$text{'themes_exportmods'}</b></td>\n";
 print "<td>",&ui_select("mod", undef,
        [ map { [ $_->{'dir'}, $_->{'desc'} ] } @themes ], 5, 1),
        "</td> </tr>\n";
 
-print "<tr> <td valign=top><b>$webmin::text{'mods_exportto'}</b></td>\n";
+print "<tr> <td valign=top><b>$text{'mods_exportto'}</b></td>\n";
 print "<td>",&ui_radio("to", 0,
-       [ [ 0, $webmin::text{'mods_exportshow'}."<br>" ],
-         [ 1, &webmin::text('mods_exportfile',
+       [ [ 0, $text{'mods_exportshow'}."<br>" ],
+         [ 1, &text('mods_exportfile',
                     &ui_textbox("file", undef, 40)) ] ]),"</td> </tr>\n";
 
 print "</table>\n";
-print &ui_form_end([ [ "ok", $webmin::text{'themes_exportok'} ] ]);
+print &ui_form_end([ [ "ok", $text{'themes_exportok'} ] ]);
 
 &ui_print_footer("", $text{'index_return'});
 

diff --git a/usermin/edit_ui.cgi b/usermin/edit_ui.cgi
index f76137f..1f515d5 100755 (executable)
--- a/usermin/edit_ui.cgi
+++ b/usermin/edit_ui.cgi
@@ -16,36 +16,36 @@ print &ui_table_start($text{'ui_header'}, undef, 2, [ "width=30%" ]);
 for($i=0; $i<@webmin::cs_names; $i++) {
        $cd = $webmin::cs_codes[$i];
        print &ui_table_row($webmin::cs_names[$i],
-               &ui_opt_textbox($cd, $uconfig{$cd}, 8, $webmin::text{'ui_default'},
-                 $webmin::text{'ui_rgb'}));
+               &ui_opt_textbox($cd, $uconfig{$cd}, 8, $text{'ui_default'},
+                 $text{'ui_rgb'}));
        }
 
-print &ui_table_row($webmin::text{'ui_texttitles'},
+print &ui_table_row($text{'ui_texttitles'},
       &ui_yesno_radio("texttitles", int($uconfig{'texttitles'})));
 
-print &ui_table_row($webmin::text{'ui_sysinfo'},
+print &ui_table_row($text{'ui_sysinfo'},
       &ui_select("sysinfo", int($uconfig{'sysinfo'}),
-      [ map { [ $_, $webmin::text{'ui_sysinfo'.$_} ] } (0, 1, 4, 2, 3) ]));
+      [ map { [ $_, $text{'ui_sysinfo'.$_} ] } (0, 1, 4, 2, 3) ]));
 
 print &ui_table_row($text{'ui_hostnamemode'},
       &ui_select("hostnamemode", int($uconfig{'hostnamemode'}),
       [ map { [ $_, $text{'ui_hnm'.$_} ] } (0 .. 3) ]).
       " ".&ui_textbox("hostnamedisplay", $uconfig{'hostnamedisplay'}, 20));
 
-print &ui_table_row($webmin::text{'ui_showlogin'},
+print &ui_table_row($text{'ui_showlogin'},
       &ui_yesno_radio("showlogin", $uconfig{'showlogin'}));
 
-print &ui_table_row($webmin::text{'startpage_nohost'},
+print &ui_table_row($text{'startpage_nohost'},
       &ui_radio("nohostname", $uconfig{'nohostname'} ? 1 : 0,
                  [ [ 0, $text{'yes'} ], [ 1, $text{'no'} ] ]));
 
-print &ui_table_row($webmin::text{'startpage_gotoone'},
+print &ui_table_row($text{'startpage_gotoone'},
       &ui_yesno_radio("gotoone", int($uconfig{'gotoone'})));
 
 @modules = &list_modules();
-print &ui_table_row($webmin::text{'startpage_gotomodule'},
+print &ui_table_row($text{'startpage_gotomodule'},
       &ui_select("gotomodule", $uconfig{'gotomodule'},
-      [ [ "", $webmin::text{'startpage_gotonone'} ],
+      [ [ "", $text{'startpage_gotonone'} ],
       map { [ $_->{'dir'}, $_->{'desc'} ] }
           sort { $a->{'desc'} cmp $b->{'desc'} } @modules ]));
 
@@ -71,7 +71,7 @@ print &ui_table_row($text{'ui_tabs'},
        &ui_radio("notabs", $uconfig{'notabs'} ? 1 : 0,
          [ [ 0, $text{'yes'} ], [ 1, $text{'no'} ] ]));
 
-print &ui_table_row($webmin::text{'ui_dateformat'},
+print &ui_table_row($text{'ui_dateformat'},
        &ui_select("dateformat", $uconfig{'dateformat'} || "dd/mon/yyyy",
          [ map { [ $_, $text{'ui_dateformat_'.$_} ] }
            @webmin::webmin_date_formats ]));

diff --git a/usermin/edit_upgrade.cgi b/usermin/edit_upgrade.cgi
index cba2172..044b1a5 100755 (executable)
--- a/usermin/edit_upgrade.cgi
+++ b/usermin/edit_upgrade.cgi
@@ -35,7 +35,7 @@ if (!$mode && !$dir) {
                "$text{'upgrade_delete'}<br>\n";
        }
 print "<input type=checkbox name=force value=1> ",
-       "$webmin::text{'upgrade_force'}<br>\n";
+       "$text{'upgrade_force'}<br>\n";
 print ui_table_end();
 print ui_form_end([ [ "upgrade", $text{'upgrade_ok'} ] ]);
 
@@ -80,7 +80,7 @@ printf "<input name=other size=30 value='%s'><br>\n",
 
 if ($config{'cron_mode'} == 0) {
        $upmins = sprintf "%2.2d", $config{'upmins'};
-       print &webmin::text('update_sched2',
+       print &text('update_sched2',
                    "<input name=hour size=2 value='$config{'uphour'}'>",
                    "<input name=mins size=2 value='$upmins'>",
                    "<input name=days size=3 value='$config{'updays'}'>"),"<br>\n";

diff --git a/usermin/export_mod.cgi b/usermin/export_mod.cgi
index 05f8ffb..076ee7f 100755 (executable)
--- a/usermin/export_mod.cgi
+++ b/usermin/export_mod.cgi
@@ -3,14 +3,14 @@
 
 require './usermin-lib.pl';
 &ReadParse();
-&error_setup($webmin::text{'export_err'});
+&error_setup($text{'export_err'});
 @mods = split(/\0/, $in{'mod'});
-@mods || &error($webmin::text{'delete_enone'});
+@mods || &error($text{'delete_enone'});
 
 # Make sure we have the needed commands
-&has_command("tar") || &error(&webmin::text('export_ecmd', "<tt>tar</tt>"));
+&has_command("tar") || &error(&text('export_ecmd', "<tt>tar</tt>"));
 &has_command("gzip") || &error(&twebmin::ext('export_ecmd', "<tt>gzip</tt>"));
-$in{'to'} == 0 || $in{'file'} =~ /^\// || &error($webmin::text{'export_efile'});
+$in{'to'} == 0 || $in{'file'} =~ /^\// || &error($text{'export_efile'});
 
 # Make the tar.gz file
 $temp = $in{'to'} ? $in{'file'} : &transname();
@@ -37,11 +37,11 @@ if ($in{'to'} == 0) {
        }
 else {
        # Tell the user
-       &ui_print_header(undef, $webmin::text{'export_title'}, "");
+       &ui_print_header(undef, $text{'export_title'}, "");
 
-       print &webmin::text('export_done', "<tt>$in{'file'}</tt>"),"<p>\n";
+       print &text('export_done', "<tt>$in{'file'}</tt>"),"<p>\n";
 
-       &ui_print_footer("/$module_name/edit_mods.cgi", $webmin::text{'mods_return'},
+       &ui_print_footer("/$module_name/edit_mods.cgi", $text{'mods_return'},
                         "", $text{'index_return'});
        }
 

diff --git a/usermin/install_mod.cgi b/usermin/install_mod.cgi
index 7b83da2..b665c09 100755 (executable)
--- a/usermin/install_mod.cgi
+++ b/usermin/install_mod.cgi
@@ -84,7 +84,7 @@ for($i=0; $i<@mdescs; $i++) {
                }
        }
 print "</ul><p>\n";
-&ui_print_footer("edit_mods.cgi?mode=install", $webmin::text{'mods_return'},
+&ui_print_footer("edit_mods.cgi?mode=install", $text{'mods_return'},
                 "", $text{'index_return'});
 
 sub inst_error

diff --git a/usermin/newkey.cgi b/usermin/newkey.cgi
index 323afaa..8f63ee7 100755 (executable)
--- a/usermin/newkey.cgi
+++ b/usermin/newkey.cgi
@@ -9,18 +9,18 @@ $access{'ssl'} || &error($text{'acl_ecannot'});
 # Validate inputs
 &error_setup($text{'newkey_err'});
 $in{'commonName_def'} || $in{'commonName'} =~ /^[A-Za-z0-9\.\-\*]+$/ ||
-       &error($webmin::text{'newkey_ecn'});
-$in{'newfile'} || &error($webmin::text{'newkey_efile'});
+       &error($text{'newkey_ecn'});
+$in{'newfile'} || &error($text{'newkey_efile'});
 $in{'size_def'} || $in{'size'} =~ /^\d+$/ ||
-       &error($webmin::text{'newkey_esize'});
-$in{'days'} =~ /^\d+$/ || &error($webmin::text{'newkey_edays'});
+       &error($text{'newkey_esize'});
+$in{'days'} =~ /^\d+$/ || &error($text{'newkey_edays'});
 
-&ui_print_header(undef, $webmin::text{'newkey_title'}, "");
+&ui_print_header(undef, $text{'newkey_title'}, "");
 
 %aclconfig = &foreign_config('acl');
 &foreign_require("acl", "acl-lib.pl");
 if (!($cmd = &acl::get_ssleay())) {
-       print "<p>",&webmin::text('newkey_ecmd',
+       print "<p>",&text('newkey_ecmd',
                        "<tt>$aclconfig{'ssleay'}</tt>",
                        "$gconfig{'webprefix'}/config.cgi?acl"),"<p>\n";
        &ui_print_footer("", $text{'index_return'});
@@ -45,7 +45,7 @@ $rv = $?;
 $out = `cat $outtemp`;
 &unlink_file($outtemp);
 if (!-r $ctemp || !-r $ktemp || $?) {
-       print "<p>$webmin::text{'newkey_essl'}<br>\n";
+       print "<p>$text{'newkey_essl'}<br>\n";
        print "<pre>$out</pre>\n";
        &ui_print_footer("", $text{'index_return'});
        exit;
@@ -55,7 +55,7 @@ if (!-r $ctemp || !-r $ktemp || $?) {
 &unlink_file($ctemp);
 &unlink_file($ktemp);
 if ($catout || $?) {
-       print "<p>$webmin::text{'newkey_ecat'}<br>\n";
+       print "<p>$text{'newkey_ecat'}<br>\n";
        print "<pre>$catout</pre>\n";
        &ui_print_footer("", $text{'index_return'});
        exit;

diff --git a/usermin/save_ipkey.cgi b/usermin/save_ipkey.cgi
index d7b2d33..6b11648 100755 (executable)
--- a/usermin/save_ipkey.cgi
+++ b/usermin/save_ipkey.cgi
@@ -18,13 +18,13 @@ if ($in{'delete'}) {
        }
 else {
        # Validate inputs
-       &error_setup($webmin::text{'ipkey_err'});
+       &error_setup($text{'ipkey_err'});
        @ips = split(/\s+/, $in{'ips'});
        foreach $i (@ips) {
                &check_ipaddress($i) ||
-                       &error(&webmin::text('ipkey_eip', $i));
+                       &error(&text('ipkey_eip', $i));
                }
-       @ips || &error(&webmin::text('ipkey_eips'));
+       @ips || &error(&text('ipkey_eips'));
        $ipkey->{'ips'} = \@ips;
        &webmin::validate_key_cert($in{'key'}, $in{'cert_def'} ? undef : $in{'cert'});
        $ipkey->{'key'} = $in{'key'};

diff --git a/usermin/usermin-lib.pl b/usermin/usermin-lib.pl
index aaff002..4fffeb3 100644 (file)
--- a/usermin/usermin-lib.pl
+++ b/usermin/usermin-lib.pl
@@ -9,13 +9,14 @@ Functions for configuring Usermin running on this system. Example usage :
 
 =cut
 
-do '../web-lib.pl';
+BEGIN { push(@INC, ".."); };
+use WebminCore;
 &init_config();
-do '../ui-lib.pl';
 %access = &get_module_acl();
 $access{'upgrade'} = 0 if (&is_readonly_mode());       # too hard to fake
-&foreign_require("webmin", "webmin-lib.pl");
-&foreign_require("acl", "acl-lib.pl");
+&foreign_require("webmin");
+&foreign_require("acl");
+%text = ( %webmin::text, %text );
 
 $usermin_miniserv_config = "$config{'usermin_dir'}/miniserv.conf";
 $usermin_config = "$config{'usermin_dir'}/config";
@@ -762,7 +763,7 @@ if ($minfo{'clone'}) {
        if ($ugconfig{'theme'}) {
                &unlink_logged("$miniserv{'root'}/$ugconfig{'theme'}/$m");
                }
-       $mdesc = &webmin::text('delete_desc1', $minfo{'desc'}, $minfo{'clone'});
+       $mdesc = &text('delete_desc1', $minfo{'desc'}, $minfo{'clone'});
        }
 else {
        # Delete any clones of this module
@@ -786,7 +787,7 @@ else {
 
        # Deleting the real module
        local $size = &disk_usage_kb($mdir);
-       $mdesc = &webmin::text('delete_desc2', "<b>$minfo{'desc'}</b>",
+       $mdesc = &text('delete_desc2', "<b>$minfo{'desc'}</b>",
                           "<tt>$mdir</tt>", $size);
        if ($type eq 'rpm') {
                # This module was installed from an RPM .. rpm -e it