Changeset 670 for trunk

Timestamp:

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

Author:

aarkerio

Message:

Update forums and tests

Location:

trunk/app

Files:

• controllers/recovers_controller.php (modified) (4 diffs)
• controllers/users_controller.php (modified) (2 diffs)
• views/recovers/newpwd.ctp (modified) (1 diff)

trunk/app/controllers/recovers_controller.php

@@ -22 +22 @@
  public function recover()
  {
-        $this->pageTitle = 'Recover password :: Karamelo E-learning on Web 2.0';
+        $this->pageTitle = __('Recover password', true);
         
         $this->Portal->statics(); // Using Portal component 
@@ -35 +35 @@
         $this->Sanitize->clean($this->data["User"]);
         
-        if ( !empty( $this->data["User"] ) )
-        {
+        if ( !empty( $this->data["User"] ) ):
+ 
            $user_id = $this->Recover->User->field('id', array('email' => $this->data['User']['email'], 'active'=>1));
            
-           if ($user_id == null)
-           {
+           if ($user_id == null):
                $this->set('error_message', "Error: email <b>" . $this->data["User"]["email"] . "</b> does not exist on database");
+
                $this->render('check', 'ajax');
-           }
-           else  // email exist
-           {   
+        else:  // email exist
+             
            $this->data['Recover']['user_id']  = $user_id;   //the user id
-               
+
                $this->data['Recover']['random']   = $this->Adds->genPassword(20);
                
-               $this->Recover->create();
-               
-               if ( $this->Recover->save($this->data['Recover']) )
-               {
-                   if ( $this->_sendNewUserPwd($this->data['User']['email'], $this->data['Recover']['random']) ) 
-                   {
-                       $this->set('message', "Success. An email has been sent to: <b>".$this->data["User"]["email"]) . "</b>";
+               if ( $this->Recover->save($this->data) ):
+             if ( $this->_sendNewUserPwd($this->data['User']['email'], $this->data['Recover']['random']) ):
+                        $this->set('message', "Success. An email has been sent to: <b>".$this->data["User"]["email"]) . "</b>";
                        
-                       $this->render('check', 'ajax');
-                   }
-               }
-           }
-        }
+                        $this->render('check', 'ajax');
+             endif;
+           endif;
+       endif;
+     endif;   
    }
        
    public function newpwd($random = null)
    {  
-      if ( $random == null )
-      {  
+      if ( $random == null ):  
         redirect('/');
-      }
+      endif;
       
       $this->layout = 'popup';
       
-      $this->pageTitle = 'Karamelo New Password';
+      $this->pageTitle = __('Karamelo New Password', true);
       
       $conditions = array("random" => $random);
@@ -82 +76 @@
       $data = $this->Recover->find($conditions, $fields);
       
-      if ( $data == null )
-      {
-          $this->redirect('/');
-      }
-      else
-      {  
-         $this->data["User"]["id"]     = $data["Recover"]["user_id"];
-         $pwd                          = $this->genPwd(8);
-         $this->data["User"]["passwd"] = $pwd;
+      if ( $data == null ):
+         $this->redirect('/');
+      else:
+     
+         $this->data['User']['id']     = $data['Recover']['user_id'];
+         $pwd                          = $this->Adds->genPassword(8);
+         $this->data['User']['pwd']    = $this->Auth->password($pwd);
          
-         if ( $this->Recover->User->save($this->data["User"]) )
-         {
+         if ( $this->Recover->User->save($this->data) ):
               $this->set('pwd', $pwd);
               
-              $this->Recover->del($data["Recover"]["user_id"]);  //del the row
-         }
-      }
+              $this->Recover->del($data['Recover']['user_id']);  //del the row
+         endif;
+      endif;
  }
  
@@ -115 +106 @@
     $this->set('random', $random);
     //Do not pass any args to send() 
-    if ( $this->Email->send() ) 
-    {
-            return true; 
-    } 
-    else
-    {
+    if ( $this->Email->send() ):
+            return true;
+    else:
             return false;
-    }
+    endif;
  }
 }

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;
    }
   }

trunk/app/views/recovers/newpwd.ctp

@@ -1 @@
-<div style="width:50%;margin:0 auto 0 auto;border:1px dotted orange;padding:15px">
+<div style="width:80%;margin:0 auto 0 auto;border:1px dotted orange;padding:8px">
 <?php
 
-if ( isset($error) )
-{
+if ( isset($error) ):
         echo '<span style="color:red;padding:7px;">Error: no such key.</span>';
-}
+endif;
 
-if ( isset($pwd) )
-{
-    echo '<span style="color:blue;padding:7px;">Your new passwdord is <b>' . $pwd . '</b>, don\'t lose! ;-)</span> <br />';
+if ( isset($pwd) ):
+    echo '<span style="color:blue;padding:7px;">'.__('Your new password is', true). ' <b>' . $pwd . '</b>,'. __('do not forget', true).'! ;-)</span> <br />';
     
     echo $html->link('login', '/users/login');
-}
+endif;
 ?>
 </div>