Commit Graph

11677 Commits

Author SHA1 Message Date
Jamie Cameron
245709dca0 Only iterate over the last octet network 2017-05-04 23:36:23 -07:00
Jamie Cameron
77c84a7539 Handle case where encoding module is missing 2017-05-03 20:43:38 -07:00
Jamie Cameron
9716326acd Merge pull request #543 from qooob/patch-13
Make editor respect file's initial encoding: Viewer
2017-05-03 20:41:25 -07:00
Jamie Cameron
89331739f3 Merge pull request #545 from amishxda/master
add noportcheck to not to check if port is in use
2017-05-03 19:03:32 -07:00
Amish
2b0e28852e add noportcheck to not to check if port is in use
add variable noportcheck to not to check if port is in use
2017-05-03 14:22:10 +05:30
Jamie Cameron
12ef84ff3e Merge pull request #544 from qooob/patch-14
Make editor respect file's initial encoding: Saver
2017-05-02 21:58:39 -07:00
Ilia Rostovtsev
85e80edf91 Make editor respect file's initial encoding: Saver
An addition to `edit_file.cgi` commit.
2017-05-02 13:26:30 +03:00
Ilia Rostovtsev
8e44c145b9 Make editor respect file's initial encoding: Viewer
This patch will make sure that user, will be able to READ files with different encodings properly and also, will be able to SAVE them without changing the initial encoding.

This awesomeness requires dependencies. However, RHEL has it installed by default but not Debian. New Webmin release should make sure to require/pull dependent packages:

For RHEL: `perl-Encode-Detect`
For Debian: `libencode-detect-perl`

P.S. We should no let user to set non-UTF8 locale anymore. All languages should be displayed unambiguously, like Google does, (Русский, svenska, Deutsche, English (United States) .. ).
2017-05-02 13:23:34 +03:00
Jamie Cameron
a1f53a5a47 Merge pull request #541 from qooob/patch-12
For the future so user could choose encoding in file editor window
2017-05-01 22:27:37 -07:00
Ilia Rostovtsev
b91a867744 For the future so user could choose encoding in file editor window
I think I did it correctly, theoretically looks good. I just don't know if `$in{'encoding'}` has to be escaped anyhow. Other than that, it seems ok, as when user passes encoding, it will tell the script to use one.
2017-05-01 20:49:17 +03:00
Jamie Cameron
dd5fa1295b Merge pull request #540 from qooob/patch-11
Typo, missing ;
2017-05-01 10:24:27 -07:00
Ilia Rostovtsev
6bb5b79d80 Typo, missing ; 2017-05-01 20:12:29 +03:00
Jamie Cameron
1494007307 Merge pull request #539 from qooob/patch-10
Fix for folks not using UTF-8 #52019
2017-05-01 10:09:01 -07:00
Ilia Rostovtsev
edd32a0819 Here is the fix for folks not using UTF-8 #52019
This is more like server side thing.

We expect that everything that is coming from the editor (CodeMirror) is always UTF-8 encoded. In case, global encoding is set to something different, then UTF-8, we must use the user encoding to properly encode the data and have correct file encoding after all.

[#52019](https://www.virtualmin.com/node/52019)
2017-05-01 20:04:27 +03:00
Jamie Cameron
79877df57c Escape output from the init script 2017-04-29 16:56:58 -07:00
Jamie Cameron
641053c5b2 config option fixes 2017-04-29 16:27:39 -07:00
Jamie Cameron
b56761c41b permissons fixes 2017-04-29 16:27:22 -07:00
Jamie Cameron
580578ecbc Use proper version comparison function 2017-04-29 16:26:24 -07:00
Jamie Cameron
813e6dd4ad Use proper version comparison function, so that 2.3 is below 2.11 https://sourceforge.net/p/webadmin/bugs/4937/ 2017-04-29 15:48:03 -07:00
Jamie Cameron
49aa15c138 Use correct hostname in SNI for SSL requests https://virtualmin.com/node/51969 2017-04-29 14:59:03 -07:00
Jamie Cameron
640bc8495c IPv6 addresses need [ ] in the URL https://sourceforge.net/p/webadmin/bugs/4949/ 2017-04-27 23:23:14 -07:00
Jamie Cameron
36ed9b2212 Merge branch 'master' of git@github.com:webmin/webmin 2017-04-27 09:05:27 -07:00
Jamie Cameron
37f0eb519e Detect the browser seen on the galaxy s6 https://www.virtualmin.com/node/51987 2017-04-27 09:04:52 -07:00
Jamie Cameron
0d251ff103 Merge pull request #536 from qooob/patch-9
To look consistent in Account Functions in Usermin
2017-04-25 17:10:22 -07:00
Jamie Cameron
b99637bab3 Merge pull request #535 from qooob/patch-8
When there is no value we need to return 0 but not empty
2017-04-25 17:09:52 -07:00
Jamie Cameron
801a71d172 Merge pull request #344 from qooob/patch-30
Respect module info
2017-04-25 16:55:24 -07:00
Ilia Rostovtsev
d5aac92059 To look consistent in Account Functions in Usermin
Just to beautify the string to look like the rest of them in `Account Functions`.
2017-04-25 14:10:19 +03:00
Ilia Rostovtsev
55d98674b1 When there is no value we need to return 0 but not empty
As reported here, it's true:

https://github.com/qooob/authentic-theme/issues/726
2017-04-25 10:56:58 +03:00
Jamie Cameron
6f0b58ee4d new version bump 2017-04-23 22:33:25 -07:00
Jamie Cameron
63da3c8e39 Fix dupe string 2017-04-23 22:32:41 -07:00
Jamie Cameron
1b21a404bf Merge branch 'master' of git@github.com:webmin/webmin 2017-04-23 20:25:03 -07:00
Jamie Cameron
464bc50e62 Use new API to keep chroot shell 2017-04-23 20:24:56 -07:00
Jamie Cameron
406b3f7bdc Add new option to keep the current shell 2017-04-23 20:20:56 -07:00
Joe Cooper
8b7af771f8 Merge pull request #533 from swelljoe/master
no warnings redefine to prevent confusing warnings
2017-04-23 19:50:12 -05:00
Joe cooper
aa71f4d8e1 no warnings redefine to prevent confusing warnings 2017-04-23 19:41:56 -05:00
Jamie Cameron
a37185b170 Fix code that detects support for mysql.hosts table https://sourceforge.net/p/webadmin/bugs/4945/ 2017-04-23 14:17:51 -07:00
Jamie Cameron
97e40304ac Fix missing space 2017-04-19 22:30:59 -07:00
Jamie Cameron
77e6bc2a00 HTML outside the head or body is too dangerous to include 2017-04-19 18:41:09 -07:00
Jamie Cameron
eaf63ebc48 chroot options for shell module 2017-04-19 13:54:16 -07:00
Jamie Cameron
2c194271fc ref and use columns can collide https://sourceforge.net/p/webadmin/bugs/4939/ 2017-04-18 23:25:21 -07:00
Jamie Cameron
7c0b0f0a9f Merge branch 'master' of git@github.com:webmin/webmin 2017-04-18 22:07:07 -07:00
Jamie Cameron
fe8eb50f2d Fix a couple of small bugs on my system 2017-04-18 22:01:32 -07:00
Jamie Cameron
cb2d221508 Merge pull request #476 from qooob/patch-2
Enable editor for .XSL files
2017-04-17 18:19:54 -07:00
Jamie Cameron
c65de713f7 Merge pull request #531 from qooob/patch-7
path in bookmarks must be URI friendly
2017-04-16 09:45:44 -07:00
Ilia Rostovtsev
2ff3afea6a path in bookmarks must be URI friendly 2017-04-16 09:37:49 +03:00
Jamie Cameron
25d7fe4299 Support both smtpd_recipient_restrictions and smtpd_relay_restrictions, and fix labelling https://sourceforge.net/p/webadmin/bugs/4930/ 2017-04-15 21:30:59 -07:00
Jamie Cameron
42a50ab078 smtp_skip_4xx_greeting is deprecated 2017-04-13 21:27:57 -07:00
Jamie Cameron
bc0eea7a01 onError is also a JS reference 2017-04-11 16:17:30 -07:00
Jamie Cameron
34dbddd616 Check allowed paths in some more cases 2017-04-11 10:38:04 -07:00
Jamie Cameron
785a1186c6 Escape text of command being run 2017-04-11 10:30:57 -07:00