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

2203 Commits

Author SHA1 Message Date
Michael Kaufmann
25c6a37df2 fix wrong variable-name in Customers.delete() 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-07-21 10:03:20 +02:00
Michael Kaufmann
41a470fe36 added option to disable creation of default subdomain; fixes #960 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-07-21 09:53:54 +02:00
Michael Kaufmann
1d903770fc have more power over theme logo, custom theme logo and uploaded logo; refs #958 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-07-20 20:35:54 +02:00
Nicolas
934be5a238 Fix SOA-Record (#959) 2021-07-20 19:29:06 +02:00
Michael Kaufmann
5608f0407f correct heredoc indentation in AcmeSh for php-7.1; fixes #957 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-07-20 08:11:32 +02:00
Kai
ce9d8dad7f Feature-request #672 - database name prefixes + custom name (#956) 
* Fix makeoption function call

* Update formfield.mysql_add.php

Added database name

* Update formfield.mysql_add.php

* Update formfield.mysql_add.php

* Update Mysqls.php

* Update DbManager.php

* Update formfield.mysql_add.php

* Update german.lng.php

* Update formfield.mysql_add.php

* Update Mysqls.php

* Added field database_name (Feature #672)

* Added Testfunction for customer choosed database name

* Fixed test for customer choosed database name
Added docs for param $name

* Fixed mysql api command add
Removed doubled code

* Set settings for customer choosed db name

* Fixed wrong excepted for database name

* Renamed parameter database_name to custom_suffix

* Changed testCustomerMysqlsList
Added testCustomerMysqlsDBNameDelete
 2021-07-19 19:10:12 +02:00
Michael Kaufmann
156846a845 set version to 0.10.27 for upcoming release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-07-18 10:57:38 +02:00
Michael Kaufmann
b0273c68d2 remove debian jessie config-templates (outdated); set debian stretch as deprecated; add debian bullseye config templates 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-07-16 12:15:03 +02:00
Michael Kaufmann
35cd567c48 check whether there was an image upload at all 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-07-13 09:01:22 +02:00
Daniel Schmitz
282d7d9101 migrate old image + fix versioning 2021-07-09 17:07:50 +08:00
Daniel Schmitz
48f6601003 check mime types 2021-07-09 16:42:21 +08:00
Daniel
c4c4279171 Merge branch 'Froxlor:master' into logo-custom-login 2021-07-09 16:32:59 +08:00
Michael Kaufmann
b88f9c1f18 allow defining php_value/php_admin_value for session.save_path when using php-fpm; fixes #954 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-07-09 08:23:46 +02:00
Daniel Schmitz
7a8b39fad0 wip 2021-07-07 14:00:55 +08:00
Daniel Schmitz
518ec202ab wip 2021-07-07 13:26:15 +08:00
Daniel
dfbb4127e2 Merge branch 'Froxlor:master' into logo-custom-login 2021-06-28 10:39:02 +08:00
Michael Kaufmann
73991e855c Support ZeroSSL via acme.sh (v3); refs #946 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-06-27 09:00:44 +02:00
Michael Kaufmann
0208812013 prefer custom zone entries over automatically created ones when system.dns_createmailentry is enabled, fixes #944 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-06-27 08:41:16 +02:00
kruegerj
d2efa3ecc4 Update focal.xml 2021-06-24 03:16:12 +02:00
Daniel Schmitz
c69ef20b17 wip 2021-06-23 10:58:52 +08:00
Michael Kaufmann
61a50cc657 add setting for default serveralias value for new domains, refs #944 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-06-16 15:10:52 +02:00
Michael Kaufmann
8cf3f4ee24 set version to 0.10.26 for upcoming maintenance releasae 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-05-14 08:21:53 +02:00
Michael Kaufmann
769525bb56 do not touch/chown error/access log if log is disabled, fixes #934 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-04-12 09:42:25 +02:00
Michael Kaufmann
9195fb3c98 additionally sort by length of username for libnss-extrausers passwd file to have the main user as first in result in any case; fixes #933 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-04-12 09:37:36 +02:00
Michael Kaufmann
82922f7aea add new settings for legal-notes; terms-of-use and privacy-policy; fixes #930 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-24 14:36:48 +01:00
Michael Kaufmann
db1a39b6d9 match composePhpOptions() definition everywhere 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-24 13:49:58 +01:00
Michael Kaufmann
7fbbc2ea0b add vhost replacer {FPMSOCKET} for custom vhost configs; fixes #931 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-24 13:46:24 +01:00
Michael Kaufmann
91d4432108 check rr against possible existing CNAME entries, fixes #927 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-15 17:33:30 +01:00
Michael Kaufmann
c8914312aa Refactoring columns from large table to avoid '1118 Row size too large' error 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-11 09:45:52 +01:00
Michael Kaufmann
3fd89c48e8 set version to 0.10.25 for upcoming maintenance release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-05 20:27:55 +01:00
Michael Kaufmann
eceb144a77 also trigger removal of domain in powerdns database if used; refs #923 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-04 12:09:03 +01:00
Michael Kaufmann
1d9651b18a trgger acme.sh removal for domains if customers is being deleted; fixes #923 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-04 12:07:20 +01:00
Michael Kaufmann
49db4e60cb escape passwords for email content (new email-account, new ftp-account and new database); fixes #905 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-03 11:25:58 +01:00
Michael Kaufmann
53e8ccbccb added 'deactivated' parameter to EmailAccounts.update() so admins can disable individual email-accounts, will be overridden if customer is deactivatd and re-enabled; fixes #921 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-03 10:59:16 +01:00
Michael Kaufmann
6d8fc215f1 add description field to panel_domains and mail_virtual table, API parameter 'description' for Domains.add()/Domains.update() and Email.add()/Emails.update(); fixes #910 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-03 10:25:42 +01:00
Michael Kaufmann
f94c303cb3 add API parameter 'show_usages' for Customers.listing() and Customers.get() to return number of domains, and diskspaced used split into webspace_used, mailspace_used and dbspace_used; fixes #912 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-03-03 09:50:30 +01:00
RipClaw2971
3b3527348f Update AcmeSh.php 
Renewed certificates are not recognized if the domain is in upper/lower case.
 2021-02-24 13:00:31 +01:00
Michael Kaufmann
036d5f0713 Merge pull request #919 from nachtgeist/soa 
dns: make mail address of SOA records configurable
 2021-02-21 18:27:57 +01:00
Daniel Reichelt
a1b8807b0f dns: make mail address of SOA records configurable 2021-02-21 13:00:30 +01:00
Michael Kaufmann
356a087b6a Merge pull request #918 from nachtgeist/pns 
dns: check NS entry to be used as primary NS
 2021-02-21 09:14:37 +01:00
Daniel Reichelt
67d67a287f system: validatePassword(): also quote the delimiter ('/') 
Quoting the default regex delimiter is required for the password
complexity check to work if '/' had been specified as special character
in Froxlor's account settings.
 2021-02-21 02:33:46 +01:00
Daniel Reichelt
1f792466bf dns: check NS entry to be used as primary NS 
Don't just blindly use the first custom NS entry for SOA, actually check
if it pertains to the domain in question
 2021-02-21 02:33:23 +01:00
Michael Kaufmann
841c529107 fix check for required firstname/name/company in Customers.update(), fixes #915 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-02-15 23:26:18 +01:00
Michael Kaufmann
41c3f21f0b list only phpenabled and http-enabled domains in php-configuration overview; fixes #911 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-02-11 16:16:04 +01:00
Michael Kaufmann
b8c0688ba0 added possibility to use 'in' sql-operation in sql_where parameter for Api-calls; php-8 compat fix in admin_traffic 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-02-11 12:09:42 +01:00
Michael Kaufmann
24e02e99fb set version to 0.10.24 for upcoming maintenance release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-02-05 15:46:08 +01:00
Michael Kaufmann
97bb7b6227 add filecontent to allowed form-fields to not be escaped 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-02-05 15:44:49 +01:00
Michael Kaufmann
3a17d03796 add option to specify (optional) fileextension/suffix for generated dkim-private keys; fixes #907 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-01-20 12:12:41 +01:00
Michael Kaufmann
9b86d576fa do not display usages on dashboard in fixed size-units but dynamically adjusted 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-01-18 20:49:55 +01:00
Michael Kaufmann
a31da97d66 exclude some formfields from xss-cleaning as it could alter the wanted content 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-01-13 10:14:51 +01:00