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

1441 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
6409fb2dbe started working on Mysqls-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-23 15:17:22 +01:00
Michael Kaufmann (d00p)
662f537a0d fixes in Admins.update(); use ApiCommand for theme-, language- and password-change 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-23 12:48:17 +01:00
Michael Kaufmann (d00p)
8e0bfe9d09 add Admins.update() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-23 11:57:29 +01:00
Michael Kaufmann (d00p)
8930d2a1bf check remote-ip when ip-restriction is set in api_keys table 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-23 11:08:24 +01:00
Michael Kaufmann (d00p)
d9ec214e17 secure included webinterface-modules; add settings-functions to Froxlor-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-22 21:05:58 +01:00
Michael Kaufmann (d00p)
dfb5d33a56 add Admins.add() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-22 16:51:56 +01:00
Michael Kaufmann (d00p)
b42a7b1b26 show basic api doc in webinterface (top-menu - options - API help) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-22 13:41:28 +01:00
Michael Kaufmann (d00p)
a468fe50df filter deactivated users who want to use the API; fix error-output in Customers::update() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-22 11:42:13 +01:00
Michael Kaufmann (d00p)
c1875132ef fix unchecked-checkbox value passed to API 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-22 11:34:40 +01:00
Michael Kaufmann (d00p)
332e29be24 lots of phpdoc; fix Customers::update() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-22 11:16:55 +01:00
Michael Kaufmann (d00p)
c93e2678f7 make Customers::update() also work with loginname as an alternative to the id 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-22 10:47:14 +01:00
Michael Kaufmann (d00p)
689ca853c3 minor fixes in Customers and Domains ApiCommands, added list() and get() for Admins-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-21 14:38:27 +01:00
Michael Kaufmann (d00p)
8310e8554b enable usage of 'domainname' as an alternative to 'id' for Domains::get() and Domains::delete(); enable usage of 'loginname' as an alternative to 'id' for Customers::get() and Customers::delete() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-21 13:14:54 +01:00
Michael Kaufmann (d00p)
b56414ed0e add sql-query of last statement to sql-debug for debugging purposes; fix default-ssl-ip setting and allow 'none' value 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-21 12:16:50 +01:00
Michael Kaufmann (d00p)
5480fcbf5d add default-ssl-ip setting 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-21 11:50:34 +01:00
Michael Kaufmann (d00p)
26b9c030b5 leave default-values for adding std-subdomain when adding customer from the parameters-array; do not require ipandports parameter when adding domain but rather default to system.defaultip if no ipandport is given 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-21 10:57:46 +01:00
Michael Kaufmann (d00p)
b9653c5abd fix company-required check for good now :P 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-20 19:11:33 +01:00
Michael Kaufmann (d00p)
eabc78c84f enhance check for requirement of company field 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-20 14:21:40 +01:00
Michael Kaufmann (d00p)
033393880d fix typo in variable name 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-20 14:14:47 +01:00
Michael Kaufmann (d00p)
b2ac1fb593 add FpmDaemons ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-19 13:58:39 +01:00
Michael Kaufmann (d00p)
8c6ae4f3a3 add PhpSettings ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-19 13:36:15 +01:00
Michael Kaufmann (d00p)
5524ff7cae fixes in Customers::update() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-19 11:36:01 +01:00
Michael Kaufmann (d00p)
603e14913b finished Customer::update(), untested 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-19 10:45:41 +01:00
Michael Kaufmann (d00p)
133af365bd enhance ApiCommand::getParam() to specify required and optional parameter 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-19 08:59:24 +01:00
Michael Kaufmann (d00p)
532551263d add new api-module to output list of possible modules/functions 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-18 10:19:17 +01:00
Michael Kaufmann (d00p)
bdfd601dae Merge remote-tracking branch 'origin/master' into 0.10.0 2018-02-18 10:17:38 +01:00
Michael Kaufmann (d00p)
9619abdad7 when importing settings with enabled ssl flag, validate that the target system has ssl enabled ip's to avoid unexpected behaviour, tthx v3ng for testing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-17 16:00:50 +01:00
Michael Kaufmann (d00p)
fd287e7be4 add apache restart command after enabling modules in config-templates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-17 14:51:04 +01:00
Michael Kaufmann (d00p)
5afdbae83a minor phpDoc fixes in Logger classes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-16 15:50:31 +01:00
Michael Kaufmann (d00p)
7c96164770 fix lng availability; add returncode for not-found messages 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-16 15:39:59 +01:00
Michael Kaufmann (d00p)
60defd3cdf fix unlimited flags when adding customer; add debug flag to log all api-requests for testing purposes now 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-16 14:34:55 +01:00
Michael Kaufmann (d00p)
8978dd3a4b std-subdomain <> ip connection is already handled by Domains::add() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-16 13:55:12 +01:00
Michael Kaufmann (d00p)
1e45da2410 more work on Customer-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-16 13:27:31 +01:00
Michael Kaufmann (d00p)
2da2912c9c set update-check-urls to api-version; started working on Customers-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-16 10:56:27 +01:00
Michael Kaufmann (d00p)
4d12a4f37b Merge remote-tracking branch 'origin/master' into 0.10.0 2018-02-16 09:24:14 +01:00
Michael Kaufmann (d00p)
350e3d733a do not check for options if field is disabled, unset enabled-ownvhost flags for fcgid/fpm if the corresponding other one is activated; fixes #518 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-16 09:22:34 +01:00
Michael Kaufmann (d00p)
81602f17be add Domains api module 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 14:44:48 +01:00
Michael Kaufmann (d00p)
df5fb963c1 make language strings the language the user uses 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 13:03:30 +01:00
Michael Kaufmann (d00p)
0fc2fbaf09 add language strings (english only currently) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 12:59:34 +01:00
Michael Kaufmann (d00p)
a82d5cf764 minor fixes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 11:37:38 +01:00
Michael Kaufmann (d00p)
d068477a93 set version to 0.10.0 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 07:54:21 +01:00
Michael Kaufmann (d00p)
4663f8c6ec converted IpsAndPorts to API 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 07:48:03 +01:00
Michael Kaufmann (d00p)
dd371c72a2 start api implementation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 07:47:35 +01:00
Michael Kaufmann (d00p)
6f91bece17 fix postfix config for postfix/courier on precise and trusty, fixes #516 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 07:44:54 +01:00
Michael Kaufmann (d00p)
5c30961d3c set version to 0.9.39.5 for bugfix release (imap/pop3 ticks not enabled if active in hosting plan when editing hosting plan) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-14 13:31:39 +01:00
Michael Kaufmann (d00p)
6befe85656 fix add/edit domain due to wrong access to settings; setting version to 0.9.39.4 for bugfix release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 12:23:05 +01:00
Michael Kaufmann (d00p)
482e8c9a11 set version to 0.9.39.3 for maintenance release and upcoming debian package so the new hosting-plan feature is included 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 09:06:49 +01:00
Michael Kaufmann (d00p)
372ab5d9c8 add domain flag to avoid generation of nginx try_files directive in webroot which is not suitable for some applications; fixes #461 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 08:12:58 +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