zena 1.2.2 → 1.2.3

data/lib/zena/deploy/httpd.rhtml

@@ -1,9 +1,20 @@
 # zena apache2 setup for <%= config[:balancer] %>
 # automatically generated file
 
+<% if config[:ssl] %>
+NameVirtualHost *:80
+NameVirtualHost *:443
+
+SSLProtocol all
+SSLCipherSuite HIGH:MEDIUM
+<% else %>
 NameVirtualHost *
+<% end %>
+
 <% if config[:app_type] == :passenger  %>
-LoadModule upload_progress_module /usr/lib/apache2/modules/mod_upload_progress.so
+LoadModule passenger_module /usr/lib/ruby/gems/1.8/gems/<%= config[:passenger_version] || 'passenger-3.0.17' %>/ext/apache2/mod_passenger.so
+PassengerRoot /usr/lib/ruby/gems/1.8/gems/<%= config[:passenger_version] || 'passenger-3.0.17' %>
+PassengerRuby /usr/bin/ruby1.8
 PassengerDefaultUser www-data
 <% elsif config[:app_type] == :mongrel %>
 <Proxy *>
@@ -22,16 +33,8 @@ PassengerDefaultUser www-data
 <% end %>
 
 <IfModule mod_expires.c>
-  ExpiresActive on
-  ExpiresDefault A0
-  ExpiresByType image/jpeg "access plus 1 year"
-  ExpiresByType image/gif "access plus 1 year"
-  ExpiresByType image/png "access plus 1 year"
-  ExpiresByType text/css "access plus 1 year"
-  ExpiresByType application/javascript "access plus 1 year"
+  <FilesMatch "\.(ico|flv|jpe?g|png|gif|js|css|swf)">
+    ExpiresActive On
+    ExpiresDefault "access plus 1 year"
+  </FilesMatch>
 </IfModule>
-
-<% if config[:ssl] %>
-SSLProtocol all
-SSLCipherSuite HIGH:MEDIUM
-<% end %>

data/lib/zena/deploy/stats.vhost.rhtml

@@ -1,7 +1,7 @@
 # zena awstats vhost for <%= config[:host] %>
 # automatically generated file
 
-<VirtualHost *>
+<VirtualHost *<%= vhost_port %>>
   ServerName stats.<%= config[:host] %>
 
   DocumentRoot /usr/share/doc/awstats/examples

data/lib/zena/deploy/vhost.rhtml

@@ -1,7 +1,7 @@
 # zena apache2 vhost for <%= config[:host] %>
 # automatically generated file
 
-<VirtualHost *<%= config[:ssl] ? ':443' : '' %>>
+<VirtualHost *<%= vhost_port %>>
   ServerName <%= config[:host] %>
 
   DocumentRoot <%= config[:sites_root] %>/<%= config[:host] %>/public
@@ -13,6 +13,8 @@
     AllowOverride None
     Order allow,deny
     Allow from all
+    # Passenger does not support MultiViews and we do not need it.
+    Options -MultiViews
   </Directory>
 
   <% if config[:static].include?('cgi-bin') %>
@@ -42,7 +44,6 @@
     Satisfy All
   </DirectoryMatch>
 
-<% if config[:app_type] == :mongrel %>
   RewriteEngine On
   <% if config[:debug_rewrite] %>
   # rewrite debugging
@@ -56,28 +57,46 @@
   RewriteCond %{SCRIPT_FILENAME} !maintenance.html
   RewriteRule ^.*$ /system/maintenance.html [L]
 
+<% list = (config[:lang_list] || 'en').split(',').map(&:strip)
+  default = list.first
+  list.reverse_each do |l|
+  if l != default %>
+  # Browser wants "<%= l %>" as favorite language
+  RewriteCond %{REQUEST_URI} ^/$
+  RewriteCond %{HTTP:Accept-Language} ^<%= l %>
+  RewriteRule ^.*$ /<%= l %> [R,L]
+<%  else %>
+  # Default language for website is "<%= l %>"
+  RewriteCond %{REQUEST_URI} ^/$
+  RewriteRule ^.*$ /<%= l %> [R,L]
+<%  end
+end %>
+
   # Rewrite index to check for static
   RewriteRule ^/$ /index.html [QSA]
 
-  # Rewrite to check for Rails cached page
-  RewriteRule ^([^.]+)$ $1.html [QSA]
-
   # Serve static (cached) assets
   RewriteCond %{QUERY_STRING} ^[0-9]+$
-  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME}.%{QUERY_STRING} -f
-  # We have to use '.'. If we use '?' apache won't find the file.
-  RewriteRule ^/(.*)$ %{REQUEST_FILENAME}.%{QUERY_STRING} [L]
+  RewriteCond %{DOCUMENT_ROOT}<%= config[:cache_path] %>%{REQUEST_FILENAME}.%{QUERY_STRING} -f
+  RewriteRule ^/(.*)$ <%= config[:cache_path] %>%{REQUEST_FILENAME}.%{QUERY_STRING} [L]
 
-  # Rails assets (static CSS, JS).
+  # Static CSS, JS
   RewriteCond %{QUERY_STRING} ^[0-9]+$
   RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} -f
   RewriteRule ^/(.*)$ %{REQUEST_FILENAME} [L]
 
+  # Zena dynamic cache                                                                 
+  RewriteCond %{DOCUMENT_ROOT}<%= config[:cache_path] %>%{REQUEST_FILENAME}%{QUERY_STRING} -f
+  RewriteRule ^/(.*)$ <%= config[:cache_path] %>%{REQUEST_FILENAME}%{QUERY_STRING} [L]
+  RewriteCond %{DOCUMENT_ROOT}<%= config[:cache_path] %>%{REQUEST_FILENAME}%{QUERY_STRING}.html -f
+  RewriteRule ^/(.*)$ <%= config[:cache_path] %>%{REQUEST_FILENAME}%{QUERY_STRING}.html [L]
+
+<% if config[:app_type] == :mongrel %>
   # else
   #  Request with query string (if some page is cached, the same page with a query should not be served as static)
   RewriteCond %{QUERY_STRING} ^.+$ [OR]
   #  All non-static
-  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
+  RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-f
   RewriteRule ^/(.*)$ balancer://<%= config[:balancer] %>%{REQUEST_URI} [P,QSA,L]
 <% elsif config[:app_type] == :passenger %>
   PassengerAppRoot <%= config[:app_root] %>
@@ -110,11 +129,12 @@
   CustomLog <%= config[:sites_root] %>/<%= config[:host] %>/log/deflate.log deflate
   <% end %>
 
-  <% if config[:ssl] %>
+  <% if ssl %>
   SSLEngine on
   SSLCertificateFile /etc/ssl/<%= config[:host] %>.crt
   SSLCertificateKeyFile /etc/ssl/<%= config[:host] %>.key
   SSLCACertificateFile /etc/ssl/<%= config[:ssl_pem] %>
   SSLVerifyClient None
+  RequestHeader set X_FORWARDED_PROTO 'https'
   <% end %>
 </VirtualHost>

data/lib/zena/deploy/vhost_ssl_redir.rhtml

@@ -0,0 +1,12 @@
+# Zena apache2 vhost for <%= config[:host] %>
+# Automatically generated file.
+
+<VirtualHost *:80>
+  ServerName <%= config[:host] %>
+  
+  # Redirect all requests to ssl
+
+  RewriteEngine On
+  RewriteCond %{HTTPS} off
+  RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]
+</VirtualHost>

data/lib/zena/deploy/vhost_www.rhtml

@@ -1,7 +1,7 @@
 # zena apache2 vhost for <%= config[:host] %>
 # automatically generated file
 
-<VirtualHost *>
+<VirtualHost *<%= vhost_port %>>
   ServerName www.<%= config[:host] %>
 
   RewriteEngine On

data/lib/zena/deploy.rb

@@ -93,9 +93,11 @@ Capistrano::Configuration.instance(:must_exist).load do
       'current/tmp',
       'current/log',
       'shared/log',
+      # Passenger uses the owner of environment.rb as worker
+      'current/config/environment.rb',
     ].map {|dir| "#{deploy_to}/#{dir}"}
 
-    # make sure production.log is created before so that it gets the correct permissionsong
+    # make sure production.log is created before so that it gets the correct permission
     run "touch #{deploy_to}/shared/log/production.log"
     run "chown -R www-data:www-data #{directories.join(' ')}"
   end
@@ -150,13 +152,20 @@ Capistrano::Configuration.instance(:must_exist).load do
   #========================== MANAGE HOST   =========================#
   desc "create a new site [-s host='...' -s pass='...' -s lang='...']"
   task :mksite, :roles => :app do
-    run "#{in_current} rake zena:mksite HOST='#{self[:host]}' PASSWORD='#{self[:pass]}' RAILS_ENV='production' HOST_LANG='#{self[:lang] || 'en'}'"
+    lang = self[:lang] ||= (self[:lang_list] || 'en').split(',').map(&:strip).first
+    self[:lang_list] ||= lang
+    run "#{in_current} rake zena:mksite HOST='#{self[:host]}' PASSWORD='#{self[:pass]}' RAILS_ENV='production' HOST_LANG='#{lang}' LANG_LIST='#{self[:lang_list] || lang}'"
     run "test -e #{sites_root}/#{self[:host]} || mkdir #{sites_root}/#{self[:host]}"
     create_vhost
     create_awstats
     logrotate
     run "chown -R www-data:www-data #{sites_root}/#{self[:host]}"
   end
+  
+  task :mksymlinks, :roles => :app do
+    run "#{in_current} rake zena:mksymlinks HOST='#{self[:host]}'"
+    run "chown -R www-data:www-data #{sites_root}/#{self[:host]}"
+  end
 
   desc "update code in the current version"
   task :up, :roles => :app do
@@ -195,17 +204,49 @@ Capistrano::Configuration.instance(:must_exist).load do
     unless self[:host]
       puts "HOST not set (use -s host=...)"
     else
-      vhost = render("#{templates}/vhost.rhtml", :config => self)
-      put(vhost, "#{vhost_root}/#{self[:host]}")
+      vhost_files = []
+      if self[:ssl] == :all
+        
+        public_path = Bricks.raw_config['public_path'] || '/public'
+        cache_path  = Bricks.raw_config['cache_path']  || '/public'
+        
+        self[:cache_path] = cache_path.sub(%r{^#{public_path}},'')
+        vhost = render("#{templates}/vhost.rhtml", :config => self, :ssl => true, :vhost_port => ':443')
+        put(vhost, "#{vhost_root}/#{self[:host]}.ssl")
+        vhost_files << "#{self[:host]}.ssl"
+        
+        # Redirect if not ssl
+        vhost = render("#{templates}/vhost_ssl_redir.rhtml", :config => self)
+        put(vhost, "#{vhost_root}/#{self[:host]}")
+        vhost_files << "#{self[:host]}"
+      elsif self[:ssl] == :logged_in
+        # Redirect only if logged in
+        vhost = render("#{templates}/vhost.rhtml", :config => self, :ssl => true, :vhost_port => ':443')
+        put(vhost, "#{vhost_root}/#{self[:host]}.ssl")
+        vhost_files << "#{self[:host]}.ssl"
+
+        # Redirect to ssl if logged in (this redirect is triggered by Zena).
+        vhost = render("#{templates}/vhost.rhtml", :config => self, :ssl => false, :vhost_port => ':80')
+        put(vhost, "#{vhost_root}/#{self[:host]}")
+        vhost_files << "#{self[:host]}"
+      else
+        vhost = render("#{templates}/vhost.rhtml", :config => self, :ssl => false, :vhost_port => '')
+        put(vhost, "#{vhost_root}/#{self[:host]}")
+        vhost_files << "#{self[:host]}"
+      end
 
       # directory setup for log
       run "test -e #{sites_root}/#{self[:host]}/log || mkdir #{sites_root}/#{self[:host]}/log"
       run "chown www-data:www-data #{sites_root}/#{self[:host]}/log"
-
-      run "test -e /etc/apache2/sites-enabled/#{self[:host]} || a2ensite #{self[:host]}" if debian_host
+      
+      if debian_host
+        vhost_files.each do |host|
+          run "test -e /etc/apache2/sites-enabled/#{host} || a2ensite #{host}"
+        end
+      end
 
       unless self[:host] =~ /^www/
-        vhost_www = render("#{templates}/vhost_www.rhtml", :config => self)
+        vhost_www = render("#{templates}/vhost_www.rhtml", :config => self, :vhost_port => (self[:ssl] ? ':80' : ''))
         put(vhost_www, "#{vhost_root}/www.#{self[:host]}")
         run "test -e /etc/apache2/sites-enabled/www.#{self[:host]} || a2ensite www.#{self[:host]}" if debian_host
       end
@@ -229,7 +270,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "chmod 640 /etc/awstats/awstats.#{self[:host]}.conf"
 
         # create stats vhost
-        stats_vhost = render("#{templates}/stats.vhost.rhtml", :config => self)
+        stats_vhost = render("#{templates}/stats.vhost.rhtml", :config => self, :vhost_port => (self[:ssl] ? ':80' : ''))
         put(stats_vhost, "#{vhost_root}/stats.#{self[:host]}")
         run "test -e /etc/apache2/sites-enabled/stats.#{self[:host]} || a2ensite stats.#{self[:host]}"
 
@@ -262,7 +303,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       else
         # create logrotate config file
         logrotate_conf = render("#{templates}/logrotate_host.rhtml", :config => self )
-        put(logrotate_conf, "/etc/logrotate.d/#{self[:host]}")
+        put(logrotate_conf, "/etc/logrotate.d/#{db_name}-#{self[:host]}")
       end
     end
   end
@@ -275,7 +316,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       run "#{in_current} rake zena:rename_site OLD_HOST='#{self[:old_host]}' HOST='#{self[:host]}' RAILS_ENV='production'"
       old_vhosts = ["#{self[:old_host]}",
                     "stats.#{self[:old_host]}",
-                    "www.#{self[:old_host]}"]
+                    "www.#{self[:old_host]}",
+                    "#{self[:old_host]}.ssl"]
       old_vhosts.each do |vhost|
         run "test -e /etc/apache2/sites-enabled/#{vhost} && a2dissite #{vhost} || true"
         vhost_path = "#{vhost_root}/#{vhost}"
@@ -314,10 +356,12 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     run "test -e /etc/apache2/sites-enabled/000-default && a2dissite default || echo 'default already disabled'"
 
-    modules = %w{rewrite deflate proxy_balancer proxy proxy_http expires}
+    modules = %w{rewrite headers deflate proxy_balancer proxy proxy_http expires}
     if self[:ssl]
       modules << 'ssl'
+      modules << 'headers'
       # Default in debian: no need to change ports.
+      # Remove NameVirtualHost directives in ports.conf (avoids warnings).
       # /etc/apache2/ports.conf:
       # Listen 443
     end

data/lib/zena/info.rb

@@ -1,4 +1,4 @@
 module Zena
-  VERSION        = '1.2.2'
+  VERSION        = '1.2.3'
   ROOT           = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/lib/zena/parser/zazen_rules.rb

@@ -7,7 +7,14 @@ module Zena
       include Zena::Acts::Secure
 
       PSEUDO_ID_REGEXP = ":[0-9a-zA-Z-]+\\+*|\\([^\\)]*\\)"
-
+      
+      def raw_content(txt)
+        txt = [:raw, txt] if txt.kind_of?(String)
+        @escaped_code << txt
+        @block_counter += 1
+        return "<pre>\\ZAZENBLOCKCODE#{@block_counter}ZAZENBLOCKCODE\\</pre>"
+      end
+      
       def start(mode)
         @helper = @options[:helper]
         # we do nothing, everything is done when 'render' is called
@@ -326,12 +333,10 @@ module Zena
 
       def extract_code(fulltext)
         @escaped_code = []
-        block_counter = -1
+        @block_counter = -1
         fulltext.gsub!( /<code([^>]*)>(.*?)<\/code>/m ) do
           if @translate_ids
-            @escaped_code << $&
-            block_counter += 1
-            "<pre>\\ZAZENBLOCKCODE#{block_counter}ZAZENBLOCKCODE\\</pre>"
+            raw_content([nil, $&])
           else
             params, text = $1, $2
             pre_params = []
@@ -345,9 +350,7 @@ module Zena
             end
             #pre_params << "class='code'" unless params =~ /class\s*=/
             pre_params = pre_params.blank? ? nil : pre_params.join(' ')
-            @escaped_code << [lang, text, pre_params]
-            block_counter += 1
-            "<pre>\\ZAZENBLOCKCODE#{block_counter}ZAZENBLOCKCODE\\</pre>"
+            raw_content([lang, text, pre_params])
           end
         end
 
@@ -366,7 +369,13 @@ module Zena
             @escaped_code[$1.to_i]
           else
             code_lang, code, pre_params = @escaped_code[$1.to_i]
-            Zena::CodeSyntax.new(code, @context[:pretty_code] ? code_lang : nil).to_html(@context.merge(:pre_params => pre_params))
+            # FIXME: How to not parse with Textile ?
+            if code_lang == :raw then
+              # SECURITY: symbol cannot be set from zazen.
+              code
+            else
+              Zena::CodeSyntax.new(code, @context[:pretty_code] ? code_lang : nil).to_html(@context.merge(:pre_params => pre_params))
+            end
           end
         end
 

data/lib/zena/routes.rb

@@ -17,8 +17,6 @@ module Zena
       resources :acls
       resources :iformats
 
-
-      connect ':prefix/*path?:cachestamp',  :controller => 'nodes', :action => 'show', :prefix => /\w\w/, :cachestamp => /\d+/
       connect ':prefix/*path',  :controller => 'nodes', :action => 'show', :prefix => /\w\w/
       connect 'dav/*path_info', :controller => 'nodes', :action => 'webdav'
 
@@ -26,7 +24,7 @@ module Zena
         :collection => { :asearch => :get, :search => :get },
         :member =>     { :import => :post, :export => :get, :save_text => :put,
                          :order => :any, :clear_order => :any,
-                         :zafu => :get, :drop => :put, :attribute => :get,
+                         :zafu => :any, :drop => :put, :attribute => :get,
                          :find => :get # same as search but starting on current node instead of root
                        }.merge(Zena::Use.routes('nodes')) do |nodes|
         nodes.resources :versions,

data/lib/zena/site_worker.rb

@@ -30,7 +30,14 @@ module Zena
           Zena::SiteWorker.perform(site, action, page + 1)
 
           # do action on nodes
-          site.send(action, nodes, page, page_count)
+          begin
+            site.send(action, nodes, page, page_count)
+          rescue => err
+            # If we let the action fail, it will rerun and we will recreate an action for page + 1 !
+            Site.logger.warn "[JOB] Failed: '#{action}'"
+            Site.logger.warn err.message
+          end
+          
         end
       end
     end

data/lib/zena/use/ajax.rb

@@ -187,10 +187,27 @@ module Zena
           else
             loading = ''
           end
+          # Disable 'redir' parameter during preview or filter.
           js_data << %Q{new Form.Observer('#{dom_id}', 0.3, function(element, value) {#{loading}
-            new Ajax.Request('#{zafu_node_path(node)}', {asynchronous:true, evalScripts:true, method:'get', parameters:Form.serialize('#{dom_id}')})
+            var data = Form.serialize('#{dom_id}').gsub(/&redir=/,'&no_redir=')
+            new Ajax.Request('#{zafu_node_path(node)}', {asynchronous:true, evalScripts:true, method:'post', parameters:data})
           });}
         end
+        
+        # Load parameters in node before rendering.
+        # SECURITY: There may be a security threat here if the node attributes are used for queries or relations.
+        def preview_node(node)
+          return nil if !node.kind_of?(Node)
+          if attrs = params[:node]
+            # Return a copy
+            new_node = node.dup
+            new_node.version = node.version.dup
+            new_node.attributes = Node.transform_attributes(params[:node], node, true)
+            return new_node
+          else
+            return node
+          end
+        end
 
         # Include draggable ids in bottom of page Javascript.
         def render_js(in_html = true)
@@ -284,7 +301,11 @@ module Zena
           end
         end
 
-        # Display an input field to filter a remote block
+        def r_preview_node
+          expand_if("#{var} = preview_node(#{node})", node.move_to(var, node.klass))
+        end
+        
+        # Display an input field to filter a remote block.
         def r_filter
           if upd = @params[:update]
             return unless block = find_target(upd)
@@ -516,7 +537,12 @@ module Zena
         def r_ajax?
           r_if(RubyLess.translate(self, 'ajax?'))
         end
-
+        
+        def r_reset_sort
+          text = text_for_link(trans('reset_sort'))
+          out "<a href='javascript:void()' onclick='Zena.resetSort(this)'>#{text}</a>"
+        end
+        
         protected
 
           def need_ajax?(each_block)

data/lib/zena/use/ancestry.rb

@@ -65,7 +65,8 @@ module Zena
 
       module ModelMethods
         include RubyLess
-        safe_context       :ancestors => {:class => ['Node'], :method => 'z_ancestors'}
+                                         # This is used to defer :class type resolution to compilation time
+        safe_method        :ancestors => Proc.new {|h, r, s| {:method => 'z_ancestors', :class => [VirtualClass['Node']], :nil => true}}
         safe_method        :fullpath => String, :short_path => [String]
 
         def self.included(base)

data/lib/zena/use/authlogic.rb

@@ -39,7 +39,8 @@ module Zena
           end
 
           def set_visitor
-            unless site = forge_cookie_with_http_auth || Site.find_by_host(request.host)
+            forge_cookie_with_http_auth
+            unless site = Site.find_by_host(request.host)
               raise ActiveRecord::RecordNotFound.new("host not found #{request.host}")
             end
 
@@ -47,7 +48,10 @@ module Zena
             ::I18n.locale = site.default_lang
 
             User.send(:with_scope, :find => {:conditions => ['site_id = ?', site.id]}) do
-              Thread.current[:visitor] = token_visitor || registered_visitor || anonymous_visitor(site)
+              if user = token_visitor || registered_visitor || anonymous_visitor(site)
+                user.asset_host = @asset_host
+                Thread.current[:visitor] = user
+              end
             end
           end
 
@@ -83,27 +87,17 @@ module Zena
           end
 
           # Create a fake cookie based on HTTP_AUTH using session_id and render_token. This is
-          # only used for requests to localhost.
+          # only used for requests from localhost (asset host).
           def forge_cookie_with_http_auth
-            if (request.host == '127.0.0.1' || request.host == 'localhost') && request.port == Zena::ASSET_PORT
+            if (request.headers['REMOTE_ADDR'] == '127.0.0.1' || request.headers['REMOTE_ADDR'] == '::1') && 
+               (Zena::ASSET_PORT.to_i == 0 || request.port.to_i == Zena::ASSET_PORT)
               authenticate_with_http_basic do |login, password|
                 # login    = visitor.id
                 # password = persistence_token
-
-                # Temporary user to find site
-                user = User.find(login)
-                if user && site = user.site
-                  # OK, we can set host
-                  request.env['HTTP_HOST'] = "#{site.host}:#{Zena::ASSET_PORT}"
-                  # forge cookie
-                  cookies['user_credentials'] = "#{password}::#{login}"
-                  site
-                else
-                  raise ActiveRecord::RecordNotFound
-                end
+                @asset_host = true
+                # forge cookie
+                cookies['user_credentials'] = "#{password}::#{login}"
               end
-            else
-              nil
             end
           end
 

data/lib/zena/use/context.rb

@@ -248,7 +248,7 @@ module Zena
           method = "group_array(#{node}) {|e| #{key}}"
           out "<% if #{var} = #{method} %>"
             open_node_context({:method => method}, :node => node.move_to(var, [node.klass], :query => node.opts[:query])) do
-              if child['each_group']
+              if descendant('each_group')
                 out expand_with
               else
                 @var = nil

data/lib/zena/use/dates.rb

@@ -119,21 +119,21 @@ module Zena
       module FormTags
         # Date selection tool.
         # TODO: make it work with form_helper: <%= f.date_box(:event_at) %>
-      	def date_box(obj, name, opts = {})
-      	  rnd_id = rand(100000000000)
-      	  defaults = {  :id=>"datef#{rnd_id}", :button=>"dateb#{rnd_id}", :display=>"dated#{rnd_id}" }
-      	  opts = defaults.merge(opts)
-      	  date = opts[:value] || obj.safe_send(name)
-      	  showsTime = opts[:time] || 'true'
-      	  # TODO: could we pass the format from the view so that it is
-      	  # translated with the view's dictionary during compilation ?
-      	  dateFormat = showsTime == 'true' ? _('datetime') : _('long_date')
-      	  value = format_date(date, :format => dateFormat)
-
-      	  # TODO: migrate code to Zafu::Markup (needs Zafu 0.7.7)
-      	  # fld = Zafu::Markup.new('input')
-      	  # fld.params = (opts[:html] || {}).merge(:name => "node[#{name}]", :id => opts[:id], :type => 'text', :value => value)
-      	  if opts[:size]
+        def date_box(obj, name, opts = {})
+          rnd_id = rand(100000000000)
+          defaults = {  :id=>"datef#{rnd_id}", :button=>"dateb#{rnd_id}", :display=>"dated#{rnd_id}" }
+          opts = defaults.merge(opts)
+          date = opts[:value] || obj.safe_send(name)
+          showsTime = opts[:time] || 'true'
+          # TODO: could we pass the format from the view so that it is
+          # translated with the view's dictionary during compilation ?
+          dateFormat = showsTime == 'true' ? _('datetime') : _('long_date')
+          value = format_date(date, :format => dateFormat)
+
+          # TODO: migrate code to Zafu::Markup (needs Zafu 0.7.7)
+          # fld = Zafu::Markup.new('input')
+          # fld.params = (opts[:html] || {}).merge(:name => "node[#{name}]", :id => opts[:id], :type => 'text', :value => value)
+          if opts[:size]
             fld = "<input id='#{opts[:id]}' name='#{name}' type='text' size='#{opts[:size]}' value='#{value}' class='#{opts[:class]}'/>"
           else
             fld = "<input id='#{opts[:id]}' name='#{name}' type='text' value='#{value}' class='#{opts[:class]}'/>"
@@ -147,11 +147,11 @@ module Zena
               ifFormat    : '#{dateFormat}'
           });}
 
-      		<<-EOL
+          <<-EOL
       <span class="date_box"><img src="/calendar/iconCalendar.gif" id="#{opts[:button]}" alt='#{_('date selection')}'/>
       #{fld}</span>
-      		EOL
-      	end
+          EOL
+        end
       end
       
       module ModelMethods
@@ -288,6 +288,8 @@ module Zena
         def strftime_tz(format, tz = nil)
           if tz.blank?
             tz = visitor.tz
+          elsif tz == 'UTC'
+             return self.strftime(format.to_s)
           elsif tz.kind_of?(String)
             tz = TZInfo::Timezone.get(tz)
           end
@@ -301,6 +303,8 @@ module Zena
         def year_tz(tz = nil)
           if tz.blank?
             tz = visitor.tz
+          elsif tz == 'UTC'
+             return self.year
           elsif tz.kind_of?(String)
             tz = TZInfo::Timezone.get(tz)
           end
@@ -314,6 +318,8 @@ module Zena
         def advance_tz(opts, tz = nil)
           if tz.blank?
             tz = visitor.tz
+          elsif tz == 'UTC'
+             return self.advance(opts)
           elsif tz.kind_of?(String)
             tz = TZInfo::Timezone.get(tz)
           end
@@ -327,6 +333,8 @@ module Zena
         def wday_tz(tz = nil)
           if tz.blank?
             tz = visitor.tz
+          elsif tz == 'UTC'
+             return self.wday
           elsif tz.kind_of?(String)
             tz = TZInfo::Timezone.get(tz)
           end
@@ -340,6 +348,8 @@ module Zena
         def to_date_tz(tz = nil)
           if tz.blank?
             tz = visitor.tz
+          elsif tz == 'UTC'
+             return self.to_date
           elsif tz.kind_of?(String)
             tz = TZInfo::Timezone.get(tz)
           end