From 1ab8ac305bf53bae8c05b917b06f035b9b700937 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Wed, 2 Dec 2009 12:09:34 -0800 Subject: Allow users to override the number of simulatenous uploads. This setting won't appear until after they have attempted to upload at least once and have issues. --- modules/gallery/libraries/Form_Uploadify.php | 7 +++++++ modules/gallery/views/form_uploadify.html.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php index b1d9fa74..52fa45f0 100644 --- a/modules/gallery/libraries/Form_Uploadify.php +++ b/modules/gallery/libraries/Form_Uploadify.php @@ -45,6 +45,13 @@ class Form_Uploadify_Core extends Form_Input { $v = new View("form_uploadify.html"); $v->album = $this->data["album"]; $v->script_data = $this->data["script_data"]; + $upload_limit = module::get_var("gallery", "upload_limit"); + if (empty($upload_limit)) { + $upload_limit = 5; + module::set_var("gallery", "upload_limit", 5); + } + + $v->upload_limit = $upload_limit; return $v; } diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index 5e99c8d5..c18bc8ca 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -24,7 +24,7 @@ fileDesc: for_js() ?>, cancelImg: "", buttonText: for_js() ?>, - simUploadLimit: 10, + simUploadLimit: , wmode: "transparent", hideButton: true, /* should be true */ auto: true, -- cgit v1.2.3 From c9e6869c681fa6579d1858cea45ec94eb0972f30 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 2 Dec 2009 19:08:13 -0800 Subject: Rename the "upload_limit" variable to "simultaneous_upload_limit" for clarity, since it only limits concurrency not the number of actual uploads. Move the default-setting code into the upgrader so that we avoid creating the variable as a side-effect of the view (personal preference to avoid side-effect code since it's led to problems in the past). --- modules/gallery/helpers/gallery_installer.php | 7 +++++++ modules/gallery/libraries/Form_Uploadify.php | 8 +------- modules/gallery/module.info | 3 +-- modules/gallery/views/form_uploadify.html.php | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'modules') diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php index 57a5ee9f..39859b36 100644 --- a/modules/gallery/helpers/gallery_installer.php +++ b/modules/gallery/helpers/gallery_installer.php @@ -432,6 +432,13 @@ class gallery_installer { module::clear_var("gallery", "blocks_site.sidebar"); module::set_version("gallery", $version = 19); } + + // Set a default for the number of simultaneous uploads + // Version 20 was reverted in 57adefc5baa7a2b0dfcd3e736e80c2fa86d3bfa2, so skip it. + if ($version == 19 || $version == 20) { + module::set_var("gallery", "simultaneous_upload_limit", 5); + module::set_version("gallery", $version = 21); + } } static function uninstall() { diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php index 52fa45f0..9d76153d 100644 --- a/modules/gallery/libraries/Form_Uploadify.php +++ b/modules/gallery/libraries/Form_Uploadify.php @@ -45,13 +45,7 @@ class Form_Uploadify_Core extends Form_Input { $v = new View("form_uploadify.html"); $v->album = $this->data["album"]; $v->script_data = $this->data["script_data"]; - $upload_limit = module::get_var("gallery", "upload_limit"); - if (empty($upload_limit)) { - $upload_limit = 5; - module::set_var("gallery", "upload_limit", 5); - } - - $v->upload_limit = $upload_limit; + $v->simultaneous_upload_limit = module::get_var("gallery", "simultaneous_upload_limit"); return $v; } diff --git a/modules/gallery/module.info b/modules/gallery/module.info index ba1ee91d..b3366f7d 100644 --- a/modules/gallery/module.info +++ b/modules/gallery/module.info @@ -1,5 +1,4 @@ name = "Gallery 3" description = "Gallery core application" -; Note: skip version 20, use 21 as the next version -version = 19 +version = 21 diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index c18bc8ca..d856c464 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -24,7 +24,7 @@ fileDesc: for_js() ?>, cancelImg: "", buttonText: for_js() ?>, - simUploadLimit: , + simUploadLimit: , wmode: "transparent", hideButton: true, /* should be true */ auto: true, -- cgit v1.2.3 From 5c107be9033ae48f781c8430702458f613e791ee Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 4 Dec 2009 11:12:24 -0800 Subject: Reload relevant models after acquiring a lock so that we don't make database calls based on obsolete data, which can lead to data corruption. Fixes ticket #926. --- modules/gallery/libraries/ORM_MPTT.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'modules') diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php index 83d2445c..ebd7abc2 100644 --- a/modules/gallery/libraries/ORM_MPTT.php +++ b/modules/gallery/libraries/ORM_MPTT.php @@ -48,6 +48,7 @@ class ORM_MPTT_Core extends ORM { */ function add_to_parent($parent) { $this->lock(); + $parent->reload(); // Assume that the prior lock holder may have changed the parent try { // Make a hole in the parent for this new item @@ -91,6 +92,7 @@ class ORM_MPTT_Core extends ORM { } $this->lock(); + $this->reload(); // Assume that the prior lock holder may have changed this entry try { $this->db->query( "UPDATE {{$this->table_name}} SET `left_ptr` = `left_ptr` - 2 WHERE `left_ptr` > {$this->right_ptr}"); @@ -224,6 +226,8 @@ class ORM_MPTT_Core extends ORM { $level_delta = ($target->level + 1) - $this->level; $this->lock(); + $this->reload(); // Assume that the prior lock holder may have changed this entry + $target->reload(); try { if ($level_delta) { // Update the levels for the to-be-moved items -- cgit v1.2.3 From 267b3a1623ebb3d9db2209adc1b14f4c882c3611 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Fri, 4 Dec 2009 13:48:52 -0800 Subject: Make the rendering of the Theme Options page consistent between the first request and any errors --- modules/gallery/controllers/admin_theme_options.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php index 9de54c78..6297e4aa 100644 --- a/modules/gallery/controllers/admin_theme_options.php +++ b/modules/gallery/controllers/admin_theme_options.php @@ -64,7 +64,8 @@ class Admin_Theme_Options_Controller extends Admin_Controller { url::redirect("admin/theme_options"); } else { $view = new Admin_View("admin.html"); - $view->content = $form; + $view->content = new View("admin_theme_options.html"); + $view->content->form = $form; print $view; } } -- cgit v1.2.3 From f4810345b48d321460d32481e5665ea4602c9207 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sat, 5 Dec 2009 09:13:04 -0800 Subject: Correct inconsistent capitalization on "Server Add" --- modules/server_add/helpers/server_add.php | 2 +- modules/server_add/helpers/server_add_event.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/server_add/helpers/server_add.php b/modules/server_add/helpers/server_add.php index 27794855..60c6426e 100644 --- a/modules/server_add/helpers/server_add.php +++ b/modules/server_add/helpers/server_add.php @@ -24,7 +24,7 @@ class server_add_Core { } if (empty($paths)) { site_status::warning( - t("Server Add needs configuration. Configure it now!", + t("Server add module needs configuration. Configure it now!", array("url" => html::mark_clean(url::site("admin/server_add")))), "server_add_configuration"); } else { diff --git a/modules/server_add/helpers/server_add_event.php b/modules/server_add/helpers/server_add_event.php index e1295bd4..9b28fd70 100644 --- a/modules/server_add/helpers/server_add_event.php +++ b/modules/server_add/helpers/server_add_event.php @@ -22,7 +22,7 @@ class server_add_event_Core { $menu->get("settings_menu") ->append(Menu::factory("link") ->id("server_add") - ->label(t("Server Add")) + ->label(t("Server add")) ->url(url::site("admin/server_add"))); } @@ -35,7 +35,7 @@ class server_add_event_Core { $menu->get("add_menu") ->append(Menu::factory("dialog") ->id("server_add") - ->label(t("Server Add")) + ->label(t("Server add")) ->url(url::site("server_add/browse/$item->id"))); } } -- cgit v1.2.3 From 03ea1ee701986d76738778f475d3ec1b01755e65 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 5 Dec 2009 12:00:50 -0800 Subject: Change the default image to be the full size so that the slideshow shows the big one. --- modules/rss/views/feed.mrss.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php index 5fce8699..a61ee96c 100644 --- a/modules/rss/views/feed.mrss.php +++ b/modules/rss/views/feed.mrss.php @@ -56,7 +56,6 @@ type="mime_type ?>" height="resize_height ?>" width="resize_width ?>" - isDefault="true" /> -- cgit v1.2.3 From 4a6b62c285fb384739b5d918113758209a259e9e Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sat, 5 Dec 2009 12:07:24 -0800 Subject: Revert "Correct inconsistent capitalization on "Server Add"" This reverts commit f4810345b48d321460d32481e5665ea4602c9207. Bharat is a correct as in that "Server Add" is a proper name and should be exempt from the capitalization rules. --- modules/server_add/helpers/server_add.php | 2 +- modules/server_add/helpers/server_add_event.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/server_add/helpers/server_add.php b/modules/server_add/helpers/server_add.php index 60c6426e..27794855 100644 --- a/modules/server_add/helpers/server_add.php +++ b/modules/server_add/helpers/server_add.php @@ -24,7 +24,7 @@ class server_add_Core { } if (empty($paths)) { site_status::warning( - t("Server add module needs configuration. Configure it now!", + t("Server Add needs configuration. Configure it now!", array("url" => html::mark_clean(url::site("admin/server_add")))), "server_add_configuration"); } else { diff --git a/modules/server_add/helpers/server_add_event.php b/modules/server_add/helpers/server_add_event.php index 9b28fd70..e1295bd4 100644 --- a/modules/server_add/helpers/server_add_event.php +++ b/modules/server_add/helpers/server_add_event.php @@ -22,7 +22,7 @@ class server_add_event_Core { $menu->get("settings_menu") ->append(Menu::factory("link") ->id("server_add") - ->label(t("Server add")) + ->label(t("Server Add")) ->url(url::site("admin/server_add"))); } @@ -35,7 +35,7 @@ class server_add_event_Core { $menu->get("add_menu") ->append(Menu::factory("dialog") ->id("server_add") - ->label(t("Server add")) + ->label(t("Server Add")) ->url(url::site("server_add/browse/$item->id"))); } } -- cgit v1.2.3