Changeset 458

Timestamp:

05/05/08 22:50:24 (8 months ago)

Author:

aarkerio

Message:

Users improved

Location:

trunk/app

Files:

• controllers/users_controller.php (modified) (2 diffs)
• controllers/vclassrooms_controller.php (modified) (1 diff)
• views/elements/poll.ctp (modified) (1 diff)

trunk/app/controllers/users_controller.php

@@ -361 +361 @@
        $this->set('message', $message);
        $this->render('validate', 'ajax'); //if error exist, stop here
-    }
-    
-    $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']))
-    {  
+      
+    }
+    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']))
+       {  
         $this->data['Confirm']['user_id']  = $this->User->getLastInsertID();   // the user id
         $this->data['Confirm']['secret']   = $this->Adds->genPassword(14);     // secret confirm ID
@@ -374 +376 @@
     $this->User->Confirm->create();
         
-        // put the user in confirm model, this is, waiting for user confirmation trough email
-        if ($this->User->Confirm->save($this->data["Confirm"]))  
+         // put the user in confirm model, this is, waiting for user confirmation trough email
+         if ($this->User->Confirm->save($this->data["Confirm"]))  
+         {
+            //Send the confirmation email
+            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('ok', true);
+              $this->render('validate', 'ajax');
+            }
+         }
+        }
+        else 
         {
-          //Send the confirmation email
-          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('ok', true);
-            $this->render('validate', 'ajax');
-          }
-       }
-    }
-    else 
-    {
             $this->set('message', array("Error"=>"Error, something is wrong in save method"));
             $this->render('validate', 'ajax');
-    }
+        }
+     }
    }
   }

trunk/app/controllers/vclassrooms_controller.php

@@ -157 +157 @@
 
       $this->set('users',$this->Vclassroom->UsersVclassroom->findAll(array('UsersVclassroom.vclassroom_id' => $vclassroom_id)));
-      //die(debug($this->Vclassroom->UsersVclassroom->findAll(array('UsersVclassroom.vclassroom_id' => $vclassroom_id))));
+      
       $this->set('data', $this->Vclassroom->find($conditions));
  }

trunk/app/views/elements/poll.ctp

@@ -58 +58 @@
     echo '<br />';
     
-    echo $ajax->submit('Votar', array("url" => "/pollrows/vote", 
+    echo $ajax->submit('Vote', array("url" => "/pollrows/vote", 
                                      "update"=>"add_pollrow",
                                      "loading" => "Element.hide('add_pollrow');Element.show('loading')",