From f5654d5931e96af03060ee3a3c8bf49b54bac90c Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sun, 18 Mar 2018 08:42:22 +0100 Subject: [PATCH] fix var-names in DirOptions-ApiCommand; fix pmd issues Signed-off-by: Michael Kaufmann (d00p) --- lib/classes/api/abstract.ApiCommand.php | 7 +++++-- lib/classes/api/commands/class.DirOptions.php | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/classes/api/abstract.ApiCommand.php b/lib/classes/api/abstract.ApiCommand.php index 77b3c58d..6f1351ca 100644 --- a/lib/classes/api/abstract.ApiCommand.php +++ b/lib/classes/api/abstract.ApiCommand.php @@ -119,7 +119,6 @@ abstract class ApiCommand extends ApiParameter } $this->initLang(); - $this->lng = $lng; $this->initMail(); if ($this->debug) { @@ -133,7 +132,8 @@ abstract class ApiCommand extends ApiParameter */ private function initLang() { - global $lng; + $lng = array(); + // query the whole table $result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_LANGUAGE . "`"); @@ -174,6 +174,9 @@ abstract class ApiCommand extends ApiParameter // last but not least include language references file include_once makeSecurePath(FROXLOR_INSTALL_DIR . '/lng/lng_references.php'); + + // set array for ApiCommand + $this->lng = $lng; } /** diff --git a/lib/classes/api/commands/class.DirOptions.php b/lib/classes/api/commands/class.DirOptions.php index 8325f9f9..2bb75e83 100644 --- a/lib/classes/api/commands/class.DirOptions.php +++ b/lib/classes/api/commands/class.DirOptions.php @@ -106,7 +106,7 @@ class DirOptions extends ApiCommand implements ResourceEntity ); Database::pexecute($stmt, $params, true, true); $id = Database::lastInsertId(); - $this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_INFO, "[API] added directory-protection for '" . $username . " (" . $path . ")'"); + $this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_INFO, "[API] added directory-option for '" . $userpath . "'"); inserttask('1'); $result = $this->apiCall('DirOptions.get', array( @@ -350,7 +350,7 @@ class DirOptions extends ApiCommand implements ResourceEntity "customerid" => $customer_data['customerid'], "id" => $id )); - $this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_INFO, "[API] deleted directory-option for '" . str_replace($userinfo['documentroot'], '/', $result['path']) . "'"); + $this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_INFO, "[API] deleted directory-option for '" . str_replace($customer_data['documentroot'], '/', $result['path']) . "'"); inserttask('1'); return $this->response(200, "successfull", $result); }