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

Timestamp:

07/05/08 01:09:56 (5 months ago)

Author:

aarkerio

Message:

Internatiantilzation

Files:

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

trunk/app/controllers/users_controller.php

@@ -527 +527 @@
  public function admin_edit() 
  {
-    if ( empty($this->data['User']) )
-    {
-        $this->layout    = 'admin';
+   if ( empty($this->data['User']) ):
+       $this->layout    = 'admin';
         
-        $this->set('Groups', Set::combine($this->User->Group->find('all', array('order' => 'name')), "{n}.Group.id","{n}.Group.name"));
+       $this->set('Groups', Set::combine($this->User->Group->find('all', array('order' => 'name')), "{n}.Group.id","{n}.Group.name"));
         
-        $this->User->unbindModel($this->User->notNow);
+       $this->User->unbindModel($this->User->notNow);
             
-                $this->data = $this->User->read(null, $this->Auth->user('id'));
-    }
-    else
-    {
-        //die( debug($this->data['User']) );
-        if ($this->User->save($this->data['User']))
-        {
-            $this->msgFlash('User has been updated.','/admin/users/edit/');
-        }
-    }
+       $this->data = $this->User->read(null, $this->Auth->user('id'));
+   
+    else:
+       //die( debug($this->data['User']) );
+       if ($this->User->save($this->data['User'])):
+            $this->msgFlash(__('User has been updated', true), '/admin/users/edit/');
+       endif;
+    endif;
  }
 
@@ -596 +593 @@
      $this->data['User']['id']     = $id;
      
-     if ($this->User->save($this->data))
-     {
+     if ($this->User->save($this->data['User'])):
            $this->msgFlash('User status changed', '/admin/users/listing/');
-     } 
-     else 
-     {
+     else:
             $this->flash('Problem!!', '/admi/users/listing/');
-     }
+     endif;
  }
  
  /*** DELETE  **/ 
- public function admin_delete($id)
- {
-    if ($this->User->del($id))
-    {
-       $this->msgFlash('User has been deleted.', '/admin/users/listing');
-    }
+ public function admin_delete($user_id)
+ {
+   if ($this->User->del($user_id)):
+       $this->msgFlash(__('User deleted', true), '/admin/users/listing');
+   endif;
  }
  
@@ -658 +651 @@
     /** Security: checks to see if file is an image, if not do not allow upload ==*/
     
-    if ( $type != "image/jpeg" && $type != "image/pjpeg" && $type != "image/png" && $type != "image/gif") 
-    {   /** is this a valid file? */
-        $ErrMsg   = "<h1>ERROR</h1> the file $imgfile_name $imgfile is not valid.<br>";
-        $ErrMsg  .= "<p>Only .jpg, .gif or .png files<br><br>";
-        $ErrMsg  .= "Current type file: " . $type . "</p>\n";
-            
-        /** delete uploaded file  */
-        unlink($imgfile);
-        die($this->flash($ErrMsg, '/admin/users/edit/') );
-    }
-    
-    if ( $imgfile_size > $maxfilesize) 
-    {
-     $ErrMsg  = "<h1>ERROR</h1> The image is too big.<br />";
-         $ErrMsg .= "<p>Bigger than 2.0 MB <br /><br />";
-         $ErrMsg .= "Current size: " . $imgfile_size ."</p>\n";
-             
-         /** delete uploaded file */
-         unlink($imgfile);
-         die( $this->flash($ErrMsg,'/admin/users/edit/') );
-    }
+    if ( $type != "image/jpeg" && $type != "image/pjpeg" && $type != "image/png" && $type != "image/gif"): 
+       /** is this a valid file? */
+       $msg   = "Error, the file $imgfile_name $imgfile is not valid, only .jpg, .gif or .png, current type file: " . $type;
+       unlink($imgfile); /** delete uploaded file  */
+       $this->flash($msg, '/admin/users/edit/');
+       return false;
+    endif;
+    
+    if ( $imgfile_size > $maxfilesize):
+       $msg  = ">Error. The image is bigger than 2.0 MB Current size: " . $imgfile_size;
+       unlink($imgfile); /** delete uploaded file */
+       $this->flash($msg,'/admin/users/edit/');
+       return false;
+    endif;
 
     //check size
-    if ($width > 100 || $height > 100)
-    {
-         $ErrMsg  = "<h1>ERROR</h1> The image is too large.<br>";
-         $ErrMsg .= "<p>Widht or height is larger than 100 pixels <br /><br />";
-         $ErrMsg .= "Current size: width ". $width ."px  height ". $height ."px</p>\n";
-             
-         /** delete uploaded file */
-         unlink($imgfile);
-         die( $this->flash($ErrMsg,'/admin/users/edit/') );
-
-    }
+    if ($width > 100 || $height > 100):
+         $msg  = "Error. Width or height is larger than 100 pixels. Width ". $width ."px,  height ". $height ."px</p>\n";
+         unlink($imgfile); /** delete uploaded file */
+         $this->flash($msg,'/admin/users/edit/');
+         return false;
+    endif;
         
     $extension   = $this->Adds->get_extension($type);
@@ -703 +684 @@
     $newfile = $uploaddir . "/" . $final_filename;
     
-    /** do extra security check to prevent malicious abuse */
-    if (is_uploaded_file($imgfile))
-    {
+   /** do extra security check to prevent malicious abuse */
+   if (is_uploaded_file($imgfile)):
        /** move file to proper directory ==*/
-       if (!copy($imgfile, $newfile))
-       {
+      if (!copy($imgfile, $newfile)):
           /** if an error occurs the file could not be written, read or possibly does not exist */
-          die($this->flash('Error Uploading File.', '/users/edit/'.$this->Auth->user('id')));
-       }
-   }
+          die($this->flash('Error Uploading File.', '/admin/users/edit/'));
+       endif;
+   endif;
    
    /** Database stuff  **/
@@ -718 +697 @@
    $this->data['User']['avatar'] = $final_filename;
    
-   if ($this->User->save($this->data))
-    {
-           $this->redirect('/admin/users/edit/'. $this->Auth->user('id'));
-    }
+   if ($this->User->save($this->data)):
+           $this->redirect('/admin/users/edit/');
+    endif;
     
     /** delete the temporary uploaded file **/