maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,742 Commits 6 Branches 188 Tags
da4ec3e1b591de96675817a009e26e05e848a6ba
Commit Graph

2742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ebedb97fae Merge pull request #275 from stweil/master 
Fix typos in comments
 2016-01-26 07:41:51 +01:00
Stefan Weil
ddd4c2ad3d Fix typo in comment 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-01-25 17:15:17 +01:00
Stefan Weil
007242e341 Fix typo in comment (found by codespell) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-01-25 17:14:43 +01:00
Roman Schmerold
0932b38364 Merge pull request #274 from stweil/master 
README: Update supported Debian versions
 2016-01-25 17:09:01 +01:00
Stefan Weil
5c0ba566e0 README: Update supported Debian versions 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-01-24 22:21:26 +01:00
Michael Kaufmann
67b97dbefd Merge pull request #273 from xWuZaa/fastcgi_params 
remove Duplicate fastcgi_index
 2016-01-21 12:01:25 +01:00
xWuZaa
4d2f72a814 remove duplicate fastcgi_index from fastcgi_params in nginx config templates 2016-01-21 11:51:33 +01:00
Michael Kaufmann
9d1108c2f4 Merge pull request #272 from hypernics/opcache 
add new OPCache info page
 2016-01-21 07:46:16 +01:00
Janos Muzsi
cd75bb843a wrong variable 2016-01-20 23:52:46 +01:00
Janos Muzsi
fb6393ad8f OPCache info page 2016-01-20 22:12:43 +01:00
Dessa
1ba2800a30 Merge pull request #271 from mmunz/master 
German Translations: Fix typo
 2016-01-20 13:13:41 +01:00
Manuel Munz
9d78ad70e6 German Translations: Fix typo 2016-01-20 13:10:48 +01:00
Michael Kaufmann (d00p)
98c675792e fix possible undefined values used in templates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-18 11:33:41 +01:00
Robert Förster (Dessa)
39b50d05ec fix lintian warning executable-not-elf-or-script 0.9.34.2 2016-01-18 10:54:46 +01:00
Michael Kaufmann (d00p)
a6182e2def set new version for bugfix release :P 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-18 10:53:54 +01:00
Michael Kaufmann (d00p)
efdb3623e1 fix return value usage in write-context 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-18 10:51:39 +01:00
Michael Kaufmann
eef6102088 Merge pull request #270 from hypernics/apcuinfo 
add PHP APCu Info page
 2016-01-18 10:21:05 +01:00
Michael Kaufmann (d00p)
9fe55cb729 set version to 0.9.34.1 for upcoming maintenaince release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.34.1 		2016-01-18 08:07:16 +01:00
Janos Muzsi
13870f3ae8 APCu Info page 2016-01-17 01:17:43 +01:00
Michael Kaufmann (d00p)
ca9670e832 update copyright year in static standard-customer-index page 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-15 10:26:00 +01:00
Michael Kaufmann (d00p)
29494b71fa do not create vhost content for ssl-vhosts that do not have a ssl-certificate specified, fixes #1583 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-15 09:40:59 +01:00
Michael Kaufmann (d00p)
f2c3b3f165 ignore errors when deleting old statistics-index-page in case this is the first run and no index.html exists yet 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-11 09:14:09 +01:00
Michael Kaufmann (d00p)
4e402b6378 unset js and css variables of theme after using footer-template so they can be used there instead of the header-template only, fixes #1580 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-01-11 07:14:57 +01:00
Michael Kaufmann (d00p)
6a22fbbf78 fix wrong webserver-setting when chosing apache-2.4 in the installation process, thx to TByte 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-12-27 16:26:15 +01:00
Michael Kaufmann (d00p)
27f2217139 fix typo, refs #1578 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-12-21 14:23:17 +01:00
Michael Kaufmann (d00p)
038bb803db fixing more path-related warnings when editing an ftp-user, refs #1578 2015-12-21 14:12:30 +01:00
Michael Kaufmann (d00p)
67b85e5708 fix path displaying in some cases 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-12-21 08:32:04 +01:00
Michael Kaufmann (d00p)
a21b1f7df5 correct display of paths in domain- and ftp-overview 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-12-09 08:49:43 +01:00
Michael Kaufmann (d00p)
eb6e66cbf2 do not double mailbox-paths in postfix config, fixes #1575 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-12-09 08:49:15 +01:00
Michael Kaufmann
778fe718ed Merge pull request #261 from knox/master 
added more php_value and php_flag for suhosin
 2015-11-29 20:05:32 +01:00
Michael Kaufmann
ef080cd80e Merge pull request #262 from knox/feature/suexec-workaround 
improvements of suexec-workaround
 2015-11-29 20:05:10 +01:00
knox
22a4a1824a remove suexec-workaround when removing dir options 2015-11-29 18:21:30 +01:00
knox
56163f66d8 fixed ownership of cgi-bin symlink created by suexec-workaround 
see http://manpages.debian.org/cgi-bin/man.cgi?apropos=0&format=html&query=chown&sektion=1&locale=en
 2015-11-29 17:24:24 +01:00
knox
73a7e438ec added more php_value and php_flag for suhosin 
see https://suhosin.org/stories/howtos.html and https://suhosin.org/stories/configuration.html
 2015-11-29 16:08:22 +01:00
Michael Kaufmann
27f4e226f3 Merge pull request #260 from knox/master 
added php_flag 'suhosin.session.encrypt' and 'mbstring.func_overload'
 2015-11-23 09:38:27 +01:00
knox
7357029a28 added php_flag 'suhosin.session.encrypt' and 'mbstring.func_overload' 
these are required for custom php configuration for roundcube webmail
 2015-11-22 13:41:06 +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
77dcc37b33 Merge pull request #259 from stweil/master 
Don't assign variable from void function
 2015-11-15 10:26:39 +01:00
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