summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/comment/helpers/comment_theme.php8
-rw-r--r--modules/digibug/helpers/digibug_theme.php2
-rw-r--r--modules/gallery/helpers/gallery_theme.php27
-rw-r--r--modules/gallery/libraries/Gallery_View.php18
-rw-r--r--modules/gallery/tests/Cache_Test.php32
-rw-r--r--modules/gallery/tests/controller_auth_data.txt5
-rw-r--r--modules/gallery/tests/xss_data.txt106
-rw-r--r--modules/recaptcha/helpers/recaptcha_theme.php4
-rw-r--r--modules/search/helpers/search_theme.php2
-rw-r--r--modules/server_add/helpers/server_add_theme.php18
-rw-r--r--modules/tag/helpers/tag_theme.php10
-rw-r--r--modules/tag/models/tag.php12
-rw-r--r--modules/user/controllers/admin_users.php28
-rw-r--r--modules/user/css/user.css1
-rw-r--r--modules/user/helpers/user_theme.php8
-rw-r--r--modules/user/views/admin_users.html.php5
16 files changed, 170 insertions, 116 deletions
diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index b993cdae..9cc93fa1 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -19,14 +19,12 @@
*/
class comment_theme_Core {
static function head($theme) {
- $theme->css("comment.css");
- $theme->script("comment.js");
- return "";
+ return $theme->css("comment.css")
+ . $theme->script("comment.js");
}
static function admin_head($theme) {
- $theme->css("comment.css");
- return "";
+ return $theme->css("comment.css");
}
static function photo_bottom($theme) {
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index d146e17d..1106910e 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -19,6 +19,6 @@
*/
class digibug_theme_Core {
static function head($theme) {
- $theme->script("digibug.js");
+ return $theme->script("digibug.js");
}
}
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 978c69a6..ebf8f38e 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -21,9 +21,9 @@ class gallery_theme_Core {
static function head($theme) {
$session = Session::instance();
$buf = "";
- $theme->css("gallery.css");
+ $buf .= $theme->css("gallery.css");
if ($session->get("debug")) {
- $theme->css("debug.css");
+ $buf .= $theme->css("debug.css");
}
if (module::is_active("rss")) {
@@ -40,32 +40,33 @@ class gallery_theme_Core {
if (count(locales::installed())) {
// Needed by the languages block
- $theme->script("jquery.cookie.js");
+ $buf .= $theme->script("jquery.cookie.js");
}
if ($session->get("l10n_mode", false)) {
- $theme->css("l10n_client.css");
- $theme->script("jquery.cookie.js");
- $theme->script("l10n_client.js");
+ $buf .= $theme->css("l10n_client.css")
+ . $theme->script("jquery.cookie.js")
+ . $theme->script("l10n_client.js");
}
- $theme->css("uploadify/uploadify.css");
+ $buf .= $theme->css("uploadify/uploadify.css");
return $buf;
}
static function admin_head($theme) {
- $theme->css("gallery.css");
- $theme->script("gallery.panel.js");
+ $buf = $theme->css("gallery.css");
+ $buf .= $theme->script("gallery.panel.js");
$session = Session::instance();
if ($session->get("debug")) {
- $theme->css("debug.css");
+ $buf .= $theme->css("debug.css");
}
if ($session->get("l10n_mode", false)) {
- $theme->css("l10n_client.css");
- $theme->script("jquery.cookie.js");
- $theme->script("l10n_client.js");
+ $buf .= $theme->css("l10n_client.css");
+ $buf .= $theme->script("jquery.cookie.js");
+ $buf .=$theme->script("l10n_client.js");
}
+ return $buf;
}
static function page_bottom($theme) {
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 8befda95..e27dc41a 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -22,6 +22,15 @@ class Gallery_View_Core extends View {
protected $combine_queue = array();
/**
+ * Provide a url to a resource within the current theme. This allows us to refer to theme
+ * resources without naming the theme itself which makes themes easier to copy.
+ */
+ public function url($path, $absolute_url=false) {
+ $arg = "themes/{$this->theme_name}/$path";
+ return $absolute_url ? url::abs_file($arg) : url::file($arg);
+ }
+
+ /**
* Begin gather up scripts or css files so that they can be combined into a single request.
*
* @param $types a comma separated list of types to combine, eg "script,css"
@@ -54,15 +63,6 @@ class Gallery_View_Core extends View {
}
/**
- * Provide a url to a resource within the current theme. This allows us to refer to theme
- * resources without naming the theme itself which makes themes easier to copy.
- */
- public function url($path, $absolute_url=false) {
- $arg = "themes/{$this->theme_name}/$path";
- return $absolute_url ? url::abs_file($arg) : url::file($arg);
- }
-
- /**
* If css combining is enabled, add this css to the list of css that will be
* combined into a single style element. When combined, the order of style elements
* is preserved.
diff --git a/modules/gallery/tests/Cache_Test.php b/modules/gallery/tests/Cache_Test.php
index b95ef0a2..5e14051a 100644
--- a/modules/gallery/tests/Cache_Test.php
+++ b/modules/gallery/tests/Cache_Test.php
@@ -24,8 +24,16 @@ class Cache_Test extends Gallery_Unit_Test_Case {
$this->_driver = new Cache_Database_Driver();
}
- public function cache_exists_test() {
- $this->assert_false($this->_driver->exists("test_key"), "test_key should not be defined");
+ private function _exists($id) {
+ return db::build()
+ ->where("key", "=", $id)
+ ->where("expiration", ">=", time())
+ ->limit("1")
+ ->count_records("caches") > 0;
+ }
+
+ public function cache_exists_test_helper_function_test() {
+ $this->assert_false($this->_exists("test_key"), "test_key should not be defined");
$id = random::hash();
db::build()
@@ -34,7 +42,7 @@ class Cache_Test extends Gallery_Unit_Test_Case {
->values($id, "<tag1>, <tag2>", 84600 + time(), serialize("some test data"))
->execute();
- $this->assert_true($this->_driver->exists($id), "test_key should be defined");
+ $this->assert_true($this->_exists($id), "test_key should be defined");
}
public function cache_get_test() {
@@ -100,9 +108,9 @@ class Cache_Test extends Gallery_Unit_Test_Case {
$this->_driver->delete(array($id1));
- $this->assert_false($this->_driver->exists($id1), "$id1 should have been deleted");
- $this->assert_true($this->_driver->exists($id2), "$id2 should not have been deleted");
- $this->assert_true($this->_driver->exists($id3), "$id3 should not have been deleted");
+ $this->assert_false($this->_exists($id1), "$id1 should have been deleted");
+ $this->assert_true($this->_exists($id2), "$id2 should not have been deleted");
+ $this->assert_true($this->_exists($id3), "$id3 should not have been deleted");
}
public function cache_delete_tag_test() {
@@ -120,9 +128,9 @@ class Cache_Test extends Gallery_Unit_Test_Case {
$data = $this->_driver->delete_tag(array("tag3"));
- $this->assert_true($this->_driver->exists($id1), "$id1 should not have been deleted");
- $this->assert_false($this->_driver->exists($id2), "$id2 should have been deleted");
- $this->assert_false($this->_driver->exists($id3), "$id3 should have been deleted");
+ $this->assert_true($this->_exists($id1), "$id1 should not have been deleted");
+ $this->assert_false($this->_exists($id2), "$id2 should have been deleted");
+ $this->assert_false($this->_exists($id3), "$id3 should have been deleted");
}
public function cache_delete_all_test() {
@@ -140,8 +148,8 @@ class Cache_Test extends Gallery_Unit_Test_Case {
$data = $this->_driver->delete(true);
- $this->assert_false($this->_driver->exists($id1), "$id1 should have been deleted");
- $this->assert_false($this->_driver->exists($id2), "$id2 should have been deleted");
- $this->assert_false($this->_driver->exists($id3), "$id3 should have been deleted");
+ $this->assert_false($this->_exists($id1), "$id1 should have been deleted");
+ $this->assert_false($this->_exists($id2), "$id2 should have been deleted");
+ $this->assert_false($this->_exists($id3), "$id3 should have been deleted");
}
} \ No newline at end of file
diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt
index 24170092..f1192071 100644
--- a/modules/gallery/tests/controller_auth_data.txt
+++ b/modules/gallery/tests/controller_auth_data.txt
@@ -22,8 +22,8 @@ modules/gallery/controllers/user_profile.php show
modules/gallery/controllers/user_profile.php contact DIRTY_AUTH
modules/gallery/controllers/user_profile.php send DIRTY_AUTH
modules/gallery/controllers/welcome_message.php index DIRTY_AUTH
-modules/organize/controllers/organize.php dialog DIRTY_CSRF
-modules/organize/controllers/organize.php add_album_fields DIRTY_AUTH
+modules/organize/controllers/organize.php tree DIRTY_CSRF
+modules/organize/controllers/organize.php delete DIRTY_AUTH
modules/rest/controllers/rest.php index DIRTY_CSRF|DIRTY_AUTH
modules/rest/controllers/rest.php reset_api_key_confirm DIRTY_AUTH
modules/rest/controllers/rest.php reset_api_key DIRTY_AUTH
@@ -35,5 +35,6 @@ modules/server_add/controllers/server_add.php children
modules/tag/controllers/admin_tags.php index DIRTY_CSRF
modules/tag/controllers/tag.php __call DIRTY_CSRF|DIRTY_AUTH
modules/tag/controllers/tags.php autocomplete DIRTY_CSRF|DIRTY_AUTH
+modules/user/controllers/admin_users.php index DIRTY_CSRF
modules/user/controllers/password.php reset DIRTY_AUTH
modules/user/controllers/password.php do_reset DIRTY_CSRF|DIRTY_AUTH
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 366391cf..609f786a 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -213,7 +213,7 @@ modules/gallery/views/menu_link.html.php 5 DIRTY_JS $menu-
modules/gallery/views/movieplayer.html.php 2 DIRTY html::anchor($item->file_url(true),"",$attrs)
modules/gallery/views/movieplayer.html.php 5 DIRTY_JS $attrs["id"]
modules/gallery/views/movieplayer.html.php 7 DIRTY_JS url::abs_file("lib/flowplayer.swf")
-modules/gallery/views/movieplayer.html.php 14 DIRTY_JS url::abs_file("lib/flowplayer.pseudostreaming.swf")
+modules/gallery/views/movieplayer.html.php 17 DIRTY_JS url::abs_file("lib/flowplayer.pseudostreaming.swf")
modules/gallery/views/permissions_browse.html.php 3 DIRTY_JS url::site("permissions/form/__ITEM__")
modules/gallery/views/permissions_browse.html.php 16 DIRTY_JS url::site("permissions/change/__CMD__/__GROUP__/__PERM__/__ITEM__?csrf=$csrf")
modules/gallery/views/permissions_browse.html.php 43 DIRTY_ATTR $parent->id
@@ -262,8 +262,8 @@ modules/gallery/views/user_profile.html.php 34 DIRTY_ATTR $use
modules/gallery/views/user_profile.html.php 43 DIRTY $info->view
modules/image_block/views/image_block_block.html.php 4 DIRTY_JS $item->url()
modules/image_block/views/image_block_block.html.php 5 DIRTY $item->thumb_img(array("class"=>"g-thumbnail"))
-modules/info/views/info_block.html.php 22 DIRTY gallery::date_time($item->captured)
-modules/info/views/info_block.html.php 29 DIRTY_JS $item->owner->url
+modules/info/views/info_block.html.php 5 DIRTY $info["label"]
+modules/info/views/info_block.html.php 5 DIRTY $info["value"]
modules/notification/views/comment_published.html.php 28 DIRTY_JS $comment->item()->abs_url()
modules/notification/views/comment_published.html.php 29 DIRTY $comment->item()->abs_url()
modules/notification/views/item_added.html.php 16 DIRTY_JS $item->abs_url()
@@ -274,22 +274,29 @@ modules/notification/views/item_updated.html.php 20 DIRTY_JS $item-
modules/notification/views/item_updated.html.php 20 DIRTY $item->abs_url()
modules/notification/views/user_profile_notification.html.php 5 DIRTY_ATTR $subscription->id
modules/notification/views/user_profile_notification.html.php 6 DIRTY_JS $subscription->url
-modules/organize/views/organize_dialog.html.php 94 DIRTY_JS $domain
-modules/organize/views/organize_dialog.html.php 95 DIRTY_JS $access_key
-modules/organize/views/organize_dialog.html.php 96 DIRTY_JS request::protocol()
-modules/organize/views/organize_dialog.html.php 97 DIRTY_JS $file_filter
-modules/organize/views/organize_dialog.html.php 98 DIRTY_JS $sort_order
-modules/organize/views/organize_dialog.html.php 99 DIRTY_JS $sort_fields
-modules/organize/views/organize_dialog.html.php 100 DIRTY_JS $album->id
-modules/organize/views/organize_dialog.html.php 101 DIRTY_JS $selected_id
-modules/organize/views/organize_dialog.html.php 102 DIRTY_JS $rest_uri
-modules/organize/views/organize_dialog.html.php 103 DIRTY_JS $controller_uri
-modules/organize/views/organize_dialog.html.php 109 DIRTY_JS $flash_minimum_version="10.0.0"
-modules/organize/views/organize_dialog.html.php 127 DIRTY_JS $swf_uri
-modules/organize/views/organize_dialog.html.php 140 DIRTY_ATTR request::protocol()
+modules/organize/views/organize_dialog.html.php 8 DIRTY_JS url::site("items/__ID__")
+modules/organize/views/organize_dialog.html.php 14 DIRTY_JS $album->title
+modules/organize/views/organize_frame.html.php 12 DIRTY_JS url::file("modules/organize/vendor/ext/images/default/s.gif")
+modules/organize/views/organize_frame.html.php 56 DIRTY_JS url::site("organize/album_info/__ID__")
+modules/organize/views/organize_frame.html.php 94 DIRTY_JS access::csrf_token()
+modules/organize/views/organize_frame.html.php 96 DIRTY_JS url::site("organize/set_sort/__ID__")
+modules/organize/views/organize_frame.html.php 116 DIRTY_JS url::site("organize/delete")
+modules/organize/views/organize_frame.html.php 125 DIRTY_JS access::csrf_token()
+modules/organize/views/organize_frame.html.php 226 DIRTY_JS url::site("organize/rearrange")
+modules/organize/views/organize_frame.html.php 237 DIRTY_JS access::csrf_token()
+modules/organize/views/organize_frame.html.php 275 DIRTY_JS $key
+modules/organize/views/organize_frame.html.php 398 DIRTY_JS url::site("organize/tree/{$album->id}")
+modules/organize/views/organize_frame.html.php 456 DIRTY_JS url::site("organize/reparent")
+modules/organize/views/organize_frame.html.php 479 DIRTY_JS access::csrf_token()
+modules/organize/views/organize_frame.html.php 495 DIRTY_JS access::can("edit",item::root())
+modules/organize/views/organize_frame.html.php 497 DIRTY_JS item::root()->title
+modules/organize/views/organize_frame.html.php 499 DIRTY_JS item::root()->id
+modules/organize/views/organize_frame.html.php 507 DIRTY_JS $album->id
+modules/organize/views/organize_frame.html.php 508 DIRTY_JS $album->id
modules/recaptcha/views/admin_recaptcha.html.php 11 DIRTY $form
modules/recaptcha/views/admin_recaptcha.html.php 23 DIRTY_JS $public_key
-modules/recaptcha/views/form_recaptcha.html.php 7 DIRTY_JS $public_key
+modules/recaptcha/views/form_recaptcha.html.php 3 DIRTY_ATTR request::protocol()
+modules/recaptcha/views/form_recaptcha.html.php 8 DIRTY_JS $public_key
modules/rest/views/reset_api_key_confirm.html.php 6 DIRTY $form
modules/rss/views/feed.mrss.php 10 DIRTY $feed->uri
modules/rss/views/feed.mrss.php 13 DIRTY_JS $feed->uri
@@ -346,28 +353,31 @@ modules/user/views/admin_users.html.php 73 DIRTY_ATTR $use
modules/user/views/admin_users.html.php 74 DIRTY_ATTR $user->avatar_url(20,$theme->url(,true))
modules/user/views/admin_users.html.php 88 DIRTY ($user->last_login==0)?"":gallery::date($user->last_login)
modules/user/views/admin_users.html.php 91 DIRTY db::build()->from("items")->where("owner_id","=",$user->id)->count_records()
-modules/user/views/admin_users.html.php 127 DIRTY_ATTR $group->id
-modules/user/views/admin_users.html.php 127 DIRTY_ATTR ($group->special?"g-default-group":"")
-modules/user/views/admin_users.html.php 129 DIRTY $v
+modules/user/views/admin_users.html.php 113 DIRTY $pager
+modules/user/views/admin_users.html.php 132 DIRTY_ATTR $group->id
+modules/user/views/admin_users.html.php 132 DIRTY_ATTR ($group->special?"g-default-group":"")
+modules/user/views/admin_users.html.php 134 DIRTY $v
modules/user/views/admin_users_delete_user.html.php 6 DIRTY $form
modules/user/views/admin_users_group.html.php 24 DIRTY_JS $user->id
modules/user/views/admin_users_group.html.php 24 DIRTY_JS $group->id
modules/watermark/views/admin_watermarks.html.php 20 DIRTY_ATTR $width
modules/watermark/views/admin_watermarks.html.php 20 DIRTY_ATTR $height
modules/watermark/views/admin_watermarks.html.php 20 DIRTY_ATTR $url
-themes/admin_wind/views/admin.html.php 21 DIRTY_JS $theme->url()
-themes/admin_wind/views/admin.html.php 38 DIRTY $theme->admin_head()
-themes/admin_wind/views/admin.html.php 42 DIRTY $theme->admin_page_top()
-themes/admin_wind/views/admin.html.php 50 DIRTY $theme->admin_header_top()
-themes/admin_wind/views/admin.html.php 51 DIRTY_JS item::root()->url()
-themes/admin_wind/views/admin.html.php 54 DIRTY $theme->user_menu()
-themes/admin_wind/views/admin.html.php 57 DIRTY $theme->admin_menu()
-themes/admin_wind/views/admin.html.php 60 DIRTY $theme->admin_header_bottom()
-themes/admin_wind/views/admin.html.php 67 DIRTY $content
-themes/admin_wind/views/admin.html.php 73 DIRTY $sidebar
-themes/admin_wind/views/admin.html.php 78 DIRTY $theme->admin_footer()
-themes/admin_wind/views/admin.html.php 81 DIRTY $theme->admin_credits()
-themes/admin_wind/views/admin.html.php 86 DIRTY $theme->admin_page_bottom()
+themes/admin_wind/views/admin.html.php 31 DIRTY $theme->admin_head()
+themes/admin_wind/views/admin.html.php 40 DIRTY_JS $theme->url()
+themes/admin_wind/views/admin.html.php 45 DIRTY $theme->get_combined("script")
+themes/admin_wind/views/admin.html.php 48 DIRTY $theme->get_combined("css")
+themes/admin_wind/views/admin.html.php 52 DIRTY $theme->admin_page_top()
+themes/admin_wind/views/admin.html.php 60 DIRTY $theme->admin_header_top()
+themes/admin_wind/views/admin.html.php 61 DIRTY_JS item::root()->url()
+themes/admin_wind/views/admin.html.php 64 DIRTY $theme->user_menu()
+themes/admin_wind/views/admin.html.php 67 DIRTY $theme->admin_menu()
+themes/admin_wind/views/admin.html.php 70 DIRTY $theme->admin_header_bottom()
+themes/admin_wind/views/admin.html.php 77 DIRTY $content
+themes/admin_wind/views/admin.html.php 83 DIRTY $sidebar
+themes/admin_wind/views/admin.html.php 88 DIRTY $theme->admin_footer()
+themes/admin_wind/views/admin.html.php 91 DIRTY $theme->admin_credits()
+themes/admin_wind/views/admin.html.php 96 DIRTY $theme->admin_page_bottom()
themes/admin_wind/views/block.html.php 3 DIRTY_ATTR $anchor
themes/admin_wind/views/block.html.php 5 DIRTY $id
themes/admin_wind/views/block.html.php 5 DIRTY_ATTR $css_id
@@ -398,20 +408,22 @@ themes/wind/views/dynamic.html.php 17 DIRTY_ATTR $chi
themes/wind/views/dynamic.html.php 29 DIRTY $theme->paginator()
themes/wind/views/movie.html.php 5 DIRTY $theme->paginator()
themes/wind/views/movie.html.php 9 DIRTY $item->movie_img(array("class"=>"g-movie","id"=>"g-item-id-{$item->id}"))
-themes/wind/views/page.html.php 9 DIRTY $page_title
-themes/wind/views/page.html.php 12 DIRTY $theme->item()->title
-themes/wind/views/page.html.php 16 DIRTY item::root()->title
-themes/wind/views/page.html.php 26 DIRTY_JS $theme->url()
-themes/wind/views/page.html.php 35 DIRTY $new_width
-themes/wind/views/page.html.php 36 DIRTY $new_height
-themes/wind/views/page.html.php 37 DIRTY $thumb_proportion
-themes/wind/views/page.html.php 74 DIRTY $header_text
-themes/wind/views/page.html.php 76 DIRTY_JS item::root()->url()
-themes/wind/views/page.html.php 80 DIRTY $theme->user_menu()
-themes/wind/views/page.html.php 101 DIRTY_JS $parent->url($parent->id==$theme->item()->parent_id?"show={$theme->item()->id}":null)
-themes/wind/views/page.html.php 122 DIRTY $content
-themes/wind/views/page.html.php 128 DIRTY newView("sidebar.html")
-themes/wind/views/page.html.php 135 DIRTY $footer_text
+themes/wind/views/page.html.php 10 DIRTY $page_title
+themes/wind/views/page.html.php 13 DIRTY $theme->item()->title
+themes/wind/views/page.html.php 17 DIRTY item::root()->title
+themes/wind/views/page.html.php 31 DIRTY $new_width
+themes/wind/views/page.html.php 32 DIRTY $new_height
+themes/wind/views/page.html.php 33 DIRTY $thumb_proportion
+themes/wind/views/page.html.php 70 DIRTY_JS $theme->url()
+themes/wind/views/page.html.php 75 DIRTY $theme->get_combined("script")
+themes/wind/views/page.html.php 78 DIRTY $theme->get_combined("css")
+themes/wind/views/page.html.php 88 DIRTY $header_text
+themes/wind/views/page.html.php 90 DIRTY_JS item::root()->url()
+themes/wind/views/page.html.php 94 DIRTY $theme->user_menu()
+themes/wind/views/page.html.php 115 DIRTY_JS $parent->url($parent->id==$theme->item()->parent_id?"show={$theme->item()->id}":null)
+themes/wind/views/page.html.php 136 DIRTY $content
+themes/wind/views/page.html.php 142 DIRTY newView("sidebar.html")
+themes/wind/views/page.html.php 149 DIRTY $footer_text
themes/wind/views/paginator.html.php 33 DIRTY_JS $first_page_url
themes/wind/views/paginator.html.php 42 DIRTY_JS $previous_page_url
themes/wind/views/paginator.html.php 70 DIRTY_JS $next_page_url
diff --git a/modules/recaptcha/helpers/recaptcha_theme.php b/modules/recaptcha/helpers/recaptcha_theme.php
index ee880986..3677a7c7 100644
--- a/modules/recaptcha/helpers/recaptcha_theme.php
+++ b/modules/recaptcha/helpers/recaptcha_theme.php
@@ -19,10 +19,10 @@
*/
class recaptcha_theme_Core {
static function head($theme) {
- $theme->css("recaptcha.css");
+ return $theme->css("recaptcha.css");
}
static function admin_head($theme) {
- $theme->css("recaptcha.css");
+ return $theme->css("recaptcha.css");
}
} \ No newline at end of file
diff --git a/modules/search/helpers/search_theme.php b/modules/search/helpers/search_theme.php
index 07066caa..45a88dc2 100644
--- a/modules/search/helpers/search_theme.php
+++ b/modules/search/helpers/search_theme.php
@@ -22,7 +22,7 @@ class search_theme_Core {
if ($theme->page_subtype() != "login") {
$view = new View("search_link.html");
return $view->render();
- }else {
+ } else {
return "";
}
}
diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 53f78772..6395c2f0 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -20,24 +20,24 @@
class server_add_theme_Core {
static function head($theme) {
if (identity::active_user()->admin) {
- $theme->css("server_add.css");
- $theme->script("server_add.js");
+ return $theme->css("server_add.css")
+ . $theme->script("server_add.js");
}
}
static function admin_head($theme) {
- $head = array();
+ $buf = "";
if (strpos(Router::$current_uri, "admin/server_add") !== false) {
- $theme->css("server_add.css");
- $theme->css("jquery.autocomplete.css");
+ $buf .= $theme->css("server_add.css")
+ . $theme->css("jquery.autocomplete.css");
$base = url::site("__ARGS__");
$csrf = access::csrf_token();
- $head[] = "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
+ $buf .= "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
- $theme->script("jquery.autocomplete.js");
- $theme->script("admin.js");
+ $buf .= $theme->script("jquery.autocomplete.js")
+ . $theme->script("admin.js");
}
- return implode("\n", $head);
+ return $buf;
}
} \ No newline at end of file
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index f731dbb7..3325a832 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -19,13 +19,13 @@
*/
class tag_theme_Core {
static function head($theme) {
- $theme->css("jquery.autocomplete.css");
- $theme->script("jquery.autocomplete.js");
- $theme->css("tag.css");
+ return $theme->css("jquery.autocomplete.css")
+ . $theme->script("jquery.autocomplete.js")
+ . $theme->css("tag.css");
}
static function admin_head($theme) {
- $theme->css("tag.css");
- $theme->script("gallery.in_place_edit.js");
+ return $theme->css("tag.css")
+ . $theme->script("gallery.in_place_edit.js");
}
} \ No newline at end of file
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index 25df87e0..2b73b5be 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -78,12 +78,14 @@ class Tag_Model_Core extends ORM {
$related_item_ids[$row->item_id] = 1;
}
- $added = array_diff($this->changed_relations["items"], $this->object_relations["items"]);
- $removed = array_diff($this->object_relations["items"], $this->changed_relations["items"]);
- if (isset($this->changed_relations["items"])) {
- $changed = array_merge($added, $removed);
+ if (isset($this->object_relations["items"])) {
+ $added = array_diff($this->changed_relations["items"], $this->object_relations["items"]);
+ $removed = array_diff($this->object_relations["items"], $this->changed_relations["items"]);
+ if (isset($this->changed_relations["items"])) {
+ $changed = array_merge($added, $removed);
+ }
+ $this->count = count($this->object_relations["items"]) + count($added) - count($removed);
}
- $this->count = count($this->object_relations["items"]) + count($added) - count($removed);
$result = parent::save();
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 23032ab3..9ef6f8c1 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -22,8 +22,34 @@ class Admin_Users_Controller extends Admin_Controller {
$view = new Admin_View("admin.html");
$view->page_title = t("Users and groups");
$view->content = new View("admin_users.html");
- $view->content->users = ORM::factory("user")->order_by("name", "ASC")->find_all();
+
+ // @todo: add this as a config option
+ $page_size = module::get_var("user", "page_size", 10);
+ $page = Input::instance()->get("page", "1");
+ $builder = db::build();
+ $user_count = $builder->from("users")->count_records();
+
+ $view->content->pager = new Pagination();
+ $view->content->pager->initialize(
+ array("query_string" => "page",
+ "total_items" => $user_count,
+ "items_per_page" => $page_size,
+ "style" => "classic"));
+
+ // Make sure that the page references a valid offset
+ if ($page < 1) {
+ url::redirect(url::merge(array("page" => 1)));
+ } else if ($page > $view->content->pager->total_pages) {
+ url::redirect(url::merge(array("page" => $view->content->pager->total_pages)));
+ }
+
+ // Join our users against the items table so that we can get a count of their items
+ // in the same query.
+ $view->content->users = ORM::factory("user")
+ ->order_by("users.name", "ASC")
+ ->find_all($page_size, $view->content->pager->sql_offset);
$view->content->groups = ORM::factory("group")->order_by("name", "ASC")->find_all();
+
print $view;
}
diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 084eac31..93e3d02e 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -12,6 +12,7 @@
#g-user-admin {
width: auto;
+ margin-bottom: 4em;
}
#g-group-admin {
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 5a7161ed..70e96f70 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -19,12 +19,12 @@
*/
class user_theme_Core {
static function head($theme) {
- $theme->css("user.css");
- $theme->script("password_strength.js");
+ return $theme->css("user.css")
+ . $theme->script("password_strength.js");
}
static function admin_head($theme) {
- $theme->css("user.css");
- $theme->script("password_strength.js");
+ return $theme->css("user.css")
+ . $theme->script("password_strength.js");
}
} \ No newline at end of file
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index f067cae8..a7bd6b27 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -108,6 +108,11 @@
</tr>
<? endforeach ?>
</table>
+
+ <div class="g-paginator">
+ <?= $pager ?>
+ </div>
+
</div>
</div>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-14 05:03:55 +0000