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

376 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
b4e8458076 enhance findDirs function and filter awstats/webalizer (sub)folders for target-directory selection 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-18 15:32:14 +02:00
Michael Kaufmann (d00p)
f406962dfd allow empty select-value for panel.customer_hide_options 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-13 10:48:28 +02: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)
3b157a8c66 do not hide unavailable options, just disable them so people can see what is actually possible but just not available due to webserver-usage or other settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-12 11:23:29 +02:00
Michael Kaufmann (d00p)
b162fb6e99 avoid double encoding of Punycode as with php-5.6 the 'new' idna class throws exceptions, thx to housequake 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-08-26 09:41:19 +02:00
Michael Kaufmann (d00p)
e17a2eff4a fix auto-generated dns zone when using multiple MX records and superfluous whitespace, fixes #1646 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-08-06 07:39:37 +02:00
Michael Kaufmann (d00p)
0e77d5ab94 stay php-5.3 compatible 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-08-02 13:41:58 +02:00
Michael Kaufmann (d00p)
f1b7d731bd Fix #2 Parameter 3 to getFormFieldDataXXX() expected to be a reference, value given since php-7.0.9 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-07-29 09:13:34 +02:00
Daniel Reichelt
50317da185 dns: no separate zonefiles for ismainbutsubto domains 3/3 
replace iteration over $domains array by recursive walkDomainList()
 2016-06-18 02:33:02 +02:00
Daniel Reichelt
5f9962b6ba dns: fix generation of zone serials 2016-06-17 22:25:35 +02:00
Daniel Reichelt
d6dc71436a dns: fix generation of imap/pop3/mail/smtp A/AAAA-records 
The dns-editor introduced a regression where imap/pop3/mail/smtp A-records
would not get created, even tough the setting system.dns_createmailentry was
enabled.

fix A fix
 2016-06-17 22:25:21 +02:00
Daniel Reichelt
b6f99958fd dns: fix generation of alias records for subdomains 
The checks whether or not to create wildcard/www records for subdomains
wrongly depended on the setting of the parent domain instead of the
subdomain in question.
 2016-06-17 19:43:36 +02:00
Michael Kaufmann (d00p)
339d84736e no quotation of dns data for powerdns 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-21 09:03:21 +02:00
Michael Kaufmann (d00p)
b14ab6b1c1 validate record/label in dns-editor; better escaping for soa-admin mail 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-18 10:35:47 +02:00
Michael Kaufmann (d00p)
1ce5cf6c00 various fixes for dns with froxlor-hostname 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-17 09:12:39 +02:00
Michael Kaufmann (d00p)
69443d95d5 add support for power-dns (untested); most config-templates missing for pdns; create SPF/DKIM entries only if domain is emaildomain 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-17 08:30:02 +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)
68fa0e6576 let createDomainZone() return the DnsZone object for better use later 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-15 09:56:48 +02:00
Michael Kaufmann (d00p)
e0e748a0bc outsource record-generation and zone-generation to classes for better handling 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-15 08:46:23 +02:00
Michael Kaufmann (d00p)
02654a256d fix sql query in getAllowedDomainEntry() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-14 08:59:46 +02:00
Michael Kaufmann (d00p)
86dc57c2cc outsource some dns functions to own files; allow opening of dns-editor only for domains that belong to the user (or the user has permission to edit as admin/reseller) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-13 19:40:37 +02:00
Michael Kaufmann (d00p)
899663350d fix handling of DKIM multi-line entries; outsource some code to new DnsBase class 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-12 13:36:17 +02:00
Michael Kaufmann (d00p)
cec5f33870 fix checking for existing SPF entry in DNS 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-12 10:14:04 +02:00
Michael Kaufmann (d00p)
68d579b629 add SPF and DKIM stuff to DNS 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-12 09:36:33 +02:00
Michael Kaufmann (d00p)
9b5ce83e8b add testing-bind-cron for new dns-stuff (not activated); added main-but-subdomain-stuff 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-11 16:11:23 +02:00
Michael Kaufmann (d00p)
7379398d22 set correct primary nameserver for SOA record 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-11 13:47:36 +02:00
Michael Kaufmann (d00p)
d1106dd984 fix wrong unset of array-element 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-11 07:44:32 +02:00
Michael Kaufmann (d00p)
b775c2f60e minor fixes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-10 19:20:01 +02:00
Michael Kaufmann (d00p)
407a7c01aa add createDomainZone function for new dns-editor; dump zone below the editor for testing purposes; all required entries that are not custom entered will be auto-generated like the bind-cron does this for now 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-10 14:11:01 +02:00
Michael Kaufmann (d00p)
2210d3de12 fix mail-account backup; fix missing job description for admin-dashboard (outstanding tasks); avoid double backup-task insertion when customer presses refresh after scheduling the backup-job 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-05 08:23:46 +02:00
Michael Kaufmann (d00p)
9bfd5eb17e --exclude is relativ to path given via -C parameter 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:19 +02:00
Michael Kaufmann (d00p)
fb555027fd fix -C parameter and --exclude parameter for good now 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:19 +02:00
Michael Kaufmann (d00p)
05974de4d5 fix tar -C parameter again... 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:19 +02:00
Michael Kaufmann (d00p)
9c9bbb81de fix tar -C parameter and create_backup_tar_data list 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:18 +02:00
Michael Kaufmann (d00p)
ef7da53806 change directory before creating tarball to avoid having complete paths in it 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:18 +02:00
Michael Kaufmann (d00p)
c8bbefb2bb add simple backup-function for customers (testing state) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:18 +02:00
Michael Kaufmann (d00p)
8bc19e3893 fix intendation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-10 12:12:19 +01:00
Michael Kaufmann (d00p)
f9740ff545 check whether an email account is to be deleted when re-adding an email account with the same name, fixes #1519 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-10 10:54:32 +01:00
Michael Kaufmann (d00p)
604f37bd17 intriduce DB version (again) so we can keep release-version numbers while updating the database; added enable/disable switch for Let's Encrypt 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-07 13:47:22 +01:00
Michael Kaufmann (d00p)
b67749bcdc allow private networks in AXFR server list 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-27 20:02:46 +01:00
Johannes Feichtner
55df79a79c Fix for previous commit: Also delete occasionally existing entries for the newly defined standard IP entries before re-adding them. They could have been assigned separately 2016-02-21 14:00:53 +01:00
Johannes Feichtner
32c32a7e7a Enable multiple standard IPs 2016-02-21 14:00:26 +01:00
Johannes Feichtner
387be846f1 Fix fatal error in phpErrHandler with PHP7 and suit cronjob for various PHP versions 2016-02-20 20:21:09 +01:00
Daniel Reichelt
a68effe4e7 logging: add loglevel to syslog output 2016-02-16 20:19:31 +01:00
Daniel Reichelt
f4ef5af63b add function getFormFieldDataText() 
Previously webserver configs would contain CRLFs from
system.default_vhostconf on admin_settings.php.

This patch adds a new function which automatically gets recognized by
getFormFieldData() and mangles textarea form elements through
str_replace("\r\n", "\n", ...).
 2016-02-09 14:45:08 +01:00
Michael Kaufmann (d00p)
5228e0f3d6 normalize path in appendOpenBasedirPath() after empty check as this results in an assert in makeCorrectDir() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-01 09:35:31 +01:00
Hanno Heinrichs
6eeaf66e2c prevent directory traversal in paths 2016-01-28 22:40:54 +01:00
Michael Kaufmann
7f82549e23 Merge pull request #277 from hph86/fix_path_blacklist 
fix blacklisting of characters in paths
 2016-01-28 22:00:56 +01:00
Michael Kaufmann (d00p)
2bb8f707eb fix second argument for rand() function 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-28 21:19:48 +01:00