From 0b59f270a432f8c7b6128981f0a39b4a2e2fbd34 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 13 May 2008 04:22:33 +0000 Subject: Some sweeping syntax changes for consistency: (! foo) changed to ( ! foo) || changed to OR changed newline standardization code in various places from preg_replace to str_replace --- system/libraries/Upload.php | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'system/libraries/Upload.php') diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 07cbd924b..1225ee36b 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -1,4 +1,4 @@ -set_error('upload_no_file_selected'); return FALSE; } // Is the upload path valid? - if (! $this->validate_upload_path()) + if ( ! $this->validate_upload_path()) { // errors will already be set by validate_upload_path() so just return FALSE return FALSE; } // Was the file able to be uploaded? If not, determine the reason why. - if (! is_uploaded_file($_FILES[$field]['tmp_name'])) + if ( ! is_uploaded_file($_FILES[$field]['tmp_name'])) { - $error = (! isset($_FILES[$field]['error'])) ? 4 : $_FILES[$field]['error']; + $error = ( ! isset($_FILES[$field]['error'])) ? 4 : $_FILES[$field]['error']; switch($error) { @@ -198,14 +198,14 @@ class CI_Upload { } // Is the file type allowed to be uploaded? - if (! $this->is_allowed_filetype()) + if ( ! $this->is_allowed_filetype()) { $this->set_error('upload_invalid_filetype'); return FALSE; } // Is the file size within the allowed maximum? - if (! $this->is_allowed_filesize()) + if ( ! $this->is_allowed_filesize()) { $this->set_error('upload_invalid_filesize'); return FALSE; @@ -213,7 +213,7 @@ class CI_Upload { // Are the image dimensions within the allowed size? // Note: This can fail if the server has an open_basdir restriction. - if (! $this->is_allowed_dimensions()) + if ( ! $this->is_allowed_dimensions()) { $this->set_error('upload_invalid_dimensions'); return FALSE; @@ -253,9 +253,9 @@ class CI_Upload { * we'll use move_uploaded_file(). One of the two should * reliably work in most environments */ - if (! @copy($this->file_temp, $this->upload_path.$this->file_name)) + if ( ! @copy($this->file_temp, $this->upload_path.$this->file_name)) { - if (! @move_uploaded_file($this->file_temp, $this->upload_path.$this->file_name)) + if ( ! @move_uploaded_file($this->file_temp, $this->upload_path.$this->file_name)) { $this->set_error('upload_destination_error'); return FALSE; @@ -350,7 +350,7 @@ class CI_Upload { $filename = md5(uniqid(mt_rand())).$this->file_ext; } - if (! file_exists($path.$filename)) + if ( ! file_exists($path.$filename)) { return $filename; } @@ -360,7 +360,7 @@ class CI_Upload { $new_filename = ''; for ($i = 1; $i < 100; $i++) { - if (! file_exists($path.$filename.$i.$this->file_ext)) + if ( ! file_exists($path.$filename.$i.$this->file_ext)) { $new_filename = $filename.$i.$this->file_ext; break; @@ -389,7 +389,7 @@ class CI_Upload { */ function set_max_filesize($n) { - $this->max_size = (! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; + $this->max_size = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; } // -------------------------------------------------------------------- @@ -403,7 +403,7 @@ class CI_Upload { */ function set_max_width($n) { - $this->max_width = (! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; + $this->max_width = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; } // -------------------------------------------------------------------- @@ -417,7 +417,7 @@ class CI_Upload { */ function set_max_height($n) { - $this->max_height = (! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; + $this->max_height = ( ! eregi("^[[:digit:]]+$", $n)) ? 0 : $n; } // -------------------------------------------------------------------- @@ -447,7 +447,7 @@ class CI_Upload { */ function set_image_properties($path = '') { - if (! $this->is_image()) + if ( ! $this->is_image()) { return; } @@ -460,7 +460,7 @@ class CI_Upload { $this->image_width = $D['0']; $this->image_height = $D['1']; - $this->image_type = (! isset($types[$D['2']])) ? 'unknown' : $types[$D['2']]; + $this->image_type = ( ! isset($types[$D['2']])) ? 'unknown' : $types[$D['2']]; $this->image_size_str = $D['3']; // string containing height and width } } @@ -528,7 +528,7 @@ class CI_Upload { */ function is_allowed_filetype() { - if (count($this->allowed_types) == 0 || ! is_array($this->allowed_types)) + if (count($this->allowed_types) == 0 OR ! is_array($this->allowed_types)) { $this->set_error('upload_no_file_types'); return FALSE; @@ -587,7 +587,7 @@ class CI_Upload { */ function is_allowed_dimensions() { - if (! $this->is_image()) + if ( ! $this->is_image()) { return TRUE; } @@ -636,13 +636,13 @@ class CI_Upload { $this->upload_path = str_replace("\\", "/", realpath($this->upload_path)); } - if (! @is_dir($this->upload_path)) + if ( ! @is_dir($this->upload_path)) { $this->set_error('upload_no_filepath'); return FALSE; } - if (! is_really_writable($this->upload_path)) + if ( ! is_really_writable($this->upload_path)) { $this->set_error('upload_not_writable'); return FALSE; @@ -741,7 +741,7 @@ class CI_Upload { return FALSE; } - if (! $fp = @fopen($file, FOPEN_READ_WRITE)) + if ( ! $fp = @fopen($file, FOPEN_READ_WRITE)) { return FALSE; } @@ -830,7 +830,7 @@ class CI_Upload { } } - return (! isset($this->mimes[$mime])) ? FALSE : $this->mimes[$mime]; + return ( ! isset($this->mimes[$mime])) ? FALSE : $this->mimes[$mime]; } /** @@ -875,6 +875,6 @@ class CI_Upload { } // END Upload Class - -/* End of file Upload.php */ + +/* End of file Upload.php */ /* Location: ./system/libraries/Upload.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b