adjusted callsign lookups to be case insensitive

chrismatthieu · May 30, 2011 · c11d3f7 · c11d3f7
1 parent 0ac7c1a
commit c11d3f7
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 13 deletions.
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
@@ -17,7 +17,7 @@ def login
 
     if @u and @p.user.is_admin 
       # @u = User.find_by_login(params[:login])
-      @u = User.find(:first, :conditions => ['login = UPPER(?)', params[:login].upcase])        
+      @u = User.find(:first, :conditions => ['login ILIKE ?', params[:login]])        
 
       flash[:notice] = "Hello #{@u.f rescue ''}"
       # cookies[:auth_token] = {:expires => Time.now-1.day, :value => "" }

diff --git a/app/controllers/aprs_controller.rb b/app/controllers/aprs_controller.rb
@@ -6,7 +6,7 @@ def callsign
 
     #@user = User.find_by_login(@callsign) 
     # @user = User.find(:first, :conditions => ['login = ?', @callsign])
-    @user = User.find(:first, :conditions => ['login = UPPER(?)', @callsign.upcase])        
+    @user = User.find(:first, :conditions => ['login ILIKE ?)', @callsign])           
 
 
     # if @user

diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb
@@ -97,7 +97,7 @@ def callsign
 
     #@user = User.find_by_login(@callsign) 
     # @userx = User.find(:first, :conditions => ['login = ?', @callsign])
-    @userx = User.find(:first, :conditions => ['login = UPPER(?)', @callsign.upcase])        
+    @userx = User.find(:first, :conditions => ['login ILIKE ?)', @callsign])          
 
 
     if @userx

diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contacts_controller.rb
@@ -262,7 +262,7 @@ def graph
 
     #@user = User.find_by_login(@callsign) 
     # @userx = User.find(:first, :conditions => ['login = ?', @callsign])
-    @userx = User.find(:first, :conditions => ['login = UPPER(?)', @callsign.upcase])        
+    @userx = User.find(:first, :conditions => ['login ILIKE ?)', @callsign])         
 
 
     if @userx

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -373,8 +373,8 @@ def callsign
     else
 
       # @userx = User.find_by_login(@callsign) 
-      @userx = User.find(:first, :conditions => ['login = UPPER(?)', @callsign.upcase])        
-
+      @userx = User.find(:first, :conditions => ['login ILIKE ?)', @callsign])        
+      # LOCALHOST use LIKE for mysql
 
       @callelements = Array.new 
       if @userx

diff --git a/app/controllers/lists_controller.rb b/app/controllers/lists_controller.rb
@@ -137,7 +137,7 @@ def callsign
 
     # @user = User.find_by_login(@callsign) 
     # @userx = User.find(:first, :conditions => ['login = ?', @callsign])
-    @userx = User.find(:first, :conditions => ['login = UPPER(?)', @callsign.upcase])        
+    @userx = User.find(:first, :conditions => ['login ILIKE ?)', @callsign])           
 
 
     if @userx

diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
@@ -52,8 +52,7 @@ def callsign
 
     #@user = User.find_by_login(@callsign) 
     # @userx = User.find(:first, :conditions => ['login = ?', @callsign])
-    @userx = User.find(:first, :conditions => ['login = UPPER(?)', @callsign.upcase])        
-
+    @userx = User.find(:first, :conditions => ['login ILIKE ?)', @callsign])    
 
     if @userx
 

diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
@@ -129,7 +129,7 @@ def callsign
 
     #@user = User.find_by_login(@callsign) 
     # @user = User.find(:first, :conditions => ['login = ?', @callsign])
-    @user = User.find(:first, :conditions => ['login = UPPER(?)', @callsign.upcase])        
+    @user = User.find(:first, :conditions => ['login ILIKE ?)', @callsign])           
 
 
     if @user

diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
@@ -207,7 +207,7 @@ def callsign
 
     #@user = User.find_by_login(@callsign) 
     # @userx = User.find(:first, :conditions => ['login = ?', @callsign])
-    @userx = User.find(:first, :conditions => ['login = UPPER(?)', @callsign.upcase])        
+    @userx = User.find(:first, :conditions => ['login ILIKE ?)', @callsign])           
 
 
     if @userx

diff --git a/app/controllers/timeline_controller.rb b/app/controllers/timeline_controller.rb
@@ -32,7 +32,7 @@ def callsign
 
     #@user = User.find_by_login(@callsign) 
     # @user = User.find(:first, :conditions => ['login = ?', @callsign])
-    @user = User.find(:first, :conditions => ['login = UPPER(?)', @callsign.upcase])        
+    @user = User.find(:first, :conditions => ['login ILIKE ?)', @callsign])            
 
 
     if @user

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -85,7 +85,7 @@ def can_mail? user
   # Returns the user or nil.
   def self.authenticate(login, password)
     # u = find_by_login(login) # need to get the salt
-    u = User.find(:first, :conditions => ['login = UPPER(?)', login.upcase])        
+    u = User.find(:first, :conditions => ['login ILIKE ?)', @callsign])           
 
     u && u.authenticated?(password) ? u : nil
   end