orange-more 0.5.8 → 0.6.0

data/lib/orange-more/events/plugin.rb

@@ -1,14 +0,0 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
-
-module Orange::Plugins
-  class Events < Base
-    views_dir       File.join(File.dirname(__FILE__), 'views')
-    assets_dir      File.join(File.dirname(__FILE__), 'assets')
-    resource    Orange::CalendarResource.new
-    resource    Orange::EventResource.new
-  end
-end
-
-Orange.plugin(Orange::Plugins::Events.new)
-

data/lib/orange-more/events/resources/calendar_resource.rb

@@ -1,33 +0,0 @@
-module Orange
-  class CalendarResource < ModelResource
-    use OrangeCalendar
-    call_me :calendar
-    def stack_init
-      orange[:admin, true].add_link("Settings", :resource => @my_orange_name, :text => 'Calendars')
-      orange[:radius].define_tag "calendar" do |tag|
-     	  template = tag.attr["template"] || false
-     	  if tag.attr["name"]
-     	    calendars = tag.attr["name"].split.map{|x| model_class.first(:name => x)}
-          unless tag.attr["main"] && tag.attr["main"] == "false"
-            calendars << model_class.all(:main => true)
-          end
-        else
-          calendars = model_class.all
-        end
-        events = OrangeEvent.all(:calendar => calendars, :starts.gt => Time.now, :order => [:starts.asc])
-        orange[:calendar].calendar(tag.locals.packet, {:list => events, :template => template})
-      end
-    end
-    
-    def calendar(packet, opts = {})
-      template = (opts[:template] || "calendar").to_sym
-      do_list_view(packet, template, opts)
-    end
-    
-    def afterNew(packet, obj, opts = {})
-      obj.orange_site = packet['site'] unless obj.orange_site
-    end
-    
-    
-  end
-end

data/lib/orange-more/events/resources/event_resource.rb

@@ -1,147 +0,0 @@
-require 'eventbright'
-require 'json'
-module Orange
-  class EventResource < ModelResource
-    # For integration with Eventbrite. Application key needs user
-    # key for full access.
-    ORANGE_EVENTBRITE_KEY = "ODQ5MDMzZWQwOWRl"
-    
-    use OrangeEvent
-    call_me :events
-    
-    def stack_init
-      orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Events')
-      EventBright.setup(ORANGE_EVENTBRITE_KEY)
-      options[:eventbrite_key] = orange.options['eventbrite_key'] || false
-    end
-    
-    def eventbrite_user
-      return false unless options[:eventbrite_key]
-      begin
-        @eventbrite_user = EventBright::User.new(options[:eventbrite_key]) 
-      rescue # If EventBright gem throws error, we're probably having issues connecting
-        false
-      end
-    end
-    
-    def find_extras(packet, mode, opts = {})
-      extras = {:calendars => OrangeCalendar.all}
-      case mode
-      when :create, :edit
-        ev = eventbrite_venues
-        ee = eventbrite_events
-        ev_json = {} if ev
-        ev.each{|v| ev_json[v.id] = v.attributes.merge(:id => v.id)} if ev
-        ee_json = {} if ee
-        ee.each{|v| ee_json[v.id] = v.attributes.merge(:id => v.id).reject{|k,v| [:venue, :organizer].include? k}} if ee
-        extras.merge!(:eventbrite_venues => ev, :venues_json => ev_json.to_json, 
-                      :eventbrite_events => ee, :events_json => ee_json.to_json
-                      ) if options[:eventbrite_key]
-      
-      end
-      extras
-    end
-    
-    def synchronize_attendees(packet, params = {})
-      no_reroute = params.delete(:no_reroute)
-      params = params.with_defaults(:resource_id => packet['route.resource_id'])
-      if packet.request.post? && orange.loaded?(:members) && 
-        event_orange = model_class.get(params[:resource_id])
-        event = eventbrite_user.events.select{|e| e.id.to_s == event_orange.eventbrite_id}.first
-        orange[:members, true].add_attendee_group(packet, "Eventbrite Attendee", "#{event.title} - #{event.id}")
-        emails = event.attendees.map{|a| a.email}
-        orange[:members, true].batch_update_interest_mailchimp(packet, emails, "Eventbrite Attendee", "#{event.title} - #{event.id}")
-      end
-      packet.reroute(@my_orange_name, :orange, packet['route.resource_id'], 'edit') unless no_reroute
-    end
-    
-    # Todo - eventbrite crashes when date in past
-    def beforeNew(packet, params = {})
-      eventbrite_synchronize(packet, params)
-      true
-    end
-    
-    # Todo - eventbrite crashes when date in past
-    def beforeSave(packet, model, params = {})
-      eventbrite_synchronize(packet, params)
-      true
-    end
-    
-    def eventbrite_synchronize(packet, params = {})
-      venue_id = params.delete('orange_venue_id')
-      if params['link_to_eventbrite'] != "0" 
-        if venue_id == "new"
-          v = EventBright::Venue.new(eventbrite_user)
-          v.organizer_id = eventbrite_user.organizers.first.id
-        else
-          v = eventbrite_user.venues.select{|v| v.id == venue_id.to_i }.first
-        end
-        update_venue(v, params)
-        if params['eventbrite_id'] == "new"
-          e = EventBright::Event.new(eventbrite_user)
-          e.organizer = eventbrite_user.organizers.first
-        else
-          e = eventbrite_user.events.select{|e| e.id == params['eventbrite_id'].to_i }.first
-        end
-        params['eventbrite_id'] = update_event(e, params, v)
-      else
-        params['eventbrite_id'] = nil
-      end
-      params
-    end
-    
-    def update_event(event, params, venue)
-      event.venue = venue
-      event.title = params["name"]
-      event.description = params["description"]
-      event.start_date = params["starts_date"] + " " + params["starts_time"]
-      event.end_date = params["ends_date"] + " " + params["ends_time"]
-      if(event.start_date > event.end_date)
-        raise "An event can't end before it starts."
-      else
-        event.status = "live"
-        event.save
-      end
-      return event.id
-    end
-    
-    def update_venue(venue, params)
-      venue.name = params["location_name"]
-      venue.address = params["location_address"]
-      venue.address_2 = params["location_address2"]
-      venue.city = params["location_city"]
-      venue.region = params["location_state"]
-      venue.postal_code = params["location_zip"]
-      venue.country_code = "US"
-      venue.save
-    end
-    
-    def find_list(packet, mode, opts = {})
-      model_class.all(:order => [:starts.desc]) || []
-    end
-    
-    def post_to_eventbrite
-      
-    end
-    
-    def eventbrite_venues
-      list = []
-      begin
-        list = eventbrite_user.venues
-      rescue
-        return false
-      end
-      list
-    end
-    
-    def eventbrite_events
-      list = []
-      begin
-        list = eventbrite_user.events
-      rescue
-        return false
-      end
-      list
-    end
-  end
-end

data/lib/orange-more/events/views/calendar/calendar.haml

@@ -1,8 +0,0 @@
--# Given a list of events...
-- for event in list
-  .event
-    %h2 #{event.name}
-    .description
-      = event.blurb
-      
-      %a{:href => route_to(:events, event.id)} Learn More

data/lib/orange-more/events/views/events/create.haml

@@ -1,55 +0,0 @@
-- packet.add_js('events.js', :module => '_events_')
-%form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post'}
-  - for prop in props.reject{|v| v[:name].to_s =~ /location_/ || v[:name].to_s =~ /eventbrite/}
-    %p= view_attribute(prop, model_name, :label => true)
-  %fieldset
-    %legend Venue
-    %p
-      %select{:id => "#{model_name}-venue", :name => "#{model_name}[orange_venue_id]"}
-        %option(disabled) Choose a venue
-        - for venue in eventbrite_venues
-          %option{:value => venue.id}= venue.name
-        %option{:value => "new"} New...
-      %a.show-venue-details{:href=>"#"} (Details)
-    .new-venue
-      :javascript
-        var venues = #{venues_json};
-      - for prop in props.select{|v| v[:name].to_s =~ /location_/}
-        %p= view_attribute(prop, model_name, :label => true)
-  %fieldset
-    %legend EventBrite
-    %p
-      %label Link to EventBrite?
-      %input(type="hidden" value="0" name="events[link_to_eventbrite]")
-      %input(type="checkbox" value="1" name="events[link_to_eventbrite]")
-    %p.eventbrite-link(style="display:none;")
-      :javascript
-        var events = #{events_json};
-      %label Which EventBrite Event?
-      %br
-      %select{:id => "#{model_name}-eventbrite-id", :name => "#{model_name}[eventbrite_id]"}
-        %optgroup(label="Create a new event")
-          %option{:value => "new"} New...
-        %optgroup(label="Existing event")
-          - for event in eventbrite_events
-            %option{:value => event.id}= event.title
-  %p
-    %label{:for => "#{model_name}-calendar"} Calendar
-    %br
-    %select{:id => "#{model_name}-calendar", :name => "#{model_name}[orange_calendar_id]"}
-      - for calendar in calendars
-        %option{:value => calendar.id}= calendar.name
-  %p
-    %label{:for => "#{model_name}-starts"} Starts
-    %br
-    %input{:type => 'text', :id => "#{model_name}-starts", :class => 'date', :name => "#{model_name}[starts_date]", :size => 10, :value => Time.now.strftime("%m/%d/%Y") }
-    at
-    %input{:type => 'text', :name => "#{model_name}[starts_time]", :size => 8, :value => Time.now.strftime("%I:%M %p") }
-  %p
-    %label{:for => "#{model_name}-ends"} Ends
-    %br
-    %input{:type => 'text', :id => "#{model_name}-ends", :size => 10, :class => 'date', :name => "#{model_name}[ends_date]", :value => (Time.now + 60*60).strftime("%m/%d/%Y") }
-    at
-    %input{:type => 'text', :name => "#{model_name}[ends_time]", :size => 8, :value => (Time.now + 60*60).strftime("%I:%M %p") }
-  %input{:type => 'submit', :value => 'Save New Event'}
-  

data/lib/orange-more/events/views/events/edit.haml

@@ -1,59 +0,0 @@
--if model
-  - my_event = eventbrite_events.select{|e| e.id == model.eventbrite_id.to_i }.first || nil
-  - packet.add_js('events.js', :module => '_events_')
-  %form{:action => "#{packet.route_to(model_name, model[:id], 'save')}", :method => 'post'}
-    - for prop in props.reject{|v| v[:name].to_s =~ /location_/ || v[:name].to_s =~ /eventbrite/}
-      %p= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))
-    %fieldset
-      %legend Venue
-      %p
-        %select{:id => "#{model_name}-venue", :name => "#{model_name}[orange_venue_id]"}
-          %option(disabled) Choose a venue
-          - for venue in eventbrite_venues
-            %option{:value => venue.id, :selected => ((my_event && (venue.id == my_event.venue.id)) || venue.name == model.location_name)}= venue.name
-          %option{:value => "new"} New...
-        %a.show-venue-details{:href=>"#"} (Details)
-      .new-venue
-        :javascript
-          var venues = #{venues_json};
-        - for prop in props.select{|v| v[:name].to_s =~ /location_/}
-          %p= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))
-    %fieldset
-      %legend EventBrite
-      %p
-        %label Link to EventBrite?
-        %input(type="hidden" value="0" name="events[link_to_eventbrite]")
-        %input{:type=>"checkbox", :value=>"1", :name=>"events[link_to_eventbrite]", :checked=>(model.link_to_eventbrite ? true : false)}
-      %p.eventbrite-link{:style => (model.link_to_eventbrite ? "" : "display:none;")}
-        :javascript
-          var events = #{events_json};
-        %label Which EventBrite Event?
-        %br
-        %select{:id => "#{model_name}-eventbrite-id", :name => "#{model_name}[eventbrite_id]"}
-          %optgroup(label="Create a new event")
-            %option{:value => "new"} New...
-          %optgroup(label="Existing event")
-            - for event in eventbrite_events
-              %option{:value => event.id, :selected => (my_event && (my_event.id == event.id))}= event.title
-    %p
-      %label{:for => "#{model_name}-calendar"} Calendar
-      %br
-      %select{:id => "#{model_name}-calendar", :name => "#{model_name}[orange_calendar_id]"}
-        - for calendar in calendars
-          %option{:value => calendar.id, :selected => (model.calendar.id == calendar.id)}= calendar.name
-    %p
-      %label{:for => "#{model_name}-starts"} Starts
-      %br
-      %input{:type => 'text', :id => "#{model_name}-starts", :class => 'date', :name => "#{model_name}[starts_date]", :size => 10, :value => model.starts_date }
-      at
-      %input{:type => 'text', :name => "#{model_name}[starts_time]", :size => 8, :value => model.starts_time }
-    %p
-      %label{:for => "#{model_name}-ends"} Ends
-      %br
-      %input{:type => 'text', :id => "#{model_name}-ends", :size => 10, :class => 'date', :name => "#{model_name}[ends_date]", :value => model.ends_date }
-      at
-      %input{:type => 'text', :name => "#{model_name}[ends_time]", :size => 8, :value => model.ends_time }
-    %input{:type => 'submit', :value => 'Save Event'}
-  = form_link('Synchronize Eventbrite Attendees to Mailchimp', route_to(model_name, model.id, 'synchronize_attendees'))
-- else
-  %p Couldn't find the event.

data/lib/orange-more/events/views/events/list.haml

@@ -1,13 +0,0 @@
-%table
-  %thead
-    %tr
-      %th Name
-      %th Description
-      %th Location
-      %th Calendar
-      %th EventBrite Link
-      %th
-  %tbody
-    - for obj in list
-      = view_table_row(model_name, :model => obj)
-%a{:href => route_to(model_name, 'create')} New

data/lib/orange-more/events/views/events/show.haml

@@ -1,4 +0,0 @@
--# Given a list of events...
-.event
-  %h2 #{model.name}
-  .description= model.description

data/lib/orange-more/events/views/events/table_row.haml

@@ -1,17 +0,0 @@
-- if model
-  %tr
-    %td= model.name
-    %td= model.description
-    %td= model.location_name
-    %td= model.calendar.blank? ? "None" : model.calendar.name
-    %td
-      - if model.link_to_eventbrite
-        - if model.eventbrite_id && model.eventbrite_id != "new"
-          %a{:href => "http://www.eventbrite.com/myevent?eid="+model.eventbrite_id}= model.name
-        - else
-          N/A
-      - else
-        N/A
-    %td.actions
-      = form_link('Delete', route_to(model_name, model.id, 'delete'), 'Are you sure you want to delete this?', {:method => 'delete'})
-      %a{:href => route_to(model_name, model.id, 'edit')} Edit

data/lib/orange-more/members.rb

@@ -1 +0,0 @@
-require File.join('orange-more', 'members', 'plugin')

data/lib/orange-more/members/cartons/member_carton.rb

@@ -1,38 +0,0 @@
-require 'md5'
-
-class OrangeMember < Orange::Carton
-  id
-  front do
-    text :first_name
-    text :last_name
-    text :email
-    text :title
-    text :organization
-  end  
-  text :hashed_password
-  text :salt
-  text :reset_token
-  property :reset_on, DateTime
-  
-  def password=(val)
-    attribute_set(:hashed_password, Digest::MD5.hexdigest("#{salt}orange-is-awesome#{val}"))
-  end
-  
-  def salt
-    my_salt = attribute_get(:salt)
-    unless(my_salt)
-      my_salt = Digest::MD5.hexdigest(Time.now.iso8601)
-      attribute_set(:salt, my_salt)
-    end
-    my_salt
-  end
-  
-  def reset!
-    token = Digest::MD5.hexdigest(Time.now.iso8601)
-    # Invalidate password
-    attribute_set(:hashed_password, Digest::MD5.hexdigest("#{salt}#{token}"))
-    attribute_set(:reset_on, DateTime)
-    attribute_set(:reset_token, token)
-  end
-  
-end

data/lib/orange-more/members/plugin.rb

@@ -1,13 +0,0 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
-Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
-
-module Orange::Plugins
-  class Members < Base
-    views_dir   File.join(File.dirname(__FILE__), 'views')
-    
-    resource    Orange::MembersResource.new
-  end
-end
-
-Orange.plugin(Orange::Plugins::Members.new)
-

data/lib/orange-more/members/resources/members_resource.rb

@@ -1,327 +0,0 @@
-require 'spreedly'
-require 'hominid'
-
-module Orange
-  class MembersResource < Orange::ModelResource
-    use OrangeMember
-    call_me :members
-    def stack_init
-      options[:spreedly_key] = orange.options['spreedly_key'] || false
-      options[:spreedly_plan] = orange.options['spreedly_plan'] || false
-      options[:spreedly_site] = orange.options['spreedly_site'] || false
-      options[:mailchimp_key] = orange.options["mailchimp_key"] || false
-      options[:mailchimp_list] = orange.options["mailchimp_list"] || false
-      options[:mailchimp_interests] = orange.options["mailchimp_interests"] || false
-      options[:mailchimp_merge_fields] = orange.options["mailchimp_merge_fields"] || {}
-      Spreedly.configure(options[:spreedly_site], options[:spreedly_key]) if options[:spreedly_key]
-      
-      orange[:admin, true].add_link("Settings", :resource => @my_orange_name, :text => 'Members')
-      orange[:radius, true].define_tag "if_member" do |tag|
-        packet = tag.locals.packet
-        if packet.session["member"]
-          tag.expand
-        else
-          if(tag.attr["else_view"]) 
-            orange[:members].do_view(packet, tag.attr["else_view"].to_sym)
-          else
-            ""
-          end
-        end
-      end
-      orange[:radius, true].define_tag "if_paid_member" do |tag|
-        packet = tag.locals.packet
-        if packet.session["member"] && orange[:members].paid?(packet, packet.session["member"])
-          tag.expand
-        else
-          if(tag.attr["else_view"]) 
-            orange[:members].do_view(packet, tag.attr["else_view"].to_sym)
-          else
-            ""
-          end
-        end
-      end
-      orange[:radius, true].define_tag "unless_member" do |tag|
-        packet = tag.locals.packet
-        unless packet.session["member"]
-          tag.expand
-        else
-          ""
-        end
-      end
-    end
-    
-    def hominid
-      @hominid ||= Hominid::Base.new({:api_key => options[:mailchimp_key]}) if options[:mailchimp_key]
-    end
-    
-    def hominid_list
-      @hominid_list ||= hominid.find_list_by_id(options[:mailchimp_list]) if options[:mailchimp_list] && hominid
-    end
-    
-    
-    
-    def paid?(packet, member)
-      return true unless options[:spreedly_key]
-      unless member.is_a? model_class
-        member = model_class.get(member)
-      end
-      subscriber = Spreedly::Subscriber.find(member.id)
-      subscriber ? subscriber.active? : false
-    end
-    
-    def subscription_url(packet, member)
-      return "" unless options[:spreedly_key]
-      unless member.is_a? model_class
-        member = model_class.get(member)
-      end
-      Spreedly.subscribe_url(member.id, options[:spreedly_plan])
-    end
-    
-    def list_groups(packet)
-      hominid.call("listInterestGroupings", options[:mailchimp_list]).select{|g| options[:mailchimp_interests].include? g["name"]}
-    end
-    
-    def list_groups_for_email(packet, email)
-      chimp_info = hominid.member_info(options[:mailchimp_list], email)
-    end
-        # 
-        # def add_to_mailchimp(packet, member_params)
-        #   email = member_params[:email]
-        #   fname = member_params[:first_name]
-        #   lname = member_params[:last_name]
-        #   interests = member_params[:groups].map{|key, val| 
-        #     { "name" => key, "groups" => groups.map{|str| str.gsub(/,/, "\,")}.join(",") }
-        #   }
-        #   hominid.subscribe(options[:mailchimp_list], email, {:FNAME => fname, :LNAME => lname, :INTERESTS => interests}, {:update_existing => true})
-        # end
-    
-    def synchronize_with_mailchimp(packet, member_params)
-      email = member_params["email"]
-      old_email = member_params["old_email"] || email
-      fname = member_params["first_name"] || ''
-      lname = member_params["last_name"] || ''
-      others = {}
-      for key, val in options[:mailchimp_merge_fields]
-        others[val.upcase.to_sym] = member_params[key] || ''
-      end
-      interests = member_params["groups"].blank? ? [] : member_params["groups"].map{|key, val| 
-        { "name" => key, "groups" => val.reject{|str| str.blank? }.map{|str| str.gsub(/,/, '\,')}.join(",") }
-      }
-      hominid.subscribe(options[:mailchimp_list], old_email, {:FNAME => fname, :LNAME => lname, :GROUPINGS => interests}.merge(others), {:update_existing => true})
-    end
-    
-    def synchronize_from_mailchimp(packet, member)
-      email = member.email
-      member_info = mailchimp_member_info(packet, member)
-      for key, val in options[:mailchimp_merge_fields]
-        member.attribute_set(key, member_info["merges"][val])
-      end
-      member.save
-    end
-    
-    def batch_update_interest_mailchimp(packet, emails, grouping_name, groups)
-      interests = [{ "name" => grouping_name, "groups" => groups }]
-      emails = emails.map{|e| {:EMAIL => e, :GROUPINGS => interests}}
-      hominid.subscribe_many(options[:mailchimp_list], emails, {:double_opt_in => true, :update_existing => true, :replace_interests => false})
-    end
-    
-    def add_attendee_group(packet, grouping_name, name, limit = 15)
-      list = options[:mailchimp_list]
-      my_groups = hominid.call("listInterestGroupings", list)
-      grouping = my_groups.select{|a| a["name"] == grouping_name}.first
-      if grouping
-        # Return true if already in the list.
-        return true if grouping["groups"].select{|a| a["name"] == name }.size > 0
-      
-        # Keep group size manageable
-        if grouping["groups"].size > limit
-          remove = grouping["groups"].shift 
-          hominid.call("listInterestGroupDel", list, remove["name"], grouping["id"])
-        end
-        hominid.call("listInterestGroupAdd", list, name, grouping["id"])
-      else
-        hominid.call("listInterestGroupingAdd", list, grouping_name, "checkboxes", [name] )
-      end
-    end
-    
-    def unsubscribe_from_mailchimp(packet, email)
-      hominid.unsubscribe(options[:mailchimp_list], email)
-    end
-    
-    def mailchimp_member_info(packet, member)
-      # Can give member id, hydrate to member before continuing.
-      unless member.is_a? model_class
-        member = model_class.get(member)
-      end
-      return [] unless member && options[:mailchimp_list]
-      list = options[:mailchimp_list]
-      begin
-        mailchimp_info = hominid.member_info(list, member.email)
-      rescue Hominid::ListError => e
-        mailchimp_info = {}
-      end
-      mailchimp_info
-    end
-    
-    def login(packet, opts = {})
-      if packet.request.post?
-        params = packet.request.params["members"]
-        login = params["login_email"]
-        password = params["login_password"]
-        member = model_class.first({:email => login})
-        tester = model_class.new({:salt => (member.salt || "")})
-        tester.password = password
-        if member && tester.hashed_password == member.hashed_password
-          packet.session["member"] = member.id
-          packet.reroute(@my_orange_name, :orange, :profile)
-        else
-          packet.flash("error", "Invalid email or password")
-          do_view(packet, :login, opts)
-        end
-      else
-        packet.reroute(@my_orange_name, :orange, :profile) if packet.session["member"]
-        do_view(packet, :login, opts)
-      end
-    end
-    
-    def register(packet, opts = {})
-      if packet.request.post?
-        params = packet.request.params["members"]
-        unless params["name"].blank?
-          # Problem, stay on registration
-          packet.flash("error", "It looks like you might be a spam robot. Make sure you didn't fill out an extra field by mistake.")
-          return do_view(packet, :register, opts.merge(:list_groups => list_groups(packet)))
-        end
-        params.delete("name")
-        member = model_class.first(:email => params["email"])
-        if member
-          # Existing member... do they already have password?
-          if member.hashed_password.blank?
-            # A member who is part of the mailing list, but hasn't
-            # set a password
-            email = params.delete("email")
-            mailing_list = params.delete("email_subscribe")
-            groups = params.delete("groups")
-            save(packet, {:resource_id => member.id, :params => params, :no_reroute => true})
-            member = model_class.first(:email => email)
-            if member.hashed_password.blank?              
-              # Problem, stay on registration
-              do_view(packet, :register, opts.merge(:list_groups => list_groups(packet)))
-            else
-              packet.flash("info", "Looks like this email address was already on our mailing list. Please take the time to correct our details about you.")
-              packet.session["member"] = member.id
-              # Synchronize with the mailchimp account.
-              params.merge!("groups" => groups)
-              synchronize_with_mailchimp(packet, params.merge("groups" => groups, "email" => email)) if mailing_list
-              packet.reroute(@my_orange_name, :orange, :profile)
-            end
-          else
-            # A person trying to sign up with an email that already
-            # has a password
-            packet.flash("error", "Looks like this email address already has an account. Try logging in instead.")
-            packet.reroute(@my_orange_name, :orange, :login)
-          end
-        else
-          # New member time!
-          mailing_list = params.delete("email_subscribe")
-          groups = params.delete("groups")
-          new(packet, {:no_reroute => true, :params => params})
-          # success ?
-          member = model_class.first(:email => params["email"])
-          if member && !(mailchimp_member_info(packet, member).blank?)
-            packet.session["member"] = member.id
-            synchronize_from_mailchimp(packet, member)
-            synchronize_with_mailchimp(packet, params.merge("groups" => groups)) if mailing_list
-            packet.flash("info", "Looks like this email address was already on our mailing list. Please take the time to correct our details about you.")
-            packet.reroute(@my_orange_name, :orange, :profile)
-          elsif member
-            packet.session["member"] = member.id
-            params.merge!("groups" => groups)
-            synchronize_with_mailchimp(packet, params.merge("groups" => groups)) if mailing_list
-            packet.flash("info", "You've successfully created an account. Please take the time to fill in more details about yourself.")
-            packet.reroute(@my_orange_name, :orange, :profile)
-          else
-            # Problem, stay on registration
-            do_view(packet, :register, opts.merge(:list_groups => list_groups(packet)))
-          end
-        end # End pre-existing member if 
-      else
-        do_view(packet, :register, opts.merge(:list_groups => list_groups(packet)))
-      end
-    end
-    
-    def logout(packet, opts = {})
-      packet.session["member"] = nil
-      do_view(packet, :logout, opts)
-    end
-    
-    def profile(packet, opts = {})
-      no_reroute = opts.delete(:no_reroute)
-      # login check
-      unless packet.session["member"]
-        packet.flash("error", "You must log in to view this page")
-        packet.reroute(@my_orange_name, :orange, :login) 
-      end
-      
-      if packet.request.post?
-        params = packet.request.params["members"]
-        if params["current_password"].blank?
-          # Can't change password without confirming current
-          params.delete("password")
-          params.delete("repeat_password")
-          password_change = false
-        else 
-          password_change = true
-        end
-        member = model_class.get(packet.session["member"])
-        check = model_class.new(:password => params.delete("current_password"))
-        if !password_change || member.hashed_password == check.hashed_password
-          
-          mailing_list = params.delete("email_subscribe")
-          groups = params.delete("groups")
-          old_email = member.email
-          save(packet, {:resource_id => packet.session["member"], :no_reroute => true, :params => params})
-          if mailing_list == "1"
-            synchronize_with_mailchimp(packet, params.merge("groups" => groups, "old_email" => old_email))
-          else
-            unsubscribe_from_mailchimp(packet, params["email"])
-          end
-        else
-          packet.flash("error", "Your old password was not input correctly")
-        end
-      end
-      member = model_class.get(packet.session["member"])
-      opts[:model] = member
-      do_view(packet, :profile, opts.merge(:list_groups => list_groups(packet)))
-    end
-    
-    
-    def beforeNew(packet, params)
-      unless params["password"] == params["repeat_password"]
-        packet.flash("error", "New password does not match repeated password")
-        return false 
-      end
-      unless params["password"].blank? || params["password"].size >= 6
-        packet.flash("error", "Password should be over 6 characters")
-        return false
-      end
-      params.delete("password") if params["password"].blank?
-      params.delete("repeat_password")
-      true
-    end
-    
-    def beforeSave(packet, m, params)
-      unless params["password"] == params["repeat_password"]
-        packet.flash("error", "New password does not match repeated password")
-        return false 
-      end
-      unless params["password"].blank? || params["password"].size >= 6
-        packet.flash("error", "Password should be over 6 characters")
-        return false
-      end
-      params.delete("password") if params["password"].blank?
-      params.delete("repeat_password")
-      true
-    end
-  end
-end