Froxlor

maketank/Froxlor

Fork 0

Commit Graph

Select branches

Hide Pull Requests

2.1.x

live

master

remotes/origin/2.1.x

upgrade-2

upgrade-2.0

0.10.0

0.10.0-rc1

0.10.0-rc2

0.10.1

0.10.10

0.10.11

0.10.12

0.10.13

0.10.14

0.10.15

0.10.16

0.10.17

0.10.18

0.10.19

0.10.2

0.10.20

0.10.21

0.10.22

0.10.23

0.10.23.1

0.10.24

0.10.25

0.10.26

0.10.27

0.10.28

0.10.29

0.10.29.1

0.10.3

0.10.30

0.10.31

0.10.32

0.10.33

0.10.34

0.10.34.1

0.10.35

0.10.35.1

0.10.36

0.10.37

0.10.38

0.10.38.1

0.10.38.2

0.10.38.3

0.10.4

0.10.5

0.10.6

0.10.7

0.10.8

0.10.9

0.9

0.9.1

0.9.10

0.9.11

0.9.12

0.9.13

0.9.13.1

0.9.14

0.9.15

0.9.15.1

0.9.16

0.9.17

0.9.18

0.9.18.1

0.9.19

0.9.2

0.9.2.1

0.9.20

0.9.20.1

0.9.21

0.9.22

0.9.22-rc1

0.9.23

0.9.23-rc1

0.9.24

0.9.24-rc1

0.9.25

0.9.25-rc1

0.9.26

0.9.26-rc1

0.9.27

0.9.27-rc1

0.9.28

0.9.28-rc1

0.9.28.1

0.9.29

0.9.29-rc1

0.9.3

0.9.30

0.9.30-rc1

0.9.31

0.9.31-rc1

0.9.31-rc2

0.9.31.1

0.9.31.2

0.9.32

0.9.32-rc1

0.9.32-rc2

0.9.33

0.9.33-rc1

0.9.33-rc2

0.9.33-rc3

0.9.33.1

0.9.33.2

0.9.34

0.9.34.1

0.9.34.2

0.9.35

0.9.35-rc1

0.9.35.1

0.9.36

0.9.37

0.9.37-rc1

0.9.38

0.9.38-rc1

0.9.38-rc2

0.9.38.1

0.9.38.2

0.9.38.3

0.9.38.4

0.9.38.5

0.9.38.6

0.9.38.7

0.9.38.8

0.9.39

0.9.39.1

0.9.39.2

0.9.39.3

0.9.39.4

0.9.39.5

0.9.4

0.9.40

0.9.40.1

0.9.5

0.9.6

0.9.7

0.9.8

0.9.9

2.0.1

2.0.10

2.0.11

2.0.12

2.0.13

2.0.14

2.0.15

2.0.16

2.0.17

2.0.18

2.0.19

2.0.2

2.0.20

2.0.21

2.0.22

2.0.23

2.0.24

2.0.3

2.0.4

2.0.5

2.0.6

2.0.7

2.0.8

2.0.9

2.1.0

2.1.0-beta1

2.1.0-beta2

2.1.0-rc1

2.1.0-rc2

2.1.0-rc3

2.1.1

2.1.2

2.1.3

2.1.4

2.1.5

2.1.6

2.1.7

2.1.8

2.1.9

2.2.0

2.2.0-rc1

2.2.0-rc2

2.2.0-rc3

2.2.1

2.2.2

2.2.3

2.2.4

2.2.5

2.2.6

2.2.7

2.2.8

greylisting-2.0

f9459e92e7 fix redirect to non-standard-ssl port and also implement it for lighttpd Michael Kaufmann (d00p) 2013-09-30 08:20:03 +02:00
5e4cb880f7 Merge pull request #108 from tilman19/upstreamfix Michael Kaufmann 2013-09-29 23:08:24 -07:00
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. Tilman Klaeger 2013-09-30 01:01:10 +02:00
7b918ec982 fix php-fpm on apache2 (update 'AddHandler with SetHandler, etc.), thx to snoopotic from the forum Michael Kaufmann (d00p) 2013-09-29 20:37:39 +02:00
9d43e64610 domain-hascert state 3 is non-existent, it should be 0, thx EleRas Michael Kaufmann (d00p) 2013-09-29 19:29:24 +02:00
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 Michael Kaufmann (d00p) 2013-09-29 18:40:25 +02:00
b3280e2264 use same aliasdomain-check queryin 'add' like we do in 'edit' of domains Michael Kaufmann (d00p) 2013-09-29 18:15:46 +02:00
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 Michael Kaufmann (d00p) 2013-09-29 15:08:45 +02:00
94478d7ebc set correct guid when using fcgid and own-vhost for froxlor, thx to snoopotic from the forum Michael Kaufmann (d00p) 2013-09-29 14:49:35 +02:00
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) Michael Kaufmann (d00p) 2013-09-29 12:10:09 +02:00
5ff3b04679 add SSLVerifyDepth also to the ip/port section Michael Kaufmann (d00p) 2013-09-28 18:48:56 +02:00
243e30365f Merge pull request #106 from tilman19/master Michael Kaufmann 2013-09-28 09:47:14 -07:00
c90eecba49 Minor additions to ssl per vhost settings: add ssl CA cert and chainfail to ssl vhost Tilman Klaeger 2013-09-28 18:13:58 +02:00
eca2df275c improve ip-address description in admin_domains, thx to datenfalke and Sephi Michael Kaufmann (d00p) 2013-09-28 12:55:43 +02:00
93ba24374b move a long, these are not the changes you are looking for Michael Kaufmann (d00p) 2013-09-28 10:44:59 +02:00
d2c142c07e Merge pull request #105 from tilman19/master Michael Kaufmann 2013-09-28 01:24:39 -07:00
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 Tilman Klaeger (tilman19) 2013-09-28 03:43:49 +02:00
86d3cf794c re-add ssl.png-icon as it is still used (ssleditor), thx Sephi Michael Kaufmann (d00p) 2013-09-27 17:14:57 +02:00
f7c014e14f remove unecessary and weird conditional (how's that supposed to work?) and fix editing of domain as admin (not always reproducible though...) Michael Kaufmann (d00p) 2013-09-27 16:28:33 +02:00
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 Michael Kaufmann (d00p) 2013-09-27 11:03:21 +02:00
5b419cb7df add missing copyright notes to cron_mailboxsize; implement untested version of multi-stack for lighttpd-webserver Michael Kaufmann (d00p) 2013-09-27 10:19:58 +02:00
a3eeb21ae2 create correct SetHandler/FCGID config for froxlor's own vhost when vhostcontainer=1 and fcgid is enabled, thx to snoopotic from our forum Michael Kaufmann (d00p) 2013-09-26 21:19:22 +02:00
5d4b7e3856 when removing a ip/port combination, also remove the connections to domains Michael Kaufmann (d00p) 2013-09-25 17:59:36 +02:00
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 Michael Kaufmann (d00p) 2013-09-25 17:08:06 +02:00
a993295356 fixes when adding a user with std.subdomain (multi-stack related) Michael Kaufmann (d00p) 2013-09-24 17:32:40 +02:00
bacf60df59 Sephi doesn't like missing B's in KB :P Michael Kaufmann (d00p) 2013-09-23 17:38:52 +02:00
1edb3c7874 also, select field 'mboxsize' in customer_email because we want to show it to the user :P, thx Sephi...again... Michael Kaufmann (d00p) 2013-09-23 17:36:17 +02:00
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 Michael Kaufmann (d00p) 2013-09-23 16:58:27 +02:00
f9f4773616 properly escape custom-error strings in apache2, fixes #1009 Michael Kaufmann (d00p) 2013-09-23 14:48:02 +02:00
74b48dace2 better error-message when version of files do not match version in database (update needed), thx to 'unknown75' from the Forum Michael Kaufmann (d00p) 2013-09-23 12:27:11 +02:00
6b3a54995c fix enabling of 'speciallogfile' if security questions are asked when editing a domain, fixes #1213 Michael Kaufmann (d00p) 2013-09-23 09:35:33 +02:00
bdd2ca2300 embed html5shiv.js locally instead of using a (probably) unreliable source (which also updates it to 3.6.2 final) Robert Förster (Dessa) 2013-09-22 20:33:48 +02:00
bbab7d7298 we don't use the non-minified versions of the jqplot plugins so we don't need to keep them Robert Förster (Dessa) 2013-09-22 20:25:05 +02:00
8a5c9dd03b update css folder, use minified versions as we do not change them Robert Förster (Dessa) 2013-09-22 20:18:59 +02:00
6a9de311c7 re-add jqery-stuff - something went wrong the last time Michael Kaufmann (d00p) 2013-09-22 17:17:00 +02:00
fea16cd108 register our own autoloader and add PHPMailerAutoload so we don't need to patch phpMailer on every update Michael Kaufmann (d00p) 2013-09-21 13:10:04 +02:00
b894e273c7 remove requirement of PHPMailerAutoloader as we have our own Michael Kaufmann (d00p) 2013-09-21 13:03:04 +02:00
30122d8bf1 just replace the german word for 'unlimited' with the corresponding sign like in the english lang-file Michael Kaufmann (d00p) 2013-09-21 12:48:52 +02:00
fc802f8087 Update all JQuery related libraries to more recent versions Michael Kaufmann (d00p) 2013-09-21 12:47:53 +02:00
5ceaede1a9 Update Smarty to current stable version 3.1.14 Michael Kaufmann (d00p) 2013-09-21 12:23:33 +02:00
2dfdd6a5f9 Update HTMLPurifier to current stable version 4.5.0 Michael Kaufmann (d00p) 2013-09-21 12:18:55 +02:00
fc8bd2b7af Update phpMailer to current stable release 5.2.7 Michael Kaufmann (d00p) 2013-09-21 12:07:44 +02:00
98f1bc49fd beautify ip-list when editing a domain as customer; correct 'sed'-command for fpm-setup for debian wheezy; add note for ftp-path validation (bug #1231) Michael Kaufmann (d00p) 2013-09-20 10:58:36 +02:00
0475751cee fix minor issues; re-added cronjob for lighttpd-webserver (i swear i don't know what happened :P) Michael Kaufmann (d00p) 2013-09-19 22:13:12 +02:00
9e405dafce merge tilman19-master branch (multistack support) - note: this is a very early stage, don't expect everything to work 100%, use at your own risk. Testers are very very welcome (only apache2 and nginx (even more testing) so far) Michael Kaufmann (d00p) 2013-09-19 19:36:06 +02:00
46e260fc91 correcting variable name, now really fixes #1264 Michael Kaufmann (d00p) 2013-09-19 08:04:25 +02:00
005dfac926 Merge branch 'master' of github.com:Froxlor/Froxlor Michael Kaufmann (d00p) 2013-09-18 23:30:46 +02:00
a62eff0819 fix deactivating of nameserver-option in admin_domains when editing a domain, fixes #1264 Michael Kaufmann (d00p) 2013-09-18 23:29:41 +02:00
1d49bfe80e partially revert to a75dad35dd, fixes #1263 Robert Förster (Dessa) 2013-09-18 15:45:21 +02:00
23361e64bb setting version to 0.9.29 0.9.29 Michael Kaufmann (d00p) 2013-09-18 12:50:22 +02:00
b5a999ae6b remove mod_tls_memcache module from debian wheezy's proftpd config as it is provided without memcache-support, fixes #1258 Michael Kaufmann (d00p) 2013-09-18 07:38:01 +02:00
2432b7c466 add note for customer-ssl-directory that it will be purged by the cron (just like fcgid-config-dir) Michael Kaufmann (d00p) 2013-09-12 18:45:36 +02:00
075e18def3 add note to customer domain-add/edit to clearify trailing-slash in URLs, corrected apache-rewrite for url-redirects, fixes #1261 Michael Kaufmann (d00p) 2013-09-07 11:32:08 +02:00
cce4bd36ef wrong solution by SCD in #1261. This works as intended for me. Michael Kaufmann (d00p) 2013-09-07 09:53:02 +02:00
d61fe9e0c0 fix mod-rewrite for redirect to URIs, fixes #1261 Michael Kaufmann (d00p) 2013-09-06 14:00:15 +02:00
daf94c6ec9 regenerate webserver-configuration files after changing ssl-certificates as customer, fixes #1260 Michael Kaufmann (d00p) 2013-09-03 14:40:03 +02:00
77143c7de0 use correct vmail username/groupname variable for postfix/dovecot Michael Kaufmann (d00p) 2013-09-03 10:29:49 +02:00
ed2949bd21 Merge pull request #104 from nsb2006/patch-1 Michael Kaufmann 2013-09-01 03:54:16 -07:00
427f862dac Update zh-cn.lng.php nsb2006 2013-09-01 18:50:49 +08:00
c97b3f3e0c add note that opendkim is currently not supported 0.9.29-rc1 Michael Kaufmann (d00p) 2013-08-27 11:45:21 +02:00
e50e9cbd8d Merge pull request #103 from misdoro/master Michael Kaufmann 2013-08-25 22:49:41 -07:00
d90af956de Update function.validateDomain.php misdoro 2013-08-25 20:46:08 +02:00
ef688bd0c0 add htmlpurifier Serializer dir to .gitignore. Robert Förster (Dessa) 2013-08-20 07:12:08 +02:00
022b83d881 remove notice of undefined variable when adding/editing a customer as admin Michael Kaufmann (d00p) 2013-08-20 06:55:56 +02:00
14bd4c927b show real loginname instead of just <froxloruser> so people won't get confused, refs #1251 Michael Kaufmann (d00p) 2013-08-19 12:23:28 +02:00
6bfec9dc40 adding cipher-order to ssl-vhosts when using apache, thx to Marcel Michael Kaufmann (d00p) 2013-08-19 11:20:39 +02:00
60ddcc221c fix undefined index 'openbasedir' when creating a subdomain Michael Kaufmann (d00p) 2013-08-18 21:17:41 +02:00
c11460cfcc use correct html-characters to display lower-than and greater-than signs in backup-info-text, fixes #1251 Michael Kaufmann (d00p) 2013-08-18 13:00:07 +02:00
a181954864 remove duplicate, old and wrong language entry in dutch language file, fixes #1250 Michael Kaufmann (d00p) 2013-08-18 12:07:08 +02:00
dc57eb1394 remove unknown user 'froxlorftp' and use nobody/nogroup (default) for proftpd on gentoo, fixes #1249 Michael Kaufmann (d00p) 2013-08-18 12:00:28 +02:00
a33b3b3fd9 remove duplicate config-entry in proftpd.conf for gentoo, fixes #1247 Michael Kaufmann (d00p) 2013-08-18 11:55:43 +02:00
e4a4755ed0 add missing icon, thx to novaflash Michael Kaufmann (d00p) 2013-07-19 12:08:45 +02:00
ab8975ccc3 Merge branch 'master' of github.com:Froxlor/Froxlor Michael Kaufmann (d00p) 2013-07-14 11:24:17 +02:00
d4d02bfa7d fix undefined variables and domain-edit of php-config when FPM is enabled Michael Kaufmann (d00p) 2013-07-14 11:23:52 +02:00
fbb4c81e53 - put proper smtpd_relay_restrictions also in gentoo template, postfix 2.10 is stable for a while now (and the only available version besides masked 2.11 anyway) - fix 80 char "limit" per line for wheezy postfix templates (only cosmetic) Robert Förster (Dessa) 2013-07-12 09:22:21 +02:00
6d06187df4 make e-mail address and compare-address lowercase, thx to DasTho from the forum Michael Kaufmann (d00p) 2013-07-10 13:45:52 +02:00
1870a88f6b fix possible undefined variable in error-message, thx to Dessa Michael Kaufmann (d00p) 2013-07-09 21:46:56 +02:00
d02c739640 fix proftpd-config-templates for debian wheezy, thx to finnq & Spacey Michael Kaufmann (d00p) 2013-07-09 20:54:06 +02:00
26326937b1 (probably) fixed postfix configuration Robert Förster (Dessa) 2013-07-08 18:40:10 +02:00
3267cdfda7 fix undefined variable in wheezy-config Michael Kaufmann (d00p) 2013-07-05 10:55:42 +02:00
b7a4b69ee0 enhance php-fpm configuration options to use custom-ini-settings, refs #587 Michael Kaufmann (d00p) 2013-07-05 10:54:52 +02:00
69e2c7dee1 Merge pull request #101 from 23networks/master Michael Kaufmann 2013-07-04 10:24:01 -07:00
7589e7a21b fix incorrect database-field regarding Maildir setting, fixes #1242 ; set version to 0.9.29-rc1 Michael Kaufmann (d00p) 2013-07-04 19:20:20 +02:00
272de00af2 php-fpm--config 'log_errors_max_len' belongs to php_value and not php_flag, fixes #1241 Michael Kaufmann (d00p) 2013-07-04 19:03:06 +02:00
ff66f62831 Merge branch 'master' of github.com:Froxlor/Froxlor Michael Kaufmann (d00p) 2013-07-03 11:34:45 +02:00
68fb822160 give possibility to change php.ini-values for fpm-pool configurations (only pre-defined sections are possible for now), refs #587 Michael Kaufmann (d00p) 2013-07-03 11:34:34 +02:00
c00edd399e override fg color to obtain readability Johannes Matheis 2013-07-03 08:47:42 +00:00
a75dad35dd massive update of the wheezy templates, but take them with a grain of salt for now, in particular: - dkim is broken (pending code changes, this affects *everyone* with opendkim i suppose) - it has received *no* testing (yet) Robert Förster (Dessa) 2013-07-01 15:07:28 +02:00
d4e79911cb Merge pull request #100 from evgeni/allow_sieve Dessa 2013-07-01 03:55:30 -07:00
44cfa99c5c allow sieve usage for all mail users Evgeni Golov 2013-06-30 21:45:58 +02:00
9b60dc09ea add possibility to specify enabled Zend Guard for APS, fixes #1235 Michael Kaufmann (d00p) 2013-06-21 10:22:46 +02:00
04e1ade0d2 Merge pull request #99 from 5nafu/master Michael Kaufmann 2013-06-21 00:06:43 -07:00
05399ce53e Merge pull request #98 from wb7/master Michael Kaufmann 2013-06-21 00:05:46 -07:00
3ef481763c Bug #1220: Added smtpd_relay_restrictions to all postfix configurations 5nafu 2013-06-21 08:57:57 +02:00
f842e69d81 Changed sentence @d00p Lucas 2013-06-20 13:54:09 +03:00
de09d3dd5f Removed tag at the end Lucas 2013-06-19 19:48:55 +03:00
1793873bbb Updated german grammer #2 Lucas 2013-06-19 19:46:58 +03:00
fb04e99dcb Merge pull request #97 from wb7/master Michael Kaufmann 2013-06-19 08:56:03 -07:00
817966f4ea Changed some German sentences - grammer Lucas 2013-06-19 18:15:56 +03:00
d9e7cd349b fix in display of error for path-field when dropdown is chosen (customer/domains); update change in speciallogfile also for subdomains of that domain, fixes #1223 Michael Kaufmann (d00p) 2013-06-09 15:18:38 +02:00