Merge branch 'autoredirect-v5.3.0-dev' into wiki.ohea.xyz-dev

Based on: https://github.com/remyd1/gollum/commit/925ebcfe04f294c979b9e088dc0955ca1dfa8c44

gollum.gemspec

@@ -1212,6 +1212,7 @@ Gem::Specification.new do |s|
     lib/gollum/templates/pagination.mustache
     lib/gollum/templates/search.mustache
     lib/gollum/templates/searchbar.mustache
+    lib/gollum/templates/user.mustache
     lib/gollum/templates/wiki_content.mustache
     lib/gollum/uri_encode_component.rb
     lib/gollum/views/commit.rb

lib/gollum/app.rb

@@ -211,7 +211,7 @@ module Precious
       end
 
       get '/edit/*' do
-        forbid unless @allow_editing
+        forbid unless @allow_editing && @user_authed
         wikip = wiki_page(params[:splat].first)
         @name = wikip.fullname
         @path = wikip.path
@@ -234,6 +234,7 @@ module Precious
 
         wiki = wiki_new
         halt 405 unless wiki.allow_uploads
+        forbid unless @user_authed
 
         if params[:file]
           fullname = params[:file][:filename]
@@ -290,6 +291,7 @@ module Precious
       post '/rename/*' do
         wikip = wiki_page(params[:splat].first)
         halt 500 if wikip.nil?
+        forbid unless @user_authed
         wiki   = wikip.wiki
         page   = wikip.page
         rename = params[:rename]
@@ -333,6 +335,7 @@ module Precious
         path      = "/#{clean_url(sanitize_empty_params(params[:path]))}"
         wiki      = wiki_new
         page      = wiki.page(::File.join(path, params[:page]))
+        forbid unless @user_authed
 
         return if page.nil?
         if etag != page.sha
@@ -353,6 +356,7 @@ module Precious
 
       post '/delete/*' do
         forbid unless @allow_editing
+        forbid unless @user_authed
         wiki = wiki_new
         filepath = params[:splat].first
         unless filepath.nil?
@@ -364,6 +368,7 @@ module Precious
 
       get '/create/*' do
         forbid unless @allow_editing
+        forbid unless @user_authed
         wikip = wiki_page(params[:splat].first)
         @name = wikip.name
         @ext  = wikip.ext
@@ -389,6 +394,7 @@ module Precious
         path   = sanitize_empty_params(params[:path]) || ''
         format = params[:format].intern
         wiki   = wiki_new
+        forbid unless @user_authed
 
         path.gsub!(/^\//, '')
 
@@ -620,7 +626,41 @@ module Precious
 
     def show_page_or_file(fullpath)
       wiki = wiki_new
-      if page = wiki.page(fullpath)
+
+
+      # check if folders exists
+      contents = wiki.tree_list
+      print contents
+      entry    = contents.detect do |entry|
+        Gollum::File::path_match(fullpath, entry)
+      end
+      print entry
+      #if path
+      #  @path = Pathname.new(path).cleanpath.to_s
+      #  check_path   = wiki.page_file_dir ? ::File.join(wiki.page_file_dir, @path, '/') : "#{@path}/"
+      #  @results.select!  {|result| result.path.start_with?(check_path) }
+      #end
+
+      #@results.sort_by! {|result| result.name.downcase}
+      #elsif fullpath[-1] == '/' ? Gollum::Page.valid_page_name?(fullpath) : false
+
+
+
+      if page = fullpath[-1] != '/' ? wiki.page("#{fullpath}/#{wiki.index_page}") : false
+        @page          = page
+        @name          = page.filename_stripped
+        @content       = page.formatted_data
+        @upload_dest   = find_upload_dest(Pathname.new(fullpath).cleanpath.to_s)
+
+        # Extensions and layout data
+        @editable      = true
+        @toc_content   = wiki.universal_toc ? @page.toc_data : nil
+        @h1_title      = wiki.h1_title
+        @bar_side      = wiki.bar_side
+        @allow_uploads = wiki.allow_uploads
+        @navbar        = true
+        mustache :page
+      elsif page = wiki.page(fullpath)
         @page          = page
         @name          = page.filename_stripped
         @content       = page.formatted_data
@@ -638,8 +678,13 @@ module Precious
         show_file(file)
       elsif @redirects_enabled && redirect_path = wiki.redirects[fullpath]
         redirect to("#{encodeURIComponent(redirect_path)}?redirected_from=#{encodeURIComponent(fullpath)}")
+      elsif entry
+        # check if the folder fullpath exists
+        # if so, redirect to overview
+        #
+          redirect to("/gollum/overview/#{clean_url(encodeURIComponent(fullpath))}")
       else
-        if @allow_editing
+        if @allow_editing && @user_authed
           path = fullpath[-1] == '/' ? "#{fullpath}#{wiki.index_page}" : fullpath # Append default index page if no page name is supplied
           redirect to("/gollum/create/#{clean_url(encodeURIComponent(path))}")
         else

lib/gollum/public/gollum/stylesheets/template.scss.erb

@@ -734,3 +734,12 @@ nav.actions {
     display: none;
    }
 }
+
+/* @section user */
+#user p {
+    text-align: right;
+    padding-right:0.5em;
+    font-size: .8em;
+    line-height: 2.0em;
+    color: #999;
+}

lib/gollum/templates/layout.mustache

@@ -60,6 +60,7 @@
 <body>
 <div class="container-lg clearfix">
 {{{yield}}}
+{{< user}}
 </div>
 </body>
 </html>

lib/gollum/templates/user.mustache

@@ -0,0 +1,10 @@
+<div id="user">
+    <p>
+    {{#user_authed}}
+      {{user_name}} | {{user_provider}} | <strong><a href="/__omnigollum__/logout">[Logout]</a></strong>
+    {{/user_authed}}
+    {{^user_authed}}
+      not logged in | <strong><a href="/__omnigollum__/login">[Login]</a></strong>
+    {{/user_authed}}
+    <p>
+</div>

lib/gollum/views/layout.rb

@@ -87,6 +87,19 @@ module Precious
       def latest_changes
         false
       end
+
+      # Passthrough additional omniauth parameters for status bar
+      def user_authed
+        @user_authed
+      end
+
+      def user_provider
+        @user.provider
+      end
+
+      def user_name
+        @user.name
+      end
       
     end
   end