From 9c751c564dd079e3fc2524c59c5b909f0178f43b Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sat, 8 Oct 2016 14:51:27 +0200 Subject: muser: Rename login_cli_client to login_api_client Signed-off-by: Florian Pritz --- application/models/muser.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/application/models/muser.php b/application/models/muser.php index 2ec727690..9866f0c86 100644 --- a/application/models/muser.php +++ b/application/models/muser.php @@ -67,18 +67,19 @@ class Muser extends CI_Model { return $this->duser->login($username, $password); } - private function login_cli_client() + private function login_api_client() { $username = $this->input->post("username"); $password = $this->input->post("password"); + // TODO keep for now. might be useful if adapted to apikeys instead of passwords // prefer post parameters if either (username or password) is set - if ($username === false && $password === false) { - if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) { - $username = $_SERVER['PHP_AUTH_USER']; - $password = $_SERVER['PHP_AUTH_PW']; - } - } + //if ($username === false && $password === false) { + //if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) { + //$username = $_SERVER['PHP_AUTH_USER']; + //$password = $_SERVER['PHP_AUTH_PW']; + //} + //} if ($username !== false && $password !== false) { if ($this->login($username, $password)) { @@ -279,9 +280,8 @@ class Muser extends CI_Model { $this->apilogin($this->input->post("apikey")); } - # keep for now. might be useful if adapted to apikeys instead of passwords - //if (is_cli_client()) { - //$this->login_cli_client(); + //if (is_api_client()) { + //$this->login_api_client(); //} if ($this->logged_in()) { -- cgit v1.2.3-24-g4f1b