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

3610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
6d8b22dccf Merge remote-tracking branch 'origin/master' into 0.10.0 2018-03-03 14:58:46 +01:00
Michael Kaufmann
26c3c8e6f0 Merge pull request #527 from JB1985/patch-2 
Update german.lng.php
 2018-03-03 14:58:38 +01:00
Michael Kaufmann (d00p)
0f6cc05089 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-03-03 14:58:06 +01:00
Michael Kaufmann
08814f8c9a Merge pull request #530 from michaelzangl/fix-hostname-error-message 
Fix hostname error message
 2018-03-03 14:57:22 +01:00
Michael Kaufmann
632eb98df9 Merge pull request #529 from michaelzangl/fix-installer-path 
Froxlor installer: Use same file path for chmod.
 2018-03-03 13:05:59 +01:00
Michael Zangl
909c983aec Fix invalidhostname error message (de). 2018-03-03 11:49:58 +01:00
Michael Zangl
8642254175 Fix invalidhostname error message. 2018-03-03 11:48:26 +01:00
Michael Zangl
7e81b0bb5a Froxlor installer: Use same file path for chmod. 2018-03-03 11:18:28 +01:00
Michael Kaufmann (d00p)
22a48cac33 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-03-02 19:37:32 +01:00
Michael Kaufmann (d00p)
20eaa7bc08 fix missing sql-prepared-statement parameter, fixes #528 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-02 19:36:56 +01:00
Michael Kaufmann (d00p)
1605d2af07 enhance phpdox config 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-02 18:25:06 +01:00
JB1985
abb94c9189 Update german.lng.php 
Übersetzung Änderung von Lets Encrypt
 2018-03-02 17:28:30 +01:00
Michael Kaufmann (d00p)
cadb6618ec list() is a reserved php keyword, changed ApiCommand::list() to ApiCommand::listing() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-02 17:22:47 +01:00
Michael Kaufmann (d00p)
594512404f optimized CustomersTest and DomainsTest; minor fixes in SubDomains-ApiCommand; added more tests for SubDomains-Command 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-02 15:24:46 +01:00
Michael Kaufmann (d00p)
aeb8655cc3 fix sql query in Domains.get; minor fixes in Domains.update; first unit-test for Domains.update 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-01 19:59:27 +01:00
Michael Kaufmann (d00p)
601d16b17c minor fixes in Domains.add; added more tests 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-01 19:41:57 +01:00
Michael Kaufmann (d00p)
02616d3080 minor fixes and first tests for Domains-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-01 16:46:47 +01:00
Michael Kaufmann (d00p)
2bf5e90a77 add testsuite parameter to phpunit to respect our required test-order; minor fixes in Domains- and SubDomains Command 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-27 18:07:43 +01:00
Michael Kaufmann (d00p)
75bc6d32ab minor fixes in SubDomains.add; first Unit-Tests for SubDomains-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-27 17:10:52 +01:00
Michael Kaufmann (d00p)
3e0b551416 fix copy'n'paste fail 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-27 15:56:05 +01:00
Michael Kaufmann (d00p)
a038e35e45 added Subdomains.add; minor fixes and enhancements 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-27 15:54:07 +01:00
Michael Kaufmann (d00p)
6318e5514b ignore some more checkstyle rules 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-27 10:54:03 +01:00
Michael Kaufmann (d00p)
392db944a2 started work in SubDomains-ApiCommand; minor fixes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-27 10:34:37 +01:00
Michael Kaufmann (d00p)
b097c19c0a correct phpcs config 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-27 09:30:57 +01:00
Michael Kaufmann
b46d3a3769 Update README.md 
new test :)
 2018-02-27 08:59:49 +01:00
Michael Kaufmann
a2172329cd Update README.md 
added CI build-status
 2018-02-27 08:50:54 +01:00
Michael Kaufmann (d00p)
309b70c0f8 completed Ftps-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-27 08:23:19 +01:00
Michael Kaufmann (d00p)
4b9ed8ee39 use correct order 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 22:39:06 +01:00
Michael Kaufmann (d00p)
2599f61b32 add jenkins build.xml and more; added first unit-tests 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 22:35:04 +01:00
Michael Kaufmann (d00p)
9a4359e010 fix IpsAndPorts.delete 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 19:56:03 +01:00
Michael Kaufmann (d00p)
4d89f614e3 remove unnecessary checks as getParam() validates the existance already 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 18:08:43 +01:00
Michael Kaufmann (d00p)
4fad0def1e fix mailer variable and fix typo in Ftps.add and Ftps.delete 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 18:02:18 +01:00
Michael Kaufmann (d00p)
c093783904 forgot the mailobject :P 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 16:02:09 +01:00
Michael Kaufmann (d00p)
257855b43b fix typo in field-value for ApiCommand::getUserDetail() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 16:00:54 +01:00
Michael Kaufmann (d00p)
55ec20be10 use Ftps.add in webinterface 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 15:55:49 +01:00
Michael Kaufmann (d00p)
b0f355ba2f fixed in Mysqls.add, added Ftps.add 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 15:49:41 +01:00
Michael Kaufmann (d00p)
ceb8619552 preparations for assign-multiple-ips-to-an-admin in Api, not in webinterface yet 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 12:15:48 +01:00
Michael Kaufmann (d00p)
6191ee6fba add Ftps.list and Ftps.delete 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 09:36:58 +01:00
Michael Kaufmann (d00p)
c9256c0020 add 'adminname' to result in Customers.get; fix Customers.move and return customer-data there instead of just true 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 09:01:13 +01:00
Michael Kaufmann (d00p)
592c9ed0b9 automatically trim() all parameters given 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 08:21:56 +01:00
Michael Kaufmann (d00p)
4a1decf359 do not update fields of customer a customer cannot even change; unset custom_notes when admin of customer set custom_notes_show to 0 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-26 07:51:44 +01:00
Michael Kaufmann (d00p)
ae42e87a64 fix in Admins.update; code-format Customers ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-25 21:26:51 +01:00
Michael Kaufmann (d00p)
5c330505ea correct Admins.update and Admins.delete 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-25 20:47:36 +01:00
Michael Kaufmann (d00p)
c65d95c1ef Merge remote-tracking branch 'origin/master' into 0.10.0 2018-02-25 18:29:28 +01:00
Michael Kaufmann (d00p)
2b366c8f23 add field for fullchain to be stored in ssl-certificates-table; create fullchain file if given (it's not used by froxlor); do not generate/renew certificates for disabled customers domains 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-25 18:22:15 +01:00
Michael Kaufmann (d00p)
e66dde2e64 id <> loginname, grrr 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-25 17:08:30 +01:00
Michael Kaufmann (d00p)
f32a1921c5 re-read admin/customer when adding/updating so we return the fields from the table, not the placeholders of the prepared-statement 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-25 17:03:49 +01:00
Michael Kaufmann (d00p)
0958d07f23 fixes in Admins and Customers ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-25 16:49:24 +01:00
Michael Kaufmann (d00p)
a222114d0a remove unnecessary parameter-checks as they will never happen; make Customers.update callable for customers 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-25 15:02:58 +01:00
Michael Kaufmann (d00p)
243b68cc37 minor changes for testing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-25 11:47:28 +01:00