maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,703 Commits 6 Branches 188 Tags
5df4b3e7df4fd1d05089a8eddb597753a435f61b
Commit Graph

2703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Roman Schmerold
997141efea Merge pull request #257 from stweil/master 
templates: Code cleanup
 2015-11-14 19:16:11 +01:00
Stefan Weil
6fe0f56e41 templates: Code cleanup 
* Remove unneeded semicolon.
* Add missing semicolon.
* Add linefeed at end of file

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2015-11-14 19:09:39 +01:00
Michael Kaufmann
8c3b7b518f Merge pull request #256 from lobeck/master 
fix ssl setttings for rewrite vhosts on nginx, fixes #1568
 2015-11-14 14:14:57 +01:00
Christian Becker
6996f6516c fix ssl setttings for rewrite vhosts on nginx, fixes #1568 
- previously the ssl settings were missing in rewrite vhosts
- this caused ssl errors for these hosts as the default certificate has been used instead of the vhost specific cert.
- this seem to only apply for nginx, not apache
 2015-11-14 14:10:23 +01:00
Michael Kaufmann
60cc071031 Merge pull request #255 from stweil/typos 
Fix typos found by codespell, thx to stweil
 2015-11-13 08:05:27 +01:00
Stefan Weil
fe5ab0d8da Fix typos found by codespell 
Fix also a grammar issue.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2015-11-13 07:56:12 +01:00
Michael Kaufmann (d00p)
0939d032a5 fix wrong vhost creation with nginx when customer is deactivated and no docroot for deactivated users was given, fixes #1565 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-11-12 08:42:32 +01:00
Michael Kaufmann (d00p)
d21391e8ba add apache-2.4 to the installer so apache-2.4 users get the 2.4 mods activated right away, NOTE: we cannot find out whether you're on 2.2 or 2.4 - so you should now what you got and select the correct one, fixes #1566 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-11-12 08:27:07 +01:00
Michael Kaufmann (d00p)
0651dc28c8 fix filename in ubuntu trusty 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-11-12 08:18:46 +01:00
Michael Kaufmann (d00p)
5b8fea9378 introduce warning-progress-bar-color when using -15% of the given web/traffic max-warn level (default 90%), fixes #1567 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-11-12 08:18:28 +01:00
Michael Kaufmann (d00p)
eda055acca Allow always_populate_raw_post_data to be set in php.ini for php-fpm, fixes #1562 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-11-04 11:35:05 +01:00
Michael Kaufmann
7fb3918773 Merge pull request #253 from github-ivan/master-fixes 
Checking for possible duplicate froxlor-local user entries in ftp-group
 2015-10-30 15:58:08 +01:00
Krisztian Ivancso
4e38f614f2 Checking froxlor-local user membership in ftp-group 
It prevents possible duplication in list.
 2015-10-25 11:48:21 +01:00
Robert Förster (Dessa)
c7d8cb6d33 switch postfix default to postfix 3 on gentoo since this is what is stable for a while already (2.x got dropped back to ~arch and will be removed from the template once removed from the tree) 2015-10-20 02:59:44 +02:00
Dessa
e211fb891b Merge pull request #252 from rpasing/master 
Fix problems in Dovecot quota configuration:
 2015-10-20 02:53:07 +02:00
Rene Pasing
05f3e8f433 Fix problems in Dovecot quota configuration: 
1) Since Dovecot 2.x, quota rules are by default in bytes,
  and not in kilobytes (hence multiplicating with 1024 is
  not going to be megabytes). Fixed this by adding 'M' suffix.

2) Since Dovecot 2.x, the quota rule is always named `quota_rule`
  or (for userdb prefetch) `userdb_quota_rule` (there were some
  incorrect namings in the distribution configs).

Ref: http://wiki2.dovecot.org/Quota/Configuration#MySQL
 2015-10-20 02:26:28 +02:00
Michael Kaufmann (d00p)
b6949e12b1 correct gentoo.xml config-templates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-10-19 09:04:14 +02:00
Michael Kaufmann
0772952e71 Merge pull request #251 from Commifreak/master 
Update froxlor.sql
 2015-10-18 18:19:39 +02:00
Robin Kluth
dc4d5c6953 Update froxlor.sql 
Did someone forget the M after 128 in the Default PHP-Config? ;)
 2015-10-18 18:09:26 +02:00
Robert Förster (Dessa)
9d45f4d534 Revert "ease file-permissions, they sometimes cause issues" 
This reverts commit 5ead5e9c90.

part of this commit is reverted as most files shouldn't be world readable
 2015-10-08 00:32:13 +02:00
Michael Kaufmann (d00p)
2b8a9a74be move checkCrondConfigurationFile() from cron_init to cron_shutdown so a forced regeneration of the cron.d-file is being handled in the same cronrun 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-10-05 20:10:55 +02:00
Michael Kaufmann (d00p)
d226af5314 do not select cron.d-file-regeneration task in cron_task as it is not being handled there 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-10-04 17:30:33 +02: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)
94b43021ff sort libnss-result by length of name to always return the 'base'user instead of a ftp-user (because select does not have a default order), fixes #1556 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-09-21 10:26:18 +02:00
Michael Kaufmann (d00p)
0b901af0f0 define array for mod_php users, fixes #1555 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-09-14 22:23:40 +02:00
Michael Kaufmann (d00p)
5ead5e9c90 ease file-permissions, they sometimes cause issues 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-09-12 20:33:28 +02:00
Michael Kaufmann (d00p)
1cdaa1d727 revert wrong changes from pull-request 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-09-10 08:28:12 +02:00
Michael Kaufmann
2c38bca1b5 Merge pull request #250 from blueJack92/patch-3 
Fixing (possible) permission problems of configuration files
 2015-09-10 08:19:41 +02:00
blueJack92
7c45ca220b Fixing some (big) peanuts 
Fixing permission problems with files, which have 0640 as file attributes.
Fixing problems in main.cf (Postfix). setgid_group must be set, otherwise running newaliases will fail.
Moreover I set the missing paths correctly in the main.cf (regard to Debian Jessie).
 2015-09-09 23:33:27 +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
Michael Kaufmann
7c63b78bbb Merge pull request #249 from 5nafu/findDirs 
Fix Regression from commit 687c5ce for Bug #611
 2015-09-09 07:44:14 +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)
722d17b211 [configfiles] correct permissions for froxlor_bind.conf 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-09-08 08:21:33 +02:00
Michael Kaufmann (d00p)
afbfb810fd [configfiles] don't mv a file that is to be backed up but has mode=append, use cp instead 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-09-08 08:18:32 +02:00
Michael Kaufmann (d00p)
1d3ae4f2c8 merged current stable 0.9.34 release as master 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-09-07 15:24:40 +02:00
Michael Kaufmann (d00p)
9bf784f64e set version to 0.9.34 for upcoming release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.34 		2015-09-07 13:33:22 +02:00
Michael Kaufmann (d00p)
116c0e19b2 add managesieve/sieve config-template for dovecot to Gentoo 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-09-04 19:34:09 +02:00
Michael Kaufmann (d00p)
7939187916 remove old/unused config-template-files (replaced by XML) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-09-04 10:56:20 +02:00
Piotr Rzeczkowski
9d40e0903b Allow max_input_vars in PHP-FPM configuration 2015-08-30 08:37:57 +02:00
Roman Schmerold
320adad154 Merge pull request #248 from rzeka/master 
Allow max_input_vars in PHP-FPM configuration
 2015-08-24 17:06:23 +02:00
Piotr Rzeczkowski
c52df5b286 Allow max_input_vars in PHP-FPM configuration 2015-08-24 12:18:56 +02:00
Michael Kaufmann (d00p)
30a25c0e8c comment out unexisting group 'Debian-exim' when exim is not installed 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-08-20 20:50:35 +02:00
Michael Kaufmann (d00p)
95035afe38 comment out unexisting group 'Debian-exim' when exim is not installed 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-08-20 20:49:56 +02:00
Roman Schmerold (BNoiZe)
62559dd2b4 Fixed undefined error in admin_customers.php 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-08-19 07:16:05 +02:00
Roman Schmerold (BNoiZe)
a6473695eb Fixed width of email inputs 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-08-19 07:06:52 +02:00
Frank Gehann
edd60d3331 Fixed composeSslSettings which used variables not available in the function scope. 2015-08-18 11:03:06 +02:00
Michael Kaufmann
c9e4819f3f Merge pull request #247 from Tak0r/master 
Fixed unknown variables in composeSslSettings
 2015-08-16 20:08:14 +02:00
Frank Gehann
7cf321b24a Fixed composeSslSettings which used variables not available in the function scope. 2015-08-16 15:45:48 +02:00