diff options
| author | Florian Pritz <bluewind@xinu.at> | 2016-10-08 14:51:27 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2016-11-05 19:44:15 +0100 |
| commit | 485dad44e7927cf63d8ff0851fc77a08eb5b193b (patch) | |
| tree | bf362fd726bca74a6cf4a817504cd6cdb5593da2 | |
| parent | e7291add38a9c3e79105759fb14a7f6ae1d923dd (diff) | |
muser: Rename login_cli_client to login_api_client
Signed-off-by: Florian Pritz <bluewind@xinu.at>
| -rw-r--r-- | application/models/muser.php | 20 |
1 files 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()) { |