Revert "Fix to use reload over restart when possible"

This reverts commit c41c8119e3.
Fix styling
2022-06-25 15:50:16 +03:00 · 2022-06-23 23:46:34 +03:00 · 2022-06-23 12:38:31 +03:00 · 2022-06-23 01:55:47 +03:00 · 2022-06-23 01:15:43 +03:00 · 2022-06-22 22:10:40 +03:00
1156 changed files with 12509 additions and 2782 deletions
@@ -1,239 +0,0 @@
---- Changes since 1.140 ----
-Fixed a security hole that allowed any user to view the configuration of any module, even those that they should not have access to.
-Fixed a security hole that could allow an attacker to lock valid users by sending a bogus username or password.
---- Changes since 1.150 ----
-Updated the setup.sh script to use MD5 password encryption by default, on systems where Perl supports it.
-Fixed a security hole in the maketemp.pl script, used to create the /tmp/.webmin directory at install time. If an un-trusted user creates this directory before Webmin is installed, he could create in it a symbolic link pointing to a critical file on the system, which would be overwritten when Webmin writes to the link filename (CVE bug CAN-2004-0559).
-When PAM is used for Unix authentication, expired passwords are now detected and the user is prompted to select a new password (if this feature is enabled on the Webmin Configuration module).
-Make all functions in ui-lib.pl themable, allowing themes to have more detailed control over modules that make use of this library.
-Updated all modules to call ui_print_header instead of calling header and printing <hr>, so that themes can avoid the <hr>. Also updated the MSC theme to do this.
---- Changes since 1.160 ----
-Added support for Solaris 10.
-Included several additional translations for various languages and modules.
-Added support for config- files that allow a range of OS version numbers, and used this to reduce the number of standard config files.
---- Changes since 1.170 ----
-When installing a module from the command line, by it will be granted to the same users who receive new modules when Webmin is upgraded. By default, this is root and admin.
-Added basic support for multiple root directories, so that Webmin modules can be separated into core and third-party on the filesystem.
-When installing or upgrading Webmin, password timeouts are now enabled by default. This protects against brute-force password guessing attacks.
---- Changes since 1.180 ----
-All subheadings have been reduced in size when using the default MSC theme.
-All modules now use a new API for writing to configuration files, which ensures that the file does not get written to or truncated if the system is out of disk space.
---- Changes since 1.200 ----
-On Solaris systems that support RBAC, available modules and access rights can now be derived from RBAC for selected users. This can be enabled on a per-user or per-module basic in the Webmin Users module.
---- Changes since 1.210 ----
-Added a new Global ACL control option to limit a user to read-only mode. This does not yet support all modules, but in those that are supported any changes the user makes will simply not take effect.
-Restarting of Webmin is now much faster in some modules that do not need a full configuration reload, due to the addition of a function that justs tells miniserv.pl to re-read its config file.
---- Changes since 1.220 ----
-Added basic support for running Webmin on Windows system with ActiveState Perl installed. The new setup.pl install script must be used, as the setup.sh shell script cannot run on Windows.
-Fixed a bug that could allow a remote attack if the option to use full PAM conversations is enabled.
-Improved the Webmin RPM to not lose the /etc/webmin directory when upgrading from an RPM by another vendor (like Mandrake or DAG).
---- Changes since 1.230 ----
-Replaced all calls to the crypt() function with new code that will use the Crypt::UnixCrypt Perl modules on systems for with crypt() is broken.
---- Changes since 1.240 ----
-Fixed a possible security hole caused by a bug in Perl.
---- Changes since 1.260 ----
-Proxy settings made in the Webmin Configuration module are passed on to programs Webmin calls via the http_proxy and ftp_proxy environment variables.
-Added automatically created UTF-8 translations for simplified and traditional Chinese.
---- Changes since 1.270 ----
-Updated almost all modules that use tables to use the new ui_columns functions. This allows themes to do highlighting when a row is moved over or selected.
-Added a new 'Simple Blue' theme, which uses fewer images and does table row highlighting.
-Changed the way that Webmin log diff files are stored, so that they are categorized by action and not all in one huge directory.
---- Changes since 1.280 ----
-Fixed security holes that allow remote read access to any file on the server for which the path is known.
---- Changes since 1.290 ----
-SELinux security contexts are preserved on files safely modified by Webmin's write-and-rename code.
-Added xmlrpc.cgi program, which provides an XML-RPC interface to all Webmin module functions.
-Tested and improved support for Fedora 5.
---- Changes since 1.300 ----
-Fixed the rare bug about renaming the .webmintmp file.
---- Changes since 1.310 ----
-Module configuration files can now be named based on the real operating system types, such as config-Ubuntu-Linux, which would be used in preference to config-debian-linux.
-When a large file is uploaded, it is no longer read into memory by miniserv.pl.
-Update the code that fetches mirror sites from Sourceforge, to handle their new website design.
-Changed the default theme for all installs to the new framed blue theme.
-Updated all rows of links (like select all, invert selection, add something) above tables to use a separator between links.
-Added caching for sudo capable user checks, to avoid excessive slow calls to sudo.
-Fixed a memory leak when running under ActiveState Perl on Windows.
---- Changes since 1.320 ----
-Fixed XSS bugs in chooser.cgi.
-If the operating system is upgraded after Webmin is installed, a button is displayed on the main page to update Webmin's view of the current OS.
-Improved the tabs API to add an option to put a box around the visible tab, and whitespace around tabs.
-If listening on all specified IP addresses fails, Webmin will fall back to accepting connections on any address.
-All Module Config pages are now generating using new ui-lib.pl code, for easier theming.
-Added a global access control option to set the Unix user the file browser lists directories as.
---- Changes since 1.330 ----
-Added more ui-lib.pl functions for hidden page sections.
-Fixed another XSS bug in chooser.cgi.
-The Webmin function to get the system's hostname now reads a file instead of calling the hostname comment, which is faster.
-Added an ACL option to the file chooser for additional directories to allow access to.
-Changed the way sizes are displayed, to use a format like 1.32 GB or 8 kB.
-Removed letter images (used by the old theme), and forced the standard header function to always use text titles.
-Added support for Slam64 Linux.
---- Changes since 1.340 ----
-Added Redhat Enterprise release 5 support.
-Requests to the /unauthenticated URL can never execute CGI programs, to provide an extra layer of security against URL escaping attacks.
-Fixed XSS bugs in pam_login.cgi.
---- Changes since 1.370 ----
-Hid the Jabber and Security Sentries modules by default, as the underlying software is no longer supported.
-On Linux systems, sped up the function for finding processes so that it no longer has to launch 'ps' - instead, it reads /proc directly.
-When read_file_lines is used to read a file, the Unix or Windows newlines will be preserved when it is written out.
---- Changes since 1.380 ----
-Added a search box to the left frame of the blue theme, for finding modules, config options, help pages and text.
-All images, CSS and other static content served by Webmin has an HTTP Expires for 1 week in the future, to improve cachability.
-Lock files are automatically removed when the process creating them exits.
-NetBSD 4.0 support.
-Italian and Catalan translations contributed for many modules, thanks to Giovanni and Jaume Badiella.
-Changed the error message that appears when Webmin detects a link from another web page, and removed the button to allow the link (which was unreliable anyway).
---- Changes since 1.390 ----
-Links from unknown referers are now blocked by default, to prevent XSS attacks. This may break browsers that don't supply a Referer: HTTP header.
---- Changes since 1.400 ----
-Big Czech translation updates, thanks to Petr Vanek and the Czech translation team.
-All popups in Webmin are now XSS-safe, and thus do not need protection from unknown referers which prevented them from working in some browsers.
-All Webmin session IDs are now stored MD5 hashed, to prevent sessions from being captured if the sessiondb DBM is somehow read by an attacker.
-Many Dutch updates, thanks to Gandyman.
-MD5 encryption for Webmin and Unix passwords can be used on systems that have either the MD5 or Digest::MD5 perl module, or support it in the crypt() function.
---- Changes since 1.410 ----
-Many Korean updates, thanks to JoungKyun Kim.
-More Dutch updates, thanks to Gandyman.
-Added a debugging log file, which records all files read and written, commands run and more. This can be enabled in the Webmin Configuration module.
---- Changes since 1.420 ----
-Many Greek translation updates, thanks to Vagelis Koutsomitros.
-Catalan translation updates by Jaume Badiella.
-Many Dutch translation contributions by Gandyman.
---- Changes since 1.430 ----
-A large Croatian translation update, thanks to Domagoj Bikic.
-When a user whose password is close to expiry or has already expired logs in, a warning will be displayed on Webmin's first page.
-Many Japanese translation updates, thanks to Kazuya Masuda.
---- Changes since 1.440 ----
-Russian translation updates, thanks to Anton Statutov.
-Webmin's serialization functions can now handle objects, which allows them to be passed as parameters to remote function calls. Both caller and recipient must have the object's class installed though.
-Converted commands in the core web-lib-funcs.pl API file to POD format, and added more details about each function.
---- Changes since 1.450 ----
-Added a language option for UK english, and converted words in the default Webmin language to US english.
-Major Dutch translation updates, thanks to Gandyman.
-Catalan translation updates by Jaume Badiella.
-Converted all core modules to use the new WebminCore perl module instead of web-lib.pl. This significantly improves memory use and load time in code that uses functions from multiple modules, asssuming they have all been converted.
---- Changes since 1.470 ----
-Catalan translation updates by Jaume Badiella.
-Added an UTF-8 encoding of the Russian translation, thanks to shavlukov@gmail.com.
-French translation updates by ButterflyOfFire.
-Dutch translation updates by Gandyman.
-Dramatically improved Webmin's search function, to include links to pages that help or UI text comes from. Also changed the layout of results to a more Webmin-ish style.
---- Changes since 1.480 ----
-Catalan translation updates by Jaume Badiella.
-Dutch translation updates, thanks to Gandyman.
-Beginnings of a Basque translation, thanks to Mireia Lezea.
---- Changes since 1.500 ----
-Czech translation updates, thanks to Karel Hudan.
-The Webmin RPM now preserves the /etc/webmin directory when un-installed and then re-installed.
-Added a robots.txt file to block indexing of Webmin by search engines.
-The Webmin search box can now be disabled in the Webmin Users module, under "Permissions for all modules".
-Brazillian Portuguese translation updates for several modules, thanks to Djavan Fagundes.
---- Changes since 1.510 ----
-Dutch translation updates, thanks to Gandyman.
-Polish translation updates, thanks to Dariusz Dêbowski.
---- Changes since 1.520 ----
-Catalan translation updates by Jaume Badiella.
---- Changes since 1.530 ----
-Sped up the loading of language files by pre-caching them in memory when Webmin is started, and not performing sub-string substitutions in most modules.
-Added support for Pardus Linux, thanks to Kaan Ozdincer.
-Major Dutch updates, thanks to Gandyman.
-Majoe French translation update, thanks to ButterflyOfFire.
-Allow per-language language overrides to be defined, in custom-lang.$code files.
-Updated numerous modules to improve support for Debian 6 and Ubuntu 10.10.
-If a browser asks for gzip compression, Webmin can now return compressed content either generated dynamically or from a pre-compressed .gz file in the same directory. Dynamic compression depends on the Compress::Zlib perl module.
-Added support for Amazon Linux.
---- Changes since 1.550 ----
-Catalan updates, thanks to Jaume Badiella.
-Italian translation updates, thanks to Andrea Oliveri.
-Major German translation updates, thanks to Raymond Vetter.
---- Changes since 1.560 ----
-More German translation updates, thanks to Raymond Vetter.
-More French translation updates, thanks to ButterflyOfFire.
---- Changes since 1.570 ----
-Even more German translation updates, thanks to Raymond Vetter.
-Added UTF-8 encodings for languages using the iso-8859-2, like Czech and Polish.
-Catalan updates, thanks to Jaume Badiella.
-Norwegian translation updates, thanks to Stein-Aksel Basma.
-The MySQL, PostgreSQL, Filesystem Backup and Backup Configuration Files modules now all support the use of Webmin variable substitutions in backup paths (like $HOSTNAME) via a new Module Config option.
---- Changes since 1.580 ----
-Even more German translation updates, thanks to Raymond Vetter.
-More Dutch updates, thanks to Gandyman.
-Catalan updates, thanks to Jaume Badiella.
-Norwegian updates, thanks to Stein-Aksel Basma.
-All languages now have UTF-8 encoded variants, as well as their native character sets.
-Added support for Ubuntu 12.04.
---- Changes since 1.590 ----
-Even more German translation updates, thanks to Raymond Vetter.
-Norwegian updates, thanks to Stein-Aksel Basma.
-Dutch translation updates, thanks to Gandyman.
-Switch order of command and mode in debug logs to make it clear that "mode=X" is part of the log, not part of the command.
-Added the new Gray Framed Theme, and made it the default for new installs.
---- Changes since 1.600 ----
-Even more German translation updates, thanks to Raymond Vetter.
-Catalan updates, thanks to Jaume Badiella.
---- Changes since 1.610 ----
-Norwegian updates, thanks to Stein-Aksel Basma.
-Catalan updates, thanks to Jaume Badiella.
-Yet more German translation updates, thanks to Raymond Vetter.
-Polish translation updates from Piotr Kozica.
---- Changes since 1.620 ----
-More German translation updates, thanks to Raymond Vetter.
-Polish translation updates from Piotr Kozica.
-Norwegian updates, thanks to Stein-Aksel Basma.
-Improved FreeBSD 8 and 9 support across multiple modules.
-Hungarian translation updates from Balázs Zoltán.
---- Changes since 1.650 ----
-More German translation updates, thanks to Raymond Vetter.
-Norwegian updates, thanks to Stein-Aksel Basma.
---- Changes since 1.660 ----
-More German translation updates, thanks to Raymond Vetter.
-Norwegian updates, thanks to Stein-Aksel Basma.
-Catalan updates, thanks to Jaume Badiella.
-IPv6 access control now match an address exactly, unless a network size is entered.
-FTP uploads and downloads to IPv6-only servers now work properly, thanks to support for the EPSV protocol command.
-Added a Bahasa Malaysia translation, thanks to Nawawi Jamili, Nizam Adnan and Weldan Jamili.
-Added filtering for lists in the user, group and file chooser popups, thanks to a patch from Nawawi Jamili.
---- Changes since 1.670 ----
-More German translation updates, thanks to Raymond Vetter.
-Norwegian updates, thanks to Stein-Aksel Basma.
-Catalan updates, thanks to Jaume Badiella.
-Security fixes for XSS attacks in user_chooser.cgi and other scripts.
---- Changes since 1.690 ----
-More German translation updates, thanks to Raymond Vetter.
-Support for RHEL 7, CentOS 7 and other derivatives in multiple modules.
---- Changes since 1.700 ----
-More German translation updates, thanks to Raymond Vetter.
-Catalan updates, thanks to Jaume Badiella.
-Added additional protected against Shellshock exploits made via the Webmin webserver.
---- Changes since 1.710 ----
-SSL v2 and v3 are now disabled by default at Webmin install time, to block the POODLE attack. They can be re-enabled on the SSL Encryption page of the Webmin Configuration module.
---- Changes since 1.720 ----
-Deprecated the old blue-theme in favor of the new gray-theme.
-Catalan translation updates from Jaume Badiella.
-More German translation updates, thanks to Raymond Vetter.
---- Changes since 1.730 ----
-More German translation updates, thanks to Raymond Vetter.
-Norwegian updates, thanks to Stein-Aksel Basma.
-The awesome new Authentic Theme by Ilia Rostovtsev is now included in the Webmin package.
-Catalan translation updates from Jaume Badiella.
---- Changes since 1.740 ----
-Norwegian updates, thanks to Stein-Aksel Basma.
-Catalan translation updates from Jaume Badiella.
-More German translation updates, thanks to Raymond Vetter.
---- Changes since 1.750 ----
-Norwegian updates, thanks to Stein-Aksel Basma.
-Catalan translation updates from Jaume Badiella.
-More German translation updates, thanks to Raymond Vetter.
-Fixed an XSS bug that allowed xmlrpc.cgi to be abused by a malicious link.
---- Changes since 1.760 ----
-For new installs, switched the location of data files in many modules to /var/webmin instead of /etc/webmin.
---- Changes since 1.790 ----
-Added a recent logins section to the System Information page.
-Major rework of majordomo module, Kay Marquardt
---- Changes since 1.870 ----
-German translation updates, thanks to Raymond Vetter.
-Catalan translation updates from Jaume Badiella.
-Bulgarian translations from Grigor Gatchev.
-Added Support for Synology NAS and opkg/ipkg Community Package Manager, Kay Marquardt
-Added Support for configuring spam filtering when amvisd is used, Kay Marquardt
@@ -1,7 +1,64 @@
 ## Changelog

+#### 1.995 (June 23, 2022)
+  * Add improvements to stability for `systemd` systems
+  * Add native support to default to system default hashing format
+  * Add support to `yescrypt` password hashing scheme
+  * Add new _System Logs Viewer_ (logviewer) module
+  * Add new `webmin server` sub-command
+  * Add to set enviromental variables in Filesystem Backup module
+  * Fix upload tracker issues with large uploads
+  * Fix NVMe drives status support
+  * Fix AlmaLinux support
+  * Fix BIND config for FreeBSD 12 on initial setup
+
+#### Version 1.994 (May 22, 2022)
+This release fixes a security issue in versions 1.991 and below. All systems with less-privileged Webmin users are recommended to upgrade as soon as possible.
+
+#### Version 1.991 (April 18, 2022)
+This is mainly a bugfix release for issues found since 1.990.
+
+#### Version 1.990 (March 3, 2022)
+This release contains a critical security fix, an updated theme, and a bunch of other small features and improvements. We recommend that all systems with untrusted Webmin users upgrade immediately!
+
+#### Version 1.983 (December 26, 2021)
+This release is mostly bugfixes for issues found in 1.983.
+
+#### Version 1.983 (December 4, 2021)
+These releases are mostly bugfixes for issues found in 1.982.
+
+#### Version 1.982 (November 26, 2021)
+This release includes the latest Authentic theme, support for archive extraction and folder uploads in the File Manager module, automatic formatting of the Apache config, translation updates, and many more small features and bugfixes.
+
+#### Version 1.981 (August 28, 2021)
+This is just a bugfix for issues found in version 1.980.
+
+#### Version 1.980 (August 22, 2021)
+This release includes numerous small bugfixes, a theme update, translation fixes, support for Rocky and Alma Linuxes, and a new API for changing password.
+
+#### Version 1.979 (June 15, 2021)
+This release fixes several bugs found in 1.974, updates the Authentic theme, adds 2FA support in Usermin, and fixes a security bug in the Network Configuration module.
+
+#### Version 1.974 (May 1, 2021)
+Mostly a bugfix release, but it also contains a security for users who installed using the `setup.pl` script (which is not common).
+
+#### Version 1.972 (March 1, 2021)
+This is mainly a bugfix release for issues with Let's Encrypt and a few other modules.
+
+#### Version 1.970 (January 6, 2021)
+This release updates the theme, fixes a Windows security issue, updates the CA cert for Let's Encrypt, and improves translations.
+
+#### Version 1.962 (November 11, 2020)
+These are bugfix releases for 2-factor signin and other small issues.
+
+#### Version 1.960 (October 19, 2020)
+This release improves MySQL user management, updates the theme UI, fixes parsing of complex Netplan configs, removes the dependency on apt-show-versions and much much more.
+
+#### Version 1.953 (July 5, 2020)
+This release adds automatic translations for all languages in UTF-8, updates the Authentic theme, adds support for Postfix SNI certs and Chrony, caching for LDAP lookups, and a huge number of bugfixes and minor features.
+
 #### Version 1.941 (January 16, 2020)
-This release updates the built-in Let's Encrypt client, adds support for creating "safe-mode" Webmin users, support for CAA records in the BIND module, and the ability to search Postfix maps. It also updates the Authentic Theme to the latest version, which includes numerous improvements to the File Manager and overall UI.
+This release updates the built-in Let's Encrypt client, adds support for creating "safe-mode" Webmin users, support for CAA records in the BIND module, and the ability to search Postfix maps. It also updates the Authentic theme to the latest version, which includes numerous improvements to the File Manager and overall UI.

 #### Version 1.930 (August 18, 2019)
 These updates fix a [security vulnerability](http://webmin.com/security.html) and should be installed IMMEDIATELY by all users. Although it is not exploitable in a Webmin install with the default configuration, upgrading is strongly recommended.
@@ -19,10 +76,10 @@ This version includes wildcard Let's Encrypt SSL cert support, theme and transla
 This version includes Ubuntu 18 network config support, translation updates, multiple theme and file manager updates, BIND freeze/thaw support, support for more Linux distributuions, and a bunch of other bugfixes and small improvements.

 #### Version 1.880 (March 16, 2018)
-This version includes German, Catalan and Bulgarian translation updates, a new version of the Authentic Theme, support for directly editing the MySQL and PostgreSQL config files, Let's Encrypt bugfixes, more control over system status email notifications, and more.
+This version includes German, Catalan and Bulgarian translation updates, a new version of the Authentic theme, support for directly editing the MySQL and PostgreSQL config files, Let's Encrypt bugfixes, more control over system status email notifications, and more.

 #### Version 1.870 (December 08, 2018)
-This release includes many translation updates, fixes for Let's Encrypt support, UI cleanups, and most importantly a new major version of the Authentic Theme.
+This release includes many translation updates, fixes for Let's Encrypt support, UI cleanups, and most importantly a new major version of the Authentic theme.

 #### Version 1.860 (October 10, 2017)
 This release includes Let's Encrypt DNS fixes, Majordomo module improvements, XSS security bugfixes, translation updates, a new version of the theme, and more.
@@ -34,10 +91,307 @@ This release includes Let's Encrypt fixes, Majordomo module improvements, Firewa
 This major release includes a large theme update, XSS security fixes, per-domain SSL cert support, thin-provisioned LVM support, Let's Encrypt improvements, translation updates, and the usual gang of bugfixes. Also available is Usermin 1.710, which contains many of the same updates.

 #### Version 1.830 (December 29, 2016)
-This is mainly a bugfix release, but also contains some translation updates, the latest version of the Authentic Theme, fixes related to Let's Encrypt and LDAP client support, and SElinux and file attribute support in the file manager.
+This is mainly a bugfix release, but also contains some translation updates, the latest version of the Authentic theme, fixes related to Let's Encrypt and LDAP client support, and SElinux and file attribute support in the file manager.

 #### Version 1.820 (October 3, 2016)
 This updated includes a bunch of bugfixes (particularly in the BIND module), translation updates, the ability to download a MySQL backup, Let's Encrypt improvements, and more.

 #### Version 1.810 (August 8, 2016)
-This updated includes the latest Authentic Theme, a new IPv6 Firewall module for Linux, Webmin actions logging improvements, Let's Encrypt API fixes and a bunch of other small updates and bugfixes.
+This updated includes the latest Authentic theme, a new IPv6 Firewall module for Linux, Webmin actions logging improvements, Let's Encrypt API fixes and a bunch of other small updates and bugfixes.
+
+#### Version 1.800
+* German translation updates, thanks to Raymond Vetter.
+* Catalan translation updates from Jaume Badiella.
+* Bulgarian translations from Grigor Gatchev.
+* Added Support for Synology NAS and opkg/ipkg Community Package Manager, Kay Marquardt
+* Added Support for configuring spam filtering when amvisd is used, Kay Marquardt
+
+
+#### Version 1.790
+* Added a recent logins section to the System Information page.
+* Major rework of majordomo module, Kay Marquardt
+
+
+#### Version 1.760
+* For new installs, switched the location of data files in many modules to /var/webmin instead of /etc/webmin.
+
+#### Version 1.750
+* Norwegian updates, thanks to Stein-Aksel Basma.
+* Catalan translation updates from Jaume Badiella.
+* More German translation updates, thanks to Raymond Vetter.
+* Fixed an XSS bug that allowed xmlrpc.cgi to be abused by a malicious link.
+
+#### Version 1.740
+* Norwegian updates, thanks to Stein-Aksel Basma.
+* Catalan translation updates from Jaume Badiella.
+* More German translation updates, thanks to Raymond Vetter.
+
+#### Version 1.730
+* More German translation updates, thanks to Raymond Vetter.
+* Norwegian updates, thanks to Stein-Aksel Basma.
+* The awesome new Authentic Theme by @iliajie is now included in the Webmin package.
+* Catalan translation updates from Jaume Badiella.
+
+#### Version 1.720
+* Deprecated the old blue-theme in favor of the new gray-theme.
+* Catalan translation updates from Jaume Badiella.
+* More German translation updates, thanks to Raymond Vetter.
+
+#### Version 1.710
+* SSL v2 and v3 are now disabled by default at Webmin install time, to block the POODLE attack. They can be re-enabled on the SSL Encryption page of the Webmin Configuration module.
+
+#### Version 1.700
+* More German translation updates, thanks to Raymond Vetter.
+* Catalan updates, thanks to Jaume Badiella.
+* Added additional protected against Shellshock exploits made via the Webmin webserver.
+
+#### Version 1.690
+* More German translation updates, thanks to Raymond Vetter.
+* Support for RHEL 7, CentOS 7 and other derivatives in multiple modules.
+
+#### Version 1.670
+* More German translation updates, thanks to Raymond Vetter.
+* Norwegian updates, thanks to Stein-Aksel Basma.
+* Catalan updates, thanks to Jaume Badiella.
+* Security fixes for XSS attacks in `user_chooser.cgi` and other scripts.
+
+#### Version 1.660
+* More German translation updates, thanks to Raymond Vetter.
+* Norwegian updates, thanks to Stein-Aksel Basma.
+* Catalan updates, thanks to Jaume Badiella.
+* IPv6 access control now match an address exactly, unless a network size is entered.
+* FTP uploads and downloads to IPv6-only servers now work properly, thanks to support for the EPSV protocol command.
+* Added a Bahasa Malaysia translation, thanks to Nawawi Jamili, Nizam Adnan and Weldan Jamili.
+* Added filtering for lists in the user, group and file chooser popups, thanks to a patch from Nawawi Jamili.
+
+#### Version 1.650
+* More German translation updates, thanks to Raymond Vetter.
+* Norwegian updates, thanks to Stein-Aksel Basma.
+
+#### Version 1.620
+* More German translation updates, thanks to Raymond Vetter.
+* Polish translation updates from Piotr Kozica.
+* Norwegian updates, thanks to Stein-Aksel Basma.
+* Improved FreeBSD 8 and 9 support across multiple modules.
+* Hungarian translation updates from Balázs Zoltán.
+
+#### Version 1.610
+* Norwegian updates, thanks to Stein-Aksel Basma.
+* Catalan updates, thanks to Jaume Badiella.
+* Yet more German translation updates, thanks to Raymond Vetter.
+* Polish translation updates from Piotr Kozica.
+
+#### Version 1.600
+* Even more German translation updates, thanks to Raymond Vetter.
+* Catalan updates, thanks to Jaume Badiella.
+
+#### Version 1.590
+* Even more German translation updates, thanks to Raymond Vetter.
+* Norwegian updates, thanks to Stein-Aksel Basma.
+* Dutch translation updates, thanks to Gandyman.
+* Switch order of command and mode in debug logs to make it clear that "mode=X" is part of the log, not part of the command.
+* Added the new Gray Framed Theme, and made it the default for new installs.
+
+#### Version 1.580
+* Even more German translation updates, thanks to Raymond Vetter.
+* More Dutch updates, thanks to Gandyman.
+* Catalan updates, thanks to Jaume Badiella.
+* Norwegian updates, thanks to Stein-Aksel Basma.
+* All languages now have UTF-8 encoded variants, as well as their native character sets.
+* Added support for Ubuntu 12.04.
+
+#### Version 1.570
+* Even more German translation updates, thanks to Raymond Vetter.
+* Added UTF-8 encodings for languages using the iso-8859-2, like Czech and Polish.
+* Catalan updates, thanks to Jaume Badiella.
+* Norwegian translation updates, thanks to Stein-Aksel Basma.
+* The MySQL, PostgreSQL, Filesystem Backup and Backup Configuration Files modules now all support the use of Webmin variable substitutions in backup paths (like $HOSTNAME) via a new Module Config option.
+
+#### Version 1.560
+* More German translation updates, thanks to Raymond Vetter.
+* More French translation updates, thanks to ButterflyOfFire.
+
+#### Version 1.550
+* Catalan updates, thanks to Jaume Badiella.
+* Italian translation updates, thanks to Andrea Oliveri.
+* Major German translation updates, thanks to Raymond Vetter.
+
+#### Version 1.530
+* Speed up the loading of language files by pre-caching them in memory when Webmin is started, and not performing sub-string substitutions in most modules.
+* Added support for Pardus Linux, thanks to Kaan Ozdincer.
+* Major Dutch updates, thanks to Gandyman.
+* Majoe French translation update, thanks to ButterflyOfFire.
+* Allow per-language language overrides to be defined, in custom-lang.$code files.
+* Updated numerous modules to improve support for Debian 6 and Ubuntu 10.10.
+* If a browser asks for gzip compression, Webmin can now return compressed content either generated dynamically or from a pre-compressed .gz file in the same directory. Dynamic compression depends on the Compress::Zlib perl module.
+* Added support for Amazon Linux.
+
+#### Version 1.520
+* Catalan translation updates by Jaume Badiella.
+
+#### Version 1.510
+* Dutch translation updates, thanks to Gandyman.
+* Polish translation updates, thanks to Dariusz Dêbowski.
+
+#### Version 1.500
+* Czech translation updates, thanks to Karel Hudan.
+* The Webmin RPM now preserves the /etc/webmin directory when un-installed and then re-installed.
+* Added a robots.txt file to block indexing of Webmin by search engines.
+* The Webmin search box can now be disabled in the Webmin Users module, under "Permissions for all modules".
+* Brazillian Portuguese translation updates for several modules, thanks to Djavan Fagundes.
+
+#### Version 1.480
+* Catalan translation updates by Jaume Badiella.
+* Dutch translation updates, thanks to Gandyman.
+* Beginnings of a Basque translation, thanks to Mireia Lezea.
+
+#### Version 1.470
+* Catalan translation updates by Jaume Badiella.
+* Added an UTF-8 encoding of the Russian translation, thanks to shavlukov@gmail.com.
+* French translation updates by ButterflyOfFire.
+* Dutch translation updates by Gandyman.
+* Dramatically improved Webmin's search function, to include links to pages that help or UI text comes from. Also changed the layout of results to a more Webmin-ish style.
+
+#### Version 1.450
+* Added a language option for UK english, and converted words in the default Webmin language to US english.
+* Major Dutch translation updates, thanks to Gandyman.
+* Catalan translation updates by Jaume Badiella.
+* Converted all core modules to use the new WebminCore perl module instead of `web-lib.pl`. This significantly improves memory use and load time in code that uses functions from multiple modules, asssuming they have all been converted.
+
+#### Version 1.440
+* Russian translation updates, thanks to Anton Statutov.
+* Webmin's serialization functions can now handle objects, which allows them to be passed as parameters to remote function calls. Both caller and recipient must have the object's class installed though.
+* Converted commands in the core `web-lib-funcs.pl` API file to POD format, and added more details about each function.
+
+#### Version 1.430
+* A large Croatian translation update, thanks to Domagoj Bikic.
+* When a user whose password is close to expiry or has already expired logs in, a warning will be displayed on Webmin's first page.
+* Many Japanese translation updates, thanks to Kazuya Masuda.
+
+#### Version 1.420
+* Many Greek translation updates, thanks to Vagelis Koutsomitros.
+* Catalan translation updates by Jaume Badiella.
+* Many Dutch translation contributions by Gandyman.
+
+#### Version 1.410
+* Many Korean updates, thanks to JoungKyun Kim.
+* More Dutch updates, thanks to Gandyman.
+* Added a debugging log file, which records all files read and written, commands run and more. This can be enabled in the Webmin Configuration module.
+
+#### Version 1.400
+* Big Czech translation updates, thanks to Petr Vanek and the Czech translation team.
+* All popups in Webmin are now XSS-safe, and thus do not need protection from unknown referers which prevented them from working in some browsers.
+* All Webmin session IDs are now stored MD5 hashed, to prevent sessions from being captured if the sessiondb DBM is somehow read by an attacker.
+* Many Dutch updates, thanks to Gandyman.
+* MD5 encryption for Webmin and Unix passwords can be used on systems that have either the MD5 or Digest::MD5 perl module, or support it in the crypt() function.
+
+#### Version 1.390
+* Links from unknown referers are now blocked by default, to prevent XSS attacks. This may break browsers that don't supply a Referer: HTTP header.
+
+#### Version 1.380
+* Added a search box to the left frame of the blue theme, for finding modules, config options, help pages and text.
+* All images, CSS and other static content served by Webmin has an HTTP Expires for 1 week in the future, to improve cachability.
+* Lock files are automatically removed when the process creating them exits.
+* NetBSD 4.0 support.
+* Italian and Catalan translations contributed for many modules, thanks to Giovanni and Jaume Badiella.
+* Changed the error message that appears when Webmin detects a link from another web page, and removed the button to allow the link (which was unreliable anyway).
+
+#### Version 1.370
+* Hid the Jabber and Security Sentries modules by default, as the underlying software is no longer supported.
+* On Linux systems, sped up the function for finding processes so that it no longer has to launch 'ps' - instead, it reads /proc directly.
+* When `read_file_lines` is used to read a file, the Unix or Windows newlines will be preserved when it is written out.
+
+#### Version 1.340
+* Added Redhat Enterprise release 5 support.
+* Requests to the /unauthenticated URL can never execute CGI programs, to provide an extra layer of security against URL escaping attacks.
+* Fixed XSS bugs in `pam_login.cgi`.
+
+#### Version 1.330
+* Added more `ui-lib.pl` functions for hidden page sections.
+* Fixed another XSS bug in chooser.cgi.
+* The Webmin function to get the system's hostname now reads a file instead of calling the hostname comment, which is faster.
+* Added an ACL option to the file chooser for additional directories to allow access to.
+* Changed the way sizes are displayed, to use a format like 1.32 GB or 8 kB.
+* Removed letter images (used by the old theme), and forced the standard header function to always use text titles.
+* Added support for Slam64 Linux.
+
+#### Version 1.320
+* Fixed XSS bugs in chooser.cgi.
+* If the operating system is upgraded after Webmin is installed, a button is displayed on the main page to update Webmin's view of the current OS.
+* Improved the tabs API to add an option to put a box around the visible tab, and whitespace around tabs.
+* If listening on all specified IP addresses fails, Webmin will fall back to accepting connections on any address.
+* All Module Config pages are now generating using new `ui-lib.pl` code, for easier theming.
+* Added a global access control option to set the Unix user the file browser lists directories as.
+
+#### Version 1.310
+* Module configuration files can now be named based on the real operating system types, such as config-Ubuntu-Linux, which would be used in preference to config-debian-linux.
+* When a large file is uploaded, it is no longer read into memory by `miniserv.pl`.
+* Update the code that fetches mirror sites from Sourceforge, to handle their new website design.
+* Changed the default theme for all installs to the new framed blue theme.
+* Updated all rows of links (like select all, invert selection, add something) above tables to use a separator between links.
+* Added caching for sudo capable user checks, to avoid excessive slow calls to sudo.
+* Fixed a memory leak when running under ActiveState Perl on Windows.
+
+#### Version 1.300
+* Fixed the rare bug about renaming the .webmintmp file.
+
+#### Version 1.290
+* SELinux security contexts are preserved on files safely modified by Webmin's write-and-rename code.
+* Added xmlrpc.cgi program, which provides an XML-RPC interface to all Webmin module functions.
+* Tested and improved support for Fedora 5.
+
+#### Version 1.280
+* Fixed security holes that allow remote read access to any file on the server for which the path is known.
+
+#### Version 1.270
+* Updated almost all modules that use tables to use the new `ui_columns` functions. This allows themes to do highlighting when a row is moved over or selected.
+* Added a new 'Simple Blue' theme, which uses fewer images and does table row highlighting.
+* Changed the way that Webmin log diff files are stored, so that they are categorized by action and not all in one huge directory.
+
+#### Version 1.260
+* Proxy settings made in the Webmin Configuration module are passed on to programs Webmin calls via the `http_proxy` and `ftp_proxy` environment variables.
+* Added automatically created UTF-8 translations for simplified and traditional Chinese.
+
+#### Version 1.240
+* Fixed a possible security hole caused by a bug in Perl.
+
+#### Version 1.230
+* Replaced all calls to the crypt() function with new code that will use the Crypt::UnixCrypt Perl modules on systems for with crypt() is broken.
+
+#### Version 1.220
+* Added basic support for running Webmin on Windows system with ActiveState Perl installed. The new `setup.pl` install script must be used, as the setup.sh shell script cannot run on Windows.
+* Fixed a bug that could allow a remote attack if the option to use full PAM conversations is enabled.
+* Improved the Webmin RPM to not lose the /etc/webmin directory when upgrading from an RPM by another vendor (like Mandrake or DAG).
+
+#### Version 1.210
+* Added a new Global ACL control option to limit a user to read-only mode. This does not yet support all modules, but in those that are supported any changes the user makes will simply not take effect.
+* Restarting of Webmin is now much faster in some modules that do not need a full configuration reload, due to the addition of a function that justs tells `miniserv.pl` to re-read its config file.
+
+#### Version 1.200
+* On Solaris systems that support RBAC, available modules and access rights can now be derived from RBAC for selected users. This can be enabled on a per-user or per-module basic in the Webmin Users module.
+
+#### Version 1.180
+* All subheadings have been reduced in size when using the default MSC theme.
+* All modules now use a new API for writing to configuration files, which ensures that the file does not get written to or truncated if the system is out of disk space.
+
+#### Version 1.170
+* When installing a module from the command line, by it will be granted to the same users who receive new modules when Webmin is upgraded. By default, this is root and admin.
+* Added basic support for multiple root directories, so that Webmin modules can be separated into core and third-party on the filesystem.
+* When installing or upgrading Webmin, password timeouts are now enabled by default. This protects against brute-force password guessing attacks.
+
+#### Version 1.160
+* Added support for Solaris 10.
+* Included several additional translations for various languages and modules.
+* Added support for config- files that allow a range of OS version numbers, and used this to reduce the number of standard config files.
+
+#### Version 1.150
+* Updated the setup.sh script to use MD5 password encryption by default, on systems where Perl supports it.
+* Fixed a security hole in the `maketemp.pl` script, used to create the /tmp/.webmin directory at install time. If an un-trusted user creates this directory before Webmin is installed, he could create in it a symbolic link pointing to a critical file on the system, which would be overwritten when Webmin writes to the link filename (CVE bug CAN-2004-0559).
+* When PAM is used for Unix authentication, expired passwords are now detected and the user is prompted to select a new password (if this feature is enabled on the Webmin Configuration module).
+* Make all functions in `ui-lib.pl` themable, allowing themes to have more detailed control over modules that make use of this library.
+* Updated all modules to call `ui_print_header` instead of calling header and printing `<hr>`, so that themes can avoid the `<hr>`. Also updated the MSC theme to do this.
+
+#### Version 1.140
+* Fixed a security hole that allowed any user to view the configuration of any module, even those that they should not have access to.
+* Fixed a security hole that could allow an attacker to lock valid users by sending a bogus username or password.
+
@@ -29,7 +29,7 @@ Webmin can be installed in two different ways:
 1. By downloading a pre-built package, available for different distributions (CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris and [other](http://www.webmin.com/support.html)) from our [download page](http://webmin.com/download.html);
  <kbd>Note: It is highly recommended to [add repository](https://doxfer.webmin.com/Webmin/Installation) to your system for having automatic updates.</kbd>

- 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-1.982.tar.gz), and running [_setup.sh_](http://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
+ 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-1.995.tar.gz), and running [_setup.sh_](http://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
  <kbd>Note: If you are installing Webmin [on Windows](http://www.webmin.com/windows.html) system, you must run the command `perl setup.pl` instead. The Windows version depends on several programs, and modules that may not be part of the standard distribution. You will need _process.exe_ commmand, _sc.exe_ command, and _Win32::Daemon_ Perl module.</kbd>

 ## Documentation
@@ -44,7 +44,7 @@ Complete set of documentation for Webmin and all of its modules can be found at
 ### Contributors

 * [Joe Cooper](https://github.com/swelljoe)
-* [Ilia Rostovtsev](https://github.com/rostovtsev)
+* [Ilia Rostovtsev](https://github.com/iliajie)
 * [Kay Marquardt](https://github.com/gnadelwartz)
 * [Nawawi Jamili](https://github.com/nawawi) + [57 more..](https://github.com/webmin/webmin/graphs/contributors)

@@ -0,0 +1,23 @@
+## Reporting Security Issues
+
+Please send all reports of security issues found in Webmin to security@webmin.com
+via email, ideally PGP encrypted with the key from https://www.webmin.com/jcameron-key.asc .
+
+Potential security issues, in descending order of impact, include :
+
+* Remotely exploitable attacks that allow `root` access to Webmin without
+  any credentials.
+
+* Privilege escalation vulnerabilities that allow non-`root` users of Webmin
+  to run commands or access files as `root`.
+
+* XSS attacks that target users already logged into Webmin when they visit
+  another website.
+
+Things that are not actually security issues include :
+
+* XSS attacks that are blocked by Webmin's referrer checks, which are enabled
+  by default.
+
+* Attacks that require modifications to Webmin's code or configuration, which
+  can only be done by someone who already has `root` permissions.
@@ -14,6 +14,7 @@ Library for editing webmin users, passwords and access rights.
 BEGIN { push(@INC, ".."); };
 use strict;
 use warnings;
+no warnings 'redefine';
 use WebminCore;
 &init_config();
 do 'md5-lib.pl';
@@ -651,7 +652,7 @@ else {
 	my $deny = $user->{'deny'};
 	$deny =~ s/:/;/g if ($deny);
 	foreach my $l (@pwfile) {
-		if ($l =~ /^([^:]+):([^:]*)/ && $1 eq $username) {
+		if ($l =~ /^([^:]+):([^:\r\n]*)/ && $1 eq $username) {
 			&add_old_password($user, "$2", \%miniserv);
 			&print_tempfile($fh,
 				$user->{'name'},":",
@@ -1690,10 +1691,17 @@ elsif ($mode == 2) {
 	return &encrypt_sha512($pass, $salt);
 	}
 else {
-	# Use Unix DES
-	&seed_random();
-	$salt ||= chr(int(rand(26))+65).chr(int(rand(26))+65);
-	return &unix_crypt($pass, $salt);
+	# Try detecting system default first
+	if (&foreign_available('useradmin')) {
+		&foreign_require('useradmin');
+		return &useradmin::encrypt_password($pass, $salt, 1);
+		}
+	else {
+		# Use Unix DES
+		&seed_random();
+		$salt ||= chr(int(rand(26))+65).chr(int(rand(26))+65);
+		return &unix_crypt($pass, $salt);
+		}
 	}
 }

@@ -1953,6 +1961,7 @@ return 1 if ($found >= 0);		# Already setup

 # Grant access to the user and path
 &lock_file(&get_miniserv_config_file());
+$user ||= '';
 push(@anon, "$path=$user");
 $miniserv->{'anonymous'} = join(" ", @anon);
 &put_miniserv_config($miniserv);
@@ -13,5 +13,6 @@ my %miniserv;
 &get_miniserv_config(\%miniserv);
 &delete_session_id(\%miniserv, $in{'id'});
 &restart_miniserv();
-&redirect("list_sessions.cgi");
+&redirect($in{'redirect_ref'} ?
+    &get_referer_relative() : "list_sessions.cgi");

@@ -5,7 +5,7 @@
 use strict;
 use warnings;
 require './acl-lib.pl';
-our (%in, %text, %config, %access, $config_directory, $base_remote_user);
+our (%in, %text, %config, %access, $config_directory, $base_remote_user, $remote_user);
 &foreign_require("webmin", "webmin-lib.pl");

 &ReadParse();
@@ -434,7 +434,7 @@ if ($in{'user'}) {
 	if (&foreign_available("webminlog")) {
 		push(@buts, [ "but_log", $text{'edit_log'} ]);
 		}
-	if ($access{'switch'} && $main::session_id) {
+	if ($access{'switch'} && $main::session_id && $in{'user'} ne $remote_user) {
 		push(@buts, [ "but_switch", $text{'edit_switch'} ]);
 		}
 	if ($access{'delete'}) {
@@ -351,6 +351,7 @@ sessions_login=Laaste aktief om
 sessions_host=IP adres
 sessions_lview=Bekyk logboeke..
 sessions_actions=Optrede..
+sessions_all=Alle sessies..
 sessions_logouts=Toon ook afgemelde sessies..
 sessions_state=staat
 sessions_this=Hierdie aanmelding
@@ -239,6 +239,7 @@ sessions_login=آخر نشاط في
 sessions_host=عنوان IP
 sessions_lview=عرض السجلات..
 sessions_actions=أجراءات..
+sessions_all=كل الجلسات..
 sessions_logouts=اعرض أيضًا جلسات تسجيل الخروج..
 sessions_state=حالة
 sessions_this=هذا تسجيل الدخول
@@ -351,6 +351,7 @@ sessions_login=Апошні раз быў у
 sessions_host=IP-адрас
 sessions_lview=Прагляд часопісаў..
 sessions_actions=Дзеянні..
+sessions_all=Усе сеансы..
 sessions_logouts=Таксама паказаць выходныя сесіі.
 sessions_state=Дзярж
 sessions_this=Гэта ўваход
@@ -10,6 +10,8 @@ save_eunixname=Потребителското име '$1' не е потреби

 sync_modify=Преименувайте съответстващия потребител на Webmin, когато потребител на Unix е преименуван.

+sessions_all=Всички сесии..
+
 sql_nocache0=Кеш връзки към база данни
 sql_nocache1=Отворете нова връзка за всяко търсене
 sql_timeout_def=Използвайте времето за изчакване на връзката по подразбиране (60 секунди)
@@ -10,6 +10,8 @@ save_eunixname=El nom d'usuari '$1' no és un usuari Unix, per la qual cosa no e

 sync_modify=Canvieu el nom de l'usuari Webmin coincident quan es canvia el nom d'un usuari Unix.

+sessions_all=Totes les sessions..
+
 sql_nocache0=Connexions de memòria cau a la base de dades
 sql_nocache1=Obriu una connexió nova per a cada cerca
 sql_timeout_def=Utilitza el temps d'espera de connexió predeterminat (60 segons)
@@ -61,6 +61,7 @@ unix_header=Nastavení ověřování uživatelů Unixu
 unix_utable=Povolení uživatelé Unixu

 sessions_actions=Akce..
+sessions_all=Všechny relace..
 sessions_logouts=Zobrazit také odhlášené relace.
 sessions_state=Stát
 sessions_this=Toto přihlášení
@@ -10,6 +10,8 @@ save_eunixname=Brugernavnet '$1' er ikke en Unix-bruger, og kan derfor ikke brug

 sync_modify=Omdøb den matchende Webmin-bruger, når en Unix-bruger omdøbes.

+sessions_all=Alle sessioner..
+
 sql_nocache0=Cache-forbindelser til databasen
 sql_nocache1=Åbn en ny forbindelse til hvert opslag
 sql_timeout_def=Brug standardforbindelse timeout (60 sekunder)
@@ -1,5 +1,7 @@
 sync_modify=Benennen Sie den passenden Webmin-Benutzer um, wenn ein Unix-Benutzer umbenannt wird.

+sessions_all=Alle Sitzungen..
+
 sql_nocache0=Cache-Verbindungen zur Datenbank
 sql_nocache1=Öffnen Sie für jede Suche eine neue Verbindung
 sql_timeout_def=Standard-Verbindungszeitlimit verwenden (60 Sekunden)
@@ -10,6 +10,8 @@ save_eunixname=Το όνομα χρήστη '$1' δεν είναι χρήστη

 sync_modify=Μετονομάστε τον αντίστοιχο χρήστη Webmin όταν μετονομάζεται ένας χρήστης Unix.

+sessions_all=Όλες οι συνεδρίες..
+
 sql_nocache0=Συνδέσεις προσωρινής μνήμης με βάση δεδομένων
 sql_nocache1=Ανοίξτε μια νέα σύνδεση για κάθε αναζήτηση
 sql_timeout_def=Χρήση προεπιλεγμένου χρονικού ορίου σύνδεσης (60 δευτερόλεπτα)
@@ -351,8 +351,10 @@ sessions_login=Last active at
 sessions_host=IP address
 sessions_lview=View logs..
 sessions_actions=Actions..
+sessions_all=All sessions..
 sessions_logouts=Also show logged-out sessions..
 sessions_state=State
+sessions_action=Actions
 sessions_this=This login
 sessions_in=Logged in
 sessions_out=Logged out
@@ -13,6 +13,7 @@ delete_eanonuser=Este usuario se está utilizando para acceder al módulo anóni
 sync_modify=Cambie el nombre del usuario de Webmin coincidente cuando se cambie el nombre de un usuario de Unix.

 sessions_actions=Comportamiento..
+sessions_all=Todas las sesiones..
 sessions_logouts=Mostrar también sesiones cerradas.
 sessions_state=Estado
 sessions_this=Este inicio de sesión
@@ -57,6 +57,7 @@ unix_header=Unix erabiltzailearen autentifikazio ezarpenak
 unix_utable=Onartutako Unix erabiltzaileak

 sessions_actions=Ekintzak..
+sessions_all=Saio guztiak..
 sessions_logouts=Erakutsi itxitako saioak ere..
 sessions_state=Estatu
 sessions_this=Saioa hasiera
@@ -112,6 +112,7 @@ unix_utable=کاربران مجاز Unix

 sessions_host=آدرس آی پی
 sessions_actions=اقدامات..
+sessions_all=تمام جلسات..
 sessions_logouts=همچنین جلسات ورود به سیستم را نشان دهید..
 sessions_state=دولت
 sessions_this=این ورود
@@ -351,6 +351,7 @@ sessions_login=Viimeksi aktiivinen klo
 sessions_host=IP-osoite
 sessions_lview=Näytä lokit..
 sessions_actions=Toiminnot..
+sessions_all=Kaikki istunnot..
 sessions_logouts=Näytä myös kirjautuneet istunnot..
 sessions_state=Osavaltio
 sessions_this=Tämä kirjautuminen
@@ -56,6 +56,8 @@ unix_esudomod=Le module Perl $1 nécessaire à l'authentification <tt>sudo</tt>
 unix_header=Paramètres d'authentification utilisateur Unix
 unix_utable=Utilisateurs Unix autorisés

+sessions_all=Toutes les séances..
+
 udeletes_jerr=Échec de l'ajout d'utilisateurs au groupe

 pass_header=Options d'application de mot de passe Webmin
@@ -351,6 +351,7 @@ sessions_login=פעיל לאחרונה בשעה
 sessions_host=כתובת ה - IP
 sessions_lview=הצגת יומנים..
 sessions_actions=פעולות..
+sessions_all=כל המפגשים..
 sessions_logouts=הראה גם הפעלות לא מחוברות..
 sessions_state=מדינה
 sessions_this=כניסה זו
@@ -62,6 +62,7 @@ unix_header=Unix postavke provjere autentičnosti korisnika
 unix_utable=Dopušteni Unix korisnici

 sessions_actions=Akcije..
+sessions_all=Sve sesije..
 sessions_logouts=Prikaži i odjavljene sesije..
 sessions_state=država
 sessions_this=Ova prijava
@@ -88,6 +88,7 @@ unix_header=Unix felhasználói hitelesítési beállítások
 unix_utable=Engedélyezett Unix felhasználók

 sessions_actions=Hozzászólások..
+sessions_all=Minden ülés..
 sessions_logouts=A kijelentkezett munkamenetek megjelenítése is
 sessions_state=Állapot
 sessions_this=Ez a bejelentkezés
@@ -37,6 +37,7 @@ unix_header=Impostazioni di autenticazione utente Unix
 unix_utable=Utenti Unix consentiti

 sessions_actions=Azioni..
+sessions_all=Tutte le sessioni..
 sessions_logouts=Mostra anche sessioni disconnesse.
 sessions_state=Stato
 sessions_this=Questo login
@@ -59,6 +59,7 @@ unix_header=Unixユーザー認証設定
 unix_utable=許可されたUnixユーザー

 sessions_actions=行動..
+sessions_all=すべてのセッション。
 sessions_logouts=ログアウトしたセッションも表示します。
 sessions_state=状態
 sessions_this=このログイン
@@ -59,6 +59,7 @@ unix_header=유닉스 사용자 인증 설정
 unix_utable=허용 된 유닉스 사용자

 sessions_actions=행위..
+sessions_all=모든 세션..
 sessions_logouts=로그 아웃 된 세션도 표시하십시오.
 sessions_state=상태
 sessions_this=이 로그인
@@ -351,6 +351,7 @@ sessions_login=Paskutinį kartą aktyvus
 sessions_host=IP adresas
 sessions_lview=Žiūrėti žurnalus..
 sessions_actions=Veiksmai..
+sessions_all=Visi užsiėmimai..
 sessions_logouts=Taip pat rodyti atsijungusius seansus..
 sessions_state=Valstybė
 sessions_this=Šis prisijungimas
@@ -351,6 +351,7 @@ sessions_login=Pēdējo reizi aktīvs plkst
 sessions_host=IP adrese
 sessions_lview=Skatīt žurnālus..
 sessions_actions=Darbības..
+sessions_all=Visas sesijas..
 sessions_logouts=Rādīt arī atteikšanās sesijas..
 sessions_state=Valsts
 sessions_this=Šī pieteikšanās
@@ -13,6 +13,7 @@ delete_eanonuser=Pengguna ini sedang digunakan untuk akses modul tanpa nama
 sync_modify=Ganti nama pengguna Webmin yang sepadan apabila pengguna Unix dinamakan semula.

 sessions_actions=Tindakan..
+sessions_all=Semua sesi..
 sessions_logouts=Juga tunjukkan sesi log keluar..
 sessions_state=Negeri
 sessions_this=Log masuk ini
@@ -351,6 +351,7 @@ sessions_login=L-aħħar attiv fi
 sessions_host=Indirizz IP
 sessions_lview=Ara zkuk..
 sessions_actions=Azzjonijiet..
+sessions_all=Is-sessjonijiet kollha..
 sessions_logouts=Uri wkoll sessjonijiet illoggjati..
 sessions_state=Stat
 sessions_this=Dan id-dħul
@@ -36,6 +36,7 @@ unix_header=Unix-instellingen voor gebruikersauthenticatie
 unix_utable=Toegestane Unix-gebruikers

 sessions_actions=Acties..
+sessions_all=Alle sessies..
 sessions_logouts=Toon ook uitgelogde sessies..
 sessions_state=Staat
 sessions_this=Deze login
@@ -1,5 +1,7 @@
 sync_modify=Gi nytt navn til den samsvarende Webmin-brukeren når en Unix-bruker får nytt navn.

+sessions_all=Alle økter..
+
 sql_nocache0=Cache-tilkoblinger til databasen
 sql_nocache1=Åpne en ny forbindelse for hvert oppslag
 sql_timeout_def=Bruk standard tilkoblingstimeout (60 sekunder)
@@ -11,6 +11,7 @@ save_eunixname=Nazwa użytkownika „$1” nie jest użytkownikiem systemu Unix,
 sync_modify=Zmień nazwę pasującego użytkownika Webmin, gdy zmieniona zostanie nazwa użytkownika Uniksa.

 sessions_actions=Działania..
+sessions_all=Wszystkie sesje...
 sessions_logouts=Pokaż także wylogowane sesje.
 sessions_state=Stan
 sessions_this=Ten login
@@ -327,6 +327,7 @@ sessions_login=Ativo pela última vez às
 sessions_host=endereço de IP
 sessions_lview=Ver registros..
 sessions_actions=Ações..
+sessions_all=Todas as sessões..
 sessions_logouts=Mostrar também sessões desconectadas.
 sessions_state=Estado
 sessions_this=Este login
@@ -55,6 +55,7 @@ unix_header=Configurações de autenticação de usuário Unix
 unix_utable=Usuários Unix permitidos

 sessions_actions=Ações..
+sessions_all=Todas as sessões..
 sessions_logouts=Mostrar também sessões desconectadas.
 sessions_state=Estado
 sessions_this=Este login
@@ -351,6 +351,7 @@ sessions_login=Ultima activitate la
 sessions_host=adresa IP
 sessions_lview=Vizualizați jurnalele..
 sessions_actions=Acțiuni..
+sessions_all=Toate sesiunile..
 sessions_logouts=Arată, de asemenea, sesiuni deconectate..
 sessions_state=Stat
 sessions_this=Această autentificare
@@ -59,6 +59,7 @@ unix_header=Настройки аутентификации пользовате
 unix_utable=Разрешенные пользователи Unix

 sessions_actions=Действия..
+sessions_all=Все сеансы..
 sessions_logouts=Также показать сеансы выхода из системы.
 sessions_state=состояние
 sessions_this=Этот логин
@@ -104,6 +104,7 @@ unix_header=Nastavenia overovania používateľov systému Unix
 unix_utable=Povolení používatelia Unixu

 sessions_actions=Akcia..
+sessions_all=Všetky relácie..
 sessions_logouts=Zobraziť aj odhlásené relácie.
 sessions_state=Štát
 sessions_this=Toto prihlásenie
@@ -351,6 +351,7 @@ sessions_login=Nazadnje aktivno ob
 sessions_host=IP naslov
 sessions_lview=Prikaži dnevnike..
 sessions_actions=Ukrepi..
+sessions_all=Vse seje..
 sessions_logouts=Prikaži tudi odjavne seje.
 sessions_state=Država
 sessions_this=Ta prijava
@@ -59,6 +59,7 @@ unix_header=Unix inställningar för användarautentisering
 unix_utable=Tillåtna Unix-användare

 sessions_actions=Handlingar..
+sessions_all=Alla sessioner..
 sessions_logouts=Visa även utloggade sessioner..
 sessions_state=stat
 sessions_this=Den här inloggningen
@@ -351,6 +351,7 @@ sessions_login=ใช้งานล่าสุดเวลา
 sessions_host=ที่อยู่ IP
 sessions_lview=ดูบันทึก..
 sessions_actions=การดำเนินการ..
+sessions_all=ทุกวาระ..
 sessions_logouts=แสดงเซสชันการออกจากระบบด้วย..
 sessions_state=สถานะ
 sessions_this=เข้าสู่ระบบนี้
@@ -120,6 +120,7 @@ unix_utable=İzin verilen Unix kullanıcıları

 sessions_host=IP adresi
 sessions_actions=Hareketler..
+sessions_all=Tüm oturumlar..
 sessions_logouts=Oturumu kapatılmış oturumları da göster..
 sessions_state=Durum
 sessions_this=Bu giriş
@@ -346,6 +346,7 @@ sessions_login=Останній активний о
 sessions_host=IP-адреса
 sessions_lview=Переглянути журнали..
 sessions_actions=Дії..
+sessions_all=Всі сеанси..
 sessions_logouts=Показати також сеанси виходу з системи..
 sessions_state=Держава
 sessions_this=Це логін
@@ -351,6 +351,7 @@ sessions_login=آخری فعال
 sessions_host=IP پتہ
 sessions_lview=نوشتہ جات دیکھیں..
 sessions_actions=عمل..
+sessions_all=تمام سیشنز..
 sessions_logouts=لاگ آؤٹ سیشن بھی دکھائیں..
 sessions_state=حالت
 sessions_this=یہ لاگ ان
@@ -351,6 +351,7 @@ sessions_login=Hoạt động lần cuối tại
 sessions_host=địa chỉ IP
 sessions_lview=Xem các bản ghi..
 sessions_actions=Hành động..
+sessions_all=Tất cả các phiên..
 sessions_logouts=Cũng hiển thị các phiên đăng xuất..
 sessions_state=Tiểu bang
 sessions_this=Thông tin đăng nhập này
@@ -160,6 +160,7 @@ sessions_login=上次活动时间：
 sessions_host=IP地址
 sessions_lview=查看日志
 sessions_actions=动作..
+sessions_all=所有会议..
 sessions_logouts=同时显示注销的会话。
 sessions_state=州
 sessions_this=此登录名
@@ -138,6 +138,7 @@ unix_utable=允許的Unix用戶

 sessions_host=IP地址
 sessions_actions=動作..
+sessions_all=所有會議..
 sessions_logouts=還顯示註銷的會話。
 sessions_state=州
 sessions_this=此登錄名
@@ -28,10 +28,12 @@ if (@logins) {
 		}
 	my $html = &ui_columns_start([ $text{'sessions_host'},
 				       $text{'sessions_login'},
-				       $text{'sessions_state'} ]);
+				       $text{'sessions_state'},
+				       $text{'sessions_action'} ]);
 	my $open = 0;
 	foreach my $l (@logins) {
 		my $state;
+		my $candel = 0;
 		if ($l->[0] =~ /^\!/) {
 			$state = $text{'sessions_out'};
 			}
@@ -41,17 +43,36 @@ if (@logins) {
 			}
 		else {
 			$state = $text{'sessions_in'};
+			$candel = 1;
 			if ($l->[2] ne $ENV{'REMOTE_HOST'}) {
 				$open++;
 				$state = "<font color=orange>$state</font>";
 				}
 			}
 		$main::theme_allow_make_date = 1;
-		$html .= &ui_columns_row([ $l->[2],
-					   &make_date($l->[1]),
-					   $state ]);
+		my @links;
+		if (&foreign_available("webminlog")) {
+		      push(@links,
+		         &ui_link("@{[&get_webprefix()]}/webminlog/search.cgi?uall=1&mall=1&tall=1&wall=1&fall=1&sid=$l->[3]",
+		         $text{'sessions_lview'}))
+			}
+		if ($candel) {
+		      push(@links,
+		         &ui_link("@{[&get_webprefix()]}/acl/delete_session.cgi?id=$l->[3]&redirect_ref=1",
+		         $text{'sessions_kill'}))
+			}
+		$html .= &ui_columns_row([
+		          $l->[2],
+		          &make_date($l->[1]),
+		          $state,
+			  &ui_links_row(\@links) ]);
 		}
 	$html .= &ui_columns_end();
+	if (&foreign_available("acl")) {
+		$html .= &ui_link("@{[&get_webprefix()]}/acl/list_sessions.cgi",
+				  $text{'sessions_all'}, undef,
+				  "title=\"$text{'sessions_title'}\"");
+		}
 	push(@rv, { 'type' => 'html',
 		    'desc' => $text{'logins_title'},
 		    'open' => $open,
@@ -124,7 +124,7 @@ foreach my $d (&get_httpd_defines()) {
 		}
 	}
 while($line = <$fh>) {
-	chop;
+	$line =~ s/\r|\n//g;
 	$line =~ s/^\s*#.*$//g;
 	if ($line =~ /^\s*<\/(\S+)\s*(.*)>/) {
 		# end of a container directive. This can only happen in a
@@ -144,6 +144,11 @@ while($line = <$fh>) {
 		$altmod =~ s/^(\S+)_module$/mod_$1/g;
 		local $mpmmod = $mod;
 		$mpmmod =~ s/^mpm_//; $mpmmod =~ s/_module$//;
+		if ($mod eq "prefork") {
+			# Special case for all the prefork aliases
+			($mod, $altmod, $mpmmod) = ("mod_".$mod."_module",
+						    "mod_mpm_".$mod, $mod);
+			}
 		if (!$not && $httpd_modules{$mod} ||
 		    $not && !$httpd_modules{$mod} ||
 		    !$not && $httpd_modules{$altmod} ||
@@ -2168,23 +2173,6 @@ foreach my $l (@{$conf_lref}) {
 if ($conf_block_opening == $conf_block_closing) {

    my $conf_lvl = 0;
-    my $conf_prev_line;
-    my $conf_curr_line;
-    my $conf_virthost;
-    my @confs_separate =
-           (
-           	'Protocols',
-           	'SuexecUserGroup',
-           	'ServerName',
-           	'ScriptAlias',
-           	'DocumentRoot',
-           	'ErrorLog',
-           	'DirectoryIndex',
-           	'Alias',
-           	'RewriteEngine',
-           	'Fcgid',
-           	'SSL',
-           );
    foreach my $l (@{$conf_lref}) {
        my $indent_current = $indent x $conf_lvl;

@@ -2194,59 +2182,20 @@ if ($conf_block_opening == $conf_block_closing) {
            # Indent up next line if a new block
            if ($l =~ /(<[a-zA-Z]+).*>/) {
                $conf_lvl++;
-                if ($l =~ /(<VirtualHost).*>/) {
-                	$conf_virthost++;
-                	}
                }

            # Indent down next line if a closing block
            if ($l =~ /(<\/[a-zA-Z]+).*>/) {
                $conf_lvl--;

-                if ($l =~ /(<\/VirtualHost).*>/) {
-                	$conf_virthost--;
-                	}
-
                # Change current indent right now as it is a closing block
                $indent_current = $indent x $conf_lvl;
                }
            }

-        # Store previous and current lines
-        $conf_prev_line = &trim($conf_curr_line);
-        $conf_curr_line = &trim($l);
-
        # Replace beginning spaces with needed indent
        $l =~ s/^\s*/$indent_current/
            if($l);
-        
-
-        # Check if current line needs to be prepended
-        # with a new line for better readability
-        if (!$config{'format_config_lines'}) {
-            # Allow new line insertion only inside of VirtualHost block
-            if ($conf_virthost) {
-                # If current line is not part of a commented block
-                if ($conf_curr_line !~ /^\s*#/) {
-                    # If previous line is not already an empty line
-                    if (length($conf_prev_line)) {
-                        # If the previous line was something 
-                        # we want to take a break before and after match
-                        if (grep {$conf_curr_line =~ /^$_/} @confs_separate &&
-                            grep {$conf_prev_line !~ /^$_/} @confs_separate) {
-                        	# If not the first directive in VirtualHost
-                        	if($conf_prev_line !~ /(^<VirtualHost).*>/) {
-                            	$l = "\n$l"
-                        		}
-                            }
-                        # If current is opening block
-                        elsif ($conf_curr_line =~ /(^<[a-zA-Z]+).*>/) {
-                            $l = "\n$l";
-                            }
-                        }
-                    }
-                }
-            }
        }
    }
 }
@@ -217,15 +217,17 @@ push(@mems, @cmems);

 if ($in{'adddir'} && $in{'root'}) {
 	# Add a <Directory> section for the root
+	my @dmems;
+	if ($httpd_modules{'core'} < 2.4) {
+		push(@dmems, { 'name' => 'allow',
+			       'value' => 'from all' });
+		}
+	push(@dmems, { 'name' => 'Options',
+		       'value' => 'None' });
 	$dirsect = { 'name' => 'Directory',
 		     'value' => "\"$in{'root'}\"",
 		     'type' => 1,
-		     'members' => [
-			{ 'name' => 'allow',
-			  'value' => 'from all' },
-			{ 'name' => 'Options',
-			  'value' => 'None' },
-			],
+		     'members' => \@dmems,
 		   };
 	if ($httpd_modules{'core'} >= 2.4) {
 		# Apache 2.4+ needs a 'Require all granted' line
@@ -138,32 +138,34 @@ if ($access{'allow'} && $config{'allow_file'}) {
 	}

 # If there is an init script that runs an atd server, show status
-&foreign_require("init");
-my $init = defined(&get_init_name) ? &get_init_name() : undef;
-if ($access{'stop'} && $init) {
-	print &ui_hr();
-	print &ui_buttons_start();
+if (&foreign_available("init")) {
+	&foreign_require("init");
+	my $init = defined(&get_init_name) ? &get_init_name() : undef;
+	if ($access{'stop'} && $init) {
+		print &ui_hr();
+		print &ui_buttons_start();

-	# Running now?
-	my $r = &init::status_action($init);
-	if ($r == 1) {
-		print &ui_buttons_row("stop.cgi", $text{'index_stop'},
-				      $text{'index_stopdesc'});
+		# Running now?
+		my $r = &init::status_action($init);
+		if ($r == 1) {
+			print &ui_buttons_row("stop.cgi", $text{'index_stop'},
+					      $text{'index_stopdesc'});
+			}
+		elsif ($r == 0) {
+			print &ui_buttons_row("start.cgi", $text{'index_start'},
+					      $text{'index_startdesc'});
+			}
+
+		# Start at boot?
+		my $atboot = &init::action_status($init);
+		print &ui_buttons_row("bootup.cgi", $text{'index_boot'},
+				      $text{'index_bootdesc'}, undef,
+				      &ui_radio("boot", $atboot == 2 ? 1 : 0,
+						[ [ 1, $text{'yes'} ],
+						  [ 0, $text{'no'} ] ]));
+
+		print &ui_buttons_end();
 		}
-	elsif ($r == 0) {
-		print &ui_buttons_row("start.cgi", $text{'index_start'},
-				      $text{'index_startdesc'});
-		}
-
-	# Start at boot?
-	my $atboot = &init::action_status($init);
-	print &ui_buttons_row("bootup.cgi", $text{'index_boot'},
-			      $text{'index_bootdesc'}, undef,
-			      &ui_radio("boot", $atboot == 2 ? 1 : 0,
-					[ [ 1, $text{'yes'} ],
-					  [ 0, $text{'no'} ] ]));
-
-	print &ui_buttons_end();
 	}

 &ui_print_footer("/", $text{'index'});
@@ -5,17 +5,16 @@ do 'bandwidth-lib.pl';
 # Output HTML for editing security options for the acl module
 sub acl_security_form
 {
-print "<tr> <td><b>$text{'acl_setup'}</b></td> <td>\n";
-printf "<input type=radio name=setup value=1 %s> $text{'yes'}\n",
-	$o->{'setup'} ? 'checked' : '';
-printf "<input type=radio name=setup value=0 %s> $text{'no'}</td> </tr>\n",
-	$o->{'setup'} ? '' : 'checked';
+my ($o) = @_;
+print &ui_table_row($text{'acl_setup'},
+	&ui_yesno_radio("setup", $o->{'setup'}));
 }

 # acl_security_save(&options)
 # Parse the form for security options for the acl module
 sub acl_security_save
 {
-$_[0]->{'setup'} = $in{'setup'};
+my ($o) = @_;
+$o->{'setup'} = $in{'setup'};
 }

@@ -8,12 +8,12 @@
 BEGIN { push(@INC, ".."); };
 use WebminCore;
 &init_config();
-if (&foreign_installed("syslog-ng")) {
-	&foreign_require("syslog-ng", "syslog-ng-lib.pl");
+if (&foreign_installed("syslog-ng", 1) == 2) {
+	&foreign_require("syslog-ng");
 	$syslog_module = "syslog-ng";
 	}
 elsif (&foreign_installed("syslog")) {
-	&foreign_require("syslog", "syslog-lib.pl");
+	&foreign_require("syslog");
 	$syslog_module = "syslog";
 	}
 else {
@@ -124,54 +124,47 @@ elsif ($missingrule || !$sysconf) {
 if (@hours) {
 	# Show reporting form
 	print &ui_form_start("index.cgi");
-	print "<table>\n";
+	print &ui_table_start(undef, undef, 2);

-	print "<tr> <td><b>$text{'index_by'}</b></td>\n";
-	print "<td>",&ui_select("by", $in{'by'},
-		[ [ 'hour', $text{'index_hour'} ],
-		  [ 'day', $text{'index_day'} ],
-		  [ 'host', $text{'index_host'} ],
-		  [ 'proto', $text{'index_proto'} ],
-		  [ 'iport', $text{'index_iport'} ],
-		  [ 'oport', $text{'index_oport'} ],
-		  [ 'port', $text{'index_port'} ] ]),"</td>\n";
+	print &ui_table_row($text{'index_by'},
+		&ui_select("by", $in{'by'},
+			[ [ 'hour', $text{'index_hour'} ],
+			  [ 'day', $text{'index_day'} ],
+			  [ 'host', $text{'index_host'} ],
+			  [ 'proto', $text{'index_proto'} ],
+			  [ 'iport', $text{'index_iport'} ],
+			  [ 'oport', $text{'index_oport'} ],
+			  [ 'port', $text{'index_port'} ] ]));

-	print "<td><b>$text{'index_for'}</b></td>\n";
-	print "<td>",&ui_select("for", $in{'for'},
-		[ [ '', $text{'index_all'} ],
-		  [ 'host', $text{'index_forhost'} ],
-		  [ 'proto', $text{'index_forproto'} ],
-		  [ 'iport', $text{'index_foriport'} ],
-		  [ 'oport', $text{'index_foroport'} ] ]),"\n";
-	print &ui_textbox("what", $in{'for'} ? $in{'what'} : "", 20),
-	      "</td> </tr>\n";
+	print &ui_table_row($text{'index_for'},
+		&ui_select("for", $in{'for'},
+			[ [ '', $text{'index_all'} ],
+			  [ 'host', $text{'index_forhost'} ],
+			  [ 'proto', $text{'index_forproto'} ],
+			  [ 'iport', $text{'index_foriport'} ],
+			  [ 'oport', $text{'index_foroport'} ] ])." ".
+		&ui_textbox("what", $in{'for'} ? $in{'what'} : "", 20));

-	print "<tr> <td><b>$text{'index_from'}</b></td>\n";
-	print "<td colspan=4>",
+	print &ui_table_row($text{'index_from'},
 		&date_input($in{'from_day'}, $in{'from_month'},
-			    $in{'from_year'}, "from"),
-		&hourmin_input($in{'from_hour'}, "00", "from"),"</td> </tr>\n";
+			    $in{'from_year'}, "from").
+		&hourmin_input($in{'from_hour'}, "00", "from"));

-	print "<tr> <td><b>$text{'index_to'}</b></td>\n";
-	print "<td colspan=4>",
+	print &ui_table_row($text{'index_to'},
 		&date_input($in{'to_day'}, $in{'to_month'},
-			    $in{'to_year'}, "to"),
-		&hourmin_input($in{'to_hour'}, "00", "to"),"</td> </tr>\n";
+			    $in{'to_year'}, "to").
+		&hourmin_input($in{'to_hour'}, "00", "to"));

 	if (!%in) {
 		# Enable by default
 		$in{'low'} = 1;
 		}
-	print "<tr> <td></td> <td colspan=4>\n";
-	print &ui_checkbox("low", 1, $text{'index_low'}, $in{'low'});
-	print &ui_checkbox("resolv", 1, $text{'index_resolv'}, $in{'resolv'});
-	print "</td> </tr>\n";
+	print &ui_table_row("",
+		&ui_checkbox("low", 1, $text{'index_low'}, $in{'low'}).
+		&ui_checkbox("resolv", 1, $text{'index_resolv'}, $in{'resolv'}));

-	print "<tr> <td colspan=4>",
-		&ui_submit($text{'index_search'}),"</td> </td>\n";
-
-	print "</table>\n";
-	print &ui_form_end();
+	print &ui_table_end();
+	print &ui_form_end([ [ undef, $text{'index_search'} ] ]);
 	}
 elsif (!$missingrule && $sysconf) {
 	print "<b>$text{'index_none'}</b><p>\n";
@@ -344,37 +337,45 @@ if ($in{'by'}) {
 		@order = grep { $count{$_} } @order;
 		}
 	if (@order) {
-		print "<table width=100% cellpadding=0 cellspacing=0>\n";
-		print "<tr>\n";
-		print "<td><b>",$text{'index_h'.$in{'by'}},"</b></td>\n";
-		print "<td colspan=2><b>$text{'index_usage'}</b></td>\n";
-		print "</tr>\n";
-		$total = 0;
+		print &ui_columns_start([ $text{'index_h'.$in{'by'}},
+					  $text{'index_usage'},
+					  $text{'index_in'},
+					  $text{'index_out'},
+					  $text{'index_total'} ], 100, 0);
+		$itotal = $ototal = $total = 0;
 		foreach $k (@order) {
-			print "<tr>\n";
+			my @cols;
 			if ($in{'by'} eq 'hour') {
-				print "<td>",&make_date($k*60*60),"</td>\n";
+				push(@cols, &make_date($k*60*60));
 				}
 			elsif ($in{'by'} eq 'day') {
 				$date = &make_date_day($k*60*60);
-				print "<td>$date</td>\n";
+				push(@cols, $date);
 				}
 			else {
-				print "<td>$k</td>\n";
+				push(@cols, $k);
 				}
-			print "<td>";
-			printf "<img src=images/red.gif width=%d height=10>",
+			my $bar = sprintf
+				"<img src=images/red.gif width=%d height=10>",
 				$max ? int($width * $icount{$k}/$max)+1 : 1;
-			printf "<img src=images/blue.gif width=%d height=10>",
+			$bar .= sprintf
+				"<img src=images/blue.gif width=%d height=10>",
 				$max ? int($width * $ocount{$k}/$max)+1 : 1;
-			print "</td>";
-			print "<td>",&nice_size($count{$k}),"</td>\n";
+			push(@cols, $bar);
+			push(@cols, &nice_size($icount{$k}),
+				    &nice_size($ocount{$k}),
+				    &nice_size($count{$k}));
 			$total += $count{$k};
+			$itotal += $icount{$k};
+			$ototal += $ocount{$k};
 			print "</tr>\n";
+			print &ui_columns_row(\@cols);
 			}
-		print "<tr> <td colspan=2></td> <td><b>",
-		&nice_size($total),"</td> </tr>\n";
-		print "</table>\n";
+		print &ui_columns_row([ undef, undef,
+					&nice_size($itotal),
+					&nice_size($ototal),
+					&nice_size($total) ]);
+		print &ui_columns_end();
 		}
 	else {
 		print "<b>$text{'index_nomatch'}</b><p>\n";
@@ -41,6 +41,9 @@ index_efrom=Ongeldige begindatum en tyd
 index_eto=Ongeldige einddatum en tyd
 index_err=Verslag kon nie gegenereer word nie
 index_usage=Netwerkverkeer <font color=#ff0000>afgelaai</font> en <font color=#0000ff>opgelaai</font>
+index_in=Aflaai
+index_out=Laai op
+index_total=Totaal
 index_hhour=Uur
 index_hhost=host
 index_hday=dag
@@ -41,6 +41,9 @@ index_efrom=تاريخ ووقت البدء غير صالحين
 index_eto=تاريخ ووقت انتهاء غير صالحين
 index_err=فشل في إنشاء التقرير
 index_usage=تم تنزيل حركة مرور الشبكة <font color=#ff0000></font> و <font color=#0000ff>التي تم تحميلها</font>
+index_in=تحميل
+index_out=تحميل
+index_total=المجموع
 index_hhour=ساعة
 index_hhost=مضيف
 index_hday=يوم
@@ -41,6 +41,9 @@ index_efrom=Несапраўдная дата і час пачатку
 index_eto=Дата і час канца несапраўдныя
 index_err=Не атрымалася стварыць справаздачу
 index_usage=Сеткавы трафік <font color=#ff0000>загружаны</font> і <font color=#0000ff>загружаны</font>
+index_in=Спампаваць
+index_out=Загрузіць
+index_total=Усяго
 index_hhour=Гадзіна
 index_hhost=Гаспадар
 index_hday=Дзень
@@ -41,6 +41,9 @@ index_efrom=Невалидна начална дата и час
 index_eto=Невалидна крайна дата и час
 index_err=Неуспешно генериране на отчет
 index_usage=Мрежов трафик <font color=#ff0000>изтеглен</font> и <font color=#0000ff>качен</font>
+index_in=Изтегли
+index_out=Качване
+index_total=Обща сума
 index_hhour=час
 index_hhost=домакин
 index_hday=ден
@@ -0,0 +1,3 @@
+index_in=descarregar
+index_out=Carrega
+index_total=Total
@@ -41,6 +41,9 @@ index_efrom=Neplatné počáteční datum a čas
 index_eto=Neplatné datum a čas ukončení
 index_err=Generování zprávy se nezdařilo
 index_usage=Síťový provoz <font color=#ff0000>staženo</font> a <font color=#0000ff>uploaded</font>
+index_in=Stažení
+index_out=nahrát
+index_total=Celkový
 index_hhour=Hodina
 index_hhost=Hostitel
 index_hday=Den
@@ -41,6 +41,9 @@ index_efrom=Ugyldig startdato og tid
 index_eto=Ugyldig slutdato og tid
 index_err=Rapporten blev ikke genereret
 index_usage=Netværkstrafik <font color=#ff0000>downloadet</font> og <font color=#0000ff>uploadet</font>
+index_in=Hent
+index_out=Upload
+index_total=i alt
 index_hhour=Time
 index_hhost=Vært
 index_hday=Dag
@@ -0,0 +1,3 @@
+index_in=Download
+index_out=Hochladen
+index_total=Gesamt
@@ -41,6 +41,9 @@ index_efrom=Μη έγκυρη ημερομηνία και ώρα έναρξης
 index_eto=Μη έγκυρη ημερομηνία και ώρα λήξης
 index_err=Αποτυχία δημιουργίας αναφοράς
 index_usage=Η διακίνηση δικτύου <font color=#ff0000>κατέβασμα</font> και <font color=#0000ff>ανέβηκε</font>
+index_in=Κατεβάστε
+index_out=Μεταφόρτωση
+index_total=Σύνολο
 index_hhour=Ωρα
 index_hhost=Πλήθος
 index_hday=Ημέρα
@@ -41,6 +41,9 @@ index_efrom=Invalid starting date and time
 index_eto=Invalid ending date and time
 index_err=Failed to generate report
 index_usage=Network traffic <font color=#ff0000>downloaded</font> and <font color=#0000ff>uploaded</font>
+index_in=Download
+index_out=Upload
+index_total=Total
 index_hhour=Hour
 index_hhost=Host
 index_hday=Day
@@ -2,6 +2,9 @@ index_emod=El módulo Webmin $1 no está instalado en este sistema o no es compa
 index_esyslog=Ninguno de los módulos de registros del sistema está instalado en este sistema y es compatible con su sistema operativo. El módulo de monitoreo de ancho de banda no puede funcionar sin uno de ellos.
 index_setupdesc2=<b>Advertencia: este módulo registrará TODO el tráfico de red enviado o recibido en la interfaz seleccionada. Esto consumirá una gran cantidad de espacio en disco y tiempo de CPU en una conexión de red rápida.</b>
 index_other=Otro ..
+index_in=Descargar
+index_out=Subir
+index_total=Total

 setup_eiface=Nombre de interfaz faltante o no válido

@@ -41,6 +41,9 @@ index_efrom=Hasierako data eta ordua baliogabeak
 index_eto=Amaiera data eta ordua baliogabea
 index_err=Ezin izan da txostena sortu
 index_usage=Sareko trafikoa <font color=#ff0000>deskargatu</font> eta <font color=#0000ff>kargatuta</font>
+index_in=Deskargatu
+index_out=Kargatu
+index_total=Guztira
 index_hhour=Ordua
 index_hhost=ostalaria
 index_hday=eguna
@@ -41,6 +41,9 @@ index_efrom=تاریخ و زمان شروع نامعتبر است
 index_eto=تاریخ و زمان پایان نامعتبر
 index_err=گزارش ایجاد نشد
 index_usage=ترافیک شبکه <font color=#ff0000>بارگیری شده</font> و <font color=#0000ff>بارگذاری شد</font>
+index_in=دانلود
+index_out=بارگذاری
+index_total=جمع
 index_hhour=ساعت
 index_hhost=میزبان
 index_hday=روز
@@ -41,6 +41,9 @@ index_efrom=Virheellinen aloituspäivä ja -aika
 index_eto=Virheellinen lopetuspäivämäärä ja -aika
 index_err=Raportin luonti epäonnistui
 index_usage=Verkkoliikenne <font color=#ff0000>ladattu</font> ja <font color=#0000ff>ladattu</font>
+index_in=ladata
+index_out=Lataa
+index_total=Kaikki yhteensä
 index_hhour=Tunnin
 index_hhost=isäntä
 index_hday=Päivä
@@ -0,0 +1,3 @@
+index_in=Télécharger
+index_out=Télécharger
+index_total=Total
@@ -41,6 +41,9 @@ index_efrom=תאריך ושעה התחלה לא חוקיים
 index_eto=תאריך ושעת סיום לא חוקיים
 index_err=יצירת הדוח נכשלה
 index_usage=תעבורת רשת <font color=#ff0000>שהורדה</font> ו <font color=#0000ff>הועלה</font>
+index_in=הורד
+index_out=העלה
+index_total=סך הכל
 index_hhour=שעה
 index_hhost=מנחה
 index_hday=יום
@@ -1,3 +1,6 @@
 index_other=Ostali ..
+index_in=preuzimanje datoteka
+index_out=Učitaj
+index_total=Ukupno

 setup_eiface=Nedostaje ili nevaljano ime sučelja
@@ -1,4 +1,7 @@
 index_esyslog=A Rendszernaplók egyikét sem telepíti erre a rendszerre, és az operációs rendszer nem támogatja. A sávszélesség-figyelő modul nem működhet ezek nélkül.
 index_setupdesc2=<b>Figyelem - ez a modul naplózza az összes küldött vagy fogadott hálózati forgalmat a kiválasztott felületen. Ez nagy mennyiségű lemezterületet és CPU-időt fog igénybe venni egy gyors hálózati kapcsolaton.</b>
+index_in=Letöltés
+index_out=Feltöltés
+index_total=Teljes

 setup_eiface=Hiányzó vagy érvénytelen felület neve
@@ -41,6 +41,9 @@ index_efrom=Data e ora di inizio non valide
 index_eto=Data e ora di fine non valide
 index_err=Generazione del rapporto non riuscita
 index_usage=Traffico di rete <font color=#ff0000>scaricato</font> e <font color=#0000ff>caricato</font>
+index_in=Scarica
+index_out=Caricamento
+index_total=Totale
 index_hhour=Ora
 index_hhost=Ospite
 index_hday=Giorno
@@ -41,6 +41,9 @@ index_efrom=無効な開始日時
 index_eto=無効な終了日時
 index_err=レポートを生成できませんでした
 index_usage=ネットワークトラフィック<font color=＃ff0000>ダウンロード済み</font>および<font color=＃0000ff>アップロード済み</font>
+index_in=ダウンロード
+index_out=アップロード
+index_total=合計
 index_hhour=時
 index_hhost=ホスト
 index_hday=日
@@ -41,6 +41,9 @@ index_efrom=유효하지 않은 시작 날짜 및 시간
 index_eto=유효하지 않은 종료 날짜 및 시간
 index_err=보고서를 생성하지 못했습니다
 index_usage=네트워크 트래픽 <font color=#ff0000>다운로드</font> 및 <font color=#0000ff>업로드</font>
+index_in=다운로드
+index_out=업로드
+index_total=총
 index_hhour=시
 index_hhost=주최자
 index_hday=일
@@ -41,6 +41,9 @@ index_efrom=Netinkama pradžios data ir laikas
 index_eto=Netinkama pabaigos data ir laikas
 index_err=Nepavyko sugeneruoti ataskaitos
 index_usage=Tinklo srautas <font color=#ff0000>atsisiųstas</font> ir <font color=#0000ff>įkeltas</font>
+index_in=parsisiųsti
+index_out=Įkelti
+index_total=Iš viso
 index_hhour=Valanda
 index_hhost=Priimančioji
 index_hday=Diena
@@ -41,6 +41,9 @@ index_efrom=Nederīgs sākuma datums un laiks
 index_eto=Nederīgs beigu datums un laiks
 index_err=Neizdevās ģenerēt pārskatu
 index_usage=Tīkla trafiks <font color=#ff0000>lejupielādēts</font> un <font color=#0000ff>augšupielādēts</font>
+index_in=Lejupielādēt
+index_out=Augšupielādēt
+index_total=Kopā
 index_hhour=Stunda
 index_hhost=Saimnieks
 index_hday=Diena
@@ -0,0 +1,3 @@
+index_in=Muat turun
+index_out=Muat naik
+index_total=Jumlah
@@ -41,6 +41,9 @@ index_efrom=Data u ħin tal-bidu mhux validi
 index_eto=Data u ħin li jispiċċaw mhux validi
 index_err=Naqas milli jiġġenera rapport
 index_usage=It-traffiku tan-netwerk <font color=#ff0000>jitniżżel</font> u <font color=#0000ff>imtella '</font>
+index_in=Niżżel
+index_out=Upload
+index_total=Total
 index_hhour=Siegħa
 index_hhost=Ospitanti
 index_hday=Jum
@@ -0,0 +1,3 @@
+index_in=Downloaden
+index_out=Uploaden
+index_total=Totaal
@@ -0,0 +1,3 @@
+index_in=nedlasting
+index_out=Laste opp
+index_total=Total
@@ -0,0 +1,3 @@
+index_in=Pobierać
+index_out=Wgrywać
+index_total=Całkowity
@@ -41,6 +41,9 @@ index_efrom=Data e hora de início inválidas
 index_eto=Data e hora de término inválidas
 index_err=Falha ao gerar o relatório
 index_usage=Tráfego de rede <font color=#ff0000>baixado</font> e <font color=#0000ff>carregado</font>
+index_in=Download
+index_out=Carregar
+index_total=Total
 index_hhour=Hora
 index_hhost=Hospedeiro
 index_hday=Dia
@@ -41,6 +41,9 @@ index_efrom=Data e hora de início inválidas
 index_eto=Data e hora de término inválidas
 index_err=Falha ao gerar o relatório
 index_usage=Tráfego de rede <font color=#ff0000>baixado</font> e <font color=#0000ff>carregado</font>
+index_in=Download
+index_out=Carregar
+index_total=Total
 index_hhour=Hora
 index_hhost=Hospedeiro
 index_hday=Dia
@@ -41,6 +41,9 @@ index_efrom=Data și ora de începere nevalide
 index_eto=Data și ora de încheiere nevalide
 index_err=Eroare la generarea raportului
 index_usage=Traficul de rețea <font color=#ff0000>descărcat</font> și <font color=#0000ff>încărcat</font>
+index_in=Descarca
+index_out=Încărcați
+index_total=Total
 index_hhour=Ora
 index_hhost=Gazdă
 index_hday=Zi
@@ -41,6 +41,9 @@ index_efrom=Неверная дата и время начала
 index_eto=Неправильная дата и время окончания
 index_err=Не удалось сгенерировать отчет
 index_usage=Сетевой трафик <font color=#ff0000>загружен</font> и <font color=#0000ff>загружен</font>
+index_in=Скачать
+index_out=Загрузить
+index_total=Общее
 index_hhour=Час
 index_hhost=хозяин
 index_hday=День
@@ -41,6 +41,9 @@ index_efrom=Neplatný dátum a čas začiatku
 index_eto=Neplatný dátum a čas ukončenia
 index_err=Nepodarilo sa vygenerovať prehľad
 index_usage=Sieťový prenos <font color=#ff0000>stiahnutý</font> a <font color=#0000ff>uploaded</font>
+index_in=Stiahnuť ▼
+index_out=Nahrať
+index_total=Celkom
 index_hhour=hodina
 index_hhost=Hostiteľ
 index_hday=deň
@@ -41,6 +41,9 @@ index_efrom=Neveljaven začetni datum in ura
 index_eto=Neveljaven datum in čas zaključka
 index_err=Poročila ni bilo mogoče ustvariti
 index_usage=Omrežni promet <font color=#ff0000>prenesen</font> in <font color=#0000ff>naložen</font>
+index_in=Prenesi
+index_out=Naloži
+index_total=Skupaj
 index_hhour=Ura
 index_hhost=Gostitelj
 index_hday=Dan
@@ -1,4 +1,7 @@
 index_setupdesc2=<b>Varning - den här modulen loggar ALL nätverkstrafik som skickats eller mottagits i det valda gränssnittet. Detta kommer att konsumera en stor mängd diskutrymme och CPU-tid på en snabb nätverksanslutning.</b>
 index_other=Övrig ..
+index_in=Ladda ner
+index_out=Ladda upp
+index_total=Total

 setup_eiface=Saknas eller ogiltigt gränssnittsnamn
@@ -41,6 +41,9 @@ index_efrom=วันที่และเวลาเริ่มต้นไ
 index_eto=วันที่และเวลาสิ้นสุดไม่ถูกต้อง
 index_err=ไม่สามารถสร้างรายงาน
 index_usage=การรับส่งข้อมูลเครือข่าย <font color=#ff0000>ดาวน์โหลด</font> และ <font color=#0000ff>อัปโหลด</font>
+index_in=ดาวน์โหลด
+index_out=ที่อัพโหลด
+index_total=ทั้งหมด
 index_hhour=ชั่วโมง
 index_hhost=เจ้าภาพ
 index_hday=วัน
@@ -41,6 +41,9 @@ index_efrom=Geçersiz başlangıç tarihi ve saati
 index_eto=Geçersiz bitiş tarihi ve saati
 index_err=Rapor oluşturulamadı
 index_usage=Ağ trafiği <font color=#ff0000>indirildi</font> ve <font color=#0000ff>yüklendi</font>
+index_in=İndirmek
+index_out=Yüklemek
+index_total=Toplam
 index_hhour=Saat
 index_hhost=evsahibi
 index_hday=Gün
@@ -41,6 +41,9 @@ index_efrom=Недійсна дата і час початку
 index_eto=Недійсна дата та час закінчення
 index_err=Не вдалося створити звіт
 index_usage=Мережевий трафік <font color=#ff0000>завантажений</font> та <font color=#0000ff>завантажений</font>
+index_in=Завантажити
+index_out=Завантажити
+index_total=Всього
 index_hhour=Година
 index_hhost=Господар
 index_hday=День
@@ -41,6 +41,9 @@ index_efrom=غلط آغاز اور تاریخ
 index_eto=غلط ختم ہونے کی تاریخ اور وقت
 index_err=رپورٹ تیار کرنے میں ناکام
 index_usage=Network traffic <font color=#ff0000>downloaded</font> and <font color=#0000ff>uploaded</font>
+index_in=ڈاؤن لوڈ کریں
+index_out=اپ لوڈ کریں۔
+index_total=کل
 index_hhour=قیامت
 index_hhost=میزبان
 index_hday=دن
@@ -41,6 +41,9 @@ index_efrom=Ngày và giờ bắt đầu không hợp lệ
 index_eto=Ngày và thời gian kết thúc không hợp lệ
 index_err=Không thể tạo báo cáo
 index_usage=Lưu lượng truy cập mạng <font color=#ff0000>đã tải xuống</font> và <font color=#0000ff>đã tải lên</font>
+index_in=Tải xuống
+index_out=Tải lên
+index_total=Toàn bộ
 index_hhour=Giờ
 index_hhost=Tổ chức
 index_hday=ngày
@@ -41,6 +41,9 @@ index_efrom=无效的开始日期和时间
 index_eto=无效的结束日期和时间
 index_err=未能生成报告
 index_usage=网络流量<font color=＃ff0000>已下载</font>和<font color=＃0000ff>已上传</font>
+index_in=下载
+index_out=上传
+index_total=全部的
 index_hhour=小时
 index_hhost=主办
 index_hday=天
@@ -41,6 +41,9 @@ index_efrom=無效的開始日期和時間
 index_eto=無效的結束日期和時間
 index_err=未能生成報告
 index_usage=網絡流量<font color=＃ff0000>已下載</font>和<font color=＃0000ff>已上傳</font>
+index_in=下載
+index_out=上傳
+index_total=全部的
 index_hhour=小時
 index_hhost=主辦
 index_hday=天
--- a/Show More
+++ b/Show More