| "; print &ui_form_start("exec_cron.cgi"); print &ui_hidden("idx", $in{'idx'}); - print " | ",&ui_submit($text{'edit_run'})," | \n"; + print &ui_submit($text{'edit_run'}); print &ui_form_end(); + print "\n"; } # Clone button + print ""; print &ui_form_start("edit_cron.cgi"); print &ui_hidden("clone", $in{'idx'}); print &ui_hidden("new", 1); - print " | ",&ui_submit($text{'edit_clone'})," | \n"; + print &ui_submit($text{'edit_clone'}); print &ui_form_end(); + print ""; # Delete button if ($access{'delete'}) { + print ""; print &ui_form_start("delete_cron.cgi"); print &ui_hidden("idx", $in{'idx'}); - print " | ",&ui_submit($text{'delete'})," | \n"; + print &ui_submit($text{'delete'}); print &ui_form_end(); + print "\n"; } print "
+Quan aquesta opci est establerta, el controlador mantindr les opcions +s de DMA, Desenmascarament d'interrupcions i +Nombre de sectors per a E/S de sectors mltiples desprs +de reiniciar (tal i com es fa durant la seqncia de recuperaci d'errors). +
+No totes les unitats suporten aquesta caracterstica. + +
+ + diff --git a/fdisk/help/k.es.html b/fdisk/help/keep_settings.es.html similarity index 100% rename from fdisk/help/k.es.html rename to fdisk/help/keep_settings.es.html diff --git a/fdisk/help/k.fr.html b/fdisk/help/keep_settings.fr.html similarity index 100% rename from fdisk/help/k.fr.html rename to fdisk/help/keep_settings.fr.html diff --git a/fdisk/help/k.html b/fdisk/help/keep_settings.html similarity index 100% rename from fdisk/help/k.html rename to fdisk/help/keep_settings.html diff --git a/fdisk/help/k.pl.UTF-8.html b/fdisk/help/keep_settings.pl.UTF-8.html similarity index 100% rename from fdisk/help/k.pl.UTF-8.html rename to fdisk/help/keep_settings.pl.UTF-8.html diff --git a/fdisk/help/k.pl.html b/fdisk/help/keep_settings.pl.html similarity index 100% rename from fdisk/help/k.pl.html rename to fdisk/help/keep_settings.pl.html diff --git a/fdisk/help/k.sv.html b/fdisk/help/keep_settings.sv.html similarity index 100% rename from fdisk/help/k.sv.html rename to fdisk/help/keep_settings.sv.html diff --git a/fdisk/help/k.zh_TW.Big5.html b/fdisk/help/keep_settings.zh_TW.Big5.html similarity index 100% rename from fdisk/help/k.zh_TW.Big5.html rename to fdisk/help/keep_settings.zh_TW.Big5.html diff --git a/fdisk/help/k.zh_TW.UTF-8.html b/fdisk/help/keep_settings.zh_TW.UTF-8.html similarity index 100% rename from fdisk/help/k.zh_TW.UTF-8.html rename to fdisk/help/keep_settings.zh_TW.UTF-8.html diff --git a/fdisk/help/sector_count.ca.html b/fdisk/help/sector_count.ca.html new file mode 100644 index 000000000..c8c2bc061 --- /dev/null +++ b/fdisk/help/sector_count.ca.html @@ -0,0 +1,18 @@ +
+Aix s'utilitza per millorar el rendiment en les lectures seqencials +de fitxers grans, llegint prviament blocs addicionals abans que li calguin +a la tasca en execuci. En la versi actual del nucli (2.0.10)m aix t +un valor per defecte de 8 sectors (4 Kb), Aquest valor sembla bo per a +la majoria de propsits, per en un sistema on la majoria d'accessos sn +aleatoris, un valor ms petit pot donar un rendiment millor. A ms, moltes +unitats IDE tamb tenen un funci de lectura anticipada integrada, que +alleuja la necessitat d'una lectura anticipada del sistema de fitxers en +molts casos. + +
+ + diff --git a/fdisk/help/a.es.html b/fdisk/help/sector_count.es.html similarity index 100% rename from fdisk/help/a.es.html rename to fdisk/help/sector_count.es.html diff --git a/fdisk/help/a.fr.html b/fdisk/help/sector_count.fr.html similarity index 100% rename from fdisk/help/a.fr.html rename to fdisk/help/sector_count.fr.html diff --git a/fdisk/help/a.html b/fdisk/help/sector_count.html similarity index 100% rename from fdisk/help/a.html rename to fdisk/help/sector_count.html diff --git a/fdisk/help/a.nl.html b/fdisk/help/sector_count.nl.html similarity index 100% rename from fdisk/help/a.nl.html rename to fdisk/help/sector_count.nl.html diff --git a/fdisk/help/a.pl.UTF-8.html b/fdisk/help/sector_count.pl.UTF-8.html similarity index 100% rename from fdisk/help/a.pl.UTF-8.html rename to fdisk/help/sector_count.pl.UTF-8.html diff --git a/fdisk/help/a.pl.html b/fdisk/help/sector_count.pl.html similarity index 100% rename from fdisk/help/a.pl.html rename to fdisk/help/sector_count.pl.html diff --git a/fdisk/help/a.ru_RU.html b/fdisk/help/sector_count.ru_RU.html similarity index 100% rename from fdisk/help/a.ru_RU.html rename to fdisk/help/sector_count.ru_RU.html diff --git a/fdisk/help/a.ru_SU.html b/fdisk/help/sector_count.ru_SU.html similarity index 100% rename from fdisk/help/a.ru_SU.html rename to fdisk/help/sector_count.ru_SU.html diff --git a/fdisk/help/a.sv.html b/fdisk/help/sector_count.sv.html similarity index 100% rename from fdisk/help/a.sv.html rename to fdisk/help/sector_count.sv.html diff --git a/fdisk/help/a.zh_TW.Big5.html b/fdisk/help/sector_count.zh_TW.Big5.html similarity index 100% rename from fdisk/help/a.zh_TW.Big5.html rename to fdisk/help/sector_count.zh_TW.Big5.html diff --git a/fdisk/help/a.zh_TW.UTF-8.html b/fdisk/help/sector_count.zh_TW.UTF-8.html similarity index 100% rename from fdisk/help/a.zh_TW.UTF-8.html rename to fdisk/help/sector_count.zh_TW.UTF-8.html diff --git a/fetchmail/config.info.pl b/fetchmail/config.info.pl old mode 100755 new mode 100644 diff --git a/fetchmail/images/.xvpics/icon.gif b/fetchmail/images/.xvpics/icon.gif deleted file mode 100644 index 0fe4ed225..000000000 Binary files a/fetchmail/images/.xvpics/icon.gif and /dev/null differ diff --git a/file/BorderPanel.java b/file/BorderPanel.java old mode 100755 new mode 100644 diff --git a/file/config.info.ca b/file/config.info.ca old mode 100755 new mode 100644 diff --git a/file/config.info.el b/file/config.info.el old mode 100755 new mode 100644 diff --git a/file/config.info.it b/file/config.info.it old mode 100755 new mode 100644 diff --git a/file/images/.xvpics/preview.gif b/file/images/.xvpics/preview.gif deleted file mode 100644 index ec6e91112..000000000 Binary files a/file/images/.xvpics/preview.gif and /dev/null differ diff --git a/file/images/html.gif b/file/images/html.gif old mode 100755 new mode 100644 diff --git a/file/lang/el b/file/lang/el old mode 100755 new mode 100644 diff --git a/filemin/acl_security.pl b/filemin/acl_security.pl index faa4c2a79..5a6770bf7 100644 --- a/filemin/acl_security.pl +++ b/filemin/acl_security.pl @@ -5,7 +5,7 @@ sub acl_security_form { # Directories the user can access print &ui_table_row($text{'acl_allowed_paths'}."
\n". - $text{'acl_allowed_paths2'} + $text{'acl_allowed_paths2'}, ui_textarea("allowed_paths", join("\n", split(/\s+/, $access->{'allowed_paths'})), 10, 80, undef, undef, "style='width: 100%'"), 2); diff --git a/filemin/lang/ca b/filemin/lang/ca index e784abe24..1a8d83c8b 100644 --- a/filemin/lang/ca +++ b/filemin/lang/ca @@ -11,6 +11,8 @@ create_file=Crea un Fitxer compress_selected=Comprimeix la Selecci chmod_selected=Executa chmod sobre la Selecci chown_selected=Executa chown sobre la Selecci +chcon_selected=Chcon de la Selecci +chattr_selected=Chattr de la Selecci remove_selected=Elimina la Selecci browse_for_upload=Explora per a Pujar upload_files=Puja Fitxers @@ -20,10 +22,11 @@ name=Nom type=Tipus actions=Accions size=Mida -ownership=Propietari owner_user=Usuari owner_group=Grup permissions=Permisos +selinux=Context de seguretat +attributes=Atributs last_mod_time=Modificat rename=Reanomena edit=Edita @@ -35,8 +38,8 @@ delete=Suprimeix save_file=Desa el fitxer previous_page=a la pgina anterior count_uploads=fixer(s) selecccionats per pujar -error_title=Error!!! -warning_title=Atenci!!! +error_title=Error! +warning_title=Atenci! nothing_selected=No hi ha res seleccionat error_load_template=Error en carregar el fitxer de plantilla create=Crea @@ -49,6 +52,12 @@ archive_name=Nom de l'arxiu dialog_compress=Comprimeix about_to_delete=Ests a punt de suprimir els segents elements: are_you_sure=Segur que ho vols fer? +context_label=Context a aplicar +context_label_error=El context de seguretat no pot estar en blanc +context_label_error_proc=No s'ha pogut canviar el context de seguretat +attr_label=Atributs a aplicar +attr_label_error=Cal especificar els atributs +attr_label_error_proc=No s'han pogut canviar els atributs user_name=Usuari group_name=Grup dialog_change=Canvia @@ -71,7 +80,7 @@ dialog_file_url=URL del fitxer a descarregar dialog_user_name=Usuari del servidor remot (si cal) dialog_user_pass=Contrasenya del servidor remot (si cal) dialog_download=Descarrega -error_invalid_uri=Error: No has donat un URL vlid!!! +error_invalid_uri=Error: No has donat un URL vlid! file_already_exists=ja existeix a files_ready_for_upload=Visualitza els fitxers seleccionats errors_occured=S0'han produt els segents errors en executar l'operaci @@ -112,6 +121,7 @@ provide_search_query=Proporciona una consulta de cerca dialog_recursive=Recursiu refresh=Refresca http_downloading=S'est descarregant +http_done=S'ha descarregat $1 a $2. uploading=S'est pujant, espera si et plau... acl_allowed_paths=Permet l'accs als directoris acl_allowed_paths2=(Per a usuaris no root) @@ -144,8 +154,11 @@ menu_tools=Eines menu_bookmarks=Preferits notallowed=No tens perms per accedir a $1. Els directoris permesos sn: $2 error_upload_emax=El fitxer pujat s ms gran que el lmit de $1 +extract_etype=Tipus de fitxer d'arxiu no suportat info_total1=Total: $1 fitxer i $2 directori info_total2=Total: $1 fitxers i $2 directori info_total3=Total: $1 fitxer i $2 directoris info_total4=Total: $1 fitxers i $2 directoris + +ownership=Propietari diff --git a/filemin/search.cgi b/filemin/search.cgi index a188b5b8c..203067734 100755 --- a/filemin/search.cgi +++ b/filemin/search.cgi @@ -25,4 +25,4 @@ if($in{'caseins'}) { print_interface(); -&ui_print_footer("index.cgi?path=".&urize($path), $text{'previous_page'}); +&ui_print_footer("index.cgi?path=".&urlize($path), $text{'previous_page'}); diff --git a/filter/config.info.ca b/filter/config.info.ca old mode 100755 new mode 100644 index 714c78c2c..e0eb5ab02 --- a/filter/config.info.ca +++ b/filter/config.info.ca @@ -1,5 +1,5 @@ -virtualmin_config=Cam complet del directori de configuracio de Virtualmin,3,No installat -virtualmin_spam=Cam complet del programa de consulta d'usuaris de spam de Virtualmin,3,No installat,40 +virtualmin_spam=Cam complet del programa de consulta de spam d'usuaris de Virtualmin,3,No est installat,40 +virtualmin_config=Cam complet del directori de configuraci de Virtualmin,3,No installat warn_procmail=Mostra un avs si Procmail no est installat,1,1-S,0-No forward_procmail=Crea fitxer .forward per executar procmail,1,1-S,0-No alias_files=Cam complet dels fitxers d'lies globals,9,40,3,\t diff --git a/filter/config.info.el b/filter/config.info.el old mode 100755 new mode 100644 diff --git a/filter/lang/ca b/filter/lang/ca old mode 100755 new mode 100644 diff --git a/filter/lang/el b/filter/lang/el old mode 100755 new mode 100644 diff --git a/firewall/config.info.ca b/firewall/config.info.ca deleted file mode 100755 index 3ccd66d0a..000000000 --- a/firewall/config.info.ca +++ /dev/null @@ -1,15 +0,0 @@ -line0=Opcions configurables,11 -view_condition=Mostra la condici a la llista de regles,1,1-S,0-No -view_comment=Mostra el comentari a la llista de regles,1,1-S,0-No -comment_mod=Emmagatzema els comentaris com a,1,0-# comentaris en un fitxer desat,1---opci de comentari -cluster_mode=Actualitza els servidors del cluster,1,0-Quan es faci un canvi,1-En aplicar la configuraci -force_init=Inicia sempre el talla foc des del script d'inicialitzaci a Debian,1,1-S,0-No -before_cmd=Ordre a executar abans de canviar les regles,3,Cap -after_cmd=Ordre a executar desprs de canviar les regles,3,Cap -before_apply_cmd=Ordre a executar abans d'aplicar la configuraci,3,Cap -after_apply_cmd=Ordre a executar desprs d'aplicar la configuraci,3,Cap -line1=Configuraci del sistema,11 -direct=Edita directament les regles del tallafocs enlloc del fitxer,1,1-S,0-No -save_file=File to save/edit IPv4 rules,3,Use operating system or Webmin default -save_file6=File to save/edit IPv6 rules,3,Use operating system or Webmin default - diff --git a/firewall/images/.xvpics/after.gif b/firewall/images/.xvpics/after.gif deleted file mode 100644 index d87d6e724..000000000 --- a/firewall/images/.xvpics/after.gif +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:16x16 Indexed (82 bytes) -#END_OF_COMMENTS -16 16 255 -WSWSWSWSWSWSWSWSWWSWWSWWWSWSWWSWWSWWSw7W \ No newline at end of file diff --git a/firewall/images/.xvpics/icon.gif b/firewall/images/.xvpics/icon.gif deleted file mode 100644 index 7b26fc6c0..000000000 --- a/firewall/images/.xvpics/icon.gif +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:48x48 RGB (2918 bytes) -#END_OF_COMMENTS -48 48 255 -``m``````M``````````H``````d``````@``m````@``m````````@`d```@````i``````````m```@````Ƞ`d````@```@`id`@`@`@`ѭֱmhEhedDidEdmdEdDEdEiiѭѭdidiDidEhdEhEdDeDIdie֨```@`iD`@``@`@`@@id`````@`I`@```@`@`@@```Ġڤ``@`@eD`@``@`@`@````Ā````@`ED```@``````m````@`@`Ed@``@`````id`֨```@`@E`@````@``md``ٲnhiDeDDEHiihIihimimihlɨɄňňőňĩdiD`DA@d@d`Edid@edded`Id`@@@@```@`i@```````Š``hA`@`@@```@`hE`````````ha`@@`@````@la@````ѥ```hE``@`````@`hA````````m`d`@@```iD``````dd`@`````m`@`ȥĤ`d`eddD``eDIde`e`dd`d@d`@``````addddD``@``````dhddE````````dddded`d``ddd`d```dd``ddѩɰdͱɉ̬deȈĬȨ̨ȄȨȨȬȬȤ`̤Ȩ̨̨Ȩd̨ȨȨ̨ȤĨȨ̨̨̤`ȨȨ̨̨̬Ȩ̬̬̭̬̭ȨȨ̬̭̭ͬͬȨȬȤd`ĤȨ̬Ͱ̬ͬѬͨȤȨ`ѰѨȬ̬Ȭ```̬ЬШ̈``Ь̬`Ͱ̬Ȩ`dͱͰ̬`ѭѬͬ` \ No newline at end of file diff --git a/firewall/lang/ca b/firewall/lang/ca index 4029fe0dc..4673cd59a 100644 --- a/firewall/lang/ca +++ b/firewall/lang/ca @@ -3,6 +3,7 @@ index_editing=Fitxer de regles $1 index_ecommand=No s'ha trobat al sistema l'ordre $1. Webmin necessita aquesta ordre per configurar IPtables. index_ekernel=S'ha produt un error en comprovar la configuraci actual d'IPtables: $1 Aix pot indicar que el nucli no suporta IPtables. index_header=Configuraci del tallafocs de $1 +index_evalid=ATENCI! La teva configuraci actual d'IPtables s invlida: $1 index_change=S'est mostrant IPtable: index_chain_input=Paquets d'entrada (INPUT) - S'aplica noms als paquets adreats a aquest host index_chain_output=Paquets de sortida (OUTPUT) - S'aplica noms als paquets originats per aquest host @@ -67,12 +68,21 @@ index_auto4=Bloqueja-les totes excepte SSH, IDENT, ping i ports alts a la interf index_auto5=Bloqueja-les totes excepte els ports utilitzats per a hostalatge virtual a la interfcie: index_auto=Configura el Tallafocs index_add=Afegeix -index_shorewall=Atenci! Sembla que s'est utilitzant Shorewall per generar el tallafocs del sistema. Pot ser que hagis d'utilitzar el mdul de Tallafocs Shoreline en lloc d'aquest. -index_firewalld=Atenci! Sembla que s'est utilitzant FirewallD per a generar el tallafocs del sistema. Potser hauries d'utilitzar el mdul FirewallD en lloc d'aquest. +index_shorewall=Avs! Sembla que s'est utilitzant Shorewall per generar el tallafocs del sistema. Pot ser que hagis d'utilitzar el mdul de Tallafocs Shoreline en lloc d'aquest. +index_firewalld=Avs! Sembla que s'est utilitzant FirewallD per a generar el tallafocs del sistema. Potser hauries d'utilitzar el mdul FirewallD en lloc d'aquest. +index_fail2ban=Avs! Sembla que Fail2Ban s'est utilitzant per a gestionar algunes regles del tallafocs. Les hauries de modificar amb el mdul Fail2Ban i filtrar-les amb f2b-.* o b fail2ban-.*. +index_filter_chain=no est gestionat pel tallafocs. +index_filter_nodirect=Atenci! S'han detectat regles gestionades externament. Activa "Edita directament les regles del tallafocs" o les teves regles del tallafocs poden petar. index_reset=Reinicia el Tallafocs index_resetdesc=Fes clic sobre aquest bot per eliminar totes les regles existents del tallafocs i establir-ne de noves per a una configuraci inicial bsica. index_cluster=Servidors del Cluster index_clusterdesc=Fes clic sobre aquest bot per configurar servidors Webmin addicionals als quals es copiar automticament la configuraci del tallafocs. +index_ipset=conjunt IP +index_ipset_title=Els conjunts IP actius que es poden utilitzar a les regles del tallafocs +index_ipset_name=Nom +index_ipset_type=Tipus +index_ipset_elem=# Elements +index_ipset_size=Mida desc_p=el protocol s $1 desc_p!=el protocol no s $1 @@ -127,6 +137,9 @@ desc_physdev-out!=la interf desc_conds=Si $1 desc_and=i desc_always=Sempre +desc_args--match-set=$2 est contingut al conjunt IP $1 +desc_src=origen +desc_dest=destinaci redhat_einstalled=No s'ha trobat cap acci d'engegada iptables(6) que indiqui que el paquet IPtables no est installat al sistema redhat_eoutput=S'ha produt un error en buscar l'estat d'IPtables amb l'ordre $1. Aix probablement indica que el sistema est configurat per utilitzar IPchains en lloc d'IPtables. diff --git a/firewalld/config.info.ca b/firewalld/config.info.ca old mode 100755 new mode 100644 diff --git a/firewalld/create_zone.cgi b/firewalld/create_zone.cgi index 246533386..93423725e 100755 --- a/firewalld/create_zone.cgi +++ b/firewalld/create_zone.cgi @@ -3,7 +3,7 @@ use strict; use warnings; -require 'firewalld-lib.pl'; +require './firewalld-lib.pl'; our (%text, %in); &ReadParse(); &error_setup($text{'zone_err'}); diff --git a/firewalld/default_zone.cgi b/firewalld/default_zone.cgi index ca32a98bf..c8a7d45ee 100755 --- a/firewalld/default_zone.cgi +++ b/firewalld/default_zone.cgi @@ -3,7 +3,7 @@ use strict; use warnings; -require 'firewalld-lib.pl'; +require './firewalld-lib.pl'; our (%text, %in); &ReadParse(); &error_setup($text{'defzone_err'}); diff --git a/firewalld/delete_rules.cgi b/firewalld/delete_rules.cgi index 5dbbec2e7..a0b9a866a 100755 --- a/firewalld/delete_rules.cgi +++ b/firewalld/delete_rules.cgi @@ -3,7 +3,7 @@ use strict; use warnings; -require 'firewalld-lib.pl'; +require './firewalld-lib.pl'; our (%in, %text); &error_setup($text{'delete_err'}); &ReadParse(); diff --git a/firewalld/delete_zone.cgi b/firewalld/delete_zone.cgi index 7159c1dfe..01d95aa83 100755 --- a/firewalld/delete_zone.cgi +++ b/firewalld/delete_zone.cgi @@ -3,7 +3,7 @@ use strict; use warnings; -require 'firewalld-lib.pl'; +require './firewalld-lib.pl'; our (%text, %in); &ReadParse(); &error_setup($text{'delzone_err'}); diff --git a/firewalld/edit_forward.cgi b/firewalld/edit_forward.cgi index 7c2f451d6..319c88956 100755 --- a/firewalld/edit_forward.cgi +++ b/firewalld/edit_forward.cgi @@ -3,7 +3,7 @@ use strict; use warnings; -require 'firewalld-lib.pl'; +require './firewalld-lib.pl'; our (%in, %text); &ReadParse(); diff --git a/firewalld/edit_port.cgi b/firewalld/edit_port.cgi index dfec0833d..cb281bfc9 100755 --- a/firewalld/edit_port.cgi +++ b/firewalld/edit_port.cgi @@ -3,7 +3,7 @@ use strict; use warnings; -require 'firewalld-lib.pl'; +require './firewalld-lib.pl'; our (%in, %text); &ReadParse(); diff --git a/firewalld/edit_serv.cgi b/firewalld/edit_serv.cgi index cbb7cdff8..b85480b09 100755 --- a/firewalld/edit_serv.cgi +++ b/firewalld/edit_serv.cgi @@ -3,7 +3,7 @@ use strict; use warnings; -require 'firewalld-lib.pl'; +require './firewalld-lib.pl'; our (%in, %text); &ReadParse(); diff --git a/firewalld/index.cgi b/firewalld/index.cgi index 2bf295dea..19cd3ee61 100755 --- a/firewalld/index.cgi +++ b/firewalld/index.cgi @@ -3,7 +3,7 @@ use strict; use warnings; -require 'firewalld-lib.pl'; +require './firewalld-lib.pl'; our (%in, %text, %config, %access, $base_remote_user); &ReadParse(); if ($in{'addzone'}) { diff --git a/firewalld/lang/ca b/firewalld/lang/ca old mode 100755 new mode 100644 index 167ff2261..896e43e91 --- a/firewalld/lang/ca +++ b/firewalld/lang/ca @@ -21,8 +21,10 @@ index_port=Port o servei index_proto=Protocol index_tservice=Servei index_tport=Port +index_tforward=Reenviament index_padd=Afegeix un port perms. index_sadd=Afegeix un servei perms. +index_fadd=Afegeix un port de reenviament. index_delete=Suprimeix les Regles Seleccionades index_return=a la llista de zones index_ezones=No s'ha trobat cap zona FirewallD! @@ -36,6 +38,7 @@ port_zone=Perm port_port=Port a permetre port_mode0=Un sol port port_mode1=Rang de ports +port_mode2=El mateix que el port original port_proto=Protocol de xarxa port_ezone=La zona no existeix! port_err=No s'ha pogut desar el port @@ -50,6 +53,18 @@ serv_header=Opcions del servei perm serv_name=Servei a permetre serv_err=No s'ha pogut desar el servei +forward_edit=Edici de Reenviament +forward_create=Creaci de Reenviament +forward_header=Opcions del port de reenviament +forward_zone=Reenvia per a la zona +forward_err=No s'ha pogut desar el reenviament +forward_port=Port d'origen +forward_dstport=Port de destinaci +forward_dstaddr=Adrea de destinaci +forward_dstlocal=Aquest sistema +forward_edstaddr=Adrea de destinaci IPv4 invlida +forward_eneither=Cal introduir ob una adrea de destinaci o b un port + check_ecmd=No s'ha trobat al sistema l'ordre $1 de control de FirewallD delete_err=NO s'han pogut suprimir les regles @@ -91,6 +106,9 @@ log_update_port=S'ha actualitzat el port perm log_create_serv=S'ha afegit el servei perms $1 log_delete_serv=S'ha eliminat el servei perms $1 log_update_serv=S'ha actualitzat el servei perms $1 +log_create_forward=S'ha afegit el reenviament $1 +log_delete_forward=S'ha suprimit el reenviament $1 +log_update_forward=S'ha actualitzat el reenviament $1 log_delete_rules=S'han eliminat $1 ports permesos log_ifaces_zone=S'han actualitzat les interfcies de la zona $1 log_create_zone=S'ha creat la zona $1 diff --git a/firewalld/save_forward.cgi b/firewalld/save_forward.cgi index 8e52b8db8..f5e0947cb 100755 --- a/firewalld/save_forward.cgi +++ b/firewalld/save_forward.cgi @@ -3,7 +3,7 @@ use strict; use warnings; -require 'firewalld-lib.pl'; +require './firewalld-lib.pl'; our (%in, %text); &error_setup($text{'forward_err'}); &ReadParse(); diff --git a/firewalld/save_ifaces.cgi b/firewalld/save_ifaces.cgi index 53ad926b7..aedc1d5e1 100755 --- a/firewalld/save_ifaces.cgi +++ b/firewalld/save_ifaces.cgi @@ -3,7 +3,7 @@ use strict; use warnings; -require 'firewalld-lib.pl'; +require './firewalld-lib.pl'; our (%in, %text); &error_setup($text{'ifaces_err'}); &ReadParse(); diff --git a/firewalld/save_port.cgi b/firewalld/save_port.cgi index 62f1fb077..217ce9490 100755 --- a/firewalld/save_port.cgi +++ b/firewalld/save_port.cgi @@ -3,7 +3,7 @@ use strict; use warnings; -require 'firewalld-lib.pl'; +require './firewalld-lib.pl'; our (%in, %text); &error_setup($text{'port_err'}); &ReadParse(); diff --git a/firewalld/save_serv.cgi b/firewalld/save_serv.cgi index 2b1d452e5..dc8ba02ad 100755 --- a/firewalld/save_serv.cgi +++ b/firewalld/save_serv.cgi @@ -3,7 +3,7 @@ use strict; use warnings; -require 'firewalld-lib.pl'; +require './firewalld-lib.pl'; our (%in, %text); &error_setup($text{'serv_err'}); &ReadParse(); diff --git a/firewalld/zone_form.cgi b/firewalld/zone_form.cgi index 612f30a7c..666f46f7d 100755 --- a/firewalld/zone_form.cgi +++ b/firewalld/zone_form.cgi @@ -3,7 +3,7 @@ use strict; use warnings; -require 'firewalld-lib.pl'; +require './firewalld-lib.pl'; our (%text, %in); &ReadParse(); &ui_print_header(undef, $text{'zone_title'}, ""); diff --git a/flashterm/images/icon.gif b/flashterm/images/icon.gif old mode 100755 new mode 100644 diff --git a/format/config.info.pl b/format/config.info.pl old mode 100755 new mode 100644 diff --git a/frox/help/intro.ca.html b/frox/help/intro.ca.html old mode 100755 new mode 100644 diff --git a/frox/images/general.gif b/frox/images/general.gif old mode 100755 new mode 100644 diff --git a/frox/images/icon.gif b/frox/images/icon.gif old mode 100755 new mode 100644 diff --git a/fsdump/help/after.pl.html b/fsdump/help/after.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/attribs.de.html b/fsdump/help/attribs.de.html old mode 100755 new mode 100644 diff --git a/fsdump/help/attribs.pl.html b/fsdump/help/attribs.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/bcomp.de.html b/fsdump/help/bcomp.de.html old mode 100755 new mode 100644 diff --git a/fsdump/help/bcomp.pl.html b/fsdump/help/bcomp.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/before.de.html b/fsdump/help/before.de.html old mode 100755 new mode 100644 diff --git a/fsdump/help/before.pl.html b/fsdump/help/before.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/blocks.de.html b/fsdump/help/blocks.de.html old mode 100755 new mode 100644 diff --git a/fsdump/help/blocks.pl.html b/fsdump/help/blocks.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/bsize.pl.html b/fsdump/help/bsize.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/comp.de.html b/fsdump/help/comp.de.html old mode 100755 new mode 100644 diff --git a/fsdump/help/comp.pl.html b/fsdump/help/comp.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/config_date_subs.ca.html b/fsdump/help/config_date_subs.ca.html old mode 100755 new mode 100644 diff --git a/fsdump/help/config_date_subs.pl.html b/fsdump/help/config_date_subs.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/dest.pl.html b/fsdump/help/dest.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/dir.pl.html b/fsdump/help/dir.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/dirs.pl.html b/fsdump/help/dirs.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/dump.pl.html b/fsdump/help/dump.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/edit.pl.html b/fsdump/help/edit.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/email.pl.html b/fsdump/help/email.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/enabled.pl.html b/fsdump/help/enabled.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/erase.pl.html b/fsdump/help/erase.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/exclude.ca.html b/fsdump/help/exclude.ca.html old mode 100755 new mode 100644 diff --git a/fsdump/help/exclude.pl.html b/fsdump/help/exclude.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/extra.pl.html b/fsdump/help/extra.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/gzip.pl.html b/fsdump/help/gzip.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/honour.pl.html b/fsdump/help/honour.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/ignoreread.ca.html b/fsdump/help/ignoreread.ca.html old mode 100755 new mode 100644 diff --git a/fsdump/help/ignoreread.pl.html b/fsdump/help/ignoreread.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/intro.pl.html b/fsdump/help/intro.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/keep.no.html b/fsdump/help/keep.no.html old mode 100755 new mode 100644 diff --git a/fsdump/help/keep.pl.html b/fsdump/help/keep.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/label.pl.html b/fsdump/help/label.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/level.pl.html b/fsdump/help/level.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/links.pl.html b/fsdump/help/links.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/max.pl.html b/fsdump/help/max.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/multi.pl.html b/fsdump/help/multi.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/notape.ca.html b/fsdump/help/notape.ca.html old mode 100755 new mode 100644 diff --git a/fsdump/help/notape.pl.html b/fsdump/help/notape.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/offline.pl.html b/fsdump/help/offline.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/over.pl.html b/fsdump/help/over.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/overwrite.no.html b/fsdump/help/overwrite.no.html old mode 100755 new mode 100644 diff --git a/fsdump/help/overwrite.pl.html b/fsdump/help/overwrite.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/pass.ca.html b/fsdump/help/pass.ca.html old mode 100755 new mode 100644 diff --git a/fsdump/help/pass.pl.html b/fsdump/help/pass.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/pass2.ca.html b/fsdump/help/pass2.ca.html old mode 100755 new mode 100644 diff --git a/fsdump/help/pass2.pl.html b/fsdump/help/pass2.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/perms.de.html b/fsdump/help/perms.de.html old mode 100755 new mode 100644 diff --git a/fsdump/help/perms.pl.html b/fsdump/help/perms.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rdir.pl.html b/fsdump/help/rdir.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/remount.ca.html b/fsdump/help/remount.ca.html old mode 100755 new mode 100644 diff --git a/fsdump/help/remount.pl.html b/fsdump/help/remount.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/restore.pl.html b/fsdump/help/restore.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/reverify.ca.html b/fsdump/help/reverify.ca.html old mode 100755 new mode 100644 diff --git a/fsdump/help/reverify.pl.html b/fsdump/help/reverify.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rextra.pl.html b/fsdump/help/rextra.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rfiles.pl.html b/fsdump/help/rfiles.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rgzip.pl.html b/fsdump/help/rgzip.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rlabel.pl.html b/fsdump/help/rlabel.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rmt.ca.html b/fsdump/help/rmt.ca.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rmt.pl.html b/fsdump/help/rmt.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rmulti.pl.html b/fsdump/help/rmulti.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rnoattribs.pl.html b/fsdump/help/rnoattribs.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rover.pl.html b/fsdump/help/rover.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rrsh.ca.html b/fsdump/help/rrsh.ca.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rrsh.pl.html b/fsdump/help/rrsh.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rsh.ca.html b/fsdump/help/rsh.ca.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rsh.pl.html b/fsdump/help/rsh.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rsrc.pl.html b/fsdump/help/rsrc.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/rtest.pl.html b/fsdump/help/rtest.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/subject.pl.html b/fsdump/help/subject.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/tarupdate.ca.html b/fsdump/help/tarupdate.ca.html old mode 100755 new mode 100644 diff --git a/fsdump/help/tarupdate.pl.html b/fsdump/help/tarupdate.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/update.pl.html b/fsdump/help/update.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/verify.de.html b/fsdump/help/verify.de.html old mode 100755 new mode 100644 diff --git a/fsdump/help/verify.pl.html b/fsdump/help/verify.pl.html old mode 100755 new mode 100644 diff --git a/fsdump/help/xdev.de.html b/fsdump/help/xdev.de.html old mode 100755 new mode 100644 diff --git a/fsdump/help/xdev.pl.html b/fsdump/help/xdev.pl.html old mode 100755 new mode 100644 diff --git a/ftelnet/images/icon.gif b/ftelnet/images/icon.gif old mode 100755 new mode 100644 diff --git a/gray-theme/apache/images/type_icon_10.gif b/gray-theme/apache/images/type_icon_10.gif old mode 100755 new mode 100644 diff --git a/gray-theme/bind8/images/TXT.gif b/gray-theme/bind8/images/TXT.gif old mode 100755 new mode 100644 diff --git a/gray-theme/bind8/images/slaves.gif b/gray-theme/bind8/images/slaves.gif old mode 100755 new mode 100644 diff --git a/gray-theme/dhcpd/images/group.gif b/gray-theme/dhcpd/images/group.gif old mode 100755 new mode 100644 diff --git a/gray-theme/dhcpd/images/pool.gif b/gray-theme/dhcpd/images/pool.gif old mode 100755 new mode 100644 diff --git a/gray-theme/fdisk/images/.xvpics/use.gif b/gray-theme/fdisk/images/.xvpics/use.gif deleted file mode 100644 index 2b5e427d7..000000000 --- a/gray-theme/fdisk/images/.xvpics/use.gif +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:4x12 RGB (105 bytes) -#END_OF_COMMENTS -4 12 255 - \ No newline at end of file diff --git a/gray-theme/file/images/.xvpics/preview.gif b/gray-theme/file/images/.xvpics/preview.gif deleted file mode 100644 index 7715f7977..000000000 Binary files a/gray-theme/file/images/.xvpics/preview.gif and /dev/null differ diff --git a/gray-theme/file/images/html.gif b/gray-theme/file/images/html.gif old mode 100755 new mode 100644 diff --git a/gray-theme/images/.xvpics/first-grey.gif b/gray-theme/images/.xvpics/first-grey.gif deleted file mode 100644 index 3a2c36ba1..000000000 Binary files a/gray-theme/images/.xvpics/first-grey.gif and /dev/null differ diff --git a/gray-theme/images/.xvpics/first.gif b/gray-theme/images/.xvpics/first.gif deleted file mode 100644 index 40607e528..000000000 Binary files a/gray-theme/images/.xvpics/first.gif and /dev/null differ diff --git a/gray-theme/images/.xvpics/last-grey.gif b/gray-theme/images/.xvpics/last-grey.gif deleted file mode 100644 index 8de972ca2..000000000 Binary files a/gray-theme/images/.xvpics/last-grey.gif and /dev/null differ diff --git a/gray-theme/images/.xvpics/last.gif b/gray-theme/images/.xvpics/last.gif deleted file mode 100644 index 881c6f793..000000000 Binary files a/gray-theme/images/.xvpics/last.gif and /dev/null differ diff --git a/gray-theme/images/.xvpics/lc1.gif b/gray-theme/images/.xvpics/lc1.gif deleted file mode 100644 index fa3727a09..000000000 --- a/gray-theme/images/.xvpics/lc1.gif +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:6x6 RGB (40 bytes) -#END_OF_COMMENTS -6 6 255 -rwurrrrrrrr \ No newline at end of file diff --git a/gray-theme/images/.xvpics/lc2.gif b/gray-theme/images/.xvpics/lc2.gif deleted file mode 100644 index 975916e46..000000000 --- a/gray-theme/images/.xvpics/lc2.gif +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:6x6 Indexed (38 bytes) -#END_OF_COMMENTS -6 6 255 - \ No newline at end of file diff --git a/gray-theme/images/.xvpics/left-arrow.gif b/gray-theme/images/.xvpics/left-arrow.gif deleted file mode 100644 index 7020ff061..000000000 --- a/gray-theme/images/.xvpics/left-arrow.gif +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:20x26 RGB (129 bytes) -#END_OF_COMMENTS -20 26 255 -I$II۶IH%I۶%HI%I$II۶IH%I۶$I)II$II۶IH%Iە$I)DI$II۶IH%IH%HI۶I$II۶(۶I$II۶mv%ڷ۶I$IIۑRqE۶I$IIRqnv$۶I$II۶qNrqDI%HI$II۶mRqrnv$IIII$IIۑRqnqRr(EI)I$IIrMrqrrM$IH)۶mRrqrnQrHڶ۶rMrqrrMEڷ۶ImRrqrnu$۶۶I$mRqrnv$۶I$II۶qNrqDI%HI$II۶Rqnv%HIII$II۶IqN$IHII$II۶IHmv$IHI۶I$II۶(۶I$II۶ڒ%ڷڶ۶I$II۶%$۶۶I$II۶%HDֺI$II۶IH%I۶%HI%I$II۶IH%I۶%HI% \ No newline at end of file diff --git a/gray-theme/images/.xvpics/left-grey.gif b/gray-theme/images/.xvpics/left-grey.gif deleted file mode 100644 index 8b0fc354c..000000000 Binary files a/gray-theme/images/.xvpics/left-grey.gif and /dev/null differ diff --git a/gray-theme/images/.xvpics/left.gif b/gray-theme/images/.xvpics/left.gif deleted file mode 100644 index 7020ff061..000000000 --- a/gray-theme/images/.xvpics/left.gif +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:20x26 RGB (129 bytes) -#END_OF_COMMENTS -20 26 255 -I$II۶IH%I۶%HI%I$II۶IH%I۶$I)II$II۶IH%Iە$I)DI$II۶IH%IH%HI۶I$II۶(۶I$II۶mv%ڷ۶I$IIۑRqE۶I$IIRqnv$۶I$II۶qNrqDI%HI$II۶mRqrnv$IIII$IIۑRqnqRr(EI)I$IIrMrqrrM$IH)۶mRrqrnQrHڶ۶rMrqrrMEڷ۶ImRrqrnu$۶۶I$mRqrnv$۶I$II۶qNrqDI%HI$II۶Rqnv%HIII$II۶IqN$IHII$II۶IHmv$IHI۶I$II۶(۶I$II۶ڒ%ڷڶ۶I$II۶%$۶۶I$II۶%HDֺI$II۶IH%I۶%HI%I$II۶IH%I۶%HI% \ No newline at end of file diff --git a/gray-theme/images/.xvpics/menubg.gif b/gray-theme/images/.xvpics/menubg.gif deleted file mode 100644 index 0bc0dd777..000000000 --- a/gray-theme/images/.xvpics/menubg.gif +++ /dev/null @@ -1,187 +0,0 @@ -P7 332 -#IMGINFO:97x26 RGB (3062 bytes) -#END_OF_COMMENTS -80 21 255 -{w* * -) -) -* * -) -* * *) -NWsWwwwR* Ss NvJ * -) -* * -) -* * -Nwwwwwwww{ww{w{ww.* -).**-**.*.-+-.*N.NW{sRSR.* N.*MN*M*.) -)* -) -* - * * *SwVswwSvwswvws{swwwwwR* --+-*...N*..N.O-SNNw{www.N.) - -% - - * * -% - * -) - &rSwVsSrWrWswvswwwwwwwS) -)*.N/-O.N.RO-SNRs{wwS).) -* * ) - * * -) -) - * -*RNWwSRsRSvsWwwrwwwwwwS) - -) -.)/N2N/RNRORRsw{wwwn-.* --* - * -* -) -* -) - * -)/N2SwRSRswWwrWswwwwwwWs * -) - -)*N2ORNSRsRs{wwwS.)* * -* -) -) - & * -* -.N.S.NSVORSRwwWRswWWwWsW) -* * -) - -).ORRSRSsv{wwwrJ)*.)S) -) - & - * * -* * /N..R/.RN3NSRwSRwwWwwwWSR**%* -* * -rSRsWw{wwvwwvwrw{N -) * * -* * -*..N.../N.2SNSVsSwWwwwWsS2* .- -* * -) -Srwwwwwww{szww{s) & -) -* -) -) -*..*- -/-O.w.SVwswWwwWWN/- -* * -) - -) -) -.swww{ww{wwvwwww)% - * * - * * -) -* ** -)./wV*3rwSwwR/vS) - * &* * -* * -Rwwww{wwwwww{wwN -) -* -) - -) -% - -) -) - * -.wwSRSwR Ow-&Wr*-J)* -) -) - -%% - *.Swvwwwws{rww{{wwwwS * -*- -* *. -)*. -).** *Ov{SwRSw) -NRN. -) - -) - & -) - * -% -.NWsvWsvSwsVswwvwwwwwW)* -.*-/).*...J...N.NN{wwWNR.* * * - ) - & -) - -% - * * /RSvsSRSvSsvWwswwwwzsW*)*.*N...N.N/M3NN2ow{wwr.*- -) * - -% - * * -) -% - * -N2SrWSRsVsWwswVswww{Ww.) -) -*..N/R.NR/NRROvw{w.*-*. * -% - * - * -% - * -* * -N2N3NwRSSvS{sWrWswwwwwwWM - -) -* +-OR.SNRSNRsw{w{vR*.) -* *& -) -* -) - * -) -*.2N.O2NS2ORWsvSSvwwWwwwsW.* * -) -) -.*SRNSRSrSw{w{o *) -)wr -) - * * * -* -)/-/N...N/R.SRSw.wwwWwwwSwR.*%& * -%*.sRSvS{wwwwvsNRN2owN -) - -) - * * &)/-/)O O..RS.wWsWwwwSwwVSSN * -.. & &2sSvwww{wwwwwwwN -) -* -) -%) -)**).*.*NWsrWwwwwSWwSw2O-* -* . & * -.wvwwww{w{wwwvwws -) * -) - * * - * * -) - *.sWS)WwN.sW.*{S.) -* * -) - * -) - **wwww{ww{wwwww \ No newline at end of file diff --git a/gray-theme/images/.xvpics/ok.gif b/gray-theme/images/.xvpics/ok.gif deleted file mode 100644 index c6becb2c8..000000000 --- a/gray-theme/images/.xvpics/ok.gif +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:16x16 RGB (605 bytes) -#END_OF_COMMENTS -16 16 255 -۶Q 0ru uzT u}x yyyyy Qu0uyu}1u0101yY0 },4] ~4]0}y,04YU0uUu0u0UYY } XUUY8 y}TUYYXY 0}Y}41u1 0 \ No newline at end of file diff --git a/gray-theme/images/.xvpics/open.gif b/gray-theme/images/.xvpics/open.gif deleted file mode 100644 index 5fa7f3bb5..000000000 Binary files a/gray-theme/images/.xvpics/open.gif and /dev/null differ diff --git a/gray-theme/images/.xvpics/rc1.gif b/gray-theme/images/.xvpics/rc1.gif deleted file mode 100644 index abaf926ea..000000000 --- a/gray-theme/images/.xvpics/rc1.gif +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:6x6 RGB (57 bytes) -#END_OF_COMMENTS -6 6 255 -rrrrrrr \ No newline at end of file diff --git a/gray-theme/images/.xvpics/rc2.gif b/gray-theme/images/.xvpics/rc2.gif deleted file mode 100644 index d7c416e23..000000000 --- a/gray-theme/images/.xvpics/rc2.gif +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:6x6 Indexed (43 bytes) -#END_OF_COMMENTS -6 6 255 - \ No newline at end of file diff --git a/gray-theme/images/.xvpics/right-grey.gif b/gray-theme/images/.xvpics/right-grey.gif deleted file mode 100644 index d8f9b1b44..000000000 Binary files a/gray-theme/images/.xvpics/right-grey.gif and /dev/null differ diff --git a/gray-theme/images/.xvpics/title-bar-selected.png b/gray-theme/images/.xvpics/title-bar-selected.png deleted file mode 100644 index a7c5b2b25..000000000 --- a/gray-theme/images/.xvpics/title-bar-selected.png +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:13x23 RGB (221 bytes) -#END_OF_COMMENTS -13 23 255 -۷ڷ۷۷۷۷۷۷۷۷ڷ۷ڷ۷۶۷۷۷۷۷ڷ۷ڷ۷۷ڷ۷۶۷۷ڷ۷۷۷۷ڷ۶۷۷۷ڷ۷۷۷۷nnJnnomoIonnn \ No newline at end of file diff --git a/gray-theme/images/.xvpics/title-bar.png b/gray-theme/images/.xvpics/title-bar.png deleted file mode 100644 index 43082f40f..000000000 --- a/gray-theme/images/.xvpics/title-bar.png +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:13x23 RGB (216 bytes) -#END_OF_COMMENTS -13 23 255 -۶ڷڶ۶ڶ۶ڷڷ۶ڷڷڶ۶ڷڷ۶۶۶۶۶ڷ۶۶۶۶ڷ۶ڒnn \ No newline at end of file diff --git a/gray-theme/images/.xvpics/virtualmin-small.gif b/gray-theme/images/.xvpics/virtualmin-small.gif deleted file mode 100644 index bc8b1429f..000000000 --- a/gray-theme/images/.xvpics/virtualmin-small.gif +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:16x16 Indexed (880 bytes) -#END_OF_COMMENTS -16 16 255 -I$II۶IH%I۶I$II۶IH%I۶I$II۶IH%I۶I$II۶IH%I۶8T840X98T098T89T8T98U0X8P98P5X8T98U8X49T9X8P99T8P908T98U8X48P88۶I$II۶%H%I۶I$II۶%H%I۶I$II۶%H%I۶I$II۶%H%I \ No newline at end of file diff --git a/gray-theme/images/.xvpics/webmin-small.gif b/gray-theme/images/.xvpics/webmin-small.gif deleted file mode 100644 index 864bf9ace..000000000 Binary files a/gray-theme/images/.xvpics/webmin-small.gif and /dev/null differ diff --git a/gray-theme/images/.xvpics/white.gif b/gray-theme/images/.xvpics/white.gif deleted file mode 100644 index f318925a3..000000000 --- a/gray-theme/images/.xvpics/white.gif +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:1x10 Indexed (44 bytes) -#END_OF_COMMENTS -1 10 255 -IIIIII \ No newline at end of file diff --git a/gray-theme/images/address-small.gif b/gray-theme/images/address-small.gif old mode 100755 new mode 100644 diff --git a/gray-theme/images/bw.gif b/gray-theme/images/bw.gif old mode 100755 new mode 100644 diff --git a/gray-theme/images/bw.png b/gray-theme/images/bw.png old mode 100755 new mode 100644 diff --git a/gray-theme/images/graph.png b/gray-theme/images/graph.png old mode 100755 new mode 100644 diff --git a/gray-theme/images/grey.gif b/gray-theme/images/grey.gif old mode 100755 new mode 100644 diff --git a/gray-theme/images/index.gif b/gray-theme/images/index.gif old mode 100755 new mode 100644 diff --git a/gray-theme/images/newplan.gif b/gray-theme/images/newplan.gif old mode 100755 new mode 100644 diff --git a/gray-theme/images/newplan.png b/gray-theme/images/newplan.png old mode 100755 new mode 100644 diff --git a/gray-theme/images/pass.png b/gray-theme/images/pass.png old mode 100755 new mode 100644 diff --git a/gray-theme/images/title-bar.png b/gray-theme/images/title-bar.png old mode 100755 new mode 100644 diff --git a/gray-theme/images/virtualmin-small.gif b/gray-theme/images/virtualmin-small.gif old mode 100755 new mode 100644 diff --git a/gray-theme/images/vm2-small.gif b/gray-theme/images/vm2-small.gif old mode 100755 new mode 100644 diff --git a/gray-theme/images/white.gif b/gray-theme/images/white.gif old mode 100755 new mode 100644 diff --git a/gray-theme/iscsi-client/images/icon.gif b/gray-theme/iscsi-client/images/icon.gif old mode 100755 new mode 100644 diff --git a/gray-theme/iscsi-client/images/iscsi.gif b/gray-theme/iscsi-client/images/iscsi.gif old mode 100755 new mode 100644 diff --git a/gray-theme/iscsi-server/images/icon.gif b/gray-theme/iscsi-server/images/icon.gif old mode 100755 new mode 100644 diff --git a/gray-theme/mailboxes/images/read.gif b/gray-theme/mailboxes/images/read.gif old mode 100755 new mode 100644 diff --git a/gray-theme/openslp/images/icon.gif b/gray-theme/openslp/images/icon.gif old mode 100755 new mode 100644 diff --git a/gray-theme/postfix/images/manual.gif b/gray-theme/postfix/images/manual.gif old mode 100755 new mode 100644 diff --git a/gray-theme/pserver/images/cvsweb.gif b/gray-theme/pserver/images/cvsweb.gif old mode 100755 new mode 100644 diff --git a/gray-theme/pserver/images/icon.gif b/gray-theme/pserver/images/icon.gif old mode 100755 new mode 100644 diff --git a/gray-theme/samba/images/askepass.gif b/gray-theme/samba/images/askepass.gif old mode 100755 new mode 100644 diff --git a/gray-theme/samba/images/editgsync.gif b/gray-theme/samba/images/editgsync.gif old mode 100755 new mode 100644 diff --git a/gray-theme/samba/images/editsync.gif b/gray-theme/samba/images/editsync.gif old mode 100755 new mode 100644 diff --git a/gray-theme/samba/images/winbind.gif b/gray-theme/samba/images/winbind.gif old mode 100755 new mode 100644 diff --git a/gray-theme/spam/images/manual.gif b/gray-theme/spam/images/manual.gif old mode 100755 new mode 100644 diff --git a/gray-theme/squid/images/cachemgr.gif b/gray-theme/squid/images/cachemgr.gif old mode 100755 new mode 100644 diff --git a/gray-theme/squid/images/edit_cachemgr.gif b/gray-theme/squid/images/edit_cachemgr.gif old mode 100755 new mode 100644 diff --git a/gray-theme/squid/images/manual.gif b/gray-theme/squid/images/manual.gif old mode 100755 new mode 100644 diff --git a/gray-theme/theme.pl b/gray-theme/theme.pl index 44955650a..24118f6ce 100755 --- a/gray-theme/theme.pl +++ b/gray-theme/theme.pl @@ -27,8 +27,7 @@ sub theme_ui_post_header my ($text) = @_; my $rv; $rv .= "
" if (!defined($text)); +$rv .= "
" if (!defined($text)); return $rv; } @@ -37,7 +36,7 @@ return $rv; sub theme_ui_pre_footer { my $rv; -$rv .= "\n"; +$rv .= "
\n"; return $rv; } @@ -259,6 +258,7 @@ print "", ""; - diff --git a/makedist.pl b/makedist.pl index 5a5ab8d2f..1d0b997c1 100755 --- a/makedist.pl +++ b/makedist.pl @@ -106,10 +106,8 @@ foreach $m (@mlist) { $flist = ""; opendir(DIR, $m); foreach $f (readdir(DIR)) { - next if ($f =~ /^\./ || $f eq "test" || $f =~ /\.bak$/ || - $f =~ /\.tmp$/ || $f =~ /\.site$/ || $f eq ".builds" || - $f =~ /\.git$/ || $f eq ".build" || $f eq "distrib" || - $f =~ /\.(tar|wbm|wbt)\.gz$/ || $f =~ /\.pyc$/ || + next if ($f =~ /^\./ || $f =~ /\.git$/ || + $f =~ /\.(tar|wbm|wbt)\.gz$/ || $f eq "README.md" || $f =~ /^makemodule.*\.pl$/ || $f eq "linux.sh" || $f eq "freebsd.sh" || $f eq "LICENCE" || $f eq "version"); @@ -167,7 +165,6 @@ system("/usr/local/webadmin/chinese-to-utf8.pl $tardir/$dir"); # Remove useless .bak, test and other files, and create the tar.gz file print "Creating webmin-$vfile.tar.gz\n"; -system("find $tardir/$dir -name '*.bak' -o -name test -o -name '*.tmp' -o -name '*.site' -o -name core -o -name .xvpics -o -name .svn | xargs rm -rf"); system("cd $tardir ; tar cvhf - $dir 2>/dev/null | gzip -c >webmin-$vfile.tar.gz"); if (!$min && -d $zipdir) { diff --git a/makemoduledeb.pl b/makemoduledeb.pl index 17085549e..61bd8e5c7 100755 --- a/makemoduledeb.pl +++ b/makemoduledeb.pl @@ -176,12 +176,6 @@ if ($< == 0) { system("cd $usr_dir && chown -R root:bin ."); } system("find $usr_dir -name .git | xargs rm -rf"); -system("find $usr_dir -name .svn | xargs rm -rf"); -system("find $usr_dir -name .xvpics | xargs rm -rf"); -system("find $usr_dir -name '*.bak' | xargs rm -rf"); -system("find $usr_dir -name '*~' | xargs rm -rf"); -system("find $usr_dir -name '*.rej' | xargs rm -rf"); -system("find $usr_dir -name core | xargs rm -rf"); system("find $usr_dir -name RELEASE | xargs rm -rf"); system("find $usr_dir -name RELEASE.sh | xargs rm -rf"); if (-r "$usr_dir/$mod/EXCLUDE") { diff --git a/makemodulerpm.pl b/makemodulerpm.pl index 80a9f8775..188d9ad3e 100755 --- a/makemodulerpm.pl +++ b/makemodulerpm.pl @@ -192,13 +192,6 @@ my $ucprog = ucfirst($prog); system("/bin/mkdir -p /tmp/makemodulerpm"); system("cd $par && /bin/cp -rpL $source_mod /tmp/makemodulerpm/$mod"); system("/usr/bin/find /tmp/makemodulerpm -name .git | xargs rm -rf"); -system("/usr/bin/find /tmp/makemodulerpm -name .svn | xargs rm -rf"); -system("/usr/bin/find /tmp/makemodulerpm -name .xvpics | xargs rm -rf"); -system("/usr/bin/find /tmp/makemodulerpm -name '*.bak' | xargs rm -rf"); -system("/usr/bin/find /tmp/makemodulerpm -name '*~' | xargs rm -rf"); -system("/usr/bin/find /tmp/makemodulerpm -name '*.rej' | xargs rm -rf"); -system("/usr/bin/find /tmp/makemodulerpm -name '.*.swp' | xargs rm -rf"); -system("/usr/bin/find /tmp/makemodulerpm -name core | xargs rm -rf"); system("/usr/bin/find /tmp/makemodulerpm -name RELEASE | xargs rm -rf"); system("/usr/bin/find /tmp/makemodulerpm -name RELEASE.sh | xargs rm -rf"); system("/usr/bin/find /tmp/makemodulerpm -name t | xargs rm -rf"); @@ -342,7 +335,9 @@ if [ "$post_config" = "1" ]; then # Copy config file to /etc/webmin or /etc/usermin os_type=`grep "^os_type=" /etc/$prog/config | sed -e 's/os_type=//g'` os_version=`grep "^os_version=" /etc/$prog/config | sed -e 's/os_version=//g'` - /usr/bin/perl /usr/libexec/$prog/copyconfig.pl \$os_type \$os_version /usr/libexec/$prog /etc/$prog $mod + real_os_type=`grep "^real_os_type=" /etc/$prog/config | sed -e 's/real_os_type=//g'` + real_os_version=`grep "^real_os_version=" /etc/$prog/config | sed -e 's/real_os_version=//g'` + /usr/bin/perl /usr/libexec/$prog/copyconfig.pl "\$os_type/\$real_os_type" "\$os_version/\$real_os_version" /usr/libexec/$prog /etc/$prog $mod # Update the ACL for the root user, or the first user in the ACL grep "^root:" /etc/$prog/webmin.acl >/dev/null diff --git a/man/config-open-linux-3.1e b/man/config-open-linux-3.1e old mode 100755 new mode 100644 diff --git a/man/config.info.pl b/man/config.info.pl old mode 100755 new mode 100644 diff --git a/man/help/intro.no.html b/man/help/intro.no.html old mode 100755 new mode 100644 diff --git a/man/help/intro.sk.html b/man/help/intro.sk.html old mode 100755 new mode 100644 diff --git a/man/images/.xvpics/icon.gif b/man/images/.xvpics/icon.gif deleted file mode 100644 index 867f347d1..000000000 Binary files a/man/images/.xvpics/icon.gif and /dev/null differ diff --git a/mime.types b/mime.types old mode 100755 new mode 100644 diff --git a/minecraft/config.info b/minecraft/config.info index 1f304004c..058bed5a7 100644 --- a/minecraft/config.info +++ b/minecraft/config.info @@ -1,6 +1,7 @@ minecraft_dir=Base directory for Minecraft server,0 minecraft_jar=Full path to Minecraft JAR file,3,minecraft_server.jar in the base directory java_cmd=Full path to java command,0 +java_envs=Additional environment variables,0 unix_user=Run Minecraft server as user,5 init_name=Name of init script,0 history_size=Command history size,0 diff --git a/minecraft/config.info.de b/minecraft/config.info.de index cedda2159..d80eb811c 100644 --- a/minecraft/config.info.de +++ b/minecraft/config.info.de @@ -1,6 +1,7 @@ minecraft_dir=Basisverzeichnis für Minecraft Server,0 minecraft_jar=Voller Pfad zur Minecraft JAR Datei,3,minecraft_server.jar im Basisverzeichnis java_cmd=Voller Pfad zum java Befehl,0 +java_envs=Zusätzliche Umgebungsvariablen,0 unix_user=Führe Minecraft Server als Benutzer aus,5 init_name=Name des initialen Skripts,0 history_size=Befehlshistorie Größe,0 diff --git a/minecraft/edit_conf.cgi b/minecraft/edit_conf.cgi index 91e3a00f0..e1c54db81 100755 --- a/minecraft/edit_conf.cgi +++ b/minecraft/edit_conf.cgi @@ -27,7 +27,7 @@ print &ui_table_row($text{'conf_type'}, &ui_select("type", $type, [ [ "DEFAULT", $text{'conf_type_default'} ], [ "FLAT", $text{'conf_type_flat'} ], - [ "LARGEBIOMES", $text{'conf_type_largebiomes'} ] ])); + [ "LARGEBIOMES", $text{'conf_type_largebiomes'} ] ], 1, 0,1)); # Generate structures in new worlds my $structs = &find_value("generate-structures", $conf) || "true"; diff --git a/minecraft/images/cmds.gif b/minecraft/images/cmds.gif old mode 100755 new mode 100644 diff --git a/minecraft/images/conf.gif b/minecraft/images/conf.gif old mode 100755 new mode 100644 diff --git a/minecraft/images/conns.gif b/minecraft/images/conns.gif old mode 100755 new mode 100644 diff --git a/minecraft/images/icon.gif b/minecraft/images/icon.gif old mode 100755 new mode 100644 diff --git a/minecraft/images/logs.gif b/minecraft/images/logs.gif old mode 100755 new mode 100644 diff --git a/minecraft/images/manual.gif b/minecraft/images/manual.gif old mode 100755 new mode 100644 diff --git a/minecraft/images/users.gif b/minecraft/images/users.gif old mode 100755 new mode 100644 diff --git a/minecraft/minecraft-lib.pl b/minecraft/minecraft-lib.pl index 0d2f26fa7..c3cbeff04 100644 --- a/minecraft/minecraft-lib.pl +++ b/minecraft/minecraft-lib.pl @@ -170,6 +170,7 @@ my $ififo = &get_input_fifo(); my $rv = "(test -e ".$ififo." || mkfifo ".$ififo.") ; ". "cd ".$config{'minecraft_dir'}." && ". "(tail -f ".$ififo." | ". + $config{'java_envs'}." ". &has_command($config{'java_cmd'})." ". $config{'java_args'}." ". " -jar ".$jar." nogui ". diff --git a/miniserv.pl b/miniserv.pl index 833ce6c26..ed0dd9556 100755 --- a/miniserv.pl +++ b/miniserv.pl @@ -159,8 +159,11 @@ elsif (!$config{'no_pam'}) { } } if ($config{'pam_only'} && !$use_pam) { - print STDERR $startup_msg[0],"\n"; + foreach $msg (@startup_msg) { + print STDERR $msg,"\n"; + } print STDERR "PAM use is mandatory, but could not be enabled!\n"; + print STDERR "no_pam and pam_only both are set!\n" if ($config{no_pam}); exit(1); } elsif ($pam_msg && !$use_pam) { @@ -554,8 +557,11 @@ $proto = getprotobyname('tcp'); $tried_inaddr_any = 0; for($i=0; $i<@sockets; $i++) { $fh = "MAIN$i"; - socket($fh, $sockets[$i]->[2], SOCK_STREAM, $proto) || - die "Failed to open socket family $sockets[$i]->[2] : $!"; + if (!socket($fh, $sockets[$i]->[2], SOCK_STREAM, $proto)) { + # Protocol not supported + push(@sockerrs, "Failed to open socket family $sockets[$i]->[2] : $!"); + next; + } setsockopt($fh, SOL_SOCKET, SO_REUSEADDR, pack("l", 1)); if ($sockets[$i]->[2] eq PF_INET()) { $pack = pack_sockaddr_in($sockets[$i]->[1], $sockets[$i]->[0]); @@ -1102,11 +1108,7 @@ while(1) { else { # Session is OK print $outfd "2 $user\n"; - if ($lot && - $time_now - $ltime > - ($lot*60)/2) { - $sessiondb{$skey} = "$user $time_now $ip"; - } + $sessiondb{$skey} = "$user $time_now $ip"; } } } diff --git a/mon/images/.xvpics/global.gif b/mon/images/.xvpics/global.gif deleted file mode 100644 index 29173041f..000000000 --- a/mon/images/.xvpics/global.gif +++ /dev/null @@ -1,170 +0,0 @@ -P7 332 -#IMGINFO:48x48 RGB (2775 bytes) -#END_OF_COMMENTS -48 48 255 -ۻߒrSnN.NNsrۗ23SSWSSWSWN3S./*Nwrw3SSWSWWSwSWRS3*./3N.sNS7SWSwSWSw3RSWO2*N3S2/SRS7s7wSwwwW* -+VO. -* -*O.3SS33SWSWwSwwwww./*R/* -/ -**)SW37SSWwSwwwwwwS.*3*. -/ -* -+ R3SWS7SWsWwWwww{.../ -./ -. . -* -*.WSS3SSWwSwww{wwR/./. -/..*** -+ +WS33SWsWwwww{sR3N././.+.+* ) wW3rwSSWSwwww{svS.S./3././/./.+*+RWs7SwSSWWswww{wRSNS2/.3/./.*/.+* -WSs7SWSWSWSwwwwS3R//2/3.3.//2.*/**.WSWSS -3SWws{wS3.3/3N33/2/3./2/**+ -N3WSSM3WswWwwS.3/32O332/3/2//./.+. -./WSS)w.SSWwwwVS/2/3S332/S3/2/.3/. -/. - -OWS2&WSSS Wsswv/2/33S33R333S3/23/.3.+.**W/* OSSWS SSwNwsV/S2S/7/W3S33R333/2//2+.+*3N..swWOWS 3sR/RsW.Sw/23S7S33S3S332/3./..+ -../.* -rw3SS. -/R*NSSRWO73S3S7S3S33S2/3/2++. -. -+. -OSWS./ -.O*3wW/wR3S73S3S7S3S33S/2/2 2+. -/ -* - -*NWSW./ -./ -.3NwS.Ws7/W3S3S7S3S332S/R.+.* +*NSRWO**/.w./wWR3S3S73S3S7S33S/2//... . - -*OWROW/. - -/*SRSSvS3S33S7S3S3W33S.33/.//. -. '23sR/S. -*. -/.wSRW/3S73S3S7S2S333SO./*/ -* - -S3rO.S& -. ./3wrWSSwR3S7S3S33S33.3/./.+* -* -3Ws.S - -. -*./RORWSR3ssW3S3W32S/33./.// -. -* - -SS2S* -* .+R/R3S.SWWSR3W/3S3.3/2/ -/. -. + SWwS.. - )*//.3./32Ss{s2S3S3.3/2//.+. -+ S3./ + -. -//./.3SrWsWR3/3S2/3./3 -3*+* - -* -33.+ / -*+/../3wwwO233/R/3/2//./ -. - -+ - -w/. -* - -. */../R/3NS.3/./. .* ) )SN -* - -*+*RsvSR/2/././** -.*.N* - - -** .sr/2/././.+*+ ' Or - - -* -+*Sv.//./ -./ -. - -* - -* - - *3rw.//*/. -/ -*&* -N* + -*/RSv{+.+.+*. -* - -* - -R* -& - - -* +*/vS. ../*+ / - - -& - +r - - - -* - -+ +ORO -. -/.. ** - -* -** -% * - -. -+ /.+ +./ -* -* - - -*r - -* - - - -* -* - ) * - - -* - -*N* -* * - -* - - -* - - -* -..* -* - - -* - - - -* - - -**Nsߗr3O.* - -* -*rwvsrۻ \ No newline at end of file diff --git a/mon/images/.xvpics/periods.gif b/mon/images/.xvpics/periods.gif deleted file mode 100644 index 5605483b6..000000000 Binary files a/mon/images/.xvpics/periods.gif and /dev/null differ diff --git a/mount/config-cobalt-linux b/mount/config-cobalt-linux index 1aef67e5d..ce5a0ddb6 100644 --- a/mount/config-cobalt-linux +++ b/mount/config-cobalt-linux @@ -3,3 +3,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-coherent-linux b/mount/config-coherent-linux index 9aa53aa46..316ea8c9f 100644 --- a/mount/config-coherent-linux +++ b/mount/config-coherent-linux @@ -5,3 +5,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-corel-linux b/mount/config-corel-linux index 3e0aa38a6..0117b5f87 100644 --- a/mount/config-corel-linux +++ b/mount/config-corel-linux @@ -4,3 +4,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-debian-linux b/mount/config-debian-linux index 20fdcd0a3..53b275cc8 100644 --- a/mount/config-debian-linux +++ b/mount/config-debian-linux @@ -6,3 +6,4 @@ nmblookup_path=nmblookup auto_file=/etc/am-utils/amd.conf autofs_file=/etc/auto.master show_used=1 +nfs_check=1 diff --git a/mount/config-freebsd b/mount/config-freebsd index 5ca156c4d..b64084014 100644 --- a/mount/config-freebsd +++ b/mount/config-freebsd @@ -6,3 +6,4 @@ smbclient_path=smbclient long_fstypes=1 fstab_file=/etc/fstab show_used=1 +nfs_check=1 diff --git a/mount/config-generic-linux b/mount/config-generic-linux index 1aef67e5d..ce5a0ddb6 100644 --- a/mount/config-generic-linux +++ b/mount/config-generic-linux @@ -3,3 +3,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-gentoo-linux b/mount/config-gentoo-linux index 6b05d71cb..c81ffdf2b 100644 --- a/mount/config-gentoo-linux +++ b/mount/config-gentoo-linux @@ -4,3 +4,4 @@ smbclient_path=smbclient nmblookup_path=nmblookup autofs_file=/etc/autofs/auto.master show_used=1 +nfs_check=1 diff --git a/mount/config-hpux b/mount/config-hpux index 5ca156c4d..b64084014 100644 --- a/mount/config-hpux +++ b/mount/config-hpux @@ -6,3 +6,4 @@ smbclient_path=smbclient long_fstypes=1 fstab_file=/etc/fstab show_used=1 +nfs_check=1 diff --git a/mount/config-lfs-linux b/mount/config-lfs-linux index b8b992dd2..5e502c09c 100644 --- a/mount/config-lfs-linux +++ b/mount/config-lfs-linux @@ -6,3 +6,4 @@ long_fstypes=1 smbclient_path= fstab_file=/etc/fstab show_used=1 +nfs_check=1 diff --git a/mount/config-macos b/mount/config-macos index 727db2057..6951d85b4 100644 --- a/mount/config-macos +++ b/mount/config-macos @@ -5,3 +5,4 @@ auto_file= smbclient_path=smbclient long_fstypes=1 show_used=1 +nfs_check=1 diff --git a/mount/config-mandrake-linux b/mount/config-mandrake-linux index 9aa53aa46..316ea8c9f 100644 --- a/mount/config-mandrake-linux +++ b/mount/config-mandrake-linux @@ -5,3 +5,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-msc-linux b/mount/config-msc-linux index 9aa53aa46..316ea8c9f 100644 --- a/mount/config-msc-linux +++ b/mount/config-msc-linux @@ -5,3 +5,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-netbsd b/mount/config-netbsd old mode 100755 new mode 100644 index 5ca156c4d..b64084014 --- a/mount/config-netbsd +++ b/mount/config-netbsd @@ -6,3 +6,4 @@ smbclient_path=smbclient long_fstypes=1 fstab_file=/etc/fstab show_used=1 +nfs_check=1 diff --git a/mount/config-open-linux b/mount/config-open-linux index b9c4d6d40..eebfa0b7d 100644 --- a/mount/config-open-linux +++ b/mount/config-open-linux @@ -4,3 +4,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-open-linux-3.1e b/mount/config-open-linux-3.1e index 24794983d..8987fb910 100644 --- a/mount/config-open-linux-3.1e +++ b/mount/config-open-linux-3.1e @@ -4,3 +4,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-openbsd b/mount/config-openbsd index 5ca156c4d..b64084014 100644 --- a/mount/config-openbsd +++ b/mount/config-openbsd @@ -6,3 +6,4 @@ smbclient_path=smbclient long_fstypes=1 fstab_file=/etc/fstab show_used=1 +nfs_check=1 diff --git a/mount/config-openmamba-linux b/mount/config-openmamba-linux index 17cd9b3d9..cdc023489 100644 --- a/mount/config-openmamba-linux +++ b/mount/config-openmamba-linux @@ -4,3 +4,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-osf1 b/mount/config-osf1 index 2da618a93..2243257c3 100644 --- a/mount/config-osf1 +++ b/mount/config-osf1 @@ -6,3 +6,4 @@ long_fstypes=1 smbclient_path=/usr/local/samba/bin/smbclient fstab_file=/etc/fstab show_used=1 +nfs_check=1 diff --git a/mount/config-pardus-linux b/mount/config-pardus-linux index 1aef67e5d..ce5a0ddb6 100644 --- a/mount/config-pardus-linux +++ b/mount/config-pardus-linux @@ -3,3 +3,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-redhat-linux b/mount/config-redhat-linux index 17cd9b3d9..cdc023489 100644 --- a/mount/config-redhat-linux +++ b/mount/config-redhat-linux @@ -4,3 +4,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-redhat-linux-5.0-6.0 b/mount/config-redhat-linux-5.0-6.0 index 9177d6da3..5ffac97eb 100644 --- a/mount/config-redhat-linux-5.0-6.0 +++ b/mount/config-redhat-linux-5.0-6.0 @@ -5,3 +5,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-redhat-linux-6.1-ALL b/mount/config-redhat-linux-6.1-ALL index 9aa53aa46..316ea8c9f 100644 --- a/mount/config-redhat-linux-6.1-ALL +++ b/mount/config-redhat-linux-6.1-ALL @@ -5,3 +5,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-slackware-linux b/mount/config-slackware-linux index 25069bb0a..75687858a 100644 --- a/mount/config-slackware-linux +++ b/mount/config-slackware-linux @@ -3,3 +3,4 @@ long_fstypes=1 smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-sol-linux b/mount/config-sol-linux index a7a84140b..6cfcc5501 100644 --- a/mount/config-sol-linux +++ b/mount/config-sol-linux @@ -8,3 +8,4 @@ passwd_cindex=2 passwd_mindex=4 by_view=0 show_used=1 +nfs_check=1 diff --git a/mount/config-solaris b/mount/config-solaris index 6c2060768..521be4b10 100644 --- a/mount/config-solaris +++ b/mount/config-solaris @@ -4,3 +4,4 @@ long_fstypes=1 smbclient_path=/usr/local/samba/bin/smbclient nmblookup_path=/usr/local/samba/bin/nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-suse-linux b/mount/config-suse-linux index 288c8bde4..ec9266b24 100644 --- a/mount/config-suse-linux +++ b/mount/config-suse-linux @@ -4,3 +4,4 @@ autofs_file=/etc/auto.master smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-trustix-linux b/mount/config-trustix-linux index 9aa53aa46..316ea8c9f 100644 --- a/mount/config-trustix-linux +++ b/mount/config-trustix-linux @@ -5,3 +5,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-turbo-linux b/mount/config-turbo-linux index 9177d6da3..5ffac97eb 100644 --- a/mount/config-turbo-linux +++ b/mount/config-turbo-linux @@ -5,3 +5,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-turbo-linux-4.0 b/mount/config-turbo-linux-4.0 index 9177d6da3..5ffac97eb 100644 --- a/mount/config-turbo-linux-4.0 +++ b/mount/config-turbo-linux-4.0 @@ -5,3 +5,4 @@ fstab_file=/etc/fstab smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config-united-linux b/mount/config-united-linux index 288c8bde4..ec9266b24 100644 --- a/mount/config-united-linux +++ b/mount/config-united-linux @@ -4,3 +4,4 @@ autofs_file=/etc/auto.master smbclient_path=smbclient nmblookup_path=nmblookup show_used=1 +nfs_check=1 diff --git a/mount/config.info b/mount/config.info index 3141ce618..04ba53c87 100644 --- a/mount/config.info +++ b/mount/config.info @@ -11,3 +11,4 @@ auto_file=NFS automounts file,3 autofs_file=Kernel automounts file,3 smbclient_path=Full path to smbclient,3 nmblookup_path=Full path to nmblookup,3 +nfs_check=Check NFS servers before attempting mount,1,1-Yes,0-No diff --git a/mount/config.info.pl b/mount/config.info.pl old mode 100755 new mode 100644 diff --git a/mount/freebsd-lib.pl b/mount/freebsd-lib.pl index 61089a36a..9c53e5fe8 100755 --- a/mount/freebsd-lib.pl +++ b/mount/freebsd-lib.pl @@ -684,23 +684,25 @@ sub check_location if ($_[0] eq "nfs") { local($out, $temp, $mout, $dirlist); - # Use ping and showmount to see if the host exists and is up - if ($in{nfs_host} !~ /^\S+$/) { - &error("'$in{nfs_host}' is not a valid hostname"); - } - &execute_command("ping -c 1 '$in{nfs_host}'", undef, \$out, \$out); - if ($out =~ /unknown host/i) { - &error("The host '$in{nfs_host}' does not exist"); - } - elsif ($out =~ /100\% packet loss/) { - &error("The host '$in{nfs_host}' is down"); - } - &execute_command("showmount -e '$in{nfs_host}'", undef, \$out, \$out); - if ($out =~ /Unable to receive/) { - &error("The host '$in{nfs_host}' does not support NFS"); - } - elsif ($?) { - &error("Failed to get mount list : $out"); + if ($config{'nfs_check'}) { + # Use ping and showmount to see if the host exists and is up + if ($in{nfs_host} !~ /^\S+$/) { + &error("'$in{nfs_host}' is not a valid hostname"); + } + &execute_command("ping -c 1 '$in{nfs_host}'", undef, \$out, \$out); + if ($out =~ /unknown host/i) { + &error("The host '$in{nfs_host}' does not exist"); + } + elsif ($out =~ /100\% packet loss/) { + &error("The host '$in{nfs_host}' is down"); + } + &execute_command("showmount -e '$in{nfs_host}'", undef, \$out, \$out); + if ($out =~ /Unable to receive/) { + &error("The host '$in{nfs_host}' does not support NFS"); + } + elsif ($?) { + &error("Failed to get mount list : $out"); + } } # Validate directory name diff --git a/mount/freebsd-mounts-3.c b/mount/freebsd-mounts-3.c old mode 100755 new mode 100644 diff --git a/mount/freebsd-mounts-4.c b/mount/freebsd-mounts-4.c old mode 100755 new mode 100644 diff --git a/mount/freebsd-mounts-5.c b/mount/freebsd-mounts-5.c old mode 100755 new mode 100644 diff --git a/mount/freebsd-mounts-7.c b/mount/freebsd-mounts-7.c old mode 100755 new mode 100644 diff --git a/mount/help/linux_netdev.ca.html b/mount/help/linux_netdev.ca.html old mode 100755 new mode 100644 diff --git a/mount/help/linux_nfsvers.ca.html b/mount/help/linux_nfsvers.ca.html old mode 100755 new mode 100644 diff --git a/mount/help/linux_nfsvers.de.html b/mount/help/linux_nfsvers.de.html old mode 100755 new mode 100644 diff --git a/mount/help/linux_noatime.ca.html b/mount/help/linux_noatime.ca.html old mode 100755 new mode 100644 diff --git a/mount/help/linux_noatime.nl.html b/mount/help/linux_noatime.nl.html old mode 100755 new mode 100644 diff --git a/mount/help/linux_nodev.nl.html b/mount/help/linux_nodev.nl.html old mode 100755 new mode 100644 diff --git a/mount/help/linux_noexec.nl.html b/mount/help/linux_noexec.nl.html old mode 100755 new mode 100644 diff --git a/mount/hpux-lib.pl b/mount/hpux-lib.pl index 61240bd21..af6fd0bae 100755 --- a/mount/hpux-lib.pl +++ b/mount/hpux-lib.pl @@ -676,24 +676,26 @@ sub check_location if ($_[0] eq "nfs") { local($out, $temp, $mout, $dirlist); - # Use ping and showmount to see if the host exists and is up - if ($in{nfs_host} !~ /^\S+$/) { - &error("'$in{nfs_host}' is not a valid hostname"); - } - &execute_command("ping -c 1 '$in{nfs_host}'", undef, \$out, \$out); - if ($out =~ /unknown host/i) { - &error("The host '$in{nfs_host}' does not exist"); - } - elsif ($out =~ /100\% packet loss/) { - &error("The host '$in{nfs_host}' is down"); - } - &execute_command("showmount -e '$in{nfs_host}'", undef, \$out, \$out); - if ($out =~ /Unable to receive/) { - &error("The host '$in{nfs_host}' does not support NFS"); - } - elsif ($?) { - &error("Failed to get mount list : $out"); - } + if ($config{'nfs_check'}) { + # Use ping and showmount to see if the host exists and is up + if ($in{nfs_host} !~ /^\S+$/) { + &error("'$in{nfs_host}' is not a valid hostname"); + } + &execute_command("ping -c 1 '$in{nfs_host}'", undef, \$out, \$out); + if ($out =~ /unknown host/i) { + &error("The host '$in{nfs_host}' does not exist"); + } + elsif ($out =~ /100\% packet loss/) { + &error("The host '$in{nfs_host}' is down"); + } + &execute_command("showmount -e '$in{nfs_host}'", undef, \$out, \$out); + if ($out =~ /Unable to receive/) { + &error("The host '$in{nfs_host}' does not support NFS"); + } + elsif ($?) { + &error("Failed to get mount list : $out"); + } + } # Validate directory name foreach (split(/\n/, $out)) { diff --git a/mount/linux-lib.pl b/mount/linux-lib.pl index 68bdac395..ca7204244 100755 --- a/mount/linux-lib.pl +++ b/mount/linux-lib.pl @@ -2,9 +2,9 @@ # Mount table functions for linux if (!$no_check_support) { - my %suppport; + my %support; my $fsfile = &read_file_contents("/proc/filesystems"); - foreach my $l (split(/\n/, $fsfile)) { + foreach my $l (split(/\r?\n/, $fsfile)) { my @w = split(/\s+/, $l); my $fs = pop(@w); $support{$fs} = 1; @@ -37,13 +37,13 @@ if (!$no_check_support) { if ($support{'ext4'}) { $ext4_support = 1; } - if ($suppport{'xfs'} || &has_command("mkfs.xfs")) { + if ($support{'xfs'} || &has_command("mkfs.xfs")) { $xfs_support = 1; } - if ($suppport{'jfs'} || &has_command("mkfs.jfs")) { + if ($support{'jfs'} || &has_command("mkfs.jfs")) { $jfs_support = 1; } - if ($suppport{'btrfs'} || &has_command("mkfs.btrfs")) { + if ($support{'btrfs'} || &has_command("mkfs.btrfs")) { $btrfs_support = 1; } } @@ -549,16 +549,16 @@ while($dirlist")); - } - } + } + + if ($_[0] ne "nfs4" && $in{'nfs_dir'} !~ /^\/.*$/ && + &indexof($in{'nfs_dir'}, @dirlist) < 0) { + &error(&text('linux_enfsdir', $in{'nfs_dir'}, + $in{'nfs_host'}, "
$dirlist")); + } # Try a test mount to see if filesystem is available $temp = &tempname(); diff --git a/mount/mount-lib.pl b/mount/mount-lib.pl index 58dfcfe94..47e2c1452 100755 --- a/mount/mount-lib.pl +++ b/mount/mount-lib.pl @@ -306,7 +306,7 @@ my %donedevno; # Get list of zone pools my %zpools = ( 'zones' => 1, 'zroot' => 1 ); if (&has_command("zpool")) { - my @out = &backquote_command("zpool list -P || zpool list -p"); + my @out = &backquote_command("zpool list -P 2>/dev/null || zpool list -p 2>/dev/null"); foreach my $l (@out) { if (/^(\S+)\s+(\d+)\s+(\d+)\s+(\d+)/) { $zpools{$1} = [ $2 / 1024, $4 / 1024 ]; @@ -344,6 +344,14 @@ foreach my $m (@mounted) { # Skip fuse user-space filesystem mounts next; } + if ($m->[2] eq "swap") { + # Skip virtual memory + next; + } + if ($m->[2] eq "squashfs") { + # Skip /snap mounts + next; + } # Get the size - for ZFS mounts, this comes from the underlying # total pool size and free my ($t, $f); diff --git a/mount/netbsd-lib.pl b/mount/netbsd-lib.pl index 60805ad1e..7a4cc84a4 100755 --- a/mount/netbsd-lib.pl +++ b/mount/netbsd-lib.pl @@ -522,23 +522,25 @@ sub check_location if ($_[0] eq "nfs") { local($out, $temp, $mout, $dirlist); - # Use ping and showmount to see if the host exists and is up - if ($in{nfs_host} !~ /^\S+$/) { - &error("'$in{nfs_host}' is not a valid hostname"); - } - $out = &backquote_command("ping -c 1 '$in{nfs_host}' 2>&1"); - if ($out =~ /unknown host/i) { - &error("The host '$in{nfs_host}' does not exist"); - } - elsif ($out =~ /100\% packet loss/) { - &error("The host '$in{nfs_host}' is down"); - } - $out = &backquote_command("showmount -e '$in{nfs_host}' 2>&1"); - if ($out =~ /Unable to receive/) { - &error("The host '$in{nfs_host}' does not support NFS"); - } - elsif ($?) { - &error("Failed to get mount list : $out"); + if ($config{'nfs_check'}) { + # Use ping and showmount to see if the host exists and is up + if ($in{nfs_host} !~ /^\S+$/) { + &error("'$in{nfs_host}' is not a valid hostname"); + } + $out = &backquote_command("ping -c 1 '$in{nfs_host}' 2>&1"); + if ($out =~ /unknown host/i) { + &error("The host '$in{nfs_host}' does not exist"); + } + elsif ($out =~ /100\% packet loss/) { + &error("The host '$in{nfs_host}' is down"); + } + $out = &backquote_command("showmount -e '$in{nfs_host}' 2>&1"); + if ($out =~ /Unable to receive/) { + &error("The host '$in{nfs_host}' does not support NFS"); + } + elsif ($?) { + &error("Failed to get mount list : $out"); + } } # Validate directory name diff --git a/mount/netbsd-mounts-2.c b/mount/netbsd-mounts-2.c old mode 100755 new mode 100644 diff --git a/mount/netbsd-mounts-3.c b/mount/netbsd-mounts-3.c old mode 100755 new mode 100644 diff --git a/mount/netbsd-mounts.c b/mount/netbsd-mounts.c old mode 100755 new mode 100644 diff --git a/mount/openbsd-lib.pl b/mount/openbsd-lib.pl index 59d04fa73..2652f6770 100755 --- a/mount/openbsd-lib.pl +++ b/mount/openbsd-lib.pl @@ -524,23 +524,25 @@ sub check_location if ($_[0] eq "nfs") { local($out, $temp, $mout, $dirlist); - # Use ping and showmount to see if the host exists and is up - if ($in{nfs_host} !~ /^\S+$/) { - &error("'$in{nfs_host}' is not a valid hostname"); - } - $out = &backquote_command("ping -c 1 '$in{nfs_host}' 2>&1"); - if ($out =~ /unknown host/i) { - &error("The host '$in{nfs_host}' does not exist"); - } - elsif ($out =~ /100\% packet loss/) { - &error("The host '$in{nfs_host}' is down"); - } - $out = &backquote_command("showmount -e '$in{nfs_host}' 2>&1"); - if ($out =~ /Unable to receive/) { - &error("The host '$in{nfs_host}' does not support NFS"); - } - elsif ($?) { - &error("Failed to get mount list : $out"); + if ($config{'nfs_check'}) { + # Use ping and showmount to see if the host exists and is up + if ($in{nfs_host} !~ /^\S+$/) { + &error("'$in{nfs_host}' is not a valid hostname"); + } + $out = &backquote_command("ping -c 1 '$in{nfs_host}' 2>&1"); + if ($out =~ /unknown host/i) { + &error("The host '$in{nfs_host}' does not exist"); + } + elsif ($out =~ /100\% packet loss/) { + &error("The host '$in{nfs_host}' is down"); + } + $out = &backquote_command("showmount -e '$in{nfs_host}' 2>&1"); + if ($out =~ /Unable to receive/) { + &error("The host '$in{nfs_host}' does not support NFS"); + } + elsif ($?) { + &error("Failed to get mount list : $out"); + } } # Validate directory name diff --git a/mscstyle3/images/.xvpics/white_bar.jpg b/mscstyle3/images/.xvpics/white_bar.jpg deleted file mode 100644 index ee8efa652..000000000 --- a/mscstyle3/images/.xvpics/white_bar.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:8x9 RGB (363 bytes) -#END_OF_COMMENTS -8 9 255 -rrrrqrrsrrrsr \ No newline at end of file diff --git a/mscstyle3/images/cats/.xvpics/Clusters.jpg b/mscstyle3/images/cats/.xvpics/Clusters.jpg deleted file mode 100644 index 5f45b639b..000000000 Binary files a/mscstyle3/images/cats/.xvpics/Clusters.jpg and /dev/null differ diff --git a/mscstyle3/images/cats/.xvpics/Hardware.jpg b/mscstyle3/images/cats/.xvpics/Hardware.jpg deleted file mode 100644 index c4bfe29c3..000000000 Binary files a/mscstyle3/images/cats/.xvpics/Hardware.jpg and /dev/null differ diff --git a/mscstyle3/images/cats/.xvpics/Others.jpg b/mscstyle3/images/cats/.xvpics/Others.jpg deleted file mode 100644 index ea56020a1..000000000 Binary files a/mscstyle3/images/cats/.xvpics/Others.jpg and /dev/null differ diff --git a/mscstyle3/images/cats/.xvpics/Servers.jpg b/mscstyle3/images/cats/.xvpics/Servers.jpg deleted file mode 100644 index 8592e3347..000000000 Binary files a/mscstyle3/images/cats/.xvpics/Servers.jpg and /dev/null differ diff --git a/mscstyle3/images/cats/.xvpics/System.jpg b/mscstyle3/images/cats/.xvpics/System.jpg deleted file mode 100644 index fa03761c9..000000000 Binary files a/mscstyle3/images/cats/.xvpics/System.jpg and /dev/null differ diff --git a/mscstyle3/images/cats/.xvpics/Webmin.jpg b/mscstyle3/images/cats/.xvpics/Webmin.jpg deleted file mode 100644 index b3eca807f..000000000 Binary files a/mscstyle3/images/cats/.xvpics/Webmin.jpg and /dev/null differ diff --git a/mscstyle3/images/cats/.xvpics/unknown.jpg b/mscstyle3/images/cats/.xvpics/unknown.jpg deleted file mode 100644 index 32e27a035..000000000 Binary files a/mscstyle3/images/cats/.xvpics/unknown.jpg and /dev/null differ diff --git a/mscstyle3/images/cats_over/.xvpics/Clusters.jpg b/mscstyle3/images/cats_over/.xvpics/Clusters.jpg deleted file mode 100644 index 5f45b639b..000000000 Binary files a/mscstyle3/images/cats_over/.xvpics/Clusters.jpg and /dev/null differ diff --git a/mscstyle3/images/cats_over/.xvpics/Hardware.jpg b/mscstyle3/images/cats_over/.xvpics/Hardware.jpg deleted file mode 100644 index c4bfe29c3..000000000 Binary files a/mscstyle3/images/cats_over/.xvpics/Hardware.jpg and /dev/null differ diff --git a/mscstyle3/images/cats_over/.xvpics/Others.jpg b/mscstyle3/images/cats_over/.xvpics/Others.jpg deleted file mode 100644 index ea56020a1..000000000 Binary files a/mscstyle3/images/cats_over/.xvpics/Others.jpg and /dev/null differ diff --git a/mscstyle3/images/cats_over/.xvpics/Servers.jpg b/mscstyle3/images/cats_over/.xvpics/Servers.jpg deleted file mode 100644 index 8592e3347..000000000 Binary files a/mscstyle3/images/cats_over/.xvpics/Servers.jpg and /dev/null differ diff --git a/mscstyle3/images/cats_over/.xvpics/System.jpg b/mscstyle3/images/cats_over/.xvpics/System.jpg deleted file mode 100644 index fa03761c9..000000000 Binary files a/mscstyle3/images/cats_over/.xvpics/System.jpg and /dev/null differ diff --git a/mscstyle3/images/cats_over/.xvpics/Webmin.jpg b/mscstyle3/images/cats_over/.xvpics/Webmin.jpg deleted file mode 100644 index b3eca807f..000000000 Binary files a/mscstyle3/images/cats_over/.xvpics/Webmin.jpg and /dev/null differ diff --git a/mscstyle3/images/cats_over/.xvpics/unknown.jpg b/mscstyle3/images/cats_over/.xvpics/unknown.jpg deleted file mode 100644 index 32e27a035..000000000 Binary files a/mscstyle3/images/cats_over/.xvpics/unknown.jpg and /dev/null differ diff --git a/mscstyle3/images/nav/.xvpics/bg.jpg b/mscstyle3/images/nav/.xvpics/bg.jpg deleted file mode 100644 index 197209abe..000000000 --- a/mscstyle3/images/nav/.xvpics/bg.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:120x57 RGB (4905 bytes) -#END_OF_COMMENTS -80 38 255 -mMjmmmmnmImmnImmnMmiNlnimMjmmmJmmmjlNmminlnmimmInmmiMmnMimmnMminmiMmnmmMjmmmnMimmMnminmmmnmMmjmMmnMimnMimnmImnmmMnmimNlnmmnimmnmmInmMimnmminMmmnmimNmmmnLMmnimmmnimmnmmjlnmmjmmnimmNmmmnMmmmnMmmnmmMnmmmMmnmnmmMjqiNmqmnMqnmmjmMmnmmiNmmmnlnMmnMMMMnmmnmMnmmmmnlnmMnmmmmniQjmmnmmMnmmnmmnmmmnimnmmmnMmnmqirimmNImmnmMmnmMnmmjmmMjmmmjmnmmjmMmnmMmnmmmNMmmmnmmmnimmNmimnmMnimmmnmmmnmmMinmmmnMMnmmmnmnmmmjmmMnmjmmmjmMnljqinmMnmmnmminmmnmmnmmmnmImnmmiMnmmmniqiMnmmmNmmnmmmNmmmnMmnmnimmnMmnmmmnmmmmnmmMMmmnmimMnmmnMmmnmmnMQjqmmnmmmJqinMmnlnmmNimmnmmmNmmmnmminmNmmmnmmnmqnMNqmnmiqjmMmnmMmnMmnmmmnmnmNmmnmMnmiqJmmmnmmnmmjqirimmnmmqNMnmqnmnmmmnmmnqmnmmnmmrmmnmmNmmnmmmMmNMnmnmmMmrmmnmmmnmmiMnmmnQnmmnqmnmnmmnnmmnmnmmnmmnmnqmnmnmmnmmnqjqmnmmrmmrmnqmnmnmmnmmrmmnmmrmmnMQmnmmmnmmnmmnmnmnmrmmmmmrmmnmmmnmqnmnmmmnqnmqnmrnmnqmqnmnmRNMrmmmqmnqmnqnmnmmnmmnmqnmnmmrnqnmmmnmmmnmmmmnmnqnmrmnmqnmmnmmmmnmrmnMmnmmnqnmrmnmmnmqnmnqmmrmnnmnrmmmnnmqnmrnmrmmqnrmqmnqmmnqnmrmqnmnmnmqrmqnqmmrnqmmnqmmnmmnqrmmnnmqmnnqmmqmrrmmnnrmnmnqnqnqnqnnmnmmnmnrmqmrrmmmnnqqnqnnnqrmmmmrrnqqqmmqqmmnnqnnnnnqnmmnrmrmqnnnnmrnrqnnqqqnnqqnnqrnnrmmnnmmmnnqmnrmmmmrnnqrqqmqrnmrnqmqqqqqmrqqqqmqqnnnnrrqrrrrrnnmrnqmqrnqqnmqrmrrrnnmmmqqrqnmrnrqqqqqnrmmmrmmqrrrrqqqnqrrrnrmrrrnrnnrrrqrqurrqrqrqnnqqmrrrrrrrqrrrqqqrrrqrrmrnqrrrrrrqrrqqqqqrqrqrnrrqqrqqrqqrrrrrqrnqrqqrqrrrwrrrrr \ No newline at end of file diff --git a/mscstyle3/images/nav/.xvpics/bottom_bg.jpg b/mscstyle3/images/nav/.xvpics/bottom_bg.jpg deleted file mode 100644 index 8c5392cc3..000000000 --- a/mscstyle3/images/nav/.xvpics/bottom_bg.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:23x4 RGB (458 bytes) -#END_OF_COMMENTS -23 4 255 -mmmqmrnnrqmInmmiMnmmiNlnmMinmmMin \ No newline at end of file diff --git a/mscstyle3/images/nav/.xvpics/bottom_left.jpg b/mscstyle3/images/nav/.xvpics/bottom_left.jpg deleted file mode 100644 index 1848db38a..000000000 --- a/mscstyle3/images/nav/.xvpics/bottom_left.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:3x4 RGB (382 bytes) -#END_OF_COMMENTS -3 4 255 -ږnI \ No newline at end of file diff --git a/mscstyle3/images/nav/.xvpics/bottom_shadow.jpg b/mscstyle3/images/nav/.xvpics/bottom_shadow.jpg deleted file mode 100644 index 931eb9bb7..000000000 --- a/mscstyle3/images/nav/.xvpics/bottom_shadow.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:43x9 RGB (437 bytes) -#END_OF_COMMENTS -43 9 255 -%(&()%)%(I%)%)$*(%)%)H%)%)%(*$)%)I$)%)%)(&())E-%I)))I))I)%I))I)))I))I%)I))I)))I))E))I*)I.II-J)M)I*MI)N)I-I*IM)J-I)I.II-J)M)I*MI)NM*MNINM)NMJMN)NMINM*MNIMN)NMJMM*MNMJM.IMNINNMNNMn-nNQJRMNNmNMNNMNNMnNQJQNNMNn-nNMNMNNMNrMSMnRNqNRnNRmRNnRMsMRnNQnRNnRMrNRnMSmRNNqRnRrNrRnRrNrRnQsMsQoQrNrRnRRnRrNrRnRrNrRnRqRrrNsqSqSrnRrrRrRnrRrsQsQorRrrRrNrrRrRsmSqsrSqsRrrRrsqSrrRrrsQsrRrrRsqsRrrRsqSrrrRrsQs \ No newline at end of file diff --git a/mscstyle3/images/nav/.xvpics/left.jpg b/mscstyle3/images/nav/.xvpics/left.jpg deleted file mode 100644 index e020bce06..000000000 --- a/mscstyle3/images/nav/.xvpics/left.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:3x57 RGB (691 bytes) -#END_OF_COMMENTS -3 57 255 -mrmnqmmqmmnmmnqmmmrmrmnqnmmnrrrmqqrrrrqrnqruֶշ \ No newline at end of file diff --git a/mscstyle3/images/nav/.xvpics/sep.jpg b/mscstyle3/images/nav/.xvpics/sep.jpg deleted file mode 100644 index 4a638da79..000000000 --- a/mscstyle3/images/nav/.xvpics/sep.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:17x57 RGB (1147 bytes) -#END_OF_COMMENTS -17 57 255 -mMnhnmMinmmmjQimmmmnmMinmmmnmmmnMmmnMmmnMmniMmnlnmMmnmmjmmNmmjqiqjqimnmMnmmnMmqiNmmmnmnmimnmmnimnmMmnmmnmMmnmmmNmmmnmMmmNmmqmNlnmMnmmmNmNimnmInmmimnmmmmmNqiQnMmmmnMmmnhrmnmmmmrmmnpNmmnmmmmNmmmnmmnmmmnmmmqnmmmnmmmnmmnmmimnmiNmmnmMnmmmnmqmnmirINmmnmnmmnmmNqnmnMnmnmqnmmnmrmnmnmqjnmnnmmnqmnqmqnqmrQnmqnmnmmnnmnrmmnnmnnqmqnmmrqnrmrmmqnmrmmrrmrrmmrqnqmnnqqqqnqqqmrnqqrrnmmqqmnnqqnmmnmmmqmqqrmqqrnqqqrrrqrrqnqmrqrrnmrrmrrrqrrrvvurqqrrq \ No newline at end of file diff --git a/mscstyle3/images/nav/.xvpics/text_bg.jpg b/mscstyle3/images/nav/.xvpics/text_bg.jpg deleted file mode 100644 index b1c04b7a2..000000000 --- a/mscstyle3/images/nav/.xvpics/text_bg.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:120x13 RGB (1538 bytes) -#END_OF_COMMENTS -80 8 255 - \ No newline at end of file diff --git a/mscstyle3/images/nav/.xvpics/text_left.jpg b/mscstyle3/images/nav/.xvpics/text_left.jpg deleted file mode 100644 index 62277fe36..000000000 --- a/mscstyle3/images/nav/.xvpics/text_left.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:3x13 RGB (425 bytes) -#END_OF_COMMENTS -3 13 255 -ֶշ \ No newline at end of file diff --git a/mscstyle3/images/nav/.xvpics/text_sep.jpg b/mscstyle3/images/nav/.xvpics/text_sep.jpg deleted file mode 100644 index f5aadef1f..000000000 --- a/mscstyle3/images/nav/.xvpics/text_sep.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:17x13 RGB (552 bytes) -#END_OF_COMMENTS -17 13 255 - \ No newline at end of file diff --git a/mscstyle3/images/tabs/.xvpics/bg.jpg b/mscstyle3/images/tabs/.xvpics/bg.jpg deleted file mode 100644 index 35b2117e2..000000000 --- a/mscstyle3/images/tabs/.xvpics/bg.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:21x21 RGB (333 bytes) -#END_OF_COMMENTS -21 21 255 -mInlnImmnImmmInmmImnlmnmmmnIInmmmnmmmnmmmmnmnmnmnmmmmnmnmnmmmmmnnnnmnnmnnmnnmnnnmnm \ No newline at end of file diff --git a/mscstyle3/images/tabs/.xvpics/blue_left.jpg b/mscstyle3/images/tabs/.xvpics/blue_left.jpg deleted file mode 100644 index df7dafa8f..000000000 --- a/mscstyle3/images/tabs/.xvpics/blue_left.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:13x22 RGB (548 bytes) -#END_OF_COMMENTS -13 22 255 -suOvrsqsqrnrwNRnvsRsNrvnRQsvnsQvMۻrRQۻrrRۻۻrrۻrrۿrۿnۻۿۻۿۻۿۻۿۻۿۻۿۻۿۻۿۻۿۻۿ \ No newline at end of file diff --git a/mscstyle3/images/tabs/.xvpics/blue_right.jpg b/mscstyle3/images/tabs/.xvpics/blue_right.jpg deleted file mode 100644 index 75daacbcd..000000000 --- a/mscstyle3/images/tabs/.xvpics/blue_right.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:19x22 RGB (699 bytes) -#END_OF_COMMENTS -19 22 255 -NnRrSrrrRwsrRrۻRnrRrrSqwnrrvrSۻNrRrrNrwmwrrRۻNnvMsrRRsqwۻrNrrrRrrsqSۻnMnRsqSrrvۻIsMrwMsrvۻnMsQSrrrۻnQoQsRrrۻ.mNRrsRۻ)RNnRrrۻRIrNrRrۻۿ%rNRrnۻۿ%NqNrRۻۿ%MnNRrۻۿ%MNnRnۻۿ%)nQOqۻۿ%)NmSQۻۿ%)NmSQۻۿ%)NMsQۻۿ%)NMsMۻۿ%)NMrN \ No newline at end of file diff --git a/mscstyle3/images/tabs/.xvpics/bottom.jpg b/mscstyle3/images/tabs/.xvpics/bottom.jpg deleted file mode 100644 index 0c912b95a..000000000 --- a/mscstyle3/images/tabs/.xvpics/bottom.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:17x4 RGB (438 bytes) -#END_OF_COMMENTS -17 4 255 -$)$%%%(%%%%($)I))I))I*(J(&L&)INMNNQjRMNMNNMNNMNrRrNsqSqOqSrrNrRr \ No newline at end of file diff --git a/mscstyle3/images/tabs/.xvpics/left.jpg b/mscstyle3/images/tabs/.xvpics/left.jpg deleted file mode 100644 index 5e0f947bb..000000000 --- a/mscstyle3/images/tabs/.xvpics/left.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:12x21 RGB (394 bytes) -#END_OF_COMMENTS -12 21 255 -mnmmmnmmmnmmmnmnmmnmmmmmrnnqnmmnrmnrrrrnrRrrNrSqnrSqsMmrSrrq*mrSrvnRIMIi \ No newline at end of file diff --git a/mscstyle3/images/tabs/.xvpics/left_bottom.jpg b/mscstyle3/images/tabs/.xvpics/left_bottom.jpg deleted file mode 100644 index 9ab162357..000000000 --- a/mscstyle3/images/tabs/.xvpics/left_bottom.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:15x4 RGB (413 bytes) -#END_OF_COMMENTS -15 4 255 -E I)NMoQsvrrSr)I.INrRrrrSqsvrNMrNrSqsrVsqsrRRrrsRrrrsVrrrsR \ No newline at end of file diff --git a/mscstyle3/images/tabs/.xvpics/right.jpg b/mscstyle3/images/tabs/.xvpics/right.jpg deleted file mode 100644 index 42a22cd2f..000000000 Binary files a/mscstyle3/images/tabs/.xvpics/right.jpg and /dev/null differ diff --git a/mscstyle3/images/tabs/.xvpics/right_bottom.jpg b/mscstyle3/images/tabs/.xvpics/right_bottom.jpg deleted file mode 100644 index 1c136beae..000000000 --- a/mscstyle3/images/tabs/.xvpics/right_bottom.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:12x4 RGB (427 bytes) -#END_OF_COMMENTS -12 4 255 -rSvnvnRNM)%)rSvrrrSmRNMJrSvrrsqSrrNQrSvrrsqSrrrS \ No newline at end of file diff --git a/mscstyle3/images/tabs/.xvpics/shadow.jpg b/mscstyle3/images/tabs/.xvpics/shadow.jpg deleted file mode 100644 index bd400e23c..000000000 --- a/mscstyle3/images/tabs/.xvpics/shadow.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:4x37 RGB (386 bytes) -#END_OF_COMMENTS -4 37 255 -%(&())E-)I.IM*MNNMNNNrMSRnRrRrrNrSqsrSrrrSrvrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSvrrSrvrSrr \ No newline at end of file diff --git a/mscstyle3/images/tabs/.xvpics/white_left.jpg b/mscstyle3/images/tabs/.xvpics/white_left.jpg deleted file mode 100644 index 120623c45..000000000 --- a/mscstyle3/images/tabs/.xvpics/white_left.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:13x22 RGB (407 bytes) -#END_OF_COMMENTS -13 22 255 -rSvnvrSrrrRrrSrvrrSqsrSrvnvNrSrrrRrSrrrrSqsrSqrRrRRRr \ No newline at end of file diff --git a/mscstyle3/images/tabs/.xvpics/white_right.jpg b/mscstyle3/images/tabs/.xvpics/white_right.jpg deleted file mode 100644 index b122d35b8..000000000 --- a/mscstyle3/images/tabs/.xvpics/white_right.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:19x22 RGB (469 bytes) -#END_OF_COMMENTS -19 22 255 -rRrOqsRrrrWqsrrsRrRrnRrsQsrrVsrrrRnRrrRsrrrRwrRnRrrRsqsRrsRnRrRnvsRrrRnRnRrrrWrNRmSrrRrrNRmSrrRrNQoQoQsvNMRnrSrNMNrRrrRIRnRrrMNNRnr)NrMsQ)NMnRr)NMNrN)INRnR)INNQs)INMSm)INMSm)INMNr)I.mNr \ No newline at end of file diff --git a/mscstyle3/images/tabs/.xvpics/yellow_left.jpg b/mscstyle3/images/tabs/.xvpics/yellow_left.jpg deleted file mode 100644 index e596903cd..000000000 --- a/mscstyle3/images/tabs/.xvpics/yellow_left.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:13x22 RGB (595 bytes) -#END_OF_COMMENTS -13 22 255 -suOvrsqsqrnrwNRnvsRsNrvnRQsvnsQvMrRQrrRrrrrrn \ No newline at end of file diff --git a/mscstyle3/images/tabs/.xvpics/yellow_right.jpg b/mscstyle3/images/tabs/.xvpics/yellow_right.jpg deleted file mode 100644 index 9e720b5ed..000000000 --- a/mscstyle3/images/tabs/.xvpics/yellow_right.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:19x22 RGB (749 bytes) -#END_OF_COMMENTS -19 22 255 -MRrsQsRSqwRrsrMsQsrrRMsrvrrRNrrsQsrQRrwQNrNNrwmWrrޒ-RsqsRrrrmRnRrrSqsrMnRNQsrRNQoQsrRrrNMsRrrrMNQoRrr(r.nRrrqJQNrrR*qNrNr*MnRrR*MmNRr)NIrRn)JMNRr)*mNRr)*m.rR)*MnRN)*MNrN)*MNrN \ No newline at end of file diff --git a/mscstyle3/images/theme_by.jpg b/mscstyle3/images/theme_by.jpg old mode 100755 new mode 100644 diff --git a/mscstyle3/images/top_bar/.xvpics/bg.jpg b/mscstyle3/images/top_bar/.xvpics/bg.jpg deleted file mode 100644 index 2c17ca72d..000000000 --- a/mscstyle3/images/top_bar/.xvpics/bg.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:9x32 RGB (434 bytes) -#END_OF_COMMENTS -9 32 255 -rvvrsvwrsvwrvssrrsssrrvuqrrrrrrrrrrrrrrrnrrrrrrrrrmrnrrmsqrrnrrmsqrnrnrqoqnrrrnrmRRnrnrMrnrnqonRmrnnrMrnRmnrNqnNnQnnRmnNrNmrNmNnRmNmNmNNmNmMJmNMJmNIINIMIJMIN)III)IJ(J%(E%)$I%%$ ) %%$%$(!$%$% \ No newline at end of file diff --git a/mscstyle3/images/top_bar/.xvpics/left.jpg b/mscstyle3/images/top_bar/.xvpics/left.jpg deleted file mode 100644 index caa7725db..000000000 --- a/mscstyle3/images/top_bar/.xvpics/left.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:4x32 RGB (491 bytes) -#END_OF_COMMENTS -4 32 255 -rvvswrwsrsrwrsqrrrrrrrrNrrnrrrnrrnrrrnrMrnRmnRnqnRmNnRmNNmNINIII)E)$$%%$$I%$ \ No newline at end of file diff --git a/mscstyle3/images/top_bar/.xvpics/logout.jpg b/mscstyle3/images/top_bar/.xvpics/logout.jpg deleted file mode 100644 index 31019ecb5..000000000 --- a/mscstyle3/images/top_bar/.xvpics/logout.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:84x31 RGB (3074 bytes) -#END_OF_COMMENTS -80 29 255 -rwwsvvvrvwrmwvvvrsswvqND)%rwvrrvrvrrvvrrrw%H%$)nrsrrwrswrwvrvrrvrvrv( %Mnwrrimmrrrsruvvwvwvvvvwvrqrvqґm$mrrinrqrvqrvrsrrqvvrssvrsvrrrѶImIImrrrrqsrrrvswrrrrڻ߶nrrwrrrrrڍInnJMnrrrmrrswsrrvrrrqڷۖnrrrrnrsrriNqnɥmimnmrrrmnrrossssMjqmsvrۑNrrn)Im֒ɤmmqqMvnMmN۷qrۺqrnmNIMIrnq۶MnrrnMۺiimInmqr)MnۖrMmsrIINmNmmnrInmrnֶrneImMղrMqEMrJMnrIMI)mrrm)jMrnrnInr)EMrrnږmŀDnmڶmRr%msMIJMIMJDNnqrIIrnqN)mqnI)mnrnֶڑHeʨdirֶInRm%Mrm)irIHNIEMNINmsrmHNMIINnrNmLDidmmNrqr߷mrmߍrDNMnrMmqnmMINnrMJiqqInmnڶnrmrrqۺIIr%Mnnrr߶mIJIIINnnQJIIͭnmֶ֑NmnRqINmII*qEMNnqNnrMIIIRrmIMn)ImNnQJ)immͥn(JqnNrmI*HJMINIm)IINۺ߷HIJMrnqNInIMIJ(NmJMnI)I)IIMJMMnnQj-jұnqֶבm%MNnqnNMJMInMJm-JIMnMI)InRmnrINMIJMINmnMNIMJMINmINnQnQnJqڶڶ%MnNmrNmNnMnMnNmNMnMnrmnMn$)JMnqNnqNnMNiNMnrMnNmNMnMnNmNnQNmrNImnmImmnmmmMinM)IInRmNnMrnMnNnQnMnNmNnM)I%IMJMnMnRmnNnQnMnNmNrnMnMnRmNnNmrNmNmNII)I)II)II%I)HJ(JIMNmNnMnMNnMnMnNmNmNNmNIMI*mINmNnMNmNrIrMnNmNNmNmNnMnMnNmNMJmNMJMIIJ(NI)III*LJI)i.mJMnMNInMNiNMNmJMMnINMJMiNMJMnMNiNMMjMNMnINMnMJmNMJmNMNiINIMJMIINI)IMJIIM*HNIINIINIMINIMJMIJMINIMJMi.i)MJMi.i-j-i*mINIMJMIMJIMJMINIMJMIN)III*HJ)III)II)IJ(JII)II)IIJ(NE-III)JH*III)III*HJ)MEM)IJ(JII)III*HJ)IME-II*HJI)I%(E)%E(%)E)$I%%I$)E)%(E%)E(%I%)D%)%I$)E)%D)%)E(%I%%H%)E)$)E%)D)%I%(E%)%H%)E)$E)% \ No newline at end of file diff --git a/mscstyle3/images/top_bar/.xvpics/msc_logo.jpg b/mscstyle3/images/top_bar/.xvpics/msc_logo.jpg deleted file mode 100644 index 82ac0fb8d..000000000 --- a/mscstyle3/images/top_bar/.xvpics/msc_logo.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:99x32 RGB (3352 bytes) -#END_OF_COMMENTS -80 25 255 -vRSsrrwvrrrsM2RRswrvvvuvrrrvnrM.2.Rrrrqmvvvvrsrrrrrvsvsqrnm.2.RrrrrqsrsrvvsrvsrsrsvvuvvrnNQNRrrrusvvrsrsrrqrsrrqrrvqrrrnrrrrrmNR..rrqvrrrrrwrrvssvrvsrvrsrrڒrےrnvrrmN.2Rqznrrږsssrrrrnrrsssrrrrrrrmqnږnrrrm.rurrrnmrrrrrrrrrrmNIrmrnږnrrMn.VurnrrmiMrrrmnߎrnrߒֻrrnqMڷmRߑNqsmrrNmZQnrNrnm߷Mm߲Nmr۶IMqNRmrmrnrrnڷֺnMnnqnrrnrqsmvU.nrMrnIqוnrےmrm۶MNޒn֖nrrnގnmNrnQrrnrqnvvuNRsMrImM۶nnrړmr۶MۺMNm۶rrrrMRnnMrmmrrnrqnvvNM..MNMni߶I߲NrJqn۶MnnMnNnߍNMnMqNqnMNrmvvQNi.1NnNڷIוrMrmrNIrIMۖirMm۶mrnvNmqI۶NۑNmnqNnqzvrmMNn-rm۶Nmn۶IrNrmMNHrmnmImmmۻڒNnMnMNmNmNmJMNmINrInMInQrvuNIrmNN NnMNImNmNMjMNmNmNrmNmNnMnINmNmNMnMjMNmMJmNMnMnnQnNmNnmRnMNmJrMnnMNmNuvvMIrNnmN-.nMnMNnqNnMNmnNmRnmNnQnnMnNqNnMnNmNnQnMnNmNmNnnQnNnmRnMnrMnNmNrnMnMvvuNMnMnRmNINnMrNmnNqNnmNrNmnRmNnqNnNmrNmNrmNnNqNnmNrMnnMrNmNnMnQjRmNnMnMnNmNMvvun)mNNmNmNnMNmNmNnMnNmNMrJqNmNnMnNmNmNnMnRiRmNnMnNmNmNnMnNImNMNiNMNiNMNiNMNImvzqNIMJMmJMNmJMNMjMNMiNMNiNMNiNMNiNMNiMNMjMNMJmNMNiNMNiMNMjMINI)MJIMIIJMIIN)IMJHRrH*HJMI*m)INIIMJIMI*MIINIIMJIMI*MIINIIINIIM*IMIJMIIMJIM)JMI%I)I%H*H&H)I%I)I%I)E(%%)I%H*H&H*H%I)I%I)I%I)I%I)H&H*H%I)I%I)I%I)I%I)I$J(J$I)I%I)$%%$%%(%$%%$%EI%$%$%%$%$%%(%%$%$%%$)%DE$%$%)$%%$%%$%(%EE%$%%(%$%%$%%$)%DD%%$ \ No newline at end of file diff --git a/mscstyle3/images/top_bar/.xvpics/right.jpg b/mscstyle3/images/top_bar/.xvpics/right.jpg deleted file mode 100644 index 9c50eabb3..000000000 Binary files a/mscstyle3/images/top_bar/.xvpics/right.jpg and /dev/null differ diff --git a/mscstyle3/images/top_bar/.xvpics/shadow.jpg b/mscstyle3/images/top_bar/.xvpics/shadow.jpg deleted file mode 100644 index 603cdea0a..000000000 --- a/mscstyle3/images/top_bar/.xvpics/shadow.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:8x7 RGB (388 bytes) -#END_OF_COMMENTS -8 7 255 -$)E(E(%H$II%HI%HIDI)IIHIIIhNHiIIImImIiMiMimJmImMmImnLjmM \ No newline at end of file diff --git a/mscstyle3/images/top_bar/.xvpics/shadow_bg.jpg b/mscstyle3/images/top_bar/.xvpics/shadow_bg.jpg deleted file mode 100644 index aedddae14..000000000 --- a/mscstyle3/images/top_bar/.xvpics/shadow_bg.jpg +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:6x64 RGB (715 bytes) -#END_OF_COMMENTS -5 60 255 -$I$)E$II(EIHII%IIIlJImImImImJmmInmmmnMMmnIqimnmMmmniMmmnmmImnmmmmMjpjmmNmmmnmmqmnmmmmnIqimnmnmmnmmmrnqmrqnmmrmmnmmmmmmmrrrrrqrrqqrmr۶I۶I۶II$III$III$III$II \ No newline at end of file diff --git a/mscstyle3/images/top_bar/.xvpics/switch.jpg b/mscstyle3/images/top_bar/.xvpics/switch.jpg deleted file mode 100644 index f7499fb55..000000000 Binary files a/mscstyle3/images/top_bar/.xvpics/switch.jpg and /dev/null differ diff --git a/mscstyle3/images/top_bar/.xvpics/webmin_logo.jpg b/mscstyle3/images/top_bar/.xvpics/webmin_logo.jpg deleted file mode 100644 index d964e494f..000000000 Binary files a/mscstyle3/images/top_bar/.xvpics/webmin_logo.jpg and /dev/null differ diff --git a/mscstyle3/images/top_bar/webmin_logo.jpg b/mscstyle3/images/top_bar/webmin_logo.jpg old mode 100755 new mode 100644 diff --git a/mysql/backup_config.pl b/mysql/backup_config.pl index acb188cde..53d4550af 100755 --- a/mysql/backup_config.pl +++ b/mysql/backup_config.pl @@ -26,6 +26,12 @@ return undef; # Called before the files are restored from a backup sub pre_restore { +if (&is_mysql_running() != -1) { + %oldconfig = %config; + } +else { + %oldconfig = ( ); + } return undef; } @@ -33,6 +39,14 @@ return undef; # Called after the files are restored from a backup sub post_restore { +$authstr = &make_authstr(); +&read_file_cached($module_config_file, \%config); +if (&is_mysql_running() == -1 && %oldconfig) { + # New restored login isn't valid .. put back the old one + $config{'login'} = $oldconfig{'login'}; + $config{'pass'} = $oldconfig{'pass'}; + &save_module_config(); + } if (&is_mysql_running()) { &stop_mysql(); return &start_mysql(); diff --git a/mysql/backup_db.cgi b/mysql/backup_db.cgi index 75e456e44..61f4a737e 100755 --- a/mysql/backup_db.cgi +++ b/mysql/backup_db.cgi @@ -169,13 +169,17 @@ if (!$in{'save'}) { undef, undef, $file); } } + if (-d $file) { + print &text('backup_eisdir', + &html_escape($file)),"
\n"; + next; + } if ($cron && $cmode == 0) { # Run and check before-backup command (for one DB) $bok = &execute_before($db, STDOUT, 1, $file, $in{'all'} ? undef : $db); if (!$bok) { - print "$main::whatfailed : ", - $text{'backup_ebefore'},"
\n"; + print $text{'backup_ebefore'},"
\n"; next; } } @@ -186,8 +190,8 @@ if (!$in{'save'}) { \@compat, \@tables, $access{'buser'}, $in{'single'}, $in{'quick'}); if ($err) { - print "$main::whatfailed : ", - &text('backup_ebackup',"
$err"),"
\n"; + print &text('backup_ebackup', + "
".&html_escape($err).""),"
\n"; } elsif (!$in{'dest'}) { @st = stat($file); diff --git a/mysql/config-solaris-11-ALL b/mysql/config-solaris-11-ALL old mode 100755 new mode 100644 diff --git a/mysql/config.info.pl b/mysql/config.info.pl old mode 100755 new mode 100644 diff --git a/mysql/exec.cgi b/mysql/exec.cgi index 06d7f332e..7092c7137 100755 --- a/mysql/exec.cgi +++ b/mysql/exec.cgi @@ -26,7 +26,7 @@ else { if (@data) { print &ui_columns_start($d->{'titles'}); foreach $r (@data) { - print &ui_columns_row($r); + print &ui_columns_row([ map { &html_escape($_) } @$r ]); } print &ui_columns_end(); } diff --git a/mysql/help/backup_form.it.html b/mysql/help/backup_form.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/backup_form.no.html b/mysql/help/backup_form.no.html old mode 100755 new mode 100644 diff --git a/mysql/help/cnf.ca.html b/mysql/help/cnf.ca.html old mode 100755 new mode 100644 diff --git a/mysql/help/cnf.it.html b/mysql/help/cnf.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/cnf.no.html b/mysql/help/cnf.no.html old mode 100755 new mode 100644 diff --git a/mysql/help/cpriv.it.html b/mysql/help/cpriv.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/cpriv.no.html b/mysql/help/cpriv.no.html old mode 100755 new mode 100644 diff --git a/mysql/help/cprivs.it.html b/mysql/help/cprivs.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/cprivs.no.html b/mysql/help/cprivs.no.html old mode 100755 new mode 100644 diff --git a/mysql/help/create_cpriv.it.html b/mysql/help/create_cpriv.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/create_db.it.html b/mysql/help/create_db.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/create_field.it.html b/mysql/help/create_field.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/create_tpriv.it.html b/mysql/help/create_tpriv.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/create_user.it.html b/mysql/help/create_user.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/csv.it.html b/mysql/help/csv.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/db.it.html b/mysql/help/db.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/dbs.it.html b/mysql/help/dbs.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/edit_cpriv.it.html b/mysql/help/edit_cpriv.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/edit_db.it.html b/mysql/help/edit_db.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/edit_dbase.it.html b/mysql/help/edit_dbase.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/edit_field.it.html b/mysql/help/edit_field.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/edit_table.it.html b/mysql/help/edit_table.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/edit_tpriv.it.html b/mysql/help/edit_tpriv.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/edit_user.it.html b/mysql/help/edit_user.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/exec_form.it.html b/mysql/help/exec_form.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/field.it.html b/mysql/help/field.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/intro.it.html b/mysql/help/intro.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/newdb_form.it.html b/mysql/help/newdb_form.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/procs.ca.html b/mysql/help/procs.ca.html old mode 100755 new mode 100644 diff --git a/mysql/help/procs.it.html b/mysql/help/procs.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/table_form.it.html b/mysql/help/table_form.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/tpriv.it.html b/mysql/help/tpriv.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/tprivs.it.html b/mysql/help/tprivs.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/user.it.html b/mysql/help/user.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/users.it.html b/mysql/help/users.it.html old mode 100755 new mode 100644 diff --git a/mysql/help/vars.ca.html b/mysql/help/vars.ca.html old mode 100755 new mode 100644 diff --git a/mysql/help/vars.it.html b/mysql/help/vars.it.html old mode 100755 new mode 100644 diff --git a/mysql/images/.xvpics/index.gif b/mysql/images/.xvpics/index.gif deleted file mode 100644 index 530cf7c3d..000000000 Binary files a/mysql/images/.xvpics/index.gif and /dev/null differ diff --git a/mysql/images/index.gif b/mysql/images/index.gif old mode 100755 new mode 100644 diff --git a/mysql/images/root.gif b/mysql/images/root.gif old mode 100755 new mode 100644 diff --git a/mysql/images/vars.gif b/mysql/images/vars.gif old mode 100755 new mode 100644 diff --git a/mysql/index.cgi b/mysql/index.cgi index 4bff7fb6a..19222acf9 100755 --- a/mysql/index.cgi +++ b/mysql/index.cgi @@ -71,12 +71,16 @@ if ($r == 0) { &main_header(); print "
$text{'index_notrun'}
\n"; + print &text('index_emsg', "$rout"),"
\n"; + if ($access{'stop'} && &is_mysql_local()) { print &ui_hr(); - print &ui_buttons_start(); - print &ui_buttons_row("start.cgi", - $text{'index_start'}, &text('index_startmsg',"$config{'start_cmd'}")); - print &ui_buttons_end(); + print &ui_buttons_start(); + print &ui_buttons_row("start.cgi", + $text{'index_start'}, + &text('index_startmsg', + "$config{'start_cmd'}")); + print &ui_buttons_end(); } } elsif ($r == -1) { @@ -289,6 +293,9 @@ sub main_header { &ui_print_header(undef, $text{'index_title'}, "", "intro", 1, 1, 0, &help_search_link("mysql", "man", "doc", "google"), - undef, undef, &text('index_version', $mysql_version)); + undef, undef, + $config{'host'} ? + &text('index_version2', $mysql_version, $config{'host'}) : + &text('index_version', $mysql_version)); } diff --git a/mysql/lang/en b/mysql/lang/en index 2bb8e58fe..a2811131a 100644 --- a/mysql/lang/en +++ b/mysql/lang/en @@ -23,6 +23,7 @@ index_db=Database name index_tables=Tables index_elibrary=The MySQL client program $1 could not be run because it could not find the MySQL shared libraries. Check the module configuration and make sure the Path to MySQL shared libraries is set. index_version=MySQL version $1 +index_version2=MySQL version $1 on $2 index_nomod=Warning: The Perl module $1 is not installed on your system, so Webmin will not be able to reliably access your MySQL database. Click here to install it now. index_nomods=Warning: The Perl modules $1 and $2 are not installed on your system, so Webmin will not be able to reliably access your MySQL database. Click here to install them now. index_mysqlver=The command $1 returned : diff --git a/mysql/mysql-lib.pl b/mysql/mysql-lib.pl index 17d1c4596..38936f061 100755 --- a/mysql/mysql-lib.pl +++ b/mysql/mysql-lib.pl @@ -789,7 +789,7 @@ ${$_[0]} = $out if ($_[0]); if ($out =~ /lib\S+\.so/) { return -1; } -elsif ($out =~ /distrib\s+((3|4|5|6|10)\.[0-9\.]*)/i) { +elsif ($out =~ /distrib\s+((3|4|5|6|7|8|9|10)\.[0-9\.]*)/i) { return $1; } else { @@ -979,8 +979,13 @@ local ($db, $file, $user, $pass) = @_; local $authstr = &make_authstr($user, $pass); local $cs = $sql_charset ? "--default-character-set=".quotemeta($sql_charset) : ""; +local $temp = &transname(); +&open_tempfile(TEMP, ">$temp"); +&print_tempfile(TEMP, "source ".$file.";\n"); +&close_tempfile(TEMP); +&set_ownership_permissions(undef, undef, 0644, $temp); local $cmd = "$config{'mysql'} $authstr -t ".quotemeta($db)." ".$cs. - " <".quotemeta($file); + " <".quotemeta($temp); -r $file || return (1, "$file does not exist"); if ($_[4] && $_[4] ne 'root' && $< == 0) { # Restoring as a Unix user diff --git a/net/config.info.pl b/net/config.info.pl old mode 100755 new mode 100644 diff --git a/net/images/.xvpics/ifcs.gif b/net/images/.xvpics/ifcs.gif deleted file mode 100644 index da1c5721f..000000000 Binary files a/net/images/.xvpics/ifcs.gif and /dev/null differ diff --git a/net/lang/de b/net/lang/de index fd63d432b..483e5b8d8 100644 --- a/net/lang/de +++ b/net/lang/de @@ -120,9 +120,9 @@ hosts_ip=IP-Adresse hosts_return=Host-Adressenliste hosts_title=Host-Adressen idelete_err=Fehlgeschlagen IPv6-Host-Adressen zu löschen -ifcs_act=Aktiviere beim Booten? +ifcs_act=Aktiv ifcs_activedesc=Schnittstellen, die in dieser Tabelle aufgelistet sind, sind derzeit auf dem System aktiv. In den meisten Fällen sollten Sie sie unter dem Bei Boot aktiviert Registerkarte bearbeitet werden. -ifcs_add=Eine neue Schnittstelle hinzufügen +ifcs_add=Eine neue Schnittstelle hinzufügen. ifcs_address6=IPv6-Adresse ifcs_addvirt=Virtuelle Schnittstelle hinzufügen ifcs_all=Alle Schnittstellen @@ -132,14 +132,14 @@ ifcs_badd=Füge eine neue Brücke hinzu. ifcs_boot=Schnittstellen, die beim Booten aktiviert werden ifcs_bootdesc=Schnittstellen, die in dieser Tabelle aufgelistet sind, werden aktiviert, wenn das System bootet und wird in der Regel aktiv jetzt auch sein. ifcs_bootp=Von BOOTP -ifcs_broad=Broadcast +ifcs_broad=Broadcast ifcs_desc=Schnittstellenbeschreibung ifcs_dhcp=Von DHCP ifcs_down=Inaktiv ifcs_duplex=, $1 duplex ifcs_ecannot=Sie sind nicht berechtigt, Netzwerkschnittstellen zu bearbeiten ifcs_ecannot_this=Sie sind nicht berechtigt, diese Netzwerkschnittstelle zu bearbeiten -ifcs_ip=IP-Adresse +ifcs_ip=IPv4-Adresse ifcs_ip6=IPv6-Adresse ifcs_link=Netzwerk Link Status ifcs_linkno=Getrennt diff --git a/net/lang/en b/net/lang/en index 4c499c175..1e528cd15 100644 --- a/net/lang/en +++ b/net/lang/en @@ -26,7 +26,7 @@ ifcs_add=Add a new interface. ifcs_radd=Add a new address range. ifcs_badd=Add a new bridge. ifcs_boot=Activated at Boot -ifcs_act=Activate +ifcs_act=Active ifcs_bootp=From BOOTP ifcs_dhcp=From DHCP ifcs_auto6=From IPv6 discovery diff --git a/nis/config.info.pl b/nis/config.info.pl old mode 100755 new mode 100644 diff --git a/old-blue-theme/images/blue.gif b/old-blue-theme/images/blue.gif old mode 100755 new mode 100644 diff --git a/old-blue-theme/images/down.gif b/old-blue-theme/images/down.gif old mode 100755 new mode 100644 diff --git a/old-blue-theme/images/gohome.gif b/old-blue-theme/images/gohome.gif old mode 100755 new mode 100644 diff --git a/old-blue-theme/images/open.gif b/old-blue-theme/images/open.gif old mode 100755 new mode 100644 diff --git a/old-blue-theme/images/purple.gif b/old-blue-theme/images/purple.gif old mode 100755 new mode 100644 diff --git a/old-blue-theme/images/red.gif b/old-blue-theme/images/red.gif old mode 100755 new mode 100644 diff --git a/openslp/images/.xvpics/dacfg.gif b/openslp/images/.xvpics/dacfg.gif deleted file mode 100644 index 2ced7d778..000000000 Binary files a/openslp/images/.xvpics/dacfg.gif and /dev/null differ diff --git a/os_list.txt b/os_list.txt index ac66df0f4..d5460bc3e 100644 --- a/os_list.txt +++ b/os_list.txt @@ -53,6 +53,8 @@ XenServer Linux $1 redhat-linux 13.0 `cat /etc/redhat-release 2>/dev/null` =~ CloudLinux $1 redhat-linux $2+8.0 `cat /etc/redhat-release 2>/dev/null` =~ /CloudLinux.*release\s+(\S+)/ MostlyLinux $1 redhat-linux $2+8.0 `cat /etc/redhat-release 2>/dev/null` =~ /MostlyLinux\s+Linux\s+release\s+(\d+)/ Cloudrouter Linux $1 redhat-linux 15 `cat /etc/cloudrouter-release 2>/dev/null` =~ /CloudRouter\s+release\s+(\d+)\s+/ +Sangoma Linux $1 redhat-linux $2+8.0 `cat /etc/sangoma-release 2>/dev/null` =~ /Sangoma\s+Linux\s+(\S+)/ +Virtuozzo Linux $1 redhat-linux $2+8.0 `cat /etc/vzlinux-release 2>/dev/null` =~ /Virtuozzo\s+Linux\s+release\s+(\S+)/ # Redhat enterprise versions Redhat Enterprise Linux 2.1AS redhat-linux 7.3 `cat /etc/redhat-release 2>/dev/null` =~ /(Advanced\s+Server.*2\.1)|(AS.*2\.1)/i @@ -108,6 +110,10 @@ Ubuntu Linux $1 debian-linux 9.0 $etc_issue =~ /Ubuntu.*\s(16\.[0-9\.]+)\s/i | Ubuntu Linux $1 debian-linux 3.1 $etc_issue =~ /Ubuntu.*\s([0-9\.]+)\s/i Mepis Linux $1 debian-linux $1 $etc_issue =~ /MEPIS/ && `cat /etc/debian_version 2>/dev/null` =~ /([0-9\.]+)/ Mepis Linux $1 debian-linux 4.0 $etc_issue =~ /MEPIS/ && `cat /etc/debian_version 2>/dev/null` =~ /(stable)/ +Devuan Linux $1 debian-linux 8.0 $etc_issue =~ /Devuan/ && `cat /etc/devuan_version 2>/dev/null` =~ /^(jessie)/i +Devuan Linux $1 debian-linux 9.0 $etc_issue =~ /Devuan/ && `cat /etc/devuan_version 2>/dev/null` =~ /^(ascii)/i +Devuan Linux $1 debian-linux 10.0 $etc_issue =~ /Devuan/ && `cat /etc/devuan_version 2>/dev/null` =~ /^(beowulf)/i +Devuan Linux $1 debian-linux 10.0 $etc_issue =~ /Devuan/ && `cat /etc/devuan_version 2>/dev/null` =~ /^(ceres)/i # Linux Mint (Mint should be before Debian to avoid false-positive) Linux Mint 6 debian-linux 5.0 `cat /etc/lsb-release 2>/dev/null | grep DISTRIB_DESCRIPTION` =~ /^DISTRIB_DESCRIPTION="Linux Mint 6 Felicia"/ @@ -324,6 +330,7 @@ Caixa Magica 10.0 suse-linux 9.2 `cat /etc/CxM-release 2>/dev/null` =~ /10\.0/ openmamba Linux $1 openmamba-linux $1 `cat /etc/openmamba-release 2>/dev/null` =~ /openmamba\s+release\s+(\S+)/i # All FreeBSD versions +FreeBSD $1 freebsd $1 `freebsd-version 2>/dev/null` =~ /([0-9]+\.[0-9\.]+)/i FreeBSD $1 freebsd $1 $uname =~ /FreeBSD.*?\s([0-9]+\.[0-9\.]+)/i # FreeBSD clones diff --git a/package-updates/config.info.ca b/package-updates/config.info.ca old mode 100755 new mode 100644 diff --git a/package-updates/images/.xvpics/icon.gif b/package-updates/images/.xvpics/icon.gif deleted file mode 100644 index 8935a8ca7..000000000 Binary files a/package-updates/images/.xvpics/icon.gif and /dev/null differ diff --git a/package-updates/lang/ca b/package-updates/lang/ca old mode 100755 new mode 100644 diff --git a/package-updates/update.cgi b/package-updates/update.cgi index 822556b07..0596f834d 100755 --- a/package-updates/update.cgi +++ b/package-updates/update.cgi @@ -3,8 +3,19 @@ require './package-updates-lib.pl'; &ReadParse(); -$redir = "index.cgi?mode=".&urlize($in{'mode'}). - "&search=".&urlize($in{'search'}); +if ($in{'redir'}) { + $redir = $in{'redir'}; + $redirdesc = $in{'redirdesc'}; + } +elsif ($in{'redirdesc'}) { + $redir = "javascript:history.back()"; + $redirdesc = $in{'redirdesc'}; + } +else { + $redir = "index.cgi?mode=".&urlize($in{'mode'}). + "&search=".&urlize($in{'search'}); + $redirdesc = $text{'index_return'}; + } if ($in{'refresh'}) { &ui_print_unbuffered_header(undef, $text{'refresh_title'}, ""); @@ -21,7 +32,7 @@ if ($in{'refresh'}) { print &text('refresh_done3', scalar(@avail)),"
\n";
&webmin_log("refresh");
- &ui_print_footer($redir, $text{'index_return'});
+ &ui_print_footer($redir, $redirdesc);
}
else {
# Upgrade some packages
@@ -153,5 +164,5 @@ else {
{ 'got' => \@got });
}
- &ui_print_footer($redir, $text{'index_return'});
+ &ui_print_footer($redir, $redirdesc);
}
diff --git a/pam/config.info.pl b/pam/config.info.pl
old mode 100755
new mode 100644
diff --git a/pap/config.info.pl b/pap/config.info.pl
old mode 100755
new mode 100644
diff --git a/pap/help/intro.nl.html b/pap/help/intro.nl.html
old mode 100755
new mode 100644
diff --git a/passwd/config.info.el b/passwd/config.info.el
old mode 100755
new mode 100644
diff --git a/passwd/config.info.pl b/passwd/config.info.pl
old mode 100755
new mode 100644
diff --git a/passwd/images/.xvpics/icon.gif b/passwd/images/.xvpics/icon.gif
deleted file mode 100644
index 3f0cfa1fc..000000000
Binary files a/passwd/images/.xvpics/icon.gif and /dev/null differ
diff --git a/passwd/lang/af b/passwd/lang/af
old mode 100755
new mode 100644
diff --git a/passwd/lang/el b/passwd/lang/el
old mode 100755
new mode 100644
diff --git a/passwd/lang/fa b/passwd/lang/fa
old mode 100755
new mode 100644
diff --git a/phpini/config-solaris-11-ALL b/phpini/config-solaris-11-ALL
old mode 100755
new mode 100644
diff --git a/phpini/config.info.ca b/phpini/config.info.ca
old mode 100755
new mode 100644
diff --git a/phpini/help/misc_timezone.ca.html b/phpini/help/misc_timezone.ca.html
old mode 100755
new mode 100644
diff --git a/phpini/help/misc_timezone.nl.html b/phpini/help/misc_timezone.nl.html
old mode 100755
new mode 100644
diff --git a/phpini/help/misc_timezone.pl.html b/phpini/help/misc_timezone.pl.html
old mode 100755
new mode 100644
diff --git a/phpini/images/.xvpics/icon.gif b/phpini/images/.xvpics/icon.gif
deleted file mode 100644
index 928d23901..000000000
Binary files a/phpini/images/.xvpics/icon.gif and /dev/null differ
diff --git a/phpini/images/.xvpics/vars.gif b/phpini/images/.xvpics/vars.gif
deleted file mode 100644
index 8cff0658e..000000000
Binary files a/phpini/images/.xvpics/vars.gif and /dev/null differ
diff --git a/phpini/images/misc.gif b/phpini/images/misc.gif
old mode 100755
new mode 100644
diff --git a/phpini/lang/ca b/phpini/lang/ca
old mode 100755
new mode 100644
index 6e5d3264f..3eba4d512
--- a/phpini/lang/ca
+++ b/phpini/lang/ca
@@ -21,6 +21,8 @@ manual_edata=No has introdu
list_title=Gesti de la Configuraci de PHP
list_ecannot=No tens perms per gestionar aquest fitxer de configuraci de PHP
list_return=a la configuraci de PHP
+list_format_ini=Format INI
+list_format_fpm=Format FPM
vars_title=Variables de PHP
vars_header=Creaci de variables de PHP i opcions de cometes
diff --git a/postfix/config.info.pl b/postfix/config.info.pl
old mode 100755
new mode 100644
diff --git a/postfix/help/alias_cmt.ca.html b/postfix/help/alias_cmt.ca.html
old mode 100755
new mode 100644
diff --git a/postfix/help/bcc.ca.html b/postfix/help/bcc.ca.html
old mode 100755
new mode 100644
diff --git a/postfix/help/dependent.ca.html b/postfix/help/dependent.ca.html
old mode 100755
new mode 100644
diff --git a/postfix/help/master.ca.html b/postfix/help/master.ca.html
old mode 100755
new mode 100644
diff --git a/postfix/help/opt_body_checks.ca.html b/postfix/help/opt_body_checks.ca.html
old mode 100755
new mode 100644
diff --git a/postfix/help/opt_content_filter.ca.html b/postfix/help/opt_content_filter.ca.html
old mode 100755
new mode 100644
diff --git a/postfix/help/opt_header_checks.ca.html b/postfix/help/opt_header_checks.ca.html
old mode 100755
new mode 100644
diff --git a/postfix/help/opt_mailbox_size_limit.ca.html b/postfix/help/opt_mailbox_size_limit.ca.html
old mode 100755
new mode 100644
diff --git a/postfix/help/opt_relay_recipient_maps.ca.html b/postfix/help/opt_relay_recipient_maps.ca.html
old mode 100755
new mode 100644
diff --git a/postfix/help/opt_virtual_alias_domains.ca.html b/postfix/help/opt_virtual_alias_domains.ca.html
old mode 100755
new mode 100644
diff --git a/postfix/help/opt_virtual_alias_maps.ca.html b/postfix/help/opt_virtual_alias_maps.ca.html
old mode 100755
new mode 100644
diff --git a/postfix/help/relay_recipient_maps.ca.html b/postfix/help/relay_recipient_maps.ca.html
old mode 100755
new mode 100644
diff --git a/postfix/images/.xvpics/body.gif b/postfix/images/.xvpics/body.gif
deleted file mode 100644
index 9cc3ff393..000000000
Binary files a/postfix/images/.xvpics/body.gif and /dev/null differ
diff --git a/postfix/images/.xvpics/boxes.gif b/postfix/images/.xvpics/boxes.gif
deleted file mode 100644
index e05b809c3..000000000
--- a/postfix/images/.xvpics/boxes.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:48x48 RGB (289 bytes)
-#END_OF_COMMENTS
-48 48 255
-ۓ۷۷ۓڷ۷ۓڷ۷ۓۓړۓnnnnnn۶J۷YY9]YyUomn] \XX9jnIJڷ%] PNڷ] XtXyj\ \ 9k\ 9j\ 9j]]}]}]ZJKonJJonnonnnnonoKonnoJnnۓn۶۷Jn۷ے۶۷nonJn۷nJonJonJKnۓnnoۓJJnoJKJKnnonnnonnKJonnonnonnonnonnoJKnnonnonnonnnonJJnonnonnonnonnonnKJonnonnonnonnonnoJ۷
\ No newline at end of file
diff --git a/postfix/images/.xvpics/header.gif b/postfix/images/.xvpics/header.gif
deleted file mode 100644
index b01a8b4ff..000000000
Binary files a/postfix/images/.xvpics/header.gif and /dev/null differ
diff --git a/postfix/images/.xvpics/mailq.gif b/postfix/images/.xvpics/mailq.gif
deleted file mode 100644
index 5d885cad8..000000000
--- a/postfix/images/.xvpics/mailq.gif
+++ /dev/null
@@ -1,6 +0,0 @@
-P7 332
-#IMGINFO:48x48 RGB (356 bytes)
-#END_OF_COMMENTS
-48 48 255
-I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶I$I$II۶%H%I۶ڷ۶n]}]$IEHֻD)ID۶nn۶nn8]Y$I)Iֶֻ(EI)۶۷nڶ%HIIڶI$II۶۷mn~|^\kڶH%IIڷ%H%II$I۷mZ}n)Dۺ$II)ֶֻI$I۷ڷHI%IڷI$I۷۶%HI%۶ڶI$I۷۷۶۶۶ڷ$IH)ڶ۶۷ $I)Iֶֻ$II)۶۷B D)IIֻDI)I۶۷ʩ=HE)Iڷ%HE)۶۷$۶$I%HI$I۷mے]]}E(IEۺI$I۷۶nnJnۺ
$text{'index_clear'} ".
@@ -53,14 +53,14 @@ if ($sfile) {
"
$text{'index_range'} ".
&gen_range_input());
print " \n";
+ print &ui_buttons_end();
}
if ($odir && -d $odir) {
+ print &ui_buttons_start();
print &ui_buttons_row(-r "$odir/index.html" ? "view.cgi/index.html"
: "view.cgi/",
$text{'index_view'},
&text('index_viewdesc', "$odir"));
- }
-if ($sfile || $odir && -r "$odir/index.html") {
print &ui_buttons_end();
}
diff --git a/sendmail/config-generic-linux b/sendmail/config-generic-linux
old mode 100755
new mode 100644
diff --git a/sendmail/config-gentoo-linux b/sendmail/config-gentoo-linux
old mode 100755
new mode 100644
diff --git a/sendmail/config-slackware-linux-8.0 b/sendmail/config-slackware-linux-8.0
old mode 100755
new mode 100644
diff --git a/sendmail/config-slackware-linux-8.1-ALL b/sendmail/config-slackware-linux-8.1-ALL
old mode 100755
new mode 100644
diff --git a/sendmail/config-solaris-10-ALL b/sendmail/config-solaris-10-ALL
old mode 100755
new mode 100644
diff --git a/sendmail/config.info.pl b/sendmail/config.info.pl
old mode 100755
new mode 100644
diff --git a/sendmail/help/alias_cmt.ca.html b/sendmail/help/alias_cmt.ca.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/alias_cmt.nl.html b/sendmail/help/alias_cmt.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/alias_enabled.nl.html b/sendmail/help/alias_enabled.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/alias_file.ca.html b/sendmail/help/alias_file.ca.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/alias_file.nl.html b/sendmail/help/alias_file.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/alias_name.nl.html b/sendmail/help/alias_name.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/alias_to.nl.html b/sendmail/help/alias_to.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/aliases.nl.html b/sendmail/help/aliases.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/edit_alias.nl.html b/sendmail/help/edit_alias.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/intro.nl.html b/sendmail/help/intro.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_BadRcptThrottle.nl.html b/sendmail/help/opt_BadRcptThrottle.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_ConnectionRateThrottle.nl.html b/sendmail/help/opt_ConnectionRateThrottle.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_DH.nl.html b/sendmail/help/opt_DH.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_DR.nl.html b/sendmail/help/opt_DR.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_DS.nl.html b/sendmail/help/opt_DS.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_DaemonPortOptions.nl.html b/sendmail/help/opt_DaemonPortOptions.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_DontBlameSendmail.nl.html b/sendmail/help/opt_DontBlameSendmail.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_ForwardPath.nl.html b/sendmail/help/opt_ForwardPath.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_LogLevel.nl.html b/sendmail/help/opt_LogLevel.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_MatchGECOS.nl.html b/sendmail/help/opt_MatchGECOS.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_MaxDaemonChildren.nl.html b/sendmail/help/opt_MaxDaemonChildren.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_MaxHopCount.nl.html b/sendmail/help/opt_MaxHopCount.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_MaxMessageSize.nl.html b/sendmail/help/opt_MaxMessageSize.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_MaxQueueRunSize.nl.html b/sendmail/help/opt_MaxQueueRunSize.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_MaxRecipientsPerMessage.ca.html b/sendmail/help/opt_MaxRecipientsPerMessage.ca.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_MinFreeBlocks.nl.html b/sendmail/help/opt_MinFreeBlocks.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_MinQueueAge.nl.html b/sendmail/help/opt_MinQueueAge.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_PostMasterCopy.nl.html b/sendmail/help/opt_PostMasterCopy.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_QueueDirectory.nl.html b/sendmail/help/opt_QueueDirectory.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_QueueLA.nl.html b/sendmail/help/opt_QueueLA.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_RefuseLA.nl.html b/sendmail/help/opt_RefuseLA.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_SendMimeErrors.nl.html b/sendmail/help/opt_SendMimeErrors.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_Timeout.nl.html b/sendmail/help/opt_Timeout.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_dmode.nl.html b/sendmail/help/opt_dmode.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_qso.ca.html b/sendmail/help/opt_qso.ca.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/opt_qso.nl.html b/sendmail/help/opt_qso.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/help/units.nl.html b/sendmail/help/units.nl.html
old mode 100755
new mode 100644
diff --git a/sendmail/images/.xvpics/features.gif b/sendmail/images/.xvpics/features.gif
deleted file mode 100644
index 4f20d3cf7..000000000
Binary files a/sendmail/images/.xvpics/features.gif and /dev/null differ
diff --git a/sendmail/images/.xvpics/p1.gif b/sendmail/images/.xvpics/p1.gif
deleted file mode 100644
index 3445bccf1..000000000
--- a/sendmail/images/.xvpics/p1.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:6x11 Indexed (55 bytes)
-#END_OF_COMMENTS
-6 11 255
-I$`I$`I$`I$`۶`)۶`)۶`)۶`)I$II۶I$II۶I$`
\ No newline at end of file
diff --git a/sendmail/images/.xvpics/p2.gif b/sendmail/images/.xvpics/p2.gif
deleted file mode 100644
index 2c8ef9fa8..000000000
--- a/sendmail/images/.xvpics/p2.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:6x11 Indexed (55 bytes)
-#END_OF_COMMENTS
-6 11 255
-I$࠻I$࠻I$࠻I$۶)۶I۶I۶)I$II۶I$II۶I$࠻
\ No newline at end of file
diff --git a/sentry/help/hostsentry.nl.html b/sentry/help/hostsentry.nl.html
old mode 100755
new mode 100644
diff --git a/sentry/help/intro.nl.html b/sentry/help/intro.nl.html
old mode 100755
new mode 100644
diff --git a/sentry/help/logcheck.nl.html b/sentry/help/logcheck.nl.html
old mode 100755
new mode 100644
diff --git a/sentry/help/portsentry.nl.html b/sentry/help/portsentry.nl.html
old mode 100755
new mode 100644
diff --git a/sentry/images/.xvpics/hostsentry.gif b/sentry/images/.xvpics/hostsentry.gif
deleted file mode 100644
index 2a384b785..000000000
--- a/sentry/images/.xvpics/hostsentry.gif
+++ /dev/null
@@ -1,6 +0,0 @@
-P7 332
-#IMGINFO:48x48 RGB (1991 bytes)
-#END_OF_COMMENTS
-48 48 255
-mInmmmےڒmInmmmےےڒۑڒmInmmm۶ڒۑqqnrnmInmmm۶ۑڒڒڷnvmInmmm۶ۑךnNrnMsmInmmmےrnNNrHmInmmmڒ.O.R/N2/N/R.O2NI$InlJm۵ڷ../N2O.N3.N/R.On$nmmIn۶NR/.N2/N/N2N/NRڶ$%mmnڒۑڶ۶/R./N.S.N/.NMnm$JmHNRNO-O2.O.Nm$nImSnR.N/.N2mڷ۶ڷڒnmmڒڷn3.N./Nmnmmnmnmmڒ./R./NnmmnlnImnڶڶN/R.O.ۑڶInmmڶڒ.3.Hnmڷ.2OInlڶۑۑ..Nڶ۶ڷڒmmJڒڷ۶۶ڒ/N2ےڒnmۑrN.ۑmnڶڷ۵SNۑڒmڶۑ۶N*ގۑےڒmڶ۵۶nQM۵ڶmnڶڒڶsMlۑڒڒڷmnڶےڒۑONMۑڷmnڶڒےORmmmےrs-זۑmInۑ+.M/N-Inlڒڷ/MN*-JۑnMi3nqJrrڷ۶ڷڒORnMmirڲۑֻR/IORNוnmMֶN3NrO2nsINmֶ/.NۖOqn/RO..O2NNۑn3.N*.rrn.NN2ON.3N./rOrNRn3N.N.n۶.N..OR/.N/.r./R./N./RIۑM/N3N/.N/Qזn3.N./N2OM۶ے.N/R/.N/-ےr/..R/.Nn-O.N/2N/-ےN3N..O.r۱ەە+.R/.NNN../NMrەNN..O.R*S..rޒڻO.R.M/N.rq߲q
-)Nֻ۶m)nmڶrrmqו۶rNNIrNMqnqNmnqs
\ No newline at end of file
diff --git a/sentry/images/.xvpics/icon.gif b/sentry/images/.xvpics/icon.gif
deleted file mode 100644
index e280afe41..000000000
--- a/sentry/images/.xvpics/icon.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:48x48 Indexed (1094 bytes)
-#END_OF_COMMENTS
-48 48 255
-۱ֶیی֍۱ڍډۈیёֲ։֍ډղֲ۰ֱڍڈڲё։֍ֶڱۭՍ۱߭ڲҵ
\ No newline at end of file
diff --git a/sentry/images/.xvpics/logcheck.gif b/sentry/images/.xvpics/logcheck.gif
deleted file mode 100644
index 61ea29f23..000000000
Binary files a/sentry/images/.xvpics/logcheck.gif and /dev/null differ
diff --git a/sentry/images/.xvpics/portsentry.gif b/sentry/images/.xvpics/portsentry.gif
deleted file mode 100644
index 361bbd67c..000000000
Binary files a/sentry/images/.xvpics/portsentry.gif and /dev/null differ
diff --git a/servers/config.info.pl b/servers/config.info.pl
old mode 100755
new mode 100644
diff --git a/servers/images/.xvpics/asianux.gif b/servers/images/.xvpics/asianux.gif
deleted file mode 100644
index a1f68d526..000000000
Binary files a/servers/images/.xvpics/asianux.gif and /dev/null differ
diff --git a/servers/images/.xvpics/cobalt.gif b/servers/images/.xvpics/cobalt.gif
deleted file mode 100644
index 8543a3329..000000000
Binary files a/servers/images/.xvpics/cobalt.gif and /dev/null differ
diff --git a/servers/images/.xvpics/fedora.gif b/servers/images/.xvpics/fedora.gif
deleted file mode 100644
index 7f4c9375e..000000000
Binary files a/servers/images/.xvpics/fedora.gif and /dev/null differ
diff --git a/servers/images/.xvpics/irix.gif b/servers/images/.xvpics/irix.gif
deleted file mode 100644
index 082771a66..000000000
--- a/servers/images/.xvpics/irix.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:48x48 RGB (3148 bytes)
-#END_OF_COMMENTS
-48 48 255
-nnڒڶHJlۑ۵%IImۑڷڶmIIIIHJmmےmIIHJHn۶۶۶ImIIIImn۵nۑ۶Il%IIImImnHٷڶIIIHnmnHIInڶڒ۶ڒHIIm$IIHJHnmڒڒImۑnHIIIImm۶ۑnHJHIIm۶ڷmڒmmIIHJHmnnےJے۶mmIIIImImmnm۶mmnڒnHJHIImImnnmnڷڒmm%ImmڒI$m%mImmnڒmڶm$IImn۶mIIHIImn۶ڒڷnHIIImImnHIIIڶۑے۶mII$nHnۑnnmInۑڶ۶ImIIIInn۶ڶڷ۶ڷmJHIImmnmn۶ړٷڶmIHIIInmIl&mImmn۶ڶ۵H&HmInlJHڷImۑ۶ۑڷڷnHIImImJlnmmڒۑ۶ےڒnHIIImڶmڒmnmڶ۶ڷmۑnlJlnۑHڒmInڷ۶۶۶nImmnmInImJlnm۶۶۶۶nmm۶ڷڷnmmIHJm۶ڶڷڷmmnڷmmIImm۶ڷڶmnڶmmI۶ڶڶڶڒۑmn۶ڒ۵ڶڶ۶ڒnڑJ۶۶۶۶ڷڶImmmڶڶڶڒmIImHJmڒڷڶڒImIIImm۶۶۶ڶ۶mmIIImIImmnl۶۶ڶ۶mInۑHnHJmmڶ۶Iڶmn$mIImۑ۶ڶڒڷnmIHIIIڒ۶۶ڷmm%HJlnۑ۶ڷ۶IIImmmڷڒ۵I$IڶڷڒHJڶ۶ڷڶJڷ۶۶ڒٷ۶ڷڶڒ۶ڶڶڷ۶ڷ
\ No newline at end of file
diff --git a/servers/images/.xvpics/redflag.gif b/servers/images/.xvpics/redflag.gif
deleted file mode 100644
index 45f49bd4c..000000000
Binary files a/servers/images/.xvpics/redflag.gif and /dev/null differ
diff --git a/servers/images/.xvpics/slackware.gif b/servers/images/.xvpics/slackware.gif
deleted file mode 100644
index 8c2558c76..000000000
Binary files a/servers/images/.xvpics/slackware.gif and /dev/null differ
diff --git a/servers/images/.xvpics/turbo.gif b/servers/images/.xvpics/turbo.gif
deleted file mode 100644
index d9f9b0e6e..000000000
--- a/servers/images/.xvpics/turbo.gif
+++ /dev/null
@@ -1,14 +0,0 @@
-P7 332
-#IMGINFO:48x48 Indexed (1473 bytes)
-#END_OF_COMMENTS
-48 48 255
-{v[wv{v{WzwzwwZwzw{v[vw{v{V{wzwv{Wzwzw{Vwzw{v[v{{Vw{v{v[wv{v[vw{v[v{wv{V{wv{V{v{wV{v{wV{v{wzWv{v{Vwv{VwwZwv{Vwv{Vw{Vwv{Vwv{VwzWwv{VwzwVwzwWv{VwzWv{VwvWvWvwZwvWvWvwV{vWvWvwVwzWvWvwVwV{vWvvWvWv{WvWvvWvWvWvWvWvvWvWvWvSzR{R{r[rWvVwVwVwVwvVwVwVwWvVsVWvWvRwVWvVwRwVvWVsVwVvWRwVvWvSVvWvWrWVvWvSvWvRWvRWvSVvWRvWRvWrWVvSVvSVvSVwVRwVrWVvSVwRVwRVwWRvSVVsVRwRVSvVSVrWRvVSVrWRVwRVsVRWvRWRvSVVsVRwRWRRvSVRWrVRWRvRSvRVsVRVSVrSVRVsVRWRvRSVRwRVRWRvRWRVRs6rRWRRVSRvRwRVRSVRrWRRVRSVRrWRVRSVRRwRRVRWRRRWQSRVSr2vRSRvvRSRVRSQWRRSVRr2wRRRVSRRRWRRSVRRRSR2r6SQSRRRWߗRRVSQSRRRWRRRRSRRVRSQS2r6RS1s2RRRSRRRRR7MWNrSRRV.VOUOVNVRSRR2RRSQSRR2SQSRRR.VOQSRRR2RR2RRSQS2RRRRRS-WNRRRRS1R2OQSR2RNRR2RSMS2RRr2RNR2RRRO1SRRRN2RRRS-2NRS1OQS2NRR2NRR2OQS.R2RNR2RNS1SMS2RNR2RN2NRR.SQ/QS.RR.Rwۺ..RRN2RN2RN2RN3QO2NR.RR.R.RR.RR.w1O1OQ3M3MS2NR.RR.2N2NR.R.RN2N2N2NvsvrRs.R.R.R.RR.R.RN2N2.R.R.R.R.RN2N2N2N.R.R-vrN2N2N2N2N2N2N2NR.R.R.R.N2N.R-S-O1N2N.R.Rr..Q/M3M2N.R.N2N2N.R..R.N2.N1O-R.N2.N2N.R.M3.2N.Q/M2N.2N.R.N2N-3.R..N2M/-R.N2N..R.2N.v.N.2N.Q/-N2N.R..N2M/..R.M/1N..N2.N-S-.ڗrN2M/-N2.N.R.-O-2N..R..N2-O-.N2.N-/M2.N...N.1O-.N.2N.-O-2N...N-3M...N.-O1.N..Nv)R...N.-O1.N..N-/-R..N-..R..M/-.N..-N2.-/M..N.-/Q*2.N-.N.....M...N.-.N...M..2Jv.-.N...M/-.R*1/M.....-O-..N-...N.-.N..-/1N..M/-..N-/-N..-.N...-N..*Q+-..N-..N.-...*Rw)N...M....M...N-*2..-N*2*-/M...-N..*-N.2)R*..-N...-O-*2*-N...-..-*N..-..N.)...N-...*.N.)2*.N-....I....-N..*..)..N.-..*-N...-*.N.-.r..*-.N.-/-*.M....)..N...)..N-.*..-N.*-...N)..
.N*-...-J...-.*N-.....*-...M*...-*..M.*..-..N)..-*N..-*..-.J..-.*.-.*-...M*..-.*.-N.*.-...) O-*.-...I...-*..-O)...*-...)..N)...-*...-*N.-.N..M*..-*..-.*.N-.*.-..*-..*-..J-..*-..*-..N).. N.*-..*-..J
N.*-..*-.*-..*-..*-..J
N.*-...)..N
-.)NN)...)...-*..-*..)...)..*-..*MN*-.*.-.*.-s-*.-.*.M
-N.-*..-*.-.*.)...)..*-..*MN*-.*.-.*.-.*-.*N
N*.-.*.-.*.-*...)..*-.*.-.*.M
-N.-*..)..*-..)..J
N*.-.*.-*..)....)..*-.*.-.*-.*.-.*.-*..)..M
-NI..*-..)..*-.*.-..)..*-.*.-.*-.*.-.*.-*..)..M
-NI..*-..)..*-.*.-..)..*-.*.-*.-*..)..*-.*.-*.M
-NI...)..)..*-.*.-*.)..*-.*.-*.-*..)..*-.*.-*.M
-NI...)..)..*-.*.-*.)..*-.*.-*.-*..)..*-.*.-*.M
-NI...)..)..*-.*.-*.)..*-.*.-*.-*..)..*-.*.-*.M
-NI...)..)..*-.*.-*
\ No newline at end of file
diff --git a/servers/images/.xvpics/ubuntu.gif b/servers/images/.xvpics/ubuntu.gif
deleted file mode 100644
index 524b1eb56..000000000
--- a/servers/images/.xvpics/ubuntu.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:48x48 Indexed (1552 bytes)
-#END_OF_COMMENTS
-48 48 255
-I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII$IH%۶ڷI$II۶IH%I۶%HI%۶ڶ%HIIڶ%HI$I۶I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HDڶI$II۶IH%I۶%HI%۶ڶ%DDֶ۶I$II۶%H%I۶ڶ%ȷ(EII۶I$II۶%H%I۶%HI)۶I$II۶%H%I۶(EIH۶I$II۶%H%I%HE)I$II۶IH%I۶$)$IڷI$II۶IH%I۶ED$IIڷI$II۶IH%I$ۺH$۶I$II۶IH%Iַڶ۶I$II۶$I)ֶ%HI(EH۶I$II۶%H%۶ڷ$IHI%I(۶I$II۶)DI۶$I(E۶%H۶I$II۶H%IIڷ(I%IڷI(I$II۶I$ֺD)HEۺ$I(II$II۶I$ۺ$I(I(EH)۶ڶI$II۶I)%%HIIڶE(II۶I$I(E(EֺD)HIDI(I۶۶H)EH۶DI)D۶$II%HIE۶E(II%H)$ID)۶ڷ$IHEֺ$IHIH%IH%HE)۶ڶ%IHEڶ$IHIH%HII$%HI۶D)DI۶$I(EۺI%I%IHڷD)IH۶HE)H۶I$$I۶$I$I۶$IH%۶I$%I(IE(II۶)D)I۶ɻ۶(ID)۶ֻ$IHEֺD)(۶I$II$IHIֶH%HI۶$$۶I$II$E)Iڷֺ$IE)ڷڶ%I۶I$II۶$IH۶$I%Iڷ)DI$II۶IH%$II((EI$II۶IH%D)IֶֻI$II۶IH%IζֻI$II۶IH%I$۶)ڷ۶I$II۶%%(%I%HE)۶I$II۶%H۶$$IIDֻ$IIH۶I$II۶%H%$II%۶I$II۶%H%I۶D)EII$II۶IH%I۶%HI%$۶I$II۶IH%I۶%HI%%ڷI$II۶IH%I۶%HI%۶)EֺI$II۶IH%I۶%HI%۶ڶ%HIIڶ%%۶۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIID)IH۶I$II۶%H%I۶ڶ%HI%۶ڶ%HII(EHI۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶ$I)I۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶֺHE)H
\ No newline at end of file
diff --git a/servers/lang/eu b/servers/lang/eu
old mode 100755
new mode 100644
diff --git a/setup.sh b/setup.sh
index 9f0975ad8..49ad84368 100755
--- a/setup.sh
+++ b/setup.sh
@@ -76,6 +76,7 @@ PERLLIB=$wadir
if [ "$perllib" != "" ]; then
PERLLIB="$PERLLIB:$perllib"
fi
+export PERLLIB
# Validate source directory
allmods=`cd "$srcdir"; echo */module.info | sed -e 's/\/module.info//g'`
diff --git a/shorewall/config.info.ca b/shorewall/config.info.ca
old mode 100755
new mode 100644
diff --git a/shorewall/config.info.es b/shorewall/config.info.es
old mode 100755
new mode 100644
diff --git a/shorewall/images/.xvpics/hosts.gif b/shorewall/images/.xvpics/hosts.gif
deleted file mode 100644
index c5b2fa368..000000000
Binary files a/shorewall/images/.xvpics/hosts.gif and /dev/null differ
diff --git a/shorewall/images/.xvpics/nat.gif b/shorewall/images/.xvpics/nat.gif
deleted file mode 100644
index 31f6bfe47..000000000
--- a/shorewall/images/.xvpics/nat.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:48x48 Indexed (1481 bytes)
-#END_OF_COMMENTS
-48 48 255
-I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶I$II۶IH%I۶%HI۶$II%ڷڶ%HIIڶ%HII۶I$II۶IH%I۶%HI%۶ڷڒ۶۶$IIHڷH%IH۶I$II۶IH%I۶%H%ڷڶHڷ$II$۶۶$IIHڷ۶I$II۶%H%I۶mI$I۶$IIIڷH%IIڷ$I%I۶I$II۶%H%I۶ڶ%H%ڷH%IIڷ$I%Iڷڶ$II%۶I$II۶%H%I۶ڻ{{߶ֻ$IHEֺ$IHID)IH۶I$II۶%H%Iۛ{W[[7$II)ڷֶ(EII$IEII$II۶IH%IڷHW{wZW7D۶HI$I۶$IH%۶ڷI$II۶IH%I۶HSS6272D۶E(EI۶%H)EۺֶI$II۶IH%I۶%w.D۶H%IIڷ$I%IڷI$II۶IH%I۶%HwrWVrD)$IDI۶D)HE۶۶I$II۶%H%I۶ڶ%$I۶ڑ$IH%۶ڷ$IIH۶I$II۶%H%I۶ڷ$%ڶ%HIIڶI$II۶%H%I۶I$II۶%H%I۶$I۶$IH%۶ڷ$IHIڷ$IIH۶$IIII$II۶IH%۶%HIIڶI$II۶%H%I$II$۶۶I$II۶IH%ڶ%HII۶I$II۶%H%I۶$IIHڷI$II۶IH%ڶ%HII۶I$II۶%H%I۶$IIHڷI$II۶$ڶ%HIIڶI$II۶ڷ$I۶$IIIڷ۶I$IIۺ$۶H%IH۶$I%H۶$Iַ$IH)۶I$I[w[WֻID)I۶%HE)7W7zW߶$I)E۶I$I7;W{3$I%Iڷڶ$IIW;67ֻ$II$۶I$I2v337R߶)DI)۶ֺ%HEW672%HI)I$II۶2
1%(I۶ַ(EH)ֶS(EIڷI$II۶VSR6w%HI%۶ڶ%HIIڶ231Rw$IH۶I$II۶IH%۶$II۶I$II۶$I$I$I%۶I$II۶IH%$IIֻH%IIڷ%H%I$IIֻ۶I$II۶$I%H۶۶$II$۶۶$IIHڷ$I$۶۶$IIH۶I$II۶$I$I۶$II$۶۶$IIHڷH%H۶۶$II$۶I$Iֻںڶ(EHI۶H)DIڷ$I)E۶I$qE(EI۶%H)Em$IH%I$II۶ڶڶH%H۶۶$II$۶۶۶l%ڷI$II۶ڶI$II۶ڒ%IH۷H%IIڷڒH%Iڷֶm$۶I$II۶ڶIH%I۶ېH%Iڷֺ$II%ڷڶ$II۶q(I$II۶ڶI$II۶ڒ%IH۶H%IH۷ڒH%Iڷڶm$۶۶I$۶I$ڶ%HIIڶE(II۶$IID(E)I۶I$۶m۶$II$۶۶$II۵m$II۶IrmmmmmDI(I(Eߵqqqqn$I(۶q(EIH۶D)ֶq)H%I$II$ڶI$II۶ڶI$II۵۶ֺב$II۶)DII۶ѻںֶ$۶I$II$I%Iڷֺ$II%ڷڑ(EHֻI$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶۶I$Iڷڶ$I۶$IIIڷH%IIڷڷڷڶ$IHI۶I$Iڷ$I۶H%IIڷ$I%Iڷڶڶڶ$II%۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶI$II۶HI$I۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶI$II۶HI$I
\ No newline at end of file
diff --git a/shorewall/images/.xvpics/policy.gif b/shorewall/images/.xvpics/policy.gif
deleted file mode 100644
index 75a766e7c..000000000
--- a/shorewall/images/.xvpics/policy.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:48x48 Indexed (372 bytes)
-#END_OF_COMMENTS
-48 48 255
-I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶Iڷڷڷ۶$۶۶$IIHڷH%IH۶HI%H۶$II$۶۶Iڷ۶H%IIڷHI%Iڷ$II%ڷڶ$III۶IImmnmmImnmڷ۶۶$۶$II$۶۶%HI۶۶$IH۷mmmIn۶H%Iڶ%I۶۶$IIH۷$I%I۶$IH۷ڶI$Inmm%۶ڷH%I۶ڶH%HI۶ڷ$II$۶$IH۷ڶI$I۶IڷڷH$۶۶H%II۶ڶ%HI%۶$IH۷ڶI$I۶ڷJ۶H%ڷڶI$II۶ڷ$IH%I$II۶ڶH%I۶%HI۶ۑm%I%$IH%۶ڷ$I%۶ڶI$II۶ڶH%I۶%HHڷnH$۶$I%ڷڶ%H%۶ڷI$II۶ڶ%$$$I۶ڒm%$۶$IH%۶ڷ$I%۶ڶI$Iڷڶ$ڶڶ۶ڷڶۑn%Hڷ$I%ڷ$Iڶ۶I$II۶%H%I۶ڶ%HIےIڷH%HI۶$I$I۶ڷ$IH%۶I$II۶%H%I۶ڶ%HIےIڷH%HI۶$I$I۶ڷ$IH%۶I$II۶%H%I۶ڶ%HIےIڷH%HI۶$I$I۶ڷ$IH%۶I$II۶%H%I۶ڶ%HIےIڷH%HI۶$I$I۶ڷ$IH%I$II۶IH%I۶%HI%۶ڷmI%ڷڶ$III۶$IIIڷI$II۶IH%I۶%HI%lJmmmnIڷڶ$II%۶$III۶I$II۶IH%I۶%HI%lڶIڷڶ$II%۶$III۶I$II۶IH%I۶ڷH%HIImmmJmm۶%H%I۶%HI%۶ڶ۶I$II۶%H%Im۶ڶmn$IIڷH%IIڷ$I%I۶I$II۶%H%Im$۶mn$IIڷ$I%Iڷ$II%۶ڷڶI$ڶ%HI۶۶$ڶ۶$Iڶ$II$ڷڷH%۶$$%I$IڷH%$۶$I$ڷ$IIڶ۶$$I$$۶$$I۶$IIHڷ$I$۶۶%H%H$I۶I$$۶$I$۶$IIHڷ$I$۶۶%H%H$I۶I$$۶ڶ%$۶$IH%۶I۶$IH۶۶$H%Iڷڶ۶۶ڷH۶$I۶۶ڶ۶ڶ%ڷڷ$Iڶ۶۶I$II۶%H%I۶ڶ%lJmmm$II$ڷ$IIH۶H%II۶I$II۶%H%I۶ڶ%ڶڷ$II$ڷ$IIH۶H%II۶I$II۶%H%I۶ڶ%lJmmm$II$ڷ$IIH۶H%II۶I$II۶%H%I۶ڶ%ڶڷ$II$ڷ$IIH۶H%III$II۶IH%I۶%HI%۶ڷmI%ڷڶ$III۶$IIIڷI$II۶IH%I۶%HI%۶ڷmI%ڷڶ$III۶$IIIڷI$II۶IH%I۶%HI%۶ڷmI%ڷڶ$III۶$IIIڷI$II۶IڷH۶H۶۶ڶڒIH۶$I%H۶۶$II$ڷ۶I$Iڶ$II%۶%H%Iۑn$I%Iڷڶ$II%۶$IH۶I$Iڶ$II%$IHےI$IHI۶H%HI۶$$I۶ڷH۶۶ڷڶI%$IHڒm$ڷڷڶ$Iڷڶ%$%۶%$۶$$I۶ڶ%HI۶m$Iڶ۶H$I۶$$%I$ڶ$IHڷ%HI۶ڷ$ۑ$IHڷ۶۶ڷI$$ڷ$I$۶۶%H%Hۑ$I$۶ڷ$I%ڶI$$۶$I$۶H$۷ڶ%%$I$ڶ$I۶ڷI$Iڷ۶ڷڶ۶$ڶڶ%mڶ۶ڶ%$۶۶۶I$II۶%H%I۶ڶ%HI%۶ڶ%Hnm۶ڶڷڶI۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIImJmmmI۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶIImnmmmInmm$۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶI$II۶HI$I
\ No newline at end of file
diff --git a/shorewall/images/.xvpics/routestopped.gif b/shorewall/images/.xvpics/routestopped.gif
deleted file mode 100644
index 8ae701aff..000000000
--- a/shorewall/images/.xvpics/routestopped.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:48x48 Indexed (1939 bytes)
-#END_OF_COMMENTS
-48 48 255
-I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶I$II۶IH%I۶$I%ڷڶ$III۶۶I$II۶%Hġ(EI(ַ(IEH۶I$II۶%%HIIֶI$II۶I$II۶I$I۶ֻ$IH%۶I$II۶D)ֶֻ$IIII$II۶IHġĠ߶D)IHI$II۶IĠ%HE)۶ֺI$II۶ġ%H%۶ڷI$II۶Ġ$I۶I$(IDI۶IĠŠŠ%HI%۶ĠE(I۶ŠҺ$IDI$IIͩ͠ĠĠɤֶI$IҠɠI$IIҶI$IġҶֶ۶Ġֶ%$I۶E$I۶E$I۶ID)I$II$II͠ѠҠ۶I$IIΠI$IIŠ۶۶D%H۶ʠֶ͠$%H۶ŤE$I۶ġ(EI$IIΠI$IIĠ۶I$II۶ŠI$II۶Ġڶ۶I$II߲(EH)۶I$IIɠĠ$IE(۶I$II۶ġڶ%HII۶I$II۶۵$۶۶$IIHI$II۶IH%I$IIHI$II۶IH%I۶ŤĥġŤۖڻ$II)ֶֻI$II۶IH%I۶ڻەڻֶ)HEIֶI$II۶IH%I۶ڷH$۶ڶ%HI%۶ڷ۶I$II۶%H%I%$%HII۶I$II۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶI$II۶HI$I۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶI$II۶HI$I۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶI$II۶HI$I
\ No newline at end of file
diff --git a/shorewall/images/.xvpics/tunnels.gif b/shorewall/images/.xvpics/tunnels.gif
deleted file mode 100644
index db6ec294d..000000000
Binary files a/shorewall/images/.xvpics/tunnels.gif and /dev/null differ
diff --git a/shorewall/images/.xvpics/zones.gif b/shorewall/images/.xvpics/zones.gif
deleted file mode 100644
index 4c4316256..000000000
--- a/shorewall/images/.xvpics/zones.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:48x48 Indexed (1631 bytes)
-#END_OF_COMMENTS
-48 48 255
-I$II۶IH%I۶%HI%۶%ֻI$II۶I$II۶IH%I۶%۶$۶H%IH۶I$II۶IH%I۶$I%IڷI$II۶IH%I۶۶۶$IIHڷ۶I$II۶%H%Iڷ%HI%۶ڶ%HII۶I$II۶%H%$II۶I$II۶I$II۶%Hڷ۶ڷ$IIIڷH%II۶I$II۶%H۶ڶnmnmmH%I۶%HI%I$II۶IH%I۶ےnmnۑ$I$I۶ڷI$II۶IH%I۶ڷ۶ڷ۶$I(E۶ڷI$II۶IH%Iڷ۶$III۶I$II۶IH%Iڷ$I%H۶۶۶I$II۶%H%ڷ$I%H۶۶$II%۶I$II۶%H%۵J۶%H%I۶ڷ$IH%۶I$II۶%H%I۶ڶlJ%ڷ$I%Iڷڶ$II%۶I$II۶%H%I۶ڶ%Hmn$۶HI$I۶$IH%I$II۶IH%I۶%HI%۶ln$I۶ڶ%HI%۶ڷ$IHIڶI$II۶IH%I۶%HI۶ڶڶ$IHIڶ$IHI۶I$II۶IH%I۶%ۑ$IHIڶ$IHI۶I$II۶IH%I۶ڒ$I$I۶ڷ$IH%۶ڷ۶I$II۶%H%Iۑ۶ڒڶ$III۶%HII۶I$II۶%H%Iڒ$۶ڷ$IH%۶ڷ$IHI۶I$II۶%H%I۶ڶڒH%۶ڶ%HIIڶ$IHI۶I$II۶%H%I۶ڶ%HImےH%۶ڶ%HIIڶ%HIII$II۶IH%I۶%HI%l$I۶IH%I۶%HI%۶ڶI$II۶IH%I۶%۶mI$۶۶$IIHڷ(EIH۶I$II۶IH%I۶n)D)۶ֻ$IHEֺI$II۶IH%I۶ۑrr%HIֶ(EHI۶۶I$II۶%HJhrnwۻֶ$II)(EII۶I$II۶%H%$E)IHjMnw$I)Iֻ(EI)۶I$II۶%HmnHI%HEIIDnmInr۶E(EI۶%H)E۶I$II۶%H%I۶mIIIIinhIֺ$IHIڶH%HII$II۶IH%I۶%HIImmnmin)D)I۶)HE)۶ֻI$II۶IH%I۶$mm$ID)IIֻHE)IڷI$II۶IH%I۶n۶m(M۶)DII۶E(EI۶I$II۶IH%I۶I$۶m$I$I%H۶$II$۶۶۶I$II۶%۶H)E۶mD$)D۶۶$II(۶I$II۶ڷڶ%Hnmn۶%H۶D)EH۶I$II۶۶ڶ%HIn۶m$I۶ڶ%HI%۶I$II۶ڷ(EIE۶$IֶI$III$II۶IH۶$IIڷI۶۶%HII۶I$II۶I%HIڶۑֻ$IH%ֻI$II۶۶ےڶ$I%۶ۑ۶$I$I۶ڷI$II۶ڷڶ۶$III۶۶nڷڶ$III۶۶I$Iڷ%۶ۑ$I$۶$II$۶۶$IIH۶I$II۶%H%I۶۵$IH%۶ڷ$IHIڷ$IIH۶I$II۶%H%I۶ڶ%H%I۶%HI%۶ڶ%HII۶I$II۶%H%IڶH%HI۶$I%H۶۶$II$
\ No newline at end of file
diff --git a/shorewall/images/params.gif b/shorewall/images/params.gif
old mode 100755
new mode 100644
diff --git a/shorewall/lang/ca b/shorewall/lang/ca
old mode 100755
new mode 100644
diff --git a/shorewall6/config.info.ca b/shorewall6/config.info.ca
old mode 100755
new mode 100644
diff --git a/shorewall6/config.info.es b/shorewall6/config.info.es
old mode 100755
new mode 100644
diff --git a/shorewall6/images/.xvpics/hosts.gif b/shorewall6/images/.xvpics/hosts.gif
deleted file mode 100644
index c5b2fa368..000000000
Binary files a/shorewall6/images/.xvpics/hosts.gif and /dev/null differ
diff --git a/shorewall6/images/.xvpics/nat.gif b/shorewall6/images/.xvpics/nat.gif
deleted file mode 100644
index 31f6bfe47..000000000
--- a/shorewall6/images/.xvpics/nat.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:48x48 Indexed (1481 bytes)
-#END_OF_COMMENTS
-48 48 255
-I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶I$II۶IH%I۶%HI۶$II%ڷڶ%HIIڶ%HII۶I$II۶IH%I۶%HI%۶ڷڒ۶۶$IIHڷH%IH۶I$II۶IH%I۶%H%ڷڶHڷ$II$۶۶$IIHڷ۶I$II۶%H%I۶mI$I۶$IIIڷH%IIڷ$I%I۶I$II۶%H%I۶ڶ%H%ڷH%IIڷ$I%Iڷڶ$II%۶I$II۶%H%I۶ڻ{{߶ֻ$IHEֺ$IHID)IH۶I$II۶%H%Iۛ{W[[7$II)ڷֶ(EII$IEII$II۶IH%IڷHW{wZW7D۶HI$I۶$IH%۶ڷI$II۶IH%I۶HSS6272D۶E(EI۶%H)EۺֶI$II۶IH%I۶%w.D۶H%IIڷ$I%IڷI$II۶IH%I۶%HwrWVrD)$IDI۶D)HE۶۶I$II۶%H%I۶ڶ%$I۶ڑ$IH%۶ڷ$IIH۶I$II۶%H%I۶ڷ$%ڶ%HIIڶI$II۶%H%I۶I$II۶%H%I۶$I۶$IH%۶ڷ$IHIڷ$IIH۶$IIII$II۶IH%۶%HIIڶI$II۶%H%I$II$۶۶I$II۶IH%ڶ%HII۶I$II۶%H%I۶$IIHڷI$II۶IH%ڶ%HII۶I$II۶%H%I۶$IIHڷI$II۶$ڶ%HIIڶI$II۶ڷ$I۶$IIIڷ۶I$IIۺ$۶H%IH۶$I%H۶$Iַ$IH)۶I$I[w[WֻID)I۶%HE)7W7zW߶$I)E۶I$I7;W{3$I%Iڷڶ$IIW;67ֻ$II$۶I$I2v337R߶)DI)۶ֺ%HEW672%HI)I$II۶2
1%(I۶ַ(EH)ֶS(EIڷI$II۶VSR6w%HI%۶ڶ%HIIڶ231Rw$IH۶I$II۶IH%۶$II۶I$II۶$I$I$I%۶I$II۶IH%$IIֻH%IIڷ%H%I$IIֻ۶I$II۶$I%H۶۶$II$۶۶$IIHڷ$I$۶۶$IIH۶I$II۶$I$I۶$II$۶۶$IIHڷH%H۶۶$II$۶I$Iֻںڶ(EHI۶H)DIڷ$I)E۶I$qE(EI۶%H)Em$IH%I$II۶ڶڶH%H۶۶$II$۶۶۶l%ڷI$II۶ڶI$II۶ڒ%IH۷H%IIڷڒH%Iڷֶm$۶I$II۶ڶIH%I۶ېH%Iڷֺ$II%ڷڶ$II۶q(I$II۶ڶI$II۶ڒ%IH۶H%IH۷ڒH%Iڷڶm$۶۶I$۶I$ڶ%HIIڶE(II۶$IID(E)I۶I$۶m۶$II$۶۶$II۵m$II۶IrmmmmmDI(I(Eߵqqqqn$I(۶q(EIH۶D)ֶq)H%I$II$ڶI$II۶ڶI$II۵۶ֺב$II۶)DII۶ѻںֶ$۶I$II$I%Iڷֺ$II%ڷڑ(EHֻI$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶۶I$Iڷڶ$I۶$IIIڷH%IIڷڷڷڶ$IHI۶I$Iڷ$I۶H%IIڷ$I%Iڷڶڶڶ$II%۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶI$II۶HI$I۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶI$II۶HI$I
\ No newline at end of file
diff --git a/shorewall6/images/.xvpics/policy.gif b/shorewall6/images/.xvpics/policy.gif
deleted file mode 100644
index 75a766e7c..000000000
--- a/shorewall6/images/.xvpics/policy.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:48x48 Indexed (372 bytes)
-#END_OF_COMMENTS
-48 48 255
-I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶Iڷڷڷ۶$۶۶$IIHڷH%IH۶HI%H۶$II$۶۶Iڷ۶H%IIڷHI%Iڷ$II%ڷڶ$III۶IImmnmmImnmڷ۶۶$۶$II$۶۶%HI۶۶$IH۷mmmIn۶H%Iڶ%I۶۶$IIH۷$I%I۶$IH۷ڶI$Inmm%۶ڷH%I۶ڶH%HI۶ڷ$II$۶$IH۷ڶI$I۶IڷڷH$۶۶H%II۶ڶ%HI%۶$IH۷ڶI$I۶ڷJ۶H%ڷڶI$II۶ڷ$IH%I$II۶ڶH%I۶%HI۶ۑm%I%$IH%۶ڷ$I%۶ڶI$II۶ڶH%I۶%HHڷnH$۶$I%ڷڶ%H%۶ڷI$II۶ڶ%$$$I۶ڒm%$۶$IH%۶ڷ$I%۶ڶI$Iڷڶ$ڶڶ۶ڷڶۑn%Hڷ$I%ڷ$Iڶ۶I$II۶%H%I۶ڶ%HIےIڷH%HI۶$I$I۶ڷ$IH%۶I$II۶%H%I۶ڶ%HIےIڷH%HI۶$I$I۶ڷ$IH%۶I$II۶%H%I۶ڶ%HIےIڷH%HI۶$I$I۶ڷ$IH%۶I$II۶%H%I۶ڶ%HIےIڷH%HI۶$I$I۶ڷ$IH%I$II۶IH%I۶%HI%۶ڷmI%ڷڶ$III۶$IIIڷI$II۶IH%I۶%HI%lJmmmnIڷڶ$II%۶$III۶I$II۶IH%I۶%HI%lڶIڷڶ$II%۶$III۶I$II۶IH%I۶ڷH%HIImmmJmm۶%H%I۶%HI%۶ڶ۶I$II۶%H%Im۶ڶmn$IIڷH%IIڷ$I%I۶I$II۶%H%Im$۶mn$IIڷ$I%Iڷ$II%۶ڷڶI$ڶ%HI۶۶$ڶ۶$Iڶ$II$ڷڷH%۶$$%I$IڷH%$۶$I$ڷ$IIڶ۶$$I$$۶$$I۶$IIHڷ$I$۶۶%H%H$I۶I$$۶$I$۶$IIHڷ$I$۶۶%H%H$I۶I$$۶ڶ%$۶$IH%۶I۶$IH۶۶$H%Iڷڶ۶۶ڷH۶$I۶۶ڶ۶ڶ%ڷڷ$Iڶ۶۶I$II۶%H%I۶ڶ%lJmmm$II$ڷ$IIH۶H%II۶I$II۶%H%I۶ڶ%ڶڷ$II$ڷ$IIH۶H%II۶I$II۶%H%I۶ڶ%lJmmm$II$ڷ$IIH۶H%II۶I$II۶%H%I۶ڶ%ڶڷ$II$ڷ$IIH۶H%III$II۶IH%I۶%HI%۶ڷmI%ڷڶ$III۶$IIIڷI$II۶IH%I۶%HI%۶ڷmI%ڷڶ$III۶$IIIڷI$II۶IH%I۶%HI%۶ڷmI%ڷڶ$III۶$IIIڷI$II۶IڷH۶H۶۶ڶڒIH۶$I%H۶۶$II$ڷ۶I$Iڶ$II%۶%H%Iۑn$I%Iڷڶ$II%۶$IH۶I$Iڶ$II%$IHےI$IHI۶H%HI۶$$I۶ڷH۶۶ڷڶI%$IHڒm$ڷڷڶ$Iڷڶ%$%۶%$۶$$I۶ڶ%HI۶m$Iڶ۶H$I۶$$%I$ڶ$IHڷ%HI۶ڷ$ۑ$IHڷ۶۶ڷI$$ڷ$I$۶۶%H%Hۑ$I$۶ڷ$I%ڶI$$۶$I$۶H$۷ڶ%%$I$ڶ$I۶ڷI$Iڷ۶ڷڶ۶$ڶڶ%mڶ۶ڶ%$۶۶۶I$II۶%H%I۶ڶ%HI%۶ڶ%Hnm۶ڶڷڶI۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIImJmmmI۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶIImnmmmInmm$۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶI$II۶HI$I
\ No newline at end of file
diff --git a/shorewall6/images/.xvpics/routestopped.gif b/shorewall6/images/.xvpics/routestopped.gif
deleted file mode 100644
index 8ae701aff..000000000
--- a/shorewall6/images/.xvpics/routestopped.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:48x48 Indexed (1939 bytes)
-#END_OF_COMMENTS
-48 48 255
-I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶I$II۶IH%I۶%HI%۶ڶ%HIIڶ%HII۶I$II۶I$II۶IH%I۶$I%ڷڶ$III۶۶I$II۶%Hġ(EI(ַ(IEH۶I$II۶%%HIIֶI$II۶I$II۶I$I۶ֻ$IH%۶I$II۶D)ֶֻ$IIII$II۶IHġĠ߶D)IHI$II۶IĠ%HE)۶ֺI$II۶ġ%H%۶ڷI$II۶Ġ$I۶I$(IDI۶IĠŠŠ%HI%۶ĠE(I۶ŠҺ$IDI$IIͩ͠ĠĠɤֶI$IҠɠI$IIҶI$IġҶֶ۶Ġֶ%$I۶E$I۶E$I۶ID)I$II$II͠ѠҠ۶I$IIΠI$IIŠ۶۶D%H۶ʠֶ͠$%H۶ŤE$I۶ġ(EI$IIΠI$IIĠ۶I$II۶ŠI$II۶Ġڶ۶I$II߲(EH)۶I$IIɠĠ$IE(۶I$II۶ġڶ%HII۶I$II۶۵$۶۶$IIHI$II۶IH%I$IIHI$II۶IH%I۶ŤĥġŤۖڻ$II)ֶֻI$II۶IH%I۶ڻەڻֶ)HEIֶI$II۶IH%I۶ڷH$۶ڶ%HI%۶ڷ۶I$II۶%H%I%$%HII۶I$II۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶI$II۶HI$I۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶI$II۶HI$I۶I$II۶%H%I۶ڶ%HI%۶ڶ%HIIڶI$II۶HI$I
\ No newline at end of file
diff --git a/shorewall6/images/.xvpics/tunnels.gif b/shorewall6/images/.xvpics/tunnels.gif
deleted file mode 100644
index db6ec294d..000000000
Binary files a/shorewall6/images/.xvpics/tunnels.gif and /dev/null differ
diff --git a/shorewall6/images/.xvpics/zones.gif b/shorewall6/images/.xvpics/zones.gif
deleted file mode 100644
index 4c4316256..000000000
--- a/shorewall6/images/.xvpics/zones.gif
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:48x48 Indexed (1631 bytes)
-#END_OF_COMMENTS
-48 48 255
-I$II۶IH%I۶%HI%۶%ֻI$II۶I$II۶IH%I۶%۶$۶H%IH۶I$II۶IH%I۶$I%IڷI$II۶IH%I۶۶۶$IIHڷ۶I$II۶%H%Iڷ%HI%۶ڶ%HII۶I$II۶%H%$II۶I$II۶I$II۶%Hڷ۶ڷ$IIIڷH%II۶I$II۶%H۶ڶnmnmmH%I۶%HI%I$II۶IH%I۶ےnmnۑ$I$I۶ڷI$II۶IH%I۶ڷ۶ڷ۶$I(E۶ڷI$II۶IH%Iڷ۶$III۶I$II۶IH%Iڷ$I%H۶۶۶I$II۶%H%ڷ$I%H۶۶$II%۶I$II۶%H%۵J۶%H%I۶ڷ$IH%۶I$II۶%H%I۶ڶlJ%ڷ$I%Iڷڶ$II%۶I$II۶%H%I۶ڶ%Hmn$۶HI$I۶$IH%I$II۶IH%I۶%HI%۶ln$I۶ڶ%HI%۶ڷ$IHIڶI$II۶IH%I۶%HI۶ڶڶ$IHIڶ$IHI۶I$II۶IH%I۶%ۑ$IHIڶ$IHI۶I$II۶IH%I۶ڒ$I$I۶ڷ$IH%۶ڷ۶I$II۶%H%Iۑ۶ڒڶ$III۶%HII۶I$II۶%H%Iڒ$۶ڷ$IH%۶ڷ$IHI۶I$II۶%H%I۶ڶڒH%۶ڶ%HIIڶ$IHI۶I$II۶%H%I۶ڶ%HImےH%۶ڶ%HIIڶ%HIII$II۶IH%I۶%HI%l$I۶IH%I۶%HI%۶ڶI$II۶IH%I۶%۶mI$۶۶$IIHڷ(EIH۶I$II۶IH%I۶n)D)۶ֻ$IHEֺI$II۶IH%I۶ۑrr%HIֶ(EHI۶۶I$II۶%HJhrnwۻֶ$II)(EII۶I$II۶%H%$E)IHjMnw$I)Iֻ(EI)۶I$II۶%HmnHI%HEIIDnmInr۶E(EI۶%H)E۶I$II۶%H%I۶mIIIIinhIֺ$IHIڶH%HII$II۶IH%I۶%HIImmnmin)D)I۶)HE)۶ֻI$II۶IH%I۶$mm$ID)IIֻHE)IڷI$II۶IH%I۶n۶m(M۶)DII۶E(EI۶I$II۶IH%I۶I$۶m$I$I%H۶$II$۶۶۶I$II۶%۶H)E۶mD$)D۶۶$II(۶I$II۶ڷڶ%Hnmn۶%H۶D)EH۶I$II۶۶ڶ%HIn۶m$I۶ڶ%HI%۶I$II۶ڷ(EIE۶$IֶI$III$II۶IH۶$IIڷI۶۶%HII۶I$II۶I%HIڶۑֻ$IH%ֻI$II۶۶ےڶ$I%۶ۑ۶$I$I۶ڷI$II۶ڷڶ۶$III۶۶nڷڶ$III۶۶I$Iڷ%۶ۑ$I$۶$II$۶۶$IIH۶I$II۶%H%I۶۵$IH%۶ڷ$IHIڷ$IIH۶I$II۶%H%I۶ڶ%H%I۶%HI%۶ڶ%HII۶I$II۶%H%IڶH%HI۶$I%H۶۶$II$
\ No newline at end of file
diff --git a/shorewall6/images/params.gif b/shorewall6/images/params.gif
old mode 100755
new mode 100644
diff --git a/shorewall6/lang/ca b/shorewall6/lang/ca
old mode 100755
new mode 100644
diff --git a/smart-status/images/.xvpics/icon.gif b/smart-status/images/.xvpics/icon.gif
deleted file mode 100644
index 5517a4f1e..000000000
Binary files a/smart-status/images/.xvpics/icon.gif and /dev/null differ
diff --git a/software/apt-lib.pl b/software/apt-lib.pl
index 2193df0f4..ecb662610 100755
--- a/software/apt-lib.pl
+++ b/software/apt-lib.pl
@@ -136,6 +136,7 @@ return $name eq "dhcpd" && $gconfig{'os_version'} >= 7 ?
$name eq "openldap" ? "slapd" :
$name eq "ldap" ? "libnss-ldap libpam-ldap" :
$name eq "dovecot" ? "dovecot-common dovecot-imapd dovecot-pop3d" :
+ $name eq "virtualmin-modules" ? "webmin-.*" :
$name;
}
diff --git a/software/config.info.pl b/software/config.info.pl
old mode 100755
new mode 100644
diff --git a/software/help/delete.no.html b/software/help/delete.no.html
old mode 100755
new mode 100644
diff --git a/software/help/edit_pack.de.html b/software/help/edit_pack.de.html
old mode 100755
new mode 100644
diff --git a/software/help/root.de.html b/software/help/root.de.html
old mode 100755
new mode 100644
diff --git a/software/help/search.de.html b/software/help/search.de.html
old mode 100755
new mode 100644
diff --git a/software/yum-lib.pl b/software/yum-lib.pl
index fc6cb4b82..ccb5c79ce 100755
--- a/software/yum-lib.pl
+++ b/software/yum-lib.pl
@@ -221,6 +221,7 @@ return $name eq "apache" ? "httpd mod_.*" :
$name eq "postgresql" ? "postgresql postgresql-libs postgresql-server" :
$name eq "openldap" ? "openldap-servers openldap-clients" :
$name eq "ldap" ? "nss-pam-ldapd pam_ldap nss_ldap" :
+ $name eq "virtualmin-modules" ? "wbm-.*" :
$name;
}
@@ -286,7 +287,7 @@ while(
(With optional descriptions),9,50,4,\t
+reverse=Log display order,1,1-Newest lines at top,0-Newest lines at bottom
line2=System configuration,11
syslog_conf=Path to syslog config file,0
m4_conf=Syslog config is processed though m4?,1,1-Yes,0-No
diff --git a/syslog/config.info.de b/syslog/config.info.de
index f11009410..c60bb94df 100644
--- a/syslog/config.info.de
+++ b/syslog/config.info.de
@@ -4,6 +4,7 @@ refresh=Logdateiansicht wird nach X Sekunden aktualisiert,3,Niemals
compressed=Bezieht komprimierte Logs in Suche ein?,1,1-Ja,0-Nein
others=Zeige Logs von anderen Modulen?,1,1-Ja,0-Nein
extras=Andere Logdateien zum Anzeigen
(Mit optionaler Beschreibung),9,50,4,\t
+reverse=Log-Display-Reihenfolge,1,1-Neueste Zeilen oben,0-Neueste Zeilen unten
line2=Systemkonfiguration,11
syslog_conf=Pfad zur Syslog-Konfigurationsdatei,0
m4_conf=Syslog-Konfiguration wird durch m4 verarbeitet?,1,1-Ja,0-Nein
diff --git a/syslog/config.info.el b/syslog/config.info.el
old mode 100755
new mode 100644
diff --git a/syslog/config.info.pl b/syslog/config.info.pl
old mode 100755
new mode 100644
diff --git a/syslog/lang/el b/syslog/lang/el
old mode 100755
new mode 100644
diff --git a/syslog/save_log.cgi b/syslog/save_log.cgi
index 3ed8ba838..30dd941c3 100755
--- a/syslog/save_log.cgi
+++ b/syslog/save_log.cgi
@@ -95,6 +95,9 @@ elsif ($in{'view'}) {
@cats = ( "cat ".quotemeta($file) );
}
$cat = "(".join(" ; ", @cats).")";
+ if ($config{'reverse'}) {
+ $tailcmd .= " | tac";
+ }
$got = &proc::safe_process_exec(
"$cat | grep -i -a $filter | $tailcmd",
0, 0, STDOUT, undef, 1, 0, undef, 1);
@@ -131,6 +134,9 @@ elsif ($in{'view'}) {
# Just run tail on the file
$fullcmd = $tailcmd." ".quotemeta($file);
}
+ if ($config{'reverse'}) {
+ $fullcmd .= " | tac";
+ }
if ($fullcmd) {
$got = &proc::safe_process_exec(
$fullcmd, 0, 0, STDOUT, undef, 1, 0, undef, 1);
diff --git a/system-status/enable-collection.pl b/system-status/enable-collection.pl
index 90d5e2a9d..8224b5d2e 100755
--- a/system-status/enable-collection.pl
+++ b/system-status/enable-collection.pl
@@ -4,7 +4,7 @@
use strict;
use warnings;
our (%config);
-require 'system-status-lib.pl';
+require './system-status-lib.pl';
my $zero = @ARGV ? $ARGV[0] : '';
$zero eq 'none' || $zero =~ /^[1-9][0-9]*$/ && $zero <= 60 ||
die "usage: enable-collection.pl none|\n
\n";
}
=head2 ui_buttons_row(script, button-label, description, [hiddens], [after-submit], [before-submit])
@@ -1483,13 +1483,12 @@ if (ref($hiddens)) {
}
return "";
+return " \n";
}
=head2 ui_buttons_end
@@ -1453,7 +1453,7 @@ Returns HTML for the end of a block started by ui_buttons_start.
sub ui_buttons_end
{
return &theme_ui_buttons_end(@_) if (defined(&theme_ui_buttons_end));
-return "
\n";
+return "
';
+ openerobj.innerHTML = '';
}
else {
divobj.className = 'opener_shown';
- openerobj.innerHTML = '
';
+ openerobj.innerHTML = '';
}
}
diff --git a/updown/images/.xvpics/icon.gif b/updown/images/.xvpics/icon.gif
deleted file mode 100644
index ebbd7f198..000000000
Binary files a/updown/images/.xvpics/icon.gif and /dev/null differ
diff --git a/updown/lang/ca b/updown/lang/ca
old mode 100755
new mode 100644
diff --git a/updown/lang/es b/updown/lang/es
old mode 100755
new mode 100644
diff --git a/updown/lang/it b/updown/lang/it
old mode 100755
new mode 100644
diff --git a/user_chooser.cgi b/user_chooser.cgi
index 8db4d3cc4..bd3c5d354 100755
--- a/user_chooser.cgi
+++ b/user_chooser.cgi
@@ -19,7 +19,7 @@ if ($in{'multi'}) {
# base frame
&PrintHeader();
print "