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

352 Commits

Author SHA1 Message Date
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
Hanno Heinrichs
37176aa022 fix blacklisting of characters in paths 2016-01-28 21:14:28 +01:00
Michael Kaufmann (d00p)
da4ec3e1b5 avoid rand() if possible as it is not generating cryptographically secure values, thx to Hanno for putting some effort into this 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-28 08:27:15 +01:00
Michael Kaufmann (d00p)
accfd6fa14 allow /dev/urandom to be used in open_basedir path, as some applications may require that (*cough* owncloud), thx to J-BBB 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-11-20 14:20:15 +01:00
Michael Kaufmann (d00p)
be5a13fbb1 crypt() does not seem to like some special-characters in its salts, so we skip'em whenever we are generating a password as a salt-value, thx to Tobse101 for a nice debugging session ;) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-10-02 17:09:41 +02:00
Michael Kaufmann (d00p)
bdb2115c16 allow one-character usernames (or mysql-prefix) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-09-09 23:01:24 +02:00
Michael Kaufmann (d00p)
e23bf72006 remove syntax-error from pull-request #249... 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-09-09 09:32:35 +02:00
5nafu
b611ebcccb Fix Regression from commit 687c5ce for Bug #611: 
Ignore unreadable directiories instead of stoping after first unreadable
directory in function.findDirs.
This Fix comes from php.net user antennen @
http://php.net/manual/en/class.recursivedirectoryiterator.php#101654
 2015-09-08 21:29:59 +02:00
Michael Kaufmann (d00p)
4da3a87772 instead of env-variable, show ditro editor which is defined in the xml 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-08-13 15:42:57 +02:00
Michael Kaufmann (d00p)
967bd45a63 fix subdir-value if homeDir == dirToCreate in mkDirWithCorrectOwnership(), fixes pr #246 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-08-03 17:46:29 +02:00
Chris Vigelius
3cad16d2b7 fix dangerous code 2015-06-25 13:49:55 +02:00
Marcus van Dam
7e8e28fc90 Move to a generic awstats template directory 
We need this generic directory for future changes in Feature #545.
Some line-ending cleanup included.
 2015-06-01 13:09:43 +02:00
Michael Kaufmann (d00p)
27514d32de visible-tag needs to respect the do_show-value in case websrv_avail set do_show to false already 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-03-02 13:41:14 +01:00
Michael Kaufmann (d00p)
fe718ef67f add requirement for mbstring-extension as we need to be multibyte-character-safe in generatePassword(); adjust special-character-default setting to be the same as on a fresh install; outsource version-definition to separate file; set version to 0.9.34-dev3 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-23 12:23:44 +01:00
Michael Kaufmann (d00p)
fae58078f8 update ftp_groups table in case webserver-/fcgid-/fpm-user changes, refs #1491 (i guess) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-16 14:56:08 +01:00
Michael Kaufmann (d00p)
1581e08594 show only hash algorithms that are available on the system 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-15 07:51:58 +01:00
Michael Kaufmann (d00p)
37ca78913c respect possible empty-value when validating string::validate_ip 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-12 13:02:50 +01:00
Michael Kaufmann (d00p)
c356639ce9 fix move-customer-to-admin 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-10 16:12:47 +01:00
Michael Kaufmann (d00p)
3df581152d remove webftp.php as it: pulls smarty-tplengine we don't use anywhere else, is unknown to most of our users, a possible security-issue, etc. etc. etc.; just don't use webftp stuff 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-08 18:56:31 +01:00
Stefan Weil
0fc73b2bbb Fix typos found by codespell 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2015-02-08 17:52:45 +01:00
Michael Kaufmann (d00p)
909c6a8bdf allow private-network ip-addresses for database-connection, fixes #1489 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-08 17:35:31 +01:00
Michael Kaufmann (d00p)
a0a2977b7f allow to disable fcgid also with lighttpd because we allow it to be enabled with lighttpd 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-03 19:55:46 +01:00
Roman Schmerold (BNoiZe)
a0b0fa48bb Fix that name is not returned for admins 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-02 11:01:26 +01:00
Michael Kaufmann (d00p)
f4dff676d6 do not allow to enable fcgid/fpm at the same time when both are set to 'yes' simultaneously in settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-01 18:02:29 +01:00
Michael Kaufmann (d00p)
4d60b19194 only update hash if password matches, fixes #1479 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-31 12:51:20 +01:00