From 88297a682cd76ab9290cd8bf278424bf5c8458e5 Mon Sep 17 00:00:00 2001 From: Steve Coast Date: Tue, 1 Aug 2006 14:53:49 +0000 Subject: [PATCH] bits --- app/controllers/user_controller.rb | 7 ++++--- app/models/user.rb | 25 ++++++++++++++----------- app/views/user/new.rhtml | 6 +++--- app/views/user/signup.rhtml | 2 ++ config/database.yml | 2 +- db/README | 2 +- public/images/rails.png | Bin 1787 -> 0 bytes 7 files changed, 25 insertions(+), 19 deletions(-) delete mode 100644 public/images/rails.png diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 42460b4e0..7a0c8b3d7 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -1,8 +1,9 @@ class UserController < ApplicationController - def create - # do some checks, find the user then send the mail - Notifier::deliver_confirm_signup(user) + def save + @user = User.new(params[:user]) +# @user.save + #Notifier::deliver_confirm_signup(user) end def new diff --git a/app/models/user.rb b/app/models/user.rb index 6bedfbeb3..72752078e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,17 +3,20 @@ require 'digest/md5' class User < ActiveRecord::Base has_many :traces - def passwd=(str) - write_attribute("pass_crypt", Digest::MD5.hexdigest(str)) - end + validates_confirmation_of :pass_crypt - def passwd - return self.pass_crypt - end +# def password=(str) +# write_attribute("pass_crypt", Digest::MD5.hexdigest(str)) +# end - def self.authenticate(username, passwd) - find_first([ "display_name = ? AND pass_crypt =?", - username, - Digest::MD5.hexdigest(passwd) ]) - end + +# def password +# return self.pass_crypt +# end + +# def self.authenticate(username, passwd) +# find_first([ "display_name = ? AND pass_crypt =?", +# username, +# Digest::MD5.hexdigest(passwd) ]) +# end end diff --git a/app/views/user/new.rhtml b/app/views/user/new.rhtml index b67ad1f58..00ab2c7d8 100644 --- a/app/views/user/new.rhtml +++ b/app/views/user/new.rhtml @@ -3,12 +3,12 @@ Fill in the form and we'll send you a quick email to activate your account.
< By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools on openstreetmap.org is to be licensed under this Creative Commons license.

-<%= start_form_tag :action => 'signup' %> +<%= start_form_tag :action => 'save' %> - - + +
email address:<%= text_field('user', 'email',{:size => 50, :maxlength => 255}) %>
Login name<%= text_field('user', 'display_name',{:size => 50, :maxlength => 255}) %>
password:<%= password_field('user', 'password',{:size => 50, :maxlength => 255}) %>
retype password:<%= password_field('user', 'password_confirm',{:size => 50, :maxlength => 255}) %>
password:<%= password_field('user', 'pass_crypt',{:size => 50, :maxlength => 255}) %>
retype password:<%= password_field('user', 'pass_crypt_confirmation',{:size => 50, :maxlength => 255}) %>

diff --git a/app/views/user/signup.rhtml b/app/views/user/signup.rhtml index 907b30816..6e9163c01 100644 --- a/app/views/user/signup.rhtml +++ b/app/views/user/signup.rhtml @@ -1 +1,3 @@ blah + +<%= @user.email %> diff --git a/config/database.yml b/config/database.yml index d366bc96b..1fe4d9880 100644 --- a/config/database.yml +++ b/config/database.yml @@ -12,7 +12,7 @@ # http://dev.mysql.com/doc/refman/5.0/en/old-client.html development: adapter: mysql - database: osm + database: openstreetmap username: openstreetmap password: openstreetmap host: localhost diff --git a/db/README b/db/README index 72a57d241..68fc8e6ce 100644 --- a/db/README +++ b/db/README @@ -1,4 +1,4 @@ -you want to +you want to do something like this $ su # mysqladmin create openstreetmap diff --git a/public/images/rails.png b/public/images/rails.png deleted file mode 100644 index b8441f182e06974083cf08f0acaf0e2fd612bd40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1787 zcmVCLdthj)A!BBmWB&y|X`RY;f`BJ<_ju%@N||NoLFD~mQl$aHGjq>;5dG_D{h(5s}0 z6&=HANU$m__3PuddU(lvR_xWj`}Oho@9EyQt-n!E*P(KhM@X_VFV2l&>deNZJT%y8iwA zoG>u1B`p2=_u9k4v1Mud`1+qvOZoHg#bITJ9U`qBAek?40RR96!AV3xRCwBy*IQ$v zN(=yC9IhRft9V64L`77pqF_Cx@c;kSNoGK)`?Ps*cP(EtGlYZ{D5cxspMQvjKH)Oh6X(pa|J{ zGy1J$Ej7=Z{uvmMfRRsE;v`p;45B~6*ep#hM^ji zl$+7qoWq~}ewG=61uFw0He{tJurMU&4Iv?=B^eR(wAHk!miA)O7p_+YR>lbmU3rmn ze?+ze(+sEd6foB&*l9+?zkr_a-5*v&p*?c}HOGtyHg6r{WFYpQ=#z0Hc7VWLx$>M3|b0|Gn z+5t#z6*ffSVc6DjpmB2?AAR@@vB!wCK?9Yl;33;Q7^%(401QW|k=R8b!OwtLJPjjm zO9Ia;qCq)rOq!1Ia*6#A%#xb}yDx1P*pWla>9j$bnMn3CBqe4`TRll_Iy29kmG?4fbKuF=XqU|?3b@B zA`&a?KIgZ|KJx5eND_c3Em=WZn@xW8hRJ^G&sY^b(FW?WC9W_sb;+lAPdLTdBaKIK;-f}*h4|1aTjw7qX_k~e{TWO7jqcekERN;Jyh%67)q4rKpL*CEYL;|#GY{B@5 zi52XoC?xsoorJKxsliugF#z38MJqrYCWV(t<=G&f;^Me13&AiI9{3jUZ$ zFM`*L(9qc^VMxkz1oaDH!1pcD^IXp>Z0Jb=_qs?Vsrs{mp<^{$N!EC9o+`CO-(o}E zJ`y{*;9s|wr22-QoJ87y^~;)Q@b%P4UgSSsx>2$o@Vd{%Pk0@4qZ^fhB(vt$c1TG> z*{Ad;foraENbld`=MCNm4?9kvlgK~&J>ialpJ7nua zx0oRzwG5;}Qne)Fg(N3kf?JVmB;}y&5(0+~r*aL$0Zof8fe!AtHWH>A^1Y)@G@GsA zup`R{Qg?{+MaxTq#2n{6w|)c&yaJ7{U4ngAH5v6I)*;@rEBE*ehIPBwKBQU)YKE8F0lR!Sm?sE4Xk-sj&E$|A-9n dP56HS1^^A-61FoN)nxzx002ovPDHLkV1kw_Sd9Px -- 2.43.2