0
@@ -28,7 +28,6 @@ class AssetsController < ApplicationController
0
   # GET /assets/1.xml
0
   def show
0
     respond_to do |format|
0
-      format.rss 
0
       format.html do
0
         @page_title = "#{@asset.title} by #{@user.name} on alonetone"
0
         @assets = [@asset]

0
@@ -18,7 +18,7 @@ class UsersController < ApplicationController
0
     respond_to do |format|
0
       format.html do
0
         @user_count = User.count
0
-        @active     = User.count(:all, :conditions => "assets_count > 0")
0
+        @active     = User.count(:all, :conditions => "assets_count > 0", :include => :pic)
0
       end
0
       format.xml do
0
         @users = User.search(params[:q], :limit => 25)

0
@@ -26,6 +26,9 @@
0
 require 'digest/sha1'
0
 class User < ActiveRecord::Base
0
   
0
+  # has a bunch of prefs
0
+  serialize :settings
0
+  
0
   # Can create music
0
   has_many   :assets,        :dependent => :destroy, :order => 'created_at DESC'
0
   has_many   :playlists,     :dependent => :destroy, :order => 'playlists.created_at DESC'
0
@@ -47,8 +50,9 @@ class User < ActiveRecord::Base
0
   # Virtual attribute for the unencrypted password
0
   attr_accessor :password
0
 
0
-  # These attributes can be changed by a user
0
-  attr_accessible :login, :email, :password, :password_confirmation, :website, :bio, :display_name, :itunes
0
+  # These attributes can be changed via mass assignment 
0
+  attr_accessible :login, :email, :password, :password_confirmation, :website, :myspace,
0
+                  :bio, :display_name, :itunes, :settings, :city, :state
0
   
0
   # Validations
0
   validates_presence_of     :email
0
@@ -140,11 +144,11 @@ class User < ActiveRecord::Base
0
   
0
   def self.paginate_by_params(params)
0
     if params[:all]
0
-      self.paginate_all_by_activation_code(nil, :per_page => 24, :order => "created_at DESC", :page => params[:page])
0
+      self.paginate_all_by_activation_code(nil, :per_page => 24, :include => :pic, :order => "users.created_at DESC", :page => params[:page])
0
     elsif params[:playlists]
0
-      self.paginate(:all, :conditions => 'users.playlists_count > 0', :per_page => 24, :order => "users.playlists_count DESC", :page => params[:page]) 
0
+      self.paginate(:all, :conditions => 'users.playlists_count > 0', :per_page => 24, :include => :pic, :order => "users.playlists_count DESC", :page => params[:page]) 
0
     else
0
-      self.paginate(:all, :conditions => 'users.assets_count > 0', :per_page => 24, :order => "users.assets_count DESC", :page => params[:page])
0
+      self.paginate(:all, :conditions => 'users.assets_count > 0', :per_page => 24, :include => :pic, :order => "users.assets_count DESC", :page => params[:page])
0
     end
0
   end
0
   
0
@@ -189,7 +193,7 @@ class User < ActiveRecord::Base
0
   
0
   def to_xml(options = {})
0
     options[:except] ||= []
0
-    options[:except] << :email << :token << :token_expires_at << :crypted_password << :identity_url << :fb_user_id << :activation_code << :admin
0
+    options[:except] << :email << :token << :token_expires_at << :crypted_password << :identity_url << :fb_user_id << :activation_code << :admin << :salt
0
     super
0
   end
0
   

0
@@ -14,9 +14,9 @@ module AuthenticatedSystem
0
     # This is now also used to show which users are online... not at accurate as the
0
     # session based approach, but less code and less overhead.
0
     def update_last_seen_at
0
-      return unless logged_in? || session[:sudo]
0
-      User.update_all ['last_seen_at = ? AND ip = ?', Time.now.utc, request.env['REMOTE_HOST']], ['id = ?', current_user.id] 
0
-      current_user.last_seen_at = Time.now.utc
0
+      return unless logged_in? 
0
+      current_user.update_attribute(:last_seen_at,Time.now.utc)
0
+      current_user.update_attribute(:ip, request.remote_ip)
0
     end
0
     
0
     def login_required