Changeset 686 for trunk/app/controllers

Timestamp:

08/01/08 23:57:18 (4 months ago)

Author:

aarkerio

Message:

Test JS

Location:

trunk/app/controllers

Files:

• images_controller.php (modified) (2 diffs)
• users_controller.php (modified) (8 diffs)

trunk/app/controllers/images_controller.php

@@ -90 +90 @@
     
     /** 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? */
-      $error  = "Error. The file $imgfile_name is not valid.Only .jpg, .gif or .png files. Current type file: " . $type . "\n";
-        
+    $types = array('image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png', 'image/gif');
+
+    if ( !in_array($type, $types) ): 
+      $error  = "Error. The file $imgfile_name is not valid. Only .jpg, .gif or .png files. Current type file: ".$type ."\n";
       /** delete uploaded file  */
       unlink($imgfile);
@@ -103 +102 @@
     if ( $imgfile_size > $maxfilesize):
       $error  = "Error. The image is bigger than 2.0 MB. Current size: " . $imgfile_size;
-        
       /** delete uploaded file */
       unlink($imgfile);

trunk/app/controllers/users_controller.php

@@ -435 +435 @@
     /** 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? */
+    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>";
@@ -444 +444 @@
         unlink($imgfile);
         die($this->flash($ErrMsg, '/admin/users/edit/') );
-    }
-    
-    if ( $imgfile_size > $maxfilesize) 
-    {
+    endif;
+    
+    if ( $imgfile_size > $maxfilesize):
       $error  = "Error. The image is too big. Bigger than 2.0 MB  Current size: " . $imgfile_size ."\n";
              
@@ -454 +453 @@
       $this->flash($error,'/users/edit/');
       return false;
-    }
+    endif;
   
     //check size
-    if ($width > 100 || $height > 100)
-    { 
-       $error  = " The image is too large. ";
-       $error .= "Width or height is larger than 100 pixels. Current size: width ". $width ."px  height ". $height ."px\n";
+    if ($width > 100 || $height > 100): 
+      $error  = 'Error '. __('The image is too large', true);
+      $error .= "Width or height is larger than 100 pixels. Current size: width ". $width ."px  height ". $height ."px\n";
              
-       /** delete uploaded file */
-       unlink($imgfile);
-       $this->flash($error,'/users/edit/');
-       return false;
-    }
+      /** delete uploaded file */
+      unlink($imgfile);
+      $this->flash($error,'/users/edit/');
+      return false;
+    endif;
   
     $extension   = $this->Adds->get_extension($type);
@@ -479 +477 @@
     
     /** do extra security check to prevent malicious abuse */
-    if (is_uploaded_file($imgfile))
-    {
+    if (is_uploaded_file($imgfile)):
        /** move file to proper directory ==*/
-       if (!copy($imgfile, $newfile))
-       {
-          /** if an error occurs the file could not be written, read or possibly does not exist */
+      if (!copy($imgfile, $newfile)):
           die($this->flash('Error Uploading File.', '/users/edit/'));
-       }
-   }
+       endif;
+    endif;
    
   /** delete the temporary uploaded file **/
@@ -496 +491 @@
   $this->data['User']['avatar'] = $final_filename;
    
-  if ($this->User->save($this->data['User'])):
+  if ($this->User->save($this->data)):
            $this->msgFlash('Image update', '/users/edit/');
   else:
            die('Error saving');   
   endif;
-   
+
  }
 }  
@@ -524 +519 @@
        //die( debug($this->data['User']) );
        if ($this->User->save($this->data['User'])):
-            $this->msgFlash(__('User has been updated', true), '/admin/users/edit/');
+            $this->msgFlash(__('Data saved', true), '/admin/users/edit/');
        endif;
     endif;
@@ -532 +527 @@
  {
     $this->layout  = 'admin';
-       
-    $conditions    = null; //array("Entry.user_id"=>$this->Auth->user('id'));
-       
-    if ($order === null)
-    {
+
+    $conditions    = null; 
+
+    if ($order === null):
          $order = "User.id";
-    }
+    endif;
        
     if ($group_id != null && intval($group_id) ):
@@ -594 +588 @@
 
     if ( $this->data['User']['file']['error'] != 0 ):
-      $this->flash('Something where wrong, please push Back button', '/admin/users/edit/');
-      return false;
+        $this->flash('Something where wrong, please push Back button', '/admin/users/edit/');
+        return false;
     endif;