From 03c580a9b31fb82187de3c882bc274441c41847d Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Thu, 14 Feb 2013 15:36:58 +0100 Subject: Add API key support Signed-off-by: Florian Pritz --- application/controllers/user.php | 65 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to 'application/controllers/user.php') diff --git a/application/controllers/user.php b/application/controllers/user.php index 21b58cf93..009188648 100644 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -84,6 +84,71 @@ class User extends CI_Controller { } } + function create_apikey() + { + $this->muser->require_access(); + + $userid = $this->muser->get_userid(); + $comment = $this->input->post("comment"); + + + if (strlen($comment) > 255 || !preg_match("/^[a-zA-Z0-9 ]*$/", $comment)) { + // display better error for + show_error("Comment invalid. Only 255 chars of a-zA-Z0-9 and space allowed"); + } + + $key = random_alphanum(32); + + $this->db->query(" + INSERT INTO `apikeys` + (`key`, `user`, `comment`) + VALUES (?, ?, ?) + ", array($key, $userid, $comment)); + + if (is_cli_client()) { + echo "$key\n"; + } else { + redirect("user/apikeys"); + } + } + + function delete_apikey() + { + $this->muser->require_access(); + + $userid = $this->muser->get_userid(); + $key = $this->input->post("key"); + + var_dump($userid, $key); + + $this->db->query(" + DELETE FROM `apikeys` + WHERE `user` = ? + AND `key` = ? + ", array($userid, $key)); + + redirect("user/apikeys"); + } + + function apikeys() + { + $this->muser->require_access(); + + $userid = $this->muser->get_userid(); + + $query = $this->db->query(" + SELECT `key`, UNIX_TIMESTAMP(`created`) `created`, `comment` + FROM `apikeys` + WHERE `user` = ? order by created desc + ", array($userid))->result_array(); + + $this->data["query"] = $query; + + $this->load->view('header', $this->data); + $this->load->view($this->var->view_dir.'apikeys', $this->data); + $this->load->view('footer', $this->data); + } + function create_invitation_key() { $this->duser->require_implemented("can_register_new_users"); -- cgit v1.2.3-24-g4f1b From af799b2a184864d6adb6bd224f57cd58bf78154b Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 11 Aug 2013 18:23:24 +0200 Subject: Allow more chars in apikey comment "fb-client user@host" will be used by fb-client so this should work... Signed-off-by: Florian Pritz --- application/controllers/user.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/controllers/user.php') diff --git a/application/controllers/user.php b/application/controllers/user.php index 009188648..f1dbe5c31 100644 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -92,9 +92,9 @@ class User extends CI_Controller { $comment = $this->input->post("comment"); - if (strlen($comment) > 255 || !preg_match("/^[a-zA-Z0-9 ]*$/", $comment)) { + if (strlen($comment) > 255 || !preg_match("/^[a-zA-Z0-9 -@,]*$/", $comment)) { // display better error for - show_error("Comment invalid. Only 255 chars of a-zA-Z0-9 and space allowed"); + show_error("Comment invalid. Only 255 chars of a-zA-Z0-9, @, -, space and comma allowed"); } $key = random_alphanum(32); -- cgit v1.2.3-24-g4f1b