Registration fix

application/config/form_validation.php

@@ -5,13 +5,13 @@
         array (
             'field'   => 'username',
             'label'   => 'Username',
-            'rules'   => 'required|min_length[4]|max_length[16]|alpha_dash'
+            'rules'   => 'required|min_length[4]|max_length[16]|alpha_dash|callback_username_check'
         ),
 
         array (
             'field'   => 'email',
             'label'   => 'Email',
-            'rules'   => 'required|valid_email'
+            'rules'   => 'required|valid_email|callback_email_check'
         ),
 
         array (

application/controllers/contributors.php

@@ -155,6 +155,38 @@ public function edit()
         $this->load->view('contributors/edit', $data);
     }
 
+    /**
+     * A validation callback for making sure usernames aren't re-used
+     * @param string $email
+     * @return bool
+     */
+    public function username_check($username)
+    {
+        $this->load->model('contributor');
+        $this->load->library('form_validation');
+
+        if(!Contributor::findByUsername($username)) return true;
+
+        $this->form_validation->set_message('username_check', 'This username has already been used');
+        return FALSE;
+    }
+
+    /**
+     * A validation callback for making sure email addresses aren't re-used
+     * @param string $email
+     * @return bool
+     */
+    public function email_check($email)
+    {
+        $this->load->model('contributor');
+        $this->load->library('form_validation');
+
+        if(!Contributor::findByEmail($email)) return true;
+
+        $this->form_validation->set_message('email_check', 'This email has already been used');
+        return FALSE;
+    }
+
     /**
      * A CodeIgniter validation callback for checking to see the the anti-spam
      *  robot check was correct

application/models/contributor.php

@@ -52,6 +52,18 @@ public static function findById($user_id)
         return $CI->db->get_where('contributors', array('id' => $user_id))->row(0, 'Contributor');
     }
 
+    /**
+     * Get a contributor by his email
+     * @param int $email
+     * @return Contributor
+     */
+    public static function findByEmail($email)
+    {
+        $CI = &get_instance();
+        return $CI->db->get_where('contributors', array('email' => $email))->row(0, 'Contributor');
+    }
+
+
     /**
      *
      * @param string $username

sparks/access/0.0.2/config/access.php

@@ -12,7 +12,7 @@
 );
 
 # The realm. Should be somethng like Your Site Name
-$config['access_realm'] = "Restricted Site";
+$config['access_realm'] = "GetSparks.org";
 
 # Only show the prompt for base URLs that conform to this pattern.
 #  This is a standard perl regular expression.