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

Timestamp:

03/24/08 17:06:55 (10 months ago)

Author:

aarkerio

Message:

Update permission by individual controller rather than general

Files:

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

trunk/app/controllers/users_controller.php

@@ -19 +19 @@
  public function beforeFilter() 
  {
-    $this->Auth->allow(array('blog', 'entry','portfolio', 'about', 'check', 'register', 'directory', 'bloggers'));
+    $this->Auth->allow(array('blog', 'entry','portfolio', 'about', 'register', 'directory', 'bloggers', 'insert'));
     parent::beforeFilter();
  }
@@ -336 +336 @@
        $message['email_exist'] = "The email already exist ";
     }
-    // the user try to be a teacher
-    if ( $this->data['User']['group_id'] == 2) 
-    {
-       // get the secret code for teachers registration process
-      $code  = $this->User->Group->field('code', array("id"=>2));
-
-      if ( $this->data['User']['code'] != $code )
-      {
-        $message['wrong_code'] = "The teacher's code is incorrect";
-      }
+    
+    // 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 )
+    {
+        $message['wrong_code'] = "The code is incorrect, please put in contact with your school webmaster.";
     }
     
@@ -351 +348 @@
     {  
        $this->set('message', $message);
-       die($this->render('validate', 'ajax')); //if error exist, stop here
-    }
-    
-    
-    $this->data['User']['pwd']    = md5($this->data['User']['pwd']); // MD5
-    $this->data['User']['active']    = 0;
-    $this->data['User']['name_blog'] = $this->data['User']['username'].'\'s corner'; 
+       $this->render('validate', 'ajax'); //if error exist, stop here
+       exit;
+    }
+    
+    $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['User']))
     {  
         $this->data['Confirm']['user_id']  = $this->User->getLastInsertID();   // the user id
         $this->data['Confirm']['secret']   = $this->Adds->genPassword(14);     // secret confirm ID
-
-        // put the user in confirm model, this is, waiting confirmation
+    
+    $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"]))  
         {
           //Send the confirmation email
-          if ( $this->sendMail($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.In order to complete the registration process, please click on the link contained on the email.</p>";
+        $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);
@@ -503 +501 @@
 
  /****   AVATAR   ***/
- public function avatar() 
+ public function admin_avatar() 
  {
     $this->layout    = 'admin';
@@ -619 +617 @@
 }
 
-  /** Private functions */
-private function get_extension($imagetype) 
-{    
-     if ( empty($imagetype) )
-     {
-         return false;
-     }
-     
-     switch($imagetype)
-     {
-           case 'image/bmp': return '.bmp';
-           case 'image/cis-cod': return '.cod';
-           case 'image/gif': return '.gif';
-           case 'image/ief': return '.ief';
-           case 'image/jpeg': return '.jpg';
-           case 'image/pipeg': return '.jfif';
-           case 'image/tiff': return '.tif';
-           case 'image/x-cmu-raster': return '.ras';
-           case 'image/x-cmx': return '.cmx';
-           case 'image/x-icon': return '.ico';
-           case 'image/x-portable-anymap': return '.pnm';
-           case 'image/x-portable-bitmap': return '.pbm';
-           case 'image/x-portable-graymap': return '.pgm';
-           case 'image/x-portable-pixmap': return '.ppm';
-           case 'image/x-rgb': return '.rgb';
-           case 'image/x-xbitmap': return '.xbm';
-           case 'image/x-xpixmap': return '.xpm';
-           case 'image/x-xwindowdump': return '.xwd';
-           case 'image/png': return '.png';
-           case 'image/x-jps': return '.jps';
-           case 'image/x-freehand': return '.fh';
-           default: return false;
-       }
-  }
-
-private function sendMail($email, $secret) 
-{       
-        $this->Email->sender    = '::MonoNeurona.org::';
-        $this->Email->to        = $email;
-        $this->Email->subject   = 'Confirm karamelo activation account';
-        //$this->Email->replyTo   = 'noreply@mononeurona.org';
-        $this->Email->sendAs    = 'html';
-        $this->Email->template  = null;
-        $this->Email->from      = 'noreply@ononeurona.org';
-        //$this->set('foo', 'Cake tastes good today'); 
-        //Set the body of the mail as we send it.
-        //Note: the text can be an array, each element will appear as a
-        //seperate line in the message body.
-        
-        $url  = '<h2>Karamelo</h2><p>Open this in new tab to confirm: ';
-        $url .= '<a href="http://'.$_SERVER['SERVER_NAME'].'/confirms/signup/'.$secret.'">';
-        $url .= 'http://'.$_SERVER['SERVER_NAME'].'/confirms/signup/'.$secret.'</a></p>';
-        
-        //die($url);
-        
-        if ( $this->Email->send($url) ) 
-        {
+/* == PRIVATE == **/
+private function _sendNewUserPwd($email, $random)
+{   
+    $this->layout          = 'confirmation';
+    $this->Email->to       = $email;
+    //$this->Email->bcc    = array('noreply@karamelo.org');  // note
+    // this could be just a string too
+    $this->Email->subject  = 'Karamelo e-Learning:: confirma account';
+    $this->Email->replyTo  = 'support@karamelo.org';
+    $this->Email->from     = 'Chipotle-software.com';
+    $this->Email->template = 'confirmation'; // note no '.ctp'
+    //Send as 'html', 'text' or 'both' (default is 'text')
+    $this->Email->sendAs   = 'text'; // because we like to send pretty mail
+    //Set view variables as normal
+    $this->set('random', $random);
+    //Do not pass any args to send() 
+    if ( $this->Email->send() ) 
+    {
             return true; 
-        } 
-        else 
-        {
-           exit("Error!!");
-        }
- } 
+    } 
+    else
+    {
+            return false;
+    }
+ }
 }
 ?>