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

747 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
27f8c8b438 show domains of disabled customers also as disabled 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 11:49:15 +01:00
Michael Kaufmann (d00p)
fc0c796b68 avoid undefined variables/indexes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 10:58:06 +01:00
Michael Kaufmann (d00p)
de70dbb888 fix checked-property when applying hosting-plan for allowed-phpconfigs 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-12 14:58:17 +01:00
Michael Kaufmann (d00p)
bb792f228f add new hosting-plans feature 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-12 13:28:13 +01:00
Michael Kaufmann (d00p)
5612720342 only let admin select php-configs that the customer is allowed to use to avoid unwanted php-config changes when customer edits domain, refs #514 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-09 13:57:23 +01:00
Michael Kaufmann (d00p)
840b5ea229 add new feature: import/export of settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-28 14:33:00 +01:00
Michael Kaufmann (d00p)
29968e6026 add stretch config-templates, testers/feedback welcome 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-11 10:44:42 +01:00
Michael Kaufmann (d00p)
af55fe5b82 add possibility to add multiple php-fpm instances 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-07 14:55:25 +01:00
Michael Kaufmann (d00p)
1753d2895b add simple smtp-settings test-page, fixes #464 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-08-25 10:34:59 +02:00
Michael Kaufmann (d00p)
c2c5178831 remove superfluous character in froxlor.sql file, fixes #471 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-08-23 14:03:39 +02:00
Michael Kaufmann (d00p)
9aa2cc269b rename MYSQL_PASSWORD replacer to FROXLOR_MYSQL_PASSWORD in config-templates to avoid false replacement of couriers authmysqlrc, fixes #438 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-05-12 12:23:14 +02:00
Michael Kaufmann (d00p)
192e00c717 do not show NameVirtualHost in IP/Port overview when using apache-2.4 (as NameVirtualHost does not exist there anymore) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-22 08:04:11 +01:00
Michael Kaufmann (d00p)
979b1b0ad8 forgot to add template for subjectAlternativeName stuff in ssl-overview 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-18 13:23:35 +02:00
Michael Kaufmann (d00p)
ed0ede645a added ssl-certificate overview for admins and customers to show CN, Issuer, ValidFrom and ValidTo dates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-26 11:48:36 +02:00
Michael Kaufmann (d00p)
a1e4374ada show detailed information about diskspace-usage (web-, mail-, mysql-usage separated) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-19 11:42:08 +02:00
Daniel Reichelt
56c8e90700 display system hostname and some memory info on dashboard 
hostname may be useful in situations where several froxlors are
reverse-proxied on a single webserver
 2016-09-16 09:16:19 +02:00
Michael Kaufmann (d00p)
3b157a8c66 do not hide unavailable options, just disable them so people can see what is actually possible but just not available due to webserver-usage or other settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-12 11:23:29 +02:00
Michael Kaufmann (d00p)
45b6d8d571 add possibility to allow customers to select a shell for their ftp-users, with great thanks to KAPPER NETWORK-COMMUNICATIONS GmbH - kapper.net 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-08-26 10:46:15 +02:00
Robert Förster (Dessa)
51152ef026 fix lintians executable-not-elf-or-script 2016-08-02 11:40:37 +02:00
Michael Kaufmann (d00p)
cc372ba89b show DNS editor only if nameserver is activated at all 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-08-02 07:58:23 +02:00
Michael Kaufmann (d00p)
e5c649aba3 Add dns-editor icon/link to domain-overview list 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-07-27 07:48:25 +02:00
Michael Wyraz
54e2f83b17 function Settings::IsInList that tests if an option of a multi-select setting is set 2016-07-22 10:30:13 +02:00
Michael Wyraz
5165cac4e2 Hide http/ftp/mail traffic charts based on new settings 2016-07-22 09:44:20 +02:00
Daniel Reichelt
6df08f6b9a don't split .gitignore 
they would end up in .deb packages
 2016-06-19 23:09:04 +02:00
Michael Kaufmann (d00p)
151d8f8c5c Merge remote-tracking branch 'origin/master' into dns-editor 2016-05-23 15:55:24 +02:00
Michael Kaufmann (d00p)
b51f0821cb show scheduled backup and give customer the possiblity to abort the job 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-22 11:08:44 +02:00
Michael Kaufmann (d00p)
fa60c17dbc fix sql-query when editing a customer; check for dnsenabled flag in customer-domain-view template 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-18 13:32:44 +02:00
Michael Kaufmann (d00p)
e0e748a0bc outsource record-generation and zone-generation to classes for better handling 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-15 08:46:23 +02:00
Michael Kaufmann (d00p)
11eb08e031 add enabled-flag; enable dns-editor for customers; add german translations; few more fixes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-13 13:27:33 +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)
64d068659f more validation for NS and SRV records; fix display of long records 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-10 10:54:59 +02:00
Michael Kaufmann (d00p)
e33d7b756f add missing error-language-string; check whether domain is bind-domain 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-10 07:37:42 +02:00
Michael Kaufmann (d00p)
5acd51fdd3 add first part of new dns-editor 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-10 07:37:42 +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
e8f5fc1a8a Merge pull request #347 from floreno/patch-3 
min-height against height fix for ajax-changing-content
 2016-04-12 07:36:37 +02:00
Michael Kaufmann (d00p)
a014b5cc2b minor preparations for system-hostname as 'normal' domain (to use ssl/LE/etc.) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-11 09:19:43 +02:00
floreno
d474f2ec8f min-height against height fix for ajax-changing-content 2016-04-11 06:55:48 +02:00
Roman Schmerold (BNoiZe)
f5e2afaa0a Add LE icon to admin domain list 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2016-03-16 17:54:11 +01:00
Michael Kaufmann (d00p)
104383d31e add a few opcache relevant php-ini directives to be used with php-fpm; add opcache.restrict_api to the default php-config for each domain with the customer's docroot as default value 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-15 17:05:09 +01:00
Michael Kaufmann (d00p)
be83c99334 show db version on admin-dashboard 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-07 14:01:49 +01:00
Michael Kaufmann (d00p)
ca34f7a78a fix pagination on logger page (admin and customer) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-04 22:14:59 +01:00
Michael Kaufmann (d00p)
eae8b8835b enhance description of newsfeed-settings; show note on disabled admin-newsfeed on admin's dashboard; todo: ask for activation of newsfeed on install-process 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-03-04 21:57:49 +01:00
Michael Kaufmann (d00p)
f9d949f90c Revert "Merge pull request #318 from Churro/froxlorMerge_33ab67a" 
This reverts commit 4f2ee129fd, reversing
changes made to f284d67843.
 2016-03-03 23:38:02 +01:00
Michael Kaufmann (d00p)
f6e519d779 Revert "Merge pull request #326 from Churro/froxlorMerge_vhostTemplates" 
This reverts commit 319668d384, reversing
changes made to aa592c7369.

Conflicts:
	install/froxlor.sql
	install/updates/froxlor/0.9/update_0.9.inc.php
	lib/version.inc.php
 2016-03-03 23:31:19 +01:00
Johannes Feichtner
088eef9728 Vhost templates: Added a field to select the target webserver 2016-02-27 20:18:16 +01:00
Johannes Feichtner
06f4907053 Added autoresize to shell commands 2016-02-27 13:17:39 +01:00
Johannes Feichtner
abe253bc31 Feature: Vhost templates 
Reworked the initial implementation by hpmewes (https://github.com/Froxlor/Froxlor/pull/233) with
- bugfixes all over
- added support for apache and lighttpd also
- added an update sequence (instead of only modifying froxlor.sql)
- added english language variables
- added missing parts in admin_vhostsettings.php
- added parameter replacements as available since PR 244
 2016-02-21 14:53:24 +01:00
Michael Kaufmann
a6bd323a0e Merge pull request #314 from Churro/froxlorMerge_ce6cc23 
Feature: Make the MYSQL_PASSWORD string dynamically definable
 2016-02-20 22:17:49 +01:00
Johannes Feichtner
9c7092292b Feature: Make the MYSQL_PASSWORD string definable once in order to be able to copy the fragments without further change 2016-02-20 21:36:30 +01:00
Johannes Feichtner
46eeb65ff0 IPs and Ports: Only show attributes used by the current webserver 2016-02-20 21:13:47 +01:00