maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
3,946 Commits 6 Branches 188 Tags
e64e8cafa66145c58651f97bae20a5e8bfd97321
Commit Graph

174 Commits

Author SHA1 Message Date
Michael Kaufmann
e64e8cafa6 define logger constants in logger class 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-26 15:51:26 +01:00
Michael Kaufmann
7416a41a42 get rid of most of the checkstyle warnings 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-24 13:50:45 +01:00
Michael Kaufmann
4cd005051b fixed last remaining function calls which are class-methods now 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-23 19:34:32 +01:00
Michael Kaufmann
0401e6971a Revert "refactor global array" 
This reverts commit c5a58e3f36.
 2018-12-22 08:15:31 +01:00
Michael Kaufmann
7e39a7bc60 Revert "refactor global array" 
This reverts commit 370ccbdb74.
 2018-12-22 08:15:31 +01:00
Michael Kaufmann
370ccbdb74 refactor global array 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 20:51:44 +01:00
Michael Kaufmann
c5a58e3f36 refactor global array 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 20:31:17 +01:00
Michael Kaufmann
7c68fa7bd0 fixed a few functions I've missed 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 19:16:49 +01:00
Michael Kaufmann
7563907df5 convert html-related functions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 18:31:06 +01:00
Michael Kaufmann
1b090377ee even more function to class conversion 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 17:41:22 +01:00
Michael Kaufmann
0a28ef2af6 minor changes for unit-tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 16:32:44 +01:00
Michael Kaufmann
c0e89bbd05 refactor UI functions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 11:22:03 +01:00
Michael Kaufmann
5888927239 get rid of more functions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-20 12:38:18 +01:00
Michael Kaufmann
26510f0745 removing more ticket-stuff; update all unit-tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 19:42:50 +01:00
Michael Kaufmann
c4024c8107 use correct makeCorrect(Dir/File) everywhere 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 17:13:41 +01:00
Michael Kaufmann
8e84a4ff44 correct use of Database use 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 16:57:03 +01:00
Michael Kaufmann
6329042d40 use namespaces in modules 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-18 13:45:05 +01:00
Michael Kaufmann
2da59f1055 do not rely on fixed order of import-file for domains-import; first line now has to be the names of the api-parameters used for Domains.add, see https://api.froxlor.org/doc/0.10.0/#v-Domains, fixes #544 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-02 20:06:53 +01:00
Michael Kaufmann
8291c7d2ab Allow access to webserver logs via weinterface, if activated for customer; todo: view more content dynamically; fixes #603 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-01 13:33:08 +01:00
Michael Kaufmann
f198833f8c Merge remote-tracking branch 'origin/master' into 0.10.0 2018-06-21 08:12:00 +02:00
Daniel Reichelt
2ba4137e7d fix triggering an LE CSR when changing www on a main domain 
Prior to this, LE CSRs were triggered only when the wwwserveralias was
changed on alias domains, but not on main domains.

Fixes #526
 2018-06-05 06:51:20 +02:00
Daniel Reichelt
72835c56ad trim trailing whitespace 2018-06-05 06:51:10 +02:00
Michael Kaufmann
c1e62e6be7 get rid of serialization completely to avoid possible code execution, fixes #555 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-29 15:47:41 +02:00
Michael Kaufmann (d00p)
392db944a2 started work in SubDomains-ApiCommand; minor fixes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-27 10:34:37 +01:00
Michael Kaufmann (d00p)
81602f17be add Domains api module 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 14:44:48 +01:00
Michael Kaufmann (d00p)
27f8c8b438 show domains of disabled customers also as disabled 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 11:49:15 +01:00
Michael Kaufmann (d00p)
372ab5d9c8 add domain flag to avoid generation of nginx try_files directive in webroot which is not suitable for some applications; fixes #461 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 08:12:58 +01:00
Michael Kaufmann (d00p)
5612720342 only let admin select php-configs that the customer is allowed to use to avoid unwanted php-config changes when customer edits domain, refs #514 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-09 13:57:23 +01:00
Michael Kaufmann (d00p)
f49cb81e49 disable wildcard-usage with Let's Encrypt as ACME-v2 only supports the dns-01 challenge for now (pity) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-09 15:33:23 +01:00
Michael Kaufmann (d00p)
b2b9d4e31a add missing setting-strings for new acme-version setting; allow using let's encrypt with wildcard-alias when using ACME-v2 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-09 14:56:41 +01:00
Michael Kaufmann (d00p)
eaa10ce6a5 add option to update php-configs for all subdomains when editing a domain as admin (default: yes) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-08 15:31:27 +01:00
Michael Kaufmann (d00p)
b849a5f29a preparations for php-config select for customers 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-08 13:59:30 +01:00
Michael Kaufmann (d00p)
15b62aae04 add inserttask for config regeneration and fix aliasdomain NULL value if empty, fixes #478 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-10-06 09:29:49 +02:00
Michael Kaufmann (d00p)
bab982a0e6 add http2 support for froxlor-vhost and per-domain 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-08-24 13:21:21 +02:00
Michael Kaufmann (d00p)
dae233dd05 allow adding domains with multiple dashes, that are NOT punycode (xn--) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-06-04 09:17:31 +02:00
Daniel Reichelt
ec1bd6e19a add OCSP stapling support for apache2 and nginx 2017-04-11 17:09:34 +02:00
Michael Kaufmann (d00p)
c6962b0992 fix variable-typo to make phpenabled-flag work when adding new domains, thx to micw 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-16 08:43:54 +01:00
Michael Kaufmann
3d4b56b233 Merge branch 'master' into master 2016-12-11 08:19:16 +01:00
Michael Kaufmann (d00p)
54200427ab fix undefined variable when deleting a customer-domain as admin 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-24 10:40:28 +01:00
Dominic Schallert
b0326c640c Feature #1671 Checkbox to enable/disable PHP (vhost settings + fpm pool) for an entire vhost 2016-11-13 14:41:39 +01:00
Michael Kaufmann (d00p)
4274b8a737 fix setting of hsts values when security questions are asked; insert config-rebuild task if only hsts stuff changes; fix undefined variable regarding alias domain 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-03 10:52:33 +01:00
Michael Kaufmann (d00p)
ec6ddd054d remove certificate entry for LE if admin/customer disables LE for a domain 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-31 11:18:40 +01:00
Michael Kaufmann (d00p)
884b2ed913 various fixes for idn converted domains + fix undefined index alias when editing a domain with alias 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-25 12:24:57 +02:00
Michael Kaufmann (d00p)
d198729222 make the hsts domain settings actually saveable; add hsts domain settings for customer-panel; refs #1660 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-07 11:48:13 +02:00
Michael Kaufmann
074d85b40f Merge pull request #390 from FliegenKLATSCH/patch-1 
fix group by clause to be more compliant with mysql 5.7
 2016-10-04 09:35:24 +02:00
FliegenKLATSCH
2e198dbe5c fix default value for domain reg./term. date 2016-09-26 21:08:39 +02:00
Michael Kaufmann (d00p)
ed0ede645a added ssl-certificate overview for admins and customers to show CN, Issuer, ValidFrom and ValidTo dates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-26 11:48:36 +02:00
Daniel Reichelt
b366f04743 re-assign new main domain to remaining mainbutsubto-domains 2016-09-17 08:13:10 +02:00
Daniel Reichelt
f3c74bd718 remove unused code 2016-09-17 08:10:32 +02:00
Daniel Reichelt
8e1a1043a5 don't limit this query to emaildomains 
...to catch possibly existing orphaned entries in the mail-user/mail-
forwarding tables
 2016-09-17 08:10:31 +02:00