kit_cms 2.3.20 → 2.3.22

data/app/helpers/form_data_helper.rb

@@ -19,7 +19,7 @@ module FormDataHelper
         lon = geo_loc[0].longitude
       end
 
-      search = Tire.search "kit_#{app_name.downcase}_form_submissions" do 
+      search = Tire.search "#{index_name}_form_submissions" do 
         query do
           boolean do 
             must do 

data/app/helpers/form_helper.rb

@@ -1,5 +1,13 @@
 module FormHelper
 
+  def form_asset_selected(asset)
+    if @form && @form.id!=nil
+      @form.html_assets.include?(asset)
+    else
+      false
+    end
+  end
+  
 
   def text_captcha_entry
       question, answers = Form.captcha_question(500)

data/app/helpers/forum_helper.rb

@@ -1,5 +1,9 @@
 module ForumHelper
 
+  def use_markdown_editor
+     (sys_pref('use_markdown_editor')=='true' && !is_mobile?) ? 'true' : 'false'
+    end
+
   def forum_search(search_for, page, per, topic_ids = nil)
     # need to get list of topic_ids visible to this user (unless a topic_id is provided)
     # then do search, similar to forum_controller search
@@ -12,7 +16,7 @@ module ForumHelper
     color = 'green' if user.forum_status == -1
     
     ( "[" +
-      link_to(user.email, "/admin/users/#{user.id}") +
+      link_to(user.email, "/admin/user/#{user.id}") +
     "] <span class='#{color}'>" +
       user.display_name + 
       "</span> " +

data/app/helpers/kit_helper.rb

@@ -52,15 +52,11 @@ module KitHelper
     request.fullpath.split("?")[0]
   end
 
-  def kit_javascripts(additional = [])
+  def kit_javascripts
     op = []
-    (additional + javascripts).each do |name|
-      next if name.is_blank?
-      js = HtmlAsset.fetch(_sid, name.downcase.strip, "js")
+    javascripts.each do |js|
       if js
-        op << "<script type='text/javascript' src='/kit/js/#{js.kit_name.downcase}'></script>"
-      else
-        op << "<!-- javascript missing '#{name.downcase.strip}' -->"
+        op << "<script type='text/javascript' src='/kit/#{js.system_id}/js/#{js.kit_name.downcase}'></script>"
       end
     end
     op.join("\n").html_safe
@@ -68,19 +64,19 @@ module KitHelper
 
   def javascripts
     if @page
-      (@page.page_template.layout.javascripts + "," + @page.page_template.javascripts).split(',').uniq rescue []
+      (@page.page_template.layout.javascripts + @page.page_template.javascripts).uniq rescue []
     else
       js = []
       layout_name = controller.layout_name_being_used rescue "application"
       if layout_name.not_blank?
         layout = Layout.sys(_sid).where(:name=>layout_name).first
         if layout
-          js += layout.javascripts.split(',').uniq
+          js += layout.javascripts.uniq
         end
       end
       begin
       if controller.template_being_used
-        js += controller.template_being_used.javascripts.split(',').uniq 
+        js += controller.template_being_used.javascripts.uniq 
       end
       rescue 
         logger.debug "Javascripts error"
@@ -90,23 +86,13 @@ module KitHelper
     end
   end
 
-  def kit_stylesheets(additional = [])
+  def kit_stylesheets
     op = []
-    begin
-    s = stylesheets 
-    rescue Exception => e
-      s = ['application'] 
-      logger.info "#{e.message}"
-    end
-    (additional + s).each do |name|
-      next if name.is_blank?
-      sheet = HtmlAsset.fetch(_sid, name.downcase.strip, "css")
+    stylesheets.each do |sheet|
       if sheet
-        op << "<link rel='stylesheet' type='text/css' href='/kit/css/#{sheet.kit_name.downcase}'>"
-      else
-        op << "<!-- stylesheet missing '#{name.downcase.strip}' -->"
+        op << "<link rel='stylesheet' type='text/css' href='/kit/#{sheet.system_id}/css/#{sheet.kit_name.downcase}'>"
       end
-    end
+    end 
     op.join("\n").html_safe
   end
 
@@ -142,12 +128,23 @@ module KitHelper
     link_to_function label, "submit_form(this)", options
   end
 
-  def cm_editor(mode, object, field, form, form_field = nil, options = {})
-    form_field ||= "#{object}_#{field}"
-  
-    mode = 'htmlmixed' if mode == 'html'
-    mode = 'css' if mode == 'sass' || mode == 'scss'
-    render :partial=>'utility/cm_editor', :locals=>{:mode=>mode, :field=>field, :form_field=>form_field, :form=>form, :options=>options}
+  def cm_editor(name, options = {})
+    options[:mode] ||= "html"
+    options[:mode] = 'htmlmixed' if options[:mode] == 'html'
+    options[:mode] = 'css' if options[:mode] == 'sass' || options[:mode] == 'scss'
+    
+    options[:id] ||= name.gsub('[','_').gsub(']','') + rand(100000000).to_s
+
+    logger.debug "*** #{name}"
+    if options[:value].is_blank? && name =~ /([^\[]+)\[([^\]]+)\]/
+      o = $1
+      f = $2
+      options[:value] = eval("@#{o}.#{f}") rescue ""
+    end
+
+    options[:value] ||= ''
+
+    render :partial=>'utility/cm_editor', :locals=>{:options=>options, :name=>name}
   end
 
   def hide_if(bool)
@@ -360,7 +357,7 @@ module KitHelper
   end
 
   def pref(name, system = false, default = nil)
-    return nil unless current_user || system
+    return nil unless system || current_user 
     p = Preference.getCached(_sid, name, system ? nil : current_user.id)
     return p ? p : default
   end
@@ -465,17 +462,50 @@ module KitHelper
     date.strftime(Preference.getCached(_sid, 'date_time_format') || '%d-%b-%y %H:%M')
   end    
 
-   def obscure_email(email)
-        return nil if email.nil? #Don't bother if the parameter is nil.
-        lower = ('a'..'z').to_a
+  def entity_encode(s)
+      lower = ('a'..'z').to_a
         upper = ('A'..'Z').to_a
-        email.split('').map { |char|
+        s.split('').map { |char|
             output = lower.index(char) + 97 if lower.include?(char)
             output = upper.index(char) + 65 if upper.include?(char)
             output ? "&##{output};" : (char == '@' ? '&#0064;' : char)
         }.join
+  end
+
+   def obscure_email(email)
+        return nil if email.nil? #Don't bother if the parameter is nil.
+        op = []
+
+        m = rand(4)+1
+        for i in 0..email.length-1
+          if (i % m)==0
+            random_class = "c#{rand(1000000)}"
+            op << "<style type='text/css'>span.#{random_class} { display: none; }</style>"
+            op << "<span class='#{random_class}'>"
+            for x in 0..rand(5) 
+              op << (97+rand(25)).chr
+            end
+            op << "</span>"
+          end 
+          op << entity_encode(email[i])
+        end
+
+        op.join('').html_safe
     end
 
+   def ip_info_link(ip)
+     link_to ip, "http://www.infobyip.com/ip-#{ip}.html"
+    end
+
+   def is_mobile?
+    if @is_mobile==nil
+      browser = Browser.new(:ua=>request.env['HTTP_USER_AGENT'])
+      @is_mobile = browser.mobile?
+    end
+  
+    return @is_mobile
+   end
+
 end
 
 

data/app/helpers/kit_modules_helper.rb

@@ -1,5 +1,9 @@
 module KitModulesHelper
 
+  def kit_signin_form(options = {})
+    account_sign_in_form(options)
+  end
+
   def kit_page_list(options={})
     # category, template_snippet, limit = 5, order_by = "updated_at desc")
     pages = Page.sys(_sid)

data/app/helpers/user_helper.rb

@@ -1,33 +1,5 @@
 module UserHelper
 
- def devise_error_messages!
-    flash_alerts = []
-    error_key = 'errors.messages.not_saved'
-
-    if !flash.empty?
-      flash_alerts.push(flash[:error]) if flash[:error]
-      flash_alerts.push(flash[:alert]) if flash[:alert]
-      flash_alerts.push(flash[:notice]) if flash[:notice]
-      error_key = 'devise.failure.invalid'
-    end
-
-    return "" if resource.errors.empty? && flash_alerts.empty?
-    errors = resource.errors.empty? ? flash_alerts : resource.errors.full_messages
-
-    messages = errors.map { |msg| content_tag(:li, msg) }.join
-    sentence = I18n.t(error_key, :count    => errors.count,
-                                 :resource => resource.class.model_name.human.downcase)
-
-    html = <<-HTML
-    <div id="error_explanation">
-      <h2>#{sentence}</h2>
-      <ul>#{messages}</ul>
-    </div>
-    HTML
-
-    html.html_safe
-  end
-
   def field_types
     FormFieldType.sys(_sid).where(:hidden=>0).order(:name).all
   end

data/app/jobs/page_link_job.rb

@@ -0,0 +1,34 @@
+class PageLinkJob < Struct.new(:system_id)
+
+  def perform
+    last_crawl = (Time.zone.parse(Preference.get(system_id, "last_crawl")) rescue nil)
+    this_crawl = Time.now
+    Preference.set(system_id, "last_crawl", this_crawl)
+      Rails.logger.debug "Last crawl #{last_crawl} This Crawl #{this_crawl}"
+      pages = Page
+      pages = pages.sys(system_id) unless system_id == 0
+      pages = pages.where(["needs_crawl > ?", last_crawl]) if last_crawl
+      pages = pages.where(["needs_crawl <= ?", this_crawl])
+      pages.where("needs_crawl is not null").find_each do |p|
+        Rails.logger.debug "Crawling page #{p.id}"
+        p.crawl
+      end
+  end
+
+  def error(job, e)
+    Preference.set(system_id, "last_crawl", nil)
+    notes = []
+    notes << "Exception Message: #{e.message}"
+    notes << "Stack Trace: #{e.backtrace.join("\n")}"
+    reference =  Digest::MD5.hexdigest(Time.now.to_s)[0..8]
+    Event.store("PageLinkJob error", nil, 0, notes.join("\n"), reference) 
+    Activity.add(system_id, "Page Link refresh Failed #{reference}", 0, "System", '')
+    Rails.logger.error "PageLinkJob error: #{reference} #{e.message}"
+  end
+
+  def success(job)
+    Activity.add(system_id, "Page Links refreshed", 0, "System", '')
+  end
+
+end
+

data/app/jobs/queue_job.rb

@@ -0,0 +1,134 @@
+require 'twitter'
+
+class QueueJob < Struct.new(:event_id)
+
+  class Message
+    attr_accessor :body, :h1, :h2
+  end
+
+  def perform
+
+    @event = QEvent.find(event_id)
+    return if @event.processed_at
+
+    messages = {} # keyed on klass, i.e. the database record which shows how to generate the message body
+
+    twitter = Twitter::publisher.new(
+      :consumer_key => @event.q_publisher.twitter_consumer_key,
+      :consumer_secret => @event.q_publisher.twitter_consumer_secret,
+      :oauth_token => @event.q_publisher.twitter_oauth_token,
+      :oauth_token_secret => @event.q_publisher.twitter_oauth_token_secret
+    ) rescue nil
+
+    ios = Grocer.pusher(
+      certificate: StringIO.new(@event.q_publisher.ios_certificate), 
+      port:        2195, 
+      retries:     3 
+    ) rescue nil
+
+    QSubscription.sys(@event.system_id).where(:q_publisher_id=>@event.q_publisher_id).where(:topic=>@event.topic).includes(:q_user).find_each do |sub|
+
+      sub.q_user.q_users_methods.each do |method|  
+        msg = messages[method]
+        unless msg
+          klass = QKlass.sys(@event.system_id).where(:q_publisher_id=>@event.q_publisher_id).where(:name=>@event.klass).first
+          if klass
+            body = eval(klass.message_code)
+            h1 = eval(klass.h1_code)
+            h2 = eval(klass.h2_code)
+          else
+            body = @event.data
+            h1 = ""
+            h2 = ""
+          end
+          msg = Message.new
+          msg.body = body
+          msg.h1 = h1
+          msg.h2 = h2
+          messages[method] = msg
+        end
+        
+        message = QMessage.new(:q_publisher=>@event.q_publisher, :q_event=>@event, :q_subscription=>sub, :q_user=>sub.q_user, :body=>msg.body, :h1=>msg.h1, :h2=>msg.h2, :system_id=>@event.system_id)
+
+        next unless msg.body.not_blank?
+        begin
+          if method=='twitter'
+            do_twitter(sub, message, msg, twitter)
+          elsif method=='email'
+            do_email(sub, message, msg)
+          elsif method=='ios'
+            do_ios(sub, message, msg, ios)
+          elsif method=='web'
+            do_web(sub, message, msg)
+          end
+        rescue Exception => e
+          message.status = e.message 
+        end
+        message.save
+      end
+
+      sub.last_notification = Time.now
+      sub.save
+    end
+
+    @event.processed_at = Time.now
+    @event.save
+  end
+
+  def do_twitter(sub, message, twitter, msg)
+
+    unless twitter
+      message.status = 'Twitter not configured'
+      return
+    end
+
+          if sub.q_user.source==1
+            twitter.update(msg.body) # tweet
+            message.destination = "tweet"
+          else
+            return unless sub.q_user.twitter_handle.not_blank?
+            twitter.direct_message_create(sub.q_user.twitter_handle, msg.body) # direct message
+            message.destination = "@#{sub.q_user.twitter_handle}"
+          end
+        message.status = "OK"
+  end
+
+  def do_email(sub, message, msg)
+    message.destination = sub.q_user.email
+    QueueMailer.delay.notification(message.id, sub.q_user.email, sub.q_publisher.mail_from, msg.h1, msg.body)
+    message.status = "PENDING"
+  end
+
+  def do_ios(sub, message, msg, ios)
+    notification = Grocer::Notification.new(
+      device_token: sub.q_user.ios_device_token,
+      alert:        msg.body, 
+      sound:        "siren.aiff", 
+      expiry:       Time.now + 60*60,
+    )
+   
+    ios.push(notification) 
+    message.destination = "iOS"
+    message.status = "OK"
+  end
+
+  def do_web(sub, sent, msg)
+    message.status = "PENDING"
+    # do nothing - let the web api offer up the messages
+  end
+
+  def error(job, e)
+    notes = []
+    notes << "Exception Message: #{e.message}"
+    notes << "Stack Trace: #{e.backtrace.join("\n")}"
+    reference =  Digest::MD5.hexdigest(Time.now.to_s)[0..8]
+    Event.store("QueueJob error", nil, 0, notes.join("\n"), reference) 
+    Rails.logger.error "QueueJob error: #{reference} #{e.message}"
+  end
+
+  def success(job)
+  end
+
+end
+
+

data/app/mailers/notification.rb

@@ -20,6 +20,16 @@ class Notification < ActionMailer::Base
     mail :subject=>"#{Preference.get_cached(@sid, "site_name")}: New post on thread '#{truncate(post.topic_thread.title, :length=>80, :ommission=>'...')}'", :to=>@to_user.email, :from=>isfrom(@sid)
   end
 
+  def forgotten_password(to_user_id)
+    @user = User.find(to_user_id)
+    reset_url = Preference.get_cached(@user.system_id, "account_reset_url") || "/users/reset"
+
+    @reset_link =  Preference.get_cached(@user.system_id, "host") + reset_url + "/" + @user.reset_password_token
+    mail :subject=>t("account.forgotten_password_subject"),
+         :to=>@user.email,
+         :from=>isfrom(@user.system_id)
+  end
+
   def welcome_message(to, sid)
     @sid = sid
     mail(:from=>isfrom(sid), :to=>to.email, :subject=>"Thanks for joining")

data/app/mailers/queue_mailer.rb

@@ -0,0 +1,13 @@
+include ActionView::Helpers::TextHelper
+
+class QueueMailer < ActionMailer::Base
+
+  def notification(sent_id, to, from, subject, body)
+    qs = QSent.find(sent_id)
+    qs.status = "OK"
+    qs.save
+
+    mail(:from=>from, :to => to, :subject => subject, :body=>body)
+  end
+end
+