Simplify margins when showing diary entries

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8df126a04e3a5ea02325b652dc0f0432cf08b5ab..07b23ce21c814561c8266cff403a46874bb4cbb8 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -17,7 +17,6 @@ class ApplicationController < ActionController::Base
 
   helper_method :current_user
   helper_method :oauth_token
 
   helper_method :current_user
   helper_method :oauth_token

-  helper_method :preferred_langauges

 
   private
 
 
   private
 


@@ -173,8 +172,7 @@ class ApplicationController < ActionController::Base
     end
   end
 
     end
   end
 

-  def preferred_languages(reset: false)
-    @preferred_languages = nil if reset
+  def preferred_languages

     @preferred_languages ||= if params[:locale]
                                Locale.list(params[:locale])
                              elsif current_user
     @preferred_languages ||= if params[:locale]
                                Locale.list(params[:locale])
                              elsif current_user


@@ -186,13 +184,13 @@ class ApplicationController < ActionController::Base
 
   helper_method :preferred_languages
 
 
   helper_method :preferred_languages
 

-  def set_locale(reset: false)
+  def set_locale

     if current_user&.languages&.empty? && !http_accept_language.user_preferred_languages.empty?
       current_user.languages = http_accept_language.user_preferred_languages
       current_user.save
     end
 
     if current_user&.languages&.empty? && !http_accept_language.user_preferred_languages.empty?
       current_user.languages = http_accept_language.user_preferred_languages
       current_user.save
     end
 

-    I18n.locale = Locale.available.preferred(preferred_languages(:reset => reset))
+    I18n.locale = Locale.available.preferred(preferred_languages)

 
     response.headers["Vary"] = "Accept-Language"
     response.headers["Content-Language"] = I18n.locale.to_s
 
     response.headers["Vary"] = "Accept-Language"
     response.headers["Content-Language"] = I18n.locale.to_s


@@ -383,18 +381,28 @@ class ApplicationController < ActionController::Base
 
   # clean any referer parameter
   def safe_referer(referer)
 
   # clean any referer parameter
   def safe_referer(referer)

-    referer = URI.parse(referer)
+    begin
+      referer = URI.parse(referer)
+
+      if referer.scheme == "http" || referer.scheme == "https"
+        referer.scheme = nil
+        referer.host = nil
+        referer.port = nil
+      elsif referer.scheme || referer.host || referer.port
+        referer = nil
+      end

 
 

-    if referer.scheme == "http" || referer.scheme == "https"
-      referer.scheme = nil
-      referer.host = nil
-      referer.port = nil
-    elsif referer.scheme || referer.host || referer.port
+      referer = nil if referer&.path&.first != "/"
+    rescue URI::InvalidURIError

       referer = nil
     end
 
       referer = nil
     end
 

-    referer = nil if referer&.path&.first != "/"
+    referer&.to_s
+  end

 
 

-    referer.to_s
+  def scope_enabled?(scope)
+    doorkeeper_token&.includes_scope?(scope) || current_token&.includes_scope?(scope)

   end
   end

+
+  helper_method :scope_enabled?

 end
 end