Wiki2Go 1.14.4 → 1.15.0

data/bin/Wiki2Go_make_repository.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require_gem "Wiki2Go"
+
+require 'fileutils'
+require 'Wiki2Go/Install/make_repository'
+
+Wiki2Go::RepositoryMaker::create(ARGV)
+

data/bin/Wiki2Go_make_site.rb

@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 
 require 'rubygems'
 require_gem "Wiki2Go"

data/lib/Web2Go/ERB_Interpreter.rb

@@ -26,7 +26,12 @@ module Web2Go
     
     
     # Execute an ERB script and return the resulting string
-    def execute(script,params=nil)
+    def execute(script,safe_mode,params=nil)
+
+      
+#      if safe_mode > 0 then
+#        script = "<% $SAFE = #{safe_mode};%>" + script
+#      end
       
       parser = ERB.new(script)
       

data/lib/Wiki2Go/FileStorage.rb

@@ -14,6 +14,7 @@ module Wiki2Go
     def initialize(dynamic_files,static_files)
       @path = dynamic_files
       @html = static_files
+      @cached_templates = Hash.new 
     end
 
     def exists?(path)
@@ -26,7 +27,7 @@ module Wiki2Go
       lines = Array.new(1)
       lines[0] = "" 
       modified_time = Time.now
-      if exists(File.join(subwiki,name)) then
+      if exists?(File.join(subwiki,name)) then
         path = text_filename(subwiki,name,"txt") 
         File.open(path) do |f|
           lines = f.readlines
@@ -71,10 +72,16 @@ module Wiki2Go
 
     def load_template(subwiki,name)
       path = template_filename(subwiki,name)
-      template = ""
-      File.open(path) do |f|
-        template = f.gets(nil) 
+      template = @cached_templates.fetch(path,nil)
+      if template.nil? then
+        template = ""
+        File.open(path) do |f|
+          template = f.gets(nil) 
+        end
+        template.gsub!(/\<!--\s*include=(\S*)\s*--\>/i) { load_template(subwiki,$1).rstrip }
+#        @cached_templates[path] = template
       end
+      template
     end
 
     def store_web_file(subwiki,page,content)
@@ -87,7 +94,7 @@ module Wiki2Go
 
     def search(subwiki,phrase)
       pages = Array.new
-      to_search_for = Regexp.new(phrase)
+      to_search_for = Regexp.new(phrase,Regexp::IGNORECASE)
       topics = all_pages_in(subwiki)
       topics.each do |topic|
         page = load_page(subwiki,topic)
@@ -98,14 +105,16 @@ module Wiki2Go
           end
         end
       end
+      pages.sort! { |a,b| b.lastmodified <=> a.lastmodified }
       return pages
     end
 
     def all_pages_in(subwiki) 
       textdir = text_directory(subwiki)
       pattern = File.join(textdir,"**/*.txt")
+      files = Dir[pattern]
       dirlen = pattern.length - 8
-      files = Dir[pattern].sort {|a,b| File.mtime(b) <=> File.mtime(a) }
+
       files = files.collect {|file| file[dirlen..-5] }
       return files
     end
@@ -120,14 +129,13 @@ module Wiki2Go
       dirs = dirs.collect { |name| File.basename(name) }
     end
 
-    def read_changes_in(subwiki,max_number,with_body) 
+    def read_changes_in(subwiki,max_number) 
       files = all_pages_in(subwiki)
       nbfiles = (max_number < files.length ? max_number : files.length)
-      changed_pages = Array.new
-      for i in 0..nbfiles-1
-        changed_pages << load_page(subwiki,files[i])
-      end
-      return changed_pages
+
+      changed_pages = files.collect { |file| load_page(subwiki,file) }
+      changed_pages.sort! { |a,b| b.lastmodified <=> a.lastmodified }
+      return changed_pages[0..nbfiles-1] 
     end
 
     def all_versions_of(subwiki,topic)
@@ -194,6 +202,14 @@ module Wiki2Go
       end
     end
 
+    def update_chongqed_spamlist(content)
+      filename = config_filename('chonqed_blacklist','txt')
+      ensure_directory_exists(filename)
+      File.open(filename,File::CREAT|File::TRUNC|File::RDWR) do |f|
+        f.puts content
+      end
+    end
+
     private
 
     def add_new_version_to(versions,topic,lines,modified_time)

data/lib/Wiki2Go/Install/make_repository.rb

@@ -0,0 +1,140 @@
+require 'tmpdir'
+require 'fileutils'
+require 'optparse'
+require 'etc'
+
+require 'rubygems'
+require_gem 'rscm'
+
+module Wiki2Go
+  class RepositoryMaker
+
+    def RepositoryMaker.create(args)
+      opts = OptionParser.new
+
+      directory = ''
+      user      = ''
+      group     = ''
+      opts.on("-d",'--directory dir',String) { |val| directory = File.expand_path(val) }
+      opts.on("-u",'--user username',String) { |val| user = val }
+      opts.on("-g",'--group groupname',String) { |val| group = val }
+      opts.on_tail("-h", "--help", "Show this message") do
+        puts opts
+        exit
+      end
+      opts.parse(args)
+
+      puts "Directory = #{directory}"
+      if directory.empty? then
+        puts opts
+      else
+        puts "Creating CVS in directory #{directory}"
+        cvs = RepositoryMaker.new(directory)
+        cvs.make_empty_repository(user,group)
+        cvs.update_configuration
+      end
+    end
+
+    def initialize(dir)
+      @dir = dir
+      @repository = RSCM::Cvs.new(@dir)
+    end
+
+    def make_empty_repository(user,group)
+      FileUtils::mkdir_p @dir
+      FileUtils::chmod   02775,@dir
+
+      lockdir = File.join(@dir,'locks')
+      FileUtils::mkdir_p lockdir
+      FileUtils::chmod   02775,lockdir
+
+      @repository.create
+      set_owner(@dir,user,group)
+
+    end
+
+    def update_configuration
+      checkout_to = File.join(Dir.tmpdir,'cvs_config')
+      FileUtils::rm_r checkout_to if File.exists?(checkout_to)
+      cvsroot = RSCM::Cvs.new(@dir,'CVSROOT')
+      cvsroot.checkout(checkout_to)
+
+      update_cvswrappers(checkout_to)
+      update_config(checkout_to)
+
+      cvsroot.commit(checkout_to,'update cvswrappers for binary files')
+      FileUtils::rm_r(checkout_to)
+    end
+
+    private
+
+    def update_cvswrappers(dir)
+      File.open(File.join(dir,'cvswrappers'),File::APPEND|File::WRONLY) do |file|
+        file.write cvswrappers_content
+      end
+    end
+
+    def update_config(dir)
+      config_file = File.join(dir,'config')
+      lock_directory = File.join(@dir,'locks') 
+      update_file(config_file,{/LockDir=/    => "LockDir=#{lock_directory}\n" , 
+                  /LogHistory=/ => "LogHistory=TMAR\n" ,
+                  /LockServer=/ => "LockServer=none\n" })
+    end
+
+    def update_file(name,substitutions)
+      lines = []
+      File.open(name,File::RDONLY) do |file| 
+        lines = file.readlines
+      end
+
+      lines = lines.collect { |line| substitute(line,substitutions) }
+
+      File.open(name,File::WRONLY|File::TRUNC) do |file|
+        file.write lines
+      end
+    end
+
+    def substitute(line,substitutions)
+      substitutions.each do |key,replacement|
+        if key.match(line) then
+          return replacement
+        end
+      end
+      line
+    end
+
+    def cvswrappers_content
+      return <<-END_CVS_WRAPPERS
+*.gif -k 'b'
+*.jpg -k 'b'
+*.jpeg -k 'b'
+*.png -k 'b'
+
+*.doc -k 'b'
+*.pdf -k 'b'
+END_CVS_WRAPPERS
+    end
+
+    def set_owner(dir,username,groupname)
+      info = Etc.getpwnam(username)
+      if !info.nil? then
+        user_id = info.uid
+        group_id = info.gid
+        if !groupname.nil? then
+          group_id = Etc.getgrnam(groupname).gid
+        end
+        File.chown(user_id,group_id,dir)
+        Dir.glob(File.join(dir,'**/*')).each do |file|
+          if file[0] != '.' then
+            mode = File.stat(file).mode | 0020
+            File.chmod(mode,file)
+            File.chown(user_id,group_id,file)
+          end
+        end
+      end
+    end
+
+  end
+
+end

data/lib/Wiki2Go/Install/make_site.rb

@@ -3,9 +3,10 @@
 require 'etc'
 require 'fileutils'
 require 'optparse'
+require "uri"
 
 require 'rubygems'
-WIKI2GO_VERSION = '1.14.0'
+WIKI2GO_VERSION = '1.15.0'
 require_gem "Wiki2Go","~>#{WIKI2GO_VERSION}"
 
 require 'Wiki2Go/PublicWikiConfig'
@@ -33,6 +34,7 @@ module Wiki2Go
     attr_accessor  :directory
     attr_accessor  :type
     attr_reader    :source_dir
+    attr_accessor  :subsite
 
     def initialize
       @user         = WebUser.new('www-data',nil)
@@ -42,6 +44,7 @@ module Wiki2Go
       @directory    = Dir.getwd
       @type         = ''
       @source_dir   = File.expand_path(File.dirname(__FILE__))
+      @subsite      = ''
     end
 
     def dotted_port
@@ -59,6 +62,17 @@ module Wiki2Go
         server + dotted_port
       end
     end
+
+    def server_at(url)
+      uri = URI::parse(url)
+      if uri.scheme.nil? then
+        @server = url
+      else
+       @server  = uri.host
+       @subsite = uri.path
+       @port    = uri.port.to_s
+     end
+    end
   end
 
   module Install
@@ -68,7 +82,7 @@ module Wiki2Go
 
       configuration = Configuration.new      
 
-      opts.on("-s URL",'--server URL',String) { |val| configuration.server = val }
+      opts.on("-s URL",'--server URL',String) { |val| configuration.server_at(val) }
       opts.on("-p",'--port URL',"(default is port 80)",String) { |val| configuration.port = val }
       opts.on("-u",'--user username',String) { |val| configuration.user.user = val }
       opts.on("-g",'--group groupname',String) { |val| configuration.user.group = val }
@@ -307,7 +321,7 @@ require "Wiki2Go/#{baseconfig}"
 # Uncomment if you want to add 'dot' graphics to your page (see http://www.graphviz.org)
 # require 'Wiki2Go/DotGraphics'
 
-class CgiOptions < #{baseconfig}
+class CgiOptions < Wiki2Go::#{baseconfig}
 
   def initialize
     super('#{config.directory}')
@@ -316,6 +330,7 @@ class CgiOptions < #{baseconfig}
     @debug = true
     # Choose whether to have a single wiki or several subwikis
     @multi_wiki = #{ config.default_wiki.empty? ? 'false' : 'true' }
+    
     # Email of administrator of the site. Will be obfuscated on the page.
     @site_admin = 'wiki2go@nayima.be'
 
@@ -324,6 +339,16 @@ class CgiOptions < #{baseconfig}
     # System group who has access to the files
     @group = '#{config.user.group}'
 
+    # Set your Amazon affiliate ID for ISBN links
+    @amazon_affiliate = 'agilesystems-21'
+
+    # Set to true if you want to allow the execution of Ruby code inside pages
+    # SECURITY WARNING: this code can do absolutely anything, only allow for trusted users
+    @allow_dynamic_pages = false
+
+    # The base path of the wiki if it is a subsite of a larger site
+    @subsite = '#{config.subsite}'
+    
     # Uncomment if you want to add 'dot' graphics to your page (see http://www.graphviz.org)
     # The path must point to the 'dot' exexcutable
     # add_processor('GRAPH',Wiki2Go::DotGraphics.new('/usr/bin/'))
@@ -339,7 +364,10 @@ TEMPLATE_END
         end
       end
 
-      logfile = File.join(config.directory,'wiki.log')
+      logdir = File.join(config.directory,'logs')
+      mkdir_p(logdir,{ :mode => 0775}) unless File.exists?(logdir)
+
+      logfile = File.join(logdir,'wiki.log')
       if !File.exists?(logfile) then
         touch logfile
       end
@@ -383,7 +411,6 @@ TEMPLATE_END
       wiki_html = File.join('site','html',wikiname)
       mkdir_p(wiki_html,{ :mode => 0775})
       copy_if_not_exists(source,wiki_html)
-
       
       make_static_homepage(config)
 
@@ -433,13 +460,31 @@ AuthUserFile #{config.directory}/config/passwords
 require valid-user
 Options ExecCGI FollowSymLinks
 </Directory>
-ErrorLog /var/log/apache/wiki_#{config.default_wiki}_err.log
-CustomLog /var/log/apache/wiki_#{config.default_wiki}.log combined
+ErrorLog #{config.directory}/logs/error.log
+CustomLog #{config.directory}/logs/access.log.log combined
 
 </VirtualHost>
+END_TEMPLATE
+
+      subsite_template = <<-END_TEMPLATE
+RedirectMatch ^#{config.subsite}/$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
+RedirectMatch ^#{config.subsite}$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
+ScriptAlias #{config.subsite}/scripts #{config.directory}/site/scripts
+ScriptAlias #{config.subsite}/scripts/secure #{config.directory}/site/scripts/secure
+Alias #{config.subsite} #{config.directory}/site
+<Directory "#{config.directory}/site/scripts">
+Options ExecCGI FollowSymLinks
+</Directory>
+<Directory "#{config.directory}/site/scripts/secure">
+AuthType Basic
+AuthName "#{config.default_wiki} wiki site"
+AuthUserFile #{config.directory}/config/passwords
+require valid-user
+Options ExecCGI FollowSymLinks
+</Directory>
 END_TEMPLATE
       
-      write_apache_config(config,template)
+      write_apache_config(config,(config.subsite.empty? ? template : subsite_template))
     end
     
     def Install.make_readwrite_apache_config(config)
@@ -461,13 +506,31 @@ AuthUserFile #{config.directory}/config/passwords
 require valid-user
 Options ExecCGI FollowSymLinks
 </Directory>
-ErrorLog /var/log/apache/wiki_#{config.default_wiki}_err.log
-CustomLog /var/log/apache/wiki_#{config.default_wiki}.log combined
+ErrorLog #{config.directory}/logs/error.log
+CustomLog #{config.directory}/logs/access.log.log combined
 
 </VirtualHost>
+END_TEMPLATE
+
+      subsite_template = <<-END_TEMPLATE
+RedirectMatch ^#{config.subsite}/$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
+RedirectMatch ^#{config.subsite}$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
+ScriptAlias #{config.subsite}/scripts #{config.directory}/site/scripts
+ScriptAlias #{config.subsite}/scripts/secure #{config.directory}/site/scripts/secure
+Alias #{config.subsite} #{config.directory}/site
+<Directory "#{config.directory}/site/scripts">
+Options ExecCGI FollowSymLinks
+</Directory>
+<Directory "#{config.directory}/site/scripts/secure">
+AuthType Basic
+AuthName "#{config.default_wiki} wiki site"
+AuthUserFile #{config.directory}/config/passwords
+require valid-user
+Options ExecCGI FollowSymLinks
+</Directory>
 END_TEMPLATE
       
-      write_apache_config(config,template)
+      write_apache_config(config,(config.subsite.empty? ? template : subsite_template))
     end
     
     def Install.make_apache_private_config(config)
@@ -488,13 +551,31 @@ Options ExecCGI FollowSymLinks
 <Directory "#{config.directory}/site/scripts/">
 Options ExecCGI FollowSymLinks
 </Directory>
-ErrorLog /var/log/apache/wiki_#{config.default_wiki}_err.log
-CustomLog /var/log/apache/wiki_#{config.default_wiki}.log combined
+ErrorLog #{config.directory}/logs/error.log
+CustomLog #{config.directory}/logs/access.log.log combined
 
 </VirtualHost>
+END_TEMPLATE
+
+    subsite_template = <<-END_TEMPLATE
+RedirectMatch ^#{config.subsite}/$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
+RedirectMatch ^#{config.subsite}$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
+ScriptAlias #{config.subsite}/scripts #{config.directory}/site/scripts
+Alias #{config.subsite} #{config.directory}/site
+<Directory "#{config.directory}/site/">
+AuthType Basic
+AuthName "#{config.default_wiki} wiki site"
+AuthUserFile #{config.directory}/config/passwords
+require valid-user
+Options ExecCGI FollowSymLinks
+</Directory>
+<Directory "#{config.directory}/site/scripts/">
+Options ExecCGI FollowSymLinks
+</Directory>
+
 END_TEMPLATE
       
-      write_apache_config(config,template)
+      write_apache_config(config,(config.subsite.empty? ? template : subsite_template))
     end
     
     def Install.make_static_homepage(configuration)
@@ -504,12 +585,13 @@ END_TEMPLATE
       when "public" then
         configtype = PublicWikiConfig
       else
-        configtype =ReadWriteWikiConfig
+        configtype = ReadWriteWikiConfig
       end
       config = configtype.new(configuration.directory)
       if config.generate_html then
+        config.subsite = configuration.subsite
         wiki = Wiki2Go::Wiki.new(config)
-        web = Wiki2Go::Web.new(configuration.server,configuration.port,"scripts","view.rb",configuration.default_wiki,"FrontPage")
+        web = Wiki2Go::Web.new(configuration.server,configuration.port,configuration.subsite,"scripts","view.rb",configuration.default_wiki,"FrontPage")
         wiki.generate_html(web)
       end
     end