wheels 0.0.48 → 0.0.49

data/app/views/users/edit.html.haml

@@ -0,0 +1,45 @@
+%h1 Change Your Password
+
+.form
+  = form_for resource do |f|
+    -if resource.errors.any?
+      #errorExplanation
+        %h2= "#{pluralize(resource.errors.count, "error")} prohibited this change:"
+        %ul
+          - resource.errors.full_messages.each do |msg|
+            %li= msg
+    .field
+      .fieldName Old Password:
+      = f.password_field :old_password, :id=>"old_password"
+    .field
+      .fieldName New Password:
+      = f.password_field :password, :id=>"password"
+    .field
+      .fieldName Confirm Password:
+      = f.password_field :password_confirmation
+    .submit= f.submit "Change Password"
+
+:css
+  .extra_form_data {
+    display: none;
+  }
+
+= content_for :head do
+  = javascript_include_tag 'jquery.validate'
+
+
+:javascript
+  var checkingPassword = true;
+  $(function(){
+  jQuery.validator.addMethod("verify_user", function(value, element, params) {
+  //alert($(element).attr('data-verify-user-path'));
+  return $.ajax({
+  async: false,
+  url: $(element).attr('data-verify-user-path')+ '?password='+value
+  }).responseText == "true";
+  }, "Password is incorrect.");
+
+  $('form').validate({onkeyup: function(element) {}});
+  $('#old_password').rules("add", {verify_user : true, alphanumeric: true})
+  });
+

data/db/migrate/{create_access_control_entries.rb → 0110_create_access_control_entries.rb}

@@ -1,7 +1,7 @@
 class CreateAccessControlEntries < ActiveRecord::Migration
   def self.up
     create_table :access_control_entries do |t|
-      t.string :resource_class_name
+      t.string :resource_type
       t.integer :resource_id
       t.integer :user_id
       t.integer :role_id
@@ -10,8 +10,8 @@ class CreateAccessControlEntries < ActiveRecord::Migration
       t.string :serialized_options
       t.timestamps
     end
-    add_index :access_control_entries, :resource_class_name
-    add_index :access_control_entries, [:resource_class_name, :resource_id]
+    add_index :access_control_entries, :resource_type
+    add_index :access_control_entries, [:resource_type, :resource_id]
     add_index :access_control_entries, :user_id
     add_index :access_control_entries, :role_id
   end

data/db/migrate/{create_attachments.rb → 0120_create_attachments.rb}

@@ -6,12 +6,8 @@ class CreateAttachments < ActiveRecord::Migration
       t.integer :file_file_size
       t.datetime :file_updated_at
       t.integer :page_id
-      t.string :resource_class_name
-      t.integer :resource_id
-
       t.timestamps
     end
-    add_index :attachments, [:resource_class_name, :resource_id]
   end
 
   def self.down

data/db/migrate/0140_create_feedbacks.rb

@@ -0,0 +1,20 @@
+class CreateFeedbacks < ActiveRecord::Migration
+  def self.up
+    create_table :feedbacks do |t|
+      t.string :name
+      t.string :phone
+      t.string :subject
+      t.boolean :been_read
+      t.string :email
+      t.text :message
+      t.boolean :want_response
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :feedbacks
+  end
+end
+

data/db/migrate/0150_create_external_links.rb

@@ -0,0 +1,14 @@
+class CreateExternalLinks < ActiveRecord::Migration
+  def self.up
+    create_table :external_links do |t|
+      t.string :url
+      t.text :link_text
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :external_links
+  end
+end
+

data/db/migrate/0160_create_sitemaps.rb

@@ -0,0 +1,17 @@
+class CreateSitemaps < ActiveRecord::Migration
+  def self.up
+    create_table :sitemaps do |t|
+      t.integer :position
+      t.string :menu_text
+      t.string :resource_type
+      t.integer :resource_id
+      t.integer :parent_id
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :sitemaps
+  end
+end
+

data/db/migrate/0170_create_menus.rb

@@ -0,0 +1,14 @@
+class CreateMenus < ActiveRecord::Migration
+  def self.up
+    create_table :menus do |t|
+      t.string :title
+      t.timestamps
+    end
+    Menu.create(:title=>"Main Menu")
+  end
+
+  def self.down
+    drop_table :menus
+  end
+end
+

data/lib/development_mail_interceptor.rb

@@ -0,0 +1,7 @@
+class DevelopmentMailInterceptor
+  def self.delivering_email(message)
+    message.subject = "#{message.to} #{message.subject}"
+    message.to = "tgannon@gmail.com"
+  end
+end
+

data/lib/generators/wheels/recipes/wheels.rb

@@ -37,20 +37,26 @@ run "git submodule add -b rails3 http://github.com/mislav/will_paginate.git vend
 stategies << lambda do
   generate "devise:install"
   generate "devise User"; sleep 1
-  migration_template 'db/migrate/add_fields_to_users.rb', 'db/migrate/add_fields_to_users'
+  migration_template 'db/migrate/0010_add_fields_to_users.rb', 'db/migrate/add_fields_to_users'
   generate "acts_as_taggable_on:migration"; sleep 1
+  migration_template 'db/migrate/0020_create_blogs.rb', 'db/migrate/create_blogs'; sleep 1
+  migration_template 'db/migrate/0030_create_galleries.rb', 'db/migrate/create_galleries'; sleep 1
+  migration_template 'db/migrate/0040_create_images.rb', 'db/migrate/create_images'; sleep 1
+  migration_template 'db/migrate/0050_create_profiles.rb', 'db/migrate/create_profiles'; sleep 1
+  migration_template 'db/migrate/0060_insert_admin_user_and_roles.rb', 'db/migrate/insert_admin_user_and_roles'; sleep 1
+  migration_template "db/migrate/0070_create_pages.rb", "db/migrate/create_pages"; sleep 1
+  migration_template "db/migrate/0080_create_forums.rb", "db/migrate/create_forums"; sleep 1
+  migration_template "db/migrate/0090_create_discussions.rb", "db/migrate/create_discussions"; sleep 1
+  migration_template "db/migrate/0100_create_forum_messages.rb", "db/migrate/create_forum_messages"; sleep 1
+  migration_template "db/migrate/0110_create_access_control_entries.rb", "db/migrate/create_access_control_entries"; sleep 1
+  migration_template "db/migrate/0120_create_attachments.rb", "db/migrate/create_attachments"; sleep 1
+  migration_template 'db/migrate/0130_create_roles.rb', 'db/migrate/create_roles'; sleep 1
+  migration_template "db/migrate/0140_create_feedbacks.rb", "db/migrate/create_feedbacks"; sleep 1
+  migration_template "db/migrate/0150_create_external_links.rb", "db/migrate/create_external_links"; sleep 1
+  migration_template "db/migrate/0160_create_sitemaps.rb", "db/migrate/create_sitemaps"; sleep 1
+  migration_template "db/migrate/0170_create_menus.rb", "db/migrate/create_menus"; sleep 1
+
 
-  migration_template "db/migrate/create_access_control_entries.rb", "db/migrate/create_access_control_entries"; sleep 1
-  migration_template "db/migrate/create_attachments.rb", "db/migrate/create_attachments"; sleep 1
-  migration_template 'db/migrate/create_blogs.rb', 'db/migrate/create_blogs'; sleep 1
-  migration_template "db/migrate/create_discussions.rb", "db/migrate/create_discussions"; sleep 1
-  migration_template "db/migrate/create_forums.rb", "db/migrate/create_forums"; sleep 1
-  migration_template 'db/migrate/create_galleries.rb', 'db/migrate/create_galleries'; sleep 1
-  migration_template 'db/migrate/create_images.rb', 'db/migrate/create_images'; sleep 1
-  migration_template "db/migrate/create_pages.rb", "db/migrate/create_pages"; sleep 1
-  migration_template 'db/migrate/create_profiles.rb', 'db/migrate/create_profiles'; sleep 1
-  migration_template 'db/migrate/create_roles.rb', 'db/migrate/create_roles'; sleep 1
-  migration_template 'db/migrate/insert_admin_user_and_roles.rb', 'db/migrate/insert_admin_user_and_roles'; sleep 1
   plugin 'hassle', :git=>"http://github.com/pedro/hassle.git"
 
   # create wheels_resources first so that devise_for :users will appear first in routes.rb

data/lib/wheels/base.rb

@@ -0,0 +1,7 @@
+module InheritedResources
+  class Base
+
+  end
+
+end
+

data/lib/wheels/routes.rb

@@ -1,12 +1,12 @@
 module ActionDispatch::Routing
   class Mapper
     def wheels_resources
-      scope      "/admin" do
-        resources :access_control_entries
-      end
+      resources :access_control_entries
 
       resources :blogs, :path=>"blog"
 
+      resources :external_links
+
       resources :forums do
         resources :discussions do
           resources :forum_messages
@@ -19,6 +19,8 @@ module ActionDispatch::Routing
 
       resources :layouts
 
+      resources :menus
+
       resources :pages do
         resources :attachments
         resources :children, :controller=>"pages", :as => "children"
@@ -26,6 +28,8 @@ module ActionDispatch::Routing
 
       resource  :profile
 
+      resources :sitemaps
+
       devise_for :users
       resources :users do
         resources :blogs, :path=>"blog"
@@ -36,6 +40,7 @@ module ActionDispatch::Routing
         end
       end
 
+      match '/admin' => "sitemaps#index"
       match "change_password" => "users#edit"
       match "verify_password" => "users#verify", :format=>:json
     end

data/lib/wheels.rb

@@ -7,3 +7,5 @@ require 'wheels/paperclip_interpolations.rb'
 require 'wheels/password_validators.rb'
 # require 'wheels/s3login_provider.rb'
 
+require 'development_mail_interceptor.rb'
+

data/public/javascripts/jquery-validate/additional-methods.js

@@ -0,0 +1,259 @@
+(function() {
+	
+	function stripHtml(value) {
+		// remove html tags and space chars
+		return value.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' ')
+		// remove numbers and punctuation
+		.replace(/[0-9.(),;:!?%#$'"_+=\/-]*/g,'');
+	}
+	jQuery.validator.addMethod("maxWords", function(value, element, params) { 
+	    return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length < params; 
+	}, jQuery.validator.format("Please enter {0} words or less.")); 
+	 
+	jQuery.validator.addMethod("minWords", function(value, element, params) { 
+	    return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params; 
+	}, jQuery.validator.format("Please enter at least {0} words.")); 
+	 
+	jQuery.validator.addMethod("rangeWords", function(value, element, params) { 
+	    return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params[0] && value.match(/bw+b/g).length < params[1]; 
+	}, jQuery.validator.format("Please enter between {0} and {1} words."));
+
+})();
+
+jQuery.validator.addMethod("letterswithbasicpunc", function(value, element) {
+	return this.optional(element) || /^[a-z-.,()'\"\s]+$/i.test(value);
+}, "Letters or punctuation only please");  
+
+jQuery.validator.addMethod("alphanumeric", function(value, element) {
+	return this.optional(element) || /^\w+$/i.test(value);
+}, "Letters, numbers, spaces or underscores only please");  
+
+jQuery.validator.addMethod("lettersonly", function(value, element) {
+	return this.optional(element) || /^[a-z]+$/i.test(value);
+}, "Letters only please"); 
+
+jQuery.validator.addMethod("nowhitespace", function(value, element) {
+	return this.optional(element) || /^\S+$/i.test(value);
+}, "No white space please"); 
+
+jQuery.validator.addMethod("ziprange", function(value, element) {
+	return this.optional(element) || /^90[2-5]\d\{2}-\d{4}$/.test(value);
+}, "Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx");
+
+jQuery.validator.addMethod("integer", function(value, element) {
+	return this.optional(element) || /^-?\d+$/.test(value);
+}, "A positive or negative non-decimal number please");
+
+/**
+* Return true, if the value is a valid vehicle identification number (VIN).
+*
+* Works with all kind of text inputs.
+*
+* @example <input type="text" size="20" name="VehicleID" class="{required:true,vinUS:true}" />
+* @desc Declares a required input element whose value must be a valid vehicle identification number.
+*
+* @name jQuery.validator.methods.vinUS
+* @type Boolean
+* @cat Plugins/Validate/Methods
+*/ 
+jQuery.validator.addMethod(
+	"vinUS",
+	function(v){
+		if (v.length != 17)
+			return false;
+		var i, n, d, f, cd, cdv;
+		var LL    = ["A","B","C","D","E","F","G","H","J","K","L","M","N","P","R","S","T","U","V","W","X","Y","Z"];
+		var VL    = [1,2,3,4,5,6,7,8,1,2,3,4,5,7,9,2,3,4,5,6,7,8,9];
+		var FL    = [8,7,6,5,4,3,2,10,0,9,8,7,6,5,4,3,2];
+		var rs    = 0;
+		for(i = 0; i < 17; i++){
+		    f = FL[i];
+		    d = v.slice(i,i+1);
+		    if(i == 8){
+		        cdv = d;
+		    }
+		    if(!isNaN(d)){
+		        d *= f;
+		    }
+		    else{
+		        for(n = 0; n < LL.length; n++){
+		            if(d.toUpperCase() === LL[n]){
+		                d = VL[n];
+		                d *= f;
+		                if(isNaN(cdv) && n == 8){
+		                    cdv = LL[n];
+		                }
+		                break;
+		            }
+		        }
+		    }
+		    rs += d;
+		}
+		cd = rs % 11;
+		if(cd == 10){cd = "X";}
+		if(cd == cdv){return true;}
+		return false; 
+	},
+	"The specified vehicle identification number (VIN) is invalid."
+);
+
+/**
+  * Return true, if the value is a valid date, also making this formal check dd/mm/yyyy.
+  *
+  * @example jQuery.validator.methods.date("01/01/1900")
+  * @result true
+  *
+  * @example jQuery.validator.methods.date("01/13/1990")
+  * @result false
+  *
+  * @example jQuery.validator.methods.date("01.01.1900")
+  * @result false
+  *
+  * @example <input name="pippo" class="{dateITA:true}" />
+  * @desc Declares an optional input element whose value must be a valid date.
+  *
+  * @name jQuery.validator.methods.dateITA
+  * @type Boolean
+  * @cat Plugins/Validate/Methods
+  */
+jQuery.validator.addMethod(
+	"dateITA",
+	function(value, element) {
+		var check = false;
+		var re = /^\d{1,2}\/\d{1,2}\/\d{4}$/;
+		if( re.test(value)){
+			var adata = value.split('/');
+			var gg = parseInt(adata[0],10);
+			var mm = parseInt(adata[1],10);
+			var aaaa = parseInt(adata[2],10);
+			var xdata = new Date(aaaa,mm-1,gg);
+			if ( ( xdata.getFullYear() == aaaa ) && ( xdata.getMonth () == mm - 1 ) && ( xdata.getDate() == gg ) )
+				check = true;
+			else
+				check = false;
+		} else
+			check = false;
+		return this.optional(element) || check;
+	}, 
+	"Please enter a correct date"
+);
+
+jQuery.validator.addMethod("dateNL", function(value, element) {
+		return this.optional(element) || /^\d\d?[\.\/-]\d\d?[\.\/-]\d\d\d?\d?$/.test(value);
+	}, "Vul hier een geldige datum in."
+);
+
+jQuery.validator.addMethod("time", function(value, element) {
+		return this.optional(element) || /^([01][0-9])|(2[0123]):([0-5])([0-9])$/.test(value);
+	}, "Please enter a valid time, between 00:00 and 23:59"
+);
+
+/**
+ * matches US phone number format 
+ * 
+ * where the area code may not start with 1 and the prefix may not start with 1 
+ * allows '-' or ' ' as a separator and allows parens around area code 
+ * some people may want to put a '1' in front of their number 
+ * 
+ * 1(212)-999-2345
+ * or
+ * 212 999 2344
+ * or
+ * 212-999-0983
+ * 
+ * but not
+ * 111-123-5434
+ * and not
+ * 212 123 4567
+ */
+jQuery.validator.addMethod("phoneUS", function(phone_number, element) {
+    phone_number = phone_number.replace(/\s+/g, ""); 
+	return this.optional(element) || phone_number.length > 9 &&
+		phone_number.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
+}, "Please specify a valid phone number");
+
+jQuery.validator.addMethod('phoneUK', function(phone_number, element) {
+return this.optional(element) || phone_number.length > 9 &&
+phone_number.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/);
+}, 'Please specify a valid phone number');
+
+jQuery.validator.addMethod('mobileUK', function(phone_number, element) {
+return this.optional(element) || phone_number.length > 9 &&
+phone_number.match(/^((0|\+44)7(5|6|7|8|9){1}\d{2}\s?\d{6})$/);
+}, 'Please specify a valid mobile number');
+
+// TODO check if value starts with <, otherwise don't try stripping anything
+jQuery.validator.addMethod("strippedminlength", function(value, element, param) {
+	return jQuery(value).text().length >= param;
+}, jQuery.validator.format("Please enter at least {0} characters"));
+
+// same as email, but TLD is optional
+jQuery.validator.addMethod("email2", function(value, element, param) {
+	return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value); 
+}, jQuery.validator.messages.email);
+
+// same as url, but TLD is optional
+jQuery.validator.addMethod("url2", function(value, element, param) {
+	return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value); 
+}, jQuery.validator.messages.url);
+
+// NOTICE: Modified version of Castle.Components.Validator.CreditCardValidator
+// Redistributed under the the Apache License 2.0 at http://www.apache.org/licenses/LICENSE-2.0
+// Valid Types: mastercard, visa, amex, dinersclub, enroute, discover, jcb, unknown, all (overrides all other settings)
+jQuery.validator.addMethod("creditcardtypes", function(value, element, param) {
+
+	if (/[^0-9-]+/.test(value)) 
+		return false;
+	
+	value = value.replace(/\D/g, "");
+	
+	var validTypes = 0x0000;
+	
+	if (param.mastercard) 
+		validTypes |= 0x0001;
+	if (param.visa) 
+		validTypes |= 0x0002;
+	if (param.amex) 
+		validTypes |= 0x0004;
+	if (param.dinersclub) 
+		validTypes |= 0x0008;
+	if (param.enroute) 
+		validTypes |= 0x0010;
+	if (param.discover) 
+		validTypes |= 0x0020;
+	if (param.jcb) 
+		validTypes |= 0x0040;
+	if (param.unknown) 
+		validTypes |= 0x0080;
+	if (param.all) 
+		validTypes = 0x0001 | 0x0002 | 0x0004 | 0x0008 | 0x0010 | 0x0020 | 0x0040 | 0x0080;
+	
+	if (validTypes & 0x0001 && /^(51|52|53|54|55)/.test(value)) { //mastercard
+		return value.length == 16;
+	}
+	if (validTypes & 0x0002 && /^(4)/.test(value)) { //visa
+		return value.length == 16;
+	}
+	if (validTypes & 0x0004 && /^(34|37)/.test(value)) { //amex
+		return value.length == 15;
+	}
+	if (validTypes & 0x0008 && /^(300|301|302|303|304|305|36|38)/.test(value)) { //dinersclub
+		return value.length == 14;
+	}
+	if (validTypes & 0x0010 && /^(2014|2149)/.test(value)) { //enroute
+		return value.length == 15;
+	}
+	if (validTypes & 0x0020 && /^(6011)/.test(value)) { //discover
+		return value.length == 16;
+	}
+	if (validTypes & 0x0040 && /^(3)/.test(value)) { //jcb
+		return value.length == 16;
+	}
+	if (validTypes & 0x0040 && /^(2131|1800)/.test(value)) { //jcb
+		return value.length == 15;
+	}
+	if (validTypes & 0x0080) { //unknown
+		return true;
+	}
+	return false;
+}, "Please enter a valid credit card number.");