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

3460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
d4cd827284 update wiki-urls in language files 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-04-09 10:25:39 +02:00
Michael Kaufmann
50f85fb6d0 Merge pull request #417 from ianklemm/patch-1 
Correct Wiki links
 2017-04-03 20:32:24 +02:00
Vengance
9cc69e5b3d Update README.md 2017-04-03 20:31:50 +02:00
Vengance
d9e8f43298 Correct Wiki links 
Correct the links of the no longer existing redmine to Github´s inbuild Wiki
 2017-04-03 20:21:44 +02:00
Michael Kaufmann (d00p)
ad7cf52f21 Fix rowcount value for logger 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-03-17 13:05:39 +01:00
Michael Kaufmann (d00p)
398d45deae fix typo 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-03-14 13:46:07 +01:00
Michael Kaufmann (d00p)
541ab1fe6e clearify field label for domain termination date; fixes #1728 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-03-11 07:34:13 +01:00
Michael Kaufmann (d00p)
c0fddbce81 use correct pagination in admin-log/customer-log, fixes #1726 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-03-08 14:04:40 +01:00
Michael Kaufmann (d00p)
2284706e0c do not load mod_vroot in proftpd on centos 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-03-02 07:57:47 +01:00
Michael Kaufmann (d00p)
a4f72cbb40 do not show full path of file on php-error; fixes #1720 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-02-12 16:33:00 +01:00
Michael Kaufmann
d1c776b706 Merge pull request #414 from Douks08/patch-1 
Update french.lng.php
 2017-02-09 14:41:56 +01:00
Douks08
8ef315014c Update french.lng.php 
Modification de "billets" en "tickets" qui est plus fréquemment utilisé
 2017-02-09 10:19:32 +01:00
Michael Kaufmann (d00p)
2d59e569df fix phpenabled flag for new subdomains added by customers 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-30 22:46:53 +01:00
Michael Kaufmann (d00p)
202eb0931f fix auto-update of database in cronjob if activated 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-28 21:20:37 +01:00
Michael Kaufmann (d00p)
4cd1a8d656 Merge branch 'master' of github.com:Froxlor/Froxlor 2017-01-28 21:19:51 +01:00
Vengance
01a363456e Fix libnss config (#412) 
* Fix libnss config
 2017-01-28 15:47:19 +01:00
Michael Kaufmann (d00p)
8f4da0638e allow underscore in dns labels, fixes #1697 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-25 10:42:18 +01:00
Michael Kaufmann (d00p)
3e6c3d725b set version to 0.9.38.7 for upcoming bugfix release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.38.7 		2017-01-24 09:43:20 +01:00
Michael Kaufmann (d00p)
95a18be5c5 do not use HTTP_HOST variable if mod_rewrite is not used 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-24 09:41:45 +01:00
Michael Kaufmann (d00p)
8030aae37a fix directory options for deactivated users, fixes #1704 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-23 23:53:01 +01:00
Michael Kaufmann (d00p)
0eaa81b503 use libnss-mysl deb package from froxlor repo as debians 1.5-5 package is not suitable for jessie 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-23 08:17:18 +01:00
Michael Kaufmann (d00p)
c2b864a20f enable/disable php for standard-subdomain when adding a new customer according to the customer-phpenabled value, fixes #1708 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-23 08:14:14 +01:00
Michael Kaufmann (d00p)
e00cb8926d set mail-sender to customer mail address when using mod_php, fixes #1707 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-23 08:12:44 +01:00
Michael Kaufmann (d00p)
afb2bce16d fix missing german language strings, refs #1705 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-23 08:05:48 +01:00
Michael Kaufmann (d00p)
1033f502b1 add missing language strings, fixes #1705 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-19 14:09:51 +01:00
Michael Kaufmann (d00p)
ab18d94053 fix PR #407 - only works for apache-2.4 and missed the entry for customer-vhosts 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-17 11:29:40 +01:00
Michael Kaufmann
9afbe7fb71 Merge pull request #407 from buffcode/ssl-compression 
Disable SSLCompression (CRIME attack)
 2017-01-17 10:40:19 +01:00
Laurens Stötzel
5e0270e6a8 Disable SSLCompression (CRIME attack) 
https://raymii.org/s/tutorials/Strong_SSL_Security_On_Apache2.html#SSL_Compression_(CRIME_attack)
 2017-01-17 10:33:22 +01: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 (d00p)
9fdcd09089 fix install class, set version to 0.9.38.6 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.38.6 		2017-01-15 07:44:58 +01:00
Michael Kaufmann (d00p)
338cf161d2 fix undefined index if let's encrypt is used for the froxlor-vhost 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-14 18:06:04 +01:00
Michael Kaufmann (d00p)
044ce6662a set version to 0.9.38.5 for upcoming release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.38.5 		2017-01-13 19:45:17 +01:00
Michael Kaufmann (d00p)
d574233f49 also reseller/admins who can't see all customers were able to delete arbitrary ssl certificates, refs #1699 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-13 19:21:34 +01:00
Michael Kaufmann (d00p)
02c6545c94 update download url for libnss-mysql for debian jessie, fixies #1700 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-10 19:11:01 +01:00
Michael Kaufmann (d00p)
c795cd3320 check for ownership of certificate when deleting as customer, fixes #1699 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-10 08:37:50 +01:00
Michael Kaufmann (d00p)
1ebde2e6a4 return correct default redirectCode when none is set, thx to J-BBB 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-05 11:58:11 +01:00
Michael Kaufmann
78ee141b26 Merge pull request #405 from lobeck/hsts_link_fix 
fix hsts removal links
 2017-01-02 07:32:45 +01:00
Christian Becker
d11ddd910f fix hsts removal links 
without a protocol, they are treated relative which is annoying
 2017-01-02 03:06:18 +01:00
Michael Kaufmann (d00p)
437446c49d update phpMailer to 5.2.21 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-12-29 10:54:25 +01:00
Michael Kaufmann (d00p)
7a603596c5 validate ip address on installation 2016-12-28 20:13:15 +01:00
Michael Kaufmann
c2a91ed623 Merge pull request #403 from pissbeutel/master 
Changed SOA refresh intervall to be within recommended values
 2016-12-17 15:16:46 +01:00
Michael Kaufmann
3dcd2b9a3e Merge pull request #402 from stweil/doc 
Fix description in README.md
 2016-12-17 15:16:10 +01:00
pissbeutel
75622d4737 Changed SOA refresh intervall to be compliant within recommended values 
See: https://www.denic.de/fileadmin/public/documentation/DENIC-23p.pdf

The recommended values according to DENIC are:
refresh: 3600 - 86400
retry: 900 - 28800
expire: 604800 - 3600000
negTTL: 180 - 86400
 2016-12-17 15:14:02 +01:00
Stefan Weil
7a617d0aa4 Fix description in README.md 
The entry is called "System", not "Server".

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-12-17 14:33:28 +01:00
Michael Kaufmann
ccca077df7 Merge pull request #401 from stweil/html 
Fix HTML code (unclosed tag)
 2016-12-17 13:05:56 +01:00
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)
4502f7ddf5 fix Settings::Flush(), thx to Ithariel 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-12-16 10:17:48 +01:00
Michael Kaufmann (d00p)
f9101f880b use namserver IP's for axfr/pdns-config, also add placeholder AXFRSERVERS for axfr-servers setting; fixes #1691 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-12-14 09:54:49 +01:00
Michael Kaufmann (d00p)
5ed0c3f2f3 code-formatting and put phpenabled flag on a better position 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-12-11 09:50:22 +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