Chad Kieffer
c9ccc24618
Moved the short_form init function to gallery.common and made it jQuery plugin. Dropped gallery.form.js. Applied short forms to server_add and tag admin pages. Added tag.css to admin views. Added .g-wide {}.
2009-10-18 10:32:08 -06:00
Tim Almdal
090c4d016b
Merge branch 'master' into talmdal_dev
...
Conflicts:
lib/gallery.common.css
themes/admin_wind/views/admin.html.php
themes/night_wind/views/sidebar.html.php
themes/wind/views/sidebar.html.php
2009-10-18 09:28:48 -07:00
Tim Almdal
4949a2ce0b
Optimize the get method to retrieve the module information from the loaded modules. In addition add a method "info" to return the module information contained in the module.info file
2009-10-18 09:23:59 -07:00
Tim Almdal
c9a030dd08
Add a menu item to manage the Identity drivers if there is more than one installed
2009-10-18 09:21:34 -07:00
Tim Almdal
6d5c12e13e
Move the default identity config into the users module and change the Identity constructor to look in module::get_var(gallery, identity_provider) for the current identity driver.
...
In addition, don't just arbitrarily lock the use module. Only lock gallery and the module that is referenced by "user_driver_module" variable.
2009-10-18 08:00:33 -07:00
Chad Kieffer
08a22f4a39
Add tag.css to tag admin page.
2009-10-17 21:59:53 -06:00
Chad Kieffer
6e4fe79217
White space fixes.
2009-10-17 16:40:55 -06:00
Chad Kieffer
ad0497a8d2
Drop our g-clearfix in favor of using jQuery UI's ui-helper-clearfix.
2009-10-17 12:58:31 -06:00
Chad Kieffer
b677eeb5ee
Missed this in last commit.
2009-10-17 12:57:34 -06:00
Chad Kieffer
f2b6ec6637
Move tag css from theme to the module. Introduced generic .g-inline class for inline elements, including lists and forms.
2009-10-17 12:48:54 -06:00
Tim Almdal
78ee4193b7
Remove all non Identity API methods from Identity.php. Created an MY_Session class to provide the user state changes in the session and a login.php helper that has the login form.
2009-10-16 10:06:58 -07:00
Tim Almdal
bc241e44c2
Cleanup merge of user/group helpers into Identity interface. Reduce redundant code in the user module and remove references to the Identity helper from the user module as the user module should be able to access things directly. Simplify the get_user_list api method to just accept an array of ids to return user objects for.
2009-10-16 08:55:26 -07:00
Tim Almdal
00eacd659f
Start simplifying the interface by moving the static methods from user.php and group.php. Tried creating a identity helper, but the helper identity.php was confused with the library Identity.php. So got around this by making the methods on Identity static and calling the instance within the static methods. Also temporarily moved the user.php and group.php back into the user module.
2009-10-16 08:53:31 -07:00
Tim Almdal
be6765336e
Finish integrating the move of the user edit/update functions into the user module. The premise is that the plugable user module will provide the update screens if the user backend supports updates.
2009-10-16 08:53:30 -07:00
Chad Kieffer and Tim Almdal
9ce46c1df6
Apply g-dialog-link class directly to login link markup, not via jQuery.
2009-10-16 08:50:58 -07:00
Chad Kieffer and Tim Almdal
0f7de6d137
Apply g-short-form directly to short forms rather than via JS. Comment updates in ui.init.js.
2009-10-16 08:50:57 -07:00
Chad Kieffer
eb3e36f132
Apply g-dialog-link class directly to login link markup, not via jQuery.
2009-10-16 00:56:37 -06:00
Chad Kieffer
c876ec1f50
Apply g-short-form directly to short forms rather than via JS. Comment updates in ui.init.js.
2009-10-16 00:00:52 -06:00
Tim Almdal
7e4c0e7135
Merge branch 'master' into talmdal_dev
2009-10-15 09:05:44 -07:00
Tim Almdal
f5dd8d487e
Move all the edit/update forms for users and groups back to the user module.
2009-10-15 08:56:31 -07:00
Tim Almdal
1ca835cea7
Merge branch 'master' into talmdal_dev
2009-10-15 07:58:46 -07:00
Tim Almdal
0d5d4c81bc
Move the ui for user adminsitration back to the user module.
2009-10-14 21:20:30 -07:00
Tim Almdal
8e1ab75530
Recreate group::lookup that somehow got removed.
2009-10-14 21:07:19 -07:00
Tim Almdal
968cd98dfe
Indentation and phpDoc fixes
2009-10-14 10:19:47 -07:00
Tim Almdal
5b4f309163
Clean up phpDoc and change the Identity driver so only one configuration can be active at a given time.
2009-10-14 09:47:04 -07:00
Tim Almdal
1c1b726d07
Change the user config setting "allow_updates" to true in the identity config file and correct a missing variable in the view.
2009-10-13 19:56:02 -07:00
Tim Almdal
468b715a4d
reference to user::cookie_locale changed to locales::cookie_locale
2009-10-13 14:42:45 -07:00
Tim Almdal
435119ff3c
remove the cookie_locale which is now in the locales helper
2009-10-13 14:03:25 -07:00
Tim Almdal
b46346aab6
Optimize the creation of the language block
2009-10-13 13:56:44 -07:00
Tim Almdal
14e14003de
refactor the user and group helpers into the gallery core module. 2 reason, first it makes sense that users and groups are a gallery requirement and belong in core. secondly, prepares the way for the Identity refactor.
2009-10-13 13:37:37 -07:00
Tim Almdal
2af4806011
Refactor the ui component of the user module into the gallery core module.
2009-10-13 13:19:17 -07:00
Tim Almdal
df302d28e6
remove duplicate function definition
2009-10-13 13:05:37 -07:00
Tim Almdal
fcd1e79bac
forgot to add a break statement when i pasted
2009-10-13 12:54:30 -07:00
Tim Almdal
1f9d45861d
Merge branch 'master' into talmdal_dev
...
Conflicts:
modules/gallery/helpers/gallery_block.php
modules/gallery/helpers/gallery_theme.php
modules/gallery/helpers/user.php
modules/user/helpers/user_event.php
2009-10-13 12:53:33 -07:00
Tim Almdal
1c313e9d2d
Continue to refactor locale and gallery3 ui from the user module to the gallery module
2009-10-13 12:46:27 -07:00
Tim Almdal
f8eee90705
remove the unused private function user::_md5Salt()
2009-10-13 12:38:21 -07:00
Tim Almdal
2c711d8908
refactor locale related functionality out of the user module and into the gallery module.
2009-10-13 12:33:00 -07:00
Tim Almdal
ab73a4092f
Correct typo in method name
2009-10-13 12:03:55 -07:00
Tim Almdal
d9720b77e9
Merge branch 'master' into talmdal_dev
...
Conflicts:
modules/gallery/controllers/admin_users.php
modules/gallery/controllers/password.php
modules/gallery/helpers/group.php
modules/gallery/helpers/user.php
modules/notification/helpers/notification.php
2009-10-13 11:48:42 -07:00
Tim Almdal
53393a1446
Merge branch 'master' of git@github.com:gallery/gallery3
2009-10-09 01:28:17 -07:00
Bharat Mediratta
3fc1eb5842
Merge branch 'master' of git@github.com:gallery/gallery3
2009-10-13 10:39:25 -07:00
Bharat Mediratta
0a66ef9cc7
Don't allow users to change the file extension of photos/movies
...
If you can change the extension, then you can alter the way the server
handles the file, which is a security problem. So for example, you
can change a .JPG to a .PHP and then if you put some malicious PHP
code in the EXIF data, you can get the server to execute
it. Vulnerability is low because only users who have edit permissions
could do this.
Fixes ticket #846
2009-10-13 10:36:50 -07:00
Bharat Mediratta
b6c1ba7ea6
Use SQL_CALC_FOUND_ROWS instead of doing the search twice, for better performance.
...
Fixes ticket #835 , thanks Joe7!
2009-10-11 11:22:41 -07:00
Bharat Mediratta
bc63e4fcf9
Make the slug field required for all items.
...
Make the filename field required for photos/movies.
Fixes ticket #838
2009-10-11 11:16:07 -07:00
Tim Almdal
79b4b8bdc6
update the Access_Helper_Test to use the user::lookup_by_name API method.
2009-10-09 01:27:27 -07:00
Tim Almdal
1ee7d24766
Add support for the in filter to get_user_list and get_group_list. Convert the notifications to use user::get_user_list instead of accessing the table directly.
2009-10-09 01:27:26 -07:00
Tim Almdal
00ee91837f
Convert direct lookups for the user table using ORM to using the user::lookup_by_name and user_lookup API methods.
...
Convert the Admin_User controller
Convert the login and password change controller
Change the item model to call user::lookup to get the owner.
On the log model, delete the relationship between the log and user table, and replace with a
call to user::lookup
(cherry picked from commit 194cc3b27a
2009-10-09 01:26:35 -07:00
Tim Almdal
f67bfd0992
Change the users.php controller so its no longer restful. The problem with our approach to restfulness is that it assumes that the resource will be found in the gallery database. It may well be there, but in the case of using plugable drivers for users management, there are no guarantees that it is in our database or it could be in a ldap directory. So it was just easier to remove the restfulness and just call user::lookup instead.
...
(cherry picked from commit b3211cb2a8
2009-10-08 23:22:07 -07:00
Tim Almdal
7ad203b97a
Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev
2009-10-08 13:47:30 -07:00
Tim Almdal
6f315ad89c
Part of the previous commit, forgot to save... again
2009-10-08 06:35:38 -07:00
Chad Kieffer
Tim Almdal
Bharat Mediratta