maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

consistency replace dbserver with mysql_server everywhere

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-02-24 16:52:14 +01:00
parent 20aac1ccd4
commit e5a1b504d7
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/classes/api/commands/class.Mysqls.php
View File

@@ -227,7 +227,7 @@ class Mysqls extends ApiCommand implements ResourceEntity
* optional, the database-id * optional, the database-id
* @param string $dbname * @param string $dbname
* optional, the databasename * optional, the databasename
* @param int $dbserver * @param int $mysql_server
* optional, specify database-server, default is none * optional, specify database-server, default is none
* *
* @access admin, customer * @access admin, customer
@@ -239,7 +239,7 @@ class Mysqls extends ApiCommand implements ResourceEntity
$id = $this->getParam('id', true, 0); $id = $this->getParam('id', true, 0);
$dn_optional = ($id <= 0 ? false : true); $dn_optional = ($id <= 0 ? false : true);
$dbname = $this->getParam('dbname', $dn_optional, ''); $dbname = $this->getParam('dbname', $dn_optional, '');
$dbserver = $this->getParam('dbserver', true, - 1); $dbserver = $this->getParam('mysql_server', true, - 1);
if ($id <= 0 && empty($dbname)) { if ($id <= 0 && empty($dbname)) {
throw new Exception("Either 'id' or 'dbname' parameter must be given", 406); throw new Exception("Either 'id' or 'dbname' parameter must be given", 406);
@@ -326,7 +326,7 @@ class Mysqls extends ApiCommand implements ResourceEntity
* optional, the database-id * optional, the database-id
* @param string $dbname * @param string $dbname
* optional, the databasename * optional, the databasename
* @param int $dbserver * @param int $mysql_server
* optional, specify database-server, default is none * optional, specify database-server, default is none
* @param string $mysql_password * @param string $mysql_password
* optional, update password for the database * optional, update password for the database
@@ -342,7 +342,7 @@ class Mysqls extends ApiCommand implements ResourceEntity
$id = $this->getParam('id', true, 0); $id = $this->getParam('id', true, 0);
$dn_optional = ($id <= 0 ? false : true); $dn_optional = ($id <= 0 ? false : true);
$dbname = $this->getParam('dbname', $dn_optional, ''); $dbname = $this->getParam('dbname', $dn_optional, '');
$dbserver = $this->getParam('dbserver', true, - 1); $dbserver = $this->getParam('mysql_server', true, - 1);
if ($id <= 0 && empty($dbname)) { if ($id <= 0 && empty($dbname)) {
throw new Exception("Either 'id' or 'dbname' parameter must be given", 406); throw new Exception("Either 'id' or 'dbname' parameter must be given", 406);
@@ -355,7 +355,7 @@ class Mysqls extends ApiCommand implements ResourceEntity
$json_result = Mysqls::getLocal($this->getUserData(), array( $json_result = Mysqls::getLocal($this->getUserData(), array(
'id' => $id, 'id' => $id,
'dbname' => $dbname, 'dbname' => $dbname,
'dbserver' => $dbserver 'mysql_server' => $dbserver
))->get(); ))->get();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];
$id = $result['id']; $id = $result['id'];
@@ -443,7 +443,7 @@ class Mysqls extends ApiCommand implements ResourceEntity
/** /**
* list all databases, if called from an admin, list all databases of all customers you are allowed to view, or specify id or loginname for one specific customer * list all databases, if called from an admin, list all databases of all customers you are allowed to view, or specify id or loginname for one specific customer
* *
* @param int $dbserver * @param int $mysql_server
* optional, specify dbserver to select from, else use all available * optional, specify dbserver to select from, else use all available
* @param int $customerid * @param int $customerid
* optional, admin-only, select dbs of a specific customer by id * optional, admin-only, select dbs of a specific customer by id
@@ -456,7 +456,7 @@ class Mysqls extends ApiCommand implements ResourceEntity
public function list() public function list()
{ {
$result = array(); $result = array();
$dbserver = $this->getParam('dbserver', true, - 1); $dbserver = $this->getParam('mysql_server', true, - 1);
if ($this->isAdmin()) { if ($this->isAdmin()) {
// if we're an admin, list all databases of all the admins customers // if we're an admin, list all databases of all the admins customers
// or optionally for one specific customer identified by id or loginname // or optionally for one specific customer identified by id or loginname
@@ -541,7 +541,7 @@ class Mysqls extends ApiCommand implements ResourceEntity
* optional, the database-id * optional, the database-id
* @param string $dbname * @param string $dbname
* optional, the databasename * optional, the databasename
* @param int $dbserver * @param int $mysql_server
* optional, specify database-server, default is none * optional, specify database-server, default is none
* *
* @access admin, customer * @access admin, customer
@@ -553,7 +553,7 @@ class Mysqls extends ApiCommand implements ResourceEntity
$id = $this->getParam('id', true, 0); $id = $this->getParam('id', true, 0);
$dn_optional = ($id <= 0 ? false : true); $dn_optional = ($id <= 0 ? false : true);
$dbname = $this->getParam('dbname', $dn_optional, ''); $dbname = $this->getParam('dbname', $dn_optional, '');
$dbserver = $this->getParam('dbserver', true, - 1); $dbserver = $this->getParam('mysql_server', true, - 1);
if ($id <= 0 && empty($dbname)) { if ($id <= 0 && empty($dbname)) {
throw new Exception("Either 'id' or 'dbname' parameter must be given", 406); throw new Exception("Either 'id' or 'dbname' parameter must be given", 406);
@@ -566,7 +566,7 @@ class Mysqls extends ApiCommand implements ResourceEntity
$json_result = Mysqls::getLocal($this->getUserData(), array( $json_result = Mysqls::getLocal($this->getUserData(), array(
'id' => $id, 'id' => $id,
'dbname' => $dbname, 'dbname' => $dbname,
'dbserver' => $dbserver 'mysql_server' => $dbserver
))->get(); ))->get();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];
$id = $result['id']; $id = $result['id'];