goldencobra 1.2.0 → 1.2.8

data/app/controllers/goldencobra/application_controller.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Goldencobra
   class ApplicationController < ::ApplicationController
     before_filter :set_locale
@@ -53,9 +55,14 @@ module Goldencobra
         meta_tags[:noindex] = current_article.robots_no_index
       end
 
-      if !current_article.canonical_url.blank?
+      if current_article.canonical_url.present?
         # with an canonical_url for rel="canonical"
         meta_tags[:canonical] = current_article.canonical_url
+      else
+        d = Goldencobra::Domain.main
+        if d.present? && @current_client.present? && @current_client.id != d.id
+          meta_tags[:canonical] = "http://#{d.hostname}#{current_article.public_url}"
+        end
       end
 
       set_meta_tags meta_tags

data/app/controllers/goldencobra/articles_controller.rb

@@ -12,13 +12,14 @@ module Goldencobra
     end
 
     def show_cache_path
+      current_client_id = @current_client.try(:id).to_s
       geo_cache = Goldencobra::Setting.for_key("goldencobra.geocode_ip_address") == "true" && session[:user_location].present? && session[:user_location].city.present? ? session[:user_location].city.parameterize.underscore : "no_geo"
       date_cache = Goldencobra::Setting.for_key("goldencobra.article.max_cache_24h") == "true" ? Date.today.strftime("%Y%m%d") : "no_date"
       art_cache = @article ? @article.cache_key : "no_art"
       user_cache = current_user.present? ? current_user.id : "no_user"
       flash_message = session.present? && session['flash'].present? ? Time.now.to_i : ""
       auth_code = params[:auth_token].present? ? 'with_auth' : ''
-      "g/#{I18n.locale.to_s}/#{geo_cache}/#{user_cache}/#{date_cache}/#{params[:article_id]}/#{art_cache}_#{params[:pdf]}_#{params[:frontend_tags]}__#{params[:iframe]}#{flash_message}_#{auth_code}"
+      "c-#{current_client_id}/g/#{I18n.locale.to_s}/#{geo_cache}/#{user_cache}/#{date_cache}/#{params[:article_id]}/#{art_cache}_#{params[:pdf]}_#{params[:frontend_tags]}__#{params[:iframe]}#{flash_message}_#{auth_code}"
     end
 
 
@@ -79,25 +80,6 @@ module Goldencobra
       end
     end
 
-    # def convert_to_pdf
-    #   if @article
-    #     require 'net/http'
-    #     require "uri"
-    #     uid = Goldencobra::Setting.for_key("goldencobra.html2pdf_uid")
-    #     uri = URI.parse("http://html2pdf.ikusei.de/converter/new.xml?&print_layout=true&uid=#{uid}&url=#{@article.absolute_public_url}#{CGI::escape('?pdf=1')}")
-    #     logger.debug(uri)
-    #     http = Net::HTTP.new(uri.host, uri.port)
-    #     request = Net::HTTP::Get.new(uri.request_uri)
-    #     response = http.request(request)
-    #     doc = Nokogiri::HTML(response.body)
-    #     file = doc.at_xpath("//file-name").text
-    #     redirect_to "http://html2pdf.ikusei.de#{file}"
-    #   else
-    #     render :text => "404", :status => 404
-    #   end
-    # end
-
-
     def sitemap
       if Goldencobra::Setting.for_key("goldencobra.use_ssl") == "true"
         @use_ssl = "s"

data/app/controllers/goldencobra/manage_controller.rb

@@ -31,8 +31,12 @@ module Goldencobra
     end
 
     def call_for_support
-      Goldencobra::ConfirmationMailer.send_support_mail(params[:link]).deliver
-      render :text => "200"
+      if current_user || current_visitor
+        Goldencobra::ConfirmationMailer.send_support_mail(params[:link]).deliver
+        render :text => "200"
+      else
+        render :text => "401"
+      end
     end
 
   end

data/app/helpers/goldencobra/articles_helper.rb

@@ -19,6 +19,26 @@ module Goldencobra
     end
 
 
+    #Parse text for a single Word and make a link to an Article to this Word as a Subarticle of a given Article
+    def parse_glossar_entries(content,tag_name, parent_article_id=nil)
+      glossar_parent = nil
+      if parent_article_id
+        glossar_parent = Goldencobra::Article.find_by_id(parent_article_id)
+        glossar_article = glossar_parent.children.where(:breadcrumb => tag_name).first
+      else
+        glossar_article = Goldencobra::Article.where(:breadcrumb => tag_name).first
+      end
+      unless glossar_article
+        glossar_article = Goldencobra::Article.create(:title => tag_name, :breadcrumb => tag_name, :article_type => "Default Show", :parent => glossar_parent)
+      end
+
+      if glossar_article.present?
+        replace_with = "<a href='#{glossar_article.public_url}' class='glossar'>#{tag_name}</a>"
+        content = content.gsub(/\b(?<!\/)#{tag_name}(?!<)\b/, "#{replace_with}")
+      end
+    end
+
+
     def render_article_image_gallery
       if @article
         result = ""

data/app/helpers/goldencobra/navigation_helper.rb

@@ -20,7 +20,6 @@ module Goldencobra
       end
     end
 
-    #
     # navigation_menu("Hauptmenue", :depth => 1, :class => "top", :id => "menue1", :offset => 1 )
     # depth: 0 = unlimited, 1 = self, 2 = self and children 1. grades, 3 = self and up to children 2.grades
     # offset: number of levels to skip, 0 = none
@@ -58,19 +57,29 @@ module Goldencobra
 
       current_depth = master_menue.ancestry_depth
       #Check for Permission
-      if params[:frontend_tags] && params[:frontend_tags].class != String && params[:frontend_tags][:format] && params[:frontend_tags][:format] == "email"
-        #Wenn format email, dann gibt es keinen realen webseit besucher
+      begin
+        if params.present? && params[:frontend_tags].present? && params[:frontend_tags].class != String && params[:frontend_tags][:format] && params[:frontend_tags][:format] == "email"
+          #Wenn format email, dann gibt es keinen realen webseit besucher
+          ability = Ability.new()
+        else current_user.present? || current_visitor.present?
+          operator = current_user || current_visitor
+          ability = Ability.new(operator)
+        end
+      rescue
         ability = Ability.new()
-      else
-        operator = current_user || current_visitor
-        ability = Ability.new(operator)
       end
+
       if !ability.can?(:read, master_menue)
         return ""
       end
+
       if master_menue.present?
         content = ""
-        subtree_menues = master_menue.subtree.after_depth(current_depth + offset).to_depth(current_depth + depth).active.includes(:permissions).includes(:image)
+        if current_article.present?
+          subtree_menues = master_menue.subtree.after_depth(current_depth).to_depth(current_depth + depth).active.includes(:permissions).includes(:image)
+        else
+          subtree_menues = master_menue.subtree.after_depth(current_depth + offset).to_depth(current_depth + depth).active.includes(:permissions).includes(:image)
+        end
         subtree_menues = subtree_menues.to_a.delete_if{|a| !ability.can?(:read, a)}
 
         current_depth = 1
@@ -90,7 +99,7 @@ module Goldencobra
     private
 
     def menue_roots(menue_array)
-      min_of_layers = menue_array.map{|a| a.ancestry.split("/").count }.min
+      min_of_layers = menue_array.map{|a| a.ancestry.to_s.split("/").count }.min
       return menue_array.select{|a| a.ancestry.to_s.split("/").count == min_of_layers }
     end
 
@@ -104,13 +113,18 @@ module Goldencobra
       else
         child_target_link = child.target.gsub("\"",'')
       end
-      child_link = content_tag(:a, child.title, :href => child_target_link)
+      if child.remote
+        link_options = {"data-remote" => "true",:href => child_target_link}
+      else
+        link_options = {:href => child_target_link}
+      end
+      child_link = content_tag(:a, child.title, link_options )
       image_link = child.image.present? ? image_tag(child.image.image(:original)) : ""
-      child_link = child_link + content_tag(:a, image_link, :href => child_target_link, :class => "navigtion_link_imgage_wrapper") unless options[:show_image] == false
-      child_link = child_link + content_tag(:a, child.description_title, :href => child_target_link, :class => "navigtion_link_description_title") unless options[:show_description_title] == false
+      child_link = child_link + content_tag(:a, image_link, link_options.merge(:class => "navigtion_link_imgage_wrapper")) unless options[:show_image] == false
+      child_link = child_link + content_tag(:a, child.description_title, link_options.merge(:class => "navigtion_link_description_title")) unless options[:show_description_title] == false
       template = Liquid::Template.parse(child.description)
       child_link = child_link + content_tag("div", raw(template.render(Goldencobra::Article::LiquidParser)), :class => "navigtion_link_description") unless options[:show_description] == false
-      child_link = child_link + content_tag(:a, child.call_to_action_name, :href => child_target_link, :class => "navigtion_link_call_to_action_name") unless options[:show_call_to_action_name] == false
+      child_link = child_link + content_tag(:a, child.call_to_action_name, link_options.merge(:class => "navigtion_link_call_to_action_name")) unless options[:show_call_to_action_name] == false
 
       current_depth += 1
       child_elements = menue_children(child, subtree_menues)
@@ -127,7 +141,19 @@ module Goldencobra
           child_link = child_link + content_tag(:ul, raw(content_level), :class => "level_#{current_depth} children_#{visible_child_element_count}" )
         end
       end
-      return content_tag(:li, raw(child_link),"data-id" => child.id , :class => "#{ visible_child_element_count > 0 ? 'has_children' : ''}  #{child.has_active_child?(request, subtree_menues) ? 'has_active_child' : ''}    #{child.is_active?(request) ? 'active' : ''}    #{child.css_class.gsub(/\W/,' ')}".squeeze(' ').strip)
+
+      # to have path from context, when liquid witohut request
+      # logger.info("-------------")
+      # logger.info(options[:liquid_url_path].present?)
+      # logger.info(options[:liquid_url_path])
+      # logger.info(request.blank?)
+      # logger.info("-------------")
+      # if options[:liquid_url_path].present? && request.blank?
+      #   path_obj = Struct.new(:path)
+      #   request = path_obj.new(options[:liquid_url_path])
+      # end
+
+      return content_tag(:li, raw(child_link), "data-id" => child.id, :class => "#{ visible_child_element_count > 0 ? 'has_children' : '' } #{ (child.has_active_child?(request, subtree_menues) ? 'has_active_child' : '') if request.present? } #{ (child.is_active?(request) ? 'active' : '') if request.present? } #{ child.css_class.gsub(/\W/,' ') }".squeeze(' ').strip)
     end
 
   end

data/app/models/ability.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 class Ability
   include CanCan::Ability
 

data/app/models/goldencobra/article.rb

@@ -77,6 +77,7 @@ module Goldencobra
 
     accepts_nested_attributes_for :metatags, :allow_destroy => true, :reject_if => proc { |attributes| attributes['value'].blank? }
     accepts_nested_attributes_for :article_images, :allow_destroy => true
+    accepts_nested_attributes_for :images, :allow_destroy => true
     accepts_nested_attributes_for :permissions, :allow_destroy => true
     accepts_nested_attributes_for :author, :allow_destroy => true
 
@@ -85,7 +86,7 @@ module Goldencobra
     friendly_id     :for_friendly_name, use: [:slugged] #, :history
     web_url         :external_url_redirect
     has_paper_trail
-    liquid_methods :title, :created_at, :updated_at, :subtitle, :context_info, :id
+    liquid_methods :title, :created_at, :updated_at, :subtitle, :context_info, :id, :frontend_tags
 
     validates_presence_of :title, :article_type
     validates_format_of :url_name, :with => /\A[\w\d-]+\Z/, allow_blank: true
@@ -266,7 +267,6 @@ module Goldencobra
     end
 
     Goldencobra::Article.init_image_methods
-
     def image(position="standard", size="original")
       any_images = self.article_images.where(position: position)
       if any_images.any? && any_images.first.image && any_images.first.image.image
@@ -276,6 +276,7 @@ module Goldencobra
       end
     end
 
+
     def respond_to_all?(method_name)
       begin
         return eval("self.#{method_name}.present?")
@@ -342,9 +343,7 @@ module Goldencobra
           @list_of_articles = @list_of_articles.flatten.shuffle
         elsif self.sort_order == "Alphabetical"
           @list_of_articles = @list_of_articles.flatten.sort_by{|article| article.title }
-        elsif self.sort_order == "Created_at"
-          @list_of_articles = @list_of_articles.flatten.sort_by{|article| article.created_at.to_i }
-        elsif self.respond_to?(self.sort_order)
+        elsif self.respond_to?(self.sort_order.downcase)
           sort_order = self.sort_order.downcase
           @list_of_articles = @list_of_articles.flatten.sort_by{|article| article.respond_to?(sort_order) ? article.send(sort_order) : article }
         elsif self.sort_order.include?(".")
@@ -693,7 +692,7 @@ module Goldencobra
       else
         Goldencobra::Article.active.each do |article|
           article.updated_at = Time.now
-          article.save
+          article.without_versioning :save
         end
       end
     end

data/app/models/goldencobra/article_image.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: goldencobra_article_images

data/app/models/goldencobra/article_widget.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: goldencobra_article_widgets

data/app/models/goldencobra/author.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Goldencobra
 	class Author < ActiveRecord::Base
 		has_many :article

data/app/models/goldencobra/comment.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: goldencobra_comments

data/app/models/goldencobra/domain.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Goldencobra
   class Domain < ActiveRecord::Base
 
@@ -7,6 +9,20 @@ module Goldencobra
     validates_presence_of :hostname
   	validates_uniqueness_of :hostname
 
+    before_save :mark_as_main
+
+    def self.main
+      Goldencobra::Domain.where(:main => true).first
+    end
+
+    def mark_as_main
+      if self.main == true
+        Goldencobra::Domain.where("id <> #{self.id.to_i}").each do |a|
+          a.main = false
+          a.save
+        end
+      end
+    end
 
   	def self.current
   		Thread.current[:current_client]

data/app/models/goldencobra/help.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: goldencobra_helps

data/app/models/goldencobra/import_metadata.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Goldencobra
   class ImportMetadata < ActiveRecord::Base
   	ImportDataFunctions = []

data/app/models/goldencobra/location.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: goldencobra_locations
@@ -39,7 +41,7 @@ module Goldencobra
     end
 
     def skip_geocoding_once_or_always
-      self.skip_geocode || self.manual_geocoding
+      (Goldencobra::Setting.for_key("goldencobra.locations.geocoding") == "false" ) || self.skip_geocode || self.manual_geocoding
     end
   end
 end

data/app/models/goldencobra/menue.rb

@@ -23,7 +23,7 @@ module Goldencobra
   class Menue < ActiveRecord::Base
     attr_accessible :title, :target, :css_class, :active, :ancestry, :parent_id,
                     :sorter, :description, :call_to_action_name, :description_title, :image_attributes, :image_id,
-                    :permissions_attributes
+                    :permissions_attributes, :remote
     has_ancestry :orphan_strategy => :rootify, :cache_depth => true
     belongs_to :image, :class_name => Goldencobra::Upload, :foreign_key => "image_id"
 
@@ -66,7 +66,7 @@ module Goldencobra
 
     def has_active_child?(request, subtree_menues)
       @has_active_child_result ||= {}
-      @has_active_child_result[request.path.squeeze("/").split("?")[0]] ||= has_active_descendant?(subtree_menues,request)
+      @has_active_child_result[request.path.squeeze("/").split("?")[0]] ||= has_active_descendant?(subtree_menues, request)
     end
 
     def has_active_descendant?(subtree_menues,request)

data/app/models/goldencobra/metatag.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: goldencobra_metatags

data/app/models/goldencobra/permission.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: goldencobra_permissions

data/app/models/goldencobra/role.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: goldencobra_roles

data/app/models/goldencobra/role_user.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: goldencobra_roles_users

data/app/models/goldencobra/setting.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: goldencobra_settings

data/app/models/goldencobra/tracking.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: goldencobra_trackings

data/app/models/goldencobra/upload.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: goldencobra_uploads
@@ -50,8 +52,8 @@ module Goldencobra
 
     def unzip_files
       if self.image_file_name.include?(".zip") && File.exists?(self.image.path)
-        require 'zip/zip'
-        zipped_files = Zip::ZipFile.open(self.image.path)
+        require 'zip'
+        zipped_files = Zip::File.open(self.image.path)
         int = 0
         zipped_files.each do |zipped_file|
           int = int + 1

data/app/models/goldencobra/vita.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: goldencobra_vita

data/app/models/translation.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: translations

data/app/models/user.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: users

data/app/models/visitor.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # == Schema Information
 #
 # Table name: visitors