Changeset 3168 for trunk/modules

Timestamp:

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

Author:

Shadowhand

Message:

Replacing file_exists calls with is_file and is_dir, where possible.

Location:

trunk/modules

Files:

• archive/libraries/Archive.php (modified) (2 diffs)
• payment/libraries/drivers/Payment/Yourpay.php (modified) (1 diff)
• smarty/controllers/smarty_demo.php (modified) (1 diff)
• smarty/libraries/MY_Smarty.php (modified) (1 diff)

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';