RubyGems - imagine_cms - Versions diffs - 4.2.4 → 5.2.0 - Mend

imagine_cms 4.2.4 → 5.2.0

Files changed (118) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d5f39688f4ce0db4088dcb9a9fd335d8559cc8b2
-  data.tar.gz: f17c64bc6b869b8bb6ebd43f0ccb8f4a40ea8569
+SHA256:
+  metadata.gz: 6a2d2087d9caf255378b1213b70ef79ce96674fd68158faa3d175a0efcc49bcb
+  data.tar.gz: 3d26b91a3140cc36df6ce24dcd8aa0c8042d178a1596d152990bab1f8da6aba4
 SHA512:
-  metadata.gz: 1c346d09b43132531d39927c97f3747099980b5fb662900897ea0252975e2380192818aef42705f24be8579ec5dfb85d87c4c18249ce477f726143a6151bf990
-  data.tar.gz: 3b5953c978eb5b1de34ef12e8ab469689791571d38ecfd89c246b610762f883c5f6ae4ee677ec0ae24c5a0f86b7f1083a995a51a0c96ddf229b1bca2053adf3e
+  metadata.gz: 4cd0d6ba6f816b5d8a4de2f63f5947bac71a4ee02ece4fa26af8d79db2b87c5d2360d7eb5f863ddb0667615e41731473a8d77d6ea0b3c5f013e751d8b86bd0ab
+  data.tar.gz: 28b07e811ffd01c9df9db417f75bfc782f44c72779441a2a70aab854c59d2f222ad4433d8492a7d0ff94b4c47b7f1efbe2882a20fbde7e4b9f78cf69fba197d6

data/.gitignore CHANGED

@@ -7,3 +7,7 @@ test/dummy/tmp/
 test/dummy/.sass-cache
 *.gem
+prototype-rails
+docker-compose.override.yml

data/.ruby-version CHANGED

	@@ -1 +1 @@
1	- 2.2.4
1	+ 2.5.1

data/Dockerfile ADDED

@@ -0,0 +1,61 @@
+### Docker image for imagine5 ###
+# See https://github.com/phusion/passenger-docker/blob/master/Changelog.md for a list of version numbers.
+FROM phusion/passenger-ruby25:1.0.0
+LABEL maintainer="aaron@aaronnamba.com"
+# Set up 3rd party repos
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
+# Update package list
+RUN apt-get update
+# Upgrade other preinstalled packages
+RUN apt-get upgrade -y -o Dpkg::Options::="--force-confnew"
+# Install other packages we depend on
+RUN apt-get install -y nodejs yarn
+RUN apt-get install -y tzdata
+RUN apt-get install -y mysql-client
+RUN apt-get install -y libmagickcore-dev libmagickwand-dev  # for rmagick2 gem
+RUN apt-get install -y imagemagick                          # for mini-magick gem
+RUN apt-get install -y openjdk-8-jre-headless               # java for fop
+RUN apt-get install -y memcached                            # for rack-attack and rails cache
+RUN apt-get install -y cmake pkg-config                     # for rugged (git)
+RUN apt-get autoremove -y
+# Enable services
+RUN rm -f /etc/service/nginx/down
+# Add custom services
+RUN mkdir /etc/service/memcached
+COPY docker/services/memcached.sh /etc/service/memcached/run
+# RUN mkdir /etc/service/sidekiq
+# COPY docker/services/sidekiq.sh /etc/service/sidekiq/run
+# RUN mkdir /etc/service/webpack
+# COPY docker/services/webpack.sh /etc/service/webpack/run
+# Other startup scripts
+RUN mkdir -p /etc/my_init.d
+COPY docker/startup/101_mkdir.sh /etc/my_init.d/
+COPY docker/startup/201_bundler.sh /etc/my_init.d/
+COPY docker/startup/211_yarn.sh /etc/my_init.d/
+# Remove the default vhost (so that ours will respond to any Host)
+RUN rm -f /etc/nginx/sites-enabled/default
+# Post-build clean up
+RUN apt-get clean && rm -rf /tmp/* /var/tmp/*
+# RUN rm -rf /var/lib/apt/lists/*
+# Expose port 80 to the Docker host, so we can access it from the outside (remember to publish it using `docker run -p`).
+EXPOSE 80
+# For convenience
+WORKDIR /home/app/myapp
+COPY docker/conf/.my.cnf /home/app
+# Run this to start all services (if no command was provided to `docker run`)
+CMD ["/sbin/my_init"]

data/README.md ADDED

@@ -0,0 +1,50 @@
+# Imagine CMS
+[![Version](https://img.shields.io/github/tag/anamba/imagine_cms.svg?maxAge=360)](https://github.com/anamba/imagine_cms/releases/latest)
+[![License](https://img.shields.io/github/license/anamba/imagine_cms.svg)](https://github.com/anamba/imagine_cms/blob/master/license.txt)
+Imagine CMS is a web content management system developed by [Bigger Bird Creative, Inc.](https://biggerbird.com) in 2006 for its clients.
+Other CMSes came with a learning curve: not a problem for daily users, but clients who only used it once a month or so would forget everything by the next time they logged in.
+Simpler systems didn't have enough functionality to allow us to do what we wanted to do as designers and developers.
+Thus, we created a CMS that is easy for clients to use, stays out of our way, and provides useful automation (publishing and unpublishing on a schedule, navigation links, RSS feeds, etc.).
+## Current Status
+Imagine 5.2 is ready for production use (v5.2-stable branch). Imagine 4 is also available for apps tied to Rails 4.2, respectively (v4.2-stable branch).
+However, unless you are already familiar with Imagine, this project is not suitable for wider use. Why? Well, the purpose of the Imagine gem at this point is strictly to upgrade legacy sites to modern versions of Rails as simply as possible, and to make sure that if something happens to Bigger Bird, our clients will not be left high and dry. This version was never intended to be used by the general public.
+Imagine 7 will be a clean break and a great time to try Imagine CMS. Depending on how smoothly development goes, it could be released before Imagine 6 (awkward...).
+## History and Roadmap
+Imagine was originally created in the Rails 1.0 days, to run a large number of technically straightforward content-based sites (versus the one or two highly-custom web applications most Rails developers were building at the time). We wanted to provide a way to create and manage static content with a little bit of automation, while also allowing limitless custom Ruby development. However, because plugins/engines were quite limited in those days, Imagine was implemented by monkey-patching core parts of Rails and creating a new framework on top of Rails. Although this allowed us great insight into the inner workings of Rails, this approach proved extremely difficult to port to Rails 2. Thus, sites using the original Imagine 1.x were stuck on Rails 1.x for many years.
+All that is now firmly in the past. By extracting Imagine functionality into a Rails engine, we achieved compatibility with Rails 3.2 and Ruby 1.9 and removed roadblocks to a future upgrade to Rails 4 and Ruby 2, all while retaining backwards compatibility with the Imagine CMS database structure.
+(Imagine 1.x and 2.x were internal-only releases, the open source version started at 3.0.)
+* Imagine 3.0 (Rails 3.2, Ruby 1.9/2.0): [DONE, v3.0-stable] 100% restored functionality (plus a few extras and fixes), no database changes.
+* Imagine 4.0 (Rails 4.0, Ruby 2.1): [DONE, v4.0-stable] Compatibility with Rails 4.0
+* Imagine 4.1 (Rails 4.1, Ruby 2.1): [DONE, v4.1-stable] Compatibility with Rails 4.1
+* Imagine 4.2 (Rails 4.2, Ruby 2.2): [DONE, v4.2-stable] Compatibility with Rails 4.2, many minor fixes and UI improvements
+* Imagine 5.0 (Rails 5.0, Ruby 2.2): [SKIPPED] Compatibility with Rails 5.0
+* Imagine 5.1 (Rails 5.1, Ruby 2.4): [SKIPPED] Compatibility with Rails 5.1
+* **Imagine 5.2 (Rails 5.2, Ruby 2.5): [CURRENT RELEASE] Compatibility with Rails 5.2**
+* Imagine 6 (Rails 6): [FUTURE] Compatibility with Rails 6
+* Imagine 7 (Crystal): [IN PROGRESS] Rewrite in [Crystal](https://crystal-lang.org/) with [Apache CouchDB](http://couchdb.apache.org/) backend
+Imagine 6 will continue to be Rails-based, but Imagine 7 is a complete, ground-up rewrite in Crystal. Development will begin in a new repository under an Imagine CMS organization, as a proper community-driven open source project (finally!). The core concepts will continue on, but not a single line of code will carry over.
+## Hosting
+Imagine 3.x-6.x can run on typical Rails hosting platforms (anything that uses Passenger, Unicorn, Puma, etc.). On hosts that don't allow writing to the local filesystem (e.g. Heroku) you won't be able to use photo galleries or page caching, but other features should work (note: this mode of operation has not been fully tested).
+## Getting Help
+Get paid support and hosting for Imagine CMS straight from the people who made it: [Bigger Bird Creative, Inc.](https://biggerbird.com) Neither is required to use Imagine CMS, of course.
+## Contributing
+Imagine 7 (Crystal) will be a true open source project, but this project (Ruby-based Imagine) will remain more or less closed for the foreseeable future. If companies or individuals are willing to sponsor or co-develop new features, we can work something out.

data/app/assets/javascripts/imagine_cms/core.js CHANGED

@@ -1,9 +1,11 @@
 jQuery(document).ready(function () {
+  window.CodemirrorInstances = [];
   jQuery('textarea.codemirror-html').each(function () {
     var cm = CodeMirror.fromTextArea(this, {
       mode: 'application/x-erb-imagine',
       lineNumbers: true
     });
+    window.CodemirrorInstances.push(cm);
   })
 });
@@ -334,7 +336,7 @@ function showPageBrowser(field_id) {
     path = $(field_id).value;
     $('page_browser').innerHTML = 'Loading...'
-    new Ajax.Updater('page_browser', '/manage/cms/select_page?path=' + path, {asynchronous:true, evalScripts:true});
+    new Ajax.Updater('page_browser', '/manage/cms_pages/select_page?path=' + path, {asynchronous:true, evalScripts:true});
     $('page_browser_selection').value = path;
     showDojoDialog('page_browser_dialog');
 }
@@ -396,7 +398,7 @@ function scanForPageObjects(page_id, parent_key, version) {
   jQuery.each(found, function (key, val) {
     if (!cmsPageObjects[key]) {
       cmsPageObjects[key] = val;
-      jQuery.get('/manage/cms/insert_page_object_config/' + page_id + '?version= ' + version +
+      jQuery.get('/manage/cms_pages/' + page_id + '/insert_page_object_config?version= ' + version +
                  '&name=' + key + '&type=' + val + '&parent_key=' + parent_key);
     }
   });

data/app/assets/javascripts/imagine_cms/legacy/misc.js CHANGED

@@ -117,78 +117,76 @@ function selectTab(tabName, tabArray, tabBtnPrefix, tabDivPrefix, hiddenTextFiel
 function setReportDates(interval) {
-    startDateField = $('report_start_date');
-    endDateField = $('report_end_date');
-    today = startDate = endDate = new Date();
+    var startDateField = $('report_start_date');
+    var endDateField = $('report_end_date');
+    var today = new Date();
+    var startDate = new Date();
+    var endDate = new Date();
     switch (interval) {
         case 'yesterday':
-            startDate = new Date('' + (today.getMonth()+1) + '/' + (today.getDate()-1) + '/' + today.getYear());
+            startDate = new Date(today.getYear(), today.getMonth(), today.getDate()-1);
             endDate = startDate;
             break;
         case 'last_month':
-            startDate = new Date('' + today.getMonth() + '/1/' + today.getYear());
-            endDate = new Date('' + (today.getMonth()+1) + '/0/' + today.getYear());
+            startDate = new Date(today.getYear(), today.getMonth()-1, 1);
+            endDate = new Date(today.getYear(), today.getMonth(), 0);
             break;
         case 'last_quarter':
-            startMonth = Math.floor(today.getMonth() / 3) * 3 - 3;
-            startYear = today.getYear();
+            var startMonth = Math.floor(today.getMonth() / 3) * 3 - 3;
+            var startYear = today.getYear();
             if (startMonth < 0) {
                 startMonth += 12;
                 startYear--;
             }
-            endMonth = startMonth + 3;
-            endYear = startYear;
+            var endMonth = startMonth + 3;
+            var endYear = startYear;
             if (endMonth > 11) {
                 endMonth -= 12;
                 endYear++;
             }
-            startDate = new Date('' + (startMonth+1) + '/1/' + startYear);
-            endDate = new Date('' + (endMonth+1) + '/0/' + endYear);
+            startDate = new Date(startYear, startMonth, 1);
+            endDate = new Date(endYear, endMonth, 0);
             break;
         case 'last_year':
-            startDate = new Date('1/1/' + (today.getYear()-1));
-            endDate = new Date('12/31/' + (today.getYear()-1));
+            startDate = new Date(today.getYear()-1, 0, 1);
+            endDate = new Date(today.getYear()-1, 11, 31);
             break;
-        case 'today':
-            startDate = new Date('' + (today.getMonth()+1 )+ '/' + today.getDate() + '/' + today.getYear());
-            endDate = startDate;
-            break;
+        // case 'today':  // same as default
         case 'this_month':
-            startDate = new Date('' + (today.getMonth()+1) + '/1/' + today.getYear());
-            endDate = new Date('' + (today.getMonth()+2) + '/0/' + today.getYear());
+            startDate = new Date(today.getYear(), today.getMonth(), 1);
+            endDate = new Date(today.getYear(), today.getMonth()+1, 0);
             break;
         case 'this_quarter':
-            startMonth = Math.floor(today.getMonth() / 3) * 3;
-            endMonth = startMonth + 3;
-            endYear = startYear;
+            var startMonth = Math.floor(today.getMonth() / 3) * 3;
+            var endMonth = startMonth + 3;
+            var endYear = today.getYear();
             if (endMonth > 11) {
                 endMonth -= 12;
                 endYear++;
             }
-            startDate = new Date('' + (startMonth+1) + '/1/' + today.getYear());
-            endDate = new Date('' + (endMonth+1) + '/0/' + endYear);
+            startDate = new Date(today.getYear(), startMonth, 1);
+            endDate = new Date(endYear, endMonth, 0);
             break;
         case 'this_year':
-            startDate = new Date('1/1/' + today.getYear());
-            endDate = new Date('12/31/' + today.getYear());
+            startDate = new Date(today.getYear(), 0, 1);
+            endDate = new Date(today.getYear(), 11, 31);
             break;
         case 'all_time':
-            startDate = new Date('1/1/' + (today.getYear()-5));
-            endDate = new Date('12/31/' + (today.getYear()+50));
+            startDate = new Date(100, 0, 1);
+            endDate = new Date(1099, 11, 31);
             break;
         default:
-            // same as "today"
-            startDate = new Date('' + (today.getMonth()+1 )+ '/' + today.getDate() + '/' + today.getYear());
+            startDate = new Date(today.getYear(), today.getMonth(), today.getDate());
             endDate = startDate;
             break;
     }

data/app/controllers/cms/content_controller.rb CHANGED

@@ -6,7 +6,7 @@ module Cms # :nodoc:
     caches_action :rss_feed
-    before_filter :convert_content_path
+    before_action :convert_content_path
     # Routes:
     # match 'plcalendar(/:action(/:id))' => 'cms/content#page_list_calendar'
@@ -34,7 +34,7 @@ module Cms # :nodoc:
           params[:page] = 'index'
           template_found = true
         end
-      rescue Exception => e
+      rescue StandardError => e
         if e.message =~ /string contains null byte/
           # do nothing
         else
@@ -149,9 +149,9 @@ module Cms # :nodoc:
           params[:page] = 'index'
         end
-        if @pg = CmsPage.includes(:template).find_by_path(db_path.join('/'))
+        if @pg ||= (CmsPage.includes(:template).find_by_path(db_path.join('/')) || CmsPage.includes(:template).find_by_path(db_path.map { |segment| segment.gsub(/([A-Za-z\d])_/, '\1-') }.join('/')))
           if edit_mode
-            redirect_to controller: '/management/cms', action: 'edit_page_content', id: @pg and return true
+            redirect_to controller: '/manage/cms_pages', action: 'edit_page_content', id: @pg and return true
           else
             # return if page is offline and viewer is not an admin
             if @pg.published_version < 0
@@ -197,15 +197,17 @@ module Cms # :nodoc:
             render inline: template_content
-            if UseCmsPageCaching && @allow_caching && perform_caching && request.format == Mime::HTML
-              cache_page
+            if UseCmsPageCaching && @allow_caching && perform_caching && request.format == Mime[:html]
+              cache_page(nil, nil, nil)
             end
             return true
           end
         end
-      rescue Exception => e
-        logger.error "Error rendering from db: #{e.class}: #{e.message}"
+      rescue ActionController::RoutingError
+        # no need to log this
+      rescue StandardError => e
+        logger.error "Error rendering from db: #{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"
         rendering_error(e) and return true
       end
@@ -294,7 +296,7 @@ module Cms # :nodoc:
         end
         @pages.each_with_index do |page, index|
-          @page_contents[page.id] = render_to_string :inline => substitute_placeholders(@page_objects["#{key}-template"] || options[:template] || '', page, :index => index+1, :count => @pages.size)
+          @page_contents[page.id] = render_to_string :inline => substitute_placeholders(@page_objects["#{key}-template"] || '', page, :index => index+1, :count => @pages.size)
         end
       end
@@ -307,11 +309,16 @@ module Cms # :nodoc:
     def preview_template
       @pg = CmsPage.new
-      @pg.template = CmsTemplate.new
-      @pg.template.name = (params[:temp] || params[:snip])[:name] || 'New Template'
-      @pg.template.content = (params[:temp] || params[:snip])[:content]
-      @page_objects = HashObject.new
-      render :inline => substitute_placeholders(@pg.template.content, @pg), :layout => 'application'
+      if params[:id] && (@cms_template = CmsTemplate.find_by_id(params[:id])) && (pg = @cms_template.pages.where('published_version >= 0').order('updated_on desc').first)
+        @pg = pg
+      else
+        @cms_template = CmsTemplate.new(name: 'Template Preview')
+        @pg.template = @cms_template
+      end
+      @page_objects = OpenStruct.new
+      @pg.template.content = params[:content]
+      render inline: render_cms_page_to_string(@pg, params[:content])
     end
     def page_list_calendar
@@ -358,28 +365,25 @@ module Cms # :nodoc:
     protected
-    def render_cms_page_to_string(page)
+    def render_cms_page_to_string(page, template_content = nil)
+      template_content = (substitute_placeholders(template_content || page.template.content, page)) or return nil
       # sanitize possibly dangerous content before rendering
-      template_content = substitute_placeholders(page.template.content, page)
       template_content.gsub!(/<(%.*?(exec|system)\s?\(.*?\s*%)>/, '&lt;\1&gt;')
       template_content.gsub!(/<(%.*?\%x\s?\[.*?\s*%)>/, '&lt;\1&gt;')
       template_content.gsub!(/<(%.*?\`.*?\s*%)>/, '&lt;\1&gt;')
-      # silence do
-        template_content = render_to_string(:inline => template_content,
-                                            :locals => { :page => page, :safe_level => 0 })
-      # end
+      template_content = render_to_string(inline: template_content,
+                                          locals: { page: page, safe_level: 0 })
+      # do it all over again one more time to get the second level stuff (usually within page lists)
       template_content = substitute_placeholders(template_content, page)
       template_content.gsub!(/<(%.*?(exec|system)\s?\(.*?\s*%)>/, '&lt;\1&gt;')
       template_content.gsub!(/<(%.*?\%x\s?\[.*?\s*%)>/, '&lt;\1&gt;')
       template_content.gsub!(/<(%.*?\`.*?\s*%)>/, '&lt;\1&gt;')
-      # silence do
-        template_content = render_to_string(:inline => template_content,
-                                            :layout => 'application',
-                                            :locals => { :page => page })
-      # end
+      template_content = render_to_string(inline: template_content, layout: true,
+                                          locals: { page: page })
       template_content
     end

data/app/controllers/manage/application_controller.rb ADDED

@@ -0,0 +1,4 @@
+class Manage::ApplicationController < ApplicationController
+  before_action :authenticate_user
+  layout 'management'
+end

data/app/controllers/manage/cms_controller.rb ADDED

@@ -0,0 +1,13 @@
+class Manage::CmsController < Manage::ApplicationController
+  before_action :check_permissions
+  protected
+    def check_permissions
+      if !user_has_permission?(:manage_cms)
+        render '/imagine_cms/errors/permission_denied', :layout => false
+        return false
+      end
+    end
+end

data/app/controllers/{management/cms_controller.rb → manage/cms_pages_controller.rb} RENAMED

@@ -1,151 +1,30 @@
-class Management::CmsController < Management::ApplicationController # :nodoc:
+class Manage::CmsPagesController < Manage::ApplicationController
   include ActionController::Caching::Pages
   self.page_cache_directory = "#{Rails.root}/public"
-  before_filter :check_permissions
-  before_filter :block_basic_users, :except => [
-    :index, :edit_page_content,
-    :disable_caching, :garbage_collect,
-    :select_page, :list_pages_select, :request_review,
-    :toolbar_preview, :toolbar_edit,
-    :create_file_link, :upload_file, :receive_file,
-    :upload_image, :receive_image, :crop_image, :save_crop, :upload_status,
-    :upload_thumb, :crop_thumb, :save_crop_thumb,
-    :upload_feature_image, :crop_feature_image, :save_crop_feature_image,
-    :receive_gallery, :complete_gallery, :gallery_setup, :add_to_gallery,
-    :gallery_management, :select_gallery, :set_gallery_order, :save_gallery_settings,
-    :sort_images, :sort_images_save,
-    :image_details, :update_caption,
-    :delete_photo, :delete_gallery,
-    :pages, :list_pages, :edit_page, :show_template_options, :page_attribute, :set_page_version
-  ]
-  before_filter :convert_invalid_chars_in_params
+  before_action :check_permissions
+  before_action :convert_invalid_chars_in_params
   upload_status_for :receive_image
+  upload_status_for :receive_gallery
   upload_status_for :add_to_gallery
   cache_sweeper :cms_content_sweeper
-  def check_permissions
-    if !user_has_permission?(:manage_cms)
-      render '/imagine_cms/errors/permission_denied', :layout => false
-      return false
-    end
-  end
-  def block_basic_users
-    return true unless UseCmsAccessLevels
-    unless user_has_permission?(:manage_cms_full_access) && @user.cms_allowed_sections.to_s.strip.blank?
-      render '/imagine_cms/errors/permission_denied'
-      return false
-    end
-  end
-  def validate_user_access
-    unless @user.cms_allowed_sections.to_s.strip.blank?
-      allowed_sections = @user.cms_allowed_sections.split(',').map { |s| s.strip }.reject { |s| s.blank? }
-      if @pg
-        path = '/' + @pg.path
-      else
-        parent = CmsPage.find_by_id(params[:parent_id] || params[:pg][:parent_id]) rescue nil
-        return false if !parent
-        path = '/' + parent.path
-      end
-      allowed = false
-      allowed_sections.each { |s| allowed ||= (path =~ /^#{s}/) }
-      if !allowed
-        respond_to do |wants|
-          wants.js    { render :text => "Sorry, you don't have permission to edit this page."         }
-          wants.html  { redirect_to "/#{@pg.path}#{@pg.path == '' ? '' : '/'}version/#{@pg.version}"  }
-        end
-        return false
-      end
-    end
-    true
-  end
   def index
-  end
-  def templates
-    @temps = CmsTemplate.order(:name)
-  end
-  def edit_template
-    @temp = CmsTemplate.find_by_id(params[:id]) || CmsTemplate.new
-    if request.post?
-      @temp.assign_attributes(cms_template_params)
-      # begin
-        @pg = CmsPage.new
-        @page_objects = HashObject.new
-        render_to_string :inline => @temp.content
-      # rescue Exception => e
-      #   message = e.message
-      #   flash.now[:error] = "<pre>#{ERB::Util.html_escape(message)}</pre>".html_safe
-      #   logger.debug e
-      #   return
-      # end
-      # this must come after the render_to_string so that we capture template
-      # options embedded in snippets
-      @temp.options = @template_options
-      if !@temp.save
-        flash.now[:error] = @temp.errors.full_messages.join('<br/>')
-      else
-        flash[:notice] = 'Template saved.'
-        redirect_to :action => 'edit_template', :id => @temp.id and return
-      end
-    end
-  end
-  def snippets
-    @snippets = CmsSnippet.order(:name)
-  end
-  def edit_snippet
-    @snip = CmsSnippet.find_by_id(params[:id]) || CmsSnippet.new
-    if request.post?
-      @snip.assign_attributes(cms_snippet_params)
-      begin
-        @pg = CmsPage.new
-        @page_objects = HashObject.new
-        render_to_string :inline => @snip.content
-      rescue Exception => e
-        message = e.message
-        flash.now[:error] = "<pre>#{ERB::Util.html_escape(message)}</pre>".html_safe
-        logger.debug e
-        return
-      end
-      if !@snip.save
-        @error = @snip.errors.full_messages.join('<br/>')
-      else
-        flash[:notice] = 'Snippet saved.'
-        redirect_to :action => 'edit_snippet', :id => @snip.id and return
-      end
-    end
-  end
-  def pages
     @page_levels = [ '' ].concat((params[:path] || session[:cms_pages_path] || '').split('/').reject { |l| l.blank? })
     @page_levels << ''
     @path = ''
     @page = nil
   end
+  def new
+    validate_user_access or return
+    @pg ||= CmsPage.new
+    edit_page
+  end
   def list_pages
     @page_level = params[:level].to_i
@@ -176,8 +55,8 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       @pg.template ||= @parent.template
     end
-    @attrs = CmsPageObject.where(obj_type: 'attribute').uniq.pluck(:name).sort
-    @taglist = CmsPageTag.uniq.pluck(:name).sort
+    @attrs = CmsPageObject.where(obj_type: 'attribute').pluck(:name).uniq.sort
+    @taglist = CmsPageTag.pluck(:name).uniq.sort
     if params[:mode] == 'ajax_new' || params[:mode] == 'ajax_edit'
       @pg.published_version = -1 if params[:mode] == 'ajax_new'
@@ -227,19 +106,19 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
         tags_to_delete.each { |t| t.destroy }
         # now try to save page objects (just attributes in this case)
-        objects_to_delete = @pg.objects.where("obj_type = 'attribute' or obj_type = 'option'").all
+        objects_to_delete = @pg.objects.where("obj_type = 'attribute' or obj_type = 'option'").to_a
-        (params[:page_objects] || {}).each do |key,val|
+        params[:page_objects].to_unsafe_h.each do |key, val|
           next if val.blank?
           if key =~ /^obj-(\w+?)-(.+?)$/
-            obj = @pg.objects.where(:name => $2, :obj_type => $1).first
-            obj ||= @pg.objects.build(:name => $2, :obj_type => $1)
+            obj = @pg.objects.where(name: $2, obj_type: $1).first
+            obj ||= @pg.objects.build(name: $2, obj_type: $1)
             obj.content = val
-            obj.save
-            objects_to_delete = objects_to_delete.reject { |obj| obj.name == $2 }
+            obj.save!
+            objects_to_delete.reject! { |obj| obj.name == $2 }
           end
-        end
+        end if params[:page_objects]
         objects_to_delete.each { |t| t.destroy }
@@ -252,7 +131,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
           flash[:notice] = 'Page saved.'
           session[:cms_pages_path] = @pg.path
           render :update do |page|
-            page.redirect_to :action => 'pages'
+            page.redirect_to action: 'index'
           end
         end
@@ -284,7 +163,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       @pg.destroy
     end
-    redirect_to :action => 'pages'
+    redirect_to action: 'index'
   end
   def select_page
@@ -321,13 +200,13 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     load_page_objects
     load_template_options
-    render :partial => 'template_options'
+    render partial: 'template_options'
   end
   def page_attribute
     render :nothing => true and return unless params[:name]
-    @page_objects = HashObject.new({ params[:name] => params[:value] })
+    @page_objects = OpenStruct.new({ params[:name] => params[:value] })
     render :partial => 'page_attribute', :locals => { :name => params[:name] }
   end
@@ -335,7 +214,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     @pg = CmsPage.find(params[:id])
     validate_user_access or return
-    @page_objects = HashObject.new(params[:page_objects] || {})
+    @page_objects = params[:page_objects] ? OpenStruct.new(params[:page_objects].to_unsafe_h) : OpenStruct.new
     if request.get?
       @pg.version = params[:version] if params[:version] && params[:version].to_i != @pg.version
@@ -357,7 +236,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       @page_title = @pg.title
       @cms_head ||= ''
-      @cms_head << "<script type=\"text/javascript\" src=\"#{url_for(action: 'page_tags_for_lookup')}\"></script>"
+      @taglist = CmsPageTag.pluck(:name).uniq.sort
       @template_content = substitute_placeholders(@pg.template.content, @pg)
       render layout: 'application'
@@ -365,7 +244,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     elsif request.post?
       CmsPage.transaction do
         # need to revise this later if we implement deletion of page objects
-        old_objs = @pg.objects.where(:cms_page_version => @pg.version).all
+        old_objs = @pg.objects.where(cms_page_version: @pg.version).to_a
         @pg.updated_by = session[:user_id]
         @pg.updated_by_username = session[:user_username]
@@ -376,7 +255,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
         end
         @pg.updated_on = Time.now.utc
-        @pg.save
+        @pg.save  # create a new version for new page objects to reference
         # do a little bit of classification... for now, just identify page lists
         page_lists = []
@@ -432,9 +311,9 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
           end
         end
-        @page_objects.each do |key,val|
+        @page_objects.to_h.each do |key,val|
           key =~ /^obj-(\w+?)-(.+?)$/
-          obj = @pg.objects.build(:name => $2, :obj_type => $1)
+          obj = @pg.objects.build(name: $2, obj_type: $1)
           # do a little bit of "censorship" to fix up Word pastes and strange things from the editor
           if val.is_a?(String)
@@ -481,13 +360,14 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
             val.gsub!(/<br>(<\/h\d>|<\/p>)/, '\1')
           end
-          obj.content = val
-          obj.save
+          obj.content = val.to_s.force_encoding("UTF-8")
+          obj.save!
         end
         old_objs.each do |obj|
           unless @pg.objects.where(name: obj.name, cms_page_version: @pg.version)
-            obj = @pg.objects.build(:name => obj.name, :obj_type => obj.type, :content => obj.content)
+            obj = @pg.objects.build(name: obj.name, obj_type: obj.type, content: obj.content)
+            obj.save!
           end
         end
@@ -525,18 +405,6 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     end
   end
-  def page_tags_for_lookup
-    @tags = CmsPageTag.order(:name).map { |tag| tag.name }.uniq
-    headers['content-type'] = 'text/javascript'
-    render :layout => false
-  end
-  def page_attributes_for_lookup
-    @attrs = CmsPageObject.where(:obj_type => 'attribute').uniq.pluck(:name).sort
-    headers['content-type'] = 'text/javascript'
-    render :layout => false
-  end
   def page_list_add_tag
     render :partial => 'page_list_source_tag', :locals => { :i => params[:i], :key => params[:key] }
   end
@@ -553,11 +421,10 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
         @pg.published_version = params[:pg][:published_version]
         @pg.update_index
         @pg.save_without_revision
-        logger.debug @pg.errors.full_messages.inspect
       end
     end
-    render :nothing => true
+    render plain: 'success'
   end
   def request_review
@@ -565,17 +432,24 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     @version = params[:version].to_i
     # send email to request administrative review
-    # find all users with email address set
-    User.all.reject { |u| !u.active? || !u.can_manage_cms_publishing? || !u.cms_allowed_sections.blank? }.each do |u|
-      next unless valid_email_address?(u.email_address)
+    emails = []
+    User.find_each do |u|
+      next unless u.active? && valid_email_address?(u.email_address)              # must be active and have valid email address
+      next unless u.can_manage_cms_publishing? && u.cms_allowed_sections.blank?   # and have permission to publish
+      emails << ImagineCmsMailer.request_review(url_for(controller: '/cms/content', action: 'show', content_path: @pg.path.split('/')), @pg.title, @version, u, @user, params[:change_description].to_s)
+    end
+    # email delivery could may fail, catch exceptions here
+    emails.each do |email|
       begin
-        Mailer.deliver_cms_request_review(url_for(:controller => '/cms/content', :action => 'show', :content_path => []) + @pg.path, @pg.title, @version, u, @user, params[:change_description].to_s)
-      rescue Exception => e
+        email.deliver_now
+      rescue StandardError => e
         logger.error(e)
       end
     end
-    render :nothing => true
+    render nothing: true
   end
   #
@@ -602,8 +476,8 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       @cms_text_editor_placed = true
       content = ''.html_safe
       content << text_area(:page_objects, key, { :dojoType => 'Editor2', :toolbarGroup => 'main', :isToolbarGroupLeader => 'false',
-                           :focusOnLoad => focusOnLoad.to_s, :style => 'border: 2px dashed gray; padding: 5px',
-                           :minHeight => '100px' }.update(html_options))
+                            :focusOnLoad => focusOnLoad.to_s, :style => 'border: 2px dashed gray; padding: 5px',
+                            :minHeight => '100px' }.update(html_options))
       content << content_tag(:div, ''.html_safe, :id => "page_object_config_#{key}")
       content << javascript_tag("jQuery(document).ready(function () { scanForPageObjects(#{@pg.id}, '#{key}', #{@pg.version}); });")
       content << observe_field("page_objects_#{key}", :function => "scanForPageObjects(#{@pg.id}, '#{key}', #{@pg.version});", :frequency => 2)
@@ -676,9 +550,9 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     if File.exist?(target_dir)
-      redirect_to :action => 'select_gallery', :id => @pg, :gallery_id => params[:gallery_id]
+      redirect_to action: 'select_gallery', id: @pg, gallery_id: params[:gallery_id]
     else
-      render :partial => 'upload_image'
+      render partial: 'upload_image'
     end
   end
@@ -691,7 +565,14 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     data = params[:file][:data]
     original_filename = data.original_filename.strip.gsub(/[\?\s\/\:\\]+/, '-').gsub(/^-/, '').gsub(/-$/, '')
     localfile = File.join(target_dir, original_filename)
-    FileUtils.cp(data.tempfile, localfile)
+    im = MiniMagick::Image.open(data.path())
+    if im['dimensions'][0] > CmsImageMaxWidth || im['dimensions'][1] > CmsImageMaxHeight
+      im.resize "#{CmsImageMaxWidth}x#{CmsImageMaxHeight}"
+      im.write(localfile)
+    else
+      FileUtils.cp(data.path(), localfile)
+    end
     finish_upload_status "'#{File.basename(localfile)}'"
   end
@@ -715,7 +596,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     testfile = File.join(target_dir, File.basename(localfile, File.extname(localfile))) + '-croptest' + File.extname(localfile)
     # make a smaller version to help with cropping
-    im = MiniMagick::Image.from_file(localfile)
+    im = MiniMagick::Image.open(localfile)
     im.resize "500x400>"
     im.write(testfile)
     File.chmod(0644, testfile)
@@ -737,8 +618,8 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     # need to scale up requested position/dimensions based on how big test image
     # is relative to original image
-    orig_im = MiniMagick::Image.from_file(localfile)
-    test_im = MiniMagick::Image.from_file(testfile)
+    orig_im = MiniMagick::Image.open(localfile)
+    test_im = MiniMagick::Image.open(testfile)
     scale = orig_im[:width].to_f / test_im[:width]
     x1 = params[:image][:x1].to_i * scale
@@ -776,460 +657,144 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     render :partial => 'crop_results'
   end
-  def receive_gallery
+  def upload_file
+    @pg = CmsPage.find_by_id(params[:id])
+    render :partial => 'upload_file'
+  end
+  def receive_file
     @pg = CmsPage.find_by_id(params[:id])
     target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     FileUtils.mkdir_p target_dir
-    count = 1
-    localdir = File.join(target_dir, 'gallery_1')
-    while File.exist?(localdir) && count < 100
-      count += 1
-      localdir = File.join(target_dir, "gallery_#{count}")
-    end
-    FileUtils.mkdir_p File.join(localdir, 'temp')
-    data = params[:gallery_file][:data]
-    # read zip file
-    entries = []
-    Zip::File.foreach(data.path) do |zipentry|
-      next if ![ '.jpg', '.jpeg', '.png', '.gif' ].include?(File.extname(zipentry.name).downcase) || zipentry.size < 1000
-      next if File.basename(zipentry.name) =~ /^\._/
-      entries << zipentry
-    end
-    entries.sort! { |a,b| File.basename(a.name).downcase <=> File.basename(b.name).downcase }
-    Zip::File.open(data.path) do |zipfile|
-      entries.each_with_index do |zipentry, index|
-        upload_progress.message = "Extracting #{File.basename(zipentry.name)}"
-        ext = File.extname(zipentry.name)
-        localfile = File.join(localdir, 'temp', (index+1).to_s + ext.downcase)
-        jpgfile = File.join(localdir, 'temp', (index+1).to_s + '.jpg')
-        begin
-          zipentry.extract(localfile)
-          im = MiniMagick::Image.from_file(localfile)
-          im.write(jpgfile)
-          File.unlink(localfile) if localfile != jpgfile
-        rescue Exception => e
-          logger.error(e)
-        end
-      end
-    end
+    data = params[:file][:data]
+    original_filename = data.original_filename.strip.gsub(/[\?\s\/\:\\]+/, '-').gsub(/^-/, '').gsub(/-$/, '')
+    localfile = File.join(target_dir, original_filename)
+    FileUtils.cp(data.tempfile, localfile)
+    File.chmod(0644, localfile)
-    finish_upload_status "'#{File.basename(localdir)}'"
+    finish_upload_status "'#{File.basename(localfile)}'"
   end
-  def gallery_setup
+  def create_file_link
     @pg = CmsPage.find_by_id(params[:id])
-    target_dir = File.join('assets', 'content', @pg.path)
-    @dirname = File.join(target_dir, File.basename(params[:dirname]), 'temp')
-    Dir.chdir(File.join(Rails.root, 'public'))
-    @images = Dir.glob("#{@dirname}/*.{jpg,jpeg,png,gif}").sort
-    Dir.chdir(Rails.root)
-    @thumbs = []
-    @images.each do |img|
-      next if img.include?('-thumb')
-      thumbfile = File.join(Rails.root, 'public', @dirname, File.basename(img, File.extname(img))) + '-thumb.jpg'
-      @thumbs << File.join(@dirname, File.basename(img, File.extname(img))) + '-thumb.jpg'
-      next if File.exist?(thumbfile)
-      im = MiniMagick::Image.from_file(File.join(Rails.root, 'public', img))
-      im.resize "80x80" # hardcoded!
-      im.write(thumbfile)
-      File.chmod(0644, thumbfile)
-    end
+    localfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, File.basename(params[:filename]))
+    @filename = localfile.split('/').map { |s| CGI::escape(s) }.join('/') + "?#{File.mtime(localfile).to_i}"
-    @thumbs.sort! { |a,b| File.basename(a, File.extname(a)).to_i <=> File.basename(b, File.extname(b)).to_i }
-    session[:gallery_thumbs_ordered] = @thumbs.map { |thumb| File.basename(thumb, File.extname(thumb)) }
+    bucket = ImagineCmsConfig['amazon_s3'][Rails.env]['file_bucket'] rescue nil
+    prefix = ImagineCmsConfig['amazon_s3']['file_prefix'] rescue nil
+    upload_to_s3(localfile, @pg, bucket, prefix)
-    render :partial => 'gallery_setup'
+    render :partial => 'create_file_link'
   end
-  def complete_gallery
-    @pg = CmsPage.find(params[:id])
-    target_dir = File.join('assets', 'content', @pg.path)
-    @dirname = File.join(target_dir, File.basename(params[:dirname]))
-    @thumbs = session[:gallery_thumbs_ordered]
-    max_width = params[:max_width].to_i
-    max_width = GalleryMaxWidth unless max_width > 0
-    max_height = params[:max_height].to_i
-    max_height = GalleryMaxHeight unless max_height > 0
-    create_captions_file(@pg.id, { :gallery_id => File.basename(params[:dirname]) })
-    @thumbs.each_with_index do |thumb, index|
-      thumb.gsub!(/-thumb/, '')
-      tempfile = File.join(Rails.root, 'public', @dirname, 'temp', thumb + '.jpg')
-      tempthumbfile = File.join(Rails.root, 'public', @dirname, 'temp', thumb + '-thumb.jpg')
-      localfile = File.join(Rails.root, 'public', @dirname, (index+1).to_s + '.jpg')
-      thumbfile = File.join(Rails.root, 'public', @dirname, (index+1).to_s + '-thumb.jpg')
-      im = MiniMagick::Image.from_file(tempfile)
-      if im[:width] > max_width || im[:height] > max_height
-        im.resize("#{max_width}x#{max_height}")
-      end
-      im.write(localfile)
-      small = MiniMagick::Image.from_file(tempfile)
-      small.crop_resized(GalleryThumbWidth, GalleryThumbHeight)
-      small.write(thumbfile)
-      File.chmod(0644, localfile, thumbfile)
-      begin
-        File.unlink(tempfile)
-        File.unlink(tempthumbfile)
-      rescue Exception => e
-        # not that big a deal if we can't delete
-      end
-    end
+  def upload_thumb
+    @pg = CmsPage.find_by_id(params[:id])
+    render :partial => 'upload_thumb'
+  end
+  def crop_thumb
+    @pg = CmsPage.find_by_id(params[:id])
+    origfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, File.basename(params[:filename]))
+    newfilename = File.basename(params[:filename], File.extname(params[:filename])) + '-thumb' + File.extname(params[:filename])
+    localfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, newfilename)
+    FileUtils.mv(origfile, localfile)
+    File.chmod(0644, localfile)
-    begin
-      Dir.rmdir(File.join(Rails.root, 'public', @dirname, 'temp'))
-    rescue Exception => e
-      # not that big a deal if we can't delete
+    # get out now if user clicked finish
+    if params[:next_clicked].to_i != 1
+      @image_file = localfile + "?#{File.mtime(localfile).to_i}"
+      upload_to_s3(localfile, @pg)
+      render :partial => 'crop_results_thumb' and return
     end
-    create_preview_images
-    render :partial => 'complete_gallery'
-  end
-  def gallery_management
-    @pg = CmsPage.find_by_id(params[:id])
-    galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
-    @galleries = Dir.glob("#{galleries_dir}/gallery_*")
-    gallery_dir = File.join(galleries_dir, params[:gallery_id].to_s)
-    @images = Dir.glob("#{gallery_dir}/*.{jpg,jpeg,png,gif}").reject { |img| img.include?('thumb') }.map { |img| File.basename(img).split('.').first.to_i }.sort
+    # if we're still here... let's crop!
+    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
+    testfile = File.join(target_dir, File.basename(localfile, File.extname(localfile))) + '-croptest' + File.extname(localfile)
-    create_preview_images
+    # make a smaller version to help with cropping
+    im = MiniMagick::Image.open(localfile)
+    im.resize("500x400>")
+    im.write(testfile)
+    File.chmod(0644, testfile)
-    if params[:gallery_id]
-      @gallery = load_gallery_settings_from_file(params[:gallery_id])
-    end
+    @width = im[:width]
+    @height = im[:height]
+    @height = 1 if @height == 0
+    @image_file = File.basename(testfile)
+    @aspect_ratio = @width.to_f/@height
-    render :layout => false
-  end
-  def set_gallery_order
-    session[:gallery_thumbs_ordered] = params[:image_sorter]
-    render :nothing => true
+    render :partial => 'crop_thumb'
   end
-  def select_gallery
+  def save_crop_thumb
     @pg = CmsPage.find_by_id(params[:id])
-    @target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
-    @galleries = Dir.glob("#{@target_dir}/gallery_*")
+    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
+    testfile = File.join(target_dir, File.basename(params[:filename]))
+    localfile = testfile.split(/-croptest/).join('')
-    create_preview_images
+    # need to scale up requested position/dimensions based on how big test image
+    # is relative to original image
+    orig_im = MiniMagick::Image.open(localfile)
+    test_im = MiniMagick::Image.open(testfile)
+    scale = orig_im[:width].to_f / test_im[:width]
-    if request.post?
-      unless params[:gallery_id].downcase == "new"
-        redirect_to :action => 'gallery_management', :id => @pg, :gallery_id => params[:gallery_id]
-      else
-        render :partial => 'upload_image'
-      end
-    else
-      render :partial => 'select_gallery'
-    end
-  end
-  def save_gallery_settings
-    if request.post?
-      @pg = CmsPage.find_by_id(params[:id])
-      save_gallery_settings_to_file(params[:gallery_id], params[:gallery])
-      render :nothing => true
-    end
-  end
-  def sort_images
-    @pg = CmsPage.find_by_id(params[:id])
-    gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, params[:gallery_id])
-    @images = Dir.glob("#{gallery_dir}/*.{jpg,jpeg,png,gif}").reject { |img| img.include?('thumb') }.map { |img| File.basename(img).split('.').first.to_i }.sort
-    if params[:images]
-      session[:gallery_images_sorted] = params[:images]
-      render :nothing => true
-    else
-      render :partial => 'sort_images'
-    end
-  end
-  def sort_images_save
-    @pg = CmsPage.find_by_id(params[:id])
-    gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, params[:gallery_id])
-    temp_dir = File.join(gallery_dir, 'temp')
-    sorted_images = session[:gallery_images_sorted] || []
-    if sorted_images == []
-      redirect_to :action => 'gallery_management', :id => @pg, :gallery_id => params[:gallery_id]
-      return
-    end
-    # create blank captions.yml if it doesn't already exist
-    create_captions_file(@pg.id)
-    original_captions = YAML.load_file(File.join(gallery_dir, 'captions.yml')).to_a
-    new_captions = [ original_captions[0] ]
-    Dir.glob("#{gallery_dir}/**/*.jpg").each { |img| FileUtils.touch(img); FileUtils.mv(img, img + '.tmp') }
-    sorted_images.each_with_index do |img, i|
-      FileUtils.mv(File.join(gallery_dir, "#{img.to_i}.jpg.tmp"), File.join(gallery_dir, "#{i+1}.jpg"))
-      FileUtils.mv(File.join(gallery_dir, "#{img.to_i}-thumb.jpg.tmp"), File.join(gallery_dir, "#{i+1}-thumb.jpg"))
-      FileUtils.mv(File.join(gallery_dir, 'management', "#{img.to_i}.jpg.tmp"), File.join(gallery_dir, 'management', "#{i+1}.jpg"))
-      new_captions << original_captions[img.to_i] || ''
-    end
-    yaml = YAML.dump(new_captions)
-    File.open(File.join(gallery_dir, 'captions.yml'), 'w') { |f| f << yaml }
-    session[:gallery_images_sorted] = nil
-    redirect_to :action => 'gallery_management', :id => @pg, :gallery_id => params[:gallery_id]
-  end
-  def image_details
-    @pg = CmsPage.find_by_id(params[:id])
-    # create blank captions.yml if it doesn't already exist
-    create_captions_file(@pg.id)
-    gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, params[:gallery_id])
-    captions = YAML.load(File.open(File.join(gallery_dir, 'captions.yml')).read)
-    image_id = params[:image].split('.').first.to_i
-    @caption = captions[image_id]
-    render partial: 'image_details'
-  end
-  def update_caption
-    if request.post?
-      @pg = CmsPage.find_by_id(params[:id])
-      # create blank captions.yml if it doesn't already exist
-      create_captions_file(@pg.id)
-      gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, params[:gallery_id])
-      captions = YAML.load_file(File.join(gallery_dir, 'captions.yml')).to_a
-      image_id = params[:image].split('.').first.to_i
-      captions[image_id] = params[:caption]
-      yaml = YAML.dump(captions)
-      File.open(File.join(gallery_dir, 'captions.yml'), "w") { |f| f << yaml }
-    end
-    redirect_to action: 'gallery_management', id: params[:id], gallery_id: params[:gallery_id]
-  end
-  def add_to_gallery
-    @pg = CmsPage.find_by_id(params[:id])
-    galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
-    @galleries = Dir.entries(galleries_dir).sort
-    @gallery_dir = File.join(galleries_dir, params[:gallery_id])
-    images = Dir.glob("#{@gallery_dir}/*-thumb.{jpg,jpeg,png,gif}")
-    temp_location = File.join(@gallery_dir ,'temp')
-    FileUtils.rm_rf(temp_location)
-    Dir.mkdir(temp_location)
-    data = params[:gallery_file][:data]
-    data_dest = File.join(temp_location, data.original_filename)
-    File.open(data_dest, 'wb') { |f| f.write(data.read) }
+    x1 = params[:image][:x1].to_i * scale
+    y1 = params[:image][:y1].to_i * scale
+    width = params[:image][:width].to_i * scale
+    height = params[:image][:height].to_i * scale
-    last_id = images.size
-    ext = File.extname(data_dest).downcase
+    max_width = params[:image][:max_width].to_i
+    max_height = params[:image][:max_height].to_i
+    dirty = false
-    if ext != '.zip'
-      localfile = File.join(@gallery_dir, (last_id + 1).to_s + ext)
-      thumbfile = File.join(@gallery_dir, (last_id + 1).to_s + '-thumb' + ext)
-      File.open(localfile, "w") { |f| f.write(File.open(data_dest).read) }
-      # create blank captions.yml if it doesn't already exist
-      create_captions_file(@pg.id)
-      localfile = resize_image(localfile)
-      small = MiniMagick::Image.from_file(localfile)
-      small.crop_resized(GalleryThumbWidth, GalleryThumbHeight)
-      small.write(thumbfile)
-      File.chmod(0644, localfile, thumbfile)
-      create_preview_images(:force => 1)
-    elsif ext == '.zip'
-      begin
-        Zip::File.foreach(data.path) do |zipentry|
-          next if ![ '.jpg', '.jpeg', '.png', '.gif' ].include?(File.extname(zipentry.name).downcase) || zipentry.size < 1000
-          upload_progress.message = "Extracting #{File.basename(zipentry.name)}"
-          localfile = File.join(temp_location, ((last_id+1).to_s + File.extname(zipentry.name)).downcase)
-          begin
-            zipentry.extract(localfile)
-            last_id += 1
-          rescue Exception => e
-            logger.error(e)
-          end
-        end
-      rescue Exception => e
-        logger.debug params.inspect
-        logger.error(e)
-        finish_upload_status "''" and return
-      end
-      @images = Dir.glob("#{temp_location}/*.{jpg,jpeg,png,gif}")
-      @images.each do |img|
-        localfile = File.join(@gallery_dir, File.basename(img, File.extname(img))) + '.jpg'
-        tempfile = File.join(temp_location, File.basename(img, File.extname(img))) + File.extname(img)
-        thumbfile = File.join(@gallery_dir, File.basename(img, File.extname(img))) + '-thumb.jpg'
-        small = MiniMagick::Image.from_file(tempfile)
-        small.crop_resized(GalleryThumbWidth, GalleryThumbHeight)
-        small.write(thumbfile)
-        FileUtils.cp(tempfile, localfile)
-        resize_image(localfile)
-        File.chmod(0644, localfile, thumbfile)
-      end
-      # smaller images for gallery index
-      management_dir = File.join(@gallery_dir, 'management')
-      preview_images = []
-      Dir.glob("#{@gallery_dir}/*.{jpg,jpeg,png,gif}").each { |img| preview_images << img unless File.basename(img).include?('thumb') }
-      preview_images.each { |img| create_preview_image(img, management_dir, 1) }
+    # crop if user selected something
+    if params[:image][:width].to_i > 0
+      logger.debug "cropping @ (#{x1}, #{y1}) to size #{width} x #{height}"
+      orig_im.crop("#{width}x#{height}+#{x1}+#{y1}")
+      dirty = true
     end
-    File.delete(data_dest)
-    upload_progress.message = "File received successfully."
-    finish_upload_status "'#{File.basename(data_dest)}'" and return
-  end
-  def delete_photo
-    if request.post?
-      @pg = CmsPage.find_by_id(params[:id])
-      # create blank captions.yml if it doesn't already exist
-      create_captions_file(@pg.id)
-      gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, params[:gallery_id])
-      captions = YAML.load(File.open(File.join(gallery_dir, 'captions.yml')).read).to_a
-      image_id = params[:image].split('.').first.to_i
-      begin ; File.delete(File.join(gallery_dir, image_id.to_s + '.jpg')) ; rescue ; end
-      begin ; File.delete(File.join(gallery_dir, image_id.to_s + '-thumb.jpg')) ; rescue ; end
-      begin ; File.delete(File.join(gallery_dir, 'management', image_id.to_s + '.jpg')) ; rescue ; end
-      all_images = Dir.glob(File.join(gallery_dir, '*.{jpg,jpeg,png,gif}'))
-      images = []
-      all_images.each { |img| images << img if !File.basename(img).include?('thumb') && File.basename(img).split('.').first.to_i > image_id }
-      image_names = []
-      images.each_with_index { |img, index| image_names << File.basename(img).split('.').first.to_i }
-      image_names.sort!
-      new_captions = []
-      for i in 0...image_id do
-        new_captions[i] = captions[i] || ''
-      end
-      image_names.each do |img|
-        FileUtils.mv(File.join(gallery_dir, img.to_s + '.jpg'), File.join(gallery_dir, image_id.to_s + '.jpg'))
-        FileUtils.mv(File.join(gallery_dir, img.to_s + '-thumb.jpg'), File.join(gallery_dir, image_id.to_s + '-thumb.jpg'))
-        FileUtils.mv(File.join(gallery_dir, 'management', img.to_s + '.jpg'), File.join(gallery_dir, 'management', image_id.to_s + '.jpg'))
-        new_captions[image_id] = captions[img] || ''
-        image_id += 1
+    # resize if the resultant image is bigger than max dims
+    if max_width > 0 && max_height > 0
+      if orig_im[:width] > max_width || orig_im[:height] > max_height
+        logger.debug "resizing to max dims #{max_width} x #{max_height}"
+        orig_im.resize("#{max_width}x#{max_height}>")
+        dirty = true
       end
-      yaml = YAML.dump(new_captions)
-      File.open(File.join(gallery_dir, 'captions.yml'), "w") { |f| f << yaml }
     end
-    redirect_to :action => 'gallery_management', :id => params[:id], :gallery_id => params[:gallery_id]
-  end
-  def delete_gallery
-    @pg = CmsPage.find_by_id(params[:id])
-    galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
-    gallery_dir = File.join(galleries_dir, params[:gallery_id])
-    FileUtils.rm_rf(gallery_dir)
-    redirect_to :action => 'select_gallery', :id => params[:id]
-  end
-  def upload_file
-    @pg = CmsPage.find_by_id(params[:id])
-    render :partial => 'upload_file'
-  end
-  def receive_file
-    @pg = CmsPage.find_by_id(params[:id])
-    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
-    FileUtils.mkdir_p target_dir
-    data = params[:file][:data]
-    original_filename = data.original_filename.strip.gsub(/[\?\s\/\:\\]+/, '-').gsub(/^-/, '').gsub(/-$/, '')
-    localfile = File.join(target_dir, original_filename)
-    FileUtils.cp(data.tempfile, localfile)
+    orig_im.write(localfile) if dirty
     File.chmod(0644, localfile)
-    finish_upload_status "'#{File.basename(localfile)}'"
-  end
-  def create_file_link
-    @pg = CmsPage.find_by_id(params[:id])
-    localfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, File.basename(params[:filename]))
-    @filename = localfile.split('/').map { |s| CGI::escape(s) }.join('/') + "?#{File.mtime(localfile).to_i}"
-    bucket = ImagineCmsConfig['amazon_s3'][Rails.env]['file_bucket'] rescue nil
-    prefix = ImagineCmsConfig['amazon_s3']['file_prefix'] rescue nil
-    upload_to_s3(localfile, @pg, bucket, prefix)
+    @image_file = localfile + "?#{File.mtime(localfile).to_i}"
+    File.unlink testfile
+    upload_to_s3(localfile, @pg)
-    render :partial => 'create_file_link'
+    render :partial => 'crop_results_thumb'
   end
-  def upload_thumb
+  def upload_feature_image
     @pg = CmsPage.find_by_id(params[:id])
-    render :partial => 'upload_thumb'
+    render :partial => 'upload_feature_image'
   end
-  def crop_thumb
+  def crop_feature_image
     @pg = CmsPage.find_by_id(params[:id])
-    localfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, File.basename(params[:filename]))
-    File.chmod(0644, localfile)
+    origfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, File.basename(params[:filename]))
+    newfilename = File.basename(params[:filename], File.extname(params[:filename])) + '-feature' + File.extname(params[:filename])
+    localfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, newfilename)
+    FileUtils.mv(origfile, localfile)
     # get out now if user clicked finish
     if params[:next_clicked].to_i != 1
       @image_file = localfile + "?#{File.mtime(localfile).to_i}"
       upload_to_s3(localfile, @pg)
-      render :partial => 'crop_results_thumb' and return
+      render :partial => 'crop_results_feature_image' and return
     end
@@ -1238,7 +803,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     testfile = File.join(target_dir, File.basename(localfile, File.extname(localfile))) + '-croptest' + File.extname(localfile)
     # make a smaller version to help with cropping
-    im = MiniMagick::Image.from_file(localfile)
+    im = MiniMagick::Image.open(localfile)
     im.resize("500x400>")
     im.write(testfile)
     File.chmod(0644, testfile)
@@ -1249,10 +814,10 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     @image_file = File.basename(testfile)
     @aspect_ratio = @width.to_f/@height
-    render :partial => 'crop_thumb'
+    render :partial => 'crop_feature_image'
   end
-  def save_crop_thumb
+  def save_crop_feature_image
     @pg = CmsPage.find_by_id(params[:id])
     target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     testfile = File.join(target_dir, File.basename(params[:filename]))
@@ -1260,8 +825,8 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     # need to scale up requested position/dimensions based on how big test image
     # is relative to original image
-    orig_im = MiniMagick::Image.from_file(localfile)
-    test_im = MiniMagick::Image::from_file(testfile)
+    orig_im = MiniMagick::Image.open(localfile)
+    test_im = MiniMagick::Image.open(testfile)
     scale = orig_im[:width].to_f / test_im[:width]
     x1 = params[:image][:x1].to_i * scale
@@ -1296,131 +861,481 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     File.unlink testfile
     upload_to_s3(localfile, @pg)
-    render :partial => 'crop_results_thumb'
+    render :partial => 'crop_results_feature_image'
   end
-  def upload_feature_image
+  def receive_gallery
     @pg = CmsPage.find_by_id(params[:id])
-    render :partial => 'upload_feature_image'
+    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
+    FileUtils.mkdir_p target_dir
+    count = 1
+    localdir = File.join(target_dir, 'gallery_1')
+    while File.exist?(localdir) && count < 100
+      count += 1
+      localdir = File.join(target_dir, "gallery_#{count}")
+    end
+    FileUtils.mkdir_p File.join(localdir, 'temp')
+    data = params[:gallery_file][:data]
+    # read zip file
+    entries = []
+    Zip::File.foreach(data.path) do |zipentry|
+      next if ![ '.jpg', '.jpeg', '.png', '.gif' ].include?(File.extname(zipentry.name).downcase) || zipentry.size < 1000
+      next if File.basename(zipentry.name) =~ /^\._/
+      entries << zipentry
+    end
+    entries.sort! { |a,b| File.basename(a.name).downcase <=> File.basename(b.name).downcase }
+    Zip::File.open(data.path) do |zipfile|
+      entries.each_with_index do |zipentry, index|
+        upload_progress.message = "Extracting #{File.basename(zipentry.name)}"
+        ext = File.extname(zipentry.name)
+        localfile = File.join(localdir, 'temp', (index+1).to_s + ext.downcase)
+        jpgfile = File.join(localdir, 'temp', (index+1).to_s + '.jpg')
+        begin
+          zipentry.extract(localfile)
+          im = MiniMagick::Image.open(localfile)
+          im.write(jpgfile)
+          File.unlink(localfile) if localfile != jpgfile
+        rescue StandardError => e
+          logger.error(e)
+        end
+      end
+    end
+    finish_upload_status "'#{File.basename(localdir)}'"
   end
-  def crop_feature_image
+  def gallery_setup
     @pg = CmsPage.find_by_id(params[:id])
-    localfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, File.basename(params[:filename]))
-    File.chmod(0644, localfile)
+    target_dir = File.join('assets', 'content', @pg.path)
+    @dirname = File.join(target_dir, File.basename(params[:dirname]), 'temp')
+    Dir.chdir(File.join(Rails.root, 'public'))
+    @images = Dir.glob("#{@dirname}/*.{jpg,jpeg,png,gif}").sort
+    Dir.chdir(Rails.root)
+    @thumbs = []
-    # get out now if user clicked finish
-    if params[:next_clicked].to_i != 1
-      @image_file = localfile + "?#{File.mtime(localfile).to_i}"
-      upload_to_s3(localfile, @pg)
-      render :partial => 'crop_results_feature_image' and return
+    @images.each do |img|
+      next if img.include?('-thumb')
+      thumbfile = File.join(Rails.root, 'public', @dirname, File.basename(img, File.extname(img))) + '-thumb.jpg'
+      @thumbs << File.join(@dirname, File.basename(img, File.extname(img))) + '-thumb.jpg'
+      next if File.exist?(thumbfile)
+      im = MiniMagick::Image.open(File.join(Rails.root, 'public', img))
+      im.resize "80x80" # hardcoded!
+      im.write(thumbfile)
+      File.chmod(0644, thumbfile)
     end
+    @thumbs.sort! { |a,b| File.basename(a, File.extname(a)).to_i <=> File.basename(b, File.extname(b)).to_i }
+    session[:gallery_thumbs_ordered] = @thumbs.map { |thumb| File.basename(thumb, File.extname(thumb)) }
-    # if we're still here... let's crop!
-    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
-    testfile = File.join(target_dir, File.basename(localfile, File.extname(localfile))) + '-croptest' + File.extname(localfile)
+    render :partial => 'gallery_setup'
+  end
+  def complete_gallery
+    @pg = CmsPage.find(params[:id])
+    target_dir = File.join('assets', 'content', @pg.path)
+    @dirname = File.join(target_dir, File.basename(params[:dirname]))
+    @thumbs = session[:gallery_thumbs_ordered]
+    max_width = params[:max_width].to_i
+    max_width = GalleryMaxWidth unless max_width > 0
+    max_height = params[:max_height].to_i
+    max_height = GalleryMaxHeight unless max_height > 0
-    # make a smaller version to help with cropping
-    im = MiniMagick::Image.from_file(localfile)
-    im.resize("500x400>")
-    im.write(testfile)
-    File.chmod(0644, testfile)
+    create_captions_file(@pg.id, { :gallery_id => File.basename(params[:dirname]) })
-    @width = im[:width]
-    @height = im[:height]
-    @height = 1 if @height == 0
-    @image_file = File.basename(testfile)
-    @aspect_ratio = @width.to_f/@height
+    @thumbs.each_with_index do |thumb, index|
+      thumb.gsub!(/-thumb/, '')
+      tempfile = File.join(Rails.root, 'public', @dirname, 'temp', thumb + '.jpg')
+      tempthumbfile = File.join(Rails.root, 'public', @dirname, 'temp', thumb + '-thumb.jpg')
+      localfile = File.join(Rails.root, 'public', @dirname, (index+1).to_s + '.jpg')
+      thumbfile = File.join(Rails.root, 'public', @dirname, (index+1).to_s + '-thumb.jpg')
+      im = MiniMagick::Image.open(tempfile)
+      if im[:width] > max_width || im[:height] > max_height
+        im.resize("#{max_width}x#{max_height}")
+      end
+      im.write(localfile)
+      small = MiniMagick::Image.open(tempfile)
+      small.crop_resized(GalleryThumbWidth, GalleryThumbHeight)
+      small.write(thumbfile)
+      File.chmod(0644, localfile, thumbfile)
+      begin
+        File.unlink(tempfile)
+        File.unlink(tempthumbfile)
+      rescue StandardError => e
+        # not that big a deal if we can't delete
+      end
+    end
+    begin
+      Dir.rmdir(File.join(Rails.root, 'public', @dirname, 'temp'))
+    rescue StandardError => e
+      # not that big a deal if we can't delete
+    end
+    create_preview_images
+    render :partial => 'complete_gallery'
+  end
+  def gallery_management
+    @pg = CmsPage.find_by_id(params[:id])
+    galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
+    @galleries = Dir.glob("#{galleries_dir}/gallery_*")
+    gallery_dir = File.join(galleries_dir, params[:gallery_id].to_s)
+    @images = Dir.glob("#{gallery_dir}/*.{jpg,jpeg,png,gif}").reject { |img| img.include?('thumb') }.map { |img| File.basename(img).split('.').first.to_i }.sort
+    create_preview_images
+    if params[:gallery_id]
+      @gallery = load_gallery_settings_from_file(params[:gallery_id])
+    end
+    render :layout => false
+  end
+  def set_gallery_order
+    session[:gallery_thumbs_ordered] = params[:image_sorter]
+    render :nothing => true
+  end
+  def select_gallery
+    @pg = CmsPage.find_by_id(params[:id])
+    @target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
+    @galleries = Dir.glob("#{@target_dir}/gallery_*")
+    create_preview_images
+    if request.post?
+      unless params[:gallery_id].downcase == "new"
+        redirect_to :action => 'gallery_management', :id => @pg, :gallery_id => params[:gallery_id]
+      else
+        render :partial => 'upload_image'
+      end
+    else
+      render :partial => 'select_gallery'
+    end
+  end
+  def save_gallery_settings
+    if request.post?
+      @pg = CmsPage.find_by_id(params[:id])
+      save_gallery_settings_to_file(params[:gallery_id], params[:gallery])
+      render :nothing => true
+    end
+  end
+  def sort_images
+    @pg = CmsPage.find_by_id(params[:id])
+    gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, params[:gallery_id])
+    @images = Dir.glob("#{gallery_dir}/*.{jpg,jpeg,png,gif}").reject { |img| img.include?('thumb') }.map { |img| File.basename(img).split('.').first.to_i }.sort
+    if params[:images]
+      session[:gallery_images_sorted] = params[:images]
+      render :nothing => true
+    else
+      render :partial => 'sort_images'
+    end
+  end
+  def sort_images_save
+    @pg = CmsPage.find_by_id(params[:id])
+    gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, params[:gallery_id])
+    temp_dir = File.join(gallery_dir, 'temp')
+    sorted_images = session[:gallery_images_sorted] || []
+    if sorted_images == []
+      redirect_to :action => 'gallery_management', :id => @pg, :gallery_id => params[:gallery_id]
+      return
+    end
+    # create blank captions.yml if it doesn't already exist
+    create_captions_file(@pg.id)
+    original_captions = YAML.load_file(File.join(gallery_dir, 'captions.yml')).to_a
+    new_captions = [ original_captions[0] ]
+    Dir.glob("#{gallery_dir}/**/*.jpg").each { |img| FileUtils.touch(img); FileUtils.mv(img, img + '.tmp') }
+    sorted_images.each_with_index do |img, i|
+      FileUtils.mv(File.join(gallery_dir, "#{img.to_i}.jpg.tmp"), File.join(gallery_dir, "#{i+1}.jpg"))
+      FileUtils.mv(File.join(gallery_dir, "#{img.to_i}-thumb.jpg.tmp"), File.join(gallery_dir, "#{i+1}-thumb.jpg"))
+      FileUtils.mv(File.join(gallery_dir, 'management', "#{img.to_i}.jpg.tmp"), File.join(gallery_dir, 'management', "#{i+1}.jpg"))
+      new_captions << original_captions[img.to_i] || ''
+    end
+    yaml = YAML.dump(new_captions)
+    File.open(File.join(gallery_dir, 'captions.yml'), 'w') { |f| f << yaml }
+    session[:gallery_images_sorted] = nil
+    redirect_to :action => 'gallery_management', :id => @pg, :gallery_id => params[:gallery_id]
+  end
+  def image_details
+    @pg = CmsPage.find_by_id(params[:id])
+    # create blank captions.yml if it doesn't already exist
+    create_captions_file(@pg.id)
+    gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, params[:gallery_id])
+    captions = YAML.load(File.open(File.join(gallery_dir, 'captions.yml')).read)
+    image_id = params[:image].split('.').first.to_i
+    @caption = captions[image_id]
+    render partial: 'image_details'
+  end
+  def update_caption
+    if request.post?
+      @pg = CmsPage.find_by_id(params[:id])
+      # create blank captions.yml if it doesn't already exist
+      create_captions_file(@pg.id)
+      gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, params[:gallery_id])
+      captions = YAML.load_file(File.join(gallery_dir, 'captions.yml')).to_a
+      image_id = params[:image].split('.').first.to_i
+      captions[image_id] = params[:caption]
+      yaml = YAML.dump(captions)
+      File.open(File.join(gallery_dir, 'captions.yml'), "w") { |f| f << yaml }
+    end
-    render :partial => 'crop_feature_image'
+    redirect_to action: 'gallery_management', id: params[:id], gallery_id: params[:gallery_id]
   end
-  def save_crop_feature_image
+  def add_to_gallery
     @pg = CmsPage.find_by_id(params[:id])
-    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
-    testfile = File.join(target_dir, File.basename(params[:filename]))
-    localfile = testfile.split(/-croptest/).join('')
+    galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
+    @galleries = Dir.entries(galleries_dir).sort
+    @gallery_dir = File.join(galleries_dir, params[:gallery_id])
+    images = Dir.glob("#{@gallery_dir}/*-thumb.{jpg,jpeg,png,gif}")
-    # need to scale up requested position/dimensions based on how big test image
-    # is relative to original image
-    orig_im = MiniMagick::Image.from_file(localfile)
-    test_im = MiniMagick::Image::from_file(testfile)
-    scale = orig_im[:width].to_f / test_im[:width]
+    temp_location = File.join(@gallery_dir ,'temp')
+    FileUtils.rm_rf(temp_location)
+    Dir.mkdir(temp_location)
-    x1 = params[:image][:x1].to_i * scale
-    y1 = params[:image][:y1].to_i * scale
-    width = params[:image][:width].to_i * scale
-    height = params[:image][:height].to_i * scale
+    data = params[:gallery_file][:data]
+    data_dest = File.join(temp_location, data.original_filename)
+    File.open(data_dest, 'wb') { |f| f.write(data.read) }
-    max_width = params[:image][:max_width].to_i
-    max_height = params[:image][:max_height].to_i
-    dirty = false
+    last_id = images.size
+    ext = File.extname(data_dest).downcase
-    # crop if user selected something
-    if params[:image][:width].to_i > 0
-      logger.debug "cropping @ (#{x1}, #{y1}) to size #{width} x #{height}"
-      orig_im.crop("#{width}x#{height}+#{x1}+#{y1}")
-      dirty = true
+    if ext != '.zip'
+      localfile = File.join(@gallery_dir, (last_id + 1).to_s + ext)
+      thumbfile = File.join(@gallery_dir, (last_id + 1).to_s + '-thumb' + ext)
+      File.open(localfile, "w") { |f| f.write(File.open(data_dest).read) }
+      # create blank captions.yml if it doesn't already exist
+      create_captions_file(@pg.id)
+      localfile = resize_image(localfile)
+      small = MiniMagick::Image.open(localfile)
+      small.crop_resized(GalleryThumbWidth, GalleryThumbHeight)
+      small.write(thumbfile)
+      File.chmod(0644, localfile, thumbfile)
+      create_preview_images(force: true)
+    elsif ext == '.zip'
+      begin
+        Zip::File.foreach(data.path) do |zipentry|
+          next if ![ '.jpg', '.jpeg', '.png', '.gif' ].include?(File.extname(zipentry.name).downcase) || zipentry.size < 1000
+          upload_progress.message = "Extracting #{File.basename(zipentry.name)}"
+          localfile = File.join(temp_location, ((last_id+1).to_s + File.extname(zipentry.name)).downcase)
+          begin
+            zipentry.extract(localfile)
+            last_id += 1
+          rescue StandardError => e
+            logger.error(e)
+          end
+        end
+      rescue StandardError => e
+        logger.debug params.inspect
+        logger.error(e)
+        finish_upload_status "''" and return
+      end
+      @images = Dir.glob("#{temp_location}/*.{jpg,jpeg,png,gif}")
+      @images.each do |img|
+        localfile = File.join(@gallery_dir, File.basename(img, File.extname(img))) + '.jpg'
+        tempfile = File.join(temp_location, File.basename(img, File.extname(img))) + File.extname(img)
+        thumbfile = File.join(@gallery_dir, File.basename(img, File.extname(img))) + '-thumb.jpg'
+        small = MiniMagick::Image.open(tempfile)
+        small.crop_resized(GalleryThumbWidth, GalleryThumbHeight)
+        small.write(thumbfile)
+        FileUtils.cp(tempfile, localfile)
+        resize_image(localfile)
+        File.chmod(0644, localfile, thumbfile)
+      end
+      # smaller images for gallery index
+      management_dir = File.join(@gallery_dir, 'management')
+      preview_images = []
+      Dir.glob("#{@gallery_dir}/*.{jpg,jpeg,png,gif}").each { |img| preview_images << img unless File.basename(img).include?('thumb') }
+      preview_images.each { |img| create_preview_image(img, management_dir, true) }
     end
-    # resize if the resultant image is bigger than max dims
-    if max_width > 0 && max_height > 0
-      if orig_im[:width] > max_width || orig_im[:height] > max_height
-        logger.debug "resizing to max dims #{max_width} x #{max_height}"
-        orig_im.resize("#{max_width}x#{max_height}>")
-        dirty = true
+    File.delete(data_dest)
+    upload_progress.message = "File received successfully."
+    finish_upload_status "'#{File.basename(data_dest)}'" and return
+  end
+  def delete_photo
+    if request.post?
+      @pg = CmsPage.find_by_id(params[:id])
+      # create blank captions.yml if it doesn't already exist
+      create_captions_file(@pg.id)
+      gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, params[:gallery_id])
+      captions = YAML.load(File.open(File.join(gallery_dir, 'captions.yml')).read).to_a
+      image_id = params[:image].split('.').first.to_i
+      begin ; File.delete(File.join(gallery_dir, image_id.to_s + '.jpg')) ; rescue ; end
+      begin ; File.delete(File.join(gallery_dir, image_id.to_s + '-thumb.jpg')) ; rescue ; end
+      begin ; File.delete(File.join(gallery_dir, 'management', image_id.to_s + '.jpg')) ; rescue ; end
+      all_images = Dir.glob(File.join(gallery_dir, '*.{jpg,jpeg,png,gif}'))
+      images = []
+      all_images.each { |img| images << img if !File.basename(img).include?('thumb') && File.basename(img).split('.').first.to_i > image_id }
+      image_names = []
+      images.each_with_index { |img, index| image_names << File.basename(img).split('.').first.to_i }
+      image_names.sort!
+      new_captions = []
+      for i in 0...image_id do
+        new_captions[i] = captions[i] || ''
       end
+      image_names.each do |img|
+        FileUtils.mv(File.join(gallery_dir, img.to_s + '.jpg'), File.join(gallery_dir, image_id.to_s + '.jpg'))
+        FileUtils.mv(File.join(gallery_dir, img.to_s + '-thumb.jpg'), File.join(gallery_dir, image_id.to_s + '-thumb.jpg'))
+        FileUtils.mv(File.join(gallery_dir, 'management', img.to_s + '.jpg'), File.join(gallery_dir, 'management', image_id.to_s + '.jpg'))
+        new_captions[image_id] = captions[img] || ''
+        image_id += 1
+      end
+      yaml = YAML.dump(new_captions)
+      File.open(File.join(gallery_dir, 'captions.yml'), "w") { |f| f << yaml }
     end
-    orig_im.write(localfile) if dirty
-    File.chmod(0644, localfile)
+    redirect_to :action => 'gallery_management', :id => params[:id], :gallery_id => params[:gallery_id]
+  end
+  def delete_gallery
+    @pg = CmsPage.find_by_id(params[:id])
+    galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
+    gallery_dir = File.join(galleries_dir, params[:gallery_id])
-    @image_file = localfile + "?#{File.mtime(localfile).to_i}"
-    File.unlink testfile
-    upload_to_s3(localfile, @pg)
+    FileUtils.rm_rf(gallery_dir)
-    render :partial => 'crop_results_feature_image'
+    redirect_to :action => 'select_gallery', :id => params[:id]
   end
   protected
-    def cms_page_params
-      params.require(:pg).permit(:cms_template_id, :cms_template_version, :parent_id, :published_version,
-                                 :name, :title, :path, :html_head, :summary, :position,
-                                 :article_date, :article_end_date, :published_date, :expiration_date, :expires,
-                                 :thumbnail_path, :feature_image_path, :redirect_enabled, :redirect_to)
+    def check_permissions
+      if !user_has_permission?(:manage_cms)
+        render '/imagine_cms/errors/permission_denied', :layout => false
+        return false
+      end
     end
-    def cms_template_params
-      params.require(:temp).permit(:name, :content)
+    def validate_user_access
+      unless @user.cms_allowed_sections.to_s.strip.blank?
+        allowed_sections = @user.cms_allowed_sections.split(',').map { |s| s.strip }.reject { |s| s.blank? }
+        if @pg
+          path = '/' + @pg.path
+        else
+          parent = CmsPage.find_by_id(params[:parent_id] || params[:pg][:parent_id]) rescue nil
+          return false if !parent
+          path = '/' + parent.path
+        end
+        allowed = false
+        allowed_sections.each { |s| allowed ||= (path =~ /^#{s}/) }
+        if !allowed
+          respond_to do |wants|
+            wants.js    { render :text => "Sorry, you don't have permission to edit this page."         }
+            wants.html  { redirect_to "/#{@pg.path}#{@pg.path == '' ? '' : '/'}version/#{@pg.version}"  }
+          end
+          return false
+        end
+      end
+      true
     end
-    def cms_snippet_params
-      params.require(:snip).permit(:name, :content)
+    def cms_page_params
+      params.require(:pg).permit(:cms_template_id, :cms_template_version, :parent_id, :published_version,
+                                  :name, :title, :path, :html_head, :summary, :position,
+                                  :article_date, :article_end_date, :published_date, :expiration_date, :expires,
+                                  :thumbnail_path, :feature_image_path, :redirect_enabled, :redirect_to)
     end
     def load_page_objects
-      @page_objects = HashObject.new
-      @template_options = HashObject.new
+      @page_objects = OpenStruct.new
+      @template_options = OpenStruct.new
       if @pg.new_record? && @parent
-        @parent.objects.where(:obj_type => 'attribute').each do |obj|
+        @parent.objects.where(obj_type: 'attribute').each do |obj|
+          next if defined?(CmsNewPagesDoNotInherit) && CmsNewPagesDoNotInherit['attributes'] && CmsNewPagesDoNotInherit['attributes'].include?(obj.name)
           key = "obj-#{obj.obj_type.to_s}-#{obj.name}"
           @page_objects[key] = obj.content
         end
-        @parent.objects.where(:obj_type => 'option').each do |obj|
+        @parent.objects.where(obj_type: 'option').each do |obj|
+          next if defined?(CmsNewPagesDoNotInherit) && CmsNewPagesDoNotInherit['options'] && CmsNewPagesDoNotInherit['options'].include?(obj.name)
           key = "obj-#{obj.obj_type.to_s}-#{obj.name}"
           @page_objects[key] = obj.content
         end
       else
         @tags = @pg.tags.map { |t| t.name }.join(', ')
-        @pg.objects.where(:obj_type => 'attribute').each do |obj|
+        @pg.objects.where(obj_type: 'attribute').each do |obj|
           key = "obj-#{obj.obj_type.to_s}-#{obj.name}"
           @page_objects[key] = obj.content
         end
-        @pg.objects.where(:obj_type => 'option').each do |obj|
+        @pg.objects.where(obj_type: 'option').each do |obj|
           key = "obj-#{obj.obj_type.to_s}-#{obj.name}"
           @page_objects[key] = obj.content
         end
@@ -1429,16 +1344,43 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     def load_template_options
       begin
-        render_to_string :inline => @pg.template.content
-      rescue Exception => e
+        render_to_string inline: @pg.template.content
+      rescue StandardError => e
         logger.debug e
       end
     end
-    def garbage_collect
-      GC.start
+    def upload_to_s3(filename, page, bucket = nil, prefix = nil)
+      s3retries = 0
+      s3success = false
+      if ImagineCmsConfig['amazon_s3'] && ImagineCmsConfig['amazon_s3']['enabled']
+        s3 = Aws::S3::Client.new
+        bucket ||= ImagineCmsConfig['amazon_s3'][Rails.env]['image_bucket']
+        prefix ||= ImagineCmsConfig['amazon_s3']['image_prefix']
+        params = {}
+        params[:bucket] = bucket
+        params[:key] = "#{prefix}/#{page.path.blank? ? 'index' : page.path}/#{File.basename(filename)}"
+        params[:body] = open(filename)
+        params[:acl] = 'public-read'
+        params[:metadata] = ImagineCmsConfig['amazon_s3']['metadata']
+        while !s3success && s3retries < 2
+          response = s3.put_object(params)
+          s3success = response.successful?
+          s3retries += 1
+        end
+        File.unlink(filename) if s3success
+      end
+      s3success
     end
     def create_captions_file(pg_id, options = {})
       @pg ||= CmsPage.find_by_id(pg_id)
       gallery_id = options[:gallery_id] || params[:gallery_id]
@@ -1467,12 +1409,12 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       ret['autoplay'] ||= true
       ret['show_thumbs'] ||= true
-      return HashObject.new(ret)
+      return OpenStruct.new(ret)
     end
     # prerequisites: @pg (CmsPage)
     def save_gallery_settings_to_file(gallery_id, settings_hash, options = {})
-      settings_hash = settings_hash.hash if settings_hash.kind_of?(HashObject)
+      settings_hash = settings_hash.hash if settings_hash.kind_of?(OpenStruct)
       galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
       gallery_dir = File.join(galleries_dir, gallery_id)
@@ -1482,7 +1424,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     end
     def resize_image(localfile)
-      im = MiniMagick::Image::from_file(localfile)
+      im = MiniMagick::Image.open(localfile)
       if im[:width] > GalleryMaxWidth || im[:height] > GalleryMaxHeight
         im.resize("#{GalleryMaxWidth}x#{GalleryMaxHeight}")
@@ -1492,11 +1434,11 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       localfile
     end
-    def create_preview_image(src_file, dest, force = 0, overlay = 'gallery_small_overlay.png', thumb_size = 90)
+    def create_preview_image(src_file, dest, force = false, overlay = 'gallery_small_overlay.png', thumb_size = 90)
       raise "Source file required" if src_file.blank?
       dest = File.join(dest, File.basename(src_file)) if File.directory?(dest)
-      if !File.exist?(dest) || force == 1
+      if !File.exist?(dest) || force
         logger.debug "Reading source file #{src_file}"
         im = Magick::Image::read(src_file)[0]
         im_overlay = Magick::Image::read(File.join(ImagineCms::Engine.root, 'app', 'assets', 'images', 'management', overlay))[0]
@@ -1539,7 +1481,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
           # photo preview images
           preview_images.each { |img| create_preview_image(img, management_dir, options[:force]) }
-        rescue Exception => e
+        rescue StandardError => e
           # some error handling here
           session[:broken_galleries] << File.basename(g)
@@ -1547,37 +1489,9 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
         end
       end
     end
-    def upload_to_s3(filename, page, bucket = nil, prefix = nil)
-      s3retries = 0
-      s3success = false
-      if ImagineCmsConfig['amazon_s3'] && ImagineCmsConfig['amazon_s3']['enabled']
-        s3 = Aws::S3::Client.new
-        bucket ||= ImagineCmsConfig['amazon_s3'][Rails.env]['image_bucket']
-        prefix ||= ImagineCmsConfig['amazon_s3']['image_prefix']
-        params = {}
-        params[:bucket] = bucket
-        params[:key] = "#{prefix}/#{page.path.blank? ? 'index' : page.path}/#{File.basename(filename)}"
-        params[:body] = open(filename)
-        params[:acl] = 'public-read'
-        params[:metadata] = ImagineCmsConfig['amazon_s3']['metadata']
-        while !s3success && s3retries < 2
-          response = s3.put_object(params)
-          s3success = response.successful?
-          s3retries += 1
-        end
-        File.unlink(filename) if s3success
-      end
-      s3success
-    end
-end
+end
 module MiniMagick
   class Image
     def crop_resized(ncols, nrows, gravity='Center')