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

185 Commits

Author SHA1 Message Date
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
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
Michael Kaufmann (d00p)
477c99b4de Merge remote-tracking branch 'origin/master' into dns-editor 2016-05-18 10:31:05 +02:00
Michael Kaufmann (d00p)
41e4135f71 do not allow punycode input in domain-names 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-18 09:03:14 +02:00
Michael Kaufmann (d00p)
11e923453e Merge remote-tracking branch 'origin/master' into dns-editor 2016-05-16 19:59:27 +02:00
Daniel Reichelt
6e2b1773a3 LE: support alias domains 
LE CSRs are triggered for the aliasdomain target domain on

* domain deletion

* domain creation

* domain editing when
  * the aliasdomain target changes (CSR triggered both for old and new
    target)
  * wwwalias is disabled or enabled
  * letsencrypt is disabled or enabled (domain-local)

fixes #1597
 2016-05-16 17:35:51 +02:00
Michael Kaufmann (d00p)
11eb08e031 add enabled-flag; enable dns-editor for customers; add german translations; few more fixes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-13 13:27:33 +02:00
Michael Kaufmann (d00p)
5acd51fdd3 add first part of new dns-editor 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-10 07:37:42 +02:00
Michael Kaufmann (d00p)
a014b5cc2b minor preparations for system-hostname as 'normal' domain (to use ssl/LE/etc.) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-11 09:19:43 +02:00
Roman Schmerold
f1460d169d Fixed db query error, fixes #1611 2016-03-16 22:17:30 +01:00
Roman Schmerold (BNoiZe)
f5e2afaa0a Add LE icon to admin domain list 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2016-03-16 17:54:11 +01:00
Michael Kaufmann (d00p)
8bc19e3893 fix intendation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-10 12:12:19 +01:00
Daniel Reichelt
fb5fd5a279 Remove certificate on removal of subdomain, fixes #1596 2016-03-06 18:41:45 +01:00
Michael Kaufmann (d00p)
f9d949f90c Revert "Merge pull request #318 from Churro/froxlorMerge_33ab67a" 
This reverts commit 4f2ee129fd, reversing
changes made to f284d67843.
 2016-03-03 23:38:02 +01:00
Michael Kaufmann (d00p)
f6e519d779 Revert "Merge pull request #326 from Churro/froxlorMerge_vhostTemplates" 
This reverts commit 319668d384, reversing
changes made to aa592c7369.

Conflicts:
	install/froxlor.sql
	install/updates/froxlor/0.9/update_0.9.inc.php
	lib/version.inc.php
 2016-03-03 23:31:19 +01:00
Florian Aders
4c4916a661 Do not allow Let's Encrypt with AliasDomain until the certificate - storage is reworked 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-29 17:23:14 +01:00
Michael Kaufmann
319668d384 Merge pull request #326 from Churro/froxlorMerge_vhostTemplates 
Vhost templates: Added a field to select the target webserver
 2016-02-27 20:43:10 +01:00
Johannes Feichtner
088eef9728 Vhost templates: Added a field to select the target webserver 2016-02-27 20:18:16 +01:00
Michael Kaufmann (d00p)
b05105bfdf fix specialsettingsforsubdomains if security questions are being asked when editing a domain, fixes #1598 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-27 19:57:29 +01:00
Michael Kaufmann
4f2ee129fd Merge pull request #318 from Churro/froxlorMerge_33ab67a 
Feature: vHost templates (version 2)
 2016-02-26 19:16:49 +01:00
Johannes Feichtner
373cb912d8 - Hide the option on whether to include default directives with webservers different than nginx 
- Typo fix
- Indentation fix
 2016-02-26 19:08:08 +01:00
Florian Aders
deb19f2625 Removed unnecessary exit - calls 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-22 12:10:18 +01:00
Johannes Feichtner
abe253bc31 Feature: Vhost templates 
Reworked the initial implementation by hpmewes (https://github.com/Froxlor/Froxlor/pull/233) with
- bugfixes all over
- added support for apache and lighttpd also
- added an update sequence (instead of only modifying froxlor.sql)
- added english language variables
- added missing parts in admin_vhostsettings.php
- added parameter replacements as available since PR 244
 2016-02-21 14:53:24 +01:00
Florian Aders
ddaadf81d6 Temporarily deactivate ssl_redirect if a new Let's Encrypt certificate needs to be generated 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-16 14:31:07 +01:00
Michael Kaufmann (d00p)
5109443346 output error message when letsencrypt is checked and wildcard-serveralias in enabled - not just silently disable letsencrypt, people don't read the description and are confused 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-16 08:51:36 +01:00
Stefan Heid
eae9c4d78a Typo correction 2016-02-10 22:23:46 +01:00
Stefan Heid
ae581c2da7 Added termination-date to domains 2016-02-10 21:22:52 +01:00
Florian Aders
d87fc4c717 Prevent enabling let's encrypt for wildcard - domains 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:46:00 +01:00
Florian Aders
c189ad759b Add Let's Encrypt to admin - GUI 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:34:26 +01:00
Stefan Weil
5df4b3e7df Don't assign variable from void function 
Database::pexecute is based on execute which is a void function.
It does not return a value which can be assigned to a variable.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2015-11-15 10:16:33 +01:00
rzeka
a3f2fa1b16 Better customers sorting based on name and company 2015-04-28 14:14:12 +02:00
Michael Kaufmann (d00p)
bbf05fa6fd remove smarty-remnant; remove unnecessary variable assignment 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-17 13:27:30 +01:00
Michael Kaufmann (d00p)
7680cd441c force integer conversion for domainimport-offset-field, as POST sends it as string; filter IP-addresses that are unknown to froxlor when importing domains. 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-30 17:55:27 +01:00
Michael Kaufmann (d00p)
b2eeef8d38 beautification and fallback just in case 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-22 14:14:53 +01:00
Michael Kaufmann (d00p)
d674f4dd70 same alias-ip-stuff when adding a new domain and aliasdomain is selected 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-22 13:37:35 +01:00
Michael Kaufmann (d00p)
0406948c4b remove unneeded functions; fix ip-assigning when a domain is an alias of another domain and the ip's from the alias-domain are being read, no check for ssl/non-ssl was made resulting in an integrity constraint violation in the database 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-22 13:32:37 +01:00
Michael Kaufmann (d00p)
c1ca72dd3c fix validation of offset-value in domain import + minor fixes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-19 09:29:25 +01:00
Michael Kaufmann (d00p)
cd5e8801e4 add domain-bulk-import, fixes #1452 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-15 14:49:34 +01:00
Michael Kaufmann (d00p)
58ec17ce10 don't allow subdomains as alias-domains as it could lead to a possible dead-end for editing ip/port for the domain 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-10-27 10:41:29 +01:00
Michael Kaufmann (d00p)
92eea6d7b2 insert task for rebuilding config files after changing the ips (not perfect yet but better then no task) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-07-09 17:52:16 +02:00