New version bump

Add httpOnly to cookies on login page. Solves #4565.

CHANGELOG

@@ -208,3 +208,16 @@ Catalan updates, thanks to Jaume Badiella.
 Added additional protected against Shellshock exploits made via the Webmin webserver.
 ---- Changes since 1.710 ----
 SSL v2 and v3 are now disabled by default at Webmin install time, to block the POODLE attack. They can be re-enabled on the SSL Encryption page of the Webmin Configuration module.
+---- Changes since 1.720 ----
+Deprecated the old blue-theme in favor of the new gray-theme.
+Catalan translation updates from Jaume Badiella.
+More German translation updates, thanks to Raymond Vetter.
+---- Changes since 1.730 ----
+More German translation updates, thanks to Raymond Vetter.
+Norwegian updates, thanks to Stein-Aksel Basma.
+The awesome new Authentic Theme by Ilia Rostovtsev is now included in the Webmin package.
+Catalan translation updates from Jaume Badiella.
+---- Changes since 1.740 ----
+Norwegian updates, thanks to Stein-Aksel Basma.
+Catalan translation updates from Jaume Badiella.
+More German translation updates, thanks to Raymond Vetter.

README

@@ -1,4 +1,4 @@
-Webmin Version 1.720
+Webmin Version 1.750
 --------------------
 Webmin is a web-based interface for system administration for Unix. 
 Using any browser that supports tables and forms, you can setup user

acl/acl-lib.pl

@@ -462,7 +462,10 @@ else {
 	my $deny = $user->{'deny'} || "";
 	$deny =~ s/:/;/g;
 	&print_tempfile($fh,
-		"$user->{'name'}:$user->{'pass'}:$user->{'sync'}:$user->{'cert'}:",
+		$user->{'name'},":",
+		$user->{'pass'},":",
+		($user->{'sync'} || ""),":",
+		($user->{'cert'} || ""),":",
 		($allow ? "allow $allow" :
 		 $deny ? "deny $deny" : ""),":",
 		join(" ", @times),":",
@@ -647,8 +650,10 @@ else {
 		if ($l =~ /^([^:]+):([^:]*)/ && $1 eq $username) {
 			&add_old_password($user, "$2", \%miniserv);
 			&print_tempfile($fh,
-				"$user->{'name'}:$user->{'pass'}:",
-				"$user->{'sync'}:$user->{'cert'}:",
+				$user->{'name'},":",
+				$user->{'pass'},":",
+				($user->{'sync'} || ""),":",
+				($user->{'cert'} || ""),":",
 				($allow ? "allow $allow" :
 				 $deny ? "deny $deny" : ""),":",
 				join(" ", @times),":",
@@ -732,7 +737,7 @@ if ($username ne $user->{'name'} && !$user->{'proto'}) {
 
 if ($miniserv{'session'} && $username ne $user->{'name'}) {
 	# Modify all sessions for the renamed user
-	&rename_session_user(\&miniserv, $username, $user->{'name'});
+	&rename_session_user(\%miniserv, $username, $user->{'name'});
 	}
 }
 

acl/useradmin_update.pl

@@ -1,7 +1,9 @@
 
 use strict;
 use warnings;
-do "acl-lib.pl";
+if (!$main::done_foreign_require{"acl","acl-lib.pl"}) {
+	do "acl-lib.pl";
+	}
 our (%config, $config_directory);
 
 # useradmin_create_user(&details)
@@ -81,7 +83,7 @@ if ($u && $u->{'sync'}) {
 	}
 
 
-if ($_[0]->{'user'} ne $_[0]->{'olduser'}) {
+if ($_[0]->{'olduser'} && $_[0]->{'user'} ne $_[0]->{'olduser'}) {
 	# Check other users' acl module acls
 	foreach my $u (&list_users()) {
 		my %uaccess = &get_module_acl($u->{'name'});

apache/apache-lib.pl

@@ -1101,19 +1101,20 @@ close(USERS);
 # some context (global, virtual, directory or htaccess)
 sub config_icons
 {
+local ($ctx, $prog) = @_;
 local($m, $func, $e, %etype, $i, $c);
 foreach $m (sort { $a cmp $b } (keys %httpd_modules)) {
         $func = $m."_directives";
 	if (defined(&$func)) {
 		foreach $e (&$func($httpd_modules{$m})) {
-			if ($e->{$_[0]}) { $etype{$e->{'type'}}++; }
+			if ($e->{$ctx}) { $etype{$e->{'type'}}++; }
 			}
 		}
         }
 local (@titles, @links, @icons);
 for($i=0; $text{"type_$i"}; $i++) {
 	if ($etype{$i} && $access_types{$i}) {
-		push(@links, $_[1]."type=$i");
+		push(@links, $prog."type=$i");
 		push(@titles, $text{"type_$i"});
 		push(@icons, "images/type_icon_$i.gif");
 		}
@@ -1843,7 +1844,8 @@ if ($config{'link_dir'}) {
 	opendir(LINKDIR, $config{'link_dir'});
 	foreach my $f (readdir(LINKDIR)) {
 		if ($f ne "." && $f ne ".." &&
-		    (&resolve_links($config{'link_dir'}."/".$f) eq $file ||
+		    (&simplify_path(
+		       &resolve_links($config{'link_dir'}."/".$f)) eq $file ||
 		     $short eq $f)) {
 			&unlink_logged($config{'link_dir'}."/".$f);
 			}

apache/config-suse-linux-9.1-*

@@ -3,9 +3,9 @@ httpd_dir=/srv/www
 httpd_conf=/etc/apache2/httpd.conf
 mime_types=/etc/apache2/mime.types
 httpd_path=/usr/sbin/httpd2-prefork
-start_cmd=/etc/init.d/apache2 start
-stop_cmd=/etc/init.d/apache2 stop
-apply_cmd=/etc/init.d/apache2 restart
+start_cmd=service apache2 start
+stop_cmd=service apache2 stop
+apply_cmd=service apache2 restart
 show_order=0
 max_servers=100
 test_config=1

apache/create_virt.cgi

@@ -74,15 +74,14 @@ if (!$in{'name_def'}) {
 !$in{'root'} || &allowed_auth_file($in{'root'}) ||
 	&error(&text('cvirt_eroot3', $in{'root'}));
 
-if ($in{'root'} && !-d $in{'root'}) {
+if ($in{'root'} && !-e $in{'root'}) {
 	# create the document root
 	mkdir($in{'root'}, 0755) ||
 		&error(&text('cvirt_eroot2', $in{'root'}, $!));
 	$user = &find_directive("User", $conf);
 	$group = &find_directive("Group", $conf);
-	$uid = $user ? getpwnam($user) : 0;
-	$gid = $group ? getgrnam($group) : 0;
-	chown($uid, $gid, $in{'root'});
+	$user || &error($text{'cvirt_eroot4'});
+	&set_ownership_permissions($user, $group, undef, $in{'root'});
 	}
 
 # find file to add to
@@ -215,15 +214,23 @@ push(@mems, @cmems);
 
 if ($in{'adddir'} && $in{'root'}) {
 	# Add a <Directory> section for the root
-	push(@mems, { 'name' => 'Directory',
-		      'value' => "\"$in{'root'}\"",
-		      'type' => 1,
-		      'members' => [
+	$dirsect = { 'name' => 'Directory',
+		     'value' => "\"$in{'root'}\"",
+		     'type' => 1,
+		     'members' => [
 			{ 'name' => 'allow',
 			  'value' => 'from all' },
 			{ 'name' => 'Options',
-			  'value' => '+Indexes' },
-			] });
+			  'value' => 'None' },
+			],
+		   };
+	if ($httpd_modules{'core'} >= 2.4) {
+		# Apache 2.4+ needs a 'Require all granted' line
+		push(@{$dirsect->{'members'}},
+		     { 'name' => 'Require',
+		       'value' => 'all granted' });
+		}
+	push(@mems, $dirsect);
 	}
 
 # Save to the file

apache/index.cgi

@@ -417,8 +417,6 @@ if ($access{'create'}) {
 		  &ui_checkbox("nv", 1, $text{'index_nv'}, 1)."<br>" : "").
 		&ui_checkbox("listen", 1, $text{'index_listen'}, 1));
 
-	# Work out sensible default port
-
 	# Port
 	print &ui_table_row($text{'index_port'},
 		&choice_input(@nvports ? 2 : 0,
@@ -434,8 +432,16 @@ if ($access{'create'}) {
 		&ui_checkbox("adddir", 1, $text{'index_adddir'}, 1));
 
 	# Server name
-	print &ui_table_row($text{'index_name'},
-		&opt_input("", "name", $text{'index_auto'}, 30));
+	if ($access{'virts'} eq '*') {
+		print &ui_table_row($text{'index_name'},
+			&opt_input("", "name", $text{'index_auto'}, 30));
+		}
+	else {
+		# Require that non-root users enter a server name, or else it
+		# will be impossible to grant access to the new virtualhost
+		print &ui_table_row($text{'index_name'},
+			&ui_textbox("name", "", 30));
+		}
 
 	# Add to file
 	print &ui_table_row($text{'index_file'},

apache/lang/ca

@@ -67,6 +67,7 @@ cvirt_ename='$1' no
 cvirt_eroot1=Has d'introduir l'arrel dels documents
 cvirt_eroot2=No s'ha pogut crear el directori '$1': $2
 cvirt_eroot3=No tens permís per utilitzar el directori arrel '$1'
+cvirt_eroot4=No hi ha cap usuari definit a la configuracio d'Apache
 cvirt_etaken=Ja existeix un servidor virtual amb el mateix nom i el mateix port
 cvirt_efile=No s'ha pogut escriure a $1: $2
 cvirt_emissing=S'ha afegit el nou servidor virtual a $1, però Apache no està utilitzant aquest fitxer. Comprova la <a href='$2'>configuració del mòdul</a> i assegura't que el 'Fitxer o directori on s'afegeixen els servidors virtuals' és correcte.
@@ -359,6 +360,8 @@ core_ehlimit=$1 no
 core_dport=Port per defecte:
 core_address=Adreça
 core_port=Port
+core_portname=Protocol
+core_protoany=&lt;Qualsevol&gt;
 core_listen=Escolta les adreces i els ports
 core_eaddress='$1' no és una adreça vàlida
 core_eport='$1' no és un port vàlid

apache/lang/de

@@ -343,6 +343,7 @@ cvirt_eport='$1' ist kein gültiger Port
 cvirt_eroot1=Sie müssen ein Dokument-Root angeben
 cvirt_eroot2=Fehler beim Anlegen des Verzeichnisses '$1' : $2
 cvirt_eroot3=Sie sind nicht berechtigt das Root-Verzeichnis '$1' zu benutzen
+cvirt_eroot4=Keine Benutzer in der Apache-Konfiguration definiert
 cvirt_err=Fehler beim Anlegen des virtuellen Server
 cvirt_etaken=Ein virtuellen Server mit dem selben Namen und demselben Port existiert bereits
 default_serv=Standard Server

apache/lang/en

@@ -67,6 +67,7 @@ cvirt_ename='$1' is not a valid server name
 cvirt_eroot1=You must enter a document root
 cvirt_eroot2=Failed to create directory '$1' : $2
 cvirt_eroot3=You are not allowed to use the root directory '$1'
+cvirt_eroot4=No User defined in the Apache configuration
 cvirt_etaken=A virtual server with the same name and port already exists
 cvirt_efile=Failed to write to $1 : $2
 cvirt_emissing=The new virtual server was added to $1, but this file is not used by Apache. Check the <a href='$2'>module configuration</a> and make sure the 'File or directory to add virtual servers to' is correct.

apache/lang/no

@@ -302,10 +302,12 @@ core_outfilter=Bruk output filtere for alle filer
 core_overr=Innstillingsfiler kan overstyre..
 core_pid=Tjener PID fil
 core_port=Port
+core_portname=Protokoll
 core_proclimit=Prosess begrensing
 core_proclimit2=prosess begrensning
 core_product=Kun produkt
 core_proglog=Program
+core_protoany=<Enhver>
 core_realm=Navn for autentiseringsområde
 core_resp=Svar
 core_rtout=Tidsavbrudd for forespørsel
@@ -341,6 +343,7 @@ cvirt_eport='$1' er ikke en gyldig port
 cvirt_eroot1=Du må oppgi dokumentrot
 cvirt_eroot2=Kunne ikke opprette katalog '$1' : $2
 cvirt_eroot3=Du har ikke tilgang til å bruke rot-katalogen '$1'
+cvirt_eroot4=Ingen bruker definert i Apache konfigurasjonen
 cvirt_err=Kunne ikke opprette virtuell tjener
 cvirt_etaken=En virtuell tjener med samme navn og port finnes allerede
 default_serv=standard tjener

apache/virt_index.cgi

@@ -18,6 +18,10 @@ if ($in{'virt'} && $access{'types'} eq '*') {
 		     "name" => $text{'virt_edit'},
 		     "link" => "manual_form.cgi?virt=$in{'virt'}" };
 	}
+if ($v->{'value'} =~ /:80/ && $v->{'value'} !~ /:443/) {
+	# Hide SSL icon for non-SSL sites
+	$access_types{14} = 0;
+	}
 &config_icons("virtual", "edit_virt.cgi?virt=$in{'virt'}&", $sw_icon,
 	      $ed_icon ? $ed_icon : ());
 

backup-config/backup-config-lib.pl

@@ -453,7 +453,8 @@ elsif ($mode == 2) {
 return undef;
 }
 
-=head2 execute_restore(&mods, source, &files, apply, [show-only])
+=head2 execute_restore(&mods, source, &files, apply, [show-only],
+		       [&other-files])
 
 Restore configuration files from the specified source for the listed modules.
 Returns undef on success, or an error message.
@@ -461,7 +462,7 @@ Returns undef on success, or an error message.
 =cut
 sub execute_restore
 {
-my ($mods, $src, $files, $apply, $show) = @_;
+my ($mods, $src, $files, $apply, $show, $others) = @_;
 
 # Fetch file if needed
 my ($mode, $user, $pass, $host, $path, $port) = &parse_backup_url($src);
@@ -518,7 +519,7 @@ my @tarfiles = map { "/$_" } split(/\r?\n/, $out);
 my %tarfiles = map { $_, 1 } @tarfiles;
 
 # Extract manifests for each module
-my %hasmod = map { $_, 1 } @{$_[0]};
+my %hasmod = map { $_, 1 } @$mods;
 $hasmod{"_others"} = 1;
 &execute_command("rm -rf ".quotemeta($manifests_dir));
 my $rel_manifests_dir = $manifests_dir;
@@ -548,6 +549,7 @@ while($m = readdir(DIR)) {
 	push(@files, @mfiles);
 	}
 closedir(DIR);
+push(@files, @$others) if ($others);
 if (!@files) {
 	&unlink_file($file) if ($mode != 0);
 	return $text{'backup_enone2'};
@@ -555,15 +557,15 @@ if (!@files) {
 
 # Get descriptions for each module
 my %desc;
-foreach my $m (@{$_[0]}) {
+foreach my $m (@$mods) {
 	my %minfo = &get_module_info($m);
 	$desc{$m} = $minfo{'desc'};
 	}
 
 # Call module pre functions
-foreach my $m (@{$_[0]}) {
+foreach my $m (@$mods) {
 	my $mdir = &module_root_directory($m);
-	if ($m && &foreign_check($m) && !$_[4] &&
+	if ($m && &foreign_check($m) && !$show &&
 	    -r "$mdir/backup_config.pl") {
 		&foreign_require($m, "backup_config.pl");
 		if (&foreign_defined($m, "pre_restore")) {
@@ -577,7 +579,7 @@ foreach my $m (@{$_[0]}) {
 	}
 
 # Lock all files being extracted
-if (!$_[4]) {
+if (!$show) {
 	my $f;
 	foreach $f (@files) {
 		&lock_file($f);
@@ -585,7 +587,7 @@ if (!$_[4]) {
 	}
 
 # Extract contents (only files specified by manifests)
-my $flag = $_[4] ? "t" : "x";
+my $flag = $show ? "t" : "x";
 my $qfiles = join(" ", map { s/^\///; quotemeta($_) } &unique(@files));
 if ($gzipped) {
 	&execute_command("cd / ; gunzip -c $qfile | tar ${flag}f - $qfiles",
@@ -598,7 +600,7 @@ else {
 my $ex = $?;
 
 # Un-lock all files being extracted
-if (!$_[4]) {
+if (!$show) {
 	my $f;
 	foreach $f (@files) {
 		&unlock_file($f);
@@ -611,16 +613,16 @@ if ($ex) {
 	return &text('backup_euntar', "<pre>$out</pre>");
 	}
 
-if ($_[3] && !$_[4]) {
+if ($apply && !$show) {
 	# Call all module apply functions
-	foreach $m (@{$_[0]}) {
+	foreach $m (@$mods) {
 		if (&foreign_defined($m, "post_restore")) {
 			&foreign_call($m, "post_restore", \@files);
 			}
 		}
 	}
 
-@{$_[2]} = @files;
+@$files = split(/\n/, $out);
 return undef;
 }
 

backup-config/index.cgi

@@ -89,6 +89,9 @@ print &ui_table_row($text{'edit_mods2'},
 		       [ map { [ $_->{'dir'}, $_->{'desc'} ] } @mods ],
 		       5, 1));
 
+print &ui_table_row($text{'edit_other2'},
+		    &ui_textarea("others", undef, 3, 50));
+
 print &ui_table_row($text{'edit_dest2'},
 		    &show_backup_destination("src", $config{'dest'}, 1));
 

backup-config/lang/ca

@@ -35,6 +35,7 @@ edit_schedyes=S
 edit_mods=Mòduls a copiar
 edit_dest=Destinació de la còpia
 edit_mods2=Mòduls a restaurar
+edit_other2=Altres fitxers a restaurar
 edit_dest2=Restaura de
 edit_what=Inclou en la còpia
 edit_webmin=Fitxers de configuració dels mòduls Webmin
@@ -83,6 +84,7 @@ backup_failed=... ha fallat! $1
 backup_done=... completa. La mida final de la còpia és de $1 i conté $2 fitxers.
 
 restore_err=La restauració ha fallat
+restore_emods=No has seleccionat cap mòdul ni cap altre fitxer
 restore_title=Configuració de Restauració
 restore_doing=S'està començant la restauració dels fitxers de configuració de mòduls de $1...
 restore_testing=S'està extraient el contingut de la còpia de $1...

backup-config/lang/de

@@ -43,6 +43,7 @@ edit_mods=Module zum Sichern
 edit_mods2=Module zum Zurückschreiben
 edit_nofiles=Server-Konfigurationsdateien
 edit_other=Andere ausgewählte Dateien ..
+edit_other2=Andere Dateien zum Wiederherstellen
 edit_post=Befehle nach dem Backup
 edit_pre=Befehle vor dem Backup
 edit_return=Sicherungsformular
@@ -99,6 +100,7 @@ nice_upload=Hochgeladene Datei
 restore_doing=Starte Wiederherstellung der Modulkonfigurationsdateien von $1 ..
 restore_done=.. fertig. $1 Dateien wurde wiederhergestellt.
 restore_done2=.. Dateien im Backup sind :
+restore_emods=Keine Module oder andere Dateien ausgewählt
 restore_err=Wiederherstellung gescheitert!
 restore_failed=.. gescheitert! $1
 restore_testing=Extrahiere Inhalt von Backup von $1 ..

backup-config/lang/en

@@ -35,6 +35,7 @@ edit_schedyes=Yes, at times selected below ..
 edit_mods=Modules to backup
 edit_dest=Backup destination
 edit_mods2=Modules to restore
+edit_other2=Other files to restore
 edit_dest2=Restore from
 edit_what=Include in backup
 edit_webmin=Webmin module configuration files
@@ -83,6 +84,7 @@ backup_failed=.. failed! $1
 backup_done=.. complete. Final backup size was $1, containing $2 files.
 
 restore_err=Restore failed
+restore_emods=No modules or other files selected
 restore_title=Restore Configuration
 restore_doing=Starting restore of module configuration files from $1 ..
 restore_testing=Extracting contents of backup from $1 ..

backup-config/lang/no

@@ -43,6 +43,7 @@ edit_mods=Moduler som skal sikkerhetskopieres
 edit_mods2=Moduler som skal gjenopprettes
 edit_nofiles=Tjener konfigurasjonsfiler
 edit_other=Andre listede filer ..
+edit_other2=Andre filer å gjenopprette
 edit_post=Post-sikkerhetskopi kommando
 edit_pre=Pre-sikkerhetskopi kommando
 edit_return=backup skjema
@@ -99,6 +100,7 @@ nice_upload=lastet opp fil
 restore_doing=Starter gjenoppretting av modulkonfigurasjonsfiler fra $1 ..
 restore_done=.. fullført. $1 filer ble gjenopprettet.
 restore_done2=.. filer i sikkerhetskopien er :
+restore_emods=Ingen moduler eller andre filer valgt
 restore_err=Gjenoppretting feilet
 restore_failed=.. feilet! $1
 restore_testing=Pakker ut innhold av sikkerhetskopi fra $1 ..

backup-config/restore.cgi

@@ -11,7 +11,8 @@ our (%in, %text, %config, $module_config_file);
 &error_setup($text{'restore_err'});
 my $src = &parse_backup_destination("src", \%in);
 my @mods = split(/\0/, $in{'mods'});
-@mods || &error($text{'restore_emods'});
+my @others = split(/[\r\n]+/, $in{'others'});
+@mods || @others || &error($text{'restore_emods'});
 
 # Do it ..
 my ($mode, $user, $pass, $server, $path, $port) = &parse_backup_url($src);
@@ -27,7 +28,8 @@ if ($mode == 3) {
 print &text($in{'test'} ? 'restore_testing' : 'restore_doing',
 	    &nice_dest($src)),"<p>\n";
 my @files;
-my $err = &execute_restore(\@mods, $src, \@files, $in{'apply'}, $in{'test'});
+my $err = &execute_restore(\@mods, $src, \@files, $in{'apply'}, $in{'test'},
+			   \@others);
 &unlink_file($src) if ($mode == 3);
 if ($err) {
 	print &text('restore_failed', $err),"<p>\n";

bacula-backup/bacula-backup-lib.pl

@@ -819,14 +819,17 @@ local $jobs = &console_cmd($h, "show jobs");
 local @rv;
 local $job;
 foreach my $l (split(/\r?\n/, $jobs)) {
-	if ($l =~ /^Job:\s+name=([^=]*\S)\s/) {
+	if ($l =~ /^Job:\s+name=([^=]*\S)\s/ ||
+	    $l =~ /^\s*Name\s*=\s*"(.*)"/) {
 		$job = { 'name' => $1 };
 		push(@rv, $job);
 		}
-	elsif ($l =~ /Client:\s+name=([^=]*\S)\s/ && $job) {
+	elsif (($l =~ /Client:\s+name=([^=]*\S)\s/ ||
+		$l =~ /^\s*Client\s*=\s*"(.*)"/) && $job) {
 		$job->{'client'} = $1;
 		}
-	elsif ($l =~ /FileSet:\s+name=([^=]*\S)\s/ && $job) {
+	elsif (($l =~ /FileSet:\s+name=([^=]*\S)\s/ ||
+	        $l =~ /^FileSet\s*=\s*"(.*)"/) && $job) {
 		$job->{'fileset'} = $1;
 		}
 	}
@@ -843,7 +846,8 @@ local $clients = &console_cmd($h, "show clients");
 local @rv;
 local $client;
 foreach my $l (split(/\r?\n/, $clients)) {
-	if ($l =~ /^Client:\s+name=([^=]*\S)\s/) {
+	if ($l =~ /^Client:\s+name=([^=]*\S)\s/ ||
+	    $l =~ /^\s*Name\s*=\s*"(.*)"/) {
 		$client = { 'name' => $1 };
 		if ($l =~ /address=(\S+)/ && $client) {
 			$client->{'address'} = $1;
@@ -853,6 +857,12 @@ foreach my $l (split(/\r?\n/, $clients)) {
 			}
 		push(@rv, $client);
 		}
+	elsif ($l =~ /^\s*Address\s*=\s*"(.*)"/ && $client) {
+		$client->{'address'} = $1;
+		}
+	elsif ($l =~ /^\s*FDport\s*=\s*"(.*)"/ && $client) {
+		$client->{'port'} = $1;
+		}
 	}
 return @rv;
 }
@@ -867,7 +877,8 @@ local $storages = &console_cmd($h, "show storages");
 local @rv;
 local $storage;
 foreach my $l (split(/\r?\n/, $storages)) {
-	if ($l =~ /^Storage:\s+name=([^=]*\S)\s/) {
+	if ($l =~ /^Storage:\s+name=([^=]*\S)\s/ ||
+	    $l =~ /^\s*Name\s*=\s*"(.*)"/) {
 		$storage = { 'name' => $1 };
 		if ($l =~ /address=(\S+)/) {
 			$storage->{'address'} = $1;
@@ -877,6 +888,12 @@ foreach my $l (split(/\r?\n/, $storages)) {
 			}
 		push(@rv, $storage);
 		}
+	elsif ($l =~ /^\s*Address\s*=\s*"(.*)"/ && $storage) {
+		$storage->{'address'} = $1;
+		}
+	elsif ($l =~ /^\s*SDport\s*=\s*"(.*)"/ && $storage) {
+		$storage->{'port'} = $1;
+		}
 	}
 return @rv;
 }
@@ -891,13 +908,17 @@ local $pools = &console_cmd($h, "show pools");
 local @rv;
 local $pool;
 foreach my $l (split(/\r?\n/, $pools)) {
-	if ($l =~ /^Pool:\s+name=([^=]*\S)\s/) {
+	if ($l =~ /^Pool:\s+name=([^=]*\S)\s/ ||
+	    $l =~ /^\s*Name\s*=\s*"(.*)"/) {
 		$pool = { 'name' => $1 };
 		if ($l =~ /PoolType=(\S+)/) {
 			$pool->{'type'} = $1;
 			}
 		push(@rv, $pool);
 		}
+	elsif ($l =~ /^\s*PoolType\s*=\s*"(.*)"/ && $pool) {
+		$pool->{'type'} = $1;
+		}
 	}
 return @rv;
 }

bacula-backup/lang/de

@@ -371,35 +371,57 @@ log_delete_pool=Volume-Pool $1 gelöscht
 log_delete_pools=$1 Volume-Pools gelöscht
 log_delete_schedule=Backup-Zeitplan $1 gelöscht
 log_delete_schedules=$1 Backup-Zeitplan gelöscht
+log_delete_sdirector=Speicher-Daemon-Direktor $1 gelöscht
+log_delete_sdirectors=$1 Speicher-Daemon-Direktoren gelöscht
 log_delete_storage=Storage Daemon $1 gelöscht
 log_delete_storages=$1 Storage Daemons gelöscht
+log_director=Globale Bacula-Director-Konfiguration gespeichert
 log_file=Bacula Datei Daemonkonfiguration gespeichert
+log_fixpass=Bacula Konsolenprogramm Passwort behoben
+log_gbackup=Bacula Gruppensicherungsjob $1 gestartet
+log_label=Speicher-Daemon $1 gelabelt
 log_modify_client=Backup Client $1 modifiziert
+log_modify_device=Speicher-Gerät $1 modifiziert
+log_modify_fdirector=Datei-Daemon-Direktor $1 modifiziert
+log_modify_fileset=Dateisatz $1 modifiziert
 log_modify_gjob=Bacula-Gruppe Sicherungsjob $1 modifiziert
 log_modify_group=Bakula Gruppe $1 editiert
 log_modify_job=Backup-Job $1 modifiziert
 log_modify_pool=Volume Pool $1 modifiziert
+log_modify_schedule=Backup-Zeitplan $1 geändert
+log_modify_sdirector=Speicher-Daemon-Direktor $1 modifiziert
+log_modify_storage=Speicher-Daemon $1 modifiziert
+log_mount=Speicher-Gerät $1 gemounted
 log_restart=Bacula Daemons wieder gestartet
 log_start=Bacula Daemons gestartet
 log_stop=Bacula Daemons gestoppt
 log_storagec=Bacula Speicher Daemon-Konfiguration gespeichert
 log_sync=Bacula-Gruppensynchronisierung gespeichert
+log_unmount=Speicher-Gerät $1 unmounted
 mount_done=.. erfolgreicht gemountet.
+mount_err=Fehlgeschlagen Speicher-Gerät zu mounten
 mount_eslot=Fehlende oder ungültige Slot Nummer
 mount_failed=.. mounten fehlgeschlagen! Siehe die Fehlermeldung für den Grund oben.
+mount_header=Speicher mount oder unmount Optionen
 mount_mount=Montierungsspeicher
 mount_noslot=Nichts
 mount_return=montiert von
+mount_run=Mounte Volume auf Speicher-Gerät $1 ..
+mount_slot=Auto-Lader-Slot
 mount_slotno=Slotnummer
 mount_storage=Speichergerät
 mount_title=Mount oder Unmount
+mount_unmount=Unmounte Speicher
 pool_any=Sichere an jedes Volume in Pool?
+pool_auto=Streiche abgelaufene Volumes?
 pool_autolabel=Automatisch Volumes Präfix beschriften
 pool_echild=Dieser Client kann nicht gelöscht werden, da dieser von $1 genutzt wird
 pool_eclash=Ein Speichergerät mit dem gleichen Namen ist bereits vorhanden
 pool_egone=Volume Pool existiert nicht länger!
 pool_emax=Fehlende oder ungültige maximale Anzahl an Jobs pro Volume
+pool_ename=Fehlender Speichergerät-Name
 pool_ereten=Fehlende oder ungültige Aufbewahrungsfrist
+pool_err=Fehlgeschlagen Speichergerät zu speichern
 pool_header=Details vom Backup Volume Pool
 pool_max=Maximale Jobs pro Volume
 pool_maxvolsize=Maximale Volume Größe (z.B. 5G für 5 Gigabyte)
@@ -413,6 +435,7 @@ pool_type=Volume Pool Typ
 pool_unlimited=Unlimitiert
 pools_add=Füge einen neuen Volume Pool hinzu.
 pools_delete=Lösche ausgewählte Datenträger-Pools
+pools_derr=Fehlgeschlagen Volume-Pools zu löschen
 pools_name=Pool Name
 pools_none=Keine Volume Pools wurden bisher definiert.
 pools_reten=Aufbewahrungsfrist
@@ -443,6 +466,8 @@ restore_all=--Alle Clients in Gruppe--
 restore_client=Wiederherstelle zu Client oder Gruppe
 restore_clist=--Clients--
 restore_done=...Wiederherstellung komplett.
+restore_eall1=Die <b>Alle Clients in Backup</b> Option muss f&#252;r <b>Wiederherstellen zum Client oder Gruppen</b> ausgew&#228;hlt werden, wenn eine Gruppe Bacula Job wiederhergestellt werden soll.
+restore_eall2=Die <b>Alle Clients in Backup</b> Option kann nur gew&#228;hlt werden, f&#252;r <b>Stelle Clients und Gruppen wieder her</b>, wenn dabei eine Gruppe Bacula Job wiederhergestellt wird
 restore_eclient=Kein Client oder Backup Gruppe ausgew&#228;hlt
 restore_eclients=Keine Mitglieder der Bacula-Gruppe gefunden!
 restore_efiles=Keine Dateien eingegeben
@@ -483,17 +508,24 @@ schedule_header=Sicherungszeitplan Details
 schedule_level=Backup Level
 schedule_name=Sicherungszeitplan Name
 schedule_pool=Volume
+schedule_runs=Level und Zeiten ausf&#252;hren
+schedule_times=L&#228;uft um
 schedule_title1=Erstelle Backup-Zeitplan
 schedule_title2=Editiere Backup-Zeitplan
 schedules_add=F&#252;ge einen neuen Backup-Zeitplan hinzu.
 schedules_delete=L&#246;sche ausgew&#228;hlte Zeitpl&#228;ne
 schedules_derr=Fehlgeschlagen Zeitpl&#228;ne zu l&#246;schen
 schedules_name=Zeitplan Name
+schedules_none=Keine Sicherungspl&#228;ne wurden bisher festgelegt.
 schedules_return=Liste der Zeitpl&#228;ne
+schedules_sched=Level und Zeiten ausf&#252;hren
 schedules_title=Backup-Zeitpl&#228;ne
+sdirector_eclash=Ein Direktor mit dem gleichen Namen ist bereits vorhanden
 sdirector_egone=Director existiert nicht l&#228;nger!
 sdirector_ename=Fehlender Director Name
 sdirector_epass=Fehlendes Passwort
+sdirector_err=Fehlgeschlagen Speicherdaemon-Direktor zu speichern
+sdirector_header=Details des Steuerung Remote Director
 sdirector_monitor=Nur &#220;berwachung der Verbindung erlauben?
 sdirector_name=Director Name
 sdirector_pass=Akzeptiertes Passwort

bind8/CHANGELOG

@@ -140,3 +140,7 @@ Added a module configuration option to use the SPF type for Sender Permitted Fro
 ---- Changes since 1.660 ----
 Added a warning if the chroot directory that Webmin thinks BIND is using looks wrong.
 Slave zone files in raw format can now be displayed by Webmin.
+---- Changes since 1.720 ----
+Added support for NSEC3PARAM records.
+---- Changes since 1.730 ----
+Added support for editing DMARC records, which are specially encoded TXT records for defining the response to SPF and DKIM violations.

bind8/bind8-lib.pl

@@ -1124,6 +1124,58 @@ elsif ($type eq "SPF") {
 		&ui_opt_textbox("spfexp", $spf->{'exp'}, 40,
 			    $text{'value_spfnoexp'}), 3);
 	}
+elsif ($type eq "DMARC") {
+	# Like SPF, DMARC records have several attributes encoded in the
+	# TXT value
+	local $dmarc = &parse_dmarc(@v);
+	local @popts = ( [ "none", $text{'value_dmarcnone'} ],
+		         [ "quarantine", $text{'value_dmarcquar'} ],
+		         [ "reject", $text{'value_dmarcreject'} ] );
+	print &ui_table_row($text{'value_dmarcp'},
+		&ui_select("dmarcp", $dmarc->{'p'}, \@popts));
+
+	print &ui_table_row($text{'value_dmarcpct'},
+		&ui_textbox("dmarcpct", $dmarc->{'pct'}, 5)."%");
+
+	print &ui_table_row($text{'value_dmarcsp'},
+		&ui_select("dmarcsp", $dmarc->{'sp'},
+			   [ [ "", $text{'value_dmarcnop'} ], @popts ]));
+
+	print &ui_table_row($text{'value_dmarcaspf'},
+		&ui_yesno_radio("dmarcaspf", $dmarc->{'aspf'} eq 's'));
+
+	print &ui_table_row($text{'value_dmarcadkim'},
+		&ui_yesno_radio("dmarcadkim", $dmarc->{'adkim'} eq 's'));
+
+	local $rua = $dmarc->{'rua'};
+	$rua =~ s/^mailto://;
+	print &ui_table_row($text{'value_dmarcrua'},
+	    &ui_opt_textbox("dmarcrua", $rua, 50, $text{'value_dmarcnor'}), 3);
+
+	local $ruf = $dmarc->{'ruf'};
+	$ruf =~ s/^mailto://;
+	print &ui_table_row($text{'value_dmarcruf'},
+	    &ui_opt_textbox("dmarcruf", $ruf, 50, $text{'value_dmarcnor'}), 3);
+	}
+elsif ($type eq "NSEC3PARAM") {
+	# NSEC records have a hash type, flags, number of interations, salt
+	# length and salt
+	print &ui_table_row($text{'value_NSEC3PARAM1'},
+		&ui_select("value0", $v[0] || 1,
+			   [ [ 1, "SHA1" ] ], 1, 0, 1));
+
+	print &ui_table_row($text{'value_NSEC3PARAM2'},
+		&ui_select("value1", $v[1],
+			   [ [ 0, $text{'value_delegated'} ],
+			     [ 1, $text{'value_notdelegated'} ] ]));
+
+	print &ui_table_row($text{'value_NSEC3PARAM3'},
+		&ui_textbox("value2", $v[2], 4));
+
+	print &ui_table_row($text{'value_NSEC3PARAM5'},
+		&ui_textbox("value4", $v[4], 20));
+
+	}
 else {
 	# All other types just have a text box
 	print &ui_table_row($text{'value_other'},
@@ -1938,6 +1990,7 @@ sub restart_bind
 if ($config{'restart_cmd'} eq 'restart') {
 	# Stop and start again
 	&stop_bind();
+	sleep(1);	# Systemd doesn't like rapid stops and starts
 	return &start_bind();
 	}
 elsif ($config{'restart_cmd'}) {
@@ -2753,7 +2806,7 @@ $slave_error = $_[0];
 
 sub get_forward_record_types
 {
-return ("A", "NS", "CNAME", "MX", "HINFO", "TXT", "SPF", "WKS", "RP", "PTR", "LOC", "SRV", "KEY", $config{'support_aaaa'} ? ( "AAAA" ) : ( ), @extra_forward);
+return ("A", "NS", "CNAME", "MX", "HINFO", "TXT", "SPF", "DMARC", "WKS", "RP", "PTR", "LOC", "SRV", "KEY", "NSEC3PARAM", $config{'support_aaaa'} ? ( "AAAA" ) : ( ), @extra_forward);
 }
 
 sub get_reverse_record_types
@@ -3188,11 +3241,12 @@ foreach my $key (@keys) {
 
 # Remove records
 local @recs = &read_zone_file($fn, $dom);
+local $tools = &have_dnssec_tools_support();
 for(my $i=$#recs; $i>=0; $i--) {
 	if ($recs[$i]->{'type'} eq 'NSEC' ||
 	    $recs[$i]->{'type'} eq 'NSEC3' ||
 	    $recs[$i]->{'type'} eq 'RRSIG' ||
-		$recs[$i]->{'type'} eq 'NSEC3PARAM' ||
+	    $recs[$i]->{'type'} eq 'NSEC3PARAM' && $tools ||
 	    $recs[$i]->{'type'} eq 'DNSKEY') {
 		&delete_record($fn, $recs[$i]);
 		}
@@ -3600,10 +3654,11 @@ sub dt_sign_zone
 
 	# Remove DNSSEC records and save the unsigned zone file
 	@recs = &read_zone_file($z, $dom);
+	local $tools = &have_dnssec_tools_support();
 	for(my $i=$#recs; $i>=0; $i--) {
 		if ($recs[$i]->{'type'} eq 'NSEC' ||
 			$recs[$i]->{'type'} eq 'NSEC3' ||
-			$recs[$i]->{'type'} eq 'NSEC3PARAM' ||
+			$recs[$i]->{'type'} eq 'NSEC3PARAM' && $tools ||
 			$recs[$i]->{'type'} eq 'RRSIG' ||
 			$recs[$i]->{'type'} eq 'DNSKEY') {
 				&delete_record($z, $recs[$i]);
@@ -3679,10 +3734,11 @@ sub dt_resign_zone
 
 	# Remove DNSSEC records and save the unsigned zone file
 	@recs = &read_zone_file($z, $dom);
+	local $tools = &have_dnssec_tools_support();
 	for(my $i=$#recs; $i>=0; $i--) {
 		if ($recs[$i]->{'type'} eq 'NSEC' ||
 			$recs[$i]->{'type'} eq 'NSEC3' ||
-			$recs[$i]->{'type'} eq 'NSEC3PARAM' ||
+			$recs[$i]->{'type'} eq 'NSEC3PARAM' && $tools ||
 			$recs[$i]->{'type'} eq 'RRSIG' ||
 			$recs[$i]->{'type'} eq 'DNSKEY') {
 				&delete_record($z, $recs[$i]);
@@ -3870,10 +3926,11 @@ sub dt_delete_dnssec_state
 
 		# remove DNSSEC records from zonefile
 		@recs = &read_zone_file($z, $dom);
+		local $tools = &have_dnssec_tools_support();
 		for(my $i=$#recs; $i>=0; $i--) {
 			if ($recs[$i]->{'type'} eq 'NSEC' ||
 				$recs[$i]->{'type'} eq 'NSEC3' ||
-				$recs[$i]->{'type'} eq 'NSEC3PARAM' ||
+				$recs[$i]->{'type'} eq 'NSEC3PARAM' && $tools ||
 				$recs[$i]->{'type'} eq 'RRSIG' ||
 				$recs[$i]->{'type'} eq 'DNSKEY') {
 			   	    &delete_record($z, $recs[$i]);

bind8/convert_slave.cgi

@@ -14,6 +14,10 @@ $file = &find("file", $zconf->{'members'});
 if (!$file) {
 	&error($text{'convert_efile'});
 	}
+$file = &make_chroot(&absolute_path($file));
+if (!-s $file) {
+	&error(&text('convert_efilesize', $file));
+	}
 &lock_file(&make_chroot($zconf->{'file'}));
 
 # Change the type directive
@@ -26,5 +30,19 @@ if (!$file) {
 
 &flush_file_lines();
 &unlock_file(&make_chroot($zconf->{'file'}));
+
+# Convert from binary slave format to text
+if (&is_raw_format_records($file)) {
+	&has_command("named-compilezone") ||
+		&error($text{'convert_ebinary'});
+	$temp = &transname();
+	&copy_source_dest($file, $temp);
+	$out = &backquote_logged("named-compilezone -f raw -F text ".
+				 "-o $file $zone->{'name'} $temp 2>&1");
+	&error(&text('convert_ecompile', "<tt>".&html_escape($out)."</tt>"))
+		if ($?);
+	&unlink_file($temp);
+	}
+
 &redirect("");
 

bind8/edit_recs.cgi

@@ -19,28 +19,36 @@ $typedesc = $text{"recs_$in{'type'}"} || $in{'type'};
 $type = $zone->{'type'};
 $file = $zone->{'file'};
 $form = 0;
+$newname = $in{'newname'} || ($in{'type'} eq 'DMARC' ? '_dmarc' : undef);
 if (!$access{'ro'} && $type eq 'master' && $in{'type'} ne 'ALL') {
 	&record_input($in{'zone'}, $in{'view'}, $in{'type'}, $file, $dom,
-		      undef, undef, $in{'newname'}, $in{'newvalue'});
+		      undef, undef, $newname, $in{'newvalue'});
 	$form++;
 	$shown_create_form = 1;
 	}
 
-# Show search form
-print &ui_form_start("edit_recs.cgi");
-print &ui_hidden("zone", $in{'zone'}),"\n";
-print &ui_hidden("view", $in{'view'}),"\n";
-print &ui_hidden("type", $in{'type'}),"\n";
-print "<b>$text{'recs_find'}</b>\n";
-print &ui_textbox("search", $in{'search'}, 20),"\n";
-print &ui_submit($text{'recs_search'}),"<p>\n";
-print &ui_form_end();
-$form++;
-
 if (!$config{'largezones'} || $in{'search'}) {
 	# Get all records
 	@allrecs = grep { !$_->{'generate'} && !$_->{'defttl'} }
 		     &read_zone_file($file, $dom);
+	$nosearch = 1 if (!@allrecs);
+	}
+
+if (!$nosearch) {
+	# Show search form
+	print &ui_form_start("edit_recs.cgi");
+	print &ui_hidden("zone", $in{'zone'}),"\n";
+	print &ui_hidden("view", $in{'view'}),"\n";
+	print &ui_hidden("type", $in{'type'}),"\n";
+	print "<b>$text{'recs_find'}</b>\n";
+	print &ui_textbox("search", $in{'search'}, 20),"\n";
+	print &ui_submit($text{'recs_search'}),"<p>\n";
+	print &ui_form_end();
+	$form++;
+	}
+
+if (!$config{'largezones'} || $in{'search'}) {
+	# Get all records
 	if ($in{'search'}) {
 		# Limit to records matching some search
 		foreach $r (@allrecs) {
@@ -74,7 +82,7 @@ else {
 if (@recs) {
 	@recs = &sort_records(@recs);
 	foreach $v (keys %text) {
-		if ($v =~ /^value_([A-Z]+)(\d+)/) {
+		if ($v =~ /^value_([A-Z0-9]+)(\d+)/) {
 			$hmap{$1}->[$2-1] = $text{$v};
 			}
 		}

bind8/edit_view.cgi

@@ -44,6 +44,9 @@ print &address_input($text{'master_query'}, "allow-query", $vconf);
 print &address_input($text{'master_notify2'}, "also-notify", $vconf);
 print &address_input($text{'master_notify3'}, "allow-notify", $vconf);
 
+$src = &find("transfer-source", $vconf);
+print &ui_table_row($text{'net_taddr'}, &ui_textbox("transfer-source", $src->{'values'}->[0], 15));
+
 print &ui_table_end();
 
 if ($access{'ro'}) {

bind8/lang/ca

@@ -293,6 +293,11 @@ edit_espfip6='$1' no
 edit_espfinclude='$1' no és un domini addicional remitent vàlid
 edit_espfredirect='$1' no és un nom de domini alternatiu vàlid
 edit_espfexp='$1' és un nom de registre vàlid per a un missatge de rebuig
+edit_ensec3value2=Hi falfa el nombre d'iteracions o bé no és numèric
+edit_ensec3value3=Hi falta la sal no base64 o bé és incorrecta
+edit_edmarcpct=El percentatge de missatges ha de ser un enter entre 0 i 100
+edit_edmarcrua=Hi falta l'adreça de la informació agregada
+edit_edmarcruf=Hi falta l'adreça de la informació forense
 
 text_title=Edició del Fitxer de Registres
 text_title2=Visualització del Fitxer de Registres
@@ -369,8 +374,10 @@ type_NS=Servidor de Noms
 type_CNAME=Àlies del Nom
 type_MX=Servidor de Correu
 type_HINFO=Informació del Host
+type_NSEC3PARAM=Paràmetres DNSSEC
 type_TXT=Text
 type_SPF=Remitent Permès des de
+type_DMARC=DMARC
 type_WKS=Servei Conegut (WKS)
 type_RP=Persona Responsable
 type_PTR=Adreça Inversa
@@ -387,12 +394,14 @@ edit_MX=Servidor de Correu
 edit_HINFO=Informació del Host
 edit_TXT=Text
 edit_SPF=Remitent Permès des de
+edit_DMARC=DMARC
 edit_WKS=Servei Conegut (WKS)
 edit_RP=Persona Responsable
 edit_PTR=Adreça Inversa
 edit_LOC=Ubicació
 edit_SRV=Adreça del Servei
 edit_KEY=Clau Pública
+edit_NSEC3PARAM=Paràmetres DNSSEC
 
 recs_defttl=TTL per defecte
 recs_A=Adreça
@@ -403,6 +412,7 @@ recs_MX=Servidor de Correu
 recs_HINFO=Informació del Host
 recs_TXT=Text
 recs_SPF=Remitent Permès des de
+recs_DMARC=DMARC
 recs_WKS=Servei Conegut (WKS)
 recs_RP=Persona Responsable
 recs_PTR=Adreça Inversa
@@ -410,6 +420,7 @@ recs_LOC=Ubicaci
 recs_SRV=Adreça de Servei
 recs_ALL=Tot
 recs_KEY=Clau Pública
+recs_NSEC3PARAM=Paràmetres DNSSEC
 recs_delete=Suprimeix els Seleccionats
 
 value_A1=Adreça
@@ -437,6 +448,14 @@ value_KEY2=Protocol
 value_KEY3=Algoritme
 value_KEY4=Dades de la clau
 value_SPF1=Especificació SPF
+value_DMARC1=Especificació DMARC
+value_NSEC3PARAM1=Algoritme de hash
+value_NSEC3PARAM2=Banderes NSEC3
+value_NSEC3PARAM3=Nombre d'iteracions del hash
+value_NSEC3PARAM4=Llargada de la sal
+value_NSEC3PARAM5=Cadena de sal
+value_delegated=Zona delegada
+value_notdelegated=Una altra zona
 value_other=Valors (un per línia)
 value_spfa=Permet l'enviament des de l'adreça IP del domini
 value_spfmx=Permet l'enviament des dels hosts MX del domini
@@ -456,6 +475,18 @@ value_spfredirect=Utilitza un registre SPF d'un domini alternatiu
 value_spfnoredirect=Utilitza el registre d'aquest domini
 value_spfexp=Registre TXT pel al motiu del rebuig
 value_spfnoexp=Cap
+value_dmarcnone=No prenguis cap acció
+value_dmarcquar=Posa el coreu en quarantena
+value_dmarcreject=Rebutja el correu
+value_dmarcp=Política per als correus que no passen SPF o DKIM
+value_dmarcpct=Percentatge de missatges a aplicar-hi la política
+value_dmarcrua=Envia la informació agregada a
+value_dmarcruf=Envia la informació forense a
+value_dmarcsp=Política dels subdominis
+value_dmarcnop=Igual que aquest domini
+value_dmarcaspf=Requereix alineació SPF estricta
+value_dmarcadkim=Requereix alineació DKIM estricta
+value_dmarcnor=No ho enviïs
 
 warn=Avisa
 fail=Falla
@@ -793,6 +824,9 @@ log_dnssec=S'ha canviat la resignatura de la clau
 
 convert_err=No s'ha pogut convertir la zona
 convert_efile=Cal especificar un fitxer de registres abans de poder convertir una zona esclava a una de mestra.
+convert_efilesize=El fitxer de resistres $1 no existeix o bé està buit
+convert_ebinary=L'ordre necessària per convertir una zona esclava binària a format text mestre no està instal·lada
+convert_ecompile=La conversió de format binari a text ha fallat: $1
 
 whois_title=Informació WHOIS
 whois_header=Resultat de l'ordre $1...
@@ -852,9 +886,9 @@ vdelete_move=Despla
 gen_title=Generadors de Registres
 gen_desc=Aquesta pàgina permet definir generadors, cadascun dels quals crearà múltiples registres en aquesta zona utilitzant un comptador incremental. Això pot ser útil per a delegar parts de la zona inversa a un altre servidor.
 gen_range=Abast
-gen_name=Patró d'adreça
+gen_name=Patró del nom de registre
 gen_type=Tipus
-gen_value=Patró de nom de host
+gen_value=Patró del valor de registre
 gen_cmt=Comentari
 gen_skip=cada
 gen_show=Mostra els registres generats

bind8/lang/en

@@ -293,6 +293,11 @@ edit_espfip6='$1' is not a valid IPv6 address or IPv6/prefix to allow sending fr
 edit_espfinclude='$1' is not a valid additional domain from which mail is sent
 edit_espfredirect='$1' is not a valid alternate domain name
 edit_espfexp='$1' is a valid record name for a rejection message
+edit_ensec3value2=Missing or non-numeric number of iterations
+edit_ensec3value3=Missing or non-base64 salt
+edit_edmarcpct=Percentage of messages must be an integer between 0 and 100
+edit_edmarcrua=Missing aggregate feedback address
+edit_edmarcruf=Missing forensic information address
 
 text_title=Edit Records File
 text_title2=View Records File
@@ -369,8 +374,10 @@ type_NS=Name Server
 type_CNAME=Name Alias
 type_MX=Mail Server
 type_HINFO=Host Information
+type_NSEC3PARAM=DNSSEC Parameters
 type_TXT=Text
 type_SPF=Sender Permitted From
+type_DMARC=DMARC
 type_WKS=Well Known Service
 type_RP=Responsible Person
 type_PTR=Reverse Address
@@ -387,12 +394,14 @@ edit_MX=Mail Server
 edit_HINFO=Host Information
 edit_TXT=Text
 edit_SPF=Sender Permitted From
+edit_DMARC=DMARC
 edit_WKS=Well Known Service
 edit_RP=Responsible Person
 edit_PTR=Reverse Address
 edit_LOC=Location
 edit_SRV=Service Address
 edit_KEY=Public Key
+edit_NSEC3PARAM=DNSSEC Parameters
 
 recs_defttl=Default TTL
 recs_A=Address
@@ -403,6 +412,7 @@ recs_MX=Mail Server
 recs_HINFO=Host Information
 recs_TXT=Text
 recs_SPF=Sender Permitted From
+recs_DMARC=DMARC
 recs_WKS=Well Known Service
 recs_RP=Responsible Person
 recs_PTR=Reverse Address
@@ -410,6 +420,7 @@ recs_LOC=Location
 recs_SRV=Service Address
 recs_ALL=All
 recs_KEY=Public Key
+recs_NSEC3PARAM=DNSSEC Parameters
 recs_delete=Delete Selected
 
 value_A1=Address
@@ -437,6 +448,14 @@ value_KEY2=Protocol
 value_KEY3=Algorithm
 value_KEY4=Key data
 value_SPF1=SPF specification
+value_DMARC1=DMARC specification
+value_NSEC3PARAM1=Hash algorithm
+value_NSEC3PARAM2=NSEC3 flags
+value_NSEC3PARAM3=Number of hash iterations
+value_NSEC3PARAM4=Length of salt
+value_NSEC3PARAM5=Salt string
+value_delegated=Delegated zone
+value_notdelegated=Other zone
 value_other=Values (one per line)
 value_spfa=Allow sending from domain's IP address?
 value_spfmx=Allow sending from domain's MX hosts?
@@ -456,6 +475,18 @@ value_spfredirect=Use SPF record from alternate domain
 value_spfnoredirect=Use this domain's record
 value_spfexp=TXT record for rejection reason
 value_spfnoexp=None
+value_dmarcnone=Take no action
+value_dmarcquar=Quarantine email
+value_dmarcreject=Reject email
+value_dmarcp=Policy for emails that fail SPF or DKIM
+value_dmarcpct=Percentage of messages to apply policy
+value_dmarcrua=Send aggregate feedback to
+value_dmarcruf=Send forensic information to
+value_dmarcsp=Policy for sub-domains
+value_dmarcnop=Same as this domain
+value_dmarcaspf=Require strict SPF alignment
+value_dmarcadkim=Require strict DKIM alignment
+value_dmarcnor=Don't send
 
 warn=Warn
 fail=Fail
@@ -706,7 +737,7 @@ zonedef_this=System hostname ($1)
 zonedef_eprins=Missing or invalid default nameserver for master domains
 zonedef_dnssec=Create DNSSEC key and sign new zones?
 zonedef_dnssec_dt=Automate all DNSSEC operations (ignore other settings below)?
-zonedef_dne=Authenticated Denial of Existance Using
+zonedef_dne=Authenticated Denial of Existence Using
 zonedef_alg=Initial key algorithm
 zonedef_size=Initial key size
 zonedef_single=Number of keys to create
@@ -793,6 +824,9 @@ log_dnssec=Change DNSSEC key re-signing
 
 convert_err=Failed to convert zone
 convert_efile=A records file must be specified before a slave zone can be converted to a master.
+convert_efilesize=Records file $1 does not exist or is empty
+convert_ebinary=The command needed to convert from a binary slave zone to a text format master is not installed
+convert_ecompile=Binary to text format conversion failed : $1
 
 whois_title=WHOIS Information
 whois_header=Output from command $1 ..
@@ -852,9 +886,9 @@ vdelete_move=Move to view
 gen_title=Record Generators
 gen_desc=This page allows you to define generators, each of which will create multiple records in this zone using an incrementing counter. This can be useful for delegating parts of the reverse zone to another server.
 gen_range=Range
-gen_name=Address pattern
+gen_name=Record name pattern
 gen_type=Type
-gen_value=Hostname pattern
+gen_value=Record value pattern
 gen_cmt=Comment
 gen_skip=every
 gen_show=Show generated records

bind8/lang/no

@@ -224,6 +224,7 @@ edit_KEY=Offentlig nøkkel
 edit_LOC=Plassering
 edit_MX=E-post tjener
 edit_NS=Navnetjener
+edit_NSEC3PARAM=DNSSEC Parametere
 edit_PTR=Revers adresse
 edit_RP=Ansvarlig person
 edit_SPF=Sender tillatt fra
@@ -258,6 +259,7 @@ edit_eloc=Manglende bredde- og lengdegrad
 edit_emx='$1' er ikke en gyldig e-post tjener
 edit_ename='$1' er ikke et gyldig oppføringsnavn
 edit_ens='$1' er ikke en gyldig navnetjener
+edit_ensec3value2=Manglende eller ikke-base64 salt
 edit_eos=Manglende OS type
 edit_eport='$1' er ikke et gyldig portnummer
 edit_epri='$1' er ikke en gyldig prioritet
@@ -780,6 +782,7 @@ recs_KEY=Offenlig nøkkel
 recs_LOC=Plassering
 recs_MX=E-post tjener
 recs_NS=Navnetjener
+recs_NSEC3PARAM=DNSSEC Parametere
 recs_PTR=Revers adresse
 recs_RP=Ansvarlig person
 recs_SPF=Sender tillatt fra
@@ -979,6 +982,7 @@ type_KEY=Offentlig nøkkel
 type_LOC=Plassering
 type_MX=E-post tjener
 type_NS=Navnetjener
+type_NSEC3PARAM=DNSSEC Parametere
 type_PTR=Revers adresse
 type_RP=Ansvarlig person
 type_SPF=Avsender tillatt fra
@@ -1015,6 +1019,11 @@ value_LOC1=Bredde- og lengdegrad
 value_MX1=Prioritet
 value_MX2=E-post tjener
 value_NS1=Navnetjener
+value_NSEC3PARAM1=Hash algoritme
+value_NSEC3PARAM2=NSEC3 flagg
+value_NSEC3PARAM3=Antall hash iterasjoner
+value_NSEC3PARAM4=Lengde på salt
+value_NSEC3PARAM5=Salt streng
 value_PTR1=Vertsnavn
 value_RP1=E-post adresse
 value_RP2=Tekst-oppføring navn
@@ -1027,6 +1036,8 @@ value_TXT1=Melding
 value_WKS1=Adresse
 value_WKS2=Protokoll
 value_WKS3=Tjenester
+value_delegated=Delegert sone
+value_notdelegated=Annen sone
 value_other=Verdier (en per linje)
 value_spfa=Tillat sending fra domenets IP adresse?
 value_spfall=Handling for andre avsendere

bind8/records-lib.pl

@@ -282,6 +282,15 @@ while($i < @tok) {
 				}
 			}
 
+		# If this is a DMARC record .. adjust the class
+		local $dmarc;
+		if ($dir{'type'} eq 'TXT' &&
+                    ($dmarc=&parse_dmarc(@{$dir{'values'}}))) {
+                        if (!@{$dmarc->{'other'}}) {
+                                $dir{'type'} = 'DMARC';
+                                }
+                        }
+
 		push(@rv, \%dir);
 
 		# Stop processing if this was an SOA record
@@ -396,9 +405,11 @@ splice(@$lref, $_[1]->{'line'}, 1);
 # Returns a string for some zone record
 sub make_record
 {
-local $type = $_[3] eq "SPF" && !$config{'spf_record'} ? "TXT" : $_[3];
-return $_[0] . ($_[1] ? "\t$_[1]" : "") . "\t$_[2]\t$type\t$_[4]" .
-       ($_[5] ? "\t;$_[5]" : "");
+local ($name, $ttl, $cls, $type, $values, $cmt) = @_;
+local $type = $type eq "SPF" && !$config{'spf_record'} ? "TXT" :
+	      $type eq "DMARC" ? "TXT" : $type;
+return $name . ($ttl ? "\t".$ttl : "") . "\t" . $cls . "\t" . $type ."\t" .
+       $values . ($cmt ? "\t;$cmt" : "");
 }
 
 # bump_soa_record(file, &records)
@@ -738,6 +749,7 @@ local $rvword;
 while(@rv) {
 	my $w = shift(@rv);
 	if (length($rvword)+length($w)+1 >= 255) {
+		$rvword .= " ";
 		push(@rvwords, $rvword);
 		$rvword = "";
 		}
@@ -748,6 +760,57 @@ push(@rvwords, $rvword);
 return join("\" \"", @rvwords);
 }
 
+# parse_dmarc(text, ...)
+# If some text looks like an DMARC TXT record, return a parsed hash ref
+sub parse_dmarc
+{
+my $txt = join(" ", @_);
+if ($txt =~ /^v=dmarc1/i) {
+	local @w = split(/;\s*/, $txt);
+	local $dmarc = { };
+	foreach my $w (@w) {
+		$w = lc($w);
+		if ($w =~ /^(v|pct|ruf|rua|p|sp|adkim|aspf)=(\S+)$/i) {
+			$dmarc->{$1} = $2;
+			}
+		else {
+			push(@{$dmarc->{'other'}}, $w);
+			}
+		}
+	return $dmarc;
+	}
+return undef;
+}
+
+# join_dmarc(&dmarc)
+# Converts a DMARC record structure to a string, designed to be inserted into
+# quotes in a TXT record. If it is longer than 255 bytes, it will be split
+# into multiple quoted strings.
+sub join_dmarc
+{
+local ($dmarc) = @_;
+local @rv = ( "v=DMARC1" );
+foreach my $s ("pct", "ruf", "rua", "p", "sp", "adkim", "aspf") {
+	if ($dmarc->{$s} ne '') {
+		push(@rv, $s."=".$dmarc->{$s});
+		}
+	}
+push(@rv, @{$dmarc->{'other'}});
+local @rvwords;
+local $rvword;
+while(@rv) {
+	my $w = shift(@rv);
+	if (length($rvword)+length($w)+1 >= 255) {
+		push(@rvwords, $rvword);
+		$rvword = "";
+		}
+	$rvword .= "; " if ($rvword);
+	$rvword .= $w;
+	}
+push(@rvwords, $rvword);
+return join("\" \"", @rvwords);
+}
+
 # join_record_values(&record)
 # Given the values for a record, joins them into a space-separated string
 # with quoting if needed

bind8/save_gen.cgi

@@ -42,7 +42,8 @@ if ($in{'show'}) {
 
 			$rhs = $gv[3];
 			$rhs =~ s/\$\$/\0/g;
-			$rhs =~ s/\$/$i/g;
+			#$rhs =~ s/\$/$i/g;
+			$rhs =~ s/(\$(\{[^\}]*\})?)/&expand_mods($i,$2)/ge;
 			$rhs =~ s/\0/\$/g;
 			$rhsfull = &check_ipaddress($rhs) ? $rhs :
 				   $rhs =~ /\.$/ ? $rhs :
@@ -78,11 +79,11 @@ for($i=0; defined($in{"type_$i"}); $i++) {
 		if ($in{"skip_$i"}) {
 			$gv[$#gv] .= "/".$in{"skip_$i"};
 			}
-		$in{"name_$i"} =~ /^[A-Za-z0-9\.\-$uscore$star\$]+$/ ||
+		$in{"name_$i"} =~ /^[A-Za-z0-9\.\-$uscore$star\$\{\},]+$/ ||
 			&error(&text('gen_ename', $i+1));
 		push(@gv, $in{"name_$i"});
 		push(@gv, $in{"type_$i"});
-		$in{"value_$i"} =~ /^[A-Za-z0-9\.\-$uscore$star\$]+$/ ||
+		$in{"value_$i"} =~ /^[A-Za-z0-9\.\-$uscore$star\$\{\},]+$/ ||
 			&error(&text('gen_evalue', $i+1));
 		push(@gv, $in{"value_$i"});
 		push(@gv, $in{"cmt_$i"}) if ($in{"cmt_$i"});
@@ -108,3 +109,26 @@ for($i=0; defined($in{"type_$i"}); $i++) {
 &sign_dnssec_zone_if_key($zone, \@recs);
 &redirect("edit_master.cgi?zone=$in{'zone'}&view=$in{'view'}");
 
+sub expand_mods
+{
+my ($i, $m) = @_;
+$m =~ s/^\{//;
+$m =~ s/\}$//;
+my ($o, $w, $b) = split(/,/, $m);
+if ($o !~ /^\-?\d+$/) {
+	# Disallowed offset
+	$o = 0;
+	}
+if ($w !~ /^\d+$/) {
+	# Disallowed width
+	$w = 0;
+	}
+if ($b !~ /^[doxXnN]$/) {
+	# Disallowed modifier
+	$b = undef;
+	}
+$b ||= "d";
+$i += $o;
+$i = sprintf("%".($w ? "0".$w : "").$b, $i);
+return $i;
+}

bind8/save_record.cgi

@@ -339,6 +339,59 @@ else {
 			}
 		$vals = "\"".&join_spf($spf)."\"";
 		}
+	elsif ($in{'type'} eq 'DMARC') {
+		# Build DMARC record from inputs
+		$dmarc = $r ? &parse_dmarc(@{$r->{'values'}}) : { };
+		$dmarc->{'p'} = $in{'dmarcp'};
+
+		$in{'dmarcpct'} =~ /^\d+$/ && $in{'dmarcpct'} >= 0 &&
+		  $in{'dmarcpct'} <= 100 || &error($text{'edit_edmarcpct'});
+		$dmarc->{'pct'} = $in{'dmarcpct'};
+
+		if ($in{'dmarcsp'}) {
+			$dmarc->{'sp'} = $in{'dmarcsp'};
+			}
+		else {
+			delete($dmarc->{'sp'});
+			}
+
+		$dmarc->{'aspf'} = $in{'dmarcaspf'} ? 's' : 'r';
+		$dmarc->{'adkim'} = $in{'dmarcadkim'} ? 's' : 'r';
+
+		if ($in{'dmarcrua_def'}) {
+			delete($dmarc->{'rua'});
+			}
+		else {
+			$in{'dmarcrua'} =~ /^\S+$/ ||
+				&error($text{'edit_edmarcrua'});
+			$in{'dmarcrua'} = 'mailto:'.$in{'dmarcrua'}
+				if ($in{'dmarcrua'} !~ /^[a-z]+:/i);
+			$dmarc->{'rua'} = $in{'dmarcrua'};
+			}
+
+		if ($in{'dmarcruf_def'}) {
+			delete($dmarc->{'ruf'});
+			}
+		else {
+			$in{'dmarcruf'} =~ /^\S+$/ ||
+				&error($text{'edit_edmarcruf'});
+			$in{'dmarcruf'} = 'mailto:'.$in{'dmarcruf'}
+				if ($in{'dmarcruf'} !~ /^[a-z]+:/i);
+			$dmarc->{'ruf'} = $in{'dmarcruf'};
+			}
+
+		$vals = "\"".&join_dmarc($dmarc)."\"";
+		}
+	elsif ($in{'type'} eq 'NSEC3PARAM') {
+		# Save DNSSEC parameters
+		$in{'value2'} =~ /^\d+$/ ||
+			&error($text{'edit_ensec3value2'});
+		$in{'value4'} =~ /^[a-zA-Z0-9\+\/]+$/ ||
+			&error($text{'edit_ensec3value2'});
+		$vals = join(" ", "(", $in{'value0'}, $in{'value1'},
+                                       $in{'value2'}, length($in{'value4'}),
+				       $in{'value4'}, ")");
+		}
 	else {
 		# For other record types, just save the lines
 		$in{'values'} =~ s/\r//g;

bind8/save_view.cgi

@@ -20,6 +20,23 @@ $access{'ro'} && &error($text{'view_ecannot'});
 &save_address("allow-query", $view, 1);
 &save_address("also-notify", $view, 1);
 &save_address("allow-notify", $view, 1);
+
+if ($in{'transfer-source'})
+{
+        &check_ipaddress($in{'transfer-source'}) || &error(&text('net_eaddr', $in{'transfer-source'}));
+        push(@tvals, $in{'transfer-source'});
+        if (@tvals)
+        {
+                &save_directive($view, 'transfer-source',
+                [ { 'name' => 'transfer-source',
+                'values' => \@tvals } ], 1);
+        }
+}
+else
+{
+        &save_directive($view, 'transfer-source', [], 1);
+}
+
 &flush_file_lines();
 &unlock_file(&make_chroot($view->{'file'}));
 &webmin_log("view", undef, $view->{'value'}, \%in);

blue-theme

@@ -0,0 +1 @@
+gray-theme

blue-theme/lang/ca

@@ -1,44 +0,0 @@
-left_login=Identificació: $1
-left_home=Informació del Sistema
-left_oc=Esponsoritzat per OpenCountry
-left_feedback=Envia opinions
-left_search_webmin=Busca a Webmin:
-left_search_usermin=Busca a Usermin:
-left_search=Busca:
-left_logs=Visualitza els Registres del Mòdul
-left_others=Altres
-
-right_header0=Informació del Sistema
-right_host=Nom de host del sistema
-right_os=Sistema operatiu
-right_login=Identificat com a:
-right_from=Identificat des de:
-right_webmin=Versió Webmin
-right_usermin=Versió Usermin
-right_cpu=Càrrega mitjana de la CPU
-right_cpuinfo=Informació del processador
-right_cputype=$5, $8 nuclis
-right_load=$1 (1 min) $2 (5 mins) $3 (15 mins)
-right_cpuuse=Ús de la CPU
-right_cpustats=$1% usuari, $2% nucli, $4% E/S, $3% desocupada
-right_real=Memòria real
-right_virt=Memòria virtual
-right_procs=Processos en execució
-right_disk=Espai local en disc
-right_used=$1 total, $2 utilitzat
-right_out=$1 de $2
-right_quota=Ús del disc i quota
-right_header5=Informació del Compte
-right_uquota=Quota de disc i ús
-right_time=Hora del sistema
-right_uptime=En execució durant
-right_updays=$1 dies, $2 hores, $3 minuts
-right_uphours=$1 hores, $2 minuts
-right_upmins=$1 minuts
-right_kernel=Nucli i CPU
-right_kernelon=$1 $2 a $3
-right_updates=Actualitzacions de paquets
-right_upok=Tots els paquets instal·lats estan actualitzats
-right_upneed=Hi ha $1 actualitzacions de paquets disponibles
-right_upsec=Hi ha $1 actualitzacions de paquets disponibles, de les quals $2 són actualitzacions de seguretat
-__norefs=1

blue-theme/lang/de

@@ -1,43 +0,0 @@
-__norefs=1
-left_feedback=Feedback versenden
-left_home=Systeminformation
-left_login=Login: $1
-left_logs=Zeige Modul Logs an
-left_oc=Gesponsert von OpenCountry
-left_others=Andere
-left_search=Suchen:
-left_search_usermin=Suche Usermin:
-left_search_webmin=Suche Webmin:
-right_cpu=CPU-Last im Durchschnitt
-right_cpuinfo=Prozessorinformation
-right_cpustats=$1% Benutzer, $2% Kernel, $4% IO, $3% Leerlauf
-right_cputype=$5, $8 cores
-right_cpuuse=CPU Auslastung
-right_disk=Lokaler Festplattenspeicher
-right_from=Eingeloggt von
-right_header0=Systeminformation
-right_header5=Accountinformationen
-right_host=System Hostname
-right_kernel=Kernel und CPU
-right_kernelon=$1 $2 auf $3
-right_load=$1 (1 Minute) $2 (5 Minuten) $3 (15 Minuten)
-right_login=Eingeloggt als
-right_os=Betriebssystem
-right_out=$1 von $2
-right_procs=Laufende Prozesse
-right_quota=Festplattenauslastung und Quota
-right_real=Realer Speicher
-right_time=Systemzeit
-right_updates=Paketupdates
-right_updays=$1 Tag(e), $2 Stunde(n), $3 Minute(n)
-right_uphours=$1 Stunde(n), $2 Minute(n)
-right_upmins=$1 Minute(n)
-right_upneed=$1 Paketupdates sind verfügbar
-right_upok=Alle installierten Pakete sind auf dem aktuellen Stand
-right_upsec=$1 Paketupdates sind verfügbar, von dem $2 Sicherheitsupdates sind
-right_uptime=System Laufzeit
-right_uquota=Festplatten Quota und Auslastung
-right_used=$1 gesamt, $2 benutzt
-right_usermin=Usermin Version
-right_virt=Virtueller Speicher
-right_webmin=Webmin Version

blue-theme/lang/fr

@@ -1,31 +0,0 @@
-left_feedback=Envoyer un rapport
-left_home=Information Système
-left_login=Connexion : $1
-left_logs=Voir les journaux du module
-left_oc=Sponsorisé par "OpenCountry"
-left_others=Autres
-left_search=Rechercher :
-right_cpu=Moyennes de charge CPU
-right_cpuinfo=Information sur le CPU
-right_disk=Espace disque local
-right_header0=Information Système
-right_header5=Information sur le compte
-right_host=Nom d'hôte du système
-right_kernel=Noyau et CPU
-right_kernelon=$1 $2 sur $3
-right_load=$1 (1 min) $2 (5 mins) $3 (15 mins)
-right_os=Système d'exploitation
-right_out=$1 sur $2
-right_procs=Processus en cours
-right_real=Mémoire réelle
-right_time=Date et heure du système
-right_updates=Mises à jours de Paquet
-right_updays=$1 jours, $2 heures, $3 minutes
-right_uphours=$1 heures, $2 minutes
-right_upmins=$1 minutes
-right_uptime=Durèe de fonctionnement du système
-right_uquota=Utilisation et quota disque
-right_used=$1 total, $2 utilisé
-right_usermin=Version de Usermin
-right_virt=Mémoire virtuelle
-right_webmin=Version de Webmin

blue-theme/lang/ja_JP.euc

@@ -1,23 +0,0 @@
-left_login=ログイン名: $1
-left_home=システム情報
-left_oc=提供：OpenCountry
-
-right_header0=システム情報
-right_host=ホスト名
-right_os=オペレーティングシステム
-right_login=ログイン中のユーザ
-right_from=接続元
-right_webmin=Webmin バージョン
-right_usermin=Usermin バージョン
-right_cpu=CPU 平均負荷
-right_load=$1 (1分) $2 (5分) $3 (15分)
-right_real=実メモリ
-right_virt=仮想メモリ
-right_procs=走行プロセス数
-right_disk=ローカルディスク容量
-right_used=合計 $1 , 使用 $2
-right_out=$1 of $2
-right_quota=ディスク使用量とクオータ
-right_header5=アカウント情報
-right_uquota=ディスククオータと使用量
-right_time=サーバ上の時刻

blue-theme/lang/ms_MY

@@ -1,43 +0,0 @@
-__norefs=1
-left_feedback=Hantar Maklum Balas
-left_home=Maklumat Sistem
-left_login=Log masuk: $1
-left_logs=Lihat log modul
-left_oc=Ditaja oleh OpenCountry
-left_others=Lain-lain
-left_search=Carian:
-left_search_usermin=Carian Usermin:
-left_search_webmin=Carian Webmin
-right_cpu=Purata beban CPU
-right_cpuinfo=Maklumat pemproses
-right_cpustats=$1% user, $2% kernel, $4% IO, $3% idle
-right_cputype=$5, $8 teras
-right_cpuuse=Penggunaan CPU
-right_disk=Ruang disk setempat
-right_from=Telah log masuk dari
-right_header0=Maklumat Sistem
-right_header5=Maklumat Akaun
-right_host=Nama hos sistem
-right_kernel=Kernel dan CPU
-right_kernelon=$1 $2 pada $3
-right_load=$1 (1 min) $2 (5 min) $3 (15 min)
-right_login=Telah log masuk sebagai
-right_os=Sistem operasi
-right_out=$1 daripada $2
-right_procs=Proses yang dijalankan
-right_quota=Penggunaan disk dan kuota
-right_real=Memori sebenar
-right_time=Masa pada sistem
-right_updates=Pakej kemaskini
-right_updays=$1 hari, $2 jam, $3 minit
-right_uphours=$1 jam, $2 minit
-right_upmins=$1 minit
-right_upneed=terdapat $1 pakej kemaskini
-right_upok=Semua pakej yang dipasang adalah terkini
-right_upsec=terdapat $1 pakej kemaskini, dimana $2 darinya adalah kemaskini keselamatan
-right_uptime=Sistem uptime
-right_uquota=Kuota disk dan penggunaan
-right_used=total $1, $2 digunakan
-right_usermin=Versi Usermin
-right_virt=Ingatan maya
-right_webmin=Versi Webmin

blue-theme/lang/nl

@@ -1,43 +0,0 @@
-__norefs=1
-left_feedback=Verstuur Opmerkingen
-left_home=Systeem Informatie
-left_login=Login: $1
-left_logs=Bekijk Module's Logs
-left_oc=Gesponserd door OpenCountry
-left_others=Andere
-left_search=Zoek:
-left_search_usermin=Zoek Usermin:
-left_search_webmin=Zoek Webmin:
-right_cpu=CPU belasting gemiddelde
-right_cpuinfo=Processor informatie
-right_cpustats=$1% gebruiker, $2% kernel, $4% IO, $3% slaapt
-right_cputype=$5, $8 cores
-right_cpuuse=CPU gebruik
-right_disk=Locale harddisk ruimte
-right_from=Ingelogd van
-right_header0=Systeem Informatie
-right_header5=Account Informatie
-right_host=Systeem hostnaam
-right_kernel=Kernel en CPU
-right_kernelon=$1 $2 op $3
-right_load=$1 (1 min) $2 (5 minuten) $3 (15 minuten)
-right_login=Ingelogd als
-right_os=Besturing systeem
-right_out=$1 van $2
-right_procs=Lopende processen
-right_quota=Harddisk gebruik en quota
-right_real=Echt geheugen
-right_time=Systeemtijd
-right_updates=Pakketten update's
-right_updays=$1 dagen, $2 uur, $3 minuten
-right_uphours=$1 uur, $2 minuten
-right_upmins=$1 minuten
-right_upneed=Er zijn $1 pakketten updates beschikbaar
-right_upok=Al de geinstalleerde pakketten zijn up to date
-right_upsec=Er zijn $1 pakketten updates beschikbaar, waarvan er $2 veiligheid updates zijn
-right_uptime=Systeem werkt nu
-right_uquota=Harddisk quota en gebruik
-right_used=$1 totaal, $2 gebruikt
-right_usermin=Usermin Versie
-right_virt=Virtueel geheugen
-right_webmin=Webmin versie

blue-theme/lang/no

@@ -1,43 +0,0 @@
-__norefs=1
-left_feedback=Send tilbakemelding
-left_home=System informasjon
-left_login=Brukernavn: $1
-left_logs=Vis modulens logger
-left_oc=Sponset av OpenCountry
-left_others=Andre
-left_search=Søk:
-left_search_usermin=Søk i Usermin:
-left_search_webmin=Søk i Webmin:
-right_cpu=CPU gj.snittsbelastninger
-right_cpuinfo=Prosessor informasjon
-right_cpustats=$1% bruker, $2% kjerne, $4% IO, $3% ledig
-right_cputype=$5, $8 kjerner
-right_cpuuse=CPU bruk
-right_disk=Lokal diskplass
-right_from=Logget inn fra
-right_header0=System informasjon
-right_header5=Konto informasjon
-right_host=System vertsnavn
-right_kernel=Kjerne og CPU
-right_kernelon=$1 $2 på $3
-right_load=$1 (1 min) $2 (5 min.) $3 (15 min.)
-right_login=Logget inn som
-right_os=Operativsystem
-right_out=$1 av $2
-right_procs=Kjørende prosesser
-right_quota=Diskbruk og kvote
-right_real=Fysisk minne
-right_time=Tid på systemet
-right_updates=Pakkeoppdateringer
-right_updays=$1 dager, $2 timer, $3 minutter
-right_uphours=$1 timer, $2 minutter
-right_upmins=$1 minutter
-right_upneed=$1 pakkeoppdateringer er tilgjengelige
-right_upok=Alle installerte pakker er oppdatert
-right_upsec=$1 pakkeoppdateringer er tilgjengelige, og $2 av disse er sikkerhetsoppdateringer
-right_uptime=System oppetid
-right_uquota=Diskkvote og bruk
-right_used=$1 totalt, $2 brukt
-right_usermin=Usermin versjon
-right_virt=Virtuelt minne
-right_webmin=Webmin versjon

blue-theme/lang/pl

@@ -1,43 +0,0 @@
-__norefs=1
-left_feedback=Wyślij informacje zwrotne
-left_home=Informacje o systemie
-left_login=Login: $1
-left_logs=Wyświetl logi modułu
-left_oc=Sponsorowana przez OpenCountry
-left_others=Inne
-left_search=Wyszukaj:
-left_search_usermin=Wyszukaj w Usermin:
-left_search_webmin=Wyszukaj w Webmin:
-right_cpu=Średnie obciążenie CPU
-right_cpuinfo=Informacje o procesorze
-right_cpustats=$1% użytkownik, $2% jądro, $4% IO, $3% bezczynny
-right_cputype=$5, $8 rdzeni
-right_cpuuse=Użycie CPU
-right_disk=Miejsce na dysku lokalnym
-right_from=Formularz logowania
-right_header0=Infomacje o systemie
-right_header5=Infomacje o koncie
-right_host=Nazwa hosta systemu
-right_kernel=Jądro i CPU
-right_kernelon=$1 $2 na $3
-right_load=$1 (1 min) $2 (5 minut) $3 (15 minut)
-right_login=Zalogowany jako
-right_os=System operacyjny
-right_out=$1 z $2
-right_procs=Uruchomionych procesów
-right_quota=Użycie dysku i quota
-right_real=Pamięć rzeczywista
-right_time=Czas systemowy
-right_updates=Uaktualnienia paczek
-right_updays=$1 dni, $2 godzin, $3 minut
-right_uphours=$1 godzin, $2 minut
-right_upmins=$1 minut
-right_upneed=Dostępnych $1 uaktualnień paczek
-right_upok=Wszystkie zainstalowane paczki są aktualne
-right_upsec=Dostępnych jest $1 uaktualnień, z których $2 to uaktualnienia bezpieczeństwa
-right_uptime=Czas działania systmu
-right_uquota=Quota dyskowa i użycie
-right_used=Razem $1, używane $2
-right_usermin=Wersja Usermina
-right_virt=Pamięć wirtualna
-right_webmin=Wersja Webmina

blue-theme/lang/pt_BR

@@ -1,34 +0,0 @@
-left_login=Login: $1
-left_home=Informações do Sistema
-left_oc=Patrocinado por OpenCountry
-left_feedback=Enviar Feedback
-left_search_webmin=Procurar no Webmin:
-left_search_usermin=Procurar no Usermin:
-left_search=Procurar:
-left_logs=Ver Registros do Módulos
-left_others=Outros
-right_header0=Informações do Sistema
-right_host=Nome de host do sistema
-right_os=Sistema operacional
-right_login=Conectado como
-right_from=Conectado de
-right_webmin=Versão do Webmin
-right_usermin=Versão do Usermin
-right_cpu=Médias de carga da CPU
-right_load=$1 (1 minuto) $2 (5 minutos) $3 (15 minutos)
-right_real=Memória real
-right_virt=Memória virtual
-right_procs=Processos em execução
-right_disk=Espaço em disco local
-right_used=$1 no total, $2 em uso
-right_out=$1 of $2
-right_quota=Uso e cota de espaço em disco
-right_header5=Informações da Conta
-right_uquota=Cota e uso de espaço em disco
-right_time=Tempo no sistema
-right_uptime=Tempo de atividade do sistema
-right_updays=$1 dias, $2 horas, $3 minutos
-right_uphours=$1 horas, $2 minutos
-right_upmins=$1 minutos
-right_kernel=Kernel e CPU
-right_kernelon=$1 $2 em $3

blue-theme/lang/ru_SU

@@ -1,39 +0,0 @@
-left_feedback=Отправить отзыв
-left_home=Информация о системе
-left_login=Логин: $1
-left_logs=Просмотреть журнал модулей
-left_oc=При поддержке OpenCountry
-left_others=Остальные
-left_search=Поиск:
-left_search_usermin=Поиск Usermin:
-left_search_webmin=Поиск Webmin:
-right_cpu=Средняя загрузка процессора
-right_cpuinfo=Информация о процессоре
-right_cpustats=$1% пользователь, $2% ядро, $4% IO, $3% простой
-right_cputype=$5, $8 ядер
-right_cpuuse=Использование процессора
-right_disk=Место на локальном диске
-right_header0=Информация о системе
-right_header5=Информация об аккаунте
-right_host=Имя хоста
-right_kernel=Ядро и процессор
-right_kernelon=$1 $2 на $3
-right_login=Вошел как
-right_os=Операционная система
-right_procs=Запущенно процессов
-right_quota=Использование диск и квота
-right_real=Физическая память
-right_time=Системное время
-right_updates=Обновление пакетов
-right_updays=$1 дней, $2 часов, $3 минут
-right_uphours=$1 часов, $2 минут
-right_upmins=$1 минут
-right_upneed=Доступно $1 обновленных пакетов
-right_upok=Все установленные пакеты имеют последнюю версию
-right_upsec=Доступно $1 обновленных пакетов, из которых $2 содержат обновления безопасности
-right_uptime=Uptime системы
-right_uquota=Дисковая квота и использование
-right_used=$1 всего, $2 используется
-right_usermin=Версия Usermin
-right_virt=Виртуальная память
-right_webmin=Версия Webmin

blue-theme/left.cgi

@@ -1,176 +0,0 @@
-#!/usr/bin/perl
-# Show the left-side menu of Webmin modules
-
-BEGIN { push(@INC, ".."); };
-use WebminCore;
-&init_config();
-&ReadParse();
-%text = &load_language($current_theme);
-%gaccess = &get_module_acl(undef, "");
-
-# Work out what modules and categories we have
-@cats = &get_visible_modules_categories();
-@modules = map { @{$_->{'modules'}} } @cats;
-
-&popup_header();
-print <<EOF;
-<link rel="stylesheet" type="text/css" href="left.css" />
-<script>
-function toggleview (id1,id2) {
-		var obj1 = document.getElementById(id1);
-		var obj2 = document.getElementById(id2);
-		(obj1.className=="itemshown") ? obj1.className="itemhidden" : obj1.className="itemshown"; 
-		(obj1.className=="itemshown") ? obj2.innerHTML="<img border='0' src='images/open.gif' alt='[&ndash;]'>" : obj2.innerHTML="<img border='0' src='images/closed.gif' alt='[+]'>"; 
-	}
-
-// Show the logs for the current module in the right
-function show_logs() {
-  var url = ''+window.parent.frames[1].location;
-  var sl1 = url.indexOf('//');
-  var mod = '';
-  if (sl1 > 0) {
-    var sl2 = url.indexOf('/', sl1+2);
-    if (sl2 > 0) {
-      var sl3 = url.indexOf('/', sl2+1);
-      if (sl3 > 0) {
-        mod = url.substring(sl2+1, sl3);
-      } else {
-        mod = url.substring(sl2+1);
-      }
-    }
-  }
-if (mod && mod.indexOf('.cgi') <= 0) {
-  // Show one module's logs
-  window.parent.frames[1].location = 'webminlog/search.cgi?tall=4&uall=1&fall=1&mall=0&module='+mod;
-  }
-else {
-  // Show all logs
-  window.parent.frames[1].location = 'webminlog/search.cgi?tall=4&uall=1&fall=1&mall=0&mall=1'
-  }
-}
-</script>
-</head>
-<body>
-EOF
-
-# Show login
-print &text('left_login', $remote_user),"<br>\n";
-
-if ($gconfig{"notabs_${base_remote_user}"} == 2 ||
-    $gconfig{"notabs_${base_remote_user}"} == 0 && $gconfig{'notabs'} ||
-    @modules <= 1) {
-	# Show all modules in one list
-	foreach $minfo (@modules) {
-		$target = $minfo->{'noframe'} ? "_top" : "right";
-		print "<a target=$target href=$minfo->{'dir'}/>$minfo->{'desc'}</a><br>\n";
-		}
-	}
-else {
-	# Show all modules under categories
-	foreach $c (@cats) {
-		# Show category opener, plus modules under it
-		&print_category_opener(
-			$c->{'code'},
-			$in{$c->{'code'}} ? 1 : 0,
-			$c->{'unused'} ?
-				"<font color=#888888>$c->{'desc'}</font>" :
-				$c->{'desc'});
-		$cls = $in{$c->{'code'}} ? "itemshown" : "itemhidden";
-		print "<div class='$cls' id='$c->{'code'}'>";
-		foreach my $minfo (@{$c->{'modules'}}) {
-			&print_category_link("$minfo->{'dir'}/",
-					     $minfo->{'desc'},
-					     undef,
-					     undef,
-					     $minfo->{'noframe'} ? "_top" : "",
-					);
-			}
-		print "</div>\n";
-		}
-	}
-
-# Show module/help search form
-if (-r "$root_directory/webmin_search.cgi" &&
-    $gaccess{'webminsearch'}) {
-	print "<form action=webmin_search.cgi target=right>\n";
-	print $text{'left_search'},"&nbsp;";
-	print &ui_textbox("search", undef, 15);
-	}
-
-print "<div class='leftlink'><hr></div>\n";
-
-# Show current module's log search, if logging
-if ($gconfig{'log'} && &foreign_available("webminlog")) {
-	print "<div class='linkwithicon'><img src=images/logs.gif>\n";
-	print "<div class='aftericon'><a target=right href='webminlog/' onClick='show_logs(); return false;'>$text{'left_logs'}</a></div></div>\n";
-	}
-
-# Show info link
-print "<div class='linkwithicon'><img src=images/gohome.gif>\n";
-print "<div class='aftericon'><a target=right href='right.cgi?open=system&open=status'>$text{'left_home'}</a></div></div>\n";
-
-# Show feedback link, but only if a custom email is set
-%gaccess = &get_module_acl(undef, "");
-if (&get_product_name() eq 'webmin' &&		# For Webmin
-      !$ENV{'ANONYMOUS_USER'} &&
-      $gconfig{'nofeedbackcc'} != 2 &&
-      $gaccess{'feedback'} &&
-      $gconfig{'feedback_to'} ||
-    &get_product_name() eq 'usermin' &&		# For Usermin
-      !$ENV{'ANONYMOUS_USER'} &&
-      $gconfig{'feedback'}
-    ) {
-	print "<div class='linkwithicon'><img src=images/mail-small.gif>\n";
-	print "<div class='aftericon'><a target=right href='feedback_form.cgi'>$text{'left_feedback'}</a></div></div>\n";
-	}
-
-# Show refesh modules link, for master admin
-if (&foreign_available("webmin")) {
-	print "<div class='linkwithicon'><img src=images/refresh-small.gif>\n";
-	print "<div class='aftericon'><a target=right href='webmin/refresh_modules.cgi'>$text{'main_refreshmods'}</a></div></div>\n";
-	}
-
-# Show logout link
-&get_miniserv_config(\%miniserv);
-if ($miniserv{'logout'} && !$ENV{'SSL_USER'} && !$ENV{'LOCAL_USER'} &&
-    $ENV{'HTTP_USER_AGENT'} !~ /webmin/i) {
-	print "<div class='linkwithicon'><img src=images/stock_quit.gif>\n";
-	if ($main::session_id) {
-		print "<div class='aftericon'><a target=_top href='session_login.cgi?logout=1'>$text{'main_logout'}</a></div>";
-		}
-	else {
-		print "<div class='aftericon'><a target=_top href='switch_user.cgi'>$text{'main_switch'}</a></div>";
-		}
-	print "</div>\n";
-	}
-
-# Show link back to original Webmin server
-if ($ENV{'HTTP_WEBMIN_SERVERS'}) {
-	print "<div class='linkwithicon'><img src=images/webmin-small.gif>\n";
-	print "<div class='aftericon'><a target=_top href='$ENV{'HTTP_WEBMIN_SERVERS'}'>$text{'header_servers'}</a></div>";
-	}
-
-&popup_footer();
-
-# print_category_opener(name, &allcats, label)
-# Prints out an open/close twistie for some category
-sub print_category_opener
-{
-local ($c, $status, $label) = @_;
-$label = $c eq "others" ? $text{'left_others'} : $label;
-local $img = $status ? "open.gif" : "closed.gif";
-
-# Show link to close or open catgory
-print "<div class='linkwithicon'>";
-print "<a href=\"javascript:toggleview('$c','toggle$c')\" id='toggle$c'><img border='0' src='images/$img' alt='[+]'></a>\n";
-print "<div class='aftericon'><a href=\"javascript:toggleview('$c','toggle$c')\" id='toggle$c'><font color=#000000>$label</font></a></div></div>\n";
-}
-
-
-sub print_category_link
-{
-local ($link, $label, $image, $noimage, $target) = @_;
-$target ||= "right";
-print "<div class='linkindented'><a target=$target href=$link>$label</a></div>\n";
-}
-

blue-theme/right.cgi

@@ -1,310 +0,0 @@
-#!/usr/local/bin/perl
-# Show server or domain information
-
-BEGIN { push(@INC, ".."); };
-use WebminCore;
-&init_config();
-&ReadParse();
-&load_theme_library();
-if (&get_product_name() eq "usermin") {
-	$level = 3;
-	}
-else {
-	$level = 0;
-	}
-%text = &load_language($current_theme);
-$bar_width = 300;
-foreach $o (split(/\0/, $in{'open'})) {
-	push(@open, $o);
-	$open{$o} = 1;
-	}
-
-$prehead = defined(&WebminCore::theme_prehead) ?
-		&capture_function_output(\&WebminCore::theme_prehead) : "";
-&popup_header(undef, $prehead);
-print "<center>\n";
-
-# Webmin logo
-if (&get_product_name() eq 'webmin') {
-	print "<a href=http://www.webmin.com/ target=_new><img src=images/webmin-blue.png border=0></a><p>\n";
-	}
-
-if ($level == 0) {
-	# Show general system information
-	print "<table width=70%>\n";
-
-	# Ask status module for collected info
-	&foreign_require("system-status");
-	$info = &system_status::get_collected_info();
-
-	# Hostname
-	$ip = $info && $info->{'ips'} ? $info->{'ips'}->[0]->[0] :
-				&to_ipaddress(get_system_hostname());
-	$ip = " ($ip)" if ($ip);
-	print "<tr> <td><b>$text{'right_host'}</b></td>\n";
-	print "<td>",&get_system_hostname(),$ip,"</td> </tr>\n";
-
-	# Operating system
-	print "<tr> <td><b>$text{'right_os'}</b></td>\n";
-	if ($gconfig{'os_version'} eq '*') {
-		print "<td>$gconfig{'real_os_type'}</td> </tr>\n";
-		}
-	else {
-		print "<td>$gconfig{'real_os_type'} $gconfig{'real_os_version'}</td> </tr>\n";
-		}
-
-	# Webmin version
-	print "<tr> <td><b>$text{'right_webmin'}</b></td>\n";
-	print "<td>",&get_webmin_version(),"</td> </tr>\n";
-
-	# System time
-	$tm = localtime(time());
-	print "<tr> <td><b>$text{'right_time'}</b></td>\n";
-	if (&foreign_available("time")) {
-		$tm = "<a href=time/>$tm</a>";
-		}
-	print "<td>$tm</td> </tr>\n";
-
-	# Kernel and CPU
-	if ($info->{'kernel'}) {
-		print "<tr> <td><b>$text{'right_kernel'}</b></td>\n";
-		print "<td>",&text('right_kernelon',
-				   $info->{'kernel'}->{'os'},
-				   $info->{'kernel'}->{'version'},
-				   $info->{'kernel'}->{'arch'}),"</td> </tr>\n";
-		}
-
-	# CPU type and cores
-	if ($info->{'load'}) {
-		@c = @{$info->{'load'}};
-		if (@c > 3) {
-			print "<tr> <td><b>$text{'right_cpuinfo'}</b></td>\n";
-			print "<td>",&text('right_cputype', @c),"</td> </tr>\n";
-			}
-		}
-
-	# System uptime
-	&foreign_require("proc");
-	my $uptime;
-	my ($d, $h, $m) = &proc::get_system_uptime();
-	if ($d) {
-		$uptime = &text('right_updays', $d, $h, $m);
-		}
-	elsif ($m) {
-		$uptime = &text('right_uphours', $h, $m);
-		}
-	elsif ($m) {
-		$uptime = &text('right_upmins', $m);
-		}
-	if ($uptime) {
-		print "<tr> <td><b>$text{'right_uptime'}</b></td>\n";
-		print "<td>$uptime</td> </tr>\n";
-		}
-
-	# Running processes
-	if (&foreign_check("proc")) {
-		@procs = &proc::list_processes();
-		$pr = scalar(@procs);
-		print "<tr> <td><b>$text{'right_procs'}</b></td>\n";
-		if (&foreign_available("proc")) {
-			$pr = "<a href=proc/>$pr</a>";
-			}
-		print "<td>$pr</td> </tr>\n";
-		}
-
-	# Load averages
-	if ($info->{'load'}) {
-		@c = @{$info->{'load'}};
-		if (@c) {
-			print "<tr> <td><b>$text{'right_cpu'}</b></td>\n";
-			print "<td>",&text('right_load', @c),"</td> </tr>\n";
-			}
-		}
-
-	# CPU usage
-	if ($info->{'cpu'}) {
-		@c = @{$info->{'cpu'}};
-		print "<tr> <td><b>$text{'right_cpuuse'}</b></td>\n";
-		print "<td>",&text('right_cpustats', @c),"</td> </tr>\n";
-		}
-
-	# Memory usage
-	if ($info->{'mem'}) {
-		@m = @{$info->{'mem'}};
-		if (@m && $m[0]) {
-			print "<tr> <td><b>$text{'right_real'}</b></td>\n";
-			print "<td>",&text('right_used',
-				&nice_size($m[0]*1024),
-				&nice_size(($m[0]-$m[1])*1024)),
-			      "</td> </tr>\n";
-			print "<tr> <td></td>\n";
-			print "<td>",&bar_chart($m[0], $m[0]-$m[1], 1),
-			      "</td> </tr>\n";
-			}
-
-		if (@m && $m[2]) {
-			print "<tr> <td><b>$text{'right_virt'}</b></td>\n";
-			print "<td>",&text('right_used',
-				&nice_size($m[2]*1024),
-				&nice_size(($m[2]-$m[3])*1024)),
-			      "</td> </tr>\n";
-			print "<tr> <td></td>\n";
-			print "<td>",&bar_chart($m[2], $m[2]-$m[3], 1),
-			      "</td> </tr>\n";
-			}
-		}
-
-	# Disk space on local drives
-	if ($info->{'disk_total'}) {
-		($total, $free) = ($info->{'disk_total'}, $info->{'disk_free'});
-		print "<tr> <td><b>$text{'right_disk'}</b></td>\n";
-		print "<td>",&text('right_used',
-			   &nice_size($total),
-			   &nice_size($total-$free)),"</td> </tr>\n";
-		print "<tr> <td></td>\n";
-		print "<td>",&bar_chart($total, $total-$free, 1),
-		      "</td> </tr>\n";
-		}
-
-	# Package updates
-	if ($info->{'poss'}) {
-		print "<tr> <td><b>$text{'right_updates'}</b></td>\n";
-		@poss = @{$info->{'poss'}};
-		@secs = grep { $_->{'security'} } @poss;
-		if (@poss && @secs) {
-			$msg = &text('right_upsec', scalar(@poss),
-						    scalar(@secs));
-			}
-		elsif (@poss) {
-			$msg = &text('right_upneed', scalar(@poss));
-			}
-		else {
-			$msg = $text{'right_upok'};
-			}
-		if (&foreign_available("package-updates")) {
-			$msg = "<a href='package-updates/index.cgi?mode=updates'>$msg</a>";
-			}
-		print "<td>$msg</td> </tr>\n";
-		}
-
-	print "</table>\n";
-
-	# Check for incorrect OS
-	if (&foreign_check("webmin")) {
-		&foreign_require("webmin", "webmin-lib.pl");
-		&webmin::show_webmin_notifications();
-		}
-	}
-elsif ($level == 3) {
-	# Show Usermin user's information
-	print "<h3>$text{'right_header5'}</h3>\n";
-	print "<table width=70%>\n";
-
-	# Host and login info
-	print "<tr> <td><b>$text{'right_host'}</b></td>\n";
-	print "<td>",&get_system_hostname(),"</td> </tr>\n";
-
-	print "<tr> <td><b>$text{'right_os'}</b></td>\n";
-	if ($gconfig{'os_version'} eq '*') {
-		print "<td>$gconfig{'real_os_type'}</td> </tr>\n";
-		}
-	else {
-		print "<td>$gconfig{'real_os_type'} $gconfig{'real_os_version'}</td> </tr>\n";
-		}
-
-	print "<tr> <td><b>$text{'right_usermin'}</b></td>\n";
-	print "<td>",&get_webmin_version(),"</td> </tr>\n";
-
-	# System time
-	$tm = localtime(time());
-	print "<tr> <td><b>$text{'right_time'}</b></td>\n";
-	print "<td>$tm</td> </tr>\n";
-
-	# Disk quotas
-	if (&foreign_installed("quota")) {
-		&foreign_require("quota", "quota-lib.pl");
-		$n = &quota::user_filesystems($remote_user);
-		$usage = 0;
-		$quota = 0;
-		for($i=0; $i<$n; $i++) {
-			if ($quota::filesys{$i,'hblocks'}) {
-				$quota += $quota::filesys{$i,'hblocks'};
-				$usage += $quota::filesys{$i,'ublocks'};
-				}
-			elsif ($quota::filesys{$i,'sblocks'}) {
-				$quota += $quota::filesys{$i,'sblocks'};
-				$usage += $quota::filesys{$i,'ublocks'};
-				}
-			}
-		if ($quota) {
-			$bsize = $quota::config{'block_size'};
-			print "<tr> <td><b>$text{'right_uquota'}</b></td>\n";
-			print "<td>",&text('right_out',
-				&nice_size($usage*$bsize),
-				&nice_size($quota*$bsize)),"</td> </tr>\n";
-			print "<tr> <td></td>\n";
-			print "<td>",&bar_chart($quota, $usage, 1),
-			      "</td> </tr>\n";
-			}
-		}
-	print "</table>\n";
-	}
-
-print "</center>\n";
-&popup_footer();
-
-# bar_chart(total, used, blue-rest)
-# Returns HTML for a bar chart of a single value
-sub bar_chart
-{
-local ($total, $used, $blue) = @_;
-local $rv;
-$rv .= sprintf "<img src=images/red.gif width=%s height=10>",
-	int($bar_width*$used/$total)+1;
-if ($blue) {
-	$rv .= sprintf "<img src=images/blue.gif width=%s height=10>",
-		$bar_width - int($bar_width*$used/$total)-1;
-	}
-else {
-	$rv .= sprintf "<img src=images/white.gif width=%s height=10>",
-		$bar_width - int($bar_width*$used/$total)-1;
-	}
-return $rv;
-}
-
-# bar_chart_three(total, used1, used2, used3)
-# Returns HTML for a bar chart of three values, stacked
-sub bar_chart_three
-{
-local ($total, $used1, $used2, $used3) = @_;
-local $rv;
-local $w1 = int($bar_width*$used1/$total)+1;
-local $w2 = int($bar_width*$used2/$total);
-local $w3 = int($bar_width*$used3/$total);
-$rv .= sprintf "<img src=images/red.gif width=%s height=10>", $w1;
-$rv .= sprintf "<img src=images/purple.gif width=%s height=10>", $w2;
-$rv .= sprintf "<img src=images/blue.gif width=%s height=10>", $w3;
-$rv .= sprintf "<img src=images/grey.gif width=%s height=10>",
-	$bar_width - $w1 - $w2 - $w3;
-return $rv;
-}
-
-# collapsed_header(text, name)
-sub collapsed_header
-{
-local ($text, $name) = @_;
-print "<br><font style='font-size:16px'>";
-local $others = join("&", map { "open=$_" } grep { $_ ne $name } @open);
-$others = "&$others" if ($others);
-if ($open{$name}) {
-	print "<img src=images/open.gif border=0>\n";
-	print &ui_link("right.cgi?$others",$text);
-	}
-else {
-	print "<img src=images/closed.gif border=0>\n";
-	print &ui_link("right.cgi?open=$name$others",$text);
-	}
-print "</font><br>\n";
-return $open{$name};
-}
-

blue-theme/theme.info

@@ -1,12 +0,0 @@
-webmin=1
-usermin=1
-version=1.480
-desc=Blue Framed Theme
-longdesc=A simple theme with minimal graphics, which uses a categorized layout.
-depends=1.336 1.480
-desc_nl=Blauw Frame Theme
-longdesc_ja_JP.euc=
-longdesc_nl=Een eenvoudig grafish theme, welke catagorie layout gebruikt 
-desc_fr=
-longdesc_fr=
-desc_ja_JP.euc=