cvs: pear-core(PEAR_1_4) /PEAR Command.php

pajoye          Fri Jun 16 13:02:00 2006 UTC

  Modified files:              (Branch: PEAR_1_4)
    /pear-core/PEAR     Command.php 
  Log:
  - MFH: open_basedir fix and verbose error
  
  
http://cvs.php.net/viewcvs.cgi/pear-core/PEAR/Command.php?r1=1.36&r2=1.36.2.1&diff_format=u
Index: pear-core/PEAR/Command.php
diff -u pear-core/PEAR/Command.php:1.36 pear-core/PEAR/Command.php:1.36.2.1
--- pear-core/PEAR/Command.php:1.36     Fri Jan  6 04:47:36 2006
+++ pear-core/PEAR/Command.php  Fri Jun 16 13:01:59 2006
@@ -16,7 +16,7 @@
  * @author     Greg Beaver <cellog@xxxxxxx>
  * @copyright  1997-2006 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Command.php,v 1.36 2006/01/06 04:47:36 cellog Exp $
+ * @version    CVS: $Id: Command.php,v 1.36.2.1 2006/06/16 13:01:59 pajoye Exp 
$
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -231,6 +231,11 @@
         if ($dir === null) {
             $dir = dirname(__FILE__) . '/Command';
         }
+
+        if (!@is_dir($dir)) {
+            return PEAR::raiseError("registerCommands: opendir($dir) '$dir' 
does not exist or is not a directory");
+        }
+
         $dp = @opendir($dir);
         if (empty($dp)) {
             return PEAR::raiseError("registerCommands: opendir($dir) failed");