summaryrefslogtreecommitdiff
path: root/modules/gallery/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery/helpers')
-rw-r--r--modules/gallery/helpers/gallery_block.php10
-rw-r--r--modules/gallery/helpers/group.php125
-rw-r--r--modules/gallery/helpers/locales.php34
-rw-r--r--modules/gallery/helpers/user.php281
4 files changed, 215 insertions, 235 deletions
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index d8812c80..a4f4dae0 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -93,17 +93,17 @@ class gallery_block_Core {
case "language":
$locales = locales::installed();
- foreach ($locales as $locale => $display_name) {
- $locales[$locale] = SafeString::of_safe_html($display_name);
- }
- if (count($locales) > 1) {
+ if (count($locales)) {
+ foreach ($locales as $locale => $display_name) {
+ $locales[$locale] = SafeString::of_safe_html($display_name);
+ }
$block = new Block();
$block->css_id = "g-user-language-block";
$block->title = t("Language Preference");
$block->content = new View("user_languages_block.html");
$block->content->installed_locales =
array_merge(array("" => t("« none »")), $locales);
- $block->content->selected = (string) locales::cookie_locale();
+ $block->content->selected = (string) user::cookie_locale();
} else {
$block = "";
}
diff --git a/modules/gallery/helpers/group.php b/modules/gallery/helpers/group.php
index fbc5157d..17dd7f70 100644
--- a/modules/gallery/helpers/group.php
+++ b/modules/gallery/helpers/group.php
@@ -24,105 +24,100 @@
* Note: by design, this class does not do any permission checking.
*/
class group_Core {
+ static function get_edit_form_admin($group) {
+ $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
+ $form_group = $form->group("edit_group")->label(t("Edit Group"));
+ $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name);
+ $form_group->inputs["name"]->error_messages(
+ "in_use", t("There is already a group with that name"));
+ $form_group->submit("")->value(t("Save"));
+ $form->add_rules_from(self::get_edit_rules());
+ return $form;
+ }
+
+ static function get_add_form_admin() {
+ $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
+ $form->set_attr('class', "g-narrow");
+ $form_group = $form->group("add_group")->label(t("Add Group"));
+ $form_group->input("name")->label(t("Name"))->id("g-name");
+ $form_group->inputs["name"]->error_messages(
+ "in_use", t("There is already a group with that name"));
+ $form_group->submit("")->value(t("Add Group"));
+ $group = ORM::factory("group");
+ $form->add_rules_from(self::get_edit_rules());
+ return $form;
+ }
+
+ static function get_delete_form_admin($group) {
+ $form = new Forge("admin/users/delete_group/$group->id", "", "post",
+ array("id" => "g-delete-group-form"));
+ $form_group = $form->group("delete_group")->label(
+ t("Are you sure you want to delete group %group_name?", array("group_name" => $group->name)));
+ $form_group->submit("")->value(t("Delete"));
+ return $form;
+ }
+
/**
* Create a new group.
*
* @param string $name
- * @return Group_Model
+ * @return Group_Core
*/
static function create($name) {
- $group = ORM::factory("group")->where("name", $name)->find();
- if ($group->loaded) {
- throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
- }
-
- $group->name = $name;
- $group->save();
-
- return $group;
+ return Identity::instance()->create_group($name);
}
/**
* The group of all possible visitors. This includes the guest user.
*
- * @return Group_Model
+ * @return Group_Core
*/
static function everybody() {
- return model_cache::get("group", 1);
+ return Identity::instance()->everybody();
}
/**
* The group of all logged-in visitors. This does not include guest users.
*
- * @return Group_Model
+ * @return Group_Core
*/
static function registered_users() {
- return model_cache::get("group", 2);
+ return Identity::instance()->everybody();
+ }
+
+ /**
+ * Look up a group by id.
+ * @param integer $id the user id
+ * @return Group_Model the group object, or null if the id was invalid.
+ */
+ static function lookup($id) {
+ return Identity::instance()->lookup_group_by_field("id", $id);
}
/**
* Look up a group by name.
* @param integer $id the group name
- * @return Group_Model the group object, or null if the name was invalid.
+ * @return Group_Core the group object, or null if the name was invalid.
*/
static function lookup_by_name($name) {
- $group = model_cache::get("group", $name, "name");
- if ($group->loaded) {
- return $group;
- }
- return null;
+ return Identity::instance()->lookup_group_by_field("name", $name);
}
/**
- * List the users
- * @param mixed filters (@see Database.php
+ * List the groups
+ * @param mixed options to apply to the selection of the user (@see Database.php)
* @return array the group list.
*/
static function get_group_list($filter=array()) {
- $group = ORM::factory("group");
-
- foreach($filter as $method => $args) {
- switch ($method) {
- case "in":
- $group->in($args[0], $args[1]);
- break;
- default:
- $group->$method($args);
- }
- }
- return $group->find_all();
- }
-
- static function get_edit_form_admin($group) {
- $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
- $form_group = $form->group("edit_group")->label(t("Edit Group"));
- $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name);
- $form_group->inputs["name"]->error_messages(
- "in_use", t("There is already a group with that name"));
- $form_group->submit("")->value(t("Save"));
- $form->add_rules_from($group);
- return $form;
+ return Identity::instance()->get_group_list($filter);
}
- static function get_add_form_admin() {
- $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
- $form->set_attr('class', "g-narrow");
- $form_group = $form->group("add_group")->label(t("Add Group"));
- $form_group->input("name")->label(t("Name"))->id("g-name");
- $form_group->inputs["name"]->error_messages(
- "in_use", t("There is already a group with that name"));
- $form_group->submit("")->value(t("Add Group"));
- $group = ORM::factory("group");
- $form->add_rules_from($group);
- return $form;
- }
-
- static function get_delete_form_admin($group) {
- $form = new Forge("admin/users/delete_group/$group->id", "", "post",
- array("id" => "g-delete-group-form"));
- $form_group = $form->group("delete_group")->label(
- t("Are you sure you want to delete group %group_name?", array("group_name" => $group->name)));
- $form_group->submit("")->value(t("Delete"));
- return $form;
+ /**
+ * Return the edit rules associated with an group.
+ *
+ * @return stdClass containing the rules
+ */
+ static function get_edit_rules() {
+ return Identity::instance()->get_edit_rules("group");
}
}
diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index f0807c99..2cd8b0c2 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -136,6 +136,23 @@ class locales_Core {
return in_array($language, array("he", "fa", "ar"));
}
+ static function set_request_locale() {
+ // 1. Check the session specific preference (cookie)
+ $locale = self::cookie_locale();
+ // 2. Check the user's preference
+ if (!$locale) {
+ $locale = user::active()->locale;
+ }
+ // 3. Check the browser's / OS' preference
+ if (!$locale) {
+ $locale = self::locale_from_http_request();
+ }
+ // If we have any preference, override the site's default locale
+ if ($locale) {
+ I18n::instance()->locale($locale);
+ }
+ }
+
/**
* Returns the best match comparing the HTTP accept-language header
* with the installed locales.
@@ -220,23 +237,6 @@ class locales_Core {
return array(null, 0);
}
- static function set_request_locale() {
- // 1. Check the session specific preference (cookie)
- $locale = self::cookie_locale();
- // 2. Check the user's preference
- if (!$locale) {
- $locale = user::active()->locale;
- }
- // 3. Check the browser's / OS' preference
- if (!$locale) {
- $locale = locales::locale_from_http_request();
- }
- // If we have any preference, override the site's default locale
- if ($locale) {
- I18n::instance()->locale($locale);
- }
- }
-
static function cookie_locale() {
$cookie_data = Input::instance()->cookie("g_locale");
$locale = null;
diff --git a/modules/gallery/helpers/user.php b/modules/gallery/helpers/user.php
index 7aa990e1..f0509030 100644
--- a/modules/gallery/helpers/user.php
+++ b/modules/gallery/helpers/user.php
@@ -25,24 +25,34 @@
*/
class user_Core {
static function get_edit_form($user) {
+ $writable = self::is_writable();
$form = new Forge("users/update/$user->id", "", "post", array("id" => "g-edit-user-form"));
$form->set_attr("class", "g-narrow");
$group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
$group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
self::_add_locale_dropdown($group, $user);
- $group->password("password")->label(t("Password"))->id("g-password");
- $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
- ->matches($group->password);
+ if ($writable) {
+ $group->password("password")->label(t("Password"))->id("g-password");
+ $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+ ->matches($group->password);
+ }
$group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
$group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
- $form->add_rules_from($user);
+ $form->add_rules_from(self::get_edit_rules());
module::event("user_edit_form", $user, $form);
$group->submit("")->value(t("Save"));
+
+ if (!$writable) {
+ foreach ($group->inputs as $input) {
+ $input->disabled("disabled");
+ }
+ }
return $form;
}
static function get_edit_form_admin($user) {
+ $writable = self::is_writable();
$form = new Forge(
"admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
$group = $form->group("edit_user")->label(t("Edit User"));
@@ -51,17 +61,23 @@ class user_Core {
"in_use", t("There is already a user with that username"));
$group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
self::_add_locale_dropdown($group, $user);
- $group->password("password")->label(t("Password"))->id("g-password");
- $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
- ->matches($group->password);
+ if ($writable) {
+ $group->password("password")->label(t("Password"))->id("g-password");
+ $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+ ->matches($group->password);
+ }
$group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
$group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
$group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
- $form->add_rules_from($user);
- $form->edit_user->password->rules("-required");
+ $form->add_rules_from(self::get_edit_rules());
module::event("user_edit_form_admin", $user, $form);
$group->submit("")->value(t("Modify User"));
+ if (!$writable) {
+ foreach ($group->inputs as $input) {
+ $input->disabled("disabled");
+ }
+ }
return $form;
}
@@ -79,8 +95,7 @@ class user_Core {
$group->input("url")->label(t("URL"))->id("g-url");
self::_add_locale_dropdown($group);
$group->checkbox("admin")->label(t("Admin"))->id("g-admin");
- $user = ORM::factory("user");
- $form->add_rules_from($user);
+ $form->add_rules_from(self::get_edit_rules());
module::event("user_add_form_admin", $user, $form);
$group->submit("")->value(t("Add User"));
@@ -124,19 +139,76 @@ class user_Core {
}
/**
- * Make sure that we have a session and group_ids cached in the session.
+ * Return the active user. If there's no active user, return the guest user.
+ *
+ * @return User_Model
+ */
+ static function active() {
+ // @todo (maybe) cache this object so we're not always doing session lookups.
+ $user = Session::instance()->get("user", null);
+ if (!isset($user)) {
+ // Don't do this as a fallback in the Session::get() call because it can trigger unnecessary
+ // work.
+ $user = self::guest();
+ }
+ return $user;
+ }
+
+ /**
+ * Change the active user.
+ *
+ * @return User_Model
+ */
+ static function set_active($user) {
+ $session = Session::instance();
+ $session->set("user", $user);
+ $session->delete("group_ids");
+ self::load_user();
+ }
+
+ /**
+ * Return the array of group ids this user belongs to
+ *
+ * @return array
+ */
+ static function group_ids() {
+ return Session::instance()->get("group_ids", array(1));
+ }
+
+
+ static function cookie_locale() {
+ $cookie_data = Input::instance()->cookie("g_locale");
+ $locale = null;
+ if ($cookie_data) {
+ if (preg_match("/^([a-z]{2,3}(?:_[A-Z]{2})?)$/", trim($cookie_data), $matches)) {
+ $requested_locale = $matches[1];
+ $installed_locales = locales::installed();
+ if (isset($installed_locales[$requested_locale])) {
+ $locale = $requested_locale;
+ }
+ }
+ }
+ return $locale;
+ }
+
+ /**
+ * Make sure that we have a session and group_ids cached in the session. This is one
+ * of the first calls to reference the user so call the Identity::instance to load the
+ * driver classes.
*/
static function load_user() {
+ Identity::instance();
$session = Session::instance();
if (!($user = $session->get("user"))) {
- $session->set("user", $user = user::guest());
+ $session->set("user", $user = self::guest());
}
// The installer cannot set a user into the session, so it just sets an id which we should
// upconvert into a user.
+ // @todo what is user id===2
if ($user === 2) {
$user = model_cache::get("user", 2);
- user::login($user);
+ self::login($user);
$session->set("user", $user);
}
@@ -150,51 +222,54 @@ class user_Core {
}
/**
- * Return the array of group ids this user belongs to
- *
- * @return array
+ * Log in as a given user.
+ * @param object $user the user object.
*/
- static function group_ids() {
- return Session::instance()->get("group_ids", array(1));
+ static function login($user) {
+ // @todo make this an interface call
+ $user->login_count += 1;
+ $user->last_login = time();
+ $user->save();
+
+ self::set_active($user);
+ module::event("user_login", $user);
}
/**
- * Return the active user. If there's no active user, return the guest user.
- *
- * @return User_Model
+ * Log out the active user and destroy the session.
+ * @param object $user the user object.
*/
- static function active() {
- // @todo (maybe) cache this object so we're not always doing session lookups.
- $user = Session::instance()->get("user", null);
- if (!isset($user)) {
- // Don't do this as a fallback in the Session::get() call because it can trigger unnecessary
- // work.
- $user = user::guest();
+ static function logout() {
+ $user = self::active();
+ if (!$user->guest) {
+ try {
+ Session::instance()->destroy();
+ } catch (Exception $e) {
+ Kohana::log("error", $e);
+ }
+ module::event("user_logout", $user);
}
- return $user;
}
/**
- * Return the guest user.
- *
- * @todo consider caching
+ * Determine if a feature is supported by the driver.
*
- * @return User_Model
+ * @param string $feature the name of the feature to check
+ * @return boolean true if supported
*/
- static function guest() {
- return model_cache::get("user", 1);
+ static function is_writable() {
+ return Identity::instance()->is_writable();
}
/**
- * Change the active user.
+ * Return the guest user.
+ *
+ * @todo consider caching
*
* @return User_Model
*/
- static function set_active($user) {
- $session = Session::instance();
- $session->set("user", $user);
- $session->delete("group_ids");
- self::load_user();
+ static function guest() {
+ return Identity::instance()->guest();
}
/**
@@ -206,21 +281,7 @@ class user_Core {
* @return User_Model
*/
static function create($name, $full_name, $password) {
- $user = ORM::factory("user")->where("name", $name)->find();
- if ($user->loaded) {
- throw new Exception("@todo USER_ALREADY_EXISTS $name");
- }
-
- $user->name = $name;
- $user->full_name = $full_name;
- $user->password = $password;
-
- // Required groups
- $user->add(group::everybody());
- $user->add(group::registered_users());
-
- $user->save();
- return $user;
+ return Identity::instance()->create_user($name, $full_name, $password);
}
/**
@@ -231,31 +292,7 @@ class user_Core {
* @return boolean true if the password is correct
*/
static function is_correct_password($user, $password) {
- $valid = $user->password;
-
- // Try phpass first, since that's what we generate.
- if (strlen($valid) == 34) {
- require_once(MODPATH . "user/lib/PasswordHash.php");
- $hashGenerator = new PasswordHash(10, true);
- return $hashGenerator->CheckPassword($password, $valid);
- }
-
- $salt = substr($valid, 0, 4);
- // Support both old (G1 thru 1.4.0; G2 thru alpha-4) and new password schemes:
- $guess = (strlen($valid) == 32) ? md5($password) : ($salt . md5($salt . $password));
- if (!strcmp($guess, $valid)) {
- return true;
- }
-
- // Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
- $sanitizedPassword = html::specialchars($password, false);
- $guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
- : ($salt . md5($salt . $sanitizedPassword));
- if (!strcmp($guess, $valid)) {
- return true;
- }
-
- return false;
+ return Identity::instance()->is_correct_password($user, $password);
}
/**
@@ -264,38 +301,7 @@ class user_Core {
* @return string hashed password
*/
static function hash_password($password) {
- require_once(MODPATH . "user/lib/PasswordHash.php");
- $hashGenerator = new PasswordHash(10, true);
- return $hashGenerator->HashPassword($password);
- }
-
- /**
- * Log in as a given user.
- * @param object $user the user object.
- */
- static function login($user) {
- $user->login_count += 1;
- $user->last_login = time();
- $user->save();
-
- user::set_active($user);
- module::event("user_login", $user);
- }
-
- /**
- * Log out the active user and destroy the session.
- * @param object $user the user object.
- */
- static function logout() {
- $user = user::active();
- if (!$user->guest) {
- try {
- Session::instance()->destroy();
- } catch (Exception $e) {
- Kohana::log("error", $e);
- }
- module::event("user_logout", $user);
- }
+ return Identity::instance()->hash_password($password);
}
/**
@@ -304,7 +310,7 @@ class user_Core {
* @return User_Model the user object, or null if the id was invalid.
*/
static function lookup($id) {
- return self::_lookup_user_by_field("id", $id);
+ return Identity::instance()->lookup_user_by_field("id", $id);
}
/**
@@ -313,55 +319,34 @@ class user_Core {
* @return User_Model the user object, or null if the name was invalid.
*/
static function lookup_by_name($name) {
- return self::_lookup_user_by_field("name", $name);
+ return Identity::instance()->lookup_user_by_field("name", $name);
}
+
/**
* Look up a user by hash.
- * @param integer $hash the user hash value
+ * @param string $name the user name
* @return User_Model the user object, or null if the name was invalid.
*/
static function lookup_by_hash($hash) {
- return self::_lookup_user_by_field("hash", $hash);
+ return Identity::instance()->lookup_user_by_field("hash", $hash);
}
/**
* List the users
- * @param mixed filters (@see Database.php
- * @return array the user list.
+ * @param mixed options to apply to the selection of the user(optional)
+ * @return array the group list.
*/
static function get_user_list($filter=array()) {
- $user = ORM::factory("user");
-
- foreach($filter as $method => $args) {
- switch ($method) {
- case "in":
- $user->in($args[0], $args[1]);
- break;
- default:
- $user->$method($args);
- }
- }
- return $user->find_all();
+ return Identity::instance()->get_user_list($filter);
}
/**
- * Look up a user by field value.
- * @param string search field
- * @param string search value
- * @return User_Core the user object, or null if the name was invalid.
+ * Return the edit rules associated with an user.
+ *
+ * @return stdClass containing the rules
*/
- private static function _lookup_user_by_field($field_name, $value) {
- try {
- $user = model_cache::get("user", $value, $field_name);
- if ($user->loaded) {
- return $user;
- }
- } catch (Exception $e) {
- if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
- throw $e;
- }
- }
- return null;
+ static function get_edit_rules() {
+ return Identity::instance()->get_edit_rules("user");
}
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-15 00:15:28 +0000