kit_cms 2.3.20 → 2.3.22

data/app/controllers/ad_controller.rb

@@ -9,6 +9,8 @@ class AdController < KitController
     @ad.height = zone.height
     @ad.width = zone.width
     @ad.system_id = _sid
+    @ad.name = params[:ad][:name]
+    @ad.start_date = params[:ad][:start_date]
     @ad.user_id = current_user.id
     @ad.end_date = @ad.start_date + @ad.duration.send(zone.period.downcase) rescue nil
     @ad.activated = nil

data/app/controllers/admin/ad_units_controller.rb

@@ -10,7 +10,7 @@ class Admin::AdUnitsController < AdminController
     if block
       notice = 'Block already exists'
     else
-      block = Block.create(:system_id=>_sid, :name=>@ad_unit.block_name, :description=>"System generated block to display an ad of size '#{@ad_unit.name}'", :show_editors=>true, :all_templates=>true, :user_id=>current_user.id, :body=>"<%= kit_ad_by_unit(#{@ad_unit.id}) %>")
+      block = Block.create(:system_id=>_sid, :name=>@ad_unit.block_name, :description=>"System generated block to display an ad of size '#{@ad_unit.name}'", :show_editors=>true, :all_templates=>true, :user_id=>current_user.id, :body=>"<% if params[:edit] %>[[ad will appear here]]<% else %><% ad = kit_ad_by_unit(#{@ad_unit.id}) %><%= kit_ad(ad.id) if ad %><% end %>")
       notice = 'Block created'
     end
 

data/app/controllers/admin/ad_zones_controller.rb

@@ -2,6 +2,21 @@ class Admin::AdZonesController < AdminController
 
   before_filter :check_feature
 
+  def create_block
+    @ad_zone = AdZone.find_sys_id(_sid, params[:id])
+    
+    block = Block.sys(_sid).where(:name=>@ad_zone.block_name).first
+
+    if block
+      notice = 'Block already exists'
+    else
+      block = Block.create(:system_id=>_sid, :name=>@ad_zone.block_name, :description=>"System generated block to display an ad from zone '#{@ad_zone.name}'", :show_editors=>true, :all_templates=>true, :user_id=>current_user.id, :body=>"<% if params[:edit] %>[[ad will appear here]]<% else %><% ad = kit_ad_by_zone(#{@ad_zone.id}) %><%= kit_ad(ad.id) if ad %><% end %>")
+      notice = 'Block created'
+    end
+
+    redirect_to [:admin, @ad_zone], :notice=>notice
+  end
+
   def index
     @ad_zones = AdZone.sys(_sid).includes(:ad_unit)
     @ad_zones = @ad_zones.where(:ad_unit_id=>params[:ad_unit]) if params[:ad_unit] 

data/app/controllers/admin/ads_controller.rb

@@ -37,7 +37,12 @@ class Admin::AdsController < AdminController
     @ad = Ad.new(params[:ad])
     @ad.system_id = _sid
     @ad.activated = Time.now
+#    @ad.duration = params[:ad][:duration].to_i
     @ad.approved_by_id = current_user.id
+    @ad.user_id = current_user.id
+    @ad.name = params[:ad][:name]
+    @ad.start_date = params[:ad][:start_date]
+    @ad.end_date = params[:ad][:end_date] #@ad.start_date + @ad.duration.send(zone.period.downcase) rescue nil
 
     zones = check_zones
     if zones.instance_of?(String)

data/app/controllers/admin/block_controller.rb

@@ -1,67 +1,3 @@
 class Admin::BlockController < AdminController
-
-  layout "cms"
-
-  def index
-    @blocks = Block
-                .includes(:user)
-                .order("created_at desc")
-    @blocks = @blocks.where('name like "%' + params[:for] + '%" or body like "%' + params[:for] + '%" or description like "%' + params[:for] + '%"') if params[:for].not_blank?
-    @blocks = @blocks.page(params[:page]).per(3)
-  end
-
-  def new
-    @block ||= Block.new
-  end
-
-  def show
-    @block = Block.find_sys_id(_sid, params[:id])
-    if params[:version]
-      ver = params[:version].to_i
-      for v in 0..ver
-        @block.revert_to(v)
-      end
-    end
-  end
-
-  def destroy
-    @block = Block.find_sys_id(_sid, params[:id])
-    Activity.add(_sid, "Deleted block '#{@block.name}'", current_user.id, "Block")
-    Block.delete_all("id = #{params[:id]} and system_id = #{_sid}")
-    flash[:warn] = "Block deleted"
-    redirect_to "/admin/block"
-  end
-
-  def update
-    params[:block][:page_template_ids] ||= []
-    @block = Block.find_sys_id(_sid, params[:id])
-    @block.user_id = current_user.id
-
-    @block.update_attributes(params[:block])
-    if @block.save
-      Activity.add(_sid, "Update block '#{@block.name}'", current_user.id, "Block")
-
-      redirect_to "/admin/block/#{@block.id}"
-      return
-    else
-      render "edit"
-    end
-  end
-
-  def edit
-    @block = Block.find(params[:id])
-  end
-
-  def create
-    @block = Block.new(params[:block])
-    @block.user_id = current_user.id
-    if @block.save
-      Activity.add(_sid, "Create block '#{@block.name}'", current_user.id, "Block")
-      redirect_to "/admin/block/#{@block.id}"
-      return
-    else
-      render "new"
-    end
-  end
-
+ # not used 
 end

data/app/controllers/admin/blocks_controller.rb

@@ -2,6 +2,7 @@ class Admin::BlocksController < AdminController
   layout "cms"
   
   def index
+    logger.debug "*****************************************" * 5
     @blocks = Block.sys(_sid).order(:name)
     @blocks = @blocks.where('name like "%' + params[:for] + '%" or body like "%' + params[:for] + '%" or description like "%' + params[:for] + '%"') if params[:for].not_blank?
     @blocks = @blocks.page(params[:page]).per(25)
@@ -11,6 +12,7 @@ class Admin::BlocksController < AdminController
     @block = Block.find_sys_id(_sid,params[:id])
   end
 
+
   def new
     @block = Block.new
   end

data/app/controllers/admin/content_controller.rb

@@ -24,11 +24,13 @@ class Admin::ContentController < AdminController
     end
 
     indexes = [ "pages", "topic_posts", "topic_threads" ] 
-    search = Tire.search indexes.map { |name| "kit_#{app_name}_#{name}"}.join(',') do
+    system_id = _sid
+    search = Tire.search indexes.map { |name| "#{index_name}_#{name}"}.join(',') do
       query do
         string words.join(' ')
       end
       size 10
+      filter :term, :system_id=>system_id
     end
 
     @pages = search.results

data/app/controllers/admin/dashboard_controller.rb

@@ -105,8 +105,16 @@ class Admin::DashboardController < AdminController
   def system
     raise Exception("permissions") unless can?(:dashboard, :super)
 
+    if request.post? && params[:preference][:name]
+      name = params[:preference][:name]
+      value = params[:preference][:value]
+      Preference.set(_sid, name, value)
+    end
+
     @preferences = Preference.sys(_sid).where("user_id is null").order(:name)
     @preferences = @preferences.all
+
+    @preference = Preference.new    
   end
 
   def build_system
@@ -164,7 +172,6 @@ class Admin::DashboardController < AdminController
       HtmlAsset.fetch(sid, ha.name, ha.file_type)
     end
 
-
     @system_id = sid
     prefs = {
       date_time_format: "%H:%M %d-%m-%y",
@@ -390,7 +397,7 @@ class Admin::DashboardController < AdminController
 
     @@to_search.each do |model|
       if params["include_#{model.pluralize.downcase}".to_sym]
-        indexes << "kit_#{app_name.downcase}_" + model.tableize
+        indexes << "#{index_name}_" + model.tableize
         KitIndexed.indexed_columns(model).collect { |ic| 
           next if ic[:include_in_all]==false
           next if ic[:index]==:not_analyzed
@@ -414,7 +421,7 @@ class Admin::DashboardController < AdminController
       filter :term, :system_id=>system_id
 
     end
-    logger.debug "SEARCH: #{indexes.join(',')} #{search.to_json}"
+    logger.info "SEARCH: #{indexes.join(',')} #{search.to_json}"
 
     @results = search.results
     logger.debug "RESULTS: #{@results.size}"
@@ -442,13 +449,16 @@ class Admin::DashboardController < AdminController
   end
 
   def help 
+    system_id = _sid
+
     if params[:search]
       search_for = params[:search]
 
-      search = Tire.search "kit_#{app_name}_helps" do
+      search = Tire.search "#{index_name}_helps" do
         query do
           string search_for, :fields=>["name", "body", "path"]
         end
+        filter :term, :system_id=>system_id
       end
       @helps = search.results
       render "helps"
@@ -471,4 +481,18 @@ class Admin::DashboardController < AdminController
     "<span class='check_warning'>#{s}</span>".html_safe
   end
 
+  def broken_links
+    @broken = []
+    Anemone.crawl(Preference.get_cached(_sid, "host"), :skip_query_strings=>true) do |anemone|
+      anemone.skip_links_like [ /\/db/, /\/page\/\d+\/info/, /\?edit\=1/ ]
+       anemone.on_every_page do |page|
+         @broken << page
+        if page.code == 404
+         uri = URI.parse(page.url.to_s)
+         @broken << uri.path
+        end
+       end
+    end
+
+  end
 end

data/app/controllers/admin/dj_controller.rb

@@ -0,0 +1,45 @@
+class Admin::DjController < AdminController
+
+  def index
+
+    if request.post? && params[:delete]
+      DelayedJob.delete_all("id = #{params[:delete]} and queue = '#{_sid}'")
+      redirect_to "/admin/dj", :notice=>"Job deleted"
+    end
+
+    if request.post? && params[:id]
+      dj = DelayedJob.where("queue = #{_sid} and id=#{params[:id]}").first
+      if dj
+        dj.run_at = Time.now
+        dj.save
+      end
+      redirect_to "/admin/dj"
+    end
+
+    if request.post? && params[:process]
+      do_process
+      redirect_to "/admin/dj"
+    end
+
+    @delayed_jobs = DelayedJob.where(:queue=>_sid).order("created_at desc").page(params[:page]).per(100).all
+   
+    @running = false
+    if File.exist?("tmp/pids/delayed_job.pid")
+      begin
+        @pid = File.read("tmp/pids/delayed_job.pid").strip
+        Process.getpgid( @pid.to_i )
+        @running = true
+      rescue Errno::ESRCH
+      end
+    end
+  end
+
+  def do_process
+    if params[:process]
+      `bundle exec script/delayed_job #{params[:process]}`
+      flash[:notice] = "Process #{params[:process]}"
+    end
+  end
+
+end
+

data/app/controllers/admin/help_controller.rb

@@ -37,7 +37,7 @@ class Admin::HelpController < AdminController
     if params[:search]
       search_for = params[:search]
 
-      search = Tire.search "kit_#{app_name.downcase}_helps" do
+      search = Tire.search "#{index_name}_helps" do
         query do
           string search_for, :fields=>["name", "body", "path"]
         end

data/app/controllers/admin/html_asset_controller.rb

@@ -6,18 +6,6 @@
     setup_index
   end
 
-  # replace with model which writes itself to File system and is served up by webserver
-  def serve 
-    name,stamp = params[:path].split('-')
-    asset = HtmlAsset.fetch(_sid, name.downcase, params[:format])
-    response.headers['Content-Type'] = "text/#{asset.file_type}"
-    response.headers['Cache-Control'] = 'max-age=31536000, public'
-    response.headers["Expires"] = CGI.rfc1123_date(Time.now + 360.days)
-    mime_type = Mime::Type.lookup_by_extension(asset.file_type)
-    content_type = mime_type.to_s unless mime_type.nil?
-    
-    render :inline=>asset.compiled, :type=>:erb, :layout=>false, :mime_type => content_type
-  end
 
   def create
     add_sid(:html_asset)

data/app/controllers/admin/q_controller.rb

@@ -0,0 +1,120 @@
+class Admin::QController < KitController
+
+  before_filter :load_publisher, :except=>[:index, :create]
+  before_filter :check_user, :except=>[:index, :destroy, :create]
+  before_filter :check_admin, :only=>[ :destroy, :create]
+
+  def index
+    if  current_user.admin?
+      @publishers = QPublisher.sys(_sid).order(:name).all
+      @q_publisher = QPublisher.new
+      render "index", :layout=>get_layout
+    else
+      @publisher = QPublisher.sys(_sid).where(:user_id=>current_user.id).first
+      redirect_to "/admin/q/#{@publisher.id}"
+    end
+  end
+
+  def destroy
+    @publisher.destroy
+    redirect_to "/admin/q", :notice=>"publisher deleted"
+  end
+
+  def create
+    @publisher = QPublisher.new(params[:q_publisher])
+    @publisher.system_id = _sid
+    @publisher.token = rand
+    @publisher.auth_id = QPublisher.generate_random
+    @publisher.auth_secret = QPublisher.generate_random
+    @publisher.auth_method = "digest"
+    @publisher.active = 1
+    @publisher.save
+
+    @q_user = QUser.create(:system_id=>_sid, :q_publisher_id=>@publisher.id, :q_external_id=>0, :notification_method=>"twitter", :source=>1)
+
+    QSubscription.create(:system_id=>_sid, :q_publisher_id=>@publisher.id, :topic=>"tweet", :q_user_id=>@q_user.id)
+    redirect_to "/admin/q/#{@publisher.id}?auth=1", :notice=>"Created new publisher - now set up authentication"
+  end
+
+  def show
+    if request.post?
+      @event = QEvent.new(params[:q_event])
+      @event.system_id = _sid
+      @event.q_publisher = @publisher
+      @event.save
+      flash[:notice] = "Event created"
+      redirect_to "/admin/q/#{@publisher.id}"
+      return
+    end
+    @event = QEvent.new
+
+    render "show", :layout=>get_layout
+  end
+
+  def klasses
+    if request.put? || request.post?
+      if params[:q_klass][:id]
+        @q_klass = QKlass.sys(_sid).where(:id=>params[:q_klass][:id]).first
+      else
+        @q_klass = QKlass.new
+        @q_klass.system_id = _sid
+        @q_klass.q_publisher_id = @publisher.id
+      end
+      @q_klass.update_attributes(params[:q_klass])
+      @q_klass.save
+      redirect_to "/admin/q/#{@publisher.id}/klasses", :notice=>"Saved"
+      return
+    else
+      @q_klass = params[:klass_id] ? QKlass.sys(_sid).where(:id=>params[:klass_id]).first : QKlass.new
+    end
+
+    render "klasses", :layout=>get_layout
+  end
+
+  def messages
+    render "messages", :layout=>get_layout
+  end
+
+  def users
+    render "users", :layout=>get_layout
+  end
+
+  def events
+    render "events", :layout=>get_layout
+  end
+
+  def subscriptions
+    render "subscriptions", :layout=>get_layout
+  end
+
+  def update
+    @publisher.update_attributes(params[:q_publisher])
+    respond_with_bip(@publisher)
+  end
+
+  private
+  def load_publisher
+    @publisher = QPublisher.sys(_sid).where(:id=>params[:id]).first
+  end
+
+  def get_layout
+    if user.admin?
+      "cms"
+    else
+      "#{_sid}/#{Preference.get_cached(_sid, "queue_manager_layout") || "application"}"
+    end      
+  end
+
+  def check_user
+    return true if current_user.admin?
+    return true if current_user && @publisher.user_id == current_user.id
+
+    redirect_to "/"
+  end
+
+  def check_admin
+    current_user && current_user.admin?
+
+    redirect_to "/"
+  end
+end

data/app/controllers/admin/user_controller.rb

@@ -189,15 +189,15 @@ class Admin::UserController < AdminController
       musts << { :term => {:group_ids => group} } if group.not_blank?
       musts << { :query_string => {:fields => [ :email, :display_name ], :query => "*#{search_for.downcase}*" }} if search_for.not_blank?
       musts << { :term => {"attributes.#{parameter}"  => value.downcase} } if parameter.not_blank? && value.not_blank?
+      musts << { :term => {:system_id=>system_id} }
 
       if musts.size > 0  
-        search = Tire.search "kit_#{app_name.downcase}_users", {:query => { :bool => { :must => musts } }, :size=>per_page, :from=>from}
+        search = Tire.search "#{index_name}_users", {:query => { :bool => { :must => musts } }, :size=>per_page, :from=>from}
         search.size(per_page)
         search.from(from)
-        search.filter :terms, :system_id=>system_id
         @users = search.results
       else 
-        @users = User.sys(_sid).order(:email).page(params[:page]).per(per_page)
+        @users = User.sys(_sid).order('created_at desc').page(params[:page]).per(per_page)
       end
     end
 
@@ -274,7 +274,7 @@ class Admin::UserController < AdminController
       redirect_to "/db", :notice=>"You cannot become that user"
       return
     else
-      sign_in(:user,  target)
+      warden.set_user target
       redirect_to "/", :notice=>"You've successfully become that user"
       return
     end