refinerycms 0.9.5.13 → 0.9.5.14

data/vendor/plugins/authentication/app/controllers/sessions_controller.rb

@@ -1,8 +1,8 @@
 class SessionsController < ApplicationController
-  
+
   layout 'admin'
   filter_parameter_logging 'password', 'password_confirmation'
-    
+
   def create
     self.current_user = User.authenticate(params[:session][:login], params[:session][:password])
     if logged_in?
@@ -26,5 +26,5 @@ class SessionsController < ApplicationController
     flash[:notice] = "You have been logged out."
     redirect_back_or_default(new_session_url)
   end
-  
-end
+
+end

data/vendor/plugins/authentication/app/controllers/users_controller.rb

@@ -14,20 +14,20 @@ class UsersController < ApplicationController
 
   def create
     unless can_create_public_user
-      render :text => "User signup is disabled", :layout => true 
+      render :text => "User signup is disabled", :layout => true
     else
       begin
           cookies.delete :auth_token
-          # protects against session fixation attacks, wreaks havoc with 
+          # protects against session fixation attacks, wreaks havoc with
           # request forgery protection.
           # uncomment at your own risk
           # reset_session
           @user = User.new(params[:user])
-					@selected_plugin_titles = params[:user][:plugins] || []
+          @selected_plugin_titles = params[:user][:plugins] || []
 
           @user.register! if @user.valid?
           if @user.errors.empty?
-						@user.plugins = @selected_plugin_titles
+            @user.plugins = @selected_plugin_titles
             self.current_user = @user
             current_user.activate!
             redirect_back_or_default(admin_root_url)
@@ -54,12 +54,12 @@ class UsersController < ApplicationController
   end
 
   def suspend
-    @user.suspend! 
+    @user.suspend!
     redirect_to users_path
   end
 
   def unsuspend
-    @user.unsuspend! 
+    @user.unsuspend!
     redirect_to users_path
   end
 
@@ -83,4 +83,4 @@ protected
     User.count == 0
   end
 
-end
+end

data/vendor/plugins/authentication/app/helpers/sessions_helper.rb

@@ -1,2 +1,2 @@
 module SessionsHelper
-end
+end

data/vendor/plugins/authentication/app/helpers/users_helper.rb

@@ -1,2 +1,2 @@
 module UsersHelper
-end
+end

data/vendor/plugins/authentication/app/models/user.rb

@@ -1,41 +1,41 @@
 require 'digest/sha1'
-class User < ActiveRecord::Base	
-	# Hack: Allow "rake gems:install" to run when this class is missing its gem dependency.
-	# For further clarification on why, refer to:
-	# https://rails.lighthouseapp.com/projects/8994/tickets/780-rake-gems-install-doesn-t-work-if-plugins-are-missing-gem-dependencies
-	if defined? AASM
-		include AASM # include the library which will give us state machine functionality.
-		aasm_column :state
-	  aasm_initial_state :pending
-	  aasm_state :passive
-	  aasm_state :pending, :enter => :make_activation_code
-	  aasm_state :active,  :enter => :do_activate
-	  aasm_state :suspended
-	  aasm_state :deleted, :enter => :do_delete
-
-	  aasm_event :register do
-	    transitions :from => :passive, :to => :pending, :guard => Proc.new {|u| !(u.crypted_password.blank? && u.password.blank?) }
-	  end
-  
-	  aasm_event :activate do
-	    transitions :from => :pending, :to => :active 
-	  end
-  
-	  aasm_event :suspend do
-	    transitions :from => [:passive, :pending, :active], :to => :suspended
-	  end
-  
-	  aasm_event :delete do
-	    transitions :from => [:passive, :pending, :active, :suspended], :to => :deleted
-	  end
-
-	  aasm_event :unsuspend do
-	    transitions :from => :suspended, :to => :active,  :guard => Proc.new {|u| !u.activated_at.blank? }
-	    transitions :from => :suspended, :to => :pending, :guard => Proc.new {|u| !u.activation_code.blank? }
-	    transitions :from => :suspended, :to => :passive
-	  end
-	end	
-	
+class User < ActiveRecord::Base
+  # Hack: Allow "rake gems:install" to run when this class is missing its gem dependency.
+  # For further clarification on why, refer to:
+  # https://rails.lighthouseapp.com/projects/8994/tickets/780-rake-gems-install-doesn-t-work-if-plugins-are-missing-gem-dependencies
+  if defined? AASM
+    include AASM # include the library which will give us state machine functionality.
+    aasm_column :state
+    aasm_initial_state :pending
+    aasm_state :passive
+    aasm_state :pending, :enter => :make_activation_code
+    aasm_state :active,  :enter => :do_activate
+    aasm_state :suspended
+    aasm_state :deleted, :enter => :do_delete
+
+    aasm_event :register do
+      transitions :from => :passive, :to => :pending, :guard => Proc.new {|u| !(u.crypted_password.blank? && u.password.blank?) }
+    end
+
+    aasm_event :activate do
+      transitions :from => :pending, :to => :active
+    end
+
+    aasm_event :suspend do
+      transitions :from => [:passive, :pending, :active], :to => :suspended
+    end
+
+    aasm_event :delete do
+      transitions :from => [:passive, :pending, :active, :suspended], :to => :deleted
+    end
+
+    aasm_event :unsuspend do
+      transitions :from => :suspended, :to => :active,  :guard => Proc.new {|u| !u.activated_at.blank? }
+      transitions :from => :suspended, :to => :pending, :guard => Proc.new {|u| !u.activation_code.blank? }
+      transitions :from => :suspended, :to => :passive
+    end
+  end
+
   # Virtual attribute for the unencrypted password
   attr_accessor :password
 
@@ -48,11 +48,11 @@ class User < ActiveRecord::Base
   validates_length_of       :email,    :within => 3..100
   validates_uniqueness_of   :login, :email, :case_sensitive => false
   before_save :encrypt_password
-  
-	serialize :plugins_column#, Array
 
-	has_many :plugins, :class_name => "UserPlugin", :order => "position ASC"
-  
+  serialize :plugins_column#, Array
+
+  has_many :plugins, :class_name => "UserPlugin", :order => "position ASC"
+
   # prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
   attr_accessible :login, :email, :password, :password_confirmation, :plugins
@@ -77,22 +77,22 @@ class User < ActiveRecord::Base
     crypted_password == encrypt(password)
   end
 
-	def plugins=(plugin_titles)
-		self.plugins.delete_all
-		
-		plugin_titles.each do |plugin_title|
-			if plugin_title.is_a?(String)
-				self.plugins.find_or_create_by_title(plugin_title)
-			end
-		end
-	end
-	
+  def plugins=(plugin_titles)
+    self.plugins.delete_all
+
+    plugin_titles.each do |plugin_title|
+      if plugin_title.is_a?(String)
+        self.plugins.find_or_create_by_title(plugin_title)
+      end
+    end
+  end
+
   def authorized_plugins
     self.plugins.collect {|p| p.title} | Refinery::Plugins.always_allowed.titles
   end
 
   def remember_token?
-    remember_token_expires_at && Time.now.utc < remember_token_expires_at 
+    remember_token_expires_at && Time.now.utc < remember_token_expires_at
   end
 
   # These create and unset the fields required for remembering users between browser closes
@@ -122,22 +122,22 @@ class User < ActiveRecord::Base
   end
 
   protected
-    # before filter 
+    # before filter
     def encrypt_password
       return if password.blank?
       self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record?
       self.crypted_password = encrypt(password)
     end
-      
+
     def password_required?
       crypted_password.blank? || !password.blank?
     end
-    
+
     def make_activation_code
       self.deleted_at = nil
       self.activation_code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join )
     end
-    
+
     def do_delete
       self.deleted_at = Time.now.utc
     end

data/vendor/plugins/authentication/app/models/user_mailer.rb

@@ -1,19 +1,19 @@
 class UserMailer < ActionMailer::Base
-  
+
   def signup_notification(user)
     setup_email(user)
     @subject    += 'Please activate your new account'
     @body[:url]  = "http://YOURSITE/activate/#{user.activation_code}"
   end
-  
+
   def activation(user)
     setup_email(user)
     @subject    += 'Your account has been activated!'
     @body[:url]  = "http://YOURSITE/"
   end
-  
+
 protected
-  
+
   def setup_email(user)
     @recipients  = "#{user.email}"
     @from        = "ADMINEMAIL"
@@ -21,5 +21,5 @@ protected
     @sent_on     = Time.now
     @body[:user] = user
   end
-  
-end
+
+end

data/vendor/plugins/authentication/app/models/user_observer.rb

@@ -4,8 +4,8 @@ class UserObserver < ActiveRecord::Observer
   end
 
   def after_save(user)
-  
+
     UserMailer.deliver_activation(user) if user.recently_activated?
-  
+
   end
 end

data/vendor/plugins/authentication/app/models/user_plugin.rb

@@ -1,5 +1,5 @@
 class UserPlugin < ActiveRecord::Base
-	
-	belongs_to :user
-	
-end
+
+  belongs_to :user
+
+end

data/vendor/plugins/authentication/app/views/admin/users/_form.html.erb

@@ -1,38 +1,38 @@
 <%= error_messages_for :user %>
 <% form_for [:admin, @user] do |f| %>
-	<div class='field'>
-		<%= f.label :login %>
-		<%= f.text_field :login %>
-	</div>
-	<div class='field'>
-		<%= f.label :email %>
-		<%= f.text_field :email %>
-	</div>
-	<div class='field'>
-		<%= f.label :password %>
-		<%= f.password_field :password %><br />
-		<span class="preview">Leaving password blank keeps the current password</span>
-	</div>
-	<div class='field'>
-		<%= f.label :password_confirmation %>
-		<%= f.password_field :password_confirmation %>
-	</div>
-	<div class='field'>
-		<%= f.label :plugin_access %>
-		<ul id='plugins'>
-			<% @available_plugins.each do |plugin| -%>
-			  <%# Since the dashboard is always included by the framework, this will maintain the user's order %>
-			  <% if Refinery::Plugins.always_allowed.titles.include?(plugin) or (plugin == 'Users' and @user.id == current_user.id) %>
-			    <%= hidden_field_tag 'user[plugins][]', plugin %>
-			  <% else %>
-					<li>
-				    <%= check_box_tag 'user[plugins][]', plugin, @selected_plugin_titles.include?(plugin), :id => "plugins_#{plugin.downcase.gsub(" ", "_")}" %>
-						<%= f.label 'user[plugins][]', plugin, :class => "stripped", :for => "plugins_#{plugin.downcase.gsub(" ", "_")}" %>
-					</li>
-			  <% end %>
-			<% end %>
-		</ul>
-	</div>
-	<%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
-	
-<% end %>
+  <div class='field'>
+    <%= f.label :login %>
+    <%= f.text_field :login %>
+  </div>
+  <div class='field'>
+    <%= f.label :email %>
+    <%= f.text_field :email %>
+  </div>
+  <div class='field'>
+    <%= f.label :password %>
+    <%= f.password_field :password %><br />
+    <span class="preview">Leaving password blank keeps the current password</span>
+  </div>
+  <div class='field'>
+    <%= f.label :password_confirmation %>
+    <%= f.password_field :password_confirmation %>
+  </div>
+  <div class='field'>
+    <%= f.label :plugin_access %>
+    <ul id='plugins'>
+      <% @available_plugins.each do |plugin| -%>
+        <%# Since the dashboard is always included by the framework, this will maintain the user's order %>
+        <% if Refinery::Plugins.always_allowed.titles.include?(plugin) or (plugin == 'Users' and @user.id == current_user.id) %>
+          <%= hidden_field_tag 'user[plugins][]', plugin %>
+        <% else %>
+          <li>
+            <%= check_box_tag 'user[plugins][]', plugin, @selected_plugin_titles.include?(plugin), :id => "plugins_#{plugin.downcase.gsub(" ", "_")}" %>
+            <%= f.label 'user[plugins][]', plugin, :class => "stripped", :for => "plugins_#{plugin.downcase.gsub(" ", "_")}" %>
+          </li>
+        <% end %>
+      <% end %>
+    </ul>
+  </div>
+  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
+
+<% end %>

data/vendor/plugins/authentication/app/views/admin/users/edit.html.erb

@@ -1 +1 @@
-<%= render :partial => 'form' %>
+<%= render :partial => 'form' %>

data/vendor/plugins/authentication/app/views/admin/users/index.html.erb

@@ -38,4 +38,4 @@
       </strong>
     </p>
   <% end %>
-</div>
+</div>

data/vendor/plugins/authentication/app/views/admin/users/new.html.erb

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render :partial => "form" %>

data/vendor/plugins/authentication/app/views/sessions/new.html.erb

@@ -1,21 +1,21 @@
 <% form_for :session, :url => session_path do |f| -%>
-	<div class='clearfix'>
-		<div class='field session_username'>
-			<%= f.label :login %>
-			<%= f.text_field :login %>
-		</div>
-		<div class='field session_password'>
-			<%= f.label :password %>
-			<%= f.password_field :password %>
-		</div>
-	</div>
-	<div class='field remember_me'>
-		<%= f.label :remember_me, nil %>
-		<%= f.check_box :remember_me %>
-	</div>
-	<div class='form-actions'>
-		<%= submit_tag 'Log in' %>
-		or
-		<%= link_to "Cancel", root_url %>
-	</div>
+  <div class='clearfix'>
+    <div class='field session_username'>
+      <%= f.label :login %>
+      <%= f.text_field :login %>
+    </div>
+    <div class='field session_password'>
+      <%= f.label :password %>
+      <%= f.password_field :password %>
+    </div>
+  </div>
+  <div class='field remember_me'>
+    <%= f.label :remember_me, nil %>
+    <%= f.check_box :remember_me %>
+  </div>
+  <div class='form-actions'>
+    <%= submit_tag 'Log in' %>
+    or
+    <%= link_to "Cancel", root_url %>
+  </div>
 <% end -%>

data/vendor/plugins/authentication/app/views/user_mailer/activation.html.erb

@@ -1,3 +1,3 @@
 <%= @user.login %>, your account has been activated.  You may now start adding your plugins:
 
-  <%= @url %>
+  <%= @url %>

data/vendor/plugins/authentication/app/views/user_mailer/signup_notification.html.erb

@@ -5,4 +5,4 @@ Your account has been created.
 
 Visit this url to activate your account:
 
-  <%= @url %>
+  <%= @url %>

data/vendor/plugins/authentication/app/views/users/new.html.erb

@@ -20,9 +20,9 @@
     <%= f.password_field :password_confirmation %>
   </div>
   <% if just_installed? %>
-		<% Refinery::Plugins.registered.titles.each do |plugin| %>
-    	<%= hidden_field_tag 'user[plugins][]', plugin, :id => "plugins_#{plugin.downcase.gsub(" ", "_")}"  %>
-		<% end %>
+    <% Refinery::Plugins.registered.titles.each do |plugin| %>
+      <%= hidden_field_tag 'user[plugins][]', plugin, :id => "plugins_#{plugin.downcase.gsub(" ", "_")}"  %>
+    <% end %>
   <% end %>
   <p><%= submit_tag 'Sign up' %></p>
 <% end -%>

data/vendor/plugins/authentication/config/routes.rb

@@ -7,4 +7,4 @@ ActionController::Routing::Routes.draw do |map|
 
   map.login  '/login', :controller => 'sessions', :action => 'new'
   map.logout '/logout', :controller => 'sessions', :action => 'destroy'
-end
+end