Tim Almdal
7af844606d
The problem occurs because the square brackets are treated as special characters in the glob to find the children. This patch escapes the square brackets. Fixes ticket #855
2009-12-30 15:33:22 -08:00
Bharat Mediratta
c50c2d135c
Fix uses of count_records() and use ORM to count instead.
2009-12-25 12:39:09 -08:00
Bharat Mediratta
8b9a02084a
Updates for the latest version of Kohana 2.4:
...
1) Controller::$input is gone -- use Input::instance() now
2) Handle new 'database.<default>.connection.params' parameter
3) Handle new 'cache.<default>.prefix' parameter
2009-12-21 21:27:43 -08:00
Bharat Mediratta
9af0a4e59c
Convert a database call.
2009-12-18 13:36:43 -08:00
Bharat Mediratta
94411b3658
Fix a bunch of places where we were using "= null" instead of "IS NULL".
2009-12-02 10:02:08 -08:00
Bharat Mediratta
1fd0e14359
Convert all DB where() calls to take 3 arguments.
...
Convert all open_paren() calls to and_open() or or_open() as appropriate.
2009-11-26 12:09:04 -08:00
Bharat Mediratta
0121bfd585
ORM::orderby -> ORM::order_by
2009-11-25 19:26:52 -08:00
Bharat Mediratta
2e420522ec
Preliminary work to cut over to Kohana 2.4
...
- Kohana::log() -> Kohana_Log::add()
- Kohana::config_XXX -> Kohana_Config::instance()->XXX
- Implement View::set_global in MY_View
- Updated Cache_Database_Driver to latest APIs
- ORM::$loaded -> ORM::loaded()
- Updated item::viewable() to use K2.4 parenthesization
2009-11-25 13:22:24 -08:00
Chad Kieffer
03b4b27498
Add type attribute to rest of our script tags.
2009-10-30 00:14:57 -06:00
Tim Almdal
7ea13b3869
Normalize capitalization ticket #596
2009-10-28 12:15:52 -07:00
Chad Kieffer
4241e03d75
Breadcrumb updates. Apply g-first and g-active consistently, use ems instead of px for nicer proportions, make font-size the same whether on the page or in a dialog.
2009-10-27 23:03:43 -06:00
Tim Almdal
0a6b540092
Merge branch 'master' into talmdal_dev
...
Conflicts:
modules/server_add/helpers/server_add_theme.php
2009-10-24 07:28:22 -07:00
Chad Kieffer
e3f90a889d
Adjust order of items on server_add admin page. Restore autocomplete to the add form. Created a server_add.css file.
2009-10-23 22:24:06 -06:00
Tim Almdal
3c936d661a
Change the name of identity library from Identity to IdentityProvider. Create a helper class called identity to simplify call the Identity Provider. Move the contents of MY_Session.php to the new helper class and remove the MY_Session class
2009-10-22 13:11:03 -07:00
Tim Almdal
1b530e4680
Merge branch 'master' into talmdal_dev
...
Conflicts:
modules/user/views/admin_users.html.php
2009-10-19 06:27:18 -07:00
Chad Kieffer
5f56cbf997
Wrap all admin views in g-block and g-block content. This provides the means to visually separate the view's title and description from everything else. Primary admin view title should always be h1, and only one h1 per view. Removed some unused admin CSS id's.
2009-10-18 20:22:10 -06:00
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
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
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
Chad Kieffer
d581bbbd1e
Renamed more CSS selectors from gName to g-name.
2009-10-04 15:53:00 -06:00
Chad Kieffer
3e6ba7acc3
Renamed most, if not all css selectors from gName to g-name. Moved a few shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features.
2009-10-04 00:27:22 -06:00
Chad Kieffer
e1e8904e4a
Convert gDialog and gCancel over to g-dialog and g-cancel. Refactor CSS id's and classes in the login/reset password dialog.
2009-09-30 22:49:36 -06:00
Chad Kieffer
1f02c1ef6e
Apply gModuleStatus to server add status message.
2009-09-30 22:48:05 -06:00
Tim Almdal
cf89015a29
Change the fix for ticket #775 to always add the Add menu, but not add any items if the album directory is not writable.
2009-09-19 09:34:27 -07:00
Tim Almdal
4e6f2f1b4c
Don't display the add menu if the underlying operating system directory is not writable. THis should fix ticket #775
2009-09-18 23:53:48 -07:00
Tim Almdal
be84c7be25
* Changed the close functionality so the page is reloaded when the dialog is closed.
...
* Renamed the ServerAddCloseButton.
* Added Pause and Continue buttons. Now when add is clicked, A Pause button is shown,
once the adding is complete, the add button is reshown andpause button is hidden.
Clicking the pause button will hide it and show a continue button.
2009-09-18 12:17:58 -07:00
Tim Almdal
15c3f0b1aa
Refactor the server add javascript into a ui.gallery_server_add widget.
2009-09-17 21:26:55 -07:00
Tim Almdal
6469763225
Reload the album when server_add dialog is closed
2009-09-17 11:10:15 -07:00
Tim Almdal
c7f8d8be6f
Don't try to creat an album that corresponds to the staging directory. Just add the contents of the staging directlyinto the album that server_add was invoked from. Fixes ticket #785
2009-09-17 10:57:22 -07:00
Tim Almdal
be1d49d017
Change the timeout on resubmitting the next task iteration to 25ms instead of. This allows the jQuery.ajax method to complete its processing. Otherwise, the browser can spend time thrashing around trying to send the next request.
2009-09-17 10:55:50 -07:00
Tim Almdal
a5af531fbe
Don't show links as part of the auto complete list
2009-09-17 07:04:11 -07:00
Bharat Mediratta
c3f8b62376
Adjust the text of the symlink error message.
2009-09-15 19:57:12 -07:00
Jan Koprowski
7cc37451f4
Forbid from add symbolink link in admin server add. Read ticket #744 for more details.
2009-09-15 19:55:16 -07:00
Bharat Mediratta
ac8c9d6670
Fix indentation.
2009-09-06 11:26:20 -07:00
Andy Staudacher
ddb84c84e1
Rename mark_safe() to mark_clean()
2009-08-31 00:42:18 -07:00
Andy Staudacher
2bf9b8ee55
Fix double -> single quotes (::js_string returns a double-quotes delimited string)
2009-08-30 23:11:13 -07:00
Andy Staudacher
bd52a85f98
(mostly harmless) XSS fix in server add
2009-08-30 21:34:55 -07:00
Andy Staudacher
e7f5e0a9a3
Merge commit 'upstream/master'
...
Conflicts:
modules/gallery/views/l10n_client.html.php
modules/organize/views/organize_tree.html.php
modules/server_add/helpers/server_add_event.php
2009-08-30 18:27:40 -07:00
Andy Staudacher
df38a890a6
Tabs to spaces cleanup
2009-08-30 18:07:13 -07:00
Andy Staudacher
effccfd41d
Change all instances of SafeString::of_safe_html() to html::mark_safe() in views.
2009-08-30 07:00:56 -07:00
Andy Staudacher
b9bd1681a3
Update all code to use helper method html::clean(), html::purify(), ... instead of SafeString directly.
2009-08-29 22:54:20 -07:00
Bharat Mediratta
4bc7165dab
Delete obsolete comment and tighten the code in site_menu().
2009-08-29 16:42:33 -07:00
Andy Staudacher
b4b638be44
Undo url helper changes - url methods no longer return a SafeString.
...
Adding SafeString::of_safe_html() calls where urls are passed as parameters to t() and t2().
2009-08-29 16:28:30 -07:00
Andy Staudacher
0204617b60
XSS fixes
2009-08-29 15:41:02 -07:00
Andy Staudacher
a5dfc81a8f
Merge commit 'upstream/master'
...
Conflicts:
modules/akismet/views/admin_akismet.html.php
modules/comment/helpers/comment_rss.php
modules/gallery/helpers/gallery_rss.php
modules/gallery/libraries/I18n.php
modules/gallery/views/permissions_browse.html.php
modules/gallery/views/simple_uploader.html.php
modules/info/views/info_block.html.php
modules/organize/controllers/organize.php
modules/organize/views/organize.html.php
modules/organize/views/organize_album.html.php
themes/default/views/album.html.php
themes/default/views/movie.html.php
themes/default/views/photo.html.php
2009-08-29 14:17:48 -07:00
Andy Staudacher
c01ac42c46
Refactor all calls of p::clean() to SafeString::of() and p::purify() to SafeString::purify().
...
Removing any p::clean() calls for arguments to t() and t2() since their args are wrapped in a SafeString anyway.
2009-08-29 12:48:40 -07:00
jhilden
746609b967
* created new generic "Add" dropdown in the site menu. this should take care of ticket #537
...
* removed start/stop translation menu items from the admin, since they are on the languags admin page now
2009-08-29 14:27:08 -04:00
Bharat Mediratta
a28dd09c4e
Properly deal with invalid images. This fixes ticket #611 which shows
...
a BMP masquerading as a .jpg causing us to be unable to rebuild
resizes and thumbnails. Now if that happens, we discard the file, log
it and move on.
2009-08-27 17:04:48 -07:00
Bharat Mediratta
4828db003f
Remove 'ENGINE=InnoDB' specification from tables that we create. Use
...
the system's default table specification. Fixes ticket #597 .
2009-08-27 15:47:54 -07:00
Tim Almdal
afa8cade7f
Fix for ticket #590 . The gallery.dialog.js looks for an element "#dialog #gProgress" and if it finds it assumes that it is a progress dialog and removes the title. This pathc changes the name of the div containing the progress bar to gServerAddProgress and avoids the issue.
...
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca >
2009-08-18 05:18:41 +08:00
