Deal with case where allow-transfer block doesn't even exist https://github.com/webmin/webmin/issues/832

Checking for /etc/rc.d makes no sense on systemd systems https://github.com/webmin/webmin/issues/835
Fix form/table ordering https://github.com/webmin/webmin/issues/784
2026-02-04 22:52:14 +00:00 · 2018-02-28 21:21:59 -08:00 · 2018-02-28 19:46:45 -08:00 · 2018-02-27 15:53:52 -08:00 · 2018-02-27 15:51:55 -08:00 · 2018-02-25 12:27:42 -08:00
2405 changed files with 10390 additions and 5280 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,58 @@
+
+# webmin .gitattribues file
+# help git / github to know the encoding of webmin (lang) files
+
+# set default encoding to iso-8859-1 aka ASCII
+*        working-tree-encoding=iso8859-1 git-encoding=iso8859-1
+
+# force module.info to iso-8859-1 even it contains other encodings
+*/module.info        working-tree-encoding=iso8859-1 git-encoding=iso8859-1
+
+# set all .UTF-8 to UTF-8
+*.UTF-8      working-tree-encoding=UTF-8 git-encoding=UTF-8
+
+# set all non iso8859-1 lang files to correct encoding
+**/lang/ru_SU        working-tree-encoding=koi8-r       git-encoding=koi8-r
+**/lang/ru_RU        working-tree-encoding=windows-1251     git-encoding=windows-1251
+**/lang/zh_TW.Big5   working-tree-encoding=Big5         git-encoding=Big5
+**/lang/zh_CN        working-tree-encoding=GB2312       git-encoding=GB2312
+**/lang/hu       working-tree-encoding=iso-8859-2       git-encoding=iso-8859-2
+**/lang/he       working-tree-encoding=iso-8859-8-I     git-encoding=iso-8859-8-I
+**/lang/tr       working-tree-encoding=iso-8859-9       git-encoding=iso-8859-9
+**/lang/pl       working-tree-encoding=iso-8859-2       git-encoding=iso-8859-2
+**/lang/ja_JP.euc    working-tree-encoding=EUC-JP       git-encoding=EUC-JP
+**/lang/si       working-tree-encoding=iso-8859-2       git-encoding=iso-8859-2
+**/lang/ko_KR.euc    working-tree-encoding=EUC-KR       git-encoding=EUC-KR
+**/lang/cz       working-tree-encoding=iso-8859-2       git-encoding=iso-8859-2
+**/lang/th       working-tree-encoding=tis-620          git-encoding=tis-620
+**/lang/no       working-tree-encoding=iso-8859-15      git-encoding=iso-8859-15
+**/lang/sk       working-tree-encoding=iso-8859-2       git-encoding=iso-8859-2
+**/lang/lt       working-tree-encoding=windows-1257     git-encoding=windows-1257
+**/lang/bg       working-tree-encoding=windows-1251     git-encoding=windows-1251
+**/lang/el       working-tree-encoding=iso-8859-7       git-encoding=iso-8859-7
+**/lang/uk_UA    working-tree-encoding=windows-1251     git-encoding=windows-1251
+**/lang/ar       working-tree-encoding=iso-8859-6-I     git-encoding=iso-8859-6-I
+**/lang/fa       working-tree-encoding=UTF-8            git-encoding=UTF-8
+
+# set all non iso8859-1 config.info files to correct encoding
+*/config.info.ru_SU       working-tree-encoding=koi8-r          git-encoding=koi8-r
+*/lconfig.info.ru_RU      working-tree-encoding=windows-1251    git-encoding=windows-1251
+*/config.info.zh_TW.Big5  working-tree-encoding=Big5            git-encoding=Big5
+*/config.info.zh_CN       working-tree-encoding=GB2312          git-encoding=GB2312
+*/lconfig.info.hu         working-tree-encoding=iso-8859-2      git-encoding=iso-8859-2
+*/config.info.he          working-tree-encoding=iso-8859-8-I    git-encoding=iso-8859-8-I
+*/config.info.tr          working-tree-encoding=iso-8859-9      git-encoding=iso-8859-9
+*/config.info.pl          working-tree-encoding=iso-8859-2      git-encoding=iso-8859-2
+*/config.info.ja_JP.euc   working-tree-encoding=EUC-JP          git-encoding=EUC-JP
+*/config.info.si          working-tree-encoding=iso-8859-2      git-encoding=iso-8859-2
+*/config.info.ko_KR.euc   working-tree-encoding=EUC-KR          git-encoding=EUC-KR
+*/lconfig.info.cz         working-tree-encoding=iso-8859-2      git-encoding=iso-8859-2
+*/lconfig.info.th         working-tree-encoding=tis-620         git-encoding=tis-620
+*/config.info.no          working-tree-encoding=iso-8859-15     git-encoding=iso-8859-15
+*/config.info.sk          working-tree-encoding=iso-8859-2      git-encoding=iso-8859-2
+*/config.info.lt          working-tree-encoding=windows-1257    git-encoding=windows-1257
+*/lconfig.info.bg         working-tree-encoding=windows-1251    git-encoding=windows-1251
+*/config.info.el          working-tree-encoding=iso-8859-7      git-encoding=iso-8859-7
+*/config.info.uk_UA       working-tree-encoding=windows-1251    git-encoding=windows-1251
+*/config.info.ar          working-tree-encoding=iso-8859-6-I    git-encoding=iso-8859-6-I
+*/config.info.fa          working-tree-encoding=UTF-8           git-encoding=UTF-8
--- a/4
+++ b/4
@@ -230,3 +230,7 @@ Fixed an XSS bug that allowed xmlrpc.cgi to be abused by a malicious link.
 For new installs, switched the location of data files in many modules to /var/webmin instead of /etc/webmin.
 ---- Changes since 1.790 ----
 Added a recent logins section to the System Information page.
+---- Changes since 1.870 ----
+German translation updates, thanks to Raymond Vetter.
+Catalan translation updates from Jaume Badiella.
+Bulgarian translations from Grigor Gatchev.
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Webmin Version 1.870
+Webmin Version 1.880
 --------------------
 Webmin is a web-based interface for system administration for Unix. 
 Using any browser that supports tables and forms, you can setup user
--- a/acl/acl-lib.pl
+++ b/acl/acl-lib.pl
@@ -1344,9 +1344,11 @@ my ($miniserv, $username) = @_;
 return 1 if (&is_readonly_mode());
 &open_session_db($miniserv);
 foreach my $s (keys %sessiondb) {
-	my ($u, $t) = split(/\s+/, $sessiondb{$s});
-	if ($u eq $username) {
-		delete($sessiondb{$s});
+	if ($sessiondb{$s}) {
+		my ($u, $t) = split(/\s+/, $sessiondb{$s});
+		if ($u eq $username) {
+			delete($sessiondb{$s});
+			}
 		}
 	}
 dbmclose(%sessiondb);
@@ -1651,11 +1653,14 @@ is not given, a salt will be selected randomly.
 sub encrypt_password
 {
 my ($pass, $salt) = @_;
-if ($gconfig{'md5pass'}) {
+if ($gconfig{'md5pass'} == 1) {
 	# Use MD5 encryption
-	$salt ||= '$1$'.substr(time(), -8).'$xxxxxxxxxxxxxxxxxxxxxx';
 	return &encrypt_md5($pass, $salt);
 	}
+elsif ($gconfig{'md5pass'} == 2) {
+	# Use SHA512 encryption
+	return &encrypt_sha512($pass, $salt);
+	}
 else {
 	# Use Unix DES
 	&seed_random();
--- a/acl/backup_config.pl
+++ b/acl/backup_config.pl
@@ -83,17 +83,18 @@ foreach my $k (keys %aclbackup) {
 	}
 &write_file("$config_directory/config", \%gconfig);

-# Splice miniserv.conf entries for users into real config
+# Splice miniserv.conf entries for users and password restrictions into
+# real config
 %aclbackup = ( );
 &read_file("$config_directory/miniserv.conf.aclbackup", \%aclbackup);
 unlink("$config_directory/miniserv.conf.aclbackup");
 my %miniserv;
 &get_miniserv_config(\%miniserv);
 foreach my $k (keys %miniserv) {
-	delete($miniserv{$k}) if ($k =~ /^(preroot_)/);
+	delete($miniserv{$k}) if ($k =~ /^(preroot_|pass_)/);
 	}
 foreach my $k (keys %aclbackup) {
-	$miniserv{$k} = $aclbackup{$k} if ($k =~ /^(preroot_)/);
+	$miniserv{$k} = $aclbackup{$k} if ($k =~ /^(preroot_|pass_)/);
 	}
 &put_miniserv_config(\%miniserv);

--- a/acl/config-syno-linux
+++ b/acl/config-syno-linux
@@ -0,0 +1,4 @@
+ssleay=/usr/bin/openssl
+select=0
+order=0
+display=1
--- a/acl/config.info.bg
+++ b/acl/config.info.bg
@@ -1,4 +1,5 @@
 line1=Конфигурационни опции,11
+display=Режим на показване на потребител и група,1,1-Само имена,0-Имена и модули
 order=Подреди юзери и групи по,1,0-подредба във файл,1-име
 line2=Системна конфигурация,11
 ssleay=Път към openssl или ssleay програма,0
--- a/acl/lang/ca
+++ b/acl/lang/ca
@@ -340,7 +340,7 @@ unix_utable=Usuaris Unix permesos
 sessions_title=Sessions d'Entrada Actuals
 sessions_id=ID de sessió
 sessions_user=Usuari Webmin
-sessions_login=Ha entrat a
+sessions_login=Darrera activitat a
 sessions_host=Adreça IP
 sessions_lview=Visualitza els registres...
 sessions_actions=Accions...
--- a/acl/module.info
+++ b/acl/module.info
@@ -1,45 +1,6 @@
-desc_nl=Webmin Gebruikers
-desc_ko_KR.euc=Webmin »ç¿ëÀÚ
 risk=high
-desc_ru_SU=ðÏÌØÚÏ×ÁÔÅÌÉ Webmin
-desc_zh_TW.Big5=Webmin ¨Ï¥ÎªÌ
-desc_pl=U¿ytkownicy Webmina
-desc_de=Webmin-Benutzer
 name=AdminUsers
-desc_zh_CN=Webmin ÓÃ»§¹ÜÀí
-desc_pt=Utilizadores do Webmin
 category=webmin
-desc_tr=Webmin Kullanýcýlarý
 desc=Webmin Users
-desc_es=Usuarios de Webmin
-desc_sv=Webmin-användare
-desc_fr=Utilisateurs Webmin
-desc_ja_JP.euc=Webmin ¥æ¡¼¥¶
-desc_hu=Webmin felhasználók
-desc_ru_RU=Ïîëüçîâàòåëè Webmin
-desc_ca=Usuaris de Webmin
-desc_no=Webmin Brukere
-desc_pt_BR=Usuários do Webmin
-desc_sk=U¾ívatelia Webminu
 longdesc=Create Webmin users and configure which modules and features they are allowed to access.
-desc_bg=Webmin ï¿½ï¿½ï¿½ï¿½ï¿½
 readonly=1
-desc_zh_TW.UTF-8=Webmin ä½¿ç”¨è€…
-desc_zh_CN.UTF-8=Webmin ç”¨æˆ·ç®¡ç<C2A1>†
-desc_ja_JP.UTF-8=Webmin ãƒ¦ãƒ¼ã‚¶
-desc_ko_KR.UTF-8=Webmin ì‚¬ìš©ìž<C3AC>
-desc_da=Webmin brugere
-desc_it=Utenti Webmin
-desc_cz=U¾ivatelé Webminu
-desc_ru.UTF-8=ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸ Webmin
-desc_hu.UTF-8=Webmin felhasznÃ¡lÃ³k
-desc_cz.UTF-8=UÅ¾ivatelÃ© Webminu
-desc_pl.UTF-8=UÅ¼ytkownicy Webmina
-desc_sk.UTF-8=UÅ¾Ãvatelia Webminu
-longdesc_ms_MY=Cipta pengguna Webmin dan konfigurasikan modul dan ciri-ciri yang dibenarkan akses.
-desc_ms_MY=Pengguna Webmin
-longdesc_de=Erstellt Webmin-Benutzer und konfiguriert, auf welche Module und Funktionen diese berechtigt sind, zugreifen.
-longdesc_es=Crear usuarios de webmin y configurar a que modulos y caracteristicas pueden acceder.
-longdesc_pl=Twórz u¿ytkowników Webmina i kontroluj, które modu³y i funkcje s± dla nich dostêpne.
-longdesc_ca=Crea usuaris Webmin i configura quins mòduls i característiques tenen permès d'accedir.
-desc_fr.UTF-8=Utilisateurs Webmin
--- a/acl/module.info.bg
+++ b/acl/module.info.bg
@@ -0,0 +1 @@
+desc_bg=Webmin <20><><EFBFBD><EFBFBD><EFBFBD>
--- a/acl/module.info.ca
+++ b/acl/module.info.ca
@@ -0,0 +1,2 @@
+desc_ca=Usuaris de Webmin
+longdesc_ca=Crea usuaris Webmin i configura quins mòduls i característiques tenen permès d'accedir.
--- a/acl/module.info.cz
+++ b/acl/module.info.cz
@@ -0,0 +1 @@
+desc_cz=U¾ivatelé Webminu
--- a/acl/module.info.cz.UTF-8
+++ b/acl/module.info.cz.UTF-8
@@ -0,0 +1 @@
+desc_cz.UTF-8=Uživatelé Webminu
--- a/acl/module.info.da
+++ b/acl/module.info.da
@@ -0,0 +1 @@
+desc_da=Webmin brugere
--- a/acl/module.info.de
+++ b/acl/module.info.de
@@ -0,0 +1,2 @@
+desc_de=Webmin-Benutzer
+longdesc_de=Erstellt Webmin-Benutzer und konfiguriert, auf welche Module und Funktionen diese berechtigt sind, zugreifen.
--- a/acl/module.info.es
+++ b/acl/module.info.es
@@ -0,0 +1,2 @@
+desc_es=Usuarios de Webmin
+longdesc_es=Crear usuarios de webmin y configurar a que modulos y caracteristicas pueden acceder.
--- a/acl/module.info.fr
+++ b/acl/module.info.fr
@@ -0,0 +1 @@
+desc_fr=Utilisateurs Webmin
--- a/acl/module.info.fr.UTF-8
+++ b/acl/module.info.fr.UTF-8
@@ -0,0 +1 @@
+desc_fr.UTF-8=Utilisateurs Webmin
--- a/acl/module.info.hu
+++ b/acl/module.info.hu
@@ -0,0 +1 @@
+desc_hu=Webmin felhasználók
--- a/acl/module.info.hu.UTF-8
+++ b/acl/module.info.hu.UTF-8
@@ -0,0 +1 @@
+desc_hu.UTF-8=Webmin felhasználók
--- a/acl/module.info.it
+++ b/acl/module.info.it
@@ -0,0 +1 @@
+desc_it=Utenti Webmin
--- a/acl/module.info.ja_JP.UTF-8
+++ b/acl/module.info.ja_JP.UTF-8
@@ -0,0 +1 @@
+desc_ja_JP.UTF-8=Webmin ユーザ
--- a/acl/module.info.ja_JP.euc
+++ b/acl/module.info.ja_JP.euc
@@ -0,0 +1 @@
+desc_ja_JP.euc=Webmin ユーザ
--- a/acl/module.info.ko_KR.UTF-8
+++ b/acl/module.info.ko_KR.UTF-8
@@ -0,0 +1 @@
+desc_ko_KR.UTF-8=Webmin 사용자
--- a/acl/module.info.ko_KR.euc
+++ b/acl/module.info.ko_KR.euc
@@ -0,0 +1 @@
+desc_ko_KR.euc=Webmin 사용자
--- a/acl/module.info.ms_MY
+++ b/acl/module.info.ms_MY
@@ -0,0 +1,2 @@
+desc_ms_MY=Pengguna Webmin
+longdesc_ms_MY=Cipta pengguna Webmin dan konfigurasikan modul dan ciri-ciri yang dibenarkan akses.
--- a/acl/module.info.nl
+++ b/acl/module.info.nl
@@ -0,0 +1 @@
+desc_nl=Webmin Gebruikers
--- a/acl/module.info.no
+++ b/acl/module.info.no
@@ -0,0 +1 @@
+desc_no=Webmin Brukere
--- a/acl/module.info.pl
+++ b/acl/module.info.pl
@@ -0,0 +1,2 @@
+desc_pl=U¿ytkownicy Webmina
+longdesc_pl=Twórz u¿ytkowników Webmina i kontroluj, które modu³y i funkcje s± dla nich dostêpne.
--- a/acl/module.info.pl.UTF-8
+++ b/acl/module.info.pl.UTF-8
@@ -0,0 +1 @@
+desc_pl.UTF-8=Użytkownicy Webmina
--- a/acl/module.info.pt
+++ b/acl/module.info.pt
@@ -0,0 +1 @@
+desc_pt=Utilizadores do Webmin
--- a/acl/module.info.pt_BR
+++ b/acl/module.info.pt_BR
@@ -0,0 +1 @@
+desc_pt_BR=Usuários do Webmin
--- a/acl/module.info.ru.UTF-8
+++ b/acl/module.info.ru.UTF-8
@@ -0,0 +1 @@
+desc_ru.UTF-8=Пользователи Webmin
--- a/acl/module.info.ru_RU
+++ b/acl/module.info.ru_RU
@@ -0,0 +1 @@
+desc_ru_RU=Пользователи Webmin
--- a/acl/module.info.ru_SU
+++ b/acl/module.info.ru_SU
@@ -0,0 +1 @@
+desc_ru_SU=Пользователи Webmin
--- a/acl/module.info.sk
+++ b/acl/module.info.sk
@@ -0,0 +1 @@
+desc_sk=Užívatelia Webminu
--- a/acl/module.info.sk.UTF-8
+++ b/acl/module.info.sk.UTF-8
@@ -0,0 +1 @@
+desc_sk.UTF-8=Užívatelia Webminu
--- a/acl/module.info.sv
+++ b/acl/module.info.sv
@@ -0,0 +1 @@
+desc_sv=Webmin-användare
--- a/acl/module.info.tr
+++ b/acl/module.info.tr
@@ -0,0 +1 @@
+desc_tr=Webmin Kullanıcıları
--- a/acl/module.info.zh_CN
+++ b/acl/module.info.zh_CN
@@ -0,0 +1 @@
+desc_zh_CN=Webmin 用户管理
--- a/acl/module.info.zh_CN.UTF-8
+++ b/acl/module.info.zh_CN.UTF-8
@@ -0,0 +1 @@
+desc_zh_CN.UTF-8=Webmin 用户管理
--- a/acl/module.info.zh_TW.Big5
+++ b/acl/module.info.zh_TW.Big5
@@ -0,0 +1 @@
+desc_zh_TW.Big5=Webmin 使用者
--- a/acl/module.info.zh_TW.UTF-8
+++ b/acl/module.info.zh_TW.UTF-8
@@ -0,0 +1 @@
+desc_zh_TW.UTF-8=Webmin 使用者
--- a/adsl-client/config-syno-linux
+++ b/adsl-client/config-syno-linux
@@ -0,0 +1,7 @@
+start_cmd=adsl-start
+pppoe_cmd=pppoe
+stop_cmd=adsl-stop
+conf_style=0
+pppoe_conf=/etc/ppp/pppoe.conf
+status_cmd=adsl-status
+pap_file=/etc/ppp/pap-secrets
--- a/adsl-client/config.info.bg
+++ b/adsl-client/config.info.bg
@@ -1,3 +1,4 @@
+line2=Конфигурация на системата,11
 pppoe_conf=PPPOE ADSL конфигурационен файл,0
 conf_style=Формат на конфигурационен файл,1,0-Стандартен RP-PPPoE конфиг,1-Redhat мрежови файл
 pap_file=PPP файл с юзери и пароли,0
--- a/adsl-client/module.info
+++ b/adsl-client/module.info
@@ -4,25 +4,3 @@ os_support=*-linux
 category=net
 longdesc=Set up a PPP client with the RP-PPPoE package.
 depends=net
-desc_ca=Client ADSL
-desc_bg=ADSL ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½
-desc_zh_TW.Big5=ADSL«È¤áºÝ
-desc_de=ADSL-Client
-desc_ja_JP.euc=ADSL ¥¯¥é¥¤¥¢¥ó¥È
-desc_tr=ADSL Ýstemcisi
-desc_es=Cliente ADSL
-desc_zh_TW.UTF-8=ADSLå®¢æˆ¶ç«¯
-desc_ja_JP.UTF-8=ADSL ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆ
-desc_ar=ADSL Ø²Ø¨ÙˆÙ† Ø§Ù„
-desc_it=Client ADSL
-desc_cz=Klient ADSL
-desc_nl=ADSL Client
-desc_pt_BR=Cliente ADSL
-desc_pl=Klient ADSL
-desc_cz.UTF-8=Klient ADSL
-desc_pl.UTF-8=Klient ADSL
-desc_no=ADSL klient
-longdesc_ms_MY=Sediakan klien PPP dengan pakej RP-PPPoE.
-desc_ms_MY=Klien ADSL
-longdesc_pl=Konfigurowanie klienta PPTP z pakietem RP-PPPoE.
-longdesc_ca=Configura un client PPP amb el paquet RP-PPPoE.
--- a/adsl-client/module.info.ar
+++ b/adsl-client/module.info.ar
@@ -0,0 +1 @@
+desc_ar=ADSL زبون ال
--- a/adsl-client/module.info.bg
+++ b/adsl-client/module.info.bg
@@ -0,0 +1 @@
+desc_bg=ADSL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--- a/adsl-client/module.info.ca
+++ b/adsl-client/module.info.ca
@@ -0,0 +1,2 @@
+desc_ca=Client ADSL
+longdesc_ca=Configura un client PPP amb el paquet RP-PPPoE.
--- a/adsl-client/module.info.cz
+++ b/adsl-client/module.info.cz
@@ -0,0 +1 @@
+desc_cz=Klient ADSL
--- a/adsl-client/module.info.cz.UTF-8
+++ b/adsl-client/module.info.cz.UTF-8
@@ -0,0 +1 @@
+desc_cz.UTF-8=Klient ADSL
--- a/adsl-client/module.info.de
+++ b/adsl-client/module.info.de
@@ -0,0 +1,2 @@
+desc_de=ADSL-Client
+longdesc_de=Setze einen PPP client mit dem RP-PPPoE Paket auf.
--- a/adsl-client/module.info.es
+++ b/adsl-client/module.info.es
@@ -0,0 +1 @@
+desc_es=Cliente ADSL
--- a/adsl-client/module.info.it
+++ b/adsl-client/module.info.it
@@ -0,0 +1 @@
+desc_it=Client ADSL
--- a/adsl-client/module.info.ja_JP.UTF-8
+++ b/adsl-client/module.info.ja_JP.UTF-8
@@ -0,0 +1 @@
+desc_ja_JP.UTF-8=ADSL クライアント
--- a/adsl-client/module.info.ja_JP.euc
+++ b/adsl-client/module.info.ja_JP.euc
@@ -0,0 +1 @@
+desc_ja_JP.euc=ADSL クライアント
--- a/adsl-client/module.info.ms_MY
+++ b/adsl-client/module.info.ms_MY
@@ -0,0 +1,2 @@
+desc_ms_MY=Klien ADSL
+longdesc_ms_MY=Sediakan klien PPP dengan pakej RP-PPPoE.
--- a/adsl-client/module.info.nl
+++ b/adsl-client/module.info.nl
@@ -0,0 +1 @@
+desc_nl=ADSL Client
--- a/adsl-client/module.info.no
+++ b/adsl-client/module.info.no
@@ -0,0 +1 @@
+desc_no=ADSL klient
--- a/adsl-client/module.info.pl
+++ b/adsl-client/module.info.pl
@@ -0,0 +1,2 @@
+desc_pl=Klient ADSL
+longdesc_pl=Konfigurowanie klienta PPTP z pakietem RP-PPPoE.
--- a/adsl-client/module.info.pl.UTF-8
+++ b/adsl-client/module.info.pl.UTF-8
@@ -0,0 +1 @@
+desc_pl.UTF-8=Klient ADSL
--- a/adsl-client/module.info.pt_BR
+++ b/adsl-client/module.info.pt_BR
@@ -0,0 +1 @@
+desc_pt_BR=Cliente ADSL
--- a/adsl-client/module.info.tr
+++ b/adsl-client/module.info.tr
@@ -0,0 +1 @@
+desc_tr=ADSL Ýstemcisi
--- a/adsl-client/module.info.zh_TW.Big5
+++ b/adsl-client/module.info.zh_TW.Big5
@@ -0,0 +1 @@
+desc_zh_TW.Big5=ADSL<53>め際
--- a/adsl-client/module.info.zh_TW.UTF-8
+++ b/adsl-client/module.info.zh_TW.UTF-8
@@ -0,0 +1 @@
+desc_zh_TW.UTF-8=ADSL客戶端
--- a/ajaxterm/module.info
+++ b/ajaxterm/module.info
@@ -1,12 +1,3 @@
 desc=Text Login
 name=ajaxterm
 longdesc=Access the shell on your system without the need for a separate SSH client, using Ajaxterm
-desc_ca=Entrada en Mode Text
-desc_no=Tekst-terminal
-desc_nl=Tekst Login
-desc_pl=Tryb tekstowy (konsola)
-desc_hu=Shell hozzáférés (Ajaxterm)
-desc_ms_MY=Log masuk Teks
-longdesc_ms_MY=Akses shell pada sistem anda tanpa menggunakan klien SSH secara berasingan dengan menggunaka Ajaxterm
-longdesc_pl=Dostêp do pow³oki systemowej bez konieczno¶ci u¿ywania oddzielnego klienta SSH, u¿ywaj±c Ajaxterm
-longdesc_ca=Accedeix a la shell del sistema sense necessitat d'un client SSH separat utilitzant Ajaxterm
--- a/ajaxterm/module.info.ca
+++ b/ajaxterm/module.info.ca
@@ -0,0 +1,2 @@
+desc_ca=Entrada en Mode Text
+longdesc_ca=Accedeix a la shell del sistema sense necessitat d'un client SSH separat utilitzant Ajaxterm
--- a/ajaxterm/module.info.hu
+++ b/ajaxterm/module.info.hu
@@ -0,0 +1 @@
+desc_hu=Shell hozzáférés (Ajaxterm)
--- a/ajaxterm/module.info.ms_MY
+++ b/ajaxterm/module.info.ms_MY
@@ -0,0 +1,2 @@
+desc_ms_MY=Log masuk Teks
+longdesc_ms_MY=Akses shell pada sistem anda tanpa menggunakan klien SSH secara berasingan dengan menggunaka Ajaxterm
--- a/ajaxterm/module.info.nl
+++ b/ajaxterm/module.info.nl
@@ -0,0 +1 @@
+desc_nl=Tekst Login
--- a/ajaxterm/module.info.no
+++ b/ajaxterm/module.info.no
@@ -0,0 +1 @@
+desc_no=Tekst-terminal
--- a/ajaxterm/module.info.pl
+++ b/ajaxterm/module.info.pl
@@ -0,0 +1,2 @@
+desc_pl=Tryb tekstowy (konsola)
+longdesc_pl=Dost瘼 do pow這ki systemowej bez konieczno軼i u篡wania oddzielnego klienta SSH, u篡waj帷 Ajaxterm
--- a/apache/apache-lib.pl
+++ b/apache/apache-lib.pl
@@ -233,14 +233,16 @@ while($line = <$fh>) {
 			'file', $_[2],
 			'type', 1,
 			'name', $2,
-			'value', $3,
-			'indent', length($1));
+			'value', $3);
+		local $indent = $1;
 		$dir{'value'} =~ s/\s+$//g;
 		$dir{'words'} = &wsplit($dir{'value'});
 		$_[1]++;
 		@members = &parse_config_file($fh, $_[1], $_[2], $dir{'name'});
 		$dir{'members'} = \@members;
 		$dir{'eline'} = $_[1]-1;
+		$indent =~ s/\t/        /g;
+		$dir{'indent'} = length($indent);
 		push(@rv, \%dir);
 		}
 	elsif ($line =~ /^(\s*)(\S+)\s*(.*)$/) {
@@ -251,8 +253,10 @@ while($line = <$fh>) {
 			'file', $_[2],
 			'type', 0,
 			'name', $2,
-			'value', $3,
-			'indent', length($1));
+			'value', $3);
+		local $indent = $1;
+		$indent =~ s/\t/        /g;
+		$dir{'indent'} = length($indent);
 		if ($dir{'value'} =~ s/\\$//g) {
 			# multi-line directive!
 			while($line = <$fh>) {
--- a/apache/config-syno-linux
+++ b/apache/config-syno-linux
@@ -0,0 +1,15 @@
+allow_virtualmin=0
+test_always=0
+httpd_conf=/opt/etc/apache2/httpd.conf
+show_names=1
+show_order=0
+apachectl_path=/opt/sbin/apachectl
+test_apachectl=1
+httpd_dir=/opt/etc/apache2
+test_manual=1
+auto_mods=1
+pid_file=/var/run/httpd-user.pid
+test_config=1
+show_list=0
+httpd_path=/opt/sbin/httpd
+max_servers=100
--- a/apache/config.info.bg
+++ b/apache/config.info.bg
@@ -12,6 +12,7 @@ test_apachectl=
 show_names=Показвай имената на Apache директивите,1,1-Да,0-Не
 apache_docbase=Базова директория за документацията на Apache,3,Уеб страница на Apache
 auto_mods=Винаги да намира Апачи модулите автоматично?,1,1-Да,0-Не
+allow_virtualmin=Позволяване на редактиране на домейни, управлявани от Virtualmin?,1,1-Да,0-Не
 line2=Системна конфигурация,11
 httpd_dir=Коренова иректория за Apache сървър,0
 httpd_path=Път към httpd изпълним файл,0
--- a/apache/lang/gr
+++ b/apache/lang/gr
--- a/apache/mod_cgid.pl
+++ b/apache/mod_cgid.pl
@@ -0,0 +1,54 @@
+# mod_cgid.pl
+# Defines editors CGI logging directives
+
+sub mod_cgid_directives
+{
+local($rv);
+$rv = [ [ 'ScriptLog', 0, 11, 'global', 1.2 ],
+        [ 'ScriptLogLength', 0, 11, 'global', 1.2 ],
+        [ 'ScriptLogBuffer', 0, 11, 'global', 1.2 ] ];
+return &make_directives($rv, $_[0], "mod_cgid");
+}
+
+sub mod_cgid_handlers
+{
+return ("cgi-script");
+}
+
+sub edit_ScriptLog
+{
+return (1, "$text{'mod_cgi_logname'}",
+        &opt_input($_[0]->{'value'}, "ScriptLog", "$text{'mod_cgi_none'}", 20).
+        &file_chooser_button("ScriptLog", 0));
+}
+sub save_ScriptLog
+{
+$in{'ScriptLog_def'} || &allowed_auth_file($in{'ScriptLog'}) ||
+	&error($text{'mod_cgi_eunder'});
+return &parse_opt("ScriptLog", '^\S+$', "$text{'mod_cgi_elogname'}");
+}
+
+sub edit_ScriptLogLength
+{
+return (1, "$text{'mod_cgi_logsize'}",
+        &opt_input($_[0]->{'value'}, "ScriptLogLength", "$text{'mod_cgi_default'}", 8)
+		.$text{'bytes'});
+}
+sub save_ScriptLogLength
+{
+return &parse_opt("ScriptLogLength", '^\d+$', "$text{'mod_cgi_elogsize'}");
+}
+
+sub edit_ScriptLogBuffer
+{
+return (1, "$text{'mod_cgi_post'}",
+        &opt_input($_[0]->{'value'}, "ScriptLogBuffer", "$text{'mod_cgi_default'}", 6)
+		.$text{'bytes'});
+}
+sub save_ScriptLogBuffer
+{
+return &parse_opt("ScriptLogBuffer", '^\d+$', "$text{'mod_cgi_epost'}");
+}
+
+1;
+
--- a/apache/module.info
+++ b/apache/module.info
@@ -1,43 +1,8 @@
-desc_nl=Apache Webserver
-desc_ko_KR.euc=Apache webServer 
 risk=low medium high
-desc_ru_SU=÷ÅÂ ÓÅÒ×ÅÒ Apache
-desc_zh_TW.Big5=Apache ºô¶¦øªA¾¹
-desc_pl=Apache - serwer WWW
-desc_de=Apache Webserver
 name=Apache
-desc_zh_CN=Apache ·þÎñÆ÷
-desc_pt=Servidor Web Apache
 category=servers
-desc_tr=Apache Web Sunucusu
-os_support=solaris redhat-linux mandrake-linux debian-linux slackware-linux suse-linux united-linux aix hpux freebsd osf1 irix unixware openserver macos open-linux turbo-linux openbsd corel-linux cobalt-linux lfs-linux netbsd msc-linux generic-linux gentoo-linux trustix-linux sol-linux coherent-linux openmamba-linux windows pardus-linux
+os_support=solaris *-linux aix hpux freebsd osf1 irix unixware openserver macos openbsd netbsd windows 
 desc=Apache Webserver
-desc_es=Servidor Web Apache
-desc_sv=Apache Webserver
-desc_fr=Serveur Web Apache
-desc_hu=Webszerver (Apache)
-desc_ru_RU=Âåá ñåðâåð Apache
-desc_ca=Servidor Web Apache
 longdesc=Configure almost all Apache directives and features.
-desc_bg=ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½
-desc_ja_JP.euc=Apache Web¥µ¡¼¥Ð
 readonly=1
 syslog=1
-desc_zh_TW.UTF-8=Apache ç¶²é <C3A9>ä¼ºæœ<C3A6>å™¨
-desc_zh_CN.UTF-8=Apache æœ<C3A6>åŠ¡å™¨
-desc_ja_JP.UTF-8=Apache Webã‚µãƒ¼ãƒ<C3A3>
-desc_ko_KR.UTF-8=Apache webServer 
-desc_da=Apache Webserver
-desc_cz=Apache WWW server
-desc_ru.UTF-8=Ð’ÐµÐ± Ñ<>ÐµÑ€Ð²ÐµÑ€ Apache
-desc_pt_BR=Servidor Web Apache
-desc_hu.UTF-8=Apache WebkiszolgÃ¡lÃ³
-desc_cz.UTF-8=Apache WWW server
-desc_pl.UTF-8=Serwer WWW Apache
-desc_no=Apache Webtjener
-longdesc_hu=Apache direktívák és szolgáltatások beállítása
-longdesc_ms_MY=Mengkonfigurasi hampir kesemua arahan Apache dan ciri-ciri yang ada.
-desc_ms_MY=Pelayan Web Apache
-longdesc_de=Konfiguriert fast alle Apache-Direktiven und Features.
-longdesc_pl=Konfiguracja niemal wszystkich opcji i dyrektyw Apache.
-longdesc_ca=Configura gairebé totes les directives  característiques d'Apache.
--- a/apache/module.info.bg
+++ b/apache/module.info.bg
@@ -0,0 +1 @@
+desc_bg=<3D><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--- a/apache/module.info.ca
+++ b/apache/module.info.ca
@@ -0,0 +1,2 @@
+desc_ca=Servidor Web Apache
+longdesc_ca=Configura gairebé totes les directives  característiques d'Apache.
--- a/apache/module.info.cz
+++ b/apache/module.info.cz
@@ -0,0 +1 @@
+desc_cz=Apache WWW server
--- a/apache/module.info.cz.UTF-8
+++ b/apache/module.info.cz.UTF-8
@@ -0,0 +1 @@
+desc_cz.UTF-8=Apache WWW server
--- a/apache/module.info.da
+++ b/apache/module.info.da
@@ -0,0 +1 @@
+desc_da=Apache Webserver
--- a/apache/module.info.de
+++ b/apache/module.info.de
@@ -0,0 +1,2 @@
+desc_de=Apache Webserver
+longdesc_de=Konfiguriert fast alle Apache-Direktiven und Features.
--- a/apache/module.info.es
+++ b/apache/module.info.es
@@ -0,0 +1 @@
+desc_es=Servidor Web Apache
--- a/apache/module.info.fr
+++ b/apache/module.info.fr
@@ -0,0 +1 @@
+desc_fr=Serveur Web Apache
--- a/apache/module.info.hu
+++ b/apache/module.info.hu
@@ -0,0 +1,2 @@
+longdesc_hu=Apache direktívák és szolgáltatások beállítása
+desc_hu=Webszerver (Apache)
--- a/apache/module.info.hu.UTF-8
+++ b/apache/module.info.hu.UTF-8
@@ -0,0 +1 @@
+desc_hu.UTF-8=Apache Webkiszolgáló
--- a/apache/module.info.ja_JP.UTF-8
+++ b/apache/module.info.ja_JP.UTF-8
@@ -0,0 +1 @@
+desc_ja_JP.UTF-8=Apache Webサーバ
--- a/apache/module.info.ja_JP.euc
+++ b/apache/module.info.ja_JP.euc
@@ -0,0 +1 @@
+desc_ja_JP.euc=Apache Webサーバ
--- a/apache/module.info.ko_KR.UTF-8
+++ b/apache/module.info.ko_KR.UTF-8
@@ -0,0 +1 @@
+desc_ko_KR.UTF-8=Apache webServer 
--- a/apache/module.info.ko_KR.euc
+++ b/apache/module.info.ko_KR.euc
@@ -0,0 +1 @@
+desc_ko_KR.euc=Apache webServer 
--- a/apache/module.info.ms_MY
+++ b/apache/module.info.ms_MY
@@ -0,0 +1,2 @@
+desc_ms_MY=Pelayan Web Apache
+longdesc_ms_MY=Mengkonfigurasi hampir kesemua arahan Apache dan ciri-ciri yang ada.
--- a/apache/module.info.nl
+++ b/apache/module.info.nl
@@ -0,0 +1 @@
+desc_nl=Apache Webserver
--- a/apache/module.info.no
+++ b/apache/module.info.no
@@ -0,0 +1 @@
+desc_no=Apache Webtjener
--- a/apache/module.info.pl
+++ b/apache/module.info.pl
@@ -0,0 +1,2 @@
+desc_pl=Apache - serwer WWW
+longdesc_pl=Konfiguracja niemal wszystkich opcji i dyrektyw Apache.
--- a/apache/module.info.pl.UTF-8
+++ b/apache/module.info.pl.UTF-8
@@ -0,0 +1 @@
+desc_pl.UTF-8=Serwer WWW Apache
--- a/apache/module.info.pt
+++ b/apache/module.info.pt
@@ -0,0 +1 @@
+desc_pt=Servidor Web Apache
--- a/apache/module.info.pt_BR
+++ b/apache/module.info.pt_BR
@@ -0,0 +1 @@
+desc_pt_BR=Servidor Web Apache
--- a/apache/module.info.ru.UTF-8
+++ b/apache/module.info.ru.UTF-8
@@ -0,0 +1 @@
+desc_ru.UTF-8=Веб сервер Apache
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`desc_bg=Webmin <20><><EFBFBD><EFBFBD><EFBFBD>`
				`@@ -0,0 +1 @@`
				`desc_ru.UTF-8=Пользователи Webmin`
				`@@ -0,0 +1 @@`
				`desc_bg=ADSL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`
				`@@ -0,0 +1 @@`
				`desc_bg=<3D><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`