maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
4,868 Commits 6 Branches 188 Tags
164b46ece31cf9e290b0fc9acf7dfdd57d2ab75d
Commit Graph

4868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Rosenberger
d0c7706840 Checks Mysql version only if no fatal error occured 
Otherwise it is not possible to install current master due to fatal error.
 2018-12-12 20:54:56 +01:00
Michael Kaufmann
1a15cef76d when using --force on the cronjob it will now also re-set quotas if enabled 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-12 19:49:46 +01:00
Michael Kaufmann
dc44c67f86 do not show 'override fpmconfig' checkbox when not using php-fpm in php-configs 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-12 19:48:56 +01:00
Michael Kaufmann
ab819129dd return the subdomain-names in PhpSettings::listing() instead of only the amount 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-11 11:45:39 +01:00
Michael Kaufmann
8d966aebee Show number of subdomains that use a php-config; fixes #532 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-11 10:12:37 +01:00
Michael Kaufmann
4988600881 added new indicator whether services/system has been configured (on new installations); show alternative configuration possibility via config-services.php script 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-10 20:34:43 +01:00
Michael Kaufmann
d381528c06 reload fpm before nginx 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-09 11:51:43 +01:00
Michael Kaufmann
3d647a2c2e fix read in correct fpm-daemon config-id for nginx and lighttpd own-vhost, thx again to heavygale 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-09 11:05:36 +01:00
Michael Kaufmann
7e6180fed8 read in correct fpm-daemon config-id for nginx and lighttpd, thx to heavygale 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-09 10:45:22 +01:00
Michael Kaufmann
9e4ed645f7 use correct page title for php-fpm versions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-09 10:29:19 +01:00
Michael Kaufmann
9522e0cfb1 fix typo and fix '"continue" targeting switch is equivalent to "break". Did you mean to use "continue 2"' warning (as of php-7.3) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-09 08:31:21 +01:00
Michael Kaufmann
db36d57683 fix an issue where the isemaildomain flag for a main-domain can be set to false when edited by customer 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-08 12:46:17 +01:00
Michael Kaufmann
ddddbdfb18 Merge pull request #609 from foliengriller/annotations 
Improves annotations in /lib/classes/api/
 2018-12-04 22:03:07 +01:00
Michael Rosenberger
df3ad9ed12 Improves annotations for API 2018-12-04 21:58:46 +01:00
Michael Kaufmann
456875905d set password compatibility for mysql8 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-04 19:52:18 +01:00
Michael Kaufmann
1707b5e7fd fix create user for mysql8 for good, thx to bimmer 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-04 17:33:58 +01:00
Michael Kaufmann
034d1b1c8e correct syntax for CREATE USER when using mysql8 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-04 15:42:05 +01:00
Michael Kaufmann
5dd915736b changed all boolean parameters to getBoolParam-function 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-04 14:40:11 +01:00
Michael Kaufmann
07d7908f6e added wrapper for boolean api-parameters, Domains-Module for now, more later; fixes #597 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-04 13:27:21 +01:00
Michael Kaufmann
cf53365007 update README and CONTRIBUTING files; added PULL_REQUEST_TEMPLATE; database user-creation fix for MySQL8 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-04 10:52:49 +01:00
Michael Kaufmann
1f2c1c1d2f Merge pull request #608 from foliengriller/openssl1 
Ads missing extension openssl to composer.json
 2018-12-03 21:41:30 +01:00
Michael Kaufmann
51390d8add Merge pull request #607 from foliengriller/caseMissmatch1 
Corrects case missmatch of function calls
 2018-12-03 21:37:35 +01:00
Michael Rosenberger
98120de7e1 Ads missing extension openssl to composer.json 2018-12-03 21:37:17 +01:00
Michael Rosenberger
88a2cb37c9 Case missmatch of function calls 2018-12-03 21:30:12 +01:00
Michael Kaufmann
ec4d34d37a let's see if that works :P 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-03 17:29:42 +01:00
Michael Kaufmann
0b3d532028 ups, how did these get lost? 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-03 17:18:44 +01:00
Michael Kaufmann
4a0be40f92 require php-5.6 for 0.10.0; fixes #606 and remove invalid value NO_AUTO_CREATE_USER in mysql-attributes for mysql8 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-03 17:15:54 +01:00
Michael Kaufmann
2da59f1055 do not rely on fixed order of import-file for domains-import; first line now has to be the names of the api-parameters used for Domains.add, see https://api.froxlor.org/doc/0.10.0/#v-Domains, fixes #544 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-02 20:06:53 +01:00
Michael Kaufmann
1ca1314ac4 fix typo in updater 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-02 19:27:50 +01:00
Michael Kaufmann
426e46a2df show registration date of domain (if given) in admin and customer domain-list, fixes #553 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-02 11:50:45 +01:00
Michael Kaufmann
212cb0140d ups minor CSS typo, refs #603 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-01 15:06:16 +01:00
Michael Kaufmann
8291c7d2ab Allow access to webserver logs via weinterface, if activated for customer; todo: view more content dynamically; fixes #603 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-01 13:33:08 +01:00
Michael Kaufmann
1bd4c00631 forgot to replace frontend variables with replacer 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-30 13:55:08 +01:00
Michael Kaufmann
69495b94af add 2FA mechanism, fixes #547 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-30 13:45:17 +01:00
Michael Kaufmann
29c754e700 add new CUSTOMER_HOMEDIR replacer for php-configs, thx to rubberduck for the hint 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-29 09:37:18 +01:00
Michael Kaufmann
fd69fc22db format composer.json and add php-7.0 as dev-requirement (phpunit6); add unit-test for Backup.add() when customer passes / as path value 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-28 13:17:44 +01:00
Michael Kaufmann
c7bee4edf2 update 0.9.x updater according to latest bugfix-release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-27 18:53:37 +01:00
Michael Kaufmann
9756c792d7 disable sending of emails when running tests completely when run on travis 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-27 12:05:56 +01:00
Michael Kaufmann
a86f10a4b4 fix typo in function name, refs #601 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-27 11:49:32 +01:00
Michael Kaufmann
946c2507c5 last try before i branch for testing this - next time, really 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 22:00:50 +01:00
Michael Kaufmann
56ac4b5c26 last try before i branch for testing this :P 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 21:57:15 +01:00
Michael Kaufmann
e4becfb1dd add missing php-invoker stuff 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 21:50:35 +01:00
Michael Kaufmann
6129768711 actually use the required phpunit version pulled from composer 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 21:38:36 +01:00
Michael Kaufmann
72690e311f add specific phpunit version to dev-requirements 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 21:33:40 +01:00
Michael Kaufmann
2ef067e12d set a few settings according to the test-system 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 21:05:57 +01:00
Michael Kaufmann
ae71e3ad2a new try with travis-ci #last-really 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 20:29:27 +01:00
Michael Kaufmann
745621c416 new try with travis-ci #last 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 20:23:56 +01:00
Michael Kaufmann
069ccd24e6 new try with travis-ci #3 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 20:16:15 +01:00
Michael Kaufmann
76b5f813c5 new try with travis-ci #2 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 20:12:32 +01:00
Michael Kaufmann
9ad6616fa3 new try with travis-ci 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-26 20:09:27 +01:00