Changeset 3168

Timestamp:

07/20/2008 08:34:36 PM (3 months ago)

Author:

Shadowhand

Message:

Replacing file_exists calls with is_file and is_dir, where possible.

Location:

trunk

Files:

• index.php (modified) (2 diffs)
• modules/archive/libraries/Archive.php (modified) (2 diffs)
• modules/payment/libraries/drivers/Payment/Yourpay.php (modified) (1 diff)
• modules/smarty/controllers/smarty_demo.php (modified) (1 diff)
• modules/smarty/libraries/MY_Smarty.php (modified) (1 diff)
• system/config/routes.php (modified) (1 diff)
• system/core/Kohana.php (modified) (4 diffs)
• system/helpers/file.php (modified) (1 diff)
• system/helpers/upload.php (modified) (1 diff)
• system/libraries/Captcha.php (modified) (2 diffs)
• system/libraries/Image.php (modified) (1 diff)
• system/libraries/Router.php (modified) (1 diff)
• system/libraries/drivers/Cache/Sqlite.php (modified) (1 diff)
• system/libraries/drivers/Image/ImageMagick.php (modified) (1 diff)

trunk/index.php

@@ -93 +93 @@
 {
         // Check APPPATH
-        if ( ! (is_dir(APPPATH) AND file_exists(APPPATH.'config/config'.EXT)))
+        if ( ! (is_dir(APPPATH) AND is_file(APPPATH.'config/config'.EXT)))
         {
                 die
@@ -106 +106 @@
 
         // Check SYSPATH
-        if ( ! (is_dir(SYSPATH) AND file_exists(SYSPATH.'core/Bootstrap'.EXT)))
+        if ( ! (is_dir(SYSPATH) AND is_file(SYSPATH.'core/Bootstrap'.EXT)))
         {
                 die

trunk/modules/archive/libraries/Archive.php

@@ -62 +62 @@
                 empty($name) and $name = $path;
 
-                if (file_exists($path) AND is_dir($path))
+                if (is_dir($path))
                 {
                         // Force directories to end with a slash
@@ -109 +109 @@
                         throw new Kohana_Exception('archive.directory_unwritable', $directory);
 
-                if (file_exists($filename))
+                if (is_file($filename))
                 {
                         // Unable to write to the file

trunk/modules/payment/libraries/drivers/Payment/Yourpay.php

@@ -56 +56 @@
         {
                 // Check to make sure the certificate is valid
-                $this->certificate = (file_exists($config['certificate'])) ? $config['certificate'] : FALSE;
+                $this->certificate = is_file($config['certificate']) ? $config['certificate'] : FALSE;
 
                 if (!$this->certificate)

trunk/modules/smarty/controllers/smarty_demo.php

@@ -6 +6 @@
         const ALLOW_PRODUCTION = FALSE;    
 
-    public function index()
-    {
-        $welcome = new View('demo');
-        $welcome->message = "Welcome to the Kohana!";
+        public function index()
+        {
+                $welcome = new View('demo');
+                $welcome->message = "Welcome to the Kohana!";
 
-        $welcome->render(TRUE);
-    }
+                $welcome->render(TRUE);
+        }
 }

trunk/modules/smarty/libraries/MY_Smarty.php

@@ -60 +60 @@
         public function checkDirectory($directory)
         {
-                if ((! file_exists($directory) AND ! @mkdir($directory, 0755)) OR ! is_writeable($directory) OR !is_executable($directory)) 
+                if ((! file_exists($directory) AND ! @mkdir($directory, 0755)) OR ! is_writable($directory) OR !is_executable($directory)) 
                 {
                         $error = 'Compile/Cache directory "%s" is not writeable/executable';

trunk/system/config/routes.php

@@ -3 +3 @@
  * @package  Core
  *
- * Default route to use when no URI segments are available.
+ * Sets the default route to "welcome"
  */
 $config['_default'] = 'welcome';

trunk/system/core/Kohana.php

@@ -563 +563 @@
                 $filename = self::log_directory().date('Y-m-d').'.log'.EXT;
 
-                if ( ! file_exists($filename))
+                if ( ! is_file($filename))
                 {
                         // Write the SYSPATH checking header
@@ -605 +605 @@
                         $dir = realpath($dir);
 
-                        if (file_exists($dir) AND is_dir($dir) AND is_writable($dir))
+                        if (is_dir($dir) AND is_writable($dir))
                         {
                                 // Change the log directory
@@ -634 +634 @@
                         $path = APPPATH.'cache/kohana_'.$name;
 
-                        if (file_exists($path))
+                        if (is_file($path))
                         {
                                 // Check the file modification time
@@ -671 +671 @@
                         {
                                 // Delete cache
-                                return (file_exists($path) and unlink($path));
+                                return (is_file($path) and unlink($path));
                         }
                         else

trunk/system/helpers/file.php

@@ -36 +36 @@
         {
                 // Make sure the file is readable
-                if ( ! file_exists($filename) OR ! is_file($filename) OR ! is_readable($filename))
+                if ( ! (is_file($filename) AND is_readable($filename)))
                         return FALSE;
 

trunk/system/helpers/upload.php

@@ -48 +48 @@
                 $directory = rtrim($directory, '/').'/';
 
-                if ( ! file_exists($directory) AND Kohana::config('upload.create_directories') === TRUE)
+                if ( ! is_dir($directory) AND Kohana::config('upload.create_directories') === TRUE)
                 {
                         // Create the upload directory

trunk/system/libraries/Captcha.php

@@ -105 +105 @@
                         self::$config['background'] = str_replace('\\', '/', realpath($config['background']));
 
-                        if ( ! file_exists(self::$config['background']))
+                        if ( ! is_file(self::$config['background']))
                                 throw new Kohana_Exception('captcha.file_not_found', self::$config['background']);
                 }
@@ -116 +116 @@
                         foreach ($config['fonts'] as $font)
                         {
-                                if ( ! file_exists(self::$config['fontpath'].$font))
+                                if ( ! is_file(self::$config['fontpath'].$font))
                                         throw new Kohana_Exception('captcha.file_not_found', self::$config['fontpath'].$font);
                         }

trunk/system/libraries/Image.php

@@ -72 +72 @@
 
                 // Check to make sure the image exists
-                if ( ! file_exists($image))
+                if ( ! is_file($image))
                         throw new Kohana_Exception('image.file_not_found', $image);
 

trunk/system/libraries/Router.php

@@ -109 +109 @@
                                 $dir .= 'controllers/';
 
-                                if (file_exists($dir.$controller_path) OR file_exists($dir.$controller_path.EXT))
+                                if (is_dir($dir.$controller_path) OR is_file($dir.$controller_path.EXT))
                                 {
                                         // Valid path

trunk/system/libraries/drivers/Cache/Sqlite.php

@@ -43 +43 @@
 
                 // Make sure the cache database is writable
-                if (file_exists($filename) AND ! is_writable($filename))
+                if (is_file($filename) AND ! is_writable($filename))
                         throw new Kohana_Exception('cache.unwritable', $filename);
 

trunk/system/libraries/drivers/Image/ImageMagick.php

@@ -43 +43 @@
 
                 // Check to make sure the provided path is correct
-                if ( ! file_exists(realpath($config['directory']).'/convert'.$this->ext))
+                if ( ! is_file(realpath($config['directory']).'/convert'.$this->ext))
                         throw new Kohana_Exception('image.imagemagick.not_found', 'convert'.$this->ext);