From 630b240fa906ef86443a256f103eeb17ac011407 Mon Sep 17 00:00:00 2001
From: Doug Youch <doug@sessionm.com>
Date: Mon, 31 Oct 2011 14:54:23 -0400
Subject: [PATCH] added support to use the full_url

---
 app/models/content_filter.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/models/content_filter.rb b/app/models/content_filter.rb
index 5a6743f9..597f624f 100644
--- a/app/models/content_filter.rb
+++ b/app/models/content_filter.rb
@@ -98,9 +98,9 @@ def self.live_filter(name,code,options={})
   def self.full_html_filter(code,options={}) #:nodoc:
      # Need file filter to output __fs__ stuff
     if options[:folder_id] && folder = DomainFile.find_by_id(options[:folder_id])
-      code = html_replace_images(code,folder.file_path,options[:live_url])
+      code = html_replace_images(code,folder.file_path,options[:live_url],options[:full_url])
     else
-      code = html_replace_images(code,'',options[:live_url])
+      code = html_replace_images(code,'',options[:live_url],options[:full_url])
     end
     code
   end
@@ -113,9 +113,9 @@ def self.safe_html_filter(code,options={}) #:nodoc:
   def self.markdown_filter(code,options={}) #:nodoc:
     # Need file filter to output __fs__ stuff
     if options[:folder_id] && folder = DomainFile.find_by_id(options[:folder_id])
-      code = markdown_replace_images(code,folder.file_path,options[:live_url])
+      code = markdown_replace_images(code,folder.file_path,options[:live_url],options[:full_url])
     else
-      code = markdown_replace_images(code,'',options[:live_url])
+      code = markdown_replace_images(code,'',options[:live_url],options[:full_url])
     end
     begin
       Maruku.new(code).to_html
@@ -128,9 +128,9 @@ def self.markdown_filter(code,options={}) #:nodoc:
   def self.textile_filter(code,options={}) #:nodoc:
     # Need file filter images/ links and images
     if options[:folder_id] && folder = DomainFile.find_by_id(options[:folder_id])
-      code = textile_replace_images(code,folder.file_path,options[:live_url])
+      code = textile_replace_images(code,folder.file_path,options[:live_url],options[:full_url])
     else
-      code = textile_replace_images(code,'',options[:live_url])
+      code = textile_replace_images(code,'',options[:live_url],options[:full_url])
     end
     begin
       RedCloth.new(code).to_html
@@ -161,7 +161,7 @@ def self.safe_link(code)
     @@content_filter_sanitizer.auto_link(code,  :html => { :target => '_blank', :rel => 'nofollow' } )
   end
   
-  def self.markdown_replace_images(code,image_folder_path,live_url = false) #:nodoc:
+  def self.markdown_replace_images(code, image_folder_path, live_url=false, full_url=false) #:nodoc:
     cd =  code.gsub(/(\!?)\[([^\]]+)\]\(images\/([^"')]+)/) do |mtch|
       img = $1
       alt_text = $2
@@ -171,7 +171,7 @@ def self.markdown_replace_images(code,image_folder_path,live_url = false) #:nodo
         url = full_url
       else
         df = DomainFile.find_by_file_path(image_folder_path + "/" + image_path,:conditions => {  :private => false })
-        url = df ? (live_url ? df.url(size) : df.editor_url(size)) :  "/images/site/missing_thumb.gif" 
+        url = df ? (live_url ? df.send(full_url ? :full_url : :url, size) : df.editor_url(size)) :  "/images/site/missing_thumb.gif" 
       end
       "#{img}[#{alt_text}](#{url} "
     end
@@ -194,7 +194,7 @@ def self.wysiwyg_replace_images(html)
 
   end
 
- def self.html_replace_images(code,image_folder_path,live_url = false) #:nodoc:
+ def self.html_replace_images(code, image_folder_path, live_url=false, full_url=false) #:nodoc:
 
     re = Regexp.new("(['\"])images\/([a-zA-Z0-9_\\-\\/. :]+?)\\1" ,Regexp::IGNORECASE | Regexp::MULTILINE)
     cd =  code.gsub(re) do |mtch|
@@ -204,7 +204,7 @@ def self.html_replace_images(code,image_folder_path,live_url = false) #:nodoc:
         url,size = url.split(":")
       end
       df = DomainFile.find_by_file_path(image_folder_path + "/" + url)
-      url = df ?  (live_url ? df.url(size) : df.editor_url(size))  : "/images/site/missing_thumb.gif"
+      url = df ?  (live_url ? df.send(full_url ? :full_url : :url, size) : df.editor_url(size))  : "/images/site/missing_thumb.gif"
       "#{wrapper}#{url}#{wrapper}"
     end
 
@@ -212,7 +212,7 @@ def self.html_replace_images(code,image_folder_path,live_url = false) #:nodoc:
   end
 
 
-  def self.textile_replace_images(code,image_folder_path,live_url = false) #:nodoc:
+  def self.textile_replace_images(code, image_folder_path, live_url=false, full_url=false) #:nodoc:
 
     re = Regexp.new("(\!|\:)images\/([a-zA-Z0-9_\\-\\/. :]+)" ,Regexp::IGNORECASE | Regexp::MULTILINE)
     cd =  code.gsub(re) do |mtch|
@@ -222,7 +222,7 @@ def self.textile_replace_images(code,image_folder_path,live_url = false) #:nodoc
         url,size = url.split(":")
       end
       df = DomainFile.find_by_file_path(image_folder_path + "/" + url,:conditions => {  :private => false })
-      url = df ?  (live_url ? df.url(size) : df.editor_url(size)) : "/images/site/missing_thumb.gif"
+      url = df ?  (live_url ? df.send(full_url ? :full_url : :url, size) : df.editor_url(size)) : "/images/site/missing_thumb.gif"
       "#{prefix}#{url}"
     end