From 5f5cd93114eb7d094d0fd851aa87d7bbe8ae0445 Mon Sep 17 00:00:00 2001 From: hukoeth Date: Sun, 12 Sep 2010 20:17:02 +0800 Subject: [PATCH] Disable user name auto complete if people cloud is deactivated for guest user --- .../controllers/photoannotation.php | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/modules/photoannotation/controllers/photoannotation.php b/modules/photoannotation/controllers/photoannotation.php index 48f71da9..ed6083e5 100644 --- a/modules/photoannotation/controllers/photoannotation.php +++ b/modules/photoannotation/controllers/photoannotation.php @@ -229,21 +229,23 @@ class photoannotation_Controller extends Controller { } public function autocomplete() { - $users = array(); - $user_parts = explode(",", Input::instance()->get("q")); - $limit = Input::instance()->get("limit"); - $user_part = ltrim(end($user_parts)); - $user_list = ORM::factory("user") - ->where("name", "LIKE", "{$user_part}%") - ->or_where("full_name", "LIKE", "{$user_part}%") - ->order_by("full_name", "ASC") - ->limit($limit) - ->find_all(); - foreach ($user_list as $user) { - if ($user->name != "guest") { - $users[] = $user->display_name() ." (". $user->name .")"; + if (!identity::active_user()->guest || module::get_var("photoannotation", "allowguestsearch", false)) { + $users = array(); + $user_parts = explode(",", Input::instance()->get("q")); + $limit = Input::instance()->get("limit"); + $user_part = ltrim(end($user_parts)); + $user_list = ORM::factory("user") + ->where("name", "LIKE", "{$user_part}%") + ->or_where("full_name", "LIKE", "{$user_part}%") + ->order_by("full_name", "ASC") + ->limit($limit) + ->find_all(); + foreach ($user_list as $user) { + if ($user->name != "guest") { + $users[] = $user->display_name() ." (". $user->name .")"; + } } + print implode("\n", $users); } - print implode("\n", $users); } }