maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
4,598 Commits 6 Branches 188 Tags
abb98ae96066f872e40bc622753942bbced7bd9c
Commit Graph

810 Commits

Author SHA1 Message Date
Stefan Weil
5c008adf16 Fix HTML code (wrong tag) 
`<span>` must be terminated by `</span>`.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-12-17 12:34:15 +01:00
Michael Kaufmann (d00p)
9907775c0d fix installation sql 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-12-11 09:43:05 +01:00
Michael Kaufmann
c1aea2795e Merge branch 'master' into patch-1 2016-12-11 08:55:37 +01:00
Michael Kaufmann (d00p)
3a8996aee2 add missing fields that are only added via update 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-12-11 08:29:54 +01:00
Michael Kaufmann
602c38dbeb Merge branch 'master' into feature/letsencrypt-verbesserungen 2016-12-11 08:23:46 +01:00
Michael Kaufmann
3d4b56b233 Merge branch 'master' into master 2016-12-11 08:19:16 +01:00
Michael Kaufmann (d00p)
225539d2e7 show ssl-related settings only if customer has ssl-ip assigned (not yet checked per domain); fix hsts-includeSubdomain setting for fresh installations 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-29 09:34:33 +01:00
Michael Kaufmann (d00p)
56276a19d1 set version to 0.9.38.4 for upcoming bugfix release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-27 12:12:22 +01:00
Michael Wyraz
559bd6d892 Better db update 2016-11-25 10:52:50 +01:00
Michael Wyraz
18b45c749d Better handling for letsencrypt errors after failed registration or changed license 2016-11-25 09:54:47 +01:00
Michael Kaufmann (d00p)
16f547bce0 last time....0.9.38.3....what a day 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-18 10:27:11 +01:00
Michael Kaufmann (d00p)
60a482dce6 damn, forgot to save the two files to handle customer-side domain-settings regarding the hsts-includeSubdomain issue; version set to 0.9.38.2 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-18 10:21:02 +01:00
Michael Kaufmann (d00p)
9540cb158c set version to 0.9.38.1 b/c of hsts includeSubdomains flag for domains not being saved; added http2-flag for nginx as setting 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-18 10:10:03 +01:00
Michael Kaufmann (d00p)
1984aced9d set db_version correctly everywhere 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-18 08:52:40 +01:00
Michael Kaufmann (d00p)
eb8449fd79 merge conflicts in update-script 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-18 08:50:03 +01:00
Michael Kaufmann (d00p)
547140bafb set version to 0.9.38 for upcoming release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-18 08:36:35 +01:00
Janos Muzsi
d245bca445 correcting the update 2016-11-18 08:32:23 +01:00
Janos Muzsi
5f899a5510 Add support for http2 option to nginx 2016-11-17 22:50:11 +01:00
Dominic Schallert
d93cfff172 updates always at the end of the file 2016-11-13 15:18:07 +01:00
Dominic Schallert
e5053bad15 Introduced phpenabled_customer and phpenabled_vhost, updated cron scripts, updated dbversion 2016-11-13 15:15:43 +01:00
Dominic
1519db1637 Update update_0.9.inc.php 2016-11-13 14:48:50 +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)
fad607c6e8 set version to 0.9.38-rc2 for second release candidate 2016-11-07 07:28:58 +01:00
Michael Kaufmann (d00p)
3597a89da3 add missing customer_hide_option for fresh installs 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-13 11:08:26 +02:00
Michael Kaufmann (d00p)
58c14376d6 set version to 0.9.38-rc1 for upcoming release candidate 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-11 07:50:25 +02:00
Michael Kaufmann (d00p)
41c07d5b71 also add new hsts panel settings to froxlor.sql for new installs; refs #1660 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-07 11:54:08 +02:00
Michael Kaufmann (d00p)
4a3e02c1f0 add HSTS for domains (admin-side) and froxlor-vhost; fixes #1660 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-07 11:01:45 +02:00
Grigory Morozov
3ff85e167c Update update_0.9.inc.php 2016-09-27 23:08:30 +07:00
FliegenKLATSCH
2e198dbe5c fix default value for domain reg./term. date 2016-09-26 21:08:39 +02:00
Grigory Morozov
dc428b7de2 Adding unique key to ipsandports on upgrade 
Please guide on checking the correct Froxlor version, not sure how it works
 2016-09-26 23:23:11 +07:00
Grigory Morozov
06a55ef91e Prevent duplicates in ipsandports table 2016-09-26 22:52:03 +07:00
Michael Kaufmann (d00p)
6197a97dc1 Add settings to speficy smtp auth data for mails sent by froxlor 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-20 09:41:36 +02:00
Michael Kaufmann (d00p)
4229d8dda4 make path to acme.conf global alias file customizable 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-12 11:49:07 +02:00
Michael Kaufmann (d00p)
e4887362ec added let's encrypt for froxlor vhost - untested for now, testers are welcome 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-05 17:01:10 +02:00
Michael Kaufmann (d00p)
45b6d8d571 add possibility to allow customers to select a shell for their ftp-users, with great thanks to KAPPER NETWORK-COMMUNICATIONS GmbH - kapper.net 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-08-26 10:46:15 +02:00
Michael Kaufmann (d00p)
8431a82f2c check for correct extension for auto-update feature, fixes #1648 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-08-20 09:16:33 +02:00
Michael Kaufmann (d00p)
f5dc8aa1c9 set version to 0.9.37 for upcoming release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-08-02 08:51:34 +02:00
Michael Wyraz
6ab8cb1d7c Adding option to hide some elements in customer panel 2016-07-21 15:53:14 +02:00
Michael Kaufmann (d00p)
6589653667 set version to 0.9.37-rc1 for upcoming release candidate 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-07-18 16:47:19 +02:00
Michael Kaufmann (d00p)
8366e57512 Adding new setting for mod_php users to specify content of the global directory options file, fixes #1638 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-07-14 08:25:28 +02:00
Michael Kaufmann (d00p)
164e1108e5 fix for sql changes, refs #1635 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-06-24 07:49:52 +02:00
Michael Kaufmann (d00p)
8fe20251f3 try to be more strict-mode compatible, fixes #1635 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-06-24 07:42:23 +02:00
Daniel Reichelt
1e8bc553b8 fix/add SAPI checks to prevent execution via webserver 2016-06-19 23:43:42 +02:00
Michael Kaufmann (d00p)
5789e9a8a4 re-add old IDNA class so we do not have to force the php-5.6 requirement for froxlor 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-06-19 18:59:44 +02:00
Michael Kaufmann (d00p)
5866293a25 add script to change ip-addresses in froxlor from CLI and updated corresponding settings. Helpful for VM-template installations or similar. Use at own risk; feedback is appreciated 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-06-13 13:45:23 +02:00
Oliver Hader
2e7133d619 [SECURITY] Information disclosure on database failures 
In case the database is not responding, e.g. due to "too many connections"
cut-off database credentials might be shown and system path be revealed.
In terms of security this is considered as information disclosure.
 2016-06-04 20:41:03 +02:00
Stefan Heid
7faebbb197 BUGFIX: Cleaninstall fails due syntax error in froxlor.sql (missing comma) (#356) 2016-06-02 21:21:40 +02:00
Michael Kaufmann (d00p)
1f63ea10a0 adjust install sql file for dnsenabled flag and db-version 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-18 13:39:46 +02:00
Michael Kaufmann (d00p)
b4c7fb574c increase DB version for db-updates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-18 13:27:56 +02:00
Michael Kaufmann (d00p)
83fa0059de add flag to allow access to dns-editor per customer; clean up dns-entries when domain gets deleted 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-18 13:25:31 +02:00