diff options
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/controllers/admin_users.php | 2 | ||||
| -rw-r--r-- | modules/user/controllers/users.php | 3 | ||||
| -rw-r--r-- | modules/user/helpers/user_installer.php | 7 | ||||
| -rw-r--r-- | modules/user/models/user.php | 1 | ||||
| -rw-r--r-- | modules/user/module.info | 2 | ||||
| -rw-r--r-- | modules/user/views/admin_users.html.php | 4 |
6 files changed, 18 insertions, 1 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php index ed589a3..3bb702b 100644 --- a/modules/user/controllers/admin_users.php +++ b/modules/user/controllers/admin_users.php @@ -72,6 +72,7 @@ class Admin_Users_Controller extends Admin_Controller { $user->full_name = $form->add_user->full_name->value; $user->password = $form->add_user->password->value; $user->email = $form->add_user->email->value; + $user->jabberid = $form->add_user->jabberid->value; $user->url = $form->add_user->url->value; $user->locale = $form->add_user->locale->value; $user->admin = $form->add_user->admin->checked; @@ -154,6 +155,7 @@ class Admin_Users_Controller extends Admin_Controller { $user->email = $form->edit_user->email->value; $user->url = $form->edit_user->url->value; $user->locale = $form->edit_user->locale->value; + $user->jabberid = $form->edit_user->jabberid->value; if ($user->id != identity::active_user()->id) { $user->admin = $form->edit_user->admin->checked; } diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php index ee81344..b93da8b 100644 --- a/modules/user/controllers/users.php +++ b/modules/user/controllers/users.php @@ -29,6 +29,7 @@ class Users_Controller extends Controller { $valid = $form->validate(); $user->full_name = $form->edit_user->full_name->value; $user->url = $form->edit_user->url->value; + $user->jabberid = $form->edit_user->jabberid->value; if (count(locales::installed()) > 1 && $user->locale != $form->edit_user->locale->value) { @@ -211,6 +212,8 @@ class Users_Controller extends Controller { self::_add_locale_dropdown($group, $user); $group->input("url")->label(t("URL"))->id("g-url")->value($user->url) ->error_messages("url", t("You must enter a valid url")); + $group->input("jabberid")->label(t("Jabber ID"))->id("g-jabberid")->value($user->jabberid) + ->error_messages("length", t("Your jabber ID is too long")); module::event("user_edit_form", $user, $form); $group->submit("")->value(t("Save")); diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php index 67f6a3d..1c59acb 100644 --- a/modules/user/helpers/user_installer.php +++ b/modules/user/helpers/user_installer.php @@ -52,6 +52,12 @@ class user_installer { module::clear_var("user", "mininum_password_length"); module::set_version("user", $version = 4); } + + if ($version == 4) { + $db = Database::instance(); + $db->query("ALTER TABLE {users} ADD COLUMN `jabberid` VARCHAR(255) default NULL"); + module::set_version("user", $version = 5); + } } static function uninstall() { @@ -85,6 +91,7 @@ class user_installer { `hash` char(32) default NULL, `url` varchar(255) default NULL, `locale` char(10) default NULL, + `jabberid` VARCHAR(255) default NULL, PRIMARY KEY (`id`), UNIQUE KEY(`hash`), UNIQUE KEY(`name`)) diff --git a/modules/user/models/user.php b/modules/user/models/user.php index af05c0c..0b75b81 100644 --- a/modules/user/models/user.php +++ b/modules/user/models/user.php @@ -80,6 +80,7 @@ class User_Model_Core extends ORM implements User_Definition { "admin" => array("callbacks" => array(array($this, "valid_admin"))), "email" => array("rules" => array("length[1,255]", "valid::email"), "callbacks" => array(array($this, "valid_email"))), + "jabberid" => array("rules" => array("length[1,255]", "valid::email")), "full_name" => array("rules" => array("length[0,255]")), "locale" => array("rules" => array("length[2,10]")), "name" => array("rules" => array("length[1,32]", "required"), diff --git a/modules/user/module.info b/modules/user/module.info index d5128db..9864d79 100644 --- a/modules/user/module.info +++ b/modules/user/module.info @@ -1,6 +1,6 @@ name = "Users and Groups" description = "Gallery 3 user and group management" -version = 4 +version = 5 author_name = "Gallery Team" author_url = "http://codex.galleryproject.org/Gallery:Team" diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 033c9da..b48c9f1 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -63,6 +63,7 @@ <th><?= t("Username") ?></th> <th><?= t("Full name") ?></th> <th><?= t("Email") ?></th> + <th><?= t("Jabber ID") ?></th> <th><?= t("Last login") ?></th> <th><?= t("Albums/Photos") ?></th> <th><?= t("Actions") ?></th> @@ -85,6 +86,9 @@ <?= html::clean($user->email) ?> </td> <td> + <?= html::clean($user->jabberid) ?> + </td> + <td> <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?> </td> <td> |