WebSVN – Applications.gtt – Diff – /trunk/bibliotheque/pear/PEAR/ChannelFile.php

 /**
  * PEAR_ChannelFile, the channel handling class
+ *
  * PHP versions 4 and 5
+ *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
  * @category   pear
  * @package    PEAR
  * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
+ * @copyright  1997-2009 The Authors
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: ChannelFile.php,v 1.78 2006/10/31 02:54:40 cellog Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
 /**
  * Error code when channel summary is multi-line
  */
 define('PEAR_CHANNELFILE_ERROR_MULTILINE_SUMMARY', 9);
 /**
- * Error code when channel server is missing for xmlrpc or soap protocol
+ * Error code when channel server is missing for protocol
  */
 define('PEAR_CHANNELFILE_ERROR_NO_HOST', 10);
 /**
- * Error code when channel server is invalid for xmlrpc or soap protocol
+ * Error code when channel server is invalid for protocol
  */
 define('PEAR_CHANNELFILE_ERROR_INVALID_HOST', 11);
 /**
  * Error code when a mirror name is invalid
  */
 define('PEAR_CHANNELFILE_ERROR_NO_STATICVERSION', 34);
 /**
  * Error code when <baseurl> contains no type attribute in a <rest> protocol definition
  */
 define('PEAR_CHANNELFILE_ERROR_NOBASEURLTYPE', 35);
 /**
  * Error code when a mirror is defined and the channel.xml represents the __uri pseudo-channel
  */
 define('PEAR_CHANNELFILE_URI_CANT_MIRROR', 36);
 /**
  * Error code when ssl attribute is present and is not "yes"
  */
 define('PEAR_CHANNELFILE_ERROR_INVALID_SSL', 37);
 /**#@-*/
  * The Channel handling class
+ *
  * @category   pear
  * @package    PEAR
  * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
+ * @copyright  1997-2009 The Authors
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.5.1
+ * @version    Release: 1.10.1
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
-class PEAR_ChannelFile {
+class PEAR_ChannelFile
+{
     /**
      * @access private
      * @var PEAR_ErrorStack
      * @access private
      */
     var $_stack;
     /**
      * Supported channel.xml versions, for parsing
      * @var array
      * @access private
      */
      * index into the mirrors array, used for parsing xml
      * @var int
      * @access private
      */
     var $_mirrorIndex;
     /**
      * Flag used to determine the validity of parsed content
      * @var boolean
      * @access private
      */
     var $_isValid = false;
-    function PEAR_ChannelFile()
+    function __construct()
     {
-        $this->_stack = &new PEAR_ErrorStack('PEAR_ChannelFile');
+        $this->_stack = new PEAR_ErrorStack('PEAR_ChannelFile');
         $this->_stack->setErrorMessageTemplate($this->_getErrorMessage());
         $this->_isValid = false;
     }
     /**
      * @return array
      * @access protected
      */
             $parser = new PEAR_XMLParser;
             $result = $parser->parse($data);
             if ($result !== true) {
                 if ($result->getCode() == 1) {
                     $this->_stack->push(PEAR_CHANNELFILE_ERROR_NO_XML_EXT, 'error',
-                        array('error' => $error));
+                        array('error' => $result->getMessage()));
                 } else {
                     $this->_stack->push(PEAR_CHANNELFILE_ERROR_CANT_MAKE_PARSER, 'error');
+                }
                 return false;
+            }
         } else {
             $this->_stack->push(PEAR_CHANNELFILE_ERROR_NO_VERSION, 'error', array('xml' => $data));
             return false;
+        }
+    }
     /**
      * @return array
      */
     function toArray()
+    {
         if (!$this->_isValid && !$this->validate()) {
             return false;
+        }
         return $this->_channelInfo;
+    }
     /**
      * @param array
-     * @static
+     *
      * @return PEAR_ChannelFile|false false if invalid
      */
+    public static function &fromArray(
-    function &fromArray($data, $compatibility = false, $stackClass = 'PEAR_ErrorStack')
+        $data, $compatibility = false, $stackClass = 'PEAR_ErrorStack'
-    {
+    ) {
         $a = new PEAR_ChannelFile($compatibility, $stackClass);
         $a->_fromArray($data);
         if (!$a->validate()) {
             $a = false;
             return $a;
         return $a;
+    }
     /**
+     * Unlike {@link fromArray()} this does not do any validation
      * Unlike {@link fromArray()} this does not do any validation
      * @param array
      * @static
      * @return PEAR_ChannelFile
      */
-    function &fromArrayWithErrors($data, $compatibility = false,
+    public static function &fromArrayWithErrors(
-                                  $stackClass = 'PEAR_ErrorStack')
+        $data, $compatibility = false, $stackClass = 'PEAR_ErrorStack'
     ) {
         $a = new PEAR_ChannelFile($compatibility, $stackClass);
         $a->_fromArray($data);
         return $a;
     }
     /**
      * @param array
      * @access private
      */
     function _fromArray($data)
+    {
         $this->_channelInfo = $data;
     }
     /**
      * Wrapper to {@link PEAR_ErrorStack::getErrors()}
      * @param boolean determines whether to purge the error stack after retrieving
      * @return array
+        }
         if (isset($channelInfo['servers']['primary']['attribs']['port'])) {
             $ret .= ' port="' . $channelInfo['servers']['primary']['attribs']['port'] . '"';
+        }
         $ret .= ">\n";
-        if (isset($channelInfo['servers']['primary']['xmlrpc'])) {
-            $ret .= $this->_makeXmlrpcXml($channelInfo['servers']['primary']['xmlrpc'], '   ');
-        }
         if (isset($channelInfo['servers']['primary']['rest'])) {
             $ret .= $this->_makeRestXml($channelInfo['servers']['primary']['rest'], '   ');
+        }
-        if (isset($channelInfo['servers']['primary']['soap'])) {
-            $ret .= $this->_makeSoapXml($channelInfo['servers']['primary']['soap'], '   ');
-        }
         $ret .= "  </primary>\n";
         if (isset($channelInfo['servers']['mirror'])) {
             $ret .= $this->_makeMirrorsXml($channelInfo);
+        }
         $ret .= " </servers>\n";
         $ret .= "</channel>";
         return str_replace("\r", "\n", str_replace("\r\n", "\n", $ret));
+    }
-    /**
-     * Generate the <xmlrpc> tag
-     * @access private
-     */
-    function _makeXmlrpcXml($info, $indent)
-    {
-        $ret = $indent . "<xmlrpc";
-        if (isset($info['attribs']['path'])) {
-            $ret .= ' path="' . htmlspecialchars($info['attribs']['path']) . '"';
-        }
-        $ret .= ">\n";
-        $ret .= $this->_makeFunctionsXml($info['function'], "$indent ");
-        $ret .= $indent . "</xmlrpc>\n";
-        return $ret;
-    }
-    /**
-     * Generate the <soap> tag
-     * @access private
-     */
-    function _makeSoapXml($info, $indent)
-    {
-        $ret = $indent . "<soap";
-        if (isset($info['attribs']['path'])) {
-            $ret .= ' path="' . htmlspecialchars($info['attribs']['path']) . '"';
-        }
-        $ret .= ">\n";
-        $ret .= $this->_makeFunctionsXml($info['function'], "$indent ");
-        $ret .= $indent . "</soap>\n";
-        return $ret;
-    }
     /**
      * Generate the <rest> tag
      * @access private
      */
     function _makeRestXml($info, $indent)
+    {
         $ret = $indent . "<rest>\n";
-        if (!isset($info['baseurl'][0])) {
+        if (isset($info['baseurl']) && !isset($info['baseurl'][0])) {
             $info['baseurl'] = array($info['baseurl']);
+        }
-        }
+        if (isset($info['baseurl'])) {
-        foreach ($info['baseurl'] as $url) {
+            foreach ($info['baseurl'] as $url) {
-            $ret .= "$indent <baseurl type=\"" . $url['attribs']['type'] . "\"";
+                $ret .= "$indent <baseurl type=\"" . $url['attribs']['type'] . "\"";
+                $ret .= ">" . $url['_content'] . "</baseurl>\n";
             $ret .= ">" . $url['_content'] . "</baseurl>\n";
+        }
         $ret .= $indent . "</rest>\n";
         return $ret;
+            }
             if (isset($mirror['attribs']['ssl'])) {
                 $ret .= ' ssl="' . $mirror['attribs']['ssl'] . '"';
+            }
             $ret .= ">\n";
-            if (isset($mirror['xmlrpc']) || isset($mirror['soap'])) {
-                if (isset($mirror['xmlrpc'])) {
+            if (isset($mirror['rest'])) {
-                    $ret .= $this->_makeXmlrpcXml($mirror['xmlrpc'], '   ');
-                }
                 if (isset($mirror['rest'])) {
                     $ret .= $this->_makeRestXml($mirror['rest'], '   ');
+                }
-                if (isset($mirror['soap'])) {
-                    $ret .= $this->_makeSoapXml($mirror['soap'], '   ');
-                }
                 $ret .= "  </mirror>\n";
             } else {
                 $ret .= "/>\n";
+            }
+        }
                     null;
                 $this->_validateError(PEAR_CHANNELFILE_ERROR_NOVALIDATE_VERSION,
                     array('package' => $content));
+            }
+        }
-        if (isset($info['servers']['primary']['attribs']['port']) &&
+        if (isset($info['servers']['primary']['attribs'], $info['servers']['primary']['attribs']['port']) &&
               !is_numeric($info['servers']['primary']['attribs']['port'])) {
             $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_PORT,
                 array('port' => $info['servers']['primary']['attribs']['port']));
+        }
-        if (isset($info['servers']['primary']['attribs']['ssl']) &&
+        if (isset($info['servers']['primary']['attribs'], $info['servers']['primary']['attribs']['ssl']) &&
               $info['servers']['primary']['attribs']['ssl'] != 'yes') {
             $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_SSL,
                 array('ssl' => $info['servers']['primary']['attribs']['ssl'],
                     'server' => $info['name']));
+        }
-        if (isset($info['servers']['primary']['xmlrpc']) &&
-              isset($info['servers']['primary']['xmlrpc']['function'])) {
-            $this->_validateFunctions('xmlrpc', $info['servers']['primary']['xmlrpc']['function']);
-        }
-        if (isset($info['servers']['primary']['soap']) &&
-              isset($info['servers']['primary']['soap']['function'])) {
-            $this->_validateFunctions('soap', $info['servers']['primary']['soap']['function']);
         if (isset($info['servers']['primary']['rest']) &&
               isset($info['servers']['primary']['rest']['baseurl'])) {
             $this->_validateFunctions('rest', $info['servers']['primary']['rest']['baseurl']);
+        }
                 $this->_validateError(PEAR_CHANNELFILE_URI_CANT_MIRROR);
+            }
             if (!isset($info['servers']['mirror'][0])) {
                 $info['servers']['mirror'] = array($info['servers']['mirror']);
+            }
-            $i = 0;
             foreach ($info['servers']['mirror'] as $mirror) {
                 if (!isset($mirror['attribs']['host'])) {
                     $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_HOST,
                       array('type' => 'mirror'));
                 } elseif (!$this->validChannelServer($mirror['attribs']['host'])) {
+                }
                 if (isset($mirror['attribs']['ssl']) && $mirror['attribs']['ssl'] != 'yes') {
                     $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_SSL,
                         array('ssl' => $info['ssl'], 'server' => $mirror['attribs']['host']));
+                }
-                if (isset($mirror['xmlrpc'])) {
-                    $this->_validateFunctions('xmlrpc',
-                        $mirror['xmlrpc']['function'], $mirror['attribs']['host']);
-                }
-                if (isset($mirror['soap'])) {
-                    $this->_validateFunctions('soap', $mirror['soap']['function'],
-                        $mirror['attribs']['host']);
-                }
                 if (isset($mirror['rest'])) {
                     $this->_validateFunctions('rest', $mirror['rest']['baseurl'],
                         $mirror['attribs']['host']);
+                }
+            }
+        }
         return $this->_isValid;
+    }
     /**
-     * @param string xmlrpc or soap - protocol name this function applies to
+     * @param string  rest - protocol name this function applies to
      * @param array the functions
      * @param string the name of the parent element (mirror name, for instance)
      */
     function _validateFunctions($protocol, $functions, $parent = '')
+    {
         if (!isset($functions[0])) {
             $functions = array($functions);
+        }
         foreach ($functions as $function) {
             if (!isset($function['_content']) || empty($function['_content'])) {
                 $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_FUNCTIONNAME,
                     array('parent' => $parent, 'protocol' => $protocol));
+            }
             if ($protocol == 'rest') {
                 if (!isset($function['attribs']['type']) ||
                       empty($function['attribs']['type'])) {
-                    $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_BASEURLTYPE,
+                    $this->_validateError(PEAR_CHANNELFILE_ERROR_NOBASEURLTYPE,
                         array('parent' => $parent, 'protocol' => $protocol));
+                }
             } else {
                 if (!isset($function['attribs']['version']) ||
      */
     function getName()
+    {
         if (isset($this->_channelInfo['name'])) {
             return $this->_channelInfo['name'];
-        } else {
-            return false;
+        }
+        return false;
+    }
     /**
      * @return string|false
      */
     function getServer()
+    {
         if (isset($this->_channelInfo['name'])) {
-            return $this->_channelInfo['name'];
-        } else {
-            return false;
+            return $this->_channelInfo['name'];
+        }
         return false;
+    }
     /**
+    {
         if ($mirror) {
             if ($mir = $this->getMirror($mirror)) {
                 if (isset($mir['attribs']['port'])) {
                     return $mir['attribs']['port'];
-                } else {
-                    if ($this->getSSL($mirror)) {
-                        return 443;
-                    }
-                    return 80;
+                }
+                if ($this->getSSL($mirror)) {
+                    return 443;
+                }
+                return 80;
+            }
             return false;
+        }
         if (isset($this->_channelInfo['servers']['primary']['attribs']['port'])) {
             return $this->_channelInfo['servers']['primary']['attribs']['port'];
+        }
         if ($this->getSSL()) {
             return 443;
+        }
         return 80;
+    }
     /**
+    {
         if ($mirror) {
             if ($mir = $this->getMirror($mirror)) {
                 if (isset($mir['attribs']['ssl'])) {
                     return true;
-                } else {
-                    return false;
+                }
+                return false;
+            }
             return false;
+        }
         if (isset($this->_channelInfo['servers']['primary']['attribs']['ssl'])) {
             return true;
+        }
         return false;
+    }
     /**
      * @return string|false
      */
     function getSummary()
+    {
         if (isset($this->_channelInfo['summary'])) {
-            return $this->_channelInfo['summary'];
-        } else {
-            return false;
+            return $this->_channelInfo['summary'];
-        }
-    }
-    /**
-     * @param string xmlrpc or soap
-     * @param string|false mirror name or false for primary server
-     */
-    function getPath($protocol, $mirror = false)
-    {
+        }
-        if (!in_array($protocol, array('xmlrpc', 'soap'))) {
-            return false;
-        }
-        if ($mirror) {
-            if (!($mir = $this->getMirror($mirror))) {
-                return false;
-            }
-            if (isset($mir[$protocol]['attribs']['path'])) {
-                return $mir[$protocol]['attribs']['path'];
-            } else {
-                return $protocol . '.php';
-            }
-        } elseif (isset($this->_channelInfo['servers']['primary'][$protocol]['attribs']['path'])) {
-            return $this->_channelInfo['servers']['primary'][$protocol]['attribs']['path'];
-        return $protocol . '.php';
+        return false;
     }
     /**
-     * @param string protocol type (xmlrpc, soap)
+     * @param string protocol type
      * @param string Mirror name
      * @return array|false
      */
     function getFunctions($protocol, $mirror = false)
+    {
+        if ($this->getName() == '__uri') {
-        if ($this->getName() == '__uri') {
+            return false;
-            return false;
-        }
-        if ($protocol == 'rest') {
-            $function = 'baseurl';
         } else {
             $function = 'function';
         $function = $protocol == 'rest' ? 'baseurl' : 'function';
         if ($mirror) {
             if ($mir = $this->getMirror($mirror)) {
                 if (isset($mir[$protocol][$function])) {
+                    return $mir[$protocol][$function];
                     return $mir[$protocol][$function];
+            }
             return false;
             return false;
-        }
-        if (isset($this->_channelInfo['servers']['primary'][$protocol][$function])) {
             return $this->_channelInfo['servers']['primary'][$protocol][$function];
+        if (isset($this->_channelInfo['servers']['primary'][$protocol][$function])) {
+            return $this->_channelInfo['servers']['primary'][$protocol][$function];
         } else {
             return false;
         return false;
+    }
+     {
         $protocols = $this->getFunctions($type, $mirror);
         if (!$protocols) {
             return false;
+        }
         foreach ($protocols as $protocol) {
             if ($name === null) {
                 return $protocol;
+            }
             if ($protocol['_content'] != $name) {
                 continue;
+            }
             return $protocol;
+        }
         return false;
+     }
     /**
+    {
         $protocols = $this->getFunctions($type, $mirror);
         if (!$protocols) {
             return false;
+        }
         foreach ($protocols as $protocol) {
             if ($protocol['attribs']['version'] != $version) {
                 continue;
+            }
             if ($name === null) {
                 return true;
+            }
             if ($protocol['_content'] != $name) {
                 continue;
+            }
             return true;
+        }
         return false;
+    }
     /**
     function supportsREST($mirror = false)
+    {
         if ($mirror == $this->_channelInfo['name']) {
             $mirror = false;
+        }
         if ($mirror) {
             if ($mir = $this->getMirror($mirror)) {
                 return isset($mir['rest']);
+            }
             return false;
+        }
         return isset($this->_channelInfo['servers']['primary']['rest']);
+    }
     /**
     function getBaseURL($resourceType, $mirror = false)
+    {
         if ($mirror == $this->_channelInfo['name']) {
             $mirror = false;
+        }
         if ($mirror) {
-            if ($mir = $this->getMirror($mirror)) {
+            $mir = $this->getMirror($mirror);
-                $rest = $mir['rest'];
-            } else {
+            if (!$mir) {
                 return false;
+            }
-            $server = $mirror;
+            $rest = $mir['rest'];
         } else {
             $rest = $this->_channelInfo['servers']['primary']['rest'];
-            $server = $this->getServer();
+        }
         if (!isset($rest['baseurl'][0])) {
             $rest['baseurl'] = array($rest['baseurl']);
+        }
         foreach ($rest['baseurl'] as $baseurl) {
             if (strtolower($baseurl['attribs']['type']) == strtolower($resourceType)) {
                 return $baseurl['_content'];
+            }
+        }
         return false;
+    }
     /**
         return $this->resetFunctions('rest', $mirror);
+    }
     /**
      * Empty all protocol definitions
-     * @param string protocol type (xmlrpc, soap)
+     * @param string protocol type
      * @param string|false mirror name, if any
      */
     function resetFunctions($type, $mirror = false)
+    {
         if ($mirror) {
             if (isset($this->_channelInfo['servers']['mirror'])) {
                 $mirrors = $this->_channelInfo['servers']['mirror'];
                 if (!isset($mirrors[0])) {
                     $mirrors = array($mirrors);
+                }
                 foreach ($mirrors as $i => $mir) {
                     if ($mir['attribs']['host'] == $mirror) {
                         if (isset($this->_channelInfo['servers']['mirror'][$i][$type])) {
                             unset($this->_channelInfo['servers']['mirror'][$i][$type]);
+                        }
                         return true;
+                    }
+                }
-                return false;
-            } else {
-                return false;
-            }
-        } else {
-            if (isset($this->_channelInfo['servers']['primary'][$type])) {
-                unset($this->_channelInfo['servers']['primary'][$type]);
+                return false;
+            }
-            }
-            return true;
+            return false;
+        }
+        if (isset($this->_channelInfo['servers']['primary'][$type])) {
+            unset($this->_channelInfo['servers']['primary'][$type]);
+        }
         return true;
+    }
     /**
      * Set a channel's protocols to the protocols supported by pearweb
      */
     function setDefaultPEARProtocols($version = '1.0', $mirror = false)
+    {
-        switch ($version) {
-            case '1.0' :
-                $this->resetFunctions('xmlrpc', $mirror);
+        switch ($version) {
+            case '1.0' :
-                $this->resetFunctions('soap', $mirror);
+                $this->resetREST($mirror);
-                $this->resetREST($mirror);
-                $this->addFunction('xmlrpc', '1.0', 'logintest', $mirror);
-                $this->addFunction('xmlrpc', '1.0', 'package.listLatestReleases', $mirror);
+                if (!isset($this->_channelInfo['servers'])) {
-                $this->addFunction('xmlrpc', '1.0', 'package.listAll', $mirror);
-                $this->addFunction('xmlrpc', '1.0', 'package.info', $mirror);
+                    $this->_channelInfo['servers'] = array('primary' =>
-                $this->addFunction('xmlrpc', '1.0', 'package.getDownloadURL', $mirror);
-                $this->addFunction('xmlrpc', '1.1', 'package.getDownloadURL', $mirror);
-                $this->addFunction('xmlrpc', '1.0', 'package.getDepDownloadURL', $mirror);
+                        array('rest' => array()));
-                $this->addFunction('xmlrpc', '1.1', 'package.getDepDownloadURL', $mirror);
+                } elseif (!isset($this->_channelInfo['servers']['primary'])) {
+                    $this->_channelInfo['servers']['primary'] = array('rest' => array());
                 $this->addFunction('xmlrpc', '1.0', 'package.search', $mirror);
                 $this->addFunction('xmlrpc', '1.0', 'channel.listAll', $mirror);
                 return true;
             break;
             default :
                 return false;
             break;
         }
+    }
     /**
      * @return array
      */
     function getMirrors()
+    {
         if (isset($this->_channelInfo['servers']['mirror'])) {
             $mirrors = $this->_channelInfo['servers']['mirror'];
             if (!isset($mirrors[0])) {
+                $mirrors = array($mirrors);
                 $mirrors = array($mirrors);
-            }
-            return $mirrors;
         } else {
+            return $mirrors;
+        }
             return array();
         return array();
+    }
         foreach ($this->getMirrors() as $mirror) {
             if ($mirror['attribs']['host'] == $server) {
                 return $mirror;
+            }
+        }
         return false;
+    }
     /**
             if (!isset($this->_channelInfo['servers']['mirror'])) {
                 $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
                     array('mirror' => $mirror));
                 return false;
+            }
-            $setmirror = false;
             if (isset($this->_channelInfo['servers']['mirror'][0])) {
                 foreach ($this->_channelInfo['servers']['mirror'] as $i => $mir) {
                     if ($mirror == $mir['attribs']['host']) {
                         $this->_channelInfo['servers']['mirror'][$i]['attribs']['port'] = $port;
                         return true;
+                    }
+                }
                 return false;
             } elseif ($this->_channelInfo['servers']['mirror']['attribs']['host'] == $mirror) {
                 $this->_channelInfo['servers']['mirror']['attribs']['port'] = $port;
                 $this->_isValid = false;
                 return true;
+            }
+        }
         $this->_channelInfo['servers']['primary']['attribs']['port'] = $port;
         $this->_isValid = false;
         return true;
+    }
             if (!isset($this->_channelInfo['servers']['mirror'])) {
                 $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
                     array('mirror' => $mirror));
                 return false;
+            }
-            $setmirror = false;
             if (isset($this->_channelInfo['servers']['mirror'][0])) {
                 foreach ($this->_channelInfo['servers']['mirror'] as $i => $mir) {
                     if ($mirror == $mir['attribs']['host']) {
                         if (!$ssl) {
                             if (isset($this->_channelInfo['servers']['mirror'][$i]
                                 unset($this->_channelInfo['servers']['mirror'][$i]['attribs']['ssl']);
+                            }
                         } else {
                             $this->_channelInfo['servers']['mirror'][$i]['attribs']['ssl'] = 'yes';
+                        }
                         return true;
+                    }
+                }
                 return false;
             } elseif ($this->_channelInfo['servers']['mirror']['attribs']['host'] == $mirror) {
                 if (!$ssl) {
                     if (isset($this->_channelInfo['servers']['mirror']['attribs']['ssl'])) {
                         unset($this->_channelInfo['servers']['mirror']['attribs']['ssl']);
+                    }
                 } else {
                     $this->_channelInfo['servers']['mirror']['attribs']['ssl'] = 'yes';
+                }
                 $this->_isValid = false;
                 return true;
+            }
+        }
         if ($ssl) {
             $this->_channelInfo['servers']['primary']['attribs']['ssl'] = 'yes';
         } else {
             if (isset($this->_channelInfo['servers']['primary']['attribs']['ssl'])) {
                 unset($this->_channelInfo['servers']['primary']['attribs']['ssl']);
+            }
+        }
-        $this->_isValid = false;
-        return true;
-    }
-    /**
-     * Set the socket number (port) that is used to connect to this channel
-     * @param integer
-     * @param string|false name of the mirror server, or false for the primary
-     */
-    function setPath($protocol, $path, $mirror = false)
-    {
-        if (!in_array($protocol, array('xmlrpc', 'soap'))) {
-            return false;
-        }
-        if ($mirror) {
-            if (!isset($this->_channelInfo['servers']['mirror'])) {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
-                    array('mirror' => $mirror));
-                return false;
-            }
-            $setmirror = false;
-            if (isset($this->_channelInfo['servers']['mirror'][0])) {
-                foreach ($this->_channelInfo['servers']['mirror'] as $i => $mir) {
-                    if ($mirror == $mir['attribs']['host']) {
-                        $this->_channelInfo['servers']['mirror'][$i][$protocol]['attribs']['path'] =
-                            $path;
-                        return true;
-                    }
-                }
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
-                    array('mirror' => $mirror));
-                return false;
-            } elseif ($this->_channelInfo['servers']['mirror']['attribs']['host'] == $mirror) {
-                $this->_channelInfo['servers']['mirror'][$protocol]['attribs']['path'] = $path;
-                $this->_isValid = false;
-                return true;
-            }
-        }
         $this->_channelInfo['servers']['primary'][$protocol]['attribs']['path'] = $path;
         $this->_isValid = false;
         return true;
+    }
         } elseif (!$this->validChannelServer($server)) {
             $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_NAME,
                 array('tag' => 'name', 'name' => $server));
             return false;
+        }
         if ($mirror) {
             $found = false;
             foreach ($this->_channelInfo['servers']['mirror'] as $i => $mir) {
                 if ($mirror == $mir['attribs']['host']) {
                     $found = true;
                     break;
+                }
+            }
             if (!$found) {
                 $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
                     array('mirror' => $mirror));
                 return false;
+            }
             $this->_channelInfo['mirror'][$i]['attribs']['host'] = $server;
             return true;
+        }
         $this->_channelInfo['name'] = $server;
         return true;
+    }
             return false;
         } elseif (strpos(trim($summary), "\n") !== false) {
             $this->_validateWarning(PEAR_CHANNELFILE_ERROR_MULTILINE_SUMMARY,
                 array('summary' => $summary));
+        }
         $this->_channelInfo['summary'] = $summary;
         return true;
+    }
         if (!$this->validChannelServer($alias)) {
             $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_NAME,
                 array('tag' => 'suggestedalias', 'name' => $alias));
             return false;
+        }
         if ($local) {
             $this->_channelInfo['localalias'] = $alias;
         } else {
             $this->_channelInfo['suggestedalias'] = $alias;
+        }
         return true;
+    }
     /**
             return $this->_channelInfo['suggestedalias'];
+        }
         if (isset($this->_channelInfo['name'])) {
             return $this->_channelInfo['name'];
+        }
+        return '';
+    }
     /**
      * Set the package validation object if it differs from PEAR's default
     function addFunction($type, $version, $name = '', $mirror = false)
+    {
         if ($mirror) {
             return $this->addMirrorFunction($mirror, $type, $version, $name);
+        }
         $set = array('attribs' => array('version' => $version), '_content' => $name);
         if (!isset($this->_channelInfo['servers']['primary'][$type]['function'])) {
             if (!isset($this->_channelInfo['servers'])) {
                 $this->_channelInfo['servers'] = array('primary' =>
                     array($type => array()));
             } elseif (!isset($this->_channelInfo['servers']['primary'])) {
                 $this->_channelInfo['servers']['primary'] = array($type => array());
+            }
             $this->_channelInfo['servers']['primary'][$type]['function'] = $set;
             $this->_isValid = false;
             return true;
         } elseif (!isset($this->_channelInfo['servers']['primary'][$type]['function'][0])) {
             $this->_channelInfo['servers']['primary'][$type]['function'] = array(
                 $this->_channelInfo['servers']['primary'][$type]['function']);
+        }
         $this->_channelInfo['servers']['primary'][$type]['function'][] = $set;
         return true;
+    }
     /**
      * Add a protocol to a mirror's provides section
      * @param string protocol version
      * @param string protocol name, if any
      */
     function addMirrorFunction($mirror, $type, $version, $name = '')
+    {
-        $found = false;
         if (!isset($this->_channelInfo['servers']['mirror'])) {
             $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
                 array('mirror' => $mirror));
             return false;
+        }
         $setmirror = false;
         if (isset($this->_channelInfo['servers']['mirror'][0])) {
             foreach ($this->_channelInfo['servers']['mirror'] as $i => $mir) {
                 if ($mirror == $mir['attribs']['host']) {
                     $setmirror = &$this->_channelInfo['servers']['mirror'][$i];
         } else {
             if ($this->_channelInfo['servers']['mirror']['attribs']['host'] == $mirror) {
                 $setmirror = &$this->_channelInfo['servers']['mirror'];
+            }
+        }
         if (!$setmirror) {
             $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
                 array('mirror' => $mirror));
             return false;
+        }
         $set = array('attribs' => array('version' => $version), '_content' => $name);
         if (!isset($setmirror[$type]['function'])) {
             $setmirror[$type]['function'] = $set;
             $this->_isValid = false;
             return true;
         } elseif (!isset($setmirror[$type]['function'][0])) {
             $setmirror[$type]['function'] = array($setmirror[$type]['function']);
+        }
         $setmirror[$type]['function'][] = $set;
         $this->_isValid = false;
         return true;
+    }
      * @param string|false mirror name, if this is not a primary server REST base URL
      */
     function setBaseURL($resourceType, $url, $mirror = false)
+    {
         if ($mirror) {
-            $found = false;
             if (!isset($this->_channelInfo['servers']['mirror'])) {
                 $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
                     array('mirror' => $mirror));
                 return false;
+            }
             $setmirror = false;
             if (isset($this->_channelInfo['servers']['mirror'][0])) {
                 foreach ($this->_channelInfo['servers']['mirror'] as $i => $mir) {
                     if ($mirror == $mir['attribs']['host']) {
                         $setmirror = &$this->_channelInfo['servers']['mirror'][$i];
+                }
+            }
         } else {
             $setmirror = &$this->_channelInfo['servers']['primary'];
+        }
         $set = array('attribs' => array('type' => $resourceType), '_content' => $url);
         if (!isset($setmirror['rest'])) {
             $setmirror['rest'] = array();
+        }
         if (!isset($setmirror['rest']['baseurl'])) {
             $setmirror['rest']['baseurl'] = $set;
             $this->_isValid = false;
             return true;
         } elseif (!isset($setmirror['rest']['baseurl'][0])) {
             $setmirror['rest']['baseurl'] = array($setmirror['rest']['baseurl']);
+        }
         foreach ($setmirror['rest']['baseurl'] as $i => $url) {
             if ($url['attribs']['type'] == $resourceType) {
                 $this->_isValid = false;
                 $setmirror['rest']['baseurl'][$i] = $set;
                 return true;
+            }
+        }
         $setmirror['rest']['baseurl'][] = $set;
         $this->_isValid = false;
         return true;
+    }
     function addMirror($server, $port = null)
+    {
         if ($this->_channelInfo['name'] == '__uri') {
             return false; // the __uri channel cannot have mirrors by definition
+        }
         $set = array('attribs' => array('host' => $server));
         if (is_numeric($port)) {
             $set['attribs']['port'] = $port;
+        }
         if (!isset($this->_channelInfo['servers']['mirror'])) {
             $this->_channelInfo['servers']['mirror'] = $set;
             return true;
-        } else {
-            if (!isset($this->_channelInfo['servers']['mirror'][0])) {
-                $this->_channelInfo['servers']['mirror'] =
-                    array($this->_channelInfo['servers']['mirror']);
-            }
+        }
+        if (!isset($this->_channelInfo['servers']['mirror'][0])) {
+            $this->_channelInfo['servers']['mirror'] =
+                array($this->_channelInfo['servers']['mirror']);
+        }
         $this->_channelInfo['servers']['mirror'][] = $set;
         return true;
+    }
     function getValidationPackage()
+    {
         if (!$this->_isValid && !$this->validate()) {
             return false;
+        }
         if (!isset($this->_channelInfo['validatepackage'])) {
             return array('attribs' => array('version' => 'default'),
                 '_content' => 'PEAR_Validate');
+        }
         return $this->_channelInfo['validatepackage'];
+    }
     /**
     function &getValidationObject($package = false)
+    {
         if (!class_exists('PEAR_Validate')) {
             require_once 'PEAR/Validate.php';
+        }
         if (!$this->_isValid) {
             if (!$this->validate()) {
                 $a = false;
                 return $a;
+            }
+        }
         if (isset($this->_channelInfo['validatepackage'])) {
             if ($package == $this->_channelInfo['validatepackage']) {
                 // channel validation packages are always validated by PEAR_Validate
-                $val = &new PEAR_Validate;
+                $val = new PEAR_Validate;
                 return $val;
+            }
             if (!class_exists(str_replace('.', '_',
                   $this->_channelInfo['validatepackage']['_content']))) {
                 if ($this->isIncludeable(str_replace('_', '/',
                       $this->_channelInfo['validatepackage']['_content']) . '.php')) {
                     include_once str_replace('_', '/',
                         $this->_channelInfo['validatepackage']['_content']) . '.php';
                     $vclass = str_replace('.', '_',
                         $this->_channelInfo['validatepackage']['_content']);
-                    $val = &new $vclass;
+                    $val = new $vclass;
                 } else {
                     $a = false;
                     return $a;
+                }
             } else {
                 $vclass = str_replace('.', '_',
                     $this->_channelInfo['validatepackage']['_content']);
-                $val = &new $vclass;
+                $val = new $vclass;
+            }
         } else {
-            $val = &new PEAR_Validate;
+            $val = new PEAR_Validate;
+        }
         return $val;
+    }
     function isIncludeable($path)
             if (file_exists($dir . DIRECTORY_SEPARATOR . $path)
                   && is_readable($dir . DIRECTORY_SEPARATOR . $path)) {
                 return true;
+            }
+        }
         return false;
+    }
     /**
     function lastModified()
+    {
         if (isset($this->_channelInfo['_lastmodified'])) {
             return $this->_channelInfo['_lastmodified'];
+        }
         return time();
+    }
+}
-?>

Subversion Repositories Applications.gtt

(root)/trunk/bibliotheque/pear/PEAR/ChannelFile.php – Rev 94 → 187