From 752cfd30e986d8a77bfcef51ee4a15ba3c044059 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 26 May 2010 19:16:02 -0400
Subject: general extension of regex matches for http: to include https:

---
 lib/sisu/v2/composite.rb        |  2 +-
 lib/sisu/v2/html_format.rb      |  4 ++--
 lib/sisu/v2/html_promo.rb       | 10 +++++-----
 lib/sisu/v2/param.rb            |  2 +-
 lib/sisu/v2/remote.rb           |  4 ++--
 lib/sisu/v2/shared_html_lite.rb |  2 +-
 lib/sisu/v2/sisupod_make.rb     |  2 +-
 lib/sisu/v2/texpdf.rb           |  2 +-
 lib/sisu/v2/xml_format.rb       |  4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/sisu/v2/composite.rb b/lib/sisu/v2/composite.rb
index 44518957..4ff53498 100644
--- a/lib/sisu/v2/composite.rb
+++ b/lib/sisu/v2/composite.rb
@@ -179,7 +179,7 @@ module SiSU_Assemble
       if file[:images].length > 0
         file[:images].flatten!
         file[:images].uniq!
-        file[:images].delete_if {|x| x =~/http:\/\// }
+        file[:images].delete_if {|x| x =~/https?:\/\// }
       end
       file
     end
diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb
index 00706192..b3712690 100644
--- a/lib/sisu/v2/html_format.rb
+++ b/lib/sisu/v2/html_format.rb
@@ -408,7 +408,7 @@ WOK
       end
     end
     def links_guide_vertical_open #???
-      url=((defined? @vz.url_hp) && @vz.url_hp =~/^http:\/\/\S+$/ ? @vz.url_hp : @vz.url_home)
+      url=((defined? @vz.url_hp) && @vz.url_hp =~/^https?:\/\/\S+$/ ? @vz.url_hp : @vz.url_home)
       %{
 <div id="vertical_links">
   <ul id="vertical">
@@ -428,7 +428,7 @@ WOK
 <!- quick ref -!>}
     end
     def links_guide_horizontal_open #???
-      url=((defined? @vz.url_hp) && @vz.url_hp =~/^http:\/\/\S+$/ ? @vz.url_hp : @vz.url_home)
+      url=((defined? @vz.url_hp) && @vz.url_hp =~/^https?:\/\/\S+$/ ? @vz.url_hp : @vz.url_home)
       %{
 <div id="horizontal_links">
   <ul id="horizontal">
diff --git a/lib/sisu/v2/html_promo.rb b/lib/sisu/v2/html_promo.rb
index 92ea15ec..0b3e500a 100644
--- a/lib/sisu/v2/html_promo.rb
+++ b/lib/sisu/v2/html_promo.rb
@@ -154,10 +154,10 @@ module SiSU_HTML_promo
           : "#{Db[:name_prefix]}#{@prod['db']}"
         else nil
         end
-        action=if @prod['action']=~/^http:\/\//
+        action=if @prod['action']=~/^https?:\/\//
           @prod['action']
         elsif defined? @rc['search']['sisu']['action'] \
-        and @rc['search']['sisu']['action'] =~/^http:\/\//
+        and @rc['search']['sisu']['action'] =~/^https?:\/\//
           @rc['search']['sisu']['action']
         else nil
         end
@@ -169,7 +169,7 @@ module SiSU_HTML_promo
       end
       def search_form_hyperestraier(table=true)
         action=if defined? @rc['search']['hyperestraier']['action'] \
-        and @rc['search']['hyperestraier']['action'] =~/^http:\/\//
+        and @rc['search']['hyperestraier']['action'] =~/^https?:\/\//
           @rc['search']['hyperestraier']['action']
         else nil
         end
@@ -187,7 +187,7 @@ module SiSU_HTML_promo
             and x['url'] \
             and x['title']
               subtitle=x['subtitle'] ? %{ - #{x['subtitle']}} : ''
-              url_=(x['url'] =~/http:/) ? x['url'] : "../#{x['url']}"
+              url_=(x['url'] =~/https?:/) ? x['url'] : "../#{x['url']}"
               links_a << %{<p class="pane_link"><a href="#{url_}">#{x['title']}#{subtitle}</a></p>\n}
             end
           end
@@ -199,7 +199,7 @@ module SiSU_HTML_promo
         @prod['image'] ? %{<img border="0" src="../_sisu/image/#{@prod['image']}" /><br />} : ''
       end
       def url_link
-        @url_=if @prod['url'] =~/http:/
+        @url_=if @prod['url'] =~/https?:/
           "#{@prod['url']}"
         else "../#{@prod['url']}" # "#{@env.url.root}/#{@prod['url']}"
         end
diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb
index 285859d7..fbc4ccde 100644
--- a/lib/sisu/v2/param.rb
+++ b/lib/sisu/v2/param.rb
@@ -1098,7 +1098,7 @@ module SiSU_Param
         if @ec[:image].length > 0
           @ec[:image].flatten!
           @ec[:image].uniq!
-          @ec[:image].delete_if {|x| x =~/http:\/\// }
+          @ec[:image].delete_if {|x| x =~/https?:\/\// }
           @ec[:image].sort!
         end
         @ec[:audio].uniq!; @ec[:audio].flatten!; @ec[:audio].sort!
diff --git a/lib/sisu/v2/remote.rb b/lib/sisu/v2/remote.rb
index 4efe1770..32bc336d 100644
--- a/lib/sisu/v2/remote.rb
+++ b/lib/sisu/v2/remote.rb
@@ -145,7 +145,7 @@ module SiSU_Remote
             and images.length > 1
               images.flatten!
               images.uniq!
-              images.delete_if {|x| x =~/http:\/\// }
+              images.delete_if {|x| x =~/https?:\/\// }
               images.sort!
               @msg,@msgs='downloading images:', [ images.join(',') ]
               @tell.call.warn unless @opt.cmd =~/q/
@@ -181,7 +181,7 @@ module SiSU_Remote
       @requested_file=requested_file
     end
     def pod
-      re_p_div=/http:\/\/([^\/]+)(\/\S+)\/(sisupod(?:\.zip)?|\S+?(?:\.ss[mt]\.zip)?|[^\/]+?\.ssp)$/
+      re_p_div=/https?:\/\/([^\/]+)(\/\S+)\/(sisupod(?:\.zip)?|\S+?(?:\.ss[mt]\.zip)?|[^\/]+?\.ssp)$/
       re_p=/(sisupod(?:\.zip)?|\S+?\.ss[mt](?:\.zip)?|[^\/]+?\.ssp)$/
       if @requested_file =~ re_p_div
         @site,@pth,@pod= re_p_div.match(@requested_file).captures
diff --git a/lib/sisu/v2/shared_html_lite.rb b/lib/sisu/v2/shared_html_lite.rb
index c1f53e10..2743a450 100644
--- a/lib/sisu/v2/shared_html_lite.rb
+++ b/lib/sisu/v2/shared_html_lite.rb
@@ -112,7 +112,7 @@ module SiSU_Format_Shared
             word.gsub!(/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}(#{Mx[:url_o]}\S+?#{Mx[:url_c]}|image)/,ins)
           else
             u=case u
-            when /^http:\/\//
+            when /^https?:\/\//
               u
             when /^:/
               u.gsub!(/^:/,'')
diff --git a/lib/sisu/v2/sisupod_make.rb b/lib/sisu/v2/sisupod_make.rb
index c721f257..188e3315 100644
--- a/lib/sisu/v2/sisupod_make.rb
+++ b/lib/sisu/v2/sisupod_make.rb
@@ -219,7 +219,7 @@ module SiSU_Doc
       and images.length > 1
         images.flatten!
         images.uniq!
-        images.delete_if {|x| x =~/http:\/\// }
+        images.delete_if {|x| x =~/https?:\/\// }
         #images.sort!
         image_path_pwd='_sisu/image'
         path_pod_conf="#{@env.path.processing}/sisupod/_sisu"
diff --git a/lib/sisu/v2/texpdf.rb b/lib/sisu/v2/texpdf.rb
index 84347cba..8b92270f 100644
--- a/lib/sisu/v2/texpdf.rb
+++ b/lib/sisu/v2/texpdf.rb
@@ -533,7 +533,7 @@ module SiSU_TeX
           tst=SiSU_TeX_Pdf::Format_text_object.new(@md,dob)
           dob=tst.urls_txt_and_images
           dob
-        elsif dob.tmp =~/http:\/\/\S+\b/m \
+        elsif dob.tmp =~/https?:\/\/\S+\b/m \
         and dob.is =='code'
           dob=SiSU_TeX_Pdf::Bare_urls.new(@md,dob).bare_urls_in_code
           dob
diff --git a/lib/sisu/v2/xml_format.rb b/lib/sisu/v2/xml_format.rb
index ccef9b19..1558315c 100644
--- a/lib/sisu/v2/xml_format.rb
+++ b/lib/sisu/v2/xml_format.rb
@@ -665,7 +665,7 @@ WOK
       end
     end
     def links_guide_vertical_open #???
-      url=(((defined? @vz.url_hp) && @vz.url_hp =~/^http:\/\/\S+$/) ? @vz.url_hp : @vz.url_home)
+      url=(((defined? @vz.url_hp) && @vz.url_hp =~/^https?:\/\/\S+$/) ? @vz.url_hp : @vz.url_home)
       %{
 <div id="vertical_links">
   <ul id="vertical">
@@ -685,7 +685,7 @@ WOK
 <!- quick ref -!>}
     end
     def links_guide_horizontal_open #???
-      url=(((defined? @vz.url_hp) && @vz.url_hp =~/^http:\/\/\S+$/) ? @vz.url_hp : @vz.url_home)
+      url=(((defined? @vz.url_hp) && @vz.url_hp =~/^https?:\/\/\S+$/) ? @vz.url_hp : @vz.url_home)
       %{
 <div id="horizontal_links">
   <ul id="horizontal">
-- 
cgit v1.2.3