maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
1,564 Commits 6 Branches 188 Tags
a59fee305a61806ebfdb56cd3942bff76d3fde11
Commit Graph

1564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
a59fee305a fix php-fcgi starter script for nginx/php, thx to Witalij from Aixit GmbH 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 10:08:47 +02:00
Michael Kaufmann (d00p)
09b408c375 make changing default theme in settings recurse through customers and admins if changing themes for them is disallowed, fixes #1233 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 10:07:36 +02:00
Michael Kaufmann (d00p)
c109f9098c remove pretty old backwards-compatibility symlinks of cron-files, noone should need them anymore 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 09:40:01 +02:00
Michael Kaufmann
bde5ef5c90 Merge pull request #109 from tilman19/upstreamfix 
Changing SetHandler to AddHandler again
 2013-09-30 09:58:42 -07:00
Tilman Klaeger
0ca34daf76 Changing SetHandler to AddHandler again, works for me on my system. 2013-09-30 18:36:45 +02:00
Florian Aders (EleRas)
8c50c21657 Fixed type (add should be edit in edit-case) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-09-30 14:12:43 +02:00
Michael Kaufmann (d00p)
2b8d42b418 fix minor spelling error, thx to Talisman 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-30 12:13:31 +02:00
Michael Kaufmann (d00p)
2e52b95d37 fix weird behavior when adding/editing the aliasdomain value and no ssl-ip/port is given, thx datenfalke 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-30 12:12:04 +02:00
Michael Kaufmann (d00p)
5be9861bad respect default_vhostconf_domain setting of all ip/port combinations 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-30 09:59:47 +02:00
Michael Kaufmann (d00p)
de16c9c4a0 don't create a full vhost for every ip/port, just put all the ip's in the <virtualhost>-tag 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-30 08:50:18 +02:00
Michael Kaufmann (d00p)
f9459e92e7 fix redirect to non-standard-ssl port and also implement it for lighttpd 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-30 08:20:03 +02:00
Michael Kaufmann
5e4cb880f7 Merge pull request #108 from tilman19/upstreamfix 
Fix for SSL redirect if ssl port != 443
 2013-09-29 23:08:24 -07:00
Tilman Klaeger
573ada496a Fix for SSL redirect if ssl port != 443 
Before it used to forward to https://site:80 as it only checked for
domain[port] to be !=443, wich the redirecting vhost usualy is.
Now we check for destination port !=443.
Customer still has to be carefull when setting ports and IPs,
different ports on different IPs on same domain will always cause
trouble.

tilman19, tilman@3c7.de
 2013-09-30 01:26:08 +02:00
Michael Kaufmann (d00p)
7b918ec982 fix php-fpm on apache2 (update 'AddHandler with SetHandler, etc.), thx to snoopotic from the forum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-29 20:37:39 +02:00
Michael Kaufmann (d00p)
9d43e64610 domain-hascert state 3 is non-existent, it should be 0, thx EleRas 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-29 19:29:24 +02:00
Michael Kaufmann (d00p)
0b0a515124 show either if domain has a global certificate (via ip/port), a shared certificate (via parentdomain) or it's own certificate (customer-entered), thx to Nico for the artwork 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-29 18:40:25 +02:00
Michael Kaufmann (d00p)
b3280e2264 use same aliasdomain-check queryin 'add' like we do in 'edit' of domains 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-29 18:15:46 +02:00
Michael Kaufmann (d00p)
879302623b dirty fix for adding new domains when alias-domain is set (IP-check etc. were not done in tilman19-master branch), I'll get into that later 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-29 15:08:45 +02:00
Michael Kaufmann (d00p)
94478d7ebc set correct guid when using fcgid and own-vhost for froxlor, thx to snoopotic from the forum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-29 14:49:35 +02:00
Michael Kaufmann (d00p)
7015ded73a fix missing variable-sign in updater (only regarding nginx users with false fastcgi_param setting updating from 0.9.28.1 to 0.9.29-dev1) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-29 12:10:09 +02:00
Michael Kaufmann (d00p)
5ff3b04679 add SSLVerifyDepth also to the ip/port section 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-28 18:48:56 +02:00
Michael Kaufmann
243e30365f Merge pull request #106 from tilman19/master 
Minor additions to ssl per vhost settings
 2013-09-28 09:47:14 -07:00
Tilman Klaeger
c90eecba49 Minor additions to ssl per vhost settings: 
add ssl CA cert and chainfail to ssl vhost

tilman19, tilman@3c7.de
 2013-09-28 18:37:10 +02:00
Michael Kaufmann (d00p)
eca2df275c improve ip-address description in admin_domains, thx to datenfalke and Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-28 12:55:43 +02:00
Michael Kaufmann (d00p)
93ba24374b move a long, these are not the changes you are looking for 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-28 10:44:59 +02:00
Michael Kaufmann
d2c142c07e Merge pull request #105 from tilman19/master 
Little addition to phpfpm ondemand, part 1
 2013-09-28 01:24:39 -07:00
Tilman Klaeger (tilman19)
fd3852da68 php-fpm in ondemand mode keeps php process as long alive as set in 
php_fpm_idle_timeout to prevent reload on every call when setting
startup_servers to 0

tilman19 <tilman@3c7.de>
 2013-09-28 03:43:49 +02:00
Michael Kaufmann (d00p)
86d3cf794c re-add ssl.png-icon as it is still used (ssleditor), thx Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-27 17:14:57 +02:00
Michael Kaufmann (d00p)
f7c014e14f remove unecessary and weird conditional (how's that supposed to work?) and fix editing of domain as admin (not always reproducible though...) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-27 16:28:33 +02:00
Michael Kaufmann (d00p)
0727a6bf7b show whether ssl-certs are given for a domain by red or green icon in customer-domains, thx to nico for the icon-work 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-27 11:03:21 +02:00
Michael Kaufmann (d00p)
5b419cb7df add missing copyright notes to cron_mailboxsize; implement untested version of multi-stack for lighttpd-webserver 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-27 10:19:58 +02:00
Michael Kaufmann (d00p)
a3eeb21ae2 create correct SetHandler/FCGID config for froxlor's own vhost when vhostcontainer=1 and fcgid is enabled, thx to snoopotic from our forum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-26 21:19:22 +02:00
Michael Kaufmann (d00p)
5d4b7e3856 when removing a ip/port combination, also remove the connections to domains 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-25 17:59:36 +02:00
Michael Kaufmann (d00p)
7cdfdda45c allow non-standard ssl-port for ssl-redirects (actually, put the port in there if non-standard is defined in ip/port combination), fixes #201 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-25 17:08:06 +02:00
Michael Kaufmann (d00p)
a993295356 fixes when adding a user with std.subdomain (multi-stack related) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-24 17:32:40 +02:00
Michael Kaufmann (d00p)
bacf60df59 Sephi doesn't like missing B's in KB :P 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 17:38:52 +02:00
Michael Kaufmann (d00p)
1edb3c7874 also, select field 'mboxsize' in customer_email because we want to show it to the user :P, thx Sephi...again... 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 17:36:17 +02:00
Michael Kaufmann (d00p)
2a396ffb31 enhance master-cronjob parameter usage, you can now use --force-[cronname] to force any cronjob you like; now show mailbox sizes of emial accounts in the customers email overview, fixes #1007 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 16:58:27 +02:00
Michael Kaufmann (d00p)
f9f4773616 properly escape custom-error strings in apache2, fixes #1009 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 14:48:02 +02:00
Michael Kaufmann (d00p)
74b48dace2 better error-message when version of files do not match version in database (update needed), thx to 'unknown75' from the Forum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 12:27:11 +02:00
Michael Kaufmann (d00p)
6b3a54995c fix enabling of 'speciallogfile' if security questions are asked when editing a domain, fixes #1213 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 09:35:33 +02:00
Robert Förster (Dessa)
bdd2ca2300 embed html5shiv.js locally instead of using a (probably) unreliable source (which also updates it to 3.6.2 final) 2013-09-22 20:35:09 +02:00
Robert Förster (Dessa)
bbab7d7298 we don't use the non-minified versions of the jqplot plugins so we don't need to keep them 2013-09-22 20:35:09 +02:00
Robert Förster (Dessa)
8a5c9dd03b update css folder, use minified versions as we do not change them 2013-09-22 20:35:09 +02:00
Michael Kaufmann (d00p)
6a9de311c7 re-add jqery-stuff - something went wrong the last time 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-22 17:17:00 +02:00
Michael Kaufmann (d00p)
fea16cd108 register our own autoloader and add PHPMailerAutoload so we don't need to patch phpMailer on every update 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-21 13:10:04 +02:00
Michael Kaufmann (d00p)
b894e273c7 remove requirement of PHPMailerAutoloader as we have our own 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-21 13:03:04 +02:00
Michael Kaufmann (d00p)
30122d8bf1 just replace the german word for 'unlimited' with the corresponding sign like in the english lang-file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-21 12:48:52 +02:00
Michael Kaufmann (d00p)
fc802f8087 Update all JQuery related libraries to more recent versions 2013-09-21 12:47:53 +02:00
Michael Kaufmann (d00p)
5ceaede1a9 Update Smarty to current stable version 3.1.14 2013-09-21 12:23:33 +02:00