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

3663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
7a68dfc450 DirProtections and DirOptions stuff 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-15 19:35:56 +01:00
Michael Kaufmann (d00p)
858a9ba6a4 added DirProtections.update() and various unit-tests 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-15 11:01:17 +01:00
Michael Kaufmann (d00p)
f2809c47ac finished DirProtections.add() and some basic tests 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-14 19:41:12 +01:00
Michael Kaufmann (d00p)
616fb77de5 check for installed/configured froxlor in api.php and return 404 if not 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-14 18:13:32 +01:00
Michael Kaufmann (d00p)
b03d41087a Merge remote-tracking branch 'origin/master' into 0.10.0 2018-03-14 11:41:42 +01:00
Michael Kaufmann (d00p)
724e88b94f rename handler php5-fastcgi to php-fastcgi, just cosmetics; fixes #536 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-14 11:37:45 +01:00
Michael Kaufmann (d00p)
3c802038f2 split touch-command for multiple files into single ones, fixes #535 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-14 11:35:03 +01:00
Michael Kaufmann (d00p)
fe385b7800 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-03-13 10:41:01 +01:00
Michael Kaufmann (d00p)
38b57117e2 minor fixes in froxlor-sql file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-13 10:40:45 +01:00
Michael Kaufmann (d00p)
7e47383ee3 ignore NumberOfChildren pmd warning 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 22:12:16 +01:00
Michael Kaufmann (d00p)
ae3d954766 started work on DirProtections-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 22:07:51 +01:00
Michael Kaufmann (d00p)
52da7ad40f exclude some irritating pmd rules #2 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 21:47:14 +01:00
Michael Kaufmann (d00p)
309e613c83 exclude some irritating pmd rules 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 21:40:19 +01:00
Michael Kaufmann (d00p)
05857985f8 add more tests for Email-ApiCommands 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 21:29:03 +01:00
Michael Kaufmann (d00p)
a7523bbdea add domainid to result-list of Emails.get(); fix typo in EmailAccounts.add(); enhance debugging in Database-class 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 15:52:34 +01:00
Michael Kaufmann (d00p)
54deec87d0 add a few emails-apicommand unit-tests 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 15:41:08 +01:00
Michael Kaufmann (d00p)
f0e084ef0e minor fixes in EmailAccounts.update() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 14:17:45 +01:00
Michael Kaufmann (d00p)
fa7bb53d58 added EmailAccounts-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 14:13:35 +01:00
Michael Kaufmann (d00p)
6fc8cce8f5 add EmailAccounts.add; added wrapper function ApiCommand.getMailTemplate() to reduce code-duplication 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 13:44:44 +01:00
Michael Kaufmann (d00p)
2e597ef7d9 remove unused local variables 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 11:09:30 +01:00
Michael Kaufmann (d00p)
ff611fa8dc fix parameter for ApiCommand::getCustomerData() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 10:57:31 +01:00
Michael Kaufmann (d00p)
c920bf6a63 some code-reduction 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 10:45:46 +01:00
Michael Kaufmann (d00p)
66ebfaf21b Merge remote-tracking branch 'origin/master' into 0.10.0 2018-03-12 10:23:53 +01:00
Michael Kaufmann (d00p)
349fa7a761 avoid possible undefined index if no issuer-organisation is set in a certificate 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 10:22:50 +01:00
Michael Kaufmann (d00p)
81bd9d945d fix parameter customerid for Emails.add() in unit-test 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-11 10:26:05 +01:00
Michael Kaufmann (d00p)
b205f8ea5d add EmailFowarders ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-11 10:24:17 +01:00
Michael Kaufmann (d00p)
7b52c0c78c fix default value of panel.no_robots settings; add phpdoc for Database-class-methods 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-08 17:03:17 +01:00
Michael Kaufmann (d00p)
164650adc3 added Emails.update() and Emails.delete() commands 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-08 11:49:28 +01:00
Michael Kaufmann (d00p)
9e97e82990 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-03-06 21:08:02 +01:00
Michael Kaufmann (d00p)
cd5cef51e8 allow config and settings json file for config-services.php to be downloaded from a remote url 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-06 21:07:08 +01:00
Michael Kaufmann (d00p)
231159a6c6 added first methods of Emails ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-06 14:02:27 +01:00
Michael Kaufmann (d00p)
a83031504f implement generating of api-key for customer 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-06 12:43:24 +01:00
Michael Kaufmann (d00p)
893fd0774c implement deleting of api-keys via webinterface 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-06 12:26:41 +01:00
Michael Kaufmann (d00p)
704188fe27 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-03-06 11:06:31 +01:00
Michael Kaufmann (d00p)
a621fd3b09 run cronjob at the end of config-services script (when using --apply), thx v3ng 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-06 11:05:26 +01:00
Michael Kaufmann (d00p)
0c43c5d2b5 backport config-services --import-settings parameter from 0.10.0 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-06 10:52:57 +01:00
Michael Kaufmann (d00p)
864331d371 code reduction; added unit-tests for Certificates-Command; minor fixes here and there 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-05 23:35:00 +01:00
Michael Kaufmann (d00p)
f5ec759d99 added Certificates-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-05 14:21:36 +01:00
Michael Kaufmann (d00p)
b2e2590324 implemented SubDomains.update; minor fixes and enhancements in Domains-Command and validateUrl-function 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-05 12:13:01 +01:00
Michael Kaufmann (d00p)
ae4a7ff943 wrap ip-validating in Domains-ApiCommand to reduce duplicate code 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-05 08:12:08 +01:00
Michael Kaufmann (d00p)
a869bc58cd fix wrong variable-name in SubDomains.listing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-04 19:47:48 +01:00
Michael Kaufmann (d00p)
cfa07bab47 simplified and wrapped internal api calls 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-04 18:30:16 +01:00
Michael Kaufmann (d00p)
b664917147 fix sql variable in Admins.delete 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-04 12:44:31 +01:00
Michael Kaufmann (d00p)
b12392f0a9 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-03-04 12:40:55 +01:00
Michael Kaufmann (d00p)
b07d6ceeaa started UI api-key management 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-04 12:40:47 +01:00
Michael Kaufmann
aff6d82321 Merge pull request #531 from Crease29/patch-1 
Link domains to HTTPS in certificate list
 2018-03-04 12:11:12 +01:00
Kai Neuwerth
91cecf8c1e Link domains to HTTPS in certificate list 
As an admin I want to check if the certificate of a website is working.
Therefore I click on the domain in the SSL certificate list and have to prepend "https" to the URL later.
In this case I'd link the domain to HTTPS initially.
 2018-03-04 11:43:50 +01:00
Michael Kaufmann (d00p)
702b52d13e forgot to save again 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-03 21:42:34 +01:00
Michael Kaufmann (d00p)
bb3fddb08f optimize phpmd config 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-03 21:39:51 +01:00
Michael Kaufmann (d00p)
7cc17b9ca5 fix short variables 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-03 21:29:16 +01:00