Commit Graph

12376 Commits

Author SHA1 Message Date
Jamie Cameron
8e816fc962 Merge pull request #746 from gnadelwartz/patch-5
base_version() fix possible suffix in webnin version
2017-12-26 13:21:46 -08:00
Jamie Cameron
c168e949b1 Merge pull request #747 from gnadelwartz/patch-6
fix update-from-repo version postfix typo from . to -
2017-12-26 13:14:59 -08:00
Kay Marquardt
6a5ce9e43d fix version postfix typo from . to -
in update-from-repo.sh I add a postfix from latest commit date to version number so you know its not the offical version and whats the latest commit in.  I wanted to use - as seperator but used . by accident.
2017-12-26 20:41:51 +01:00
Kay Marquardt
cdc6efce95 base_verion() fix possible suffix in webnin version
In update-from-repo.sh I add - MMDD.HHMM to version, this gives 2 warnings:

Argument "1.871-1223.1116" isn't numeric in sprintf at /var/packages/webmin/target/webmin/webmin/webmin-lib.pl line 767.
Argument "1.871-1223.1116" isn't numeric in numeric gt (>) at /var/packages/webmin/target/webmin/webmin/webmin-lib.pl line 1216.

I added a small regex to filter out (possible) postfixes from version number, but does not change official version number:
 s/[-a-z:_].*//gi

only done in one place in case you say don't care about, its working, even the warning is shown :-)
2017-12-26 20:36:39 +01:00
Jamie Cameron
ce5d99fe6b Escape uploaded path 2017-12-25 23:09:44 -08:00
Jamie Cameron
645a2d3067 Force use of correct filename https://github.com/webmin/webmin/issues/726 2017-12-25 22:57:06 -08:00
Jamie Cameron
eb2722f560 Multiple aliases files are returned https://github.com/webmin/webmin/issues/741 2017-12-25 18:05:37 -08:00
Jamie Cameron
cc5c9f5594 Bulgarian update 2017-12-24 23:58:21 -08:00
Jamie Cameron
b30868ce16 Fix twofactor support for LDAP webmin users https://sourceforge.net/p/webadmin/bugs/5070/ 2017-12-24 21:59:51 -08:00
Jamie Cameron
6862d147f1 Ignore collected info that is too old https://github.com/webmin/webmin/issues/735 2017-12-24 19:03:24 -08:00
Jamie Cameron
80510b63f6 fix bogomips regexp 2017-12-24 16:54:35 -08:00
Jamie Cameron
ae50a280b8 Merge pull request #734 from gnadelwartz/patch-2
fix :CPU info is now displayed, even no `cpu mhz` entry is availible in `/proc/cpuinfo`
2017-12-24 16:51:36 -08:00
Jamie Cameron
1b833bb4c0 add nolog config directive to skip logging for some regexps https://github.com/webmin/webmin/issues/740 2017-12-24 16:06:06 -08:00
Jamie Cameron
efb462f0ac Fix perl warning https://github.com/webmin/webmin/issues/736 2017-12-24 15:56:25 -08:00
Kay Marquardt
0b10b7ef38 add BogoMIPS to model name if no cpu mhz availible 2017-12-24 10:46:07 +01:00
Jamie Cameron
00f3ce153a Merge branch 'master' of git@github.com:webmin/webmin 2017-12-23 23:12:50 -08:00
Jamie Cameron
ea6444e292 Escape mount points 2017-12-23 23:03:11 -08:00
Jamie Cameron
8b099ca698 Merge pull request #733 from gnadelwartz/patch-1
try dstat if vmstat is not availible
2017-12-23 12:16:35 -08:00
Kay Marquardt
71b9136d2c fix displaying processor model on system page
linux `os_get_cpu_info()` returns onyl info about CPU if  CPU speed is found, this leads to displaying no CPU Info at all if  `/proc/cpuinfo` has no info about CPU speed!

Changes this to check for `model name` which is the minimum requeired Info to show CPU Info
2017-12-23 20:07:38 +01:00
Jamie Cameron
f218c2bba8 Extract out function for getting the temp dir 2017-12-22 15:17:04 -08:00
Jamie Cameron
c7980e956a Cleanup environment before running certbot 2017-12-22 15:05:07 -08:00
Jamie Cameron
e56415592d Merge branch 'master' of git@github.com:webmin/webmin 2017-12-22 14:19:23 -08:00
Kay Marquardt
387be1d100 try dstat if vmstat is not availible
extends sub `get_cpu_io_usage()` to test if  `vmstat` or `dstat` is availible to get CPU usage.
2017-12-22 23:11:19 +01:00
Jamie Cameron
d531855269 Escape protected directory names 2017-12-22 11:31:03 -08:00
Jamie Cameron
20ba1a9a81 Format and escaping cleanup 2017-12-21 23:18:32 -08:00
Jamie Cameron
b5a168a905 Merge pull request #729 from gnadelwartz/master
update-from-repo works now on Synolgy and HP-UX
2017-12-21 16:50:38 -08:00
Jamie Cameron
2643b754ac Set the correct MIME type and filename https://github.com/webmin/webmin/issues/726 2017-12-21 16:48:05 -08:00
KayM
98cc5d1e69 more precise check for /etc/webmin/miniserv.conf 2017-12-21 23:01:47 +01:00
KayM
3a5db83f94 use /etc/webmin if exist 2017-12-21 22:33:11 +01:00
KayM
bf285758bc limit find -maxdepth 6, grep webmin/usermin 2017-12-21 22:20:48 +01:00
KayM
7afd6c815c replace tabs by space 2017-12-21 21:19:36 +01:00
KayM
e9057092df update-from-repo works now on synology and HP-UX 2017-12-21 20:45:58 +01:00
Jamie Cameron
626ca4fba6 Remove successful preload error message https://sourceforge.net/p/webadmin/bugs/5069/ 2017-12-20 15:55:05 -08:00
Jamie Cameron
a5d4c13cd6 Remove broken link 2017-12-19 15:54:07 -08:00
Jamie Cameron
7c678b8c84 use post forms and standarding ui functions https://www.virtualmin.com/node/41315 2017-12-19 15:43:19 -08:00
Jamie Cameron
7dfa97c6ca Pass original URL to remote server 2017-12-19 14:53:31 -08:00
Jamie Cameron
0bb6af725e Fix restore command use for testing https://sourceforge.net/p/webadmin/bugs/5060/ 2017-12-18 23:25:18 -08:00
Jamie Cameron
df4981e34a German translation updates from Raymond Vetter 2017-12-17 18:12:57 -08:00
Jamie Cameron
8a01830d52 Sometimes the backslash is legit https://sourceforge.net/p/webadmin/bugs/5056/ 2017-12-16 12:10:01 -08:00
Jamie Cameron
aa8b6f9278 Bulgarian update 2017-12-16 12:03:13 -08:00
Jamie Cameron
2142b3c7d6 Fix form in table ordering https://sourceforge.net/p/webadmin/bugs/5066/ 2017-12-16 09:41:43 -08:00
Jamie Cameron
39812f8b83 Fix form in table ordering https://sourceforge.net/p/webadmin/bugs/5066/ 2017-12-16 09:39:40 -08:00
Jamie Cameron
473f383883 Simfs mounts look like BIND mounts https://www.virtualmin.com/node/54704 2017-12-16 09:36:40 -08:00
Jamie Cameron
e041321153 Merge branch 'master' of git@github.com:webmin/webmin 2017-12-15 22:44:44 -08:00
Jamie Cameron
a6d174fa3c Fix hidden opener in old old theme https://sourceforge.net/p/webadmin/bugs/4989/ 2017-12-15 22:44:01 -08:00
Jamie Cameron
349786211d Merge pull request #723 from ChriZathens/patch-14
Update gr
2017-12-12 21:20:11 -08:00
Jamie Cameron
a86b2c70b8 Merge pull request #722 from arndttob/patch-1
Typo: Scalar should be used
2017-12-12 20:55:01 -08:00
ChriZathens
59b33881dc Update gr
translated some strings
2017-12-12 12:10:24 +02:00
arndttob
3a7d8b6dad Typo: Scalar should be used 2017-12-12 11:04:17 +01:00
Jamie Cameron
fa81a4ebfe Ensure auto-whitelist is read as the correct user 2017-12-11 23:25:03 -08:00