caboose-cms 0.3.32 → 0.3.33

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGE4OWQ5MjhhZTk1ZDM2MTBhNjU0MzQyNjc0ZjExNDcwMGE5ZmMxYw==
+    N2U2MzU1ZGVlMDI2MjBmNzdkYjhkNjcxYWI5YzY4ZTNiNTEyYjkwNA==
   data.tar.gz: !binary |-
-    Y2Q1YjRkYzUwY2EzNzIyMzRhY2U2NWZkM2ExN2VmOGM0YjExM2MyYw==
+    ZTczYjRkOTRhZWFjYmNkYmEzM2Y2MWIyZDkwZmM1ZTFlYWFkNGI0NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTZlMTgxNzY0MjgwNjEzNDVhMGU2ZGM1YWI2YWYxY2FmYzhmZTUzNzVkNWU3
-    ODA4MzE3YTI0YWRkNzgzOGFhNGUzY2MxZDA2MTliYjMxMjVmYmJhMzRjYTI4
-    NTg5MzYyN2NmZWI0YWY5ZmNlN2NmYzJjYzg5YzlkNzkxYTUwMzI=
+    ODYyZjU0Y2IzZWE2YmZhNTYxNmQ2ZWM4OTZlNjc4ZDIyMzA5NmIwZWJiZDQ5
+    NzgxYjU0YzgxZmM5MTZiNTgzMWY0OWVkZjYyOTVkN2Y5ZTJmNGVlNzM2YmUx
+    ZGY1MDJkZDE4OGQzZGI3ODQyZGZmMTIwMDdjYjE4MzEyNGZiMzk=
   data.tar.gz: !binary |-
-    MzMyZTk4MTc3ZjQ2MzQ2N2E5ZjIzZDU4YzYxYTgxMTI1MDM4OGY4MzdmMGIy
-    NzBkZWYwZWZmMTI1MmU1MTdkNmI3M2UzN2NlMWM4MWZlMThkMzY0MjdjNGFm
-    YjhlMDBiNWYxMzYxMmQyNzY3YTViY2YxNmFmOTFlZjkyOGZkNzk=
+    NDEwNTIzNDk0MTRjOTVlZTA1NWE0ZjE1YTU0MzU3NzRlODMwN2ZlNGMxNzBm
+    ZDEwMjk1Mjc5OWQxZWQ2OTI0Y2FiYzljYzlmNzVhMjQ1NWQ4YzkxMzZlNjYw
+    N2U1MThhNWJhMzBhNGEwNzRmODg4NTBmNDE1ZDQzZmU4NjU4YmE=

data/app/assets/javascripts/caboose/modal_integration.js

@@ -84,14 +84,18 @@ function caboose_modal_url(url)
 }
 
 function caboose_fix_colorbox() {
+  var color = '#111';
+  if (typeof COLORBOX_COLOR !== 'undefined')
+    color = COLORBOX_COLOR;
+  
   var padding = 21; // 21 is default
-  $("#cboxTopLeft"      ).css('background', '#111');
-  $("#cboxTopRight"     ).css('background', '#111');
-  $("#cboxBottomLeft"   ).css('background', '#111');
-  $("#cboxBottomRight"  ).css('background', '#111');
-  $("#cboxMiddleLeft"   ).css('background', '#111');
-  $("#cboxMiddleRight"  ).css('background', '#111');
-  $("#cboxTopCenter"    ).css('background', '#111');
-  $("#cboxBottomCenter" ).css('background', '#111');
+  $("#cboxTopLeft"      ).css('background', color);
+  $("#cboxTopRight"     ).css('background', color);
+  $("#cboxBottomLeft"   ).css('background', color);
+  $("#cboxBottomRight"  ).css('background', color);
+  $("#cboxMiddleLeft"   ).css('background', color);
+  $("#cboxMiddleRight"  ).css('background', color);
+  $("#cboxTopCenter"    ).css('background', color);
+  $("#cboxBottomCenter" ).css('background', color);
   $("#cboxClose"        ).hide();    
 }

data/app/assets/javascripts/caboose/model/bound_image.js

@@ -83,7 +83,7 @@ BoundImage = BoundControl.extend({
     if (resp.error)
       this.error(resp.error);
     else
-      $('#'+this.el+'_container img').attr('src', this.attribute.value);
+      $('#'+this.el+'_container img').attr('src', this.attribute.value + '?' + Math.random());
   },
     
   error: function(str) {

data/app/controllers/caboose/application_controller.rb

@@ -25,7 +25,7 @@ module Caboose
       @is_real_page = false
       
       # Sets an instance variable of the logged in user
-      @logged_in_user = logged_in_user
+      @logged_in_user = logged_in_user      
 
       before_action
     end

data/app/controllers/caboose/login_controller.rb

@@ -39,5 +39,91 @@ module Caboose
       end
       render :json => resp
     end
-  end
+    
+    # GET /login/forgot-password
+    def forgot_password_form
+      @return_url = params[:return_url].nil? ? "/" : params[:return_url]
+      @modal = params[:modal].nil? ? false : params[:modal]
+      redirect_to @return_url if logged_in?
+    end
+        
+    # POST /login/forgot-password
+    def send_reset_email
+      @return_url = params[:return_url].nil? ? "/" : params[:return_url]
+      redirect_to @return_url if logged_in?
+    
+      resp = Caboose::StdClass.new		      		
+      username = params[:username]
+      
+		  if username.nil? || username.strip.length == 0       
+		  	resp.error = "You must enter a username."
+        render :json => resp		  	
+		  	return
+		  end
+		  
+		  bob = nil
+		  bob = Caboose::User.where(:username => username).first if Caboose::User.where(:username => username).exists?
+		  bob = Caboose::User.where(:email => username).first if bob.nil? && bob = Caboose::User.where(:email => username)
+		  
+		  if bob.nil?		
+			  resp.error = "The given username is not in our system."
+			  render :json => resp
+			  return
+			end
+			
+		  rand = Array.new(20){rand(36).to_s(36)}.join		  
+		  bob.password_reset_id = rand
+		  bob.password_reset_sent = DateTime.now
+		  bob.save
+		  
+		  LoginMailer.forgot_password_email(bob).deliver
+		  		  
+		  resp.success = "We just sent you an email.  The reset link inside is good for 3 days."
+		  render :json => resp
+		end
+	
+		# GET /login/reset-password/:reset_id
+		def reset_password_form
+		  @return_url = params[:return_url].nil? ? "/" : params[:return_url]
+      redirect_to @return_url if logged_in?
+            
+      @reset_id = params[:reset_id]      
+      @user = Caboose::User.user_for_reset_id(@reset_id)            
+    end
+    
+    # POST /login/reset-password
+    def reset_password
+      @return_url = params[:return_url].nil? ? "/" : params[:return_url]
+      redirect_to @return_url if logged_in?
+      
+      resp = Caboose::StdClass.new
+	
+	    reset_id = params[:id]
+	    pass1    = params[:pass1]
+	    pass2    = params[:pass2]
+	    
+	    if reset_id.nil? || reset_id.strip.length == 0
+	      resp.error = "No reset ID was given."
+	    else
+	      user = Caboose::User.user_for_reset_id(reset_id)
+	    	
+	    	if user.nil?
+	    	  resp.error = "The given reset ID is invalid."
+	    	elsif pass1 != pass2
+	    		resp.error = "Passwords don't match."
+	    	elsif pass1.length < 8
+	    	  resp.error = "Passwords must be at least 8 characters"
+	    	else          
+	    	  user.password = Digest::SHA1.hexdigest(Caboose::salt + pass1)
+	    	  user.password_reset_id = ''
+	    	  user.password_reset_sent = ''
+	    	  user.save
+	    		resp.redirect = '/login'
+	    	end
+	    	
+	    end
+	    render :json => resp
+	  end
+	
+  end  
 end

data/app/controllers/caboose/modal_controller.rb

@@ -0,0 +1,10 @@
+module Caboose
+  class ModalController < Caboose::ApplicationController    
+    layout 'caboose/application'
+    
+    # GET /modal/:url
+    def index
+      @url = "/#{params[:url]}"      
+    end    	
+  end  
+end

data/app/mailers/caboose/login_mailer.rb

@@ -0,0 +1,10 @@
+module Caboose
+  class LoginMailer < ActionMailer::Base
+    default :from => Caboose::email_from
+            
+    def forgot_password_email(user)
+      @user = user
+      mail(:to => user.email, :subject => "#{Caboose::website_name} Forgot Password")
+    end    
+  end
+end

data/app/models/caboose/user.rb

@@ -54,4 +54,13 @@ class Caboose::User < ActiveRecord::Base
     end
     return false
   end
+  
+  def self.user_for_reset_id(reset_id)          
+    return nil if reset_id.nil?          
+    d = DateTime.now - 3.days
+    if self.where("password_reset_id = ? and password_reset_sent > ?", reset_id, d).exists?
+      return self.where("password_reset_id = ? and password_reset_sent > ?", reset_id, d).first
+    end
+    return nil
+  end
 end

data/app/views/caboose/login/forgot_password_form.html.erb

@@ -0,0 +1,59 @@
+
+<form action='/login/forgot-password' method='post' id='forgot_form'>
+  <h1>Forgot Password</h1>
+  <div id='content3'>    
+    <p>Enter your username or email address and we'll send you a link that lets you reset your password.</p>
+    <input type='hidden'    name='return_url' value='<%= @return_url %>' />
+    <input type='text'      name='username' id='username' placeholder='Login or email' />
+    <div id='message'></div>
+    <p>
+      <input type='button' id='btn_cancel' value='Cancel' onclick="parent.$.fn.colorbox.close();" />
+    	<input type='submit' id='btn_login'  value='Help Me Remember' onclick='send_forgot_password_link(); return false;' />
+    </p>
+  </div>
+</form>
+
+<% content_for :caboose_css do %>
+<style type="text/css">
+#modal_content input[type="checkbox"] { position: relative; }
+</style>
+<% end %>
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(400);
+});
+
+function send_forgot_password_link()
+{
+  modal.autosize("<p class='loading'>Retrieving info...</p>");
+	$.ajax({
+		url: '/login/forgot-password',
+		type: 'post',
+		data: $('#forgot_form').serialize(),
+		success: function(resp) {
+		  if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+		  if (resp.success)
+		  {
+		    //modal.autosize("<p class='note success'>" + resp.success + "</p>");		    
+		    var div = $('<div/>')
+		      .append($('<p/>').addClass('note success').html(resp.success))
+		      .append($('<p/>').append($('<input/>').attr('type', 'button').val('Close').click(function() { modal.close(); })));
+		    $('#content3').empty().append(div);
+		    modal.autosize();
+		  }		    
+			//if (resp.redirect != false) <%= @modal ? "" : "parent." %>window.location = resp.redirect;
+			//else parent.location.reload(true);
+		},
+		error: function() {	
+			modal.autosize("<p class='note error'>Error</p>");			
+		}
+	});
+}
+</script>
+<% end %>
+<%= content_for :caboose_css do %>
+<%= stylesheet_link_tag "caboose/login", :media => "all" %>
+<% end %>

data/app/views/caboose/login/index.html.erb

@@ -1,15 +1,16 @@
 
 <form action='/login' method='post' id='login_form'>
-<p class='other_options'>
-<a href='/register?return_url=<%= @return_url %>'>Need to register?</a>
-</p>
 <h1>Login</h1>
 <input type='hidden'    name='return_url' value='<%= @return_url %>' />
 <input type='text'      name='username' id='username' placeholder='Login or email' />
 <input type='password'  name='password' id='password' placeholder='Password' />
 <input type='checkbox'  name='remember' id='remember' value='1' checked='true' /> Remember me
+<ul class='other_options'>
+<li><a href='/register?return_url=<%= @return_url %>'>Need to register?</a></li>
+<li><a href='/login/forgot-password?return_url=<%= @return_url %>'>Forgot your password?</a></li>
+</ul>
 <div id='message'></div>
-<p>
+<p class='buttons'>
   <input type='button' id='btn_cancel' value='Cancel' onclick="parent.$.fn.colorbox.close();" />
 	<input type='submit' id='btn_login'  value='Login' onclick='login(); return false;' />
 </p>
@@ -22,7 +23,12 @@
 <% end %>
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
-var modal = new CabooseModal(400);
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(400);
+});
+
 function login()
 {
   modal.autosize("<p class='loading'>Logging in...</p>");
@@ -43,6 +49,7 @@ function login()
 		}
 	});
 }
+
 </script>
 <% end %>
 <%= content_for :caboose_css do %>

data/app/views/caboose/login/reset_password_form.html.erb

@@ -0,0 +1,46 @@
+<h1>Reset Password</h1>
+
+<% if @user.nil? %>
+  <p class='note error'>The given reset ID is invalid.</p>
+  <p class='buttons'><input type='button' value='Close' onclick="parent.window.location='/';" /></p>
+<% else %>
+  <form action='/login/reset-password' method='post' id='reset_password_form'>
+  <input type='hidden' name='id' id='id' value='<%= @reset_id %>' />		
+  <table cellpadding='4' cellspacing='0' border='0'>
+  <tr><td>New Password:	</td><td><input type='password' name='pass1' id='pass1' style='width: 250px;' /></td></tr>
+  <tr><td>Confirm:		  </td><td><input type='password' name='pass2' id='pass2' style='width: 250px;' /></td></tr>
+  </table><br />
+  <div id='message'></div>
+  <p class='buttons'>
+  <input type='submit' value='Reset Password' onclick='reset_password(); return false;' />
+  <input type='button' value='Cancel' 			  onclick="window.location='/';" />
+  </p>
+  </form>
+<% end %>
+
+<%= content_for :caboose_js do %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(400);
+});
+
+<% if !@user.nil? %>
+function reset_password()
+{
+  $.ajax({
+    url: '/login/reset-password',
+    type: 'post',
+    data: $('#reset_password_form').serialize(),
+    success: function(resp) {
+      if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;    
+    }
+  });
+}
+<% end %>
+
+</script>
+<% end %>
+

data/app/views/caboose/login_mailer/forgot_password_email.html.erb

@@ -0,0 +1,8 @@
+<% if @user %>
+<%
+url = "#{Caboose::website_domain}/modal/login/reset-password/#{@user.password_reset_id}"
+%>
+<p>To reset your <%= Caboose::website_name %> website password, click the link below:</p>
+<p><a href='<%= url %>'><%= url %></p>
+<% end %>
+

data/app/views/caboose/modal/index.html.erb

@@ -0,0 +1,9 @@
+<%= content_for :caboose_js do %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  caboose_modal_url(<%= raw Caboose.json(@url) %>);    
+});
+
+</script>
+<% end %>

data/app/views/layouts/caboose/modal.html.erb

@@ -19,6 +19,9 @@
   </div>
 </div>
 <%= javascript_include_tag "caboose/modal" %>
+<% if File.exists?("#{Rails.root}/app/assets/javascripts/modal.js") %>
+<%= javascript_include_tag "modal" %>
+<% end %>
 <%= yield :caboose_js %>
 </body>
 </html>

data/config/routes.rb

@@ -5,11 +5,17 @@ Caboose::Engine.routes.draw do
   get     "station"               => "station#index"
   get     "station/plugin-count"  => "station#plugin_count"
   
-  get     "login"                 => "login#index"
-  post    "login"                 => "login#login"
-  get     "logout"                => "logout#index"
-  get     "register"              => "register#index"
-  post    "register"              => "register#register"
+  get     "modal/:url" => "modal#index", :constraints => {:url => /.*/}
+  
+  get     "login/forgot-password"           => "login#forgot_password_form"
+  post    "login/forgot-password"           => "login#send_reset_email"  
+  get     "login/reset-password/:reset_id"  => "login#reset_password_form"
+  post    "login/reset-password"            => "login#reset_password"  
+  get     "login"                           => "login#index"
+  post    "login"                           => "login#login"
+  get     "logout"                          => "logout#index"
+  get     "register"                        => "register#index"
+  post    "register"                        => "register#register"
 
   get     "my-account"                      => "users#my_account"
   put     "my-account"                      => "users#update_my_account"

data/lib/caboose.rb

@@ -29,5 +29,17 @@ module Caboose
   # Whether or not to use URL parameters (parameters embedded in the URL before the querystring)
   mattr_accessor :use_url_params
   @@use_url_params = true
+  
+  # Website name
+  mattr_accessor :website_name
+  @@website_name = "Website"
+  
+  # Website domain name (with the protocol)
+  mattr_accessor :website_domain
+  @@website_domain = "http://www.google.com"
+  
+  # Email settings
+  mattr_accessor :email_from
+  @@email_from = "webmaster@caboosecms.com"
 
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.32'
+  VERSION = '0.3.33'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.32
+  version: 0.3.33
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -173,6 +173,7 @@ files:
 - app/controllers/caboose/application_controller.rb
 - app/controllers/caboose/login_controller.rb
 - app/controllers/caboose/logout_controller.rb
+- app/controllers/caboose/modal_controller.rb
 - app/controllers/caboose/page_block_field_values_controller.rb
 - app/controllers/caboose/page_block_fields_controller.rb
 - app/controllers/caboose/page_block_types_controller.rb
@@ -189,6 +190,7 @@ files:
 - app/helpers/caboose/pages_helper.rb
 - app/helpers/caboose/permissions_helper.rb
 - app/helpers/caboose/products_helper.rb
+- app/mailers/caboose/login_mailer.rb
 - app/models/caboose/ab_option.rb
 - app/models/caboose/ab_testing.rb
 - app/models/caboose/ab_value.rb
@@ -235,7 +237,11 @@ files:
 - app/views/caboose/application/show.html.erb
 - app/views/caboose/extras/error.html.erb
 - app/views/caboose/extras/error404.html.erb
+- app/views/caboose/login/forgot_password_form.html.erb
 - app/views/caboose/login/index.html.erb
+- app/views/caboose/login/reset_password_form.html.erb
+- app/views/caboose/login_mailer/forgot_password_email.html.erb
+- app/views/caboose/modal/index.html.erb
 - app/views/caboose/page_block_fields/admin_edit.html.erb
 - app/views/caboose/page_block_fields/admin_new.html.erb
 - app/views/caboose/page_block_types/admin_edit.html.erb