Changeset 670 for trunk/app/controllers/users_controller.php

Timestamp:

07/23/08 01:12:58 (4 months ago)

Author:

aarkerio

Message:

Update forums and tests

Files:

• trunk/app/controllers/users_controller.php (modified) (2 diffs)

trunk/app/controllers/users_controller.php

@@ -281 +281 @@
    
    /** Check Passwd **/
-   if (strlen($this->data['User']['pwd']) < 6)
-   {
+   if (strlen($this->data['User']['pwd']) < 6):
        $message['pwd_wrong'] = 'The password have less than 6 characters ';
-   }
-    
-   if (strpos($this->data['User']['username'], ' '))  // no spaces   
-   {
+   endif;
+    
+   if (strpos($this->data['User']['username'], ' ')):  // no spaces
        $message['username_spaces'] = 'Your username should not contain spaces';
-   }
+   endif;
     
    /** username check **/
-   if (strlen($this->data['User']['username']) < 5)
-   {
+   if (strlen($this->data['User']['username']) < 5):
        $message['pwd_username'] = "The username has less than 5 characters ";
-   }
+   endif;
     
    /** name check **/
-   if (strlen($this->data['User']['name']) < 5)
-   {
+   if (strlen($this->data['User']['name']) < 5):
        $message['pwd_username'] = "The name is too short";
-   }
-    
-    if (strpos($this->data['User']['pwd'], ' '))  // pwd too short
-    {
+   endif;
+    
+    if (strpos($this->data['User']['pwd'], ' ')):  // pwd no spaces
        $message['username_spaces'] = "Your password should not contain spaces";
-    }
+    endif;
     
     /** description check **/
-    if (strlen($this->data['User']['description']) < 5)
-    {
+    if (strlen($this->data['User']['description']) < 5):
        $message['description_too_short'] = "C'mon pal, talk us about you!";
-    }
+    endif;
     
     /** email check **/
-    if ($this->Adds->validEmail($this->data['User']['email']) === false)
-    {
+    if ($this->Adds->validEmail($this->data['User']['email']) === false):
        $message['pwd_username'] = "Typed email is invalid";
-    }
+    endif;
     
     /** Check the user **/
     $username = $this->User->field('username', array('username' => $this->data['User']['username']));
     
-    if ($username != null)
-    {
+    if ($username != null):
        $message['username_exist'] = 'The username already exist ';
-    }
+    endif;
     
     /** Check the email **/
     $email        = $this->User->field('email', array('email' => $this->data['User']['email']));
     
-    if ($email != null)
-    {
+    if ($email != null):
        $message['email_exist'] = 'The email already exist ';
-    }
+    endif;
     
     // get the secret code for teachers registration process
     $code  = $this->User->Group->field('code', array('id'=>$this->data['User']['group_id']));
     
-    if ( $this->data['User']['code'] != $code )
-    {
+    if ( $this->data['User']['code'] != $code ):
         $message['wrong_code'] = "The code is incorrect, please put in contact with your school webmaster.";
-    }
-    
-    if ( count($message) > 1 )
-    {  
+    endif;
+    
+    if ( count($message) > 1 ):
        $this->set('message', $message);
        $this->render('validate', 'ajax'); //if error exist, stop here
-      
-    }
-    else
-    {
+    else:
        $this->data['User']['active']     = 0;
        $this->data['User']['name_blog']  = $this->data['User']['username'].'\'s corner'; 
-       $this->User->create();
-       //exit(var_dump($this->data["User"]));
-       if ($this->User->save($this->data['User']))
-       {  
+       
+       if ($this->User->save($this->data)):  
         $this->data['Confirm']['user_id']  = $this->User->getLastInsertID();   // the user id
         $this->data['Confirm']['secret']   = $this->Adds->genPassword(14);     // secret confirm ID
@@ -364 +348 @@
         
          // put the user in confirm model, this is, waiting for user confirmation trough email
-         if ($this->User->Confirm->save($this->data["Confirm"]))  
-         {
+    if ($this->User->Confirm->save($this->data['Confirm'])):
             //Send the confirmation email
-            if ( $this-> _sendNewUserPwd($this->data['User']['email'], $this->data['Confirm']['secret']) ) 
-            { 
+       if ( $this->_sendNewUserPwd($this->data['User']['email'], $this->data['Confirm']['secret']) ):
               $msg  = "<h2>You have been registered!</h2> <p>A confirmation email has been sent to: ".$this->data['User']['email'];
           $msg .= " In order to complete the registration process, please click on the link contained on the email.</p>";
-              $this->set('message', array("Suceess"=>$msg)); 
+              $this->set('message', array('Sucess'=>$msg)); 
               $this->set('ok', true);
               $this->render('validate', 'ajax');
-            }
-         }
-        }
-        else 
-        {
+       endif;
+     endif;
+        else:
             $this->set('message', array("Error"=>"Error, something is wrong in save method"));
             $this->render('validate', 'ajax');
-        }
-     }
+    endif;
+      endif;
    }
   }