diff --git a/AUTHORS b/AUTHORS index 896c349..51afc80 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,11 +8,11 @@ N:Simon Leblanc P:Simon E:contact@leblanc-simon.eu D:2007-12 -C:internationalisation, limitation items RSS, bugfixes, système de cache +C:internationalisation, limitation items RSS, bugfixes, système de cache, code initial de la version PHP 5 N:Guillaume Duhamel P:Guill E:guillaume.duhamel@gmail.com D:2008-05 -C:Galerie de vignettes, parseur XML +C:Galerie de vignettes, parseur XML de la version < 0.8 diff --git a/HTML/Template/Flexy.php b/HTML/Template/Flexy.php deleted file mode 100644 index 66b4f18..0000000 --- a/HTML/Template/Flexy.php +++ /dev/null @@ -1,798 +0,0 @@ - -// | Original Author: Wolfram Kriesing | -// +----------------------------------------------------------------------+ -// - -/** -* @package HTML_Template_Flexy -*/ -// prevent disaster when used with xdebug! -@ini_set('xdebug.max_nesting_level', 1000); - -/* -* Global variable - used to store active options when compiling a template. -*/ -$GLOBALS['_HTML_TEMPLATE_FLEXY'] = array(); - -// ERRORS: - -define('HTML_TEMPLATE_FLEXY_ERROR_SYNTAX',-1); // syntax error in template. -define('HTML_TEMPLATE_FLEXY_ERROR_INVALIDARGS',-2); // bad arguments to methods. -define('HTML_TEMPLATE_FLEXY_ERROR_FILE',-2); // file access problem - -define('HTML_TEMPLATE_FLEXY_ERROR_RETURN',1); // RETURN ERRORS -define('HTML_TEMPLATE_FLEXY_ERROR_DIE',8); // FATAL DEATH -/** -* A Flexible Template engine - based on simpletemplate -* -* @abstract Long Description -* Have a look at the package description for details. -* -* usage: -* $template = new HTML_Template_Flexy($options); -* $template->compiler('/name/of/template.html'); -* $data =new StdClass -* $data->text = 'xxxx'; -* $template->outputObject($data,$elements) -* -* Notes: -* $options can be blank if so, it is read from -* PEAR::getStaticProperty('HTML_Template_Flexy','options'); -* -* the first argument to outputObject is an object (which could even be an -* associateve array cast to an object) - I normally send it the controller class. -* the seconde argument '$elements' is an array of HTML_Template_Flexy_Elements -* eg. array('name'=> new HTML_Template_Flexy_Element('',array('value'=>'fred blogs')); -* -* -* -* -* @version $Id: Flexy.php,v 1.96 2005/12/20 01:45:06 alan_k Exp $ -*/ -class HTML_Template_Flexy -{ - - /* - * @var array $options the options for initializing the template class - */ - var $options = array( - 'compileDir' => '', // where do you want to write to.. (defaults to session.save_path) - 'templateDir' => '', // where are your templates - - // where the template comes from. ------------------------------------------ - 'multiSource' => false, // Allow same template to exist in multiple places - // So you can have user themes.... - 'templateDirOrder' => '', // set to 'reverse' to assume that first template - - - 'debug' => false, // prints a few messages - - - // compiling conditions ------------------------------------------ - 'compiler' => 'Flexy', // which compiler to use. (Flexy,Regex, Raw,Xipe) - 'forceCompile' => false, // only suggested for debugging - - // regex Compiler ------------------------------------------ - 'filters' => array(), // used by regex compiler. - - // standard Compiler ------------------------------------------ - 'nonHTML' => false, // dont parse HTML tags (eg. email templates) - 'allowPHP' => false, // allow PHP in template (use true=allow, 'delete' = remove it.) - - 'flexyIgnore' => 0, // turn on/off the tag to element code - 'numberFormat' => ",2,'.',','", // default number format {xxx:n} format = eg. 1,200.00 - - 'url_rewrite' => '', // url rewriting ability: - // eg. "images/:test1/images/,js/:test1/js" - // changes href="images/xxx" to href="test1/images/xxx" - // and src="js/xxx.js" to src="test1/js/xxx.js" - - 'compileToString' => false, // should the compiler return a string - // rather than writing to a file. - 'privates' => false, // allow access to _variables (eg. suido privates - 'globals' => false, // allow access to _GET/_POST/_REQUEST/GLOBALS/_COOKIES/_SESSION - - 'globalfunctions' => false, // allow GLOBALS.date(#d/m/Y#) to have access to all PHP's methods - // warning dont use unless you trust the template authors - // exec() becomes exposed. - - // get text/transalation suppport ------------------------------------------ - // (flexy compiler only) - 'locale' => 'en', // works with gettext or File_Gettext - 'textdomain' => '', // for gettext emulation with File_Gettext - // eg. 'messages' (or you can use the template name. - 'textdomainDir' => '', // eg. /var/www/site.com/locale - // so the french po file is: - // /var/www/site.com/local/fr/LC_MESSAGE/{textdomain}.po - - 'Translation2' => false, // to make Translation2 a provider. - // rather than gettext. - // set to: - // 'Translation2' => array( - // 'driver' => 'dataobjectsimple', - // 'options' => array() - // ); - // or the slower way.. - // = as it requires loading the code.. - // - // 'Translation2' => new Translation2('dataobjectsimple','') - - - 'charset' => 'ISO-8859-1', // charset used with htmlspecialchars to render data. - // experimental - - // output options ------------------------------------------ - 'strict' => false, // All elements in the template must be defined - - // makes php E_NOTICE warnings appear when outputing template. - - 'fatalError' => HTML_TEMPLATE_FLEXY_ERROR_DIE, // default behavior is to die on errors in template. - - 'plugins' => array(), // load classes to be made available via the plugin method - // eg. = array('Savant') - loads the Savant methods. - // = array('MyClass_Plugins' => 'MyClass/Plugins.php') - // Class, and where to include it from.. - ); - /** - * The compiled template filename (Full path) - * - * @var string - * @access public - */ - var $compiledTemplate; - /** - * The source template filename (Full path) - * - * @var string - * @access public - */ - - - var $currentTemplate; - - /** - * The getTextStrings Filename - * - * @var string - * @access public - */ - var $getTextStringsFile; - /** - * The serialized elements array file. - * - * @var string - * @access public - */ - var $elementsFile; - - - /** - * Array of HTML_elements which is displayed on the template - * - * Technically it's private (eg. only the template uses it..) - * - * - * @var array of HTML_Template_Flexy_Elements - * @access private - */ - var $elements = array(); - /** - * Constructor - * - * Initializes the Template engine, for each instance, accepts options or - * reads from PEAR::getStaticProperty('HTML_Template_Flexy','options'); - * - * @access public - * @param array $options (Optional) - */ - - function HTML_Template_Flexy( $options=array() ) - { - - $baseoptions = array(); - if (class_exists('PEAR')) { - $baseoptions = &PEAR::getStaticProperty('HTML_Template_Flexy','options'); - } - if ($baseoptions ) { - foreach( $baseoptions as $key=>$aOption) { - $this->options[$key] = $aOption; - } - } - - foreach( $options as $key=>$aOption) { - $this->options[$key] = $aOption; - } - - $filters = $this->options['filters']; - if (is_string($filters)) { - $this->options['filters']= explode(',',$filters); - } - - if (is_string($this->options['templateDir'])) { - $this->options['templateDir'] = explode(PATH_SEPARATOR,$this->options['templateDir'] ); - } - - - } - - - - - - /** - * compile the template - * - * @access public - * @version 01/12/03 - * @author Wolfram Kriesing - * @param string $file relative to the 'templateDir' which you set when calling the constructor - * @return boolean true on success. (or string, if compileToString) PEAR_Error on failure.. - */ - function compile( $file ) - { - if (!$file) { - return $this->raiseError('HTML_Template_Flexy::compile no file selected', - HTML_TEMPLATE_FLEXY_ERROR_INVALIDARGS,HTML_TEMPLATE_FLEXY_ERROR_DIE); - } - - if (!@$this->options['locale']) { - $this->options['locale']='en'; - } - - - //Remove the slash if there is one in front, just to be safe. - $file = ltrim($file,DIRECTORY_SEPARATOR); - - - if (strpos($file,'#')) { - list($file,$this->options['output.block']) = explode('#', $file); - } - - $parts = array(); - $tmplDirUsed = false; - - // PART A mulitlanguage support: ( part B is gettext support in the engine..) - // - user created language version of template. - // - compile('abcdef.html') will check for compile('abcdef.en.html') - // (eg. when locale=en) - - $this->currentTemplate = false; - - if (preg_match('/(.*)(\.[a-z]+)$/i',$file,$parts)) { - $newfile = $parts[1].'.'.$this->options['locale'] .$parts[2]; - foreach ($this->options['templateDir'] as $tmplDir) { - if (@!file_exists($tmplDir . DIRECTORY_SEPARATOR .$newfile)) { - continue; - } - $file = $newfile; - $this->currentTemplate = $tmplDir . DIRECTORY_SEPARATOR .$newfile; - $tmplDirUsed = $tmplDir; - } - } - - // look in all the posible locations for the template directory.. - if ($this->currentTemplate === false) { - $dirs = array_unique($this->options['templateDir']); - if ($this->options['templateDirOrder'] == 'reverse') { - $dirs = array_reverse($dirs); - } - foreach ($dirs as $tmplDir) { - if (!@file_exists($tmplDir . DIRECTORY_SEPARATOR . $file)) { - continue; - } - - - if (!$this->options['multiSource'] && ($this->currentTemplate !== false)) { - return $this->raiseError("You have more than one template Named {$file} in your paths, found in both". - "
{$this->currentTemplate }
{$tmplDir}" . DIRECTORY_SEPARATOR . $file, - HTML_TEMPLATE_FLEXY_ERROR_INVALIDARGS , HTML_TEMPLATE_FLEXY_ERROR_DIE); - - } - - $this->currentTemplate = $tmplDir . DIRECTORY_SEPARATOR . $file; - $tmplDirUsed = $tmplDir; - } - } - if ($this->currentTemplate === false) { - // check if the compile dir has been created - return $this->raiseError("Could not find Template {$file} in any of the directories
" . - implode("
",$this->options['templateDir']) , - HTML_TEMPLATE_FLEXY_ERROR_INVALIDARGS, HTML_TEMPLATE_FLEXY_ERROR_DIE); - } - - - // Savant compatible compiler - - if ($this->options['compiler'] == 'Raw') { - $this->compiledTemplate = $this->currentTemplate; - $this->debug("Using Raw Compiler"); - return true; - } - - - - - // now for the compile target - - //If you are working with mulitple source folders and $options['multiSource'] is set - //the template folder will be: - // compiled_tempaltes/{templatedir_basename}_{md5_of_dir}/ - - - $compileSuffix = ((count($this->options['templateDir']) > 1) && $this->options['multiSource']) ? - DIRECTORY_SEPARATOR .basename($tmplDirUsed) . '_' .md5($tmplDirUsed) : ''; - - - $compileDest = @$this->options['compileDir']; - - $isTmp = false; - // Use a default compile directory if one has not been set. - if (!@$compileDest) { - // Use session.save_path + 'compiled_templates_' + md5(of sourcedir) - $compileDest = ini_get('session.save_path') . DIRECTORY_SEPARATOR . 'flexy_compiled_templates'; - if (!file_exists($compileDest)) { - require_once 'System.php'; - System::mkdir(array('-p',$compileDest)); - } - $isTmp = true; - - } - - - - // we generally just keep the directory structure as the application uses it, - // so we dont get into conflict with names - // if we have multi sources we do md5 the basedir.. - - - $base = $compileDest . $compileSuffix . DIRECTORY_SEPARATOR .$file; - $fullFile = $this->compiledTemplate = $base .'.'.$this->options['locale'].'.php'; - $this->getTextStringsFile = $base .'.gettext.serial'; - $this->elementsFile = $base .'.elements.serial'; - if (isset($this->options['output.block'])) { - $this->compiledTemplate .= '#'.$this->options['output.block']; - } - - $recompile = false; - - $isuptodate = file_exists($this->compiledTemplate) ? - (filemtime($this->currentTemplate) == filemtime( $this->compiledTemplate)) : 0; - - if( @$this->options['forceCompile'] || !$isuptodate ) { - $recompile = true; - } else { - $this->debug("File looks like it is uptodate."); - return true; - } - - - - - if( !@is_dir($compileDest) || !is_writeable($compileDest)) { - require_once 'System.php'; - - System::mkdir(array('-p',$compileDest)); - } - if( !@is_dir($compileDest) || !is_writeable($compileDest)) { - return $this->raiseError( "can not write to 'compileDir', which is '$compileDest'
". - "Please give write and enter-rights to it", - HTML_TEMPLATE_FLEXY_ERROR_FILE, HTML_TEMPLATE_FLEXY_ERROR_DIE); - } - - if (!file_exists(dirname($this->compiledTemplate))) { - require_once 'System.php'; - System::mkdir(array('-p','-m', 0770, dirname($this->compiledTemplate))); - } - - // Compile the template in $file. - - require_once 'HTML/Template/Flexy/Compiler.php'; - $compiler = HTML_Template_Flexy_Compiler::factory($this->options); - $ret = $compiler->compile($this); - if (is_a($ret,'PEAR_Error')) { - return $this->raiseError('HTML_Template_Flexy fatal error:' .$ret->message, - $ret->code, HTML_TEMPLATE_FLEXY_ERROR_DIE); - } - return $ret; - - //return $this->$method(); - - } - - /** - * compiles all templates - * Used for offline batch compilation (eg. if your server doesn't have write access to the filesystem). - * - * @access public - * @author Alan Knowles - * - */ - function compileAll($dir = '',$regex='/.html$/') - { - - require_once 'HTML/Template/Flexy/Compiler.php'; - $c = new HTML_Template_Flexy_Compiler; - $c->compileAll($this,$dir,$regex); - } - - /** - * Outputs an object as $t - * - * for example the using simpletags the object's variable $t->test - * would map to {test} - * - * @version 01/12/14 - * @access public - * @author Alan Knowles - * @param object to output - * @param array HTML_Template_Flexy_Elements (or any object that implements toHtml()) - * @return none - */ - - - function outputObject(&$t,$elements=array()) - { - if (!is_array($elements)) { - return $this->raiseError( - 'second Argument to HTML_Template_Flexy::outputObject() was an '.gettype($elements) . ', not an array', - HTML_TEMPLATE_FLEXY_ERROR_INVALIDARGS ,HTML_TEMPLATE_FLEXY_ERROR_DIE); - } - if (@$this->options['debug']) { - echo "output $this->compiledTemplate
"; - } - - // this may disappear later it's a Backwards Compatibility fudge to try - // and deal with the first stupid design decision to not use a second argument - // to the method. - - if (count($this->elements) && !count($elements)) { - $elements = $this->elements; - } - // end depreciated code - - - $this->elements = $this->getElements(); - - // Overlay values from $elements to $this->elements (which is created from the template) - // Remove keys with no corresponding value. - foreach($elements as $k=>$v) { - // Remove key-value pair from $this->elements if hasn't a value in $elements. - if (!$v) { - unset($this->elements[$k]); - } - // Add key-value pair to $this->$elements if it's not there already. - if (!isset($this->elements[$k])) { - $this->elements[$k] = $v; - continue; - } - // Call the clever element merger - that understands form values and - // how to display them... - $this->elements[$k] = $this->mergeElement($this->elements[$k] ,$v); - } - //echo '
'; print_r(array($elements,$this->elements));
-      
-        
-        // we use PHP's error handler to hide errors in the template.
-        // use $options['strict'] - if you want to force declaration of
-        // all variables in the template
-        
-        
-        $_error_reporting = false;
-        if (!$this->options['strict']) {
-            $_error_reporting = error_reporting(E_ALL ^ E_NOTICE);
-        }
-        if (!is_readable($this->compiledTemplate)) {
-              return $this->raiseError( "Could not open the template: '{$this->compiledTemplate}'
".
-                            "Please check the file permissions on the directory and file ",
-                            HTML_TEMPLATE_FLEXY_ERROR_FILE, HTML_TEMPLATE_FLEXY_ERROR_DIE);
-        }
-        
-        // are we using the assign api!
-        
-        if (isset($this->assign)) {
-            if (!$t) {
-                $t = (object) $this->assign->variables;
-            }
-            extract($this->assign->variables);
-            foreach(array_keys($this->assign->references) as $_k) {
-                $$_k = &$this->assign->references[$_k];
-            }
-        }
-        // used by Flexy Elements etc..
-        $GLOBALS['_HTML_TEMPLATE_FLEXY']['options']  = $this->options;
-        
-        include($this->compiledTemplate);
-        
-        // Return the error handler to its previous state. 
-        
-        if ($_error_reporting !== false) {
-            error_reporting($_error_reporting);
-        }
-    }
-    /**
-    *   Outputs an object as $t, buffers the result and returns it.
-    *
-    *   See outputObject($t) for more details.
-    *
-    *   @version    01/12/14
-    *   @access     public
-    *   @author     Alan Knowles
-    *   @param      object object to output as $t
-    *   @return     string - result
-    */
-    function bufferedOutputObject(&$t,$elements=array()) 
-    {
-        ob_start();
-        $this->outputObject($t,$elements);
-        $data = ob_get_contents();
-        ob_end_clean();
-        return $data;
-    }
-    /**
-    * static version which does new, compile and output all in one go.
-    *
-    *   See outputObject($t) for more details.
-    *
-    *   @version    01/12/14
-    *   @access     public
-    *   @author     Alan Knowles
-    *   @param      object object to output as $t
-    *   @param      filename of template
-    *   @return     string - result
-    */
-    function &staticQuickTemplate($file,&$t) 
-    {
-        $template = new HTML_Template_Flexy;
-        $template->compile($file);
-        $template->outputObject($t);
-    }
-    
-    /**
-    *   if debugging is on, print the debug info to the screen
-    *
-    *   @access     public
-    *   @author     Alan Knowles 
-    *   @param      string  $string       output to display
-    *   @return     none
-    */
-    function debug($string) 
-    {  
-        
-        if (is_a($this,'HTML_Template_Flexy')) {
-            if (!$this->options['debug']) {
-                return;
-            }
-        } else if (!@$GLOBALS['_HTML_TEMPLATE_FLEXY']['debug']) {
-            return;
-        }
-        echo "
FLEXY DEBUG: $string
";
-        
-    }
-     
-    /**
-     * A general Utility method that merges HTML_Template_Flexy_Elements
-     * Static method - no native debug avaiable..
-     *
-     * @param    HTML_Template_Flexy_Element   $original  (eg. from getElements())
-     * @param    HTML_Template_Flexy_Element   $new (with data to replace/merge)
-     * @return   HTML_Template_Flexy_Element   the combined/merged data.
-     * @static
-     * @access   public
-     */
-     
-    function mergeElement($original,$new)
-    {
-     
-        // no original - return new
-        if (!$original) {
-            return $new;
-        }
-        // no new - return original
-        if (!$new) {
-            return $original;
-        }
-        // If the properties of $original differ from those of $new and 
-        // they are set on $new, set them to $new's. Otherwise leave them 
-        // as they are.
-
-        if ($new->tag && ($new->tag != $original->tag)) {
-            $original->tag = $new->tag;
-        }
-        
-        if ($new->override !== false) {
-            $original->override = $new->override;
-        }
-        
-        if (count($new->children)) {
-            //echo "
 COPY CHILDREN"; print_r($from->children);
-            $original->children = $new->children;
-        }
-        
-        if (is_array($new->attributes)) {
-        
-            foreach ($new->attributes as $key => $value) {
-                $original->attributes[$key] = $value;
-            }
-        }
-        // originals never have prefixes or suffixes..
-        $original->prefix = $new->prefix;
-        $original->suffix = $new->suffix;  
-
-        if ($new->value !== null) {
-            $original->setValue($new->value);
-        } 
-       
-        return $original;
-        
-    }  
-     
-     
-    /**
-    * Get an array of elements from the template
-    *
-    * All 
 elements (eg. elementsFile && file_exists($this->elementsFile)) {
-            require_once 'HTML/Template/Flexy/Element.php';
-            return unserialize(file_get_contents($this->elementsFile));
-        }
-        return array();
-    }
-    
-    
-    /**
-    * Lazy loading of PEAR, and the error handler..
-    * This should load HTML_Template_Flexy_Error really..
-    * 
-    * @param   string message
-    * @param   int      error type.
-    * @param   int      an equivalant to pear error return|die etc.
-    *
-    * @return   object      pear error.
-    * @access   public
-    */
-  
-    
-    function raiseError($message, $type = null, $fatal = HTML_TEMPLATE_FLEXY_ERROR_RETURN ) 
-    {
-        HTML_Template_Flexy::debug("HTML_Template_Flexy::raiseError$message");
-        require_once 'PEAR.php';
-        if (is_a($this,'HTML_Template_Flexy') &&  ($fatal == HTML_TEMPLATE_FLEXY_ERROR_DIE)) {
-            // rewrite DIE!
-            return PEAR::raiseError($message, $type, $this->options['fatalError']);
-        }
-        if (isset($GLOBALS['_HTML_TEMPLATE_FLEXY']['fatalError']) &&  ($fatal == HTML_TEMPLATE_FLEXY_ERROR_DIE)) {
-            
-            return PEAR::raiseError($message, $type,$GLOBALS['_HTML_TEMPLATE_FLEXY']['fatalError']);
-        }
-        return PEAR::raiseError($message, $type, $fatal);
-    }
-
-
-    /**
-    * 
-    * Assign API - 
-    * 
-    * read the docs on HTML_Template_Flexy_Assign::assign()
-    *
-    * @param   varargs ....
-    * 
-    *
-    * @return   mixed    PEAR_Error or true?
-    * @access   public
-    * @see  HTML_Template_Flexy_Assign::assign()
-    * @status alpha
-    */
-  
-    function setData() {
-        require_once 'HTML/Template/Flexy/Assign.php';
-        // load assigner..
-        if (!isset($this->assign)) {
-            $this->assign = new HTML_Template_Flexy_Assign;
-        }
-        return $this->assign->assign(func_get_args());
-    }
-    /**
-    * 
-    * Assign API - by Reference
-    * 
-    * read the docs on HTML_Template_Flexy_Assign::assign()
-    *
-    * @param  key  string
-    * @param  value mixed
-    * 
-    * @return   mixed    PEAR_Error or true?
-    * @access   public
-    * @see  HTML_Template_Flexy_Assign::assign()
-    * @status alpha
-    */
-        
-    function setDataByRef($k,&$v) {
-        require_once 'HTML/Template/Flexy/Assign.php';
-        // load assigner..
-        if (!isset($this->assign)) {
-            $this->assign = new HTML_Template_Flexy_Assign;
-        }
-        $this->assign->assignRef($k,$v);
-    } 
-    /**
-    * 
-    * Plugin (used by templates as $this->plugin(...) or {this.plugin(#...#,#....#)}
-    * 
-    * read the docs on HTML_Template_Flexy_Plugin()
-    *
-    * @param  varargs ....
-    * 
-    * @return   mixed    PEAR_Error or true?
-    * @access   public
-    * @see  HTML_Template_Flexy_Plugin
-    * @status alpha
-    */
-    function plugin() {
-        require_once 'HTML/Template/Flexy/Plugin.php';
-        // load pluginManager.
-        if (!isset($this->plugin)) {
-            $this->plugin = new HTML_Template_Flexy_Plugin;
-            $this->plugin->flexy = &$this;
-        }
-        return $this->plugin->call(func_get_args());
-    } 
-    /**
-    * 
-    * output / display ? - outputs an object, without copy by references..
-    * 
-    * @param  optional mixed object to output
-    * 
-    * @return   mixed    PEAR_Error or true?
-    * @access   public
-    * @see  HTML_Template_Flexy::ouptutObject
-    * @status alpha
-    */
-    function output($object = false) 
-    {
-        return $this->outputObject($object);
-    }
-    
-    /**
-    * 
-    * render the template with data..
-    * 
-    * @param  optional mixed object to output
-    * 
-    * @return   mixed    PEAR_Error or true?
-    * @access   public
-    * @see  HTML_Template_Flexy::ouptutObject
-    * @status alpha
-    */
-    function toString($object = false) 
-    {
-        return $this->bufferedOutputObject($object);
-    }
-    
-}
\ No newline at end of file
diff --git a/HTML/Template/Flexy/Assign.php b/HTML/Template/Flexy/Assign.php
deleted file mode 100644
index bc42285..0000000
--- a/HTML/Template/Flexy/Assign.php
+++ /dev/null
@@ -1,204 +0,0 @@
-                                  |
-// +----------------------------------------------------------------------+
-//
-// $Id: Assign.php,v 1.5 2004/06/03 03:25:11 alan_k Exp $
-//
-//  Provider for Assign API ( Eg. $flexy->assign(...) )
-//
-
-define('HTML_TEMPLATE_FLEXY_ASSIGN_ERROR_INVALIDARGS', -100);
-
-class HTML_Template_Flexy_Assign {
-    
-    /**
-    * The variables stored in the Assigner
-    *
-    * @var array
-    * @access public
-    */
-    var $variables = array();
-    /**
-    * The references stored in the Assigner
-    *
-    * @var array
-    * @access public
-    */
-    var $references = array();
-
- 
-    /**
-    * 
-    * Assigns a token-name and value to $this->_token_vars for use in a
-    * template.
-    * 
-    * There are three valid ways to assign values to a template.
-    * 
-    * Form 1: $args[0] is a string and $args[1] is mixed. This means
-    * $args[0] is a token name and $args[1] is the token value (which
-    * allows objects, arrays, strings, numbers, or anything else). 
-    * $args[1] can be null, which means the corresponding token value in
-    * the template will also be null.
-    * 
-    * Form 2: $args[0] is an array and $args[1] is not set. Assign a
-    * series of tokens where the key is the token name, and the value is
-    * token value.
-    * 
-    * Form 3: $args[0] is an object and $args[1] is not set.  Assigns
-    * copies of all object variables (properties) to tokens; the token
-    * name and value is a copy of each object property and value.
-    * 
-    * @access public
-    * 
-    * @param string|array|object $args[0] This param can be a string, an
-    * array, or an object.  If $args[0] is a string, it is the name of a
-    * variable in the template.  If $args[0] is an array, it must be an
-    * associative array of key-value pairs where the key is a variable
-    * name in the template and the value is the value for that variable
-    * in the template.  If $args[0] is an object, copies of its
-    * properties will be assigned to the template.
-    * 
-    * @param mixed $args[1] If $args[0] is an array or object, $args[1]
-    * should not be set.  Otherwise, a copy of $args[1] is assigned to a
-    * template variable named after $args[0].
-    * 
-    * @return bool|PEAR_Error Boolean true if all assignments were
-    * committed, or a PEAR_Error object if there was an error.
-    * 
-    * @throws SAVANT_ERROR_ASSIGN Unknown reason for error, probably
-    * because you passed $args[1] when $args[0] is an array or object.
-    * 
-    * @author Paul M. Jones  
-    * @see assignRef()
-    * 
-    * @see assignObject()
-    * 
-    */
-    
-    function assign($args)
-    {    
-        // in Form 1, $args[0] is a string name and $args[1] is mixed.
-        // in Form 2, $args[0] is an associative array.
-        // in Form 3, $args[0] is an object.
-        
-        $count = count($args);
-        
-        // -------------------------------------------------------------
-        //
-        // Now we assign variable copies.
-        //
-        
-        // form 1 (string name and mixed value)
-        // don't check isset() on $args[1] becuase a 'null' is not set,
-        // and we might want to pass a null.
-        if (is_string($args[0]) && $count > 1) {
-            if (isset($this->references[$args[0]])) {
-                unset($this->references[$args[0]]);
-            }
-            // keep a copy in the token vars array
-            $this->variables[$args[0]] = $args[1];
-            
-            // done!
-            return true;
-        }
-        
-        // form 2 (assoc array)
-        if (is_array($args[0]) && $count == 1) {
-            
-            foreach ($args[0] as $key=>$val) {
-                $this->assign($key, $val);
-            }
-            
-            // done!
-            return true;
-        }
-        
-        // form 3 (object props)
-        if (is_object($args[0]) && $count == 1) {
-            
-            // get the object properties
-            $data = get_object_vars($args[0]);
-            foreach ($data as $key=>$val) {
-                $this->assign($key, $val);
-            }
-            
-            // done!
-            return true;
-        }
-        
-        
-        // -------------------------------------------------------------
-        //
-        // Final error catch.  We should not have gotten to this point.
-        //
-        
-        return HTML_Template_Flexy::raiseError(
-            "invalid type sent to assign, ". print_r($args,true),
-            HTML_TEMPLATE_FLEXY_ASSIGN_ERROR_INVALIDARGS             
-        );
-    }
-     
-
-    /**
-    * 
-    * Assign a token by reference.  This allows you change variable
-    * values within the template and have those changes reflected back
-    * at the calling logic script.  Works as with form 2 of assign().
-    * 
-    * @access public
-    * 
-    * @param string $name The template token-name for the reference.
-    * 
-    * @param mixed &$ref The variable passed by-reference.
-    * 
-    * @return bool|PEAR_Error Boolean true on success, or a PEAR_Error
-    * on failure.
-    * 
-    * @throws SAVANT_ERROR_ASSIGN_REF Unknown reason for error.
-    * 
-    * @see assign()
-    * @author Paul M. Jones  
-    * @see assignObject()
-    * 
-    */
-    
-    function assignRef($name, &$ref)
-    {
-        // look for the proper case: name and variable
-        if (is_string($name) && isset($ref)) {
-            if (isset($this->variables[$name])) {
-                unset($this->variables[$name]);
-            }
-            //
-            // assign the token as a reference
-            $this->references[$name] =& $ref;
-             
-            // done!
-            return true;
-        }
-        
-        // final error catch
-        return HTML_Template_Flexy::raiseError(
-            "invalid type sent to assignRef, ". print_r($name,true),
-            HTML_TEMPLATE_FLEXY_ASSIGN_ERROR_INVALIDARGS 
- 
-        );
-    }
-    
- 
-
-
}
\ No newline at end of file
diff --git a/HTML/Template/Flexy/Compiler.php b/HTML/Template/Flexy/Compiler.php
deleted file mode 100644
index 3ef1fb8..0000000
--- a/HTML/Template/Flexy/Compiler.php
+++ /dev/null
@@ -1,161 +0,0 @@
-                            |
-// +----------------------------------------------------------------------+
-//
-// $Id: Compiler.php,v 1.7 2004/07/08 04:56:30 alan_k Exp $
-//
-//  Base Compiler Class (Interface)
-//
-
-/**
-* Compiler Globals go here..
-* public (to it's children)
-*
-* @var array
-* @access public (to it's children)
-*/
-
-$GLOBAL['_HTML_TEMPLATE_FLEXY_COMPILER'] = array();
-
-
-class HTML_Template_Flexy_Compiler {
-
-        
-    /**
-    * Options 
-    *
-    * @var array
-    * @access public
-    */
-    var $options;
-    
-    /**
-    * Factory constructor
-    * 
-    * @param   array    options     only ['compiler']  is used directly
-    *
-    * @return   object    The Compiler Object
-    * @access   public
-    */
-    function factory($options) 
-    {
-        if (empty($options['compiler'])) {
-            $options['compiler'] = 'Flexy';
-        }
-    
-        require_once 'HTML/Template/Flexy/Compiler/'.ucfirst( $options['compiler'] ) .'.php';
-        $class = 'HTML_Template_Flexy_Compiler_'.$options['compiler'];
-        $ret = new $class;
-        $ret->options = $options;
-        return $ret;
-    }
-    
-    
-    /**
-    * The compile method.
-    *
-    * @param object HTML_Template_Flexy that is requesting the compile
-    * @return   object  HTML_Template_Flexy 
-    * @return   string   to compile (if not using a file as the source)
-    * @access   public
-    */
-    function compile(&$flexy,$string = false) 
-    {
-        echo "No compiler implemented!";
-    }
-     
-    /**
-    * Append HTML to compiled ouput
-    * These are hooks for passing data to other processes
-    *
-    * @param   string to append to compiled
-    * 
-    * @return   string to be output
-    * @access   public
-    */
-    function appendHtml($string) 
-    {
-      
-        return $string;
-    }
-    /**
-    * Append PHP Code to compiled ouput
-    * These are hooks for passing data to other processes
-    *
-    * @param   string PHP code to append to compiled
-    *
-    * @return   string to be output
-    * @access   public
-    */
-    
-    function appendPhp($string) 
-    {
-        
-        return '';
-    }
-    /**
-    * Compile All templates in the 
-    * These are hooks for passing data to other processes
-    *
-    * @param   string PHP code to append to compiled
-    *
-    * @return   string to be output
-    * @access   public
-    */
-    
-    function compileAll(&$flexy, $dir = '',$regex='/.html$/')
-    {
-        $this->flexy = &$flexy;
-        $this->compileDir($dir,$regex);
-    }
-    
-    
-    function compileDir($dir = '',$regex='/.html$/')
-    {
-        
-        
-        foreach ($this->flexy->options['templateDir'] as $base) {
-            if (!file_exists($base . DIRECTORY_SEPARATOR  . $dir)) {
-                continue;
-            }
-            $dh = opendir($base . DIRECTORY_SEPARATOR  . $dir);
-            while (($name = readdir($dh)) !== false) {
-                if (!$name) {  // empty!?
-                    continue;
-                }
-                if ($name{0} == '.') {
-                    continue;
-                }
-                 
-                if (is_dir($base . DIRECTORY_SEPARATOR  . $dir . DIRECTORY_SEPARATOR  . $name)) {
-                    $this->compileDir($dir . DIRECTORY_SEPARATOR  . $name,$regex);
-                    continue;
-                }
-                
-                if (!preg_match($regex,$name)) {
-                    continue;
-                }
-                //echo "Compiling $dir". DIRECTORY_SEPARATOR  . "$name \n";
-                $this->flexy->compile($dir . DIRECTORY_SEPARATOR  . $name);
-            }
-        }
-        
-    }
-    
-
-}
- 
\ No newline at end of file
diff --git a/HTML/Template/Flexy/Compiler/Flexy.php b/HTML/Template/Flexy/Compiler/Flexy.php
deleted file mode 100644
index f8e34ea..0000000
--- a/HTML/Template/Flexy/Compiler/Flexy.php
+++ /dev/null
@@ -1,985 +0,0 @@
-                            |
-// +----------------------------------------------------------------------+
-//
-// $Id: Flexy.php,v 1.20 2005/10/25 02:21:16 alan_k Exp $
-//
-//  Base Compiler Class
-//  Standard 'Original Flavour' Flexy compiler
-
-// this does the main conversion, (eg. for {vars and methods}) 
-// it relays into Compiler/Tag & Compiler/Flexy for tags and namespace handling.
-
-
-
-
-require_once 'HTML/Template/Flexy/Tokenizer.php';
-require_once 'HTML/Template/Flexy/Token.php';
- 
-class HTML_Template_Flexy_Compiler_Flexy extends HTML_Template_Flexy_Compiler {
-    
-    
-        
-    /**
-    * The current template (Full path)
-    *
-    * @var string
-    * @access public
-    */
-    var $currentTemplate;
-    /**
-    * The compile method.
-    * 
-    * @params   object HTML_Template_Flexy
-    * @params   string|false string to compile of false to use a file.
-    * @return   string   filename of template
-    * @access   public
-    */
-    function compile(&$flexy, $string=false) 
-    {
-        // read the entire file into one variable
-        
-        // note this should be moved to new HTML_Template_Flexy_Token
-        // and that can then manage all the tokens in one place..
-        global $_HTML_TEMPLATE_FLEXY_COMPILER;
-        
-        $this->currentTemplate  = $flexy->currentTemplate;
-        
-        
-        $gettextStrings = &$_HTML_TEMPLATE_FLEXY_COMPILER['gettextStrings'];
-        $gettextStrings = array(); // reset it.
-        
-        if (@$this->options['debug']) {
-            echo "compiling template $flexy->currentTemplate
";
-            
-        }
-         
-        // reset the elements.
-        $flexy->_elements = array();
-        
-        // replace this with a singleton??
-        
-        $GLOBALS['_HTML_TEMPLATE_FLEXY']['currentOptions']  = $this->options;
-        $GLOBALS['_HTML_TEMPLATE_FLEXY']['elements']        = array();
-        $GLOBALS['_HTML_TEMPLATE_FLEXY']['filename']        = $flexy->currentTemplate;
-        $GLOBALS['_HTML_TEMPLATE_FLEXY']['prefixOutput']    = '';
-        $GLOBALS['_HTML_TEMPLATE_FLEXY']['compiledTemplate']= $flexy->compiledTemplate;
-        
-        
-        // initialize Translation 2, and 
-        $this->initializeTranslator();
-        
-        
-        // load the template!
-        $data = $string;
-        $res = false;
-        if ($string === false) {
-            $data = file_get_contents($flexy->currentTemplate);
-        }
-         
-        // PRE PROCESS {_(.....)} translation markers.
-        if (strpos($data, '{_(') !== false) {
-            $data = $this->preProcessTranslation($data);
-        }
-        
-        // Tree generation!!!
-        
-        
-        
-        if (!$this->options['forceCompile'] && isset($_HTML_TEMPLATE_FLEXY_COMPILER['cache'][md5($data)])) {
-            $res = $_HTML_TEMPLATE_FLEXY_COMPILER['cache'][md5($data)];
-        } else {
-        
-             
-            $tokenizer = new HTML_Template_Flexy_Tokenizer($data);
-            $tokenizer->fileName = $flexy->currentTemplate;
-            
-            
-              
-            //$tokenizer->debug=1;
-            $tokenizer->options['ignore_html'] = $this->options['nonHTML'];
-            
-          
-            require_once 'HTML/Template/Flexy/Token.php';
-            $res = HTML_Template_Flexy_Token::buildTokens($tokenizer);
-            if (is_a($res, 'PEAR_Error')) {
-                return $res;
-            }       
-            $_HTML_TEMPLATE_FLEXY_COMPILER['cache'][md5($data)] = $res;
-            
-        }
-        
-        
-        // technically we shouldnt get here as we dont cache errors..
-        if (is_a($res, 'PEAR_Error')) {
-            return $res;
-        }   
-        
-        // turn tokens into Template..
-        
-        $data = $res->compile($this);
-        
-        if (is_a($data, 'PEAR_Error')) {
-            return $data;
-        }
-        
-        $data = $GLOBALS['_HTML_TEMPLATE_FLEXY']['prefixOutput'] . $data;
-        
-        if (   $flexy->options['debug'] > 1) {
-            echo "Result: 
".htmlspecialchars($data)."

\n";
-        }
-
-        if ($this->options['nonHTML']) {
-           $data =  str_replace("?>\n", "?>\n\n", $data);
-        }
-        
-         
-        
-        
-        // at this point we are into writing stuff...
-        if ($flexy->options['compileToString']) {
-            if (   $flexy->options['debug']) {
-                echo "Returning string:
\n";
-            }
-
-            $flexy->elements =  $GLOBALS['_HTML_TEMPLATE_FLEXY']['elements'];
-            return $data;
-        }
-        
-        
-        
-        
-        // error checking?
-        $file  = $flexy->compiledTemplate;
-        if (isset($flexy->options['output.block'])) {
-            list($file, $part) = explode('#', $file);
-        }
-        
-        if( ($cfp = fopen($file, 'w')) ) {
-            if ($flexy->options['debug']) {
-                echo "Writing: $file
\n";
-            }
-            fwrite($cfp, $data);
-            fclose($cfp);
-            
-            chmod($file, 0775);
-            // make the timestamp of the two items match.
-            clearstatcache();
-            touch($file, filemtime($flexy->currentTemplate));
-            if ($file != $flexy->compiledTemplate) {
-                chmod($flexy->compiledTemplate, 0775);
-                // make the timestamp of the two items match.
-                clearstatcache();
-                touch($flexy->compiledTemplate, filemtime($flexy->currentTemplate));
-            }
-             
-            
-        } else {
-            return HTML_Template_Flexy::raiseError('HTML_Template_Flexy::failed to write to '.$flexy->compiledTemplate,
-                HTML_TEMPLATE_FLEXY_ERROR_FILE, HTML_TEMPLATE_FLEXY_ERROR_RETURN);
-        }
-        // gettext strings
-         
-        if (file_exists($flexy->getTextStringsFile)) {
-            unlink($flexy->getTextStringsFile);
-        }
-        
-        if($gettextStrings && ($cfp = fopen( $flexy->getTextStringsFile, 'w') ) ) {
-            
-            fwrite($cfp, serialize(array_unique($gettextStrings)));
-            fclose($cfp);
-            chmod($flexy->getTextStringsFile, 0664);
-        }
-        
-        // elements
-        if (file_exists($flexy->elementsFile)) {
-            unlink($flexy->elementsFile);
-        }
-        
-        if( $GLOBALS['_HTML_TEMPLATE_FLEXY']['elements'] &&
-            ($cfp = fopen( $flexy->elementsFile, 'w') ) ) {
-            fwrite($cfp, serialize( $GLOBALS['_HTML_TEMPLATE_FLEXY']['elements']));
-            fclose($cfp);
-            chmod($flexy->elementsFile, 0664);
-            // now clear it.
-        
-        }
-        
-        return true;
-    }
-    
-    
-    /**
-    * Initilalize the translation methods.
-    *
-    * Loads Translation2 if required.
-    * 
-     *
-    * @return   none 
-    * @access   public 
-    */
-    function initializeTranslator() {
-    
-        if (is_array($this->options['Translation2'])) {
-            require_once 'Translation2.php';
-            $this->options['Translation2'] =  &Translation2::factory(
-                $this->options['Translation2']['driver'],
-                isset($this->options['Translation2']['options']) ? $this->options['Translation2']['options'] : array(),
-                isset($this->options['Translation2']['params']) ? $this->options['Translation2']['params'] : array()
-            );
-        }
-                
-        if (is_a($this->options['Translation2'], 'Translation2')) {
-            $this->options['Translation2']->setLang($this->options['locale']);
-            // fixme - needs to be more specific to which template to use..
-            foreach ($this->options['templateDir'] as $tt) {
-                $n = basename($this->currentTemplate);
-                if (substr($this->currentTemplate, 0, strlen($tt)) == $tt) {
-                    $n = substr($this->currentTemplate, strlen($tt)+1);
-                }
-                //echo $n;
-            }
-            $this->options['Translation2']->setPageID($n);
-        } else {
-            setlocale(LC_ALL, $this->options['locale']);
-        }
-        
-    }
-    
-    
-    
-    /**
-    * do the early tranlsation of {_(......)_} text
-    *
-    * 
-    * @param    input string
-    * @return   output string
-    * @access   public 
-    */
-    function preProcessTranslation($data) {
-        global $_HTML_TEMPLATE_FLEXY_COMPILER;
-        $matches = array();
-        $lmatches = explode ('{_(', $data);
-        array_shift($lmatches);
-        // shift the first..
-        foreach ($lmatches as $k) {
-            if (false === strpos($k, ')_}')) {
-                continue;
-            }
-            $x = explode(')_}', $k);
-            $matches[] = $x[0];
-        }
-    
-    
-       //echo '
';print_r($matches);
-        // we may need to do some house cleaning here...
-        $_HTML_TEMPLATE_FLEXY_COMPILER['gettextStrings'] = $matches;
-        
-        
-        // replace them now..  
-        // ** leaving in the tag (which should be ignored by the parser..
-        // we then get rid of the tags during the toString method in this class.
-        foreach($matches as $v) {
-            $data = str_replace('{_('.$v.')_}', '{_('.$this->translateString($v).')_}', $data);
-        }
-        return $data;
-    }    
-
-    
-    
-    
-    
-    /**
-    * Flag indicating compiler is inside {_( .... )_} block, and should not
-    * add to the gettextstrings array.
-    *
-    * @var boolean 
-    * @access public
-    */
-    var $inGetTextBlock = false;
-    
-    /**
-    * This is the base toString Method, it relays into toString{TokenName}
-    *
-    * @param    object    HTML_Template_Flexy_Token_*
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-
-    function toString($element) 
-    {
-        static $len = 26; // strlen('HTML_Template_Flexy_Token_');
-        if ($this->options['debug'] > 1) {
-            $x = $element;
-            unset($x->children);
-            //echo htmlspecialchars(print_r($x,true))."
\n";
-        }
-        if ($element->token == 'GetTextStart') {
-            $this->inGetTextBlock = true;
-            return '';
-        }
-        if ($element->token == 'GetTextEnd') {
-            $this->inGetTextBlock = false;
-            return '';
-        }
-        
-            
-        $class = get_class($element);
-        if (strlen($class) >= $len) {
-            $type = substr($class, $len);
-            return $this->{'toString'.$type}($element);
-        }
-        
-        $ret = $element->value;
-        $add = $element->compileChildren($this);
-        if (is_a($add, 'PEAR_Error')) {
-            return $add;
-        }
-        $ret .= $add;
-        
-        if ($element->close) {
-            $add = $element->close->compile($this);
-            if (is_a($add, 'PEAR_Error')) {
-                return $add;
-            }
-            $ret .= $add;
-        }
-        
-        return $ret;
-    }
-
-
-    /**
-    *   HTML_Template_Flexy_Token_Else toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Else
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-
-    function toStringElse($element) 
-     {
-        // pushpull states to make sure we are in an area.. - should really check to see 
-        // if the state it is pulling is a if...
-        if ($element->pullState() === false) {
-            return $this->appendHTML(
-                "Unmatched {else:} on line: {$element->line}"
-                );
-        }
-        $element->pushState();
-        return $this->appendPhp("} else {");
-    }
-    
-    /**
-    *   HTML_Template_Flexy_Token_End toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Else
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-    function toStringEnd($element) 
-    {
-        // pushpull states to make sure we are in an area.. - should really check to see 
-        // if the state it is pulling is a if...
-        if ($element->pullState() === false) {
-            return $this->appendHTML(
-                "Unmatched {end:} on line: {$element->line}"
-                );
-        }
-         
-        return $this->appendPhp("}");
-    }
-
-    /**
-    *   HTML_Template_Flexy_Token_EndTag toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_EndTag
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-
-
-    function toStringEndTag($element) 
-    {
-        return $this->toStringTag($element);
-    }
-        
-    
-    
-    /**
-    *   HTML_Template_Flexy_Token_Foreach toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Foreach 
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-    
-    function toStringForeach($element) 
-    {
-    
-        $loopon = $element->toVar($element->loopOn);
-        if (is_a($loopon, 'PEAR_Error')) {
-            return $loopon;
-        }
-        
-        $ret = 'if ($this->options[\'strict\'] || ('.
-            'is_array('. $loopon. ')  || ' .
-            'is_object(' . $loopon  . '))) ' .
-            'foreach(' . $loopon  . " ";
-            
-        $ret .= "as \${$element->key}";
-        
-        if ($element->value) {
-            $ret .=  " => \${$element->value}";
-        }
-        $ret .= ") {";
-        
-        $element->pushState();
-        $element->pushVar($element->key);
-        $element->pushVar($element->value);
-        return $this->appendPhp($ret);
-    }
-    /**
-    *   HTML_Template_Flexy_Token_If toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_If
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-    function toStringIf($element) 
-    {
-        
-        $var = $element->toVar($element->condition);
-        if (is_a($var, 'PEAR_Error')) {
-            return $var;
-        }
-        
-        $ret = "if (".$element->isNegative . $var .")  {";
-        $element->pushState();
-        return $this->appendPhp($ret);
-    }
-
-   /**
-    *  get Modifier Wrapper 
-    *
-    * converts :h, :u, :r , .....
-    * @param    object    HTML_Template_Flexy_Token_Method|Var
-    * 
-    * @return   array prefix,suffix
-    * @access   public 
-    * @see      toString*
-    */
-
-    function getModifierWrapper($element) 
-    {
-        $prefix = 'echo ';
-        
-        $suffix = '';
-        $modifier = strlen(trim($element->modifier)) ? $element->modifier : ' ';
-        
-        switch ($modifier) {
-            case 'h':
-                break;
-            case 'u':
-                $prefix = 'echo urlencode(';
-                $suffix = ')';
-                break;
-            case 'r':
-                $prefix = 'echo \'
\'; echo htmlspecialchars(print_r(';
-                $suffix = ',true)); echo \'
\';';
-                break;                
-            case 'n': 
-                // blank or value..
-                $numberformat = @$GLOBALS['_HTML_TEMPLATE_FLEXY']['currentOptions']['numberFormat'];
-                $prefix = 'echo number_format(';
-                $suffix = $GLOBALS['_HTML_TEMPLATE_FLEXY']['currentOptions']['numberFormat'] . ')';
-                break;
-            case 'b': // nl2br + htmlspecialchars
-                $prefix = 'echo nl2br(htmlspecialchars(';
-                
-                // add language ?
-                $suffix = '))';
-                break;
-            case 'e':
-                $prefix = 'echo htmlentities(';
-                // add language ?
-                $suffix = ')';
-                break;
-            case ' ':
-                $prefix = 'echo htmlspecialchars(';
-                // add language ?
-                $suffix = ')';
-                break;
-            default:
-               $prefix = 'echo $this->plugin("'.trim($element->modifier) .'",';
-               $suffix = ')'; 
-            
-            
-        }
-        
-        return array($prefix, $suffix);
-    }
-
-
-
-  /**
-    *   HTML_Template_Flexy_Token_Var toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Method
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-    function toStringVar($element) 
-    {
-        // ignore modifier at present!!
-        
-        $var = $element->toVar($element->value);
-        if (is_a($var, 'PEAR_Error')) {
-            return $var;
-        }
-        list($prefix, $suffix) = $this->getModifierWrapper($element);
-        return $this->appendPhp( $prefix . $var . $suffix .';');
-    }
-   /**
-    *   HTML_Template_Flexy_Token_Method toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Method
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-    function toStringMethod($element) 
-    {
-
-              
-        // set up the modifier at present!!
-         
-        list($prefix, $suffix) = $this->getModifierWrapper($element);
-        
-        // add the '!' to if
-        
-        if ($element->isConditional) {
-            $prefix = 'if ('.$element->isNegative;
-            $element->pushState();
-            $suffix = ')';
-        }  
-        
-        
-        // check that method exists..
-        // if (method_exists($object,'method');
-        $bits = explode('.', $element->method);
-        $method = array_pop($bits);
-        
-        $object = implode('.', $bits);
-        
-        $var = $element->toVar($object);
-        if (is_a($var, 'PEAR_Error')) {
-            return $var;
-        }
-        
-        if (($object == 'GLOBALS') && 
-            $GLOBALS['_HTML_TEMPLATE_FLEXY']['currentOptions']['globalfunctions']) {
-            // we should check if they something weird like: GLOBALS.xxxx[sdf](....)
-            $var = $method;
-        } else {
-            $prefix = 'if ($this->options[\'strict\'] || (isset('.$var.
-                ') && method_exists('.$var .", '{$method}'))) " . $prefix;
-            $var = $element->toVar($element->method);
-        }
-        
-
-        if (is_a($var, 'PEAR_Error')) {
-            return $var;
-        }
-        
-        $ret  =  $prefix;
-        $ret .=  $var . "(";
-        $s =0;
-         
-       
-         
-        foreach($element->args as $a) {
-             
-            if ($s) {
-                $ret .= ",";
-            }
-            $s =1;
-            if ($a{0} == '#') {
-                if (is_numeric(substr($a, 1, -1))) {
-                    $ret .= substr($a, 1, -1);
-                } else {
-                    $ret .= '"'. addslashes(substr($a, 1, -1)) . '"';
-                }
-                continue;
-            }
-            
-            $var = $element->toVar($a);
-            if (is_a($var, 'PEAR_Error')) {
-                return $var;
-            }
-            $ret .= $var;
-            
-        }
-        $ret .= ")" . $suffix;
-        
-        if ($element->isConditional) {
-            $ret .= ' { ';
-        } else {
-            $ret .= ";";
-        }
-        
-        
-        
-        return $this->appendPhp($ret); 
-        
-         
-
-   }
-   /**
-    *   HTML_Template_Flexy_Token_Processing toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Processing 
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-
-
-    function toStringProcessing($element) 
-    {
-        // if it's XML then quote it..
-        if (strtoupper(substr($element->value, 2, 3)) == 'XML') { 
-            return $this->appendPhp("echo '" . str_replace("'", "\\"."'", $element->value) . "';");
-        }
-        // otherwise it's PHP code - so echo it..
-        return $element->value;
-    }
-    
-    /**
-    *   HTML_Template_Flexy_Token_Text toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Text
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-
-
-
-    function toStringText($element) 
-    {
-        
-        // first get rid of stuff thats not translated etc.
-        // empty strings => output.
-        // comments -> just output
-        // our special tags -> output..
-        
-        if (!strlen(trim($element->value) )) {
-            return $this->appendHtml($element->value);
-        }
-        // dont add comments to translation lists.
-         
-        if (substr($element->value, 0, 4) == '";
-        }
-                
-            
-        
-        
-        
-        
-        // this is where it gets messy
-        // this is very slow - but what the hell 
-        //   - its only done once
-        //   - its alot more readable than a long regext.
-        //   - it doesnt infringe on copyright...
-        switch(true) {
-            case (preg_match('/^config_load\s/', $str)):
-                // convert to $t->TemplateConfigLoad()
-                $args = $this->convertAttributesToKeyVal(substr($str,strpos( $str,' ')));
-                return '{plugin(#smartyConfigLoad#,#'.$args['file'].'#,#'.$args['section'].'#)}';
-            
-            case (preg_match('/^include\s/', $str)):
-                // convert to $t->TemplateConfigLoad()
-                $args = $this->convertAttributesToKeyVal(substr($str,strpos( $str,' ')));
-             
-                return '{plugin(#smartyInclude#,#'.$args['file'].'#)}';
-           
-            case ($str == 'ldelim'):
-                return '{';
-            case ($str == 'rdelim'):
-                return '}';
-                
-                
-            case (preg_match('/^if \$(\S+)$/', $str,$matches)):
-            case (preg_match('/^if \$(\S+)\seq\s""$/', $str,$matches)):
-                // simple if variable..
-                // convert to : {if:sssssss}
-                $this->stack['if']++;
-                $var =  $this->_convertVar('$'.$matches[1]);
-                return '{if:'.substr($var,1);
-                
-            case (preg_match('/^if #(\S+)#$/', $str,$matches)):
-            case (preg_match('/^if #(\S+)#\sne\s""$/', $str,$matches)):
-                // simple if variable..
-                // convert to : {if:sssssss}
-                $this->stack['if']++;
-                $var =  $this->_convertConfigVar('#'.$matches[1].'#');
-                return '{if:'.substr($var,1);
-            
-            // negative matches
-            case (preg_match('/^if\s!\s\$(\S+)$/', $str,$matches)):
-            case (preg_match('/^if \$(\S+)\seq\s""$/', $str,$matches)):
-                // simple if variable..
-                // convert to : {if:sssssss}
-                $this->stack['if']++;
-                $var =  $this->_convertVar('$'.$matches[1]);
-                return '{if:!'.substr($var,1);
-                
-             case ($str == 'else'):
-                if (!$this->stack['if']) {
-                    break;
-                }
-                return '{else:}';
-                
-                
-            case ($str == '/if'):
-                if (!$this->stack['if']) {
-                    break;
-                }
-                $this->stack['if']--;
-                return '{end:}';
-            
-            
-        }
-        
-        return "";
-                
-        
-    
-    
-    }
-    
-    /**
-    * convert a smarty var into a flexy one.
-    *
-    * @param   string       the inside of the smart tag
-    *
-    * @return   string      a flexy version of it.
-    * @access   private
-    */
-  
-    function _convertVar($str) 
-    {
-        // look for modfiers first.
-        $mods = explode('|', $str);
-        $var = array_shift($mods);
-        $var = substr($var,1); // strip $
-        
-        // various formats :
-        // aaaa.bbbb.cccc => aaaa[bbbb][cccc]
-        // aaaa[bbbb] => aaa[bbbb]
-        // aaaa->bbbb => aaaa.bbbb
-        
-        $bits = explode('.',$var);
-        $var = array_shift($bits);
-        foreach($bits as $k) {
-            $var.= '['.$k .']';
-        }
-        $bits = explode('->',$var);
-        $var = implode('.',$bits);
-        $mods = implode('|',$mods);
-        
-        if (strlen($mods)) {
-            return '{plugin(#smartyModifiers#,'.$var.',#'.$mods.'#):h}';
-        }
-        return '{'.$var .'}' . $mods;
-    }
-    /**
-    * convert a smarty key="value" string into a key value array
-    * cheap and cheerfull - doesnt handle spaces inside the strings...
-    *
-    * @param   string       the key value part of the tag..
-    *
-    * @return   array      key value array
-    * @access   private
-    */
-    function convertAttributesToKeyVal($str) 
-    {
-        $atts = explode(' ', $str);
-        $ret = array();
-        foreach($atts as $bit) {
-            $bits = explode('=',$bit);
-            // loose stuff!!!
-            if (count($bits) != 2) {
-                continue;
-            }
-            $ret[$bits[0]] = ($bits[1]{0} == '"') ? substr($bits[1],1,-1) : $bits[1]; 
-        }
-        return $ret;
-    }
-     /**
-    * convert a smarty config var into a flexy one.
-    *
-    * @param   string       the inside of the smart tag
-    *
-    * @return   string      a flexy version of it.
-    * @access   private
-    */
-  
-    function _convertConfigVar($str) 
-    {
-        $mods = explode('|', $str);
-        $var = array_shift($mods);
-        $var = substr($var,1,-1); // strip #'s
-        $mods = implode('|',$mods);
-        if (strlen($mods)) {
-            $mods = "";
-        }
-        return '{configVars.'.$var .'}' . $mods;
-    }
-}
diff --git a/HTML/Template/Flexy/Compiler/Standard.php b/HTML/Template/Flexy/Compiler/Standard.php
deleted file mode 100644
index 8a48c44..0000000
--- a/HTML/Template/Flexy/Compiler/Standard.php
+++ /dev/null
@@ -1,910 +0,0 @@
-                            |
-// +----------------------------------------------------------------------+
-//
-// $Id: Standard.php,v 1.43 2005/02/08 05:35:27 alan_k Exp $
-//
-//  Base Compiler Class
-//  Standard 'Original Flavour' Flexy compiler
-
-/*------------------------------------------------------------------------------------------
-                                        NOTICE: 
-                             THIS COMPILER IS DEPRECIATED 
-                                USE THE FLEXY COMPILER 
-     
-                      The Flexy Compiler should be Compatible
-
-------------------------------------------------------------------------------------------*/
-
-require_once 'HTML/Template/Flexy/Tokenizer.php';
-require_once 'HTML/Template/Flexy/Token.php';
-
-// cache for po files..
-$GLOBALS['_html_template_flexy_compiler_standard']['PO'] = array();
-
-
-class HTML_Template_Flexy_Compiler_Standard extends HTML_Template_Flexy_Compiler 
-{
-    
-    
-    
-    /**
-    * The compile method.
-    * 
-    * @params   object HTML_Template_Flexy
-    * @params   string|false string to compile of false to use a file.
-    * @return   string   filename of template
-    * @access   public
-    */
-    function compile(&$flexy,$string=false) 
-    {
-        // read the entire file into one variable
-        
-        // note this should be moved to new HTML_Template_Flexy_Token
-        // and that can then manage all the tokens in one place..
-        global $_HTML_TEMPLATE_FLEXY_COMPILER;
-        
-        $gettextStrings = &$_HTML_TEMPLATE_FLEXY_COMPILER['gettextStrings'];
-        $gettextStrings = array(); // reset it.
-        
-        if (@$this->options['debug']) {
-            echo "compiling template $flexy->currentTemplate
";
-            
-        }
-         
-        // reset the elements.
-        $flexy->_elements = array();
-        
-        // replace this with a singleton??
-        
-        $GLOBALS['_HTML_TEMPLATE_FLEXY']['currentOptions'] = $this->options;
-        $GLOBALS['_HTML_TEMPLATE_FLEXY']['elements'] = array();
-        $GLOBALS['_HTML_TEMPLATE_FLEXY']['filename'] = $flexy->currentTemplate;
-        $GLOBALS['_HTML_TEMPLATE_FLEXY']['prefixOutput']  = '';
-        $GLOBALS['_HTML_TEMPLATE_FLEXY']['compiledTemplate']  = $flexy->compiledTemplate;
-        
-        if (is_array($this->options['Translation2'])) {
-            require_once 'Translation2.php';
-            $this->options['Translation2'] = new Translation2(
-                $this->options['Translation2']['driver'],
-                @$this->options['Translation2']['options']
-            );
-        }
-        
-        
-        if (is_a($this->options['Translation2'],'Translation2')) {
-            $this->options['Translation2']->setLang($this->options['locale']);
-            // fixme - needs to be more specific to which template to use..
-            foreach ($this->options['templateDir'] as $tt) {
-                $n = basename($flexy->currentTemplate);
-                if (substr($flexy->currentTemplate,0,strlen($tt)) == $tt) {
-                    $n = substr($flexy->currentTemplate,strlen($tt)+1);
-                }
-                //echo $n;
-            }
-            $this->options['Translation2']->setPageID($n);
-        } else {
-            setlocale(LC_ALL, $this->options['locale']);
-        }
-        
-        
-        
-        
-        
-        
-        
-        $data = $string;
-        $res = false;
-        if ($string === false) {
-            $data = file_get_contents($flexy->currentTemplate);
-        }
-         
-            // PRE PROCESS {_(.....)} translation markers.
-        $got_gettext_markup = false;
-        
-        
-        
-        if (strpos($data,'{_(') !== false) {
-            $matches = array();
-            $lmatches = explode ('{_(', $data);
-            array_shift($lmatches);
-            // shift the first..
-            foreach ($lmatches as $k) {
-                if (false === strpos($k,')_}')) {
-                    continue;
-                }
-                $x = explode(')_}',$k);
-                $matches[] = $x[0];
-            }
-        
-        
-           //echo '
';print_r($matches);
-            // we may need to do some house cleaning here...
-            $gettextStrings = $matches;
-            $got_gettext_markup = true;
-            
-            
-            // replace them now..  
-            // ** leaving in the tag (which should be ignored by the parser..
-            // we then get rid of the tags during the toString method in this class.
-            foreach($matches as $v) {
-                $data = str_replace('{_('.$v.')_}', '{_('.$this->translateString($v).')_}',$data);
-            }
-            
-        }
-            
-        if (isset($_HTML_TEMPLATE_FLEXY_COMPILER['cache'][md5($data)])) {
-            $res = $_HTML_TEMPLATE_FLEXY_COMPILER['cache'][md5($data)];
-        } else {
-        
-             
-            $tokenizer = new HTML_Template_Flexy_Tokenizer($data);
-            $tokenizer->fileName = $flexy->currentTemplate;
-            
-            
-            //$tokenizer->debug=1;
-            $tokenizer->options['ignore_html'] = $this->options['nonHTML'];
-            $tokenizer->options['ignore_php']  = !$this->options['allowPHP'];
-            
-            $res = HTML_Template_Flexy_Token::buildTokens($tokenizer);
-         
-            $_HTML_TEMPLATE_FLEXY_COMPILER['cache'][md5($data)] = $res;
-            
-        }
-        
-        if (is_a($res,'PEAR_Error')) {
-            return $res;
-        }   
-        // turn tokens into Template..
-        
-        $data = $res->compile($this);
-        
-        if (is_a($data,'PEAR_Error')) {
-            return $data;
-        }
-        
-        $data = $GLOBALS['_HTML_TEMPLATE_FLEXY']['prefixOutput'] . $data;
-        
-        if (   @$this->options['debug']) {
-            echo "Result: 
".htmlspecialchars($data)."

";
-            
-        }
-
-        if ($this->options['nonHTML']) {
-           $data =  str_replace("?>\n","?>\n\n",$data);
-        }
-        
-         
-        
-        
-        // at this point we are into writing stuff...
-        if ($this->options['compileToString']) {
-            $flexy->elements =  $GLOBALS['_HTML_TEMPLATE_FLEXY']['elements'];
-            return $data;
-        }
-        
-        
-        
-        
-        // error checking?
-        $file  = $flexy->compiledTemplate;
-        if (isset($flexy->options['output.block'])) {
-            list($file,$part) = explode('#',$file  );
-        }
-        
-        if( ($cfp = fopen( $file , 'w' )) ) {
-            if (@$this->options['debug']) {
-                echo "Writing: ".htmlspecialchars($data)."
";
-                
-            }
-            fwrite($cfp,$data);
-            fclose($cfp);
-            
-            chmod($file,0775);
-            // make the timestamp of the two items match.
-            clearstatcache();
-            touch($file, filemtime($flexy->currentTemplate));
-            if ($file != $flexy->compiledTemplate) {
-                chmod($flexy->compiledTemplate,0775);
-                // make the timestamp of the two items match.
-                clearstatcache();
-                touch($flexy->compiledTemplate, filemtime($flexy->currentTemplate));
-            }
-             
-            
-        } else {
-            return HTML_Template_Flexy::raiseError('HTML_Template_Flexy::failed to write to '.$flexy->compiledTemplate,
-                HTML_TEMPLATE_FLEXY_ERROR_FILE ,HTML_TEMPLATE_FLEXY_ERROR_RETURN);
-        }
-        // gettext strings
-        if (file_exists($flexy->getTextStringsFile)) {
-            unlink($flexy->getTextStringsFile);
-        }
-        
-        if($gettextStrings && ($cfp = fopen( $flexy->getTextStringsFile, 'w') ) ) {
-            
-            fwrite($cfp,serialize(array_unique($gettextStrings)));
-            fclose($cfp);
-        }
-        
-        // elements
-        if (file_exists($flexy->elementsFile)) {
-            unlink($flexy->elementsFile);
-        }
-        
-        if( $GLOBALS['_HTML_TEMPLATE_FLEXY']['elements'] &&
-            ($cfp = fopen( $flexy->elementsFile, 'w') ) ) {
-            fwrite($cfp,serialize( $GLOBALS['_HTML_TEMPLATE_FLEXY']['elements']));
-            fclose($cfp);
-            // now clear it.
-        
-        }
-        
-        return true;
-    }
-    
-    /**
-    * Flag indicating compiler is inside {_( .... )_} block, and should not
-    * add to the gettextstrings array.
-    *
-    * @var boolean 
-    * @access public
-    */
-    var $inGetTextBlock = false;
-    
-    /**
-    * This is the base toString Method, it relays into toString{TokenName}
-    *
-    * @param    object    HTML_Template_Flexy_Token_*
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-
-    function toString($element) 
-    {
-        static $len = 26; // strlen('HTML_Template_Flexy_Token_');
-        if ($this->options['debug']) {
-            $x = $element;
-            unset($x->children);
-            echo htmlspecialchars(print_r($x,true))."
\n";
-        }
-        if ($element->token == 'GetTextStart') {
-            $this->inGetTextBlock = true;
-            return '';
-        }
-        if ($element->token == 'GetTextEnd') {
-            $this->inGetTextBlock = false;
-            return '';
-        }
-        
-            
-        $class = get_class($element);
-        if (strlen($class) >= $len) {
-            $type = substr($class,$len);
-            return $this->{'toString'.$type}($element);
-        }
-        
-        $ret = $element->value;
-        $add = $element->compileChildren($this);
-        if (is_a($add,'PEAR_Error')) {
-            return $add;
-        }
-        $ret .= $add;
-        
-        if ($element->close) {
-            $add = $element->close->compile($this);
-            if (is_a($add,'PEAR_Error')) {
-                return $add;
-            }
-            $ret .= $add;
-        }
-        
-        return $ret;
-    }
-
-
-    /**
-    *   HTML_Template_Flexy_Token_Else toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Else
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-
-    function toStringElse($element) 
-     {
-        // pushpull states to make sure we are in an area.. - should really check to see 
-        // if the state it is pulling is a if...
-        if ($element->pullState() === false) {
-            return $this->appendHTML(
-                "Unmatched {else:} on line: {$element->line}"
-                );
-        }
-        $element->pushState();
-        return $this->appendPhp("} else {");
-    }
-    
-    /**
-    *   HTML_Template_Flexy_Token_End toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Else
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-    function toStringEnd($element) 
-    {
-        // pushpull states to make sure we are in an area.. - should really check to see 
-        // if the state it is pulling is a if...
-        if ($element->pullState() === false) {
-            return $this->appendHTML(
-                "Unmatched {end:} on line: {$element->line}"
-                );
-        }
-         
-        return $this->appendPhp("}");
-    }
-
-    /**
-    *   HTML_Template_Flexy_Token_EndTag toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_EndTag
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-
-
-    function toStringEndTag($element) 
-    {
-        return $this->toStringTag($element);
-    }
-        
-    
-    
-    /**
-    *   HTML_Template_Flexy_Token_Foreach toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Foreach 
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-    
-    function toStringForeach($element) 
-    {
-    
-        $loopon = $element->toVar($element->loopOn);
-        if (is_a($loopon,'PEAR_Error')) {
-            return $loopon;
-        }
-        
-        $ret = 'if ($this->options[\'strict\'] || ('.
-            'is_array('. $loopon. ')  || ' .
-            'is_object(' . $loopon  . '))) ' .
-            'foreach(' . $loopon  . " ";
-            
-        $ret .= "as \${$element->key}";
-        
-        if ($element->value) {
-            $ret .=  " => \${$element->value}";
-        }
-        $ret .= ") {";
-        
-        $element->pushState();
-        $element->pushVar($element->key);
-        $element->pushVar($element->value);
-        return $this->appendPhp($ret);
-    }
-    /**
-    *   HTML_Template_Flexy_Token_If toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_If
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-    function toStringIf($element) 
-    {
-        
-        $var = $element->toVar($element->condition);
-        if (is_a($var,'PEAR_Error')) {
-            return $var;
-        }
-        
-        $ret = "if (".$element->isNegative . $var .")  {";
-        $element->pushState();
-        return $this->appendPhp($ret);
-    }
-
-   /**
-    *  get Modifier Wrapper 
-    *
-    * converts :h, :u, :r , .....
-    * @param    object    HTML_Template_Flexy_Token_Method|Var
-    * 
-    * @return   array prefix,suffix
-    * @access   public 
-    * @see      toString*
-    */
-
-    function getModifierWrapper($element) 
-    {
-        $prefix = 'echo ';
-        
-        $suffix = '';
-        $modifier = strlen(trim($element->modifier)) ? $element->modifier : ' ';
-        
-        switch ($modifier{0}) {
-            case 'h':
-                break;
-            case 'u':
-                $prefix = 'echo urlencode(';
-                $suffix = ')';
-                break;
-            case 'r':
-                $prefix = 'echo \'
\'; echo htmlspecialchars(print_r(';
-                $suffix = ',true)); echo \'
\';';
-                break;                
-            case 'n': 
-                // blank or value..
-                $numberformat = @$GLOBALS['_HTML_TEMPLATE_FLEXY']['currentOptions']['numberFormat'];
-                $prefix = 'echo number_format(';
-                $suffix = $GLOBALS['_HTML_TEMPLATE_FLEXY']['currentOptions']['numberFormat'] . ')';
-                break;
-            case 'b': // nl2br + htmlspecialchars
-                $prefix = 'echo nl2br(htmlspecialchars(';
-                
-                // add language ?
-                $suffix = '))';
-                break;
-            case ' ':
-                $prefix = 'echo htmlspecialchars(';
-                // add language ?
-                $suffix = ')';
-                break;
-            default:
-               $prefix = 'echo $this->plugin("'.trim($element->modifier) .'",';
-               $suffix = ')'; 
-            
-            
-        }
-        
-        return array($prefix,$suffix);
-    }
-
-
-
-  /**
-    *   HTML_Template_Flexy_Token_Var toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Method
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-    function toStringVar($element) 
-    {
-        // ignore modifier at present!!
-        
-        $var = $element->toVar($element->value);
-        if (is_a($var,'PEAR_Error')) {
-            return $var;
-        }
-        list($prefix,$suffix) = $this->getModifierWrapper($element);
-        return $this->appendPhp( $prefix . $var . $suffix .';');
-    }
-   /**
-    *   HTML_Template_Flexy_Token_Method toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Method
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-  
-    function toStringMethod($element) 
-    {
-
-              
-        // set up the modifier at present!!
-        list($prefix,$suffix) = $this->getModifierWrapper($element);
-        
-        // add the '!' to if
-        
-        if ($element->isConditional) {
-            $prefix = 'if ('.$element->isNegative;
-            $element->pushState();
-            $suffix = ')';
-        }  
-        
-        
-        // check that method exists..
-        // if (method_exists($object,'method');
-        $bits = explode('.',$element->method);
-        $method = array_pop($bits);
-        
-        $object = implode('.',$bits);
-        
-        $var = $element->toVar($object);
-        if (is_a($var,'PEAR_Error')) {
-            return $var;
-        }
-        
-        if (($object == 'GLOBALS') && 
-            $GLOBALS['_HTML_TEMPLATE_FLEXY']['currentOptions']['globalfunctions']) {
-            // we should check if they something weird like: GLOBALS.xxxx[sdf](....)
-            $var = $method;
-        } else {
-            $prefix = 'if ($this->options[\'strict\'] || (isset('.$var.
-                ') && method_exists('.$var .",'{$method}'))) " . $prefix;
-            $var = $element->toVar($element->method);
-        }
-        
-
-        if (is_a($var,'PEAR_Error')) {
-            return $var;
-        }
-        
-        $ret  =  $prefix;
-        $ret .=  $var . "(";
-        $s =0;
-         
-       
-         
-        foreach($element->args as $a) {
-             
-            if ($s) {
-                $ret .= ",";
-            }
-            $s =1;
-            if ($a{0} == '#') {
-                $ret .= '"'. addslashes(substr($a,1,-1)) . '"';
-                continue;
-            }
-            
-            $var = $element->toVar($a);
-            if (is_a($var,'PEAR_Error')) {
-                return $var;
-            }
-            $ret .= $var;
-            
-        }
-        $ret .= ")" . $suffix;
-        
-        if ($element->isConditional) {
-            $ret .= ' { ';
-        } else {
-            $ret .= ";";
-        }
-        
-        
-        
-        return $this->appendPhp($ret); 
-        
-         
-
-   }
-   /**
-    *   HTML_Template_Flexy_Token_Processing toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Processing 
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-
-
-    function toStringProcessing($element) 
-    {
-        // if it's XML then quote it..
-        if (strtoupper(substr($element->value,2,3)) == 'XML') { 
-            return $this->appendPhp("echo '" . str_replace("'","\\"."'", $element->value) . "';");
-        }
-        // otherwise it's PHP code - so echo it..
-        return $element->value;
-    }
-    
-    /**
-    *   HTML_Template_Flexy_Token_Text toString 
-    *
-    * @param    object    HTML_Template_Flexy_Token_Text
-    * 
-    * @return   string     string to build a template
-    * @access   public 
-    * @see      toString*
-    */
-
-
-
-    function toStringText($element) 
-    {
-        
-        // first get rid of stuff thats not translated etc.
-        // empty strings => output.
-        // comments -> just output
-        // our special tags -> output..
-        
-        if (!strlen(trim($element->value) )) {
-            return $this->appendHtml($element->value);
-        }
-        // dont add comments to translation lists.
-         
-        if (substr($element->value,0,4) == '   -- comment */   
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 66:
-{
-	// inside comment -- without a >
-	return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 67:
-{   
-    $this->value = $this->createToken('Comment',
-        '   -- comment */   
-    $this->value = $this->createToken('DSComment');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 84:
-{   
-    $this->value = $this->createToken('DSEnd');
-    $this->yybegin(YYINITIAL); 
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK; 
-}
-case 85:
-{     
-    /* anything inside of php tags */
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 86:
-{ 
-    /* php end */
-    $this->value = $this->createToken('Php',
-        substr($this->yy_buffer,$this->yyPhpBegin ,$this->yy_buffer_end - $this->yyPhpBegin ),
-        $this->yyline,$this->yyPhpBegin);
-    $this->yybegin(YYINITIAL);
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 87:
-{
-    // inside a style comment (not - or not --
-    //    -- comment */   
-    $this->value = $this->createToken('Comment');
-	return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 88:
-{
-    // we allow anything inside of comstyle!!!
-    $this->value = $this->createToken('Comment');
-	return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 89:
-{
-	// inside style comment -- without a >
-    $this->value = $this->createToken('Comment');
-	return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 90:
-{   
-    // --> inside a style tag.
-    $this->value = $this->createToken('Comment');
-    $this->yybegin(YYINITIAL); 
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK; 
-}
-case 91:
-{
-    // var in commented out style bit..
-    $t =  $this->yytext();
-    $t = substr($t,1,-1);
-    $this->value = $this->createToken('Var', $t);
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 93:
-{
-    return $this->raiseError("unexpected something: (".$this->yytext() .") character: 0x" . dechex(ord($this->yytext())));
-}
-case 94:
-{
-    //abcd -- data characters  
-    // { and ) added for flexy
-    $this->value = $this->createToken('Text');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 95:
-{
-    // &abc;
-    $this->value = $this->createToken('Text');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 96:
-{
-    //options['ignore_html']) {
-        return $this->returnSimple();
-    }
-    $this->tagName = trim(substr($this->yytext(),1));
-    $this->tokenName = 'Tag';
-    $this->value = '';
-    $this->attributes = array();
-    $this->yybegin(IN_ATTR);
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 97:
-{ 
-    /* yyPhpBegin = $this->yy_buffer_start;
-    $this->yybegin(IN_PHP);
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 98:
-{
-    // {
-    $this->value = $this->createToken('Text');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 99:
-{
-    // &#abc;
-    $this->value = $this->createToken('Text');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 100:
-{
-    /*  -- end tag */
-    if ($this->options['ignore_html']) {
-        return $this->returnSimple();
-    }
-    if ($this->inStyle) {
-        $this->inStyle = false;
-    }
-    $this->tagName = trim(substr($this->yytext(),1));
-    $this->tokenName = 'EndTag';
-    $this->yybegin(IN_ENDTAG);
-    $this->value = '';
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 101:
-{
-    /* options['ignore_html']) {
-        return $this->returnSimple();
-    }
-    $this->value = $this->createToken('Doctype');
-    $this->yybegin(IN_MD);
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 102:
-{
-    /* returnSimple();
-}
-case 103:
-{ 
-    /* eg. yytext();
-    $tagname = trim(strtoupper(substr($t,2)));
-   // echo "STARTING XML? $t:$tagname\n";
-    if ($tagname == 'PHP') {
-        $this->yyPhpBegin = $this->yy_buffer_start;
-        $this->yybegin(IN_PHP);
-        return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-    }
-    // not php - it's xlm or something...
-    // we treat this like a tag???
-    // we are going to have to escape it eventually...!!!
-    $this->tagName = trim(substr($t,1));
-    $this->tokenName = 'Tag';
-    $this->value = '';
-    $this->attributes = array();
-    $this->yybegin(IN_ATTR);
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 104:
-{
-    $this->attrVal[] = $this->yytext();
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 105:
-{
-    $this->value = '';
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 106:
-{
-    //  -- unclosed start tag */
-    return $this->raiseError("Unclosed tags not supported"); 
-}
-case 107:
-{
-    //  the ismap */
-    $this->attributes[trim($this->yytext())] = true;
-    $this->value = '';
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 108:
-{
-    //  -- unquoted literal HACK */                          
-    $this->attributes[$this->attrKey] = trim($this->yytext());
-    $this->yybegin(IN_ATTR);
-    //   $this->raiseError("attribute value needs quotes");
-    $this->value = '';
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 109:
-{
-    //  -- number token */
-    $this->attributes[$this->attrKey] = trim($this->yytext());
-    $this->yybegin(IN_ATTR);
-    $this->value = '';
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 110:
-{
-    //echo "GOT DATA:".$this->yytext();
-    $this->attrVal[] = $this->yytext();
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 111:
-{ 
-    $this->value = $this->createToken('WhiteSpace');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK; 
-}
-case 112:
-{
-    return $this->raiseError("illegal character in markup declaration (0x".dechex(ord($this->yytext())).')');
-}
-case 113:
-{   
-    $this->value = $this->createToken('Number');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK; 
-}
-case 114:
-{ 
-    $this->value = $this->createToken('Name');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK; 
-}
-case 115:
-{ 
-    $this->value = $this->createToken('NameT');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK; 
-}
-case 116:
-{ 
-    $this->value = $this->createToken('NumberT');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK; 
-}
-case 117:
-{
-    //  -- parameter entity reference */
-    $this->value = $this->createToken('EntityRef');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 118:
-{ 
-    $this->value = $this->createToken('Literal');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK; 
-}
-case 119:
-{
-    // inside a comment (not - or not --
-    //    -- comment */   
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 120:
-{
-	// inside comment -- without a >
-	return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 121:
-{
-    $t = $this->yytext();
-    if ($t{strlen($t)-1} == ",") {
-        // add argument
-        $this->flexyArgs[] = substr($t,0,-1);
-        return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-    }
-    $this->flexyArgs[] = $t;
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 122:
-{
-    $t = $this->yytext();
-    // add argument
-    $this->flexyArgs[] = $t;
-    $this->yybegin(IN_FLEXYMETHODQUOTED_END);
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 123:
-{
-    // general text in script..
-    $this->value = $this->createToken('Text');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 124:
-{ 
-    $this->value = $this->createToken('Cdata',$this->yytext(), $this->yyline);
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 125:
-{
-    // inside a comment (not - or not --
-    //    -- comment */   
-    $this->value = $this->createToken('DSComment');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 126:
-{     
-    /* anything inside of php tags */
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 127:
-{
-    // inside a style comment (not - or not --
-    //    -- comment */   
-    $this->value = $this->createToken('Comment');
-	return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 128:
-{
-    // we allow anything inside of comstyle!!!
-    $this->value = $this->createToken('Comment');
-	return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 129:
-{
-	// inside style comment -- without a >
-    $this->value = $this->createToken('Comment');
-	return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 131:
-{
-    return $this->raiseError("unexpected something: (".$this->yytext() .") character: 0x" . dechex(ord($this->yytext())));
-}
-case 132:
-{
-    //abcd -- data characters  
-    // { and ) added for flexy
-    $this->value = $this->createToken('Text');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 133:
-{
-    $this->attrVal[] = $this->yytext();
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 134:
-{
-    $this->value = '';
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 135:
-{
-    //  -- number token */
-    $this->attributes[$this->attrKey] = trim($this->yytext());
-    $this->yybegin(IN_ATTR);
-    $this->value = '';
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 136:
-{
-    //echo "GOT DATA:".$this->yytext();
-    $this->attrVal[] = $this->yytext();
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 137:
-{
-    return $this->raiseError("illegal character in markup declaration (0x".dechex(ord($this->yytext())).')');
-}
-case 138:
-{ 
-    $this->value = $this->createToken('Cdata',$this->yytext(), $this->yyline);
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 139:
-{     
-    /* anything inside of php tags */
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 140:
-{
-    // inside a style comment (not - or not --
-    //    -- comment */   
-    $this->value = $this->createToken('Comment');
-	return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 141:
-{
-    // we allow anything inside of comstyle!!!
-    $this->value = $this->createToken('Comment');
-	return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 143:
-{
-    return $this->raiseError("unexpected something: (".$this->yytext() .") character: 0x" . dechex(ord($this->yytext())));
-}
-case 144:
-{
-    //abcd -- data characters  
-    // { and ) added for flexy
-    $this->value = $this->createToken('Text');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 145:
-{
-    $this->attrVal[] = $this->yytext();
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 146:
-{
-    //echo "GOT DATA:".$this->yytext();
-    $this->attrVal[] = $this->yytext();
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 147:
-{
-    return $this->raiseError("illegal character in markup declaration (0x".dechex(ord($this->yytext())).')');
-}
-case 148:
-{ 
-    $this->value = $this->createToken('Cdata',$this->yytext(), $this->yyline);
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 150:
-{
-    return $this->raiseError("unexpected something: (".$this->yytext() .") character: 0x" . dechex(ord($this->yytext())));
-}
-case 151:
-{
-    return $this->raiseError("illegal character in markup declaration (0x".dechex(ord($this->yytext())).')');
-}
-case 153:
-{
-    return $this->raiseError("unexpected something: (".$this->yytext() .") character: 0x" . dechex(ord($this->yytext())));
-}
-case 155:
-{
-    return $this->raiseError("unexpected something: (".$this->yytext() .") character: 0x" . dechex(ord($this->yytext())));
-}
-case 157:
-{
-    return $this->raiseError("unexpected something: (".$this->yytext() .") character: 0x" . dechex(ord($this->yytext())));
-}
-case 159:
-{
-    return $this->raiseError("unexpected something: (".$this->yytext() .") character: 0x" . dechex(ord($this->yytext())));
-}
-case 161:
-{
-    return $this->raiseError("unexpected something: (".$this->yytext() .") character: 0x" . dechex(ord($this->yytext())));
-}
-case 163:
-{
-    return $this->raiseError("unexpected something: (".$this->yytext() .") character: 0x" . dechex(ord($this->yytext())));
-}
-case 165:
-{
-    return $this->raiseError("unexpected something: (".$this->yytext() .") character: 0x" . dechex(ord($this->yytext())));
-}
-case 167:
-{
-    return $this->raiseError("unexpected something: (".$this->yytext() .") character: 0x" . dechex(ord($this->yytext())));
-}
-case 347:
-{
-    //abcd -- data characters  
-    // { and ) added for flexy
-    $this->value = $this->createToken('Text');
-    return HTML_TEMPLATE_FLEXY_TOKEN_OK;
-}
-case 348:
-{
-    //  -- number token */
-    $this->attributes[$this->attrKey] = trim($this->yytext());
-    $this->yybegin(IN_ATTR);
-    $this->value = '';
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 349:
-{
-    $t = $this->yytext();
-    // add argument
-    $this->flexyArgs[] = $t;
-    $this->yybegin(IN_FLEXYMETHODQUOTED_END);
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-case 350:
-{
-    $t = $this->yytext();
-    // add argument
-    $this->flexyArgs[] = $t;
-    $this->yybegin(IN_FLEXYMETHODQUOTED_END);
-    return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-}
-
-                        }
-                    }
-                    $yy_initial = true;
-                    $yy_state = $this->yy_state_dtrans[$this->yy_lexical_state];
-                    $yy_next_state = YY_NO_STATE;
-                    $yy_last_accept_state = YY_NO_STATE;
-                    $this->yy_mark_start();
-                    $yy_this_accept = $this->yy_acpt[$yy_state];
-                    if (YY_NOT_ACCEPT != $yy_this_accept) {
-                        $yy_last_accept_state = $yy_state;
-                        $this->yy_buffer_end = $this->yy_buffer_index;
-                    }
-                }
-            }
-        }
-        return HTML_TEMPLATE_FLEXY_TOKEN_NONE;
-    }
-}
diff --git a/HTML/Template/Flexy/Translator.php b/HTML/Template/Flexy/Translator.php
deleted file mode 100644
index c1f4e76..0000000
--- a/HTML/Template/Flexy/Translator.php
+++ /dev/null
@@ -1,472 +0,0 @@
-                                  |
-// +----------------------------------------------------------------------+
-//
-// $Id: Translator.php,v 1.8 2006/01/09 03:05:01 alan_k Exp $
-//
-//  Controller Type Class providing translation faciliites
-//
-   
-/*
-
-usage : 
-
-$t = new HTML_Template_Flexy_Translator(array(
-    'baseLang'      => 'en',
-    'targetLangs'   => array('es','fr','zh'),
-    'appURL'       => '/admin/translate.php',
-
-));
-$t->process(isset($_GET ? $_GET : array(),isset($_POST ? $_POST : array()); // read data.. etc.
-// you can replace this pretty easily with your own templates..
-$t->outputDefautTemplate();
-
-*/
-
-class HTML_Template_Flexy_Translator {
-    
-    /**
-    * Options for Translator tool.
-    *
-    * @var array
-    * @access public 
-    */
-    var $options = array(
-        'baseLang'          => 'en',            // the language the templates are in.
-        'targetLangs'       => array('fr'),     // the language the templates are being translated to.
-        'templateDir'       => '',              // these are read from global config if not set.
-        'compileDir'        => '',        
-        'url_rewrite'       => '',              // for image rewriting.. -- needs better thinking through!
-        'appURL'            => '',              // url to translation too : eg. /admin/translator.php
-        'Translation2'      => array(
-                                'driver' => 'dataobjectsimple', 
-                                'options' => 'translations'
-                            ),
-
-    );
-    /**
-    * app URL (copied from above)
-    *
-    * @var string
-    * @access public 
-    */
-    var $appURL;
-    var $languages = array();
-    /**
-    * Array of templates and the words found in each one.
-    *
-    * @var array
-    * @access public 
-    */
-    var $words= array();   
-    /**
-    * Array of objects with name, md5's, has it been set, the translation etc.
-    *
-    * @var array
-    * @access public 
-    */
-    var $status = array();
-    /**
-    * The current language
-    *
-    * @var array
-    * @access public 
-    */
-    var $translate = ''; // language being displayed /edited.
-    
-    
-    /**
-    * constructor
-    *
-    * Just set options (no checking done)
-    * 
-    * 
-    * @param   array   see options array in file.
-    * @return   none
-    * @access   public
-    */
-  
-    function HTML_Template_Flexy_Translator($options= array()) {
-        foreach($options as $k=>$v) {
-            $this->options[$k]  = $v;
-        }
-        if (!in_array($this->options['baseLang'], $this->options['targetLangs'])) {
-            $this->options['targetLangs'][] = $this->options['baseLang'];
-        }
-        $o = PEAR::getStaticProperty('HTML_Template_Flexy','options');
-        if (!strlen($this->options['templateDir'])) {
-            $this->options['templateDir'] = $o['templateDir'];
-        }
-        if (!strlen($this->options['compileDir'])) {
-            $this->options['compileDir'] = $o['compileDir'];
-        }
-        if (!strlen($this->options['url_rewrite'])) {
-            $this->options['url_rewrite'] = $o['url_rewrite'];
-        }
-        if (empty($this->options['Translation2'])) {
-            $this->options['Translation2'] = $o['Translation2'];
-        }
-        $this->appURL = $this->options['appURL'];
-        $this->languages = $this->options['targetLangs'];
-    }
-    
-    
-    /**
-    * process the input 
-    *
-    * 
-    * @param   array   $_GET; (translate = en)
-    * @param   array   $_POST; (translate = en, en[{md5}] = translation)
-    
-    * @return   none
-    * @access   public
-    */
-    
-    
-    function process($get,$post) {
-        //DB_DataObject::debugLevel(1);
-        
-        $displayLang = isset($get['translate']) ? $get['translate'] : 
-            (isset($post['translate']) ? $post['translate'] : false);
-            
-        if ($displayLang === false) {          
-            return;
-        }
-        require_once 'Translation2/Admin.php';
-          
-        $driver = $this->options['Translation2']['driver'];
-        $options = $this->options['Translation2']['options'];
-        $usingGT = ($driver == 'gettext');
-        $usingDO = ($driver == 'dataobjectsimple');
-        $trd = &Translation2_Admin::factory($driver, $options);
-        
-        
-        
-        //$trd->setDecoratedLang('en');
-        foreach($this->options['targetLangs'] as $l) {
-            $trd->addLang(array(
-                'lang_id' => $l
-            ));
-        }
-        
-        // back to parent if no language selected..
-        
-        if (!in_array($displayLang, $this->options['targetLangs'] )) {
-            require_once 'PEAR.php';
-            return PEAR::raiseError('Unknown Language :' .$displayLang);
-        }
-        
-        $this->translate = $displayLang;
-        
-        
-        if (isset($post['_apply'])) {
-            $this->clearTemplateCache($displayLang);
-             
-        }
-        $t = explode(' ',microtime()); $start= $t[0] + $t[1];
-     
-        require_once 'Translation2.php';
-        $tr = &Translation2::factory($driver, $options);
-        $tr->setLang($displayLang);
-        
-        if (!$usingDO) {
-            $suggestions = &Translation2::factory($driver, $options);
-            $suggestions->setLang($displayLang);
-        }
-        
-        $this->compileAll();
-        
-        //$tr->setPageID('test.html');
-        // delete them after we have compiled them!!
-        if (isset($post['_apply'])) {
-            $this->clearTemplateCache($displayLang);
-        }
-        //DB_DataObject::debugLevel(1);
-        $this->loadTranslations();
-        $this->loadTranslations($displayLang);
-        if ($usingDO) {
-            $this->loadTranslations();
-            $this->loadTranslations($displayLang);
-        }
-        
-        $all = array();
-        
-        if ($usingGT) {
-            $trd->storage->begin();
-        }
-        $displayLangClean = str_replace('.', '_', $displayLang);
-                 
-        foreach($this->words as $page=>$words) {
-            $status[$page] = array();
-            $tr->setPageID($page);
-            // pages....
-            if (isset($post['_clear']) && !PEAR::isError($p = $trd->getPage($page, $displayLang))) {
-                $diff = array_diff(array_keys($p), $words);
-                if (count($diff)) {
-                    foreach ($diff as $string) {
-                        $trd->remove($string, $page);
-                    }
-                }
-            }
-
-            foreach ($words as $word) {
-            
-                if (!strlen(trim($word))) { 
-                    continue;
-                }
-                
-                $md5 = md5($page.':'.$word);
-                
-                $value = $usingDO ? $this->getTranslation($page,$word,$displayLang) : $tr->get($word);
-                
-                // we posted something..
-                if (isset($post[$displayLangClean][$md5])) {
-                    // eak we shouldnt really deal with magic_quotes!!!
-                    $nval = str_replace("\r\n", "\n", get_magic_quotes_gpc() ? stripslashes($post[$_displayLang][$md5]) : $post[$_displayLang][$md5]);
-                    
-                    if ($value != $nval) {
-                        $trd->add($word,$page,array($displayLang=>$nval));
-                        $value = $nval;
-                    }
-                }
-                
-                if ($value == '') {
-                    // try the old gettext...
-                    if (isset($old[addslashes($word)])) {
-                        $trd->add($word,$page,array($displayLang=>$old[addslashes($word)]));
-                        $value = $old[addslashes($word)];
-                    }
-                
-                
-                }
-                
-                $add = new StdClass;
-                 
-                $add->from = $word;
-                $add->to   = $value;
-                if (!$add->to || ($add->from == $add->to)) {
-                    $add->untranslated = true;
-                    
-                    if ($usingDO) {
-                        $add->suggest = implode(', ', $this->getSuggestions($word, $displayLang));
-                    } else {
-                        $suggest = $suggestions->get($word);
-                        if ($suggest && ($suggest != $word)) {
-                            $add->suggest = $suggest;
-                        }
-                    }
-                    
-                    
-                }
-
-                $add->md5 = $md5;
-                // show big or small text entry..
-                $add->short = (bool) (strlen($add->from) < 30 && strstr($add->from, "\n") === false);
-                
-                $status[$page][] = $add;
-            
-                 
-            }
-            
-        }
-        if ($usingGT) {
-            $trd->storage->commit();
-        }
-        $t = explode(' ',microtime()); $total= $t[0] + $t[1] -  $start;
-        //printf("Built All in %0.2fs
",$total);
-        $this->status = $status;
-          
-             
-    
-    }
-    var $translations = array();
-    var $translationMap = array();
-   
-    /**
-    * LoadTranslations - load all the translations from the database
-    * into $this->translations[{lang}][{id}] = $translation;
-    *
-    * 
-    * @param   string       Language
-    * @access   public
-    */
-    function loadTranslations ($lang= false) {
-        $d = DB_DataObject::factory('translations');
-        $d->lang = ($lang == false) ? '-' : $lang;
-        $d->find();
-        $this->translations[$d->lang] = array();
-        while ($d->fetch()) {
-            $this->translations[$d->lang][$d->string_id] = $d->translation;
-            if ($lang == false) {
-                $this->translationMap[$d->page][$d->translation] = $d->string_id;
-            }
-            // suggestions:?
-            
-        }
-    }
-    
-    function getSuggestions($string,$lang) {
-        $ids = array();
-        //echo '
';print_r($this->translationMap);
-        foreach($this->translationMap as $page=>$map) {
-            if (isset($map[$string])) {
-                $ids[] = $map[$string];
-            }
-        }
-        //echo '
';print_r(array($string,$lang,$ids,$this->translations[$lang]));
-        
-        //exit;
-        if (!$ids) {
-            return array();
-        }
-        $ret = array();
-        foreach($ids as $id) {
-            if (isset($this->translations[$lang][$id])) {
-                $ret[] = $this->translations[$lang][$id];
-            }
-        }
-       // echo '
';print_r($ret);
-        return $ret;
-    }
-    
-    function getTranslation($page,$word,$lang)
-    {
-        
-        if (!isset($this->translationMap[$page][$word])) {
-            //echo "No string id for $page : $word\n";
-            return false;
-        }
-        if (!isset($this->translations[$lang][$this->translationMap[$page][$word]])) {
-        
-            return false;
-        }
-        return $this->translations[$lang][$this->translationMap[$page][$word]];
-    }
-    /**
-    * compile all the templates in a specified folder.
-    *
-    * 
-    * @param   string   subdirectory of templateDir or empty
-    * @return   none
-    * @access   public
-    */
-
-    function compileAll($d='') {
-        set_time_limit(0); // this could take quite a while!!!
-        
-        $words = array();
-        $dname = $d ? $this->options['templateDir'] .'/'.$d  : $this->options['templateDir'];
-        //echo "Open $dname
";
-        $dh = opendir( $dname);
-        require_once 'HTML/Template/Flexy.php';
-        $o = $this->options;
-        $o['fatalError'] = PEAR_ERROR_RETURN;
-        $o['locale'] = 'en';
-        while (($name = readdir($dh)) !== false) {
-            $fname = $d ? $d .'/'. $name : $name;
-            
-            if ($name{0} == '.') {
-                continue;
-            }
-            
-            if (is_dir($this->options['templateDir'] . '/'. $fname)) {
-                $this->compileAll($fname);
-                continue;
-            }
-                
-                
-            if (!preg_match('/\.html$/',$name)) {
-                continue;
-            }
-            
-            $oo = $o;// $oo['debug'] = 1; 
-            $x = new HTML_Template_Flexy( $oo );
-            $r = $x->compile($fname);
-            
-            //printf(" %0.3fs : $fname
", $time);
-            if (is_a($r,'PEAR_Error')) {
-                echo "compile failed on $fname
";
-                echo $r->toString();
-                continue;
-            }
-            $this->words[$fname] = file_exists($x->getTextStringsFile) ?
-                unserialize(file_get_contents($x->getTextStringsFile)) :
-                array();
-        }
-        //echo '
';print_R($words);exit;
-        
-        ksort($this->words);
-    }
-
-
-    /**
-    * delete all the compiled templates in  a specified language
-    *
-    * 
-    * @param   string   language
-    * @param   string   subdirectory of templateDir or empty
-    * @return   none
-    * @access   public
-    */
-    function clearTemplateCache($lang='en',$d = '') {
-        
-        $dname = $d ? $this->options['templateDir'] .'/'.$d  : $this->options['templateDir'];
-       
-        $dh = opendir($dname);
-        while (($name = readdir($dh)) !== false) {
-            $fname = $d ? $d .'/'. $name : $name;
-            
-            if ($name{0} == '.') {
-                continue;
-            }
-            
-            if (is_dir($this->options['templateDir'] . '/'. $fname)) {
-                $this->clearTemplateCache($lang,$fname);
-                continue;
-            }
-            if (!preg_match('/\.html$/',$name)) {
-                continue;
-            }
-      
-            $file = "{$this->options['compileDir']}/{$fname}.{$lang}.php";
-            
-            if (file_exists($file)) {
-               // echo "DELETE $file?";
-                unlink($file);
-            }
-        }
-        clearstatcache();
-    }
-   /**
-    * output the default template with the editing facilities.
-    * 
-    * @return   none
-    * @access   public
-    */
-    function outputDefaultTemplate() {
-        $o = array(
-            'compileDir' => ini_get('session.save_path') . '/HTML_Template_Flexy_Translate',
-            'templateDir' => dirname(__FILE__).'/templates'
-        );
-        $x = new HTML_Template_Flexy( $o );
-        $x->compile('translator.html');
-        $x->outputObject($this);
-    }
-        
-      
-
-}
diff --git a/HTML/Template/Flexy/Tree.php b/HTML/Template/Flexy/Tree.php
deleted file mode 100644
index 1bc2118..0000000
--- a/HTML/Template/Flexy/Tree.php
+++ /dev/null
@@ -1,333 +0,0 @@
-                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: Tree.php,v 1.5 2005/01/31 06:57:44 alan_k Exp $
-//
-// The Html Tree Component of Flexy
-// Designed to be used on it's own
-// 
-//
-//
-// The concept:
-// - it builds a big tokens[] array : 
-// - filters "Text with {placeholders}" into sprintf formated strings.
-// - matches closers to openers eg. token[4]->close = &token[5];
-// - it aliases the tokens into token[0] as children as a tree
-// - locates the base of the file. (flexy:startchildren.
-// returns a nice tree..
-
-
-class HTML_Template_Flexy_Tree {
-
-    /**
-    * Options for Tree:
-    * 'ignore'          =>   dont change {xxxX} into placeholders?
-    * 'filename'        =>   filename of file being parsed. (for error messages.)
-    * 'ignore_html'     =>   return  elements as strings.
-    * 'ignore_php'      =>   DELETE/DESTROY any php code in the original template.
-    */
-  
-    var $options = array(
-        'ignore'        => false, // was flexyIgnore
-        'filename'      => false,
-        'ignore_html'   => false,
-        'ignore_php'    => true,
-    );
-    
-        
-    /**
-    * Array of all tokens (eg. nodes / text / tags etc. )
-    * All nodes have ID's 
-    *
-    * eg.
-    *   some text
-    *  [0] => Token_Tag::
-    *         tagname = ''
-    *         children = array( &tag[1] );
-              close  = &tag[2];
-    *  [1] => Token_Text::'some test'
-    *  [2] => Token_Tag::
-    *         tagname = '';
-    *
-    *
-    *  under normal situations, the tree is built into node[0], the remaining nodes are referenced by alias.
-    *  if caching is used (the nodes > 0 will not exist, and everything will just be a child of node 0.
-    *
-    *
-    *
-    * @var array
-    * @access public
-    */
-    
-    var $tokens     = array();
-    var $strings    = array();
-        
-    
-    
-    
-    
-   
-    /**
-    * Run a Tokenizer and Store its results and return the tree.
-    * It should build a DOM Tree of the HTML
-    * 
-    * @param   string $data         data to parse.
-    * @param    array $options      see options array.
-    *
-    * @access   public
-    * @return   base token (really a dummy token, which contains the tree)
-    * @static
-    */
-  
-    function construct($data,$options=array()) 
-    {
-    
-        // local caching!
-        $md5 = md5($data);
-        if (isset($GLOBALS[__CLASS__]['cache'][$md5])) {
-            return $GLOBALS[__CLASS__]['cache'][$md5];
-        } 
-        
-        $t = new HTML_Template_Flexy_Tree;
-        $t->options = $t->options + $options;
-        require_once 'HTML/Template/Flexy/Token.php';
-        $t->tokens = array(new HTML_Template_Flexy_Token);
-        $t->tokens[0]->id =0;
-        
-        // process
-        if (is_a($r = $t->tokenize($data),'PEAR_Error')) {
-            return $r;
-        }
-        
-        $t->matchClosers();
-        $t->buildChildren(0);
-        //new Gtk_VarDump($_HTML_TEMPLATE_FLEXY_TOKEN['tokens'][0]);
-        
-        $GLOBALS[__CLASS__]['cache'][$md5] = $t->returnStart();
-        return $GLOBALS[__CLASS__]['cache'][$md5];
-
-    }
-    
-    /**
-    * The core tokenizing part - runs the tokenizer on the data,
-    * and stores the results in $this->tokens[]
-    *
-    * @param   string               Data to tokenize
-    * 
-    * @return   none | PEAR::Error
-    * @access   public|private
-    * @see      see also methods.....
-    */
-  
-    
-    function tokenize($data) {
-        require_once 'HTML/Template/Flexy/Tokenizer.php';
-        $tokenizer =  &HTML_Template_Flexy_Tokenizer::construct($data,$this->options);
-        
-        // initialize state - this trys to make sure that
-        // you dont do to many elses etc.
-       
-        //echo "RUNNING TOKENIZER";
-        // step one just tokenize it.
-        $i=1;
-        while ($t = $tokenizer->yylex()) {  
-            
-            if ($t == HTML_TEMPLATE_FLEXY_TOKEN_ERROR) {
-                return HTML_Template_Flexy::raiseError(
-                    array(
-                            "HTML_Template_Flexy_Tree::Syntax error in File: %s (Line %s)\n".
-                            "Tokenizer Error: %s\n".
-                            "Context:\n\n%s\n\n >>>>>> %s\n",
-                        $this->options['filename'], $tokenizer->yyline ,
-                        $tokenizer->error,
-                        htmlspecialchars(substr($tokenizer->yy_buffer,0,$tokenizer->yy_buffer_end)),
-                        htmlspecialchars(substr($tokenizer->yy_buffer,$tokenizer->yy_buffer_end,100))
-                    )
-                    ,HTML_TEMPLATE_FLEXY_ERROR_SYNTAX ,HTML_TEMPLATE_FLEXY_ERROR_DIE);
-            }
-                
-            if ($t == HTML_TEMPLATE_FLEXY_TOKEN_NONE) {
-                continue;
-            }
-            if ($t->token == 'Php') {
-                continue;
-            }
-            $i++;
-            $this->tokens[$i] = $tokenizer->value;
-            $this->tokens[$i]->id = $i;
-            
-            
-            
-            //print_r($_HTML_TEMPLATE_FLEXY_TOKEN['tokens'][$i]);
-             
-        }
-        //echo "BUILT TOKENS";
-    }
-    
-    
-     
-    
-    /**
-    * Match the opening and closing tags eg.  is the closer of 
-    *
-    * aliases the ->close to the tokens[{closeid}] element
-    * 
-    * @return   none
-    * @access   public
-    */
-  
-    function matchClosers() 
-    {
-        $res = &$this->tokens;
-        $total = count($this->tokens);
-        // connect open  and close tags.
-        
-        // this is done by having a stack for each of the tag types..
-        // then removing it when it finds the closing one
-        // eg.
-        //  
-        //  ends up with a stack for 's and a stack for 's
-        //
-        //
-        //
-        
-       
-        for($i=1;$i<$total;$i++) {
-            //echo "Checking TAG $i\n";
-            if (!isset($res[$i]->tag)) {
-                continue;
-            }
-            $tag = strtoupper($res[$i]->tag);
-            if ($tag{0} != '/') { // it's not a close tag..
-                  
-                
-                if (!isset($stack[$tag])) {
-                    $npos = $stack[$tag]['pos'] = 0;
-                } else {
-                    $npos = ++$stack[$tag]['pos'];
-                }
-                $stack[$tag][$npos] = $i;
-                continue;
-            }
-        
-            //echo "GOT END TAG: {$res[$i]->tag}\n";
-            $tag = substr($tag,1);
-            if (!isset($stack[$tag]['pos'])) {
-                continue; // unmatched
-            }
-            
-            $npos = $stack[$tag]['pos'];
-            if (!isset($stack[$tag][$npos])) {
-                // stack is empty!!!
-                continue;
-            }
-            // alias closer to opener..
-            $this->tokens[$stack[$tag][$npos]]->close = &$this->tokens[$i];
-            $stack[$tag]['pos']--;
-            // take it off the stack so no one else uses it!!!
-            unset($stack[$tag][$npos]);
-            if ($stack[$tag]['pos'] < 0) {
-                // too many closes - just ignore it..
-                $stack[$tag]['pos'] = 0;
-            }
-            continue;
-
-            // new entry on stack..
-          
-            
-           
-        }
-                
-        // create a dummy close for the end
-        $i = $total;
-        $this->tokens[$i] = new HTML_Template_Flexy_Token;
-        $this->tokens[$i]->id = $total;
-        $this->tokens[0]->close = &$this->tokens[$i];
-        
-        // now is it possible to connect children...
-        // now we need to GLOBALIZE!! - 
-   
-    }
-    
-   /**
-    * Build the child array for each element.
-    * RECURSIVE FUNCTION!!!!
-    *
-    * does not move tokens, just aliases the child nodes into the token array.
-    *
-    * @param   int  id of node to add children to.
-    *
-    * @access   public
-    */
-    function buildChildren($id) 
-    {
-      
-        
-        $base = &$this->tokens[$id];
-        $base->children = array();
-        $start = $base->id +1;
-        $end = $base->close->id;
-        
-        for ($i=$start; $i<$end; $i++) {
-            //echo "{$base->id}:{$base->tag} ADDING {$i}{$_HTML_TEMPLATE_FLEXY_TOKEN['tokens'][$i]->tag}
";
-            //if ($base->id == 1176) {
-            //    echo "
";print_r($_HTML_TEMPLATE_FLEXY_TOKEN['tokens'][$i]);
-            // }
-            $base->children[] = &$this->tokens[$i];
-            if (isset($this->tokens[$i]->close)) {
-            
-                // if the close id is greater than my id - ignore it! - 
-                if ($this->tokens[$i]->close->id > $end) {
-                    continue;
-                }
-                $this->buildChildren($i);
-                $i = $this->tokens[$i]->close->id;
-            }
-        }
-    }
-            
-         
-    /**
-    * Locates Flexy:startchildren etc. if it is used.
-    * and returns the base of the tree. (eg. otherwise token[0].
-    *
-    * @return  HTML_Template_Flexy_Token (base of tree.)
-    * @access   public
-    */
-    
-    function returnStart() {
-    
-        foreach(array_keys($this->tokens) as $i) {
-            switch(true) {
-                case isset($this->tokens[$i]->ucAttributes['FLEXYSTART']):
-                case isset($this->tokens[$i]->ucAttributes['FLEXY:START']):
-                    $this->tokens[$i]->removeAttribute('FLEXY:START');
-                    $this->tokens[$i]->removeAttribute('FLEXYSTART');
-                    return $this->tokens[$i];
-                case isset($this->tokens[$i]->ucAttributes['FLEXYSTARTCHILDREN']):
-                case isset($this->tokens[$i]->ucAttributes['FLEXY:STARTCHILDREN']):
-                    $this->tokens[0]->children = $this->tokens[$i]->children;
-                    return $this->tokens[0];
-            }
-        }
-        return $this->tokens[0];
-       
-    
-    }
-    
-}
\ No newline at end of file
diff --git a/HTML/Template/Flexy/compileAll.php b/HTML/Template/Flexy/compileAll.php
deleted file mode 100644
index 29af900..0000000
--- a/HTML/Template/Flexy/compileAll.php
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/php -q
-
-// +----------------------------------------------------------------------+
-//
-// $Id: compileAll.php,v 1.3 2003/08/01 08:50:27 alan_k Exp $
-//
-
-@include 'HTML/Template/Flexy.php';
-if (!class_exists('HTML_Template_Flexy')) {
-    ini_set('include_path',dirname(__FILE__).'/../../../');
-    include 'HTML/Template/Flexy.php';
-}
-require_once 'PEAR.php';
-
-if (!ini_get('register_argc_argv')) {
-    PEAR::raiseError("\nERROR: You must turn register_argc_argv On in you php.ini file for this to work\neg.\n\nregister_argc_argv = On\n\n", null, PEAR_ERROR_DIE);
-    exit;
-}
-
-if (!@$_SERVER['argv'][1]) {
-    PEAR::raiseError("\nERROR: compileAll.php usage:\n\nC:\php\pear\HTML\Template\Flexy\compileAll.php example.ini\n\n", null, PEAR_ERROR_DIE);
-    exit;
-}
-
-$config = parse_ini_file($_SERVER['argv'][1], true);
-
-$options = &PEAR::getStaticProperty('HTML_Template_Flexy','options');
-$options = $config['HTML_Template_Flexy'];
-
-if (!$options) {
-    PEAR::raiseError("\nERROR: could not read ini file\n\n", null, PEAR_ERROR_DIE);
-    exit;
-}
-
-set_time_limit(0);
-//DB_DataObject::debugLevel(5);
-$flexy= new HTML_Template_Flexy;
-$flexy->compileAll();
-?>
diff --git a/HTML/Template/Flexy/example.ini b/HTML/Template/Flexy/example.ini
deleted file mode 100644
index aa0fb24..0000000
--- a/HTML/Template/Flexy/example.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-;
-; To use config file with HTML_Template_Flexy
-; $config = parse_ini_file('example.ini',TRUE)
-; $options = &PEAR::getStaticProperty('HTML_Template_Flexy','options');
-; $options = $config['HTML_Template_Flexy'];
-;
-[HTML_Template_Flexy]
-
-compileDir =  /home/me/Projects/myapplication/compiled_templates
-		; where the compiled templates go.
-		
-templateDir =  /home/me/Projects/myapplication/templates
-		; where the original templates are.
-		
-;templateDir =  /home/me/Projects/myapplication/english;/home/me/Projects/myapplication/spanish
-		; or use multiple paths..
-		
-forceCompile = 0
-		; force compile template every time...
-		
-filters = Php,SimpleTags,BodyOnly
-		; Order of Classes to use as filters.
-
-
-;url_rewrite     = "/images/:/php_sharpsite/images/"
-		; rewrite src and href urls from /images/ to /php_sharpsite/images/
-
-;url_rewrite     = "/abc/:/xyz/,/bbb/:/zzz/"
-		; rewrite src and href urls from /abc/ to /xyz/ and /bbb/ to /zzz/
-		; not it is only on the left of the url (not anywhere inside it)
-
-		
-;flexyIgnore     = 0
-		; this turns of the transformation of HTML form elements into 
-		; HTML_Template_Flexy_Element's, either globally, or you
-		; can use it in a constructor to turn it off per template.
\ No newline at end of file
diff --git a/HTML/Template/Flexy/templates/translator.html b/HTML/Template/Flexy/templates/translator.html
deleted file mode 100644
index 0587053..0000000
--- a/HTML/Template/Flexy/templates/translator.html
+++ /dev/null
@@ -1,270 +0,0 @@
-
-
-  
-  
-  
-  
-  register2
-
- 
-
-
-
- 
-
-Select a Language To Translate To : {foreach:languages,lang}
-    {lang}
-    {end:}
-
-
- 
-
-
-
-
-  
-
-
-
-
Language : {translate}   
-     
-    or  
-    
-    or
-    
-

-
-
-{foreach:status,page,items}
-
-
-  
-    
-      
-    
-

-        +      
-        Page:{page}   (in {translate})

-      

-
-
-{end:}
-

-
-

-

-      
- 
-   
-  
-    
-  
-
\ No newline at end of file
diff --git a/HTML/Template/tests/smarty/smartytest.php b/HTML/Template/tests/smarty/smartytest.php
deleted file mode 100644
index 27dcf78..0000000
--- a/HTML/Template/tests/smarty/smartytest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-  dirname(__FILE__) ,      // where do you want to write to..
-                    'templateDir'   =>  $dir ,     // where are your templates
-                    'locale'        => 'en',    // works with gettext
-                    'forceCompile'  =>  true,  // only suggested for debugging
-                    'debug'         => false,   // prints a few errors
-                    'nonHTML'       => false,  // dont parse HTML tags (eg. email templates)
-                    'allowPHP'      => false,   // allow PHP in template
-                    'compiler'      => 'SmartyConvertor', // which compiler to use.
-                    'compileToString' => true,    // returns the converted template (rather than actually 
-                                                   // converting to PHP.
-                    'filters'       => array(),    // used by regex compiler..
-                    'numberFormat'  => ",2,'.',','",  // default number format  = eg. 1,200.00 ( {xxx:n} )
-                    'flexyIgnore'   => 0        // turn on/off the tag to element code
-                ));
-    
-    echo $x->compile(basename($file));
-}
\ No newline at end of file
diff --git a/HTML/Template/tests/templates/blocks.html b/HTML/Template/tests/templates/blocks.html
deleted file mode 100644
index e8ae6b4..0000000
--- a/HTML/Template/tests/templates/blocks.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-This is block 1
-
-
-
-This is block 2
-
-
-
-
-
diff --git a/HTML/Template/tests/templates/bug_2959.html b/HTML/Template/tests/templates/bug_2959.html
deleted file mode 100644
index 652fc88..0000000
--- a/HTML/Template/tests/templates/bug_2959.html
+++ /dev/null
@@ -1,122 +0,0 @@
--------------------------
-Dear Administrator,
-
-     -- Automatically Generated Email from XXXXXXXXXX --
-{if:hasmessage}
-
-*NOTE*: {message:h}.
-{end:}
-
-     O R D E R   A W A I T I N G   A U T H O R I S A T I O N
-_________________________________________________________________
-
-ORDER:
-
-ID:       {order.h}
-
-*Edit*:   http://{host}/admin/sales/orders/edit?id={order}
-
-_________________________________________________________________
-
-CUSTOMER DETAILS:
-
-Name:     {customer.firstname:h} {customer.lastname:h}
-
-Email:    mailto:{customer.email:h}
-
-*Edit*:   http://{host}/admin/sales/customers/edit?id={customer.id}
-
-_________________________________________________________________
-
-SHIPPING TO:                                      
-
-*{deliveryname:h}*
-{deliveryaddress:h}
-
-_________________________________________________________________
-
-XXXXXXXXXXXXXXXXXXX:
-
-*{post.transactionstatus:h}*
-
-{if:post.dubious}
-*WARNING*! - This may not be a bona fide order! - *WARNING*!
-
-*Reason*: {post.dubiousreason:h}
-
-/Contact tech support/ before proceeding with this order!
-
-{end:}
-Total (currency?):            {post.total:h}
-
-Client ID (XXXXXXXX):         {post.clientid:h}
-
-Order ID:                     {post.oid:h}
-
-Charge type:                  {post.chargetype:h}
-
-Timestamp (from XXXXXXXX):    {post.datetime:h}
-
-VbV Status:                   {post.ecistatus:h}
-
-https://XXXXX.XXXXXXXX.XXXXXX.com/XXXXX/XXXXXXX/XXXXXx
-_________________________________________________________________
-
-{foreach:orderlines,i,o}
-{if:i}
-
-  - - -   - - -   - - -   - - -   - - -   - - -   - - -   - - -
-
-{end:}
-*PRODUCT*:{o.productname:h}
-
-          ({o.producttypename:h})
-
-*Edit*:   http://{host}/admin/catalog/products/edit?id={o.product:u}
-
-FABRIC:   {o.fabricname:h}
-
-SIZE:     {o.sizename:h}
-
-Eurostop: {o.altid:h}
-
-QUANTITY: {o.quantity:h}
-
-Price ea: {o.eachprice:h}
-
-Tax each: {o.eachtax:h}
-
-Sub-total:                                       {o.totalinctax:h}
-{if:o.isgift}
-
-*GIFT MESSAGE* FOR THIS ITEM:
-{o.giftmessage}{end:}{end:}
-
-_________________________________________________________________
-
-Item total (ex tax):                             {totals.itemstotal:h}
-
-Item taxes:                                      {totals.itemstax:h}
-
-Shipping:                                       
-{totals.shippingcharges:h}
-
-Tax on shipping:                                 {totals.shippingtax:h}
-
-*GRAND TOTAL*:                                   {totals.grandtotal:h}
-
-_________________________________________________________________
-
-{totals.itemsdiscountinfo:h}
-
-{totals.itemstaxinfo:h}
-
-{totals.shippinginfo:h}
-
-{totals.shippingtaxinfo:h}
-
-_________________________________________________________________
-
-blah blah
-
---------------------------
\ No newline at end of file
diff --git a/HTML/Template/tests/templates/conditions.html b/HTML/Template/tests/templates/conditions.html
deleted file mode 100644
index bf35603..0000000
--- a/HTML/Template/tests/templates/conditions.html
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
Conditions

-
a condition {if:condition} hello {else:} world {end:}

-
a negative condition {if:!condition} hello {else:} world {end:}

-
a conditional method {if:condition()} hello {else:} world {end:}

-
a negative conditional method {if:!condition()} hello {else:} world {end:}

-
-
-test
-test
-test
-
-
-
-
Notices and errros

-
-
-
- 
-  
-    
-      
-    
-    
-      
-    
-  
-
Thanks

-      
Submitted data is ok

-      

- 
-
-  
-    
-      
-    
-    
-      
-    
-  
-
Sorry

-        
-      
  • Please fill in your last name
    • 
-   
-      
    
diff --git a/HTML/Template/tests/templates/error_foreach.html b/HTML/Template/tests/templates/error_foreach.html
deleted file mode 100644
index 1107685..0000000
--- a/HTML/Template/tests/templates/error_foreach.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
diff --git a/HTML/Template/tests/templates/flexy_tojavascript.html b/HTML/Template/tests/templates/flexy_tojavascript.html
deleted file mode 100644
index b0f96a7..0000000
--- a/HTML/Template/tests/templates/flexy_tojavascript.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-Untitled Document
-
- 
- 
- 
-
-    
-
-
-
-
-
-
-
-    
-
-
-
-
-
-
-
-
    Example of flexy:toJavascript with default values.
    
-
\ No newline at end of file
diff --git a/HTML/Template/tests/templates/forms.html b/HTML/Template/tests/templates/forms.html
deleted file mode 100644
index c24b6c9..0000000
--- a/HTML/Template/tests/templates/forms.html
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
    Form Not Parsed
    
-
-
    
-    
-    
-
    
-
-
    Parsed
    
-
-
-
    
-    Input
-    Checkbox 
-    Hidden 
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-
-
-    
-    
-    
-    
-    
-    
-    
-    #bug  bug6058    
-
-    
    
-        Credit card
-    
    
-        Cheque
-
-    
    
-        Credit card
-    
    
-        Cheque
-    
-    
-    
-    
-
    
-
-
-
-
    Bug 1120:
    
-
    
-
-
-
    
-
-
    
-
-
-
    
-
-
     Bug 1275 XHTML output 
    
-
-
-
-
-
     Bug 4005 Checkboxes 
    
-
-
-
-
-
-
-
-
-
    
-
-
-
    
diff --git a/HTML/Template/tests/templates/function.html b/HTML/Template/tests/templates/function.html
deleted file mode 100644
index 1b28552..0000000
--- a/HTML/Template/tests/templates/function.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
    Example of function block definitions
    
-
-
-
-
-
    
-    this is the contents of test1
-
    
-
-
-
    
-   
-   
-
    
-
-    
\ No newline at end of file
diff --git a/HTML/Template/tests/templates/globals.html b/HTML/Template/tests/templates/globals.html
deleted file mode 100644
index b257730..0000000
--- a/HTML/Template/tests/templates/globals.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
    GLOBALS:
    
-{_SESSION[hello]} 
    
-{_GET[fred]} 
    
-{GLOBALS[abc]} 
    
-
-
-
    Privates:
    
-{_somemethod()} 
    
-{_somevar} 
    
-
-
-
-
    Global methods 
    
-
-{GLOBALS.date(#d/m/y#)}   
    
-
-{if:GLOBALS.is_array(test)} 
    
-{end:} 
    
-
    
-
-{foreach:atest,k,v} 
    
-{if:GLOBALS.is_array(v)} 
    
-{end:} 
    
-{end:} 
    
-
diff --git a/HTML/Template/tests/templates/image_view.html b/HTML/Template/tests/templates/image_view.html
deleted file mode 100644
index b972edd..0000000
--- a/HTML/Template/tests/templates/image_view.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-  
-  image_view.html
-
-
-
-
-
-  
-    
-      
-    
-  
-

    
-            [{col.name}] {col.size}Mb
-      
    
-
-
-
\ No newline at end of file
diff --git a/HTML/Template/tests/templates/include.html b/HTML/Template/tests/templates/include.html
deleted file mode 100644
index 232c6ed..0000000
--- a/HTML/Template/tests/templates/include.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	
-
-    the variable is {foo}
-
-    
-        
-            
-        
-    
    
-
-	
-
diff --git a/HTML/Template/tests/templates/javascript.html b/HTML/Template/tests/templates/javascript.html
deleted file mode 100644
index 030d4bd..0000000
--- a/HTML/Template/tests/templates/javascript.html
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-Untitled Document
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
- 
-
-
-
-
\ No newline at end of file
diff --git a/HTML/Template/tests/templates/looping.html b/HTML/Template/tests/templates/looping.html
deleted file mode 100644
index 7997083..0000000
--- a/HTML/Template/tests/templates/looping.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
    Looping
    
-
-
-
    a loop {foreach:loop,a} {a} {end:}
    
-
    a loop with 2 vars {foreach:loop,a,b} 
-    {a} , 
-    {b}
-{end:}
    
-
-Bug #84
-{foreach:list,i}
-  {method(i)}
-{end:}
-
-{foreach:list,i,j}
-    {i}:{j}
-{end:}
-
-
-    
-        
-    
-
    {abcd}, {test(def)}
    
-
-
-
    HTML tags example using foreach="loop,a,b" or the tr
    
-
-   
-    
-    
-  
-
    {a}{b}
    
-
-
    HTML tags example using foreach="loop,a" or the tr using a highlight class.
    
-
-   
-    
-    
-    
-  
-
    a is{a.text}{a.price:n}
    
-
-
    HTML tags example using foreach="loop,a,b" or the tr
    
-
-   
-    
-  
-
    {d}
    
-
-
    Looping in CDATA
    
-Dont forget that php strips line breaks!
-
\ No newline at end of file
diff --git a/HTML/Template/tests/templates/methods.html b/HTML/Template/tests/templates/methods.html
deleted file mode 100644
index 07a6b7d..0000000
--- a/HTML/Template/tests/templates/methods.html
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
    Methods
    
-
    Calling a method {a.helloWorld()}
    
-
    or {includeBody():h}
    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    Full Method testing
    
-
-{abc(abc,def,hij)}
-{abc(abc,#def#,#hij#)}
-
-{abc(abc,def,#hij#)}
-{abc(#abc#,def,hij)}
-
-{abc(abc,def,hij):h}
-{abc(abc,#def#,#hij#):h}
-{abc(abc,def,#hij#):h}
-{abc(#abc#,def,hij):h}
-
-
-{abc(abc,def,hij):u}
-{abc(abc,#def#,#hij#):u}
-{abc(abc,def,#hij#):u}
-{abc(#abc#,def,hij):u}
-
-{abc(123,def,hij)}
-{abc(abc,#123#,123):u}
-{abc(abc,def,123)}
-{abc(#abc#,123,hij):u}
-
-
-
    Real life method testing 
    
-Invoice number: {t.getelem(t.invoice,#number#)} Place: 
-{t.getelem(t.invoice,#place#)} Date: {t.getelem(t.invoice,#date#)} Payment: 
-{t.getelem(t.invoice,#payment#)} Payment date: 
-{t.getelem(t.invoice,#payment_date#)} Seller: Name 1: 
-{t.getelem(t.seller,#name1#)} Name 2: {t.getelem(t.seller,#name2#)} NIP: 
-{t.getelem(t.seller,#nip#)} Street: {t.getelem(t.seller,#street#)} City: 
-{t.getelem(t.seller,#code#)} {t.getelem(t.seller,#city#)} Buyer: Name 1: 
-{t.getelem(t.buyer,#name1#)} Name 2: {t.getelem(t.buyer,#name2#)} NIP: 
-{t.getelem(t.buyer,#nip#)} Street: {t.getelem(t.buyer,#street#)} City: 
-{t.getelem(t.buyer,#code#)} {t.getelem(t.buyer,#city#)}
-# 	Name {if:t.show_pkwiu}	PKWIU{end:} 	Count 	Netto 	VAT 	Brutto
-{foreach:t.positions,position} {t.getelem(position,#nr#)} 
-{t.getelem(position,#name#)} {if:t.show_pkwiu} 
-{t.getelem(position,#pkwiu#)}{end:} 	{t.getelem(position,#count#)} 
-{t.getelem(position,#netto#)} 	{t.getelem(position,#vat#)} 
-{t.getelem(position,#brutto#)}
-{end:} {if:t.edit_positions} # 	Name {if:t.show_pkwiu}	PKWIU{end:} 	Count 
-{if:t.getelem(position,#netto_mode#)}	Netto{else:}	{end:} 	VAT 
-{if:t.getelem(position,#netto_mode#)}	{else:}	Brutto{end:}
-{foreach:t.edit_positions,k,position} {t.getelem(position,#nr#)} 
-{if:t.show_pkwiu} 	{end:} 	{if:t.getelem(position,#netto_mode#)} 	{else:} 
-{end:} 	{if:t.getelem(position,#netto_mode#)} 	{else:}	{end:}
-{end:} {end:} # 	
-{foreach:t.sum,sum} {t.getelem(sum,#nr#)} 		{t.getelem(sum,#netto#)} 
-{t.getelem(sum,#vat#)} 	{t.getelem(sum,#brutto#)}
-{end:}
diff --git a/HTML/Template/tests/templates/namespaces.html b/HTML/Template/tests/templates/namespaces.html
deleted file mode 100644
index 6085349..0000000
--- a/HTML/Template/tests/templates/namespaces.html
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
- 
-        
-                
-                        
-                        
-                        
-                
-                
-                        
-                                
-                                        
-                                        
-                                        
-                                
-                        
-                
-        
-        
-            
-            
-              
-                
-                  
-             
-            
-        
-        
-            {data.name}
-        
-        
-        
-            {data.name}
-        
-        
-        
-         
-            
-                    
-            
-        
-        
-        
-        
-            
-                    
-            
-        
-        
-        
-           
-            
-                
-            
-        
-        
-
diff --git a/HTML/Template/tests/templates/plugin_modifiers.html b/HTML/Template/tests/templates/plugin_modifiers.html
deleted file mode 100644
index 267b317..0000000
--- a/HTML/Template/tests/templates/plugin_modifiers.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
    Testing Plugin Modifiers
    
-
-
-{datetest:dateformat}
-
-{numbertest:numberformat}
-
-
-Bug #3946 - inside raw!
- 
-
-
- 
\ No newline at end of file
diff --git a/HTML/Template/tests/templates/raw_php.html b/HTML/Template/tests/templates/raw_php.html
deleted file mode 100644
index 8b03226..0000000
--- a/HTML/Template/tests/templates/raw_php.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-number: 
-
-
-
diff --git a/HTML/Template/tests/templates/raw_text.html b/HTML/Template/tests/templates/raw_text.html
deleted file mode 100644
index 8ea46ed..0000000
--- a/HTML/Template/tests/templates/raw_text.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-Untitled Document
- 
-
-
    Example Template for HTML_Template_Flexy
    
-
- a full string example ~!@#$%^&*() |": ?\][;'/.,=-_+ ~` abcd....
- asfasfdas
- 
- 
- 
-
    Bugs: 809 Comments:
    
-
-
-
-
-
-
-
-
-
-
- 
\ No newline at end of file
diff --git a/HTML/Template/tests/templates/style.html b/HTML/Template/tests/templates/style.html
deleted file mode 100644
index 64762f3..0000000
--- a/HTML/Template/tests/templates/style.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
- 
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/HTML/Template/tests/templates/variables.html b/HTML/Template/tests/templates/variables.html
deleted file mode 100644
index abcdbf4..0000000
--- a/HTML/Template/tests/templates/variables.html
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-Untitled Document
- 
-
-
    Example Template for HTML_Template_Flexy
    
- 
-
    Variables
    
-
-
    Standard variables 
-{hello} 
-{world:h}
-{test:u}
-{object.var}
-{array[0]}
-{array[entry]}
-{multi[array][0]}
-{object.var[array][1]}
-{object.var[array][1]:r}
-{object.var[array][1]:h}
-{object.var[array][-1]:h}
-{object[array].with[objects]}
-Long string with NL2BR + HTMLSPECIALCHARS
-{longstring:b}
-
-Everything: {t:r}
-an Object: {object:r}
-
-
-
-
-
-
-
-
-
    
-
-
diff --git a/HTML/Template/tests/test_blocks.html.phpt b/HTML/Template/tests/test_blocks.html.phpt
deleted file mode 100644
index 85470fa..0000000
--- a/HTML/Template/tests/test_blocks.html.phpt
+++ /dev/null
@@ -1,39 +0,0 @@
---TEST--
-Template Test: blocks.html
---FILE--
-
-This is block 1
-
-
-
-This is block 2
-
-
-
-
-
-
-
-===With data file: blocks.html===
-
-This is block 1
-
-
-
-This is block 2
-
-
-
-
-
-
diff --git a/HTML/Template/tests/test_bug_2959.html.phpt b/HTML/Template/tests/test_bug_2959.html.phpt
deleted file mode 100644
index 4c49107..0000000
--- a/HTML/Template/tests/test_bug_2959.html.phpt
+++ /dev/null
@@ -1,197 +0,0 @@
---TEST--
-Template Test: bug_2959.html
---FILE--
-hasmessage)  {?>
-
-*NOTE*: message;?>.
-
-
-     O R D E R   A W A I T I N G   A U T H O R I S A T I O N
-_________________________________________________________________
-
-ORDER:
-
-ID:       order->h);?>
-
-*Edit*:   http://host);?>/admin/sales/orders/edit?id=order);?>
-
-_________________________________________________________________
-
-CUSTOMER DETAILS:
-
-Name:     customer->firstname;?> customer->lastname;?>
-
-Email:    mailto:customer->email;?>
-
-*Edit*:   http://host);?>/admin/sales/customers/edit?id=customer->id);?>
-
-_________________________________________________________________
-
-SHIPPING TO:                                      
-
-*deliveryname;?>*
-deliveryaddress;?>
-
-_________________________________________________________________
-
-XXXXXXXXXXXXXXXXXXX:
-
-*post->transactionstatus;?>*
-
-post->dubious)  {?>
-*WARNING*! - This may not be a bona fide order! - *WARNING*!
-
-*Reason*: post->dubiousreason;?>
-
-/Contact tech support/ before proceeding with this order!
-
-
-Total (currency?):            post->total;?>
-
-Client ID (XXXXXXXX):         post->clientid;?>
-
-Order ID:                     post->oid;?>
-
-Charge type:                  post->chargetype;?>
-
-Timestamp (from XXXXXXXX):    post->datetime;?>
-
-VbV Status:                   post->ecistatus;?>
-
-https://XXXXX.XXXXXXXX.XXXXXX.com/XXXXX/XXXXXXX/XXXXXx
-_________________________________________________________________
-
-options['strict'] || (is_array($t->orderlines)  || is_object($t->orderlines))) foreach($t->orderlines as $i => $o) {?>
-
-
-  - - -   - - -   - - -   - - -   - - -   - - -   - - -   - - -
-
-
-*PRODUCT*:productname;?>
-
-          (producttypename;?>)
-
-*Edit*:   http://host);?>/admin/catalog/products/edit?id=product);?>
-
-FABRIC:   fabricname;?>
-
-SIZE:     sizename;?>
-
-Eurostop: altid;?>
-
-QUANTITY: quantity;?>
-
-Price ea: eachprice;?>
-
-Tax each: eachtax;?>
-
-Sub-total:                                       totalinctax;?>
-isgift)  {?>
-
-*GIFT MESSAGE* FOR THIS ITEM:
-giftmessage);?>
-
-_________________________________________________________________
-
-Item total (ex tax):                             totals->itemstotal;?>
-
-Item taxes:                                      totals->itemstax;?>
-
-Shipping:                                       
-totals->shippingcharges;?>
-
-Tax on shipping:                                 totals->shippingtax;?>
-
-*GRAND TOTAL*:                                   totals->grandtotal;?>
-
-_________________________________________________________________
-
-totals->itemsdiscountinfo;?>
-
-totals->itemstaxinfo;?>
-
-totals->shippinginfo;?>
-
-totals->shippingtaxinfo;?>
-
-_________________________________________________________________
-
-blah blah
-
---------------------------
-
-===With data file: bug_2959.html===
--------------------------
-Dear Administrator,
-
-     -- Automatically Generated Email from XXXXXXXXXX --
-
-     O R D E R   A W A I T I N G   A U T H O R I S A T I O N
-_________________________________________________________________
-
-ORDER:
-
-ID:       
-*Edit*:   http:///admin/sales/orders/edit?id=
-_________________________________________________________________
-
-CUSTOMER DETAILS:
-
-Name:      
-Email:    mailto:
-*Edit*:   http:///admin/sales/customers/edit?id=
-_________________________________________________________________
-
-SHIPPING TO:                                      
-
-**
-
-_________________________________________________________________
-
-XXXXXXXXXXXXXXXXXXX:
-
-**
-
-Total (currency?):            
-Client ID (XXXXXXXX):         
-Order ID:                     
-Charge type:                  
-Timestamp (from XXXXXXXX):    
-VbV Status:                   
-https://XXXXX.XXXXXXXX.XXXXXX.com/XXXXX/XXXXXXX/XXXXXx
-_________________________________________________________________
-
-
-_________________________________________________________________
-
-Item total (ex tax):                             
-Item taxes:                                      
-Shipping:                                       
-
-Tax on shipping:                                 
-*GRAND TOTAL*:                                   
-_________________________________________________________________
-
-
-
-
-
-_________________________________________________________________
-
-blah blah
-
---------------------------
\ No newline at end of file
diff --git a/HTML/Template/tests/test_conditions.html.phpt b/HTML/Template/tests/test_conditions.html.phpt
deleted file mode 100644
index 8b98f8d..0000000
--- a/HTML/Template/tests/test_conditions.html.phpt
+++ /dev/null
@@ -1,75 +0,0 @@
---TEST--
-Template Test: conditions.html
---FILE--
-Conditions
-
    a condition condition)  {?> hello  world 
    
-
    a negative condition condition)  {?> hello  world 
    
-
    a conditional method options['strict'] || (isset($t) && method_exists($t,'condition'))) if ($t->condition()) { ?> hello  world 
    
-
    a negative conditional method options['strict'] || (isset($t) && method_exists($t,'condition'))) if (!$t->condition()) { ?> hello  world 
    
-
-
-test)  {?>test
-options['strict'] || (isset($t) && method_exists($t,'test'))) if ($t->test()) { ?>test
-options['strict'] || (isset($t) && method_exists($t,'test'))) if ($t->test("aaa bbb",$t->ccc,"asdfasdf asdf ")) { ?>test
-
-
-
-
    Notices and errros
    
-
-
-notices)  {?>
- 
-  
-    
-      
-    
-    
-      
-    
-  
-
    Thanks
    
-      notices['ok'])  {?>
    Submitted data is ok
    
-      
    
- 
-errors)  {?>
-  
-    
-      
-    
-    
-      
-    
-  
-
    Sorry
    
-        
-      errors['lastname'])  {?>
  • Please fill in your last name
    • 
-   
-      
    
-
-
-===With data file: conditions.html===
-
-
-
    Conditions
    
-
    a condition  world 
    
-
    a negative condition  hello 
    
-
    a conditional method 
    
-
    a negative conditional method 
    
-
-
-
-
-
-
    Notices and errros
    
\ No newline at end of file
diff --git a/HTML/Template/tests/test_error_foreach.html.phpt b/HTML/Template/tests/test_error_foreach.html.phpt
deleted file mode 100644
index b16cfb0..0000000
--- a/HTML/Template/tests/test_error_foreach.html.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-Template Test: error_foreach.html
---FILE--
-xxx 
- {foreach:xxxx} {end:} 
--->
-
-
-
-===With data file: error_foreach.html===
-
-
-
-
\ No newline at end of file
diff --git a/HTML/Template/tests/test_flexy_tojavascript.html.phpt b/HTML/Template/tests/test_flexy_tojavascript.html.phpt
deleted file mode 100644
index e237ab9..0000000
--- a/HTML/Template/tests/test_flexy_tojavascript.html.phpt
+++ /dev/null
@@ -1,73 +0,0 @@
---TEST--
-Template Test: flexy_tojavascript.html
---FILE--
-
-
-
-Untitled Document
-
- 
- 
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    Example of flexy:toJavascript with default values.
    
-
-
-===With data file: flexy_tojavascript.html===
-
-
-
-Untitled Document
-
- 
- 
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
    Example of flexy:toJavascript with default values.
    
-
\ No newline at end of file
diff --git a/HTML/Template/tests/test_forms.html.phpt b/HTML/Template/tests/test_forms.html.phpt
deleted file mode 100644
index da72b06..0000000
--- a/HTML/Template/tests/test_forms.html.phpt
+++ /dev/null
@@ -1,1040 +0,0 @@
---TEST--
-Template Test: forms.html
---FILE--
- 'hello',
-    'test12a' => 'hello',
-    'test12ab' => 'hello',
-    'fred' => 'hello',
-    'aaa1' => 'hello',
-    'List' => '2000',
-    'testingxhtml' => 'checked',
-    
-));
-
-$elements["testingcheckbox"] = new HTML_Template_Flexy_Element;
-$elements["testingcheckbox"]->setValue(123);
-
-
-#bug6058
-$elements['payment_1_type'] = new HTML_Template_Flexy_Element;
-$elements['payment_1_type']->attributes['flexy:xhtml'] = true;
-$elements['payment_1_type']->setValue('cq');
-
-// this exhibits unusual behavior, but is not really a bug
-// actually the correct usage is to use '' where 'input' is.
-$elements['payment_2_type'] = new HTML_Template_Flexy_Element('input',
-				array('flexy:xhtml' => true));
-$elements['payment_2_type']->setValue('cq');
-
-
-
-
-compilefile('forms.html',
-    array(),
-    array(
-        'show_elements' => true
-    ),
-    $elements
-);
-
---EXPECTF--
-===Compiling forms.html===
-
-
-
-===Compiled file: forms.html===
-
-
    Form Not Parsed
    
-
-
    
-    
-    
-
    
-
-
    Parsed
    
-
-
-elements['test']->toHtmlnoClose();?>
-    Inputelements['test123']->toHtml();?>
-    Checkbox elements['test123a']->toHtml();?>
-    Hidden elements['test123ab']->toHtml();?>
-    elements['fred']->toHtml();?>
-    elements['aaa1']->toHtml();?>
-    
-    elements['aaa3']->toHtml();?>
-    
-    
-    elements['opt_1'];
-                $element = $this->mergeElement($element,$this->elements['opt[]']);
-                echo  $element->toHtml();?>
-    
-    elements['opt_2'];
-                $element = $this->mergeElement($element,$this->elements['opt[]']);
-                echo  $element->toHtml();?>
-    
-    elements['opt_3'];
-                $element = $this->mergeElement($element,$this->elements['opt[]']);
-                echo  $element->toHtml();?>
-    
-
-
-
-    
-    elements['List']->toHtml();?>
-    elements['_submit[4]']->toHtml();?>
-    elements['_submit[5]']->toHtml();?>
-    
-    elements['testupload']->toHtml();?>
-    
-    #bug  bug6058    
-
-    
    elements['1'];
-                $element = $this->mergeElement($element,$this->elements['payment_1_type']);
-                echo  $element->toHtml();?>
-        Credit card
-    
    elements['2'];
-                $element = $this->mergeElement($element,$this->elements['payment_1_type']);
-                echo  $element->toHtml();?>
-        Cheque
-
-    
    elements['3'];
-                $element = $this->mergeElement($element,$this->elements['payment_2_type']);
-                echo  $element->toHtml();?>
-        Credit card
-    
    elements['4'];
-                $element = $this->mergeElement($element,$this->elements['payment_2_type']);
-                echo  $element->toHtml();?>
-        Cheque
-    
-    
-    
-    
-
-
-elements['picture']->toHtml();?>
-
-
    Bug 1120:
    
-
    
-elements['testing']->toHtml();?>
-elements['_submit[2]']->toHtml();?>
-
    
-
-
    
-elements['testing2']->attributes['value'])) {
-    $this->elements['testing2']->attributes['value'] = '';
-    $this->elements['testing2']->attributes['value'] .=  htmlspecialchars($t->somevalue);
-}
-$_attributes_used = array('value');
-echo $this->elements['testing2']->toHtml();
-if (isset($_attributes_used)) {  foreach($_attributes_used as $_a) {
-    unset($this->elements['testing2']->attributes[$_a]);
-}}
-?>
-elements['_submit[1]']->toHtml();?>
-
    
-
-
     Bug 1275 XHTML output 
    
-elements['testingxhtml']->toHtml();?>
-elements['xhtmllisttest']->toHtml();?>
-
-
-
     Bug 4005 Checkboxes 
    
-elements['testingcheckbox']->toHtml();?>
-
-
-
-
-
-
-
-elements['test_mix']->attributes['action'])) {
-    $this->elements['test_mix']->attributes['action'] = '';
-    $this->elements['test_mix']->attributes['action'] .=  htmlspecialchars($t->someurl);
-}
-$_attributes_used = array('action');
-echo $this->elements['test_mix']->toHtmlnoClose();
-if (isset($_attributes_used)) {  foreach($_attributes_used as $_a) {
-    unset($this->elements['test_mix']->attributes[$_a]);
-}}
-?>
-elements['testing5']->attributes['value'])) {
-    $this->elements['testing5']->attributes['value'] = '';
-    $this->elements['testing5']->attributes['value'] .=  htmlspecialchars($t->somevalue);
-}
-$_attributes_used = array('value');
-echo $this->elements['testing5']->toHtml();
-if (isset($_attributes_used)) {  foreach($_attributes_used as $_a) {
-    unset($this->elements['testing5']->attributes[$_a]);
-}}
-?>
-elements['_submit[3]']->toHtml();?>
-
-Array
-(
-    [test] => html_template_flexy_element Object
-        (
-            [tag] => form
-            [attributes] => Array
-                (
-                    [name] => test
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [test123] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [name] => test123
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [test123a] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [name] => test123a
-                    [id] => test123ab
-                    [type] => checkbox
-                    [checked] => 1
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [test123ab] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [name] => test123ab
-                    [type] => hidden
-                    [value] => 123
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [fred] => html_template_flexy_element Object
-        (
-            [tag] => textarea
-            [attributes] => Array
-                (
-                    [name] => fred
-                )
-
-            [children] => Array
-                (
-                    [0] => some text
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [aaa1] => html_template_flexy_element Object
-        (
-            [tag] => select
-            [attributes] => Array
-                (
-                    [name] => aaa1
-                )
-
-            [children] => Array
-                (
-                    [0] => 
-        
-                    [1] => html_template_flexy_element Object
-                        (
-                            [tag] => option
-                            [attributes] => Array
-                                (
-                                )
-
-                            [children] => Array
-                                (
-                                    [0] => aa
-                                )
-
-                            [override] => 
-                            [prefix] => 
-                            [suffix] => 
-                            [value] => 
-                        )
-
-                    [2] => 
-	
-                    [3] => html_template_flexy_element Object
-                        (
-                            [tag] => option
-                            [attributes] => Array
-                                (
-                                    [selected] => 1
-                                )
-
-                            [children] => Array
-                                (
-                                    [0] => bb
-                                )
-
-                            [override] => 
-                            [prefix] => 
-                            [suffix] => 
-                            [value] => 
-                        )
-
-                    [4] => 
-        
-                    [5] => html_template_flexy_element Object
-                        (
-                            [tag] => option
-                            [attributes] => Array
-                                (
-                                )
-
-                            [children] => Array
-                                (
-                                    [0] => cc
-                                )
-
-                            [override] => 
-                            [prefix] => 
-                            [suffix] => 
-                            [value] => 
-                        )
-
-                    [6] => 
-    
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [aaa3] => html_template_flexy_element Object
-        (
-            [tag] => select
-            [attributes] => Array
-                (
-                    [name] => aaa3
-                )
-
-            [children] => Array
-                (
-                    [0] => 
-        
-                    [1] => html_template_flexy_element Object
-                        (
-                            [tag] => option
-                            [attributes] => Array
-                                (
-                                )
-
-                            [children] => Array
-                                (
-                                    [0] => aa
-                                )
-
-                            [override] => 
-                            [prefix] => 
-                            [suffix] => 
-                            [value] => 
-                        )
-
-                    [2] => 
-	
-                    [3] => html_template_flexy_element Object
-                        (
-                            [tag] => option
-                            [attributes] => Array
-                                (
-                                    [selected] => 1
-                                )
-
-                            [children] => Array
-                                (
-                                    [0] => bb
-                                )
-
-                            [override] => 
-                            [prefix] => 
-                            [suffix] => 
-                            [value] => 
-                        )
-
-                    [4] => 
-        
-                    [5] => html_template_flexy_element Object
-                        (
-                            [tag] => option
-                            [attributes] => Array
-                                (
-                                )
-
-                            [children] => Array
-                                (
-                                    [0] => cc
-                                )
-
-                            [override] => 
-                            [prefix] => 
-                            [suffix] => 
-                            [value] => 
-                        )
-
-                    [6] => 
-
-    
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [opt_1] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [id] => opt_1
-                    [type] => checkbox
-                    [name] => opt[]
-                    [value] => 1
-                    [/] => 1
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [opt_2] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [id] => opt_2
-                    [type] => checkbox
-                    [name] => opt[]
-                    [value] => 2
-                    [/] => 1
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [opt_3] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [id] => opt_3
-                    [type] => checkbox
-                    [name] => opt[]
-                    [value] => 3
-                    [/] => 1
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [List] => html_template_flexy_element Object
-        (
-            [tag] => select
-            [attributes] => Array
-                (
-                    [name] => List
-                )
-
-            [children] => Array
-                (
-                    [0] => 
-        
-                    [1] => html_template_flexy_element Object
-                        (
-                            [tag] => option
-                            [attributes] => Array
-                                (
-                                    [value] => 2000
-                                )
-
-                            [children] => Array
-                                (
-                                    [0] => 2000
-                                )
-
-                            [override] => 
-                            [prefix] => 
-                            [suffix] => 
-                            [value] => 
-                        )
-
-                    [2] => 
-        
-                    [3] => html_template_flexy_element Object
-                        (
-                            [tag] => option
-                            [attributes] => Array
-                                (
-                                    [value] => 2001
-                                )
-
-                            [children] => Array
-                                (
-                                    [0] => 2001
-                                )
-
-                            [override] => 
-                            [prefix] => 
-                            [suffix] => 
-                            [value] => 
-                        )
-
-                    [4] => 
-        
-                    [5] => html_template_flexy_element Object
-                        (
-                            [tag] => option
-                            [attributes] => Array
-                                (
-                                    [value] => 2002
-                                )
-
-                            [children] => Array
-                                (
-                                    [0] => 2002
-                                )
-
-                            [override] => 
-                            [prefix] => 
-                            [suffix] => 
-                            [value] => 
-                        )
-
-                    [6] => 
-    
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [_submit[4]] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [type] => submit
-                    [name] => _submit[4]
-                    [value] => Next >>
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [_submit[5]] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [type] => submit
-                    [name] => _submit[5]
-                    [value] => Next >>
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [testupload] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [type] => file
-                    [name] => testupload
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [payment_1_type] => 
-    [1] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [type] => radio
-                    [name] => payment_1_type
-                    [id] => 1
-                    [value] => cc
-                    [/] => 1
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [2] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [type] => radio
-                    [name] => payment_1_type
-                    [id] => 2
-                    [value] => cq
-                    [/] => 1
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [payment_2_type] => 
-    [3] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [type] => radio
-                    [name] => payment_2_type
-                    [id] => 3
-                    [value] => cc
-                    [/] => 1
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [4] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [type] => radio
-                    [name] => payment_2_type
-                    [id] => 4
-                    [value] => cq
-                    [/] => 1
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [picture] => html_template_flexy_element Object
-        (
-            [tag] => img
-            [attributes] => Array
-                (
-                    [name] => picture
-                    [id] => picture
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [testing] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [name] => testing
-                    [value] => test
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [_submit[2]] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [type] => submit
-                    [value] => x
-                    [name] => _submit[2]
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [testing2] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [name] => testing2
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [_submit[1]] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [type] => submit
-                    [name] => _submit[1]
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [testingxhtml] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [type] => checkbox
-                    [name] => testingxhtml
-                    [checked] => 1
-                    [flexy:xhtml] => 1
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [xhtmllisttest] => html_template_flexy_element Object
-        (
-            [tag] => select
-            [attributes] => Array
-                (
-                    [name] => xhtmllisttest
-                    [flexy:xhtml] => 1
-                )
-
-            [children] => Array
-                (
-                    [0] => 
-
-
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [testingcheckbox] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [type] => checkbox
-                    [name] => testingcheckbox
-                    [value] => 123
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [test_mix] => html_template_flexy_element Object
-        (
-            [tag] => form
-            [attributes] => Array
-                (
-                    [name] => test_mix
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [testing5] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [name] => testing5
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-    [_submit[3]] => html_template_flexy_element Object
-        (
-            [tag] => input
-            [attributes] => Array
-                (
-                    [type] => submit
-                    [name] => _submit[3]
-                )
-
-            [children] => Array
-                (
-                )
-
-            [override] => 
-            [prefix] => 
-            [suffix] => 
-            [value] => 
-        )
-
-)
-
-
-===With data file: forms.html===
-
-
    Form Not Parsed
    
-
-
    
-    
-    
-
    
-
-
    Parsed
    
-
-
-
        Input    Checkbox     Hidden             
-        
-    
-        
-        
-        
-
-
-
-    
-                
-        
-    #bug  bug6058    
-
-    
            Credit card
-    
            Cheque
-
-    
            Credit card
-    
            Cheque
-    
-    
-    
-    
-
    
-
-
-
    Bug 1120:
    
-
    
-
    
-
-
    
-
    
-
-
     Bug 1275 XHTML output 
    
-
-
-
     Bug 4005 Checkboxes 
    
-
-
-
-
-
-
-
-
    
\ No newline at end of file
diff --git a/HTML/Template/tests/test_function.html.phpt b/HTML/Template/tests/test_function.html.phpt
deleted file mode 100644
index e00a6d7..0000000
--- a/HTML/Template/tests/test_function.html.phpt
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-Template Test: function.html
---FILE--
-this is the contents of test1
-
    Example of function block definitions
    
-
-
-false)  {?>
-
-
    
-    
-
    
-
-
-
    
-   
-   a_value)) call_user_func_array('_html_template_flexy_compiler_flexy_flexy_'.$t->a_value,array($t,$this));?>
-
    
-
-    
-
-===With data file: function.html===
-
    Example of function block definitions
    
-
-
-
-
-
    
-   this is the contents of test1   
    
\ No newline at end of file
diff --git a/HTML/Template/tests/test_globals.html.phpt b/HTML/Template/tests/test_globals.html.phpt
deleted file mode 100644
index a7fa314..0000000
--- a/HTML/Template/tests/test_globals.html.phpt
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-Template Test: globals.html
---FILE--
-
-
-  
-    options['strict'] || (is_array($t->images)  || is_object($t->images))) foreach($t->images as $row) {?>
-      options['strict'] || (is_array($row)  || is_object($row))) foreach($row as $col) {?>
    
-            [name);?>] size);?>Mb
-      
-    
-  
-
-
-
-
-
-===With data file: image_view.html===
-
-
-
-
-  
-      
-
    
\ No newline at end of file
diff --git a/HTML/Template/tests/test_include.html.phpt b/HTML/Template/tests/test_include.html.phpt
deleted file mode 100644
index 286e7e1..0000000
--- a/HTML/Template/tests/test_include.html.phpt
+++ /dev/null
@@ -1,107 +0,0 @@
---TEST--
-Template Test: include.html
---FILE--
- range('a', 'z'),
-	    'foo'   => 'bar',
-    )
-    
-);
-
---EXPECTF--
-===Compiling include.html===
-
-
-
-===Compiled file: include.html===
-
-	
-
-    the variable is foo);?>
-
-    
-        options['strict'] || (is_array($t->range)  || is_object($t->range))) foreach($t->range as $key => $value) {?>
-            options);
-$x->compile('include_block.html');
-$_t = function_exists('clone') ? clone($t) : $t;
-foreach(get_defined_vars()  as $k=>$v) {
-    if ($k != 't') { $_t->$k = $v; }
-}
-$x->outputObject($_t, $this->elements);
-?>
-        
-    
    
-
-	
-
-
-
-===With data file: include.html===
-
-	
-
-    the variable is bar
-    
-        
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
-                
-    
    0a        
    1b        
    2c        
    3d        
    4e        
    5f        
    6g        
    7h        
    8i        
    9j        
    10k        
    11l        
    12m        
    13n        
    14o        
    15p        
    16q        
    17r        
    18s        
    19t        
    20u        
    21v        
    22w        
    23x        
    24y        
    25z        
        
    
-
-	
-
\ No newline at end of file
diff --git a/HTML/Template/tests/test_javascript.html.phpt b/HTML/Template/tests/test_javascript.html.phpt
deleted file mode 100644
index 14e1687..0000000
--- a/HTML/Template/tests/test_javascript.html.phpt
+++ /dev/null
@@ -1,171 +0,0 @@
---TEST--
-Template Test: javascript.html
---FILE--
-
-
-
-Untitled Document
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
- 
-
-
-
-
-
-===With data file: javascript.html===
-
-
-
-Untitled Document
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
- 
-
-
-
-
\ No newline at end of file
diff --git a/HTML/Template/tests/test_looping.html.phpt b/HTML/Template/tests/test_looping.html.phpt
deleted file mode 100644
index 06a8b7f..0000000
--- a/HTML/Template/tests/test_looping.html.phpt
+++ /dev/null
@@ -1,109 +0,0 @@
---TEST--
-Template Test: looping.html
---FILE--
-array(1,2,3,4)));
-
---EXPECTF--
-===Compiling looping.html===
-
-
-
-===Compiled file: looping.html===
-
-
-
    Looping
    
-
-
-
    a loop options['strict'] || (is_array($t->loop)  || is_object($t->loop))) foreach($t->loop as $a) {?>  
    
-
    a loop with 2 vars options['strict'] || (is_array($t->loop)  || is_object($t->loop))) foreach($t->loop as $a => $b) {?> 
-     , 
-    
-
    
-
-Bug #84
-options['strict'] || (is_array($t->list)  || is_object($t->list))) foreach($t->list as $i) {?>
-  options['strict'] || (isset($t) && method_exists($t,'method'))) echo htmlspecialchars($t->method($i));?>
-
-
-options['strict'] || (is_array($t->list)  || is_object($t->list))) foreach($t->list as $i => $j) {?>
-    :
-
-
-
-    options['strict'] || (is_array($t->xyz)  || is_object($t->xyz))) foreach($t->xyz as $abcd => $def) {?>
-        
-    
-
    , options['strict'] || (isset($t) && method_exists($t,'test'))) echo htmlspecialchars($t->test($def));?>
    
-
-
-
    HTML tags example using foreach="loop,a,b" or the tr
    
-
-  options['strict'] || (is_array($t->loop)  || is_object($t->loop))) foreach($t->loop as $a => $b) {?> 
-    
-    
-  
-
    
-
-
    HTML tags example using foreach="loop,a" or the tr using a highlight class.
    
-
-  options['strict'] || (is_array($t->loop)  || is_object($t->loop))) foreach($t->loop as $a) {?> 
-    
-    showtext)  {?>
-    showtext)  {?>
-  
-
    a istext);?>price,2,'.',',');?>
    
-
-
    HTML tags example using foreach="loop,a,b" or the tr
    
-
-  options['strict'] || (is_array($t->loop)  || is_object($t->loop))) foreach($t->loop as $a => $b) {?> 
-    options['strict'] || (is_array($b)  || is_object($b))) foreach($b as $c => $d) {?>
-  
-
    
-
-
    Looping in CDATA
    
-Dont forget that php strips line breaks!
-options['strict'] || (is_array($t->list)  || is_object($t->list))) foreach($t->list as $i => $j) {?>
-    :
-    
-
-]]>
-
-===With data file: looping.html===
-
-
-
    Looping
    
-
-
-
    a loop 
    
-
    a loop with 2 vars 
    
-
-Bug #84
-        
-    0:1    1:2    2:3    3:4
-
-    
    
-
-
-
    HTML tags example using foreach="loop,a,b" or the tr
    
-
-  
    
-
-
    HTML tags example using foreach="loop,a" or the tr using a highlight class.
    
-
-  
    
-
-
    HTML tags example using foreach="loop,a,b" or the tr
    
-
-  
    
-
-
    Looping in CDATA
    
-Dont forget that php strips line breaks!
-
\ No newline at end of file
diff --git a/HTML/Template/tests/test_methods.html.phpt b/HTML/Template/tests/test_methods.html.phpt
deleted file mode 100644
index 4d996eb..0000000
--- a/HTML/Template/tests/test_methods.html.phpt
+++ /dev/null
@@ -1,123 +0,0 @@
---TEST--
-Template Test: methods.html
---FILE--
-Methods
-
    Calling a method options['strict'] || (isset($t->a) && method_exists($t->a,'helloWorld'))) echo htmlspecialchars($t->a->helloWorld());?>
    
-
    or options['strict'] || (isset($t) && method_exists($t,'includeBody'))) echo $t->includeBody();?>
    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    Full Method testing
    
-
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo htmlspecialchars($t->abc($t->abc,$t->def,$t->hij));?>
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo htmlspecialchars($t->abc($t->abc,"def","hij"));?>
-
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo htmlspecialchars($t->abc($t->abc,$t->def,"hij"));?>
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo htmlspecialchars($t->abc("abc",$t->def,$t->hij));?>
-
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo $t->abc($t->abc,$t->def,$t->hij);?>
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo $t->abc($t->abc,"def","hij");?>
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo $t->abc($t->abc,$t->def,"hij");?>
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo $t->abc("abc",$t->def,$t->hij);?>
-
-
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo urlencode($t->abc($t->abc,$t->def,$t->hij));?>
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo urlencode($t->abc($t->abc,"def","hij"));?>
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo urlencode($t->abc($t->abc,$t->def,"hij"));?>
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo urlencode($t->abc("abc",$t->def,$t->hij));?>
-
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo htmlspecialchars($t->abc(123,$t->def,$t->hij));?>
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo urlencode($t->abc($t->abc,123,123));?>
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo htmlspecialchars($t->abc($t->abc,$t->def,123));?>
-options['strict'] || (isset($t) && method_exists($t,'abc'))) echo urlencode($t->abc("abc",123,$t->hij));?>
-
-
-
    Real life method testing 
    
-Invoice number: options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"number"));?> Place: 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"place"));?> Date: options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"date"));?> Payment: 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"payment"));?> Payment date: 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->invoice,"payment_date"));?> Seller: Name 1: 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"name1"));?> Name 2: options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"name2"));?> NIP: 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"nip"));?> Street: options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"street"));?> City: 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"code"));?> options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->seller,"city"));?> Buyer: Name 1: 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"name1"));?> Name 2: options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"name2"));?> NIP: 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"nip"));?> Street: options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"street"));?> City: 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"code"));?> options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($t->buyer,"city"));?>
-# 	Name show_pkwiu)  {?>	PKWIU 	Count 	Netto 	VAT 	Brutto
-options['strict'] || (is_array($t->positions)  || is_object($t->positions))) foreach($t->positions as $position) {?> options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"nr"));?> 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"name"));?> show_pkwiu)  {?> 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"pkwiu"));?> 	options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"count"));?> 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"netto"));?> 	options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"vat"));?> 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"brutto"));?>
- edit_positions)  {?> # 	Name show_pkwiu)  {?>	PKWIU 	Count 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) if ($t->getelem($t->position,"netto_mode")) { ?>	Netto	 	VAT 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) if ($t->getelem($t->position,"netto_mode")) { ?>		Brutto
-options['strict'] || (is_array($t->edit_positions)  || is_object($t->edit_positions))) foreach($t->edit_positions as $k => $position) {?> options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($position,"nr"));?> 
-show_pkwiu)  {?> 	 	options['strict'] || (isset($t) && method_exists($t,'getelem'))) if ($t->getelem($position,"netto_mode")) { ?> 	 
- 	options['strict'] || (isset($t) && method_exists($t,'getelem'))) if ($t->getelem($position,"netto_mode")) { ?> 		
-  # 	
-options['strict'] || (is_array($t->sum)  || is_object($t->sum))) foreach($t->sum as $sum) {?> options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($sum,"nr"));?> 		options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($sum,"netto"));?> 
-options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($sum,"vat"));?> 	options['strict'] || (isset($t) && method_exists($t,'getelem'))) echo htmlspecialchars($t->getelem($sum,"brutto"));?>
-
-
-
-===With data file: methods.html===
-
-
    Methods
    
-
    Calling a method 
    
-
    or 
    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    Full Method testing
    
-
-
-
-
-
-
-
-
-
    Real life method testing 
    
-Invoice number:  Place: 
- Date:  Payment: 
- Payment date: 
- Seller: Name 1: 
- Name 2:  NIP: 
- Street:  City: 
-  Buyer: Name 1: 
- Name 2:  NIP: 
- Street:  City: 
- # 	Name  	Count 	Netto 	VAT 	Brutto
-  #
\ No newline at end of file
diff --git a/HTML/Template/tests/test_namespaces.html.phpt b/HTML/Template/tests/test_namespaces.html.phpt
deleted file mode 100644
index c3d3e85..0000000
--- a/HTML/Template/tests/test_namespaces.html.phpt
+++ /dev/null
@@ -1,121 +0,0 @@
---TEST--
-Template Test: namespaces.html
---FILE--
-?xml version="1.0" ?>
-?xml-stylesheet href="chrome://global/skin/" type="text/css" ?>
-?xml-stylesheet href="/myproject/images/css/test.css" type="text/css" ?>
-
-
- 
-        
-                
-                        
-                        
-                        
-                
-                
-                        options['strict'] || (is_array($t->sresult)  || is_object($t->sresult))) foreach($t->sresult as $id => $data) {?>
-                                
-                                        
-                                        
-                                        
-                                
-                        
-                
-        
-        elements['test']->toHtmlnoClose();?>
-            elements['test2']->toHtml();?>
-            
-              
-                
-                  
-             
-            
-        
-        elements['atest']->toHtml();
-if (isset($_attributes_used)) {  foreach($_attributes_used as $_a) {
-    unset($this->elements['atest']->attributes[$_a]);
-}}
-?>
-        
-        
-            options['strict'] || (is_array($t->categories)  || is_object($t->categories))) foreach($t->categories as $data) {?>name);?>
-        
-        
-        
-         elements['supplier_id']->toHtml();?>
-        
-        
-        
-            
-                    options['strict'] || (is_array($t->x)  || is_object($t->x))) foreach($t->x as $y) {?>
-            
-        
-        
-        
-           elements['product_category']->toHtml();?>
-        
-
-
-
-===With data file: namespaces.html===
-
-
-
-
-
- 
-        
-                
-                        
-                        
-                        
-                
-                
-                                        
-        
-                                
-              
-                
-                  
-             
-            
-        
-        
-            data.name
-                
-        
-                    
-        
-        
-         
-            
-                    
-            
-                
-        
-        
-            
-                                
-        
-        
-        
-           
-            
-                
-            
-                
-
\ No newline at end of file
diff --git a/HTML/Template/tests/test_plugin_modifiers.html.phpt b/HTML/Template/tests/test_plugin_modifiers.html.phpt
deleted file mode 100644
index e5fda76..0000000
--- a/HTML/Template/tests/test_plugin_modifiers.html.phpt
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-Template Test: plugin_modifiers.html
---FILE--
-  10000.123,
-		'datetest' =>  '2004-01-12'
-	), 
-	array('plugins'=>array('Savant'))
-);
-
-compilefile('flexy_raw_with_element.html', 
-	array( ), 
-	array( )
- 
-);
---EXPECTF--
-<<<<<<< test_plugin_modifiers.html.phpt
-=======
-===Compiling plugin_modifiers.html===
-
-
-
-===Compiled file: plugin_modifiers.html===
-
    Testing Plugin Modifiers
    
-
-
-plugin("dateformat",$t->datetest);?>
-
-plugin("numberformat",$t->numbertest);?>
-
-
-Bug #3946 - inside raw!
- 
-options['strict'] || (isset($t->person) && method_exists($t->person,'useTextarea'))) echo $this->plugin("checked",$t->person->useTextarea());?>>
-
- 
-
-===With data file: plugin_modifiers.html===
-
    Testing Plugin Modifiers
    
-
-
-12 Jan 2004
-10,000.12
-
-Bug #3946 - inside raw!
- 
-
-
- 
-
-===Compiling flexy_raw_with_element.html===
-
-Error:/var/svn_live/pear/HTML_Template_Flexy/tests/templates/flexy_raw_with_element.html on Line 5 in Tag <INPUT>:
    Flexy:raw can only be used with flexy:ignore, to prevent conversion of html elements to flexy elements>>>>>>> 1.3
diff --git a/HTML/Template/tests/test_raw_php.html.phpt b/HTML/Template/tests/test_raw_php.html.phpt
deleted file mode 100644
index 240f0fe..0000000
--- a/HTML/Template/tests/test_raw_php.html.phpt
+++ /dev/null
@@ -1,68 +0,0 @@
---TEST--
-Template Test: raw_php.html
---FILE--
-true));
-compilefile('raw_php.html',array(), array('allowPHP'=>'delete'));
-
-
---EXPECTF--
-===Compiling raw_php.html===
-
-===Compile failure==
-[pear_error: message="HTML_Template_Flexy fatal error:PHP code found in script (Token)" code=-1 mode=return level=notice prefix="" info=""]
-
-
-===Compiling raw_php.html===
-
-
-
-===Compiled file: raw_php.html===
-
-
-number: 
-
-
-
-
-
-===With data file: raw_php.html===
-
-number: 0number: 1number: 2number: 3number: 4number: 5number: 6number: 7number: 8number: 9
-hello world
-hello world
-hello world
-hello world
-hello world
-hello world
-hello world
-hello world
-hello world
-hello world
-
-
-===Compiling raw_php.html===
-
-
-
-===Compiled file: raw_php.html===
-
-
-number: 
-
-
-
-
-
-===With data file: raw_php.html===
-
-
-number:
\ No newline at end of file
diff --git a/HTML/Template/tests/test_raw_text.html.phpt b/HTML/Template/tests/test_raw_text.html.phpt
deleted file mode 100644
index 297bb31..0000000
--- a/HTML/Template/tests/test_raw_text.html.phpt
+++ /dev/null
@@ -1,64 +0,0 @@
---TEST--
-Template Test: raw_text.html
---FILE--
-
-
-
-Untitled Document
- 
-
-
    Example Template for HTML_Template_Flexy
    
-
- a full string example ~!@#$%^&*() |": ?\][;'/.,=-_+ ~` abcd....
- asfasfdas
- 
- 
- 
-
    Bugs: 809 Comments:
    
-
-
-
-
-
-
-
-
-
-
- 
-
-===With data file: raw_text.html===
-
-
-
-Untitled Document
- 
-
-
    Example Template for HTML_Template_Flexy
    
-
- a full string example ~!@#$%^&*() |": ?\][;'/.,=-_+ ~` abcd....
- asfasfdas
- 
- 
- 
-
    Bugs: 809 Comments:
    
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/HTML/Template/tests/test_style.html.phpt b/HTML/Template/tests/test_style.html.phpt
deleted file mode 100644
index bea91b0..0000000
--- a/HTML/Template/tests/test_style.html.phpt
+++ /dev/null
@@ -1,69 +0,0 @@
---TEST--
-Template Test: style.html
---FILE--
-ROOT_CSS);?>/print.css">
-
-
-
-
-
-===With data file: style.html===
-
- 
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/HTML/Template/tests/test_variables.html.phpt b/HTML/Template/tests/test_variables.html.phpt
deleted file mode 100644
index 2f94fde..0000000
--- a/HTML/Template/tests/test_variables.html.phpt
+++ /dev/null
@@ -1,83 +0,0 @@
---TEST--
-Template Test: variables.html
---FILE--
-
-
-
-Untitled Document
- 
-
-
    Example Template for HTML_Template_Flexy
    
- 
-
    Variables
    
-
-
    Standard variables 
-hello);?> 
-world;?>
-test);?>
-object->var);?>
-array[0]);?>
-array['entry']);?>
-multi['array'][0]);?>
-object->var['array'][1]);?>
-'; echo htmlspecialchars(print_r($t->object->var['array'][1],true)); echo '
    ';;?>
-object->var['array'][1];?>
-object->var['array'][-1];?>
-object['array']->with['objects']);?>
-Long string with NL2BR + HTMLSPECIALCHARS
-longstring));?>
-
-Everything: '; echo htmlspecialchars(print_r($t,true)); echo '
    ';;?>
-an Object: '; echo htmlspecialchars(print_r($t->object,true)); echo '
    ';;?>
-
-
-
-
-
-
-
-
-
    
-
-
-
-
-===With data file: variables.html===
-
-
-
-Untitled Document
- 
-
-
    Example Template for HTML_Template_Flexy
    
- 
-
    Variables
    
-
-
    Standard variables 
- 
-
    Long string with NL2BR + HTMLSPECIALCHARS
-
-Everything: 
    stdClass Object
-(
-)
-
    an Object: 
    
-
-
-
-
-
-
-
-
    
-
-
\ No newline at end of file
diff --git a/PEAR.php b/PEAR.php
deleted file mode 100644
index 8dbc6c7..0000000
--- a/PEAR.php
+++ /dev/null
@@ -1,1108 +0,0 @@
-
- * @author     Stig Bakken 
- * @author     Tomas V.V.Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: PEAR.php,v 1.101 2006/04/25 02:41:03 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**#@+
- * ERROR constants
- */
-define('PEAR_ERROR_RETURN',     1);
-define('PEAR_ERROR_PRINT',      2);
-define('PEAR_ERROR_TRIGGER',    4);
-define('PEAR_ERROR_DIE',        8);
-define('PEAR_ERROR_CALLBACK',  16);
-/**
- * WARNING: obsolete
- * @deprecated
- */
-define('PEAR_ERROR_EXCEPTION', 32);
-/**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
-                    version_compare(zend_version(), "2-dev", "ge")));
-
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    define('OS_WINDOWS', true);
-    define('OS_UNIX',    false);
-    define('PEAR_OS',    'Windows');
-} else {
-    define('OS_WINDOWS', false);
-    define('OS_UNIX',    true);
-    define('PEAR_OS',    'Unix'); // blatant assumption
-}
-
-// instant backwards compatibility
-if (!defined('PATH_SEPARATOR')) {
-    if (OS_WINDOWS) {
-        define('PATH_SEPARATOR', ';');
-    } else {
-        define('PATH_SEPARATOR', ':');
-    }
-}
-
-$GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
-$GLOBALS['_PEAR_default_error_options']  = E_USER_NOTICE;
-$GLOBALS['_PEAR_destructor_object_list'] = array();
-$GLOBALS['_PEAR_shutdown_funcs']         = array();
-$GLOBALS['_PEAR_error_handler_stack']    = array();
-
-@ini_set('track_errors', true);
-
-/**
- * Base class for other PEAR classes.  Provides rudimentary
- * emulation of destructors.
- *
- * If you want a destructor in your class, inherit PEAR and make a
- * destructor method called _yourclassname (same name as the
- * constructor, but with a "_" prefix).  Also, in your constructor you
- * have to call the PEAR constructor: $this->PEAR();.
- * The destructor method will be called without parameters.  Note that
- * at in some SAPI implementations (such as Apache), any output during
- * the request shutdown (in which destructors are called) seems to be
- * discarded.  If you need to get any debug information from your
- * destructor, use error_log(), syslog() or something similar.
- *
- * IMPORTANT! To use the emulated destructors you need to create the
- * objects by reference: $obj =& new PEAR_child;
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Tomas V.V. Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @see        PEAR_Error
- * @since      Class available since PHP 4.0.2
- * @link        http://pear.php.net/manual/en/core.pear.php#core.pear.pear
- */
-class PEAR
-{
-    // {{{ properties
-
-    /**
-     * Whether to enable internal debug messages.
-     *
-     * @var     bool
-     * @access  private
-     */
-    var $_debug = false;
-
-    /**
-     * Default error mode for this object.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_mode = null;
-
-    /**
-     * Default error options used for this object when error mode
-     * is PEAR_ERROR_TRIGGER.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_options = null;
-
-    /**
-     * Default error handler (callback) for this object, if error mode is
-     * PEAR_ERROR_CALLBACK.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_default_error_handler = '';
-
-    /**
-     * Which class to use for error objects.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_error_class = 'PEAR_Error';
-
-    /**
-     * An array of expected errors.
-     *
-     * @var     array
-     * @access  private
-     */
-    var $_expected_errors = array();
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * Constructor.  Registers this object in
-     * $_PEAR_destructor_object_list for destructor emulation if a
-     * destructor object exists.
-     *
-     * @param string $error_class  (optional) which class to use for
-     *        error objects, defaults to PEAR_Error.
-     * @access public
-     * @return void
-     */
-    function PEAR($error_class = null)
-    {
-        $classname = strtolower(get_class($this));
-        if ($this->_debug) {
-            print "PEAR constructor called, class=$classname\n";
-        }
-        if ($error_class !== null) {
-            $this->_error_class = $error_class;
-        }
-        while ($classname && strcasecmp($classname, "pear")) {
-            $destructor = "_$classname";
-            if (method_exists($this, $destructor)) {
-                global $_PEAR_destructor_object_list;
-                $_PEAR_destructor_object_list[] = &$this;
-                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-                    register_shutdown_function("_PEAR_call_destructors");
-                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-                }
-                break;
-            } else {
-                $classname = get_parent_class($classname);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ destructor
-
-    /**
-     * Destructor (the emulated type of...).  Does nothing right now,
-     * but is included for forward compatibility, so subclass
-     * destructors should always call it.
-     *
-     * See the note in the class desciption about output from
-     * destructors.
-     *
-     * @access public
-     * @return void
-     */
-    function _PEAR() {
-        if ($this->_debug) {
-            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
-        }
-    }
-
-    // }}}
-    // {{{ getStaticProperty()
-
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
-        return $properties[$class][$var];
-    }
-
-    // }}}
-    // {{{ registerShutdownFunc()
-
-    /**
-    * Use this function to register a shutdown method for static
-    * classes.
-    *
-    * @access public
-    * @param  mixed $func  The function name (or array of class/method) to call
-    * @param  mixed $args  The arguments to pass to the function
-    * @return void
-    */
-    function registerShutdownFunc($func, $args = array())
-    {
-        // if we are called statically, there is a potential
-        // that no shutdown func is registered.  Bug #6445
-        if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-            register_shutdown_function("_PEAR_call_destructors");
-            $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-        }
-        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
-    }
-
-    // }}}
-    // {{{ isError()
-
-    /**
-     * Tell whether a value is a PEAR error.
-     *
-     * @param   mixed $data   the value to test
-     * @param   int   $code   if $data is an error object, return true
-     *                        only if $code is a string and
-     *                        $obj->getMessage() == $code or
-     *                        $code is an integer and $obj->getCode() == $code
-     * @access  public
-     * @return  bool    true if parameter is an error
-     */
-    function isError($data, $code = null)
-    {
-        if (is_a($data, 'PEAR_Error')) {
-            if (is_null($code)) {
-                return true;
-            } elseif (is_string($code)) {
-                return $data->getMessage() == $code;
-            } else {
-                return $data->getCode() == $code;
-            }
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ setErrorHandling()
-
-    /**
-     * Sets how errors generated by this object should be handled.
-     * Can be invoked both in objects and statically.  If called
-     * statically, setErrorHandling sets the default behaviour for all
-     * PEAR objects.  If called in an object, setErrorHandling sets
-     * the default behaviour for that object.
-     *
-     * @param int $mode
-     *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options
-     *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
-     *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *
-     *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
-     *        to be the callback function or method.  A callback
-     *        function is a string with the name of the function, a
-     *        callback method is an array of two elements: the element
-     *        at index 0 is the object, and the element at index 1 is
-     *        the name of the method to call in the object.
-     *
-     *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
-     *        a printf format string used when printing the error
-     *        message.
-     *
-     * @access public
-     * @return void
-     * @see PEAR_ERROR_RETURN
-     * @see PEAR_ERROR_PRINT
-     * @see PEAR_ERROR_TRIGGER
-     * @see PEAR_ERROR_DIE
-     * @see PEAR_ERROR_CALLBACK
-     * @see PEAR_ERROR_EXCEPTION
-     *
-     * @since PHP 4.0.5
-     */
-
-    function setErrorHandling($mode = null, $options = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $setmode     = &$this->_default_error_mode;
-            $setoptions  = &$this->_default_error_options;
-        } else {
-            $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-            $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        }
-
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-    }
-
-    // }}}
-    // {{{ expectError()
-
-    /**
-     * This method is used to tell which errors you expect to get.
-     * Expected errors are always returned with error mode
-     * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
-     * and this method pushes a new element onto it.  The list of
-     * expected errors are in effect until they are popped off the
-     * stack with the popExpect() method.
-     *
-     * Note that this method can not be called statically
-     *
-     * @param mixed $code a single error code or an array of error codes to expect
-     *
-     * @return int     the new depth of the "expected errors" stack
-     * @access public
-     */
-    function expectError($code = '*')
-    {
-        if (is_array($code)) {
-            array_push($this->_expected_errors, $code);
-        } else {
-            array_push($this->_expected_errors, array($code));
-        }
-        return sizeof($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ popExpect()
-
-    /**
-     * This method pops one element off the expected error codes
-     * stack.
-     *
-     * @return array   the list of error codes that were popped
-     */
-    function popExpect()
-    {
-        return array_pop($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ _checkDelExpect()
-
-    /**
-     * This method checks unsets an error code if available
-     *
-     * @param mixed error code
-     * @return bool true if the error code was unset, false otherwise
-     * @access private
-     * @since PHP 4.3.0
-     */
-    function _checkDelExpect($error_code)
-    {
-        $deleted = false;
-
-        foreach ($this->_expected_errors AS $key => $error_array) {
-            if (in_array($error_code, $error_array)) {
-                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
-                $deleted = true;
-            }
-
-            // clean up empty arrays
-            if (0 == count($this->_expected_errors[$key])) {
-                unset($this->_expected_errors[$key]);
-            }
-        }
-        return $deleted;
-    }
-
-    // }}}
-    // {{{ delExpect()
-
-    /**
-     * This method deletes all occurences of the specified element from
-     * the expected error codes stack.
-     *
-     * @param  mixed $error_code error code that should be deleted
-     * @return mixed list of error codes that were deleted or error
-     * @access public
-     * @since PHP 4.3.0
-     */
-    function delExpect($error_code)
-    {
-        $deleted = false;
-
-        if ((is_array($error_code) && (0 != count($error_code)))) {
-            // $error_code is a non-empty array here;
-            // we walk through it trying to unset all
-            // values
-            foreach($error_code as $key => $error) {
-                if ($this->_checkDelExpect($error)) {
-                    $deleted =  true;
-                } else {
-                    $deleted = false;
-                }
-            }
-            return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-        } elseif (!empty($error_code)) {
-            // $error_code comes alone, trying to unset it
-            if ($this->_checkDelExpect($error_code)) {
-                return true;
-            } else {
-                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-            }
-        } else {
-            // $error_code is empty
-            return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
-        }
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    /**
-     * This method is a wrapper that returns an instance of the
-     * configured error class with this object's default error
-     * handling applied.  If the $mode and $options parameters are not
-     * specified, the object's defaults are used.
-     *
-     * @param mixed $message a text error message or a PEAR error object
-     *
-     * @param int $code      a numeric error code (it is up to your class
-     *                  to define these if you want to use codes)
-     *
-     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
-     *                  specifies the PHP-internal error level (one of
-     *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *                  If $mode is PEAR_ERROR_CALLBACK, this
-     *                  parameter specifies the callback function or
-     *                  method.  In other error modes this parameter
-     *                  is ignored.
-     *
-     * @param string $userinfo If you need to pass along for example debug
-     *                  information, this parameter is meant for that.
-     *
-     * @param string $error_class The returned error object will be
-     *                  instantiated from this class, if specified.
-     *
-     * @param bool $skipmsg If true, raiseError will only pass error codes,
-     *                  the error message parameter will be dropped.
-     *
-     * @access public
-     * @return object   a PEAR error object
-     * @see PEAR::setErrorHandling
-     * @since PHP 4.0.5
-     */
-    function &raiseError($message = null,
-                         $code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $error_class = null,
-                         $skipmsg = false)
-    {
-        // The error is yet a PEAR error object
-        if (is_object($message)) {
-            $code        = $message->getCode();
-            $userinfo    = $message->getUserInfo();
-            $error_class = $message->getType();
-            $message->error_message_prefix = '';
-            $message     = $message->getMessage();
-        }
-
-        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
-            if ($exp[0] == "*" ||
-                (is_int(reset($exp)) && in_array($code, $exp)) ||
-                (is_string(reset($exp)) && in_array($message, $exp))) {
-                $mode = PEAR_ERROR_RETURN;
-            }
-        }
-        // No mode given, try global ones
-        if ($mode === null) {
-            // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            // Global error handler
-            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
-                $mode    = $GLOBALS['_PEAR_default_error_mode'];
-                $options = $GLOBALS['_PEAR_default_error_options'];
-            }
-        }
-
-        if ($error_class !== null) {
-            $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
-            $ec = $this->_error_class;
-        } else {
-            $ec = 'PEAR_Error';
-        }
-        if ($skipmsg) {
-            $a = &new $ec($code, $mode, $options, $userinfo);
-            return $a;
-        } else {
-            $a = &new $ec($message, $code, $mode, $options, $userinfo);
-            return $a;
-        }
-    }
-
-    // }}}
-    // {{{ throwError()
-
-    /**
-     * Simpler form of raiseError with fewer options.  In most cases
-     * message, code and userinfo are enough.
-     *
-     * @param string $message
-     *
-     */
-    function &throwError($message = null,
-                         $code = null,
-                         $userinfo = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $a = &$this->raiseError($message, $code, null, null, $userinfo);
-            return $a;
-        } else {
-            $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
-            return $a;
-        }
-    }
-
-    // }}}
-    function staticPushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-        $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        $stack[] = array($def_mode, $def_options);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $def_mode = $mode;
-                $def_options = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $def_mode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $def_options = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    function staticPopErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        return true;
-    }
-
-    // {{{ pushErrorHandling()
-
-    /**
-     * Push a new error handler on top of the error handler options stack. With this
-     * you can easily override the actual error handler for some code and restore
-     * it later with popErrorHandling.
-     *
-     * @param mixed $mode (same as setErrorHandling)
-     * @param mixed $options (same as setErrorHandling)
-     *
-     * @return bool Always true
-     *
-     * @see PEAR::setErrorHandling
-     */
-    function pushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $def_mode    = &$this->_default_error_mode;
-            $def_options = &$this->_default_error_options;
-        } else {
-            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-            $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        }
-        $stack[] = array($def_mode, $def_options);
-
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    // }}}
-    // {{{ popErrorHandling()
-
-    /**
-    * Pop the last error handler used
-    *
-    * @return bool Always true
-    *
-    * @see PEAR::pushErrorHandling
-    */
-    function popErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ loadExtension()
-
-    /**
-    * OS independant PHP extension load. Remember to take care
-    * on the correct extension name for case sensitive OSes.
-    *
-    * @param string $ext The extension name
-    * @return bool Success or not on the dl() call
-    */
-    function loadExtension($ext)
-    {
-        if (!extension_loaded($ext)) {
-            // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
-                return false;
-            }
-            if (OS_WINDOWS) {
-                $suffix = '.dll';
-            } elseif (PHP_OS == 'HP-UX') {
-                $suffix = '.sl';
-            } elseif (PHP_OS == 'AIX') {
-                $suffix = '.a';
-            } elseif (PHP_OS == 'OSX') {
-                $suffix = '.bundle';
-            } else {
-                $suffix = '.so';
-            }
-            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
-        }
-        return true;
-    }
-
-    // }}}
-}
-
-// {{{ _PEAR_call_destructors()
-
-function _PEAR_call_destructors()
-{
-    global $_PEAR_destructor_object_list;
-    if (is_array($_PEAR_destructor_object_list) &&
-        sizeof($_PEAR_destructor_object_list))
-    {
-        reset($_PEAR_destructor_object_list);
-        if (PEAR::getStaticProperty('PEAR', 'destructlifo')) {
-            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
-        }
-        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
-            $classname = get_class($objref);
-            while ($classname) {
-                $destructor = "_$classname";
-                if (method_exists($objref, $destructor)) {
-                    $objref->$destructor();
-                    break;
-                } else {
-                    $classname = get_parent_class($classname);
-                }
-            }
-        }
-        // Empty the object list to ensure that destructors are
-        // not called more than once.
-        $_PEAR_destructor_object_list = array();
-    }
-
-    // Now call the shutdown functions
-    if (is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
-        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
-            call_user_func_array($value[0], $value[1]);
-        }
-    }
-}
-
-// }}}
-/**
- * Standard PEAR error class for PHP 4
- *
- * This class is supserseded by {@link PEAR_Exception} in PHP 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Tomas V.V. Cox 
- * @author     Gregory Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/manual/en/core.pear.pear-error.php
- * @see        PEAR::raiseError(), PEAR::throwError()
- * @since      Class available since PHP 4.0.2
- */
-class PEAR_Error
-{
-    // {{{ properties
-
-    var $error_message_prefix = '';
-    var $mode                 = PEAR_ERROR_RETURN;
-    var $level                = E_USER_NOTICE;
-    var $code                 = -1;
-    var $message              = '';
-    var $userinfo             = '';
-    var $backtrace            = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Error constructor
-     *
-     * @param string $message  message
-     *
-     * @param int $code     (optional) error code
-     *
-     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
-     * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
-     * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
-     *
-     * @param mixed $options   (optional) error level, _OR_ in the case of
-     * PEAR_ERROR_CALLBACK, the callback function or object/method
-     * tuple.
-     *
-     * @param string $userinfo (optional) additional user/debug info
-     *
-     * @access public
-     *
-     */
-    function PEAR_Error($message = 'unknown error', $code = null,
-                        $mode = null, $options = null, $userinfo = null)
-    {
-        if ($mode === null) {
-            $mode = PEAR_ERROR_RETURN;
-        }
-        $this->message   = $message;
-        $this->code      = $code;
-        $this->mode      = $mode;
-        $this->userinfo  = $userinfo;
-        if (!PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {
-            $this->backtrace = debug_backtrace();
-            if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
-                unset($this->backtrace[0]['object']);
-            }
-        }
-        if ($mode & PEAR_ERROR_CALLBACK) {
-            $this->level = E_USER_NOTICE;
-            $this->callback = $options;
-        } else {
-            if ($options === null) {
-                $options = E_USER_NOTICE;
-            }
-            $this->level = $options;
-            $this->callback = null;
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-            } else {
-                $format = $options;
-            }
-            printf($format, $this->getMessage());
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            trigger_error($this->getMessage(), $this->level);
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $msg = $this->getMessage();
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-                if (substr($msg, -1) != "\n") {
-                    $msg .= "\n";
-                }
-            } else {
-                $format = $options;
-            }
-            die(sprintf($format, $msg));
-        }
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_callable($this->callback)) {
-                call_user_func($this->callback, $this);
-            }
-        }
-        if ($this->mode & PEAR_ERROR_EXCEPTION) {
-            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
-            eval('$e = new Exception($this->message, $this->code);throw($e);');
-        }
-    }
-
-    // }}}
-    // {{{ getMode()
-
-    /**
-     * Get the error mode from an error object.
-     *
-     * @return int error mode
-     * @access public
-     */
-    function getMode() {
-        return $this->mode;
-    }
-
-    // }}}
-    // {{{ getCallback()
-
-    /**
-     * Get the callback function/method from an error object.
-     *
-     * @return mixed callback function or object/method array
-     * @access public
-     */
-    function getCallback() {
-        return $this->callback;
-    }
-
-    // }}}
-    // {{{ getMessage()
-
-
-    /**
-     * Get the error message from an error object.
-     *
-     * @return  string  full error message
-     * @access public
-     */
-    function getMessage()
-    {
-        return ($this->error_message_prefix . $this->message);
-    }
-
-
-    // }}}
-    // {{{ getCode()
-
-    /**
-     * Get error code from an error object
-     *
-     * @return int error code
-     * @access public
-     */
-     function getCode()
-     {
-        return $this->code;
-     }
-
-    // }}}
-    // {{{ getType()
-
-    /**
-     * Get the name of this error/exception.
-     *
-     * @return string error/exception name (type)
-     * @access public
-     */
-    function getType()
-    {
-        return get_class($this);
-    }
-
-    // }}}
-    // {{{ getUserInfo()
-
-    /**
-     * Get additional user-supplied information.
-     *
-     * @return string user-supplied information
-     * @access public
-     */
-    function getUserInfo()
-    {
-        return $this->userinfo;
-    }
-
-    // }}}
-    // {{{ getDebugInfo()
-
-    /**
-     * Get additional debug information supplied by the application.
-     *
-     * @return string debug information
-     * @access public
-     */
-    function getDebugInfo()
-    {
-        return $this->getUserInfo();
-    }
-
-    // }}}
-    // {{{ getBacktrace()
-
-    /**
-     * Get the call backtrace from where the error was generated.
-     * Supported with PHP 4.3.0 or newer.
-     *
-     * @param int $frame (optional) what frame to fetch
-     * @return array Backtrace, or NULL if not available.
-     * @access public
-     */
-    function getBacktrace($frame = null)
-    {
-        if (defined('PEAR_IGNORE_BACKTRACE')) {
-            return null;
-        }
-        if ($frame === null) {
-            return $this->backtrace;
-        }
-        return $this->backtrace[$frame];
-    }
-
-    // }}}
-    // {{{ addUserInfo()
-
-    function addUserInfo($info)
-    {
-        if (empty($this->userinfo)) {
-            $this->userinfo = $info;
-        } else {
-            $this->userinfo .= " ** $info";
-        }
-    }
-
-    // }}}
-    // {{{ toString()
-
-    /**
-     * Make a string representation of this object.
-     *
-     * @return string a string with an object summary
-     * @access public
-     */
-    function toString() {
-        $modes = array();
-        $levels = array(E_USER_NOTICE  => 'notice',
-                        E_USER_WARNING => 'warning',
-                        E_USER_ERROR   => 'error');
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_array($this->callback)) {
-                $callback = (is_object($this->callback[0]) ?
-                    strtolower(get_class($this->callback[0])) :
-                    $this->callback[0]) . '::' .
-                    $this->callback[1];
-            } else {
-                $callback = $this->callback;
-            }
-            return sprintf('[%s: message="%s" code=%d mode=callback '.
-                           'callback=%s prefix="%s" info="%s"]',
-                           strtolower(get_class($this)), $this->message, $this->code,
-                           $callback, $this->error_message_prefix,
-                           $this->userinfo);
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            $modes[] = 'print';
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            $modes[] = 'trigger';
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $modes[] = 'die';
-        }
-        if ($this->mode & PEAR_ERROR_RETURN) {
-            $modes[] = 'return';
-        }
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
-                       'prefix="%s" info="%s"]',
-                       strtolower(get_class($this)), $this->message, $this->code,
-                       implode("|", $modes), $levels[$this->level],
-                       $this->error_message_prefix,
-                       $this->userinfo);
-    }
-
-    // }}}
-}
-
-/*
- * Local Variables:
- * mode: php
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-?>
diff --git a/PEAR/Autoloader.php b/PEAR/Autoloader.php
deleted file mode 100644
index 23178f6..0000000
--- a/PEAR/Autoloader.php
+++ /dev/null
@@ -1,223 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Autoloader.php,v 1.13 2006/01/06 04:47:36 cellog Exp $
- * @link       http://pear.php.net/manual/en/core.ppm.php#core.ppm.pear-autoloader
- * @since      File available since Release 0.1
- * @deprecated File deprecated in Release 1.4.0a1
- */
-
-// /* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-if (!extension_loaded("overload")) {
-    // die hard without ext/overload
-    die("Rebuild PHP with the `overload' extension to use PEAR_Autoloader");
-}
-
-/**
- * Include for PEAR_Error and PEAR classes
- */
-require_once "PEAR.php";
-
-/**
- * This class is for objects where you want to separate the code for
- * some methods into separate classes.  This is useful if you have a
- * class with not-frequently-used methods that contain lots of code
- * that you would like to avoid always parsing.
- *
- * The PEAR_Autoloader class provides autoloading and aggregation.
- * The autoloading lets you set up in which classes the separated
- * methods are found.  Aggregation is the technique used to import new
- * methods, an instance of each class providing separated methods is
- * stored and called every time the aggregated method is called.
- *
- * @category   pear
- * @package    PEAR
- * @author Stig Bakken 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/manual/en/core.ppm.php#core.ppm.pear-autoloader
- * @since      File available since Release 0.1
- * @deprecated File deprecated in Release 1.4.0a1
- */
-class PEAR_Autoloader extends PEAR
-{
-    // {{{ properties
-
-    /**
-     * Map of methods and classes where they are defined
-     *
-     * @var array
-     *
-     * @access private
-     */
-    var $_autoload_map = array();
-
-    /**
-     * Map of methods and aggregate objects
-     *
-     * @var array
-     *
-     * @access private
-     */
-    var $_method_map = array();
-
-    // }}}
-    // {{{ addAutoload()
-
-    /**
-     * Add one or more autoload entries.
-     *
-     * @param string $method     which method to autoload
-     *
-     * @param string $classname  (optional) which class to find the method in.
-     *                           If the $method parameter is an array, this
-     *                           parameter may be omitted (and will be ignored
-     *                           if not), and the $method parameter will be
-     *                           treated as an associative array with method
-     *                           names as keys and class names as values.
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function addAutoload($method, $classname = null)
-    {
-        if (is_array($method)) {
-            array_walk($method, create_function('$a,&$b', '$b = strtolower($b);'));
-            $this->_autoload_map = array_merge($this->_autoload_map, $method);
-        } else {
-            $this->_autoload_map[strtolower($method)] = $classname;
-        }
-    }
-
-    // }}}
-    // {{{ removeAutoload()
-
-    /**
-     * Remove an autoload entry.
-     *
-     * @param string $method  which method to remove the autoload entry for
-     *
-     * @return bool TRUE if an entry was removed, FALSE if not
-     *
-     * @access public
-     */
-    function removeAutoload($method)
-    {
-        $method = strtolower($method);
-        $ok = isset($this->_autoload_map[$method]);
-        unset($this->_autoload_map[$method]);
-        return $ok;
-    }
-
-    // }}}
-    // {{{ addAggregateObject()
-
-    /**
-     * Add an aggregate object to this object.  If the specified class
-     * is not defined, loading it will be attempted following PEAR's
-     * file naming scheme.  All the methods in the class will be
-     * aggregated, except private ones (name starting with an
-     * underscore) and constructors.
-     *
-     * @param string $classname  what class to instantiate for the object.
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function addAggregateObject($classname)
-    {
-        $classname = strtolower($classname);
-        if (!class_exists($classname)) {
-            $include_file = preg_replace('/[^a-z0-9]/i', '_', $classname);
-            include_once $include_file;
-        }
-        $obj =& new $classname;
-        $methods = get_class_methods($classname);
-        foreach ($methods as $method) {
-            // don't import priviate methods and constructors
-            if ($method{0} != '_' && $method != $classname) {
-                $this->_method_map[$method] = $obj;
-            }
-        }
-    }
-
-    // }}}
-    // {{{ removeAggregateObject()
-
-    /**
-     * Remove an aggregate object.
-     *
-     * @param string $classname  the class of the object to remove
-     *
-     * @return bool  TRUE if an object was removed, FALSE if not
-     *
-     * @access public
-     */
-    function removeAggregateObject($classname)
-    {
-        $ok = false;
-        $classname = strtolower($classname);
-        reset($this->_method_map);
-        while (list($method, $obj) = each($this->_method_map)) {
-            if (is_a($obj, $classname)) {
-                unset($this->_method_map[$method]);
-                $ok = true;
-            }
-        }
-        return $ok;
-    }
-
-    // }}}
-    // {{{ __call()
-
-    /**
-     * Overloaded object call handler, called each time an
-     * undefined/aggregated method is invoked.  This method repeats
-     * the call in the right aggregate object and passes on the return
-     * value.
-     *
-     * @param string $method  which method that was called
-     *
-     * @param string $args    An array of the parameters passed in the
-     *                        original call
-     *
-     * @return mixed  The return value from the aggregated method, or a PEAR
-     *                error if the called method was unknown.
-     */
-    function __call($method, $args, &$retval)
-    {
-        $method = strtolower($method);
-        if (empty($this->_method_map[$method]) && isset($this->_autoload_map[$method])) {
-            $this->addAggregateObject($this->_autoload_map[$method]);
-        }
-        if (isset($this->_method_map[$method])) {
-            $retval = call_user_func_array(array($this->_method_map[$method], $method), $args);
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-}
-
-overload("PEAR_Autoloader");
-
-?>
diff --git a/PEAR/Builder.php b/PEAR/Builder.php
deleted file mode 100644
index 6a3e223..0000000
--- a/PEAR/Builder.php
+++ /dev/null
@@ -1,461 +0,0 @@
-
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Builder.php,v 1.29 2006/03/05 21:09:18 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * Needed for extending PEAR_Builder
- */
-require_once 'PEAR/Common.php';
-require_once 'PEAR/PackageFile.php';
-/**
- * Class to handle building (compiling) extensions.
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since PHP 4.0.2
- * @see        http://pear.php.net/manual/en/core.ppm.pear-builder.php
- */
-class PEAR_Builder extends PEAR_Common
-{
-    // {{{ properties
-
-    var $php_api_version = 0;
-    var $zend_module_api_no = 0;
-    var $zend_extension_api_no = 0;
-
-    var $extensions_built = array();
-
-    var $current_callback = null;
-
-    // used for msdev builds
-    var $_lastline = null;
-    var $_firstline = null;
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Builder constructor.
-     *
-     * @param object $ui user interface object (instance of PEAR_Frontend_*)
-     *
-     * @access public
-     */
-    function PEAR_Builder(&$ui)
-    {
-        parent::PEAR_Common();
-        $this->setFrontendObject($ui);
-    }
-
-    // }}}
-
-    // {{{ _build_win32()
-
-    /**
-     * Build an extension from source on windows.
-     * requires msdev
-     */
-    function _build_win32($descfile, $callback = null)
-    {
-        if (is_object($descfile)) {
-            $pkg = $descfile;
-        } else {
-            $pf = &new PEAR_PackageFile($this->config, $this->debug);
-            $pkg = &$pf->fromPackageFile($descfile, PEAR_VALIDATE_NORMAL);
-            if (PEAR::isError($pkg)) {
-                return $pkg;
-            }
-        }
-        $dir = dirname($pkg->getArchiveFile());
-        $old_cwd = getcwd();
-
-        if (!file_exists($dir) || !is_dir($dir) || !chdir($dir)) {
-            return $this->raiseError("could not chdir to $dir");
-        }
-        $this->log(2, "building in $dir");
-
-        $dsp = $pkg->getPackage().'.dsp';
-        if (!file_exists("$dir/$dsp")) {
-            return $this->raiseError("The DSP $dsp does not exist.");
-        }
-        // XXX TODO: make release build type configurable
-        $command = 'msdev '.$dsp.' /MAKE "'.$info['package']. ' - Release"';
-
-        $this->current_callback = $callback;
-        $err = $this->_runCommand($command, array(&$this, 'msdevCallback'));
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-
-        // figure out the build platform and type
-        $platform = 'Win32';
-        $buildtype = 'Release';
-        if (preg_match('/.*?'.$pkg->getPackage().'\s-\s(\w+)\s(.*?)-+/i',$this->_firstline,$matches)) {
-            $platform = $matches[1];
-            $buildtype = $matches[2];
-        }
-
-        if (preg_match('/(.*)?\s-\s(\d+).*?(\d+)/',$this->_lastline,$matches)) {
-            if ($matches[2]) {
-                // there were errors in the build
-                return $this->raiseError("There were errors during compilation.");
-            }
-            $out = $matches[1];
-        } else {
-            return $this->raiseError("Did not understand the completion status returned from msdev.exe.");
-        }
-
-        // msdev doesn't tell us the output directory :/
-        // open the dsp, find /out and use that directory
-        $dsptext = join(file($dsp),'');
-
-        // this regex depends on the build platform and type having been
-        // correctly identified above.
-        $regex ='/.*?!IF\s+"\$\(CFG\)"\s+==\s+("'.
-                    $pkg->getPackage().'\s-\s'.
-                    $platform.'\s'.
-                    $buildtype.'").*?'.
-                    '\/out:"(.*?)"/is';
-
-        if ($dsptext && preg_match($regex,$dsptext,$matches)) {
-            // what we get back is a relative path to the output file itself.
-            $outfile = realpath($matches[2]);
-        } else {
-            return $this->raiseError("Could not retrieve output information from $dsp.");
-        }
-        // realpath returns false if the file doesn't exist
-        if ($outfile && copy($outfile, "$dir/$out")) {
-            $outfile = "$dir/$out";
-        }
-
-        $built_files[] = array(
-            'file' => "$outfile",
-            'php_api' => $this->php_api_version,
-            'zend_mod_api' => $this->zend_module_api_no,
-            'zend_ext_api' => $this->zend_extension_api_no,
-            );
-
-        return $built_files;
-    }
-    // }}}
-
-    // {{{ msdevCallback()
-    function msdevCallback($what, $data)
-    {
-        if (!$this->_firstline)
-            $this->_firstline = $data;
-        $this->_lastline = $data;
-    }
-    // }}}
-
-    // {{{ _harventInstDir
-    /**
-     * @param string
-     * @param string
-     * @param array
-     * @access private
-     */
-    function _harvestInstDir($dest_prefix, $dirname, &$built_files)
-    {
-        $d = opendir($dirname);
-        if (!$d)
-            return false;
-
-        $ret = true;
-        while (($ent = readdir($d)) !== false) {
-            if ($ent{0} == '.')
-                continue;
-
-            $full = $dirname . DIRECTORY_SEPARATOR . $ent;
-            if (is_dir($full)) {
-                if (!$this->_harvestInstDir(
-                        $dest_prefix . DIRECTORY_SEPARATOR . $ent,
-                        $full, $built_files)) {
-                    $ret = false;
-                    break;
-                }
-            } else {
-                $dest = $dest_prefix . DIRECTORY_SEPARATOR . $ent;
-                $built_files[] = array(
-                        'file' => $full,
-                        'dest' => $dest,
-                        'php_api' => $this->php_api_version,
-                        'zend_mod_api' => $this->zend_module_api_no,
-                        'zend_ext_api' => $this->zend_extension_api_no,
-                        );
-            }
-        }
-        closedir($d);
-        return $ret;
-    }
-
-    // }}}
-
-    // {{{ build()
-
-    /**
-     * Build an extension from source.  Runs "phpize" in the source
-     * directory, but compiles in a temporary directory
-     * (/var/tmp/pear-build-USER/PACKAGE-VERSION).
-     *
-     * @param string|PEAR_PackageFile_v* $descfile path to XML package description file, or
-     *               a PEAR_PackageFile object
-     *
-     * @param mixed $callback callback function used to report output,
-     * see PEAR_Builder::_runCommand for details
-     *
-     * @return array an array of associative arrays with built files,
-     * format:
-     * array( array( 'file' => '/path/to/ext.so',
-     *               'php_api' => YYYYMMDD,
-     *               'zend_mod_api' => YYYYMMDD,
-     *               'zend_ext_api' => YYYYMMDD ),
-     *        ... )
-     *
-     * @access public
-     *
-     * @see PEAR_Builder::_runCommand
-     */
-    function build($descfile, $callback = null)
-    {
-        if (PEAR_OS == "Windows") {
-            return $this->_build_win32($descfile,$callback);
-        }
-        if (PEAR_OS != 'Unix') {
-            return $this->raiseError("building extensions not supported on this platform");
-        }
-        if (is_object($descfile)) {
-            $pkg = $descfile;
-            $descfile = $pkg->getPackageFile();
-        } else {
-            $pf = &new PEAR_PackageFile($this->config);
-            $pkg = &$pf->fromPackageFile($descfile, PEAR_VALIDATE_NORMAL);
-            if (PEAR::isError($pkg)) {
-                return $pkg;
-            }
-        }
-        $dir = dirname($descfile);
-        $old_cwd = getcwd();
-        if (!file_exists($dir) || !is_dir($dir) || !chdir($dir)) {
-            return $this->raiseError("could not chdir to $dir");
-        }
-        $vdir = $pkg->getPackage() . '-' . $pkg->getVersion();
-        if (is_dir($vdir)) {
-            chdir($vdir);
-        }
-        $dir = getcwd();
-        $this->log(2, "building in $dir");
-        $this->current_callback = $callback;
-        putenv('PATH=' . $this->config->get('bin_dir') . ':' . getenv('PATH'));
-        $err = $this->_runCommand("phpize", array(&$this, 'phpizeCallback'));
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-        if (!$err) {
-            return $this->raiseError("`phpize' failed");
-        }
-
-        // {{{ start of interactive part
-        $configure_command = "$dir/configure";
-        $configure_options = $pkg->getConfigureOptions();
-        if ($configure_options) {
-            foreach ($configure_options as $o) {
-                $default = array_key_exists($o['default']) ? $o['default'] : null;
-                list($r) = $this->ui->userDialog('build',
-                                                 array($o['prompt']),
-                                                 array('text'),
-                                                 array($default));
-                if (substr($o['name'], 0, 5) == 'with-' &&
-                    ($r == 'yes' || $r == 'autodetect')) {
-                    $configure_command .= " --$o[name]";
-                } else {
-                    $configure_command .= " --$o[name]=".trim($r);
-                }
-            }
-        }
-        // }}} end of interactive part
-
-        // FIXME make configurable
-        if(!$user=getenv('USER')){
-            $user='defaultuser';
-        }
-        $build_basedir = "/var/tmp/pear-build-$user";
-        $build_dir = "$build_basedir/$vdir";
-        $inst_dir = "$build_basedir/install-$vdir";
-        $this->log(1, "building in $build_dir");
-        if (is_dir($build_dir)) {
-            System::rm(array('-rf', $build_dir));
-        }
-        if (!System::mkDir(array('-p', $build_dir))) {
-            return $this->raiseError("could not create build dir: $build_dir");
-        }
-        $this->addTempFile($build_dir);
-        if (!System::mkDir(array('-p', $inst_dir))) {
-            return $this->raiseError("could not create temporary install dir: $inst_dir");
-        }
-        $this->addTempFile($inst_dir);
-
-        if (getenv('MAKE')) {
-            $make_command = getenv('MAKE');
-        } else {
-            $make_command = 'make';
-        }
-        $to_run = array(
-            $configure_command,
-            $make_command,
-            "$make_command INSTALL_ROOT=\"$inst_dir\" install",
-            "find \"$inst_dir\" -ls"
-            );
-        if (!file_exists($build_dir) || !is_dir($build_dir) || !chdir($build_dir)) {
-            return $this->raiseError("could not chdir to $build_dir");
-        }
-        putenv('PHP_PEAR_VERSION=1.5.0a1');
-        foreach ($to_run as $cmd) {
-            $err = $this->_runCommand($cmd, $callback);
-            if (PEAR::isError($err)) {
-                chdir($old_cwd);
-                return $err;
-            }
-            if (!$err) {
-                chdir($old_cwd);
-                return $this->raiseError("`$cmd' failed");
-            }
-        }
-        if (!($dp = opendir("modules"))) {
-            chdir($old_cwd);
-            return $this->raiseError("no `modules' directory found");
-        }
-        $built_files = array();
-        $prefix = exec("php-config --prefix");
-        $this->_harvestInstDir($prefix, $inst_dir . DIRECTORY_SEPARATOR . $prefix, $built_files);
-        chdir($old_cwd);
-        return $built_files;
-    }
-
-    // }}}
-    // {{{ phpizeCallback()
-
-    /**
-     * Message callback function used when running the "phpize"
-     * program.  Extracts the API numbers used.  Ignores other message
-     * types than "cmdoutput".
-     *
-     * @param string $what the type of message
-     * @param mixed $data the message
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function phpizeCallback($what, $data)
-    {
-        if ($what != 'cmdoutput') {
-            return;
-        }
-        $this->log(1, rtrim($data));
-        if (preg_match('/You should update your .aclocal.m4/', $data)) {
-            return;
-        }
-        $matches = array();
-        if (preg_match('/^\s+(\S[^:]+):\s+(\d{8})/', $data, $matches)) {
-            $member = preg_replace('/[^a-z]/', '_', strtolower($matches[1]));
-            $apino = (int)$matches[2];
-            if (isset($this->$member)) {
-                $this->$member = $apino;
-                //$msg = sprintf("%-22s : %d", $matches[1], $apino);
-                //$this->log(1, $msg);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ _runCommand()
-
-    /**
-     * Run an external command, using a message callback to report
-     * output.  The command will be run through popen and output is
-     * reported for every line with a "cmdoutput" message with the
-     * line string, including newlines, as payload.
-     *
-     * @param string $command the command to run
-     *
-     * @param mixed $callback (optional) function to use as message
-     * callback
-     *
-     * @return bool whether the command was successful (exit code 0
-     * means success, any other means failure)
-     *
-     * @access private
-     */
-    function _runCommand($command, $callback = null)
-    {
-        $this->log(1, "running: $command");
-        $pp = popen("$command 2>&1", "r");
-        if (!$pp) {
-            return $this->raiseError("failed to run `$command'");
-        }
-        if ($callback && $callback[0]->debug == 1) {
-            $olddbg = $callback[0]->debug;
-            $callback[0]->debug = 2;
-        }
-
-        while ($line = fgets($pp, 1024)) {
-            if ($callback) {
-                call_user_func($callback, 'cmdoutput', $line);
-            } else {
-                $this->log(2, rtrim($line));
-            }
-        }
-        if ($callback && isset($olddbg)) {
-            $callback[0]->debug = $olddbg;
-        }
-        if (is_resource($pp)) {
-            $exitcode = pclose($pp);
-        } else {
-            $exitcode = -1;
-        }
-        return ($exitcode == 0);
-    }
-
-    // }}}
-    // {{{ log()
-
-    function log($level, $msg)
-    {
-        if ($this->current_callback) {
-            if ($this->debug >= $level) {
-                call_user_func($this->current_callback, 'output', $msg);
-            }
-            return;
-        }
-        return PEAR_Common::log($level, $msg);
-    }
-
-    // }}}
-}
-
-?>
diff --git a/PEAR/ChannelFile.php b/PEAR/ChannelFile.php
deleted file mode 100644
index ee7f409..0000000
--- a/PEAR/ChannelFile.php
+++ /dev/null
@@ -1,1613 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: ChannelFile.php,v 1.77 2006/03/25 21:09:08 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * Needed for error handling
- */
-require_once 'PEAR/ErrorStack.php';
-require_once 'PEAR/XMLParser.php';
-require_once 'PEAR/Common.php';
-
-/**
- * Error code if the channel.xml  tag does not contain a valid version
- */
-define('PEAR_CHANNELFILE_ERROR_NO_VERSION', 1);
-/**
- * Error code if the channel.xml  tag version is not supported (version 1.0 is the only supported version,
- * currently
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID_VERSION', 2);
-
-/**
- * Error code if parsing is attempted with no xml extension
- */
-define('PEAR_CHANNELFILE_ERROR_NO_XML_EXT', 3);
-
-/**
- * Error code if creating the xml parser resource fails
- */
-define('PEAR_CHANNELFILE_ERROR_CANT_MAKE_PARSER', 4);
-
-/**
- * Error code used for all sax xml parsing errors
- */
-define('PEAR_CHANNELFILE_ERROR_PARSER_ERROR', 5);
-
-/**#@+
- * Validation errors
- */
-/**
- * Error code when channel name is missing
- */
-define('PEAR_CHANNELFILE_ERROR_NO_NAME', 6);
-/**
- * Error code when channel name is invalid
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID_NAME', 7);
-/**
- * Error code when channel summary is missing
- */
-define('PEAR_CHANNELFILE_ERROR_NO_SUMMARY', 8);
-/**
- * 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
- */
-define('PEAR_CHANNELFILE_ERROR_NO_HOST', 10);
-/**
- * Error code when channel server is invalid for xmlrpc or soap protocol
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID_HOST', 11);
-/**
- * Error code when a mirror name is invalid
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID_MIRROR', 21);
-/**
- * Error code when a mirror type is invalid
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID_MIRRORTYPE', 22);
-/**
- * Error code when an attempt is made to generate xml, but the parsed content is invalid
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID', 23);
-/**
- * Error code when an empty package name validate regex is passed in
- */
-define('PEAR_CHANNELFILE_ERROR_EMPTY_REGEX', 24);
-/**
- * Error code when a  tag has no version
- */
-define('PEAR_CHANNELFILE_ERROR_NO_FUNCTIONVERSION', 25);
-/**
- * Error code when a  tag has no name
- */
-define('PEAR_CHANNELFILE_ERROR_NO_FUNCTIONNAME', 26);
-/**
- * Error code when a  tag has no name
- */
-define('PEAR_CHANNELFILE_ERROR_NOVALIDATE_NAME', 27);
-/**
- * Error code when a  tag has no version attribute
- */
-define('PEAR_CHANNELFILE_ERROR_NOVALIDATE_VERSION', 28);
-/**
- * Error code when a mirror does not exist but is called for in one of the set*
- * methods.
- */
-define('PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND', 32);
-/**
- * Error code when a server port is not numeric
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID_PORT', 33);
-/**
- * Error code when  contains no version attribute
- */
-define('PEAR_CHANNELFILE_ERROR_NO_STATICVERSION', 34);
-/**
- * Error code when  contains no type attribute in a  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);
-/**#@-*/
-
-/**
- * Mirror types allowed.  Currently only internet servers are recognized.
- */
-$GLOBALS['_PEAR_CHANNELS_MIRROR_TYPES'] =  array('server');
-
-
-/**
- * The Channel handling class
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_ChannelFile {
-    /**
-     * @access private
-     * @var PEAR_ErrorStack
-     * @access private
-     */
-    var $_stack;
-    
-    /**
-     * Supported channel.xml versions, for parsing
-     * @var array
-     * @access private
-     */
-    var $_supportedVersions = array('1.0');
-
-    /**
-     * Parsed channel information
-     * @var array
-     * @access private
-     */
-    var $_channelInfo;
-
-    /**
-     * index into the subchannels array, used for parsing xml
-     * @var int
-     * @access private
-     */
-    var $_subchannelIndex;
-
-    /**
-     * 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()
-    {
-        $this->_stack = &new PEAR_ErrorStack('PEAR_ChannelFile');
-        $this->_stack->setErrorMessageTemplate($this->_getErrorMessage());
-        $this->_isValid = false;
-    }
-    
-    /**
-     * @return array
-     * @access protected
-     */
-    function _getErrorMessage()
-    {
-        return
-            array(
-                PEAR_CHANNELFILE_ERROR_INVALID_VERSION =>
-                    'While parsing channel.xml, an invalid version number "%version% was passed in, expecting one of %versions%',
-                PEAR_CHANNELFILE_ERROR_NO_VERSION =>
-                    'No version number found in  tag',
-                PEAR_CHANNELFILE_ERROR_NO_XML_EXT =>
-                    '%error%',
-                PEAR_CHANNELFILE_ERROR_CANT_MAKE_PARSER =>
-                    'Unable to create XML parser',
-                PEAR_CHANNELFILE_ERROR_PARSER_ERROR =>
-                    '%error%',
-                PEAR_CHANNELFILE_ERROR_NO_NAME =>
-                    'Missing channel name',
-                PEAR_CHANNELFILE_ERROR_INVALID_NAME =>
-                    'Invalid channel %tag% "%name%"',
-                PEAR_CHANNELFILE_ERROR_NO_SUMMARY =>
-                    'Missing channel summary',
-                PEAR_CHANNELFILE_ERROR_MULTILINE_SUMMARY =>
-                    'Channel summary should be on one line, but is multi-line',
-                PEAR_CHANNELFILE_ERROR_NO_HOST =>
-                    'Missing channel server for %type% server',
-                PEAR_CHANNELFILE_ERROR_INVALID_HOST =>
-                    'Server name "%server%" is invalid for %type% server',
-                PEAR_CHANNELFILE_ERROR_INVALID_MIRROR =>
-                    'Invalid mirror name "%name%", mirror type %type%',
-                PEAR_CHANNELFILE_ERROR_INVALID_MIRRORTYPE =>
-                    'Invalid mirror type "%type%"',
-                PEAR_CHANNELFILE_ERROR_INVALID =>
-                    'Cannot generate xml, contents are invalid',
-                PEAR_CHANNELFILE_ERROR_EMPTY_REGEX =>
-                    'packagenameregex cannot be empty',
-                PEAR_CHANNELFILE_ERROR_NO_FUNCTIONVERSION =>
-                    '%parent% %protocol% function has no version',
-                PEAR_CHANNELFILE_ERROR_NO_FUNCTIONNAME =>
-                    '%parent% %protocol% function has no name',
-                PEAR_CHANNELFILE_ERROR_NOBASEURLTYPE =>
-                    '%parent% rest baseurl has no type',
-                PEAR_CHANNELFILE_ERROR_NOVALIDATE_NAME =>
-                    'Validation package has no name in  tag',
-                PEAR_CHANNELFILE_ERROR_NOVALIDATE_VERSION =>
-                    'Validation package "%package%" has no version',
-                PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND =>
-                    'Mirror "%mirror%" does not exist',
-                PEAR_CHANNELFILE_ERROR_INVALID_PORT =>
-                    'Port "%port%" must be numeric',
-                PEAR_CHANNELFILE_ERROR_NO_STATICVERSION =>
-                    ' tag must contain version attribute',
-                PEAR_CHANNELFILE_URI_CANT_MIRROR =>
-                    'The __uri pseudo-channel cannot have mirrors',
-                PEAR_CHANNELFILE_ERROR_INVALID_SSL =>
-                    '%server% has invalid ssl attribute "%ssl%" can only be yes or not present',
-            );
-    }
-
-    /**
-     * @param string contents of package.xml file
-     * @return bool success of parsing
-     */
-    function fromXmlString($data)
-    {
-        if (preg_match('/_supportedVersions)) {
-                $this->_stack->push(PEAR_CHANNELFILE_ERROR_INVALID_VERSION, 'error',
-                    array('version' => $channelversion[1]));
-                return false;
-            }
-            $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));
-                } else {
-                    $this->_stack->push(PEAR_CHANNELFILE_ERROR_CANT_MAKE_PARSER, 'error');
-                }
-                return false;
-            }
-            $this->_channelInfo = $parser->getData();
-            return true;
-        } 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
-     */
-    function &fromArray($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
-     * @param array
-     * @static
-     * @return PEAR_ChannelFile
-     */
-    function &fromArrayWithErrors($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
-     */
-    function getErrors($purge = false)
-    {
-        return $this->_stack->getErrors($purge);
-    }
-
-    /**
-     * Unindent given string (?)
-     *
-     * @param string $str The string that has to be unindented.
-     * @return string
-     * @access private
-     */
-    function _unIndent($str)
-    {
-        // remove leading newlines
-        $str = preg_replace('/^[\r\n]+/', '', $str);
-        // find whitespace at the beginning of the first line
-        $indent_len = strspn($str, " \t");
-        $indent = substr($str, 0, $indent_len);
-        $data = '';
-        // remove the same amount of whitespace from following lines
-        foreach (explode("\n", $str) as $line) {
-            if (substr($line, 0, $indent_len) == $indent) {
-                $data .= substr($line, $indent_len) . "\n";
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Parse a channel.xml file.  Expects the name of
-     * a channel xml file as input.
-     *
-     * @param string  $descfile  name of channel xml file
-     * @return bool success of parsing
-     */
-    function fromXmlFile($descfile)
-    {
-        if (!file_exists($descfile) || !is_file($descfile) || !is_readable($descfile) ||
-             (!$fp = fopen($descfile, 'r'))) {
-            require_once 'PEAR.php';
-            return PEAR::raiseError("Unable to open $descfile");
-        }
-
-        // read the whole thing so we only get one cdata callback
-        // for each block of cdata
-        fclose($fp);
-        $data = file_get_contents($descfile);
-        return $this->fromXmlString($data);
-    }
-
-    /**
-     * Parse channel information from different sources
-     *
-     * This method is able to extract information about a channel
-     * from an .xml file or a string
-     *
-     * @access public
-     * @param  string Filename of the source or the source itself
-     * @return bool
-     */
-    function fromAny($info)
-    {
-        if (is_string($info) && file_exists($info) && strlen($info) < 255) {
-            $tmp = substr($info, -4);
-            if ($tmp == '.xml') {
-                $info = $this->fromXmlFile($info);
-            } else {
-                $fp = fopen($info, "r");
-                $test = fread($fp, 5);
-                fclose($fp);
-                if ($test == "fromXmlFile($info);
-                }
-            }
-            if (PEAR::isError($info)) {
-                require_once 'PEAR.php';
-                return PEAR::raiseError($info);
-            }
-        }
-        if (is_string($info)) {
-            $info = $this->fromXmlString($info);
-        }
-        return $info;
-    }
-
-    /**
-     * Return an XML document based on previous parsing and modifications
-     *
-     * @return string XML data
-     *
-     * @access public
-     */
-    function toXml()
-    {
-        if (!$this->_isValid && !$this->validate()) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID);
-            return false;
-        }
-        if (!isset($this->_channelInfo['attribs']['version'])) {
-            $this->_channelInfo['attribs']['version'] = '1.0';
-        }
-        $channelInfo = $this->_channelInfo;
-        $ret = "\n";
-        $ret .= "
- $channelInfo[name]
- " . htmlspecialchars($channelInfo['summary'])."
-";
-        if (isset($channelInfo['suggestedalias'])) {
-            $ret .= ' ' . $channelInfo['suggestedalias'] . "\n";
-        }
-        if (isset($channelInfo['validatepackage'])) {
-            $ret .= ' ' .
-                htmlspecialchars($channelInfo['validatepackage']['_content']) .
-                "\n";
-        }
-        $ret .= " \n";
-        $ret .= '  _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 .= "  \n";
-        if (isset($channelInfo['servers']['mirror'])) {
-            $ret .= $this->_makeMirrorsXml($channelInfo);
-        }
-        $ret .= " \n";
-        $ret .= "";
-        return str_replace("\r", "\n", str_replace("\r\n", "\n", $ret));
-    }
-
-    /**
-     * Generate the  tag
-     * @access private
-     */
-    function _makeXmlrpcXml($info, $indent)
-    {
-        $ret = $indent . "_makeFunctionsXml($info['function'], "$indent ");
-        $ret .= $indent . "\n";
-        return $ret;
-    }
-
-    /**
-     * Generate the  tag
-     * @access private
-     */
-    function _makeSoapXml($info, $indent)
-    {
-        $ret = $indent . "_makeFunctionsXml($info['function'], "$indent ");
-        $ret .= $indent . "\n";
-        return $ret;
-    }
-
-    /**
-     * Generate the  tag
-     * @access private
-     */
-    function _makeRestXml($info, $indent)
-    {
-        $ret = $indent . "\n";
-        if (!isset($info['baseurl'][0])) {
-            $info['baseurl'] = array($info['baseurl']);
-        }
-        foreach ($info['baseurl'] as $url) {
-            $ret .= "$indent \n";
-        }
-        $ret .= $indent . "\n";
-        return $ret;
-    }
-
-    /**
-     * Generate the  tag
-     * @access private
-     */
-    function _makeMirrorsXml($channelInfo)
-    {
-        $ret = "";
-        if (!isset($channelInfo['servers']['mirror'][0])) {
-            $channelInfo['servers']['mirror'] = array($channelInfo['servers']['mirror']);
-        }
-        foreach ($channelInfo['servers']['mirror'] as $mirror) {
-            $ret .= '  _makeXmlrpcXml($mirror['xmlrpc'], '   ');
-                }
-                if (isset($mirror['rest'])) {
-                    $ret .= $this->_makeRestXml($mirror['rest'], '   ');
-                }
-                if (isset($mirror['soap'])) {
-                    $ret .= $this->_makeSoapXml($mirror['soap'], '   ');
-                }
-                $ret .= "  \n";
-            } else {
-                $ret .= "/>\n";
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Generate the  tag
-     * @access private
-     */
-    function _makeFunctionsXml($functions, $indent, $rest = false)
-    {
-        $ret = '';
-        if (!isset($functions[0])) {
-            $functions = array($functions);
-        }
-        foreach ($functions as $function) {
-            $ret .= "$indent\n";
-        }
-        return $ret;
-    }
-
-    /**
-     * Validation error.  Also marks the object contents as invalid
-     * @param error code
-     * @param array error information
-     * @access private
-     */
-    function _validateError($code, $params = array())
-    {
-        $this->_stack->push($code, 'error', $params);
-        $this->_isValid = false;
-    }
-
-    /**
-     * Validation warning.  Does not mark the object contents invalid.
-     * @param error code
-     * @param array error information
-     * @access private
-     */
-    function _validateWarning($code, $params = array())
-    {
-        $this->_stack->push($code, 'warning', $params);
-    }
-
-    /**
-     * Validate parsed file.
-     *
-     * @access public
-     * @return boolean
-     */
-    function validate()
-    {
-        $this->_isValid = true;
-        $info = $this->_channelInfo;
-        if (empty($info['name'])) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_NAME);
-        } elseif (!$this->validChannelServer($info['name'])) {
-            if ($info['name'] != '__uri') {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_NAME, array('tag' => 'name',
-                    'name' => $info['name']));
-            }
-        }
-        if (empty($info['summary'])) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_SUMMARY);
-        } elseif (strpos(trim($info['summary']), "\n") !== false) {
-            $this->_validateWarning(PEAR_CHANNELFILE_ERROR_MULTILINE_SUMMARY,
-                array('summary' => $info['summary']));
-        }
-        if (isset($info['suggestedalias'])) {
-            if (!$this->validChannelServer($info['suggestedalias'])) {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_NAME,
-                    array('tag' => 'suggestedalias', 'name' =>$info['suggestedalias']));
-            }
-        }
-        if (isset($info['localalias'])) {
-            if (!$this->validChannelServer($info['localalias'])) {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_NAME,
-                    array('tag' => 'localalias', 'name' =>$info['localalias']));
-            }
-        }
-        if (isset($info['validatepackage'])) {
-            if (!isset($info['validatepackage']['_content'])) {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_NOVALIDATE_NAME);
-            }
-            if (!isset($info['validatepackage']['attribs']['version'])) {
-                $content = isset($info['validatepackage']['_content']) ?
-                    $info['validatepackage']['_content'] :
-                    null;
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_NOVALIDATE_VERSION,
-                    array('package' => $content));
-            }
-        }
-        if (isset($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']) &&
-              $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']);
-        }
-        if (isset($info['servers']['mirror'])) {
-            if ($this->_channelInfo['name'] == '__uri') {
-                $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'])) {
-                    $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_HOST,
-                        array('server' => $mirror['attribs']['host'], 'type' => 'mirror'));
-                }
-                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 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,
-                        array('parent' => $parent, 'protocol' => $protocol));
-                }
-            } else {
-                if (!isset($function['attribs']['version']) ||
-                      empty($function['attribs']['version'])) {
-                    $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_FUNCTIONVERSION,
-                        array('parent' => $parent, 'protocol' => $protocol));
-                }
-            }
-        }
-    }
-
-    /**
-     * Test whether a string contains a valid channel server.
-     * @param string $ver the package version to test
-     * @return bool
-     */
-    function validChannelServer($server)
-    {
-        if ($server == '__uri') {
-            return true;
-        }
-        return (bool) preg_match(PEAR_CHANNELS_SERVER_PREG, $server);
-    }
-
-    /**
-     * @return string|false
-     */
-    function getName()
-    {
-        if (isset($this->_channelInfo['name'])) {
-            return $this->_channelInfo['name'];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @return string|false
-     */
-    function getServer()
-    {
-        if (isset($this->_channelInfo['name'])) {
-            return $this->_channelInfo['name'];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @return int|80 port number to connect to
-     */
-    function getPort($mirror = 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;
-                }
-            }
-            return false;
-        }
-        if (isset($this->_channelInfo['servers']['primary']['attribs']['port'])) {
-            return $this->_channelInfo['servers']['primary']['attribs']['port'];
-        }
-        if ($this->getSSL()) {
-            return 443;
-        }
-        return 80;
-    }
-
-    /**
-     * @return bool Determines whether secure sockets layer (SSL) is used to connect to this channel
-     */
-    function getSSL($mirror = false)
-    {
-        if ($mirror) {
-            if ($mir = $this->getMirror($mirror)) {
-                if (isset($mir['attribs']['ssl'])) {
-                    return true;
-                } else {
-                    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;
-        }
-    }
-
-    /**
-     * @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';
-    }
-
-    /**
-     * @param string protocol type (xmlrpc, soap)
-     * @param string Mirror name
-     * @return array|false
-     */
-    function getFunctions($protocol, $mirror = false)
-    {
-        if ($this->getName() == '__uri') {
-            return false;
-        }
-        if ($protocol == 'rest') {
-            $function = 'baseurl';
-        } else {
-            $function = 'function';
-        }
-        if ($mirror) {
-            if ($mir = $this->getMirror($mirror)) {
-                if (isset($mir[$protocol][$function])) {
-                    return $mir[$protocol][$function];
-                }
-            }
-            return false;
-        }
-        if (isset($this->_channelInfo['servers']['primary'][$protocol][$function])) {
-            return $this->_channelInfo['servers']['primary'][$protocol][$function];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @param string Protocol type
-     * @param string Function name (null to return the
-     *               first protocol of the type requested)
-     * @param string Mirror name, if any
-     * @return array
-     */
-     function getFunction($type, $name = null, $mirror = 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;
-     }
-
-    /**
-     * @param string protocol type
-     * @param string protocol name
-     * @param string version
-     * @param string mirror name
-     * @return boolean
-     */
-    function supports($type, $name = null, $mirror = false, $version = '1.0')
-    {
-        $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;
-    }
-
-    /**
-     * Determines whether a channel supports Representational State Transfer (REST) protocols
-     * for retrieving channel information
-     * @param string
-     * @return bool
-     */
-    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']);
-    }
-
-    /**
-     * Get the URL to access a base resource.
-     *
-     * Hyperlinks in the returned xml will be used to retrieve the proper information
-     * needed.  This allows extreme extensibility and flexibility in implementation
-     * @param string Resource Type to retrieve
-     */
-    function getBaseURL($resourceType, $mirror = false)
-    {
-        if ($mirror == $this->_channelInfo['name']) {
-            $mirror = false;
-        }
-        if ($mirror) {
-            if ($mir = $this->getMirror($mirror)) {
-                $rest = $mir['rest'];
-            } else {
-                return false;
-            }
-            $server = $mirror;
-        } 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;
-    }
-
-    /**
-     * Since REST does not implement RPC, provide this as a logical wrapper around
-     * resetFunctions for REST
-     * @param string|false mirror name, if any
-     */
-    function resetREST($mirror = false)
-    {
-        return $this->resetFunctions('rest', $mirror);
-    }
-
-    /**
-     * Empty all protocol definitions
-     * @param string protocol type (xmlrpc, soap)
-     * @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 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);
-                $this->resetFunctions('soap', $mirror);
-                $this->resetREST($mirror);
-                $this->addFunction('xmlrpc', '1.0', 'logintest', $mirror);
-                $this->addFunction('xmlrpc', '1.0', 'package.listLatestReleases', $mirror);
-                $this->addFunction('xmlrpc', '1.0', 'package.listAll', $mirror);
-                $this->addFunction('xmlrpc', '1.0', 'package.info', $mirror);
-                $this->addFunction('xmlrpc', '1.0', 'package.getDownloadURL', $mirror);
-                $this->addFunction('xmlrpc', '1.1', 'package.getDownloadURL', $mirror);
-                $this->addFunction('xmlrpc', '1.0', 'package.getDepDownloadURL', $mirror);
-                $this->addFunction('xmlrpc', '1.1', 'package.getDepDownloadURL', $mirror);
-                $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);
-            }
-            return $mirrors;
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * Get the unserialized XML representing a mirror
-     * @return array|false
-     */
-    function getMirror($server)
-    {
-        foreach ($this->getMirrors() as $mirror) {
-            if ($mirror['attribs']['host'] == $server) {
-                return $mirror;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param string
-     * @return string|false
-     * @error PEAR_CHANNELFILE_ERROR_NO_NAME
-     * @error PEAR_CHANNELFILE_ERROR_INVALID_NAME
-     */
-    function setName($name)
-    {
-        return $this->setServer($name);
-    }
-
-    /**
-     * 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 setPort($port, $mirror = 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]['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;
-    }
-
-    /**
-     * Set the socket number (port) that is used to connect to this channel
-     * @param bool Determines whether to turn on SSL support or turn it off
-     * @param string|false name of the mirror server, or false for the primary
-     */
-    function setSSL($ssl = true, $mirror = 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']) {
-                        if (!$ssl) {
-                            if (isset($this->_channelInfo['servers']['mirror'][$i]
-                                  ['attribs']['ssl'])) {
-                                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;
-    }
-
-    /**
-     * @param string
-     * @return string|false
-     * @error PEAR_CHANNELFILE_ERROR_NO_SERVER
-     * @error PEAR_CHANNELFILE_ERROR_INVALID_SERVER
-     */
-    function setServer($server, $mirror = false)
-    {
-        if (empty($server)) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_SERVER);
-            return false;
-        } 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;
-    }
-
-    /**
-     * @param string
-     * @return boolean success
-     * @error PEAR_CHANNELFILE_ERROR_NO_SUMMARY
-     * @warning PEAR_CHANNELFILE_ERROR_MULTILINE_SUMMARY
-     */
-    function setSummary($summary)
-    {
-        if (empty($summary)) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_SUMMARY);
-            return false;
-        } elseif (strpos(trim($summary), "\n") !== false) {
-            $this->_validateWarning(PEAR_CHANNELFILE_ERROR_MULTILINE_SUMMARY,
-                array('summary' => $summary));
-        }
-        $this->_channelInfo['summary'] = $summary;
-        return true;
-    }
-
-    /**
-     * @param string
-     * @param boolean determines whether the alias is in channel.xml or local
-     * @return boolean success
-     */
-    function setAlias($alias, $local = false)
-    {
-        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 string
-     */
-    function getAlias()
-    {
-        if (isset($this->_channelInfo['localalias'])) {
-            return $this->_channelInfo['localalias'];
-        }
-        if (isset($this->_channelInfo['suggestedalias'])) {
-            return $this->_channelInfo['suggestedalias'];
-        }
-        if (isset($this->_channelInfo['name'])) {
-            return $this->_channelInfo['name'];
-        }
-    }
-
-    /**
-     * Set the package validation object if it differs from PEAR's default
-     * The class must be includeable via changing _ in the classname to path separator,
-     * but no checking of this is made.
-     * @param string|false pass in false to reset to the default packagename regex
-     * @return boolean success
-     */
-    function setValidationPackage($validateclass, $version)
-    {
-        if (empty($validateclass)) {
-            unset($this->_channelInfo['validatepackage']);
-        }
-        $this->_channelInfo['validatepackage'] = array('_content' => $validateclass);
-        $this->_channelInfo['validatepackage']['attribs'] = array('version' => $version);
-    }
-
-    /**
-     * Add a protocol to the provides section
-     * @param string protocol type
-     * @param string protocol version
-     * @param string protocol name, if any
-     * @param string mirror name, if this is a mirror's protocol
-     * @return bool
-     */
-    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'])) {
-            $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 mirror name (server)
-     * @param string protocol type
-     * @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];
-                    break;
-                }
-            }
-        } 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 Resource Type this url links to
-     * @param string URL
-     * @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];
-                        break;
-                    }
-                }
-            } else {
-                if ($this->_channelInfo['servers']['mirror']['attribs']['host'] == $mirror) {
-                    $setmirror = &$this->_channelInfo['servers']['mirror'];
-                }
-            }
-        } else {
-            $setmirror = &$this->_channelInfo['servers']['primary'];
-        }
-        $set = array('attribs' => array('type' => $resourceType), '_content' => $url);
-        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;
-    }
-
-    /**
-     * @param string mirror server
-     * @param int mirror http port
-     * @return boolean
-     */
-    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']);
-            }
-        }
-        $this->_channelInfo['servers']['mirror'][] = $set;
-        return true;
-    }
-
-    /**
-     * Retrieve the name of the validation package for this channel
-     * @return string|false
-     */
-    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'];
-    }
-
-    /**
-     * Retrieve the object that can be used for custom validation
-     * @param string|false the name of the package to validate.  If the package is
-     *                     the channel validation package, PEAR_Validate is returned
-     * @return PEAR_Validate|false false is returned if the validation package
-     *         cannot be located
-     */
-    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;
-                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;
-                } else {
-                    $a = false;
-                    return $a;
-                }
-            } else {
-                $vclass = str_replace('.', '_',
-                    $this->_channelInfo['validatepackage']['_content']);
-                $val = &new $vclass;
-            }
-        } else {
-            $val = &new PEAR_Validate;
-        }
-        return $val;
-    }
-
-    function isIncludeable($path)
-    {
-        $possibilities = explode(PATH_SEPARATOR, ini_get('include_path'));
-        foreach ($possibilities as $dir) {
-            if (file_exists($dir . DIRECTORY_SEPARATOR . $path)
-                  && is_readable($dir . DIRECTORY_SEPARATOR . $path)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * This function is used by the channel updater and retrieves a value set by
-     * the registry, or the current time if it has not been set
-     * @return string
-     */
-    function lastModified()
-    {
-        if (isset($this->_channelInfo['_lastmodified'])) {
-            return $this->_channelInfo['_lastmodified'];
-        }
-        return time();
-    }
-}
-?>
diff --git a/PEAR/ChannelFile/Parser.php b/PEAR/ChannelFile/Parser.php
deleted file mode 100644
index 8243f5e..0000000
--- a/PEAR/ChannelFile/Parser.php
+++ /dev/null
@@ -1,73 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Parser.php,v 1.4 2006/01/06 04:47:36 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * base xml parser class
- */
-require_once 'PEAR/XMLParser.php';
-require_once 'PEAR/ChannelFile.php';
-/**
- * Parser for channel.xml
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_ChannelFile_Parser extends PEAR_XMLParser
-{
-    var $_config;
-    var $_logger;
-    var $_registry;
-
-    function setConfig(&$c)
-    {
-        $this->_config = &$c;
-        $this->_registry = &$c->getRegistry();
-    }
-
-    function setLogger(&$l)
-    {
-        $this->_logger = &$l;
-    }
-
-    function parse($data, $file)
-    {
-        if (PEAR::isError($err = parent::parse($data, $file))) {
-            return $err;
-        }
-        $ret = new PEAR_ChannelFile;
-        $ret->setConfig($this->_config);
-        if (isset($this->_logger)) {
-            $ret->setLogger($this->_logger);
-        }
-        $ret->fromArray($this->_unserializedData);
-        // make sure the filelist is in the easy to read format needed
-        $ret->flattenFilelist();
-        $ret->setPackagefile($file, $archive);
-        return $ret;
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Command.php b/PEAR/Command.php
deleted file mode 100644
index 6ab8aa1..0000000
--- a/PEAR/Command.php
+++ /dev/null
@@ -1,410 +0,0 @@
-
- * @author     Greg Beaver 
- * @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.37 2006/06/09 00:17:50 pajoye Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * Needed for error handling
- */
-require_once 'PEAR.php';
-require_once 'PEAR/Frontend.php';
-require_once 'PEAR/XMLParser.php';
-
-/**
- * List of commands and what classes they are implemented in.
- * @var array command => implementing class
- */
-$GLOBALS['_PEAR_Command_commandlist'] = array();
-
-/**
- * List of shortcuts to common commands.
- * @var array shortcut => command
- */
-$GLOBALS['_PEAR_Command_shortcuts'] = array();
-
-/**
- * Array of command objects
- * @var array class => object
- */
-$GLOBALS['_PEAR_Command_objects'] = array();
-
-/**
- * PEAR command class, a simple factory class for administrative
- * commands.
- *
- * How to implement command classes:
- *
- * - The class must be called PEAR_Command_Nnn, installed in the
- *   "PEAR/Common" subdir, with a method called getCommands() that
- *   returns an array of the commands implemented by the class (see
- *   PEAR/Command/Install.php for an example).
- *
- * - The class must implement a run() function that is called with three
- *   params:
- *
- *    (string) command name
- *    (array)  assoc array with options, freely defined by each
- *             command, for example:
- *             array('force' => true)
- *    (array)  list of the other parameters
- *
- *   The run() function returns a PEAR_CommandResponse object.  Use
- *   these methods to get information:
- *
- *    int getStatus()   Returns PEAR_COMMAND_(SUCCESS|FAILURE|PARTIAL)
- *                      *_PARTIAL means that you need to issue at least
- *                      one more command to complete the operation
- *                      (used for example for validation steps).
- *
- *    string getMessage()  Returns a message for the user.  Remember,
- *                         no HTML or other interface-specific markup.
- *
- *   If something unexpected happens, run() returns a PEAR error.
- *
- * - DON'T OUTPUT ANYTHING! Return text for output instead.
- *
- * - DON'T USE HTML! The text you return will be used from both Gtk,
- *   web and command-line interfaces, so for now, keep everything to
- *   plain text.
- *
- * - DON'T USE EXIT OR DIE! Always use pear errors.  From static
- *   classes do PEAR::raiseError(), from other classes do
- *   $this->raiseError().
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command
-{
-    // {{{ factory()
-
-    /**
-     * Get the right object for executing a command.
-     *
-     * @param string $command The name of the command
-     * @param object $config  Instance of PEAR_Config object
-     *
-     * @return object the command object or a PEAR error
-     *
-     * @access public
-     * @static
-     */
-    function &factory($command, &$config)
-    {
-        if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
-            PEAR_Command::registerCommands();
-        }
-        if (isset($GLOBALS['_PEAR_Command_shortcuts'][$command])) {
-            $command = $GLOBALS['_PEAR_Command_shortcuts'][$command];
-        }
-        if (!isset($GLOBALS['_PEAR_Command_commandlist'][$command])) {
-            $a = PEAR::raiseError("unknown command `$command'");
-            return $a;
-        }
-        $class = $GLOBALS['_PEAR_Command_commandlist'][$command];
-        if (!class_exists($class)) {
-            require_once $GLOBALS['_PEAR_Command_objects'][$class];
-        }
-        if (!class_exists($class)) {
-            $a = PEAR::raiseError("unknown command `$command'");
-            return $a;
-        }
-        $ui =& PEAR_Command::getFrontendObject();
-        $obj = &new $class($ui, $config);
-        return $obj;
-    }
-
-    // }}}
-    // {{{ & getObject()
-    function &getObject($command)
-    {
-        $class = $GLOBALS['_PEAR_Command_commandlist'][$command];
-        if (!class_exists($class)) {
-            require_once $GLOBALS['_PEAR_Command_objects'][$class];
-        }
-        if (!class_exists($class)) {
-            return PEAR::raiseError("unknown command `$command'");
-        }
-        $ui =& PEAR_Command::getFrontendObject();
-        $config = &PEAR_Config::singleton();
-        $obj = &new $class($ui, $config);
-        return $obj;
-    }
-
-    // }}}
-    // {{{ & getFrontendObject()
-
-    /**
-     * Get instance of frontend object.
-     *
-     * @return object|PEAR_Error
-     * @static
-     */
-    function &getFrontendObject()
-    {
-        $a = &PEAR_Frontend::singleton();
-        return $a;
-    }
-
-    // }}}
-    // {{{ & setFrontendClass()
-
-    /**
-     * Load current frontend class.
-     *
-     * @param string $uiclass Name of class implementing the frontend
-     *
-     * @return object the frontend object, or a PEAR error
-     * @static
-     */
-    function &setFrontendClass($uiclass)
-    {
-        $a = &PEAR_Frontend::setFrontendClass($uiclass);
-        return $a;
-    }
-
-    // }}}
-    // {{{ setFrontendType()
-
-    /**
-     * Set current frontend.
-     *
-     * @param string $uitype Name of the frontend type (for example "CLI")
-     *
-     * @return object the frontend object, or a PEAR error
-     * @static
-     */
-    function setFrontendType($uitype)
-    {
-        $uiclass = 'PEAR_Frontend_' . $uitype;
-        return PEAR_Command::setFrontendClass($uiclass);
-    }
-
-    // }}}
-    // {{{ registerCommands()
-
-    /**
-     * Scan through the Command directory looking for classes
-     * and see what commands they implement.
-     *
-     * @param bool   (optional) if FALSE (default), the new list of
-     *               commands should replace the current one.  If TRUE,
-     *               new entries will be merged with old.
-     *
-     * @param string (optional) where (what directory) to look for
-     *               classes, defaults to the Command subdirectory of
-     *               the directory from where this file (__FILE__) is
-     *               included.
-     *
-     * @return bool TRUE on success, a PEAR error on failure
-     *
-     * @access public
-     * @static
-     */
-    function registerCommands($merge = false, $dir = null)
-    {
-        $parser = new PEAR_XMLParser;
-        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");
-        }
-        if (!$merge) {
-            $GLOBALS['_PEAR_Command_commandlist'] = array();
-        }
-        while ($entry = readdir($dp)) {
-            if ($entry{0} == '.' || substr($entry, -4) != '.xml') {
-                continue;
-            }
-            $class = "PEAR_Command_".substr($entry, 0, -4);
-            $file = "$dir/$entry";
-            $parser->parse(file_get_contents($file));
-            $implements = $parser->getData();
-            // List of commands
-            if (empty($GLOBALS['_PEAR_Command_objects'][$class])) {
-                $GLOBALS['_PEAR_Command_objects'][$class] = "$dir/" . substr($entry, 0, -4) .
-                    '.php';
-            }
-            foreach ($implements as $command => $desc) {
-                if ($command == 'attribs') {
-                    continue;
-                }
-                if (isset($GLOBALS['_PEAR_Command_commandlist'][$command])) {
-                    return PEAR::raiseError('Command "' . $command . '" already registered in ' .
-                        'class "' . $GLOBALS['_PEAR_Command_commandlist'][$command] . '"');
-                }
-                $GLOBALS['_PEAR_Command_commandlist'][$command] = $class;
-                $GLOBALS['_PEAR_Command_commanddesc'][$command] = $desc['summary'];
-                if (isset($desc['shortcut'])) {
-                    $shortcut = $desc['shortcut'];
-                    if (isset($GLOBALS['_PEAR_Command_shortcuts'][$shortcut])) {
-                        return PEAR::raiseError('Command shortcut "' . $shortcut . '" already ' .
-                            'registered to command "' . $command . '" in class "' .
-                            $GLOBALS['_PEAR_Command_commandlist'][$command] . '"');
-                    }
-                    $GLOBALS['_PEAR_Command_shortcuts'][$shortcut] = $command;
-                }
-                if (isset($desc['options']) && $desc['options']) {
-                    foreach ($desc['options'] as $oname => $option) {
-                        if (isset($option['shortopt']) && strlen($option['shortopt']) > 1) {
-                            return PEAR::raiseError('Option "' . $oname . '" short option "' .
-                                $option['shortopt'] . '" must be ' .
-                                'only 1 character in Command "' . $command . '" in class "' .
-                                $class . '"');
-                        }
-                    }
-                }
-            }
-        }
-        ksort($GLOBALS['_PEAR_Command_shortcuts']);
-        ksort($GLOBALS['_PEAR_Command_commandlist']);
-        @closedir($dp);
-        return true;
-    }
-
-    // }}}
-    // {{{ getCommands()
-
-    /**
-     * Get the list of currently supported commands, and what
-     * classes implement them.
-     *
-     * @return array command => implementing class
-     *
-     * @access public
-     * @static
-     */
-    function getCommands()
-    {
-        if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
-            PEAR_Command::registerCommands();
-        }
-        return $GLOBALS['_PEAR_Command_commandlist'];
-    }
-
-    // }}}
-    // {{{ getShortcuts()
-
-    /**
-     * Get the list of command shortcuts.
-     *
-     * @return array shortcut => command
-     *
-     * @access public
-     * @static
-     */
-    function getShortcuts()
-    {
-        if (empty($GLOBALS['_PEAR_Command_shortcuts'])) {
-            PEAR_Command::registerCommands();
-        }
-        return $GLOBALS['_PEAR_Command_shortcuts'];
-    }
-
-    // }}}
-    // {{{ getGetoptArgs()
-
-    /**
-     * Compiles arguments for getopt.
-     *
-     * @param string $command     command to get optstring for
-     * @param string $short_args  (reference) short getopt format
-     * @param array  $long_args   (reference) long getopt format
-     *
-     * @return void
-     *
-     * @access public
-     * @static
-     */
-    function getGetoptArgs($command, &$short_args, &$long_args)
-    {
-        if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
-            PEAR_Command::registerCommands();
-        }
-        if (isset($GLOBALS['_PEAR_Command_shortcuts'][$command])) {
-            $command = $GLOBALS['_PEAR_Command_shortcuts'][$command];
-        }
-        if (!isset($GLOBALS['_PEAR_Command_commandlist'][$command])) {
-            return null;
-        }
-        $obj = &PEAR_Command::getObject($command);
-        return $obj->getGetoptArgs($command, $short_args, $long_args);
-    }
-
-    // }}}
-    // {{{ getDescription()
-
-    /**
-     * Get description for a command.
-     *
-     * @param  string $command Name of the command
-     *
-     * @return string command description
-     *
-     * @access public
-     * @static
-     */
-    function getDescription($command)
-    {
-        if (!isset($GLOBALS['_PEAR_Command_commanddesc'][$command])) {
-            return null;
-        }
-        return $GLOBALS['_PEAR_Command_commanddesc'][$command];
-    }
-
-    // }}}
-    // {{{ getHelp()
-
-    /**
-     * Get help for command.
-     *
-     * @param string $command Name of the command to return help for
-     *
-     * @access public
-     * @static
-     */
-    function getHelp($command)
-    {
-        $cmds = PEAR_Command::getCommands();
-        if (isset($GLOBALS['_PEAR_Command_shortcuts'][$command])) {
-            $command = $GLOBALS['_PEAR_Command_shortcuts'][$command];
-        }
-        if (isset($cmds[$command])) {
-            $obj = &PEAR_Command::getObject($command);
-            return $obj->getHelp($command);
-        }
-        return false;
-    }
-    // }}}
-}
-
-?>
diff --git a/PEAR/Command/Auth.php b/PEAR/Command/Auth.php
deleted file mode 100644
index 7999a8a..0000000
--- a/PEAR/Command/Auth.php
+++ /dev/null
@@ -1,186 +0,0 @@
-
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Auth.php,v 1.24 2006/03/05 21:23:21 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-require_once 'PEAR/Config.php';
-
-/**
- * PEAR commands for login/logout
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command_Auth extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'login' => array(
-            'summary' => 'Connects and authenticates to remote server',
-            'shortcut' => 'li',
-            'function' => 'doLogin',
-            'options' => array(),
-            'doc' => '
-Log in to the remote server.  To use remote functions in the installer
-that require any kind of privileges, you need to log in first.  The
-username and password you enter here will be stored in your per-user
-PEAR configuration (~/.pearrc on Unix-like systems).  After logging
-in, your username and password will be sent along in subsequent
-operations on the remote server.',
-            ),
-        'logout' => array(
-            'summary' => 'Logs out from the remote server',
-            'shortcut' => 'lo',
-            'function' => 'doLogout',
-            'options' => array(),
-            'doc' => '
-Logs out from the remote server.  This command does not actually
-connect to the remote server, it only deletes the stored username and
-password from your user configuration.',
-            )
-
-        );
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Auth constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Auth(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ doLogin()
-
-    /**
-     * Execute the 'login' command.
-     *
-     * @param string $command command name
-     *
-     * @param array $options option_name => value
-     *
-     * @param array $params list of additional parameters
-     *
-     * @return bool TRUE on success or
-     * a PEAR error on failure
-     *
-     * @access public
-     */
-    function doLogin($command, $options, $params)
-    {
-        $reg = &$this->config->getRegistry();
-        $channel = $this->config->get('default_channel');
-        $chan = $reg->getChannel($channel);
-        if (PEAR::isError($chan)) {
-            return $this->raiseError($chan);
-        }
-        $server = $this->config->get('preferred_mirror');
-        $remote = &$this->config->getRemote();
-        $username = $this->config->get('username');
-        if (empty($username)) {
-            $username = isset($_ENV['USER']) ? $_ENV['USER'] : null;
-        }
-        $this->ui->outputData("Logging in to $server.", $command);
-        
-        list($username, $password) = $this->ui->userDialog(
-            $command,
-            array('Username', 'Password'),
-            array('text',     'password'),
-            array($username,  '')
-            );
-        $username = trim($username);
-        $password = trim($password);
-        
-        $this->config->set('username', $username);
-        $this->config->set('password', $password);
-
-        if ($chan->supportsREST()) {
-            $ok = true;
-        } else {
-            $remote->expectError(401);
-            $ok = $remote->call('logintest');
-            $remote->popExpect();
-        }
-        if ($ok === true) {
-            $this->ui->outputData("Logged in.", $command);
-            $this->config->store();
-        } else {
-            return $this->raiseError("Login failed!");
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ doLogout()
-
-    /**
-     * Execute the 'logout' command.
-     *
-     * @param string $command command name
-     *
-     * @param array $options option_name => value
-     *
-     * @param array $params list of additional parameters
-     *
-     * @return bool TRUE on success or
-     * a PEAR error on failure
-     *
-     * @access public
-     */
-    function doLogout($command, $options, $params)
-    {
-        $reg = &$this->config->getRegistry();
-        $channel = $this->config->get('default_channel');
-        $chan = $reg->getChannel($channel);
-        if (PEAR::isError($chan)) {
-            return $this->raiseError($chan);
-        }
-        $server = $this->config->get('preferred_mirror');
-        $this->ui->outputData("Logging out from $server.", $command);
-        $this->config->remove('username');
-        $this->config->remove('password');
-        $this->config->store();
-        return true;
-    }
-
-    // }}}
-}
-
-?>
\ No newline at end of file
diff --git a/PEAR/Command/Auth.xml b/PEAR/Command/Auth.xml
deleted file mode 100644
index 76eeedd..0000000
--- a/PEAR/Command/Auth.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
- 
-  Connects and authenticates to remote server
-  li
-  doLogin
-  
-  
-Log in to the remote server.  To use remote functions in the installer
-that require any kind of privileges, you need to log in first.  The
-username and password you enter here will be stored in your per-user
-PEAR configuration (~/.pearrc on Unix-like systems).  After logging
-in, your username and password will be sent along in subsequent
-operations on the remote server.
- 
- 
-  Logs out from the remote server
-  lo
-  doLogout
-  
-  
-Logs out from the remote server.  This command does not actually
-connect to the remote server, it only deletes the stored username and
-password from your user configuration.
- 
-
\ No newline at end of file
diff --git a/PEAR/Command/Build.php b/PEAR/Command/Build.php
deleted file mode 100644
index 234298a..0000000
--- a/PEAR/Command/Build.php
+++ /dev/null
@@ -1,104 +0,0 @@
-
- * @author     Tomas V.V.Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Build.php,v 1.13 2006/01/06 04:47:36 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for building extensions.
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Tomas V.V.Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command_Build extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'build' => array(
-            'summary' => 'Build an Extension From C Source',
-            'function' => 'doBuild',
-            'shortcut' => 'b',
-            'options' => array(),
-            'doc' => '[package.xml]
-Builds one or more extensions contained in a package.'
-            ),
-        );
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Build constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Build(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ doBuild()
-
-    function doBuild($command, $options, $params)
-    {
-        require_once 'PEAR/Builder.php';
-        if (sizeof($params) < 1) {
-            $params[0] = 'package.xml';
-        }
-        $builder = &new PEAR_Builder($this->ui);
-        $this->debug = $this->config->get('verbose');
-        $err = $builder->build($params[0], array(&$this, 'buildCallback'));
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ buildCallback()
-
-    function buildCallback($what, $data)
-    {
-        if (($what == 'cmdoutput' && $this->debug > 1) ||
-            ($what == 'output' && $this->debug > 0)) {
-            $this->ui->outputData(rtrim($data), 'build');
-        }
-    }
-
-    // }}}
-}
diff --git a/PEAR/Command/Build.xml b/PEAR/Command/Build.xml
deleted file mode 100644
index 58628bb..0000000
--- a/PEAR/Command/Build.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
- 
-  Build an Extension From C Source
-  doBuild
-  b
-  
-  [package.xml]
-Builds one or more extensions contained in a package.
- 
-
\ No newline at end of file
diff --git a/PEAR/Command/Channels.php b/PEAR/Command/Channels.php
deleted file mode 100644
index ee5f07d..0000000
--- a/PEAR/Command/Channels.php
+++ /dev/null
@@ -1,785 +0,0 @@
-
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Channels.php,v 1.46 2006/07/17 18:19:25 pajoye Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for managing channels.
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Command_Channels extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'list-channels' => array(
-            'summary' => 'List Available Channels',
-            'function' => 'doList',
-            'shortcut' => 'lc',
-            'options' => array(),
-            'doc' => '
-List all available channels for installation.
-',
-            ),
-        'update-channels' => array(
-            'summary' => 'Update the Channel List',
-            'function' => 'doUpdateAll',
-            'shortcut' => 'uc',
-            'options' => array(),
-            'doc' => '
-List all installed packages in all channels.
-'
-            ),
-        'channel-delete' => array(
-            'summary' => 'Remove a Channel From the List',
-            'function' => 'doDelete',
-            'shortcut' => 'cde',
-            'options' => array(),
-            'doc' => '
-Delete a channel from the registry.  You may not
-remove any channel that has installed packages.
-'
-            ),
-        'channel-add' => array(
-            'summary' => 'Add a Channel',
-            'function' => 'doAdd',
-            'shortcut' => 'ca',
-            'options' => array(),
-            'doc' => '
-Add a private channel to the channel list.  Note that all
-public channels should be synced using "update-channels".
-Parameter may be either a local file or remote URL to a
-channel.xml.
-'
-            ),
-        'channel-update' => array(
-            'summary' => 'Update an Existing Channel',
-            'function' => 'doUpdate',
-            'shortcut' => 'cu',
-            'options' => array(
-                'force' => array(
-                    'shortopt' => 'f',
-                    'doc' => 'will force download of new channel.xml if an existing channel name is used',
-                    ),
-                'channel' => array(
-                    'shortopt' => 'c',
-                    'arg' => 'CHANNEL',
-                    'doc' => 'will force download of new channel.xml if an existing channel name is used',
-                    ),
-),
-            'doc' => '[|]
-Update a channel in the channel list directly.  Note that all
-public channels can be synced using "update-channels".
-Parameter may be a local or remote channel.xml, or the name of
-an existing channel.
-'
-            ),
-        'channel-info' => array(
-            'summary' => 'Retrieve Information on a Channel',
-            'function' => 'doInfo',
-            'shortcut' => 'ci',
-            'options' => array(),
-            'doc' => '
-List the files in an installed package.
-'
-            ),
-        'channel-alias' => array(
-            'summary' => 'Specify an alias to a channel name',
-            'function' => 'doAlias',
-            'shortcut' => 'cha',
-            'options' => array(),
-            'doc' => ' 
-Specify a specific alias to use for a channel name.
-The alias may not be an existing channel name or
-alias.
-'
-            ),
-        'channel-discover' => array(
-            'summary' => 'Initialize a Channel from its server',
-            'function' => 'doDiscover',
-            'shortcut' => 'di',
-            'options' => array(),
-            'doc' => '[|]
-Initialize a Channel from its server and creates the local channel.xml.
-'
-            ),
-        );
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Registry constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Channels(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ doList()
-    
-    function _sortChannels($a, $b)
-    {
-        return strnatcasecmp($a->getName(), $b->getName());
-    }
-
-    function doList($command, $options, $params)
-    {
-        $reg = &$this->config->getRegistry();
-        $registered = $reg->getChannels();
-        usort($registered, array(&$this, '_sortchannels'));
-        $i = $j = 0;
-        $data = array(
-            'caption' => 'Registered Channels:',
-            'border' => true,
-            'headline' => array('Channel', 'Summary')
-            );
-        foreach ($registered as $channel) {
-            $data['data'][] = array($channel->getName(),
-                                      $channel->getSummary());
-        }
-        if (count($registered)==0) {
-            $data = '(no registered channels)';
-        }
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-    
-    function doUpdateAll($command, $options, $params)
-    {
-        $reg = &$this->config->getRegistry();
-        $savechannel = $this->config->get('default_channel');
-        if (isset($options['channel'])) {
-            if (!$reg->channelExists($options['channel'])) {
-                return $this->raiseError('Unknown channel "' . $options['channel'] . '"');
-            }
-            $this->config->set('default_channel', $options['channel']);
-        } else {
-            $this->config->set('default_channel', 'pear.php.net');
-        }
-        $remote = &$this->config->getRemote();
-        $channels = $remote->call('channel.listAll');
-        if (PEAR::isError($channels)) {
-            $this->config->set('default_channel', $savechannel);
-            return $channels;
-        }
-        if (!is_array($channels) || isset($channels['faultCode'])) {
-            $this->config->set('default_channel', $savechannel);
-            return $this->raiseError("Incorrect channel listing returned from channel '$chan'");
-        }
-        if (!count($channels)) {
-            $data = 'no updates available';
-        }
-        $dl = &$this->getDownloader();
-        if (!class_exists('System')) {
-            require_once 'System.php';
-        }
-        $tmpdir = System::mktemp(array('-d'));
-        foreach ($channels as $channel) {
-            $channel = $channel[0];
-            $save = $channel;
-            if ($reg->channelExists($channel, true)) {
-                $this->ui->outputData("Updating channel \"$channel\"", $command);
-                $test = $reg->getChannel($channel, true);
-                if (PEAR::isError($test)) {
-                    $this->ui->outputData("Channel '$channel' is corrupt in registry!", $command);
-                    $lastmodified = false;
-                } else {
-                    $lastmodified = $test->lastModified();
-                    
-                }
-                PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                $contents = $dl->downloadHttp('http://' . $test->getName() . '/channel.xml',
-                    $this->ui, $tmpdir, null, $lastmodified);
-                PEAR::staticPopErrorHandling();
-                if (PEAR::isError($contents)) {
-                    $this->ui->outputData('ERROR: Cannot retrieve channel.xml for channel "' .
-                        $test->getName() . '"', $command);
-                    continue;
-                }
-                if (!$contents) {
-                    $this->ui->outputData("Channel \"$channel\" is up-to-date", $command);
-                    continue;
-                }
-                list($contents, $lastmodified) = $contents;
-                $info = implode('', file($contents));
-                if (!$info) {
-                    $this->ui->outputData("Channel \"$channel\" is up-to-date", $command);
-                    continue;
-                }
-                if (!class_exists('PEAR_ChannelFile')) {
-                    require_once 'PEAR/ChannelFile.php';
-                }
-                $channelinfo = new PEAR_ChannelFile;
-                $channelinfo->fromXmlString($info);
-                if ($channelinfo->getErrors()) {
-                    $this->ui->outputData("Downloaded channel data from channel \"$channel\" " . 
-                        'is corrupt, skipping', $command);
-                    continue;
-                }
-                $channel = $channelinfo;
-                if ($channel->getName() != $save) {
-                    $this->ui->outputData('ERROR: Security risk - downloaded channel ' .
-                        'definition file for channel "'
-                        . $channel->getName() . ' from channel "' . $save .
-                        '".  To use anyway, use channel-update', $command);
-                    continue;
-                }
-                $reg->updateChannel($channel, $lastmodified);
-            } else {
-                if ($reg->isAlias($channel)) {
-                    $temp = &$reg->getChannel($channel);
-                    if (PEAR::isError($temp)) {
-                        return $this->raiseError($temp);
-                    }
-                    $temp->setAlias($temp->getName(), true); // set the alias to the channel name
-                    if ($reg->channelExists($temp->getName())) {
-                        $this->ui->outputData('ERROR: existing channel "' . $temp->getName() .
-                            '" is aliased to "' . $channel . '" already and cannot be ' .
-                            're-aliased to "' . $temp->getName() . '" because a channel with ' .
-                            'that name or alias already exists!  Please re-alias and try ' .
-                            'again.', $command);
-                        continue;
-                    }
-                }
-                $this->ui->outputData("Adding new channel \"$channel\"", $command);
-                PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                $contents = $dl->downloadHttp('http://' . $channel . '/channel.xml',
-                    $this->ui, $tmpdir, null, false);
-                PEAR::staticPopErrorHandling();
-                if (PEAR::isError($contents)) {
-                    $this->ui->outputData('ERROR: Cannot retrieve channel.xml for channel "' .
-                        $channel . '"', $command);
-                    continue;
-                }
-                list($contents, $lastmodified) = $contents;
-                $info = implode('', file($contents));
-                if (!class_exists('PEAR_ChannelFile')) {
-                    require_once 'PEAR/ChannelFile.php';
-                }
-                $channelinfo = new PEAR_Channelfile;
-                $channelinfo->fromXmlString($info);
-                if ($channelinfo->getErrors()) {
-                    $this->ui->outputData("Downloaded channel data from channel \"$channel\"" .
-                        ' is corrupt, skipping', $command);
-                    continue;
-                }
-                $channel = $channelinfo;
-                if ($channel->getName() != $save) {
-                    $this->ui->outputData('ERROR: Security risk - downloaded channel ' .
-                        'definition file for channel "'
-                        . $channel->getName() . '" from channel "' . $save .
-                        '".  To use anyway, use channel-update', $command);
-                    continue;
-                }
-                $reg->addChannel($channel, $lastmodified);
-            }
-        }
-        $this->config->set('default_channel', $savechannel);
-        $this->ui->outputData('update-channels complete', $command);
-        return true;
-    }
-    
-    function doInfo($command, $options, $params)
-    {
-        if (sizeof($params) != 1) {
-            return $this->raiseError("No channel specified");
-        }
-        $reg = &$this->config->getRegistry();
-        $channel = strtolower($params[0]);
-        if ($reg->channelExists($channel)) {
-            $chan = $reg->getChannel($channel);
-            if (PEAR::isError($chan)) {
-                return $this->raiseError($chan);
-            }
-        } else {
-            if (strpos($channel, '://')) {
-                $downloader = &$this->getDownloader();
-                if (!class_exists('System')) {
-                    require_once 'System.php';
-                }
-                $tmpdir = System::mktemp(array('-d'));
-                PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                $loc = $downloader->downloadHttp($channel, $this->ui, $tmpdir);
-                PEAR::staticPopErrorHandling();
-                if (PEAR::isError($loc)) {
-                    return $this->raiseError('Cannot open "' . $channel . '"');
-                } else {
-                    $contents = implode('', file($loc));
-                }
-            } else {
-                if (file_exists($params[0])) {
-                    $fp = fopen($params[0], 'r');
-                    if (!$fp) {
-                        return $this->raiseError('Cannot open "' . $params[0] . '"');
-                    }
-                } else {
-                    return $this->raiseError('Unknown channel "' . $channel . '"');
-                }
-                $contents = '';
-                while (!feof($fp)) {
-                    $contents .= fread($fp, 1024);
-                }
-                fclose($fp);
-            }
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
-            }
-            $chan = new PEAR_ChannelFile;
-            $chan->fromXmlString($contents);
-            $chan->validate();
-            if ($errs = $chan->getErrors(true)) {
-                foreach ($errs as $err) {
-                    $this->ui->outputData($err['level'] . ': ' . $err['message']);
-                }
-                return $this->raiseError('Channel file "' . $params[0] . '" is not valid');
-            }
-        }
-        if ($chan) {
-            $channel = $chan->getName();
-            $caption = 'Channel ' . $channel . ' Information:';
-            $data1 = array(
-                'caption' => $caption,
-                'border' => true);
-            $data1['data']['server'] = array('Name and Server', $chan->getName());
-            if ($chan->getAlias() != $chan->getName()) {
-                $data1['data']['alias'] = array('Alias', $chan->getAlias());
-            }
-            $data1['data']['summary'] = array('Summary', $chan->getSummary());
-            $validate = $chan->getValidationPackage();
-            $data1['data']['vpackage'] = array('Validation Package Name', $validate['_content']);
-            $data1['data']['vpackageversion'] =
-                array('Validation Package Version', $validate['attribs']['version']);
-            $d = array();
-            $d['main'] = $data1;
-
-            $data['data'] = array();
-            $data['caption'] = 'Server Capabilities';
-            $data['headline'] = array('Type', 'Version/REST type', 'Function Name/REST base');
-            $capabilities = $chan->getFunctions('xmlrpc');
-            $soaps = $chan->getFunctions('soap');
-            if ($capabilities || $soaps || $chan->supportsREST()) {
-                if ($capabilities) {
-                    if (!isset($capabilities[0])) {
-                        $capabilities = array($capabilities);
-                    }
-                    foreach ($capabilities as $protocol) {
-                        $data['data'][] = array('xmlrpc', $protocol['attribs']['version'],
-                            $protocol['_content']);
-                    }
-                }
-                if ($soaps) {
-                    if (!isset($soaps[0])) {
-                        $soaps = array($soaps);
-                    }
-                    foreach ($soaps as $protocol) {
-                        $data['data'][] = array('soap', $protocol['attribs']['version'],
-                            $protocol['_content']);
-                    }
-                }
-                if ($chan->supportsREST()) {
-                    $funcs = $chan->getFunctions('rest');
-                    if (!isset($funcs[0])) {
-                        $funcs = array($funcs);
-                    }
-                    foreach ($funcs as $protocol) {
-                        $data['data'][] = array('rest', $protocol['attribs']['type'],
-                            $protocol['_content']); 
-                    }
-                }
-            } else {
-                $data['data'][] = array('No supported protocols');
-            }
-            $d['protocols'] = $data;
-            $data['data'] = array();
-            $mirrors = $chan->getMirrors();
-            if ($mirrors) {
-                $data['caption'] = 'Channel ' . $channel . ' Mirrors:';
-                unset($data['headline']);
-                foreach ($mirrors as $mirror) {
-                    $data['data'][] = array($mirror['attribs']['host']);
-                    $d['mirrors'] = $data;
-                }
-                foreach ($mirrors as $mirror) {
-                    $data['data'] = array();
-                    $data['caption'] = 'Mirror ' . $mirror['attribs']['host'] . ' Capabilities';
-                    $data['headline'] = array('Type', 'Version/REST type', 'Function Name/REST base');
-                    $capabilities = $chan->getFunctions('xmlrpc', $mirror['attribs']['host']);
-                    $soaps = $chan->getFunctions('soap', $mirror['attribs']['host']);
-                    if ($capabilities || $soaps || $chan->supportsREST($mirror['attribs']['host'])) {
-                        if ($capabilities) {
-                            if (!isset($capabilities[0])) {
-                                $capabilities = array($capabilities);
-                            }
-                            foreach ($capabilities as $protocol) {
-                                $data['data'][] = array('xmlrpc', $protocol['attribs']['version'],
-                                    $protocol['_content']);
-                            }
-                        }
-                        if ($soaps) {
-                            if (!isset($soaps[0])) {
-                                $soaps = array($soaps);
-                            }
-                            foreach ($soaps as $protocol) {
-                                $data['data'][] = array('soap', $protocol['attribs']['version'],
-                                    $protocol['_content']);
-                            }
-                        }
-                        if ($chan->supportsREST($mirror['attribs']['host'])) {
-                            $funcs = $chan->getFunctions('rest', $mirror['attribs']['host']);
-                            if (!isset($funcs[0])) {
-                                $funcs = array($funcs);
-                            }
-                            foreach ($funcs as $protocol) {
-                                $data['data'][] = array('rest', $protocol['attribs']['type'],
-                                    $protocol['_content']); 
-                            }
-                        }
-                    } else {
-                        $data['data'][] = array('No supported protocols');
-                    }
-                    $d['mirrorprotocols'] = $data;
-                }
-            }
-            $this->ui->outputData($d, 'channel-info');
-        } else {
-            return $this->raiseError('Serious error: Channel "' . $params[0] .
-                '" has a corrupted registry entry');
-        }
-    }
-
-    // }}}
-    
-    function doDelete($command, $options, $params)
-    {
-        if (sizeof($params) != 1) {
-            return $this->raiseError('channel-delete: no channel specified');
-        }
-        $reg = &$this->config->getRegistry();
-        if (!$reg->channelExists($params[0])) {
-            return $this->raiseError('channel-delete: channel "' . $params[0] . '" does not exist');
-        }
-        $channel = $reg->channelName($params[0]);
-        if ($channel == 'pear.php.net') {
-            return $this->raiseError('Cannot delete the pear.php.net channel');
-        }
-        if ($channel == 'pecl.php.net') {
-            return $this->raiseError('Cannot delete the pecl.php.net channel');
-        }
-        if ($channel == '__uri') {
-            return $this->raiseError('Cannot delete the __uri pseudo-channel');
-        }
-        if (PEAR::isError($err = $reg->listPackages($channel))) {
-            return $err;
-        }
-        if (count($err)) {
-            return $this->raiseError('Channel "' . $channel .
-                '" has installed packages, cannot delete');
-        }
-        if (!$reg->deleteChannel($channel)) {
-            return $this->raiseError('Channel "' . $channel . '" deletion failed');
-        } else {
-            $this->config->deleteChannel($channel);
-            $this->ui->outputData('Channel "' . $channel . '" deleted', $command);
-        }
-    }
-
-    function doAdd($command, $options, $params)
-    {
-        if (sizeof($params) != 1) {
-            return $this->raiseError('channel-add: no channel file specified');
-        }
-        if (strpos($params[0], '://')) {
-            $downloader = &$this->getDownloader();
-            if (!class_exists('System')) {
-                require_once 'System.php';
-            }
-            $tmpdir = System::mktemp(array('-d'));
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $loc = $downloader->downloadHttp($params[0], $this->ui, $tmpdir, null, false);
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($loc)) {
-                return $this->raiseError('channel-add: Cannot open "' . $params[0] . '"');
-            } else {
-                list($loc, $lastmodified) = $loc;
-                $contents = implode('', file($loc));
-            }
-        } else {
-            $lastmodified = $fp = false;
-            if (file_exists($params[0])) {
-                $fp = fopen($params[0], 'r');
-            }
-            if (!$fp) {
-                return $this->raiseError('channel-add: cannot open "' . $params[0] . '"');
-            }
-            $contents = '';
-            while (!feof($fp)) {
-                $contents .= fread($fp, 1024);
-            }
-            fclose($fp);
-        }
-        if (!class_exists('PEAR_ChannelFile')) {
-            require_once 'PEAR/ChannelFile.php';
-        }
-        $channel = new PEAR_ChannelFile;
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $result = $channel->fromXmlString($contents);
-        PEAR::staticPopErrorHandling();
-        if (!$result) {
-            $exit = false;
-            if (count($errors = $channel->getErrors(true))) {
-                foreach ($errors as $error) {
-                    $this->ui->outputData(ucfirst($error['level'] . ': ' . $error['message']));
-                    if (!$exit) {
-                        $exit = $error['level'] == 'error' ? true : false;
-                    }
-                }
-                if ($exit) {
-                    return $this->raiseError('channel-add: invalid channel.xml file');
-                }
-            }
-        }
-        $reg = &$this->config->getRegistry();
-        if ($reg->channelExists($channel->getName())) {
-            return $this->raiseError('channel-add: Channel "' . $channel->getName() .
-                '" exists, use channel-update to update entry');
-        }
-        $ret = $reg->addChannel($channel, $lastmodified);
-        if (PEAR::isError($ret)) {
-            return $ret;
-        }
-        if (!$ret) {
-            return $this->raiseError('channel-add: adding Channel "' . $channel->getName() .
-                '" to registry failed');
-        }
-        $this->config->setChannels($reg->listChannels());
-        $this->config->writeConfigFile();
-        $this->ui->outputData('Adding Channel "' . $channel->getName() . '" succeeded', $command);
-    }
-
-    function doUpdate($command, $options, $params)
-    {
-        if (!class_exists('System')) {
-            require_once 'System.php';
-        }
-        $tmpdir = System::mktemp(array('-d'));
-        $reg = &$this->config->getRegistry();
-        if (sizeof($params) != 1) {
-            return $this->raiseError("No channel file specified");
-        }
-        $lastmodified = false;
-        if ((!file_exists($params[0]) || is_dir($params[0]))
-              && $reg->channelExists(strtolower($params[0]))) {
-            $c = $reg->getChannel(strtolower($params[0]));
-            if (PEAR::isError($c)) {
-                return $this->raiseError($c);
-            }
-            $this->ui->outputData('Retrieving channel.xml from remote server');
-            $dl = &$this->getDownloader(array());
-            // if force is specified, use a timestamp of "1" to force retrieval
-            $lastmodified = isset($options['force']) ? false : $c->lastModified();
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $contents = $dl->downloadHttp('http://' . $c->getName() . '/channel.xml',
-                $this->ui, $tmpdir, null, $lastmodified);
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($contents)) {
-                return $this->raiseError('Cannot retrieve channel.xml for channel "' .
-                    $c->getName() . '"');
-            }
-            list($contents, $lastmodified) = $contents;
-            if (!$contents) {
-                $this->ui->outputData("Channel $params[0] channel.xml is up to date");
-                return;
-            }
-            $contents = implode('', file($contents));
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
-            }
-            $channel = new PEAR_ChannelFile;
-            $channel->fromXmlString($contents);
-            if (!$channel->getErrors()) {
-                // security check: is the downloaded file for the channel we got it from?
-                if (strtolower($channel->getName()) != strtolower($c->getName())) {
-                    if (isset($options['force'])) {
-                        $this->ui->log(0, 'WARNING: downloaded channel definition file' .
-                            ' for channel "' . $channel->getName() . '" from channel "' .
-                            strtolower($c->getName()) . '"');
-                    } else {
-                        return $this->raiseError('ERROR: downloaded channel definition file' .
-                            ' for channel "' . $channel->getName() . '" from channel "' .
-                            strtolower($c->getName()) . '"');
-                    }
-                }
-            }
-        } else {
-            if (strpos($params[0], '://')) {
-                $dl = &$this->getDownloader();
-                PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                $loc = $dl->downloadHttp($params[0],
-                    $this->ui, $tmpdir, null, $lastmodified);
-                PEAR::staticPopErrorHandling();
-                if (PEAR::isError($loc)) {
-                    return $this->raiseError("Cannot open " . $params[0]);
-                } else {
-                    list($loc, $lastmodified) = $loc;
-                    $contents = implode('', file($loc));
-                }
-            } else {
-                $fp = false;
-                if (file_exists($params[0])) {
-                    $fp = fopen($params[0], 'r');
-                }
-                if (!$fp) {
-                    return $this->raiseError("Cannot open " . $params[0]);
-                }
-                $contents = '';
-                while (!feof($fp)) {
-                    $contents .= fread($fp, 1024);
-                }
-                fclose($fp);
-            }
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
-            }
-            $channel = new PEAR_ChannelFile;
-            $channel->fromXmlString($contents);
-        }
-        $exit = false;
-        if (count($errors = $channel->getErrors(true))) {
-            foreach ($errors as $error) {
-                $this->ui->outputData(ucfirst($error['level'] . ': ' . $error['message']));
-                if (!$exit) {
-                    $exit = $error['level'] == 'error' ? true : false;
-                }
-            }
-            if ($exit) {
-                return $this->raiseError('Invalid channel.xml file');
-            }
-        }
-        if (!$reg->channelExists($channel->getName())) {
-            return $this->raiseError('Error: Channel "' . $channel->getName() .
-                '" does not exist, use channel-add to add an entry');
-        }
-        $ret = $reg->updateChannel($channel, $lastmodified);
-        if (PEAR::isError($ret)) {
-            return $ret;
-        }
-        if (!$ret) {
-            return $this->raiseError('Updating Channel "' . $channel->getName() .
-                '" in registry failed');
-        }
-        $this->config->setChannels($reg->listChannels());
-        $this->config->writeConfigFile();
-        $this->ui->outputData('Update of Channel "' . $channel->getName() . '" succeeded');
-    }
-
-    function &getDownloader()
-    {
-        if (!class_exists('PEAR_Downloader')) {
-            require_once 'PEAR/Downloader.php';
-        }
-        $a = new PEAR_Downloader($this->ui, array(), $this->config);
-        return $a;
-    }
-
-    function doAlias($command, $options, $params)
-    {
-        $reg = &$this->config->getRegistry();
-        if (sizeof($params) == 1) {
-            return $this->raiseError('No channel alias specified');
-        }
-        if (sizeof($params) != 2) {
-            return $this->raiseError(
-                'Invalid format, correct is: channel-alias channel alias');
-        }
-        if (!$reg->channelExists($params[0], true)) {
-            if ($reg->isAlias($params[0])) {
-                $extra = ' (use "channel-alias ' . $reg->channelName($params[0]) . ' ' .
-                    strtolower($params[1]) . '")';
-            } else {
-                $extra = '';
-            }
-            return $this->raiseError('"' . $params[0] . '" is not a valid channel' . $extra);
-        }
-        if ($reg->isAlias($params[1])) {
-            return $this->raiseError('Channel "' . $reg->channelName($params[1]) . '" is ' .
-                'already aliased to "' . strtolower($params[1]) . '", cannot re-alias');
-        }
-        $chan = &$reg->getChannel($params[0]);
-        if (PEAR::isError($chan)) {
-            return $this->raiseError('Corrupt registry?  Error retrieving channel "' . $params[0] .
-                '" information (' . $chan->getMessage() . ')');
-        }
-        // make it a local alias
-        if (!$chan->setAlias(strtolower($params[1]), true)) {
-            return $this->raiseError('Alias "' . strtolower($params[1]) .
-                '" is not a valid channel alias');
-        }
-        $reg->updateChannel($chan);
-        $this->ui->outputData('Channel "' . $chan->getName() . '" aliased successfully to "' .
-            strtolower($params[1]) . '"');
-    }
-
-    function doDiscover($command, $options, $params)
-    {
-        $reg = &$this->config->getRegistry();
-        if (sizeof($params) != 1) {
-            return $this->raiseError("No channel server specified");
-        }
-        if ($reg->channelExists($params[0])) {
-            if ($reg->isAlias($params[0])) {
-                return $this->raiseError("A channel alias named \"$params[0]\" " .
-                    'already exists, aliasing channel "' . $reg->channelName($params[0])
-                    . '"');
-            } else {
-                return $this->raiseError("Channel \"$params[0]\" is already initialized");
-            }
-        }
-        $this->pushErrorHandling(PEAR_ERROR_RETURN);
-        $err = $this->doAdd($command, $options, array('http://' . $params[0] . '/channel.xml'));
-        $this->popErrorHandling();
-        if (PEAR::isError($err)) {
-            return $this->raiseError("Discovery of channel \"$params[0]\" failed (" .
-                $err->getMessage() . ')');
-        }
-        $this->ui->outputData("Discovery of channel \"$params[0]\" succeeded", $command);
-    }
-}
-?>
diff --git a/PEAR/Command/Channels.xml b/PEAR/Command/Channels.xml
deleted file mode 100644
index 849fa0a..0000000
--- a/PEAR/Command/Channels.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-
- 
-  List Available Channels
-  doList
-  lc
-  
-  
-List all available channels for installation.
-
- 
- 
-  Update the Channel List
-  doUpdateAll
-  uc
-  
-  
-List all installed packages in all channels.
-
- 
- 
-  Remove a Channel From the List
-  doDelete
-  cde
-  
-  <channel name>
-Delete a channel from the registry.  You may not
-remove any channel that has installed packages.
-
- 
- 
-  Add a Channel
-  doAdd
-  ca
-  
-  <channel.xml>
-Add a private channel to the channel list.  Note that all
-public channels should be synced using "update-channels".
-Parameter may be either a local file or remote URL to a
-channel.xml.
-
- 
- 
-  Update an Existing Channel
-  doUpdate
-  cu
-  
-   
-    f
-    will force download of new channel.xml if an existing channel name is used
-   
-   
-    c
-    CHANNEL
-    will force download of new channel.xml if an existing channel name is used
-   
-  
-  [<channel.xml>|<channel name>]
-Update a channel in the channel list directly.  Note that all
-public channels can be synced using "update-channels".
-Parameter may be a local or remote channel.xml, or the name of
-an existing channel.
-
- 
- 
-  Retrieve Information on a Channel
-  doInfo
-  ci
-  
-  <package>
-List the files in an installed package.
-
- 
- 
-  Specify an alias to a channel name
-  doAlias
-  cha
-  
-  <channel> <alias>
-Specify a specific alias to use for a channel name.
-The alias may not be an existing channel name or
-alias.
-
- 
- 
-  Initialize a Channel from its server
-  doDiscover
-  di
-  
-  [<channel.xml>|<channel name>]
-Initialize a Channel from its server and create the local channel.xml.
-
- 
-
diff --git a/PEAR/Command/Common.php b/PEAR/Command/Common.php
deleted file mode 100644
index 85ac719..0000000
--- a/PEAR/Command/Common.php
+++ /dev/null
@@ -1,291 +0,0 @@
-
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Common.php,v 1.35 2006/06/08 22:25:18 pajoye Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR.php';
-
-/**
- * PEAR commands base class
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command_Common extends PEAR
-{
-    // {{{ properties
-
-    /**
-     * PEAR_Config object used to pass user system and configuration
-     * on when executing commands
-     *
-     * @var PEAR_Config
-     */
-    var $config;
-    /**
-     * @var PEAR_Registry
-     * @access protected
-     */
-    var $_registry;
-
-    /**
-     * User Interface object, for all interaction with the user.
-     * @var object
-     */
-    var $ui;
-
-    var $_deps_rel_trans = array(
-                                 'lt' => '<',
-                                 'le' => '<=',
-                                 'eq' => '=',
-                                 'ne' => '!=',
-                                 'gt' => '>',
-                                 'ge' => '>=',
-                                 'has' => '=='
-                                 );
-
-    var $_deps_type_trans = array(
-                                  'pkg' => 'package',
-                                  'ext' => 'extension',
-                                  'php' => 'PHP',
-                                  'prog' => 'external program',
-                                  'ldlib' => 'external library for linking',
-                                  'rtlib' => 'external runtime library',
-                                  'os' => 'operating system',
-                                  'websrv' => 'web server',
-                                  'sapi' => 'SAPI backend'
-                                  );
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Common constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Common(&$ui, &$config)
-    {
-        parent::PEAR();
-        $this->config = &$config;
-        $this->ui = &$ui;
-    }
-
-    // }}}
-
-    // {{{ getCommands()
-
-    /**
-     * Return a list of all the commands defined by this class.
-     * @return array list of commands
-     * @access public
-     */
-    function getCommands()
-    {
-        $ret = array();
-        foreach (array_keys($this->commands) as $command) {
-            $ret[$command] = $this->commands[$command]['summary'];
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ getShortcuts()
-
-    /**
-     * Return a list of all the command shortcuts defined by this class.
-     * @return array shortcut => command
-     * @access public
-     */
-    function getShortcuts()
-    {
-        $ret = array();
-        foreach (array_keys($this->commands) as $command) {
-            if (isset($this->commands[$command]['shortcut'])) {
-                $ret[$this->commands[$command]['shortcut']] = $command;
-            }
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ getOptions()
-
-    function getOptions($command)
-    {
-        $shortcuts = $this->getShortcuts();
-        if (isset($shortcuts[$command])) {
-            $command = $shortcuts[$command];
-        }
-        if (isset($this->commands[$command]) &&
-              isset($this->commands[$command]['options'])) {
-            return $this->commands[$command]['options'];
-        } else {
-            return null;
-        }
-    }
-
-    // }}}
-    // {{{ getGetoptArgs()
-
-    function getGetoptArgs($command, &$short_args, &$long_args)
-    {
-        $short_args = "";
-        $long_args = array();
-        if (empty($this->commands[$command]) || empty($this->commands[$command]['options'])) {
-            return;
-        }
-        reset($this->commands[$command]['options']);
-        while (list($option, $info) = each($this->commands[$command]['options'])) {
-            $larg = $sarg = '';
-            if (isset($info['arg'])) {
-                if ($info['arg']{0} == '(') {
-                    $larg = '==';
-                    $sarg = '::';
-                    $arg = substr($info['arg'], 1, -1);
-                } else {
-                    $larg = '=';
-                    $sarg = ':';
-                    $arg = $info['arg'];
-                }
-            }
-            if (isset($info['shortopt'])) {
-                $short_args .= $info['shortopt'] . $sarg;
-            }
-            $long_args[] = $option . $larg;
-        }
-    }
-
-    // }}}
-    // {{{ getHelp()
-    /**
-    * Returns the help message for the given command
-    *
-    * @param string $command The command
-    * @return mixed A fail string if the command does not have help or
-    *               a two elements array containing [0]=>help string,
-    *               [1]=> help string for the accepted cmd args
-    */
-    function getHelp($command)
-    {
-        $config = &PEAR_Config::singleton();
-        if (!isset($this->commands[$command])) {
-            return "No such command \"$command\"";
-        }
-        $help = null;
-        if (isset($this->commands[$command]['doc'])) {
-            $help = $this->commands[$command]['doc'];
-        }
-        if (empty($help)) {
-            // XXX (cox) Fallback to summary if there is no doc (show both?)
-            if (!isset($this->commands[$command]['summary'])) {
-                return "No help for command \"$command\"";
-            }
-            $help = $this->commands[$command]['summary'];
-        }
-        if (preg_match_all('/{config\s+([^\}]+)}/e', $help, $matches)) {
-            foreach($matches[0] as $k => $v) {
-                $help = preg_replace("/$v/", $config->get($matches[1][$k]), $help);
-            }
-        }
-        return array($help, $this->getHelpArgs($command));
-    }
-
-    // }}}
-    // {{{ getHelpArgs()
-    /**
-    * Returns the help for the accepted arguments of a command
-    *
-    * @param  string $command
-    * @return string The help string
-    */
-    function getHelpArgs($command)
-    {
-        if (isset($this->commands[$command]['options']) &&
-            count($this->commands[$command]['options']))
-        {
-            $help = "Options:\n";
-            foreach ($this->commands[$command]['options'] as $k => $v) {
-                if (isset($v['arg'])) {
-                    if ($v['arg'][0] == '(') {
-                        $arg = substr($v['arg'], 1, -1);
-                        $sapp = " [$arg]";
-                        $lapp = "[=$arg]";
-                    } else {
-                        $sapp = " $v[arg]";
-                        $lapp = "=$v[arg]";
-                    }
-                } else {
-                    $sapp = $lapp = "";
-                }
-                if (isset($v['shortopt'])) {
-                    $s = $v['shortopt'];
-                    $help .= "  -$s$sapp, --$k$lapp\n";
-                } else {
-                    $help .= "  --$k$lapp\n";
-                }
-                $p = "        ";
-                $doc = rtrim(str_replace("\n", "\n$p", $v['doc']));
-                $help .= "        $doc\n";
-            }
-            return $help;
-        }
-        return null;
-    }
-
-    // }}}
-    // {{{ run()
-
-    function run($command, $options, $params)
-    {
-        if (empty($this->commands[$command]['function'])) {
-            // look for shortcuts
-            foreach (array_keys($this->commands) as $cmd) {
-                if (isset($this->commands[$cmd]['shortcut']) && $this->commands[$cmd]['shortcut'] == $command) {
-                    if (empty($this->commands[$cmd]['function'])) {
-                        return $this->raiseError("unknown command `$command'");
-                    } else {
-                        $func = $this->commands[$cmd]['function'];
-                    }
-                    $command = $cmd;
-                    break;
-                }
-            }
-        } else {
-            $func = $this->commands[$command]['function'];
-        }
-        return $this->$func($command, $options, $params);
-    }
-
-    // }}}
-}
-
-?>
diff --git a/PEAR/Command/Config.php b/PEAR/Command/Config.php
deleted file mode 100644
index edde1ea..0000000
--- a/PEAR/Command/Config.php
+++ /dev/null
@@ -1,418 +0,0 @@
-
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Config.php,v 1.52 2006/03/05 21:32:47 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for managing configuration data.
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command_Config extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'config-show' => array(
-            'summary' => 'Show All Settings',
-            'function' => 'doConfigShow',
-            'shortcut' => 'csh',
-            'options' => array(
-                'channel' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'show configuration variables for another channel',
-                    'arg' => 'CHAN',
-                    ),
-),
-            'doc' => '[layer]
-Displays all configuration values.  An optional argument
-may be used to tell which configuration layer to display.  Valid
-configuration layers are "user", "system" and "default". To display
-configurations for different channels, set the default_channel
-configuration variable and run config-show again.
-',
-            ),
-        'config-get' => array(
-            'summary' => 'Show One Setting',
-            'function' => 'doConfigGet',
-            'shortcut' => 'cg',
-            'options' => array(
-                'channel' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'show configuration variables for another channel',
-                    'arg' => 'CHAN',
-                    ),
-),
-            'doc' => ' [layer]
-Displays the value of one configuration parameter.  The
-first argument is the name of the parameter, an optional second argument
-may be used to tell which configuration layer to look in.  Valid configuration
-layers are "user", "system" and "default".  If no layer is specified, a value
-will be picked from the first layer that defines the parameter, in the order
-just specified.  The configuration value will be retrieved for the channel
-specified by the default_channel configuration variable.
-',
-            ),
-        'config-set' => array(
-            'summary' => 'Change Setting',
-            'function' => 'doConfigSet',
-            'shortcut' => 'cs',
-            'options' => array(
-                'channel' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'show configuration variables for another channel',
-                    'arg' => 'CHAN',
-                    ),
-),
-            'doc' => '  [layer]
-Sets the value of one configuration parameter.  The first argument is
-the name of the parameter, the second argument is the new value.  Some
-parameters are subject to validation, and the command will fail with
-an error message if the new value does not make sense.  An optional
-third argument may be used to specify in which layer to set the
-configuration parameter.  The default layer is "user".  The
-configuration value will be set for the current channel, which
-is controlled by the default_channel configuration variable.
-',
-            ),
-        'config-help' => array(
-            'summary' => 'Show Information About Setting',
-            'function' => 'doConfigHelp',
-            'shortcut' => 'ch',
-            'options' => array(),
-            'doc' => '[parameter]
-Displays help for a configuration parameter.  Without arguments it
-displays help for all configuration parameters.
-',
-           ),
-        'config-create' => array(
-            'summary' => 'Create a Default configuration file',
-            'function' => 'doConfigCreate',
-            'shortcut' => 'coc',
-            'options' => array(
-                'windows' => array(
-                    'shortopt' => 'w',
-                    'doc' => 'create a config file for a windows install',
-                    ),
-            ),
-            'doc' => ' 
-Create a default configuration file with all directory configuration
-variables set to subdirectories of , and save it as .
-This is useful especially for creating a configuration file for a remote
-PEAR installation (using the --remoteconfig option of install, upgrade,
-and uninstall).
-',
-            ),
-        );
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Config constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Config(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ doConfigShow()
-
-    function doConfigShow($command, $options, $params)
-    {
-        if (is_array($params)) {
-            $layer = isset($params[0]) ? $params[0] : NULL;
-        } else {
-            $layer = NULL;
-        }
-
-        // $params[0] -> the layer
-        if ($error = $this->_checkLayer($layer)) {
-            return $this->raiseError("config-show:$error");
-        }
-        $keys = $this->config->getKeys();
-        sort($keys);
-        $channel = isset($options['channel']) ? $options['channel'] :
-            $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        if (!$reg->channelExists($channel)) {
-            return $this->raiseError('Channel "' . $channel . '" does not exist');
-        }
-        $data = array('caption' => 'Configuration (channel ' . $channel . '):');
-        foreach ($keys as $key) {
-            $type = $this->config->getType($key);
-            $value = $this->config->get($key, $layer, $channel);
-            if ($type == 'password' && $value) {
-                $value = '********';
-            }
-            if ($value === false) {
-                $value = 'false';
-            } elseif ($value === true) {
-                $value = 'true';
-            }
-            $data['data'][$this->config->getGroup($key)][] = array($this->config->getPrompt($key) , $key, $value);
-        }
-        foreach ($this->config->getLayers() as $layer) {
-            $data['data']['Config Files'][] = array(ucfirst($layer) . ' Configuration File', 'Filename' , $this->config->getConfFile($layer));
-        }
-
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-
-    // }}}
-    // {{{ doConfigGet()
-
-    function doConfigGet($command, $options, $params)
-    {
-        if (!is_array($params)) {
-            $args_cnt = 0;
-        } else {
-            $args_cnt  = count($params);
-        }
-
-        switch ($args_cnt) {
-            case 1:
-                $config_key = $params[0];
-                $layer = NULL;
-                break;
-            case 2:
-                $config_key = $params[0];
-                $layer = $params[1];
-                if ($error = $this->_checkLayer($layer)) {
-                    return $this->raiseError("config-get:$error");
-                }
-                break;
-            case 0:
-            default:
-                return $this->raiseError("config-get expects 1 or 2 parameters");
-        }
-
-        $channel = isset($options['channel']) ? $options['channel'] : $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-
-        if (!$reg->channelExists($channel)) {
-            return $this->raiseError('Channel "' . $channel . '" does not exist');
-        }
-
-        $this->ui->outputData($this->config->get($config_key, $layer, $channel), $command);
-
-        return true;
-    }
-
-    // }}}
-    // {{{ doConfigSet()
-
-    function doConfigSet($command, $options, $params)
-    {
-        // $param[0] -> a parameter to set
-        // $param[1] -> the value for the parameter
-        // $param[2] -> the layer
-        $failmsg = '';
-        if (sizeof($params) < 2 || sizeof($params) > 3) {
-            $failmsg .= "config-set expects 2 or 3 parameters";
-            return PEAR::raiseError($failmsg);
-        }
-        if (isset($params[2]) && ($error = $this->_checkLayer($params[2]))) {
-            $failmsg .= $error;
-            return PEAR::raiseError("config-set:$failmsg");
-        }
-        $channel = isset($options['channel']) ? $options['channel'] :
-            $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        if (!$reg->channelExists($channel)) {
-            return $this->raiseError('Channel "' . $channel . '" does not exist');
-        }
-        if ($params[0] == 'default_channel') {
-            if (!$reg->channelExists($params[1])) {
-                return $this->raiseError('Channel "' . $params[1] . '" does not exist');
-            }
-        }
-        if (count($params) == 2) {
-            array_push($params, 'user');
-            $layer = 'user';
-        } else {
-            $layer = $params[2];
-        }
-        array_push($params, $channel);
-        if (!call_user_func_array(array(&$this->config, 'set'), $params))
-        {
-            array_pop($params);
-            $failmsg = "config-set (" . implode(", ", $params) . ") failed, channel $channel";
-        } else {
-            $this->config->store($layer);
-        }
-        if ($failmsg) {
-            return $this->raiseError($failmsg);
-        }
-        $this->ui->outputData('config-set succeeded', $command);
-        return true;
-    }
-
-    // }}}
-    // {{{ doConfigHelp()
-
-    function doConfigHelp($command, $options, $params)
-    {
-        if (empty($params)) {
-            $params = $this->config->getKeys();
-        }
-        $data['caption']  = "Config help" . ((count($params) == 1) ? " for $params[0]" : '');
-        $data['headline'] = array('Name', 'Type', 'Description');
-        $data['border']   = true;
-        foreach ($params as $name) {
-            $type = $this->config->getType($name);
-            $docs = $this->config->getDocs($name);
-            if ($type == 'set') {
-                $docs = rtrim($docs) . "\nValid set: " .
-                    implode(' ', $this->config->getSetValues($name));
-            }
-            $data['data'][] = array($name, $type, $docs);
-        }
-        $this->ui->outputData($data, $command);
-    }
-
-    // }}}
-    // {{{ doConfigCreate()
-
-    function doConfigCreate($command, $options, $params)
-    {
-        if (count($params) != 2) {
-            return PEAR::raiseError('config-create: must have 2 parameters, root path and ' .
-                'filename to save as');
-        }
-        $root = $params[0];
-        // Clean up the DIRECTORY_SEPARATOR mess
-        $ds2 = DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR;
-        $root = preg_replace(array('!\\\\+!', '!/+!', "!$ds2+!"),
-                             array('/', '/', '/'),
-                            $root);
-        if ($root{0} != '/') {
-            if (isset($options['windows'])) {
-                if (!preg_match('/^[A-Za-z]:/', $root)) {
-                    return PEAR::raiseError('Root directory must be an absolute path beginning ' .
-                        'with "\\" or "C:\\", was: "' . $root . '"');
-                }
-            } else {
-                return PEAR::raiseError('Root directory must be an absolute path beginning ' .
-                    'with "/", was: "' . $root . '"');
-            }
-        }
-        $windows = isset($options['windows']);
-        if ($windows) {
-            $root = str_replace('/', '\\', $root);
-        }
-        if (!file_exists($params[1])) {
-            if (!@touch($params[1])) {
-                return PEAR::raiseError('Could not create "' . $params[1] . '"');
-            }
-        }
-        $params[1] = realpath($params[1]);
-        $config = &new PEAR_Config($params[1], '#no#system#config#', false, false);
-        if ($root{strlen($root) - 1} == '/') {
-            $root = substr($root, 0, strlen($root) - 1);
-        }
-        $config->noRegistry();
-        $config->set('php_dir', $windows ? "$root\\pear\\php" : "$root/pear/php", 'user');
-        $config->set('data_dir', $windows ? "$root\\pear\\data" : "$root/pear/data");
-        $config->set('ext_dir', $windows ? "$root\\pear\\ext" : "$root/pear/ext");
-        $config->set('doc_dir', $windows ? "$root\\pear\\docs" : "$root/pear/docs");
-        $config->set('test_dir', $windows ? "$root\\pear\\tests" : "$root/pear/tests");
-        $config->set('cache_dir', $windows ? "$root\\pear\\cache" : "$root/pear/cache");
-        $config->set('bin_dir', $windows ? "$root\\pear" : "$root/pear");
-        $config->writeConfigFile();
-        $this->_showConfig($config);
-        $this->ui->outputData('Successfully created default configuration file "' . $params[1] . '"',
-            $command);
-    }
-
-    // }}}
-
-    function _showConfig(&$config)
-    {
-        $params = array('user');
-        $keys = $config->getKeys();
-        sort($keys);
-        $channel = 'pear.php.net';
-        $data = array('caption' => 'Configuration (channel ' . $channel . '):');
-        foreach ($keys as $key) {
-            $type = $config->getType($key);
-            $value = $config->get($key, 'user', $channel);
-            if ($type == 'password' && $value) {
-                $value = '********';
-            }
-            if ($value === false) {
-                $value = 'false';
-            } elseif ($value === true) {
-                $value = 'true';
-            }
-            $data['data'][$config->getGroup($key)][] =
-                array($config->getPrompt($key) , $key, $value);
-        }
-        foreach ($config->getLayers() as $layer) {
-            $data['data']['Config Files'][] =
-                array(ucfirst($layer) . ' Configuration File', 'Filename' ,
-                    $config->getConfFile($layer));
-        }
-
-        $this->ui->outputData($data, 'config-show');
-        return true;
-    }
-    // {{{ _checkLayer()
-
-    /**
-     * Checks if a layer is defined or not
-     *
-     * @param string $layer The layer to search for
-     * @return mixed False on no error or the error message
-     */
-    function _checkLayer($layer = null)
-    {
-        if (!empty($layer) && $layer != 'default') {
-            $layers = $this->config->getLayers();
-            if (!in_array($layer, $layers)) {
-                return " only the layers: \"" . implode('" or "', $layers) . "\" are supported";
-            }
-        }
-        return false;
-    }
-
-    // }}}
-}
-
-?>
diff --git a/PEAR/Command/Config.xml b/PEAR/Command/Config.xml
deleted file mode 100644
index c42daac..0000000
--- a/PEAR/Command/Config.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
- 
-  Show All Settings
-  doConfigShow
-  csh
-  
-   
-    c
-    show configuration variables for another channel
-    CHAN
-   
-  
-  [layer]
-Displays all configuration values.  An optional argument
-may be used to tell which configuration layer to display.  Valid
-configuration layers are "user", "system" and "default". To display
-configurations for different channels, set the default_channel
-configuration variable and run config-show again.
-
- 
- 
-  Show One Setting
-  doConfigGet
-  cg
-  
-   
-    c
-    show configuration variables for another channel
-    CHAN
-   
-  
-  <parameter> [layer]
-Displays the value of one configuration parameter.  The
-first argument is the name of the parameter, an optional second argument
-may be used to tell which configuration layer to look in.  Valid configuration
-layers are "user", "system" and "default".  If no layer is specified, a value
-will be picked from the first layer that defines the parameter, in the order
-just specified.  The configuration value will be retrieved for the channel
-specified by the default_channel configuration variable.
-
- 
- 
-  Change Setting
-  doConfigSet
-  cs
-  
-   
-    c
-    show configuration variables for another channel
-    CHAN
-   
-  
-  <parameter> <value> [layer]
-Sets the value of one configuration parameter.  The first argument is
-the name of the parameter, the second argument is the new value.  Some
-parameters are subject to validation, and the command will fail with
-an error message if the new value does not make sense.  An optional
-third argument may be used to specify in which layer to set the
-configuration parameter.  The default layer is "user".  The
-configuration value will be set for the current channel, which
-is controlled by the default_channel configuration variable.
-
- 
- 
-  Show Information About Setting
-  doConfigHelp
-  ch
-  
-  [parameter]
-Displays help for a configuration parameter.  Without arguments it
-displays help for all configuration parameters.
-
- 
- 
-  Create a Default configuration file
-  doConfigCreate
-  coc
-  
-   
-    w
-    create a config file for a windows install
-   
-  
-  <root path> <filename>
-Create a default configuration file with all directory configuration
-variables set to subdirectories of <root path>, and save it as <filename>.
-This is useful especially for creating a configuration file for a remote
-PEAR installation (using the --remoteconfig option of install, upgrade,
-and uninstall).
-
- 
-
\ No newline at end of file
diff --git a/PEAR/Command/Install.php b/PEAR/Command/Install.php
deleted file mode 100644
index 8557bb3..0000000
--- a/PEAR/Command/Install.php
+++ /dev/null
@@ -1,1038 +0,0 @@
-
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Install.php,v 1.119 2006/05/12 02:38:58 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for installation or deinstallation/upgrading of
- * packages.
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command_Install extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'install' => array(
-            'summary' => 'Install Package',
-            'function' => 'doInstall',
-            'shortcut' => 'i',
-            'options' => array(
-                'force' => array(
-                    'shortopt' => 'f',
-                    'doc' => 'will overwrite newer installed packages',
-                    ),
-                'loose' => array(
-                    'shortopt' => 'l',
-                    'doc' => 'do not check for recommended dependency version',
-                    ),
-                'nodeps' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'ignore dependencies, install anyway',
-                    ),
-                'register-only' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'do not install files, only register the package as installed',
-                    ),
-                'soft' => array(
-                    'shortopt' => 's',
-                    'doc' => 'soft install, fail silently, or upgrade if already installed',
-                    ),
-                'nobuild' => array(
-                    'shortopt' => 'B',
-                    'doc' => 'don\'t build C extensions',
-                    ),
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'request uncompressed files when downloading',
-                    ),
-                'installroot' => array(
-                    'shortopt' => 'R',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT), use packagingroot for RPM',
-                    ),
-                'packagingroot' => array(
-                    'shortopt' => 'P',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when packaging files, like RPM packaging',
-                    ),
-                'ignore-errors' => array(
-                    'doc' => 'force install even if there were errors',
-                    ),
-                'alldeps' => array(
-                    'shortopt' => 'a',
-                    'doc' => 'install all required and optional dependencies',
-                    ),
-                'onlyreqdeps' => array(
-                    'shortopt' => 'o',
-                    'doc' => 'install all required dependencies',
-                    ),
-                'offline' => array(
-                    'shortopt' => 'O',
-                    'doc' => 'do not attempt to download any urls or contact channels',
-                    ),
-                'pretend' => array(
-                    'shortopt' => 'p',
-                    'doc' => 'Only list the packages that would be downloaded',
-                    ),
-                ),
-            'doc' => '[channel/] ...
-Installs one or more PEAR packages.  You can specify a package to
-install in four ways:
-
-"Package-1.0.tgz" : installs from a local file
-
-"http://example.com/Package-1.0.tgz" : installs from
-anywhere on the net.
-
-"package.xml" : installs the package described in
-package.xml.  Useful for testing, or for wrapping a PEAR package in
-another package manager such as RPM.
-
-"Package[-version/state][.tar]" : queries your default channel\'s server
-({config master_server}) and downloads the newest package with
-the preferred quality/state ({config preferred_state}).
-
-To retrieve Package version 1.1, use "Package-1.1," to retrieve
-Package state beta, use "Package-beta."  To retrieve an uncompressed
-file, append .tar (make sure there is no file by the same name first)
-
-To download a package from another channel, prefix with the channel name like
-"channel/Package"
-
-More than one package may be specified at once.  It is ok to mix these
-four ways of specifying packages.
-'),
-        'upgrade' => array(
-            'summary' => 'Upgrade Package',
-            'function' => 'doInstall',
-            'shortcut' => 'up',
-            'options' => array(
-                'force' => array(
-                    'shortopt' => 'f',
-                    'doc' => 'overwrite newer installed packages',
-                    ),
-                'loose' => array(
-                    'shortopt' => 'l',
-                    'doc' => 'do not check for recommended dependency version',
-                    ),
-                'nodeps' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'ignore dependencies, upgrade anyway',
-                    ),
-                'register-only' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'do not install files, only register the package as upgraded',
-                    ),
-                'nobuild' => array(
-                    'shortopt' => 'B',
-                    'doc' => 'don\'t build C extensions',
-                    ),
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'request uncompressed files when downloading',
-                    ),
-                'installroot' => array(
-                    'shortopt' => 'R',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT), use packagingroot for RPM',
-                    ),
-                'packagingroot' => array(
-                    'shortopt' => 'P',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when packaging files, like RPM packaging',
-                    ),
-                'ignore-errors' => array(
-                    'doc' => 'force install even if there were errors',
-                    ),
-                'alldeps' => array(
-                    'shortopt' => 'a',
-                    'doc' => 'install all required and optional dependencies',
-                    ),
-                'onlyreqdeps' => array(
-                    'shortopt' => 'o',
-                    'doc' => 'install all required dependencies',
-                    ),
-                'offline' => array(
-                    'shortopt' => 'O',
-                    'doc' => 'do not attempt to download any urls or contact channels',
-                    ),
-                'pretend' => array(
-                    'shortopt' => 'p',
-                    'doc' => 'Only list the packages that would be downloaded',
-                    ),
-                ),
-            'doc' => ' ...
-Upgrades one or more PEAR packages.  See documentation for the
-"install" command for ways to specify a package.
-
-When upgrading, your package will be updated if the provided new
-package has a higher version number (use the -f option if you need to
-upgrade anyway).
-
-More than one package may be specified at once.
-'),
-        'upgrade-all' => array(
-            'summary' => 'Upgrade All Packages',
-            'function' => 'doInstall',
-            'shortcut' => 'ua',
-            'options' => array(
-                'nodeps' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'ignore dependencies, upgrade anyway',
-                    ),
-                'register-only' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'do not install files, only register the package as upgraded',
-                    ),
-                'nobuild' => array(
-                    'shortopt' => 'B',
-                    'doc' => 'don\'t build C extensions',
-                    ),
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'request uncompressed files when downloading',
-                    ),
-                'installroot' => array(
-                    'shortopt' => 'R',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT), use packagingroot for RPM',
-                    ),
-                'ignore-errors' => array(
-                    'doc' => 'force install even if there were errors',
-                    ),
-                'loose' => array(
-                    'doc' => 'do not check for recommended dependency version',
-                    ),
-                ),
-            'doc' => '
-Upgrades all packages that have a newer release available.  Upgrades are
-done only if there is a release available of the state specified in
-"preferred_state" (currently {config preferred_state}), or a state considered
-more stable.
-'),
-        'uninstall' => array(
-            'summary' => 'Un-install Package',
-            'function' => 'doUninstall',
-            'shortcut' => 'un',
-            'options' => array(
-                'nodeps' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'ignore dependencies, uninstall anyway',
-                    ),
-                'register-only' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'do not remove files, only register the packages as not installed',
-                    ),
-                'installroot' => array(
-                    'shortopt' => 'R',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT)',
-                    ),
-                'ignore-errors' => array(
-                    'doc' => 'force install even if there were errors',
-                    ),
-                'offline' => array(
-                    'shortopt' => 'O',
-                    'doc' => 'do not attempt to uninstall remotely',
-                    ),
-                ),
-            'doc' => '[channel/] ...
-Uninstalls one or more PEAR packages.  More than one package may be
-specified at once.  Prefix with channel name to uninstall from a
-channel not in your default channel ({config default_channel})
-'),
-        'bundle' => array(
-            'summary' => 'Unpacks a Pecl Package',
-            'function' => 'doBundle',
-            'shortcut' => 'bun',
-            'options' => array(
-                'destination' => array(
-                   'shortopt' => 'd',
-                    'arg' => 'DIR',
-                    'doc' => 'Optional destination directory for unpacking (defaults to current path or "ext" if exists)',
-                    ),
-                'force' => array(
-                    'shortopt' => 'f',
-                    'doc' => 'Force the unpacking even if there were errors in the package',
-                ),
-            ),
-            'doc' => '
-Unpacks a Pecl Package into the selected location. It will download the
-package if needed.
-'),
-        'run-scripts' => array(
-            'summary' => 'Run Post-Install Scripts bundled with a package',
-            'function' => 'doRunScripts',
-            'shortcut' => 'rs',
-            'options' => array(
-            ),
-            'doc' => '
-Run post-installation scripts in package , if any exist.
-'),
-    );
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Install constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Install(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    /**
-     * For unit testing purposes
-     */
-    function &getDownloader(&$ui, $options, &$config)
-    {
-        if (!class_exists('PEAR_Downloader')) {
-            require_once 'PEAR/Downloader.php';
-        }
-        $a = &new PEAR_Downloader($ui, $options, $config);
-        return $a;
-    }
-
-    /**
-     * For unit testing purposes
-     */
-    function &getInstaller(&$ui)
-    {
-        if (!class_exists('PEAR_Installer')) {
-            require_once 'PEAR/Installer.php';
-        }
-        $a = &new PEAR_Installer($ui);
-        return $a;
-    }
-
-    function enableExtension($binaries, $type)
-    {
-        if (!($phpini = $this->config->get('php_ini', null, 'pear.php.net'))) {
-            return PEAR::raiseError('configuration option "php_ini" is not set to php.ini location');
-        }
-        $ini = $this->_parseIni($phpini);
-        if (PEAR::isError($ini)) {
-            return $ini;
-        }
-        $fp = @fopen($phpini, 'wb');
-        if (!$fp) {
-            return PEAR::raiseError('cannot open php.ini "' . $phpini . '" for writing');
-        }
-        $line = 0;
-        if ($type == 'extsrc' || $type == 'extbin') {
-            $search = 'extensions';
-            $enable = 'extension';
-        } else {
-            $search = 'zend_extensions';
-            ob_start();
-            phpinfo(INFO_GENERAL);
-            $info = ob_get_contents();
-            ob_end_clean();
-            $debug = function_exists('leak') ? '_debug' : '';
-            $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
-            $enable = 'zend_extension' . $debug . $ts;
-        }
-        foreach ($ini[$search] as $line => $extension) {
-            if (in_array($extension, $binaries, true) || in_array(
-                  $ini['extension_dir'] . DIRECTORY_SEPARATOR . $extension, $binaries, true)) {
-                // already enabled - assume if one is, all are
-                return true;
-            }
-        }
-        if ($line) {
-            $newini = array_slice($ini['all'], 0, $line);
-        } else {
-            $newini = array();
-        }
-        foreach ($binaries as $binary) {
-            if ($ini['extension_dir']) {
-                $binary = basename($binary);
-            }
-            $newini[] = $enable . '="' . $binary . '"' . (OS_UNIX ? "\n" : "\r\n");
-        }
-        $newini = array_merge($newini, array_slice($ini['all'], $line));
-        foreach ($newini as $line) {
-            fwrite($fp, $line);
-        }
-        fclose($fp);
-        return true;
-    }
-
-    function disableExtension($binaries, $type)
-    {
-        if (!($phpini = $this->config->get('php_ini', null, 'pear.php.net'))) {
-            return PEAR::raiseError('configuration option "php_ini" is not set to php.ini location');
-        }
-        $ini = $this->_parseIni($phpini);
-        if (PEAR::isError($ini)) {
-            return $ini;
-        }
-        $line = 0;
-        if ($type == 'extsrc' || $type == 'extbin') {
-            $search = 'extensions';
-            $enable = 'extension';
-        } else {
-            $search = 'zend_extensions';
-            ob_start();
-            phpinfo(INFO_GENERAL);
-            $info = ob_get_contents();
-            ob_end_clean();
-            $debug = function_exists('leak') ? '_debug' : '';
-            $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
-            $enable = 'zend_extension' . $debug . $ts;
-        }
-        $found = false;
-        foreach ($ini[$search] as $line => $extension) {
-            if (in_array($extension, $binaries, true) || in_array(
-                  $ini['extension_dir'] . DIRECTORY_SEPARATOR . $extension, $binaries, true)) {
-                $found = true;
-                break;
-            }
-        }
-        if (!$found) {
-            // not enabled
-            return true;
-        }
-        $fp = @fopen($phpini, 'wb');
-        if (!$fp) {
-            return PEAR::raiseError('cannot open php.ini "' . $phpini . '" for writing');
-        }
-        if ($line) {
-            $newini = array_slice($ini['all'], 0, $line);
-            // delete the enable line
-            $newini = array_merge($newini, array_slice($ini['all'], $line + 1));
-        } else {
-            $newini = array_slice($ini['all'], 1);
-        }
-        foreach ($newini as $line) {
-            fwrite($fp, $line);
-        }
-        fclose($fp);
-        return true;
-    }
-
-    function _parseIni($filename)
-    {
-        if (file_exists($filename)) {
-            if (filesize($filename) > 300000) {
-                return PEAR::raiseError('php.ini "' . $filename . '" is too large, aborting');
-            }
-            ob_start();
-            phpinfo(INFO_GENERAL);
-            $info = ob_get_contents();
-            ob_end_clean();
-            $debug = function_exists('leak') ? '_debug' : '';
-            $ts = preg_match('/Thread Safety.+enabled/', $info) ? '_ts' : '';
-            $zend_extension_line = 'zend_extension' . $debug . $ts;
-            $all = @file($filename);
-            if (!$all) {
-                return PEAR::raiseError('php.ini "' . $filename .'" could not be read');
-            }
-            $zend_extensions = $extensions = array();
-            // assume this is right, but pull from the php.ini if it is found
-            $extension_dir = ini_get('extension_dir');
-            foreach ($all as $linenum => $line) {
-                $line = trim($line);
-                if (!$line) {
-                    continue;
-                }
-                if ($line[0] == ';') {
-                    continue;
-                }
-                if (strtolower(substr($line, 0, 13)) == 'extension_dir') {
-                    $line = trim(substr($line, 13));
-                    if ($line[0] == '=') {
-                        $x = trim(substr($line, 1));
-                        $x = explode(';', $x);
-                        $extension_dir = str_replace('"', '', array_shift($x));
-                        continue;
-                    }
-                }
-                if (strtolower(substr($line, 0, 9)) == 'extension') {
-                    $line = trim(substr($line, 9));
-                    if ($line[0] == '=') {
-                        $x = trim(substr($line, 1));
-                        $x = explode(';', $x);
-                        $extensions[$linenum] = str_replace('"', '', array_shift($x));
-                        continue;
-                    }
-                }
-                if (strtolower(substr($line, 0, strlen($zend_extension_line))) ==
-                      $zend_extension_line) {
-                    $line = trim(substr($line, strlen($zend_extension_line)));
-                    if ($line[0] == '=') {
-                        $x = trim(substr($line, 1));
-                        $x = explode(';', $x);
-                        $zend_extensions[$linenum] = str_replace('"', '', array_shift($x));
-                        continue;
-                    }
-                }
-            }
-            return array(
-                'extensions' => $extensions,
-                'zend_extensions' => $zend_extensions,
-                'extension_dir' => $extension_dir,
-                'all' => $all,
-            );
-        } else {
-            return PEAR::raiseError('php.ini "' . $filename . '" does not exist');
-        }
-    }
-
-    // {{{ doInstall()
-
-    function doInstall($command, $options, $params)
-    {
-        if (empty($this->installer)) {
-            $this->installer = &$this->getInstaller($this->ui);
-        }
-        if ($command == 'upgrade') {
-            $options['upgrade'] = true;
-        }
-        if (isset($options['installroot']) && isset($options['packagingroot'])) {
-            return $this->raiseError('ERROR: cannot use both --installroot and --packagingroot');
-        }
-        if (isset($options['packagingroot']) && $this->config->get('verbose') > 2) {
-            $this->ui->outputData('using package root: ' . $options['packagingroot']);
-        }
-        $reg = &$this->config->getRegistry();
-        if ($command == 'upgrade-all') {
-            $options['upgrade'] = true;
-            $reg = &$this->config->getRegistry();
-            $savechannel = $this->config->get('default_channel');
-            $params = array();
-            foreach ($reg->listChannels() as $channel) {
-                if ($channel == '__uri') {
-                    continue;
-                }
-                $this->config->set('default_channel', $channel);
-                $chan = &$reg->getChannel($channel);
-                if (PEAR::isError($chan)) {
-                    return $this->raiseError($chan);
-                }
-                if ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-                      $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) {
-                    $dorest = true;
-                    unset($remote);
-                } else {
-                    $dorest = false;
-                    $remote = &$this->config->getRemote($this->config);
-                }
-                $state = $this->config->get('preferred_state');
-                $installed = array_flip($reg->listPackages($channel));
-                PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                if ($dorest) {
-                    $rest = &$this->config->getREST('1.0', array());
-                    $latest = $rest->listLatestUpgrades($base, $state, $installed, $channel, $reg);
-                } else {
-                    if (empty($state) || $state == 'any') {
-                        $latest = $remote->call("package.listLatestReleases");
-                    } else {
-                        $latest = $remote->call("package.listLatestReleases", $state);
-                    }
-                }
-                PEAR::staticPopErrorHandling();
-                if (PEAR::isError($latest) || !is_array($latest)) {
-                    continue;
-                }
-                foreach ($latest as $package => $info) {
-                    $package = strtolower($package);
-                    if (!isset($installed[$package])) {
-                        // skip packages we don't have installed
-                        continue;
-                    }
-                    $inst_version = $reg->packageInfo($package, 'version', $channel);
-                    if (version_compare("$info[version]", "$inst_version", "le")) {
-                        // installed version is up-to-date
-                        continue;
-                    }
-                    $params[] = $reg->parsedPackageNameToString(array('package' => $package,
-                        'channel' => $channel));
-                    $this->ui->outputData(array('data' => "Will upgrade $package"), $command);
-                }
-            }
-            $this->config->set('default_channel', $savechannel);
-        }
-        $this->downloader = &$this->getDownloader($this->ui, $options, $this->config);
-        $errors = array();
-        $downloaded = array();
-        $downloaded = &$this->downloader->download($params);
-        if (PEAR::isError($downloaded)) {
-            return $this->raiseError($downloaded);
-        }
-        $errors = $this->downloader->getErrorMsgs();
-        if (count($errors)) {
-            foreach ($errors as $error) {
-                $err['data'][] = array($error);
-            }
-            $err['headline'] = 'Install Errors';
-            $this->ui->outputData($err);
-            if (!count($downloaded)) {
-                return $this->raiseError("$command failed");
-            }
-        }
-        $data = array(
-            'headline' => 'Packages that would be Installed'
-        );
-        if (isset($options['pretend'])) {
-            foreach ($downloaded as $package) {
-                $data['data'][] = array($reg->parsedPackageNameToString($package->getParsedPackage()));
-            }
-            $this->ui->outputData($data, 'pretend');
-            return true;
-        }
-        $this->installer->setOptions($options);
-        $this->installer->sortPackagesForInstall($downloaded);
-        if (PEAR::isError($err = $this->installer->setDownloadedPackages($downloaded))) {
-            $this->raiseError($err->getMessage());
-            return true;
-        }
-        $extrainfo = array();
-        if (isset($options['packagingroot'])) {
-            $packrootphp_dir = $this->installer->_prependPath(
-                $this->config->get('php_dir', null, 'pear.php.net'),
-                $options['packagingroot']);
-            $instreg = new PEAR_Registry($packrootphp_dir);
-        } else {
-            $instreg = $reg;
-        }
-        foreach ($downloaded as $param) {
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $info = $this->installer->install($param, $options);
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($info)) {
-                $oldinfo = $info;
-                $pkg = &$param->getPackageFile();
-                if ($info->getCode() != PEAR_INSTALLER_NOBINARY) {
-                    if (!($info = $pkg->installBinary($this->installer))) {
-                        $this->ui->outputData('ERROR: ' .$oldinfo->getMessage());
-                        continue;
-                    }
-                    // we just installed a different package than requested,
-                    // let's change the param and info so that the rest of this works
-                    $param = $info[0];
-                    $info = $info[1];
-                }
-            }
-            if (is_array($info)) {
-                if ($param->getPackageType() == 'extsrc' ||
-                      $param->getPackageType() == 'extbin' ||
-                      $param->getPackageType() == 'zendextsrc' ||
-                      $param->getPackageType() == 'zendextbin') {
-                    $pkg = &$param->getPackageFile();
-                    if ($instbin = $pkg->getInstalledBinary()) {
-                        $instpkg = &$instreg->getPackage($instbin, $pkg->getChannel());
-                    } else {
-                        $instpkg = &$instreg->getPackage($pkg->getPackage(), $pkg->getChannel());
-                    }
-                    foreach ($instpkg->getFilelist() as $name => $atts) {
-                        $pinfo = pathinfo($atts['installed_as']);
-                        if (!isset($pinfo['extension']) ||
-                              in_array($pinfo['extension'], array('c', 'h'))) {
-                            continue; // make sure we don't match php_blah.h
-                        }
-                        if ((strpos($pinfo['basename'], 'php_') === 0 &&
-                              $pinfo['extension'] == 'dll') ||
-                              // most unices
-                              $pinfo['extension'] == 'so' ||
-                              // hp-ux
-                              $pinfo['extension'] == 'sl') {
-                            $binaries[] = array($atts['installed_as'], $pinfo);
-                            break;
-                        }
-                    }
-                    foreach ($binaries as $pinfo) {
-                        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                        $ret = $this->enableExtension(array($pinfo[0]), $param->getPackageType());
-                        PEAR::staticPopErrorHandling();
-                        if (PEAR::isError($ret)) {
-                            $extrainfo[] = $ret->getMessage();
-                            if ($param->getPackageType() == 'extsrc' ||
-                                  $param->getPackageType() == 'extbin') {
-                                $exttype = 'extension';
-                            } else {
-                                ob_start();
-                                phpinfo(INFO_GENERAL);
-                                $info = ob_get_contents();
-                                ob_end_clean();
-                                $debug = function_exists('leak') ? '_debug' : '';
-                                $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
-                                $exttype = 'zend_extension' . $debug . $ts;
-                            }
-                            $extrainfo[] = 'You should add "' . $exttype . '=' .
-                                $pinfo[1]['basename'] . '" to php.ini';
-                        } else {
-                            $extrainfo[] = 'Extension ' . $instpkg->getProvidesExtension() .
-                                ' enabled in php.ini';
-                        }
-                    }
-                }
-                if ($this->config->get('verbose') > 0) {
-                    $channel = $param->getChannel();
-                    $label = $reg->parsedPackageNameToString(
-                        array(
-                            'channel' => $channel,
-                            'package' => $param->getPackage(),
-                            'version' => $param->getVersion(),
-                        ));
-                    $out = array('data' => "$command ok: $label");
-                    if (isset($info['release_warnings'])) {
-                        $out['release_warnings'] = $info['release_warnings'];
-                    }
-                    $this->ui->outputData($out, $command);
-                    if (!isset($options['register-only']) && !isset($options['offline'])) {
-                        if ($this->config->isDefinedLayer('ftp')) {
-                            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                            $info = $this->installer->ftpInstall($param);
-                            PEAR::staticPopErrorHandling();
-                            if (PEAR::isError($info)) {
-                                $this->ui->outputData($info->getMessage());
-                                $this->ui->outputData("remote install failed: $label");
-                            } else {
-                                $this->ui->outputData("remote install ok: $label");
-                            }
-                        }
-                    }
-                }
-                $deps = $param->getDeps();
-                if ($deps) {
-                    if (isset($deps['group'])) {
-                        $groups = $deps['group'];
-                        if (!isset($groups[0])) {
-                            $groups = array($groups);
-                        }
-                        foreach ($groups as $group) {
-                            if ($group['attribs']['name'] == 'default') {
-                                // default group is always installed, unless the user
-                                // explicitly chooses to install another group
-                                continue;
-                            }
-                            $this->ui->outputData($param->getPackage() . ': Optional feature ' .
-                                $group['attribs']['name'] . ' available (' .
-                                $group['attribs']['hint'] . ')');
-                        }
-                        $extrainfo[] = 'To install use "pear install ' .
-                            $reg->parsedPackageNameToString(
-                                array('package' => $param->getPackage(),
-                                      'channel' => $param->getChannel()), true) .
-                                  '#featurename"';
-                    }
-                }
-                if (isset($options['installroot'])) {
-                    $reg = &$this->config->getRegistry();
-                }
-                if (isset($options['packagingroot'])) {
-                    $instreg = new PEAR_Registry($packrootphp_dir);
-                } else {
-                    $instreg = $reg;
-                }
-                $pkg = &$instreg->getPackage($param->getPackage(), $param->getChannel());
-                // $pkg may be NULL if install is a 'fake' install via --packagingroot
-                if (is_object($pkg)) {
-                    $pkg->setConfig($this->config);
-                    if ($list = $pkg->listPostinstallScripts()) {
-                        $pn = $reg->parsedPackageNameToString(array('channel' =>
-                           $param->getChannel(), 'package' => $param->getPackage()), true);
-                        $extrainfo[] = $pn . ' has post-install scripts:';
-                        foreach ($list as $file) {
-                            $extrainfo[] = $file;
-                        }
-                        $extrainfo[] = 'Use "pear run-scripts ' . $pn . '" to run';
-                        $extrainfo[] = 'DO NOT RUN SCRIPTS FROM UNTRUSTED SOURCES';
-                    }
-                }
-            } else {
-                return $this->raiseError("$command failed");
-            }
-        }
-        if (count($extrainfo)) {
-            foreach ($extrainfo as $info) {
-                $this->ui->outputData($info);
-            }
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ doUninstall()
-
-    function doUninstall($command, $options, $params)
-    {
-        if (empty($this->installer)) {
-            $this->installer = &$this->getInstaller($this->ui);
-        }
-        if (isset($options['remoteconfig'])) {
-            $e = $this->config->readFTPConfigFile($options['remoteconfig']);
-            if (!PEAR::isError($e)) {
-                $this->installer->setConfig($this->config);
-            }
-        }
-        if (sizeof($params) < 1) {
-            return $this->raiseError("Please supply the package(s) you want to uninstall");
-        }
-        $reg = &$this->config->getRegistry();
-        $newparams = array();
-        $badparams = array();
-        foreach ($params as $pkg) {
-            $channel = $this->config->get('default_channel');
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $parsed = $reg->parsePackageName($pkg, $channel);
-            PEAR::staticPopErrorHandling();
-            if (!$parsed || PEAR::isError($parsed)) {
-                $badparams[] = $pkg;
-                continue;
-            }
-            $package = $parsed['package'];
-            $channel = $parsed['channel'];
-            $info = &$reg->getPackage($package, $channel);
-            if ($info === null &&
-                 ($channel == 'pear.php.net' || $channel == 'pecl.php.net')) {
-                // make sure this isn't a package that has flipped from pear to pecl but
-                // used a package.xml 1.0
-                $testc = ($channel == 'pear.php.net') ? 'pecl.php.net' : 'pear.php.net';
-                $info = &$reg->getPackage($package, $testc);
-                if ($info !== null) {
-                    $channel = $testc;
-                }
-            }
-            if ($info === null) {
-                $badparams[] = $pkg;
-            } else {
-                $newparams[] = &$info;
-                // check for binary packages (this is an alias for those packages if so)
-                if ($installedbinary = $info->getInstalledBinary()) {
-                    $this->ui->log('adding binary package ' .
-                        $reg->parsedPackageNameToString(array('channel' => $channel,
-                            'package' => $installedbinary), true));
-                    $newparams[] = &$reg->getPackage($installedbinary, $channel);
-                }
-                // add the contents of a dependency group to the list of installed packages
-                if (isset($parsed['group'])) {
-                    $group = $info->getDependencyGroup($parsed['group']);
-                    if ($group) {
-                        $installed = &$reg->getInstalledGroup($group);
-                        if ($installed) {
-                            foreach ($installed as $i => $p) {
-                                $newparams[] = &$installed[$i];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        $err = $this->installer->sortPackagesForUninstall($newparams);
-        if (PEAR::isError($err)) {
-            $this->ui->outputData($err->getMessage(), $command);
-            return true;
-        }
-        $params = $newparams;
-        // twist this to use it to check on whether dependent packages are also being uninstalled
-        // for circular dependencies like subpackages
-        $this->installer->setUninstallPackages($newparams);
-        $params = array_merge($params, $badparams);
-        foreach ($params as $pkg) {
-            $this->installer->pushErrorHandling(PEAR_ERROR_RETURN);
-            if ($err = $this->installer->uninstall($pkg, $options)) {
-                $this->installer->popErrorHandling();
-                if (PEAR::isError($err)) {
-                    $this->ui->outputData($err->getMessage(), $command);
-                    continue;
-                }
-                if ($pkg->getPackageType() == 'extsrc' ||
-                      $pkg->getPackageType() == 'extbin' ||
-                      $pkg->getPackageType() == 'zendextsrc' ||
-                      $pkg->getPackageType() == 'zendextbin') {
-                    if ($instbin = $pkg->getInstalledBinary()) {
-                        continue; // this will be uninstalled later
-                    }
-                    foreach ($pkg->getFilelist() as $name => $atts) {
-                        $pinfo = pathinfo($atts['installed_as']);
-                        if (!isset($pinfo['extension']) ||
-                              in_array($pinfo['extension'], array('c', 'h'))) {
-                            continue; // make sure we don't match php_blah.h
-                        }
-                        if ((strpos($pinfo['basename'], 'php_') === 0 &&
-                              $pinfo['extension'] == 'dll') ||
-                              // most unices
-                              $pinfo['extension'] == 'so' ||
-                              // hp-ux
-                              $pinfo['extension'] == 'sl') {
-                            $binaries[] = array($atts['installed_as'], $pinfo);
-                            break;
-                        }
-                    }
-                    foreach ($binaries as $pinfo) {
-                        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                        $ret = $this->disableExtension(array($pinfo[0]), $pkg->getPackageType());
-                        PEAR::staticPopErrorHandling();
-                        if (PEAR::isError($ret)) {
-                            $extrainfo[] = $ret->getMessage();
-                            if ($pkg->getPackageType() == 'extsrc' ||
-                                  $pkg->getPackageType() == 'extbin') {
-                                $exttype = 'extension';
-                            } else {
-                                ob_start();
-                                phpinfo(INFO_GENERAL);
-                                $info = ob_get_contents();
-                                ob_end_clean();
-                                $debug = function_exists('leak') ? '_debug' : '';
-                                $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
-                                $exttype = 'zend_extension' . $debug . $ts;
-                            }
-                            $this->ui->outputData('Unable to remove "' . $exttype . '=' .
-                                $pinfo[1]['basename'] . '" from php.ini', $command);
-                        } else {
-                            $this->ui->outputData('Extension ' . $pkg->getProvidesExtension() .
-                                ' disabled in php.ini', $command);
-                        }
-                    }
-                }
-                $savepkg = $pkg;
-                if ($this->config->get('verbose') > 0) {
-                    if (is_object($pkg)) {
-                        $pkg = $reg->parsedPackageNameToString($pkg);
-                    }
-                    $this->ui->outputData("uninstall ok: $pkg", $command);
-                }
-                if (!isset($options['offline']) && is_object($savepkg) &&
-                      defined('PEAR_REMOTEINSTALL_OK')) {
-                    if ($this->config->isDefinedLayer('ftp')) {
-                        $this->installer->pushErrorHandling(PEAR_ERROR_RETURN);
-                        $info = $this->installer->ftpUninstall($savepkg);
-                        $this->installer->popErrorHandling();
-                        if (PEAR::isError($info)) {
-                            $this->ui->outputData($info->getMessage());
-                            $this->ui->outputData("remote uninstall failed: $pkg");
-                        } else {
-                            $this->ui->outputData("remote uninstall ok: $pkg");
-                        }
-                    }
-                }
-            } else {
-                $this->installer->popErrorHandling();
-                if (is_object($pkg)) {
-                    $pkg = $reg->parsedPackageNameToString($pkg);
-                }
-                return $this->raiseError("uninstall failed: $pkg");
-            }
-        }
-        return true;
-    }
-
-    // }}}
-
-
-    // }}}
-    // {{{ doBundle()
-    /*
-    (cox) It just downloads and untars the package, does not do
-            any check that the PEAR_Installer::_installFile() does.
-    */
-
-    function doBundle($command, $options, $params)
-    {
-        $downloader = &$this->getDownloader($this->ui, array('force' => true, 'nodeps' => true,
-            'soft' => true), $this->config);
-        $reg = &$this->config->getRegistry();
-        if (sizeof($params) < 1) {
-            return $this->raiseError("Please supply the package you want to bundle");
-        }
-
-        if (isset($options['destination'])) {
-            if (!is_dir($options['destination'])) {
-                System::mkdir('-p ' . $options['destination']);
-            }
-            $dest = realpath($options['destination']);
-        } else {
-            $pwd = getcwd();
-            if (is_dir($pwd . DIRECTORY_SEPARATOR . 'ext')) {
-                $dest = $pwd . DIRECTORY_SEPARATOR . 'ext';
-            } else {
-                $dest = $pwd;
-            }
-        }
-        $downloader->setDownloadDir($dest);
-        $result = &$downloader->download(array($params[0]));
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $pkgfile = &$result[0]->getPackageFile();
-        $pkgname = $pkgfile->getName();
-        $pkgversion = $pkgfile->getVersion();
-
-        // Unpacking -------------------------------------------------
-        $dest .= DIRECTORY_SEPARATOR . $pkgname;
-        $orig = $pkgname . '-' . $pkgversion;
-
-        $tar = &new Archive_Tar($pkgfile->getArchiveFile());
-        if (!$tar->extractModify($dest, $orig)) {
-            return $this->raiseError('unable to unpack ' . $pkgfile->getArchiveFile());
-        }
-        $this->ui->outputData("Package ready at '$dest'");
-    // }}}
-    }
-
-    // }}}
-
-    function doRunScripts($command, $options, $params)
-    {
-        if (!isset($params[0])) {
-            return $this->raiseError('run-scripts expects 1 parameter: a package name');
-        }
-        $reg = &$this->config->getRegistry();
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $parsed = $reg->parsePackageName($params[0], $this->config->get('default_channel'));
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($parsed)) {
-            return $this->raiseError($parsed);
-        }
-        $package = &$reg->getPackage($parsed['package'], $parsed['channel']);
-        if (is_object($package)) {
-            $package->setConfig($this->config);
-            $package->runPostinstallScripts();
-        } else {
-            return $this->raiseError('Could not retrieve package "' . $params[0] . '" from registry');
-        }
-        $this->ui->outputData('Install scripts complete', $command);
-        return true;
-    }
-}
-?>
diff --git a/PEAR/Command/Install.xml b/PEAR/Command/Install.xml
deleted file mode 100644
index 14f3399..0000000
--- a/PEAR/Command/Install.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-
- 
-  Install Package
-  doInstall
-  i
-  
-   
-    f
-    will overwrite newer installed packages
-   
-   
-    l
-    do not check for recommended dependency version
-   
-   
-    n
-    ignore dependencies, install anyway
-   
-   
-    r
-    do not install files, only register the package as installed
-   
-   
-    s
-    soft install, fail silently, or upgrade if already installed
-   
-   
-    B
-    don't build C extensions
-   
-   
-    Z
-    request uncompressed files when downloading
-   
-   
-    R
-    DIR
-    root directory used when installing files (ala PHP's INSTALL_ROOT)
-   
-   
-    force install even if there were errors
-   
-   
-    a
-    install all required and optional dependencies
-   
-   
-    o
-    install all required dependencies
-   
-   
-    O
-    do not attempt to download any urls or contact channels
-   
-   
-    p
-    Only list the packages that would be downloaded
-   
-  
-  [channel/]<package> ...
-Installs one or more PEAR packages.  You can specify a package to
-install in four ways:
-
-"Package-1.0.tgz" : installs from a local file
-
-"http://example.com/Package-1.0.tgz" : installs from
-anywhere on the net.
-
-"package.xml" : installs the package described in
-package.xml.  Useful for testing, or for wrapping a PEAR package in
-another package manager such as RPM.
-
-"Package[-version/state][.tar]" : queries your default channel's server
-({config master_server}) and downloads the newest package with
-the preferred quality/state ({config preferred_state}).
-
-To retrieve Package version 1.1, use "Package-1.1," to retrieve
-Package state beta, use "Package-beta."  To retrieve an uncompressed
-file, append .tar (make sure there is no file by the same name first)
-
-To download a package from another channel, prefix with the channel name like
-"channel/Package"
-
-More than one package may be specified at once.  It is ok to mix these
-four ways of specifying packages.
-
- 
- 
-  Upgrade Package
-  doInstall
-  up
-  
-   
-    f
-    overwrite newer installed packages
-   
-   
-    l
-    do not check for recommended dependency version
-   
-   
-    n
-    ignore dependencies, upgrade anyway
-   
-   
-    r
-    do not install files, only register the package as upgraded
-   
-   
-    B
-    don't build C extensions
-   
-   
-    Z
-    request uncompressed files when downloading
-   
-   
-    R
-    DIR
-    root directory used when installing files (ala PHP's INSTALL_ROOT)
-   
-   
-    force install even if there were errors
-   
-   
-    a
-    install all required and optional dependencies
-   
-   
-    o
-    install all required dependencies
-   
-   
-    O
-    do not attempt to download any urls or contact channels
-   
-   
-    p
-    Only list the packages that would be downloaded
-   
-  
-  <package> ...
-Upgrades one or more PEAR packages.  See documentation for the
-"install" command for ways to specify a package.
-
-When upgrading, your package will be updated if the provided new
-package has a higher version number (use the -f option if you need to
-upgrade anyway).
-
-More than one package may be specified at once.
-
- 
- 
-  Upgrade All Packages
-  doInstall
-  ua
-  
-   
-    n
-    ignore dependencies, upgrade anyway
-   
-   
-    r
-    do not install files, only register the package as upgraded
-   
-   
-    B
-    don't build C extensions
-   
-   
-    Z
-    request uncompressed files when downloading
-   
-   
-    R
-    DIR
-    root directory used when installing files (ala PHP's INSTALL_ROOT)
-   
-   
-    force install even if there were errors
-   
-   
-    do not check for recommended dependency version
-   
-  
-  
-Upgrades all packages that have a newer release available.  Upgrades are
-done only if there is a release available of the state specified in
-"preferred_state" (currently {config preferred_state}), or a state considered
-more stable.
-
- 
- 
-  Un-install Package
-  doUninstall
-  un
-  
-   
-    n
-    ignore dependencies, uninstall anyway
-   
-   
-    r
-    do not remove files, only register the packages as not installed
-   
-   
-    R
-    DIR
-    root directory used when installing files (ala PHP's INSTALL_ROOT)
-   
-   
-    force install even if there were errors
-   
-   
-    O
-    do not attempt to uninstall remotely
-   
-  
-  [channel/]<package> ...
-Uninstalls one or more PEAR packages.  More than one package may be
-specified at once.  Prefix with channel name to uninstall from a
-channel not in your default channel ({config default_channel})
-
- 
- 
-  Unpacks a Pecl Package
-  doBundle
-  bun
-  
-   
-    d
-    DIR
-    Optional destination directory for unpacking (defaults to current path or "ext" if exists)
-   
-   
-    f
-    Force the unpacking even if there were errors in the package
-   
-  
-  <package>
-Unpacks a Pecl Package into the selected location. It will download the
-package if needed.
-
- 
- 
-  Run Post-Install Scripts bundled with a package
-  doRunScripts
-  rs
-  
-  <package>
-Run post-installation scripts in package <package>, if any exist.
-
- 
-
\ No newline at end of file
diff --git a/PEAR/Command/Mirror.php b/PEAR/Command/Mirror.php
deleted file mode 100644
index 81ade9b..0000000
--- a/PEAR/Command/Mirror.php
+++ /dev/null
@@ -1,153 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Mirror.php,v 1.18 2006/03/02 18:14:13 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.2.0
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for providing file mirrors
- *
- * @category   pear
- * @package    PEAR
- * @author     Alexander Merz 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.2.0
- */
-class PEAR_Command_Mirror extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'download-all' => array(
-            'summary' => 'Downloads each available package from the default channel',
-            'function' => 'doDownloadAll',
-            'shortcut' => 'da',
-            'options' => array(
-                'channel' =>
-                    array(
-                    'shortopt' => 'c',
-                    'doc' => 'specify a channel other than the default channel',
-                    'arg' => 'CHAN',
-                    ),
-                ),
-            'doc' => '
-Requests a list of available packages from the default channel ({config default_channel})
-and downloads them to current working directory.  Note: only
-packages within preferred_state ({config preferred_state}) will be downloaded'
-            ),
-        );
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Mirror constructor.
-     *
-     * @access public
-     * @param object PEAR_Frontend a reference to an frontend
-     * @param object PEAR_Config a reference to the configuration data
-     */
-    function PEAR_Command_Mirror(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    /**
-     * For unit-testing
-     */
-    function &factory($a)
-    {
-        $a = &PEAR_Command::factory($a, $this->config);
-        return $a;
-    }
-
-    // {{{ doDownloadAll()
-    /**
-    * retrieves a list of avaible Packages from master server
-    * and downloads them
-    *
-    * @access public
-    * @param string $command the command
-    * @param array $options the command options before the command
-    * @param array $params the stuff after the command name
-    * @return bool true if succesful
-    * @throw PEAR_Error 
-    */
-    function doDownloadAll($command, $options, $params)
-    {
-        $savechannel = $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        $channel = isset($options['channel']) ? $options['channel'] :
-            $this->config->get('default_channel');
-        if (!$reg->channelExists($channel)) {
-            $this->config->set('default_channel', $savechannel);
-            return $this->raiseError('Channel "' . $channel . '" does not exist');
-        }
-        $this->config->set('default_channel', $channel);
-        $this->ui->outputData('Using Channel ' . $this->config->get('default_channel'));
-        $chan = $reg->getChannel($channel);
-        if (PEAR::isError($chan)) {
-            return $this->raiseError($chan);
-        }
-        if ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) {
-            $rest = &$this->config->getREST('1.0', array());
-            $remoteInfo = array_flip($rest->listPackages($base));
-        } else {
-            $remote = &$this->config->getRemote();
-            $stable = ($this->config->get('preferred_state') == 'stable');
-            $remoteInfo = $remote->call("package.listAll", true, $stable, false);
-        }
-        if (PEAR::isError($remoteInfo)) {
-            return $remoteInfo;
-        }
-        $cmd = &$this->factory("download");
-        if (PEAR::isError($cmd)) {
-            return $cmd;
-        }
-        $this->ui->outputData('Using Preferred State of ' .
-            $this->config->get('preferred_state'));
-        $this->ui->outputData('Gathering release information, please wait...');
-        /**
-         * Error handling not necessary, because already done by 
-         * the download command
-         */
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $err = $cmd->run('download', array('downloadonly' => true), array_keys($remoteInfo));
-        PEAR::staticPopErrorHandling();
-        $this->config->set('default_channel', $savechannel);
-        if (PEAR::isError($err)) {
-            $this->ui->outputData($err->getMessage());
-        }
-        return true;
-    }
-
-    // }}}
-}
diff --git a/PEAR/Command/Mirror.xml b/PEAR/Command/Mirror.xml
deleted file mode 100644
index 5a10a5b..0000000
--- a/PEAR/Command/Mirror.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
- 
-  Downloads each available package from the default channel
-  doDownloadAll
-  da
-  
-   
-    c
-    specify a channel other than the default channel
-    CHAN
-   
-  
-  
-Requests a list of available packages from the default channel ({config default_channel})
-and downloads them to current working directory.  Note: only
-packages within preferred_state ({config preferred_state}) will be downloaded
- 
-
\ No newline at end of file
diff --git a/PEAR/Command/Package.php b/PEAR/Command/Package.php
deleted file mode 100644
index 9b7b563..0000000
--- a/PEAR/Command/Package.php
+++ /dev/null
@@ -1,828 +0,0 @@
-
- * @author     Martin Jansen 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Package.php,v 1.122 2006/06/07 23:38:14 pajoye Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for login/logout
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Martin Jansen 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-
-class PEAR_Command_Package extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'package' => array(
-            'summary' => 'Build Package',
-            'function' => 'doPackage',
-            'shortcut' => 'p',
-            'options' => array(
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'Do not gzip the package file'
-                    ),
-                'showname' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'Print the name of the packaged file.',
-                    ),
-                ),
-            'doc' => '[descfile] [descfile2]
-Creates a PEAR package from its description file (usually called
-package.xml).  If a second packagefile is passed in, then
-the packager will check to make sure that one is a package.xml
-version 1.0, and the other is a package.xml version 2.0.  The
-package.xml version 1.0 will be saved as "package.xml" in the archive,
-and the other as "package2.xml" in the archive"
-'
-            ),
-        'package-validate' => array(
-            'summary' => 'Validate Package Consistency',
-            'function' => 'doPackageValidate',
-            'shortcut' => 'pv',
-            'options' => array(),
-            'doc' => '
-',
-            ),
-        'cvsdiff' => array(
-            'summary' => 'Run a "cvs diff" for all files in a package',
-            'function' => 'doCvsDiff',
-            'shortcut' => 'cd',
-            'options' => array(
-                'quiet' => array(
-                    'shortopt' => 'q',
-                    'doc' => 'Be quiet',
-                    ),
-                'reallyquiet' => array(
-                    'shortopt' => 'Q',
-                    'doc' => 'Be really quiet',
-                    ),
-                'date' => array(
-                    'shortopt' => 'D',
-                    'doc' => 'Diff against revision of DATE',
-                    'arg' => 'DATE',
-                    ),
-                'release' => array(
-                    'shortopt' => 'R',
-                    'doc' => 'Diff against tag for package release REL',
-                    'arg' => 'REL',
-                    ),
-                'revision' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'Diff against revision REV',
-                    'arg' => 'REV',
-                    ),
-                'context' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'Generate context diff',
-                    ),
-                'unified' => array(
-                    'shortopt' => 'u',
-                    'doc' => 'Generate unified diff',
-                    ),
-                'ignore-case' => array(
-                    'shortopt' => 'i',
-                    'doc' => 'Ignore case, consider upper- and lower-case letters equivalent',
-                    ),
-                'ignore-whitespace' => array(
-                    'shortopt' => 'b',
-                    'doc' => 'Ignore changes in amount of white space',
-                    ),
-                'ignore-blank-lines' => array(
-                    'shortopt' => 'B',
-                    'doc' => 'Ignore changes that insert or delete blank lines',
-                    ),
-                'brief' => array(
-                    'doc' => 'Report only whether the files differ, no details',
-                    ),
-                'dry-run' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'Don\'t do anything, just pretend',
-                    ),
-                ),
-            'doc' => '
-Compares all the files in a package.  Without any options, this
-command will compare the current code with the last checked-in code.
-Using the -r or -R option you may compare the current code with that
-of a specific release.
-',
-            ),
-        'cvstag' => array(
-            'summary' => 'Set CVS Release Tag',
-            'function' => 'doCvsTag',
-            'shortcut' => 'ct',
-            'options' => array(
-                'quiet' => array(
-                    'shortopt' => 'q',
-                    'doc' => 'Be quiet',
-                    ),
-                'reallyquiet' => array(
-                    'shortopt' => 'Q',
-                    'doc' => 'Be really quiet',
-                    ),
-                'slide' => array(
-                    'shortopt' => 'F',
-                    'doc' => 'Move (slide) tag if it exists',
-                    ),
-                'delete' => array(
-                    'shortopt' => 'd',
-                    'doc' => 'Remove tag',
-                    ),
-                'dry-run' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'Don\'t do anything, just pretend',
-                    ),
-                ),
-            'doc' => ' [files...]
-Sets a CVS tag on all files in a package.  Use this command after you have
-packaged a distribution tarball with the "package" command to tag what
-revisions of what files were in that release.  If need to fix something
-after running cvstag once, but before the tarball is released to the public,
-use the "slide" option to move the release tag.
-
-to include files (such as a second package.xml, or tests not included in the
-release), pass them as additional parameters.
-',
-            ),
-        'package-dependencies' => array(
-            'summary' => 'Show package dependencies',
-            'function' => 'doPackageDependencies',
-            'shortcut' => 'pd',
-            'options' => array(),
-            'doc' => '
-List all dependencies the package has.'
-            ),
-        'sign' => array(
-            'summary' => 'Sign a package distribution file',
-            'function' => 'doSign',
-            'shortcut' => 'si',
-            'options' => array(),
-            'doc' => '
-Signs a package distribution (.tar or .tgz) file with GnuPG.',
-            ),
-        'makerpm' => array(
-            'summary' => 'Builds an RPM spec file from a PEAR package',
-            'function' => 'doMakeRPM',
-            'shortcut' => 'rpm',
-            'options' => array(
-                'spec-template' => array(
-                    'shortopt' => 't',
-                    'arg' => 'FILE',
-                    'doc' => 'Use FILE as RPM spec file template'
-                    ),
-                'rpm-pkgname' => array(
-                    'shortopt' => 'p',
-                    'arg' => 'FORMAT',
-                    'doc' => 'Use FORMAT as format string for RPM package name, %s is replaced
-by the PEAR package name, defaults to "PEAR::%s".',
-                    ),
-                ),
-            'doc' => '
-
-Creates an RPM .spec file for wrapping a PEAR package inside an RPM
-package.  Intended to be used from the SPECS directory, with the PEAR
-package tarball in the SOURCES directory:
-
-$ pear makerpm ../SOURCES/Net_Socket-1.0.tgz
-Wrote RPM spec file PEAR::Net_Geo-1.0.spec
-$ rpm -bb PEAR::Net_Socket-1.0.spec
-...
-Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
-',
-            ),
-        'convert' => array(
-            'summary' => 'Convert a package.xml 1.0 to package.xml 2.0 format',
-            'function' => 'doConvert',
-            'shortcut' => 'c2',
-            'options' => array(
-                'flat' => array(
-                    'shortopt' => 'f',
-                    'doc' => 'do not beautify the filelist.',
-                    ),
-                ),
-            'doc' => '[descfile] [descfile2]
-Converts a package.xml in 1.0 format into a package.xml
-in 2.0 format.  The new file will be named package2.xml by default,
-and package.xml will be used as the old file by default.
-This is not the most intelligent conversion, and should only be
-used for automated conversion or learning the format.
-'
-            ),
-        );
-
-    var $output;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Package constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Package(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ _displayValidationResults()
-
-    function _displayValidationResults($err, $warn, $strict = false)
-    {
-        foreach ($err as $e) {
-            $this->output .= "Error: $e\n";
-        }
-        foreach ($warn as $w) {
-            $this->output .= "Warning: $w\n";
-        }
-        $this->output .= sprintf('Validation: %d error(s), %d warning(s)'."\n",
-                                       sizeof($err), sizeof($warn));
-        if ($strict && sizeof($err) > 0) {
-            $this->output .= "Fix these errors and try again.";
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    function &getPackager()
-    {
-        if (!class_exists('PEAR_Packager')) {
-            require_once 'PEAR/Packager.php';
-        }
-        $a = &new PEAR_Packager;
-        return $a;
-    }
-
-    function &getPackageFile($config, $debug = false, $tmpdir = null)
-    {
-        if (!class_exists('PEAR_Common')) {
-            require_once 'PEAR/Common.php';
-        }
-        if (!class_exists('PEAR/PackageFile.php')) {
-            require_once 'PEAR/PackageFile.php';
-        }
-        $a = &new PEAR_PackageFile($config, $debug, $tmpdir);
-        $common = new PEAR_Common;
-        $common->ui = $this->ui;
-        $a->setLogger($common);
-        return $a;
-    }
-    // {{{ doPackage()
-
-    function doPackage($command, $options, $params)
-    {
-        $this->output = '';
-        $pkginfofile = isset($params[0]) ? $params[0] : 'package.xml';
-        $pkg2 = isset($params[1]) ? $params[1] : null;
-        if (!$pkg2 && !isset($params[0])) {
-            if (file_exists('package2.xml')) {
-                $pkg2 = 'package2.xml';
-            }
-        }
-        $packager = &$this->getPackager();
-        $compress = empty($options['nocompress']) ? true : false;
-        $result = $packager->package($pkginfofile, $compress, $pkg2);
-        if (PEAR::isError($result)) {
-            return $this->raiseError($result);
-        }
-        // Don't want output, only the package file name just created
-        if (isset($options['showname'])) {
-            $this->output = $result;
-        }
-        if ($this->output) {
-            $this->ui->outputData($this->output, $command);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ doPackageValidate()
-
-    function doPackageValidate($command, $options, $params)
-    {
-        $this->output = '';
-        if (sizeof($params) < 1) {
-            $params[0] = "package.xml";
-        }
-        $obj = &$this->getPackageFile($this->config, $this->_debug);
-        $obj->rawReturn();
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $info = $obj->fromTgzFile($params[0], PEAR_VALIDATE_NORMAL);
-        if (PEAR::isError($info)) {
-            $info = $obj->fromPackageFile($params[0], PEAR_VALIDATE_NORMAL);
-        } else {
-            $archive = $info->getArchiveFile();
-            $tar = &new Archive_Tar($archive);
-            $tar->extract(dirname($info->getPackageFile()));
-            $info->setPackageFile(dirname($info->getPackageFile()) . DIRECTORY_SEPARATOR .
-                $info->getPackage() . '-' . $info->getVersion() . DIRECTORY_SEPARATOR .
-                basename($info->getPackageFile()));
-        }
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-        $valid = false;
-        if ($info->getPackagexmlVersion() == '2.0') {
-            if ($valid = $info->validate(PEAR_VALIDATE_NORMAL)) {
-                $info->flattenFileList();
-                $valid = $info->validate(PEAR_VALIDATE_PACKAGING);
-            }
-        } else {
-            $valid = $info->validate(PEAR_VALIDATE_PACKAGING);
-        }
-        $err = array();
-        $warn = array();
-        if (!$valid) {
-            foreach ($info->getValidationWarnings() as $error) {
-                if ($error['level'] == 'warning') {
-                    $warn[] = $error['message'];
-                } else {
-                    $err[] = $error['message'];
-                }
-            }
-        }
-        $this->_displayValidationResults($err, $warn);
-        $this->ui->outputData($this->output, $command);
-        return true;
-    }
-
-    // }}}
-    // {{{ doCvsTag()
-
-    function doCvsTag($command, $options, $params)
-    {
-        $this->output = '';
-        $_cmd = $command;
-        if (sizeof($params) < 1) {
-            $help = $this->getHelp($command);
-            return $this->raiseError("$command: missing parameter: $help[0]");
-        }
-        $obj = &$this->getPackageFile($this->config, $this->_debug);
-        $info = $obj->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-        $err = $warn = array();
-        if (!$info->validate()) {
-            foreach ($info->getValidationWarnings() as $error) {
-                if ($error['level'] == 'warning') {
-                    $warn[] = $error['message'];
-                } else {
-                    $err[] = $error['message'];
-                }
-            }
-        }
-        if (!$this->_displayValidationResults($err, $warn, true)) {
-            $this->ui->outputData($this->output, $command);
-            return $this->raiseError('CVS tag failed');
-        }
-        $version = $info->getVersion();
-        $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $version);
-        $cvstag = "RELEASE_$cvsversion";
-        $files = array_keys($info->getFilelist());
-        $command = "cvs";
-        if (isset($options['quiet'])) {
-            $command .= ' -q';
-        }
-        if (isset($options['reallyquiet'])) {
-            $command .= ' -Q';
-        }
-        $command .= ' tag';
-        if (isset($options['slide'])) {
-            $command .= ' -F';
-        }
-        if (isset($options['delete'])) {
-            $command .= ' -d';
-        }
-        $command .= ' ' . $cvstag . ' ' . escapeshellarg($params[0]);
-        array_shift($params);
-        if (count($params)) {
-            // add in additional files to be tagged
-            $files = array_merge($files, $params);
-        }
-        foreach ($files as $file) {
-            $command .= ' ' . escapeshellarg($file);
-        }
-        if ($this->config->get('verbose') > 1) {
-            $this->output .= "+ $command\n";
-        }
-        $this->output .= "+ $command\n";
-        if (empty($options['dry-run'])) {
-            $fp = popen($command, "r");
-            while ($line = fgets($fp, 1024)) {
-                $this->output .= rtrim($line)."\n";
-            }
-            pclose($fp);
-        }
-        $this->ui->outputData($this->output, $_cmd);
-        return true;
-    }
-
-    // }}}
-    // {{{ doCvsDiff()
-
-    function doCvsDiff($command, $options, $params)
-    {
-        $this->output = '';
-        if (sizeof($params) < 1) {
-            $help = $this->getHelp($command);
-            return $this->raiseError("$command: missing parameter: $help[0]");
-        }
-        $obj = &$this->getPackageFile($this->config, $this->_debug);
-        $info = $obj->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-        $err = $warn = array();
-        if (!$info->validate()) {
-            foreach ($info->getValidationWarnings() as $error) {
-                if ($error['level'] == 'warning') {
-                    $warn[] = $error['message'];
-                } else {
-                    $err[] = $error['message'];
-                }
-            }
-        }
-        if (!$this->_displayValidationResults($err, $warn, true)) {
-            $this->ui->outputData($this->output, $command);
-            return $this->raiseError('CVS diff failed');
-        }
-        $info1 = $info->getFilelist();
-        $files = $info1;
-        $cmd = "cvs";
-        if (isset($options['quiet'])) {
-            $cmd .= ' -q';
-            unset($options['quiet']);
-        }
-        if (isset($options['reallyquiet'])) {
-            $cmd .= ' -Q';
-            unset($options['reallyquiet']);
-        }
-        if (isset($options['release'])) {
-            $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $options['release']);
-            $cvstag = "RELEASE_$cvsversion";
-            $options['revision'] = $cvstag;
-            unset($options['release']);
-        }
-        $execute = true;
-        if (isset($options['dry-run'])) {
-            $execute = false;
-            unset($options['dry-run']);
-        }
-        $cmd .= ' diff';
-        // the rest of the options are passed right on to "cvs diff"
-        foreach ($options as $option => $optarg) {
-            $arg = $short = false;
-            if (isset($this->commands[$command]['options'][$option])) {
-                $arg = $this->commands[$command]['options'][$option]['arg'];
-                $short = $this->commands[$command]['options'][$option]['shortopt'];
-            }
-            $cmd .= $short ? " -$short" : " --$option";
-            if ($arg && $optarg) {
-                $cmd .= ($short ? '' : '=') . escapeshellarg($optarg);
-            }
-        }
-        foreach ($files as $file) {
-            $cmd .= ' ' . escapeshellarg($file['name']);
-        }
-        if ($this->config->get('verbose') > 1) {
-            $this->output .= "+ $cmd\n";
-        }
-        if ($execute) {
-            $fp = popen($cmd, "r");
-            while ($line = fgets($fp, 1024)) {
-                $this->output .= rtrim($line)."\n";
-            }
-            pclose($fp);
-        }
-        $this->ui->outputData($this->output, $command);
-        return true;
-    }
-
-    // }}}
-    // {{{ doPackageDependencies()
-
-    function doPackageDependencies($command, $options, $params)
-    {
-        // $params[0] -> the PEAR package to list its information
-        if (sizeof($params) != 1) {
-            return $this->raiseError("bad parameter(s), try \"help $command\"");
-        }
-        $obj = &$this->getPackageFile($this->config, $this->_debug);
-        $info = $obj->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-        $deps = $info->getDeps();
-        if (is_array($deps)) {
-            if ($info->getPackagexmlVersion() == '1.0') {
-                $data = array(
-                    'caption' => 'Dependencies for pear/' . $info->getPackage(),
-                    'border' => true,
-                    'headline' => array("Required?", "Type", "Name", "Relation", "Version"),
-                    );
-
-                foreach ($deps as $d) {
-                    if (isset($d['optional'])) {
-                        if ($d['optional'] == 'yes') {
-                            $req = 'No';
-                        } else {
-                            $req = 'Yes';
-                        }
-                    } else {
-                        $req = 'Yes';
-                    }
-                    if (isset($this->_deps_rel_trans[$d['rel']])) {
-                        $rel = $this->_deps_rel_trans[$d['rel']];
-                    } else {
-                        $rel = $d['rel'];
-                    }
-
-                    if (isset($this->_deps_type_trans[$d['type']])) {
-                        $type = ucfirst($this->_deps_type_trans[$d['type']]);
-                    } else {
-                        $type = $d['type'];
-                    }
-
-                    if (isset($d['name'])) {
-                        $name = $d['name'];
-                    } else {
-                        $name = '';
-                    }
-
-                    if (isset($d['version'])) {
-                        $version = $d['version'];
-                    } else {
-                        $version = '';
-                    }
-
-                    $data['data'][] = array($req, $type, $name, $rel, $version);
-                }
-            } else { // package.xml 2.0 dependencies display
-                require_once 'PEAR/Dependency2.php';
-                $deps = $info->getDependencies();
-                $reg = &$this->config->getRegistry();
-                if (is_array($deps)) {
-                    $d = new PEAR_Dependency2($this->config, array(), '');
-                    $data = array(
-                        'caption' => 'Dependencies for ' . $info->getPackage(),
-                        'border' => true,
-                        'headline' => array("Required?", "Type", "Name", 'Versioning', 'Group'),
-                        );
-                    foreach ($deps as $type => $subd) {
-                        $req = ($type == 'required') ? 'Yes' : 'No';
-                        if ($type == 'group') {
-                            $group = $subd['attribs']['name'];
-                        } else {
-                            $group = '';
-                        }
-                        if (!isset($subd[0])) {
-                            $subd = array($subd);
-                        }
-                        foreach ($subd as $groupa) {
-                            foreach ($groupa as $deptype => $depinfo) {
-                                if ($deptype == 'attribs') {
-                                    continue;
-                                }
-                                if ($deptype == 'pearinstaller') {
-                                    $deptype = 'pear Installer';
-                                }
-                                if (!isset($depinfo[0])) {
-                                    $depinfo = array($depinfo);
-                                }
-                                foreach ($depinfo as $inf) {
-                                    $name = '';
-                                    if (isset($inf['channel'])) {
-                                        $alias = $reg->channelAlias($inf['channel']);
-                                        if (!$alias) {
-                                            $alias = '(channel?) ' .$inf['channel'];
-                                        }
-                                        $name = $alias . '/';
-                                    }
-                                    if (isset($inf['name'])) {
-                                        $name .= $inf['name'];
-                                    } elseif (isset($inf['pattern'])) {
-                                        $name .= $inf['pattern'];
-                                    } else {
-                                        $name .= '';
-                                    }
-                                    if (isset($inf['uri'])) {
-                                        $name .= ' [' . $inf['uri'] .  ']';
-                                    }
-                                    if (isset($inf['conflicts'])) {
-                                        $ver = 'conflicts';
-                                    } else {
-                                        $ver = $d->_getExtraString($inf);
-                                    }
-                                    $data['data'][] = array($req, ucfirst($deptype), $name,
-                                        $ver, $group);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            $this->ui->outputData($data, $command);
-            return true;
-        }
-
-        // Fallback
-        $this->ui->outputData("This package does not have any dependencies.", $command);
-    }
-
-    // }}}
-    // {{{ doSign()
-
-    function doSign($command, $options, $params)
-    {
-        require_once 'System.php';
-        require_once 'Archive/Tar.php';
-        // should move most of this code into PEAR_Packager
-        // so it'll be easy to implement "pear package --sign"
-        if (sizeof($params) != 1) {
-            return $this->raiseError("bad parameter(s), try \"help $command\"");
-        }
-        if (!file_exists($params[0])) {
-            return $this->raiseError("file does not exist: $params[0]");
-        }
-        $obj = $this->getPackageFile($this->config, $this->_debug);
-        $info = $obj->fromTgzFile($params[0], PEAR_VALIDATE_NORMAL);
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-        $tar = new Archive_Tar($params[0]);
-        $tmpdir = System::mktemp('-d pearsign');
-        if (!$tar->extractList('package2.xml package.sig', $tmpdir)) {
-            if (!$tar->extractList('package.xml package.sig', $tmpdir)) {
-                return $this->raiseError("failed to extract tar file");
-            }
-        }
-        if (file_exists("$tmpdir/package.sig")) {
-            return $this->raiseError("package already signed");
-        }
-        $packagexml = 'package.xml';
-        if (file_exists("$tmpdir/package2.xml")) {
-            $packagexml = 'package2.xml';
-        }
-        if (file_exists("$tmpdir/package.sig")) {
-            unlink("$tmpdir/package.sig");
-        }
-        $input = $this->ui->userDialog($command,
-                                       array('GnuPG Passphrase'),
-                                       array('password'));
-        $gpg = popen("gpg --batch --passphrase-fd 0 --armor --detach-sign --output $tmpdir/package.sig $tmpdir/$packagexml 2>/dev/null", "w");
-        if (!$gpg) {
-            return $this->raiseError("gpg command failed");
-        }
-        fwrite($gpg, "$input[0]\n");
-        if (pclose($gpg) || !file_exists("$tmpdir/package.sig")) {
-            return $this->raiseError("gpg sign failed");
-        }
-        $tar->addModify("$tmpdir/package.sig", '', $tmpdir);
-        return true;
-    }
-
-    // }}}
-
-    /**
-     * For unit testing purposes
-     */
-    function &getInstaller(&$ui)
-    {
-        if (!class_exists('PEAR_Installer')) {
-            require_once 'PEAR/Installer.php';
-        }
-        $a = &new PEAR_Installer($ui);
-        return $a;
-    }
-    
-    /**
-     * For unit testing purposes
-     */
-    function &getCommandPackaging(&$ui, &$config)
-    {
-        if (!class_exists('PEAR_Command_Packaging')) {
-            if ($fp = @fopen('PEAR/Command/Packaging.php', 'r', true)) {
-                fclose($fp);
-                include_once 'PEAR/Command/Packaging.php';
-            }
-        }
-        
-        if (class_exists('PEAR_Command_Packaging')) {
-            $a = &new PEAR_Command_Packaging($ui, $config);
-        } else {
-            $a = null;
-        }
-        return $a;
-    }
-
-    // {{{ doMakeRPM()
-
-    function doMakeRPM($command, $options, $params)
-    {
-
-        // Check to see if PEAR_Command_Packaging is installed, and
-        // transparently switch to use the "make-rpm-spec" command from it
-        // instead, if it does. Otherwise, continue to use the old version
-        // of "makerpm" supplied with this package (PEAR).
-        $packaging_cmd = $this->getCommandPackaging($this->ui, $this->config);
-        if ($packaging_cmd !== null) {
-            $this->ui->outputData('PEAR_Command_Packaging is installed; using '.
-                'newer "make-rpm-spec" command instead');
-            return $packaging_cmd->run('make-rpm-spec', $options, $params);
-        } else {
-            $this->ui->outputData('WARNING: "pear makerpm" is no longer available; an '.
-              'improved version is available via "pear make-rpm-spec", which '.
-              'is available by installing PEAR_Command_Packaging');
-        }
-        return true;
-    }
-
-    function doConvert($command, $options, $params)
-    {
-        $packagexml = isset($params[0]) ? $params[0] : 'package.xml';
-        $newpackagexml = isset($params[1]) ? $params[1] : dirname($packagexml) .
-            DIRECTORY_SEPARATOR . 'package2.xml';
-        $pkg = &$this->getPackageFile($this->config, $this->_debug);
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $pf = $pkg->fromPackageFile($packagexml, PEAR_VALIDATE_NORMAL);
-        PEAR::staticPopErrorHandling();
-        if (!PEAR::isError($pf)) {
-            if (is_a($pf, 'PEAR_PackageFile_v2')) {
-                $this->ui->outputData($packagexml . ' is already a package.xml version 2.0');
-                return true;
-            }
-            $gen = &$pf->getDefaultGenerator();
-            $newpf = &$gen->toV2();
-            $newpf->setPackagefile($newpackagexml);
-            $gen = &$newpf->getDefaultGenerator();
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $state = (isset($options['flat']) ? PEAR_VALIDATE_PACKAGING : PEAR_VALIDATE_NORMAL);
-            $saved = $gen->toPackageFile(dirname($newpackagexml), $state,
-                basename($newpackagexml));
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($saved)) {
-                if (is_array($saved->getUserInfo())) {
-                    foreach ($saved->getUserInfo() as $warning) {
-                        $this->ui->outputData($warning['message']);
-                    }
-                }
-                $this->ui->outputData($saved->getMessage());
-                return true;
-            }
-            $this->ui->outputData('Wrote new version 2.0 package.xml to "' . $saved . '"');
-            return true;
-        } else {
-            if (is_array($pf->getUserInfo())) {
-                foreach ($pf->getUserInfo() as $warning) {
-                    $this->ui->outputData($warning['message']);
-                }
-            }
-            return $this->raiseError($pf);
-        }
-    }
-
-    // }}}
-}
-
-?>
diff --git a/PEAR/Command/Package.xml b/PEAR/Command/Package.xml
deleted file mode 100644
index 6ded8fe..0000000
--- a/PEAR/Command/Package.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-
- 
-  Build Package
-  doPackage
-  p
-  
-   
-    Z
-    Do not gzip the package file
-   
-   
-    n
-    Print the name of the packaged file.
-   
-  
-  [descfile] [descfile2]
-Creates a PEAR package from its description file (usually called
-package.xml).  If a second packagefile is passed in, then
-the packager will check to make sure that one is a package.xml
-version 1.0, and the other is a package.xml version 2.0.  The
-package.xml version 1.0 will be saved as "package.xml" in the archive,
-and the other as "package2.xml" in the archive"
-
- 
- 
-  Validate Package Consistency
-  doPackageValidate
-  pv
-  
-  
-
- 
- 
-  Run a "cvs diff" for all files in a package
-  doCvsDiff
-  cd
-  
-   
-    q
-    Be quiet
-   
-   
-    Q
-    Be really quiet
-   
-   
-    D
-    Diff against revision of DATE
-    DATE
-   
-   
-    R
-    Diff against tag for package release REL
-    REL
-   
-   
-    r
-    Diff against revision REV
-    REV
-   
-   
-    c
-    Generate context diff
-   
-   
-    u
-    Generate unified diff
-   
-   
-    i
-    Ignore case, consider upper- and lower-case letters equivalent
-   
-   
-    b
-    Ignore changes in amount of white space
-   
-   
-    B
-    Ignore changes that insert or delete blank lines
-   
-   
-    Report only whether the files differ, no details
-   
-   
-    n
-    Don't do anything, just pretend
-   
-  
-  <package.xml>
-Compares all the files in a package.  Without any options, this
-command will compare the current code with the last checked-in code.
-Using the -r or -R option you may compare the current code with that
-of a specific release.
-
- 
- 
-  Set CVS Release Tag
-  doCvsTag
-  ct
-  
-   
-    q
-    Be quiet
-   
-   
-    Q
-    Be really quiet
-   
-   
-    F
-    Move (slide) tag if it exists
-   
-   
-    d
-    Remove tag
-   
-   
-    n
-    Don't do anything, just pretend
-   
-  
-  <package.xml>
-Sets a CVS tag on all files in a package.  Use this command after you have
-packaged a distribution tarball with the "package" command to tag what
-revisions of what files were in that release.  If need to fix something
-after running cvstag once, but before the tarball is released to the public,
-use the "slide" option to move the release tag.
-
- 
- 
-  Show package dependencies
-  doPackageDependencies
-  pd
-  
-  
-List all dependencies the package has.
- 
- 
-  Sign a package distribution file
-  doSign
-  si
-  
-  <package-file>
-Signs a package distribution (.tar or .tgz) file with GnuPG.
- 
- 
-  Builds an RPM spec file from a PEAR package
-  doMakeRPM
-  rpm
-  
-   
-    t
-    FILE
-    Use FILE as RPM spec file template
-   
-   
-    p
-    FORMAT
-    Use FORMAT as format string for RPM package name, %s is replaced
-by the PEAR package name, defaults to "PEAR::%s".
-   
-  
-  <package-file>
-
-Creates an RPM .spec file for wrapping a PEAR package inside an RPM
-package.  Intended to be used from the SPECS directory, with the PEAR
-package tarball in the SOURCES directory:
-
-$ pear makerpm ../SOURCES/Net_Socket-1.0.tgz
-Wrote RPM spec file PEAR::Net_Geo-1.0.spec
-$ rpm -bb PEAR::Net_Socket-1.0.spec
-...
-Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
-
- 
- 
-  Convert a package.xml 1.0 to package.xml 2.0 format
-  doConvert
-  c2
-  
-   
-    f
-    do not beautify the filelist.
-   
-  
-  [descfile] [descfile2]
-Converts a package.xml in 1.0 format into a package.xml
-in 2.0 format.  The new file will be named package2.xml by default,
-and package.xml will be used as the old file by default.
-This is not the most intelligent conversion, and should only be
-used for automated conversion or learning the format.
-
- 
-
diff --git a/PEAR/Command/Pickle.php b/PEAR/Command/Pickle.php
deleted file mode 100644
index 00b5611..0000000
--- a/PEAR/Command/Pickle.php
+++ /dev/null
@@ -1,376 +0,0 @@
-
- * @copyright  2005-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Pickle.php,v 1.6 2006/05/12 02:38:58 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for login/logout
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  2005-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.1
- */
-
-class PEAR_Command_Pickle extends PEAR_Command_Common
-{
-    var $commands = array(
-        'pickle' => array(
-            'summary' => 'Build PECL Package',
-            'function' => 'doPackage',
-            'shortcut' => 'pi',
-            'options' => array(
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'Do not gzip the package file'
-                    ),
-                'showname' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'Print the name of the packaged file.',
-                    ),
-                ),
-            'doc' => '[descfile]
-Creates a PECL package from its package2.xml file.
-
-An automatic conversion will be made to a package.xml 1.0 and written out to
-disk in the current directory as "package.xml".  Note that
-only simple package.xml 2.0 will be converted.  package.xml 2.0 with:
-
- - dependency types other than required/optional PECL package/ext/php/pearinstaller
- - more than one extsrcrelease or zendextsrcrelease
- - zendextbinrelease, extbinrelease, phprelease, or bundle release type
- - dependency groups
- - ignore tags in release filelist
- - tasks other than replace
- - custom roles
-
-will cause pickle to fail, and output an error message.  If your package2.xml
-uses any of these features, you are best off using PEAR_PackageFileManager to
-generate both package.xml.
-'
-            ),
-        );
-
-    /**
-     * PEAR_Command_Package constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Pickle(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-
-    /**
-     * For unit-testing ease
-     *
-     * @return PEAR_Packager
-     */
-    function &getPackager()
-    {
-        if (!class_exists('PEAR_Packager')) {
-            require_once 'PEAR/Packager.php';
-        }
-        $a = &new PEAR_Packager;
-        return $a;
-    }
-
-    /**
-     * For unit-testing ease
-     *
-     * @param PEAR_Config $config
-     * @param bool $debug
-     * @param string|null $tmpdir
-     * @return PEAR_PackageFile
-     */
-    function &getPackageFile($config, $debug = false, $tmpdir = null)
-    {
-        if (!class_exists('PEAR_Common')) {
-            require_once 'PEAR/Common.php';
-        }
-        if (!class_exists('PEAR/PackageFile.php')) {
-            require_once 'PEAR/PackageFile.php';
-        }
-        $a = &new PEAR_PackageFile($config, $debug, $tmpdir);
-        $common = new PEAR_Common;
-        $common->ui = $this->ui;
-        $a->setLogger($common);
-        return $a;
-    }
-
-    function doPackage($command, $options, $params)
-    {
-        $this->output = '';
-        $pkginfofile = isset($params[0]) ? $params[0] : 'package2.xml';
-        $packager = &$this->getPackager();
-        if (PEAR::isError($err = $this->_convertPackage($pkginfofile))) {
-            return $err;
-        }
-        $compress = empty($options['nocompress']) ? true : false;
-        $result = $packager->package($pkginfofile, $compress, 'package.xml');
-        if (PEAR::isError($result)) {
-            return $this->raiseError($result);
-        }
-        // Don't want output, only the package file name just created
-        if (isset($options['showname'])) {
-            $this->ui->outputData($result, $command);
-        }
-        return true;
-    }
-
-    function _convertPackage($packagexml)
-    {
-        $pkg = &$this->getPackageFile($this->config);
-        $pf2 = &$pkg->fromPackageFile($packagexml, PEAR_VALIDATE_NORMAL);
-        if (!is_a($pf2, 'PEAR_PackageFile_v2')) {
-            return $this->raiseError('Cannot process "' .
-                $packagexml . '", is not a package.xml 2.0');
-        }
-        require_once 'PEAR/PackageFile/v1.php';
-        $pf = new PEAR_PackageFile_v1;
-        $pf->setConfig($this->config);
-        if ($pf2->getPackageType() != 'extsrc' && $pf2->getPackageType() != 'zendextsrc') {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", is not an extension source package.  Using a PEAR_PackageFileManager-based ' .
-            'script is an option');
-        }
-        if (is_array($pf2->getUsesRole())) {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", contains custom roles.  Using a PEAR_PackageFileManager-based script or ' .
-            'the convert command is an option');
-        }
-        if (is_array($pf2->getUsesTask())) {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", contains custom tasks.  Using a PEAR_PackageFileManager-based script or ' .
-            'the convert command is an option');
-        }
-        $deps = $pf2->getDependencies();
-        if (isset($deps['group'])) {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", contains dependency groups.  Using a PEAR_PackageFileManager-based script ' .
-            'or the convert command is an option');
-        }
-        if (isset($deps['required']['subpackage']) ||
-              isset($deps['optional']['subpackage'])) {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", contains subpackage dependencies.  Using a PEAR_PackageFileManager-based  '.
-            'script is an option');
-        }
-        if (isset($deps['required']['os'])) {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", contains os dependencies.  Using a PEAR_PackageFileManager-based  '.
-            'script is an option');
-        }
-        if (isset($deps['required']['arch'])) {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", contains arch dependencies.  Using a PEAR_PackageFileManager-based  '.
-            'script is an option');
-        }
-        $pf->setPackage($pf2->getPackage());
-        $pf->setSummary($pf2->getSummary());
-        $pf->setDescription($pf2->getDescription());
-        foreach ($pf2->getMaintainers() as $maintainer) {
-            $pf->addMaintainer($maintainer['role'], $maintainer['handle'],
-                $maintainer['name'], $maintainer['email']);
-        }
-        $pf->setVersion($pf2->getVersion());
-        $pf->setDate($pf2->getDate());
-        $pf->setLicense($pf2->getLicense());
-        $pf->setState($pf2->getState());
-        $pf->setNotes($pf2->getNotes());
-        $pf->addPhpDep($deps['required']['php']['min'], 'ge');
-        if (isset($deps['required']['php']['max'])) {
-            $pf->addPhpDep($deps['required']['php']['max'], 'le');
-        }
-        if (isset($deps['required']['package'])) {
-            if (!isset($deps['required']['package'][0])) {
-                $deps['required']['package'] = array($deps['required']['package']);
-            }
-            foreach ($deps['required']['package'] as $dep) {
-                if (!isset($dep['channel'])) {
-                    return $this->raiseError('Cannot safely convert "' . $packagexml . '"' .
-                    ' contains uri-based dependency on a package.  Using a ' .
-                    'PEAR_PackageFileManager-based script is an option');
-                }
-                if ($dep['channel'] != 'pear.php.net' && $dep['channel'] != 'pecl.php.net') {
-                    return $this->raiseError('Cannot safely convert "' . $packagexml . '"' .
-                    ' contains dependency on a non-standard channel package.  Using a ' .
-                    'PEAR_PackageFileManager-based script is an option');
-                }
-                if (isset($dep['conflicts'])) {
-                    return $this->raiseError('Cannot safely convert "' . $packagexml . '"' .
-                    ' contains conflicts dependency.  Using a ' .
-                    'PEAR_PackageFileManager-based script is an option');
-                }
-                if (isset($dep['exclude'])) {
-                    $this->ui->outputData('WARNING: exclude tags are ignored in conversion');
-                }
-                if (isset($dep['min'])) {
-                    $pf->addPackageDep($dep['name'], $dep['min'], 'ge');
-                }
-                if (isset($dep['max'])) {
-                    $pf->addPackageDep($dep['name'], $dep['max'], 'le');
-                }
-            }
-        }
-        if (isset($deps['required']['extension'])) {
-            if (!isset($deps['required']['extension'][0])) {
-                $deps['required']['extension'] = array($deps['required']['extension']);
-            }
-            foreach ($deps['required']['extension'] as $dep) {
-                if (isset($dep['conflicts'])) {
-                    return $this->raiseError('Cannot safely convert "' . $packagexml . '"' .
-                    ' contains conflicts dependency.  Using a ' .
-                    'PEAR_PackageFileManager-based script is an option');
-                }
-                if (isset($dep['exclude'])) {
-                    $this->ui->outputData('WARNING: exclude tags are ignored in conversion');
-                }
-                if (isset($dep['min'])) {
-                    $pf->addExtensionDep($dep['name'], $dep['min'], 'ge');
-                }
-                if (isset($dep['max'])) {
-                    $pf->addExtensionDep($dep['name'], $dep['max'], 'le');
-                }
-            }
-        }
-        if (isset($deps['optional']['package'])) {
-            if (!isset($deps['optional']['package'][0])) {
-                $deps['optional']['package'] = array($deps['optional']['package']);
-            }
-            foreach ($deps['optional']['package'] as $dep) {
-                if (!isset($dep['channel'])) {
-                    return $this->raiseError('Cannot safely convert "' . $packagexml . '"' .
-                    ' contains uri-based dependency on a package.  Using a ' .
-                    'PEAR_PackageFileManager-based script is an option');
-                }
-                if ($dep['channel'] != 'pear.php.net' && $dep['channel'] != 'pecl.php.net') {
-                    return $this->raiseError('Cannot safely convert "' . $packagexml . '"' .
-                    ' contains dependency on a non-standard channel package.  Using a ' .
-                    'PEAR_PackageFileManager-based script is an option');
-                }
-                if (isset($dep['exclude'])) {
-                    $this->ui->outputData('WARNING: exclude tags are ignored in conversion');
-                }
-                if (isset($dep['min'])) {
-                    $pf->addPackageDep($dep['name'], $dep['min'], 'ge', 'yes');
-                }
-                if (isset($dep['max'])) {
-                    $pf->addPackageDep($dep['name'], $dep['max'], 'le', 'yes');
-                }
-            }
-        }
-        if (isset($deps['optional']['extension'])) {
-            if (!isset($deps['optional']['extension'][0])) {
-                $deps['optional']['extension'] = array($deps['optional']['extension']);
-            }
-            foreach ($deps['optional']['extension'] as $dep) {
-                if (isset($dep['exclude'])) {
-                    $this->ui->outputData('WARNING: exclude tags are ignored in conversion');
-                }
-                if (isset($dep['min'])) {
-                    $pf->addExtensionDep($dep['name'], $dep['min'], 'ge', 'yes');
-                }
-                if (isset($dep['max'])) {
-                    $pf->addExtensionDep($dep['name'], $dep['max'], 'le', 'yes');
-                }
-            }
-        }
-        $contents = $pf2->getContents();
-        $release = $pf2->getReleases();
-        if (isset($releases[0])) {
-            return $this->raiseError('Cannot safely process "' . $packagexml . '" contains ' 
-            . 'multiple extsrcrelease/zendextsrcrelease tags.  Using a PEAR_PackageFileManager-based script ' .
-            'or the convert command is an option');
-        }
-        if ($configoptions = $pf2->getConfigureOptions()) {
-            foreach ($configoptions as $option) {
-                $pf->addConfigureOption($option['name'], $option['prompt'],
-                    isset($option['default']) ? $option['default'] : false);
-            }
-        }
-        if (isset($release['filelist']['ignore'])) {
-            return $this->raiseError('Cannot safely process "' . $packagexml . '" contains ' 
-            . 'ignore tags.  Using a PEAR_PackageFileManager-based script or the convert' .
-            ' command is an option');
-        }
-        if (isset($release['filelist']['install']) &&
-              !isset($release['filelist']['install'][0])) {
-            $release['filelist']['install'] = array($release['filelist']['install']);
-        }
-        if (isset($contents['dir']['attribs']['baseinstalldir'])) {
-            $baseinstalldir = $contents['dir']['attribs']['baseinstalldir'];
-        } else {
-            $baseinstalldir = false;
-        }
-        if (!isset($contents['dir']['file'][0])) {
-            $contents['dir']['file'] = array($contents['dir']['file']);
-        }
-        foreach ($contents['dir']['file'] as $file) {
-            if ($baseinstalldir && !isset($file['attribs']['baseinstalldir'])) {
-                $file['attribs']['baseinstalldir'] = $baseinstalldir;
-            }
-            $processFile = $file;
-            unset($processFile['attribs']);
-            if (count($processFile)) {
-                foreach ($processFile as $name => $task) {
-                    if ($name != $pf2->getTasksNs() . ':replace') {
-                        return $this->raiseError('Cannot safely process "' . $packagexml .
-                        '" contains tasks other than replace.  Using a ' .
-                        'PEAR_PackageFileManager-based script is an option.');
-                    }
-                    $file['attribs']['replace'][] = $task;
-                }
-            }
-            if (!in_array($file['attribs']['role'], PEAR_Common::getFileRoles())) {
-                return $this->raiseError('Cannot safely convert "' . $packagexml .
-                '", contains custom roles.  Using a PEAR_PackageFileManager-based script ' .
-                'or the convert command is an option');
-            }
-            if (isset($release['filelist']['install'])) {
-                foreach ($release['filelist']['install'] as $installas) {
-                    if ($installas['attribs']['name'] == $file['attribs']['name']) {
-                        $file['attribs']['install-as'] = $installas['attribs']['as'];
-                    }
-                }
-            }
-            $pf->addFile('/', $file['attribs']['name'], $file['attribs']);
-        }
-        if ($pf2->getChangeLog()) {
-            $this->ui->outputData('WARNING: changelog is not translated to package.xml ' .
-                '1.0, use PEAR_PackageFileManager-based script if you need changelog-' .
-                'translation for package.xml 1.0');
-        }
-        $gen = &$pf->getDefaultGenerator();
-        $gen->toPackageFile('.');
-    }
-}
-
-?>
diff --git a/PEAR/Command/Pickle.xml b/PEAR/Command/Pickle.xml
deleted file mode 100644
index 96069b8..0000000
--- a/PEAR/Command/Pickle.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
- 
-  Build PECL Package
-  doPackage
-  pi
-  
-   
-    Z
-    Do not gzip the package file
-   
-   
-    n
-    Print the name of the packaged file.
-   
-  
-  [descfile] [descfile2]
-Creates a PECL package from its description file (usually called
-package.xml).  If a second packagefile is passed in, then
-the packager will check to make sure that one is a package.xml
-version 1.0, and the other is a package.xml version 2.0.  The
-package.xml version 1.0 will be saved as "package.xml" in the archive,
-and the other as "package2.xml" in the archive"
-
-If no second file is passed in, and [descfile] is a package.xml 2.0,
-an automatic conversion will be made to a package.xml 1.0.  Note that
-only simple package.xml 2.0 will be converted.  package.xml 2.0 with:
-
- - dependency types other than required/optional PECL package/ext/php/pearinstaller
- - more than one extsrcrelease/zendextsrcrelease
- - zendextbinrelease, extbinrelease, phprelease, or bundle release type
- - dependency groups
- - ignore tags in release filelist
- - tasks other than replace
- - custom roles
-
-will cause pickle to fail, and output an error message.  If your package2.xml
-uses any of these features, you are best off using PEAR_PackageFileManager to
-generate both package.xml.
- 
-
\ No newline at end of file
diff --git a/PEAR/Command/Registry.php b/PEAR/Command/Registry.php
deleted file mode 100644
index 9b23a44..0000000
--- a/PEAR/Command/Registry.php
+++ /dev/null
@@ -1,1008 +0,0 @@
-
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Registry.php,v 1.73 2006/09/18 16:39:40 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for registry manipulation
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command_Registry extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'list' => array(
-            'summary' => 'List Installed Packages In The Default Channel',
-            'function' => 'doList',
-            'shortcut' => 'l',
-            'options' => array(
-                'channel' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'list installed packages from this channel',
-                    'arg' => 'CHAN',
-                    ),
-                'allchannels' => array(
-                    'shortopt' => 'a',
-                    'doc' => 'list installed packages from all channels',
-                    ),
-                ),
-            'doc' => '
-If invoked without parameters, this command lists the PEAR packages
-installed in your php_dir ({config php_dir}).  With a parameter, it
-lists the files in a package.
-',
-            ),
-        'list-files' => array(
-            'summary' => 'List Files In Installed Package',
-            'function' => 'doFileList',
-            'shortcut' => 'fl',
-            'options' => array(),
-            'doc' => '
-List the files in an installed package.
-'
-            ),
-        'shell-test' => array(
-            'summary' => 'Shell Script Test',
-            'function' => 'doShellTest',
-            'shortcut' => 'st',
-            'options' => array(),
-            'doc' => ' [[relation] version]
-Tests if a package is installed in the system. Will exit(1) if it is not.
-      The version comparison operator. One of:
-                <, lt, <=, le, >, gt, >=, ge, ==, =, eq, !=, <>, ne
-       The version to compare with
-'),
-        'info' => array(
-            'summary'  => 'Display information about a package',
-            'function' => 'doInfo',
-            'shortcut' => 'in',
-            'options'  => array(),
-            'doc'      => '
-Displays information about a package. The package argument may be a
-local package file, an URL to a package file, or the name of an
-installed package.'
-            )
-        );
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Registry constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Registry(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ doList()
-
-    function _sortinfo($a, $b)
-    {
-        $apackage = isset($a['package']) ? $a['package'] : $a['name'];
-        $bpackage = isset($b['package']) ? $b['package'] : $b['name'];
-        return strcmp($apackage, $bpackage);
-    }
-
-    function doList($command, $options, $params)
-    {
-        if (isset($options['allchannels'])) {
-            return $this->doListAll($command, array(), $params);
-        }
-        $reg = &$this->config->getRegistry();
-        if (count($params) == 1) {
-            return $this->doFileList($command, $options, $params);
-        }
-        if (isset($options['channel'])) {
-            if ($reg->channelExists($options['channel'])) {
-                $channel = $reg->channelName($options['channel']);
-            } else {
-                return $this->raiseError('Channel "' . $options['channel'] .'" does not exist');
-            }
-        } else {
-            $channel = $this->config->get('default_channel');
-        }
-        $installed = $reg->packageInfo(null, null, $channel);
-        usort($installed, array(&$this, '_sortinfo'));
-        $i = $j = 0;
-        $data = array(
-            'caption' => 'Installed packages, channel ' .
-                $channel . ':',
-            'border' => true,
-            'headline' => array('Package', 'Version', 'State')
-            );
-        foreach ($installed as $package) {
-            $pobj = $reg->getPackage(isset($package['package']) ?
-                                        $package['package'] : $package['name'], $channel);
-            $data['data'][] = array($pobj->getPackage(), $pobj->getVersion(),
-                                    $pobj->getState() ? $pobj->getState() : null);
-        }
-        if (count($installed)==0) {
-            $data = '(no packages installed from channel ' . $channel . ')';
-        }
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-    
-    function doListAll($command, $options, $params)
-    {
-        $reg = &$this->config->getRegistry();
-        $installed = $reg->packageInfo(null, null, null);
-        foreach ($installed as $channel => $packages) {
-            usort($packages, array($this, '_sortinfo'));
-            $i = $j = 0;
-            $data = array(
-                'caption' => 'Installed packages, channel ' . $channel . ':',
-                'border' => true,
-                'headline' => array('Package', 'Version', 'State')
-                );
-            foreach ($packages as $package) {
-                $pobj = $reg->getPackage(isset($package['package']) ?
-                                            $package['package'] : $package['name'], $channel);
-                $data['data'][] = array($pobj->getPackage(), $pobj->getVersion(),
-                                        $pobj->getState() ? $pobj->getState() : null);
-            }
-            if (count($packages)==0) {
-                $data = array(
-                    'caption' => 'Installed packages, channel ' . $channel . ':',
-                    'border' => true,
-                    'data' => array(array('(no packages installed)')),
-                    );
-            }
-            $this->ui->outputData($data, $command);
-        }
-        return true;
-    }
-    
-    function doFileList($command, $options, $params)
-    {
-        if (count($params) != 1) {
-            return $this->raiseError('list-files expects 1 parameter');
-        }
-        $reg = &$this->config->getRegistry();
-        $fp = false;
-        if (!is_dir($params[0]) && (file_exists($params[0]) || $fp = @fopen($params[0],
-              'r'))) {
-            if ($fp) {
-                fclose($fp);
-            }
-            if (!class_exists('PEAR_PackageFile')) {
-                require_once 'PEAR/PackageFile.php';
-            }
-            $pkg = &new PEAR_PackageFile($this->config, $this->_debug);
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $info = &$pkg->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
-            PEAR::staticPopErrorHandling();
-            $headings = array('Package File', 'Install Path');
-            $installed = false;
-        } else {
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $parsed = $reg->parsePackageName($params[0], $this->config->get('default_channel'));
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($parsed)) {
-                return $this->raiseError($parsed);
-            }
-            $info = &$reg->getPackage($parsed['package'], $parsed['channel']);
-            $headings = array('Type', 'Install Path');
-            $installed = true;
-        }
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-        if ($info === null) {
-            return $this->raiseError("`$params[0]' not installed");
-        }
-        $list = ($info->getPackagexmlVersion() == '1.0' || $installed) ?
-            $info->getFilelist() : $info->getContents();
-        if ($installed) {
-            $caption = 'Installed Files For ' . $params[0];
-        } else {
-            $caption = 'Contents of ' . basename($params[0]);
-        }
-        $data = array(
-            'caption' => $caption,
-            'border' => true,
-            'headline' => $headings);
-        if ($info->getPackagexmlVersion() == '1.0' || $installed) {
-            foreach ($list as $file => $att) {
-                if ($installed) {
-                    if (empty($att['installed_as'])) {
-                        continue;
-                    }
-                    $data['data'][] = array($att['role'], $att['installed_as']);
-                } else {
-                    if (isset($att['baseinstalldir']) && !in_array($att['role'],
-                          array('test', 'data', 'doc'))) {
-                        $dest = $att['baseinstalldir'] . DIRECTORY_SEPARATOR .
-                            $file;
-                    } else {
-                        $dest = $file;
-                    }
-                    switch ($att['role']) {
-                        case 'test':
-                        case 'data':
-                        case 'doc':
-                            $role = $att['role'];
-                            if ($role == 'test') {
-                                $role .= 's';
-                            }
-                            $dest = $this->config->get($role . '_dir') . DIRECTORY_SEPARATOR .
-                                $info->getPackage() . DIRECTORY_SEPARATOR . $dest;
-                            break;
-                        case 'php':
-                        default:
-                            $dest = $this->config->get('php_dir') . DIRECTORY_SEPARATOR .
-                                $dest;
-                    }
-                    $ds2 = DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR;
-                    $dest = preg_replace(array('!\\\\+!', '!/!', "!$ds2+!"),
-                                                    array(DIRECTORY_SEPARATOR,
-                                                          DIRECTORY_SEPARATOR,
-                                                          DIRECTORY_SEPARATOR),
-                                                    $dest);
-                    $file = preg_replace('!/+!', '/', $file);
-                    $data['data'][] = array($file, $dest);
-                }
-            }
-        } else { // package.xml 2.0, not installed
-            if (!isset($list['dir']['file'][0])) {
-                $list['dir']['file'] = array($list['dir']['file']);
-            }
-            foreach ($list['dir']['file'] as $att) {
-                $att = $att['attribs'];
-                $file = $att['name'];
-                $role = &PEAR_Installer_Role::factory($info, $att['role'], $this->config);
-                $role->setup($this, $info, $att, $file);
-                if (!$role->isInstallable()) {
-                    $dest = '(not installable)';
-                } else {
-                    $dest = $role->processInstallation($info, $att, $file, '');
-                    if (PEAR::isError($dest)) {
-                        $dest = '(Unknown role "' . $att['role'] . ')';
-                    } else {
-                        list(,, $dest) = $dest;
-                    }
-                }
-                $data['data'][] = array($file, $dest);
-            }
-        }
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-
-    // }}}
-    // {{{ doShellTest()
-
-    function doShellTest($command, $options, $params)
-    {
-        $this->pushErrorHandling(PEAR_ERROR_RETURN);
-        $reg = &$this->config->getRegistry();
-        $info = $reg->parsePackageName($params[0], $this->config->get('default_channel'));
-        if (PEAR::isError($info)) {
-            exit(1); // invalid package name
-        }
-        $package = $info['package'];
-        $channel = $info['channel'];
-        // "pear shell-test Foo"
-        if (!$reg->packageExists($package, $channel)) {
-            if ($channel == 'pecl.php.net') {
-                if ($reg->packageExists($package, 'pear.php.net')) {
-                    $channel = 'pear.php.net'; // magically change channels for extensions
-                }
-            }
-        }
-        if (sizeof($params) == 1) {
-            if (!$reg->packageExists($package, $channel)) {
-                exit(1);
-            }
-            // "pear shell-test Foo 1.0"
-        } elseif (sizeof($params) == 2) {
-            $v = $reg->packageInfo($package, 'version', $channel);
-            if (!$v || !version_compare("$v", "{$params[1]}", "ge")) {
-                exit(1);
-            }
-            // "pear shell-test Foo ge 1.0"
-        } elseif (sizeof($params) == 3) {
-            $v = $reg->packageInfo($package, 'version', $channel);
-            if (!$v || !version_compare("$v", "{$params[2]}", $params[1])) {
-                exit(1);
-            }
-        } else {
-            $this->popErrorHandling();
-            $this->raiseError("$command: expects 1 to 3 parameters");
-            exit(1);
-        }
-    }
-
-    // }}}
-    // {{{ doInfo
-
-    function doInfo($command, $options, $params)
-    {
-        if (count($params) != 1) {
-            return $this->raiseError('pear info expects 1 parameter');
-        }
-        $info = $fp = false;
-        $reg = &$this->config->getRegistry();
-        if ((file_exists($params[0]) && is_file($params[0]) && !is_dir($params[0])) || $fp = @fopen($params[0], 'r')) {
-            if ($fp) {
-                fclose($fp);
-            }
-            if (!class_exists('PEAR_PackageFile')) {
-                require_once 'PEAR/PackageFile.php';
-            }
-            $pkg = &new PEAR_PackageFile($this->config, $this->_debug);
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $obj = &$pkg->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($obj)) {
-                $uinfo = $obj->getUserInfo();
-                if (is_array($uinfo)) {
-                    foreach ($uinfo as $message) {
-                        if (is_array($message)) {
-                            $message = $message['message'];
-                        }
-                        $this->ui->outputData($message);
-                    }
-                }
-                return $this->raiseError($obj);
-            }
-            if ($obj->getPackagexmlVersion() == '1.0') {
-                $info = $obj->toArray();
-            } else {
-                return $this->_doInfo2($command, $options, $params, $obj, false);
-            }
-        } else {
-            $parsed = $reg->parsePackageName($params[0], $this->config->get('default_channel'));
-            if (PEAR::isError($parsed)) {
-                return $this->raiseError($parsed);
-            }
-            $package = $parsed['package'];
-            $channel = $parsed['channel'];
-            $info = $reg->packageInfo($package, null, $channel);
-            if (isset($info['old'])) {
-                $obj = $reg->getPackage($package, $channel);
-                return $this->_doInfo2($command, $options, $params, $obj, true);
-            }
-        }
-        if (PEAR::isError($info)) {
-            return $info;
-        }
-        if (empty($info)) {
-            $this->raiseError("No information found for `$params[0]'");
-            return;
-        }
-        unset($info['filelist']);
-        unset($info['dirtree']);
-        unset($info['changelog']);
-        if (isset($info['xsdversion'])) {
-            $info['package.xml version'] = $info['xsdversion'];
-            unset($info['xsdversion']);
-        }
-        if (isset($info['packagerversion'])) {
-            $info['packaged with PEAR version'] = $info['packagerversion'];
-            unset($info['packagerversion']);
-        }
-        $keys = array_keys($info);
-        $longtext = array('description', 'summary');
-        foreach ($keys as $key) {
-            if (is_array($info[$key])) {
-                switch ($key) {
-                    case 'maintainers': {
-                        $i = 0;
-                        $mstr = '';
-                        foreach ($info[$key] as $m) {
-                            if ($i++ > 0) {
-                                $mstr .= "\n";
-                            }
-                            $mstr .= $m['name'] . " <";
-                            if (isset($m['email'])) {
-                                $mstr .= $m['email'];
-                            } else {
-                                $mstr .= $m['handle'] . '@php.net';
-                            }
-                            $mstr .= "> ($m[role])";
-                        }
-                        $info[$key] = $mstr;
-                        break;
-                    }
-                    case 'release_deps': {
-                        $i = 0;
-                        $dstr = '';
-                        foreach ($info[$key] as $d) {
-                            if (isset($this->_deps_rel_trans[$d['rel']])) {
-                                $rel = $this->_deps_rel_trans[$d['rel']];
-                            } else {
-                                $rel = $d['rel'];
-                            }
-                            if (isset($this->_deps_type_trans[$d['type']])) {
-                                $type = ucfirst($this->_deps_type_trans[$d['type']]);
-                            } else {
-                                $type = $d['type'];
-                            }
-                            if (isset($d['name'])) {
-                                $name = $d['name'] . ' ';
-                            } else {
-                                $name = '';
-                            }
-                            if (isset($d['version'])) {
-                                $version = $d['version'] . ' ';
-                            } else {
-                                $version = '';
-                            }
-                            if (isset($d['optional']) && $d['optional'] == 'yes') {
-                                $optional = ' (optional)';
-                            } else {
-                                $optional = '';
-                            }
-                            $dstr .= "$type $name$rel $version$optional\n";
-                        }
-                        $info[$key] = $dstr;
-                        break;
-                    }
-                    case 'provides' : {
-                        $debug = $this->config->get('verbose');
-                        if ($debug < 2) {
-                            $pstr = 'Classes: ';
-                        } else {
-                            $pstr = '';
-                        }
-                        $i = 0;
-                        foreach ($info[$key] as $p) {
-                            if ($debug < 2 && $p['type'] != "class") {
-                                continue;
-                            }
-                            // Only print classes when verbosity mode is < 2
-                            if ($debug < 2) {
-                                if ($i++ > 0) {
-                                    $pstr .= ", ";
-                                }
-                                $pstr .= $p['name'];
-                            } else {
-                                if ($i++ > 0) {
-                                    $pstr .= "\n";
-                                }
-                                $pstr .= ucfirst($p['type']) . " " . $p['name'];
-                                if (isset($p['explicit']) && $p['explicit'] == 1) {
-                                    $pstr .= " (explicit)";
-                                }
-                            }
-                        }
-                        $info[$key] = $pstr;
-                        break;
-                    }
-                    case 'configure_options' : {
-                        foreach ($info[$key] as $i => $p) {
-                            $info[$key][$i] = array_map(null, array_keys($p), array_values($p));
-                            $info[$key][$i] = array_map(create_function('$a',
-                                'return join(" = ",$a);'), $info[$key][$i]);
-                            $info[$key][$i] = implode(', ', $info[$key][$i]);
-                        }
-                        $info[$key] = implode("\n", $info[$key]);
-                        break;
-                    }
-                    default: {
-                        $info[$key] = implode(", ", $info[$key]);
-                        break;
-                    }
-                }
-            }
-            if ($key == '_lastmodified') {
-                $hdate = date('Y-m-d', $info[$key]);
-                unset($info[$key]);
-                $info['Last Modified'] = $hdate;
-            } elseif ($key == '_lastversion') {
-                $info['Previous Installed Version'] = $info[$key] ? $info[$key] : '- None -';
-                unset($info[$key]);
-            } else {
-                $info[$key] = trim($info[$key]);
-                if (in_array($key, $longtext)) {
-                    $info[$key] = preg_replace('/  +/', ' ', $info[$key]);
-                }
-            }
-        }
-        $caption = 'About ' . $info['package'] . '-' . $info['version'];
-        $data = array(
-            'caption' => $caption,
-            'border' => true);
-        foreach ($info as $key => $value) {
-            $key = ucwords(trim(str_replace('_', ' ', $key)));
-            $data['data'][] = array($key, $value);
-        }
-        $data['raw'] = $info;
-
-        $this->ui->outputData($data, 'package-info');
-    }
-
-    // }}}
-
-    /**
-     * @access private
-     */
-    function _doInfo2($command, $options, $params, &$obj, $installed)
-    {
-        $reg = &$this->config->getRegistry();
-        $caption = 'About ' . $obj->getChannel() . '/' .$obj->getPackage() . '-' .
-            $obj->getVersion();
-        $data = array(
-            'caption' => $caption,
-            'border' => true);
-        switch ($obj->getPackageType()) {
-            case 'php' :
-                $release = 'PEAR-style PHP-based Package';
-            break;
-            case 'extsrc' :
-                $release = 'PECL-style PHP extension (source code)';
-            break;
-            case 'zendextsrc' :
-                $release = 'PECL-style Zend extension (source code)';
-            break;
-            case 'extbin' :
-                $release = 'PECL-style PHP extension (binary)';
-            break;
-            case 'zendextbin' :
-                $release = 'PECL-style Zend extension (binary)';
-            break;
-            case 'bundle' :
-                $release = 'Package bundle (collection of packages)';
-            break;
-        }
-        $extends = $obj->getExtends();
-        $extends = $extends ?
-            $obj->getPackage() . ' (extends ' . $extends . ')' : $obj->getPackage();
-        if ($src = $obj->getSourcePackage()) {
-            $extends .= ' (source package ' . $src['channel'] . '/' . $src['package'] . ')';
-        }
-        $info = array(
-            'Release Type' => $release,
-            'Name' => $extends,
-            'Channel' => $obj->getChannel(),
-            'Summary' => preg_replace('/  +/', ' ', $obj->getSummary()),
-            'Description' => preg_replace('/  +/', ' ', $obj->getDescription()),
-            );
-        $info['Maintainers'] = '';
-        foreach (array('lead', 'developer', 'contributor', 'helper') as $role) {
-            $leads = $obj->{"get{$role}s"}();
-            if (!$leads) {
-                continue;
-            }
-            if (isset($leads['active'])) {
-                $leads = array($leads);
-            }
-            foreach ($leads as $lead) {
-                if (!empty($info['Maintainers'])) {
-                    $info['Maintainers'] .= "\n";
-                }
-                $info['Maintainers'] .= $lead['name'] . ' <';
-                $info['Maintainers'] .= $lead['email'] . "> ($role)";
-            }
-        }
-        $info['Release Date'] = $obj->getDate();
-        if ($time = $obj->getTime()) {
-            $info['Release Date'] .= ' ' . $time;
-        }
-        $info['Release Version'] = $obj->getVersion() . ' (' . $obj->getState() . ')';
-        $info['API Version'] = $obj->getVersion('api') . ' (' . $obj->getState('api') . ')';
-        $info['License'] = $obj->getLicense();
-        $uri = $obj->getLicenseLocation();
-        if ($uri) {
-            if (isset($uri['uri'])) {
-                $info['License'] .= ' (' . $uri['uri'] . ')';
-            } else {
-                $extra = $obj->getInstalledLocation($info['filesource']);
-                if ($extra) {
-                    $info['License'] .= ' (' . $uri['filesource'] . ')';
-                }
-            }
-        }
-        $info['Release Notes'] = $obj->getNotes();
-        if ($compat = $obj->getCompatible()) {
-            $info['Compatible with'] = '';
-            foreach ($compat as $package) {
-                $info['Compatible with'] .= $package['channel'] . '/' . $package['package'] .
-                    "\nVersions >= " . $package['min'] . ', <= ' . $package['max'];
-                if (isset($package['exclude'])) {
-                    if (is_array($package['exclude'])) {
-                        $package['exclude'] = implode(', ', $package['exclude']);
-                    }
-                    if (!isset($info['Not Compatible with'])) {
-                        $info['Not Compatible with'] = '';
-                    } else {
-                        $info['Not Compatible with'] .= "\n";
-                    }
-                    $info['Not Compatible with'] .= $package['channel'] . '/' .
-                        $package['package'] . "\nVersions " . $package['exclude'];
-                }
-            }
-        }
-        $usesrole = $obj->getUsesrole();
-        if ($usesrole) {
-            if (!isset($usesrole[0])) {
-                $usesrole = array($usesrole);
-            }
-            foreach ($usesrole as $roledata) {
-                if (isset($info['Uses Custom Roles'])) {
-                    $info['Uses Custom Roles'] .= "\n";
-                } else {
-                    $info['Uses Custom Roles'] = '';
-                }
-                if (isset($roledata['package'])) {
-                    $rolepackage = $reg->parsedPackageNameToString($roledata, true);
-                } else {
-                    $rolepackage = $roledata['uri'];
-                }
-                $info['Uses Custom Roles'] .= $roledata['role'] . ' (' . $rolepackage . ')';
-            }
-        }
-        $usestask = $obj->getUsestask();
-        if ($usestask) {
-            if (!isset($usestask[0])) {
-                $usestask = array($usestask);
-            }
-            foreach ($usestask as $taskdata) {
-                if (isset($info['Uses Custom Tasks'])) {
-                    $info['Uses Custom Tasks'] .= "\n";
-                } else {
-                    $info['Uses Custom Tasks'] = '';
-                }
-                if (isset($taskdata['package'])) {
-                    $taskpackage = $reg->parsedPackageNameToString($taskdata, true);
-                } else {
-                    $taskpackage = $taskdata['uri'];
-                }
-                $info['Uses Custom Tasks'] .= $taskdata['task'] . ' (' . $taskpackage . ')';
-            }
-        }
-        $deps = $obj->getDependencies();
-        $info['Required Dependencies'] = 'PHP version ' . $deps['required']['php']['min'];
-        if (isset($deps['required']['php']['max'])) {
-            $info['Required Dependencies'] .= '-' . $deps['required']['php']['max'] . "\n";
-        } else {
-            $info['Required Dependencies'] .= "\n";
-        }
-        if (isset($deps['required']['php']['exclude'])) {
-            if (!isset($info['Not Compatible with'])) {
-                $info['Not Compatible with'] = '';
-            } else {
-                $info['Not Compatible with'] .= "\n";
-            }
-            if (is_array($deps['required']['php']['exclude'])) {
-                $deps['required']['php']['exclude'] =
-                    implode(', ', $deps['required']['php']['exclude']);
-            }
-            $info['Not Compatible with'] .= "PHP versions\n  " .
-                $deps['required']['php']['exclude'];
-        }
-        $info['Required Dependencies'] .= 'PEAR installer version';
-        if (isset($deps['required']['pearinstaller']['max'])) {
-            $info['Required Dependencies'] .= 's ' .
-                $deps['required']['pearinstaller']['min'] . '-' .
-                $deps['required']['pearinstaller']['max'];
-        } else {
-            $info['Required Dependencies'] .= ' ' .
-                $deps['required']['pearinstaller']['min'] . ' or newer';
-        }
-        if (isset($deps['required']['pearinstaller']['exclude'])) {
-            if (!isset($info['Not Compatible with'])) {
-                $info['Not Compatible with'] = '';
-            } else {
-                $info['Not Compatible with'] .= "\n";
-            }
-            if (is_array($deps['required']['pearinstaller']['exclude'])) {
-                $deps['required']['pearinstaller']['exclude'] =
-                    implode(', ', $deps['required']['pearinstaller']['exclude']);
-            }
-            $info['Not Compatible with'] .= "PEAR installer\n  Versions " .
-                $deps['required']['pearinstaller']['exclude'];
-        }
-        foreach (array('Package', 'Extension') as $type) {
-            $index = strtolower($type);
-            if (isset($deps['required'][$index])) {
-                if (isset($deps['required'][$index]['name'])) {
-                    $deps['required'][$index] = array($deps['required'][$index]);
-                }
-                foreach ($deps['required'][$index] as $package) {
-                    if (isset($package['conflicts'])) {
-                        $infoindex = 'Not Compatible with';
-                        if (!isset($info['Not Compatible with'])) {
-                            $info['Not Compatible with'] = '';
-                        } else {
-                            $info['Not Compatible with'] .= "\n";
-                        }
-                    } else {
-                        $infoindex = 'Required Dependencies';
-                        $info[$infoindex] .= "\n";
-                    }
-                    if ($index == 'extension') {
-                        $name = $package['name'];
-                    } else {
-                        if (isset($package['channel'])) {
-                            $name = $package['channel'] . '/' . $package['name'];
-                        } else {
-                            $name = '__uri/' . $package['name'] . ' (static URI)';
-                        }
-                    }
-                    $info[$infoindex] .= "$type $name";
-                    if (isset($package['uri'])) {
-                        $info[$infoindex] .= "\n  Download URI: $package[uri]";
-                        continue;
-                    }
-                    if (isset($package['max']) && isset($package['min'])) {
-                        $info[$infoindex] .= " \n  Versions " .
-                            $package['min'] . '-' . $package['max'];
-                    } elseif (isset($package['min'])) {
-                        $info[$infoindex] .= " \n  Version " .
-                            $package['min'] . ' or newer';
-                    } elseif (isset($package['max'])) {
-                        $info[$infoindex] .= " \n  Version " .
-                            $package['max'] . ' or older';
-                    }
-                    if (isset($package['recommended'])) {
-                        $info[$infoindex] .= "\n  Recommended version: $package[recommended]";
-                    }
-                    if (isset($package['exclude'])) {
-                        if (!isset($info['Not Compatible with'])) {
-                            $info['Not Compatible with'] = '';
-                        } else {
-                            $info['Not Compatible with'] .= "\n";
-                        }
-                        if (is_array($package['exclude'])) {
-                            $package['exclude'] = implode(', ', $package['exclude']);
-                        }
-                        $package['package'] = $package['name']; // for parsedPackageNameToString
-                         if (isset($package['conflicts'])) {
-                            $info['Not Compatible with'] .= '=> except ';
-                        }
-                       $info['Not Compatible with'] .= 'Package ' .
-                            $reg->parsedPackageNameToString($package, true);
-                        $info['Not Compatible with'] .= "\n  Versions " . $package['exclude'];
-                    }
-                }
-            }
-        }
-        if (isset($deps['required']['os'])) {
-            if (isset($deps['required']['os']['name'])) {
-                $dep['required']['os']['name'] = array($dep['required']['os']['name']);
-            }
-            foreach ($dep['required']['os'] as $os) {
-                if (isset($os['conflicts']) && $os['conflicts'] == 'yes') {
-                    if (!isset($info['Not Compatible with'])) {
-                        $info['Not Compatible with'] = '';
-                    } else {
-                        $info['Not Compatible with'] .= "\n";
-                    }
-                    $info['Not Compatible with'] .= "$os[name] Operating System";
-                } else {
-                    $info['Required Dependencies'] .= "\n";
-                    $info['Required Dependencies'] .= "$os[name] Operating System";
-                }
-            }
-        }
-        if (isset($deps['required']['arch'])) {
-            if (isset($deps['required']['arch']['pattern'])) {
-                $dep['required']['arch']['pattern'] = array($dep['required']['os']['pattern']);
-            }
-            foreach ($dep['required']['arch'] as $os) {
-                if (isset($os['conflicts']) && $os['conflicts'] == 'yes') {
-                    if (!isset($info['Not Compatible with'])) {
-                        $info['Not Compatible with'] = '';
-                    } else {
-                        $info['Not Compatible with'] .= "\n";
-                    }
-                    $info['Not Compatible with'] .= "OS/Arch matching pattern '/$os[pattern]/'";
-                } else {
-                    $info['Required Dependencies'] .= "\n";
-                    $info['Required Dependencies'] .= "OS/Arch matching pattern '/$os[pattern]/'";
-                }
-            }
-        }
-        if (isset($deps['optional'])) {
-            foreach (array('Package', 'Extension') as $type) {
-                $index = strtolower($type);
-                if (isset($deps['optional'][$index])) {
-                    if (isset($deps['optional'][$index]['name'])) {
-                        $deps['optional'][$index] = array($deps['optional'][$index]);
-                    }
-                    foreach ($deps['optional'][$index] as $package) {
-                        if (isset($package['conflicts']) && $package['conflicts'] == 'yes') {
-                            $infoindex = 'Not Compatible with';
-                            if (!isset($info['Not Compatible with'])) {
-                                $info['Not Compatible with'] = '';
-                            } else {
-                                $info['Not Compatible with'] .= "\n";
-                            }
-                        } else {
-                            $infoindex = 'Optional Dependencies';
-                            if (!isset($info['Optional Dependencies'])) {
-                                $info['Optional Dependencies'] = '';
-                            } else {
-                                $info['Optional Dependencies'] .= "\n";
-                            }
-                        }
-                        if ($index == 'extension') {
-                            $name = $package['name'];
-                        } else {
-                            if (isset($package['channel'])) {
-                                $name = $package['channel'] . '/' . $package['name'];
-                            } else {
-                                $name = '__uri/' . $package['name'] . ' (static URI)';
-                            }
-                        }
-                        $info[$infoindex] .= "$type $name";
-                        if (isset($package['uri'])) {
-                            $info[$infoindex] .= "\n  Download URI: $package[uri]";
-                            continue;
-                        }
-                        if ($infoindex == 'Not Compatible with') {
-                            // conflicts is only used to say that all versions conflict
-                            continue;
-                        }
-                        if (isset($package['max']) && isset($package['min'])) {
-                            $info[$infoindex] .= " \n  Versions " .
-                                $package['min'] . '-' . $package['max'];
-                        } elseif (isset($package['min'])) {
-                            $info[$infoindex] .= " \n  Version " .
-                                $package['min'] . ' or newer';
-                        } elseif (isset($package['max'])) {
-                            $info[$infoindex] .= " \n  Version " .
-                                $package['min'] . ' or older';
-                        }
-                        if (isset($package['recommended'])) {
-                            $info[$infoindex] .= "\n  Recommended version: $package[recommended]";
-                        }
-                        if (isset($package['exclude'])) {
-                            if (!isset($info['Not Compatible with'])) {
-                                $info['Not Compatible with'] = '';
-                            } else {
-                                $info['Not Compatible with'] .= "\n";
-                            }
-                            if (is_array($package['exclude'])) {
-                                $package['exclude'] = implode(', ', $package['exclude']);
-                            }
-                            $info['Not Compatible with'] .= "Package $package\n  Versions " .
-                                $package['exclude'];
-                        }
-                    }
-                }
-            }
-        }
-        if (isset($deps['group'])) {
-            if (!isset($deps['group'][0])) {
-                $deps['group'] = array($deps['group']);
-            }
-            foreach ($deps['group'] as $group) {
-                $info['Dependency Group ' . $group['attribs']['name']] = $group['attribs']['hint'];
-                $groupindex = $group['attribs']['name'] . ' Contents';
-                $info[$groupindex] = '';
-                foreach (array('Package', 'Extension') as $type) {
-                    $index = strtolower($type);
-                    if (isset($group[$index])) {
-                        if (isset($group[$index]['name'])) {
-                            $group[$index] = array($group[$index]);
-                        }
-                        foreach ($group[$index] as $package) {
-                            if (!empty($info[$groupindex])) {
-                                $info[$groupindex] .= "\n";
-                            }
-                            if ($index == 'extension') {
-                                $name = $package['name'];
-                            } else {
-                                if (isset($package['channel'])) {
-                                    $name = $package['channel'] . '/' . $package['name'];
-                                } else {
-                                    $name = '__uri/' . $package['name'] . ' (static URI)';
-                                }
-                            }
-                            if (isset($package['uri'])) {
-                                if (isset($package['conflicts']) && $package['conflicts'] == 'yes') {
-                                    $info[$groupindex] .= "Not Compatible with $type $name";
-                                } else {
-                                    $info[$groupindex] .= "$type $name";
-                                }
-                                $info[$groupindex] .= "\n  Download URI: $package[uri]";
-                                continue;
-                            }
-                            if (isset($package['conflicts']) && $package['conflicts'] == 'yes') {
-                                $info[$groupindex] .= "Not Compatible with $type $name";
-                                continue;
-                            }
-                            $info[$groupindex] .= "$type $name";
-                            if (isset($package['max']) && isset($package['min'])) {
-                                $info[$groupindex] .= " \n  Versions " .
-                                    $package['min'] . '-' . $package['max'];
-                            } elseif (isset($package['min'])) {
-                                $info[$groupindex] .= " \n  Version " .
-                                    $package['min'] . ' or newer';
-                            } elseif (isset($package['max'])) {
-                                $info[$groupindex] .= " \n  Version " .
-                                    $package['min'] . ' or older';
-                            }
-                            if (isset($package['recommended'])) {
-                                $info[$groupindex] .= "\n  Recommended version: $package[recommended]";
-                            }
-                            if (isset($package['exclude'])) {
-                                if (!isset($info['Not Compatible with'])) {
-                                    $info['Not Compatible with'] = '';
-                                } else {
-                                    $info[$groupindex] .= "Not Compatible with\n";
-                                }
-                                if (is_array($package['exclude'])) {
-                                    $package['exclude'] = implode(', ', $package['exclude']);
-                                }
-                                $info[$groupindex] .= "  Package $package\n  Versions " .
-                                    $package['exclude'];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        if ($obj->getPackageType() == 'bundle') {
-            $info['Bundled Packages'] = '';
-            foreach ($obj->getBundledPackages() as $package) {
-                if (!empty($info['Bundled Packages'])) {
-                    $info['Bundled Packages'] .= "\n";
-                }
-                if (isset($package['uri'])) {
-                    $info['Bundled Packages'] .= '__uri/' . $package['name'];
-                    $info['Bundled Packages'] .= "\n  (URI: $package[uri]";
-                } else {
-                    $info['Bundled Packages'] .= $package['channel'] . '/' . $package['name'];
-                }
-            }
-        }
-        $info['package.xml version'] = '2.0';
-        if ($installed) {
-            if ($obj->getLastModified()) {
-                $info['Last Modified'] = date('Y-m-d H:i', $obj->getLastModified());
-            }
-            $v = $obj->getLastInstalledVersion();
-            $info['Previous Installed Version'] = $v ? $v : '- None -';
-        }
-        foreach ($info as $key => $value) {
-            $data['data'][] = array($key, $value);
-        }
-        $data['raw'] = $obj->getArray(); // no validation needed
-
-        $this->ui->outputData($data, 'package-info');
-    }
-}
-
-?>
diff --git a/PEAR/Command/Registry.xml b/PEAR/Command/Registry.xml
deleted file mode 100644
index b231372..0000000
--- a/PEAR/Command/Registry.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
- 
-  List Installed Packages In The Default Channel
-  doList
-  l
-  
-   
-    c
-    list installed packages from this channel
-    CHAN
-   
-   
-    a
-    list installed packages from all channels
-   
-  
-  <package>
-If invoked without parameters, this command lists the PEAR packages
-installed in your php_dir ({config php_dir}).  With a parameter, it
-lists the files in a package.
-
- 
- 
-  List Files In Installed Package
-  doFileList
-  fl
-  
-  <package>
-List the files in an installed package.
-
- 
- 
-  Shell Script Test
-  doShellTest
-  st
-  
-  <package> [[relation] version]
-Tests if a package is installed in the system. Will exit(1) if it is not.
-   <relation>   The version comparison operator. One of:
-                <, lt, <=, le, >, gt, >=, ge, ==, =, eq, !=, <>, ne
-   <version>    The version to compare with
-
- 
- 
-  Display information about a package
-  doInfo
-  in
-  
-  <package>
-Displays information about a package. The package argument may be a
-local package file, an URL to a package file, or the name of an
-installed package.
- 
-
\ No newline at end of file
diff --git a/PEAR/Command/Remote.php b/PEAR/Command/Remote.php
deleted file mode 100644
index d03e83b..0000000
--- a/PEAR/Command/Remote.php
+++ /dev/null
@@ -1,683 +0,0 @@
-
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Remote.php,v 1.96 2006/09/24 03:08:57 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-require_once 'PEAR/REST.php';
-
-/**
- * PEAR commands for remote server querying
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command_Remote extends PEAR_Command_Common
-{
-    // {{{ command definitions
-
-    var $commands = array(
-        'remote-info' => array(
-            'summary' => 'Information About Remote Packages',
-            'function' => 'doRemoteInfo',
-            'shortcut' => 'ri',
-            'options' => array(),
-            'doc' => '
-Get details on a package from the server.',
-            ),
-        'list-upgrades' => array(
-            'summary' => 'List Available Upgrades',
-            'function' => 'doListUpgrades',
-            'shortcut' => 'lu',
-            'options' => array(),
-            'doc' => '[preferred_state]
-List releases on the server of packages you have installed where
-a newer version is available with the same release state (stable etc.)
-or the state passed as the second parameter.'
-            ),
-        'remote-list' => array(
-            'summary' => 'List Remote Packages',
-            'function' => 'doRemoteList',
-            'shortcut' => 'rl',
-            'options' => array(
-                'channel' =>
-                    array(
-                    'shortopt' => 'c',
-                    'doc' => 'specify a channel other than the default channel',
-                    'arg' => 'CHAN',
-                    )
-                ),
-            'doc' => '
-Lists the packages available on the configured server along with the
-latest stable release of each package.',
-            ),
-        'search' => array(
-            'summary' => 'Search remote package database',
-            'function' => 'doSearch',
-            'shortcut' => 'sp',
-            'options' => array(
-                'channel' =>
-                    array(
-                    'shortopt' => 'c',
-                    'doc' => 'specify a channel other than the default channel',
-                    'arg' => 'CHAN',
-                    )
-                ),
-            'doc' => '[packagename] [packageinfo]
-Lists all packages which match the search parameters.  The first
-parameter is a fragment of a packagename.  The default channel
-will be used unless explicitly overridden.  The second parameter
-will be used to match any portion of the summary/description',
-            ),
-        'list-all' => array(
-            'summary' => 'List All Packages',
-            'function' => 'doListAll',
-            'shortcut' => 'la',
-            'options' => array(
-                'channel' =>
-                    array(
-                    'shortopt' => 'c',
-                    'doc' => 'specify a channel other than the default channel',
-                    'arg' => 'CHAN',
-                    )
-                ),
-            'doc' => '
-Lists the packages available on the configured server along with the
-latest stable release of each package.',
-            ),
-        'download' => array(
-            'summary' => 'Download Package',
-            'function' => 'doDownload',
-            'shortcut' => 'd',
-            'options' => array(
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'download an uncompressed (.tar) file',
-                    ),
-                ),
-            'doc' => '...
-Download package tarballs.  The files will be named as suggested by the
-server, for example if you download the DB package and the latest stable
-version of DB is 1.6.5, the downloaded file will be DB-1.6.5.tgz.',
-            ),
-        'clear-cache' => array(
-            'summary' => 'Clear Web Services Cache',
-            'function' => 'doClearCache',
-            'shortcut' => 'cc',
-            'options' => array(),
-            'doc' => '
-Clear the XML-RPC/REST cache.  See also the cache_ttl configuration
-parameter.
-',
-            ),
-        );
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Remote constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Remote(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    function _checkChannelForStatus($channel, $chan)
-    {
-        if (PEAR::isError($chan)) {
-            $this->raiseError($chan);
-        }
-        if (!is_a($chan, 'PEAR_ChannelFile')) {
-            return $this->raiseError('Internal corruption error: invalid channel "' .
-                $channel . '"');
-        }
-        $rest = new PEAR_REST($this->config);
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $a = $rest->downloadHttp('http://' . $channel .
-            '/channel.xml', $chan->lastModified());
-        PEAR::staticPopErrorHandling();
-        if (!PEAR::isError($a) && $a) {
-            $this->ui->outputData('WARNING: channel "' . $channel . '" has ' .
-                'updated its protocols, use "channel-update ' . $channel .
-                '" to update');
-        }
-    }
-
-    // {{{ doRemoteInfo()
-
-    function doRemoteInfo($command, $options, $params)
-    {
-        if (sizeof($params) != 1) {
-            return $this->raiseError("$command expects one param: the remote package name");
-        }
-        $savechannel = $channel = $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        $package = $params[0];
-        $parsed = $reg->parsePackageName($package, $channel);
-        if (PEAR::isError($parsed)) {
-            return $this->raiseError('Invalid package name "' . $package . '"');
-        }
-        
-        $channel = $parsed['channel'];
-        $this->config->set('default_channel', $channel);
-        $chan = $reg->getChannel($channel);
-        if (PEAR::isError($e = $this->_checkChannelForStatus($channel, $chan))) {
-            return $e;
-        }
-        if ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) {
-            $rest = &$this->config->getREST('1.0', array());
-            $info = $rest->packageInfo($base, $parsed['package']);
-        } else {
-            $r = &$this->config->getRemote();
-            $info = $r->call('package.info', $parsed['package']);
-        }
-        if (PEAR::isError($info)) {
-            $this->config->set('default_channel', $savechannel);
-            return $this->raiseError($info);
-        }
-        if (!isset($info['name'])) {
-            return $this->raiseError('No remote package "' . $package . '" was found');
-        }
-
-        $installed = $reg->packageInfo($info['name'], null, $channel);
-        $info['installed'] = $installed['version'] ? $installed['version'] : '- no -';
-        if (is_array($info['installed'])) {
-            $info['installed'] = $info['installed']['release'];
-        }
-
-        $this->ui->outputData($info, $command);
-        $this->config->set('default_channel', $savechannel);
-
-        return true;
-    }
-
-    // }}}
-    // {{{ doRemoteList()
-
-    function doRemoteList($command, $options, $params)
-    {
-        $savechannel = $channel = $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        if (isset($options['channel'])) {
-            $channel = $options['channel'];
-            if ($reg->channelExists($channel)) {
-                $this->config->set('default_channel', $channel);
-            } else {
-                return $this->raiseError('Channel "' . $channel . '" does not exist');
-            }
-        }
-        $chan = $reg->getChannel($channel);
-        if (PEAR::isError($e = $this->_checkChannelForStatus($channel, $chan))) {
-            return $e;
-        }
-        $list_options = false;
-        if ($this->config->get('preferred_state') == 'stable') {
-            $list_options = true;
-        }
-        if ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.1', $this->config->get('preferred_mirror'))) {
-            // use faster list-all if available
-            $rest = &$this->config->getREST('1.1', array());
-            $available = $rest->listAll($base, $list_options);
-        } elseif ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) {
-            $rest = &$this->config->getREST('1.0', array());
-            $available = $rest->listAll($base, $list_options);
-        } else {
-            $r = &$this->config->getRemote();
-            if ($channel == 'pear.php.net') {
-                // hack because of poor pearweb design
-                $available = $r->call('package.listAll', true, $list_options, false);
-            } else {
-                $available = $r->call('package.listAll', true, $list_options);
-            }
-        }
-        if (PEAR::isError($available)) {
-            $this->config->set('default_channel', $savechannel);
-            return $this->raiseError($available);
-        }
-        $i = $j = 0;
-        $data = array(
-            'caption' => 'Channel ' . $channel . ' Available packages:',
-            'border' => true,
-            'headline' => array('Package', 'Version'),
-            );
-        if (count($available)==0) {
-            $data = '(no packages available yet)';
-        } else {
-            foreach ($available as $name => $info) {
-                $data['data'][] = array($name, (isset($info['stable']) && $info['stable'])
-                    ? $info['stable'] : '-n/a-');
-            }
-        }
-        $this->ui->outputData($data, $command);
-        $this->config->set('default_channel', $savechannel);
-        return true;
-    }
-
-    // }}}
-    // {{{ doListAll()
-
-    function doListAll($command, $options, $params)
-    {
-        $savechannel = $channel = $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        if (isset($options['channel'])) {
-            $channel = $options['channel'];
-            if ($reg->channelExists($channel)) {
-                $this->config->set('default_channel', $channel);
-            } else {
-                return $this->raiseError("Channel \"$channel\" does not exist");
-            }
-        }
-        $list_options = false;
-        if ($this->config->get('preferred_state') == 'stable') {
-            $list_options = true;
-        }
-        $chan = $reg->getChannel($channel);
-        if (PEAR::isError($e = $this->_checkChannelForStatus($channel, $chan))) {
-            return $e;
-        }
-        if ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.1', $this->config->get('preferred_mirror'))) {
-            // use faster list-all if available
-            $rest = &$this->config->getREST('1.1', array());
-            $available = $rest->listAll($base, $list_options, false);
-        } elseif ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) {
-            $rest = &$this->config->getREST('1.0', array());
-            $available = $rest->listAll($base, $list_options, false);
-        } else {
-            $r = &$this->config->getRemote();
-            if ($channel == 'pear.php.net') {
-                // hack because of poor pearweb design
-                $available = $r->call('package.listAll', true, $list_options, false);
-            } else {
-                $available = $r->call('package.listAll', true, $list_options);
-            }
-        }
-        if (PEAR::isError($available)) {
-            $this->config->set('default_channel', $savechannel);
-            return $this->raiseError('The package list could not be fetched from the remote server. Please try again. (Debug info: "' . $available->getMessage() . '")');
-        }
-        $data = array(
-            'caption' => 'All packages:',
-            'border' => true,
-            'headline' => array('Package', 'Latest', 'Local'),
-            );
-        $local_pkgs = $reg->listPackages($channel);
-
-        foreach ($available as $name => $info) {
-            $installed = $reg->packageInfo($name, null, $channel);
-            if (is_array($installed['version'])) {
-                $installed['version'] = $installed['version']['release'];
-            }
-            $desc = $info['summary'];
-            if (isset($params[$name])) {
-                $desc .= "\n\n".$info['description'];
-            }
-            if (isset($options['mode']))
-            {
-                if ($options['mode'] == 'installed' && !isset($installed['version'])) {
-                    continue;
-                }
-                if ($options['mode'] == 'notinstalled' && isset($installed['version'])) {
-                    continue;
-                }
-                if ($options['mode'] == 'upgrades'
-                      && (!isset($installed['version']) || version_compare($installed['version'],
-                      $info['stable'], '>='))) {
-                    continue;
-                }
-            }
-            $pos = array_search(strtolower($name), $local_pkgs);
-            if ($pos !== false) {
-                unset($local_pkgs[$pos]);
-            }
-
-            if (isset($info['stable']) && !$info['stable']) {
-                $info['stable'] = null;
-            }
-            $data['data'][$info['category']][] = array(
-                $reg->channelAlias($channel) . '/' . $name,
-                isset($info['stable']) ? $info['stable'] : null,
-                isset($installed['version']) ? $installed['version'] : null,
-                isset($desc) ? $desc : null,
-                isset($info['deps']) ? $info['deps'] : null,
-                );
-        }
-
-        if (isset($options['mode']) && in_array($options['mode'], array('notinstalled', 'upgrades'))) {
-            $this->config->set('default_channel', $savechannel);
-            $this->ui->outputData($data, $command);
-            return true;
-        }
-        foreach ($local_pkgs as $name) {
-            $info = &$reg->getPackage($name, $channel);
-            $data['data']['Local'][] = array(
-                $reg->channelAlias($channel) . '/' . $info->getPackage(),
-                '',
-                $info->getVersion(),
-                $info->getSummary(),
-                $info->getDeps()
-                );
-        }
-
-        $this->config->set('default_channel', $savechannel);
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-
-    // }}}
-    // {{{ doSearch()
-
-    function doSearch($command, $options, $params)
-    {
-        if ((!isset($params[0]) || empty($params[0]))
-            && (!isset($params[1]) || empty($params[1])))
-        {
-            return $this->raiseError('no valid search string supplied');
-        };
-
-        $savechannel = $channel = $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        $package = $params[0];
-        $summary = isset($params[1]) ? $params[1] : false;
-        if (isset($options['channel'])) {
-            $reg = &$this->config->getRegistry();
-            $channel = $options['channel'];
-            if ($reg->channelExists($channel)) {
-                $this->config->set('default_channel', $channel);
-            } else {
-                return $this->raiseError('Channel "' . $channel . '" does not exist');
-            }
-        }
-        $chan = $reg->getChannel($channel);
-        if (PEAR::isError($e = $this->_checkChannelForStatus($channel, $chan))) {
-            return $e;
-        }
-        if ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) {
-            $rest = &$this->config->getREST('1.0', array());
-            $available = $rest->listAll($base, false, false, $package, $summary);
-        } else {
-            $r = &$this->config->getRemote();
-            $available = $r->call('package.search', $package, $summary, true, 
-                $this->config->get('preferred_state') == 'stable', true);
-        }
-        if (PEAR::isError($available)) {
-            $this->config->set('default_channel', $savechannel);
-            return $this->raiseError($available);
-        }
-        if (!$available) {
-            return $this->raiseError('no packages found that match pattern "' . $package . '"');
-        }
-        $data = array(
-            'caption' => 'Matched packages, channel ' . $channel . ':',
-            'border' => true,
-            'headline' => array('Package', 'Stable/(Latest)', 'Local'),
-            );
-
-        foreach ($available as $name => $info) {
-            $installed = $reg->packageInfo($name, null, $channel);
-            $desc = $info['summary'];
-            if (isset($params[$name]))
-                $desc .= "\n\n".$info['description'];
-
-            $unstable = '';
-            if ($info['unstable']) {
-                $unstable = '/(' . $info['unstable'] . ' ' . $info['state'] . ')';
-            }
-            if (!isset($info['stable']) || !$info['stable']) {
-                $info['stable'] = 'none';
-            }
-            $version = is_array($installed['version']) ? $installed['version']['release'] :
-                $installed['version'];
-            $data['data'][$info['category']][] = array(
-                $name,
-                $info['stable'] . $unstable,
-                $version,
-                $desc,
-                );
-        }
-        $this->ui->outputData($data, $command);
-        $this->config->set('default_channel', $channel);
-        return true;
-    }
-
-    // }}}
-    function &getDownloader($options)
-    {
-        if (!class_exists('PEAR_Downloader')) {
-            require_once 'PEAR/Downloader.php';
-        }
-        $a = &new PEAR_Downloader($this->ui, $options, $this->config);
-        return $a;
-    }
-    // {{{ doDownload()
-
-    function doDownload($command, $options, $params)
-    {
-        // make certain that dependencies are ignored
-        $options['downloadonly'] = 1;
-
-        // eliminate error messages for preferred_state-related errors
-        /* TODO: Should be an option, but until now download does respect
-           prefered state */
-        /* $options['ignorepreferred_state'] = 1; */
-        // eliminate error messages for preferred_state-related errors
-
-        $downloader = &$this->getDownloader($options);
-        $downloader->setDownloadDir(getcwd());
-        $errors = array();
-        $downloaded = array();
-        $err = $downloader->download($params);
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-        $errors = $downloader->getErrorMsgs();
-        if (count($errors)) {
-            foreach ($errors as $error) {
-                $this->ui->outputData($error);
-            }
-            return $this->raiseError("$command failed");
-        }
-        $downloaded = $downloader->getDownloadedPackages();
-        foreach ($downloaded as $pkg) {
-            $this->ui->outputData("File $pkg[file] downloaded", $command);
-        }
-        return true;
-    }
-
-    function downloadCallback($msg, $params = null)
-    {
-        if ($msg == 'done') {
-            $this->bytes_downloaded = $params;
-        }
-    }
-
-    // }}}
-    // {{{ doListUpgrades()
-
-    function doListUpgrades($command, $options, $params)
-    {
-        require_once 'PEAR/Common.php';
-        if (isset($params[0]) && !is_array(PEAR_Common::betterStates($params[0]))) {
-            return $this->raiseError($params[0] . ' is not a valid state (stable/beta/alpha/devel/etc.) try "pear help list-upgrades"');
-        }
-        $savechannel = $channel = $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        foreach ($reg->listChannels() as $channel) {
-            $inst = array_flip($reg->listPackages($channel));
-            if (!count($inst)) {
-                continue;
-            }
-            if ($channel == '__uri') {
-                continue;
-            }
-            $this->config->set('default_channel', $channel);
-            if (empty($params[0])) {
-                $state = $this->config->get('preferred_state');
-            } else {
-                $state = $params[0];
-            }
-            $caption = $channel . ' Available Upgrades';
-            $chan = $reg->getChannel($channel);
-            if (PEAR::isError($e = $this->_checkChannelForStatus($channel, $chan))) {
-                return $e;
-            }
-            if ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-                  $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) {
-                $rest = &$this->config->getREST('1.0', array());
-                if (empty($state) || $state == 'any') {
-                    $state = false;
-                } else {
-                    $caption .= ' (' . implode(', ', PEAR_Common::betterStates($state, true)) . ')';
-                }
-                PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                $latest = $rest->listLatestUpgrades($base, $state, $inst, $channel, $reg);
-                PEAR::staticPopErrorHandling();
-            } else {
-                $remote = &$this->config->getRemote();
-                $remote->pushErrorHandling(PEAR_ERROR_RETURN);
-                if (empty($state) || $state == 'any') {
-                    $latest = $remote->call("package.listLatestReleases");
-                } else {
-                    $latest = $remote->call("package.listLatestReleases", $state);
-                    $caption .= ' (' . implode(', ', PEAR_Common::betterStates($state, true)) . ')';
-                }
-                $remote->popErrorHandling();
-            }
-            if (PEAR::isError($latest)) {
-                $this->ui->outputData($latest->getMessage());
-                continue;
-            }
-            $caption .= ':';
-            if (PEAR::isError($latest)) {
-                $this->config->set('default_channel', $savechannel);
-                return $latest;
-            }
-            $data = array(
-                'caption' => $caption,
-                'border' => 1,
-                'headline' => array('Channel', 'Package', 'Local', 'Remote', 'Size'),
-                );
-            foreach ((array)$latest as $pkg => $info) {
-                $package = strtolower($pkg);
-                if (!isset($inst[$package])) {
-                    // skip packages we don't have installed
-                    continue;
-                }
-                extract($info);
-                $inst_version = $reg->packageInfo($package, 'version', $channel);
-                $inst_state   = $reg->packageInfo($package, 'release_state', $channel);
-                if (version_compare("$version", "$inst_version", "le")) {
-                    // installed version is up-to-date
-                    continue;
-                }
-                if ($filesize >= 20480) {
-                    $filesize += 1024 - ($filesize % 1024);
-                    $fs = sprintf("%dkB", $filesize / 1024);
-                } elseif ($filesize > 0) {
-                    $filesize += 103 - ($filesize % 103);
-                    $fs = sprintf("%.1fkB", $filesize / 1024.0);
-                } else {
-                    $fs = "  -"; // XXX center instead
-                }
-                $data['data'][] = array($channel, $pkg, "$inst_version ($inst_state)", "$version ($state)", $fs);
-            }
-            if (empty($data['data'])) {
-                $this->ui->outputData('Channel ' . $channel . ': No upgrades available');
-            } else {
-                $this->ui->outputData($data, $command);
-            }
-        }
-        $this->config->set('default_channel', $savechannel);
-        return true;
-    }
-
-    // }}}
-    // {{{ doClearCache()
-
-    function doClearCache($command, $options, $params)
-    {
-        $cache_dir = $this->config->get('cache_dir');
-        $verbose = $this->config->get('verbose');
-        $output = '';
-        if (!file_exists($cache_dir) || !is_dir($cache_dir)) {
-            return $this->raiseError("$cache_dir does not exist or is not a directory");
-        }
-        if (!($dp = @opendir($cache_dir))) {
-            return $this->raiseError("opendir($cache_dir) failed: $php_errormsg");
-        }
-        if ($verbose >= 1) {
-            $output .= "reading directory $cache_dir\n";
-        }
-        $num = 0;
-        while ($ent = readdir($dp)) {
-            if (preg_match('/^xmlrpc_cache_[a-z0-9]{32}$/', $ent) ||
-                  preg_match('/rest.cache(file|id)$/', $ent)) {
-                $path = $cache_dir . DIRECTORY_SEPARATOR . $ent;
-                if (file_exists($path)) {
-                    $ok = @unlink($path);
-                } else {
-                    $ok = false;
-                    $php_errormsg = '';
-                }
-                if ($ok) {
-                    if ($verbose >= 2) {
-                        $output .= "deleted $path\n";
-                    }
-                    $num++;
-                } elseif ($verbose >= 1) {
-                    $output .= "failed to delete $path $php_errormsg\n";
-                }
-            }
-        }
-        closedir($dp);
-        if ($verbose >= 1) {
-            $output .= "$num cache entries cleared\n";
-        }
-        $this->ui->outputData(rtrim($output), $command);
-        return $num;
-    }
-
-    // }}}
-}
-
-?>
diff --git a/PEAR/Command/Remote.xml b/PEAR/Command/Remote.xml
deleted file mode 100644
index ce8b7e4..0000000
--- a/PEAR/Command/Remote.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
- 
-  Information About Remote Packages
-  doRemoteInfo
-  ri
-  
-  <package>
-Get details on a package from the server.
- 
- 
-  List Available Upgrades
-  doListUpgrades
-  lu
-  
-  [preferred_state]
-List releases on the server of packages you have installed where
-a newer version is available with the same release state (stable etc.)
-or the state passed as the second parameter.
- 
- 
-  List Remote Packages
-  doRemoteList
-  rl
-  
-   
-    c
-    specify a channel other than the default channel
-    CHAN
-   
-  
-  
-Lists the packages available on the configured server along with the
-latest stable release of each package.
- 
- 
-  Search remote package database
-  doSearch
-  sp
-  
-   
-    c
-    specify a channel other than the default channel
-    CHAN
-   
-  
-  [packagename] [packageinfo]
-Lists all packages which match the search parameters.  The first
-parameter is a fragment of a packagename.  The default channel
-will be used unless explicitly overridden.  The second parameter
-will be used to match any portion of the summary/description
- 
- 
-  List All Packages
-  doListAll
-  la
-  
-   
-    c
-    specify a channel other than the default channel
-    CHAN
-   
-  
-  
-Lists the packages available on the configured server along with the
-latest stable release of each package.
- 
- 
-  Download Package
-  doDownload
-  d
-  
-   
-    Z
-    download an uncompressed (.tar) file
-   
-  
-  <package>...
-Download package tarballs.  The files will be named as suggested by the
-server, for example if you download the DB package and the latest stable
-version of DB is 1.6.5, the downloaded file will be DB-1.6.5.tgz.
- 
- 
-  Clear Web Services Cache
-  doClearCache
-  cc
-  
-  
-Clear the XML-RPC/REST cache.  See also the cache_ttl configuration
-parameter.
-
- 
-
\ No newline at end of file
diff --git a/PEAR/Command/Test.php b/PEAR/Command/Test.php
deleted file mode 100644
index 81a3b29..0000000
--- a/PEAR/Command/Test.php
+++ /dev/null
@@ -1,303 +0,0 @@
-
- * @author     Martin Jansen 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Test.php,v 1.12 2006/03/28 05:33:42 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for login/logout
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Martin Jansen 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-
-class PEAR_Command_Test extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'run-tests' => array(
-            'summary' => 'Run Regression Tests',
-            'function' => 'doRunTests',
-            'shortcut' => 'rt',
-            'options' => array(
-                'recur' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'Run tests in child directories, recursively.  4 dirs deep maximum',
-                ),
-                'ini' => array(
-                    'shortopt' => 'i',
-                    'doc' => 'actual string of settings to pass to php in format " -d setting=blah"',
-                    'arg' => 'SETTINGS'
-                ),
-                'realtimelog' => array(
-                    'shortopt' => 'l',
-                    'doc' => 'Log test runs/results as they are run',
-                ),
-                'quiet' => array(
-                    'shortopt' => 'q',
-                    'doc' => 'Only display detail for failed tests',
-                ),
-                'simple' => array(
-                    'shortopt' => 's',
-                    'doc' => 'Display simple output for all tests',
-                ),
-                'package' => array(
-                    'shortopt' => 'p',
-                    'doc' => 'Treat parameters as installed packages from which to run tests',
-                ),
-                'phpunit' => array(
-                    'shortopt' => 'u',
-                    'doc' => 'Search parameters for AllTests.php, and use that to run phpunit-based tests',
-                ),
-                'tapoutput' => array(
-                    'shortopt' => 't',
-                    'doc' => 'Output run-tests.log in TAP-compliant format',
-                ),
-            ),
-            'doc' => '[testfile|dir ...]
-Run regression tests with PHP\'s regression testing script (run-tests.php).',
-            ),
-        );
-
-    var $output;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Test constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Test(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-    // {{{ doRunTests()
-
-    function doRunTests($command, $options, $params)
-    {
-        if (isset($options['phpunit']) && isset($options['tapoutput'])) {
-            return $this->raiseError('ERROR: cannot use both --phpunit and --tapoutput at the same time');
-        }
-        require_once 'PEAR/Common.php';
-        require_once 'PEAR/RunTest.php';
-        require_once 'System.php';
-        $log = new PEAR_Common;
-        $log->ui = &$this->ui; // slightly hacky, but it will work
-        $run = new PEAR_RunTest($log, $options);
-        $tests = array();
-        if (isset($options['recur'])) {
-            $depth = 4;
-        } else {
-            $depth = 1;
-        }
-        if (!count($params)) {
-            $params[] = '.';
-        }
-        if (isset($options['package'])) {
-            $oldparams = $params;
-            $params = array();
-            $reg = &$this->config->getRegistry();
-            foreach ($oldparams as $param) {
-                $pname = $reg->parsePackageName($param, $this->config->get('default_channel'));
-                if (PEAR::isError($pname)) {
-                    return $this->raiseError($pname);
-                }
-                $package = &$reg->getPackage($pname['package'], $pname['channel']);
-                if (!$package) {
-                    return PEAR::raiseError('Unknown package "' .
-                        $reg->parsedPackageNameToString($pname) . '"');
-                }
-                $filelist = $package->getFilelist();
-                foreach ($filelist as $name => $atts) {
-                    if (isset($atts['role']) && $atts['role'] != 'test') {
-                        continue;
-                    }
-                    if (isset($options['phpunit'])) {
-                        if (!preg_match('/AllTests\.php$/i', $name)) {
-                            continue;
-                        }
-                    } else {
-                        if (!preg_match('/\.phpt$/', $name)) {
-                            continue;
-                        }
-                    }
-                    $params[] = $atts['installed_as'];
-                }
-            }
-        }
-        foreach ($params as $p) {
-            if (is_dir($p)) {
-                if (isset($options['phpunit'])) {
-                    $dir = System::find(array($p, '-type', 'f',
-                                                '-maxdepth', $depth,
-                                                '-name', 'AllTests.php'));
-                } else {
-                    $dir = System::find(array($p, '-type', 'f',
-                                                '-maxdepth', $depth,
-                                                '-name', '*.phpt'));
-                }
-                $tests = array_merge($tests, $dir);
-            } else {
-                if (isset($options['phpunit'])) {
-                    if (!preg_match('/AllTests\.php$/i', $p)) {
-                        continue;
-                    }
-                    $tests[] = $p;
-                } else {
-                    if (!file_exists($p)) {
-                        if (!preg_match('/\.phpt$/', $p)) {
-                            $p .= '.phpt';
-                        }
-                        $dir = System::find(array(dirname($p), '-type', 'f',
-                                                    '-maxdepth', $depth,
-                                                    '-name', $p));
-                        $tests = array_merge($tests, $dir);
-                    } else {
-                        $tests[] = $p;
-                    }
-                }
-            }
-        }
-        $ini_settings = '';
-        if (isset($options['ini'])) {
-            $ini_settings .= $options['ini'];
-        }
-        if (isset($_ENV['TEST_PHP_INCLUDE_PATH'])) {
-            $ini_settings .= " -d include_path={$_ENV['TEST_PHP_INCLUDE_PATH']}";
-        }
-        if ($ini_settings) {
-            $this->ui->outputData('Using INI settings: "' . $ini_settings . '"');
-        }
-        $skipped = $passed = $failed = array();
-        $this->ui->outputData('Running ' . count($tests) . ' tests', $command);
-        $start = time();
-        if (isset($options['realtimelog'])) {
-            if (file_exists('run-tests.log')) {
-                unlink('run-tests.log');
-            }
-        }
-        if (isset($options['tapoutput'])) {
-            $tap = '1..' . count($tests) . "\n";
-        }
-        $i = 1;
-        foreach ($tests as $t) {
-            if (isset($options['realtimelog'])) {
-                $fp = @fopen('run-tests.log', 'a');
-                if ($fp) {
-                    fwrite($fp, "Running test $t...");
-                    fclose($fp);
-                }
-            }
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $run->run($t, $ini_settings);
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($result)) {
-                $this->ui->log(0, $result->getMessage());
-                continue;
-            }
-            if (isset($options['tapoutput'])) {
-                $tap .= $result[0] . ' ' . $i . $result[1] . "\n";
-                $i++;
-                continue;
-            }
-            if (isset($options['realtimelog'])) {
-                $fp = @fopen('run-tests.log', 'a');
-                if ($fp) {
-                    fwrite($fp, "$result\n");
-                    fclose($fp);
-                }
-            }
-            if ($result == 'FAILED') {
-            	$failed[] = $t;
-            }
-            if ($result == 'PASSED') {
-            	$passed[] = $t;
-            }
-            if ($result == 'SKIPPED') {
-            	$skipped[] = $t;
-            }
-        }
-        $total = date('i:s', time() - $start);
-        if (isset($options['tapoutput'])) {
-            $fp = @fopen('run-tests.log', 'w');
-            if ($fp) {
-                fwrite($fp, $tap, strlen($tap));
-                fclose($fp);
-                $this->ui->outputData('wrote TAP-format log to "' .realpath('run-tests.log') .
-                    '"', $command);
-            }
-        } else {
-            if (count($failed)) {
-                $output = "TOTAL TIME: $total\n";
-                $output .= count($passed) . " PASSED TESTS\n";
-                $output .= count($skipped) . " SKIPPED TESTS\n";
-        		$output .= count($failed) . " FAILED TESTS:\n";
-            	foreach ($failed as $failure) {
-            		$output .= $failure . "\n";
-            	}
-                if (isset($options['realtimelog'])) {
-                    $fp = @fopen('run-tests.log', 'a');
-                } else {
-                    $fp = @fopen('run-tests.log', 'w');
-                }
-                if ($fp) {
-                    fwrite($fp, $output, strlen($output));
-                    fclose($fp);
-                    $this->ui->outputData('wrote log to "' . realpath('run-tests.log') . '"', $command);
-                }
-            } elseif (file_exists('run-tests.log') && !is_dir('run-tests.log')) {
-                @unlink('run-tests.log');
-            }
-        }
-        $this->ui->outputData('TOTAL TIME: ' . $total);
-        $this->ui->outputData(count($passed) . ' PASSED TESTS', $command);
-        $this->ui->outputData(count($skipped) . ' SKIPPED TESTS', $command);
-        if (count($failed)) {
-    		$this->ui->outputData(count($failed) . ' FAILED TESTS:', $command);
-        	foreach ($failed as $failure) {
-        		$this->ui->outputData($failure, $command);
-        	}
-        }
-
-        return true;
-    }
-    // }}}
-}
-
-?>
diff --git a/PEAR/Command/Test.xml b/PEAR/Command/Test.xml
deleted file mode 100644
index 8938522..0000000
--- a/PEAR/Command/Test.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
- 
-  Run Regression Tests
-  doRunTests
-  rt
-  
-   
-    r
-    Run tests in child directories, recursively.  4 dirs deep maximum
-   
-   
-    i
-    actual string of settings to pass to php in format " -d setting=blah"
-    SETTINGS
-   
-   
-    l
-    Log test runs/results as they are run
-   
-   
-    q
-    Only display detail for failed tests
-   
-   
-    s
-    Display simple output for all tests
-   
-   
-    p
-    Treat parameters as installed packages from which to run tests
-   
-   
-    u
-    Search parameters for AllTests.php, and use that to run phpunit-based tests
-   
-   
-    t
-    Output run-tests.log in TAP-compliant format
-   
-  
-  [testfile|dir ...]
-Run regression tests with PHP's regression testing script (run-tests.php).
- 
-
\ No newline at end of file
diff --git a/PEAR/Common.php b/PEAR/Common.php
deleted file mode 100644
index a62b151..0000000
--- a/PEAR/Common.php
+++ /dev/null
@@ -1,1126 +0,0 @@
-
- * @author     Tomas V. V. Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Common.php,v 1.157 2006/05/12 02:38:58 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1.0
- * @deprecated File deprecated since Release 1.4.0a1
- */
-
-/**
- * Include error handling
- */
-require_once 'PEAR.php';
-
-// {{{ constants and globals
-
-/**
- * PEAR_Common error when an invalid PHP file is passed to PEAR_Common::analyzeSourceCode()
- */
-define('PEAR_COMMON_ERROR_INVALIDPHP', 1);
-define('_PEAR_COMMON_PACKAGE_NAME_PREG', '[A-Za-z][a-zA-Z0-9_]+');
-define('PEAR_COMMON_PACKAGE_NAME_PREG', '/^' . _PEAR_COMMON_PACKAGE_NAME_PREG . '$/');
-
-// this should allow: 1, 1.0, 1.0RC1, 1.0dev, 1.0dev123234234234, 1.0a1, 1.0b1, 1.0pl1
-define('_PEAR_COMMON_PACKAGE_VERSION_PREG', '\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?');
-define('PEAR_COMMON_PACKAGE_VERSION_PREG', '/^' . _PEAR_COMMON_PACKAGE_VERSION_PREG . '$/i');
-
-// XXX far from perfect :-)
-define('_PEAR_COMMON_PACKAGE_DOWNLOAD_PREG', '(' . _PEAR_COMMON_PACKAGE_NAME_PREG .
-    ')(-([.0-9a-zA-Z]+))?');
-define('PEAR_COMMON_PACKAGE_DOWNLOAD_PREG', '/^' . _PEAR_COMMON_PACKAGE_DOWNLOAD_PREG .
-    '$/');
-
-define('_PEAR_CHANNELS_NAME_PREG', '[A-Za-z][a-zA-Z0-9\.]+');
-define('PEAR_CHANNELS_NAME_PREG', '/^' . _PEAR_CHANNELS_NAME_PREG . '$/');
-
-// this should allow any dns or IP address, plus a path - NO UNDERSCORES ALLOWED
-define('_PEAR_CHANNELS_SERVER_PREG', '[a-zA-Z0-9\-]+(?:\.[a-zA-Z0-9\-]+)*(\/[a-zA-Z0-9\-]+)*');
-define('PEAR_CHANNELS_SERVER_PREG', '/^' . _PEAR_CHANNELS_SERVER_PREG . '$/i');
-
-define('_PEAR_CHANNELS_PACKAGE_PREG',  '(' ._PEAR_CHANNELS_SERVER_PREG . ')\/('
-         . _PEAR_COMMON_PACKAGE_NAME_PREG . ')');
-define('PEAR_CHANNELS_PACKAGE_PREG', '/^' . _PEAR_CHANNELS_PACKAGE_PREG . '$/i');
-
-define('_PEAR_COMMON_CHANNEL_DOWNLOAD_PREG', '(' . _PEAR_CHANNELS_NAME_PREG . ')::('
-    . _PEAR_COMMON_PACKAGE_NAME_PREG . ')(-([.0-9a-zA-Z]+))?');
-define('PEAR_COMMON_CHANNEL_DOWNLOAD_PREG', '/^' . _PEAR_COMMON_CHANNEL_DOWNLOAD_PREG . '$/');
-
-/**
- * List of temporary files and directories registered by
- * PEAR_Common::addTempFile().
- * @var array
- */
-$GLOBALS['_PEAR_Common_tempfiles'] = array();
-
-/**
- * Valid maintainer roles
- * @var array
- */
-$GLOBALS['_PEAR_Common_maintainer_roles'] = array('lead','developer','contributor','helper');
-
-/**
- * Valid release states
- * @var array
- */
-$GLOBALS['_PEAR_Common_release_states'] = array('alpha','beta','stable','snapshot','devel');
-
-/**
- * Valid dependency types
- * @var array
- */
-$GLOBALS['_PEAR_Common_dependency_types'] = array('pkg','ext','php','prog','ldlib','rtlib','os','websrv','sapi');
-
-/**
- * Valid dependency relations
- * @var array
- */
-$GLOBALS['_PEAR_Common_dependency_relations'] = array('has','eq','lt','le','gt','ge','not', 'ne');
-
-/**
- * Valid file roles
- * @var array
- */
-$GLOBALS['_PEAR_Common_file_roles'] = array('php','ext','test','doc','data','src','script');
-
-/**
- * Valid replacement types
- * @var array
- */
-$GLOBALS['_PEAR_Common_replacement_types'] = array('php-const', 'pear-config', 'package-info');
-
-/**
- * Valid "provide" types
- * @var array
- */
-$GLOBALS['_PEAR_Common_provide_types'] = array('ext', 'prog', 'class', 'function', 'feature', 'api');
-
-/**
- * Valid "provide" types
- * @var array
- */
-$GLOBALS['_PEAR_Common_script_phases'] = array('pre-install', 'post-install', 'pre-uninstall', 'post-uninstall', 'pre-build', 'post-build', 'pre-configure', 'post-configure', 'pre-setup', 'post-setup');
-
-// }}}
-
-/**
- * Class providing common functionality for PEAR administration classes.
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Tomas V. V. Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- * @deprecated This class will disappear, and its components will be spread
- *             into smaller classes, like the AT&T breakup, as of Release 1.4.0a1
- */
-class PEAR_Common extends PEAR
-{
-    // {{{ properties
-
-    /** stack of elements, gives some sort of XML context */
-    var $element_stack = array();
-
-    /** name of currently parsed XML element */
-    var $current_element;
-
-    /** array of attributes of the currently parsed XML element */
-    var $current_attributes = array();
-
-    /** assoc with information about a package */
-    var $pkginfo = array();
-
-    /**
-     * User Interface object (PEAR_Frontend_* class).  If null,
-     * the log() method uses print.
-     * @var object
-     */
-    var $ui = null;
-
-    /**
-     * Configuration object (PEAR_Config).
-     * @var object
-     */
-    var $config = null;
-
-    var $current_path = null;
-
-    /**
-     * PEAR_SourceAnalyzer instance
-     * @var object
-     */
-    var $source_analyzer = null;
-    /**
-     * Flag variable used to mark a valid package file
-     * @var boolean
-     * @access private
-     */
-    var $_validPackageFile;
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Common constructor
-     *
-     * @access public
-     */
-    function PEAR_Common()
-    {
-        parent::PEAR();
-        $this->config = &PEAR_Config::singleton();
-        $this->debug = $this->config->get('verbose');
-    }
-
-    // }}}
-    // {{{ destructor
-
-    /**
-     * PEAR_Common destructor
-     *
-     * @access private
-     */
-    function _PEAR_Common()
-    {
-        // doesn't work due to bug #14744
-        //$tempfiles = $this->_tempfiles;
-        $tempfiles =& $GLOBALS['_PEAR_Common_tempfiles'];
-        while ($file = array_shift($tempfiles)) {
-            if (@is_dir($file)) {
-                if (!class_exists('System')) {
-                    require_once 'System.php';
-                }
-                System::rm(array('-rf', $file));
-            } elseif (file_exists($file)) {
-                unlink($file);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ addTempFile()
-
-    /**
-     * Register a temporary file or directory.  When the destructor is
-     * executed, all registered temporary files and directories are
-     * removed.
-     *
-     * @param string  $file  name of file or directory
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function addTempFile($file)
-    {
-        if (!class_exists('PEAR_Frontend')) {
-            require_once 'PEAR/Frontend.php';
-        }
-        PEAR_Frontend::addTempFile($file);
-    }
-
-    // }}}
-    // {{{ mkDirHier()
-
-    /**
-     * Wrapper to System::mkDir(), creates a directory as well as
-     * any necessary parent directories.
-     *
-     * @param string  $dir  directory name
-     *
-     * @return bool TRUE on success, or a PEAR error
-     *
-     * @access public
-     */
-    function mkDirHier($dir)
-    {
-        $this->log(2, "+ create dir $dir");
-        if (!class_exists('System')) {
-            require_once 'System.php';
-        }
-        return System::mkDir(array('-p', $dir));
-    }
-
-    // }}}
-    // {{{ log()
-
-    /**
-     * Logging method.
-     *
-     * @param int    $level  log level (0 is quiet, higher is noisier)
-     * @param string $msg    message to write to the log
-     *
-     * @return void
-     *
-     * @access public
-     * @static
-     */
-    function log($level, $msg, $append_crlf = true)
-    {
-        if ($this->debug >= $level) {
-            if (!class_exists('PEAR_Frontend')) {
-                require_once 'PEAR/Frontend.php';
-            }
-            $ui = &PEAR_Frontend::singleton();
-            if (is_a($ui, 'PEAR_Frontend')) {
-                $ui->log($msg, $append_crlf);
-            } else {
-                print "$msg\n";
-            }
-        }
-    }
-
-    // }}}
-    // {{{ mkTempDir()
-
-    /**
-     * Create and register a temporary directory.
-     *
-     * @param string $tmpdir (optional) Directory to use as tmpdir.
-     *                       Will use system defaults (for example
-     *                       /tmp or c:\windows\temp) if not specified
-     *
-     * @return string name of created directory
-     *
-     * @access public
-     */
-    function mkTempDir($tmpdir = '')
-    {
-        if ($tmpdir) {
-            $topt = array('-t', $tmpdir);
-        } else {
-            $topt = array();
-        }
-        $topt = array_merge($topt, array('-d', 'pear'));
-        if (!class_exists('System')) {
-            require_once 'System.php';
-        }
-        if (!$tmpdir = System::mktemp($topt)) {
-            return false;
-        }
-        $this->addTempFile($tmpdir);
-        return $tmpdir;
-    }
-
-    // }}}
-    // {{{ setFrontendObject()
-
-    /**
-     * Set object that represents the frontend to be used.
-     *
-     * @param  object Reference of the frontend object
-     * @return void
-     * @access public
-     */
-    function setFrontendObject(&$ui)
-    {
-        $this->ui = &$ui;
-    }
-
-    // }}}
-
-    // {{{ infoFromTgzFile()
-
-    /**
-     * Returns information about a package file.  Expects the name of
-     * a gzipped tar file as input.
-     *
-     * @param string  $file  name of .tgz file
-     *
-     * @return array  array with package information
-     *
-     * @access public
-     * @deprecated use PEAR_PackageFile->fromTgzFile() instead
-     *
-     */
-    function infoFromTgzFile($file)
-    {
-        $packagefile = &new PEAR_PackageFile($this->config);
-        $pf = &$packagefile->fromTgzFile($file, PEAR_VALIDATE_NORMAL);
-        if (PEAR::isError($pf)) {
-            $errs = $pf->getUserinfo();
-            if (is_array($errs)) {
-                foreach ($errs as $error) {
-                    $e = $this->raiseError($error['message'], $error['code'], null, null, $error);
-                }
-            }
-            return $pf;
-        }
-        return $this->_postProcessValidPackagexml($pf);
-    }
-
-    // }}}
-    // {{{ infoFromDescriptionFile()
-
-    /**
-     * Returns information about a package file.  Expects the name of
-     * a package xml file as input.
-     *
-     * @param string  $descfile  name of package xml file
-     *
-     * @return array  array with package information
-     *
-     * @access public
-     * @deprecated use PEAR_PackageFile->fromPackageFile() instead
-     *
-     */
-    function infoFromDescriptionFile($descfile)
-    {
-        $packagefile = &new PEAR_PackageFile($this->config);
-        $pf = &$packagefile->fromPackageFile($descfile, PEAR_VALIDATE_NORMAL);
-        if (PEAR::isError($pf)) {
-            $errs = $pf->getUserinfo();
-            if (is_array($errs)) {
-                foreach ($errs as $error) {
-                    $e = $this->raiseError($error['message'], $error['code'], null, null, $error);
-                }
-            }
-            return $pf;
-        }
-        return $this->_postProcessValidPackagexml($pf);
-    }
-
-    // }}}
-    // {{{ infoFromString()
-
-    /**
-     * Returns information about a package file.  Expects the contents
-     * of a package xml file as input.
-     *
-     * @param string  $data  contents of package.xml file
-     *
-     * @return array   array with package information
-     *
-     * @access public
-     * @deprecated use PEAR_PackageFile->fromXmlstring() instead
-     *
-     */
-    function infoFromString($data)
-    {
-        $packagefile = &new PEAR_PackageFile($this->config);
-        $pf = &$packagefile->fromXmlString($data, PEAR_VALIDATE_NORMAL, false);
-        if (PEAR::isError($pf)) {
-            $errs = $pf->getUserinfo();
-            if (is_array($errs)) {
-                foreach ($errs as $error) {
-                    $e = $this->raiseError($error['message'], $error['code'], null, null, $error);
-                }
-            }
-            return $pf;
-        }
-        return $this->_postProcessValidPackagexml($pf);
-    }
-    // }}}
-
-    /**
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @return array
-     */
-    function _postProcessValidPackagexml(&$pf)
-    {
-        if (is_a($pf, 'PEAR_PackageFile_v2')) {
-            // sort of make this into a package.xml 1.0-style array
-            // changelog is not converted to old format.
-            $arr = $pf->toArray(true);
-            $arr = array_merge($arr, $arr['old']);
-            unset($arr['old']);
-            unset($arr['xsdversion']);
-            unset($arr['contents']);
-            unset($arr['compatible']);
-            unset($arr['channel']);
-            unset($arr['uri']);
-            unset($arr['dependencies']);
-            unset($arr['phprelease']);
-            unset($arr['extsrcrelease']);
-            unset($arr['zendextsrcrelease']);
-            unset($arr['extbinrelease']);
-            unset($arr['zendextbinrelease']);
-            unset($arr['bundle']);
-            unset($arr['lead']);
-            unset($arr['developer']);
-            unset($arr['helper']);
-            unset($arr['contributor']);
-            $arr['filelist'] = $pf->getFilelist();
-            $this->pkginfo = $arr;
-            return $arr;
-        } else {
-            $this->pkginfo = $pf->toArray();
-            return $this->pkginfo;
-        }
-    }
-    // {{{ infoFromAny()
-
-    /**
-     * Returns package information from different sources
-     *
-     * This method is able to extract information about a package
-     * from a .tgz archive or from a XML package definition file.
-     *
-     * @access public
-     * @param  string Filename of the source ('package.xml', '.tgz')
-     * @return string
-     * @deprecated use PEAR_PackageFile->fromAnyFile() instead
-     */
-    function infoFromAny($info)
-    {
-        if (is_string($info) && file_exists($info)) {
-            $packagefile = &new PEAR_PackageFile($this->config);
-            $pf = &$packagefile->fromAnyFile($info, PEAR_VALIDATE_NORMAL);
-            if (PEAR::isError($pf)) {
-                $errs = $pf->getUserinfo();
-                if (is_array($errs)) {
-                    foreach ($errs as $error) {
-                        $e = $this->raiseError($error['message'], $error['code'], null, null, $error);
-                    }
-                }
-                return $pf;
-            }
-            return $this->_postProcessValidPackagexml($pf);
-        }
-        return $info;
-    }
-
-    // }}}
-    // {{{ xmlFromInfo()
-
-    /**
-     * Return an XML document based on the package info (as returned
-     * by the PEAR_Common::infoFrom* methods).
-     *
-     * @param array  $pkginfo  package info
-     *
-     * @return string XML data
-     *
-     * @access public
-     * @deprecated use a PEAR_PackageFile_v* object's generator instead
-     */
-    function xmlFromInfo($pkginfo)
-    {
-        $config = &PEAR_Config::singleton();
-        $packagefile = &new PEAR_PackageFile($config);
-        $pf = &$packagefile->fromArray($pkginfo);
-        $gen = &$pf->getDefaultGenerator();
-        return $gen->toXml(PEAR_VALIDATE_PACKAGING);
-    }
-
-    // }}}
-    // {{{ validatePackageInfo()
-
-    /**
-     * Validate XML package definition file.
-     *
-     * @param  string $info Filename of the package archive or of the
-     *                package definition file
-     * @param  array $errors Array that will contain the errors
-     * @param  array $warnings Array that will contain the warnings
-     * @param  string $dir_prefix (optional) directory where source files
-     *                may be found, or empty if they are not available
-     * @access public
-     * @return boolean
-     * @deprecated use the validation of PEAR_PackageFile objects
-     */
-    function validatePackageInfo($info, &$errors, &$warnings, $dir_prefix = '')
-    {
-        $config = &PEAR_Config::singleton();
-        $packagefile = &new PEAR_PackageFile($config);
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        if (strpos($info, 'fromXmlString($info, PEAR_VALIDATE_NORMAL, '');
-        } else {
-            $pf = &$packagefile->fromAnyFile($info, PEAR_VALIDATE_NORMAL);
-        }
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($pf)) {
-            $errs = $pf->getUserinfo();
-            if (is_array($errs)) {
-                foreach ($errs as $error) {
-                    if ($error['level'] == 'error') {
-                        $errors[] = $error['message'];
-                    } else {
-                        $warnings[] = $error['message'];
-                    }
-                }
-            }
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ buildProvidesArray()
-
-    /**
-     * Build a "provides" array from data returned by
-     * analyzeSourceCode().  The format of the built array is like
-     * this:
-     *
-     *  array(
-     *    'class;MyClass' => 'array('type' => 'class', 'name' => 'MyClass'),
-     *    ...
-     *  )
-     *
-     *
-     * @param array $srcinfo array with information about a source file
-     * as returned by the analyzeSourceCode() method.
-     *
-     * @return void
-     *
-     * @access public
-     *
-     */
-    function buildProvidesArray($srcinfo)
-    {
-        $file = basename($srcinfo['source_file']);
-        $pn = '';
-        if (isset($this->_packageName)) {
-            $pn = $this->_packageName;
-        }
-        $pnl = strlen($pn);
-        foreach ($srcinfo['declared_classes'] as $class) {
-            $key = "class;$class";
-            if (isset($this->pkginfo['provides'][$key])) {
-                continue;
-            }
-            $this->pkginfo['provides'][$key] =
-                array('file'=> $file, 'type' => 'class', 'name' => $class);
-            if (isset($srcinfo['inheritance'][$class])) {
-                $this->pkginfo['provides'][$key]['extends'] =
-                    $srcinfo['inheritance'][$class];
-            }
-        }
-        foreach ($srcinfo['declared_methods'] as $class => $methods) {
-            foreach ($methods as $method) {
-                $function = "$class::$method";
-                $key = "function;$function";
-                if ($method{0} == '_' || !strcasecmp($method, $class) ||
-                    isset($this->pkginfo['provides'][$key])) {
-                    continue;
-                }
-                $this->pkginfo['provides'][$key] =
-                    array('file'=> $file, 'type' => 'function', 'name' => $function);
-            }
-        }
-
-        foreach ($srcinfo['declared_functions'] as $function) {
-            $key = "function;$function";
-            if ($function{0} == '_' || isset($this->pkginfo['provides'][$key])) {
-                continue;
-            }
-            if (!strstr($function, '::') && strncasecmp($function, $pn, $pnl)) {
-                $warnings[] = "in1 " . $file . ": function \"$function\" not prefixed with package name \"$pn\"";
-            }
-            $this->pkginfo['provides'][$key] =
-                array('file'=> $file, 'type' => 'function', 'name' => $function);
-        }
-    }
-
-    // }}}
-    // {{{ analyzeSourceCode()
-
-    /**
-     * Analyze the source code of the given PHP file
-     *
-     * @param  string Filename of the PHP file
-     * @return mixed
-     * @access public
-     */
-    function analyzeSourceCode($file)
-    {
-        if (!function_exists("token_get_all")) {
-            return false;
-        }
-        if (!defined('T_DOC_COMMENT')) {
-            define('T_DOC_COMMENT', T_COMMENT);
-        }
-        if (!defined('T_INTERFACE')) {
-            define('T_INTERFACE', -1);
-        }
-        if (!defined('T_IMPLEMENTS')) {
-            define('T_IMPLEMENTS', -1);
-        }
-        if (!$fp = @fopen($file, "r")) {
-            return false;
-        }
-        fclose($fp);
-        $contents = file_get_contents($file);
-        $tokens = token_get_all($contents);
-/*
-        for ($i = 0; $i < sizeof($tokens); $i++) {
-            @list($token, $data) = $tokens[$i];
-            if (is_string($token)) {
-                var_dump($token);
-            } else {
-                print token_name($token) . ' ';
-                var_dump(rtrim($data));
-            }
-        }
-*/
-        $look_for = 0;
-        $paren_level = 0;
-        $bracket_level = 0;
-        $brace_level = 0;
-        $lastphpdoc = '';
-        $current_class = '';
-        $current_interface = '';
-        $current_class_level = -1;
-        $current_function = '';
-        $current_function_level = -1;
-        $declared_classes = array();
-        $declared_interfaces = array();
-        $declared_functions = array();
-        $declared_methods = array();
-        $used_classes = array();
-        $used_functions = array();
-        $extends = array();
-        $implements = array();
-        $nodeps = array();
-        $inquote = false;
-        $interface = false;
-        for ($i = 0; $i < sizeof($tokens); $i++) {
-            if (is_array($tokens[$i])) {
-                list($token, $data) = $tokens[$i];
-            } else {
-                $token = $tokens[$i];
-                $data = '';
-            }
-            if ($inquote) {
-                if ($token != '"') {
-                    continue;
-                } else {
-                    $inquote = false;
-                    continue;
-                }
-            }
-            switch ($token) {
-                case T_WHITESPACE:
-                    continue;
-                case ';':
-                    if ($interface) {
-                        $current_function = '';
-                        $current_function_level = -1;
-                    }
-                    break;
-                case '"':
-                    $inquote = true;
-                    break;
-                case T_CURLY_OPEN:
-                case T_DOLLAR_OPEN_CURLY_BRACES:
-                case '{': $brace_level++; continue 2;
-                case '}':
-                    $brace_level--;
-                    if ($current_class_level == $brace_level) {
-                        $current_class = '';
-                        $current_class_level = -1;
-                    }
-                    if ($current_function_level == $brace_level) {
-                        $current_function = '';
-                        $current_function_level = -1;
-                    }
-                    continue 2;
-                case '[': $bracket_level++; continue 2;
-                case ']': $bracket_level--; continue 2;
-                case '(': $paren_level++;   continue 2;
-                case ')': $paren_level--;   continue 2;
-                case T_INTERFACE:
-                    $interface = true;
-                case T_CLASS:
-                    if (($current_class_level != -1) || ($current_function_level != -1)) {
-                        PEAR::raiseError("Parser error: invalid PHP found in file \"$file\"",
-                            PEAR_COMMON_ERROR_INVALIDPHP);
-                        return false;
-                    }
-                case T_FUNCTION:
-                case T_NEW:
-                case T_EXTENDS:
-                case T_IMPLEMENTS:
-                    $look_for = $token;
-                    continue 2;
-                case T_STRING:
-                    if (version_compare(zend_version(), '2.0', '<')) {
-                        if (in_array(strtolower($data),
-                            array('public', 'private', 'protected', 'abstract',
-                                  'interface', 'implements', 'throw') 
-                                 )) {
-                            PEAR::raiseError('Error: PHP5 token encountered in ' . $file . 
-                            'packaging should be done in PHP 5');
-                            return false;
-                        }
-                    }
-                    if ($look_for == T_CLASS) {
-                        $current_class = $data;
-                        $current_class_level = $brace_level;
-                        $declared_classes[] = $current_class;
-                    } elseif ($look_for == T_INTERFACE) {
-                        $current_interface = $data;
-                        $current_class_level = $brace_level;
-                        $declared_interfaces[] = $current_interface;
-                    } elseif ($look_for == T_IMPLEMENTS) {
-                        $implements[$current_class] = $data;
-                    } elseif ($look_for == T_EXTENDS) {
-                        $extends[$current_class] = $data;
-                    } elseif ($look_for == T_FUNCTION) {
-                        if ($current_class) {
-                            $current_function = "$current_class::$data";
-                            $declared_methods[$current_class][] = $data;
-                        } elseif ($current_interface) {
-                            $current_function = "$current_interface::$data";
-                            $declared_methods[$current_interface][] = $data;
-                        } else {
-                            $current_function = $data;
-                            $declared_functions[] = $current_function;
-                        }
-                        $current_function_level = $brace_level;
-                        $m = array();
-                    } elseif ($look_for == T_NEW) {
-                        $used_classes[$data] = true;
-                    }
-                    $look_for = 0;
-                    continue 2;
-                case T_VARIABLE:
-                    $look_for = 0;
-                    continue 2;
-                case T_DOC_COMMENT:
-                case T_COMMENT:
-                    if (preg_match('!^/\*\*\s!', $data)) {
-                        $lastphpdoc = $data;
-                        if (preg_match_all('/@nodep\s+(\S+)/', $lastphpdoc, $m)) {
-                            $nodeps = array_merge($nodeps, $m[1]);
-                        }
-                    }
-                    continue 2;
-                case T_DOUBLE_COLON:
-                    if (!($tokens[$i - 1][0] == T_WHITESPACE || $tokens[$i - 1][0] == T_STRING)) {
-                        PEAR::raiseError("Parser error: invalid PHP found in file \"$file\"",
-                            PEAR_COMMON_ERROR_INVALIDPHP);
-                        return false;
-                    }
-                    $class = $tokens[$i - 1][1];
-                    if (strtolower($class) != 'parent') {
-                        $used_classes[$class] = true;
-                    }
-                    continue 2;
-            }
-        }
-        return array(
-            "source_file" => $file,
-            "declared_classes" => $declared_classes,
-            "declared_interfaces" => $declared_interfaces,
-            "declared_methods" => $declared_methods,
-            "declared_functions" => $declared_functions,
-            "used_classes" => array_diff(array_keys($used_classes), $nodeps),
-            "inheritance" => $extends,
-            "implements" => $implements,
-            );
-    }
-
-    // }}}
-    // {{{  betterStates()
-
-    /**
-     * Return an array containing all of the states that are more stable than
-     * or equal to the passed in state
-     *
-     * @param string Release state
-     * @param boolean Determines whether to include $state in the list
-     * @return false|array False if $state is not a valid release state
-     */
-    function betterStates($state, $include = false)
-    {
-        static $states = array('snapshot', 'devel', 'alpha', 'beta', 'stable');
-        $i = array_search($state, $states);
-        if ($i === false) {
-            return false;
-        }
-        if ($include) {
-            $i--;
-        }
-        return array_slice($states, $i + 1);
-    }
-
-    // }}}
-    // {{{ detectDependencies()
-
-    function detectDependencies($any, $status_callback = null)
-    {
-        if (!function_exists("token_get_all")) {
-            return false;
-        }
-        if (PEAR::isError($info = $this->infoFromAny($any))) {
-            return $this->raiseError($info);
-        }
-        if (!is_array($info)) {
-            return false;
-        }
-        $deps = array();
-        $used_c = $decl_c = $decl_f = $decl_m = array();
-        foreach ($info['filelist'] as $file => $fa) {
-            $tmp = $this->analyzeSourceCode($file);
-            $used_c = @array_merge($used_c, $tmp['used_classes']);
-            $decl_c = @array_merge($decl_c, $tmp['declared_classes']);
-            $decl_f = @array_merge($decl_f, $tmp['declared_functions']);
-            $decl_m = @array_merge($decl_m, $tmp['declared_methods']);
-            $inheri = @array_merge($inheri, $tmp['inheritance']);
-        }
-        $used_c = array_unique($used_c);
-        $decl_c = array_unique($decl_c);
-        $undecl_c = array_diff($used_c, $decl_c);
-        return array('used_classes' => $used_c,
-                     'declared_classes' => $decl_c,
-                     'declared_methods' => $decl_m,
-                     'declared_functions' => $decl_f,
-                     'undeclared_classes' => $undecl_c,
-                     'inheritance' => $inheri,
-                     );
-    }
-
-    // }}}
-    // {{{ getUserRoles()
-
-    /**
-     * Get the valid roles for a PEAR package maintainer
-     *
-     * @return array
-     * @static
-     */
-    function getUserRoles()
-    {
-        return $GLOBALS['_PEAR_Common_maintainer_roles'];
-    }
-
-    // }}}
-    // {{{ getReleaseStates()
-
-    /**
-     * Get the valid package release states of packages
-     *
-     * @return array
-     * @static
-     */
-    function getReleaseStates()
-    {
-        return $GLOBALS['_PEAR_Common_release_states'];
-    }
-
-    // }}}
-    // {{{ getDependencyTypes()
-
-    /**
-     * Get the implemented dependency types (php, ext, pkg etc.)
-     *
-     * @return array
-     * @static
-     */
-    function getDependencyTypes()
-    {
-        return $GLOBALS['_PEAR_Common_dependency_types'];
-    }
-
-    // }}}
-    // {{{ getDependencyRelations()
-
-    /**
-     * Get the implemented dependency relations (has, lt, ge etc.)
-     *
-     * @return array
-     * @static
-     */
-    function getDependencyRelations()
-    {
-        return $GLOBALS['_PEAR_Common_dependency_relations'];
-    }
-
-    // }}}
-    // {{{ getFileRoles()
-
-    /**
-     * Get the implemented file roles
-     *
-     * @return array
-     * @static
-     */
-    function getFileRoles()
-    {
-        return $GLOBALS['_PEAR_Common_file_roles'];
-    }
-
-    // }}}
-    // {{{ getReplacementTypes()
-
-    /**
-     * Get the implemented file replacement types in
-     *
-     * @return array
-     * @static
-     */
-    function getReplacementTypes()
-    {
-        return $GLOBALS['_PEAR_Common_replacement_types'];
-    }
-
-    // }}}
-    // {{{ getProvideTypes()
-
-    /**
-     * Get the implemented file replacement types in
-     *
-     * @return array
-     * @static
-     */
-    function getProvideTypes()
-    {
-        return $GLOBALS['_PEAR_Common_provide_types'];
-    }
-
-    // }}}
-    // {{{ getScriptPhases()
-
-    /**
-     * Get the implemented file replacement types in
-     *
-     * @return array
-     * @static
-     */
-    function getScriptPhases()
-    {
-        return $GLOBALS['_PEAR_Common_script_phases'];
-    }
-
-    // }}}
-    // {{{ validPackageName()
-
-    /**
-     * Test whether a string contains a valid package name.
-     *
-     * @param string $name the package name to test
-     *
-     * @return bool
-     *
-     * @access public
-     */
-    function validPackageName($name)
-    {
-        return (bool)preg_match(PEAR_COMMON_PACKAGE_NAME_PREG, $name);
-    }
-
-
-    // }}}
-    // {{{ validPackageVersion()
-
-    /**
-     * Test whether a string contains a valid package version.
-     *
-     * @param string $ver the package version to test
-     *
-     * @return bool
-     *
-     * @access public
-     */
-    function validPackageVersion($ver)
-    {
-        return (bool)preg_match(PEAR_COMMON_PACKAGE_VERSION_PREG, $ver);
-    }
-
-
-    // }}}
-
-    // {{{ downloadHttp()
-
-    /**
-     * Download a file through HTTP.  Considers suggested file name in
-     * Content-disposition: header and can run a callback function for
-     * different events.  The callback will be called with two
-     * parameters: the callback type, and parameters.  The implemented
-     * callback types are:
-     *
-     *  'setup'       called at the very beginning, parameter is a UI object
-     *                that should be used for all output
-     *  'message'     the parameter is a string with an informational message
-     *  'saveas'      may be used to save with a different file name, the
-     *                parameter is the filename that is about to be used.
-     *                If a 'saveas' callback returns a non-empty string,
-     *                that file name will be used as the filename instead.
-     *                Note that $save_dir will not be affected by this, only
-     *                the basename of the file.
-     *  'start'       download is starting, parameter is number of bytes
-     *                that are expected, or -1 if unknown
-     *  'bytesread'   parameter is the number of bytes read so far
-     *  'done'        download is complete, parameter is the total number
-     *                of bytes read
-     *  'connfailed'  if the TCP connection fails, this callback is called
-     *                with array(host,port,errno,errmsg)
-     *  'writefailed' if writing to disk fails, this callback is called
-     *                with array(destfile,errmsg)
-     *
-     * If an HTTP proxy has been configured (http_proxy PEAR_Config
-     * setting), the proxy will be used.
-     *
-     * @param string  $url       the URL to download
-     * @param object  $ui        PEAR_Frontend_* instance
-     * @param object  $config    PEAR_Config instance
-     * @param string  $save_dir  (optional) directory to save file in
-     * @param mixed   $callback  (optional) function/method to call for status
-     *                           updates
-     *
-     * @return string  Returns the full path of the downloaded file or a PEAR
-     *                 error on failure.  If the error is caused by
-     *                 socket-related errors, the error object will
-     *                 have the fsockopen error code available through
-     *                 getCode().
-     *
-     * @access public
-     * @deprecated in favor of PEAR_Downloader::downloadHttp()
-     */
-    function downloadHttp($url, &$ui, $save_dir = '.', $callback = null)
-    {
-        if (!class_exists('PEAR_Downloader')) {
-            require_once 'PEAR/Downloader.php';
-        }
-        return PEAR_Downloader::downloadHttp($url, $ui, $save_dir, $callback);
-    }
-
-    // }}}
-
-    /**
-     * @param string $path relative or absolute include path
-     * @return boolean
-     * @static
-     */
-    function isIncludeable($path)
-    {
-        if (file_exists($path) && is_readable($path)) {
-            return true;
-        }
-        $ipath = explode(PATH_SEPARATOR, ini_get('include_path'));
-        foreach ($ipath as $include) {
-            $test = realpath($include . DIRECTORY_SEPARATOR . $path);
-            if (file_exists($test) && is_readable($test)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
-require_once 'PEAR/Config.php';
-require_once 'PEAR/PackageFile.php';
-?>
\ No newline at end of file
diff --git a/PEAR/Config.php b/PEAR/Config.php
deleted file mode 100644
index 77d30be..0000000
--- a/PEAR/Config.php
+++ /dev/null
@@ -1,2105 +0,0 @@
-
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Config.php,v 1.135 2006/09/24 05:45:26 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * Required for error handling
- */
-require_once 'PEAR.php';
-require_once 'PEAR/Registry.php';
-require_once 'PEAR/Installer/Role.php';
-require_once 'System.php';
-require_once 'PEAR/Remote.php';
-
-/**
- * Last created PEAR_Config instance.
- * @var object
- */
-$GLOBALS['_PEAR_Config_instance'] = null;
-if (!defined('PEAR_INSTALL_DIR') || !PEAR_INSTALL_DIR) {
-    $PEAR_INSTALL_DIR = PHP_LIBDIR . DIRECTORY_SEPARATOR . 'pear';
-} else {
-    $PEAR_INSTALL_DIR = PEAR_INSTALL_DIR;
-}
-
-// Below we define constants with default values for all configuration
-// parameters except username/password.  All of them can have their
-// defaults set through environment variables.  The reason we use the
-// PHP_ prefix is for some security, PHP protects environment
-// variables starting with PHP_*.
-
-// default channel and preferred mirror is based on whether we are invoked through
-// the "pear" or the "pecl" command
-
-if (!defined('PEAR_RUNTYPE') || PEAR_RUNTYPE == 'pear') {
-    define('PEAR_CONFIG_DEFAULT_CHANNEL', 'pear.php.net');
-} else {
-    define('PEAR_CONFIG_DEFAULT_CHANNEL', 'pecl.php.net');
-}
-
-if (getenv('PHP_PEAR_SYSCONF_DIR')) {
-    define('PEAR_CONFIG_SYSCONFDIR', getenv('PHP_PEAR_SYSCONF_DIR'));
-} elseif (getenv('SystemRoot')) {
-    define('PEAR_CONFIG_SYSCONFDIR', getenv('SystemRoot'));
-} else {
-    define('PEAR_CONFIG_SYSCONFDIR', PHP_SYSCONFDIR);
-}
-
-// Default for master_server
-if (getenv('PHP_PEAR_MASTER_SERVER')) {
-    define('PEAR_CONFIG_DEFAULT_MASTER_SERVER', getenv('PHP_PEAR_MASTER_SERVER'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_MASTER_SERVER', 'pear.php.net');
-}
-
-// Default for http_proxy
-if (getenv('PHP_PEAR_HTTP_PROXY')) {
-    define('PEAR_CONFIG_DEFAULT_HTTP_PROXY', getenv('PHP_PEAR_HTTP_PROXY'));
-} elseif (getenv('http_proxy')) {
-    define('PEAR_CONFIG_DEFAULT_HTTP_PROXY', getenv('http_proxy'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_HTTP_PROXY', '');
-}
-
-// Default for php_dir
-if (getenv('PHP_PEAR_INSTALL_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR'));
-} else {
-    if (file_exists($PEAR_INSTALL_DIR) && is_dir($PEAR_INSTALL_DIR)) {
-        define('PEAR_CONFIG_DEFAULT_PHP_DIR',
-               $PEAR_INSTALL_DIR);
-    } else {
-        define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR);
-    }
-}
-
-// Default for ext_dir
-if (getenv('PHP_PEAR_EXTENSION_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_EXT_DIR', getenv('PHP_PEAR_EXTENSION_DIR'));
-} else {
-    if (ini_get('extension_dir')) {
-        define('PEAR_CONFIG_DEFAULT_EXT_DIR', ini_get('extension_dir'));
-    } elseif (defined('PEAR_EXTENSION_DIR') &&
-              file_exists(PEAR_EXTENSION_DIR) && is_dir(PEAR_EXTENSION_DIR)) {
-        define('PEAR_CONFIG_DEFAULT_EXT_DIR', PEAR_EXTENSION_DIR);
-    } elseif (defined('PHP_EXTENSION_DIR')) {
-        define('PEAR_CONFIG_DEFAULT_EXT_DIR', PHP_EXTENSION_DIR);
-    } else {
-        define('PEAR_CONFIG_DEFAULT_EXT_DIR', '.');
-    }
-}
-
-// Default for doc_dir
-if (getenv('PHP_PEAR_DOC_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_DOC_DIR', getenv('PHP_PEAR_DOC_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_DOC_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'docs');
-}
-
-// Default for bin_dir
-if (getenv('PHP_PEAR_BIN_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_BIN_DIR', getenv('PHP_PEAR_BIN_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_BIN_DIR', PHP_BINDIR);
-}
-
-// Default for data_dir
-if (getenv('PHP_PEAR_DATA_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_DATA_DIR', getenv('PHP_PEAR_DATA_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_DATA_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'data');
-}
-
-// Default for test_dir
-if (getenv('PHP_PEAR_TEST_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_TEST_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'tests');
-}
-
-// Default for temp_dir
-if (getenv('PHP_PEAR_TEMP_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_TEMP_DIR', getenv('PHP_PEAR_TEMP_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_TEMP_DIR',
-           System::tmpdir() . DIRECTORY_SEPARATOR . 'pear' .
-           DIRECTORY_SEPARATOR . 'temp');
-}
-
-// Default for cache_dir
-if (getenv('PHP_PEAR_CACHE_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_CACHE_DIR', getenv('PHP_PEAR_CACHE_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_CACHE_DIR',
-           System::tmpdir() . DIRECTORY_SEPARATOR . 'pear' .
-           DIRECTORY_SEPARATOR . 'cache');
-}
-
-// Default for download_dir
-if (getenv('PHP_PEAR_DOWNLOAD_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_DOWNLOAD_DIR', getenv('PHP_PEAR_DOWNLOAD_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_DOWNLOAD_DIR',
-           System::tmpdir() . DIRECTORY_SEPARATOR . 'pear' .
-           DIRECTORY_SEPARATOR . 'download');
-}
-
-// Default for php_bin
-if (getenv('PHP_PEAR_PHP_BIN')) {
-    define('PEAR_CONFIG_DEFAULT_PHP_BIN', getenv('PHP_PEAR_PHP_BIN'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_PHP_BIN', PEAR_CONFIG_DEFAULT_BIN_DIR.
-           DIRECTORY_SEPARATOR.'php'.(OS_WINDOWS ? '.exe' : ''));
-}
-
-// Default for verbose
-if (getenv('PHP_PEAR_VERBOSE')) {
-    define('PEAR_CONFIG_DEFAULT_VERBOSE', getenv('PHP_PEAR_VERBOSE'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_VERBOSE', 1);
-}
-
-// Default for preferred_state
-if (getenv('PHP_PEAR_PREFERRED_STATE')) {
-    define('PEAR_CONFIG_DEFAULT_PREFERRED_STATE', getenv('PHP_PEAR_PREFERRED_STATE'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_PREFERRED_STATE', 'stable');
-}
-
-// Default for umask
-if (getenv('PHP_PEAR_UMASK')) {
-    define('PEAR_CONFIG_DEFAULT_UMASK', getenv('PHP_PEAR_UMASK'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_UMASK', decoct(umask()));
-}
-
-// Default for cache_ttl
-if (getenv('PHP_PEAR_CACHE_TTL')) {
-    define('PEAR_CONFIG_DEFAULT_CACHE_TTL', getenv('PHP_PEAR_CACHE_TTL'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_CACHE_TTL', 3600);
-}
-
-// Default for sig_type
-if (getenv('PHP_PEAR_SIG_TYPE')) {
-    define('PEAR_CONFIG_DEFAULT_SIG_TYPE', getenv('PHP_PEAR_SIG_TYPE'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_SIG_TYPE', 'gpg');
-}
-
-// Default for sig_bin
-if (getenv('PHP_PEAR_SIG_BIN')) {
-    define('PEAR_CONFIG_DEFAULT_SIG_BIN', getenv('PHP_PEAR_SIG_BIN'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_SIG_BIN',
-           System::which(
-               'gpg', OS_WINDOWS ? 'c:\gnupg\gpg.exe' : '/usr/local/bin/gpg'));
-}
-
-// Default for sig_keydir
-if (getenv('PHP_PEAR_SIG_KEYDIR')) {
-    define('PEAR_CONFIG_DEFAULT_SIG_KEYDIR', getenv('PHP_PEAR_SIG_KEYDIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_SIG_KEYDIR',
-           PEAR_CONFIG_SYSCONFDIR . DIRECTORY_SEPARATOR . 'pearkeys');
-}
-
-/**
- * This is a class for storing configuration data, keeping track of
- * which are system-defined, user-defined or defaulted.
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Config extends PEAR
-{
-    // {{{ properties
-
-    /**
-     * Array of config files used.
-     *
-     * @var array layer => config file
-     */
-    var $files = array(
-        'system' => '',
-        'user' => '',
-        );
-
-    var $layers = array();
-    
-    /**
-     * Configuration data, two-dimensional array where the first
-     * dimension is the config layer ('user', 'system' and 'default'),
-     * and the second dimension is keyname => value.
-     *
-     * The order in the first dimension is important!  Earlier
-     * layers will shadow later ones when a config value is
-     * requested (if a 'user' value exists, it will be returned first,
-     * then 'system' and finally 'default').
-     *
-     * @var array layer => array(keyname => value, ...)
-     */
-    var $configuration = array(
-        'user' => array(),
-        'system' => array(),
-        'default' => array(),
-        );
-    
-    /**
-     * Configuration values that can be set for a channel
-     *
-     * All other configuration values can only have a global value
-     * @var array
-     * @access private
-     */
-    var $_channelConfigInfo = array(
-        'php_dir', 'ext_dir', 'doc_dir', 'bin_dir', 'data_dir',
-        'test_dir', 'php_bin', 'username', 'password', 'verbose',
-        'preferred_state', 'umask', 'preferred_mirror',
-        );
-
-    /**
-     * Channels that can be accessed
-     * @see setChannels()
-     * @var array
-     * @access private
-     */
-    var $_channels = array('pear.php.net', 'pecl.php.net', '__uri');
-
-    /**
-     * This variable is used to control the directory values returned
-     * @see setInstallRoot();
-     * @var string|false
-     * @access private
-     */
-    var $_installRoot = false;
-
-    /**
-     * If requested, this will always refer to the registry
-     * contained in php_dir
-     * @var PEAR_Registry
-     */
-    var $_registry = array();
-
-    /**
-     * @var array
-     * @access private
-     */
-    var $_regInitialized = array();
-
-    /**
-     * @var bool
-     * @access private
-     */
-    var $_noRegistry = false;
-
-    /**
-     * amount of errors found while parsing config
-     * @var integer
-     * @access private
-     */
-    var $_errorsFound = 0;
-    var $_lastError = null;
-
-    /**
-     * Information about the configuration data.  Stores the type,
-     * default value and a documentation string for each configuration
-     * value.
-     *
-     * @var array layer => array(infotype => value, ...)
-     */
-    var $configuration_info = array(
-        // Channels/Internet Access
-        'default_channel' => array(
-            'type' => 'string',
-            'default' => PEAR_CONFIG_DEFAULT_CHANNEL,
-            'doc' => 'the default channel to use for all non explicit commands',
-            'prompt' => 'Default Channel',
-            'group' => 'Internet Access',
-            ),
-        'preferred_mirror' => array(
-            'type' => 'string',
-            'default' => PEAR_CONFIG_DEFAULT_CHANNEL,
-            'doc' => 'the default server or mirror to use for channel actions',
-            'prompt' => 'Default Channel Mirror',
-            'group' => 'Internet Access',
-            ),
-        'remote_config' => array(
-            'type' => 'password',
-            'default' => '',
-            'doc' => 'ftp url of remote configuration file to use for synchronized install',
-            'prompt' => 'Remote Configuration File',
-            'group' => 'Internet Access',
-            ),
-        'auto_discover' => array(
-            'type' => 'integer',
-            'default' => 0,
-            'doc' => 'whether to automatically discover new channels',
-            'prompt' => 'Auto-discover new Channels',
-            'group' => 'Internet Access',
-            ),
-        // Internet Access
-        'master_server' => array(
-            'type' => 'string',
-            'default' => 'pear.php.net',
-            'doc' => 'name of the main PEAR server [NOT USED IN THIS VERSION]',
-            'prompt' => 'PEAR server [DEPRECATED]',
-            'group' => 'Internet Access',
-            ),
-        'http_proxy' => array(
-            'type' => 'string',
-            'default' => PEAR_CONFIG_DEFAULT_HTTP_PROXY,
-            'doc' => 'HTTP proxy (host:port) to use when downloading packages',
-            'prompt' => 'HTTP Proxy Server Address',
-            'group' => 'Internet Access',
-            ),
-        // File Locations
-        'php_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_PHP_DIR,
-            'doc' => 'directory where .php files are installed',
-            'prompt' => 'PEAR directory',
-            'group' => 'File Locations',
-            ),
-        'ext_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_EXT_DIR,
-            'doc' => 'directory where loadable extensions are installed',
-            'prompt' => 'PHP extension directory',
-            'group' => 'File Locations',
-            ),
-        'doc_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_DOC_DIR,
-            'doc' => 'directory where documentation is installed',
-            'prompt' => 'PEAR documentation directory',
-            'group' => 'File Locations',
-            ),
-        'bin_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_BIN_DIR,
-            'doc' => 'directory where executables are installed',
-            'prompt' => 'PEAR executables directory',
-            'group' => 'File Locations',
-            ),
-        'data_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_DATA_DIR,
-            'doc' => 'directory where data files are installed',
-            'prompt' => 'PEAR data directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'test_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_TEST_DIR,
-            'doc' => 'directory where regression tests are installed',
-            'prompt' => 'PEAR test directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'cache_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_CACHE_DIR,
-            'doc' => 'directory which is used for XMLRPC cache',
-            'prompt' => 'PEAR Installer cache directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'temp_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_TEMP_DIR,
-            'doc' => 'directory which is used for all temp files',
-            'prompt' => 'PEAR Installer temp directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'download_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_CACHE_DIR,
-            'doc' => 'directory which is used for all downloaded files',
-            'prompt' => 'PEAR Installer download directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'php_bin' => array(
-            'type' => 'file',
-            'default' => PEAR_CONFIG_DEFAULT_PHP_BIN,
-            'doc' => 'PHP CLI/CGI binary for executing scripts',
-            'prompt' => 'PHP CLI/CGI binary',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'php_ini' => array(
-            'type' => 'file',
-            'default' => '',
-            'doc' => 'location of php.ini in which to enable PECL extensions on install',
-            'prompt' => 'php.ini location',
-            'group' => 'File Locations (Advanced)',
-            ),
-        // Maintainers
-        'username' => array(
-            'type' => 'string',
-            'default' => '',
-            'doc' => '(maintainers) your PEAR account name',
-            'prompt' => 'PEAR username (for maintainers)',
-            'group' => 'Maintainers',
-            ),
-        'password' => array(
-            'type' => 'password',
-            'default' => '',
-            'doc' => '(maintainers) your PEAR account password',
-            'prompt' => 'PEAR password (for maintainers)',
-            'group' => 'Maintainers',
-            ),
-        // Advanced
-        'verbose' => array(
-            'type' => 'integer',
-            'default' => PEAR_CONFIG_DEFAULT_VERBOSE,
-            'doc' => 'verbosity level
-0: really quiet
-1: somewhat quiet
-2: verbose
-3: debug',
-            'prompt' => 'Debug Log Level',
-            'group' => 'Advanced',
-            ),
-        'preferred_state' => array(
-            'type' => 'set',
-            'default' => PEAR_CONFIG_DEFAULT_PREFERRED_STATE,
-            'doc' => 'the installer will prefer releases with this state when installing packages without a version or state specified',
-            'valid_set' => array(
-                'stable', 'beta', 'alpha', 'devel', 'snapshot'),
-            'prompt' => 'Preferred Package State',
-            'group' => 'Advanced',
-            ),
-        'umask' => array(
-            'type' => 'mask',
-            'default' => PEAR_CONFIG_DEFAULT_UMASK,
-            'doc' => 'umask used when creating files (Unix-like systems only)',
-            'prompt' => 'Unix file mask',
-            'group' => 'Advanced',
-            ),
-        'cache_ttl' => array(
-            'type' => 'integer',
-            'default' => PEAR_CONFIG_DEFAULT_CACHE_TTL,
-            'doc' => 'amount of secs where the local cache is used and not updated',
-            'prompt' => 'Cache TimeToLive',
-            'group' => 'Advanced',
-            ),
-        'sig_type' => array(
-            'type' => 'set',
-            'default' => PEAR_CONFIG_DEFAULT_SIG_TYPE,
-            'doc' => 'which package signature mechanism to use',
-            'valid_set' => array('gpg'),
-            'prompt' => 'Package Signature Type',
-            'group' => 'Maintainers',
-            ),
-        'sig_bin' => array(
-            'type' => 'string',
-            'default' => PEAR_CONFIG_DEFAULT_SIG_BIN,
-            'doc' => 'which package signature mechanism to use',
-            'prompt' => 'Signature Handling Program',
-            'group' => 'Maintainers',
-            ),
-        'sig_keyid' => array(
-            'type' => 'string',
-            'default' => '',
-            'doc' => 'which key to use for signing with',
-            'prompt' => 'Signature Key Id',
-            'group' => 'Maintainers',
-            ),
-        'sig_keydir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_SIG_KEYDIR,
-            'doc' => 'directory where signature keys are located',
-            'prompt' => 'Signature Key Directory',
-            'group' => 'Maintainers',
-            ),
-        // __channels is reserved - used for channel-specific configuration
-        );
-
-    // }}}
-
-    // {{{ PEAR_Config([file], [defaults_file])
-
-    /**
-     * Constructor.
-     *
-     * @param string file to read user-defined options from
-     * @param string file to read system-wide defaults from
-     * @param bool   determines whether a registry object "follows"
-     *               the value of php_dir (is automatically created
-     *               and moved when php_dir is changed)
-     * @param bool   if true, fails if configuration files cannot be loaded
-     *
-     * @access public
-     *
-     * @see PEAR_Config::singleton
-     */
-    function PEAR_Config($user_file = '', $system_file = '', $ftp_file = false,
-                         $strict = true)
-    {
-        $this->PEAR();
-        PEAR_Installer_Role::initializeConfig($this);
-        $sl = DIRECTORY_SEPARATOR;
-        if (empty($user_file)) {
-            if (OS_WINDOWS) {
-                $user_file = PEAR_CONFIG_SYSCONFDIR . $sl . 'pear.ini';
-            } else {
-                $user_file = getenv('HOME') . $sl . '.pearrc';
-            }
-        }
-        if (empty($system_file)) {
-            if (OS_WINDOWS) {
-                $system_file = PEAR_CONFIG_SYSCONFDIR . $sl . 'pearsys.ini';
-            } else {
-                $system_file = PEAR_CONFIG_SYSCONFDIR . $sl . 'pear.conf';
-            }
-        }
-
-        $this->layers = array_keys($this->configuration);
-        $this->files['user'] = $user_file;
-        $this->files['system'] = $system_file;
-        if ($user_file && file_exists($user_file)) {
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $this->readConfigFile($user_file, 'user', $strict);
-            $this->popErrorHandling();
-            if ($this->_errorsFound > 0) {
-                return;
-            }
-        }
-
-        if ($system_file && file_exists($system_file)) {
-            $this->mergeConfigFile($system_file, false, 'system', $strict);
-            if ($this->_errorsFound > 0) {
-                return;
-            }
-
-        }
-
-        if (!$ftp_file) {
-            $ftp_file = $this->get('remote_config');
-        }
-
-        if ($ftp_file && defined('PEAR_REMOTEINSTALL_OK')) {
-            $this->readFTPConfigFile($ftp_file);
-        }
-
-        foreach ($this->configuration_info as $key => $info) {
-            $this->configuration['default'][$key] = $info['default'];
-        }
-
-        $this->_registry['default'] = &new PEAR_Registry($this->configuration['default']['php_dir']);
-        $this->_registry['default']->setConfig($this);
-        $this->_regInitialized['default'] = false;
-        //$GLOBALS['_PEAR_Config_instance'] = &$this;
-    }
-
-    // }}}
-    // {{{ singleton([file], [defaults_file])
-
-    /**
-     * Static singleton method.  If you want to keep only one instance
-     * of this class in use, this method will give you a reference to
-     * the last created PEAR_Config object if one exists, or create a
-     * new object.
-     *
-     * @param string (optional) file to read user-defined options from
-     * @param string (optional) file to read system-wide defaults from
-     *
-     * @return object an existing or new PEAR_Config instance
-     *
-     * @access public
-     *
-     * @see PEAR_Config::PEAR_Config
-     */
-    function &singleton($user_file = '', $system_file = '', $strict = true)
-    {
-        if (is_object($GLOBALS['_PEAR_Config_instance'])) {
-            return $GLOBALS['_PEAR_Config_instance'];
-        }
-
-        $t_conf = &new PEAR_Config($user_file, $system_file, false, $strict);
-        if ($t_conf->_errorsFound > 0) {
-             return $t_conf->lastError;
-        }
-
-        $GLOBALS['_PEAR_Config_instance'] = &$t_conf;
-        return $GLOBALS['_PEAR_Config_instance'];
-    }
-
-    // }}}
-    // {{{ validConfiguration()
-
-    /**
-     * Determine whether any configuration files have been detected, and whether a
-     * registry object can be retrieved from this configuration.
-     * @return bool
-     * @since PEAR 1.4.0a1
-     */
-    function validConfiguration()
-    {
-        if ($this->isDefinedLayer('user') || $this->isDefinedLayer('system')) {
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ readConfigFile([file], [layer])
-
-    /**
-     * Reads configuration data from a file.  All existing values in
-     * the config layer are discarded and replaced with data from the
-     * file.
-     * @param string file to read from, if NULL or not specified, the
-     *               last-used file for the same layer (second param) is used
-     * @param string config layer to insert data into ('user' or 'system')
-     * @return bool TRUE on success or a PEAR error on failure
-     */
-    function readConfigFile($file = null, $layer = 'user', $strict = true)
-    {
-        if (empty($this->files[$layer])) {
-            return $this->raiseError("unknown config layer `$layer'");
-        }
-
-        if ($file === null) {
-            $file = $this->files[$layer];
-        }
-
-        $data = $this->_readConfigDataFrom($file);
-
-        if (PEAR::isError($data)) {
-            if ($strict) {
-                $this->_errorsFound++;
-                $this->lastError = $data;
-
-                return $data;
-            } else {
-                return true;
-            }
-        } else {
-            $this->files[$layer] = $file;
-        }
-
-        $this->_decodeInput($data);
-        $this->configuration[$layer] = $data;
-        $this->_setupChannels();
-        if (!$this->_noRegistry && ($phpdir = $this->get('php_dir', $layer, 'pear.php.net'))) {
-            $this->_registry[$layer] = &new PEAR_Registry($phpdir);
-            $this->_registry[$layer]->setConfig($this);
-            $this->_regInitialized[$layer] = false;
-        } else {
-            unset($this->_registry[$layer]);
-        }
-        return true;
-    }
-
-    // }}}
-
-    /**
-     * @param string url to the remote config file, like ftp://www.example.com/pear/config.ini
-     * @return true|PEAR_Error
-     */
-    function readFTPConfigFile($path)
-    {
-        do { // poor man's try
-            if (!class_exists('PEAR_FTP')) {
-                if (!class_exists('PEAR_Common')) {
-                    require_once 'PEAR/Common.php';
-                }
-                if (PEAR_Common::isIncludeable('PEAR/FTP.php')) {
-                    require_once 'PEAR/FTP.php';
-                }
-            }
-            if (class_exists('PEAR_FTP')) {
-                $this->_ftp = &new PEAR_FTP;
-                $this->_ftp->pushErrorHandling(PEAR_ERROR_RETURN);
-                $e = $this->_ftp->init($path);
-                if (PEAR::isError($e)) {
-                    $this->_ftp->popErrorHandling();
-                    return $e;
-                }
-                $tmp = System::mktemp('-d');
-                PEAR_Common::addTempFile($tmp);
-                $e = $this->_ftp->get(basename($path), $tmp . DIRECTORY_SEPARATOR .
-                    'pear.ini', false, FTP_BINARY);
-                if (PEAR::isError($e)) {
-                    $this->_ftp->popErrorHandling();
-                    return $e;
-                }
-                PEAR_Common::addTempFile($tmp . DIRECTORY_SEPARATOR . 'pear.ini');
-                $this->_ftp->disconnect();
-                $this->_ftp->popErrorHandling();
-                $this->files['ftp'] = $tmp . DIRECTORY_SEPARATOR . 'pear.ini';
-                $e = $this->readConfigFile(null, 'ftp');
-                if (PEAR::isError($e)) {
-                    return $e;
-                }
-                $fail = array();
-                foreach ($this->configuration_info as $key => $val) {
-                    if (in_array($this->getGroup($key),
-                          array('File Locations', 'File Locations (Advanced)')) &&
-                          $this->getType($key) == 'directory') {
-                        // any directory configs must be set for this to work
-                        if (!isset($this->configuration['ftp'][$key])) {
-                            $fail[] = $key;
-                        }
-                    }
-                }
-                if (count($fail)) {
-                    $fail = '"' . implode('", "', $fail) . '"';
-                    unset($this->files['ftp']);
-                    unset($this->configuration['ftp']);
-                    return PEAR::raiseError('ERROR: Ftp configuration file must set all ' .
-                        'directory configuration variables.  These variables were not set: ' .
-                        $fail);
-                } else {
-                    return true;
-                }
-            } else {
-                return PEAR::raiseError('Net_FTP must be installed to use remote config');
-            }
-        } while (false); // poor man's catch
-        unset($this->files['ftp']);
-        return PEAR::raiseError('no remote host specified');
-    }
-
-    // {{{ _setupChannels()
-    
-    /**
-     * Reads the existing configurations and creates the _channels array from it
-     */
-    function _setupChannels()
-    {
-        $set = array_flip(array_values($this->_channels));
-        foreach ($this->configuration as $layer => $data) {
-            $i = 1000;
-            if (isset($data['__channels'])) {
-                foreach ($data['__channels'] as $channel => $info) {
-                    $set[$channel] = $i++;
-                }
-            }
-        }
-        $this->_channels = array_values(array_flip($set));
-        $this->setChannels($this->_channels);
-    }
-
-    // }}}
-    // {{{ deleteChannel(channel)
-
-    function deleteChannel($channel)
-    {
-        foreach ($this->configuration as $layer => $data) {
-            if (isset($data['__channels'])) {
-                if (isset($data['__channels'][strtolower($channel)])) {
-                    unset($this->configuration[$layer]['__channels'][strtolower($channel)]);
-                }
-            }
-        }
-        $this->_channels = array_flip($this->_channels);
-        unset($this->_channels[strtolower($channel)]);
-        $this->_channels = array_flip($this->_channels);
-    }
-
-    // }}}
-    // {{{ mergeConfigFile(file, [override], [layer])
-
-    /**
-     * Merges data into a config layer from a file.  Does the same
-     * thing as readConfigFile, except it does not replace all
-     * existing values in the config layer.
-     * @param string file to read from
-     * @param bool whether to overwrite existing data (default TRUE)
-     * @param string config layer to insert data into ('user' or 'system')
-     * @param string if true, errors are returned if file opening fails
-     * @return bool TRUE on success or a PEAR error on failure
-     */
-    function mergeConfigFile($file, $override = true, $layer = 'user', $strict = true)
-    {
-        if (empty($this->files[$layer])) {
-            return $this->raiseError("unknown config layer `$layer'");
-        }
-        if ($file === null) {
-            $file = $this->files[$layer];
-        }
-        $data = $this->_readConfigDataFrom($file);
-        if (PEAR::isError($data)) {
-            if ($strict) {
-                $this->_errorsFound++;
-                $this->lastError = $data;
-
-                return $data;
-            } else {
-                return true;
-            }
-        }
-        $this->_decodeInput($data);
-        if ($override) {
-            $this->configuration[$layer] =
-                PEAR_Config::arrayMergeRecursive($this->configuration[$layer], $data);
-        } else {
-            $this->configuration[$layer] =
-                PEAR_Config::arrayMergeRecursive($data, $this->configuration[$layer]);
-        }
-        $this->_setupChannels();
-        if (!$this->_noRegistry && ($phpdir = $this->get('php_dir', $layer, 'pear.php.net'))) {
-            $this->_registry[$layer] = &new PEAR_Registry($phpdir);
-            $this->_registry[$layer]->setConfig($this);
-            $this->_regInitialized[$layer] = false;
-        } else {
-            unset($this->_registry[$layer]);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ arrayMergeRecursive($arr2, $arr1)
-    /**
-     * @param array
-     * @param array
-     * @return array
-     * @static
-     */
-    function arrayMergeRecursive($arr2, $arr1)
-    {
-        $ret = array();
-        foreach ($arr2 as $key => $data) {
-            if (!isset($arr1[$key])) {
-                $ret[$key] = $data;
-                unset($arr1[$key]);
-                continue;
-            }
-            if (is_array($data)) {
-                if (!is_array($arr1[$key])) {
-                    $ret[$key] = $arr1[$key];
-                    unset($arr1[$key]);
-                    continue;
-                }
-                $ret[$key] = PEAR_Config::arrayMergeRecursive($arr1[$key], $arr2[$key]);
-                unset($arr1[$key]);
-            }
-        }
-        return array_merge($ret, $arr1);
-    }
-
-    // }}}
-    // {{{ writeConfigFile([file], [layer])
-
-    /**
-     * Writes data into a config layer from a file.
-     *
-     * @param string|null file to read from, or null for default
-     * @param string config layer to insert data into ('user' or
-     *               'system')
-     * @param string|null data to write to config file or null for internal data [DEPRECATED]
-     * @return bool TRUE on success or a PEAR error on failure
-     */
-    function writeConfigFile($file = null, $layer = 'user', $data = null)
-    {
-        $this->_lazyChannelSetup($layer);
-        if ($layer == 'both' || $layer == 'all') {
-            foreach ($this->files as $type => $file) {
-                $err = $this->writeConfigFile($file, $type, $data);
-                if (PEAR::isError($err)) {
-                    return $err;
-                }
-            }
-            return true;
-        }
-        if (empty($this->files[$layer])) {
-            return $this->raiseError("unknown config file type `$layer'");
-        }
-        if ($file === null) {
-            $file = $this->files[$layer];
-        }
-        $data = ($data === null) ? $this->configuration[$layer] : $data;
-        $this->_encodeOutput($data);
-        $opt = array('-p', dirname($file));
-        if (!@System::mkDir($opt)) {
-            return $this->raiseError("could not create directory: " . dirname($file));
-        }
-        if (file_exists($file) && is_file($file) && !is_writeable($file)) {
-            return $this->raiseError("no write access to $file!");
-        }
-        $fp = @fopen($file, "w");
-        if (!$fp) {
-            return $this->raiseError("PEAR_Config::writeConfigFile fopen('$file','w') failed ($php_errormsg)");
-        }
-        $contents = "#PEAR_Config 0.9\n" . serialize($data);
-        if (!@fwrite($fp, $contents)) {
-            return $this->raiseError("PEAR_Config::writeConfigFile: fwrite failed ($php_errormsg)");
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ _readConfigDataFrom(file)
-
-    /**
-     * Reads configuration data from a file and returns the parsed data
-     * in an array.
-     *
-     * @param string file to read from
-     *
-     * @return array configuration data or a PEAR error on failure
-     *
-     * @access private
-     */
-    function _readConfigDataFrom($file)
-    {
-        $fp = false;
-        if (file_exists($file)) {
-            $fp = @fopen($file, "r");
-        }
-        if (!$fp) {
-            return $this->raiseError("PEAR_Config::readConfigFile fopen('$file','r') failed");
-        }
-        $size = filesize($file);
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        fclose($fp);
-        $contents = file_get_contents($file);
-        if (empty($contents)) {
-            return $this->raiseError('Configuration file "' . $file . '" is empty');
-        }
-        
-        set_magic_quotes_runtime($rt);
-
-        $version = false;
-        if (preg_match('/^#PEAR_Config\s+(\S+)\s+/si', $contents, $matches)) {
-            $version = $matches[1];
-            $contents = substr($contents, strlen($matches[0]));
-        } else {
-            // Museum config file
-            if (substr($contents,0,2) == 'a:') {
-                $version = '0.1';
-            }
-        }
-        if ($version && version_compare("$version", '1', '<')) {
-
-            // no '@', it is possible that unserialize
-            // raises a notice but it seems to block IO to
-            // STDOUT if a '@' is used and a notice is raise
-            $data = unserialize($contents);
-
-            if (!is_array($data) && !$data) {
-                if ($contents == serialize(false)) {
-                    $data = array();
-                } else {
-                    $err = $this->raiseError("PEAR_Config: bad data in $file");
-                    return $err;
-                }
-            }
-            if (!is_array($data)) {
-                if (strlen(trim($contents)) > 0) {
-                    $error = "PEAR_Config: bad data in $file";
-                    $err = $this->raiseError($error);
-                    return $err;
-                } else {
-                    $data = array();
-                }
-            }
-        // add parsing of newer formats here...
-        } else {
-            $err = $this->raiseError("$file: unknown version `$version'");
-            return $err; 
-        }
-        return $data;
-    }
-
-    // }}}
-    // {{{ getConfFile(layer)
-    /**
-    * Gets the file used for storing the config for a layer
-    *
-    * @param string $layer 'user' or 'system'
-    */
-
-    function getConfFile($layer)
-    {
-        return $this->files[$layer];
-    }
-
-    // }}}
-
-    /**
-     * @param array information on a role as parsed from its xml file
-     * @return true|PEAR_Error
-     * @access private
-     */
-    function _addConfigVars($vars)
-    {
-        if (count($vars) > 3) {
-            return $this->raiseError('Roles can only define 3 new config variables or less');
-        }
-        foreach ($vars as $name => $var) {
-            if (!is_array($var)) {
-                return $this->raiseError('Configuration information must be an array');
-            }
-            if (!isset($var['type'])) {
-                return $this->raiseError('Configuration information must contain a type');
-            } else {
-                if (!in_array($var['type'],
-                      array('string', 'mask', 'password', 'directory', 'file', 'set'))) {
-                    return $this->raiseError(
-                        'Configuration type must be one of directory, file, string, ' .
-                        'mask, set, or password');
-                }
-            }
-            if (!isset($var['default'])) {
-                return $this->raiseError(
-                    'Configuration information must contain a default value ("default" index)');
-            } else {
-                if (is_array($var['default'])) {
-                    $real_default = '';
-                    foreach ($var['default'] as $config_var => $val) {
-                        if (strpos($config_var, 'text') === 0) {
-                            $real_default .= $val;
-                        } elseif (strpos($config_var, 'constant') === 0) {
-                            if (defined($val)) {
-                                $real_default .= constant($val);
-                            } else {
-                                return $this->raiseError(
-                                    'Unknown constant "' . $val . '" requested in ' .
-                                    'default value for configuration variable "' .
-                                    $name . '"');
-                            }
-                        } elseif (isset($this->configuration_info[$config_var])) {
-                            $real_default .=
-                                $this->configuration_info[$config_var]['default'];
-                        } else {
-                            return $this->raiseError(
-                                'Unknown request for "' . $config_var . '" value in ' .
-                                'default value for configuration variable "' .
-                                $name . '"');
-                        }
-                    }
-                    $var['default'] = $real_default;
-                }
-                if ($var['type'] == 'integer') {
-                    $var['default'] = (integer) $var['default'];
-                }
-            }
-            if (!isset($var['doc'])) {
-                return $this->raiseError(
-                    'Configuration information must contain a summary ("doc" index)');
-            }
-            if (!isset($var['prompt'])) {
-                return $this->raiseError(
-                    'Configuration information must contain a simple prompt ("prompt" index)');
-            }
-            if (!isset($var['group'])) {
-                return $this->raiseError(
-                    'Configuration information must contain a simple group ("group" index)');
-            }
-            if (isset($this->configuration_info[$name])) {
-                return $this->raiseError('Configuration variable "' . $name .
-                    '" already exists');
-            }
-            $this->configuration_info[$name] = $var;
-            // fix bug #7351: setting custom config variable in a channel fails
-            $this->_channelConfigInfo[] = $name;
-        }
-        return true;
-    }
-
-    // {{{ _encodeOutput(&data)
-
-    /**
-     * Encodes/scrambles configuration data before writing to files.
-     * Currently, 'password' values will be base64-encoded as to avoid
-     * that people spot cleartext passwords by accident.
-     *
-     * @param array (reference) array to encode values in
-     *
-     * @return bool TRUE on success
-     *
-     * @access private
-     */
-    function _encodeOutput(&$data)
-    {
-        foreach ($data as $key => $value) {
-            if ($key == '__channels') {
-                foreach ($data['__channels'] as $channel => $blah) {
-                    $this->_encodeOutput($data['__channels'][$channel]);
-                }
-            }
-            if (!isset($this->configuration_info[$key])) {
-                continue;
-            }
-            $type = $this->configuration_info[$key]['type'];
-            switch ($type) {
-                // we base64-encode passwords so they are at least
-                // not shown in plain by accident
-                case 'password': {
-                    $data[$key] = base64_encode($data[$key]);
-                    break;
-                }
-                case 'mask': {
-                    $data[$key] = octdec($data[$key]);
-                    break;
-                }
-            }
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ _decodeInput(&data)
-
-    /**
-     * Decodes/unscrambles configuration data after reading from files.
-     *
-     * @param array (reference) array to encode values in
-     *
-     * @return bool TRUE on success
-     *
-     * @access private
-     *
-     * @see PEAR_Config::_encodeOutput
-     */
-    function _decodeInput(&$data)
-    {
-        if (!is_array($data)) {
-            return true;
-        }
-        foreach ($data as $key => $value) {
-            if ($key == '__channels') {
-                foreach ($data['__channels'] as $channel => $blah) {
-                    $this->_decodeInput($data['__channels'][$channel]);
-                }
-            }
-            if (!isset($this->configuration_info[$key])) {
-                continue;
-            }
-            $type = $this->configuration_info[$key]['type'];
-            switch ($type) {
-                case 'password': {
-                    $data[$key] = base64_decode($data[$key]);
-                    break;
-                }
-                case 'mask': {
-                    $data[$key] = decoct($data[$key]);
-                    break;
-                }
-            }
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ getDefaultChannel([layer])
-    /**
-     * Retrieve the default channel.
-     *
-     * On startup, channels are not initialized, so if the default channel is not
-     * pear.php.net, then initialize the config.
-     * @param string registry layer
-     * @return string|false
-     */
-    function getDefaultChannel($layer = null)
-    {
-        $ret = false;
-        if ($layer === null) {
-            foreach ($this->layers as $layer) {
-                if (isset($this->configuration[$layer]['default_channel'])) {
-                    $ret = $this->configuration[$layer]['default_channel'];
-                    break;
-                }
-            }
-        } elseif (isset($this->configuration[$layer]['default_channel'])) {
-            $ret = $this->configuration[$layer]['default_channel'];
-        }
-        if ($ret == 'pear.php.net' && defined('PEAR_RUNTYPE') && PEAR_RUNTYPE == 'pecl') {
-            $ret = 'pecl.php.net';
-        }
-        if ($ret) {
-            if ($ret != 'pear.php.net') {
-                $this->_lazyChannelSetup();
-            }
-            return $ret;
-        }
-        return PEAR_CONFIG_DEFAULT_CHANNEL;
-    }
-
-    // {{{ get(key, [layer])
-    /**
-     * Returns a configuration value, prioritizing layers as per the
-     * layers property.
-     *
-     * @param string config key
-     *
-     * @return mixed the config value, or NULL if not found
-     *
-     * @access public
-     */
-    function get($key, $layer = null, $channel = false)
-    {
-        if (!isset($this->configuration_info[$key])) {
-            return null;
-        }
-        if ($key == '__channels') {
-            return null;
-        }
-        if ($key == 'default_channel') {
-            return $this->getDefaultChannel($layer);
-        }
-        if (!$channel) {
-            $channel = $this->getDefaultChannel();
-        } elseif ($channel != 'pear.php.net') {
-            $this->_lazyChannelSetup();
-        }
-        $channel = strtolower($channel);
-        
-        $test = (in_array($key, $this->_channelConfigInfo)) ?
-            $this->_getChannelValue($key, $layer, $channel) :
-            null;
-        if ($test !== null) {
-            if ($this->_installRoot) {
-                if (in_array($this->getGroup($key),
-                      array('File Locations', 'File Locations (Advanced)')) &&
-                      $this->getType($key) == 'directory') {
-                    return $this->_prependPath($test, $this->_installRoot);
-                }
-            }
-            return $test;
-        }
-        if ($layer === null) {
-            foreach ($this->layers as $layer) {
-                if (isset($this->configuration[$layer][$key])) {
-                    $test = $this->configuration[$layer][$key];
-                    if ($this->_installRoot) {
-                        if (in_array($this->getGroup($key),
-                              array('File Locations', 'File Locations (Advanced)')) &&
-                              $this->getType($key) == 'directory') {
-                            return $this->_prependPath($test, $this->_installRoot);
-                        }
-                    }
-                    if ($key == 'preferred_mirror') {
-                        $reg = &$this->getRegistry();
-                        if (is_object($reg)) {
-                            $chan = &$reg->getChannel($channel);
-                            if (PEAR::isError($chan)) {
-                                return $channel;
-                            }
-                            if (!$chan->getMirror($test) && $chan->getName() != $test) {
-                                return $channel; // mirror does not exist
-                            }
-                        }
-                    }
-                    return $test;
-                }
-            }
-        } elseif (isset($this->configuration[$layer][$key])) {
-            $test = $this->configuration[$layer][$key];
-            if ($this->_installRoot) {
-                if (in_array($this->getGroup($key),
-                      array('File Locations', 'File Locations (Advanced)')) &&
-                      $this->getType($key) == 'directory') {
-                    return $this->_prependPath($test, $this->_installRoot);
-                }
-            }
-            if ($key == 'preferred_mirror') {
-                $reg = &$this->getRegistry();
-                if (is_object($reg)) {
-                    $chan = &$reg->getChannel($channel);
-                    if (PEAR::isError($chan)) {
-                        return $channel;
-                    }
-                    if (!$chan->getMirror($test) && $chan->getName() != $test) {
-                        return $channel; // mirror does not exist
-                    }
-                }
-            }
-            return $test;
-        }
-        return null;
-    }
-
-    // }}}
-    // {{{ _getChannelValue(key, value, [layer])
-    /**
-     * Returns a channel-specific configuration value, prioritizing layers as per the
-     * layers property.
-     *
-     * @param string config key
-     *
-     * @return mixed the config value, or NULL if not found
-     *
-     * @access private
-     */
-    function _getChannelValue($key, $layer, $channel)
-    {
-        if ($key == '__channels' || $channel == 'pear.php.net') {
-            return null;
-        }
-        $ret = null;
-        if ($layer === null) {
-            foreach ($this->layers as $ilayer) {
-                if (isset($this->configuration[$ilayer]['__channels'][$channel][$key])) {
-                    $ret = $this->configuration[$ilayer]['__channels'][$channel][$key];
-                    break;
-                }
-            }
-        } elseif (isset($this->configuration[$layer]['__channels'][$channel][$key])) {
-            $ret = $this->configuration[$layer]['__channels'][$channel][$key];
-        }
-        if ($key == 'preferred_mirror') {
-            if ($ret !== null) {
-                $reg = &$this->getRegistry($layer);
-                if (is_object($reg)) {
-                    $chan = &$reg->getChannel($channel);
-                    if (PEAR::isError($chan)) {
-                        return $channel;
-                    }
-                    if (!$chan->getMirror($ret) && $chan->getName() != $ret) {
-                        return $channel; // mirror does not exist
-                    }
-                }
-                return $ret;
-            }
-            if ($channel != $this->getDefaultChannel($layer)) {
-                return $channel; // we must use the channel name as the preferred mirror
-                                 // if the user has not chosen an alternate
-            } else {
-                return $this->getDefaultChannel($layer);
-            }
-        }
-        return $ret;
-    }
-
-
-    // }}}
-    // {{{ set(key, value, [layer])
-
-    /**
-     * Set a config value in a specific layer (defaults to 'user').
-     * Enforces the types defined in the configuration_info array.  An
-     * integer config variable will be cast to int, and a set config
-     * variable will be validated against its legal values.
-     *
-     * @param string config key
-     * @param string config value
-     * @param string (optional) config layer
-     * @param string channel to set this value for, or null for global value
-     * @return bool TRUE on success, FALSE on failure
-     */
-    function set($key, $value, $layer = 'user', $channel = false)
-    {
-        if ($key == '__channels') {
-            return false;
-        }
-        if (!isset($this->configuration[$layer])) {
-            return false;
-        }
-        if ($key == 'default_channel') {
-            // can only set this value globally
-            $channel = 'pear.php.net';
-            if ($value != 'pear.php.net') {
-                $this->_lazyChannelSetup($layer);
-            }
-        }
-        if ($key == 'preferred_mirror') {
-            if ($channel == '__uri') {
-                return false; // can't set the __uri pseudo-channel's mirror
-            }
-            $reg = &$this->getRegistry($layer);
-            if (is_object($reg)) {
-                $chan = &$reg->getChannel($channel ? $channel : 'pear.php.net');
-                if (PEAR::isError($chan)) {
-                    return false;
-                }
-                if (!$chan->getMirror($value) && $chan->getName() != $value) {
-                    return false; // mirror does not exist
-                }
-            }
-        }
-        if (empty($this->configuration_info[$key])) {
-            return false;
-        }
-        extract($this->configuration_info[$key]);
-        switch ($type) {
-            case 'integer':
-                $value = (int)$value;
-                break;
-            case 'set': {
-                // If a valid_set is specified, require the value to
-                // be in the set.  If there is no valid_set, accept
-                // any value.
-                if ($valid_set) {
-                    reset($valid_set);
-                    if ((key($valid_set) === 0 && !in_array($value, $valid_set)) ||
-                        (key($valid_set) !== 0 && empty($valid_set[$value])))
-                    {
-                        return false;
-                    }
-                }
-                break;
-            }
-        }
-        if (!$channel) {
-            $channel = $this->get('default_channel', null, 'pear.php.net');
-        }
-        if (!in_array($channel, $this->_channels)) {
-            $this->_lazyChannelSetup($layer);
-            $reg = &$this->getRegistry($layer);
-            if ($reg) {
-                $channel = $reg->channelName($channel);
-            }
-            if (!in_array($channel, $this->_channels)) {
-                return false;
-            }
-        }
-        if ($channel != 'pear.php.net') {
-            if (in_array($key, $this->_channelConfigInfo)) {
-                $this->configuration[$layer]['__channels'][$channel][$key] = $value;
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            if ($key == 'default_channel') {
-                if (!isset($reg)) {
-                    $reg = &$this->getRegistry($layer);
-                    if (!$reg) {
-                        $reg = &$this->getRegistry();
-                    }
-                }
-                if ($reg) {
-                    $value = $reg->channelName($value);
-                }
-                if (!$value) {
-                    return false;
-                }
-            }
-        }
-        $this->configuration[$layer][$key] = $value;
-        if ($key == 'php_dir' && !$this->_noRegistry) {
-            if (!isset($this->_registry[$layer]) ||
-                  $value != $this->_registry[$layer]->install_dir) {
-                $this->_registry[$layer] = &new PEAR_Registry($value);
-                $this->_regInitialized[$layer] = false;
-                $this->_registry[$layer]->setConfig($this);
-            }
-        }
-        return true;
-    }
-
-    // }}}
-    function _lazyChannelSetup($uselayer = false)
-    {
-        if ($this->_noRegistry) {
-            return;
-        }
-        $merge = false;
-        foreach ($this->_registry as $layer => $p) {
-            if ($uselayer && $uselayer != $layer) {
-                continue;
-            }
-            if (!$this->_regInitialized[$layer]) {
-                if ($layer == 'default' && isset($this->_registry['user']) ||
-                      isset($this->_registry['system'])) {
-                    // only use the default registry if there are no alternatives
-                    continue;
-                }
-                if (!is_object($this->_registry[$layer])) {
-                    if ($phpdir = $this->get('php_dir', $layer, 'pear.php.net')) {
-                        $this->_registry[$layer] = &new PEAR_Registry($phpdir);
-                        $this->_registry[$layer]->setConfig($this);
-                        $this->_regInitialized[$layer] = false;
-                    } else {
-                        unset($this->_registry[$layer]);
-                        return;
-                    }
-                }
-                $this->setChannels($this->_registry[$layer]->listChannels(), $merge);
-                $this->_regInitialized[$layer] = true;
-                $merge = true;
-            }
-        }
-    }
-    // {{{ setChannels()
-    
-    /**
-     * Set the list of channels.
-     *
-     * This should be set via a call to {@link PEAR_Registry::listChannels()}
-     * @param array
-     * @param bool
-     * @return bool success of operation
-     */
-    function setChannels($channels, $merge = false)
-    {
-        if (!is_array($channels)) {
-            return false;
-        }
-        if ($merge) {
-            $this->_channels = array_merge($this->_channels, $channels);
-        } else {
-            $this->_channels = $channels;
-        }
-        foreach ($channels as $channel) {
-            $channel = strtolower($channel);
-            if ($channel == 'pear.php.net') {
-                continue;
-            }
-            foreach ($this->layers as $layer) {
-                if (!isset($this->configuration[$layer]['__channels'][$channel])
-                      || !is_array($this->configuration[$layer]['__channels'][$channel])) {
-                    $this->configuration[$layer]['__channels'][$channel] = array();
-                }
-            }
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ getType(key)
-
-    /**
-     * Get the type of a config value.
-     *
-     * @param string  config key
-     *
-     * @return string type, one of "string", "integer", "file",
-     * "directory", "set" or "password".
-     *
-     * @access public
-     *
-     */
-    function getType($key)
-    {
-        if (isset($this->configuration_info[$key])) {
-            return $this->configuration_info[$key]['type'];
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ getDocs(key)
-
-    /**
-     * Get the documentation for a config value.
-     *
-     * @param string  config key
-     *
-     * @return string documentation string
-     *
-     * @access public
-     *
-     */
-    function getDocs($key)
-    {
-        if (isset($this->configuration_info[$key])) {
-            return $this->configuration_info[$key]['doc'];
-        }
-        return false;
-    }
-       // }}}
-    // {{{ getPrompt(key)
-
-    /**
-     * Get the short documentation for a config value.
-     *
-     * @param string  config key
-     *
-     * @return string short documentation string
-     *
-     * @access public
-     *
-     */
-    function getPrompt($key)
-    {
-        if (isset($this->configuration_info[$key])) {
-            return $this->configuration_info[$key]['prompt'];
-        }
-        return false;
-    }
-    // }}}
-    // {{{ getGroup(key)
-
-    /**
-     * Get the parameter group for a config key.
-     *
-     * @param string  config key
-     *
-     * @return string parameter group
-     *
-     * @access public
-     *
-     */
-    function getGroup($key)
-    {
-        if (isset($this->configuration_info[$key])) {
-            return $this->configuration_info[$key]['group'];
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ getGroups()
-
-    /**
-     * Get the list of parameter groups.
-     *
-     * @return array list of parameter groups
-     *
-     * @access public
-     *
-     */
-    function getGroups()
-    {
-        $tmp = array();
-        foreach ($this->configuration_info as $key => $info) {
-            $tmp[$info['group']] = 1;
-        }
-        return array_keys($tmp);
-    }
-
-    // }}}
-    // {{{ getGroupKeys()
-
-    /**
-     * Get the list of the parameters in a group.
-     *
-     * @param string $group parameter group
-     *
-     * @return array list of parameters in $group
-     *
-     * @access public
-     *
-     */
-    function getGroupKeys($group)
-    {
-        $keys = array();
-        foreach ($this->configuration_info as $key => $info) {
-            if ($info['group'] == $group) {
-                $keys[] = $key;
-            }
-        }
-        return $keys;
-    }
-
-    // }}}
-    // {{{ getSetValues(key)
-
-    /**
-     * Get the list of allowed set values for a config value.  Returns
-     * NULL for config values that are not sets.
-     *
-     * @param string  config key
-     *
-     * @return array enumerated array of set values, or NULL if the
-     *               config key is unknown or not a set
-     *
-     * @access public
-     *
-     */
-    function getSetValues($key)
-    {
-        if (isset($this->configuration_info[$key]) &&
-            isset($this->configuration_info[$key]['type']) &&
-            $this->configuration_info[$key]['type'] == 'set')
-        {
-            $valid_set = $this->configuration_info[$key]['valid_set'];
-            reset($valid_set);
-            if (key($valid_set) === 0) {
-                return $valid_set;
-            }
-            return array_keys($valid_set);
-        }
-        return null;
-    }
-
-    // }}}
-    // {{{ getKeys()
-
-    /**
-     * Get all the current config keys.
-     *
-     * @return array simple array of config keys
-     *
-     * @access public
-     */
-    function getKeys()
-    {
-        $keys = array();
-        foreach ($this->layers as $layer) {
-            $test = $this->configuration[$layer];
-            if (isset($test['__channels'])) {
-                foreach ($test['__channels'] as $channel => $configs) {
-                    $keys = array_merge($keys, $configs);
-                }
-            }
-            unset($test['__channels']);
-            $keys = array_merge($keys, $test);
-        }
-        return array_keys($keys);
-    }
-
-    // }}}
-    // {{{ remove(key, [layer])
-
-    /**
-     * Remove the a config key from a specific config layer.
-     *
-     * @param string config key
-     *
-     * @param string (optional) config layer
-     *
-     * @return bool TRUE on success, FALSE on failure
-     *
-     * @access public
-     */
-    function remove($key, $layer = 'user')
-    {
-        $channel = $this->getDefaultChannel();
-        if ($channel !== 'pear.php.net') {
-            if (isset($this->configuration[$layer]['__channels'][$channel][$key])) {
-                unset($this->configuration[$layer]['__channels'][$channel][$key]);
-                return true;
-            }
-        }
-        if (isset($this->configuration[$layer][$key])) {
-            unset($this->configuration[$layer][$key]);
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ removeLayer(layer)
-
-    /**
-     * Temporarily remove an entire config layer.  USE WITH CARE!
-     *
-     * @param string config key
-     *
-     * @param string (optional) config layer
-     *
-     * @return bool TRUE on success, FALSE on failure
-     *
-     * @access public
-     */
-    function removeLayer($layer)
-    {
-        if (isset($this->configuration[$layer])) {
-            $this->configuration[$layer] = array();
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ store([layer])
-
-    /**
-     * Stores configuration data in a layer.
-     *
-     * @param string config layer to store
-     *
-     * @return bool TRUE on success, or PEAR error on failure
-     *
-     * @access public
-     */
-    function store($layer = 'user', $data = null)
-    {
-        return $this->writeConfigFile(null, $layer, $data);
-    }
-
-    // }}}
-    // {{{ toDefault(key)
-
-    /**
-     * Unset the user-defined value of a config key, reverting the
-     * value to the system-defined one.
-     *
-     * @param string config key
-     *
-     * @return bool TRUE on success, FALSE on failure
-     *
-     * @access public
-     */
-    function toDefault($key)
-    {
-        trigger_error("PEAR_Config::toDefault() deprecated, use PEAR_Config::remove() instead", E_USER_NOTICE);
-        return $this->remove($key, 'user');
-    }
-
-    // }}}
-    // {{{ definedBy(key)
-
-    /**
-     * Tells what config layer that gets to define a key.
-     *
-     * @param string config key
-     * @param boolean return the defining channel
-     *
-     * @return string|array the config layer, or an empty string if not found.
-     *
-     *         if $returnchannel, the return is an array array('layer' => layername,
-     *         'channel' => channelname), or an empty string if not found
-     *
-     * @access public
-     */
-    function definedBy($key, $returnchannel = false)
-    {
-        foreach ($this->layers as $layer) {
-            $channel = $this->getDefaultChannel();
-            if ($channel !== 'pear.php.net') {
-                if (isset($this->configuration[$layer]['__channels'][$channel][$key])) {
-                    if ($returnchannel) {
-                        return array('layer' => $layer, 'channel' => $channel);
-                    }
-                    return $layer;
-                }
-            }
-            if (isset($this->configuration[$layer][$key])) {
-                if ($returnchannel) {
-                    return array('layer' => $layer, 'channel' => 'pear.php.net');
-                }
-                return $layer;
-            }
-        }
-        return '';
-    }
-
-    // }}}
-    // {{{ isDefaulted(key)
-
-    /**
-     * Tells whether a config value has a system-defined value.
-     *
-     * @param string   config key
-     *
-     * @return bool
-     *
-     * @access public
-     *
-     * @deprecated
-     */
-    function isDefaulted($key)
-    {
-        trigger_error("PEAR_Config::isDefaulted() deprecated, use PEAR_Config::definedBy() instead", E_USER_NOTICE);
-        return $this->definedBy($key) == 'system';
-    }
-
-    // }}}
-    // {{{ isDefined(key)
-
-    /**
-     * Tells whether a given key exists as a config value.
-     *
-     * @param string config key
-     *
-     * @return bool whether  exists in this object
-     *
-     * @access public
-     */
-    function isDefined($key)
-    {
-        foreach ($this->layers as $layer) {
-            if (isset($this->configuration[$layer][$key])) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ isDefinedLayer(key)
-
-    /**
-     * Tells whether a given config layer exists.
-     *
-     * @param string config layer
-     *
-     * @return bool whether  exists in this object
-     *
-     * @access public
-     */
-    function isDefinedLayer($layer)
-    {
-        return isset($this->configuration[$layer]);
-    }
-
-    // }}}
-    // {{{ getLayers()
-
-    /**
-     * Returns the layers defined (except the 'default' one)
-     *
-     * @return array of the defined layers
-     */
-    function getLayers()
-    {
-        $cf = $this->configuration;
-        unset($cf['default']);
-        return array_keys($cf);
-    }
-
-    // }}}
-    // {{{ apiVersion()
-    function apiVersion()
-    {
-        return '1.1';
-    }
-    // }}}
-
-    /**
-     * @return PEAR_Registry
-     */
-    function &getRegistry($use = null)
-    {
-        if ($use === null) {
-            $layer = 'user';
-        } else {
-            $layer = $use;
-        }
-        if (isset($this->_registry[$layer])) {
-            return $this->_registry[$layer];
-        } elseif ($use === null && isset($this->_registry['system'])) {
-            return $this->_registry['system'];
-        } elseif ($use === null && isset($this->_registry['default'])) {
-            return $this->_registry['default'];
-        } elseif ($use) {
-            $a = false;
-            return $a;
-        } else {
-            // only go here if null was passed in
-            echo "CRITICAL ERROR: Registry could not be initialized from any value";
-            exit(1);
-        }
-    }
-    /**
-     * This is to allow customization like the use of installroot
-     * @param PEAR_Registry
-     * @return bool
-     */
-    function setRegistry(&$reg, $layer = 'user')
-    {
-        if ($this->_noRegistry) {
-            return false;
-        }
-        if (!in_array($layer, array('user', 'system'))) {
-            return false;
-        }
-        $this->_registry[$layer] = &$reg;
-        if (is_object($reg)) {
-            $this->_registry[$layer]->setConfig($this);
-        }
-        return true;
-    }
-
-    function noRegistry()
-    {
-        $this->_noRegistry = true;
-    }
-
-    /**
-     * @return PEAR_Remote
-     */
-    function &getRemote()
-    {
-        $remote = &new PEAR_Remote($this);
-        return $remote;
-    }
-
-    /**
-     * @return PEAR_REST
-     */
-    function &getREST($version, $options = array())
-    {
-        $version = str_replace('.', '', $version);
-        if (!class_exists($class = 'PEAR_REST_' . $version)) {
-            require_once 'PEAR/REST/' . $version . '.php';
-        }
-        $remote = &new $class($this, $options);
-        return $remote;
-    }
-
-    /**
-     * The ftp server is set in {@link readFTPConfigFile()}.  It exists only if a
-     * remote configuration file has been specified
-     * @return PEAR_FTP|false
-     */
-    function &getFTP()
-    {
-        if (isset($this->_ftp)) {
-            return $this->_ftp;
-        } else {
-            $a = false;
-            return $a;
-        }
-    }
-
-    // {{{ _prependPath($path, $prepend)
-
-    function _prependPath($path, $prepend)
-    {
-        if (strlen($prepend) > 0) {
-            if (OS_WINDOWS && preg_match('/^[a-z]:/i', $path)) {
-                if (preg_match('/^[a-z]:/i', $prepend)) {
-                    $prepend = substr($prepend, 2);
-                } elseif ($prepend{0} != '\\') {
-                    $prepend = "\\$prepend";
-                }
-                $path = substr($path, 0, 2) . $prepend . substr($path, 2);
-            } else {
-                $path = $prepend . $path;
-            }
-        }
-        return $path;
-    }
-    // }}}
-
-    /**
-     * @param string|false installation directory to prepend to all _dir variables, or false to
-     *                     disable
-     */
-    function setInstallRoot($root)
-    {
-        if (substr($root, -1) == DIRECTORY_SEPARATOR) {
-            $root = substr($root, 0, -1);
-        }
-        $old = $this->_installRoot;
-        $this->_installRoot = $root;
-        if (($old != $root) && !$this->_noRegistry) {
-            foreach (array_keys($this->_registry) as $layer) {
-                if ($layer == 'ftp' || !isset($this->_registry[$layer])) {
-                    continue;
-                }
-                $this->_registry[$layer] =
-                    &new PEAR_Registry($this->get('php_dir', $layer, 'pear.php.net'));
-                $this->_registry[$layer]->setConfig($this);
-                $this->_regInitialized[$layer] = false;
-            }
-        }
-    }
-}
-
-?>
diff --git a/PEAR/Dependency.php b/PEAR/Dependency.php
deleted file mode 100644
index b7b4898..0000000
--- a/PEAR/Dependency.php
+++ /dev/null
@@ -1,495 +0,0 @@
-                             |
-// |          Stig Bakken                                    |
-// +----------------------------------------------------------------------+
-//
-// THIS FILE IS DEPRECATED IN FAVOR OF DEPENDENCY2.PHP, AND IS NOT USED IN THE INSTALLER
-// $Id: Dependency.php,v 1.42 2006/03/26 23:25:56 cellog Exp $
-
-require_once "PEAR.php";
-require_once "OS/Guess.php";
-
-define('PEAR_DEPENDENCY_MISSING',        -1);
-define('PEAR_DEPENDENCY_CONFLICT',       -2);
-define('PEAR_DEPENDENCY_UPGRADE_MINOR',  -3);
-define('PEAR_DEPENDENCY_UPGRADE_MAJOR',  -4);
-define('PEAR_DEPENDENCY_BAD_DEPENDENCY', -5);
-define('PEAR_DEPENDENCY_MISSING_OPTIONAL', -6);
-define('PEAR_DEPENDENCY_CONFLICT_OPTIONAL',       -7);
-define('PEAR_DEPENDENCY_UPGRADE_MINOR_OPTIONAL',  -8);
-define('PEAR_DEPENDENCY_UPGRADE_MAJOR_OPTIONAL',  -9);
-
-/**
- * Dependency check for PEAR packages
- *
- * The class is based on the dependency RFC that can be found at
- * http://cvs.php.net/cvs.php/pearweb/rfc. It requires PHP >= 4.1
- *
- * @author Tomas V.V.Vox 
- * @author Stig Bakken 
- */
-class PEAR_Dependency
-{
-    // {{{ constructor
-    /**
-     * Constructor
-     *
-     * @access public
-     * @param  object Registry object
-     * @return void
-     */
-    function PEAR_Dependency(&$registry)
-    {
-        $this->registry = &$registry;
-    }
-
-    // }}}
-    // {{{ callCheckMethod()
-
-    /**
-    * This method maps the XML dependency definition to the
-    * corresponding one from PEAR_Dependency
-    *
-    * 
    -    * $opts => Array
-    *    (
-    *        [type] => pkg
-    *        [rel] => ge
-    *        [version] => 3.4
-    *        [name] => HTML_Common
-    *        [optional] => false
-    *    )
-    * 
    
-    *
-    * @param  string Error message
-    * @param  array  Options
-    * @return boolean
-    */
-    function callCheckMethod(&$errmsg, $opts)
-    {
-        $rel = isset($opts['rel']) ? $opts['rel'] : 'has';
-        $req = isset($opts['version']) ? $opts['version'] : null;
-        $name = isset($opts['name']) ? $opts['name'] : null;
-        $channel = isset($opts['channel']) ? $opts['channel'] : 'pear.php.net';
-        $opt = (isset($opts['optional']) && $opts['optional'] == 'yes') ?
-            $opts['optional'] : null;
-        $errmsg = '';
-        switch ($opts['type']) {
-            case 'pkg':
-                return $this->checkPackage($errmsg, $name, $req, $rel, $opt, $channel);
-                break;
-            case 'ext':
-                return $this->checkExtension($errmsg, $name, $req, $rel, $opt);
-                break;
-            case 'php':
-                return $this->checkPHP($errmsg, $req, $rel);
-                break;
-            case 'prog':
-                return $this->checkProgram($errmsg, $name);
-                break;
-            case 'os':
-                return $this->checkOS($errmsg, $name);
-                break;
-            case 'sapi':
-                return $this->checkSAPI($errmsg, $name);
-                break;
-            case 'zend':
-                return $this->checkZend($errmsg, $name);
-                break;
-            default:
-                return "'{$opts['type']}' dependency type not supported";
-        }
-    }
-
-    // }}}
-    // {{{ checkPackage()
-
-    /**
-     * Package dependencies check method
-     *
-     * @param string $errmsg    Empty string, it will be populated with an error message, if any
-     * @param string $name      Name of the package to test
-     * @param string $req       The package version required
-     * @param string $relation  How to compare versions with each other
-     * @param bool   $opt       Whether the relationship is optional
-     * @param string $channel   Channel name
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkPackage(&$errmsg, $name, $req = null, $relation = 'has',
-                          $opt = false, $channel = 'pear.php.net')
-    {
-        if (is_string($req) && substr($req, 0, 2) == 'v.') {
-            $req = substr($req, 2);
-        }
-        switch ($relation) {
-            case 'has':
-                if (!$this->registry->packageExists($name, $channel)) {
-                    if ($opt) {
-                        $errmsg = "package `$channel/$name' is recommended to utilize some features.";
-                        return PEAR_DEPENDENCY_MISSING_OPTIONAL;
-                    }
-                    $errmsg = "requires package `$channel/$name'";
-                    return PEAR_DEPENDENCY_MISSING;
-                }
-                return false;
-            case 'not':
-                if ($this->registry->packageExists($name, $channel)) {
-                    $errmsg = "conflicts with package `$channel/$name'";
-                    return PEAR_DEPENDENCY_CONFLICT;
-                }
-                return false;
-            case 'lt':
-            case 'le':
-            case 'eq':
-            case 'ne':
-            case 'ge':
-            case 'gt':
-                $version = $this->registry->packageInfo($name, 'version', $channel);
-                if (!$this->registry->packageExists($name, $channel)
-                    || !version_compare("$version", "$req", $relation))
-                {
-                    $code = $this->codeFromRelation($relation, $version, $req, $opt);
-                    if ($opt) {
-                        $errmsg = "package `$channel/$name' version " . $this->signOperator($relation) .
-                            " $req is recommended to utilize some features.";
-                        if ($version) {
-                            $errmsg .= "  Installed version is $version";
-                        }
-                        return $code;
-                    }
-                    $errmsg = "requires package `$channel/$name' " .
-                        $this->signOperator($relation) . " $req";
-                    return $code;
-                }
-                return false;
-        }
-        $errmsg = "relation '$relation' with requirement '$req' is not supported (name=$channel/$name)";
-        return PEAR_DEPENDENCY_BAD_DEPENDENCY;
-    }
-
-    // }}}
-    // {{{ checkPackageUninstall()
-
-    /**
-     * Check package dependencies on uninstall
-     *
-     * @param string $error     The resultant error string
-     * @param string $warning   The resultant warning string
-     * @param string $name      Name of the package to test
-     * @param string $channel   Channel name of the package
-     *
-     * @return bool true if there were errors
-     */
-    function checkPackageUninstall(&$error, &$warning, $package, $channel = 'pear.php.net')
-    {
-        $channel = strtolower($channel);
-        $error = null;
-        $channels = $this->registry->listAllPackages();
-        foreach ($channels as $channelname => $packages) {
-            foreach ($packages as $pkg) {
-                if ($pkg == $package && $channel == $channelname) {
-                    continue;
-                }
-                $deps = $this->registry->packageInfo($pkg, 'release_deps', $channel);
-                if (empty($deps)) {
-                    continue;
-                }
-                foreach ($deps as $dep) {
-                    $depchannel = isset($dep['channel']) ? $dep['channel'] : 'pear.php.net';
-                    if ($dep['type'] == 'pkg' && (strcasecmp($dep['name'], $package) == 0) &&
-                          ($depchannel == $channel)) {
-                        if ($dep['rel'] == 'ne') {
-                            continue;
-                        }
-                        if (isset($dep['optional']) && $dep['optional'] == 'yes') {
-                            $warning .= "\nWarning: Package '$depchannel/$pkg' optionally depends on '$channel:/package'";
-                        } else {
-                            $error .= "Package '$depchannel/$pkg' depends on '$channel/$package'\n";
-                        }
-                    }
-                }
-            }
-        }
-        return ($error) ? true : false;
-    }
-
-    // }}}
-    // {{{ checkExtension()
-
-    /**
-     * Extension dependencies check method
-     *
-     * @param string $name        Name of the extension to test
-     * @param string $req_ext_ver Required extension version to compare with
-     * @param string $relation    How to compare versions with eachother
-     * @param bool   $opt         Whether the relationship is optional
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkExtension(&$errmsg, $name, $req = null, $relation = 'has',
-        $opt = false)
-    {
-        if ($relation == 'not') {
-            if (extension_loaded($name)) {
-                $errmsg = "conflicts with  PHP extension '$name'";
-                return PEAR_DEPENDENCY_CONFLICT;
-            } else {
-                return false;
-            }
-        }
-
-        if (!extension_loaded($name)) {
-            if ($relation == 'ne') {
-                return false;
-            }
-            if ($opt) {
-                $errmsg = "'$name' PHP extension is recommended to utilize some features";
-                return PEAR_DEPENDENCY_MISSING_OPTIONAL;
-            }
-            $errmsg = "'$name' PHP extension is not installed";
-            return PEAR_DEPENDENCY_MISSING;
-        }
-        if ($relation == 'has') {
-            return false;
-        }
-        $code = false;
-        if (is_string($req) && substr($req, 0, 2) == 'v.') {
-            $req = substr($req, 2);
-        }
-        $ext_ver = phpversion($name);
-        $operator = $relation;
-        // Force params to be strings, otherwise the comparation will fail (ex. 0.9==0.90)
-        if (!version_compare("$ext_ver", "$req", $operator)) {
-            $errmsg = "'$name' PHP extension version " .
-                $this->signOperator($operator) . " $req is required";
-            $code = $this->codeFromRelation($relation, $ext_ver, $req, $opt);
-            if ($opt) {
-                $errmsg = "'$name' PHP extension version " . $this->signOperator($operator) .
-                    " $req is recommended to utilize some features";
-                return $code;
-            }
-        }
-        return $code;
-    }
-
-    // }}}
-    // {{{ checkOS()
-
-    /**
-     * Operating system  dependencies check method
-     *
-     * @param string $os  Name of the operating system
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkOS(&$errmsg, $os)
-    {
-        // XXX Fixme: Implement a more flexible way, like
-        // comma separated values or something similar to PEAR_OS
-        static $myos;
-        if (empty($myos)) {
-            $myos = new OS_Guess();
-        }
-        // only 'has' relation is currently supported
-        if ($myos->matchSignature($os)) {
-            return false;
-        }
-        $errmsg = "'$os' operating system not supported";
-        return PEAR_DEPENDENCY_CONFLICT;
-    }
-
-    // }}}
-    // {{{ checkPHP()
-
-    /**
-     * PHP version check method
-     *
-     * @param string $req   which version to compare
-     * @param string $relation  how to compare the version
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkPHP(&$errmsg, $req, $relation = 'ge')
-    {
-        // this would be a bit stupid, but oh well :)
-        if ($relation == 'has') {
-            return false;
-        }
-        if ($relation == 'not') {
-            $errmsg = "Invalid dependency - 'not' is allowed when specifying PHP, you must run PHP in PHP";
-            return PEAR_DEPENDENCY_BAD_DEPENDENCY;
-        }
-        if (substr($req, 0, 2) == 'v.') {
-            $req = substr($req,2, strlen($req) - 2);
-        }
-        $php_ver = phpversion();
-        $operator = $relation;
-        if (!version_compare("$php_ver", "$req", $operator)) {
-            $errmsg = "PHP version " . $this->signOperator($operator) .
-                " $req is required";
-            return PEAR_DEPENDENCY_CONFLICT;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ checkProgram()
-
-    /**
-     * External program check method.  Looks for executable files in
-     * directories listed in the PATH environment variable.
-     *
-     * @param string $program   which program to look for
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkProgram(&$errmsg, $program)
-    {
-        // XXX FIXME honor safe mode
-        $exe_suffix = OS_WINDOWS ? '.exe' : '';
-        $path_elements = explode(PATH_SEPARATOR, getenv('PATH'));
-        foreach ($path_elements as $dir) {
-            $file = $dir . DIRECTORY_SEPARATOR . $program . $exe_suffix;
-            if (file_exists($file) && is_executable($file)) {
-                return false;
-            }
-        }
-        $errmsg = "'$program' program is not present in the PATH";
-        return PEAR_DEPENDENCY_MISSING;
-    }
-
-    // }}}
-    // {{{ checkSAPI()
-
-    /**
-     * SAPI backend check method.  Version comparison is not yet
-     * available here.
-     *
-     * @param string $name      name of SAPI backend
-     * @param string $req   which version to compare
-     * @param string $relation  how to compare versions (currently
-     *                          hardcoded to 'has')
-     * @return mixed bool false if no error or the error string
-     */
-    function checkSAPI(&$errmsg, $name, $req = null, $relation = 'has')
-    {
-        // XXX Fixme: There is no way to know if the user has or
-        // not other SAPI backends installed than the installer one
-
-        $sapi_backend = php_sapi_name();
-        // Version comparisons not supported, sapi backends don't have
-        // version information yet.
-        if ($sapi_backend == $name) {
-            return false;
-        }
-        $errmsg = "'$sapi_backend' SAPI backend not supported";
-        return PEAR_DEPENDENCY_CONFLICT;
-    }
-
-    // }}}
-    // {{{ checkZend()
-
-    /**
-     * Zend version check method
-     *
-     * @param string $req   which version to compare
-     * @param string $relation  how to compare the version
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkZend(&$errmsg, $req, $relation = 'ge')
-    {
-        if (substr($req, 0, 2) == 'v.') {
-            $req = substr($req,2, strlen($req) - 2);
-        }
-        $zend_ver = zend_version();
-        $operator = substr($relation,0,2);
-        if (!version_compare("$zend_ver", "$req", $operator)) {
-            $errmsg = "Zend version " . $this->signOperator($operator) .
-                " $req is required";
-            return PEAR_DEPENDENCY_CONFLICT;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ signOperator()
-
-    /**
-     * Converts text comparing operators to them sign equivalents
-     *
-     * Example: 'ge' to '>='
-     *
-     * @access public
-     * @param  string Operator
-     * @return string Sign equivalent
-     */
-    function signOperator($operator)
-    {
-        switch($operator) {
-            case 'lt': return '<';
-            case 'le': return '<=';
-            case 'gt': return '>';
-            case 'ge': return '>=';
-            case 'eq': return '==';
-            case 'ne': return '!=';
-            default:
-                return $operator;
-        }
-    }
-
-    // }}}
-    // {{{ codeFromRelation()
-
-    /**
-     * Convert relation into corresponding code
-     *
-     * @access public
-     * @param  string Relation
-     * @param  string Version
-     * @param  string Requirement
-     * @param  bool   Optional dependency indicator
-     * @return integer
-     */
-    function codeFromRelation($relation, $version, $req, $opt = false)
-    {
-        $code = PEAR_DEPENDENCY_BAD_DEPENDENCY;
-        switch ($relation) {
-            case 'gt': case 'ge': case 'eq':
-                // upgrade
-                $have_major = preg_replace('/\D.*/', '', $version);
-                $need_major = preg_replace('/\D.*/', '', $req);
-                if ($need_major > $have_major) {
-                    $code = $opt ? PEAR_DEPENDENCY_UPGRADE_MAJOR_OPTIONAL :
-                                   PEAR_DEPENDENCY_UPGRADE_MAJOR;
-                } else {
-                    $code = $opt ? PEAR_DEPENDENCY_UPGRADE_MINOR_OPTIONAL :
-                                   PEAR_DEPENDENCY_UPGRADE_MINOR;
-                }
-                break;
-            case 'lt': case 'le': case 'ne':
-                $code = $opt ? PEAR_DEPENDENCY_CONFLICT_OPTIONAL :
-                               PEAR_DEPENDENCY_CONFLICT;
-                break;
-        }
-        return $code;
-    }
-
-    // }}}
-}
-?>
diff --git a/PEAR/Dependency2.php b/PEAR/Dependency2.php
deleted file mode 100644
index a62044a..0000000
--- a/PEAR/Dependency2.php
+++ /dev/null
@@ -1,1202 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Dependency2.php,v 1.51 2006/09/19 04:29:43 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * Required for the PEAR_VALIDATE_* constants
- */
-require_once 'PEAR/Validate.php';
-
-/**
- * Dependency check for PEAR packages
- *
- * This class handles both version 1.0 and 2.0 dependencies
- * WARNING: *any* changes to this class must be duplicated in the
- * test_PEAR_Dependency2 class found in tests/PEAR_Dependency2/setup.php.inc,
- * or unit tests will not actually validate the changes
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Dependency2
-{
-    /**
-     * One of the PEAR_VALIDATE_* states
-     * @see PEAR_VALIDATE_NORMAL
-     * @var integer
-     */
-    var $_state;
-    /**
-     * Command-line options to install/upgrade/uninstall commands
-     * @param array
-     */
-    var $_options;
-    /**
-     * @var OS_Guess
-     */
-    var $_os;
-    /**
-     * @var PEAR_Registry
-     */
-    var $_registry;
-    /**
-     * @var PEAR_Config
-     */
-    var $_config;
-    /**
-     * @var PEAR_DependencyDB
-     */
-    var $_dependencydb;
-    /**
-     * Output of PEAR_Registry::parsedPackageName()
-     * @var array
-     */
-    var $_currentPackage;
-    /**
-     * @param PEAR_Config
-     * @param array installation options
-     * @param array format of PEAR_Registry::parsedPackageName()
-     * @param int installation state (one of PEAR_VALIDATE_*)
-     */
-    function PEAR_Dependency2(&$config, $installoptions, $package,
-                              $state = PEAR_VALIDATE_INSTALLING)
-    {
-        $this->_config = &$config;
-        if (!class_exists('PEAR_DependencyDB')) {
-            require_once 'PEAR/DependencyDB.php';
-        }
-        if (isset($installoptions['packagingroot'])) {
-            // make sure depdb is in the right location
-            $config->setInstallRoot($installoptions['packagingroot']);
-        }
-        $this->_registry = &$config->getRegistry();
-        $this->_dependencydb = &PEAR_DependencyDB::singleton($config);
-        if (isset($installoptions['packagingroot'])) {
-            $config->setInstallRoot(false);
-        }
-        $this->_options = $installoptions;
-        $this->_state = $state;
-        if (!class_exists('OS_Guess')) {
-            require_once 'OS/Guess.php';
-        }
-        $this->_os = new OS_Guess;
-        $this->_currentPackage = $package;
-    }
-
-    function _getExtraString($dep)
-    {
-        $extra = ' (';
-        if (isset($dep['uri'])) {
-            return '';
-        }
-        if (isset($dep['recommended'])) {
-            $extra .= 'recommended version ' . $dep['recommended'];
-        } else {
-            if (isset($dep['min'])) {
-                $extra .= 'version >= ' . $dep['min'];
-            }
-            if (isset($dep['max'])) {
-                if ($extra != ' (') {
-                    $extra .= ', ';
-                }
-                $extra .= 'version <= ' . $dep['max'];
-            }
-            if (isset($dep['exclude'])) {
-                if (!is_array($dep['exclude'])) {
-                    $dep['exclude'] = array($dep['exclude']);
-                }
-                if ($extra != ' (') {
-                    $extra .= ', ';
-                }
-                $extra .= 'excluded versions: ';
-                foreach ($dep['exclude'] as $i => $exclude) {
-                    if ($i) {
-                        $extra .= ', ';
-                    }
-                    $extra .= $exclude;
-                }
-            }
-        }
-        $extra .= ')';
-        if ($extra == ' ()') {
-            $extra = '';
-        }
-        return $extra;
-    }
-
-    /**
-     * This makes unit-testing a heck of a lot easier
-     */
-    function getPHP_OS()
-    {
-        return PHP_OS;
-    }
-
-    /**
-     * This makes unit-testing a heck of a lot easier
-     */
-    function getsysname()
-    {
-        return $this->_os->getSysname();
-    }
-
-    /**
-     * Specify a dependency on an OS.  Use arch for detailed os/processor information
-     *
-     * There are two generic OS dependencies that will be the most common, unix and windows.
-     * Other options are linux, freebsd, darwin (OS X), sunos, irix, hpux, aix
-     */
-    function validateOsDependency($dep)
-    {
-        if ($this->_state != PEAR_VALIDATE_INSTALLING &&
-              $this->_state != PEAR_VALIDATE_DOWNLOADING) {
-            return true;
-        }
-        if (isset($dep['conflicts'])) {
-            $not = true;
-        } else {
-            $not = false;
-        }
-        if ($dep['name'] == '*') {
-            return true;
-        }
-        switch (strtolower($dep['name'])) {
-            case 'windows' :
-                if ($not) {
-                    if (strtolower(substr($this->getPHP_OS(), 0, 3)) == 'win') {
-                        if (!isset($this->_options['nodeps']) &&
-                              !isset($this->_options['force'])) {
-                            return $this->raiseError("Cannot install %s on Windows");
-                        } else {
-                            return $this->warning("warning: Cannot install %s on Windows");
-                        }
-                    }
-                } else {
-                    if (strtolower(substr($this->getPHP_OS(), 0, 3)) != 'win') {
-                        if (!isset($this->_options['nodeps']) &&
-                              !isset($this->_options['force'])) {
-                            return $this->raiseError("Can only install %s on Windows");
-                        } else {
-                            return $this->warning("warning: Can only install %s on Windows");
-                        }
-                    }
-                }
-            break;
-            case 'unix' :
-                $unices = array('linux', 'freebsd', 'darwin', 'sunos', 'irix', 'hpux', 'aix');
-                if ($not) {
-                    if (in_array($this->getSysname(), $unices)) {
-                        if (!isset($this->_options['nodeps']) &&
-                              !isset($this->_options['force'])) {
-                            return $this->raiseError("Cannot install %s on any Unix system");
-                        } else {
-                            return $this->warning(
-                                "warning: Cannot install %s on any Unix system");
-                        }
-                    }
-                } else {
-                    if (!in_array($this->getSysname(), $unices)) {
-                        if (!isset($this->_options['nodeps']) &&
-                              !isset($this->_options['force'])) {
-                            return $this->raiseError("Can only install %s on a Unix system");
-                        } else {
-                            return $this->warning(
-                                "warning: Can only install %s on a Unix system");
-                        }
-                    }
-                }
-            break;
-            default :
-                if ($not) {
-                    if (strtolower($dep['name']) == strtolower($this->getSysname())) {
-                        if (!isset($this->_options['nodeps']) &&
-                              !isset($this->_options['force'])) {
-                            return $this->raiseError('Cannot install %s on ' . $dep['name'] .
-                                ' operating system');
-                        } else {
-                            return $this->warning('warning: Cannot install %s on ' .
-                                $dep['name'] . ' operating system');
-                        }
-                    }
-                } else {
-                    if (strtolower($dep['name']) != strtolower($this->getSysname())) {
-                        if (!isset($this->_options['nodeps']) &&
-                              !isset($this->_options['force'])) {
-                            return $this->raiseError('Cannot install %s on ' .
-                                $this->getSysname() .
-                                ' operating system, can only install on ' . $dep['name']);
-                        } else {
-                            return $this->warning('warning: Cannot install %s on ' .
-                                $this->getSysname() .
-                                ' operating system, can only install on ' . $dep['name']);
-                        }
-                    }
-                }
-        }
-        return true;
-    }
-
-    /**
-     * This makes unit-testing a heck of a lot easier
-     */
-    function matchSignature($pattern)
-    {
-        return $this->_os->matchSignature($pattern);
-    }
-
-    /**
-     * Specify a complex dependency on an OS/processor/kernel version,
-     * Use OS for simple operating system dependency.
-     *
-     * This is the only dependency that accepts an eregable pattern.  The pattern
-     * will be matched against the php_uname() output parsed by OS_Guess
-     */
-    function validateArchDependency($dep)
-    {
-        if ($this->_state != PEAR_VALIDATE_INSTALLING) {
-            return true;
-        }
-        if (isset($dep['conflicts'])) {
-            $not = true;
-        } else {
-            $not = false;
-        }
-        if (!$this->matchSignature($dep['pattern'])) {
-            if (!$not) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s Architecture dependency failed, does not ' .
-                        'match "' . $dep['pattern'] . '"');
-                } else {
-                    return $this->warning('warning: %s Architecture dependency failed, does ' .
-                        'not match "' . $dep['pattern'] . '"');
-                }
-            }
-            return true;
-        } else {
-            if ($not) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s Architecture dependency failed, required "' .
-                        $dep['pattern'] . '"');
-                } else {
-                    return $this->warning('warning: %s Architecture dependency failed, ' .
-                        'required "' . $dep['pattern'] . '"');
-                }
-            }
-            return true;
-        }
-    }
-
-    /**
-     * This makes unit-testing a heck of a lot easier
-     */
-    function extension_loaded($name)
-    {
-        return extension_loaded($name);
-    }
-
-    /**
-     * This makes unit-testing a heck of a lot easier
-     */
-    function phpversion($name = null)
-    {
-        if ($name !== null) {
-            return phpversion($name);
-        } else {
-            return phpversion();
-        }
-    }
-
-    function validateExtensionDependency($dep, $required = true)
-    {
-        if ($this->_state != PEAR_VALIDATE_INSTALLING &&
-              $this->_state != PEAR_VALIDATE_DOWNLOADING) {
-            return true;
-        }
-        $loaded = $this->extension_loaded($dep['name']);
-        $extra = $this->_getExtraString($dep);
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-        }
-        if (!isset($dep['min']) && !isset($dep['max']) &&
-              !isset($dep['recommended']) && !isset($dep['exclude'])) {
-            if ($loaded) {
-                if (isset($dep['conflicts'])) {
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s conflicts with PHP extension "' .
-                            $dep['name'] . '"' . $extra);
-                    } else {
-                        return $this->warning('warning: %s conflicts with PHP extension "' .
-                            $dep['name'] . '"' . $extra);
-                    }
-                }
-                return true;
-            } else {
-                if (isset($dep['conflicts'])) {
-                    return true;
-                }
-                if ($required) {
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s requires PHP extension "' .
-                            $dep['name'] . '"' . $extra);
-                    } else {
-                        return $this->warning('warning: %s requires PHP extension "' .
-                            $dep['name'] . '"' . $extra);
-                    }
-                } else {
-                    return $this->warning('%s can optionally use PHP extension "' .
-                        $dep['name'] . '"' . $extra);
-                }
-            }
-        }
-        if (!$loaded) {
-            if (isset($dep['conflicts'])) {
-                return true;
-            }
-            if (!$required) {
-                return $this->warning('%s can optionally use PHP extension "' .
-                    $dep['name'] . '"' . $extra);
-            } else {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s requires PHP extension "' . $dep['name'] .
-                        '"' . $extra);
-                }
-                    return $this->warning('warning: %s requires PHP extension "' . $dep['name'] .
-                        '"' . $extra);
-            }
-        }
-        $version = (string) $this->phpversion($dep['name']);
-        if (empty($version)) {
-            $version = '0';
-        }
-        $fail = false;
-        if (isset($dep['min'])) {
-            if (!version_compare($version, $dep['min'], '>=')) {
-                $fail = true;
-            }
-        }
-        if (isset($dep['max'])) {
-            if (!version_compare($version, $dep['max'], '<=')) {
-                $fail = true;
-            }
-        }
-        if ($fail && !isset($dep['conflicts'])) {
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('%s requires PHP extension "' . $dep['name'] .
-                    '"' . $extra . ', installed version is ' . $version);
-            } else {
-                return $this->warning('warning: %s requires PHP extension "' . $dep['name'] .
-                    '"' . $extra . ', installed version is ' . $version);
-            }
-        } elseif ((isset($dep['min']) || isset($dep['max'])) && !$fail && isset($dep['conflicts'])) {
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('%s conflicts with PHP extension "' .
-                    $dep['name'] . '"' . $extra . ', installed version is ' . $version);
-            } else {
-                return $this->warning('warning: %s conflicts with PHP extension "' .
-                    $dep['name'] . '"' . $extra . ', installed version is ' . $version);
-            }
-        }
-        if (isset($dep['exclude'])) {
-            foreach ($dep['exclude'] as $exclude) {
-                if (version_compare($version, $exclude, '==')) {
-                    if (isset($dep['conflicts'])) {
-                        continue;
-                    }
-                    if (!isset($this->_options['nodeps']) &&
-                          !isset($this->_options['force'])) {
-                        return $this->raiseError('%s is not compatible with PHP extension "' .
-                            $dep['name'] . '" version ' .
-                            $exclude);
-                    } else {
-                        return $this->warning('warning: %s is not compatible with PHP extension "' .
-                            $dep['name'] . '" version ' .
-                            $exclude);
-                    }
-                } elseif (version_compare($version, $exclude, '!=') && isset($dep['conflicts'])) {
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s conflicts with PHP extension "' .
-                            $dep['name'] . '"' . $extra . ', installed version is ' . $version);
-                    } else {
-                        return $this->warning('warning: %s conflicts with PHP extension "' .
-                            $dep['name'] . '"' . $extra . ', installed version is ' . $version);
-                    }
-                }
-            }
-        }
-        if (isset($dep['recommended'])) {
-            if (version_compare($version, $dep['recommended'], '==')) {
-                return true;
-            } else {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s dependency: PHP extension ' . $dep['name'] .
-                        ' version "' . $version . '"' .
-                        ' is not the recommended version "' . $dep['recommended'] .
-                        '", but may be compatible, use --force to install');
-                } else {
-                    return $this->warning('warning: %s dependency: PHP extension ' .
-                        $dep['name'] . ' version "' . $version . '"' .
-                        ' is not the recommended version "' . $dep['recommended'].'"');
-                }
-            }
-        }
-        return true;
-    }
-
-    function validatePhpDependency($dep)
-    {
-        if ($this->_state != PEAR_VALIDATE_INSTALLING &&
-              $this->_state != PEAR_VALIDATE_DOWNLOADING) {
-            return true;
-        }
-        $version = $this->phpversion();
-        $extra = $this->_getExtraString($dep);
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-        }
-        if (isset($dep['min'])) {
-            if (!version_compare($version, $dep['min'], '>=')) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s requires PHP' .
-                        $extra . ', installed version is ' . $version);
-                } else {
-                    return $this->warning('warning: %s requires PHP' .
-                        $extra . ', installed version is ' . $version);
-                }
-            }
-        }
-        if (isset($dep['max'])) {
-            if (!version_compare($version, $dep['max'], '<=')) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s requires PHP' .
-                        $extra . ', installed version is ' . $version);
-                } else {
-                    return $this->warning('warning: %s requires PHP' .
-                        $extra . ', installed version is ' . $version);
-                }
-            }
-        }
-        if (isset($dep['exclude'])) {
-            foreach ($dep['exclude'] as $exclude) {
-                if (version_compare($version, $exclude, '==')) {
-                    if (!isset($this->_options['nodeps']) &&
-                          !isset($this->_options['force'])) {
-                        return $this->raiseError('%s is not compatible with PHP version ' .
-                            $exclude);
-                    } else {
-                        return $this->warning(
-                            'warning: %s is not compatible with PHP version ' .
-                            $exclude);
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * This makes unit-testing a heck of a lot easier
-     */
-    function getPEARVersion()
-    {
-        return '1.5.0a1';
-    }
-
-    function validatePearinstallerDependency($dep)
-    {
-        $pearversion = $this->getPEARVersion();
-        $extra = $this->_getExtraString($dep);
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-        }
-        if (version_compare($pearversion, $dep['min'], '<')) {
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('%s requires PEAR Installer' . $extra .
-                    ', installed version is ' . $pearversion);
-            } else {
-                return $this->warning('warning: %s requires PEAR Installer' . $extra .
-                    ', installed version is ' . $pearversion);
-            }
-        }
-        if (isset($dep['max'])) {
-            if (version_compare($pearversion, $dep['max'], '>')) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s requires PEAR Installer' . $extra .
-                        ', installed version is ' . $pearversion);
-                } else {
-                    return $this->warning('warning: %s requires PEAR Installer' . $extra .
-                        ', installed version is ' . $pearversion);
-                }
-            }
-        }
-        if (isset($dep['exclude'])) {
-            if (!isset($dep['exclude'][0])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-            foreach ($dep['exclude'] as $exclude) {
-                if (version_compare($exclude, $pearversion, '==')) {
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s is not compatible with PEAR Installer ' .
-                            'version ' . $exclude);
-                    } else {
-                        return $this->warning('warning: %s is not compatible with PEAR ' .
-                            'Installer version ' . $exclude);
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    function validateSubpackageDependency($dep, $required, $params)
-    {
-        return $this->validatePackageDependency($dep, $required, $params);
-    }
-
-    /**
-     * @param array dependency information (2.0 format)
-     * @param boolean whether this is a required dependency
-     * @param array a list of downloaded packages to be installed, if any
-     * @param boolean if true, then deps on pear.php.net that fail will also check
-     *                against pecl.php.net packages to accomodate extensions that have
-     *                moved to pecl.php.net from pear.php.net
-     */
-    function validatePackageDependency($dep, $required, $params, $depv1 = false)
-    {
-        if ($this->_state != PEAR_VALIDATE_INSTALLING &&
-              $this->_state != PEAR_VALIDATE_DOWNLOADING) {
-            return true;
-        }
-        if (isset($dep['providesextension'])) {
-            if ($this->extension_loaded($dep['providesextension'])) {
-                $save = $dep;
-                $subdep = $dep;
-                $subdep['name'] = $subdep['providesextension'];
-                PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                $ret = $this->validateExtensionDependency($subdep, $required);
-                PEAR::popErrorHandling();
-                if (!PEAR::isError($ret)) {
-                    return true;
-                }
-            }
-        }
-        if ($this->_state == PEAR_VALIDATE_INSTALLING) {
-            return $this->_validatePackageInstall($dep, $required, $depv1);
-        }
-        if ($this->_state == PEAR_VALIDATE_DOWNLOADING) {
-            return $this->_validatePackageDownload($dep, $required, $params, $depv1);
-        }
-    }
-
-    function _validatePackageDownload($dep, $required, $params, $depv1 = false)
-    {
-        $dep['package'] = $dep['name'];
-        if (isset($dep['uri'])) {
-            $dep['channel'] = '__uri';
-        }
-        $depname = $this->_registry->parsedPackageNameToString($dep, true);
-        $found = false;
-        foreach ($params as $param) {
-            if ($param->isEqual(
-                  array('package' => $dep['name'],
-                        'channel' => $dep['channel']))) {
-                $found = true;
-                break;
-            }
-            if ($depv1 && $dep['channel'] == 'pear.php.net') {
-                if ($param->isEqual(
-                  array('package' => $dep['name'],
-                        'channel' => 'pecl.php.net'))) {
-                    $found = true;
-                    break;
-                }
-            }
-        }
-        if (!$found && isset($dep['providesextension'])) {
-            foreach ($params as $param) {
-                if ($param->isExtension($dep['providesextension'])) {
-                    $found = true;
-                    break;
-                }
-            }
-        }
-        if ($found) {
-            $version = $param->getVersion();
-            $installed = false;
-            $downloaded = true;
-        } else {
-            if ($this->_registry->packageExists($dep['name'], $dep['channel'])) {
-                $installed = true;
-                $downloaded = false;
-                $version = $this->_registry->packageinfo($dep['name'], 'version',
-                    $dep['channel']);
-            } else {
-                if ($dep['channel'] == 'pecl.php.net' && $this->_registry->packageExists($dep['name'],
-                      'pear.php.net')) {
-                    $installed = true;
-                    $downloaded = false;
-                    $version = $this->_registry->packageinfo($dep['name'], 'version',
-                        'pear.php.net');
-                } else {
-                    $version = 'not installed or downloaded';
-                    $installed = false;
-                    $downloaded = false;
-                }
-            }
-        }
-        $extra = $this->_getExtraString($dep);
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-        }
-        if (!isset($dep['min']) && !isset($dep['max']) &&
-              !isset($dep['recommended']) && !isset($dep['exclude'])) {
-            if ($installed || $downloaded) {
-                $installed = $installed ? 'installed' : 'downloaded';
-                if (isset($dep['conflicts'])) {
-                    if ($version) {
-                        $rest = ", $installed version is " . $version;
-                    } else {
-                        $rest = '';
-                    }
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s conflicts with package "' . $depname . '"' .
-                            $extra . $rest);
-                    } else {
-                        return $this->warning('warning: %s conflicts with package "' . $depname . '"' .
-                            $extra . $rest);
-                    }
-                }
-                return true;
-            } else {
-                if (isset($dep['conflicts'])) {
-                    return true;
-                }
-                if ($required) {
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s requires package "' . $depname . '"' .
-                            $extra);
-                    } else {
-                        return $this->warning('warning: %s requires package "' . $depname . '"' .
-                            $extra);
-                    }
-                } else {
-                    return $this->warning('%s can optionally use package "' . $depname . '"' .
-                        $extra);
-                }
-            }
-        }
-        if (!$installed && !$downloaded) {
-            if (isset($dep['conflicts'])) {
-                return true;
-            }
-            if ($required) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s requires package "' . $depname . '"' .
-                        $extra);
-                } else {
-                    return $this->warning('warning: %s requires package "' . $depname . '"' .
-                        $extra);
-                }
-            } else {
-                return $this->warning('%s can optionally use package "' . $depname . '"' .
-                    $extra);
-            }
-        }
-        $fail = false;
-        if (isset($dep['min'])) {
-            if (version_compare($version, $dep['min'], '<')) {
-                $fail = true;
-            }
-        }
-        if (isset($dep['max'])) {
-            if (version_compare($version, $dep['max'], '>')) {
-                $fail = true;
-            }
-        }
-        if ($fail && !isset($dep['conflicts'])) {
-            $installed = $installed ? 'installed' : 'downloaded';
-            $dep['package'] = $dep['name'];
-            $dep = $this->_registry->parsedPackageNameToString($dep, true);
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('%s requires package "' . $depname . '"' .
-                    $extra . ", $installed version is " . $version);
-            } else {
-                return $this->warning('warning: %s requires package "' . $depname . '"' .
-                    $extra . ", $installed version is " . $version);
-            }
-        } elseif ((isset($dep['min']) || isset($dep['max'])) && !$fail &&
-              isset($dep['conflicts']) && !isset($dep['exclude'])) {
-            $installed = $installed ? 'installed' : 'downloaded';
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('%s conflicts with package "' . $depname . '"' . $extra .
-                    ", $installed version is " . $version);
-            } else {
-                return $this->warning('warning: %s conflicts with package "' . $depname . '"' .
-                    $extra . ", $installed version is " . $version);
-            }
-        }
-        if (isset($dep['exclude'])) {
-            $installed = $installed ? 'installed' : 'downloaded';
-            foreach ($dep['exclude'] as $exclude) {
-                if (version_compare($version, $exclude, '==') && !isset($dep['conflicts'])) {
-                    if (!isset($this->_options['nodeps']) &&
-                          !isset($this->_options['force'])) {
-                        return $this->raiseError('%s is not compatible with ' .
-                            $installed . ' package "' .
-                            $depname . '" version ' .
-                            $exclude);
-                    } else {
-                        return $this->warning('warning: %s is not compatible with ' .
-                            $installed . ' package "' .
-                            $depname . '" version ' .
-                            $exclude);
-                    }
-                } elseif (version_compare($version, $exclude, '!=') && isset($dep['conflicts'])) {
-                    $installed = $installed ? 'installed' : 'downloaded';
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s conflicts with package "' . $depname . '"' .
-                            $extra . ", $installed version is " . $version);
-                    } else {
-                        return $this->warning('warning: %s conflicts with package "' . $depname . '"' .
-                            $extra . ", $installed version is " . $version);
-                    }
-                }
-            }
-        }
-        if (isset($dep['recommended'])) {
-            $installed = $installed ? 'installed' : 'downloaded';
-            if (version_compare($version, $dep['recommended'], '==')) {
-                return true;
-            } else {
-                if (!$found && $installed) {
-                    $param = $this->_registry->getPackage($dep['name'], $dep['channel']);
-                }
-                if ($param) {
-                    $found = false;
-                    foreach ($params as $parent) {
-                        if ($parent->isEqual($this->_currentPackage)) {
-                            $found = true;
-                            break;
-                        }
-                    }
-                    if ($found) {
-                        if ($param->isCompatible($parent)) {
-                            return true;
-                        }
-                    } else { // this is for validPackage() calls
-                        $parent = $this->_registry->getPackage($this->_currentPackage['package'],
-                            $this->_currentPackage['channel']);
-                        if ($parent !== null) {
-                            if ($param->isCompatible($parent)) {
-                                return true;
-                            }
-                        }
-                    }
-                }
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force']) &&
-                      !isset($this->_options['loose'])) {
-                    return $this->raiseError('%s dependency package "' . $depname .
-                        '" ' . $installed . ' version ' . $version . 
-                        ' is not the recommended version ' . $dep['recommended'] .
-                        ', but may be compatible, use --force to install');
-                } else {
-                    return $this->warning('warning: %s dependency package "' . $depname .
-                        '" ' . $installed . ' version ' . $version .
-                        ' is not the recommended version ' . $dep['recommended']);
-                }
-            }
-        }
-        return true;
-    }
-
-    function _validatePackageInstall($dep, $required, $depv1 = false)
-    {
-        return $this->_validatePackageDownload($dep, $required, array(), $depv1);
-    }
-
-    /**
-     * Verify that uninstalling packages passed in to command line is OK.
-     *
-     * @param PEAR_Installer $dl
-     * @return PEAR_Error|true
-     */
-    function validatePackageUninstall(&$dl)
-    {
-        if (PEAR::isError($this->_dependencydb)) {
-            return $this->_dependencydb;
-        }
-        $params = array();
-        // construct an array of "downloaded" packages to fool the package dependency checker
-        // into using these to validate uninstalls of circular dependencies
-        $downloaded = &$dl->getUninstallPackages();
-        foreach ($downloaded as $i => $pf) {
-            if (!class_exists('PEAR_Downloader_Package')) {
-                require_once 'PEAR/Downloader/Package.php';
-            }
-            $dp = &new PEAR_Downloader_Package($dl);
-            $dp->setPackageFile($downloaded[$i]);
-            $params[$i] = &$dp;
-        }
-        $deps = $this->_dependencydb->getDependentPackageDependencies($this->_currentPackage);
-        $fail = false;
-        if ($deps) {
-            foreach ($deps as $channel => $info) {
-                foreach ($info as $package => $ds) {
-                    foreach ($ds as $d) {
-                        $d['dep']['package'] = $d['dep']['name'];
-                        $checker = &new PEAR_Dependency2($this->_config, $this->_options,
-                            array('channel' => $channel, 'package' => $package), $this->_state);
-                        $dep = $d['dep'];
-                        $required = $d['type'] == 'required';
-                        $ret = $checker->_validatePackageUninstall($dep, $required, $params, $dl);
-                        if (is_array($ret)) {
-                            $dl->log(0, $ret[0]);
-                        } elseif (PEAR::isError($ret)) {
-                            $dl->log(0, $ret->getMessage());
-                            $fail = true;
-                        }
-                    }
-                }
-            }
-        }
-        if ($fail) {
-            if (isset($this->_options['nodeps']) || isset($this->_options['force'])) {
-                return $this->warning(
-                    'warning: %s should not be uninstalled, other installed packages depend ' .
-                    'on this package');
-            } else {
-                return $this->raiseError(
-                    '%s cannot be uninstalled, other installed packages depend on this package');
-            }
-        }
-        return true;
-    }
-
-    function _validatePackageUninstall($dep, $required, $params, &$dl)
-    {
-        $dep['package'] = $dep['name'];
-        $depname = $this->_registry->parsedPackageNameToString($dep, true);
-        $found = false;
-        foreach ($params as $param) {
-            if ($param->isEqual($this->_currentPackage)) {
-                $found = true;
-                break;
-            }
-        }
-        $version = $this->_registry->packageinfo($dep['name'], 'version',
-            $dep['channel']);
-        if (!$version) {
-            return true;
-        }
-        $extra = $this->_getExtraString($dep);
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-        }
-        if (isset($dep['conflicts'])) {
-            return true; // uninstall OK - these packages conflict (probably installed with --force)
-        }
-        if (!isset($dep['min']) && !isset($dep['max'])) {
-            if ($required) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('"' . $depname . '" is required by ' .
-                        'installed package %s' . $extra);
-                } else {
-                    return $this->warning('warning: "' . $depname . '" is required by ' .
-                        'installed package %s' . $extra);
-                }
-            } else {
-                return $this->warning('"' . $depname . '" can be optionally used by ' .
-                        'installed package %s' . $extra);
-            }
-        }
-        $fail = false;
-        if (isset($dep['min'])) {
-            if (version_compare($version, $dep['min'], '>=')) {
-                $fail = true;
-            }
-        }
-        if (isset($dep['max'])) {
-            if (version_compare($version, $dep['max'], '<=')) {
-                $fail = true;
-            }
-        }
-        if ($fail) {
-            if ($found) {
-                if (!isset($dl->___checked[$this->_currentPackage['channel']]
-                      [$this->_currentPackage['package']])) {
-                    $dl->___checked[$this->_currentPackage['channel']]
-                      [$this->_currentPackage['package']] = true;
-                    $deps = $this->_dependencydb->getDependentPackageDependencies(
-                        $this->_currentPackage);
-                    if ($deps) {
-                        foreach ($deps as $channel => $info) {
-                            foreach ($info as $package => $ds) {
-                                foreach ($ds as $d) {
-                                    $d['dep']['package'] = $d['dep']['name'];
-                                    $checker = &new PEAR_Dependency2($this->_config, $this->_options,
-                                        array('channel' => $channel, 'package' => $package),
-                                        $this->_state);
-                                    $dep = $d['dep'];
-                                    $required = $d['type'] == 'required';
-                                    $ret = $checker->_validatePackageUninstall($dep, $required, $params,
-                                        $dl);
-                                    if (PEAR::isError($ret)) {
-                                        $fail = true;
-                                        break 3;
-                                    }
-                                }
-                            }
-                            $fail = false;
-                        }
-                    }
-                } else {
-                    return true;
-                }
-            }
-            if (!$fail) {
-                return true;
-            }
-            if ($required) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError($depname . $extra . ' is required by installed package' .
-                        ' "%s"');
-                } else {
-                    return $this->warning('warning: ' . $depname . $extra .
-                        ' is required by installed package "%s"');
-                }
-            } else {
-                return $this->warning($depname . $extra . ' can be optionally used by installed package' .
-                        ' "%s"');
-            }
-        }
-        return true;
-    }
-
-    /**
-     * validate a downloaded package against installed packages
-     * 
-     * As of PEAR 1.4.3, this will only validate
-     *
-     * @param array|PEAR_Downloader_Package|PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     *              $pkg package identifier (either
-     *                   array('package' => blah, 'channel' => blah) or an array with
-     *                   index 'info' referencing an object)
-     * @param PEAR_Downloader $dl
-     * @param array $params full list of packages to install
-     * @return true|PEAR_Error
-     */
-    function validatePackage($pkg, &$dl, $params = array())
-    {
-        if (is_array($pkg) && isset($pkg['info'])) {
-            $deps = $this->_dependencydb->getDependentPackageDependencies($pkg['info']);
-        } else {
-            $deps = $this->_dependencydb->getDependentPackageDependencies($pkg);
-        }
-        $fail = false;
-        if ($deps) {
-            if (!class_exists('PEAR_Downloader_Package')) {
-                require_once 'PEAR/Downloader/Package.php';
-            }
-            $dp = &new PEAR_Downloader_Package($dl);
-            if (is_object($pkg)) {
-                $dp->setPackageFile($pkg);
-            } else {
-                $dp->setDownloadURL($pkg);
-            }
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            foreach ($deps as $channel => $info) {
-                foreach ($info as $package => $ds) {
-                    foreach ($params as $packd) {
-                        if (strtolower($packd->getPackage()) == strtolower($package) &&
-                              $packd->getChannel() == $channel) {
-                            $dl->log(3, 'skipping installed package check of "' .
-                                        $this->_registry->parsedPackageNameToString(
-                                            array('channel' => $channel, 'package' => $package),
-                                            true) .
-                                        '", version "' . $packd->getVersion() . '" will be ' .
-                                        'downloaded and installed');
-                            continue 2; // jump to next package
-                        }
-                    }
-                    foreach ($ds as $d) {
-                        $checker = &new PEAR_Dependency2($this->_config, $this->_options,
-                            array('channel' => $channel, 'package' => $package), $this->_state);
-                        $dep = $d['dep'];
-                        $required = $d['type'] == 'required';
-                        $ret = $checker->_validatePackageDownload($dep, $required, array(&$dp));
-                        if (is_array($ret)) {
-                            $dl->log(0, $ret[0]);
-                        } elseif (PEAR::isError($ret)) {
-                            $dl->log(0, $ret->getMessage());
-                            $fail = true;
-                        }
-                    }
-                }
-            }
-            PEAR::popErrorHandling();
-        }
-        if ($fail) {
-            return $this->raiseError(
-                '%s cannot be installed, conflicts with installed packages');
-        }
-        return true;
-    }
-
-    /**
-     * validate a package.xml 1.0 dependency
-     */
-    function validateDependency1($dep, $params = array())
-    {
-        if (!isset($dep['optional'])) {
-            $dep['optional'] = 'no';
-        }
-        list($newdep, $type) = $this->normalizeDep($dep);
-        if (!$newdep) {
-            return $this->raiseError("Invalid Dependency");
-        }
-        if (method_exists($this, "validate{$type}Dependency")) {
-            return $this->{"validate{$type}Dependency"}($newdep, $dep['optional'] == 'no',
-                $params, true);
-        }
-    }
-
-    /**
-     * Convert a 1.0 dep into a 2.0 dep
-     */
-    function normalizeDep($dep)
-    {
-        $types = array(
-            'pkg' => 'Package',
-            'ext' => 'Extension',
-            'os' => 'Os',
-            'php' => 'Php'
-        );
-        if (isset($types[$dep['type']])) {
-            $type = $types[$dep['type']];
-        } else {
-            return array(false, false);
-        }
-        $newdep = array();
-        switch ($type) {
-            case 'Package' :
-                $newdep['channel'] = 'pear.php.net';
-            case 'Extension' :
-            case 'Os' :
-                $newdep['name'] = $dep['name'];
-            break;
-        }
-        $dep['rel'] = PEAR_Dependency2::signOperator($dep['rel']);
-        switch ($dep['rel']) {
-            case 'has' :
-                return array($newdep, $type);
-            break;
-            case 'not' :
-                $newdep['conflicts'] = true;
-            break;
-            case '>=' :
-            case '>' :
-                $newdep['min'] = $dep['version'];
-                if ($dep['rel'] == '>') {
-                    $newdep['exclude'] = $dep['version'];
-                }
-            break;
-            case '<=' :
-            case '<' :
-                $newdep['max'] = $dep['version'];
-                if ($dep['rel'] == '<') {
-                    $newdep['exclude'] = $dep['version'];
-                }
-            break;
-            case 'ne' :
-            case '!=' :
-                $newdep['min'] = '0';
-                $newdep['max'] = '100000';
-                $newdep['exclude'] = $dep['version'];
-            break;
-            case '==' :
-                $newdep['min'] = $dep['version'];
-                $newdep['max'] = $dep['version'];
-            break;
-        }
-        if ($type == 'Php') {
-            if (!isset($newdep['min'])) {
-                $newdep['min'] = '4.2.0';
-            }
-            if (!isset($newdep['max'])) {
-                $newdep['max'] = '6.0.0';
-            }
-        }
-        return array($newdep, $type);
-    }
-
-    /**
-     * Converts text comparing operators to them sign equivalents
-     *
-     * Example: 'ge' to '>='
-     *
-     * @access public
-     * @param  string Operator
-     * @return string Sign equivalent
-     */
-    function signOperator($operator)
-    {
-        switch($operator) {
-            case 'lt': return '<';
-            case 'le': return '<=';
-            case 'gt': return '>';
-            case 'ge': return '>=';
-            case 'eq': return '==';
-            case 'ne': return '!=';
-            default:
-                return $operator;
-        }
-    }
-
-    function raiseError($msg)
-    {
-        if (isset($this->_options['ignore-errors'])) {
-            return $this->warning($msg);
-        }
-        return PEAR::raiseError(sprintf($msg, $this->_registry->parsedPackageNameToString(
-            $this->_currentPackage, true)));
-    }
-
-    function warning($msg)
-    {
-        return array(sprintf($msg, $this->_registry->parsedPackageNameToString(
-            $this->_currentPackage, true)));
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/DependencyDB.php b/PEAR/DependencyDB.php
deleted file mode 100644
index cf1d606..0000000
--- a/PEAR/DependencyDB.php
+++ /dev/null
@@ -1,673 +0,0 @@
-
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: DependencyDB.php,v 1.33 2006/05/25 21:40:36 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * Needed for error handling
- */
-require_once 'PEAR.php';
-require_once 'PEAR/Config.php';
-
-/**
- * Track dependency relationships between installed packages
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @author     Tomas V.V.Cox 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_DependencyDB
-{
-    // {{{ properties
-
-    /**
-     * This is initialized by {@link setConfig()}
-     * @var PEAR_Config
-     * @access private
-     */
-    var $_config;
-    /**
-     * This is initialized by {@link setConfig()}
-     * @var PEAR_Registry
-     * @access private
-     */
-    var $_registry;
-    /**
-     * Filename of the dependency DB (usually .depdb)
-     * @var string
-     * @access private
-     */
-    var $_depdb = false;
-    /**
-     * File name of the lockfile (usually .depdblock)
-     * @var string
-     * @access private
-     */
-    var $_lockfile = false;
-    /**
-     * Open file resource for locking the lockfile
-     * @var resource|false
-     * @access private
-     */
-    var $_lockFp = false;
-    /**
-     * API version of this class, used to validate a file on-disk
-     * @var string
-     * @access private
-     */
-    var $_version = '1.0';
-    /**
-     * Cached dependency database file
-     * @var array|null
-     * @access private
-     */
-    var $_cache;
-
-    // }}}
-    // {{{ & singleton()
-
-    /**
-     * Get a raw dependency database.  Calls setConfig() and assertDepsDB()
-     * @param PEAR_Config
-     * @param string|false full path to the dependency database, or false to use default
-     * @return PEAR_DependencyDB|PEAR_Error
-     * @static
-     */
-    function &singleton(&$config, $depdb = false)
-    {
-        if (!isset($GLOBALS['_PEAR_DEPENDENCYDB_INSTANCE']
-              [$config->get('php_dir', null, 'pear.php.net')])) {
-            $a = new PEAR_DependencyDB;
-            $GLOBALS['_PEAR_DEPENDENCYDB_INSTANCE']
-              [$config->get('php_dir', null, 'pear.php.net')] = &$a;
-            $a->setConfig($config, $depdb);
-            if (PEAR::isError($e = $a->assertDepsDB())) {
-                return $e;
-            }
-        }
-        return $GLOBALS['_PEAR_DEPENDENCYDB_INSTANCE']
-              [$config->get('php_dir', null, 'pear.php.net')];
-    }
-
-    /**
-     * Set up the registry/location of dependency DB
-     * @param PEAR_Config|false
-     * @param string|false full path to the dependency database, or false to use default
-     */
-    function setConfig(&$config, $depdb = false)
-    {
-        if (!$config) {
-            $this->_config = &PEAR_Config::singleton();
-        } else {
-            $this->_config = &$config;
-        }
-        $this->_registry = &$this->_config->getRegistry();
-        if (!$depdb) {
-            $this->_depdb = $this->_config->get('php_dir', null, 'pear.php.net') .
-                DIRECTORY_SEPARATOR . '.depdb';
-        } else {
-            $this->_depdb = $depdb;
-        }
-        $this->_lockfile = dirname($this->_depdb) . DIRECTORY_SEPARATOR . '.depdblock';
-    }
-    // }}}
-
-    function hasWriteAccess()
-    {
-        if (!file_exists($this->_depdb)) {
-            $dir = $this->_depdb;
-            while ($dir && $dir != '.') {
-                $dir = dirname($dir); // cd ..
-                if ($dir != '.' && file_exists($dir)) {
-                    if (is_writeable($dir)) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                }
-            }
-            return false;
-        }
-        return is_writeable($this->_depdb);
-    }
-
-    // {{{ assertDepsDB()
-
-    /**
-     * Create the dependency database, if it doesn't exist.  Error if the database is
-     * newer than the code reading it.
-     * @return void|PEAR_Error
-     */
-    function assertDepsDB()
-    {
-        if (!is_file($this->_depdb)) {
-            $this->rebuildDB();
-        } else {
-            $depdb = $this->_getDepDB();
-            // Datatype format has been changed, rebuild the Deps DB
-            if ($depdb['_version'] < $this->_version) {
-                $this->rebuildDB();
-            }
-            if ($depdb['_version']{0} > $this->_version{0}) {
-                return PEAR::raiseError('Dependency database is version ' .
-                    $depdb['_version'] . ', and we are version ' .
-                    $this->_version . ', cannot continue');
-            }
-        }
-    }
-
-    /**
-     * Get a list of installed packages that depend on this package
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2|array
-     * @return array|false
-     */
-    function getDependentPackages(&$pkg)
-    {
-        $data = $this->_getDepDB();
-        if (is_object($pkg)) {
-            $channel = strtolower($pkg->getChannel());
-            $package = strtolower($pkg->getPackage());
-        } else {
-            $channel = strtolower($pkg['channel']);
-            $package = strtolower($pkg['package']);
-        }
-        if (isset($data['packages'][$channel][$package])) {
-            return $data['packages'][$channel][$package];
-        }
-        return false;
-    }
-
-    /**
-     * Get a list of the actual dependencies of installed packages that depend on
-     * a package.
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2|array
-     * @return array|false
-     */
-    function getDependentPackageDependencies(&$pkg)
-    {
-        $data = $this->_getDepDB();
-        if (is_object($pkg)) {
-            $channel = strtolower($pkg->getChannel());
-            $package = strtolower($pkg->getPackage());
-        } else {
-            $channel = strtolower($pkg['channel']);
-            $package = strtolower($pkg['package']);
-        }
-        $depend = $this->getDependentPackages($pkg);
-        if (!$depend) {
-            return false;
-        }
-        $dependencies = array();
-        foreach ($depend as $info) {
-            $temp = $this->getDependencies($info);
-            foreach ($temp as $dep) {
-                if (strtolower($dep['dep']['channel']) == strtolower($channel) &&
-                      strtolower($dep['dep']['name']) == strtolower($package)) {
-                    $dependencies[$info['channel']][$info['package']][] = $dep;
-                }
-            }
-        }
-        return $dependencies;
-    }
-
-    /**
-     * Get a list of dependencies of this installed package
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2|array
-     * @return array|false
-     */
-    function getDependencies(&$pkg)
-    {
-        if (is_object($pkg)) {
-            $channel = strtolower($pkg->getChannel());
-            $package = strtolower($pkg->getPackage());
-        } else {
-            $channel = strtolower($pkg['channel']);
-            $package = strtolower($pkg['package']);
-        }
-        $data = $this->_getDepDB();
-        if (isset($data['dependencies'][$channel][$package])) {
-            return $data['dependencies'][$channel][$package];
-        }
-        return false;
-    }
-
-    /**
-     * Determine whether $parent depends on $child, near or deep
-     * @param array|PEAR_PackageFile_v2|PEAR_PackageFile_v2
-     * @param array|PEAR_PackageFile_v2|PEAR_PackageFile_v2
-     */
-    function dependsOn($parent, $child)
-    {
-        $c = array();
-        $this->_getDepDB();
-        return $this->_dependsOn($parent, $child, $c);
-    }
-    
-    function _dependsOn($parent, $child, &$checked)
-    {
-        if (is_object($parent)) {
-            $channel = strtolower($parent->getChannel());
-            $package = strtolower($parent->getPackage());
-        } else {
-            $channel = strtolower($parent['channel']);
-            $package = strtolower($parent['package']);
-        }
-        if (is_object($child)) {
-            $depchannel = strtolower($child->getChannel());
-            $deppackage = strtolower($child->getPackage());
-        } else {
-            $depchannel = strtolower($child['channel']);
-            $deppackage = strtolower($child['package']);
-        }
-        if (isset($checked[$channel][$package][$depchannel][$deppackage])) {
-            return false; // avoid endless recursion
-        }
-        $checked[$channel][$package][$depchannel][$deppackage] = true;
-        if (!isset($this->_cache['dependencies'][$channel][$package])) {
-            return false;
-        }
-        foreach ($this->_cache['dependencies'][$channel][$package] as $info) {
-            if (isset($info['dep']['uri'])) {
-                if (is_object($child)) {
-                    if ($info['dep']['uri'] == $child->getURI()) {
-                        return true;
-                    }
-                } elseif (isset($child['uri'])) {
-                    if ($info['dep']['uri'] == $child['uri']) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-            if (strtolower($info['dep']['channel']) == strtolower($depchannel) &&
-                  strtolower($info['dep']['name']) == strtolower($deppackage)) {
-                return true;
-            }
-        }
-        foreach ($this->_cache['dependencies'][$channel][$package] as $info) {
-            if (isset($info['dep']['uri'])) {
-                if ($this->_dependsOn(array(
-                        'uri' => $info['dep']['uri'],
-                        'package' => $info['dep']['name']), $child, $checked)) {
-                    return true;
-                }
-            } else {
-                if ($this->_dependsOn(array(
-                        'channel' => $info['dep']['channel'],
-                        'package' => $info['dep']['name']), $child, $checked)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Register dependencies of a package that is being installed or upgraded
-     * @param PEAR_PackageFile_v2|PEAR_PackageFile_v2
-     */
-    function installPackage(&$package)
-    {
-        $data = $this->_getDepDB();
-        unset($this->_cache);
-        $this->_setPackageDeps($data, $package);
-        $this->_writeDepDB($data);
-    }
-
-    /**
-     * Remove dependencies of a package that is being uninstalled, or upgraded.
-     *
-     * Upgraded packages first uninstall, then install
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2|array If an array, then it must have
-     *        indices 'channel' and 'package'
-     */
-    function uninstallPackage(&$pkg)
-    {
-        $data = $this->_getDepDB();
-        unset($this->_cache);
-        if (is_object($pkg)) {
-            $channel = strtolower($pkg->getChannel());
-            $package = strtolower($pkg->getPackage());
-        } else {
-            $channel = strtolower($pkg['channel']);
-            $package = strtolower($pkg['package']);
-        }
-        if (!isset($data['dependencies'][$channel][$package])) {
-            return true;
-        }
-        foreach ($data['dependencies'][$channel][$package] as $dep) {
-            $found = false;
-            if (isset($dep['dep']['uri'])) {
-                $depchannel = '__uri';
-            } else {
-                $depchannel = strtolower($dep['dep']['channel']);
-            }
-            if (isset($data['packages'][$depchannel][strtolower($dep['dep']['name'])])) {
-                foreach ($data['packages'][$depchannel][strtolower($dep['dep']['name'])] as
-                      $i => $info) {
-                    if ($info['channel'] == $channel &&
-                          $info['package'] == $package) {
-                        $found = true;
-                        break;
-                    }
-                }
-            }
-            if ($found) {
-                unset($data['packages'][$depchannel][strtolower($dep['dep']['name'])][$i]);
-                if (!count($data['packages'][$depchannel][strtolower($dep['dep']['name'])])) {
-                    unset($data['packages'][$depchannel][strtolower($dep['dep']['name'])]);
-                    if (!count($data['packages'][$depchannel])) {
-                        unset($data['packages'][$depchannel]);
-                    }
-                } else {
-                    $data['packages'][$depchannel][strtolower($dep['dep']['name'])] =
-                        array_values(
-                            $data['packages'][$depchannel][strtolower($dep['dep']['name'])]);
-                }
-            }
-        }
-        unset($data['dependencies'][$channel][$package]);
-        if (!count($data['dependencies'][$channel])) {
-            unset($data['dependencies'][$channel]);
-        }
-        if (!count($data['dependencies'])) {
-            unset($data['dependencies']);
-        }
-        if (!count($data['packages'])) {
-            unset($data['packages']);
-        }
-        $this->_writeDepDB($data);
-    }
-
-    /**
-     * Rebuild the dependency DB by reading registry entries.
-     * @return true|PEAR_Error
-     */
-    function rebuildDB()
-    {
-        $depdb = array('_version' => $this->_version);
-        if (!$this->hasWriteAccess()) {
-            // allow startup for read-only with older Registry
-            return $depdb;
-        }
-        $packages = $this->_registry->listAllPackages();
-        foreach ($packages as $channel => $ps) {
-            foreach ($ps as $package) {
-                $package = $this->_registry->getPackage($package, $channel);
-                $this->_setPackageDeps($depdb, $package);
-            }
-        }
-        $error = $this->_writeDepDB($depdb);
-        if (PEAR::isError($error)) {
-            return $error;
-        }
-        $this->_cache = $depdb;
-        return true;
-    }
-
-    /**
-     * Register usage of the dependency DB to prevent race conditions
-     * @param int one of the LOCK_* constants
-     * @return true|PEAR_Error
-     * @access private
-     */
-    function _lock($mode = LOCK_EX)
-    {
-        if (!eregi('Windows 9', php_uname())) {
-            if ($mode != LOCK_UN && is_resource($this->_lockFp)) {
-                // XXX does not check type of lock (LOCK_SH/LOCK_EX)
-                return true;
-            }
-            $open_mode = 'w';
-            // XXX People reported problems with LOCK_SH and 'w'
-            if ($mode === LOCK_SH) {
-                if (!file_exists($this->_lockfile)) {
-                    touch($this->_lockfile);
-                } elseif (!is_file($this->_lockfile)) {
-                    return PEAR::raiseError('could not create Dependency lock file, ' .
-                        'it exists and is not a regular file');
-                }
-                $open_mode = 'r';
-            }
-
-            if (!is_resource($this->_lockFp)) {
-                $this->_lockFp = @fopen($this->_lockfile, $open_mode);
-            }
-            if (!is_resource($this->_lockFp)) {
-                return PEAR::raiseError("could not create Dependency lock file" .
-                                         (isset($php_errormsg) ? ": " . $php_errormsg : ""));
-            }
-            if (!(int)flock($this->_lockFp, $mode)) {
-                switch ($mode) {
-                    case LOCK_SH: $str = 'shared';    break;
-                    case LOCK_EX: $str = 'exclusive'; break;
-                    case LOCK_UN: $str = 'unlock';    break;
-                    default:      $str = 'unknown';   break;
-                }
-                return PEAR::raiseError("could not acquire $str lock ($this->_lockfile)");
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Release usage of dependency DB
-     * @return true|PEAR_Error
-     * @access private
-     */
-    function _unlock()
-    {
-        $ret = $this->_lock(LOCK_UN);
-        if (is_resource($this->_lockFp)) {
-            fclose($this->_lockFp);
-        }
-        $this->_lockFp = null;
-        return $ret;
-    }
-
-    /**
-     * Load the dependency database from disk, or return the cache
-     * @return array|PEAR_Error
-     */
-    function _getDepDB()
-    {
-        if (!$this->hasWriteAccess()) {
-            return array('_version' => $this->_version);
-        }
-        if (isset($this->_cache)) {
-            return $this->_cache;
-        }
-        if (!$fp = fopen($this->_depdb, 'r')) {
-            $err = PEAR::raiseError("Could not open dependencies file `".$this->_depdb."'");
-            return $err;
-        }
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        clearstatcache();
-        fclose($fp);
-        $data = unserialize(file_get_contents($this->_depdb));
-        set_magic_quotes_runtime($rt);
-        $this->_cache = $data;
-        return $data;
-    }
-
-    /**
-     * Write out the dependency database to disk
-     * @param array the database
-     * @return true|PEAR_Error
-     * @access private
-     */
-    function _writeDepDB(&$deps)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        if (!$fp = fopen($this->_depdb, 'wb')) {
-            $this->_unlock();
-            return PEAR::raiseError("Could not open dependencies file `".$this->_depdb."' for writing");
-        }
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        fwrite($fp, serialize($deps));
-        set_magic_quotes_runtime($rt);
-        fclose($fp);
-        $this->_unlock();
-        $this->_cache = $deps;
-        return true;
-    }
-
-    /**
-     * Register all dependencies from a package in the dependencies database, in essence
-     * "installing" the package's dependency information
-     * @param array the database
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @access private
-     */
-    function _setPackageDeps(&$data, &$pkg)
-    {
-        $pkg->setConfig($this->_config);
-        if ($pkg->getPackagexmlVersion() == '1.0') {
-            $gen = &$pkg->getDefaultGenerator();
-            $deps = $gen->dependenciesToV2();
-        } else {
-            $deps = $pkg->getDeps(true);
-        }
-        if (!$deps) {
-            return;
-        }
-        $data['dependencies'][strtolower($pkg->getChannel())][strtolower($pkg->getPackage())]
-            = array();
-        if (isset($deps['required']['package'])) {
-            if (!isset($deps['required']['package'][0])) {
-                $deps['required']['package'] = array($deps['required']['package']);
-            }
-            foreach ($deps['required']['package'] as $dep) {
-                $this->_registerDep($data, $pkg, $dep, 'required');
-            }
-        }
-        if (isset($deps['optional']['package'])) {
-            if (!isset($deps['optional']['package'][0])) {
-                $deps['optional']['package'] = array($deps['optional']['package']);
-            }
-            foreach ($deps['optional']['package'] as $dep) {
-                $this->_registerDep($data, $pkg, $dep, 'optional');
-            }
-        }
-        if (isset($deps['required']['subpackage'])) {
-            if (!isset($deps['required']['subpackage'][0])) {
-                $deps['required']['subpackage'] = array($deps['required']['subpackage']);
-            }
-            foreach ($deps['required']['subpackage'] as $dep) {
-                $this->_registerDep($data, $pkg, $dep, 'required');
-            }
-        }
-        if (isset($deps['optional']['subpackage'])) {
-            if (!isset($deps['optional']['subpackage'][0])) {
-                $deps['optional']['subpackage'] = array($deps['optional']['subpackage']);
-            }
-            foreach ($deps['optional']['subpackage'] as $dep) {
-                $this->_registerDep($data, $pkg, $dep, 'optional');
-            }
-        }
-        if (isset($deps['group'])) {
-            if (!isset($deps['group'][0])) {
-                $deps['group'] = array($deps['group']);
-            }
-            foreach ($deps['group'] as $group) {
-                if (isset($group['package'])) {
-                    if (!isset($group['package'][0])) {
-                        $group['package'] = array($group['package']);
-                    }
-                    foreach ($group['package'] as $dep) {
-                        $this->_registerDep($data, $pkg, $dep, 'optional',
-                            $group['attribs']['name']);
-                    }
-                }
-                if (isset($group['subpackage'])) {
-                    if (!isset($group['subpackage'][0])) {
-                        $group['subpackage'] = array($group['subpackage']);
-                    }
-                    foreach ($group['subpackage'] as $dep) {
-                        $this->_registerDep($data, $pkg, $dep, 'optional',
-                            $group['attribs']['name']);
-                    }
-                }
-            }
-        }
-        if ($data['dependencies'][strtolower($pkg->getChannel())]
-              [strtolower($pkg->getPackage())] == array()) {
-            unset($data['dependencies'][strtolower($pkg->getChannel())]
-              [strtolower($pkg->getPackage())]);
-            if (!count($data['dependencies'][strtolower($pkg->getChannel())])) {
-                unset($data['dependencies'][strtolower($pkg->getChannel())]);
-            }
-        }
-    }
-
-    /**
-     * @param array the database
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param array the specific dependency
-     * @param required|optional whether this is a required or an optional dep
-     * @param string|false dependency group this dependency is from, or false for ordinary dep
-     */
-    function _registerDep(&$data, &$pkg, $dep, $type, $group = false)
-    {
-        $info = array(
-            'dep' => $dep,
-            'type' => $type,
-            'group' => $group);
-
-        if (isset($dep['channel'])) {
-            $depchannel = $dep['channel'];
-        } else {
-            $depchannel = '__uri';
-        }
-        $data['dependencies'][strtolower($pkg->getChannel())][strtolower($pkg->getPackage())][]
-            = $info;
-        if (isset($data['packages'][strtolower($depchannel)][strtolower($dep['name'])])) {
-            $found = false;
-            foreach ($data['packages'][strtolower($depchannel)][strtolower($dep['name'])]
-                  as $i => $p) {
-                if ($p['channel'] == strtolower($pkg->getChannel()) &&
-                      $p['package'] == strtolower($pkg->getPackage())) {
-                    $found = true;
-                    break;
-                }
-            }
-            if (!$found) {
-                $data['packages'][strtolower($depchannel)][strtolower($dep['name'])][]
-                    = array('channel' => strtolower($pkg->getChannel()),
-                            'package' => strtolower($pkg->getPackage()));
-            }
-        } else {
-            $data['packages'][strtolower($depchannel)][strtolower($dep['name'])][]
-                = array('channel' => strtolower($pkg->getChannel()),
-                        'package' => strtolower($pkg->getPackage()));
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Downloader.php b/PEAR/Downloader.php
deleted file mode 100644
index 18375a2..0000000
--- a/PEAR/Downloader.php
+++ /dev/null
@@ -1,1580 +0,0 @@
-
- * @author     Stig Bakken 
- * @author     Tomas V. V. Cox 
- * @author     Martin Jansen 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Downloader.php,v 1.115 2006/09/24 22:50:44 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.3.0
- */
-
-/**
- * Needed for constants, extending
- */
-require_once 'PEAR/Common.php';
-
-define('PEAR_INSTALLER_OK',       1);
-define('PEAR_INSTALLER_FAILED',   0);
-define('PEAR_INSTALLER_SKIPPED', -1);
-define('PEAR_INSTALLER_ERROR_NO_PREF_STATE', 2);
-
-/**
- * Administration class used to download anything from the internet (PEAR Packages,
- * static URLs, xml files)
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @author     Stig Bakken 
- * @author     Tomas V. V. Cox 
- * @author     Martin Jansen 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.3.0
- */
-class PEAR_Downloader extends PEAR_Common
-{
-    /**
-     * @var PEAR_Registry
-     * @access private
-     */
-    var $_registry;
-
-    /**
-     * @var PEAR_Remote
-     * @access private
-     */
-    var $_remote;
-
-    /**
-     * Preferred Installation State (snapshot, devel, alpha, beta, stable)
-     * @var string|null
-     * @access private
-     */
-    var $_preferredState;
-
-    /**
-     * Options from command-line passed to Install.
-     *
-     * Recognized options:
    
-     *  - onlyreqdeps   : install all required dependencies as well
-     *  - alldeps       : install all dependencies, including optional
-     *  - installroot   : base relative path to install files in
-     *  - force         : force a download even if warnings would prevent it
-     *  - nocompress    : download uncompressed tarballs
-     * @see PEAR_Command_Install
-     * @access private
-     * @var array
-     */
-    var $_options;
-
-    /**
-     * Downloaded Packages after a call to download().
-     *
-     * Format of each entry:
-     *
-     * 
-     * array('pkg' => 'package_name', 'file' => '/path/to/local/file',
-     *    'info' => array() // parsed package.xml
-     * );
-     * 
-     * @access private
-     * @var array
-     */
-    var $_downloadedPackages = array();
-
-    /**
-     * Packages slated for download.
-     *
-     * This is used to prevent downloading a package more than once should it be a dependency
-     * for two packages to be installed.
-     * Format of each entry:
-     *
-     * 
    -     * array('package_name1' => parsed package.xml, 'package_name2' => parsed package.xml,
-     * );
-     * 
    
-     * @access private
-     * @var array
-     */
-    var $_toDownload = array();
-
-    /**
-     * Array of every package installed, with names lower-cased.
-     *
-     * Format:
-     * 
-     * array('package1' => 0, 'package2' => 1, );
-     * 
-     * @var array
-     */
-    var $_installed = array();
-
-    /**
-     * @var array
-     * @access private
-     */
-    var $_errorStack = array();
-    
-    /**
-     * @var boolean
-     * @access private
-     */
-    var $_internalDownload = false;
-
-    /**
-     * Temporary variable used in sorting packages by dependency in {@link sortPkgDeps()}
-     * @var array
-     * @access private
-     */
-    var $_packageSortTree;
-
-    /**
-     * Temporary directory, or configuration value where downloads will occur
-     * @var string
-     */
-    var $_downloadDir;
-    // {{{ PEAR_Downloader()
-
-    /**
-     * @param PEAR_Frontend_*
-     * @param array
-     * @param PEAR_Config
-     */
-    function PEAR_Downloader(&$ui, $options, &$config)
-    {
-        parent::PEAR_Common();
-        $this->_options = $options;
-        $this->config = &$config;
-        $this->_preferredState = $this->config->get('preferred_state');
-        $this->ui = &$ui;
-        if (!$this->_preferredState) {
-            // don't inadvertantly use a non-set preferred_state
-            $this->_preferredState = null;
-        }
-
-        if (isset($this->_options['installroot'])) {
-            $this->config->setInstallRoot($this->_options['installroot']);
-        }
-        $this->_registry = &$config->getRegistry();
-        $this->_remote = &$config->getRemote();
-
-        if (isset($this->_options['alldeps']) || isset($this->_options['onlyreqdeps'])) {
-            $this->_installed = $this->_registry->listAllPackages();
-            foreach ($this->_installed as $key => $unused) {
-                if (!count($unused)) {
-                    continue;
-                }
-                $strtolower = create_function('$a','return strtolower($a);');
-                array_walk($this->_installed[$key], $strtolower);
-            }
-        }
-    }
-
-    /**
-     * Attempt to discover a channel's remote capabilities from
-     * its server name
-     * @param string
-     * @return boolean
-     */
-    function discover($channel)
-    {
-        $this->log(1, 'Attempting to discover channel "' . $channel . '"...');
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $callback = $this->ui ? array(&$this, '_downloadCallback') : null;
-        if (!class_exists('System')) {
-            require_once 'System.php';
-        }
-        $a = $this->downloadHttp('http://' . $channel . '/channel.xml', $this->ui,
-            System::mktemp(array('-d')), $callback, false);
-        PEAR::popErrorHandling();
-        if (PEAR::isError($a)) {
-            return false;
-        }
-        list($a, $lastmodified) = $a;
-        if (!class_exists('PEAR/ChannelFile.php')) {
-            require_once 'PEAR/ChannelFile.php';
-        }
-        $b = new PEAR_ChannelFile;
-        if ($b->fromXmlFile($a)) {
-            unlink($a);
-            if ($this->config->get('auto_discover')) {
-                $this->_registry->addChannel($b, $lastmodified);
-                $alias = $b->getName();
-                if ($b->getName() == $this->_registry->channelName($b->getAlias())) {
-                    $alias = $b->getAlias();
-                }
-                $this->log(1, 'Auto-discovered channel "' . $channel .
-                    '", alias "' . $alias . '", adding to registry');
-            }
-            return true;
-        }
-        unlink($a);
-        return false;
-    }
-
-    /**
-     * For simpler unit-testing
-     * @param PEAR_Downloader
-     * @return PEAR_Downloader_Package
-     */
-    function &newDownloaderPackage(&$t)
-    {
-        if (!class_exists('PEAR_Downloader_Package')) {
-            require_once 'PEAR/Downloader/Package.php';
-        }
-        $a = &new PEAR_Downloader_Package($t);
-        return $a;
-    }
-
-    /**
-     * For simpler unit-testing
-     * @param PEAR_Config
-     * @param array
-     * @param array
-     * @param int
-     */
-    function &getDependency2Object(&$c, $i, $p, $s)
-    {
-        if (!class_exists('PEAR/Dependency2.php')) {
-            require_once 'PEAR/Dependency2.php';
-        }
-        $z = &new PEAR_Dependency2($c, $i, $p, $s);
-        return $z;
-    }
-
-    function &download($params)
-    {
-        if (!count($params)) {
-            $a = array();
-            return $a;
-        }
-        if (!isset($this->_registry)) {
-            $this->_registry = &$this->config->getRegistry();
-        }
-        if (!isset($this->_remote)) {
-            $this->_remote = &$this->config->getRemote();
-        }
-        $channelschecked = array();
-        // convert all parameters into PEAR_Downloader_Package objects
-        foreach ($params as $i => $param) {
-            $params[$i] = &$this->newDownloaderPackage($this);
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $err = $params[$i]->initialize($param);
-            PEAR::staticPopErrorHandling();
-            if (!$err) {
-                // skip parameters that were missed by preferred_state
-                continue;
-            }
-            if (PEAR::isError($err)) {
-                if (!isset($this->_options['soft'])) {
-                    $this->log(0, $err->getMessage());
-                }
-                $params[$i] = false;
-                if (is_object($param)) {
-                    $param = $param->getChannel() . '/' . $param->getPackage();
-                }
-                $this->pushError('Package "' . $param . '" is not valid',
-                    PEAR_INSTALLER_SKIPPED);
-            } else {
-                do {
-                    if ($params[$i] && $params[$i]->getType() == 'local') {
-                        // bug #7090
-                        // skip channel.xml check for local packages
-                        break;
-                    }
-                    if ($params[$i] && !isset($channelschecked[$params[$i]->getChannel()]) &&
-                          !isset($this->_options['offline'])) {
-                        $channelschecked[$params[$i]->getChannel()] = true;
-                        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                        if (!class_exists('System')) {
-                            require_once 'System.php';
-                        }
-                        $curchannel = &$this->_registry->getChannel($params[$i]->getChannel());
-                        if (PEAR::isError($curchannel)) {
-                            PEAR::staticPopErrorHandling();
-                            return $this->raiseError($curchannel);
-                        }
-                        if (PEAR::isError($dir = $this->getDownloadDir())) {
-                            PEAR::staticPopErrorHandling();
-                            break;
-                        }
-                        $a = $this->downloadHttp('http://' . $params[$i]->getChannel() .
-                            '/channel.xml', $this->ui, $dir, null, $curchannel->lastModified());
-
-                        PEAR::staticPopErrorHandling();
-                        if (PEAR::isError($a) || !$a) {
-                            break;
-                        }
-                        $this->log(0, 'WARNING: channel "' . $params[$i]->getChannel() . '" has ' .
-                            'updated its protocols, use "channel-update ' . $params[$i]->getChannel() .
-                            '" to update');
-                    }
-                } while (false);
-                if ($params[$i] && !isset($this->_options['downloadonly'])) {
-                    if (isset($this->_options['packagingroot'])) {
-                        $checkdir = $this->_prependPath(
-                            $this->config->get('php_dir', null, $params[$i]->getChannel()),
-                            $this->_options['packagingroot']);
-                    } else {
-                        $checkdir = $this->config->get('php_dir',
-                            null, $params[$i]->getChannel());
-                    }
-                    while ($checkdir && $checkdir != '/' && !file_exists($checkdir)) {
-                        $checkdir = dirname($checkdir);
-                    }
-                    if ($checkdir == '.') {
-                        $checkdir = '/';
-                    }
-                    if (!is_writeable($checkdir)) {
-                        return PEAR::raiseError('Cannot install, php_dir for channel "' .
-                            $params[$i]->getChannel() . '" is not writeable by the current user');
-                    }
-                }
-            }
-        }
-        unset($channelschecked);
-        PEAR_Downloader_Package::removeDuplicates($params);
-        if (!count($params)) {
-            $a = array();
-            return $a;
-        }
-        if (!isset($this->_options['nodeps']) && !isset($this->_options['offline'])) {
-            $reverify = true;
-            while ($reverify) {
-                $reverify = false;
-                foreach ($params as $i => $param) {
-                    $ret = $params[$i]->detectDependencies($params);
-                    if (PEAR::isError($ret)) {
-                        $reverify = true;
-                        $params[$i] = false;
-                        PEAR_Downloader_Package::removeDuplicates($params);
-                        if (!isset($this->_options['soft'])) {
-                            $this->log(0, $ret->getMessage());
-                        }
-                        continue 2;
-                    }
-                }
-            }
-        }
-        if (isset($this->_options['offline'])) {
-            $this->log(3, 'Skipping dependency download check, --offline specified');
-        }
-        if (!count($params)) {
-            $a = array();
-            return $a;
-        }
-        while (PEAR_Downloader_Package::mergeDependencies($params));
-        PEAR_Downloader_Package::removeInstalled($params);
-        if (!count($params)) {
-            $this->pushError('No valid packages found', PEAR_INSTALLER_FAILED);
-            $a = array();
-            return $a;
-        }
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $err = $this->analyzeDependencies($params);
-        PEAR::popErrorHandling();
-        if (!count($params)) {
-            $this->pushError('No valid packages found', PEAR_INSTALLER_FAILED);
-            $a = array();
-            return $a;
-        }
-        $ret = array();
-        $newparams = array();
-        if (isset($this->_options['pretend'])) {
-            return $params;
-        }
-        foreach ($params as $i => $package) {
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $pf = &$params[$i]->download();
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($pf)) {
-                if (!isset($this->_options['soft'])) {
-                    $this->log(1, $pf->getMessage());
-                    $this->log(0, 'Error: cannot download "' .
-                        $this->_registry->parsedPackageNameToString($package->getParsedPackage(),
-                            true) .
-                        '"');
-                }
-                continue;
-            }
-            $newparams[] = &$params[$i];
-            $ret[] = array('file' => $pf->getArchiveFile(),
-                                   'info' => &$pf,
-                                   'pkg' => $pf->getPackage());
-        }
-        $this->_downloadedPackages = $ret;
-        return $newparams;
-    }
-
-    /**
-     * @param array all packages to be installed
-     */
-    function analyzeDependencies(&$params)
-    {
-        $hasfailed = $failed = false;
-        if (isset($this->_options['downloadonly'])) {
-            return;
-        }
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $redo = true;
-        $reset = false;
-        while ($redo) {
-            $redo = false;
-            foreach ($params as $i => $param) {
-                $deps = $param->getDeps();
-                if (!$deps) {
-                    $depchecker = &$this->getDependency2Object($this->config, $this->getOptions(),
-                        $param->getParsedPackage(), PEAR_VALIDATE_DOWNLOADING);
-                    if ($param->getType() == 'xmlrpc') {
-                        $send = $param->getDownloadURL();
-                    } else {
-                        $send = $param->getPackageFile();
-                    }
-                    $installcheck = $depchecker->validatePackage($send, $this, $params);
-                    if (PEAR::isError($installcheck)) {
-                        if (!isset($this->_options['soft'])) {
-                            $this->log(0, $installcheck->getMessage());
-                        }
-                        $hasfailed = true;
-                        $params[$i] = false;
-                        $reset = true;
-                        $redo = true;
-                        $failed = false;
-                        PEAR_Downloader_Package::removeDuplicates($params);
-                        continue 2;
-                    }
-                    continue;
-                }
-                if (!$reset && $param->alreadyValidated()) {
-                    continue;
-                }
-                if (count($deps)) {
-                    $depchecker = &$this->getDependency2Object($this->config, $this->getOptions(),
-                        $param->getParsedPackage(), PEAR_VALIDATE_DOWNLOADING);
-                    if ($param->getType() == 'xmlrpc') {
-                        $send = $param->getDownloadURL();
-                    } else {
-                        $send = $param->getPackageFile();
-                    }
-                    $installcheck = $depchecker->validatePackage($send, $this, $params);
-                    if (PEAR::isError($installcheck)) {
-                        if (!isset($this->_options['soft'])) {
-                            $this->log(0, $installcheck->getMessage());
-                        }
-                        $hasfailed = true;
-                        $params[$i] = false;
-                        $reset = true;
-                        $redo = true;
-                        $failed = false;
-                        PEAR_Downloader_Package::removeDuplicates($params);
-                        continue 2;
-                    }
-                    $failed = false;
-                    if (isset($deps['required'])) {
-                        foreach ($deps['required'] as $type => $dep) {
-                            // note: Dependency2 will never return a PEAR_Error if ignore-errors
-                            // is specified, so soft is needed to turn off logging
-                            if (!isset($dep[0])) {
-                                if (PEAR::isError($e = $depchecker->{"validate{$type}Dependency"}($dep,
-                                      true, $params))) {
-                                    $failed = true;
-                                    if (!isset($this->_options['soft'])) {
-                                        $this->log(0, $e->getMessage());
-                                    }
-                                } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                    if (!isset($this->_options['soft'])) {
-                                        $this->log(0, $e[0]);
-                                    }
-                                }
-                            } else {
-                                foreach ($dep as $d) {
-                                    if (PEAR::isError($e =
-                                          $depchecker->{"validate{$type}Dependency"}($d,
-                                          true, $params))) {
-                                        $failed = true;
-                                        if (!isset($this->_options['soft'])) {
-                                            $this->log(0, $e->getMessage());
-                                        }
-                                    } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                        if (!isset($this->_options['soft'])) {
-                                            $this->log(0, $e[0]);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        if (isset($deps['optional'])) {
-                            foreach ($deps['optional'] as $type => $dep) {
-                                if (!isset($dep[0])) {
-                                    if (PEAR::isError($e =
-                                          $depchecker->{"validate{$type}Dependency"}($dep,
-                                          false, $params))) {
-                                        $failed = true;
-                                        if (!isset($this->_options['soft'])) {
-                                            $this->log(0, $e->getMessage());
-                                        }
-                                    } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                        if (!isset($this->_options['soft'])) {
-                                            $this->log(0, $e[0]);
-                                        }
-                                    }
-                                } else {
-                                    foreach ($dep as $d) {
-                                        if (PEAR::isError($e =
-                                              $depchecker->{"validate{$type}Dependency"}($d,
-                                              false, $params))) {
-                                            $failed = true;
-                                            if (!isset($this->_options['soft'])) {
-                                                $this->log(0, $e->getMessage());
-                                            }
-                                        } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                            if (!isset($this->_options['soft'])) {
-                                                $this->log(0, $e[0]);
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        $groupname = $param->getGroup();
-                        if (isset($deps['group']) && $groupname) {
-                            if (!isset($deps['group'][0])) {
-                                $deps['group'] = array($deps['group']);
-                            }
-                            $found = false;
-                            foreach ($deps['group'] as $group) {
-                                if ($group['attribs']['name'] == $groupname) {
-                                    $found = true;
-                                    break;
-                                }
-                            }
-                            if ($found) {
-                                unset($group['attribs']);
-                                foreach ($group as $type => $dep) {
-                                    if (!isset($dep[0])) {
-                                        if (PEAR::isError($e =
-                                              $depchecker->{"validate{$type}Dependency"}($dep,
-                                              false, $params))) {
-                                            $failed = true;
-                                            if (!isset($this->_options['soft'])) {
-                                                $this->log(0, $e->getMessage());
-                                            }
-                                        } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                            if (!isset($this->_options['soft'])) {
-                                                $this->log(0, $e[0]);
-                                            }
-                                        }
-                                    } else {
-                                        foreach ($dep as $d) {
-                                            if (PEAR::isError($e =
-                                                  $depchecker->{"validate{$type}Dependency"}($d,
-                                                  false, $params))) {
-                                                $failed = true;
-                                                if (!isset($this->_options['soft'])) {
-                                                    $this->log(0, $e->getMessage());
-                                                }
-                                            } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                                if (!isset($this->_options['soft'])) {
-                                                    $this->log(0, $e[0]);
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        foreach ($deps as $dep) {
-                            if (PEAR::isError($e = $depchecker->validateDependency1($dep, $params))) {
-                                $failed = true;
-                                if (!isset($this->_options['soft'])) {
-                                    $this->log(0, $e->getMessage());
-                                }
-                            } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                if (!isset($this->_options['soft'])) {
-                                    $this->log(0, $e[0]);
-                                }
-                            }
-                        }
-                    }
-                    $params[$i]->setValidated();
-                }
-                if ($failed) {
-                    $hasfailed = true;
-                    $params[$i] = false;
-                    $reset = true;
-                    $redo = true;
-                    $failed = false;
-                    PEAR_Downloader_Package::removeDuplicates($params);
-                    continue 2;
-                }
-            }
-        }
-        PEAR::staticPopErrorHandling();
-        if ($hasfailed && (isset($this->_options['ignore-errors']) ||
-              isset($this->_options['nodeps']))) {
-            // this is probably not needed, but just in case
-            if (!isset($this->_options['soft'])) {
-                $this->log(0, 'WARNING: dependencies failed');
-            }
-        }
-    }
-
-    /**
-     * Retrieve the directory that downloads will happen in
-     * @access private
-     * @return string
-     */
-    function getDownloadDir()
-    {
-        if (isset($this->_downloadDir)) {
-            return $this->_downloadDir;
-        }
-        $downloaddir = $this->config->get('download_dir');
-        if (empty($downloaddir)) {
-            if (!class_exists('System')) {
-                require_once 'System.php';
-            }
-            if (PEAR::isError($downloaddir = System::mktemp('-d'))) {
-                return $downloaddir;
-            }
-            $this->log(3, '+ tmp dir created at ' . $downloaddir);
-        }
-        if (!is_writable($downloaddir)) {
-            if (PEAR::isError(System::mkdir(array('-p', $downloaddir)))) {
-                return PEAR::raiseError('download directory "' . $downloaddir .
-                    '" is not writeable.  Change download_dir config variable to ' .
-                    'a writeable dir');
-            }
-        }
-        return $this->_downloadDir = $downloaddir;
-    }
-
-    function setDownloadDir($dir)
-    {
-        $this->_downloadDir = $dir;
-    }
-
-    // }}}
-    // {{{ configSet()
-    function configSet($key, $value, $layer = 'user', $channel = false)
-    {
-        $this->config->set($key, $value, $layer, $channel);
-        $this->_preferredState = $this->config->get('preferred_state', null, $channel);
-        if (!$this->_preferredState) {
-            // don't inadvertantly use a non-set preferred_state
-            $this->_preferredState = null;
-        }
-    }
-
-    // }}}
-    // {{{ setOptions()
-    function setOptions($options)
-    {
-        $this->_options = $options;
-    }
-
-    // }}}
-    // {{{ setOptions()
-    function getOptions()
-    {
-        return $this->_options;
-    }
-
-    // }}}
-
-    /**
-     * For simpler unit-testing
-     * @param PEAR_Config
-     * @param int
-     * @param string
-     */
-    function &getPackagefileObject(&$c, $d, $t = false)
-    {
-        if (!class_exists('PEAR_PackageFile')) {
-            require_once 'PEAR/PackageFile.php';
-        }
-        $a = &new PEAR_PackageFile($c, $d, $t);
-        return $a;
-    }
-
-    // {{{ _getPackageDownloadUrl()
-
-    /**
-     * @param array output of {@link parsePackageName()}
-     * @access private
-     */
-    function _getPackageDownloadUrl($parr)
-    {
-        $curchannel = $this->config->get('default_channel');
-        $this->configSet('default_channel', $parr['channel']);
-        // getDownloadURL returns an array.  On error, it only contains information
-        // on the latest release as array(version, info).  On success it contains
-        // array(version, info, download url string)
-        $state = isset($parr['state']) ? $parr['state'] : $this->config->get('preferred_state');
-        if (!$this->_registry->channelExists($parr['channel'])) {
-            do {
-                if ($this->config->get('auto_discover')) {
-                    if ($this->discover($parr['channel'])) {
-                        break;
-                    }
-                }
-                $this->configSet('default_channel', $curchannel);
-                return PEAR::raiseError('Unknown remote channel: ' . $remotechannel);
-            } while (false);
-        }
-        $chan = &$this->_registry->getChannel($parr['channel']);
-        if (PEAR::isError($chan)) {
-            return $chan;
-        }
-        $version = $this->_registry->packageInfo($parr['package'], 'version',
-            $parr['channel']);
-        if ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) {
-            $rest = &$this->config->getREST('1.0', $this->_options);
-            if (!isset($parr['version']) && !isset($parr['state']) && $version
-                  && !isset($this->_options['downloadonly'])) {
-                $url = $rest->getDownloadURL($base, $parr, $state, $version);
-            } else {
-                $url = $rest->getDownloadURL($base, $parr, $state, false);
-            }
-            if (PEAR::isError($url)) {
-                $this->configSet('default_channel', $curchannel);
-                return $url;
-            }
-            if ($parr['channel'] != $curchannel) {
-                $this->configSet('default_channel', $curchannel);
-            }
-            if (!is_array($url)) {
-                return $url;
-            }
-            $url['raw'] = false; // no checking is necessary for REST
-            if (!is_array($url['info'])) {
-                return PEAR::raiseError('Invalid remote dependencies retrieved from REST - ' .
-                    'this should never happen');
-            }
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $testversion = $this->_registry->packageInfo($url['package'], 'version',
-                $parr['channel']);
-            PEAR::staticPopErrorHandling();
-            if (!isset($this->_options['force']) &&
-                  !isset($this->_options['downloadonly']) &&
-                  !PEAR::isError($testversion)) {
-                if (version_compare($testversion, $url['version'], '>=')) {
-                    return PEAR::raiseError($this->_registry->parsedPackageNameToString(
-                        $parr, true) . ' is already installed and is newer than detected ' .
-                        'release version ' . $url['version'], -976);
-                }
-            }
-            if (isset($url['info']['required']) || $url['compatible']) {
-                require_once 'PEAR/PackageFile/v2.php';
-                $pf = new PEAR_PackageFile_v2;
-                $pf->setRawChannel($parr['channel']);
-                if ($url['compatible']) {
-                    $pf->setRawCompatible($url['compatible']);
-                }
-            } else {
-                require_once 'PEAR/PackageFile/v1.php';
-                $pf = new PEAR_PackageFile_v1;
-            }
-            $pf->setRawPackage($url['package']);
-            $pf->setDeps($url['info']);
-            $pf->setRawState($url['stability']);
-            $url['info'] = &$pf;
-            if (!extension_loaded("zlib") || isset($this->_options['nocompress'])) {
-                $ext = '.tar';
-            } else {
-                $ext = '.tgz';
-            }
-            if (is_array($url)) {
-                if (isset($url['url'])) {
-                    $url['url'] .= $ext;
-                }
-            }
-            return $url;
-        } elseif ($chan->supports('xmlrpc', 'package.getDownloadURL', false, '1.1')) {
-            // don't install with the old version information unless we're doing a plain
-            // vanilla simple installation.  If the user says to install a particular
-            // version or state, ignore the current installed version
-            if (!isset($parr['version']) && !isset($parr['state']) && $version
-                  && !isset($this->_options['downloadonly'])) {
-                $url = $this->_remote->call('package.getDownloadURL', $parr, $state, $version);
-            } else {
-                $url = $this->_remote->call('package.getDownloadURL', $parr, $state);
-            }
-        } else {
-            $url = $this->_remote->call('package.getDownloadURL', $parr, $state);
-        }
-        if (PEAR::isError($url)) {
-            return $url;
-        }
-        if ($parr['channel'] != $curchannel) {
-            $this->configSet('default_channel', $curchannel);
-        }
-        if (isset($url['__PEAR_ERROR_CLASS__'])) {
-            return PEAR::raiseError($url['message']);
-        }
-        if (!is_array($url)) {
-            return $url;
-        }
-        $url['raw'] = $url['info'];
-        if (isset($this->_options['downloadonly'])) {
-            $pkg = &$this->getPackagefileObject($this->config, $this->debug);
-        } else {
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            if (PEAR::isError($dir = $this->getDownloadDir())) {
-                PEAR::staticPopErrorHandling();
-                return $dir;
-            }
-            PEAR::staticPopErrorHandling();
-            $pkg = &$this->getPackagefileObject($this->config, $this->debug, $dir);
-        }
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $pinfo = &$pkg->fromXmlString($url['info'], PEAR_VALIDATE_DOWNLOADING, 'remote');
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($pinfo)) {
-            if (!isset($this->_options['soft'])) {
-                $this->log(0, $pinfo->getMessage());
-            }
-            return PEAR::raiseError('Remote package.xml is not valid - this should never happen');
-        }
-        $url['info'] = &$pinfo;
-        if (!extension_loaded("zlib") || isset($this->_options['nocompress'])) {
-            $ext = '.tar';
-        } else {
-            $ext = '.tgz';
-        }
-        if (is_array($url)) {
-            if (isset($url['url'])) {
-                $url['url'] .= $ext;
-            }
-        }
-        return $url;
-    }
-    // }}}
-    // {{{ getDepPackageDownloadUrl()
-
-    /**
-     * @param array dependency array
-     * @access private
-     */
-    function _getDepPackageDownloadUrl($dep, $parr)
-    {
-        $xsdversion = isset($dep['rel']) ? '1.0' : '2.0';
-        $curchannel = $this->config->get('default_channel');
-        if (isset($dep['uri'])) {
-            $xsdversion = '2.0';
-            $chan = &$this->_registry->getChannel('__uri');
-            if (PEAR::isError($chan)) {
-                return $chan;
-            }
-            $version = $this->_registry->packageInfo($dep['name'], 'version', '__uri');
-            $this->configSet('default_channel', '__uri');
-        } else {
-            if (isset($dep['channel'])) {
-                $remotechannel = $dep['channel'];
-            } else {
-                $remotechannel = 'pear.php.net';
-            }
-            if (!$this->_registry->channelExists($remotechannel)) {
-                do {
-                    if ($this->config->get('auto_discover')) {
-                        if ($this->discover($remotechannel)) {
-                            break;
-                        }
-                    }
-                    return PEAR::raiseError('Unknown remote channel: ' . $remotechannel);
-                } while (false);
-            }
-            $chan = &$this->_registry->getChannel($remotechannel);
-            if (PEAR::isError($chan)) {
-                return $chan;
-            }
-            $version = $this->_registry->packageInfo($dep['name'], 'version',
-                $remotechannel);
-            $this->configSet('default_channel', $remotechannel);
-        }
-        $state = isset($parr['state']) ? $parr['state'] : $this->config->get('preferred_state');
-        if (isset($parr['state']) && isset($parr['version'])) {
-            unset($parr['state']);
-        }
-        if (isset($dep['uri'])) {
-            $info = &$this->newDownloaderPackage($this);
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $err = $info->initialize($dep);
-            PEAR::staticPopErrorHandling();
-            if (!$err) {
-                // skip parameters that were missed by preferred_state
-                return PEAR::raiseError('Cannot initialize dependency');
-            }
-            if (PEAR::isError($err)) {
-                if (!isset($this->_options['soft'])) {
-                    $this->log(0, $err->getMessage());
-                }
-                if (is_object($info)) {
-                    $param = $info->getChannel() . '/' . $info->getPackage();
-                }
-                return PEAR::raiseError('Package "' . $param . '" is not valid');
-            }
-            return $info;
-        } elseif ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) {
-            $rest = &$this->config->getREST('1.0', $this->_options);
-            $url = $rest->getDepDownloadURL($base, $xsdversion, $dep, $parr,
-                    $state, $version);
-            if (PEAR::isError($url)) {
-                return $url;
-            }
-            if ($parr['channel'] != $curchannel) {
-                $this->configSet('default_channel', $curchannel);
-            }
-            if (!is_array($url)) {
-                return $url;
-            }
-            $url['raw'] = false; // no checking is necessary for REST
-            if (!is_array($url['info'])) {
-                return PEAR::raiseError('Invalid remote dependencies retrieved from REST - ' .
-                    'this should never happen');
-            }
-            if (isset($url['info']['required'])) {
-                if (!class_exists('PEAR_PackageFile_v2')) {
-                    require_once 'PEAR/PackageFile/v2.php';
-                }
-                $pf = new PEAR_PackageFile_v2;
-                $pf->setRawChannel($remotechannel);
-            } else {
-                if (!class_exists('PEAR_PackageFile_v1')) {
-                    require_once 'PEAR/PackageFile/v1.php';
-                }
-                $pf = new PEAR_PackageFile_v1;
-            }
-            $pf->setRawPackage($url['package']);
-            $pf->setDeps($url['info']);
-            $pf->setRawState($url['stability']);
-            $url['info'] = &$pf;
-            if (!extension_loaded("zlib") || isset($this->_options['nocompress'])) {
-                $ext = '.tar';
-            } else {
-                $ext = '.tgz';
-            }
-            if (is_array($url)) {
-                if (isset($url['url'])) {
-                    $url['url'] .= $ext;
-                }
-            }
-            return $url;
-        } elseif ($chan->supports('xmlrpc', 'package.getDepDownloadURL', false, '1.1')) {
-            if ($version) {
-                $url = $this->_remote->call('package.getDepDownloadURL', $xsdversion, $dep, $parr,
-                    $state, $version);
-            } else {
-                $url = $this->_remote->call('package.getDepDownloadURL', $xsdversion, $dep, $parr,
-                    $state);
-            }
-        } else {
-            $url = $this->_remote->call('package.getDepDownloadURL', $xsdversion, $dep, $parr, $state);
-        }
-        if ($this->config->get('default_channel') != $curchannel) {
-            $this->configSet('default_channel', $curchannel);
-        }
-        if (!is_array($url)) {
-            return $url;
-        }
-        if (isset($url['__PEAR_ERROR_CLASS__'])) {
-            return PEAR::raiseError($url['message']);
-        }
-        $url['raw'] = $url['info'];
-        $pkg = &$this->getPackagefileObject($this->config, $this->debug);
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $pinfo = &$pkg->fromXmlString($url['info'], PEAR_VALIDATE_DOWNLOADING, 'remote');
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($pinfo)) {
-            if (!isset($this->_options['soft'])) {
-                $this->log(0, $pinfo->getMessage());
-            }
-            return PEAR::raiseError('Remote package.xml is not valid - this should never happen');
-        }
-        $url['info'] = &$pinfo;
-        if (is_array($url)) {
-            if (!extension_loaded("zlib") || isset($this->_options['nocompress'])) {
-                $ext = '.tar';
-            } else {
-                $ext = '.tgz';
-            }
-            if (isset($url['url'])) {
-                $url['url'] .= $ext;
-            }
-        }
-        return $url;
-    }
-    // }}}
-    // {{{ getPackageDownloadUrl()
-
-    /**
-     * @deprecated in favor of _getPackageDownloadUrl
-     */
-    function getPackageDownloadUrl($package, $version = null, $channel = false)
-    {
-        if ($version) {
-            $package .= "-$version";
-        }
-        if ($this === null || $this->_registry === null) {
-            $package = "http://pear.php.net/get/$package";
-        } else {
-            $chan = $this->_registry->getChannel($channel);
-            if (PEAR::isError($chan)) {
-                return '';
-            }
-            $package = "http://" . $chan->getServer() . "/get/$package";
-        }
-        if (!extension_loaded("zlib")) {
-            $package .= '?uncompress=yes';
-        }
-        return $package;
-    }
-
-    // }}}
-    // {{{ getDownloadedPackages()
-
-    /**
-     * Retrieve a list of downloaded packages after a call to {@link download()}.
-     *
-     * Also resets the list of downloaded packages.
-     * @return array
-     */
-    function getDownloadedPackages()
-    {
-        $ret = $this->_downloadedPackages;
-        $this->_downloadedPackages = array();
-        $this->_toDownload = array();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ _downloadCallback()
-
-    function _downloadCallback($msg, $params = null)
-    {
-        switch ($msg) {
-            case 'saveas':
-                $this->log(1, "downloading $params ...");
-                break;
-            case 'done':
-                $this->log(1, '...done: ' . number_format($params, 0, '', ',') . ' bytes');
-                break;
-            case 'bytesread':
-                static $bytes;
-                if (empty($bytes)) {
-                    $bytes = 0;
-                }
-                if (!($bytes % 10240)) {
-                    $this->log(1, '.', false);
-                }
-                $bytes += $params;
-                break;
-            case 'start':
-                if($params[1] == -1) {
-                    $length = "Unknown size";
-                } else {
-                    $length = number_format($params[1], 0, '', ',')." bytes";
-                }
-                $this->log(1, "Starting to download {$params[0]} ($length)");
-                break;
-        }
-        if (method_exists($this->ui, '_downloadCallback'))
-            $this->ui->_downloadCallback($msg, $params);
-    }
-
-    // }}}
-    // {{{ _prependPath($path, $prepend)
-
-    function _prependPath($path, $prepend)
-    {
-        if (strlen($prepend) > 0) {
-            if (OS_WINDOWS && preg_match('/^[a-z]:/i', $path)) {
-                if (preg_match('/^[a-z]:/i', $prepend)) {
-                    $prepend = substr($prepend, 2);
-                } elseif ($prepend{0} != '\\') {
-                    $prepend = "\\$prepend";
-                }
-                $path = substr($path, 0, 2) . $prepend . substr($path, 2);
-            } else {
-                $path = $prepend . $path;
-            }
-        }
-        return $path;
-    }
-    // }}}
-    // {{{ pushError($errmsg, $code)
-
-    /**
-     * @param string
-     * @param integer
-     */
-    function pushError($errmsg, $code = -1)
-    {
-        array_push($this->_errorStack, array($errmsg, $code));
-    }
-
-    // }}}
-    // {{{ getErrorMsgs()
-
-    function getErrorMsgs()
-    {
-        $msgs = array();
-        $errs = $this->_errorStack;
-        foreach ($errs as $err) {
-            $msgs[] = $err[0];
-        }
-        $this->_errorStack = array();
-        return $msgs;
-    }
-
-    // }}}
-
-    /**
-     * for BC
-     */
-    function sortPkgDeps(&$packages, $uninstall = false)
-    {
-        $uninstall ? 
-            $this->sortPackagesForUninstall($packages) :
-            $this->sortPackagesForInstall($packages);
-    }
-
-    function _getDepTreeDP($package, $packages, &$deps, &$checked)
-    {
-        $pf = $package->getPackageFile();
-        $checked[strtolower($package->getChannel())][strtolower($package->getPackage())]
-            = true;
-        $pdeps = $pf->getDeps(true);
-        if (!$pdeps) {
-            return;
-        }
-        if ($pf->getPackagexmlVersion() == '1.0') {
-            foreach ($pdeps as $dep) {
-                if ($dep['type'] != 'pkg') {
-                    continue;
-                }
-                $deps['pear.php.net'][strtolower($dep['name'])] = true;
-                foreach ($packages as $p) {
-                    $dep['channel'] = 'pear.php.net';
-                    $dep['package'] = $dep['name'];
-                    if ($p->isEqual($dep)) {
-                        if (!isset($checked[strtolower($p->getChannel())]
-                              [strtolower($p->getPackage())])) {
-                            // add the dependency's dependencies to the tree
-                            $this->_getDepTreeDP($p, $packages, $deps, $checked);
-                        }
-                    }
-                }
-            }
-        } else {
-            $tdeps = array();
-            if (isset($pdeps['required']['package'])) {
-                $t = $pdeps['required']['package'];
-                if (!isset($t[0])) {
-                    $t = array($t);
-                }
-                $tdeps = array_merge($tdeps, $t);
-            }
-            if (isset($pdeps['required']['subpackage'])) {
-                $t = $pdeps['required']['subpackage'];
-                if (!isset($t[0])) {
-                    $t = array($t);
-                }
-                $tdeps = array_merge($tdeps, $t);
-            }
-            if (isset($pdeps['optional']['package'])) {
-                $t = $pdeps['optional']['package'];
-                if (!isset($t[0])) {
-                    $t = array($t);
-                }
-                $tdeps = array_merge($tdeps, $t);
-            }
-            if (isset($pdeps['optional']['subpackage'])) {
-                $t = $pdeps['optional']['subpackage'];
-                if (!isset($t[0])) {
-                    $t = array($t);
-                }
-                $tdeps = array_merge($tdeps, $t);
-            }
-            if (isset($pdeps['group'])) {
-                if (!isset($pdeps['group'][0])) {
-                    $pdeps['group'] = array($pdeps['group']);
-                }
-                foreach ($pdeps['group'] as $group) {
-                    if (isset($group['package'])) {
-                        $t = $group['package'];
-                        if (!isset($t[0])) {
-                            $t = array($t);
-                        }
-                        $tdeps = array_merge($tdeps, $t);
-                    }
-                    if (isset($group['subpackage'])) {
-                        $t = $group['subpackage'];
-                        if (!isset($t[0])) {
-                            $t = array($t);
-                        }
-                        $tdeps = array_merge($tdeps, $t);
-                    }
-                }
-            }
-            foreach ($tdeps as $dep) {
-                if (!isset($dep['channel'])) {
-                    $depchannel = '__uri';
-                } else {
-                    $depchannel = $dep['channel'];
-                }
-                $deps[$depchannel][strtolower($dep['name'])] = true;
-                foreach ($packages as $p) {
-                    $dep['channel'] = $depchannel;
-                    $dep['package'] = $dep['name'];
-                    if ($p->isEqual($dep)) {
-                        if (!isset($checked[strtolower($p->getChannel())]
-                              [strtolower($p->getPackage())])) {
-                            // add the dependency's dependencies to the tree
-                            $this->_getDepTreeDP($p, $packages, $deps, $checked);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Sort a list of arrays of array(downloaded packagefilename) by dependency.
-     *
-     * It also removes duplicate dependencies
-     * @param array an array of downloaded PEAR_Downloader_Packages
-     * @return array array of array(packagefilename, package.xml contents)
-     */
-    function sortPackagesForInstall(&$packages)
-    {
-        foreach ($packages as $i => $package) {
-            $checked = $deps = array();
-            $this->_getDepTreeDP($packages[$i], $packages, $deps, $checked);
-            $this->_depTree[$package->getChannel()][$package->getPackage()] = $deps;
-        }
-        usort($packages, array(&$this, '_sortInstall'));
-    }
-
-    function _dependsOn($a, $b)
-    {
-        return $this->_checkDepTree(strtolower($a->getChannel()), strtolower($a->getPackage()),
-            $b);
-    }
-
-    function _checkDepTree($channel, $package, $b, $checked = array())
-    {
-        $checked[$channel][$package] = true;
-        if (!isset($this->_depTree[$channel][$package])) {
-            return false;
-        }
-        if (isset($this->_depTree[$channel][$package][strtolower($b->getChannel())]
-              [strtolower($b->getPackage())])) {
-            return true;
-        }
-        foreach ($this->_depTree[$channel][$package] as $ch => $packages) {
-            foreach ($packages as $pa => $true) {
-                if ($this->_checkDepTree($ch, $pa, $b, $checked)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    function _sortInstall($a, $b)
-    {
-        if (!$a->getDeps() && !$b->getDeps()) {
-            return 0; // neither package has dependencies, order is insignificant
-        }
-        if ($a->getDeps() && !$b->getDeps()) {
-            return 1; // $a must be installed after $b because $a has dependencies
-        }
-        if (!$a->getDeps() && $b->getDeps()) {
-            return -1; // $b must be installed after $a because $b has dependencies
-        }
-        // both packages have dependencies
-        if ($this->_dependsOn($a, $b)) {
-            return 1;
-        }
-        if ($this->_dependsOn($b, $a)) {
-            return -1;
-        }
-        return 0;
-    }
-
-    /**
-     * Download a file through HTTP.  Considers suggested file name in
-     * Content-disposition: header and can run a callback function for
-     * different events.  The callback will be called with two
-     * parameters: the callback type, and parameters.  The implemented
-     * callback types are:
-     *
-     *  'setup'       called at the very beginning, parameter is a UI object
-     *                that should be used for all output
-     *  'message'     the parameter is a string with an informational message
-     *  'saveas'      may be used to save with a different file name, the
-     *                parameter is the filename that is about to be used.
-     *                If a 'saveas' callback returns a non-empty string,
-     *                that file name will be used as the filename instead.
-     *                Note that $save_dir will not be affected by this, only
-     *                the basename of the file.
-     *  'start'       download is starting, parameter is number of bytes
-     *                that are expected, or -1 if unknown
-     *  'bytesread'   parameter is the number of bytes read so far
-     *  'done'        download is complete, parameter is the total number
-     *                of bytes read
-     *  'connfailed'  if the TCP/SSL connection fails, this callback is called
-     *                with array(host,port,errno,errmsg)
-     *  'writefailed' if writing to disk fails, this callback is called
-     *                with array(destfile,errmsg)
-     *
-     * If an HTTP proxy has been configured (http_proxy PEAR_Config
-     * setting), the proxy will be used.
-     *
-     * @param string  $url       the URL to download
-     * @param object  $ui        PEAR_Frontend_* instance
-     * @param object  $config    PEAR_Config instance
-     * @param string  $save_dir  directory to save file in
-     * @param mixed   $callback  function/method to call for status
-     *                           updates
-     * @param false|string|array $lastmodified header values to check against for caching
-     *                           use false to return the header values from this download
-     * @param false|array $accept Accept headers to send
-     * @return string|array  Returns the full path of the downloaded file or a PEAR
-     *                       error on failure.  If the error is caused by
-     *                       socket-related errors, the error object will
-     *                       have the fsockopen error code available through
-     *                       getCode().  If caching is requested, then return the header
-     *                       values.
-     *
-     * @access public
-     */
-    function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null,
-                          $accept = false)
-    {
-        static $redirect = 0;
-        // allways reset , so we are clean case of error
-        $wasredirect = $redirect;
-        $redirect = 0;
-        if ($callback) {
-            call_user_func($callback, 'setup', array(&$ui));
-        }
-        $info = parse_url($url);
-        if (!isset($info['scheme']) || !in_array($info['scheme'], array('http', 'https'))) {
-            return PEAR::raiseError('Cannot download non-http URL "' . $url . '"');
-        }
-        if (!isset($info['host'])) {
-            return PEAR::raiseError('Cannot download from non-URL "' . $url . '"');
-        } else {
-            $host = isset($info['host']) ? $info['host'] : null;
-            $port = isset($info['port']) ? $info['port'] : null;
-            $path = isset($info['path']) ? $info['path'] : null;
-        }
-        if (isset($this)) {
-            $config = &$this->config;
-        } else {
-            $config = &PEAR_Config::singleton();
-        }
-        $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
-        if ($config->get('http_proxy') && 
-              $proxy = parse_url($config->get('http_proxy'))) {
-            $proxy_host = isset($proxy['host']) ? $proxy['host'] : null;
-            if (isset($proxy['scheme']) && $proxy['scheme'] == 'https') {
-                $proxy_host = 'ssl://' . $proxy_host;
-            }
-            $proxy_port = isset($proxy['port']) ? $proxy['port'] : 8080;
-            $proxy_user = isset($proxy['user']) ? urldecode($proxy['user']) : null;
-            $proxy_pass = isset($proxy['pass']) ? urldecode($proxy['pass']) : null;
-
-            if ($callback) {
-                call_user_func($callback, 'message', "Using HTTP proxy $host:$port");
-            }
-        }
-        if (empty($port)) {
-            if (isset($info['scheme']) && $info['scheme'] == 'https') {
-                $port = 443;
-            } else {
-                $port = 80;
-            }
-        }
-        if ($proxy_host != '') {
-            $fp = @fsockopen($proxy_host, $proxy_port, $errno, $errstr);
-            if (!$fp) {
-                if ($callback) {
-                    call_user_func($callback, 'connfailed', array($proxy_host, $proxy_port,
-                                                                  $errno, $errstr));
-                }
-                return PEAR::raiseError("Connection to `$proxy_host:$proxy_port' failed: $errstr", $errno);
-            }
-            if ($lastmodified === false || $lastmodified) {
-                $request = "GET $url HTTP/1.1\r\n";
-            } else {
-                $request = "GET $url HTTP/1.0\r\n";
-            }
-        } else {
-            if (isset($info['scheme']) && $info['scheme'] == 'https') {
-                $host = 'ssl://' . $host;
-            }
-            $fp = @fsockopen($host, $port, $errno, $errstr);
-            if (!$fp) {
-                if ($callback) {
-                    call_user_func($callback, 'connfailed', array($host, $port,
-                                                                  $errno, $errstr));
-                }
-                return PEAR::raiseError("Connection to `$host:$port' failed: $errstr", $errno);
-            }
-            if ($lastmodified === false || $lastmodified) {
-                $request = "GET $path HTTP/1.1\r\n";
-                $request .= "Host: $host:$port\r\n";
-            } else {
-                $request = "GET $path HTTP/1.0\r\n";
-                $request .= "Host: $host\r\n";
-            }
-        }
-        $ifmodifiedsince = '';
-        if (is_array($lastmodified)) {
-            if (isset($lastmodified['Last-Modified'])) {
-                $ifmodifiedsince = 'If-Modified-Since: ' . $lastmodified['Last-Modified'] . "\r\n";
-            }
-            if (isset($lastmodified['ETag'])) {
-                $ifmodifiedsince .= "If-None-Match: $lastmodified[ETag]\r\n";
-            }
-        } else {
-            $ifmodifiedsince = ($lastmodified ? "If-Modified-Since: $lastmodified\r\n" : '');
-        }
-        $request .= $ifmodifiedsince . "User-Agent: PEAR/1.5.0a1/PHP/" .
-            PHP_VERSION . "\r\n";
-        if (isset($this)) { // only pass in authentication for non-static calls
-            $username = $config->get('username');
-            $password = $config->get('password');
-            if ($username && $password) {
-                $tmp = base64_encode("$username:$password");
-                $request .= "Authorization: Basic $tmp\r\n";
-            }
-        }
-        if ($proxy_host != '' && $proxy_user != '') {
-            $request .= 'Proxy-Authorization: Basic ' .
-                base64_encode($proxy_user . ':' . $proxy_pass) . "\r\n";
-        }
-        if ($accept) {
-            $request .= 'Accept: ' . implode(', ', $accept) . "\r\n";
-        }
-        $request .= "Connection: close\r\n";
-        $request .= "\r\n";
-        fwrite($fp, $request);
-        $headers = array();
-        $reply = 0;
-        while (trim($line = fgets($fp, 1024))) {
-            if (preg_match('/^([^:]+):\s+(.*)\s*$/', $line, $matches)) {
-                $headers[strtolower($matches[1])] = trim($matches[2]);
-            } elseif (preg_match('|^HTTP/1.[01] ([0-9]{3}) |', $line, $matches)) {
-                $reply = (int) $matches[1];
-                if ($reply == 304 && ($lastmodified || ($lastmodified === false))) {
-                    return false;
-                }
-                if (! in_array($reply, array(200, 301, 302, 303, 305, 307))) {
-                    return PEAR::raiseError("File http://$host:$port$path not valid (received: $line)");
-                }
-            }
-        }
-        if ($reply != 200) {
-            if (isset($headers['location'])) {
-                if ($wasredirect < 5) {
-                    $redirect = $wasredirect + 1;
-                    return $this->downloadHttp($headers['location'],
-                            $ui, $save_dir, $callback, $lastmodified, $accept);
-                } else {
-                    return PEAR::raiseError("File http://$host:$port$path not valid (redirection looped more than 5 times)");
-                }
-            } else {
-                return PEAR::raiseError("File http://$host:$port$path not valid (redirected but no location)");
-            }
-        }
-        if (isset($headers['content-disposition']) &&
-            preg_match('/\sfilename=\"([^;]*\S)\"\s*(;|$)/', $headers['content-disposition'], $matches)) {
-            $save_as = basename($matches[1]);
-        } else {
-            $save_as = basename($url);
-        }
-        if ($callback) {
-            $tmp = call_user_func($callback, 'saveas', $save_as);
-            if ($tmp) {
-                $save_as = $tmp;
-            }
-        }
-        $dest_file = $save_dir . DIRECTORY_SEPARATOR . $save_as;
-        if (!$wp = @fopen($dest_file, 'wb')) {
-            fclose($fp);
-            if ($callback) {
-                call_user_func($callback, 'writefailed', array($dest_file, $php_errormsg));
-            }
-            return PEAR::raiseError("could not open $dest_file for writing");
-        }
-        if (isset($headers['content-length'])) {
-            $length = $headers['content-length'];
-        } else {
-            $length = -1;
-        }
-        $bytes = 0;
-        if ($callback) {
-            call_user_func($callback, 'start', array(basename($dest_file), $length));
-        }
-        while ($data = fread($fp, 1024)) {
-            $bytes += strlen($data);
-            if ($callback) {
-                call_user_func($callback, 'bytesread', $bytes);
-            }
-            if (!@fwrite($wp, $data)) {
-                fclose($fp);
-                if ($callback) {
-                    call_user_func($callback, 'writefailed', array($dest_file, $php_errormsg));
-                }
-                return PEAR::raiseError("$dest_file: write failed ($php_errormsg)");
-            }
-        }
-        fclose($fp);
-        fclose($wp);
-        if ($callback) {
-            call_user_func($callback, 'done', $bytes);
-        }
-        if ($lastmodified === false || $lastmodified) {
-            if (isset($headers['etag'])) {
-                $lastmodified = array('ETag' => $headers['etag']);
-            }
-            if (isset($headers['last-modified'])) {
-                if (is_array($lastmodified)) {
-                    $lastmodified['Last-Modified'] = $headers['last-modified'];
-                } else {
-                    $lastmodified = $headers['last-modified'];
-                }
-            }
-            return array($dest_file, $lastmodified, $headers);
-        }
-        return $dest_file;
-    }
-}
-// }}}
-
-?>
diff --git a/PEAR/Downloader/Package.php b/PEAR/Downloader/Package.php
deleted file mode 100644
index 5513773..0000000
--- a/PEAR/Downloader/Package.php
+++ /dev/null
@@ -1,1775 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Package.php,v 1.102 2006/09/25 05:27:23 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * Error code when parameter initialization fails because no releases
- * exist within preferred_state, but releases do exist
- */
-define('PEAR_DOWNLOADER_PACKAGE_STATE', -1003);
-/**
- * Coordinates download parameters and manages their dependencies
- * prior to downloading them.
- *
- * Input can come from three sources:
- *
- * - local files (archives or package.xml)
- * - remote files (downloadable urls)
- * - abstract package names
- *
- * The first two elements are handled cleanly by PEAR_PackageFile, but the third requires
- * accessing pearweb's xml-rpc interface to determine necessary dependencies, and the
- * format returned of dependencies is slightly different from that used in package.xml.
- *
- * This class hides the differences between these elements, and makes automatic
- * dependency resolution a piece of cake.  It also manages conflicts when
- * two classes depend on incompatible dependencies, or differing versions of the same
- * package dependency.  In addition, download will not be attempted if the php version is
- * not supported, PEAR installer version is not supported, or non-PECL extensions are not
- * installed.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Downloader_Package
-{
-    /**
-     * @var PEAR_Downloader
-     */
-    var $_downloader;
-    /**
-     * @var PEAR_Config
-     */
-    var $_config;
-    /**
-     * @var PEAR_Registry
-     */
-    var $_registry;
-    /**
-     * Used to implement packagingroot properly
-     * @var PEAR_Registry
-     */
-    var $_installRegistry;
-    /**
-     * @var PEAR_PackageFile_v1|PEAR_PackageFile|v2
-     */
-    var $_packagefile;
-    /**
-     * @var array
-     */
-    var $_parsedname;
-    /**
-     * @var array
-     */
-    var $_downloadURL;
-    /**
-     * @var array
-     */
-    var $_downloadDeps = array();
-    /**
-     * @var boolean
-     */
-    var $_valid = false;
-    /**
-     * @var boolean
-     */
-    var $_analyzed = false;
-    /**
-     * if this or a parent package was invoked with Package-state, this is set to the
-     * state variable.
-     *
-     * This allows temporary reassignment of preferred_state for a parent package and all of
-     * its dependencies.
-     * @var string|false
-     */
-    var $_explicitState = false;
-    /**
-     * If this package is invoked with Package#group, this variable will be true
-     */
-    var $_explicitGroup = false;
-    /**
-     * Package type local|url|xmlrpc
-     * @var string
-     */
-    var $_type;
-    /**
-     * Contents of package.xml, if downloaded from a remote channel
-     * @var string|false
-     * @access private
-     */
-    var $_rawpackagefile;
-    /**
-     * @var boolean
-     * @access private
-     */
-    var $_validated = false;
-
-    /**
-     * @param PEAR_Downloader
-     */
-    function PEAR_Downloader_Package(&$downloader)
-    {
-        $this->_downloader = &$downloader;
-        $this->_config = &$this->_downloader->config;
-        $this->_registry = &$this->_config->getRegistry();
-        $options = $downloader->getOptions();
-        if (isset($options['packagingroot'])) {
-            $this->_config->setInstallRoot($options['packagingroot']);
-            $this->_installRegistry = &$this->_config->getRegistry();
-            $this->_config->setInstallRoot(false);
-        } else {
-            $this->_installRegistry = &$this->_registry;
-        }
-        $this->_valid = $this->_analyzed = false;
-    }
-
-    /**
-     * Parse the input and determine whether this is a local file, a remote uri, or an
-     * abstract package name.
-     *
-     * This is the heart of the PEAR_Downloader_Package(), and is used in
-     * {@link PEAR_Downloader::download()}
-     * @param string
-     * @return bool|PEAR_Error
-     */
-    function initialize($param)
-    {
-        $origErr = $this->_fromFile($param);
-        if (!$this->_valid) {
-            $options = $this->_downloader->getOptions();
-            if (isset($options['offline'])) {
-                if (PEAR::isError($origErr)) {
-                    if (!isset($options['soft'])) {
-                        $this->_downloader->log(0, $origErr->getMessage());
-                    }
-                }
-                return PEAR::raiseError('Cannot download non-local package "' . $param . '"');
-            }
-            $err = $this->_fromUrl($param);
-            if (PEAR::isError($err) || !$this->_valid) {
-                if ($this->_type == 'url') {
-                    if (PEAR::isError($err)) {
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(0, $err->getMessage());
-                        }
-                    }
-                    return PEAR::raiseError("Invalid or missing remote package file");
-                }
-                $err = $this->_fromString($param);
-                if (PEAR::isError($err) || !$this->_valid) {
-                    if (PEAR::isError($err) &&
-                          $err->getCode() == PEAR_DOWNLOADER_PACKAGE_STATE) {
-                        return false; // instruct the downloader to silently skip
-                    }
-                    if (isset($this->_type) && $this->_type == 'local' &&
-                          PEAR::isError($origErr)) {
-                        if (is_array($origErr->getUserInfo())) {
-                            foreach ($origErr->getUserInfo() as $err) {
-                                if (is_array($err)) {
-                                    $err = $err['message'];
-                                }
-                                if (!isset($options['soft'])) {
-                                    $this->_downloader->log(0, $err);
-                                }
-                            }
-                        }
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(0, $origErr->getMessage());
-                        }
-                        if (is_array($param)) {
-                            $param = $this->_registry->parsedPackageNameToString($param,
-                                true);
-                        }
-                        return PEAR::raiseError(
-                            "Cannot initialize '$param', invalid or missing package file");
-                    }
-                    if (PEAR::isError($err)) {
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(0, $err->getMessage());
-                        }
-                    }
-                    if (is_array($param)) {
-                        $param = $this->_registry->parsedPackageNameToString($param, true);
-                    }
-                    return PEAR::raiseError(
-                        "Cannot initialize '$param', invalid or missing package file");
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Retrieve any non-local packages
-     * @return PEAR_PackageFile_v1|PEAR_PackageFile_v2|PEAR_Error
-     */
-    function &download()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile;
-        }
-        if (isset($this->_downloadURL['url'])) {
-            $this->_isvalid = false;
-            $info = $this->getParsedPackage();
-            foreach ($info as $i => $p) {
-                $info[$i] = strtolower($p);
-            }
-            $err = $this->_fromUrl($this->_downloadURL['url'],
-                $this->_registry->parsedPackageNameToString($this->_parsedname, true));
-            $newinfo = $this->getParsedPackage();
-            foreach ($newinfo as $i => $p) {
-                $newinfo[$i] = strtolower($p);
-            }
-            if ($info != $newinfo) {
-                do {
-                    if ($info['package'] == 'pecl.php.net' && $newinfo['package'] == 'pear.php.net') {
-                        $info['package'] = 'pear.php.net';
-                        if ($info == $newinfo) {
-                            // skip the channel check if a pecl package says it's a PEAR package
-                            break;
-                        }
-                    }
-                    return PEAR::raiseError('CRITICAL ERROR: We are ' .
-                        $this->_registry->parsedPackageNameToString($info) . ', but the file ' .
-                        'downloaded claims to be ' .
-                        $this->_registry->parsedPackageNameToString($this->getParsedPackage()));
-                } while (false);
-            }
-            if (PEAR::isError($err) || !$this->_valid) {
-                return $err;
-            }
-        }
-        $this->_type = 'local';
-        return $this->_packagefile;
-    }
-
-    function &getPackageFile()
-    {
-        return $this->_packagefile;
-    }
-
-    function &getDownloader()
-    {
-        return $this->_downloader;
-    }
-
-    function getType() 
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Like {@link initialize()}, but operates on a dependency
-     */
-    function fromDepURL($dep)
-    {
-        $this->_downloadURL = $dep;
-        if (isset($dep['uri'])) {
-            $options = $this->_downloader->getOptions();
-            if (!extension_loaded("zlib") || isset($options['nocompress'])) {
-                $ext = '.tar';
-            } else {
-                $ext = '.tgz';
-            }
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            $err = $this->_fromUrl($dep['uri'] . $ext);
-            PEAR::popErrorHandling();
-            if (PEAR::isError($err)) {
-                if (!isset($options['soft'])) {
-                    $this->_downloader->log(0, $err->getMessage());
-                }
-                return PEAR::raiseError('Invalid uri dependency "' . $dep['uri'] . $ext . '", ' .
-                    'cannot download');
-            }
-        } else {
-            $this->_parsedname =
-                array(
-                    'package' => $dep['info']->getPackage(),
-                    'channel' => $dep['info']->getChannel(),
-                    'version' => $dep['version']
-                );
-            if (!isset($dep['nodefault'])) {
-                $this->_parsedname['group'] = 'default'; // download the default dependency group
-                $this->_explicitGroup = false;
-            }
-            $this->_rawpackagefile = $dep['raw'];
-        }
-    }
-
-    function detectDependencies($params)
-    {
-        $options = $this->_downloader->getOptions();
-        if (isset($options['downloadonly'])) {
-            return;
-        }
-        if (isset($options['offline'])) {
-            $this->_downloader->log(3, 'Skipping dependency download check, --offline specified');
-            return;
-        }
-        $pname = $this->getParsedPackage();
-        if (!$pname) {
-            return;
-        }
-        $deps = $this->getDeps();
-        if (!$deps) {
-            return;
-        }
-        if (isset($deps['required'])) { // package.xml 2.0
-            return $this->_detect2($deps, $pname, $options, $params);
-        } else {
-            return $this->_detect1($deps, $pname, $options, $params);
-        }
-    }
-
-    function setValidated()
-    {
-        $this->_validated = true;
-    }
-
-    function alreadyValidated()
-    {
-        return $this->_validated;
-    }
-
-    /**
-     * Remove packages to be downloaded that are already installed
-     * @param array of PEAR_Downloader_Package objects
-     * @static
-     */
-    function removeInstalled(&$params)
-    {
-        if (!isset($params[0])) {
-            return;
-        }
-        $options = $params[0]->_downloader->getOptions();
-        if (!isset($options['downloadonly'])) {
-            foreach ($params as $i => $param) {
-                // remove self if already installed with this version
-                // this does not need any pecl magic - we only remove exact matches
-                if ($param->_installRegistry->packageExists($param->getPackage(), $param->getChannel())) {
-                    if (version_compare($param->_installRegistry->packageInfo($param->getPackage(), 'version',
-                          $param->getChannel()), $param->getVersion(), '==')) {
-                        if (!isset($options['force'])) {
-                            $info = $param->getParsedPackage();
-                            unset($info['version']);
-                            unset($info['state']);
-                            if (!isset($options['soft'])) {
-                                $param->_downloader->log(1, 'Skipping package "' .
-                                    $param->getShortName() .
-                                    '", already installed as version ' .
-                                    $param->_installRegistry->packageInfo($param->getPackage(),
-                                        'version', $param->getChannel()));
-                            }
-                            $params[$i] = false;
-                        }
-                    } elseif (!isset($options['force']) && !isset($options['upgrade']) &&
-                          !isset($options['soft'])) {
-                        $info = $param->getParsedPackage();
-                        $param->_downloader->log(1, 'Skipping package "' .
-                            $param->getShortName() .
-                            '", already installed as version ' .
-                            $param->_installRegistry->packageInfo($param->getPackage(), 'version',
-                                $param->getChannel()));
-                        $params[$i] = false;
-                    }
-                }
-            }
-        }
-        PEAR_Downloader_Package::removeDuplicates($params);
-    }
-
-    function _detect2($deps, $pname, $options, $params)
-    {
-        $this->_downloadDeps = array();
-        $groupnotfound = false;
-        foreach (array('package', 'subpackage') as $packagetype) {
-            // get required dependency group
-            if (isset($deps['required'][$packagetype])) {
-                if (isset($deps['required'][$packagetype][0])) {
-                    foreach ($deps['required'][$packagetype] as $dep) {
-                        if (isset($dep['conflicts'])) {
-                            // skip any package that this package conflicts with
-                            continue;
-                        }
-                        $ret = $this->_detect2Dep($dep, $pname, 'required', $params);
-                        if (is_array($ret)) {
-                            $this->_downloadDeps[] = $ret;
-                        }
-                    }
-                } else {
-                    $dep = $deps['required'][$packagetype];
-                    if (!isset($dep['conflicts'])) {
-                        // skip any package that this package conflicts with
-                        $ret = $this->_detect2Dep($dep, $pname, 'required', $params);
-                        if (is_array($ret)) {
-                            $this->_downloadDeps[] = $ret;
-                        }
-                    }
-                }
-            }
-            // get optional dependency group, if any
-            if (isset($deps['optional'][$packagetype])) {
-                $skipnames = array();
-                if (!isset($deps['optional'][$packagetype][0])) {
-                    $deps['optional'][$packagetype] = array($deps['optional'][$packagetype]);
-                }
-                foreach ($deps['optional'][$packagetype] as $dep) {
-                    $skip = false;
-                    if (!isset($options['alldeps'])) {
-                        $dep['package'] = $dep['name'];
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(3, 'Notice: package "' .
-                              $this->_registry->parsedPackageNameToString($this->getParsedPackage(),
-                                    true) . '" optional dependency "' .
-                                $this->_registry->parsedPackageNameToString(array('package' =>
-                                    $dep['name'], 'channel' => 'pear.php.net'), true) .
-                                '" will not be automatically downloaded');
-                        }
-                        $skipnames[] = $this->_registry->parsedPackageNameToString($dep, true);
-                        $skip = true;
-                        unset($dep['package']);
-                    }
-                    if (!($ret = $this->_detect2Dep($dep, $pname, 'optional', $params))) {
-                        $dep['package'] = $dep['name'];
-                        $skip = count($skipnames) ?
-                            $skipnames[count($skipnames) - 1] : '';
-                        if ($skip ==
-                              $this->_registry->parsedPackageNameToString($dep, true)) {
-                            array_pop($skipnames);
-                        }
-                    }
-                    if (!$skip && is_array($ret)) {
-                        $this->_downloadDeps[] = $ret;
-                    }
-                }
-                if (count($skipnames)) {
-                    if (!isset($options['soft'])) {
-                        $this->_downloader->log(1, 'Did not download optional dependencies: ' .
-                            implode(', ', $skipnames) .
-                            ', use --alldeps to download automatically');
-                    }
-                }
-            }
-            // get requested dependency group, if any
-            $groupname = $this->getGroup();
-            $explicit = $this->_explicitGroup;
-            if (!$groupname) {
-                if ($this->canDefault()) {
-                    $groupname = 'default'; // try the default dependency group
-                } else {
-                    continue;
-                }
-            }
-            if ($groupnotfound) {
-                continue;
-            }
-            if (isset($deps['group'])) {
-                if (isset($deps['group']['attribs'])) {
-                    if (strtolower($deps['group']['attribs']['name']) == strtolower($groupname)) {
-                        $group = $deps['group'];
-                    } elseif ($explicit) {
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(0, 'Warning: package "' .
-                                $this->_registry->parsedPackageNameToString($pname, true) .
-                                '" has no dependency ' . 'group named "' . $groupname . '"');
-                        }
-                        $groupnotfound = true;
-                        continue;
-                    }
-                } else {
-                    $found = false;
-                    foreach ($deps['group'] as $group) {
-                        if (strtolower($group['attribs']['name']) == strtolower($groupname)) {
-                            $found = true;
-                            break;
-                        }
-                    }
-                    if (!$found) {
-                        if ($explicit) {
-                            if (!isset($options['soft'])) {
-                                $this->_downloader->log(0, 'Warning: package "' .
-                                    $this->_registry->parsedPackageNameToString($pname, true) .
-                                    '" has no dependency ' . 'group named "' . $groupname . '"');
-                            }
-                        }
-                        $groupnotfound = true;
-                        continue;
-                    }
-                }
-            }
-            if (isset($group)) {
-                if (isset($group[$packagetype])) {
-                    if (isset($group[$packagetype][0])) {
-                        foreach ($group[$packagetype] as $dep) {
-                            $ret = $this->_detect2Dep($dep, $pname, 'dependency group "' .
-                                $group['attribs']['name'] . '"', $params);
-                            if (is_array($ret)) {
-                                $this->_downloadDeps[] = $ret;
-                            }
-                        }
-                    } else {
-                        $ret = $this->_detect2Dep($group[$packagetype], $pname,
-                            'dependency group "' .
-                            $group['attribs']['name'] . '"', $params);
-                        if (is_array($ret)) {
-                            $this->_downloadDeps[] = $ret;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    function _detect2Dep($dep, $pname, $group, $params)
-    {
-        if (isset($dep['conflicts'])) {
-            return true;
-        }
-        $options = $this->_downloader->getOptions();
-        if (isset($dep['uri'])) {
-            return array('uri' => $dep['uri'], 'dep' => $dep);;
-        }
-        $testdep = $dep;
-        $testdep['package'] = $dep['name'];
-        if (PEAR_Downloader_Package::willDownload($testdep, $params)) {
-            $dep['package'] = $dep['name'];
-            if (!isset($options['soft'])) {
-                $this->_downloader->log(2, $this->getShortName() . ': Skipping ' . $group .
-                    ' dependency "' .
-                    $this->_registry->parsedPackageNameToString($dep, true) .
-                    '", will be installed');
-            }
-            return false;
-        }
-        $options = $this->_downloader->getOptions();
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        if ($this->_explicitState) {
-            $pname['state'] = $this->_explicitState;
-        }
-        $url =
-            $this->_downloader->_getDepPackageDownloadUrl($dep, $pname);
-        if (PEAR::isError($url)) {
-            PEAR::popErrorHandling();
-            return $url;
-        }
-        $dep['package'] = $dep['name'];
-        $ret = $this->_analyzeDownloadURL($url, 'dependency', $dep, $params, $group == 'optional' &&
-            !isset($options['alldeps']), true);
-        PEAR::popErrorHandling();
-        if (PEAR::isError($ret)) {
-            if (!isset($options['soft'])) {
-                $this->_downloader->log(0, $ret->getMessage());
-            }
-            return false;
-        } else {
-            // check to see if a dep is already installed and is the same or newer
-            if (!isset($dep['min']) && !isset($dep['max']) && !isset($dep['recommended'])) {
-                $oper = 'has';
-            } else {
-                $oper = 'gt';
-            }
-            // do not try to move this before getDepPackageDownloadURL
-            // we can't determine whether upgrade is necessary until we know what
-            // version would be downloaded
-            if (!isset($options['force']) && $this->isInstalled($ret, $oper)) {
-                $version = $this->_installRegistry->packageInfo($dep['name'], 'version',
-                    $dep['channel']);
-                $dep['package'] = $dep['name'];
-                if (!isset($options['soft'])) {
-                    $this->_downloader->log(3, $this->getShortName() . ': Skipping ' . $group .
-                        ' dependency "' .
-                    $this->_registry->parsedPackageNameToString($dep, true) .
-                        '" version ' . $url['version'] . ', already installed as version ' .
-                        $version);
-                }
-                return false;
-            }
-        }
-        if (isset($dep['nodefault'])) {
-            $ret['nodefault'] = true;
-        }
-        return $ret;
-    }
-
-    function _detect1($deps, $pname, $options, $params)
-    {
-        $this->_downloadDeps = array();
-        $skipnames = array();
-        foreach ($deps as $dep) {
-            $nodownload = false;
-            if ($dep['type'] == 'pkg') {
-                $dep['channel'] = 'pear.php.net';
-                $dep['package'] = $dep['name'];
-                switch ($dep['rel']) {
-                    case 'not' :
-                        continue 2;
-                    case 'ge' :
-                    case 'eq' :
-                    case 'gt' :
-                    case 'has' :
-                        $group = (!isset($dep['optional']) || $dep['optional'] == 'no') ?
-                            'required' :
-                            'optional';
-                        if (PEAR_Downloader_Package::willDownload($dep, $params)) {
-                            $this->_downloader->log(2, $this->getShortName() . ': Skipping ' . $group
-                                . ' dependency "' .
-                                $this->_registry->parsedPackageNameToString($dep, true) .
-                                '", will be installed');
-                            continue 2;
-                        }
-                        $fakedp = new PEAR_PackageFile_v1;
-                        $fakedp->setPackage($dep['name']);
-                        // skip internet check if we are not upgrading (bug #5810)
-                        if (!isset($options['upgrade']) && $this->isInstalled(
-                              $fakedp, $dep['rel'])) {
-                            $this->_downloader->log(2, $this->getShortName() . ': Skipping ' . $group
-                                . ' dependency "' .
-                                $this->_registry->parsedPackageNameToString($dep, true) .
-                                '", is already installed');
-                            continue 2;
-                        }
-                }
-                PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                if ($this->_explicitState) {
-                    $pname['state'] = $this->_explicitState;
-                }
-                $url =
-                    $this->_downloader->_getDepPackageDownloadUrl($dep, $pname);
-                $chan = 'pear.php.net';
-                if (PEAR::isError($url)) {
-                    // check to see if this is a pecl package that has jumped
-                    // from pear.php.net to pecl.php.net channel
-                    if (!class_exists('PEAR_Dependency2')) {
-                        require_once 'PEAR/Dependency2.php';
-                    }
-                    $newdep = PEAR_Dependency2::normalizeDep($dep);
-                    $newdep = $newdep[0];
-                    $newdep['channel'] = 'pecl.php.net';
-                    $chan = 'pecl.php.net';
-                    $url =
-                        $this->_downloader->_getDepPackageDownloadUrl($newdep, $pname);
-                    $obj = &$this->_installRegistry->getPackage($dep['name']);
-                    if (PEAR::isError($url)) {
-                        PEAR::popErrorHandling();
-                        if ($obj !== null && $this->isInstalled($obj, $dep['rel'])) {
-                            $group = (!isset($dep['optional']) || $dep['optional'] == 'no') ?
-                                'required' :
-                                'optional';
-                            $dep['package'] = $dep['name'];
-                            if (!isset($options['soft'])) {
-                                $this->_downloader->log(3, $this->getShortName() .
-                                    ': Skipping ' . $group . ' dependency "' .
-                                    $this->_registry->parsedPackageNameToString($dep, true) .
-                                    '", already installed as version ' . $obj->getVersion());
-                            }
-                            $skip = count($skipnames) ?
-                                $skipnames[count($skipnames) - 1] : '';
-                            if ($skip ==
-                                  $this->_registry->parsedPackageNameToString($dep, true)) {
-                                array_pop($skipnames);
-                            }
-                            continue;
-                        } else {
-                            if (isset($dep['optional']) && $dep['optional'] == 'yes') {
-                                $this->_downloader->log(2, $this->getShortName() .
-                                    ': Skipping ' . $group
-                                    . ' dependency "' .
-                                    $this->_registry->parsedPackageNameToString($dep, true) .
-                                    '", no releases exist');
-                                continue;
-                            } else {
-                                return $url;
-                            }
-                        }
-                    }
-                }
-                PEAR::popErrorHandling();
-                if (!isset($options['alldeps'])) {
-                    if (isset($dep['optional']) && $dep['optional'] == 'yes') {
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(3, 'Notice: package "' .
-                                $this->getShortName() .
-                                '" optional dependency "' .
-                                $this->_registry->parsedPackageNameToString(
-                                    array('channel' => $chan, 'package' =>
-                                    $dep['name']), true) .
-                                '" will not be automatically downloaded');
-                        }
-                        $skipnames[] = $this->_registry->parsedPackageNameToString(
-                                array('channel' => $chan, 'package' =>
-                                $dep['name']), true);
-                        $nodownload = true;
-                    }
-                }
-                if (!isset($options['alldeps']) && !isset($options['onlyreqdeps'])) {
-                    if (!isset($dep['optional']) || $dep['optional'] == 'no') {
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(3, 'Notice: package "' .
-                                $this->getShortName() .
-                                '" required dependency "' .
-                                $this->_registry->parsedPackageNameToString(
-                                    array('channel' => $chan, 'package' =>
-                                    $dep['name']), true) .
-                                '" will not be automatically downloaded');
-                        }
-                        $skipnames[] = $this->_registry->parsedPackageNameToString(
-                                array('channel' => $chan, 'package' =>
-                                $dep['name']), true);
-                        $nodownload = true;
-                    }
-                }
-                // check to see if a dep is already installed
-                // do not try to move this before getDepPackageDownloadURL
-                // we can't determine whether upgrade is necessary until we know what
-                // version would be downloaded
-                if (!isset($options['force']) && $this->isInstalled(
-                        $url, $dep['rel'])) {
-                    $group = (!isset($dep['optional']) || $dep['optional'] == 'no') ?
-                        'required' :
-                        'optional';
-                    $dep['package'] = $dep['name'];
-                    if (isset($newdep)) {
-                        $version = $this->_installRegistry->packageInfo($newdep['name'], 'version',
-                            $newdep['channel']);
-                    } else {
-                        $version = $this->_installRegistry->packageInfo($dep['name'], 'version');
-                    }
-                    $dep['version'] = $url['version'];
-                    if (!isset($options['soft'])) {
-                        $this->_downloader->log(3, $this->getShortName() . ': Skipping ' . $group .
-                            ' dependency "' .
-                            $this->_registry->parsedPackageNameToString($dep, true) .
-                            '", already installed as version ' . $version);
-                    }
-                    $skip = count($skipnames) ?
-                        $skipnames[count($skipnames) - 1] : '';
-                    if ($skip ==
-                          $this->_registry->parsedPackageNameToString($dep, true)) {
-                        array_pop($skipnames);
-                    }
-                    continue;
-                }
-                if ($nodownload) {
-                    continue;
-                }
-                PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                if (isset($newdep)) {
-                    $dep = $newdep;
-                }
-                $dep['package'] = $dep['name'];
-                $ret = $this->_analyzeDownloadURL($url, 'dependency', $dep, $params,
-                    isset($dep['optional']) && $dep['optional'] == 'yes' &&
-                    !isset($options['alldeps']), true);
-                PEAR::popErrorHandling();
-                if (PEAR::isError($ret)) {
-                    if (!isset($options['soft'])) {
-                        $this->_downloader->log(0, $ret->getMessage());
-                    }
-                    continue;
-                }
-                $this->_downloadDeps[] = $ret;
-            }
-        }
-        if (count($skipnames)) {
-            if (!isset($options['soft'])) {
-                $this->_downloader->log(1, 'Did not download dependencies: ' .
-                    implode(', ', $skipnames) .
-                    ', use --alldeps or --onlyreqdeps to download automatically');
-            }
-        }
-    }
-
-    function setDownloadURL($pkg)
-    {
-        $this->_downloadURL = $pkg;
-    }
-
-    /**
-     * Set the package.xml object for this downloaded package
-     *
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2 $pkg
-     */
-    function setPackageFile(&$pkg)
-    {
-        $this->_packagefile = &$pkg;
-    }
-
-    function getShortName()
-    {
-        return $this->_registry->parsedPackageNameToString(array('channel' => $this->getChannel(),
-            'package' => $this->getPackage()), true);
-    }
-
-    function getParsedPackage()
-    {   
-        if (isset($this->_packagefile) || isset($this->_parsedname)) {
-            return array('channel' => $this->getChannel(),
-                'package' => $this->getPackage(),
-                'version' => $this->getVersion());
-        }
-        return false;
-    }
-
-    function getDownloadURL()
-    {
-        return $this->_downloadURL;
-    }
-
-    function canDefault()
-    {
-        if (isset($this->_downloadURL)) {
-            if (isset($this->_downloadURL['nodefault'])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    function getPackage()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getPackage();
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->getPackage();
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     */
-    function isSubpackage(&$pf)
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->isSubpackage($pf);
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->isSubpackage($pf);
-        } else {
-            return false;
-        }
-    }
-
-    function getPackageType()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getPackageType();
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->getPackageType();
-        } else {
-            return false;
-        }
-    }
-
-    function isBundle()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getPackageType() == 'bundle';
-        } else {
-            return false;
-        }
-    }
-
-    function getPackageXmlVersion()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getPackagexmlVersion();
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->getPackagexmlVersion();
-        } else {
-            return '1.0';
-        }
-    }
-
-    function getChannel()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getChannel();
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->getChannel();
-        } else {
-            return false;
-        }
-    }
-
-    function getURI()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getURI();
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->getURI();
-        } else {
-            return false;
-        }
-    }
-
-    function getVersion()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getVersion();
-        } elseif (isset($this->_downloadURL['version'])) {
-            return $this->_downloadURL['version'];
-        } else {
-            return false;
-        }
-    }
-
-    function isCompatible($pf)
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->isCompatible($pf);
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->isCompatible($pf);
-        } else {
-            return true;
-        }
-    }
-
-    function setGroup($group)
-    {
-        $this->_parsedname['group'] = $group;
-    }
-
-    function getGroup()
-    {
-        if (isset($this->_parsedname['group'])) {
-            return $this->_parsedname['group'];
-        } else {
-            return '';
-        }
-    }
-
-    function isExtension($name)
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->isExtension($name);
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->getProvidesExtension() == $name;
-        } else {
-            return false;
-        }
-    }
-
-    function getDeps()
-    {
-        if (isset($this->_packagefile)) {
-            $ver = $this->_packagefile->getPackagexmlVersion();
-            if (version_compare($ver, '2.0', '>=')) {
-                return $this->_packagefile->getDeps(true);
-            } else {
-                return $this->_packagefile->getDeps();
-            }
-        } elseif (isset($this->_downloadURL['info'])) {
-            $ver = $this->_downloadURL['info']->getPackagexmlVersion();
-            if (version_compare($ver, '2.0', '>=')) {
-                return $this->_downloadURL['info']->getDeps(true);
-            } else {
-                return $this->_downloadURL['info']->getDeps();
-            }
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * @param array Parsed array from {@link PEAR_Registry::parsePackageName()} or a dependency
-     *                     returned from getDepDownloadURL()
-     */
-    function isEqual($param)
-    {
-        if (is_object($param)) {
-            $channel = $param->getChannel();
-            $package = $param->getPackage();
-            if ($param->getURI()) {
-                $param = array(
-                    'channel' => $param->getChannel(),
-                    'package' => $param->getPackage(),
-                    'version' => $param->getVersion(),
-                    'uri' => $param->getURI(),
-                );
-            } else {
-                $param = array(
-                    'channel' => $param->getChannel(),
-                    'package' => $param->getPackage(),
-                    'version' => $param->getVersion(),
-                );
-            }
-        } else {
-            if (isset($param['uri'])) {
-                if ($this->getChannel() != '__uri') {
-                    return false;
-                }
-                return $param['uri'] == $this->getURI();
-            }
-            $package = isset($param['package']) ? $param['package'] :
-                $param['info']->getPackage();
-            $channel = isset($param['channel']) ? $param['channel'] :
-                $param['info']->getChannel();
-            if (isset($param['rel'])) {
-                if (!class_exists('PEAR_Dependency2')) {
-                    require_once 'PEAR/Dependency2.php';
-                }
-                $newdep = PEAR_Dependency2::normalizeDep($param);
-                $newdep = $newdep[0];
-            } elseif (isset($param['min'])) {
-                $newdep = $param;
-            }
-        }
-        if (isset($newdep)) {
-            if (!isset($newdep['min'])) {
-                $newdep['min'] = '0';
-            }
-            if (!isset($newdep['max'])) {
-                $newdep['max'] = '100000000000000000000';
-            }
-            // use magic to support pecl packages suddenly jumping to the pecl channel
-            // we need to support both dependency possibilities
-            if ($channel == 'pear.php.net' && $this->getChannel() == 'pecl.php.net') {
-                if ($package == $this->getPackage()) {
-                    $channel = 'pecl.php.net';
-                }
-            }
-            if ($channel == 'pecl.php.net' && $this->getChannel() == 'pear.php.net') {
-                if ($package == $this->getPackage()) {
-                    $channel = 'pear.php.net';
-                }
-            }
-            return (strtolower($package) == strtolower($this->getPackage()) &&
-                $channel == $this->getChannel() &&
-                version_compare($newdep['min'], $this->getVersion(), '<=') &&
-                version_compare($newdep['max'], $this->getVersion(), '>='));
-        }
-        // use magic to support pecl packages suddenly jumping to the pecl channel
-        if ($channel == 'pecl.php.net' && $this->getChannel() == 'pear.php.net') {
-            if (strtolower($package) == strtolower($this->getPackage())) {
-                $channel = 'pear.php.net';
-            }
-        }
-        if (isset($param['version'])) {
-            return (strtolower($package) == strtolower($this->getPackage()) &&
-                $channel == $this->getChannel() &&
-                $param['version'] == $this->getVersion());
-        } else {
-            return strtolower($package) == strtolower($this->getPackage()) &&
-                $channel == $this->getChannel();
-        }
-    }
-
-    function isInstalled($dep, $oper = '==')
-    {
-        if (!$dep) {
-            return false;
-        }
-        if ($oper != 'ge' && $oper != 'gt' && $oper != 'has' && $oper != '==') {
-            return false;
-        }
-        if (is_object($dep)) {
-            $package = $dep->getPackage();
-            $channel = $dep->getChannel();
-            if ($dep->getURI()) {
-                $dep = array(
-                    'uri' => $dep->getURI(),
-                    'version' => $dep->getVersion(),
-                );
-            } else {
-                $dep = array(
-                    'version' => $dep->getVersion(),
-                );
-            }
-        } else {
-            if (isset($dep['uri'])) {
-                $channel = '__uri';
-                $package = $dep['dep']['name'];
-            } else {
-                $channel = $dep['info']->getChannel();
-                $package = $dep['info']->getPackage();
-            }
-        }
-        $options = $this->_downloader->getOptions();
-        $test = $this->_installRegistry->packageExists($package, $channel);
-        if (!$test && $channel == 'pecl.php.net') {
-            // do magic to allow upgrading from old pecl packages to new ones
-            $test = $this->_installRegistry->packageExists($package, 'pear.php.net');
-            $channel = 'pear.php.net';
-        }
-        if ($test) {
-            if (isset($dep['uri'])) {
-                if ($this->_installRegistry->packageInfo($package, 'uri', '__uri') == $dep['uri']) {
-                    return true;
-                }
-            }
-            if (isset($options['upgrade'])) {
-                if ($oper == 'has') {
-                    if (version_compare($this->_installRegistry->packageInfo(
-                          $package, 'version', $channel),
-                          $dep['version'], '>=')) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    if (version_compare($this->_installRegistry->packageInfo(
-                          $package, 'version', $channel),
-                          $dep['version'], '>=')) {
-                        return true;
-                    }
-                    return false;
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @param array
-     * @static
-     */
-    function removeDuplicates(&$params)
-    {
-        $pnames = array();
-        foreach ($params as $i => $param) {
-            if (!$param) {
-                continue;
-            }
-            if ($param->getPackage()) {
-                $pnames[$i] = $param->getChannel() . '/' .
-                    $param->getPackage() . '-' . $param->getVersion() . '#' . $param->getGroup();
-            }
-        }
-        $pnames = array_unique($pnames);
-        $unset = array_diff(array_keys($params), array_keys($pnames));
-        $testp = array_flip($pnames);
-        foreach ($params as $i => $param) {
-            if (!$param) {
-                $unset[] = $i;
-                continue;
-            }
-            if (!is_a($param, 'PEAR_Downloader_Package')) {
-                $unset[] = $i;
-                continue;
-            }
-            if (!isset($testp[$param->getChannel() . '/' . $param->getPackage() . '-' .
-                  $param->getVersion() . '#' . $param->getGroup()])) {
-                $unset[] = $i;
-            }
-        }
-        foreach ($unset as $i) {
-            unset($params[$i]);
-        }
-        $ret = array();
-        foreach ($params as $i => $param) {
-            $ret[] = &$params[$i];
-        }
-        $params = array();
-        foreach ($ret as $i => $param) {
-            $params[] = &$ret[$i];
-        }
-    }
-
-    function explicitState()
-    {
-        return $this->_explicitState;
-    }
-
-    function setExplicitState($s)
-    {
-        $this->_explicitState = $s;
-    }
-
-    /**
-     * @static
-     */
-    function mergeDependencies(&$params)
-    {
-        $newparams = array();
-        $bundles = array();
-        foreach ($params as $i => $param) {
-            if (!$param->isBundle()) {
-                continue;
-            }
-            $bundles[] = $i;
-            $pf = &$param->getPackageFile();
-            $newdeps = array();
-            $contents = $pf->getBundledPackages();
-            if (!is_array($contents)) {
-                $contents = array($contents);
-            }
-            foreach ($contents as $file) {
-                $filecontents = $pf->getFileContents($file);
-                $dl = &$param->getDownloader();
-                $options = $dl->getOptions();
-                if (PEAR::isError($dir = $dl->getDownloadDir())) {
-                    return $dir;
-                }
-                $fp = @fopen($dir . DIRECTORY_SEPARATOR . $file, 'wb');
-                if (!$fp) {
-                    continue;
-                }
-                fwrite($fp, $filecontents, strlen($filecontents));
-                fclose($fp);
-                if ($s = $params[$i]->explicitState()) {
-                    $obj->setExplicitState($s);
-                }
-                $obj = &new PEAR_Downloader_Package($params[$i]->getDownloader());
-                PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                if (PEAR::isError($dir = $dl->getDownloadDir())) {
-                    PEAR::popErrorHandling();
-                    return $dir;
-                }
-                $e = $obj->_fromFile($a = $dir . DIRECTORY_SEPARATOR . $file);
-                PEAR::popErrorHandling();
-                if (PEAR::isError($e)) {
-                    if (!isset($options['soft'])) {
-                        $dl->log(0, $e->getMessage());
-                    }
-                    continue;
-                }
-                $j = &$obj;
-                if (!PEAR_Downloader_Package::willDownload($j,
-                      array_merge($params, $newparams)) && !$param->isInstalled($j)) {
-                    $newparams[] = &$j;
-                }
-            }
-        }
-        foreach ($bundles as $i) {
-            unset($params[$i]); // remove bundles - only their contents matter for installation
-        }
-        PEAR_Downloader_Package::removeDuplicates($params); // strip any unset indices
-        if (count($newparams)) { // add in bundled packages for install
-            foreach ($newparams as $i => $unused) {
-                $params[] = &$newparams[$i];
-            }
-            $newparams = array();
-        }
-        foreach ($params as $i => $param) {
-            $newdeps = array();
-            foreach ($param->_downloadDeps as $dep) {
-                if (!PEAR_Downloader_Package::willDownload($dep,
-                      array_merge($params, $newparams)) && !$param->isInstalled($dep)) {
-                    $newdeps[] = $dep;
-                } else {
-                    // detect versioning conflicts here
-                }
-            }
-            // convert the dependencies into PEAR_Downloader_Package objects for the next time
-            // around
-            $params[$i]->_downloadDeps = array();
-            foreach ($newdeps as $dep) {
-                $obj = &new PEAR_Downloader_Package($params[$i]->getDownloader());
-                if ($s = $params[$i]->explicitState()) {
-                    $obj->setExplicitState($s);
-                }
-                PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                $e = $obj->fromDepURL($dep);
-                PEAR::popErrorHandling();
-                if (PEAR::isError($e)) {
-                    if (!isset($options['soft'])) {
-                        $obj->_downloader->log(0, $e->getMessage());
-                    }
-                    continue;
-                }
-                $e = $obj->detectDependencies($params);
-                if (PEAR::isError($e)) {
-                    if (!isset($options['soft'])) {
-                        $obj->_downloader->log(0, $e->getMessage());
-                    }
-                }
-                $j = &$obj;
-                $newparams[] = &$j;
-            }
-        }
-        if (count($newparams)) {
-            foreach ($newparams as $i => $unused) {
-                $params[] = &$newparams[$i];
-            }
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-
-    /**
-     * @static
-     */
-    function willDownload($param, $params)
-    {
-        if (!is_array($params)) {
-            return false;
-        }
-        foreach ($params as $obj) {
-            if ($obj->isEqual($param)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * For simpler unit-testing
-     * @param PEAR_Config
-     * @param int
-     * @param string
-     */
-    function &getPackagefileObject(&$c, $d, $t = false)
-    {
-        $a = &new PEAR_PackageFile($c, $d, $t);
-        return $a;
-    }
-
-
-    /**
-     * This will retrieve from a local file if possible, and parse out
-     * a group name as well.  The original parameter will be modified to reflect this.
-     * @param string|array can be a parsed package name as well
-     * @access private
-     */
-    function _fromFile(&$param)
-    {
-        $saveparam = $param;
-        if (is_string($param)) {
-            if (!@file_exists($param)) {
-                $test = explode('#', $param);
-                $group = array_pop($test);
-                if (file_exists(implode('#', $test))) {
-                    $this->setGroup($group);
-                    $param = implode('#', $test);
-                    $this->_explicitGroup = true;
-                }
-            }
-            if (@is_file($param)) {
-                $this->_type = 'local';
-                $options = $this->_downloader->getOptions();
-                if (isset($options['downloadonly'])) {
-                    $pkg = &$this->getPackagefileObject($this->_config,
-                        $this->_downloader->_debug);
-                } else {
-                    if (PEAR::isError($dir = $this->_downloader->getDownloadDir())) {
-                        return $dir;
-                    }
-                    $pkg = &$this->getPackagefileObject($this->_config,
-                        $this->_downloader->_debug, $dir);
-                }
-                PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                $pf = &$pkg->fromAnyFile($param, PEAR_VALIDATE_INSTALLING);
-                PEAR::popErrorHandling();
-                if (PEAR::isError($pf)) {
-                    $this->_valid = false;
-                    $param = $saveparam;
-                    return $pf;
-                }
-                $this->_packagefile = &$pf;
-                if (!$this->getGroup()) {
-                    $this->setGroup('default'); // install the default dependency group
-                }
-                return $this->_valid = true;
-            }
-        }
-        $param = $saveparam;
-        return $this->_valid = false;
-    }
-
-    function _fromUrl($param, $saveparam = '')
-    {
-        if (!is_array($param) &&
-              (preg_match('#^(http|ftp)://#', $param))) {
-            $options = $this->_downloader->getOptions();
-            $this->_type = 'url';
-            $callback = $this->_downloader->ui ?
-                array(&$this->_downloader, '_downloadCallback') : null;
-            $this->_downloader->pushErrorHandling(PEAR_ERROR_RETURN);
-            if (PEAR::isError($dir = $this->_downloader->getDownloadDir())) {
-                $this->_downloader->popErrorHandling();
-                return $dir;
-            }
-            $file = $this->_downloader->downloadHttp($param, $this->_downloader->ui,
-                $dir, $callback);
-            $this->_downloader->popErrorHandling();
-            if (PEAR::isError($file)) {
-                if (!empty($saveparam)) {
-                    $saveparam = ", cannot download \"$saveparam\"";
-                }
-                $err = PEAR::raiseError('Could not download from "' . $param .
-                    '"' . $saveparam . ' (' . $file->getMessage() . ')');
-                    return $err;
-            }
-            if ($this->_rawpackagefile) {
-                require_once 'Archive/Tar.php';
-                $tar = &new Archive_Tar($file);
-                $packagexml = $tar->extractInString('package2.xml');
-                if (!$packagexml) {
-                    $packagexml = $tar->extractInString('package.xml');
-                }
-                if (str_replace(array("\n", "\r"), array('',''), $packagexml) !=
-                      str_replace(array("\n", "\r"), array('',''), $this->_rawpackagefile)) {
-                    if ($this->getChannel() == 'pear.php.net') {
-                        // be more lax for the existing PEAR packages that have not-ok
-                        // characters in their package.xml
-                        $this->_downloader->log(0, 'CRITICAL WARNING: The "' .
-                            $this->getPackage() . '" package has invalid characters in its ' .
-                            'package.xml.  The next version of PEAR may not be able to install ' .
-                            'this package for security reasons.  Please open a bug report at ' .
-                            'http://pear.php.net/package/' . $this->getPackage() . '/bugs');
-                    } else {
-                        return PEAR::raiseError('CRITICAL ERROR: package.xml downloaded does ' .
-                            'not match value returned from xml-rpc');
-                    }
-                }
-            }
-            // whew, download worked!
-            if (isset($options['downloadonly'])) {
-                $pkg = &$this->getPackagefileObject($this->_config, $this->_downloader->debug);
-            } else {
-                if (PEAR::isError($dir = $this->_downloader->getDownloadDir())) {
-                    return $dir;
-                }
-                $pkg = &$this->getPackagefileObject($this->_config, $this->_downloader->debug,
-                    $dir);
-            }
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            $pf = &$pkg->fromAnyFile($file, PEAR_VALIDATE_INSTALLING);
-            PEAR::popErrorHandling();
-            if (PEAR::isError($pf)) {
-                if (is_array($pf->getUserInfo())) {
-                    foreach ($pf->getUserInfo() as $err) {
-                        if (is_array($err)) {
-                            $err = $err['message'];
-                        }
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(0, "Validation Error: $err");
-                        }
-                    }
-                }
-                if (!isset($options['soft'])) {
-                    $this->_downloader->log(0, $pf->getMessage());
-                }
-                $err = PEAR::raiseError('Download of "' . ($saveparam ? $saveparam :
-                    $param) . '" succeeded, but it is not a valid package archive');
-                $this->_valid = false;
-                return $err;
-            }
-            $this->_packagefile = &$pf;
-            $this->setGroup('default'); // install the default dependency group
-            return $this->_valid = true;
-        }
-        return $this->_valid = false;
-    }
-
-    /**
-     *
-     * @param string|array pass in an array of format
-     *                     array(
-     *                      'package' => 'pname',
-     *                     ['channel' => 'channame',]
-     *                     ['version' => 'version',]
-     *                     ['state' => 'state',])
-     *                     or a string of format [channame/]pname[-version|-state]
-     */
-    function _fromString($param)
-    {
-        $options = $this->_downloader->getOptions();
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $pname = $this->_registry->parsePackageName($param,
-            $this->_config->get('default_channel'));
-        PEAR::popErrorHandling();
-        if (PEAR::isError($pname)) {
-            if ($pname->getCode() == 'invalid') {
-                $this->_valid = false;
-                return false;
-            }
-            if ($pname->getCode() == 'channel') {
-                $parsed = $pname->getUserInfo();
-                if ($this->_downloader->discover($parsed['channel'])) {
-                    if ($this->_config->get('auto_discover')) {
-                        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                        $pname = $this->_registry->parsePackageName($param,
-                            $this->_config->get('default_channel'));
-                        PEAR::popErrorHandling();
-                    } else {
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(0, 'Channel "' . $parsed['channel'] .
-                                '" is not initialized, use ' .
-                                '"pear channel-discover ' . $parsed['channel'] . '" to initialize' .
-                                'or pear config-set auto_discover 1');
-                        }
-                    }
-                }
-                if (PEAR::isError($pname)) {
-                    if (!isset($options['soft'])) {
-                        $this->_downloader->log(0, $pname->getMessage());
-                    }
-                    if (is_array($param)) {
-                        $param = $this->_registry->parsedPackageNameToString($param);
-                    }
-                    $err = PEAR::raiseError('invalid package name/package file "' .
-                        $param . '"');
-                    $this->_valid = false;
-                    return $err;
-                }
-            } else {
-                if (!isset($options['soft'])) {
-                    $this->_downloader->log(0, $pname->getMessage());
-                }
-                $err = PEAR::raiseError('invalid package name/package file "' .
-                    $param . '"');
-                $this->_valid = false;
-                return $err;
-            }
-        }
-        if (!isset($this->_type)) {
-            $this->_type = 'xmlrpc';
-        }
-        $this->_parsedname = $pname;
-        if (isset($pname['state'])) {
-            $this->_explicitState = $pname['state'];
-        } else {
-            $this->_explicitState = false;
-        }
-        if (isset($pname['group'])) {
-            $this->_explicitGroup = true;
-        } else {
-            $this->_explicitGroup = false;
-        }
-        $info = $this->_downloader->_getPackageDownloadUrl($pname);
-        if (PEAR::isError($info)) {
-            if ($info->getCode() != -976 && $pname['channel'] == 'pear.php.net') {
-                // try pecl
-                $pname['channel'] = 'pecl.php.net';
-                if ($test = $this->_downloader->_getPackageDownloadUrl($pname)) {
-                    if (!PEAR::isError($test)) {
-                        $info = PEAR::raiseError($info->getMessage() . ' - package ' .
-                            $this->_registry->parsedPackageNameToString($pname, true) .
-                            ' can be installed with "pecl install ' . $pname['package'] .
-                            '"');
-                    } else {
-                        $pname['channel'] = 'pear.php.net';
-                    }
-                } else {
-                    $pname['channel'] = 'pear.php.net';
-                }
-            }
-            return $info;
-        }
-        $this->_rawpackagefile = $info['raw'];
-        $ret = $this->_analyzeDownloadURL($info, $param, $pname);
-        if (PEAR::isError($ret)) {
-            return $ret;
-        }
-        if ($ret) {
-            $this->_downloadURL = $ret;
-            return $this->_valid = (bool) $ret;
-        }
-    }
-
-    /**
-     * @param array output of package.getDownloadURL
-     * @param string|array|object information for detecting packages to be downloaded, and
-     *                            for errors
-     * @param array name information of the package
-     * @param array|null packages to be downloaded
-     * @param bool is this an optional dependency?
-     * @param bool is this any kind of dependency?
-     * @access private
-     */
-    function _analyzeDownloadURL($info, $param, $pname, $params = null, $optional = false,
-                                 $isdependency = false)
-    {
-        if (!is_string($param) && PEAR_Downloader_Package::willDownload($param, $params)) {
-            return false;
-        }
-        if (!$info) {
-            if (!is_string($param)) {
-                $saveparam = ", cannot download \"$param\"";
-            } else {
-                $saveparam = '';
-            }
-            // no releases exist
-            return PEAR::raiseError('No releases for package "' .
-                $this->_registry->parsedPackageNameToString($pname, true) . '" exist' . $saveparam);
-        }
-        if (strtolower($info['info']->getChannel()) != strtolower($pname['channel'])) {
-            $err = false;
-            if ($pname['channel'] == 'pecl.php.net') {
-                if ($info['info']->getChannel() != 'pear.php.net') {
-                    $err = true;
-                }
-            } elseif ($info['info']->getChannel() == 'pecl.php.net') {
-                if ($pname['channel'] != 'pear.php.net') {
-                    $err = true;
-                }
-            } else {
-                $err = true;
-            }
-            if ($err) {
-                return PEAR::raiseError('SECURITY ERROR: package in channel "' . $pname['channel'] .
-                    '" retrieved another channel\'s name for download! ("' .
-                    $info['info']->getChannel() . '")');
-            }
-        }
-        if (!isset($info['url'])) {
-            if ($this->isInstalled($info)) {
-                if ($isdependency && version_compare($info['version'],
-                      $this->_registry->packageInfo($info['info']->getPackage(),
-                            'version', $info['info']->getChannel()), '<=')) {
-                    // ignore bogus errors of "failed to download dependency"
-                    // if it is already installed and the one that would be
-                    // downloaded is older or the same version (Bug #7219)
-                    return false;
-                }
-            }
-            $instead =  ', will instead download version ' . $info['version'] .
-                        ', stability "' . $info['info']->getState() . '"';
-            // releases exist, but we failed to get any
-            if (isset($this->_downloader->_options['force'])) {
-                if (isset($pname['version'])) {
-                    $vs = ', version "' . $pname['version'] . '"';
-                } elseif (isset($pname['state'])) {
-                    $vs = ', stability "' . $pname['state'] . '"';
-                } elseif ($param == 'dependency') {
-                    if (!class_exists('PEAR_Common')) {
-                        require_once 'PEAR/Common.php';
-                    }
-                    if (!in_array($info['info']->getState(),
-                          PEAR_Common::betterStates($this->_config->get('preferred_state'), true))) {
-                        if ($optional) {
-                            // don't spit out confusing error message
-                            return $this->_downloader->_getPackageDownloadUrl(
-                                array('package' => $pname['package'],
-                                      'channel' => $pname['channel'],
-                                      'version' => $info['version']));
-                        }
-                        $vs = ' within preferred state "' . $this->_config->get('preferred_state') .
-                            '"';
-                    } else {
-                        if (!class_exists('PEAR_Dependency2')) {
-                            require_once 'PEAR/Dependency2.php';
-                        }
-                        if ($optional) {
-                            // don't spit out confusing error message
-                            return $this->_downloader->_getPackageDownloadUrl(
-                                array('package' => $pname['package'],
-                                      'channel' => $pname['channel'],
-                                      'version' => $info['version']));
-                        }
-                        $vs = PEAR_Dependency2::_getExtraString($pname);
-                        $instead = '';
-                    }
-                } else {
-                    $vs = ' within preferred state "' . $this->_config->get(
-                        'preferred_state') . '"';
-                }
-                if (!isset($options['soft'])) {
-                    $this->_downloader->log(1, 'WARNING: failed to download ' . $pname['channel'] .
-                        '/' . $pname['package'] . $vs . $instead);
-                }
-                // download the latest release
-                return $this->_downloader->_getPackageDownloadUrl(
-                    array('package' => $pname['package'],
-                          'channel' => $pname['channel'],
-                          'version' => $info['version']));
-            } else {
-                // construct helpful error message
-                if (isset($pname['version'])) {
-                    $vs = ', version "' . $pname['version'] . '"';
-                } elseif (isset($pname['state'])) {
-                    $vs = ', stability "' . $pname['state'] . '"';
-                } elseif ($param == 'dependency') {
-                    if (!class_exists('PEAR_Common')) {
-                        require_once 'PEAR/Common.php';
-                    }
-                    if (!in_array($info['info']->getState(),
-                          PEAR_Common::betterStates($this->_config->get('preferred_state'), true))) {
-                        if ($optional) {
-                            // don't spit out confusing error message, and don't die on
-                            // optional dep failure!
-                            return $this->_downloader->_getPackageDownloadUrl(
-                                array('package' => $pname['package'],
-                                      'channel' => $pname['channel'],
-                                      'version' => $info['version']));
-                        }
-                        $vs = ' within preferred state "' . $this->_config->get('preferred_state') .
-                            '"';
-                    } else {
-                        if (!class_exists('PEAR_Dependency2')) {
-                            require_once 'PEAR/Dependency2.php';
-                        }
-                        if ($optional) {
-                            // don't spit out confusing error message, and don't die on
-                            // optional dep failure!
-                            return $this->_downloader->_getPackageDownloadUrl(
-                                array('package' => $pname['package'],
-                                      'channel' => $pname['channel'],
-                                      'version' => $info['version']));
-                        }
-                        $vs = PEAR_Dependency2::_getExtraString($pname);
-                    }
-                } else {
-                    $vs = ' within preferred state "' . $this->_downloader->config->get(
-                        'preferred_state') . '"';
-                }
-                $options = $this->_downloader->getOptions();
-                // this is only set by the "download-all" command
-                if (isset($options['ignorepreferred_state'])) {
-                    $err = PEAR::raiseError(
-                        'Failed to download ' . $this->_registry->parsedPackageNameToString(
-                            array('channel' => $pname['channel'], 'package' => $pname['package']),
-                                true)
-                         . $vs .
-                        ', latest release is version ' . $info['version'] .
-                        ', stability "' . $info['info']->getState() . '", use "' .
-                        $this->_registry->parsedPackageNameToString(
-                            array('channel' => $pname['channel'], 'package' => $pname['package'],
-                            'version' => $info['version'])) . '" to install',
-                            PEAR_DOWNLOADER_PACKAGE_STATE);
-                    return $err;
-                }
-                $err = PEAR::raiseError(
-                    'Failed to download ' . $this->_registry->parsedPackageNameToString(
-                        array('channel' => $pname['channel'], 'package' => $pname['package']),
-                            true)
-                     . $vs .
-                    ', latest release is version ' . $info['version'] .
-                    ', stability "' . $info['info']->getState() . '", use "' .
-                    $this->_registry->parsedPackageNameToString(
-                        array('channel' => $pname['channel'], 'package' => $pname['package'],
-                        'version' => $info['version'])) . '" to install');
-                return $err;
-            }
-        }
-        if (isset($info['deprecated']) && $info['deprecated']) {
-            $this->_downloader->log(0,
-                'WARNING: "' . 
-                    $this->_registry->parsedPackageNameToString(
-                            array('channel' => $info['info']->getChannel(),
-                                  'package' => $info['info']->getPackage()), true) .
-                '" is deprecated in favor of "' .
-                    $this->_registry->parsedPackageNameToString($info['deprecated'], true) .
-                '"');
-        }
-        return $info;
-    }
-}
-?>
diff --git a/PEAR/ErrorStack.php b/PEAR/ErrorStack.php
deleted file mode 100644
index ce70aa8..0000000
--- a/PEAR/ErrorStack.php
+++ /dev/null
@@ -1,982 +0,0 @@
-
- * @copyright  2004-2006 Greg Beaver
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: ErrorStack.php,v 1.25 2006/09/22 03:13:17 cellog Exp $
- * @link       http://pear.php.net/package/PEAR_ErrorStack
- */
-
-/**
- * Singleton storage
- * 
- * Format:
- * 
    - * array(
- *  'package1' => PEAR_ErrorStack object,
- *  'package2' => PEAR_ErrorStack object,
- *  ...
- * )
- * 
    
- * @access private
- * @global array $GLOBALS['_PEAR_ERRORSTACK_SINGLETON']
- */
-$GLOBALS['_PEAR_ERRORSTACK_SINGLETON'] = array();
-
-/**
- * Global error callback (default)
- * 
- * This is only used if set to non-false.  * is the default callback for
- * all packages, whereas specific packages may set a default callback
- * for all instances, regardless of whether they are a singleton or not.
- *
- * To exclude non-singletons, only set the local callback for the singleton
- * @see PEAR_ErrorStack::setDefaultCallback()
- * @access private
- * @global array $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK']
- */
-$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'] = array(
-    '*' => false,
-);
-
-/**
- * Global Log object (default)
- * 
- * This is only used if set to non-false.  Use to set a default log object for
- * all stacks, regardless of instantiation order or location
- * @see PEAR_ErrorStack::setDefaultLogger()
- * @access private
- * @global array $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER']
- */
-$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = false;
-
-/**
- * Global Overriding Callback
- * 
- * This callback will override any error callbacks that specific loggers have set.
- * Use with EXTREME caution
- * @see PEAR_ErrorStack::staticPushCallback()
- * @access private
- * @global array $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER']
- */
-$GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'] = array();
-
-/**#@+
- * One of four possible return values from the error Callback
- * @see PEAR_ErrorStack::_errorCallback()
- */
-/**
- * If this is returned, then the error will be both pushed onto the stack
- * and logged.
- */
-define('PEAR_ERRORSTACK_PUSHANDLOG', 1);
-/**
- * If this is returned, then the error will only be pushed onto the stack,
- * and not logged.
- */
-define('PEAR_ERRORSTACK_PUSH', 2);
-/**
- * If this is returned, then the error will only be logged, but not pushed
- * onto the error stack.
- */
-define('PEAR_ERRORSTACK_LOG', 3);
-/**
- * If this is returned, then the error is completely ignored.
- */
-define('PEAR_ERRORSTACK_IGNORE', 4);
-/**
- * If this is returned, then the error is logged and die() is called.
- */
-define('PEAR_ERRORSTACK_DIE', 5);
-/**#@-*/
-
-/**
- * Error code for an attempt to instantiate a non-class as a PEAR_ErrorStack in
- * the singleton method.
- */
-define('PEAR_ERRORSTACK_ERR_NONCLASS', 1);
-
-/**
- * Error code for an attempt to pass an object into {@link PEAR_ErrorStack::getMessage()}
- * that has no __toString() method
- */
-define('PEAR_ERRORSTACK_ERR_OBJTOSTRING', 2);
-/**
- * Error Stack Implementation
- *
- * Usage:
- * 
- * // global error stack
- * $global_stack = &PEAR_ErrorStack::singleton('MyPackage');
- * // local error stack
- * $local_stack = new PEAR_ErrorStack('MyPackage');
- * 
- * @author     Greg Beaver 
- * @version    1.5.0a1
- * @package    PEAR_ErrorStack
- * @category   Debugging
- * @copyright  2004-2006 Greg Beaver
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: ErrorStack.php,v 1.25 2006/09/22 03:13:17 cellog Exp $
- * @link       http://pear.php.net/package/PEAR_ErrorStack
- */
-class PEAR_ErrorStack {
-    /**
-     * Errors are stored in the order that they are pushed on the stack.
-     * @since 0.4alpha Errors are no longer organized by error level.
-     * This renders pop() nearly unusable, and levels could be more easily
-     * handled in a callback anyway
-     * @var array
-     * @access private
-     */
-    var $_errors = array();
-
-    /**
-     * Storage of errors by level.
-     *
-     * Allows easy retrieval and deletion of only errors from a particular level
-     * @since PEAR 1.4.0dev
-     * @var array
-     * @access private
-     */
-    var $_errorsByLevel = array();
-
-    /**
-     * Package name this error stack represents
-     * @var string
-     * @access protected
-     */
-    var $_package;
-    
-    /**
-     * Determines whether a PEAR_Error is thrown upon every error addition
-     * @var boolean
-     * @access private
-     */
-    var $_compat = false;
-    
-    /**
-     * If set to a valid callback, this will be used to generate the error
-     * message from the error code, otherwise the message passed in will be
-     * used
-     * @var false|string|array
-     * @access private
-     */
-    var $_msgCallback = false;
-    
-    /**
-     * If set to a valid callback, this will be used to generate the error
-     * context for an error.  For PHP-related errors, this will be a file
-     * and line number as retrieved from debug_backtrace(), but can be
-     * customized for other purposes.  The error might actually be in a separate
-     * configuration file, or in a database query.
-     * @var false|string|array
-     * @access protected
-     */
-    var $_contextCallback = false;
-    
-    /**
-     * If set to a valid callback, this will be called every time an error
-     * is pushed onto the stack.  The return value will be used to determine
-     * whether to allow an error to be pushed or logged.
-     * 
-     * The return value must be one an PEAR_ERRORSTACK_* constant
-     * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
-     * @var false|string|array
-     * @access protected
-     */
-    var $_errorCallback = array();
-    
-    /**
-     * PEAR::Log object for logging errors
-     * @var false|Log
-     * @access protected
-     */
-    var $_logger = false;
-    
-    /**
-     * Error messages - designed to be overridden
-     * @var array
-     * @abstract
-     */
-    var $_errorMsgs = array();
-    
-    /**
-     * Set up a new error stack
-     * 
-     * @param string   $package name of the package this error stack represents
-     * @param callback $msgCallback callback used for error message generation
-     * @param callback $contextCallback callback used for context generation,
-     *                 defaults to {@link getFileLine()}
-     * @param boolean  $throwPEAR_Error
-     */
-    function PEAR_ErrorStack($package, $msgCallback = false, $contextCallback = false,
-                         $throwPEAR_Error = false)
-    {
-        $this->_package = $package;
-        $this->setMessageCallback($msgCallback);
-        $this->setContextCallback($contextCallback);
-        $this->_compat = $throwPEAR_Error;
-    }
-    
-    /**
-     * Return a single error stack for this package.
-     * 
-     * Note that all parameters are ignored if the stack for package $package
-     * has already been instantiated
-     * @param string   $package name of the package this error stack represents
-     * @param callback $msgCallback callback used for error message generation
-     * @param callback $contextCallback callback used for context generation,
-     *                 defaults to {@link getFileLine()}
-     * @param boolean  $throwPEAR_Error
-     * @param string   $stackClass class to instantiate
-     * @static
-     * @return PEAR_ErrorStack
-     */
-    function &singleton($package, $msgCallback = false, $contextCallback = false,
-                         $throwPEAR_Error = false, $stackClass = 'PEAR_ErrorStack')
-    {
-        if (isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
-            return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package];
-        }
-        if (!class_exists($stackClass)) {
-            if (function_exists('debug_backtrace')) {
-                $trace = debug_backtrace();
-            }
-            PEAR_ErrorStack::staticPush('PEAR_ErrorStack', PEAR_ERRORSTACK_ERR_NONCLASS,
-                'exception', array('stackclass' => $stackClass),
-                'stack class "%stackclass%" is not a valid class name (should be like PEAR_ErrorStack)',
-                false, $trace);
-        }
-        $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package] =
-            new $stackClass($package, $msgCallback, $contextCallback, $throwPEAR_Error);
-
-        return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package];
-    }
-
-    /**
-     * Internal error handler for PEAR_ErrorStack class
-     * 
-     * Dies if the error is an exception (and would have died anyway)
-     * @access private
-     */
-    function _handleError($err)
-    {
-        if ($err['level'] == 'exception') {
-            $message = $err['message'];
-            if (isset($_SERVER['REQUEST_URI'])) {
-                echo '
    ';
-            } else {
-                echo "\n";
-            }
-            var_dump($err['context']);
-            die($message);
-        }
-    }
-    
-    /**
-     * Set up a PEAR::Log object for all error stacks that don't have one
-     * @param Log $log 
-     * @static
-     */
-    function setDefaultLogger(&$log)
-    {
-        if (is_object($log) && method_exists($log, 'log') ) {
-            $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = &$log;
-        } elseif (is_callable($log)) {
-            $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = &$log;
-	}
-    }
-    
-    /**
-     * Set up a PEAR::Log object for this error stack
-     * @param Log $log 
-     */
-    function setLogger(&$log)
-    {
-        if (is_object($log) && method_exists($log, 'log') ) {
-            $this->_logger = &$log;
-        } elseif (is_callable($log)) {
-            $this->_logger = &$log;
-        }
-    }
-    
-    /**
-     * Set an error code => error message mapping callback
-     * 
-     * This method sets the callback that can be used to generate error
-     * messages for any instance
-     * @param array|string Callback function/method
-     */
-    function setMessageCallback($msgCallback)
-    {
-        if (!$msgCallback) {
-            $this->_msgCallback = array(&$this, 'getErrorMessage');
-        } else {
-            if (is_callable($msgCallback)) {
-                $this->_msgCallback = $msgCallback;
-            }
-        }
-    }
-    
-    /**
-     * Get an error code => error message mapping callback
-     * 
-     * This method returns the current callback that can be used to generate error
-     * messages
-     * @return array|string|false Callback function/method or false if none
-     */
-    function getMessageCallback()
-    {
-        return $this->_msgCallback;
-    }
-    
-    /**
-     * Sets a default callback to be used by all error stacks
-     * 
-     * This method sets the callback that can be used to generate error
-     * messages for a singleton
-     * @param array|string Callback function/method
-     * @param string Package name, or false for all packages
-     * @static
-     */
-    function setDefaultCallback($callback = false, $package = false)
-    {
-        if (!is_callable($callback)) {
-            $callback = false;
-        }
-        $package = $package ? $package : '*';
-        $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'][$package] = $callback;
-    }
-    
-    /**
-     * Set a callback that generates context information (location of error) for an error stack
-     * 
-     * This method sets the callback that can be used to generate context
-     * information for an error.  Passing in NULL will disable context generation
-     * and remove the expensive call to debug_backtrace()
-     * @param array|string|null Callback function/method
-     */
-    function setContextCallback($contextCallback)
-    {
-        if ($contextCallback === null) {
-            return $this->_contextCallback = false;
-        }
-        if (!$contextCallback) {
-            $this->_contextCallback = array(&$this, 'getFileLine');
-        } else {
-            if (is_callable($contextCallback)) {
-                $this->_contextCallback = $contextCallback;
-            }
-        }
-    }
-    
-    /**
-     * Set an error Callback
-     * If set to a valid callback, this will be called every time an error
-     * is pushed onto the stack.  The return value will be used to determine
-     * whether to allow an error to be pushed or logged.
-     * 
-     * The return value must be one of the ERRORSTACK_* constants.
-     * 
-     * This functionality can be used to emulate PEAR's pushErrorHandling, and
-     * the PEAR_ERROR_CALLBACK mode, without affecting the integrity of
-     * the error stack or logging
-     * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
-     * @see popCallback()
-     * @param string|array $cb
-     */
-    function pushCallback($cb)
-    {
-        array_push($this->_errorCallback, $cb);
-    }
-    
-    /**
-     * Remove a callback from the error callback stack
-     * @see pushCallback()
-     * @return array|string|false
-     */
-    function popCallback()
-    {
-        if (!count($this->_errorCallback)) {
-            return false;
-        }
-        return array_pop($this->_errorCallback);
-    }
-    
-    /**
-     * Set a temporary overriding error callback for every package error stack
-     *
-     * Use this to temporarily disable all existing callbacks (can be used
-     * to emulate the @ operator, for instance)
-     * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
-     * @see staticPopCallback(), pushCallback()
-     * @param string|array $cb
-     * @static
-     */
-    function staticPushCallback($cb)
-    {
-        array_push($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'], $cb);
-    }
-    
-    /**
-     * Remove a temporary overriding error callback
-     * @see staticPushCallback()
-     * @return array|string|false
-     * @static
-     */
-    function staticPopCallback()
-    {
-        $ret = array_pop($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK']);
-        if (!is_array($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'])) {
-            $GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'] = array();
-        }
-        return $ret;
-    }
-    
-    /**
-     * Add an error to the stack
-     * 
-     * If the message generator exists, it is called with 2 parameters.
-     *  - the current Error Stack object
-     *  - an array that is in the same format as an error.  Available indices
-     *    are 'code', 'package', 'time', 'params', 'level', and 'context'
-     * 
-     * Next, if the error should contain context information, this is
-     * handled by the context grabbing method.
-     * Finally, the error is pushed onto the proper error stack
-     * @param int    $code      Package-specific error code
-     * @param string $level     Error level.  This is NOT spell-checked
-     * @param array  $params    associative array of error parameters
-     * @param string $msg       Error message, or a portion of it if the message
-     *                          is to be generated
-     * @param array  $repackage If this error re-packages an error pushed by
-     *                          another package, place the array returned from
-     *                          {@link pop()} in this parameter
-     * @param array  $backtrace Protected parameter: use this to pass in the
-     *                          {@link debug_backtrace()} that should be used
-     *                          to find error context
-     * @return PEAR_Error|array if compatibility mode is on, a PEAR_Error is also
-     * thrown.  If a PEAR_Error is returned, the userinfo
-     * property is set to the following array:
-     * 
-     * 
-     * array(
-     *    'code' => $code,
-     *    'params' => $params,
-     *    'package' => $this->_package,
-     *    'level' => $level,
-     *    'time' => time(),
-     *    'context' => $context,
-     *    'message' => $msg,
-     * //['repackage' => $err] repackaged error array/Exception class
-     * );
-     * 
-     * 
-     * Normally, the previous array is returned.
-     */
-    function push($code, $level = 'error', $params = array(), $msg = false,
-                  $repackage = false, $backtrace = false)
-    {
-        $context = false;
-        // grab error context
-        if ($this->_contextCallback) {
-            if (!$backtrace) {
-                $backtrace = debug_backtrace();
-            }
-            $context = call_user_func($this->_contextCallback, $code, $params, $backtrace);
-        }
-        
-        // save error
-        $time = explode(' ', microtime());
-        $time = $time[1] + $time[0];
-        $err = array(
-                'code' => $code,
-                'params' => $params,
-                'package' => $this->_package,
-                'level' => $level,
-                'time' => $time,
-                'context' => $context,
-                'message' => $msg,
-               );
-
-        if ($repackage) {
-            $err['repackage'] = $repackage;
-        }
-
-        // set up the error message, if necessary
-        if ($this->_msgCallback) {
-            $msg = call_user_func_array($this->_msgCallback,
-                                        array(&$this, $err));
-            $err['message'] = $msg;
-        }        
-        $push = $log = true;
-        $die = false;
-        // try the overriding callback first
-        $callback = $this->staticPopCallback();
-        if ($callback) {
-            $this->staticPushCallback($callback);
-        }
-        if (!is_callable($callback)) {
-            // try the local callback next
-            $callback = $this->popCallback();
-            if (is_callable($callback)) {
-                $this->pushCallback($callback);
-            } else {
-                // try the default callback
-                $callback = isset($GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'][$this->_package]) ?
-                    $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'][$this->_package] :
-                    $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK']['*'];
-            }
-        }
-        if (is_callable($callback)) {
-            switch(call_user_func($callback, $err)){
-            	case PEAR_ERRORSTACK_IGNORE: 
-            		return $err;
-        		break;
-            	case PEAR_ERRORSTACK_PUSH: 
-            		$log = false;
-        		break;
-            	case PEAR_ERRORSTACK_LOG: 
-            		$push = false;
-        		break;
-            	case PEAR_ERRORSTACK_DIE: 
-            		$die = true;
-        		break;
-                // anything else returned has the same effect as pushandlog
-            }
-        }
-        if ($push) {
-            array_unshift($this->_errors, $err);
-            $this->_errorsByLevel[$err['level']][] = &$this->_errors[0];
-        }
-        if ($log) {
-            if ($this->_logger || $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER']) {
-                $this->_log($err);
-            }
-        }
-        if ($die) {
-            die();
-        }
-        if ($this->_compat && $push) {
-            return $this->raiseError($msg, $code, null, null, $err);
-        }
-        return $err;
-    }
-    
-    /**
-     * Static version of {@link push()}
-     * 
-     * @param string $package   Package name this error belongs to
-     * @param int    $code      Package-specific error code
-     * @param string $level     Error level.  This is NOT spell-checked
-     * @param array  $params    associative array of error parameters
-     * @param string $msg       Error message, or a portion of it if the message
-     *                          is to be generated
-     * @param array  $repackage If this error re-packages an error pushed by
-     *                          another package, place the array returned from
-     *                          {@link pop()} in this parameter
-     * @param array  $backtrace Protected parameter: use this to pass in the
-     *                          {@link debug_backtrace()} that should be used
-     *                          to find error context
-     * @return PEAR_Error|array if compatibility mode is on, a PEAR_Error is also
-     *                          thrown.  see docs for {@link push()}
-     * @static
-     */
-    function staticPush($package, $code, $level = 'error', $params = array(),
-                        $msg = false, $repackage = false, $backtrace = false)
-    {
-        $s = &PEAR_ErrorStack::singleton($package);
-        if ($s->_contextCallback) {
-            if (!$backtrace) {
-                if (function_exists('debug_backtrace')) {
-                    $backtrace = debug_backtrace();
-                }
-            }
-        }
-        return $s->push($code, $level, $params, $msg, $repackage, $backtrace);
-    }
-    
-    /**
-     * Log an error using PEAR::Log
-     * @param array $err Error array
-     * @param array $levels Error level => Log constant map
-     * @access protected
-     */
-    function _log($err)
-    {
-        if ($this->_logger) {
-            $logger = &$this->_logger;
-        } else {
-            $logger = &$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'];
-        }
-        if (is_a($logger, 'Log')) {
-            $levels = array(
-                'exception' => PEAR_LOG_CRIT,
-                'alert' => PEAR_LOG_ALERT,
-                'critical' => PEAR_LOG_CRIT,
-                'error' => PEAR_LOG_ERR,
-                'warning' => PEAR_LOG_WARNING,
-                'notice' => PEAR_LOG_NOTICE,
-                'info' => PEAR_LOG_INFO,
-                'debug' => PEAR_LOG_DEBUG);
-            if (isset($levels[$err['level']])) {
-                $level = $levels[$err['level']];
-            } else {
-                $level = PEAR_LOG_INFO;
-            }
-            $logger->log($err['message'], $level, $err);
-        } else { // support non-standard logs
-            call_user_func($logger, $err);
-        }
-    }
-
-    
-    /**
-     * Pop an error off of the error stack
-     * 
-     * @return false|array
-     * @since 0.4alpha it is no longer possible to specify a specific error
-     * level to return - the last error pushed will be returned, instead
-     */
-    function pop()
-    {
-        $err = @array_shift($this->_errors);
-        if (!is_null($err)) {
-            @array_pop($this->_errorsByLevel[$err['level']]);
-            if (!count($this->_errorsByLevel[$err['level']])) {
-                unset($this->_errorsByLevel[$err['level']]);
-            }
-        }
-        return $err;
-    }
-
-    /**
-     * Pop an error off of the error stack, static method
-     *
-     * @param string package name
-     * @return boolean
-     * @since PEAR1.5.0a1
-     */
-    function staticPop($package)
-    {
-        if ($package) {
-            if (!isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
-                return false;
-            }
-            return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package]->pop();
-        }
-    }
-
-    /**
-     * Determine whether there are any errors on the stack
-     * @param string|array Level name.  Use to determine if any errors
-     * of level (string), or levels (array) have been pushed
-     * @return boolean
-     */
-    function hasErrors($level = false)
-    {
-        if ($level) {
-            return isset($this->_errorsByLevel[$level]);
-        }
-        return count($this->_errors);
-    }
-    
-    /**
-     * Retrieve all errors since last purge
-     * 
-     * @param boolean set in order to empty the error stack
-     * @param string level name, to return only errors of a particular severity
-     * @return array
-     */
-    function getErrors($purge = false, $level = false)
-    {
-        if (!$purge) {
-            if ($level) {
-                if (!isset($this->_errorsByLevel[$level])) {
-                    return array();
-                } else {
-                    return $this->_errorsByLevel[$level];
-                }
-            } else {
-                return $this->_errors;
-            }
-        }
-        if ($level) {
-            $ret = $this->_errorsByLevel[$level];
-            foreach ($this->_errorsByLevel[$level] as $i => $unused) {
-                // entries are references to the $_errors array
-                $this->_errorsByLevel[$level][$i] = false;
-            }
-            // array_filter removes all entries === false
-            $this->_errors = array_filter($this->_errors);
-            unset($this->_errorsByLevel[$level]);
-            return $ret;
-        }
-        $ret = $this->_errors;
-        $this->_errors = array();
-        $this->_errorsByLevel = array();
-        return $ret;
-    }
-    
-    /**
-     * Determine whether there are any errors on a single error stack, or on any error stack
-     *
-     * The optional parameter can be used to test the existence of any errors without the need of
-     * singleton instantiation
-     * @param string|false Package name to check for errors
-     * @param string Level name to check for a particular severity
-     * @return boolean
-     * @static
-     */
-    function staticHasErrors($package = false, $level = false)
-    {
-        if ($package) {
-            if (!isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
-                return false;
-            }
-            return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package]->hasErrors($level);
-        }
-        foreach ($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'] as $package => $obj) {
-            if ($obj->hasErrors($level)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     * Get a list of all errors since last purge, organized by package
-     * @since PEAR 1.4.0dev BC break! $level is now in the place $merge used to be
-     * @param boolean $purge Set to purge the error stack of existing errors
-     * @param string  $level Set to a level name in order to retrieve only errors of a particular level
-     * @param boolean $merge Set to return a flat array, not organized by package
-     * @param array   $sortfunc Function used to sort a merged array - default
-     *        sorts by time, and should be good for most cases
-     * @static
-     * @return array 
-     */
-    function staticGetErrors($purge = false, $level = false, $merge = false,
-                             $sortfunc = array('PEAR_ErrorStack', '_sortErrors'))
-    {
-        $ret = array();
-        if (!is_callable($sortfunc)) {
-            $sortfunc = array('PEAR_ErrorStack', '_sortErrors');
-        }
-        foreach ($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'] as $package => $obj) {
-            $test = $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package]->getErrors($purge, $level);
-            if ($test) {
-                if ($merge) {
-                    $ret = array_merge($ret, $test);
-                } else {
-                    $ret[$package] = $test;
-                }
-            }
-        }
-        if ($merge) {
-            usort($ret, $sortfunc);
-        }
-        return $ret;
-    }
-    
-    /**
-     * Error sorting function, sorts by time
-     * @access private
-     */
-    function _sortErrors($a, $b)
-    {
-        if ($a['time'] == $b['time']) {
-            return 0;
-        }
-        if ($a['time'] < $b['time']) {
-            return 1;
-        }
-        return -1;
-    }
-
-    /**
-     * Standard file/line number/function/class context callback
-     *
-     * This function uses a backtrace generated from {@link debug_backtrace()}
-     * and so will not work at all in PHP < 4.3.0.  The frame should
-     * reference the frame that contains the source of the error.
-     * @return array|false either array('file' => file, 'line' => line,
-     *         'function' => function name, 'class' => class name) or
-     *         if this doesn't work, then false
-     * @param unused
-     * @param integer backtrace frame.
-     * @param array Results of debug_backtrace()
-     * @static
-     */
-    function getFileLine($code, $params, $backtrace = null)
-    {
-        if ($backtrace === null) {
-            return false;
-        }
-        $frame = 0;
-        $functionframe = 1;
-        if (!isset($backtrace[1])) {
-            $functionframe = 0;
-        } else {
-            while (isset($backtrace[$functionframe]['function']) &&
-                  $backtrace[$functionframe]['function'] == 'eval' &&
-                  isset($backtrace[$functionframe + 1])) {
-                $functionframe++;
-            }
-        }
-        if (isset($backtrace[$frame])) {
-            if (!isset($backtrace[$frame]['file'])) {
-                $frame++;
-            }
-            $funcbacktrace = $backtrace[$functionframe];
-            $filebacktrace = $backtrace[$frame];
-            $ret = array('file' => $filebacktrace['file'],
-                         'line' => $filebacktrace['line']);
-            // rearrange for eval'd code or create function errors
-            if (strpos($filebacktrace['file'], '(') && 
-            	  preg_match(';^(.*?)\((\d+)\) : (.*?)$;', $filebacktrace['file'],
-                  $matches)) {
-                $ret['file'] = $matches[1];
-                $ret['line'] = $matches[2] + 0;
-            }
-            if (isset($funcbacktrace['function']) && isset($backtrace[1])) {
-                if ($funcbacktrace['function'] != 'eval') {
-                    if ($funcbacktrace['function'] == '__lambda_func') {
-                        $ret['function'] = 'create_function() code';
-                    } else {
-                        $ret['function'] = $funcbacktrace['function'];
-                    }
-                }
-            }
-            if (isset($funcbacktrace['class']) && isset($backtrace[1])) {
-                $ret['class'] = $funcbacktrace['class'];
-            }
-            return $ret;
-        }
-        return false;
-    }
-    
-    /**
-     * Standard error message generation callback
-     * 
-     * This method may also be called by a custom error message generator
-     * to fill in template values from the params array, simply
-     * set the third parameter to the error message template string to use
-     * 
-     * The special variable %__msg% is reserved: use it only to specify
-     * where a message passed in by the user should be placed in the template,
-     * like so:
-     * 
-     * Error message: %msg% - internal error
-     * 
-     * If the message passed like so:
-     * 
-     * 
-     * $stack->push(ERROR_CODE, 'error', array(), 'server error 500');
-     * 
-     * 
-     * The returned error message will be "Error message: server error 500 -
-     * internal error"
-     * @param PEAR_ErrorStack
-     * @param array
-     * @param string|false Pre-generated error message template
-     * @static
-     * @return string
-     */
-    function getErrorMessage(&$stack, $err, $template = false)
-    {
-        if ($template) {
-            $mainmsg = $template;
-        } else {
-            $mainmsg = $stack->getErrorMessageTemplate($err['code']);
-        }
-        $mainmsg = str_replace('%__msg%', $err['message'], $mainmsg);
-        if (is_array($err['params']) && count($err['params'])) {
-            foreach ($err['params'] as $name => $val) {
-                if (is_array($val)) {
-                    // @ is needed in case $val is a multi-dimensional array
-                    $val = @implode(', ', $val);
-                }
-                if (is_object($val)) {
-                    if (method_exists($val, '__toString')) {
-                        $val = $val->__toString();
-                    } else {
-                        PEAR_ErrorStack::staticPush('PEAR_ErrorStack', PEAR_ERRORSTACK_ERR_OBJTOSTRING,
-                            'warning', array('obj' => get_class($val)),
-                            'object %obj% passed into getErrorMessage, but has no __toString() method');
-                        $val = 'Object';
-                    }
-                }
-                $mainmsg = str_replace('%' . $name . '%', $val, $mainmsg);
-            }
-        }
-        return $mainmsg;
-    }
-    
-    /**
-     * Standard Error Message Template generator from code
-     * @return string
-     */
-    function getErrorMessageTemplate($code)
-    {
-        if (!isset($this->_errorMsgs[$code])) {
-            return '%__msg%';
-        }
-        return $this->_errorMsgs[$code];
-    }
-    
-    /**
-     * Set the Error Message Template array
-     * 
-     * The array format must be:
-     * 
    -     * array(error code => 'message template',...)
-     * 
    
-     * 
-     * Error message parameters passed into {@link push()} will be used as input
-     * for the error message.  If the template is 'message %foo% was %bar%', and the
-     * parameters are array('foo' => 'one', 'bar' => 'six'), the error message returned will
-     * be 'message one was six'
-     * @return string
-     */
-    function setErrorMessageTemplate($template)
-    {
-        $this->_errorMsgs = $template;
-    }
-    
-    
-    /**
-     * emulate PEAR::raiseError()
-     * 
-     * @return PEAR_Error
-     */
-    function raiseError()
-    {
-        require_once 'PEAR.php';
-        $args = func_get_args();
-        return call_user_func_array(array('PEAR', 'raiseError'), $args);
-    }
-}
-$stack = &PEAR_ErrorStack::singleton('PEAR_ErrorStack');
-$stack->pushCallback(array('PEAR_ErrorStack', '_handleError'));
-?>
diff --git a/PEAR/Exception.php b/PEAR/Exception.php
deleted file mode 100644
index 51e2c65..0000000
--- a/PEAR/Exception.php
+++ /dev/null
@@ -1,393 +0,0 @@
-
- * @author     Hans Lellelid 
- * @author     Bertrand Mansion 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Exception.php,v 1.25 2006/09/25 14:14:40 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.3.3
- */
-
-
-/**
- * Base PEAR_Exception Class
- *
- * 1) Features:
- *
- * - Nestable exceptions (throw new PEAR_Exception($msg, $prev_exception))
- * - Definable triggers, shot when exceptions occur
- * - Pretty and informative error messages
- * - Added more context info available (like class, method or cause)
- * - cause can be a PEAR_Exception or an array of mixed
- *   PEAR_Exceptions/PEAR_ErrorStack warnings
- * - callbacks for specific exception classes and their children
- *
- * 2) Ideas:
- *
- * - Maybe a way to define a 'template' for the output
- *
- * 3) Inherited properties from PHP Exception Class:
- *
- * protected $message
- * protected $code
- * protected $line
- * protected $file
- * private   $trace
- *
- * 4) Inherited methods from PHP Exception Class:
- *
- * __clone
- * __construct
- * getMessage
- * getCode
- * getFile
- * getLine
- * getTraceSafe
- * getTraceSafeAsString
- * __toString
- *
- * 5) Usage example
- *
- * 
- *  require_once 'PEAR/Exception.php';
- *
- *  class Test {
- *     function foo() {
- *         throw new PEAR_Exception('Error Message', ERROR_CODE);
- *     }
- *  }
- *
- *  function myLogger($pear_exception) {
- *     echo $pear_exception->getMessage();
- *  }
- *  // each time a exception is thrown the 'myLogger' will be called
- *  // (its use is completely optional)
- *  PEAR_Exception::addObserver('myLogger');
- *  $test = new Test;
- *  try {
- *     $test->foo();
- *  } catch (PEAR_Exception $e) {
- *     print $e;
- *  }
- * 
- *
- * @category   pear
- * @package    PEAR
- * @author     Tomas V.V.Cox 
- * @author     Hans Lellelid 
- * @author     Bertrand Mansion 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.3.3
- *
- */
-class PEAR_Exception extends Exception
-{
-    const OBSERVER_PRINT = -2;
-    const OBSERVER_TRIGGER = -4;
-    const OBSERVER_DIE = -8;
-    protected $cause;
-    private static $_observers = array();
-    private static $_uniqueid = 0;
-    private $_trace;
-
-    /**
-     * Supported signatures:
-     *  - PEAR_Exception(string $message);
-     *  - PEAR_Exception(string $message, int $code);
-     *  - PEAR_Exception(string $message, Exception $cause);
-     *  - PEAR_Exception(string $message, Exception $cause, int $code);
-     *  - PEAR_Exception(string $message, PEAR_Error $cause);
-     *  - PEAR_Exception(string $message, PEAR_Error $cause, int $code);
-     *  - PEAR_Exception(string $message, array $causes);
-     *  - PEAR_Exception(string $message, array $causes, int $code);
-     * @param string exception message
-     * @param int|Exception|PEAR_Error|array|null exception cause
-     * @param int|null exception code or null
-     */
-    public function __construct($message, $p2 = null, $p3 = null)
-    {
-        if (is_int($p2)) {
-            $code = $p2;
-            $this->cause = null;
-        } elseif (is_object($p2) || is_array($p2)) {
-            // using is_object allows both Exception and PEAR_Error
-            if (is_object($p2) && !($p2 instanceof Exception)) {
-                if (!class_exists('PEAR_Error') || !($p2 instanceof PEAR_Error)) {
-                    throw new PEAR_Exception('exception cause must be Exception, ' .
-                        'array, or PEAR_Error');
-                }
-            }
-            $code = $p3;
-            if (is_array($p2) && isset($p2['message'])) {
-                // fix potential problem of passing in a single warning
-                $p2 = array($p2);
-            }
-            $this->cause = $p2;
-        } else {
-            $code = null;
-            $this->cause = null;
-        }
-        parent::__construct($message, $code);
-        $this->signal();
-    }
-
-    /**
-     * @param mixed $callback  - A valid php callback, see php func is_callable()
-     *                         - A PEAR_Exception::OBSERVER_* constant
-     *                         - An array(const PEAR_Exception::OBSERVER_*,
-     *                           mixed $options)
-     * @param string $label    The name of the observer. Use this if you want
-     *                         to remove it later with removeObserver()
-     */
-    public static function addObserver($callback, $label = 'default')
-    {
-        self::$_observers[$label] = $callback;
-    }
-
-    public static function removeObserver($label = 'default')
-    {
-        unset(self::$_observers[$label]);
-    }
-
-    /**
-     * @return int unique identifier for an observer
-     */
-    public static function getUniqueId()
-    {
-        return self::$_uniqueid++;
-    }
-
-    private function signal()
-    {
-        foreach (self::$_observers as $func) {
-            if (is_callable($func)) {
-                call_user_func($func, $this);
-                continue;
-            }
-            settype($func, 'array');
-            switch ($func[0]) {
-                case self::OBSERVER_PRINT :
-                    $f = (isset($func[1])) ? $func[1] : '%s';
-                    printf($f, $this->getMessage());
-                    break;
-                case self::OBSERVER_TRIGGER :
-                    $f = (isset($func[1])) ? $func[1] : E_USER_NOTICE;
-                    trigger_error($this->getMessage(), $f);
-                    break;
-                case self::OBSERVER_DIE :
-                    $f = (isset($func[1])) ? $func[1] : '%s';
-                    die(printf($f, $this->getMessage()));
-                    break;
-                default:
-                    trigger_error('invalid observer type', E_USER_WARNING);
-            }
-        }
-    }
-
-    /**
-     * Return specific error information that can be used for more detailed
-     * error messages or translation.
-     *
-     * This method may be overridden in child exception classes in order
-     * to add functionality not present in PEAR_Exception and is a placeholder
-     * to define API
-     *
-     * The returned array must be an associative array of parameter => value like so:
-     * 
    -     * array('name' => $name, 'context' => array(...))
-     * 
    
-     * @return array
-     */
-    public function getErrorData()
-    {
-        return array();
-    }
-
-    /**
-     * Returns the exception that caused this exception to be thrown
-     * @access public
-     * @return Exception|array The context of the exception
-     */
-    public function getCause()
-    {
-        return $this->cause;
-    }
-
-    /**
-     * Function must be public to call on caused exceptions
-     * @param array
-     */
-    public function getCauseMessage(&$causes)
-    {
-        $trace = $this->getTraceSafe();
-        $cause = array('class'   => get_class($this),
-                       'message' => $this->message,
-                       'file' => 'unknown',
-                       'line' => 'unknown');
-        if (isset($trace[0])) {
-            if (isset($trace[0]['file'])) {
-                $cause['file'] = $trace[0]['file'];
-                $cause['line'] = $trace[0]['line'];
-            }
-        }
-        $causes[] = $cause;
-        if ($this->cause instanceof PEAR_Exception) {
-            $this->cause->getCauseMessage($causes);
-        } elseif ($this->cause instanceof Exception) {
-            $causes[] = array('class'   => get_class($cause),
-                              'message' => $cause->getMessage(),
-                              'file' => $cause->getFile(),
-                              'line' => $cause->getLine());
-        } elseif (class_exists('PEAR_Error') && $this->cause instanceof PEAR_Error) {
-            $causes[] = array('class' => get_class($this->cause),
-                              'message' => $this->cause->getMessage());
-        } elseif (is_array($this->cause)) {
-            foreach ($this->cause as $cause) {
-                if ($cause instanceof PEAR_Exception) {
-                    $cause->getCauseMessage($causes);
-                } elseif ($cause instanceof Exception) {
-                    $causes[] = array('class'   => get_class($cause),
-                                   'message' => $cause->getMessage(),
-                                   'file' => $cause->getFile(),
-                                   'line' => $cause->getLine());
-                } elseif (class_exists('PEAR_Error') && $cause instanceof PEAR_Error) {
-                    $causes[] = array('class' => get_class($cause),
-                                      'message' => $cause->getMessage());
-                } elseif (is_array($cause) && isset($cause['message'])) {
-                    // PEAR_ErrorStack warning
-                    $causes[] = array(
-                        'class' => $cause['package'],
-                        'message' => $cause['message'],
-                        'file' => isset($cause['context']['file']) ?
-                                            $cause['context']['file'] :
-                                            'unknown',
-                        'line' => isset($cause['context']['line']) ?
-                                            $cause['context']['line'] :
-                                            'unknown',
-                    );
-                }
-            }
-        }
-    }
-
-    public function getTraceSafe()
-    {   
-        if (!isset($this->_trace)) {
-            $this->_trace = $this->getTrace();
-            if (empty($this->_trace)) {
-                $backtrace = debug_backtrace();
-                $this->_trace = array($backtrace[count($backtrace)-1]);
-            }
-        }
-        return $this->_trace;
-    }
-
-    public function getErrorClass()
-    {
-        $trace = $this->getTraceSafe();
-        return $trace[0]['class'];
-    }
-
-    public function getErrorMethod()
-    {
-        $trace = $this->getTraceSafe();
-        return $trace[0]['function'];
-    }
-
-    public function __toString()
-    {
-        if (isset($_SERVER['REQUEST_URI'])) {
-            return $this->toHtml();
-        }
-        return $this->toText();
-    }
-
-    public function toHtml()
-    {
-        $trace = $this->getTraceSafe();
-        $causes = array();
-        $this->getCauseMessage($causes);
-        $html =  '' . "\n";
-        foreach ($causes as $i => $cause) {
-            $html .= '\n";
-        }
-        $html .= '' . "\n"
-               . ''
-               . ''
-               . '' . "\n";
-
-        foreach ($trace as $k => $v) {
-            $html .= ''
-                   . ''
-                   . '' . "\n";
-        }
-        $html .= ''
-               . ''
-               . '' . "\n"
-               . '
    '
-               . str_repeat('-', $i) . ' ' . $cause['class'] . ': '
-               . htmlspecialchars($cause['message']) . ' in ' . $cause['file'] . ' '
-               . 'on line ' . $cause['line'] . ''
-               . "
    Exception trace
    #FunctionLocation
    ' . $k . '';
-            if (!empty($v['class'])) {
-                $html .= $v['class'] . $v['type'];
-            }
-            $html .= $v['function'];
-            $args = array();
-            if (!empty($v['args'])) {
-                foreach ($v['args'] as $arg) {
-                    if (is_null($arg)) $args[] = 'null';
-                    elseif (is_array($arg)) $args[] = 'Array';
-                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
-                    elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
-                    elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
-                    else {
-                        $arg = (string)$arg;
-                        $str = htmlspecialchars(substr($arg, 0, 16));
-                        if (strlen($arg) > 16) $str .= '…';
-                        $args[] = "'" . $str . "'";
-                    }
-                }
-            }
-            $html .= '(' . implode(', ',$args) . ')'
-                   . '' . (isset($v['file']) ? $v['file'] : 'unknown')
-                   . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
-                   . '
    ' . ($k+1) . '{main} 
    ';
-        return $html;
-    }
-
-    public function toText()
-    {
-        $causes = array();
-        $this->getCauseMessage($causes);
-        $causeMsg = '';
-        foreach ($causes as $i => $cause) {
-            $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
-                   . $cause['message'] . ' in ' . $cause['file']
-                   . ' on line ' . $cause['line'] . "\n";
-        }
-        return $causeMsg . $this->getTraceAsString();
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/PEAR/Frontend.php b/PEAR/Frontend.php
deleted file mode 100644
index b8e4530..0000000
--- a/PEAR/Frontend.php
+++ /dev/null
@@ -1,186 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Frontend.php,v 1.9 2006/03/03 13:13:07 pajoye Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * Which user interface class is being used.
- * @var string class name
- */
-$GLOBALS['_PEAR_FRONTEND_CLASS'] = 'PEAR_Frontend_CLI';
-
-/**
- * Instance of $_PEAR_Command_uiclass.
- * @var object
- */
-$GLOBALS['_PEAR_FRONTEND_SINGLETON'] = null;
-
-/**
- * Singleton-based frontend for PEAR user input/output
- *
- * Note that frontend classes must implement userConfirm(), and shoul implement
- * displayFatalError() and outputData()
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Frontend extends PEAR
-{
-    /**
-     * Retrieve the frontend object
-     * @return PEAR_Frontend_CLI|PEAR_Frontend_Web|PEAR_Frontend_Gtk
-     * @static
-     */
-    function &singleton($type = null)
-    {
-        if ($type === null) {
-            if (!isset($GLOBALS['_PEAR_FRONTEND_SINGLETON'])) {
-                $a = false;
-                return $a;
-            }
-            return $GLOBALS['_PEAR_FRONTEND_SINGLETON'];
-        } else {
-            $a = PEAR_Frontend::setFrontendClass($type);
-            return $a;
-        }
-    }
-
-    /**
-     * Set the frontend class that will be used by calls to {@link singleton()}
-     *
-     * Frontends are expected to conform to the PEAR naming standard of
-     * _ => DIRECTORY_SEPARATOR (PEAR_Frontend_CLI is in PEAR/Frontend/CLI.php)
-     * @param string $uiclass full class name
-     * @return PEAR_Frontend
-     * @static
-     */
-    function &setFrontendClass($uiclass)
-    {
-        if (is_object($GLOBALS['_PEAR_FRONTEND_SINGLETON']) &&
-              is_a($GLOBALS['_PEAR_FRONTEND_SINGLETON'], $uiclass)) {
-            return $GLOBALS['_PEAR_FRONTEND_SINGLETON'];
-        }
-        if (!class_exists($uiclass)) {
-            $file = str_replace('_', '/', $uiclass) . '.php';
-            if (PEAR_Frontend::isIncludeable($file)) {
-                include_once $file;
-            }
-        }
-        if (class_exists($uiclass)) {
-            $obj = &new $uiclass;
-            // quick test to see if this class implements a few of the most
-            // important frontend methods
-            if (method_exists($obj, 'userConfirm')) {
-                $GLOBALS['_PEAR_FRONTEND_SINGLETON'] = &$obj;
-                $GLOBALS['_PEAR_FRONTEND_CLASS'] = $uiclass;
-                return $obj;
-            } else {
-                $err = PEAR::raiseError("not a frontend class: $uiclass");
-                return $err;
-            }
-        }
-        $err = PEAR::raiseError("no such class: $uiclass");
-        return $err;
-    }
-
-    /**
-     * Set the frontend class that will be used by calls to {@link singleton()}
-     *
-     * Frontends are expected to be a descendant of PEAR_Frontend
-     * @param PEAR_Frontend
-     * @return PEAR_Frontend
-     * @static
-     */
-    function &setFrontendObject($uiobject)
-    {
-        if (is_object($GLOBALS['_PEAR_FRONTEND_SINGLETON']) &&
-              is_a($GLOBALS['_PEAR_FRONTEND_SINGLETON'], get_class($uiobject))) {
-            return $GLOBALS['_PEAR_FRONTEND_SINGLETON'];
-        }
-        if (!is_a($uiobject, 'PEAR_Frontend')) {
-            $err = PEAR::raiseError('not a valid frontend class: (' .
-                get_class($uiobject) . ')');
-            return $err;
-        }
-        // quick test to see if this class implements a few of the most
-        // important frontend methods
-        if (method_exists($uiobject, 'userConfirm')) {
-            $GLOBALS['_PEAR_FRONTEND_SINGLETON'] = &$uiobject;
-            $GLOBALS['_PEAR_FRONTEND_CLASS'] = get_class($uiobject);
-            return $uiobject;
-        } else {
-            $err = PEAR::raiseError("not a value frontend class: (" . get_class($uiobject)
-                . ')');
-            return $err;
-        }
-    }
-
-    /**
-     * @param string $path relative or absolute include path
-     * @return boolean
-     * @static
-     */
-    function isIncludeable($path)
-    {
-        if (file_exists($path) && is_readable($path)) {
-            return true;
-        }
-        $ipath = explode(PATH_SEPARATOR, ini_get('include_path'));
-        foreach ($ipath as $include) {
-            $test = realpath($include . DIRECTORY_SEPARATOR . $path);
-            if (!$test) { // support wrappers like phar (realpath just don't work with them)
-                $test = $include . DIRECTORY_SEPARATOR . $path;
-            }
-            if (file_exists($test) && is_readable($test)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param PEAR_Config
-     */
-    function setConfig(&$config)
-    {
-    }
-
-    /**
-     * This can be overridden to allow session-based temporary file management
-     *
-     * By default, all files are deleted at the end of a session.  The web installer
-     * needs to be able to sustain a list over many sessions in order to support
-     * user interaction with install scripts
-     */
-    function addTempFile($file)
-    {
-        $GLOBALS['_PEAR_Common_tempfiles'][] = $file;
-    }
-
-    function log($msg, $append_crlf = true)
-    {
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Frontend/CLI.php b/PEAR/Frontend/CLI.php
deleted file mode 100644
index f91fa77..0000000
--- a/PEAR/Frontend/CLI.php
+++ /dev/null
@@ -1,764 +0,0 @@
-
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: CLI.php,v 1.64 2006/04/25 02:57:57 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-/**
- * base class
- */
-require_once 'PEAR/Frontend.php';
-
-/**
- * Command-line Frontend for the PEAR Installer
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Frontend_CLI extends PEAR_Frontend
-{
-    // {{{ properties
-
-    /**
-     * What type of user interface this frontend is for.
-     * @var string
-     * @access public
-     */
-    var $type = 'CLI';
-    var $lp = ''; // line prefix
-
-    var $params = array();
-    var $term = array(
-        'bold' => '',
-        'normal' => '',
-        );
-
-    // }}}
-
-    // {{{ constructor
-
-    function PEAR_Frontend_CLI()
-    {
-        parent::PEAR();
-        $term = getenv('TERM'); //(cox) $_ENV is empty for me in 4.1.1
-        if (function_exists('posix_isatty') && !posix_isatty(1)) {
-            // output is being redirected to a file or through a pipe
-        } elseif ($term) {
-            // XXX can use ncurses extension here, if available
-            if (preg_match('/^(xterm|vt220|linux)/', $term)) {
-                $this->term['bold'] = sprintf("%c%c%c%c", 27, 91, 49, 109);
-                $this->term['normal']=sprintf("%c%c%c", 27, 91, 109);
-            } elseif (preg_match('/^vt100/', $term)) {
-                $this->term['bold'] = sprintf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0);
-                $this->term['normal']=sprintf("%c%c%c%c%c", 27, 91, 109, 0, 0);
-            }
-        } elseif (OS_WINDOWS) {
-            // XXX add ANSI codes here
-        }
-    }
-
-    // }}}
-
-    // {{{ displayLine(text)
-
-    function displayLine($text)
-    {
-        trigger_error("PEAR_Frontend_CLI::displayLine deprecated", E_USER_ERROR);
-    }
-
-    function _displayLine($text)
-    {
-        print "$this->lp$text\n";
-    }
-
-    // }}}
-    // {{{ display(text)
-
-    function display($text)
-    {
-        trigger_error("PEAR_Frontend_CLI::display deprecated", E_USER_ERROR);
-    }
-
-    function _display($text)
-    {
-        print $text;
-    }
-
-    // }}}
-    // {{{ displayError(eobj)
-
-    /**
-     * @param object PEAR_Error object
-     */
-    function displayError($eobj)
-    {
-        return $this->_displayLine($eobj->getMessage());
-    }
-
-    // }}}
-    // {{{ displayFatalError(eobj)
-
-    /**
-     * @param object PEAR_Error object
-     */
-    function displayFatalError($eobj)
-    {
-        $this->displayError($eobj);
-        if (class_exists('PEAR_Config')) {
-            $config = &PEAR_Config::singleton();
-            if ($config->get('verbose') > 5) {
-                if (function_exists('debug_print_backtrace')) {
-                    debug_print_backtrace();
-                } elseif (function_exists('debug_backtrace')) {
-                    $trace = debug_backtrace();
-                    $raised = false;
-                    foreach ($trace as $i => $frame) {
-                        if (!$raised) {
-                            if (isset($frame['class']) && strtolower($frame['class']) ==
-                                  'pear' && strtolower($frame['function']) == 'raiseerror') {
-                                $raised = true;
-                            } else {
-                                continue;
-                            }
-                        }
-                        if (!isset($frame['class'])) {
-                            $frame['class'] = '';
-                        }
-                        if (!isset($frame['type'])) {
-                            $frame['type'] = '';
-                        }
-                        if (!isset($frame['function'])) {
-                            $frame['function'] = '';
-                        }
-                        if (!isset($frame['line'])) {
-                            $frame['line'] = '';
-                        }
-                        $this->_displayLine("#$i: $frame[class]$frame[type]$frame[function] $frame[line]");
-                    }
-                }
-            }
-        }
-        exit(1);
-    }
-
-    // }}}
-    // {{{ displayHeading(title)
-
-    function displayHeading($title)
-    {
-        trigger_error("PEAR_Frontend_CLI::displayHeading deprecated", E_USER_ERROR);
-    }
-
-    function _displayHeading($title)
-    {
-        print $this->lp.$this->bold($title)."\n";
-        print $this->lp.str_repeat("=", strlen($title))."\n";
-    }
-
-    // }}}
-
-    /**
-     * Instruct the runInstallScript method to skip a paramgroup that matches the
-     * id value passed in.
-     *
-     * This method is useful for dynamically configuring which sections of a post-install script
-     * will be run based on the user's setup, which is very useful for making flexible
-     * post-install scripts without losing the cross-Frontend ability to retrieve user input
-     * @param string
-     */
-    function skipParamgroup($id)
-    {
-        $this->_skipSections[$id] = true;
-    }
-
-    function runPostinstallScripts(&$scripts)
-    {
-        foreach ($scripts as $i => $script) {
-            $this->runInstallScript($scripts[$i]->_params, $scripts[$i]->_obj);
-        }
-    }
-
-    /**
-     * @param array $xml contents of postinstallscript tag
-     * @param object $script post-installation script
-     * @param string install|upgrade
-     */
-    function runInstallScript($xml, &$script)
-    {
-        $this->_skipSections = array();
-        if (!is_array($xml) || !isset($xml['paramgroup'])) {
-            $script->run(array(), '_default');
-        } else {
-            $completedPhases = array();
-            if (!isset($xml['paramgroup'][0])) {
-                $xml['paramgroup'] = array($xml['paramgroup']);
-            }
-            foreach ($xml['paramgroup'] as $group) {
-                if (isset($this->_skipSections[$group['id']])) {
-                    // the post-install script chose to skip this section dynamically
-                    continue;
-                }
-                if (isset($group['name'])) {
-                    $paramname = explode('::', $group['name']);
-                    if ($lastgroup['id'] != $paramname[0]) {
-                        continue;
-                    }
-                    $group['name'] = $paramname[1];
-                    if (isset($answers)) {
-                        if (isset($answers[$group['name']])) {
-                            switch ($group['conditiontype']) {
-                                case '=' :
-                                    if ($answers[$group['name']] != $group['value']) {
-                                        continue 2;
-                                    }
-                                break;
-                                case '!=' :
-                                    if ($answers[$group['name']] == $group['value']) {
-                                        continue 2;
-                                    }
-                                break;
-                                case 'preg_match' :
-                                    if (!@preg_match('/' . $group['value'] . '/',
-                                          $answers[$group['name']])) {
-                                        continue 2;
-                                    }
-                                break;
-                                default :
-                                return;
-                            }
-                        }
-                    } else {
-                        return;
-                    }
-                }
-                $lastgroup = $group;
-                if (isset($group['instructions'])) {
-                    $this->_display($group['instructions']);
-                }
-                if (!isset($group['param'][0])) {
-                    $group['param'] = array($group['param']);
-                }
-                if (isset($group['param'])) {
-                    if (method_exists($script, 'postProcessPrompts')) {
-                        $prompts = $script->postProcessPrompts($group['param'], $group['id']);
-                        if (!is_array($prompts) || count($prompts) != count($group['param'])) {
-                            $this->outputData('postinstall', 'Error: post-install script did not ' .
-                                'return proper post-processed prompts');
-                            $prompts = $group['param'];
-                        } else {
-                            foreach ($prompts as $i => $var) {
-                                if (!is_array($var) || !isset($var['prompt']) ||
-                                      !isset($var['name']) ||
-                                      ($var['name'] != $group['param'][$i]['name']) ||
-                                      ($var['type'] != $group['param'][$i]['type'])) {
-                                    $this->outputData('postinstall', 'Error: post-install script ' .
-                                        'modified the variables or prompts, severe security risk. ' .
-                                        'Will instead use the defaults from the package.xml');
-                                    $prompts = $group['param'];
-                                }
-                            }
-                        }
-                        $answers = $this->confirmDialog($prompts);
-                    } else {
-                        $answers = $this->confirmDialog($group['param']);
-                    }
-                }
-                if ((isset($answers) && $answers) || !isset($group['param'])) {
-                    if (!isset($answers)) {
-                        $answers = array();
-                    }
-                    array_unshift($completedPhases, $group['id']);
-                    if (!$script->run($answers, $group['id'])) {
-                        $script->run($completedPhases, '_undoOnError');
-                        return;
-                    }
-                } else {
-                    $script->run($completedPhases, '_undoOnError');
-                    return;
-                }
-            }
-        }
-    }
-
-    /**
-     * Ask for user input, confirm the answers and continue until the user is satisfied
-     * @param array an array of arrays, format array('name' => 'paramname', 'prompt' =>
-     *              'text to display', 'type' => 'string'[, default => 'default value'])
-     * @return array
-     */
-    function confirmDialog($params)
-    {
-        $answers = array();
-        $prompts = $types = array();
-        foreach ($params as $param) {
-            $prompts[$param['name']] = $param['prompt'];
-            $types[$param['name']] = $param['type'];
-            if (isset($param['default'])) {
-                $answers[$param['name']] = $param['default'];
-            } else {
-                $answers[$param['name']] = '';
-            }
-        }
-        $tried = false;
-        do {
-            if ($tried) {
-                $i = 1;
-                foreach ($answers as $var => $value) {
-                    if (!strlen($value)) {
-                        echo $this->bold("* Enter an answer for #" . $i . ": ({$prompts[$var]})\n");
-                    }
-                    $i++;
-                }
-            }
-            $answers = $this->userDialog('', $prompts, $types, $answers);
-            $tried = true;
-        } while (is_array($answers) && count(array_filter($answers)) != count($prompts));
-        return $answers;
-    }
-    // {{{ userDialog(prompt, [type], [default])
-
-    function userDialog($command, $prompts, $types = array(), $defaults = array(),
-                        $screensize = 20)
-    {
-        if (!is_array($prompts)) {
-            return array();
-        }
-        $testprompts = array_keys($prompts);
-        $result = $defaults;
-        if (!defined('STDIN')) {
-            $fp = fopen('php://stdin', 'r');
-        } else {
-            $fp = STDIN;
-        }
-        while (true) {
-            $descLength = max(array_map('strlen', $prompts));
-            $descFormat = "%-{$descLength}s";
-            $last = count($prompts);
-
-            $i = 0;
-            foreach ($prompts as $n => $var) {
-                printf("%2d. $descFormat : %s\n", ++$i, $prompts[$n], isset($result[$n]) ?
-                    $result[$n] : null);
-            }
-
-            print "\n1-$last, 'all', 'abort', or Enter to continue: ";
-            $tmp = trim(fgets($fp, 1024));
-            if (empty($tmp)) {
-                break;
-            }
-            if ($tmp == 'abort') {
-                return false;
-            }
-            if (isset($testprompts[(int)$tmp - 1])) {
-                $var = $testprompts[(int)$tmp - 1];
-                $desc = $prompts[$var];
-                $current = $result[$var];
-                print "$desc [$current] : ";
-                $tmp = trim(fgets($fp, 1024));
-                if (trim($tmp) !== '') {
-                    $result[$var] = trim($tmp);
-                }
-            } elseif ($tmp == 'all') {
-                foreach ($prompts as $var => $desc) {
-                    $current = $result[$var];
-                    print "$desc [$current] : ";
-                    $tmp = trim(fgets($fp, 1024));
-                    if (trim($tmp) !== '') {
-                        $result[$var] = trim($tmp);
-                    }
-                }
-            }
-        }
-        if (!defined('STDIN')) {
-            fclose($fp);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ userConfirm(prompt, [default])
-
-    function userConfirm($prompt, $default = 'yes')
-    {
-        trigger_error("PEAR_Frontend_CLI::userConfirm not yet converted", E_USER_ERROR);
-        static $positives = array('y', 'yes', 'on', '1');
-        static $negatives = array('n', 'no', 'off', '0');
-        print "$this->lp$prompt [$default] : ";
-        $fp = fopen("php://stdin", "r");
-        $line = fgets($fp, 2048);
-        fclose($fp);
-        $answer = strtolower(trim($line));
-        if (empty($answer)) {
-            $answer = $default;
-        }
-        if (in_array($answer, $positives)) {
-            return true;
-        }
-        if (in_array($answer, $negatives)) {
-            return false;
-        }
-        if (in_array($default, $positives)) {
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ startTable([params])
-
-    function startTable($params = array())
-    {
-        trigger_error("PEAR_Frontend_CLI::startTable deprecated", E_USER_ERROR);
-    }
-
-    function _startTable($params = array())
-    {
-        $params['table_data'] = array();
-        $params['widest'] = array();  // indexed by column
-        $params['highest'] = array(); // indexed by row
-        $params['ncols'] = 0;
-        $this->params = $params;
-    }
-
-    // }}}
-    // {{{ tableRow(columns, [rowparams], [colparams])
-
-    function tableRow($columns, $rowparams = array(), $colparams = array())
-    {
-        trigger_error("PEAR_Frontend_CLI::tableRow deprecated", E_USER_ERROR);
-    }
-
-    function _tableRow($columns, $rowparams = array(), $colparams = array())
-    {
-        $highest = 1;
-        for ($i = 0; $i < sizeof($columns); $i++) {
-            $col = &$columns[$i];
-            if (isset($colparams[$i]) && !empty($colparams[$i]['wrap'])) {
-                $col = wordwrap($col, $colparams[$i]['wrap'], "\n", 0);
-            }
-            if (strpos($col, "\n") !== false) {
-                $multiline = explode("\n", $col);
-                $w = 0;
-                foreach ($multiline as $n => $line) {
-                    if (strlen($line) > $w) {
-                        $w = strlen($line);
-                    }
-                }
-                $lines = sizeof($multiline);
-            } else {
-                $w = strlen($col);
-            }
-
-            if (isset($this->params['widest'][$i])) {
-                if ($w > $this->params['widest'][$i]) {
-                    $this->params['widest'][$i] = $w;
-                }
-            } else {
-                $this->params['widest'][$i] = $w;
-            }
-            $tmp = count_chars($columns[$i], 1);
-            // handle unix, mac and windows formats
-            $lines = (isset($tmp[10]) ? $tmp[10] : (isset($tmp[13]) ? $tmp[13] : 0)) + 1;
-            if ($lines > $highest) {
-                $highest = $lines;
-            }
-        }
-        if (sizeof($columns) > $this->params['ncols']) {
-            $this->params['ncols'] = sizeof($columns);
-        }
-        $new_row = array(
-            'data' => $columns,
-            'height' => $highest,
-            'rowparams' => $rowparams,
-            'colparams' => $colparams,
-            );
-        $this->params['table_data'][] = $new_row;
-    }
-
-    // }}}
-    // {{{ endTable()
-
-    function endTable()
-    {
-        trigger_error("PEAR_Frontend_CLI::endTable deprecated", E_USER_ERROR);
-    }
-
-    function _endTable()
-    {
-        extract($this->params);
-        if (!empty($caption)) {
-            $this->_displayHeading($caption);
-        }
-        if (count($table_data) == 0) {
-            return;
-        }
-        if (!isset($width)) {
-            $width = $widest;
-        } else {
-            for ($i = 0; $i < $ncols; $i++) {
-                if (!isset($width[$i])) {
-                    $width[$i] = $widest[$i];
-                }
-            }
-        }
-        $border = false;
-        if (empty($border)) {
-            $cellstart = '';
-            $cellend = ' ';
-            $rowend = '';
-            $padrowend = false;
-            $borderline = '';
-        } else {
-            $cellstart = '| ';
-            $cellend = ' ';
-            $rowend = '|';
-            $padrowend = true;
-            $borderline = '+';
-            foreach ($width as $w) {
-                $borderline .= str_repeat('-', $w + strlen($cellstart) + strlen($cellend) - 1);
-                $borderline .= '+';
-            }
-        }
-        if ($borderline) {
-            $this->_displayLine($borderline);
-        }
-        for ($i = 0; $i < sizeof($table_data); $i++) {
-            extract($table_data[$i]);
-            if (!is_array($rowparams)) {
-                $rowparams = array();
-            }
-            if (!is_array($colparams)) {
-                $colparams = array();
-            }
-            $rowlines = array();
-            if ($height > 1) {
-                for ($c = 0; $c < sizeof($data); $c++) {
-                    $rowlines[$c] = preg_split('/(\r?\n|\r)/', $data[$c]);
-                    if (sizeof($rowlines[$c]) < $height) {
-                        $rowlines[$c] = array_pad($rowlines[$c], $height, '');
-                    }
-                }
-            } else {
-                for ($c = 0; $c < sizeof($data); $c++) {
-                    $rowlines[$c] = array($data[$c]);
-                }
-            }
-            for ($r = 0; $r < $height; $r++) {
-                $rowtext = '';
-                for ($c = 0; $c < sizeof($data); $c++) {
-                    if (isset($colparams[$c])) {
-                        $attribs = array_merge($rowparams, $colparams);
-                    } else {
-                        $attribs = $rowparams;
-                    }
-                    $w = isset($width[$c]) ? $width[$c] : 0;
-                    //$cell = $data[$c];
-                    $cell = $rowlines[$c][$r];
-                    $l = strlen($cell);
-                    if ($l > $w) {
-                        $cell = substr($cell, 0, $w);
-                    }
-                    if (isset($attribs['bold'])) {
-                        $cell = $this->bold($cell);
-                    }
-                    if ($l < $w) {
-                        // not using str_pad here because we may
-                        // add bold escape characters to $cell
-                        $cell .= str_repeat(' ', $w - $l);
-                    }
-
-                    $rowtext .= $cellstart . $cell . $cellend;
-                }
-                if (!$border) {
-                    $rowtext = rtrim($rowtext);
-                }
-                $rowtext .= $rowend;
-                $this->_displayLine($rowtext);
-            }
-        }
-        if ($borderline) {
-            $this->_displayLine($borderline);
-        }
-    }
-
-    // }}}
-    // {{{ outputData()
-
-    function outputData($data, $command = '_default')
-    {
-        switch ($command) {
-            case 'channel-info':
-                foreach ($data as $type => $section) {
-                    if ($type == 'main') {
-                        $section['data'] = array_values($section['data']);
-                    }
-                    $this->outputData($section);
-                }
-                break;
-            case 'install':
-            case 'upgrade':
-            case 'upgrade-all':
-                if (isset($data['release_warnings'])) {
-                    $this->_displayLine('');
-                    $this->_startTable(array(
-                        'border' => false,
-                        'caption' => 'Release Warnings'
-                        ));
-                    $this->_tableRow(array($data['release_warnings']), null, array(1 => array('wrap' => 55)));
-                    $this->_endTable();
-                    $this->_displayLine('');
-                }
-                $this->_displayLine($data['data']);
-                break;
-            case 'search':
-                $this->_startTable($data);
-                if (isset($data['headline']) && is_array($data['headline'])) {
-                    $this->_tableRow($data['headline'], array('bold' => true), array(1 => array('wrap' => 55)));
-                }
-
-                foreach($data['data'] as $category) {
-                    foreach($category as $pkg) {
-                        $this->_tableRow($pkg, null, array(1 => array('wrap' => 55)));
-                    }
-                };
-                $this->_endTable();
-                break;
-            case 'list-all':
-                $this->_startTable($data);
-                if (isset($data['headline']) && is_array($data['headline'])) {
-                    $this->_tableRow($data['headline'], array('bold' => true), array(1 => array('wrap' => 55)));
-                }
-
-                foreach($data['data'] as $category) {
-                    foreach($category as $pkg) {
-                        unset($pkg[4]);
-                        unset($pkg[5]);
-                        $this->_tableRow($pkg, null, array(1 => array('wrap' => 55)));
-                    }
-                };
-                $this->_endTable();
-                break;
-            case 'config-show':
-                $data['border'] = false;
-                $opts = array(0 => array('wrap' => 30),
-                              1 => array('wrap' => 20),
-                              2 => array('wrap' => 35));
-                $this->_startTable($data);
-                if (isset($data['headline']) && is_array($data['headline'])) {
-                    $this->_tableRow($data['headline'],
-                                     array('bold' => true),
-                                     $opts);
-                }
-                foreach($data['data'] as $group) {
-                    foreach($group as $value) {
-                        if ($value[2] == '') {
-                            $value[2] = "";
-                        }
-                        $this->_tableRow($value, null, $opts);
-                    }
-                }
-                $this->_endTable();
-                break;
-            case 'remote-info':
-                $d = $data;
-                $data = array(
-                    'caption' => 'Package details:',
-                    'border' => false,
-                    'data' => array(
-                        array("Latest",    $data['stable']),
-                        array("Installed", $data['installed']),
-                        array("Package",   $data['name']),
-                        array("License",   $data['license']),
-                        array("Category",  $data['category']),
-                        array("Summary",   $data['summary']),
-                        array("Description", $data['description']),
-                        ),
-                    );
-                    if (isset($d['deprecated']) && $d['deprecated']) {
-                        $conf = &PEAR_Config::singleton();
-                        $reg = $conf->getRegistry();
-                        $name = $reg->parsedPackageNameToString($d['deprecated'], true);
-                        $data['data'][] = array('Deprecated! use', $name);
-                    }
-            default: {
-                if (is_array($data)) {
-                    $this->_startTable($data);
-                    $count = count($data['data'][0]);
-                    if ($count == 2) {
-                        $opts = array(0 => array('wrap' => 25),
-                                      1 => array('wrap' => 48)
-                        );
-                    } elseif ($count == 3) {
-                        $opts = array(0 => array('wrap' => 30),
-                                      1 => array('wrap' => 20),
-                                      2 => array('wrap' => 35)
-                        );
-                    } else {
-                        $opts = null;
-                    }
-                    if (isset($data['headline']) && is_array($data['headline'])) {
-                        $this->_tableRow($data['headline'],
-                                         array('bold' => true),
-                                         $opts);
-                    }
-                    foreach($data['data'] as $row) {
-                        $this->_tableRow($row, null, $opts);
-                    }
-                    $this->_endTable();
-                } else {
-                    $this->_displayLine($data);
-                }
-            }
-        }
-    }
-
-    // }}}
-    // {{{ log(text)
-
-
-    function log($text, $append_crlf = true)
-    {
-        if ($append_crlf) {
-            return $this->_displayLine($text);
-        }
-        return $this->_display($text);
-    }
-
-
-    // }}}
-    // {{{ bold($text)
-
-    function bold($text)
-    {
-        if (empty($this->term['bold'])) {
-            return strtoupper($text);
-        }
-        return $this->term['bold'] . $text . $this->term['normal'];
-    }
-
-    // }}}
-}
-
-?>
diff --git a/PEAR/Installer.php b/PEAR/Installer.php
deleted file mode 100644
index 0d50f60..0000000
--- a/PEAR/Installer.php
+++ /dev/null
@@ -1,1645 +0,0 @@
-
- * @author     Tomas V.V. Cox 
- * @author     Martin Jansen 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Installer.php,v 1.237 2006/09/25 23:01:05 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * Used for installation groups in package.xml 2.0 and platform exceptions
- */
-require_once 'OS/Guess.php';
-require_once 'PEAR/Downloader.php';
-
-define('PEAR_INSTALLER_NOBINARY', -240);
-/**
- * Administration class used to install PEAR packages and maintain the
- * installed package database.
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Tomas V.V. Cox 
- * @author     Martin Jansen 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Installer extends PEAR_Downloader
-{
-    // {{{ properties
-
-    /** name of the package directory, for example Foo-1.0
-     * @var string
-     */
-    var $pkgdir;
-
-    /** directory where PHP code files go
-     * @var string
-     */
-    var $phpdir;
-
-    /** directory where PHP extension files go
-     * @var string
-     */
-    var $extdir;
-
-    /** directory where documentation goes
-     * @var string
-     */
-    var $docdir;
-
-    /** installation root directory (ala PHP's INSTALL_ROOT or
-     * automake's DESTDIR
-     * @var string
-     */
-    var $installroot = '';
-
-    /** debug level
-     * @var int
-     */
-    var $debug = 1;
-
-    /** temporary directory
-     * @var string
-     */
-    var $tmpdir;
-
-    /**
-     * PEAR_Registry object used by the installer
-     * @var PEAR_Registry
-     */
-    var $registry;
-
-    /**
-     * array of PEAR_Downloader_Packages
-     * @var array
-     */
-    var $_downloadedPackages;
-
-    /** List of file transactions queued for an install/upgrade/uninstall.
-     *
-     *  Format:
-     *    array(
-     *      0 => array("rename => array("from-file", "to-file")),
-     *      1 => array("delete" => array("file-to-delete")),
-     *      ...
-     *    )
-     *
-     * @var array
-     */
-    var $file_operations = array();
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Installer constructor.
-     *
-     * @param object $ui user interface object (instance of PEAR_Frontend_*)
-     *
-     * @access public
-     */
-    function PEAR_Installer(&$ui)
-    {
-        parent::PEAR_Common();
-        $this->setFrontendObject($ui);
-        $this->debug = $this->config->get('verbose');
-    }
-
-    function setOptions($options)
-    {
-        $this->_options = $options;
-    }
-
-    function setConfig(&$config)
-    {
-        $this->config = &$config;
-        $this->_registry = &$config->getRegistry();
-    }
-
-    // }}}
-
-    function _removeBackups($files)
-    {
-        foreach ($files as $path) {
-            $this->addFileOperation('removebackup', array($path));
-        }
-    }
-
-    // {{{ _deletePackageFiles()
-
-    /**
-     * Delete a package's installed files, does not remove empty directories.
-     *
-     * @param string package name
-     * @param string channel name
-     * @param bool if true, then files are backed up first
-     * @return bool TRUE on success, or a PEAR error on failure
-     * @access protected
-     */
-    function _deletePackageFiles($package, $channel = false, $backup = false)
-    {
-        if (!$channel) {
-            $channel = 'pear.php.net';
-        }
-        if (!strlen($package)) {
-            return $this->raiseError("No package to uninstall given");
-        }
-        if (strtolower($package) == 'pear' && $channel == 'pear.php.net') {
-            // to avoid race conditions, include all possible needed files
-            require_once 'PEAR/Task/Common.php';
-            require_once 'PEAR/Task/Replace.php';
-            require_once 'PEAR/Task/Unixeol.php';
-            require_once 'PEAR/Task/Windowseol.php';
-            require_once 'PEAR/PackageFile/v1.php';
-            require_once 'PEAR/PackageFile/v2.php';
-            require_once 'PEAR/PackageFile/Generator/v1.php';
-            require_once 'PEAR/PackageFile/Generator/v2.php';
-        }
-        $filelist = $this->_registry->packageInfo($package, 'filelist', $channel);
-        if ($filelist == null) {
-            return $this->raiseError("$channel/$package not installed");
-        }
-        $ret = array();
-        foreach ($filelist as $file => $props) {
-            if (empty($props['installed_as'])) {
-                continue;
-            }
-            $path = $props['installed_as'];
-            if ($backup) {
-                $this->addFileOperation('backup', array($path));
-                $ret[] = $path;
-            }
-            $this->addFileOperation('delete', array($path));
-        }
-        if ($backup) {
-            return $ret;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ _installFile()
-
-    /**
-     * @param string filename
-     * @param array attributes from  tag in package.xml
-     * @param string path to install the file in
-     * @param array options from command-line
-     * @access private
-     */
-    function _installFile($file, $atts, $tmp_path, $options)
-    {
-        // {{{ return if this file is meant for another platform
-        static $os;
-        if (!isset($this->_registry)) {
-            $this->_registry = &$this->config->getRegistry();
-        }
-        if (isset($atts['platform'])) {
-            if (empty($os)) {
-                $os = new OS_Guess();
-            }
-            if (strlen($atts['platform']) && $atts['platform']{0} == '!') {
-                $negate = true;
-                $platform = substr($atts['platform'], 1);
-            } else {
-                $negate = false;
-                $platform = $atts['platform'];
-            }
-            if ((bool) $os->matchSignature($platform) === $negate) {
-                $this->log(3, "skipped $file (meant for $atts[platform], we are ".$os->getSignature().")");
-                return PEAR_INSTALLER_SKIPPED;
-            }
-        }
-        // }}}
-
-        $channel = $this->pkginfo->getChannel();
-        // {{{ assemble the destination paths
-        switch ($atts['role']) {
-            case 'doc':
-            case 'data':
-            case 'test':
-                $dest_dir = $this->config->get($atts['role'] . '_dir', null, $channel) .
-                            DIRECTORY_SEPARATOR . $this->pkginfo->getPackage();
-                unset($atts['baseinstalldir']);
-                break;
-            case 'ext':
-            case 'php':
-                $dest_dir = $this->config->get($atts['role'] . '_dir', null, $channel);
-                break;
-            case 'script':
-                $dest_dir = $this->config->get('bin_dir', null, $channel);
-                break;
-            case 'src':
-            case 'extsrc':
-                $this->source_files++;
-                return;
-            default:
-                return $this->raiseError("Invalid role `$atts[role]' for file $file");
-        }
-        $save_destdir = $dest_dir;
-        if (!empty($atts['baseinstalldir'])) {
-            $dest_dir .= DIRECTORY_SEPARATOR . $atts['baseinstalldir'];
-        }
-        if (dirname($file) != '.' && empty($atts['install-as'])) {
-            $dest_dir .= DIRECTORY_SEPARATOR . dirname($file);
-        }
-        if (empty($atts['install-as'])) {
-            $dest_file = $dest_dir . DIRECTORY_SEPARATOR . basename($file);
-        } else {
-            $dest_file = $dest_dir . DIRECTORY_SEPARATOR . $atts['install-as'];
-        }
-        $orig_file = $tmp_path . DIRECTORY_SEPARATOR . $file;
-
-        // Clean up the DIRECTORY_SEPARATOR mess
-        $ds2 = DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR;
-        list($dest_file, $orig_file) = preg_replace(array('!\\\\+!', '!/!', "!$ds2+!"),
-                                                    array(DIRECTORY_SEPARATOR,
-                                                          DIRECTORY_SEPARATOR,
-                                                          DIRECTORY_SEPARATOR),
-                                                    array($dest_file, $orig_file));
-        $final_dest_file = $installed_as = $dest_file;
-        if (isset($this->_options['packagingroot'])) {
-            $installedas_dest_dir = dirname($final_dest_file);
-            $installedas_dest_file = $dest_dir . DIRECTORY_SEPARATOR . '.tmp' . basename($final_dest_file);
-            $final_dest_file = $this->_prependPath($final_dest_file,
-                $this->_options['packagingroot']);
-        } else {
-            $installedas_dest_dir = dirname($final_dest_file);
-            $installedas_dest_file = $installedas_dest_dir . DIRECTORY_SEPARATOR . '.tmp' . basename($final_dest_file);
-        }
-        $dest_dir = dirname($final_dest_file);
-        $dest_file = $dest_dir . DIRECTORY_SEPARATOR . '.tmp' . basename($final_dest_file);
-        // }}}
-
-        if (empty($this->_options['register-only']) &&
-              (!file_exists($dest_dir) || !is_dir($dest_dir))) {
-            if (!$this->mkDirHier($dest_dir)) {
-                return $this->raiseError("failed to mkdir $dest_dir",
-                                         PEAR_INSTALLER_FAILED);
-            }
-            $this->log(3, "+ mkdir $dest_dir");
-        }
-        // pretty much nothing happens if we are only registering the install
-        if (empty($this->_options['register-only'])) {
-            if (empty($atts['replacements'])) {
-                if (!file_exists($orig_file)) {
-                    return $this->raiseError("file $orig_file does not exist",
-                                             PEAR_INSTALLER_FAILED);
-                }
-                if (!@copy($orig_file, $dest_file)) {
-                    return $this->raiseError("failed to write $dest_file: $php_errormsg",
-                                             PEAR_INSTALLER_FAILED);
-                }
-                $this->log(3, "+ cp $orig_file $dest_file");
-                if (isset($atts['md5sum'])) {
-                    $md5sum = md5_file($dest_file);
-                }
-            } else {
-                // {{{ file with replacements
-                if (!file_exists($orig_file)) {
-                    return $this->raiseError("file does not exist",
-                                             PEAR_INSTALLER_FAILED);
-                }
-                $contents = file_get_contents($orig_file);
-                if ($contents === false) {
-                    $contents = '';
-                }
-                if (isset($atts['md5sum'])) {
-                    $md5sum = md5($contents);
-                }
-                $subst_from = $subst_to = array();
-                foreach ($atts['replacements'] as $a) {
-                    $to = '';
-                    if ($a['type'] == 'php-const') {
-                        if (preg_match('/^[a-z0-9_]+$/i', $a['to'])) {
-                            eval("\$to = $a[to];");
-                        } else {
-                            if (!isset($options['soft'])) {
-                                $this->log(0, "invalid php-const replacement: $a[to]");
-                            }
-                            continue;
-                        }
-                    } elseif ($a['type'] == 'pear-config') {
-                        if ($a['to'] == 'master_server') {
-                            $chan = $this->_registry->getChannel($channel);
-                            if (!PEAR::isError($chan)) {
-                                $to = $chan->getServer();
-                            } else {
-                                $to = $this->config->get($a['to'], null, $channel);
-                            }
-                        } else {
-                            $to = $this->config->get($a['to'], null, $channel);
-                        }
-                        if (is_null($to)) {
-                            if (!isset($options['soft'])) {
-                                $this->log(0, "invalid pear-config replacement: $a[to]");
-                            }
-                            continue;
-                        }
-                    } elseif ($a['type'] == 'package-info') {
-                        if ($t = $this->pkginfo->packageInfo($a['to'])) {
-                            $to = $t;
-                        } else {
-                            if (!isset($options['soft'])) {
-                                $this->log(0, "invalid package-info replacement: $a[to]");
-                            }
-                            continue;
-                        }
-                    }
-                    if (!is_null($to)) {
-                        $subst_from[] = $a['from'];
-                        $subst_to[] = $to;
-                    }
-                }
-                $this->log(3, "doing ".sizeof($subst_from)." substitution(s) for $final_dest_file");
-                if (sizeof($subst_from)) {
-                    $contents = str_replace($subst_from, $subst_to, $contents);
-                }
-                $wp = @fopen($dest_file, "wb");
-                if (!is_resource($wp)) {
-                    return $this->raiseError("failed to create $dest_file: $php_errormsg",
-                                             PEAR_INSTALLER_FAILED);
-                }
-                if (@fwrite($wp, $contents) === false) {
-                    return $this->raiseError("failed writing to $dest_file: $php_errormsg",
-                                             PEAR_INSTALLER_FAILED);
-                }
-                fclose($wp);
-                // }}}
-            }
-            // {{{ check the md5
-            if (isset($md5sum)) {
-                if (strtolower($md5sum) == strtolower($atts['md5sum'])) {
-                    $this->log(2, "md5sum ok: $final_dest_file");
-                } else {
-                    if (empty($options['force'])) {
-                        // delete the file
-                        if (file_exists($dest_file)) {
-                            unlink($dest_file);
-                        }
-                        if (!isset($options['ignore-errors'])) {
-                            return $this->raiseError("bad md5sum for file $final_dest_file",
-                                                 PEAR_INSTALLER_FAILED);
-                        } else {
-                            if (!isset($options['soft'])) {
-                                $this->log(0, "warning : bad md5sum for file $final_dest_file");
-                            }
-                        }
-                    } else {
-                        if (!isset($options['soft'])) {
-                            $this->log(0, "warning : bad md5sum for file $final_dest_file");
-                        }
-                    }
-                }
-            }
-            // }}}
-            // {{{ set file permissions
-            if (!OS_WINDOWS) {
-                if ($atts['role'] == 'script') {
-                    $mode = 0777 & ~(int)octdec($this->config->get('umask'));
-                    $this->log(3, "+ chmod +x $dest_file");
-                } else {
-                    $mode = 0666 & ~(int)octdec($this->config->get('umask'));
-                }
-                $this->addFileOperation("chmod", array($mode, $dest_file));
-                if (!@chmod($dest_file, $mode)) {
-                    if (!isset($options['soft'])) {
-                        $this->log(0, "failed to change mode of $dest_file: $php_errormsg");
-                    }
-                }
-            }
-            // }}}
-            $this->addFileOperation("rename", array($dest_file, $final_dest_file,
-                $atts['role'] == 'ext'));
-        }
-        // Store the full path where the file was installed for easy unistall
-        $this->addFileOperation("installed_as", array($file, $installed_as,
-                                $save_destdir, dirname(substr($installedas_dest_file, strlen($save_destdir)))));
-
-        //$this->log(2, "installed: $dest_file");
-        return PEAR_INSTALLER_OK;
-    }
-
-    // }}}
-    // {{{ _installFile2()
-
-    /**
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string filename
-     * @param array attributes from  tag in package.xml
-     * @param string path to install the file in
-     * @param array options from command-line
-     * @access private
-     */
-    function _installFile2(&$pkg, $file, $atts, $tmp_path, $options)
-    {
-        if (!isset($this->_registry)) {
-            $this->_registry = &$this->config->getRegistry();
-        }
-
-        $channel = $pkg->getChannel();
-        // {{{ assemble the destination paths
-        if (!in_array($atts['attribs']['role'],
-              PEAR_Installer_Role::getValidRoles($pkg->getPackageType()))) {
-            return $this->raiseError('Invalid role `' . $atts['attribs']['role'] .
-                    "' for file $file");
-        }
-        $role = &PEAR_Installer_Role::factory($pkg, $atts['attribs']['role'], $this->config);
-        $err = $role->setup($this, $pkg, $atts['attribs'], $file);
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-        if (!$role->isInstallable()) {
-            return;
-        }
-        $info = $role->processInstallation($pkg, $atts['attribs'], $file, $tmp_path);
-        if (PEAR::isError($info)) {
-            return $info;
-        } else {
-            list($save_destdir, $dest_dir, $dest_file, $orig_file) = $info;
-        }
-        $final_dest_file = $installed_as = $dest_file;
-        if (isset($this->_options['packagingroot'])) {
-            $final_dest_file = $this->_prependPath($final_dest_file,
-                $this->_options['packagingroot']);
-        }
-        $dest_dir = dirname($final_dest_file);
-        $dest_file = $dest_dir . DIRECTORY_SEPARATOR . '.tmp' . basename($final_dest_file);
-        // }}}
-
-        if (empty($this->_options['register-only'])) {
-            if (!file_exists($dest_dir) || !is_dir($dest_dir)) {
-                if (!$this->mkDirHier($dest_dir)) {
-                    return $this->raiseError("failed to mkdir $dest_dir",
-                                             PEAR_INSTALLER_FAILED);
-                }
-                $this->log(3, "+ mkdir $dest_dir");
-            }
-        }
-        $attribs = $atts['attribs'];
-        unset($atts['attribs']);
-        // pretty much nothing happens if we are only registering the install
-        if (empty($this->_options['register-only'])) {
-            if (!count($atts)) { // no tasks
-                if (!file_exists($orig_file)) {
-                    return $this->raiseError("file $orig_file does not exist",
-                                             PEAR_INSTALLER_FAILED);
-                }
-                if (!@copy($orig_file, $dest_file)) {
-                    return $this->raiseError("failed to write $dest_file: $php_errormsg",
-                                             PEAR_INSTALLER_FAILED);
-                }
-                $this->log(3, "+ cp $orig_file $dest_file");
-                if (isset($attribs['md5sum'])) {
-                    $md5sum = md5_file($dest_file);
-                }
-            } else { // file with tasks
-                if (!file_exists($orig_file)) {
-                    return $this->raiseError("file $orig_file does not exist",
-                                             PEAR_INSTALLER_FAILED);
-                }
-                $contents = file_get_contents($orig_file);
-                if ($contents === false) {
-                    $contents = '';
-                }
-                if (isset($attribs['md5sum'])) {
-                    $md5sum = md5($contents);
-                }
-                foreach ($atts as $tag => $raw) {
-                    $tag = str_replace(array($pkg->getTasksNs() . ':', '-'), 
-                        array('', '_'), $tag);
-                    $task = "PEAR_Task_$tag";
-                    $task = &new $task($this->config, $this, PEAR_TASK_INSTALL);
-                    if (!$task->isScript()) { // scripts are only handled after installation
-                        $task->init($raw, $attribs, $pkg->getLastInstalledVersion());
-                        $res = $task->startSession($pkg, $contents, $final_dest_file);
-                        if ($res === false) {
-                            continue; // skip this file
-                        }
-                        if (PEAR::isError($res)) {
-                            return $res;
-                        }
-                        $contents = $res; // save changes
-                    }
-                    $wp = @fopen($dest_file, "wb");
-                    if (!is_resource($wp)) {
-                        return $this->raiseError("failed to create $dest_file: $php_errormsg",
-                                                 PEAR_INSTALLER_FAILED);
-                    }
-                    if (fwrite($wp, $contents) === false) {
-                        return $this->raiseError("failed writing to $dest_file: $php_errormsg",
-                                                 PEAR_INSTALLER_FAILED);
-                    }
-                    fclose($wp);
-                }
-            }
-            // {{{ check the md5
-            if (isset($md5sum)) {
-                if (strtolower($md5sum) == strtolower($attribs['md5sum'])) {
-                    $this->log(2, "md5sum ok: $final_dest_file");
-                } else {
-                    if (empty($options['force'])) {
-                        // delete the file
-                        if (file_exists($dest_file)) {
-                            unlink($dest_file);
-                        }
-                        if (!isset($options['ignore-errors'])) {
-                            return $this->raiseError("bad md5sum for file $final_dest_file",
-                                                     PEAR_INSTALLER_FAILED);
-                        } else {
-                            if (!isset($options['soft'])) {
-                                $this->log(0, "warning : bad md5sum for file $final_dest_file");
-                            }
-                        }
-                    } else {
-                        if (!isset($options['soft'])) {
-                            $this->log(0, "warning : bad md5sum for file $final_dest_file");
-                        }
-                    }
-                }
-            }
-            // }}}
-            // {{{ set file permissions
-            if (!OS_WINDOWS) {
-                if ($role->isExecutable()) {
-                    $mode = 0777 & ~(int)octdec($this->config->get('umask'));
-                    $this->log(3, "+ chmod +x $dest_file");
-                } else {
-                    $mode = 0666 & ~(int)octdec($this->config->get('umask'));
-                }
-                $this->addFileOperation("chmod", array($mode, $dest_file));
-                if (!@chmod($dest_file, $mode)) {
-                    if (!isset($options['soft'])) {
-                        $this->log(0, "failed to change mode of $dest_file: $php_errormsg");
-                    }
-                }
-            }
-            // }}}
-            $this->addFileOperation("rename", array($dest_file, $final_dest_file, $role->isExtension()));
-        }
-        // Store the full path where the file was installed for easy uninstall
-        $this->addFileOperation("installed_as", array($file, $installed_as,
-                            $save_destdir, dirname(substr($dest_file, strlen($save_destdir)))));
-
-        //$this->log(2, "installed: $dest_file");
-        return PEAR_INSTALLER_OK;
-    }
-
-    // }}}
-    // {{{ addFileOperation()
-
-    /**
-     * Add a file operation to the current file transaction.
-     *
-     * @see startFileTransaction()
-     * @param string $type This can be one of:
-     *    - rename:  rename a file ($data has 3 values)
-     *    - backup:  backup an existing file ($data has 1 value)
-     *    - removebackup:  clean up backups created during install ($data has 1 value)
-     *    - chmod:   change permissions on a file ($data has 2 values)
-     *    - delete:  delete a file ($data has 1 value)
-     *    - rmdir:   delete a directory if empty ($data has 1 value)
-     *    - installed_as: mark a file as installed ($data has 4 values).
-     * @param array $data For all file operations, this array must contain the
-     *    full path to the file or directory that is being operated on.  For
-     *    the rename command, the first parameter must be the file to rename,
-     *    the second its new name, the third whether this is a PHP extension.
-     *
-     *    The installed_as operation contains 4 elements in this order:
-     *    1. Filename as listed in the filelist element from package.xml
-     *    2. Full path to the installed file
-     *    3. Full path from the php_dir configuration variable used in this
-     *       installation
-     *    4. Relative path from the php_dir that this file is installed in
-     */
-    function addFileOperation($type, $data)
-    {
-        if (!is_array($data)) {
-            return $this->raiseError('Internal Error: $data in addFileOperation'
-                . ' must be an array, was ' . gettype($data));
-        }
-        if ($type == 'chmod') {
-            $octmode = decoct($data[0]);
-            $this->log(3, "adding to transaction: $type $octmode $data[1]");
-        } else {
-            $this->log(3, "adding to transaction: $type " . implode(" ", $data));
-        }
-        $this->file_operations[] = array($type, $data);
-    }
-
-    // }}}
-    // {{{ startFileTransaction()
-
-    function startFileTransaction($rollback_in_case = false)
-    {
-        if (count($this->file_operations) && $rollback_in_case) {
-            $this->rollbackFileTransaction();
-        }
-        $this->file_operations = array();
-    }
-
-    // }}}
-    // {{{ commitFileTransaction()
-
-    function commitFileTransaction()
-    {
-        $n = count($this->file_operations);
-        $this->log(2, "about to commit $n file operations");
-        // {{{ first, check permissions and such manually
-        $errors = array();
-        foreach ($this->file_operations as $tr) {
-            list($type, $data) = $tr;
-            switch ($type) {
-                case 'rename':
-                    if (!file_exists($data[0])) {
-                        $errors[] = "cannot rename file $data[0], doesn't exist";
-                    }
-                    // check that dest dir. is writable
-                    if (!is_writable(dirname($data[1]))) {
-                        $errors[] = "permission denied ($type): $data[1]";
-                    }
-                    break;
-                case 'chmod':
-                    // check that file is writable
-                    if (!is_writable($data[1])) {
-                        $errors[] = "permission denied ($type): $data[1] " . decoct($data[0]);
-                    }
-                    break;
-                case 'delete':
-                    if (!file_exists($data[0])) {
-                        $this->log(2, "warning: file $data[0] doesn't exist, can't be deleted");
-                    }
-                    // check that directory is writable
-                    if (file_exists($data[0])) {
-                        if (!is_writable(dirname($data[0]))) {
-                            $errors[] = "permission denied ($type): $data[0]";
-                        } else {
-                            // make sure the file to be deleted can be opened for writing
-                            $fp = false;
-                            if (!is_dir($data[0]) &&
-                                  (!is_writable($data[0]) || !($fp = @fopen($data[0], 'a')))) {
-                                $errors[] = "permission denied ($type): $data[0]";
-                            } elseif ($fp) {
-                                fclose($fp);
-                            }
-                        }
-                    }
-                    break;
-            }
-
-        }
-        // }}}
-        $m = sizeof($errors);
-        if ($m > 0) {
-            foreach ($errors as $error) {
-                if (!isset($this->_options['soft'])) {
-                    $this->log(1, $error);
-                }
-            }
-            if (!isset($this->_options['ignore-errors'])) {
-                return false;
-            }
-        }
-        $this->_dirtree = array();
-        // {{{ really commit the transaction
-        foreach ($this->file_operations as $tr) {
-            list($type, $data) = $tr;
-            switch ($type) {
-                case 'backup':
-                    if (!@copy($data[0], $data[0] . '.bak')) {
-                        $this->log(1, 'Could not copy ' . $data[0] . ' to ' . $data[0] .
-                            '.bak ' . $php_errormsg);
-                        return false;
-                    }
-                    $this->log(3, "+ backup $data[0] to $data[0].bak");
-                    break;
-                case 'removebackup':
-                    if (file_exists($data[0] . '.bak') && is_writable($data[0] . '.bak')) {
-                        unlink($data[0] . '.bak');
-                        $this->log(3, "+ rm backup of $data[0] ($data[0].bak)");
-                    }
-                    break;
-                case 'rename':
-                    if (file_exists($data[1])) {
-                        $test = @unlink($data[1]);
-                    } else {
-                        $test = null;
-                    }
-                    if (!$test && file_exists($data[1])) {
-                        if ($data[2]) {
-                            $extra = ', this extension must be installed manually.  Rename to "' .
-                                basename($data[1]) . '"';
-                        } else {
-                            $extra = '';
-                        }
-                        if (!isset($this->_options['soft'])) {
-                            $this->log(1, 'Could not delete ' . $data[1] . ', cannot rename ' .
-                                $data[0] . $extra);
-                        }
-                        if (!isset($this->_options['ignore-errors'])) {
-                            return false;
-                        }
-                    }
-                    // permissions issues with rename - copy() is far superior
-                    $perms = @fileperms($data[0]);
-                    if (!@copy($data[0], $data[1])) {
-                        $this->log(1, 'Could not rename ' . $data[0] . ' to ' . $data[1] .
-                            ' ' . $php_errormsg);
-                        return false;
-                    }
-                    // copy over permissions, otherwise they are lost
-                    @chmod($data[1], $perms);
-                    @unlink($data[0]);
-                    $this->log(3, "+ mv $data[0] $data[1]");
-                    break;
-                case 'chmod':
-                    if (!@chmod($data[1], $data[0])) {
-                        $this->log(1, 'Could not chmod ' . $data[1] . ' to ' .
-                            decoct($data[0]) . ' ' . $php_errormsg);
-                        return false;
-                    }
-                    $octmode = decoct($data[0]);
-                    $this->log(3, "+ chmod $octmode $data[1]");
-                    break;
-                case 'delete':
-                    if (file_exists($data[0])) {
-                        if (!@unlink($data[0])) {
-                            $this->log(1, 'Could not delete ' . $data[0] . ' ' .
-                                $php_errormsg);
-                            return false;
-                        }
-                        $this->log(3, "+ rm $data[0]");
-                    }
-                    break;
-                case 'rmdir':
-                    if (file_exists($data[0])) {
-                        do {
-                            $testme = opendir($data[0]);
-                            while (false !== ($entry = readdir($testme))) {
-                                if ($entry == '.' || $entry == '..') {
-                                    continue;
-                                }
-                                closedir($testme);
-                                break 2; // this directory is not empty and can't be
-                                         // deleted
-                            }
-                            closedir($testme);
-                            if (!@rmdir($data[0])) {
-                                $this->log(1, 'Could not rmdir ' . $data[0] . ' ' .
-                                    $php_errormsg);
-                                return false;
-                            }
-                            $this->log(3, "+ rmdir $data[0]");
-                        } while (false);
-                    }
-                    break;
-                case 'installed_as':
-                    $this->pkginfo->setInstalledAs($data[0], $data[1]);
-                    if (!isset($this->_dirtree[dirname($data[1])])) {
-                        $this->_dirtree[dirname($data[1])] = true;
-                        $this->pkginfo->setDirtree(dirname($data[1]));
-
-                        while(!empty($data[3]) && $data[3] != '/' && $data[3] != '\\'
-                              && $data[3] != '.') {
-                            $this->pkginfo->setDirtree($pp =
-                                $this->_prependPath($data[3], $data[2]));
-                            $this->_dirtree[$pp] = true;
-                            $data[3] = dirname($data[3]);
-                        }
-                    }
-                    break;
-            }
-        }
-        // }}}
-        $this->log(2, "successfully committed $n file operations");
-        $this->file_operations = array();
-        return true;
-    }
-
-    // }}}
-    // {{{ rollbackFileTransaction()
-
-    function rollbackFileTransaction()
-    {
-        $n = count($this->file_operations);
-        $this->log(2, "rolling back $n file operations");
-        foreach ($this->file_operations as $tr) {
-            list($type, $data) = $tr;
-            switch ($type) {
-                case 'backup':
-                    if (file_exists($data[0] . '.bak')) {
-                        @unlink($data[0]);
-                        @copy($data[0] . '.bak', $data[0]);
-                        $this->log(3, "+ restore $data[0] from $data[0].bak");
-                    }
-                    break;
-                case 'rename':
-                    @unlink($data[0]);
-                    $this->log(3, "+ rm $data[0]");
-                    break;
-                case 'mkdir':
-                    @rmdir($data[0]);
-                    $this->log(3, "+ rmdir $data[0]");
-                    break;
-                case 'chmod':
-                    break;
-                case 'delete':
-                    break;
-                case 'installed_as':
-                    $this->pkginfo->setInstalledAs($data[0], false);
-                    break;
-            }
-        }
-        $this->pkginfo->resetDirtree();
-        $this->file_operations = array();
-    }
-
-    // }}}
-    // {{{ mkDirHier($dir)
-
-    function mkDirHier($dir)
-    {
-        $this->addFileOperation('mkdir', array($dir));
-        return parent::mkDirHier($dir);
-    }
-
-    // }}}
-    // {{{ download()
-
-    /**
-     * Download any files and their dependencies, if necessary
-     *
-     * @param array a mixed list of package names, local files, or package.xml
-     * @param PEAR_Config
-     * @param array options from the command line
-     * @param array this is the array that will be populated with packages to
-     *              install.  Format of each entry:
-     *
-     * 
-     * array('pkg' => 'package_name', 'file' => '/path/to/local/file',
-     *    'info' => array() // parsed package.xml
-     * );
-     * 
-     * @param array this will be populated with any error messages
-     * @param false private recursion variable
-     * @param false private recursion variable
-     * @param false private recursion variable
-     * @deprecated in favor of PEAR_Downloader
-     */
-    function download($packages, $options, &$config, &$installpackages,
-                      &$errors, $installed = false, $willinstall = false, $state = false)
-    {
-        // trickiness: initialize here
-        parent::PEAR_Downloader($this->ui, $options, $config);
-        $ret = parent::download($packages);
-        $errors = $this->getErrorMsgs();
-        $installpackages = $this->getDownloadedPackages();
-        trigger_error("PEAR Warning: PEAR_Installer::download() is deprecated " .
-                      "in favor of PEAR_Downloader class", E_USER_WARNING);
-        return $ret;
-    }
-
-    // }}}
-    // {{{ _parsePackageXml()
-
-    function _parsePackageXml(&$descfile, &$tmpdir)
-    {
-        if (substr($descfile, -4) == '.xml') {
-            $tmpdir = false;
-        } else {
-            // {{{ Decompress pack in tmp dir -------------------------------------
-
-            // To allow relative package file names
-            $descfile = realpath($descfile);
-
-            if (PEAR::isError($tmpdir = System::mktemp('-d'))) {
-                return $tmpdir;
-            }
-            $this->log(3, '+ tmp dir created at ' . $tmpdir);
-            // }}}
-        }
-        // Parse xml file -----------------------------------------------
-        $pkg = new PEAR_PackageFile($this->config, $this->debug, $tmpdir);
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $p = &$pkg->fromAnyFile($descfile, PEAR_VALIDATE_INSTALLING);
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($p)) {
-            if (is_array($p->getUserInfo())) {
-                foreach ($p->getUserInfo() as $err) {
-                    $loglevel = $err['level'] == 'error' ? 0 : 1;
-                    if (!isset($this->_options['soft'])) {
-                        $this->log($loglevel, ucfirst($err['level']) . ': ' . $err['message']);
-                    }
-                }
-            }
-            return $this->raiseError('Installation failed: invalid package file');
-        } else {
-            $descfile = $p->getPackageFile();
-        }
-        return $p;
-    }
-
-    // }}}
-    /**
-     * Set the list of PEAR_Downloader_Package objects to allow more sane
-     * dependency validation
-     * @param array
-     */
-    function setDownloadedPackages(&$pkgs)
-    {
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $err = $this->analyzeDependencies($pkgs);
-        PEAR::popErrorHandling();
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-        $this->_downloadedPackages = &$pkgs;
-    }
-
-    /**
-     * Set the list of PEAR_Downloader_Package objects to allow more sane
-     * dependency validation
-     * @param array
-     */
-    function setUninstallPackages(&$pkgs)
-    {
-        $this->_downloadedPackages = &$pkgs;
-    }
-
-    function getInstallPackages()
-    {
-        return $this->_downloadedPackages;
-    }
-
-    // {{{ install()
-
-    /**
-     * Installs the files within the package file specified.
-     *
-     * @param string|PEAR_Downloader_Package $pkgfile path to the package file,
-     *        or a pre-initialized packagefile object
-     * @param array $options
-     * recognized options:
-     * - installroot   : optional prefix directory for installation
-     * - force         : force installation
-     * - register-only : update registry but don't install files
-     * - upgrade       : upgrade existing install
-     * - soft          : fail silently
-     * - nodeps        : ignore dependency conflicts/missing dependencies
-     * - alldeps       : install all dependencies
-     * - onlyreqdeps   : install only required dependencies
-     *
-     * @return array|PEAR_Error package info if successful
-     */
-
-    function install($pkgfile, $options = array())
-    {
-        $this->_options = $options;
-        $this->_registry = &$this->config->getRegistry();
-        if (is_object($pkgfile)) {
-            $dlpkg = &$pkgfile;
-            $pkg = $pkgfile->getPackageFile();
-            $pkgfile = $pkg->getArchiveFile();
-            $descfile = $pkg->getPackageFile();
-            $tmpdir = dirname($descfile);
-        } else {
-            $descfile = $pkgfile;
-            $tmpdir = '';
-            if (PEAR::isError($pkg = &$this->_parsePackageXml($descfile, $tmpdir))) {
-                return $pkg;
-            }
-        }
-
-        if (realpath($descfile) != realpath($pkgfile)) {
-            $tar = new Archive_Tar($pkgfile);
-            if (!$tar->extract($tmpdir)) {
-                return $this->raiseError("unable to unpack $pkgfile");
-            }
-        }
-
-        $pkgname = $pkg->getName();
-        $channel = $pkg->getChannel();
-        if (isset($this->_options['packagingroot'])) {
-            $regdir = $this->_prependPath(
-                $this->config->get('php_dir', null, 'pear.php.net'),
-                $this->_options['packagingroot']);
-            $packrootphp_dir = $this->_prependPath(
-                $this->config->get('php_dir', null, $channel),
-                $this->_options['packagingroot']);
-        }
-
-        if (isset($options['installroot'])) {
-            $this->config->setInstallRoot($options['installroot']);
-            $this->_registry = &$this->config->getRegistry();
-            $installregistry = &$this->_registry;
-            $this->installroot = ''; // all done automagically now
-            $php_dir = $this->config->get('php_dir', null, $channel);
-        } else {
-            $this->config->setInstallRoot(false);
-            $this->_registry = &$this->config->getRegistry();
-            if (isset($this->_options['packagingroot'])) {
-                $installregistry = &new PEAR_Registry($regdir);
-                $php_dir = $packrootphp_dir;
-            } else {
-                $installregistry = &$this->_registry;
-                $php_dir = $this->config->get('php_dir', null, $channel);
-            }
-            $this->installroot = '';
-        }
-
-        // {{{ checks to do when not in "force" mode
-        if (empty($options['force']) &&
-              (file_exists($this->config->get('php_dir')) &&
-               is_dir($this->config->get('php_dir')))) {
-            $testp = $channel == 'pear.php.net' ? $pkgname : array($channel, $pkgname);
-            $instfilelist = $pkg->getInstallationFileList(true);
-            if (PEAR::isError($instfilelist)) {
-                return $instfilelist;
-            }
-            $test = $installregistry->checkFileMap($instfilelist, $testp, '1.1');
-            if (PEAR::isError($test)) {
-                return $test;
-            }
-            if (sizeof($test)) {
-                $pkgs = $this->getInstallPackages();
-                $found = false;
-                foreach ($pkgs as $param) {
-                    if ($pkg->isSubpackageOf($param)) {
-                        $found = true;
-                        break;
-                    }
-                }
-                if ($found) {
-                    // subpackages can conflict with earlier versions of parent packages
-                    $parentreg = $installregistry->packageInfo($param->getPackage(), null, $param->getChannel());
-                    $tmp = $test;
-                    foreach ($tmp as $file => $info) {
-                        if (is_array($info)) {
-                            if (strtolower($info[1]) == strtolower($param->getPackage()) &&
-                                  strtolower($info[0]) == strtolower($param->getChannel())) {
-                                unset($test[$file]);
-                                unset($parentreg['filelist'][$file]);
-                            }
-                        } else {
-                            if (strtolower($param->getChannel()) != 'pear.php.net') {
-                                continue;
-                            }
-                            if (strtolower($info) == strtolower($param->getPackage())) {
-                                unset($test[$file]);
-                                unset($parentreg['filelist'][$file]);
-                            }
-                        }
-                    }
-                    $pfk = &new PEAR_PackageFile($this->config);
-                    $parentpkg = &$pfk->fromArray($parentreg);
-                    $installregistry->updatePackage2($parentpkg);
-                }
-                if ($param->getChannel() == 'pecl.php.net' && isset($options['upgrade'])) {
-                    $tmp = $test;
-                    foreach ($tmp as $file => $info) {
-                        if (is_string($info)) {
-                            // pear.php.net packages are always stored as strings
-                            if (strtolower($info) == strtolower($param->getPackage())) {
-                                // upgrading existing package
-                                unset($test[$file]);
-                            }
-                        }
-                    }
-                }
-                if (sizeof($test)) {
-                    $msg = "$channel/$pkgname: conflicting files found:\n";
-                    $longest = max(array_map("strlen", array_keys($test)));
-                    $fmt = "%${longest}s (%s)\n";
-                    foreach ($test as $file => $info) {
-                        if (!is_array($info)) {
-                            $info = array('pear.php.net', $info);
-                        }
-                        $info = $info[0] . '/' . $info[1];
-                        $msg .= sprintf($fmt, $file, $info);
-                    }
-                    if (!isset($options['ignore-errors'])) {
-                        return $this->raiseError($msg);
-                    } else {
-                        if (!isset($options['soft'])) {
-                            $this->log(0, "WARNING: $msg");
-                        }
-                    }
-                }
-            }
-        }
-        // }}}
-
-        $this->startFileTransaction();
-
-        if (empty($options['upgrade']) && empty($options['soft'])) {
-            // checks to do only when installing new packages
-            if ($channel == 'pecl.php.net') {
-                $test = $installregistry->packageExists($pkgname, $channel);
-                if (!$test) {
-                    $test = $installregistry->packageExists($pkgname, 'pear.php.net');
-                }
-            } else {
-                $test = $installregistry->packageExists($pkgname, $channel);
-            }
-            if (empty($options['force']) && $test) {
-                return $this->raiseError("$channel/$pkgname is already installed");
-            }
-        } else {
-            $usechannel = $channel;
-            if ($channel == 'pecl.php.net') {
-                $test = $installregistry->packageExists($pkgname, $channel);
-                if (!$test) {
-                    $test = $installregistry->packageExists($pkgname, 'pear.php.net');
-                    $usechannel = 'pear.php.net';
-                }
-            } else {
-                $test = $installregistry->packageExists($pkgname, $channel);
-            }
-            if ($test) {
-                $v1 = $installregistry->packageInfo($pkgname, 'version', $usechannel);
-                $v2 = $pkg->getVersion();
-                $cmp = version_compare("$v1", "$v2", 'gt');
-                if (empty($options['force']) && !version_compare("$v2", "$v1", 'gt')) {
-                    return $this->raiseError("upgrade to a newer version ($v2 is not newer than $v1)");
-                }
-                if (empty($options['register-only'])) {
-                    // when upgrading, remove old release's files first:
-                    if (PEAR::isError($err = $this->_deletePackageFiles($pkgname, $usechannel,
-                          true))) {
-                        if (!isset($options['ignore-errors'])) {
-                            return $this->raiseError($err);
-                        } else {
-                            if (!isset($options['soft'])) {
-                                $this->log(0, 'WARNING: ' . $err->getMessage());
-                            }
-                        }
-                    } else {
-                        $backedup = $err;
-                    }
-                }
-            }
-        }
-
-        // {{{ Copy files to dest dir ---------------------------------------
-
-        // info from the package it self we want to access from _installFile
-        $this->pkginfo = &$pkg;
-        // used to determine whether we should build any C code
-        $this->source_files = 0;
-
-        $savechannel = $this->config->get('default_channel');
-        if (empty($options['register-only']) && !is_dir($php_dir)) {
-            if (PEAR::isError(System::mkdir(array('-p'), $php_dir))) {
-                return $this->raiseError("no installation destination directory '$php_dir'\n");
-            }
-        }
-
-        $tmp_path = dirname($descfile);
-        if (substr($pkgfile, -4) != '.xml') {
-            $tmp_path .= DIRECTORY_SEPARATOR . $pkgname . '-' . $pkg->getVersion();
-        }
-
-        $this->configSet('default_channel', $channel);
-        // {{{ install files
-
-        $ver = $pkg->getPackagexmlVersion();
-        if (version_compare($ver, '2.0', '>=')) {
-            $filelist = $pkg->getInstallationFilelist();
-        } else {
-            $filelist = $pkg->getFileList();
-        }
-        if (PEAR::isError($filelist)) {
-            return $filelist;
-        }
-        $pkg->resetFilelist();
-        $pkg->setLastInstalledVersion($installregistry->packageInfo($pkg->getPackage(),
-            'version', $pkg->getChannel()));
-        foreach ($filelist as $file => $atts) {
-            if ($pkg->getPackagexmlVersion() == '1.0') {
-                $this->expectError(PEAR_INSTALLER_FAILED);
-                $res = $this->_installFile($file, $atts, $tmp_path, $options);
-                $this->popExpect();
-            } else {
-                $this->expectError(PEAR_INSTALLER_FAILED);
-                $res = $this->_installFile2($pkg, $file, $atts, $tmp_path, $options);
-                $this->popExpect();
-            }
-            if (PEAR::isError($res)) {
-                if (empty($options['ignore-errors'])) {
-                    $this->rollbackFileTransaction();
-                    if ($res->getMessage() == "file does not exist") {
-                        $this->raiseError("file $file in package.xml does not exist");
-                    }
-                    return $this->raiseError($res);
-                } else {
-                    if (!isset($options['soft'])) {
-                        $this->log(0, "Warning: " . $res->getMessage());
-                    }
-                }
-            }
-            if ($res == PEAR_INSTALLER_OK) {
-                // Register files that were installed
-                $pkg->installedFile($file, $atts);
-            }
-        }
-        // }}}
-
-        // {{{ compile and install source files
-        if ($this->source_files > 0 && empty($options['nobuild'])) {
-            if (PEAR::isError($err =
-                  $this->_compileSourceFiles($savechannel, $pkg))) {
-                return $err;
-            }
-        }
-        // }}}
-
-        if (isset($backedup)) {
-            $this->_removeBackups($backedup);
-        }
-        if (!$this->commitFileTransaction()) {
-            $this->rollbackFileTransaction();
-            $this->configSet('default_channel', $savechannel);
-            return $this->raiseError("commit failed", PEAR_INSTALLER_FAILED);
-        }
-        // }}}
-
-        $ret = false;
-        $installphase = 'install';
-        $oldversion = false;
-        // {{{ Register that the package is installed -----------------------
-        if (empty($options['upgrade'])) {
-            // if 'force' is used, replace the info in registry
-            $usechannel = $channel;
-            if ($channel == 'pecl.php.net') {
-                $test = $installregistry->packageExists($pkgname, $channel);
-                if (!$test) {
-                    $test = $installregistry->packageExists($pkgname, 'pear.php.net');
-                    $usechannel = 'pear.php.net';
-                }
-            } else {
-                $test = $installregistry->packageExists($pkgname, $channel);
-            }
-            if (!empty($options['force']) && $test) {
-                $oldversion = $installregistry->packageInfo($pkgname, 'version', $usechannel);
-                $installregistry->deletePackage($pkgname, $usechannel);
-            }
-            $ret = $installregistry->addPackage2($pkg);
-        } else {
-            $usechannel = $channel;
-            if ($channel == 'pecl.php.net') {
-                $test = $installregistry->packageExists($pkgname, $channel);
-                if (!$test) {
-                    $test = $installregistry->packageExists($pkgname, 'pear.php.net');
-                    $usechannel = 'pear.php.net';
-                }
-            } else {
-                $test = $installregistry->packageExists($pkgname, $channel);
-            }
-            // new: upgrade installs a package if it isn't installed
-            if (!$test) {
-                $ret = $installregistry->addPackage2($pkg);
-            } else {
-                if ($usechannel != $channel) {
-                    $installregistry->deletePackage($pkgname, $usechannel);
-                    $ret = $installregistry->addPackage2($pkg);
-                } else {
-                    $ret = $installregistry->updatePackage2($pkg);
-                }
-                $installphase = 'upgrade';
-            }
-        }
-        if (!$ret) {
-            $this->configSet('default_channel', $savechannel);
-            return $this->raiseError("Adding package $channel/$pkgname to registry failed");
-        }
-        // }}}
-        $this->configSet('default_channel', $savechannel);
-        if (class_exists('PEAR_Task_Common')) { // this is auto-included if any tasks exist
-            if (PEAR_Task_Common::hasPostinstallTasks()) {
-                PEAR_Task_Common::runPostinstallTasks($installphase);
-            }
-        }
-        return $pkg->toArray(true);
-    }
-
-    // }}}
-
-    // {{{ _compileSourceFiles()
-    /**
-     * @param string
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     */
-    function _compileSourceFiles($savechannel, &$filelist)
-    {
-        require_once 'PEAR/Builder.php';
-        $this->log(1, "$this->source_files source files, building");
-        $bob = &new PEAR_Builder($this->ui);
-        $bob->debug = $this->debug;
-        $built = $bob->build($filelist, array(&$this, '_buildCallback'));
-        if (PEAR::isError($built)) {
-            $this->rollbackFileTransaction();
-            $this->configSet('default_channel', $savechannel);
-            return $built;
-        }
-        $this->log(1, "\nBuild process completed successfully");
-        foreach ($built as $ext) {
-            $bn = basename($ext['file']);
-            list($_ext_name, $_ext_suff) = explode('.', $bn);
-            if ($_ext_suff == '.so' || $_ext_suff == '.dll') {
-                if (extension_loaded($_ext_name)) {
-                    $this->raiseError("Extension '$_ext_name' already loaded. " .
-                                      'Please unload it in your php.ini file ' .
-                                      'prior to install or upgrade');
-                }
-                $role = 'ext';
-            } else {
-                $role = 'src';
-            }
-            $dest = $ext['dest'];
-            $packagingroot = '';
-            if (isset($this->_options['packagingroot'])) {
-                $packagingroot = $this->_options['packagingroot'];
-            }
-            $copyto = $this->_prependPath($dest, $packagingroot);
-            if ($copyto != $dest) {
-	            $this->log(1, "Installing '$dest' as '$copyto'");
-            } else {
-	            $this->log(1, "Installing '$dest'");
-            }
-            $copydir = dirname($copyto);
-            // pretty much nothing happens if we are only registering the install
-            if (empty($this->_options['register-only'])) {
-                if (!file_exists($copydir) || !is_dir($copydir)) {
-                    if (!$this->mkDirHier($copydir)) {
-                        return $this->raiseError("failed to mkdir $copydir",
-                            PEAR_INSTALLER_FAILED);
-                    }
-                    $this->log(3, "+ mkdir $copydir");
-                }
-                if (!@copy($ext['file'], $copyto)) {
-                    return $this->raiseError("failed to write $copyto ($php_errormsg)", PEAR_INSTALLER_FAILED);
-                }
-                $this->log(3, "+ cp $ext[file] $copyto");
-                if (!OS_WINDOWS) {
-                    $mode = 0666 & ~(int)octdec($this->config->get('umask'));
-                    $this->addFileOperation('chmod', array($mode, $copyto));
-                    if (!@chmod($copyto, $mode)) {
-                        $this->log(0, "failed to change mode of $copyto ($php_errormsg)");
-                    }
-                }
-                $this->addFileOperation('rename', array($ext['file'], $copyto));
-            }
-
-            if ($filelist->getPackageXmlVersion() == '1.0') {
-                $filelist->installedFile($bn, array(
-                    'role' => $role,
-                    'name' => $bn,
-                    'installed_as' => $dest,
-                    'php_api' => $ext['php_api'],
-                    'zend_mod_api' => $ext['zend_mod_api'],
-                    'zend_ext_api' => $ext['zend_ext_api'],
-                    ));
-            } else {
-                $filelist->installedFile($bn, array('attribs' => array(
-                    'role' => $role,
-                    'name' => $bn,
-                    'installed_as' => $dest,
-                    'php_api' => $ext['php_api'],
-                    'zend_mod_api' => $ext['zend_mod_api'],
-                    'zend_ext_api' => $ext['zend_ext_api'],
-                    )));
-            }
-        }
-    }
-
-    // }}}
-    function &getUninstallPackages()
-    {
-        return $this->_downloadedPackages;
-    }
-    // {{{ uninstall()
-
-    /**
-     * Uninstall a package
-     *
-     * This method removes all files installed by the application, and then
-     * removes any empty directories.
-     * @param string package name
-     * @param array Command-line options.  Possibilities include:
-     *
-     *              - installroot: base installation dir, if not the default
-     *              - nodeps: do not process dependencies of other packages to ensure
-     *                        uninstallation does not break things
-     */
-    function uninstall($package, $options = array())
-    {
-        if (isset($options['installroot'])) {
-            $this->config->setInstallRoot($options['installroot']);
-            $this->installroot = '';
-        } else {
-            $this->config->setInstallRoot('');
-            $this->installroot = '';
-        }
-        $this->_registry = &$this->config->getRegistry();
-        if (is_object($package)) {
-            $channel = $package->getChannel();
-            $pkg = $package;
-            $package = $pkg->getPackage();
-        } else {
-            $pkg = false;
-            $info = $this->_registry->parsePackageName($package,
-                $this->config->get('default_channel'));
-            $channel = $info['channel'];
-            $package = $info['package'];
-        }
-        $savechannel = $this->config->get('default_channel');
-        $this->configSet('default_channel', $channel);
-        if (!is_object($pkg)) {
-            $pkg = $this->_registry->getPackage($package, $channel);
-        }
-        if (!$pkg) {
-            $this->configSet('default_channel', $savechannel);
-            return $this->raiseError($this->_registry->parsedPackageNameToString(
-                array(
-                    'channel' => $channel,
-                    'package' => $package
-                ), true) . ' not installed');
-        }
-        if ($pkg->getInstalledBinary()) {
-            // this is just an alias for a binary package
-            return $this->_registry->deletePackage($package, $channel);
-        }
-        $filelist = $pkg->getFilelist();
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        if (!class_exists('PEAR_Dependency2')) {
-            require_once 'PEAR/Dependency2.php';
-        }
-        $depchecker = &new PEAR_Dependency2($this->config, $options, 
-            array('channel' => $channel, 'package' => $package),
-            PEAR_VALIDATE_UNINSTALLING);
-        $e = $depchecker->validatePackageUninstall($this);
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($e)) {
-            if (!isset($options['ignore-errors'])) {
-                return $this->raiseError($e);
-            } else {
-                if (!isset($options['soft'])) {
-                    $this->log(0, 'WARNING: ' . $e->getMessage());
-                }
-            }
-        } elseif (is_array($e)) {
-            if (!isset($options['soft'])) {
-                $this->log(0, $e[0]);
-            }
-        }
-        $this->pkginfo = &$pkg;
-        // {{{ Delete the files
-        $this->startFileTransaction();
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        if (PEAR::isError($err = $this->_deletePackageFiles($package, $channel))) {
-            PEAR::popErrorHandling();
-            $this->rollbackFileTransaction();
-            $this->configSet('default_channel', $savechannel);
-            if (!isset($options['ignore-errors'])) {
-                return $this->raiseError($err);
-            } else {
-                if (!isset($options['soft'])) {
-                    $this->log(0, 'WARNING: ' . $err->getMessage());
-                }
-            }
-        } else {
-            PEAR::popErrorHandling();
-        }
-        if (!$this->commitFileTransaction()) {
-            $this->rollbackFileTransaction();
-            if (!isset($options['ignore-errors'])) {
-                return $this->raiseError("uninstall failed");
-            } elseif (!isset($options['soft'])) {
-                $this->log(0, 'WARNING: uninstall failed');
-            }
-        } else {
-            $this->startFileTransaction();
-            if ($dirtree = $pkg->getDirTree()) {
-                // attempt to delete empty directories
-                uksort($dirtree, array($this, '_sortDirs'));
-                foreach($dirtree as $dir => $notused) {
-                    $this->addFileOperation('rmdir', array($dir));
-                }
-            } else {
-                $this->configSet('default_channel', $savechannel);
-                return $this->_registry->deletePackage($package, $channel);
-            }
-            if (!$this->commitFileTransaction()) {
-                $this->rollbackFileTransaction();
-                if (!isset($options['ignore-errors'])) {
-                    return $this->raiseError("uninstall failed");
-                } elseif (!isset($options['soft'])) {
-                    $this->log(0, 'WARNING: uninstall failed');
-                }
-            }
-        }
-        // }}}
-
-        $this->configSet('default_channel', $savechannel);
-        // Register that the package is no longer installed
-        return $this->_registry->deletePackage($package, $channel);
-    }
-
-    /**
-     * Sort a list of arrays of array(downloaded packagefilename) by dependency.
-     *
-     * It also removes duplicate dependencies
-     * @param array an array of PEAR_PackageFile_v[1/2] objects
-     * @return array|PEAR_Error array of array(packagefilename, package.xml contents)
-     */
-    function sortPackagesForUninstall(&$packages)
-    {
-        $this->_dependencyDB = &PEAR_DependencyDB::singleton($this->config);
-        if (PEAR::isError($this->_dependencyDB)) {
-            return $this->_dependencyDB;
-        }
-        usort($packages, array(&$this, '_sortUninstall'));
-    }
-
-    function _sortUninstall($a, $b)
-    {
-        if (!$a->getDeps() && !$b->getDeps()) {
-            return 0; // neither package has dependencies, order is insignificant
-        }
-        if ($a->getDeps() && !$b->getDeps()) {
-            return -1; // $a must be installed after $b because $a has dependencies
-        }
-        if (!$a->getDeps() && $b->getDeps()) {
-            return 1; // $b must be installed after $a because $b has dependencies
-        }
-        // both packages have dependencies
-        if ($this->_dependencyDB->dependsOn($a, $b)) {
-            return -1;
-        }
-        if ($this->_dependencyDB->dependsOn($b, $a)) {
-            return 1;
-        }
-        return 0;
-    }
-
-    // }}}
-    // {{{ _sortDirs()
-    function _sortDirs($a, $b)
-    {
-        if (strnatcmp($a, $b) == -1) return 1;
-        if (strnatcmp($a, $b) == 1) return -1;
-        return 0;
-    }
-
-    // }}}
-
-    // {{{ _buildCallback()
-
-    function _buildCallback($what, $data)
-    {
-        if (($what == 'cmdoutput' && $this->debug > 1) ||
-            ($what == 'output' && $this->debug > 0)) {
-            $this->ui->outputData(rtrim($data), 'build');
-        }
-    }
-
-    // }}}
-}
-
-// {{{ md5_file() utility function
-if (!function_exists("md5_file")) {
-    function md5_file($filename) {
-        if (!$fd = @fopen($file, 'r')) {
-            return false;
-        }
-        fclose($fd);
-        return md5(file_get_contents($filename));
-    }
-}
-// }}}
-
-?>
\ No newline at end of file
diff --git a/PEAR/Installer/Role.php b/PEAR/Installer/Role.php
deleted file mode 100644
index 939d3b2..0000000
--- a/PEAR/Installer/Role.php
+++ /dev/null
@@ -1,250 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Role.php,v 1.15 2006/05/12 02:38:58 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * base class for installer roles
- */
-require_once 'PEAR/Installer/Role/Common.php';
-require_once 'PEAR/XMLParser.php';
-//$GLOBALS['_PEAR_INSTALLER_ROLES'] = array();
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role
-{
-    /**
-     * Set up any additional configuration variables that file roles require
-     *
-     * Never call this directly, it is called by the PEAR_Config constructor
-     * @param PEAR_Config
-     * @access private
-     * @static
-     */
-    function initializeConfig(&$config)
-    {
-        if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
-            PEAR_Installer_Role::registerRoles();
-        }
-        foreach ($GLOBALS['_PEAR_INSTALLER_ROLES'] as $class => $info) {
-            if (!$info['config_vars']) {
-                continue;
-            }
-            $config->_addConfigVars($info['config_vars']);
-        }
-    }
-
-    /**
-     * @param PEAR_PackageFile_v2
-     * @param string role name
-     * @param PEAR_Config
-     * @return PEAR_Installer_Role_Common
-     * @static
-     */
-    function &factory($pkg, $role, &$config)
-    {
-        if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
-            PEAR_Installer_Role::registerRoles();
-        }
-        if (!in_array($role, PEAR_Installer_Role::getValidRoles($pkg->getPackageType()))) {
-            $a = false;
-            return $a;
-        }
-        $a = 'PEAR_Installer_Role_' . ucfirst($role);
-        if (!class_exists($a)) {
-            require_once str_replace('_', '/', $a) . '.php';
-        }
-        $b = new $a($config);
-        return $b;
-    }
-
-    /**
-     * Get a list of file roles that are valid for the particular release type.
-     *
-     * For instance, src files serve no purpose in regular php releases.
-     * @param string
-     * @param bool clear cache
-     * @return array
-     * @static
-     */
-    function getValidRoles($release, $clear = false)
-    {
-        if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
-            PEAR_Installer_Role::registerRoles();
-        }
-        static $ret = array();
-        if ($clear) {
-            $ret = array();
-        }
-        if (isset($ret[$release])) {
-            return $ret[$release];
-        }
-        $ret[$release] = array();
-        foreach ($GLOBALS['_PEAR_INSTALLER_ROLES'] as $role => $okreleases) {
-            if (in_array($release, $okreleases['releasetypes'])) {
-                $ret[$release][] = strtolower(str_replace('PEAR_Installer_Role_', '', $role));
-            }
-        }
-        return $ret[$release];
-    }
-
-    /**
-     * Get a list of roles that require their files to be installed
-     *
-     * Most roles must be installed, but src and package roles, for instance
-     * are pseudo-roles.  src files are compiled into a new extension.  Package
-     * roles are actually fully bundled releases of a package
-     * @param bool clear cache
-     * @return array
-     * @static
-     */
-    function getInstallableRoles($clear = false)
-    {
-        if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
-            PEAR_Installer_Role::registerRoles();
-        }
-        static $ret;
-        if ($clear) {
-            unset($ret);
-        }
-        if (!isset($ret)) {
-            foreach ($GLOBALS['_PEAR_INSTALLER_ROLES'] as $role => $okreleases) {
-                if ($okreleases['installable']) {
-                    $ret[] = strtolower(str_replace('PEAR_Installer_Role_', '', $role));
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Return an array of roles that are affected by the baseinstalldir attribute
-     *
-     * Most roles ignore this attribute, and instead install directly into:
-     * PackageName/filepath
-     * so a tests file tests/file.phpt is installed into PackageName/tests/filepath.php
-     * @param bool clear cache
-     * @return array
-     * @static
-     */
-    function getBaseinstallRoles($clear = false)
-    {
-        if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
-            PEAR_Installer_Role::registerRoles();
-        }
-        static $ret;
-        if ($clear) {
-            unset($ret);
-        }
-        if (!isset($ret)) {
-            foreach ($GLOBALS['_PEAR_INSTALLER_ROLES'] as $role => $okreleases) {
-                if ($okreleases['honorsbaseinstall']) {
-                    $ret[] = strtolower(str_replace('PEAR_Installer_Role_', '', $role));
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Return an array of file roles that should be analyzed for PHP content at package time,
-     * like the "php" role.
-     * @param bool clear cache
-     * @return array
-     * @static
-     */
-    function getPhpRoles($clear = false)
-    {
-        if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
-            PEAR_Installer_Role::registerRoles();
-        }
-        static $ret;
-        if ($clear) {
-            unset($ret);
-        }
-        if (!isset($ret)) {
-            foreach ($GLOBALS['_PEAR_INSTALLER_ROLES'] as $role => $okreleases) {
-                if ($okreleases['phpfile']) {
-                    $ret[] = strtolower(str_replace('PEAR_Installer_Role_', '', $role));
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Scan through the Command directory looking for classes
-     * and see what commands they implement.
-     * @param string which directory to look for classes, defaults to
-     *               the Installer/Roles subdirectory of
-     *               the directory from where this file (__FILE__) is
-     *               included.
-     *
-     * @return bool TRUE on success, a PEAR error on failure
-     * @access public
-     * @static
-     */
-    function registerRoles($dir = null)
-    {
-        $parser = new PEAR_XMLParser;
-        if ($dir === null) {
-            $dir = dirname(__FILE__) . '/Role';
-        }
-        if (!file_exists($dir) || !is_dir($dir)) {
-            return PEAR::raiseError("registerRoles: opendir($dir) failed");
-        }
-        $dp = @opendir($dir);
-        if (empty($dp)) {
-            return PEAR::raiseError("registerRoles: opendir($dir) failed");
-        }
-        while ($entry = readdir($dp)) {
-            if ($entry{0} == '.' || substr($entry, -4) != '.xml') {
-                continue;
-            }
-            $class = "PEAR_Installer_Role_".substr($entry, 0, -4);
-            // List of roles
-            if (empty($GLOBALS['_PEAR_INSTALLER_ROLES'][$class])) {
-                $file = "$dir/$entry";
-                $parser->parse(file_get_contents($file));
-                $data = $parser->getData();
-                if (!is_array($data['releasetypes'])) {
-                    $data['releasetypes'] = array($data['releasetypes']);
-                }
-                $GLOBALS['_PEAR_INSTALLER_ROLES'][$class] = $data;
-            }
-        }
-        closedir($dp);
-        ksort($GLOBALS['_PEAR_INSTALLER_ROLES']);
-        PEAR_Installer_Role::getBaseinstallRoles(true);
-        PEAR_Installer_Role::getInstallableRoles(true);
-        PEAR_Installer_Role::getPhpRoles(true);
-        PEAR_Installer_Role::getValidRoles('****', true);
-        return true;
-    }
-}
-?>
diff --git a/PEAR/Installer/Role/Common.php b/PEAR/Installer/Role/Common.php
deleted file mode 100644
index 5c6121d..0000000
--- a/PEAR/Installer/Role/Common.php
+++ /dev/null
@@ -1,180 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Common.php,v 1.10 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * Base class for all installation roles.
- *
- * This class allows extensibility of file roles.  Packages with complex
- * customization can now provide custom file roles along with the possibility of
- * adding configuration values to match.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Common
-{
-    /**
-     * @var PEAR_Config
-     * @access protected
-     */
-    var $config;
-
-    /**
-     * @param PEAR_Config
-     */
-    function PEAR_Installer_Role_Common(&$config)
-    {
-        $this->config = $config;
-    }
-
-    /**
-     * Retrieve configuration information about a file role from its XML info
-     *
-     * @param string $role Role Classname, as in "PEAR_Installer_Role_Data"
-     * @return array
-     */
-    function getInfo($role)
-    {
-        if (empty($GLOBALS['_PEAR_INSTALLER_ROLES'][$role])) {
-            return PEAR::raiseError('Unknown Role class: "' . $role . '"');
-        }
-        return $GLOBALS['_PEAR_INSTALLER_ROLES'][$role];
-    }
-
-    /**
-     * This is called for each file to set up the directories and files
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param array attributes from the  tag
-     * @param string file name
-     * @return array an array consisting of:
-     *
-     *    1 the original, pre-baseinstalldir installation directory
-     *    2 the final installation directory
-     *    3 the full path to the final location of the file
-     *    4 the location of the pre-installation file
-     */
-    function processInstallation($pkg, $atts, $file, $tmp_path, $layer = null)
-    {
-        $roleInfo = PEAR_Installer_Role_Common::getInfo('PEAR_Installer_Role_' . 
-            ucfirst(str_replace('pear_installer_role_', '', strtolower(get_class($this)))));
-        if (PEAR::isError($roleInfo)) {
-            return $roleInfo;
-        }
-        if (!$roleInfo['locationconfig']) {
-            return false;
-        }
-        if ($roleInfo['honorsbaseinstall']) {
-            $dest_dir = $save_destdir = $this->config->get($roleInfo['locationconfig'], $layer,
-                $pkg->getChannel());
-            if (!empty($atts['baseinstalldir'])) {
-                $dest_dir .= DIRECTORY_SEPARATOR . $atts['baseinstalldir'];
-            }
-        } elseif ($roleInfo['unusualbaseinstall']) {
-            $dest_dir = $save_destdir = $this->config->get($roleInfo['locationconfig'],
-                    null, $pkg->getChannel()) . DIRECTORY_SEPARATOR . $pkg->getPackage();
-            if (!empty($atts['baseinstalldir'])) {
-                $dest_dir .= DIRECTORY_SEPARATOR . $atts['baseinstalldir'];
-            }
-        } else {
-            $dest_dir = $save_destdir = $this->config->get($roleInfo['locationconfig'],
-                    null, $pkg->getChannel()) . DIRECTORY_SEPARATOR . $pkg->getPackage();
-        }
-        if (dirname($file) != '.' && empty($atts['install-as'])) {
-            $dest_dir .= DIRECTORY_SEPARATOR . dirname($file);
-        }
-        if (empty($atts['install-as'])) {
-            $dest_file = $dest_dir . DIRECTORY_SEPARATOR . basename($file);
-        } else {
-            $dest_file = $dest_dir . DIRECTORY_SEPARATOR . $atts['install-as'];
-        }
-        $orig_file = $tmp_path . DIRECTORY_SEPARATOR . $file;
-
-        // Clean up the DIRECTORY_SEPARATOR mess
-        $ds2 = DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR;
-        
-        list($dest_dir, $dest_file, $orig_file) = preg_replace(array('!\\\\+!', '!/!', "!$ds2+!"),
-                                                    array(DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR,
-                                                          DIRECTORY_SEPARATOR),
-                                                    array($dest_dir, $dest_file, $orig_file));
-        return array($save_destdir, $dest_dir, $dest_file, $orig_file);
-    }
-
-    /**
-     * Get the name of the configuration variable that specifies the location of this file
-     * @return string|false
-     */
-    function getLocationConfig()
-    {
-        $roleInfo = PEAR_Installer_Role_Common::getInfo('PEAR_Installer_Role_' . 
-            ucfirst(str_replace('pear_installer_role_', '', strtolower(get_class($this)))));
-        if (PEAR::isError($roleInfo)) {
-            return $roleInfo;
-        }
-        return $roleInfo['locationconfig'];
-    }
-
-    /**
-     * Do any unusual setup here
-     * @param PEAR_Installer
-     * @param PEAR_PackageFile_v2
-     * @param array file attributes
-     * @param string file name
-     */
-    function setup(&$installer, $pkg, $atts, $file)
-    {
-    }
-
-    function isExecutable()
-    {
-        $roleInfo = PEAR_Installer_Role_Common::getInfo('PEAR_Installer_Role_' . 
-            ucfirst(str_replace('pear_installer_role_', '', strtolower(get_class($this)))));
-        if (PEAR::isError($roleInfo)) {
-            return $roleInfo;
-        }
-        return $roleInfo['executable'];
-    }
-
-    function isInstallable()
-    {
-        $roleInfo = PEAR_Installer_Role_Common::getInfo('PEAR_Installer_Role_' . 
-            ucfirst(str_replace('pear_installer_role_', '', strtolower(get_class($this)))));
-        if (PEAR::isError($roleInfo)) {
-            return $roleInfo;
-        }
-        return $roleInfo['installable'];
-    }
-
-    function isExtension()
-    {
-        $roleInfo = PEAR_Installer_Role_Common::getInfo('PEAR_Installer_Role_' . 
-            ucfirst(str_replace('pear_installer_role_', '', strtolower(get_class($this)))));
-        if (PEAR::isError($roleInfo)) {
-            return $roleInfo;
-        }
-        return $roleInfo['phpextension'];
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Data.php b/PEAR/Installer/Role/Data.php
deleted file mode 100644
index 81362b6..0000000
--- a/PEAR/Installer/Role/Data.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Data.php,v 1.6 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Data extends PEAR_Installer_Role_Common {}
-?>
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Data.xml b/PEAR/Installer/Role/Data.xml
deleted file mode 100644
index a6294a5..0000000
--- a/PEAR/Installer/Role/Data.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
- php
- extsrc
- extbin
- zendextsrc
- zendextbin
- 1
- data_dir
- 
- 
- 
- 
- 
- 
-
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Doc.php b/PEAR/Installer/Role/Doc.php
deleted file mode 100644
index bed0405..0000000
--- a/PEAR/Installer/Role/Doc.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Doc.php,v 1.6 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Doc extends PEAR_Installer_Role_Common {}
-?>
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Doc.xml b/PEAR/Installer/Role/Doc.xml
deleted file mode 100644
index 16ad377..0000000
--- a/PEAR/Installer/Role/Doc.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
- php
- extsrc
- extbin
- zendextsrc
- zendextbin
- 1
- doc_dir
- 
- 
- 
- 
- 
- 
-
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Ext.php b/PEAR/Installer/Role/Ext.php
deleted file mode 100644
index f00cf7c..0000000
--- a/PEAR/Installer/Role/Ext.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Ext.php,v 1.6 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Ext extends PEAR_Installer_Role_Common {}
-?>
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Ext.xml b/PEAR/Installer/Role/Ext.xml
deleted file mode 100644
index c02425c..0000000
--- a/PEAR/Installer/Role/Ext.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
- extbin
- zendextbin
- 1
- ext_dir
- 1
- 
- 
- 
- 1
- 
-
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Php.php b/PEAR/Installer/Role/Php.php
deleted file mode 100644
index e8f555a..0000000
--- a/PEAR/Installer/Role/Php.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Php.php,v 1.7 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Php extends PEAR_Installer_Role_Common {}
-?>
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Php.xml b/PEAR/Installer/Role/Php.xml
deleted file mode 100644
index 0cf81e4..0000000
--- a/PEAR/Installer/Role/Php.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
- php
- extsrc
- extbin
- zendextsrc
- zendextbin
- 1
- php_dir
- 1
- 
- 1
- 
- 
- 
-
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Script.php b/PEAR/Installer/Role/Script.php
deleted file mode 100644
index 860532a..0000000
--- a/PEAR/Installer/Role/Script.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Script.php,v 1.6 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Script extends PEAR_Installer_Role_Common {}
-?>
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Script.xml b/PEAR/Installer/Role/Script.xml
deleted file mode 100644
index 3a5ceeb..0000000
--- a/PEAR/Installer/Role/Script.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
- php
- extsrc
- extbin
- zendextsrc
- zendextbin
- 1
- bin_dir
- 1
- 
- 
- 1
- 
- 
-
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Src.php b/PEAR/Installer/Role/Src.php
deleted file mode 100644
index d85808f..0000000
--- a/PEAR/Installer/Role/Src.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Src.php,v 1.6 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Src extends PEAR_Installer_Role_Common
-{
-    function setup(&$installer, $pkg, $atts, $file)
-    {
-        $installer->source_files++;
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Src.xml b/PEAR/Installer/Role/Src.xml
deleted file mode 100644
index b2e022e..0000000
--- a/PEAR/Installer/Role/Src.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
- extsrc
- zendextsrc
- 
- 
- 
- 
- 
- 
- 
- 
-
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Test.php b/PEAR/Installer/Role/Test.php
deleted file mode 100644
index a944f3b..0000000
--- a/PEAR/Installer/Role/Test.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Test.php,v 1.6 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Test extends PEAR_Installer_Role_Common {}
-?>
\ No newline at end of file
diff --git a/PEAR/Installer/Role/Test.xml b/PEAR/Installer/Role/Test.xml
deleted file mode 100644
index 103680d..0000000
--- a/PEAR/Installer/Role/Test.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
- php
- extsrc
- extbin
- zendextsrc
- zendextbin
- 1
- test_dir
- 
- 
- 
- 
- 
- 
-
\ No newline at end of file
diff --git a/PEAR/PackageFile.php b/PEAR/PackageFile.php
deleted file mode 100644
index 4ebf0c0..0000000
--- a/PEAR/PackageFile.php
+++ /dev/null
@@ -1,474 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: PackageFile.php,v 1.40 2006/09/25 05:12:21 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * needed for PEAR_VALIDATE_* constants
- */
-require_once 'PEAR/Validate.php';
-/**
- * Error code if the package.xml  tag does not contain a valid version
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_PACKAGEVERSION', 1);
-/**
- * Error code if the package.xml  tag version is not supported (version 1.0 and 1.1 are the only supported versions,
- * currently
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_PACKAGEVERSION', 2);
-/**
- * Abstraction for the package.xml package description file
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile
-{
-    /**
-     * @var PEAR_Config
-     */
-    var $_config;
-    var $_debug;
-    /**
-     * Temp directory for uncompressing tgz files.
-     * @var string|false
-     */
-    var $_tmpdir;
-    var $_logger = false;
-    /**
-     * @var boolean
-     */
-    var $_rawReturn = false;
-
-    /**
-     *
-     * @param   PEAR_Config $config
-     * @param   ?   $debug
-     * @param   string @tmpdir Optional temporary directory for uncompressing
-     *          files
-     */
-    function PEAR_PackageFile(&$config, $debug = false, $tmpdir = false)
-    {
-        $this->_config = $config;
-        $this->_debug = $debug;
-        $this->_tmpdir = $tmpdir;
-    }
-
-    /**
-     * Turn off validation - return a parsed package.xml without checking it
-     *
-     * This is used by the package-validate command
-     */
-    function rawReturn()
-    {
-        $this->_rawReturn = true;
-    }
-
-    function setLogger(&$l)
-    {
-        $this->_logger = &$l;
-    }
-
-    /**
-     * Create a PEAR_PackageFile_Parser_v* of a given version.
-     * @param   int $version
-     * @return  PEAR_PackageFile_Parser_v1|PEAR_PackageFile_Parser_v1
-     */
-    function &parserFactory($version)
-    {
-        if (!in_array($version{0}, array('1', '2'))) {
-            $a = false;
-            return $a;
-        }
-        include_once 'PEAR/PackageFile/Parser/v' . $version{0} . '.php';
-        $version = $version{0};
-        $class = "PEAR_PackageFile_Parser_v$version";
-        $a = new $class;
-        return $a;
-    }
-
-    /**
-     * For simpler unit-testing
-     * @return string
-     */
-    function getClassPrefix()
-    {
-        return 'PEAR_PackageFile_v';
-    }
-
-    /**
-     * Create a PEAR_PackageFile_v* of a given version.
-     * @param   int $version
-     * @return  PEAR_PackageFile_v1|PEAR_PackageFile_v1
-     */
-    function &factory($version)
-    {
-        if (!in_array($version{0}, array('1', '2'))) {
-            $a = false;
-            return $a;
-        }
-        include_once 'PEAR/PackageFile/v' . $version{0} . '.php';
-        $version = $version{0};
-        $class = $this->getClassPrefix() . $version;
-        $a = new $class;
-        return $a;
-    }
-
-    /**
-     * Create a PEAR_PackageFile_v* from its toArray() method
-     *
-     * WARNING: no validation is performed, the array is assumed to be valid,
-     * always parse from xml if you want validation.
-     * @param   array $arr
-     * @return PEAR_PackageFileManager_v1|PEAR_PackageFileManager_v2
-     * @uses    factory() to construct the returned object.
-     */
-    function &fromArray($arr)
-    {
-        if (isset($arr['xsdversion'])) {
-            $obj = &$this->factory($arr['xsdversion']);
-            if ($this->_logger) {
-                $obj->setLogger($this->_logger);
-            }
-            $obj->setConfig($this->_config);
-            $obj->fromArray($arr);
-            return $obj;
-        } else {
-            if (isset($arr['package']['attribs']['version'])) {
-                $obj = &$this->factory($arr['package']['attribs']['version']);
-            } else {
-                $obj = &$this->factory('1.0');
-            }
-            if ($this->_logger) {
-                $obj->setLogger($this->_logger);
-            }
-            $obj->setConfig($this->_config);
-            $obj->fromArray($arr);
-            return $obj;
-        }
-    }
-
-    /**
-     * Create a PEAR_PackageFile_v* from an XML string.
-     * @access  public
-     * @param   string $data contents of package.xml file
-     * @param   int $state package state (one of PEAR_VALIDATE_* constants)
-     * @param   string $file full path to the package.xml file (and the files
-     *          it references)
-     * @param   string $archive optional name of the archive that the XML was
-     *          extracted from, if any
-     * @return  PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @uses    parserFactory() to construct a parser to load the package.
-     */
-    function &fromXmlString($data, $state, $file, $archive = false)
-    {
-        if (preg_match('/]+version="([0-9]+\.[0-9]+)"/', $data, $packageversion)) {
-            if (!in_array($packageversion[1], array('1.0', '2.0', '2.1'))) {
-                return PEAR::raiseError('package.xml version "' . $packageversion[1] .
-                    '" is not supported, only 1.0, 2.0, and 2.1 are supported.');
-            }
-            $object = &$this->parserFactory($packageversion[1]);
-            if ($this->_logger) {
-                $object->setLogger($this->_logger);
-            }
-            $object->setConfig($this->_config);
-            $pf = $object->parse($data, $file, $archive);
-            if (PEAR::isError($pf)) {
-                return $pf;
-            }
-            if ($this->_rawReturn) {
-                return $pf;
-            }
-            if ($pf->validate($state)) {
-                if ($this->_logger) {
-                    if ($pf->getValidationWarnings(false)) {
-                        foreach ($pf->getValidationWarnings() as $warning) {
-                            $this->_logger->log(0, 'WARNING: ' . $warning['message']);
-                        }
-                    }
-                }
-                if (method_exists($pf, 'flattenFilelist')) {
-                    $pf->flattenFilelist(); // for v2
-                }
-                return $pf;
-            } else {
-                if ($this->_config->get('verbose') > 0) {
-                    if ($this->_logger) {
-                        if ($pf->getValidationWarnings(false)) {
-                            foreach ($pf->getValidationWarnings(false) as $warning) {
-                                $this->_logger->log(0, 'ERROR: ' . $warning['message']);
-                            }
-                        }
-                    }
-                }
-                $a = PEAR::raiseError('Parsing of package.xml from file "' . $file . '" failed',
-                    2, null, null, $pf->getValidationWarnings());
-                return $a;
-            }
-        } elseif (preg_match('/]+version="([^"]+)"/', $data, $packageversion)) {
-            $a = PEAR::raiseError('package.xml file "' . $file .
-                '" has unsupported package.xml  version "' . $packageversion[1] . '"');
-            return $a;
-        } else {
-            if (!class_exists('PEAR_ErrorStack')) {
-                require_once 'PEAR/ErrorStack.php';
-            }
-            PEAR_ErrorStack::staticPush('PEAR_PackageFile',
-                PEAR_PACKAGEFILE_ERROR_NO_PACKAGEVERSION,
-                'warning', array('xml' => $data), 'package.xml "' . $file .
-                    '" has no package.xml  version');
-            $object = &$this->parserFactory('1.0');
-            $object->setConfig($this->_config);
-            $pf = $object->parse($data, $file, $archive);
-            if (PEAR::isError($pf)) {
-                return $pf;
-            }
-            if ($this->_rawReturn) {
-                return $pf;
-            }
-            if ($pf->validate($state)) {
-                if ($this->_logger) {
-                    if ($pf->getValidationWarnings(false)) {
-                        foreach ($pf->getValidationWarnings() as $warning) {
-                            $this->_logger->log(0, 'WARNING: ' . $warning['message']);
-                        }
-                    }
-                }
-                if (method_exists($pf, 'flattenFilelist')) {
-                    $pf->flattenFilelist(); // for v2
-                }
-                return $pf;
-            } else {
-                $a = PEAR::raiseError('Parsing of package.xml from file "' . $file . '" failed',
-                    2, null, null, $pf->getValidationWarnings());
-                return $a;
-            }
-        }
-    }
-
-    /**
-     * Register a temporary file or directory.  When the destructor is
-     * executed, all registered temporary files and directories are
-     * removed.
-     *
-     * @param string  $file  name of file or directory
-     * @return  void
-     */
-    function addTempFile($file)
-    {
-        $GLOBALS['_PEAR_Common_tempfiles'][] = $file;
-    }
-
-    /**
-     * Create a PEAR_PackageFile_v* from a compresed Tar or Tgz file.
-     * @access  public
-     * @param string contents of package.xml file
-     * @param int package state (one of PEAR_VALIDATE_* constants)
-     * @return  PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @using   Archive_Tar to extract the files
-     * @using   fromPackageFile() to load the package after the package.xml
-     *          file is extracted.
-     */
-    function &fromTgzFile($file, $state)
-    {
-        if (!class_exists('Archive_Tar')) {
-            require_once 'Archive/Tar.php';
-        }
-        $tar = new Archive_Tar($file);
-        if ($this->_debug <= 1) {
-            $tar->pushErrorHandling(PEAR_ERROR_RETURN);
-        }
-        $content = $tar->listContent();
-        if ($this->_debug <= 1) {
-            $tar->popErrorHandling();
-        }
-        if (!is_array($content)) {
-            if (is_string($file) && strlen($file < 255) &&
-                  (!file_exists($file) || !@is_file($file))) {
-                $ret = PEAR::raiseError("could not open file \"$file\"");
-                return $ret;
-            }
-            $file = realpath($file);
-            $ret = PEAR::raiseError("Could not get contents of package \"$file\"".
-                                     '. Invalid tgz file.');
-            return $ret;
-        } else {
-            if (!count($content) && !@is_file($file)) {
-                $ret = PEAR::raiseError("could not open file \"$file\"");
-                return $ret;
-            }
-        }
-        $xml = null;
-        $origfile = $file;
-        foreach ($content as $file) {
-            $name = $file['filename'];
-            if ($name == 'package2.xml') { // allow a .tgz to distribute both versions
-                $xml = $name;
-                break;
-            }
-            if ($name == 'package.xml') {
-                $xml = $name;
-                break;
-            } elseif (ereg('package.xml$', $name, $match)) {
-                $xml = $name;
-                break;
-            }
-        }
-        if ($this->_tmpdir) {
-            $tmpdir = $this->_tmpdir;
-        } else {
-            $tmpdir = System::mkTemp(array('-d', 'pear'));
-            PEAR_PackageFile::addTempFile($tmpdir);
-        }
-        $this->_extractErrors();
-        PEAR::staticPushErrorHandling(PEAR_ERROR_CALLBACK, array($this, '_extractErrors'));
-        if (!$xml || !$tar->extractList(array($xml), $tmpdir)) {
-            $extra = implode("\n", $this->_extractErrors());
-            if ($extra) {
-                $extra = ' ' . $extra;
-            }
-            PEAR::staticPopErrorHandling();
-            $ret = PEAR::raiseError('could not extract the package.xml file from "' .
-                $origfile . '"' . $extra);
-            return $ret;
-        }
-        PEAR::staticPopErrorHandling();
-        $ret = &PEAR_PackageFile::fromPackageFile("$tmpdir/$xml", $state, $origfile);
-        return $ret;
-    }
-
-    /**
-     * helper for extracting Archive_Tar errors
-     * @var array
-     * @access private
-     */
-    var $_extractErrors = array();
-
-    /**
-     * helper callback for extracting Archive_Tar errors
-     *
-     * @param PEAR_Error|null $err
-     * @return array
-     * @access private
-     */
-    function _extractErrors($err = null)
-    {
-        static $errors = array();
-        if ($err === null) {
-            $e = $errors;
-            $errors = array();
-            return $e;
-        }
-        $errors[] = $err->getMessage();
-    }
-
-    /**
-     * Create a PEAR_PackageFile_v* from a package.xml file.
-     *
-     * @access public
-     * @param   string  $descfile  name of package xml file
-     * @param   int     $state package state (one of PEAR_VALIDATE_* constants)
-     * @param   string|false $archive name of the archive this package.xml came
-     *          from, if any
-     * @return  PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @uses    PEAR_PackageFile::fromXmlString to create the oject after the
-     *          XML is loaded from the package.xml file.
-     */
-    function &fromPackageFile($descfile, $state, $archive = false)
-    {
-        if (is_string($descfile) && strlen($descfile) < 255 &&
-             (!file_exists($descfile) || !is_file($descfile) || !is_readable($descfile) ||
-             (!$fp = @fopen($descfile, 'r')))) {
-            $a = PEAR::raiseError("Unable to open $descfile");
-            return $a;
-        }
-
-        // read the whole thing so we only get one cdata callback
-        // for each block of cdata
-        fclose($fp);
-        $data = file_get_contents($descfile);
-        $ret = &PEAR_PackageFile::fromXmlString($data, $state, $descfile, $archive);
-        return $ret;
-    }
-
-
-    /**
-     * Create a PEAR_PackageFile_v* from a .tgz archive or package.xml file.
-     *
-     * This method is able to extract information about a package from a .tgz
-     * archive or from a XML package definition file.
-     *
-     * @access public
-     * @param   string  $info file name
-     * @param   int     $state package state (one of PEAR_VALIDATE_* constants)
-     * @return  PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @uses    fromPackageFile() if the file appears to be XML
-     * @uses    fromTgzFile() to load all non-XML files
-     */
-    function &fromAnyFile($info, $state)
-    {
-        if (is_dir($info)) {
-            $dir_name = realpath($info);
-            if (file_exists($dir_name . '/package.xml')) {
-                $info = PEAR_PackageFile::fromPackageFile($dir_name .  '/package.xml', $state);
-            } elseif (file_exists($dir_name .  '/package2.xml')) {
-                $info = PEAR_PackageFile::fromPackageFile($dir_name .  '/package2.xml', $state);
-            } else {
-                $info = PEAR::raiseError("No package definition found in '$info' directory");
-            }
-            return $info;
-        }
-
-        $fp = false;
-        if (is_string($info) && strlen($info) < 255 &&
-             (file_exists($info) || ($fp = @fopen($info, 'r')))) {
-            if ($fp) {
-                fclose($fp);
-            }
-            $tmp = substr($info, -4);
-            if ($tmp == '.xml') {
-                $info = &PEAR_PackageFile::fromPackageFile($info, $state);
-            } elseif ($tmp == '.tar' || $tmp == '.tgz') {
-                $info = &PEAR_PackageFile::fromTgzFile($info, $state);
-            } else {
-                $fp = fopen($info, "r");
-                $test = fread($fp, 5);
-                fclose($fp);
-                if ($test == "
diff --git a/PEAR/PackageFile/Generator/v1.php b/PEAR/PackageFile/Generator/v1.php
deleted file mode 100644
index c027bbc..0000000
--- a/PEAR/PackageFile/Generator/v1.php
+++ /dev/null
@@ -1,1272 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: v1.php,v 1.72 2006/05/10 02:56:19 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * needed for PEAR_VALIDATE_* constants
- */
-require_once 'PEAR/Validate.php';
-require_once 'System.php';
-require_once 'PEAR/PackageFile/v2.php';
-/**
- * This class converts a PEAR_PackageFile_v1 object into any output format.
- *
- * Supported output formats include array, XML string, and a PEAR_PackageFile_v2
- * object, for converting package.xml 1.0 into package.xml 2.0 with no sweat.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile_Generator_v1
-{
-    /**
-     * @var PEAR_PackageFile_v1
-     */
-    var $_packagefile;
-    function PEAR_PackageFile_Generator_v1(&$packagefile)
-    {
-        $this->_packagefile = &$packagefile;
-    }
-
-    function getPackagerVersion()
-    {
-        return '1.5.0a1';
-    }
-
-    /**
-     * @param PEAR_Packager
-     * @param bool if true, a .tgz is written, otherwise a .tar is written
-     * @param string|null directory in which to save the .tgz
-     * @return string|PEAR_Error location of package or error object
-     */
-    function toTgz(&$packager, $compress = true, $where = null)
-    {
-        require_once 'Archive/Tar.php';
-        if ($where === null) {
-            if (!($where = System::mktemp(array('-d')))) {
-                return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: mktemp failed');
-            }
-        } elseif (!@System::mkDir(array('-p', $where))) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: "' . $where . '" could' .
-                ' not be created');
-        }
-        if (file_exists($where . DIRECTORY_SEPARATOR . 'package.xml') &&
-              !is_file($where . DIRECTORY_SEPARATOR . 'package.xml')) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: unable to save package.xml as' .
-                ' "' . $where . DIRECTORY_SEPARATOR . 'package.xml"');
-        }
-        if (!$this->_packagefile->validate(PEAR_VALIDATE_PACKAGING)) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: invalid package file');
-        }
-        $pkginfo = $this->_packagefile->getArray();
-        $ext = $compress ? '.tgz' : '.tar';
-        $pkgver = $pkginfo['package'] . '-' . $pkginfo['version'];
-        $dest_package = getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext;
-        if (file_exists(getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext) &&
-              !is_file(getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext)) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: cannot create tgz file "' .
-                getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext . '"');
-        }
-        if ($pkgfile = $this->_packagefile->getPackageFile()) {
-            $pkgdir = dirname(realpath($pkgfile));
-            $pkgfile = basename($pkgfile);
-        } else {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: package file object must ' .
-                'be created from a real file');
-        }
-        // {{{ Create the package file list
-        $filelist = array();
-        $i = 0;
-
-        foreach ($this->_packagefile->getFilelist() as $fname => $atts) {
-            $file = $pkgdir . DIRECTORY_SEPARATOR . $fname;
-            if (!file_exists($file)) {
-                return PEAR::raiseError("File does not exist: $fname");
-            } else {
-                $filelist[$i++] = $file;
-                if (!isset($atts['md5sum'])) {
-                    $this->_packagefile->setFileAttribute($fname, 'md5sum', md5_file($file));
-                }
-                $packager->log(2, "Adding file $fname");
-            }
-        }
-        // }}}
-        $packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, 'package.xml', true);
-        if ($packagexml) {
-            $tar =& new Archive_Tar($dest_package, $compress);
-            $tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
-            // ----- Creates with the package.xml file
-            $ok = $tar->createModify(array($packagexml), '', $where);
-            if (PEAR::isError($ok)) {
-                return $ok;
-            } elseif (!$ok) {
-                return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: tarball creation failed');
-            }
-            // ----- Add the content of the package
-            if (!$tar->addModify($filelist, $pkgver, $pkgdir)) {
-                return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: tarball creation failed');
-            }
-            return $dest_package;
-        }
-    }
-
-    /**
-     * @param string|null directory to place the package.xml in, or null for a temporary dir
-     * @param int one of the PEAR_VALIDATE_* constants
-     * @param string name of the generated file
-     * @param bool if true, then no analysis will be performed on role="php" files
-     * @return string|PEAR_Error path to the created file on success
-     */
-    function toPackageFile($where = null, $state = PEAR_VALIDATE_NORMAL, $name = 'package.xml',
-                           $nofilechecking = false)
-    {
-        if (!$this->_packagefile->validate($state, $nofilechecking)) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toPackageFile: invalid package.xml',
-                null, null, null, $this->_packagefile->getValidationWarnings());
-        }
-        if ($where === null) {
-            if (!($where = System::mktemp(array('-d')))) {
-                return PEAR::raiseError('PEAR_Packagefile_v1::toPackageFile: mktemp failed');
-            }
-        } elseif (!@System::mkDir(array('-p', $where))) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toPackageFile: "' . $where . '" could' .
-                ' not be created');
-        }
-        $newpkgfile = $where . DIRECTORY_SEPARATOR . $name;
-        $np = @fopen($newpkgfile, 'wb');
-        if (!$np) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toPackageFile: unable to save ' .
-               "$name as $newpkgfile");
-        }
-        fwrite($np, $this->toXml($state, true));
-        fclose($np);
-        return $newpkgfile;
-    }
-
-    /**
-     * fix both XML encoding to be UTF8, and replace standard XML entities < > " & '
-     *
-     * @param string $string
-     * @return string
-     * @access private
-     */
-    function _fixXmlEncoding($string)
-    {
-        if (version_compare(phpversion(), '5.0.0', 'lt')) {
-            $string = utf8_encode($string);
-        }
-        return strtr($string, array(
-                                          '&'  => '&',
-                                          '>'  => '>',
-                                          '<'  => '<',
-                                          '"'  => '"',
-                                          '\'' => ''' ));
-    }
-
-    /**
-     * Return an XML document based on the package info (as returned
-     * by the PEAR_Common::infoFrom* methods).
-     *
-     * @return string XML data
-     */
-    function toXml($state = PEAR_VALIDATE_NORMAL, $nofilevalidation = false)
-    {
-        $this->_packagefile->setDate(date('Y-m-d'));
-        if (!$this->_packagefile->validate($state, $nofilevalidation)) {
-            return false;
-        }
-        $pkginfo = $this->_packagefile->getArray();
-        static $maint_map = array(
-            "handle" => "user",
-            "name" => "name",
-            "email" => "email",
-            "role" => "role",
-            );
-        $ret = "\n";
-        $ret .= "\n";
-        $ret .= "\n" .
-" $pkginfo[package]";
-        if (isset($pkginfo['extends'])) {
-            $ret .= "\n$pkginfo[extends]";
-        }
-        $ret .=
- "\n ".$this->_fixXmlEncoding($pkginfo['summary'])."\n" .
-" ".trim($this->_fixXmlEncoding($pkginfo['description']))."\n \n" .
-" \n";
-        foreach ($pkginfo['maintainers'] as $maint) {
-            $ret .= "  \n";
-            foreach ($maint_map as $idx => $elm) {
-                $ret .= "   <$elm>";
-                $ret .= $this->_fixXmlEncoding($maint[$idx]);
-                $ret .= "\n";
-            }
-            $ret .= "  \n";
-        }
-        $ret .= "  \n";
-        $ret .= $this->_makeReleaseXml($pkginfo, false, $state);
-        if (isset($pkginfo['changelog']) && count($pkginfo['changelog']) > 0) {
-            $ret .= " \n";
-            foreach ($pkginfo['changelog'] as $oldrelease) {
-                $ret .= $this->_makeReleaseXml($oldrelease, true);
-            }
-            $ret .= " \n";
-        }
-        $ret .= "\n";
-        return $ret;
-    }
-
-    // }}}
-    // {{{ _makeReleaseXml()
-
-    /**
-     * Generate part of an XML description with release information.
-     *
-     * @param array  $pkginfo    array with release information
-     * @param bool   $changelog  whether the result will be in a changelog element
-     *
-     * @return string XML data
-     *
-     * @access private
-     */
-    function _makeReleaseXml($pkginfo, $changelog = false, $state = PEAR_VALIDATE_NORMAL)
-    {
-        // XXX QUOTE ENTITIES IN PCDATA, OR EMBED IN CDATA BLOCKS!!
-        $indent = $changelog ? "  " : "";
-        $ret = "$indent \n";
-        if (!empty($pkginfo['version'])) {
-            $ret .= "$indent  $pkginfo[version]\n";
-        }
-        if (!empty($pkginfo['release_date'])) {
-            $ret .= "$indent  $pkginfo[release_date]\n";
-        }
-        if (!empty($pkginfo['release_license'])) {
-            $ret .= "$indent  $pkginfo[release_license]\n";
-        }
-        if (!empty($pkginfo['release_state'])) {
-            $ret .= "$indent  $pkginfo[release_state]\n";
-        }
-        if (!empty($pkginfo['release_notes'])) {
-            $ret .= "$indent  ".trim($this->_fixXmlEncoding($pkginfo['release_notes']))
-            ."\n$indent  \n";
-        }
-        if (!empty($pkginfo['release_warnings'])) {
-            $ret .= "$indent  ".$this->_fixXmlEncoding($pkginfo['release_warnings'])."\n";
-        }
-        if (isset($pkginfo['release_deps']) && sizeof($pkginfo['release_deps']) > 0) {
-            $ret .= "$indent  \n";
-            foreach ($pkginfo['release_deps'] as $dep) {
-                $ret .= "$indent   _fixXmlEncoding($c['name']) . "\"";
-                if (isset($c['default'])) {
-                    $ret .= " default=\"" . $this->_fixXmlEncoding($c['default']) . "\"";
-                }
-                $ret .= " prompt=\"" . $this->_fixXmlEncoding($c['prompt']) . "\"";
-                $ret .= "/>\n";
-            }
-            $ret .= "$indent  \n";
-        }
-        if (isset($pkginfo['provides'])) {
-            foreach ($pkginfo['provides'] as $key => $what) {
-                $ret .= "$indent  recursiveXmlFilelist($pkginfo['filelist']);
-            } else {
-                foreach ($pkginfo['filelist'] as $file => $fa) {
-                    if (!isset($fa['role'])) {
-                        $fa['role'] = '';
-                    }
-                    $ret .= "$indent   _fixXmlEncoding($fa['baseinstalldir']) . '"';
-                    }
-                    if (isset($fa['md5sum'])) {
-                        $ret .= " md5sum=\"$fa[md5sum]\"";
-                    }
-                    if (isset($fa['platform'])) {
-                        $ret .= " platform=\"$fa[platform]\"";
-                    }
-                    if (!empty($fa['install-as'])) {
-                        $ret .= ' install-as="' .
-                            $this->_fixXmlEncoding($fa['install-as']) . '"';
-                    }
-                    $ret .= ' name="' . $this->_fixXmlEncoding($file) . '"';
-                    if (empty($fa['replacements'])) {
-                        $ret .= "/>\n";
-                    } else {
-                        $ret .= ">\n";
-                        foreach ($fa['replacements'] as $r) {
-                            $ret .= "$indent     $v) {
-                                $ret .= " $k=\"" . $this->_fixXmlEncoding($v) .'"';
-                            }
-                            $ret .= "/>\n";
-                        }
-                        $ret .= "$indent   \n";
-                    }
-                }
-            }
-            $ret .= "$indent  \n";
-        }
-        $ret .= "$indent \n";
-        return $ret;
-    }
-
-    /**
-     * @param array
-     * @access protected
-     */
-    function recursiveXmlFilelist($list)
-    {
-        $this->_dirs = array();
-        foreach ($list as $file => $attributes) {
-            $this->_addDir($this->_dirs, explode('/', dirname($file)), $file, $attributes);
-        }
-        return $this->_formatDir($this->_dirs);
-    }
-
-    /**
-     * @param array
-     * @param array
-     * @param string|null
-     * @param array|null
-     * @access private
-     */
-    function _addDir(&$dirs, $dir, $file = null, $attributes = null)
-    {
-        if ($dir == array() || $dir == array('.')) {
-            $dirs['files'][basename($file)] = $attributes;
-            return;
-        }
-        $curdir = array_shift($dir);
-        if (!isset($dirs['dirs'][$curdir])) {
-            $dirs['dirs'][$curdir] = array();
-        }
-        $this->_addDir($dirs['dirs'][$curdir], $dir, $file, $attributes);
-    }
-
-    /**
-     * @param array
-     * @param string
-     * @param string
-     * @access private
-     */
-    function _formatDir($dirs, $indent = '', $curdir = '')
-    {
-        $ret = '';
-        if (!count($dirs)) {
-            return '';
-        }
-        if (isset($dirs['dirs'])) {
-            uksort($dirs['dirs'], 'strnatcasecmp');
-            foreach ($dirs['dirs'] as $dir => $contents) {
-                $usedir = "$curdir/$dir";
-                $ret .= "$indent   \n";
-                $ret .= $this->_formatDir($contents, "$indent ", $usedir);
-                $ret .= "$indent    \n";
-            }
-        }
-        if (isset($dirs['files'])) {
-            uksort($dirs['files'], 'strnatcasecmp');
-            foreach ($dirs['files'] as $file => $attribs) {
-                $ret .= $this->_formatFile($file, $attribs, $indent);
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * @param string
-     * @param array
-     * @param string
-     * @access private
-     */
-    function _formatFile($file, $attributes, $indent)
-    {
-        $ret = "$indent   _fixXmlEncoding($attributes['baseinstalldir']) . '"';
-        }
-        if (isset($attributes['md5sum'])) {
-            $ret .= " md5sum=\"$attributes[md5sum]\"";
-        }
-        if (isset($attributes['platform'])) {
-            $ret .= " platform=\"$attributes[platform]\"";
-        }
-        if (!empty($attributes['install-as'])) {
-            $ret .= ' install-as="' .
-                $this->_fixXmlEncoding($attributes['install-as']) . '"';
-        }
-        $ret .= ' name="' . $this->_fixXmlEncoding($file) . '"';
-        if (empty($attributes['replacements'])) {
-            $ret .= "/>\n";
-        } else {
-            $ret .= ">\n";
-            foreach ($attributes['replacements'] as $r) {
-                $ret .= "$indent     $v) {
-                    $ret .= " $k=\"" . $this->_fixXmlEncoding($v) .'"';
-                }
-                $ret .= "/>\n";
-            }
-            $ret .= "$indent   \n";
-        }
-        return $ret;
-    }
-
-    // {{{ _unIndent()
-
-    /**
-     * Unindent given string (?)
-     *
-     * @param string $str The string that has to be unindented.
-     * @return string
-     * @access private
-     */
-    function _unIndent($str)
-    {
-        // remove leading newlines
-        $str = preg_replace('/^[\r\n]+/', '', $str);
-        // find whitespace at the beginning of the first line
-        $indent_len = strspn($str, " \t");
-        $indent = substr($str, 0, $indent_len);
-        $data = '';
-        // remove the same amount of whitespace from following lines
-        foreach (explode("\n", $str) as $line) {
-            if (substr($line, 0, $indent_len) == $indent) {
-                $data .= substr($line, $indent_len) . "\n";
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * @return array
-     */
-    function dependenciesToV2()
-    {
-        $arr = array();
-        $this->_convertDependencies2_0($arr);
-        return $arr['dependencies'];
-    }
-
-    /**
-     * Convert a package.xml version 1.0 into version 2.0
-     *
-     * Note that this does a basic conversion, to allow more advanced
-     * features like bundles and multiple releases
-     * @param string the classname to instantiate and return.  This must be
-     *               PEAR_PackageFile_v2 or a descendant
-     * @param boolean if true, only valid, deterministic package.xml 1.0 as defined by the
-     *                strictest parameters will be converted
-     * @return PEAR_PackageFile_v2|PEAR_Error
-     */
-    function &toV2($class = 'PEAR_PackageFile_v2', $strict = false)
-    {
-        if ($strict) {
-            if (!$this->_packagefile->validate()) {
-                $a = PEAR::raiseError('invalid package.xml version 1.0 cannot be converted' .
-                    ' to version 2.0', null, null, null,
-                    $this->_packagefile->getValidationWarnings(true));
-                return $a;
-            }
-        }
-        $arr = array(
-            'attribs' => array(
-                             'version' => '2.0',
-                             'xmlns' => 'http://pear.php.net/dtd/package-2.0',
-                             'xmlns:tasks' => 'http://pear.php.net/dtd/tasks-1.0',
-                             'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-                             'xsi:schemaLocation' => "http://pear.php.net/dtd/tasks-1.0\n" .
-"http://pear.php.net/dtd/tasks-1.0.xsd\n" .
-"http://pear.php.net/dtd/package-2.0\n" .
-'http://pear.php.net/dtd/package-2.0.xsd',
-                         ),
-            'name' => $this->_packagefile->getPackage(),
-            'channel' => 'pear.php.net',
-        );
-        $arr['summary'] = $this->_packagefile->getSummary();
-        $arr['description'] = $this->_packagefile->getDescription();
-        $maintainers = $this->_packagefile->getMaintainers();
-        foreach ($maintainers as $maintainer) {
-            if ($maintainer['role'] != 'lead') {
-                continue;
-            }
-            $new = array(
-                'name' => $maintainer['name'],
-                'user' => $maintainer['handle'],
-                'email' => $maintainer['email'],
-                'active' => 'yes',
-            );
-            $arr['lead'][] = $new;
-        }
-        if (!isset($arr['lead'])) { // some people... you know?
-            $arr['lead'] = array(
-                'name' => 'unknown',
-                'user' => 'unknown',
-                'email' => 'noleadmaintainer@example.com',
-                'active' => 'no',
-            );
-        }
-        if (count($arr['lead']) == 1) {
-            $arr['lead'] = $arr['lead'][0];
-        }
-        foreach ($maintainers as $maintainer) {
-            if ($maintainer['role'] == 'lead') {
-                continue;
-            }
-            $new = array(
-                'name' => $maintainer['name'],
-                'user' => $maintainer['handle'],
-                'email' => $maintainer['email'],
-                'active' => 'yes',
-            );
-            $arr[$maintainer['role']][] = $new;
-        }
-        if (isset($arr['developer']) && count($arr['developer']) == 1) {
-            $arr['developer'] = $arr['developer'][0];
-        }
-        if (isset($arr['contributor']) && count($arr['contributor']) == 1) {
-            $arr['contributor'] = $arr['contributor'][0];
-        }
-        if (isset($arr['helper']) && count($arr['helper']) == 1) {
-            $arr['helper'] = $arr['helper'][0];
-        }
-        $arr['date'] = $this->_packagefile->getDate();
-        $arr['version'] =
-            array(
-                'release' => $this->_packagefile->getVersion(),
-                'api' => $this->_packagefile->getVersion(),
-            );
-        $arr['stability'] =
-            array(
-                'release' => $this->_packagefile->getState(),
-                'api' => $this->_packagefile->getState(),
-            );
-        $licensemap =
-            array(
-                'php' => 'http://www.php.net/license',
-                'php license' => 'http://www.php.net/license',
-                'lgpl' => 'http://www.gnu.org/copyleft/lesser.html',
-                'bsd' => 'http://www.opensource.org/licenses/bsd-license.php',
-                'bsd style' => 'http://www.opensource.org/licenses/bsd-license.php',
-                'bsd-style' => 'http://www.opensource.org/licenses/bsd-license.php',
-                'mit' => 'http://www.opensource.org/licenses/mit-license.php',
-                'gpl' => 'http://www.gnu.org/copyleft/gpl.html',
-                'apache' => 'http://www.opensource.org/licenses/apache2.0.php'
-            );
-        if (isset($licensemap[strtolower($this->_packagefile->getLicense())])) {
-            $arr['license'] = array(
-                'attribs' => array('uri' =>
-                    $licensemap[strtolower($this->_packagefile->getLicense())]),
-                '_content' => $this->_packagefile->getLicense()
-                );
-        } else {
-            // don't use bogus uri
-            $arr['license'] = $this->_packagefile->getLicense();
-        }
-        $arr['notes'] = $this->_packagefile->getNotes();
-        $temp = array();
-        $arr['contents'] = $this->_convertFilelist2_0($temp);
-        $this->_convertDependencies2_0($arr);
-        $release = ($this->_packagefile->getConfigureOptions() || $this->_isExtension) ?
-            'extsrcrelease' : 'phprelease';
-        if ($release == 'extsrcrelease') {
-            $arr['channel'] = 'pecl.php.net';
-            $arr['providesextension'] = $arr['name']; // assumption
-        }
-        $arr[$release] = array();
-        if ($this->_packagefile->getConfigureOptions()) {
-            $arr[$release]['configureoption'] = $this->_packagefile->getConfigureOptions();
-            foreach ($arr[$release]['configureoption'] as $i => $opt) {
-                $arr[$release]['configureoption'][$i] = array('attribs' => $opt);
-            }
-            if (count($arr[$release]['configureoption']) == 1) {
-                $arr[$release]['configureoption'] = $arr[$release]['configureoption'][0];
-            }
-        }
-        $this->_convertRelease2_0($arr[$release], $temp);
-        if ($release == 'extsrcrelease' && count($arr[$release]) > 1) {
-            // multiple extsrcrelease tags added in PEAR 1.4.1
-            $arr['dependencies']['required']['pearinstaller']['min'] = '1.4.1';
-        }
-        if ($cl = $this->_packagefile->getChangelog()) {
-            foreach ($cl as $release) {
-                $rel = array();
-                $rel['version'] =
-                    array(
-                        'release' => $release['version'],
-                        'api' => $release['version'],
-                    );
-                if (!isset($release['release_state'])) {
-                    $release['release_state'] = 'stable';
-                }
-                $rel['stability'] =
-                    array(
-                        'release' => $release['release_state'],
-                        'api' => $release['release_state'],
-                    );
-                if (isset($release['release_date'])) {
-                    $rel['date'] = $release['release_date'];
-                } else {
-                    $rel['date'] = date('Y-m-d');
-                }
-                if (isset($release['release_license'])) {
-                    if (isset($licensemap[strtolower($release['release_license'])])) {
-                        $uri = $licensemap[strtolower($release['release_license'])];
-                    } else {
-                        $uri = 'http://www.example.com';
-                    }
-                    $rel['license'] = array(
-                            'attribs' => array('uri' => $uri),
-                            '_content' => $release['release_license']
-                        );
-                } else {
-                    $rel['license'] = $arr['license'];
-                }
-                if (!isset($release['release_notes'])) {
-                    $release['release_notes'] = 'no release notes';
-                }
-                $rel['notes'] = $release['release_notes'];
-                $arr['changelog']['release'][] = $rel;
-            }
-        }
-        $ret = new $class;
-        $ret->setConfig($this->_packagefile->_config);
-        if (isset($this->_packagefile->_logger) && is_object($this->_packagefile->_logger)) {
-            $ret->setLogger($this->_packagefile->_logger);
-        }
-        $ret->fromArray($arr);
-        return $ret;
-    }
-
-    /**
-     * @param array
-     * @param bool
-     * @access private
-     */
-    function _convertDependencies2_0(&$release, $internal = false)
-    {
-        $peardep = array('pearinstaller' =>
-            array('min' => '1.4.0b1')); // this is a lot safer
-        $required = $optional = array();
-        $release['dependencies'] = array();
-        if ($this->_packagefile->hasDeps()) {
-            foreach ($this->_packagefile->getDeps() as $dep) {
-                if (!isset($dep['optional']) || $dep['optional'] == 'no') {
-                    $required[] = $dep;
-                } else {
-                    $optional[] = $dep;
-                }
-            }
-            foreach (array('required', 'optional') as $arr) {
-                $deps = array();
-                foreach ($$arr as $dep) {
-                    // organize deps by dependency type and name
-                    if (!isset($deps[$dep['type']])) {
-                        $deps[$dep['type']] = array();
-                    }
-                    if (isset($dep['name'])) {
-                        $deps[$dep['type']][$dep['name']][] = $dep;
-                    } else {
-                        $deps[$dep['type']][] = $dep;
-                    }
-                }
-                do {
-                    if (isset($deps['php'])) {
-                        $php = array();
-                        if (count($deps['php']) > 1) {
-                            $php = $this->_processPhpDeps($deps['php']);
-                        } else {
-                            if (!isset($deps['php'][0])) {
-                                list($key, $blah) = each ($deps['php']); // stupid buggy versions
-                                $deps['php'] = array($blah[0]);
-                            }
-                            $php = $this->_processDep($deps['php'][0]);
-                            if (!$php) {
-                                break; // poor mans throw
-                            }
-                        }
-                        $release['dependencies'][$arr]['php'] = $php;
-                    }
-                } while (false);
-                do {
-                    if (isset($deps['pkg'])) {
-                        $pkg = array();
-                        $pkg = $this->_processMultipleDepsName($deps['pkg']);
-                        if (!$pkg) {
-                            break; // poor mans throw
-                        }
-                        $release['dependencies'][$arr]['package'] = $pkg;
-                    }
-                } while (false);
-                do {
-                    if (isset($deps['ext'])) {
-                        $pkg = array();
-                        $pkg = $this->_processMultipleDepsName($deps['ext']);
-                        $release['dependencies'][$arr]['extension'] = $pkg;
-                    }
-                } while (false);
-                // skip sapi - it's not supported so nobody will have used it
-                // skip os - it's not supported in 1.0
-            }
-        }
-        if (isset($release['dependencies']['required'])) {
-            $release['dependencies']['required'] =
-                array_merge($peardep, $release['dependencies']['required']);
-        } else {
-            $release['dependencies']['required'] = $peardep;
-        }
-        if (!isset($release['dependencies']['required']['php'])) {
-            $release['dependencies']['required']['php'] =
-                array('min' => '4.0.0');
-        }
-        $order = array();
-        $bewm = $release['dependencies']['required'];
-        $order['php'] = $bewm['php'];
-        $order['pearinstaller'] = $bewm['pearinstaller'];
-        isset($bewm['package']) ? $order['package'] = $bewm['package'] :0;
-        isset($bewm['extension']) ? $order['extension'] = $bewm['extension'] :0;
-        $release['dependencies']['required'] = $order;
-    }
-
-    /**
-     * @param array
-     * @access private
-     */
-    function _convertFilelist2_0(&$package)
-    {
-        $ret = array('dir' =>
-                    array(
-                        'attribs' => array('name' => '/'),
-                        'file' => array()
-                        )
-                    );
-        $package['platform'] =
-        $package['install-as'] = array();
-        $this->_isExtension = false;
-        foreach ($this->_packagefile->getFilelist() as $name => $file) {
-            $file['name'] = $name;
-            if (isset($file['role']) && $file['role'] == 'src') {
-                $this->_isExtension = true;
-            }
-            if (isset($file['replacements'])) {
-                $repl = $file['replacements'];
-                unset($file['replacements']);
-            } else {
-                unset($repl);
-            }
-            if (isset($file['install-as'])) {
-                $package['install-as'][$name] = $file['install-as'];
-                unset($file['install-as']);
-            }
-            if (isset($file['platform'])) {
-                $package['platform'][$name] = $file['platform'];
-                unset($file['platform']);
-            }
-            $file = array('attribs' => $file);
-            if (isset($repl)) {
-                foreach ($repl as $replace ) {
-                    $file['tasks:replace'][] = array('attribs' => $replace);
-                }
-                if (count($repl) == 1) {
-                    $file['tasks:replace'] = $file['tasks:replace'][0];
-                }
-            }
-            $ret['dir']['file'][] = $file;
-        }
-        return $ret;
-    }
-
-    /**
-     * Post-process special files with install-as/platform attributes and
-     * make the release tag.
-     * 
-     * This complex method follows this work-flow to create the release tags:
-     * 
-     * 
    -     * - if any install-as/platform exist, create a generic release and fill it with
-     *   o  tags for 
-     *   o  tags for 
-     *   o  tags for 
-     *   o  tags for 
-     * - create a release for each platform encountered and fill with
-     *   o  tags for 
-     *   o  tags for 
-     *   o  tags for 
-     *   o  tags for 
-     *   o  tags for 
-     *   o  tags for 
-     *   o  tags for 
-     * 
    
-     * 
-     * It does this by accessing the $package parameter, which contains an array with
-     * indices:
-     * 
-     *  - platform: mapping of file => OS the file should be installed on
-     *  - install-as: mapping of file => installed name
-     *  - osmap: mapping of OS => list of files that should be installed
-     *    on that OS
-     *  - notosmap: mapping of OS => list of files that should not be
-     *    installed on that OS
-     *
-     * @param array
-     * @param array
-     * @access private
-     */
-    function _convertRelease2_0(&$release, $package)
-    {
-        //- if any install-as/platform exist, create a generic release and fill it with 
-        if (count($package['platform']) || count($package['install-as'])) {
-            $generic = array();
-            $genericIgnore = array();
-            foreach ($package['install-as'] as $file => $as) {
-                //o  tags for 
-                if (!isset($package['platform'][$file])) {
-                    $generic[] = $file;
-                    continue;
-                }
-                //o  tags for 
-                if (isset($package['platform'][$file]) &&
-                      $package['platform'][$file]{0} == '!') {
-                    $generic[] = $file;
-                    continue;
-                }
-                //o  tags for 
-                if (isset($package['platform'][$file]) &&
-                      $package['platform'][$file]{0} != '!') {
-                    $genericIgnore[] = $file;
-                    continue;
-                }
-            }
-            foreach ($package['platform'] as $file => $platform) {
-                if (isset($package['install-as'][$file])) {
-                    continue;
-                }
-                if ($platform{0} != '!') {
-                    //o  tags for 
-                    $genericIgnore[] = $file;
-                }
-            }
-            if (count($package['platform'])) {
-                $oses = $notplatform = $platform = array();
-                foreach ($package['platform'] as $file => $os) {
-                    // get a list of oses
-                    if ($os{0} == '!') {
-                        if (isset($oses[substr($os, 1)])) {
-                            continue;
-                        }
-                        $oses[substr($os, 1)] = count($oses);
-                    } else {
-                        if (isset($oses[$os])) {
-                            continue;
-                        }
-                        $oses[$os] = count($oses);
-                    }
-                }
-                //- create a release for each platform encountered and fill with
-                foreach ($oses as $os => $releaseNum) {
-                    $release[$releaseNum]['installconditions']['os']['name'] = $os;
-                    $release[$releaseNum]['filelist'] = array('install' => array(),
-                        'ignore' => array());
-                    foreach ($package['install-as'] as $file => $as) {
-                        //o  tags for 
-                        if (!isset($package['platform'][$file])) {
-                            $release[$releaseNum]['filelist']['install'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                        'as' => $as,
-                                    ),
-                                );
-                            continue;
-                        }
-                        //o  tags for
-                        //  
-                        if (isset($package['platform'][$file]) &&
-                              $package['platform'][$file] == $os) {
-                            $release[$releaseNum]['filelist']['install'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                        'as' => $as,
-                                    ),
-                                );
-                            continue;
-                        }
-                        //o  tags for
-                        //  
-                        if (isset($package['platform'][$file]) &&
-                              $package['platform'][$file] != "!$os" &&
-                              $package['platform'][$file]{0} == '!') {
-                            $release[$releaseNum]['filelist']['install'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                        'as' => $as,
-                                    ),
-                                );
-                            continue;
-                        }
-                        //o  tags for
-                        //  
-                        if (isset($package['platform'][$file]) &&
-                              $package['platform'][$file] == "!$os") {
-                            $release[$releaseNum]['filelist']['ignore'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                    ),
-                                );
-                            continue;
-                        }
-                        //o  tags for
-                        //  
-                        if (isset($package['platform'][$file]) &&
-                              $package['platform'][$file]{0} != '!' &&
-                              $package['platform'][$file] != $os) {
-                            $release[$releaseNum]['filelist']['ignore'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                    ),
-                                );
-                            continue;
-                        }
-                    }
-                    foreach ($package['platform'] as $file => $platform) {
-                        if (isset($package['install-as'][$file])) {
-                            continue;
-                        }
-                        //o  tags for 
-                        if ($platform == "!$os") {
-                            $release[$releaseNum]['filelist']['ignore'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                    ),
-                                );
-                            continue;
-                        }
-                        //o  tags for 
-                        if ($platform{0} != '!' && $platform != $os) {
-                            $release[$releaseNum]['filelist']['ignore'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                    ),
-                                );
-                        }
-                    }
-                    if (!count($release[$releaseNum]['filelist']['install'])) {
-                        unset($release[$releaseNum]['filelist']['install']);
-                    }
-                    if (!count($release[$releaseNum]['filelist']['ignore'])) {
-                        unset($release[$releaseNum]['filelist']['ignore']);
-                    }
-                }
-                if (count($generic) || count($genericIgnore)) {
-                    $release[count($oses)] = array();
-                    if (count($generic)) {
-                        foreach ($generic as $file) {
-                            if (isset($package['install-as'][$file])) {
-                                $installas = $package['install-as'][$file];
-                            } else {
-                                $installas = $file;
-                            }
-                            $release[count($oses)]['filelist']['install'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                        'as' => $installas,
-                                    )
-                                );
-                        }
-                    }
-                    if (count($genericIgnore)) {
-                        foreach ($genericIgnore as $file) {
-                            $release[count($oses)]['filelist']['ignore'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                    )
-                                );
-                        }
-                    }
-                }
-                // cleanup
-                foreach ($release as $i => $rel) {
-                    if (isset($rel['filelist']['install']) &&
-                          count($rel['filelist']['install']) == 1) {
-                        $release[$i]['filelist']['install'] =
-                            $release[$i]['filelist']['install'][0];
-                    }
-                    if (isset($rel['filelist']['ignore']) &&
-                          count($rel['filelist']['ignore']) == 1) {
-                        $release[$i]['filelist']['ignore'] =
-                            $release[$i]['filelist']['ignore'][0];
-                    }
-                }
-                if (count($release) == 1) {
-                    $release = $release[0];
-                }
-            } else {
-                // no platform atts, but some install-as atts
-                foreach ($package['install-as'] as $file => $value) {
-                    $release['filelist']['install'][] =
-                        array(
-                            'attribs' => array(
-                                'name' => $file,
-                                'as' => $value
-                            )
-                        );
-                }
-                if (count($release['filelist']['install']) == 1) {
-                    $release['filelist']['install'] = $release['filelist']['install'][0];
-                }
-            }
-        }
-    }
-
-    /**
-     * @param array
-     * @return array
-     * @access private
-     */
-    function _processDep($dep)
-    {
-        if ($dep['type'] == 'php') {
-            if ($dep['rel'] == 'has') {
-                // come on - everyone has php!
-                return false;
-            }
-        }
-        $php = array();
-        if ($dep['type'] != 'php') {
-            $php['name'] = $dep['name'];
-            if ($dep['type'] == 'pkg') {
-                $php['channel'] = 'pear.php.net';
-            }
-        }
-        switch ($dep['rel']) {
-            case 'gt' :
-                $php['min'] = $dep['version'];
-                $php['exclude'] = $dep['version'];
-            break;
-            case 'ge' :
-                if (!isset($dep['version'])) {
-                    if ($dep['type'] == 'php') {
-                        if (isset($dep['name'])) {
-                            $dep['version'] = $dep['name'];
-                        }
-                    }
-                }
-                $php['min'] = $dep['version'];
-            break;
-            case 'lt' :
-                $php['max'] = $dep['version'];
-                $php['exclude'] = $dep['version'];
-            break;
-            case 'le' :
-                $php['max'] = $dep['version'];
-            break;
-            case 'eq' :
-                $php['min'] = $dep['version'];
-                $php['max'] = $dep['version'];
-            break;
-            case 'ne' :
-                $php['exclude'] = $dep['version'];
-            break;
-            case 'not' :
-                $php['conflicts'] = 'yes';
-            break;
-        }
-        return $php;
-    }
-
-    /**
-     * @param array
-     * @return array
-     */
-    function _processPhpDeps($deps)
-    {
-        $test = array();
-        foreach ($deps as $dep) {
-            $test[] = $this->_processDep($dep);
-        }
-        $min = array();
-        $max = array();
-        foreach ($test as $dep) {
-            if (!$dep) {
-                continue;
-            }
-            if (isset($dep['min'])) {
-                $min[$dep['min']] = count($min);
-            }
-            if (isset($dep['max'])) {
-                $max[$dep['max']] = count($max);
-            }
-        }
-        if (count($min) > 0) {
-            uksort($min, 'version_compare');
-        }
-        if (count($max) > 0) {
-            uksort($max, 'version_compare');
-        }
-        if (count($min)) {
-            // get the highest minimum
-            $min = array_pop($a = array_flip($min));
-        } else {
-            $min = false;
-        }
-        if (count($max)) {
-            // get the lowest maximum
-            $max = array_shift($a = array_flip($max));
-        } else {
-            $max = false;
-        }
-        if ($min) {
-            $php['min'] = $min;
-        }
-        if ($max) {
-            $php['max'] = $max;
-        }
-        $exclude = array();
-        foreach ($test as $dep) {
-            if (!isset($dep['exclude'])) {
-                continue;
-            }
-            $exclude[] = $dep['exclude'];
-        }
-        if (count($exclude)) {
-            $php['exclude'] = $exclude;
-        }
-        return $php;
-    }
-
-    /**
-     * process multiple dependencies that have a name, like package deps
-     * @param array
-     * @return array
-     * @access private
-     */
-    function _processMultipleDepsName($deps)
-    {
-        $tests = array();
-        foreach ($deps as $name => $dep) {
-            foreach ($dep as $d) {
-                $tests[$name][] = $this->_processDep($d);
-            }
-        }
-        foreach ($tests as $name => $test) {
-            $php = array();
-            $min = array();
-            $max = array();
-            $php['name'] = $name;
-            foreach ($test as $dep) {
-                if (!$dep) {
-                    continue;
-                }
-                if (isset($dep['channel'])) {
-                    $php['channel'] = 'pear.php.net';
-                }
-                if (isset($dep['conflicts']) && $dep['conflicts'] == 'yes') {
-                    $php['conflicts'] = 'yes';
-                }
-                if (isset($dep['min'])) {
-                    $min[$dep['min']] = count($min);
-                }
-                if (isset($dep['max'])) {
-                    $max[$dep['max']] = count($max);
-                }
-            }
-            if (count($min) > 0) {
-                uksort($min, 'version_compare');
-            }
-            if (count($max) > 0) {
-                uksort($max, 'version_compare');
-            }
-            if (count($min)) {
-                // get the highest minimum
-                $min = array_pop($a = array_flip($min));
-            } else {
-                $min = false;
-            }
-            if (count($max)) {
-                // get the lowest maximum
-                $max = array_shift($a = array_flip($max));
-            } else {
-                $max = false;
-            }
-            if ($min) {
-                $php['min'] = $min;
-            }
-            if ($max) {
-                $php['max'] = $max;
-            }
-            $exclude = array();
-            foreach ($test as $dep) {
-                if (!isset($dep['exclude'])) {
-                    continue;
-                }
-                $exclude[] = $dep['exclude'];
-            }
-            if (count($exclude)) {
-                $php['exclude'] = $exclude;
-            }
-            $ret[] = $php;
-        }
-        return $ret;
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/PackageFile/Generator/v2.php b/PEAR/PackageFile/Generator/v2.php
deleted file mode 100644
index b629015..0000000
--- a/PEAR/PackageFile/Generator/v2.php
+++ /dev/null
@@ -1,1527 +0,0 @@
-
- * @author     Stephan Schmidt (original XML_Serializer code)
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: v2.php,v 1.35 2006/03/25 21:09:08 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * file/dir manipulation routines
- */
-require_once 'System.php';
-/**
- * This class converts a PEAR_PackageFile_v2 object into any output format.
- *
- * Supported output formats include array, XML string (using S. Schmidt's
- * XML_Serializer, slightly customized)
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @author     Stephan Schmidt (original XML_Serializer code)
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile_Generator_v2
-{
-   /**
-    * default options for the serialization
-    * @access private
-    * @var array $_defaultOptions
-    */
-    var $_defaultOptions = array(
-                         'indent'             => ' ',                    // string used for indentation
-                         'linebreak'          => "\n",                  // string used for newlines
-                         'typeHints'          => false,                 // automatically add type hin attributes
-                         'addDecl'            => true,                 // add an XML declaration
-                         'defaultTagName'     => 'XML_Serializer_Tag',  // tag used for indexed arrays or invalid names
-                         'classAsTagName'     => false,                 // use classname for objects in indexed arrays
-                         'keyAttribute'       => '_originalKey',        // attribute where original key is stored
-                         'typeAttribute'      => '_type',               // attribute for type (only if typeHints => true)
-                         'classAttribute'     => '_class',              // attribute for class of objects (only if typeHints => true)
-                         'scalarAsAttributes' => false,                 // scalar values (strings, ints,..) will be serialized as attribute
-                         'prependAttributes'  => '',                    // prepend string for attributes
-                         'indentAttributes'   => false,                 // indent the attributes, if set to '_auto', it will indent attributes so they all start at the same column
-                         'mode'               => 'simplexml',             // use 'simplexml' to use parent name as tagname if transforming an indexed array
-                         'addDoctype'         => false,                 // add a doctype declaration
-                         'doctype'            => null,                  // supply a string or an array with id and uri ({@see PEAR_PackageFile_Generator_v2_PEAR_PackageFile_Generator_v2_XML_Util::getDoctypeDeclaration()}
-                         'rootName'           => 'package',                  // name of the root tag
-                         'rootAttributes'     => array(
-                             'version' => '2.0',
-                             'xmlns' => 'http://pear.php.net/dtd/package-2.0',
-                             'xmlns:tasks' => 'http://pear.php.net/dtd/tasks-1.0',
-                             'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-                             'xsi:schemaLocation' => 'http://pear.php.net/dtd/tasks-1.0
-http://pear.php.net/dtd/tasks-1.0.xsd
-http://pear.php.net/dtd/package-2.0
-http://pear.php.net/dtd/package-2.0.xsd',
-                         ),               // attributes of the root tag
-                         'attributesArray'    => 'attribs',                  // all values in this key will be treated as attributes
-                         'contentName'        => '_content',                   // this value will be used directly as content, instead of creating a new tag, may only be used in conjuction with attributesArray
-                         'beautifyFilelist'   => false,
-                         'encoding' => 'UTF-8',
-                        );
-
-   /**
-    * options for the serialization
-    * @access private
-    * @var array $options
-    */
-    var $options = array();
-
-   /**
-    * current tag depth
-    * @var integer $_tagDepth
-    */
-    var $_tagDepth = 0;
-
-   /**
-    * serilialized representation of the data
-    * @var string $_serializedData
-    */
-    var $_serializedData = null;
-    /**
-     * @var PEAR_PackageFile_v2
-     */
-    var $_packagefile;
-    /**
-     * @param PEAR_PackageFile_v2
-     */
-    function PEAR_PackageFile_Generator_v2(&$packagefile)
-    {
-        $this->_packagefile = &$packagefile;
-    }
-
-    /**
-     * @return string
-     */
-    function getPackagerVersion()
-    {
-        return '1.5.0a1';
-    }
-
-    /**
-     * @param PEAR_Packager
-     * @param bool generate a .tgz or a .tar
-     * @param string|null temporary directory to package in
-     */
-    function toTgz(&$packager, $compress = true, $where = null)
-    {
-        $a = null;
-        return $this->toTgz2($packager, $a, $compress, $where);
-    }
-
-    /**
-     * Package up both a package.xml and package2.xml for the same release
-     * @param PEAR_Packager
-     * @param PEAR_PackageFile_v1
-     * @param bool generate a .tgz or a .tar
-     * @param string|null temporary directory to package in
-     */
-    function toTgz2(&$packager, &$pf1, $compress = true, $where = null)
-    {
-        require_once 'Archive/Tar.php';
-        if (!$this->_packagefile->isEquivalent($pf1)) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: "' .
-                basename($pf1->getPackageFile()) .
-                '" is not equivalent to "' . basename($this->_packagefile->getPackageFile())
-                . '"');
-        }
-        if ($where === null) {
-            if (!($where = System::mktemp(array('-d')))) {
-                return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: mktemp failed');
-            }
-        } elseif (!@System::mkDir(array('-p', $where))) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: "' . $where . '" could' .
-                ' not be created');
-        }
-        if (file_exists($where . DIRECTORY_SEPARATOR . 'package.xml') &&
-              !is_file($where . DIRECTORY_SEPARATOR . 'package.xml')) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: unable to save package.xml as' .
-                ' "' . $where . DIRECTORY_SEPARATOR . 'package.xml"');
-        }
-        if (!$this->_packagefile->validate(PEAR_VALIDATE_PACKAGING)) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: invalid package.xml');
-        }
-        $ext = $compress ? '.tgz' : '.tar';
-        $pkgver = $this->_packagefile->getPackage() . '-' . $this->_packagefile->getVersion();
-        $dest_package = getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext;
-        if (file_exists(getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext) &&
-              !is_file(getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext)) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: cannot create tgz file "' .
-                getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext . '"');
-        }
-        if ($pkgfile = $this->_packagefile->getPackageFile()) {
-            $pkgdir = dirname(realpath($pkgfile));
-            $pkgfile = basename($pkgfile);
-        } else {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: package file object must ' .
-                'be created from a real file');
-        }
-        // {{{ Create the package file list
-        $filelist = array();
-        $i = 0;
-        $this->_packagefile->flattenFilelist();
-        $contents = $this->_packagefile->getContents();
-        if (isset($contents['bundledpackage'])) { // bundles of packages
-            $contents = $contents['bundledpackage'];
-            if (!isset($contents[0])) {
-                $contents = array($contents);
-            }
-            $packageDir = $where;
-            foreach ($contents as $i => $package) {
-                $fname = $package;
-                $file = $pkgdir . DIRECTORY_SEPARATOR . $fname;
-                if (!file_exists($file)) {
-                    return $packager->raiseError("File does not exist: $fname");
-                }
-                $tfile = $packageDir . DIRECTORY_SEPARATOR . $fname;
-                System::mkdir(array('-p', dirname($tfile)));
-                copy($file, $tfile);
-                $filelist[$i++] = $tfile;
-                $packager->log(2, "Adding package $fname");
-            }
-        } else { // normal packages
-            $contents = $contents['dir']['file'];
-            if (!isset($contents[0])) {
-                $contents = array($contents);
-            }
-    
-            $packageDir = $where;
-            foreach ($contents as $i => $file) {
-                $fname = $file['attribs']['name'];
-                $atts = $file['attribs'];
-                $orig = $file;
-                $file = $pkgdir . DIRECTORY_SEPARATOR . $fname;
-                if (!file_exists($file)) {
-                    return $packager->raiseError("File does not exist: $fname");
-                } else {
-                    $tfile = $packageDir . DIRECTORY_SEPARATOR . $fname;
-                    unset($orig['attribs']);
-                    if (count($orig)) { // file with tasks
-                        // run any package-time tasks
-                        $contents = file_get_contents($file);
-                        foreach ($orig as $tag => $raw) {
-                            $tag = str_replace($this->_packagefile->getTasksNs() . ':', '', $tag);
-                            $task = "PEAR_Task_$tag";
-                            $task = &new $task($this->_packagefile->_config,
-                                $this->_packagefile->_logger,
-                                PEAR_TASK_PACKAGE);
-                            $task->init($raw, $atts, null);
-                            $res = $task->startSession($this->_packagefile, $contents, $tfile);
-                            if (!$res) {
-                                continue; // skip this task
-                            }
-                            if (PEAR::isError($res)) {
-                                return $res;
-                            }
-                            $contents = $res; // save changes
-                            System::mkdir(array('-p', dirname($tfile)));
-                            $wp = fopen($tfile, "wb");
-                            fwrite($wp, $contents);
-                            fclose($wp);
-                        }
-                    }
-                    if (!file_exists($tfile)) {
-                        System::mkdir(array('-p', dirname($tfile)));
-                        copy($file, $tfile);
-                    }
-                    $filelist[$i++] = $tfile;
-                    $this->_packagefile->setFileAttribute($fname, 'md5sum', md5_file($tfile), $i - 1);
-                    $packager->log(2, "Adding file $fname");
-                }
-            }
-        }
-            // }}}
-        if ($pf1 !== null) {
-            $name = 'package2.xml';
-        } else {
-            $name = 'package.xml';
-        }
-        $packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, $name);
-        if ($packagexml) {
-            $tar =& new Archive_Tar($dest_package, $compress);
-            $tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
-            // ----- Creates with the package.xml file
-            $ok = $tar->createModify(array($packagexml), '', $where);
-            if (PEAR::isError($ok)) {
-                return $packager->raiseError($ok);
-            } elseif (!$ok) {
-                return $packager->raiseError('PEAR_Packagefile_v2::toTgz(): adding ' . $name .
-                    ' failed');
-            }
-            // ----- Add the content of the package
-            if (!$tar->addModify($filelist, $pkgver, $where)) {
-                return $packager->raiseError(
-                    'PEAR_Packagefile_v2::toTgz(): tarball creation failed');
-            }
-            // add the package.xml version 1.0
-            if ($pf1 !== null) {
-                $pfgen = &$pf1->getDefaultGenerator();
-                $packagexml1 = $pfgen->toPackageFile($where, PEAR_VALIDATE_PACKAGING,
-                    'package.xml', true);
-                if (!$tar->addModify(array($packagexml1), '', $where)) {
-                    return $packager->raiseError(
-                        'PEAR_Packagefile_v2::toTgz(): adding package.xml failed');
-                }
-            }
-            return $dest_package;
-        }
-    }
-
-    function toPackageFile($where = null, $state = PEAR_VALIDATE_NORMAL, $name = 'package.xml')
-    {
-        if (!$this->_packagefile->validate($state)) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toPackageFile: invalid package.xml',
-                null, null, null, $this->_packagefile->getValidationWarnings());
-        }
-        if ($where === null) {
-            if (!($where = System::mktemp(array('-d')))) {
-                return PEAR::raiseError('PEAR_Packagefile_v2::toPackageFile: mktemp failed');
-            }
-        } elseif (!@System::mkDir(array('-p', $where))) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toPackageFile: "' . $where . '" could' .
-                ' not be created');
-        }
-        $newpkgfile = $where . DIRECTORY_SEPARATOR . $name;
-        $np = @fopen($newpkgfile, 'wb');
-        if (!$np) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toPackageFile: unable to save ' .
-               "$name as $newpkgfile");
-        }
-        fwrite($np, $this->toXml($state));
-        fclose($np);
-        return $newpkgfile;
-    }
-
-    function &toV2()
-    {
-        return $this->_packagefile;
-    }
-
-    /**
-     * Return an XML document based on the package info (as returned
-     * by the PEAR_Common::infoFrom* methods).
-     *
-     * @return string XML data
-     */
-    function toXml($state = PEAR_VALIDATE_NORMAL, $options = array())
-    {
-        $this->_packagefile->setDate(date('Y-m-d'));
-        $this->_packagefile->setTime(date('H:i:s'));
-        if (!$this->_packagefile->validate($state)) {
-            return false;
-        }
-        if (is_array($options)) {
-            $this->options = array_merge($this->_defaultOptions, $options);
-        } else {
-            $this->options = $this->_defaultOptions;
-        }
-        $arr = $this->_packagefile->getArray();
-        if (isset($arr['filelist'])) {
-            unset($arr['filelist']);
-        }
-        if (isset($arr['_lastversion'])) {
-            unset($arr['_lastversion']);
-        }
-        if ($state ^ PEAR_VALIDATE_PACKAGING && !isset($arr['bundle'])) {
-            $use = $this->_recursiveXmlFilelist($arr['contents']['dir']['file']);
-            unset($arr['contents']['dir']['file']);
-            if (isset($use['dir'])) {
-                $arr['contents']['dir']['dir'] = $use['dir'];
-            }
-            if (isset($use['file'])) {
-                $arr['contents']['dir']['file'] = $use['file'];
-            }
-            $this->options['beautifyFilelist'] = true;
-        }
-        $arr['attribs']['packagerversion'] = '1.5.0a1';
-        if ($this->serialize($arr, $options)) {
-            return $this->_serializedData . "\n";
-        }
-        return false;
-    }
-
-
-    function _recursiveXmlFilelist($list)
-    {
-        $dirs = array();
-        if (isset($list['attribs'])) {
-            $file = $list['attribs']['name'];
-            unset($list['attribs']['name']);
-            $attributes = $list['attribs'];
-            $this->_addDir($dirs, explode('/', dirname($file)), $file, $attributes);
-        } else {
-            foreach ($list as $a) {
-                $file = $a['attribs']['name'];
-                $attributes = $a['attribs'];
-                unset($a['attribs']);
-                $this->_addDir($dirs, explode('/', dirname($file)), $file, $attributes, $a);
-            }
-        }
-        $this->_formatDir($dirs);
-        $this->_deFormat($dirs);
-        return $dirs;
-    }
-
-    function _addDir(&$dirs, $dir, $file = null, $attributes = null, $tasks = null)
-    {
-        if (!$tasks) {
-            $tasks = array();
-        }
-        if ($dir == array() || $dir == array('.')) {
-            $dirs['file'][basename($file)] = $tasks;
-            $attributes['name'] = basename($file);
-            $dirs['file'][basename($file)]['attribs'] = $attributes;
-            return;
-        }
-        $curdir = array_shift($dir);
-        if (!isset($dirs['dir'][$curdir])) {
-            $dirs['dir'][$curdir] = array();
-        }
-        $this->_addDir($dirs['dir'][$curdir], $dir, $file, $attributes, $tasks);
-    }
-
-    function _formatDir(&$dirs)
-    {
-        if (!count($dirs)) {
-            return array();
-        }
-        $newdirs = array();
-        if (isset($dirs['dir'])) {
-            $newdirs['dir'] = $dirs['dir'];
-        }
-        if (isset($dirs['file'])) {
-            $newdirs['file'] = $dirs['file'];
-        }
-        $dirs = $newdirs;
-        if (isset($dirs['dir'])) {
-            uksort($dirs['dir'], 'strnatcasecmp');
-            foreach ($dirs['dir'] as $dir => $contents) {
-                $this->_formatDir($dirs['dir'][$dir]);
-            }
-        }
-        if (isset($dirs['file'])) {
-            uksort($dirs['file'], 'strnatcasecmp');
-        };
-    }
-
-    function _deFormat(&$dirs)
-    {
-        if (!count($dirs)) {
-            return array();
-        }
-        $newdirs = array();
-        if (isset($dirs['dir'])) {
-            foreach ($dirs['dir'] as $dir => $contents) {
-                $newdir = array();
-                $newdir['attribs']['name'] = $dir;
-                $this->_deFormat($contents);
-                foreach ($contents as $tag => $val) {
-                    $newdir[$tag] = $val;
-                }
-                $newdirs['dir'][] = $newdir;
-            }
-            if (count($newdirs['dir']) == 1) {
-                $newdirs['dir'] = $newdirs['dir'][0];
-            }
-        }
-        if (isset($dirs['file'])) {
-            foreach ($dirs['file'] as $name => $file) {
-                $newdirs['file'][] = $file;
-            }
-            if (count($newdirs['file']) == 1) {
-                $newdirs['file'] = $newdirs['file'][0];
-            }
-        }
-        $dirs = $newdirs;
-    }
-
-    /**
-    * reset all options to default options
-    *
-    * @access   public
-    * @see      setOption(), XML_Unserializer()
-    */
-    function resetOptions()
-    {
-        $this->options = $this->_defaultOptions;
-    }
-
-   /**
-    * set an option
-    *
-    * You can use this method if you do not want to set all options in the constructor
-    *
-    * @access   public
-    * @see      resetOption(), XML_Serializer()
-    */
-    function setOption($name, $value)
-    {
-        $this->options[$name] = $value;
-    }
-    
-   /**
-    * sets several options at once
-    *
-    * You can use this method if you do not want to set all options in the constructor
-    *
-    * @access   public
-    * @see      resetOption(), XML_Unserializer(), setOption()
-    */
-    function setOptions($options)
-    {
-        $this->options = array_merge($this->options, $options);
-    }
-
-   /**
-    * serialize data
-    *
-    * @access   public
-    * @param    mixed    $data data to serialize
-    * @return   boolean  true on success, pear error on failure
-    */
-    function serialize($data, $options = null)
-    {
-        // if options have been specified, use them instead
-        // of the previously defined ones
-        if (is_array($options)) {
-            $optionsBak = $this->options;
-            if (isset($options['overrideOptions']) && $options['overrideOptions'] == true) {
-                $this->options = array_merge($this->_defaultOptions, $options);
-            } else {
-                $this->options = array_merge($this->options, $options);
-            }
-        }
-        else {
-            $optionsBak = null;
-        }
-        
-        //  start depth is zero
-        $this->_tagDepth = 0;
-
-        $this->_serializedData = '';
-        // serialize an array
-        if (is_array($data)) {
-            if (isset($this->options['rootName'])) {
-                $tagName = $this->options['rootName'];
-            } else {
-                $tagName = 'array';
-            }
-
-            $this->_serializedData .= $this->_serializeArray($data, $tagName, $this->options['rootAttributes']);
-        }
-        
-        // add doctype declaration
-        if ($this->options['addDoctype'] === true) {
-            $this->_serializedData = PEAR_PackageFile_Generator_v2_XML_Util::getDoctypeDeclaration($tagName, $this->options['doctype'])
-                                   . $this->options['linebreak']
-                                   . $this->_serializedData;
-        }
-
-        //  build xml declaration
-        if ($this->options['addDecl']) {
-            $atts = array();
-            if (isset($this->options['encoding']) ) {
-                $encoding = $this->options['encoding'];
-            } else {
-                $encoding = null;
-            }
-            $this->_serializedData = PEAR_PackageFile_Generator_v2_XML_Util::getXMLDeclaration('1.0', $encoding)
-                                   . $this->options['linebreak']
-                                   . $this->_serializedData;
-        }
-        
-        
-		if ($optionsBak !== null) {
-			$this->options = $optionsBak;
-		}
-		
-        return  true;
-    }
-
-   /**
-    * get the result of the serialization
-    *
-    * @access public
-    * @return string serialized XML
-    */
-    function getSerializedData()
-    {
-        if ($this->_serializedData == null ) {
-            return  $this->raiseError('No serialized data available. Use XML_Serializer::serialize() first.', XML_SERIALIZER_ERROR_NO_SERIALIZATION);
-        }
-        return $this->_serializedData;
-    }
-    
-   /**
-    * serialize any value
-    *
-    * This method checks for the type of the value and calls the appropriate method
-    *
-    * @access private
-    * @param  mixed     $value
-    * @param  string    $tagName
-    * @param  array     $attributes
-    * @return string
-    */
-    function _serializeValue($value, $tagName = null, $attributes = array())
-    {
-        if (is_array($value)) {
-            $xml = $this->_serializeArray($value, $tagName, $attributes);
-        } elseif (is_object($value)) {
-            $xml = $this->_serializeObject($value, $tagName);
-        } else {
-            $tag = array(
-                          'qname'      => $tagName,
-                          'attributes' => $attributes,
-                          'content'    => $value
-                        );
-            $xml = $this->_createXMLTag($tag);
-        }
-        return $xml;
-    }
-    
-   /**
-    * serialize an array
-    *
-    * @access   private
-    * @param    array   $array       array to serialize
-    * @param    string  $tagName     name of the root tag
-    * @param    array   $attributes  attributes for the root tag
-    * @return   string  $string      serialized data
-    * @uses     PEAR_PackageFile_Generator_v2_XML_Util::isValidName() to check, whether key has to be substituted
-    */
-    function _serializeArray(&$array, $tagName = null, $attributes = array())
-    {
-        $_content = null;
-        
-        /**
-         * check for special attributes
-         */
-        if ($this->options['attributesArray'] !== null) {
-            if (isset($array[$this->options['attributesArray']])) {
-                $attributes = $array[$this->options['attributesArray']];
-                unset($array[$this->options['attributesArray']]);
-            }
-            /**
-             * check for special content
-             */
-            if ($this->options['contentName'] !== null) {
-                if (isset($array[$this->options['contentName']])) {
-                    $_content = $array[$this->options['contentName']];
-                    unset($array[$this->options['contentName']]);
-                }
-            }
-        }
-
-        /*
-        * if mode is set to simpleXML, check whether
-        * the array is associative or indexed
-        */
-        if (is_array($array) && $this->options['mode'] == 'simplexml') {
-            $indexed = true;
-            if (!count($array)) {
-                $indexed = false;
-            }
-            foreach ($array as $key => $val) {
-                if (!is_int($key)) {
-                    $indexed = false;
-                    break;
-                }
-            }
-
-            if ($indexed && $this->options['mode'] == 'simplexml') {
-                $string = '';
-                foreach ($array as $key => $val) {
-                    if ($this->options['beautifyFilelist'] && $tagName == 'dir') {
-                        if (!isset($this->_curdir)) {
-                            $this->_curdir = '';
-                        }
-                        $savedir = $this->_curdir;
-                        if (isset($val['attribs'])) {
-                            if ($val['attribs']['name'] == '/') {
-                                $this->_curdir = '/';
-                            } else {
-                                if ($this->_curdir == '/') {
-                                    $this->_curdir = '';
-                                }
-                                $this->_curdir .= '/' . $val['attribs']['name'];
-                            }
-                        }
-                    }
-                    $string .= $this->_serializeValue( $val, $tagName, $attributes);
-                    if ($this->options['beautifyFilelist'] && $tagName == 'dir') {
-                        $string .= ' ';
-                        if (empty($savedir)) {
-                            unset($this->_curdir);
-                        } else {
-                            $this->_curdir = $savedir;
-                        }
-                    }
-                    
-                    $string .= $this->options['linebreak'];
-        			//	do indentation
-                    if ($this->options['indent']!==null && $this->_tagDepth>0) {
-                        $string .= str_repeat($this->options['indent'], $this->_tagDepth);
-                    }
-                }
-                return rtrim($string);
-            }
-        }
-        
-		if ($this->options['scalarAsAttributes'] === true) {
-	        foreach ($array as $key => $value) {
-				if (is_scalar($value) && (PEAR_PackageFile_Generator_v2_XML_Util::isValidName($key) === true)) {
-					unset($array[$key]);
-					$attributes[$this->options['prependAttributes'].$key] = $value;
-				}
-			}
-		}
-
-        // check for empty array => create empty tag
-        if (empty($array)) {
-            $tag = array(
-                            'qname'      => $tagName,
-                            'content'    => $_content,
-                            'attributes' => $attributes
-                        );
-
-        } else {
-            $this->_tagDepth++;
-            $tmp = $this->options['linebreak'];
-            foreach ($array as $key => $value) {
-    			//	do indentation
-                if ($this->options['indent']!==null && $this->_tagDepth>0) {
-                    $tmp .= str_repeat($this->options['indent'], $this->_tagDepth);
-                }
-    
-    			//	copy key
-    			$origKey	=	$key;
-    			//	key cannot be used as tagname => use default tag
-                $valid = PEAR_PackageFile_Generator_v2_XML_Util::isValidName($key);
-    	        if (PEAR::isError($valid)) {
-    	            if ($this->options['classAsTagName'] && is_object($value)) {
-    	                $key = get_class($value);
-    	            } else {
-            	        $key = $this->options['defaultTagName'];
-    	            }
-           	 	}
-                $atts = array();
-                if ($this->options['typeHints'] === true) {
-                    $atts[$this->options['typeAttribute']] = gettype($value);
-    				if ($key !== $origKey) {
-    					$atts[$this->options['keyAttribute']] = (string)$origKey;
-    				}
-    
-                }
-                if ($this->options['beautifyFilelist'] && $key == 'dir') {
-                    if (!isset($this->_curdir)) {
-                        $this->_curdir = '';
-                    }
-                    $savedir = $this->_curdir;
-                    if (isset($value['attribs'])) {
-                        if ($value['attribs']['name'] == '/') {
-                            $this->_curdir = '/';
-                        } else {
-                            $this->_curdir .= '/' . $value['attribs']['name'];
-                        }
-                    }
-                }
-
-                if (is_string($value) && $value && ($value{strlen($value) - 1} == "\n")) {
-                    $value .= str_repeat($this->options['indent'], $this->_tagDepth);
-                }
-                $tmp .= $this->_createXMLTag(array(
-                                                    'qname'      => $key,
-                                                    'attributes' => $atts,
-                                                    'content'    => $value )
-                                            );
-                if ($this->options['beautifyFilelist'] && $key == 'dir') {
-                    if (isset($value['attribs'])) {
-                        $tmp .= ' ';
-                        if (empty($savedir)) {
-                            unset($this->_curdir);
-                        } else {
-                            $this->_curdir = $savedir;
-                        }
-                    }
-                }
-                $tmp .= $this->options['linebreak'];
-            }
-            
-            $this->_tagDepth--;
-            if ($this->options['indent']!==null && $this->_tagDepth>0) {
-                $tmp .= str_repeat($this->options['indent'], $this->_tagDepth);
-            }
-    
-    		if (trim($tmp) === '') {
-    			$tmp = null;
-    		}
-    		
-            $tag = array(
-                            'qname'      => $tagName,
-                            'content'    => $tmp,
-                            'attributes' => $attributes
-                        );
-        }
-        if ($this->options['typeHints'] === true) {
-            if (!isset($tag['attributes'][$this->options['typeAttribute']])) {
-                $tag['attributes'][$this->options['typeAttribute']] = 'array';
-            }
-        }
-
-        $string = $this->_createXMLTag($tag, false);
-        return $string;
-    }
-  
-   /**
-    * create a tag from an array
-    * this method awaits an array in the following format
-    * array(
-    *       'qname'        => $tagName,
-    *       'attributes'   => array(),
-    *       'content'      => $content,      // optional
-    *       'namespace'    => $namespace     // optional
-    *       'namespaceUri' => $namespaceUri  // optional
-    *   )
-    *
-    * @access   private
-    * @param    array   $tag tag definition
-    * @param    boolean $replaceEntities whether to replace XML entities in content or not
-    * @return   string  $string XML tag
-    */
-    function _createXMLTag( $tag, $replaceEntities = true )
-    {
-        if ($this->options['indentAttributes'] !== false) {
-            $multiline = true;
-            $indent    = str_repeat($this->options['indent'], $this->_tagDepth);
-
-            if ($this->options['indentAttributes'] == '_auto') {
-                $indent .= str_repeat(' ', (strlen($tag['qname'])+2));
-
-            } else {
-                $indent .= $this->options['indentAttributes'];
-            }
-        } else {
-            $multiline = false;
-            $indent    = false;
-        }
-    
-        if (is_array($tag['content'])) {
-            if (empty($tag['content'])) {
-                $tag['content'] =   '';
-            }
-        } elseif(is_scalar($tag['content']) && (string)$tag['content'] == '') {
-            $tag['content'] =   '';
-        }
-    
-        if (is_scalar($tag['content']) || is_null($tag['content'])) {
-            if ($this->options['encoding'] == 'UTF-8' &&
-                  version_compare(phpversion(), '5.0.0', 'lt')) {
-                $encoding = PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_UTF8_XML;
-            } else {
-                $encoding = PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_XML;
-            }
-            $tag = PEAR_PackageFile_Generator_v2_XML_Util::createTagFromArray($tag, $replaceEntities, $multiline, $indent, $this->options['linebreak'], $encoding);
-        } elseif (is_array($tag['content'])) {
-            $tag    =   $this->_serializeArray($tag['content'], $tag['qname'], $tag['attributes']);
-        } elseif (is_object($tag['content'])) {
-            $tag    =   $this->_serializeObject($tag['content'], $tag['qname'], $tag['attributes']);
-        } elseif (is_resource($tag['content'])) {
-            settype($tag['content'], 'string');
-            $tag    =   PEAR_PackageFile_Generator_v2_XML_Util::createTagFromArray($tag, $replaceEntities);
-        }
-        return  $tag;
-    }
-}
-
-// well, it's one way to do things without extra deps ...
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Stephan Schmidt                        |
-// +----------------------------------------------------------------------+
-//
-//    $Id: v2.php,v 1.35 2006/03/25 21:09:08 cellog Exp $
-
-/**
- * error code for invalid chars in XML name
- */
-define("PEAR_PackageFile_Generator_v2_XML_Util_ERROR_INVALID_CHARS", 51);
-
-/**
- * error code for invalid chars in XML name
- */
-define("PEAR_PackageFile_Generator_v2_XML_Util_ERROR_INVALID_START", 52);
-
-/**
- * error code for non-scalar tag content
- */
-define("PEAR_PackageFile_Generator_v2_XML_Util_ERROR_NON_SCALAR_CONTENT", 60);
-    
-/**
- * error code for missing tag name
- */
-define("PEAR_PackageFile_Generator_v2_XML_Util_ERROR_NO_TAG_NAME", 61);
-    
-/**
- * replace XML entities
- */
-define("PEAR_PackageFile_Generator_v2_XML_Util_REPLACE_ENTITIES", 1);
-
-/**
- * embedd content in a CData Section
- */
-define("PEAR_PackageFile_Generator_v2_XML_Util_CDATA_SECTION", 2);
-
-/**
- * do not replace entitites
- */
-define("PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_NONE", 0);
-
-/**
- * replace all XML entitites
- * This setting will replace <, >, ", ' and &
- */
-define("PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_XML", 1);
-
-/**
- * replace only required XML entitites
- * This setting will replace <, " and &
- */
-define("PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_XML_REQUIRED", 2);
-
-/**
- * replace HTML entitites
- * @link    http://www.php.net/htmlentities
- */
-define("PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_HTML", 3);
-
-/**
- * replace all XML entitites, and encode from ISO-8859-1 to UTF-8
- * This setting will replace <, >, ", ' and &
- */
-define("PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_UTF8_XML", 4);
-
-/**
- * utility class for working with XML documents
- * 
- * customized version of XML_Util 0.6.0
- *
- * @category XML
- * @package  PEAR
- * @version  0.6.0
- * @author   Stephan Schmidt 
- * @author   Gregory Beaver 
- */
-class PEAR_PackageFile_Generator_v2_XML_Util {
-
-   /**
-    * return API version
-    *
-    * @access   public
-    * @static
-    * @return   string  $version API version
-    */
-    function apiVersion()
-    {
-        return "0.6";
-    }
-
-   /**
-    * replace XML entities
-    *
-    * With the optional second parameter, you may select, which
-    * entities should be replaced.
-    *
-    * 
-    * require_once 'XML/Util.php';
-    * 
-    * // replace XML entites:
-    * $string = PEAR_PackageFile_Generator_v2_XML_Util::replaceEntities("This string contains < & >.");
-    * 
-    *
-    * @access   public
-    * @static
-    * @param    string  string where XML special chars should be replaced
-    * @param    integer setting for entities in attribute values (one of PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_XML, PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_XML_REQUIRED, PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_HTML)
-    * @return   string  string with replaced chars
-    */
-    function replaceEntities($string, $replaceEntities = PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_XML)
-    {
-        switch ($replaceEntities) {
-            case PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_UTF8_XML:
-                return strtr(utf8_encode($string),array(
-                                          '&'  => '&',
-                                          '>'  => '>',
-                                          '<'  => '<',
-                                          '"'  => '"',
-                                          '\'' => ''' ));
-                break;
-            case PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_XML:
-                return strtr($string,array(
-                                          '&'  => '&',
-                                          '>'  => '>',
-                                          '<'  => '<',
-                                          '"'  => '"',
-                                          '\'' => ''' ));
-                break;
-            case PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_XML_REQUIRED:
-                return strtr($string,array(
-                                          '&'  => '&',
-                                          '<'  => '<',
-                                          '"'  => '"' ));
-                break;
-            case PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_HTML:
-                return htmlspecialchars($string);
-                break;
-        }
-        return $string;
-    }
-
-   /**
-    * build an xml declaration
-    *
-    * 
-    * require_once 'XML/Util.php';
-    * 
-    * // get an XML declaration:
-    * $xmlDecl = PEAR_PackageFile_Generator_v2_XML_Util::getXMLDeclaration("1.0", "UTF-8", true);
-    * 
-    *
-    * @access   public
-    * @static
-    * @param    string  $version     xml version
-    * @param    string  $encoding    character encoding
-    * @param    boolean $standAlone  document is standalone (or not)
-    * @return   string  $decl xml declaration
-    * @uses     PEAR_PackageFile_Generator_v2_XML_Util::attributesToString() to serialize the attributes of the XML declaration
-    */
-    function getXMLDeclaration($version = "1.0", $encoding = null, $standalone = null)
-    {
-        $attributes = array(
-                            "version" => $version,
-                           );
-        // add encoding
-        if ($encoding !== null) {
-            $attributes["encoding"] = $encoding;
-        }
-        // add standalone, if specified
-        if ($standalone !== null) {
-            $attributes["standalone"] = $standalone ? "yes" : "no";
-        }
-        
-        return sprintf("", PEAR_PackageFile_Generator_v2_XML_Util::attributesToString($attributes, false));
-    }
-
-   /**
-    * build a document type declaration
-    *
-    * 
-    * require_once 'XML/Util.php';
-    * 
-    * // get a doctype declaration:
-    * $xmlDecl = PEAR_PackageFile_Generator_v2_XML_Util::getDocTypeDeclaration("rootTag","myDocType.dtd");
-    * 
-    *
-    * @access   public
-    * @static
-    * @param    string  $root         name of the root tag
-    * @param    string  $uri          uri of the doctype definition (or array with uri and public id)
-    * @param    string  $internalDtd  internal dtd entries   
-    * @return   string  $decl         doctype declaration
-    * @since    0.2
-    */
-    function getDocTypeDeclaration($root, $uri = null, $internalDtd = null)
-    {
-        if (is_array($uri)) {
-            $ref = sprintf( ' PUBLIC "%s" "%s"', $uri["id"], $uri["uri"] );
-        } elseif (!empty($uri)) {
-            $ref = sprintf( ' SYSTEM "%s"', $uri );
-        } else {
-            $ref = "";
-        }
-
-        if (empty($internalDtd)) {
-            return sprintf("", $root, $ref);
-        } else {
-            return sprintf("", $root, $ref, $internalDtd);
-        }
-    }
-
-   /**
-    * create string representation of an attribute list
-    *
-    * 
-    * require_once 'XML/Util.php';
-    * 
-    * // build an attribute string
-    * $att = array(
-    *              "foo"   =>  "bar",
-    *              "argh"  =>  "tomato"
-    *            );
-    *
-    * $attList = PEAR_PackageFile_Generator_v2_XML_Util::attributesToString($att);    
-    * 
-    *
-    * @access   public
-    * @static
-    * @param    array         $attributes        attribute array
-    * @param    boolean|array $sort              sort attribute list alphabetically, may also be an assoc array containing the keys 'sort', 'multiline', 'indent', 'linebreak' and 'entities'
-    * @param    boolean       $multiline         use linebreaks, if more than one attribute is given
-    * @param    string        $indent            string used for indentation of multiline attributes
-    * @param    string        $linebreak         string used for linebreaks of multiline attributes
-    * @param    integer       $entities          setting for entities in attribute values (one of PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_NONE, PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_XML, PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_XML_REQUIRED, PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_HTML)
-    * @return   string                           string representation of the attributes
-    * @uses     PEAR_PackageFile_Generator_v2_XML_Util::replaceEntities() to replace XML entities in attribute values
-    * @todo     allow sort also to be an options array
-    */
-    function attributesToString($attributes, $sort = true, $multiline = false, $indent = '    ', $linebreak = "\n", $entities = PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_XML)
-    {
-        /**
-         * second parameter may be an array
-         */
-        if (is_array($sort)) {
-            if (isset($sort['multiline'])) {
-                $multiline = $sort['multiline'];
-            }
-            if (isset($sort['indent'])) {
-                $indent = $sort['indent'];
-            }
-            if (isset($sort['linebreak'])) {
-                $multiline = $sort['linebreak'];
-            }
-            if (isset($sort['entities'])) {
-                $entities = $sort['entities'];
-            }
-            if (isset($sort['sort'])) {
-                $sort = $sort['sort'];
-            } else {
-                $sort = true;
-            }
-        }
-        $string = '';
-        if (is_array($attributes) && !empty($attributes)) {
-            if ($sort) {
-                ksort($attributes);
-            }
-            if( !$multiline || count($attributes) == 1) {
-                foreach ($attributes as $key => $value) {
-                    if ($entities != PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_NONE) {
-                        $value = PEAR_PackageFile_Generator_v2_XML_Util::replaceEntities($value, $entities);
-                    }
-                    $string .= ' '.$key.'="'.$value.'"';
-                }
-            } else {
-                $first = true;
-                foreach ($attributes as $key => $value) {
-                    if ($entities != PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_NONE) {
-                        $value = PEAR_PackageFile_Generator_v2_XML_Util::replaceEntities($value, $entities);
-                    }
-                    if ($first) {
-                        $string .= " ".$key.'="'.$value.'"';
-                        $first = false;
-                    } else {
-                        $string .= $linebreak.$indent.$key.'="'.$value.'"';
-                    }
-                }
-            }
-        }
-        return $string;
-    }
-
-   /**
-    * create a tag
-    *
-    * This method will call PEAR_PackageFile_Generator_v2_XML_Util::createTagFromArray(), which
-    * is more flexible.
-    *
-    * 
-    * require_once 'XML/Util.php';
-    * 
-    * // create an XML tag:
-    * $tag = PEAR_PackageFile_Generator_v2_XML_Util::createTag("myNs:myTag", array("foo" => "bar"), "This is inside the tag", "http://www.w3c.org/myNs#");
-    * 
-    *
-    * @access   public
-    * @static
-    * @param    string  $qname             qualified tagname (including namespace)
-    * @param    array   $attributes        array containg attributes
-    * @param    mixed   $content
-    * @param    string  $namespaceUri      URI of the namespace
-    * @param    integer $replaceEntities   whether to replace XML special chars in content, embedd it in a CData section or none of both
-    * @param    boolean $multiline         whether to create a multiline tag where each attribute gets written to a single line
-    * @param    string  $indent            string used to indent attributes (_auto indents attributes so they start at the same column)
-    * @param    string  $linebreak         string used for linebreaks
-    * @param    string  $encoding          encoding that should be used to translate content
-    * @return   string  $string            XML tag
-    * @see      PEAR_PackageFile_Generator_v2_XML_Util::createTagFromArray()
-    * @uses     PEAR_PackageFile_Generator_v2_XML_Util::createTagFromArray() to create the tag
-    */
-    function createTag($qname, $attributes = array(), $content = null, $namespaceUri = null, $replaceEntities = PEAR_PackageFile_Generator_v2_XML_Util_REPLACE_ENTITIES, $multiline = false, $indent = "_auto", $linebreak = "\n", $encoding = PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_XML)
-    {
-        $tag = array(
-                     "qname"      => $qname,
-                     "attributes" => $attributes
-                    );
-
-        // add tag content
-        if ($content !== null) {
-            $tag["content"] = $content;
-        }
-        
-        // add namespace Uri
-        if ($namespaceUri !== null) {
-            $tag["namespaceUri"] = $namespaceUri;
-        }
-
-        return PEAR_PackageFile_Generator_v2_XML_Util::createTagFromArray($tag, $replaceEntities, $multiline, $indent, $linebreak, $encoding);
-    }
-
-   /**
-    * create a tag from an array
-    * this method awaits an array in the following format
-    * 
    -    * array(
-    *  "qname"        => $qname         // qualified name of the tag
-    *  "namespace"    => $namespace     // namespace prefix (optional, if qname is specified or no namespace)
-    *  "localpart"    => $localpart,    // local part of the tagname (optional, if qname is specified)
-    *  "attributes"   => array(),       // array containing all attributes (optional)
-    *  "content"      => $content,      // tag content (optional)
-    *  "namespaceUri" => $namespaceUri  // namespaceUri for the given namespace (optional)
-    *   )
-    * 
    
-    *
-    * 
-    * require_once 'XML/Util.php';
-    * 
-    * $tag = array(
-    *           "qname"        => "foo:bar",
-    *           "namespaceUri" => "http://foo.com",
-    *           "attributes"   => array( "key" => "value", "argh" => "fruit&vegetable" ),
-    *           "content"      => "I'm inside the tag",
-    *            );
-    * // creating a tag with qualified name and namespaceUri
-    * $string = PEAR_PackageFile_Generator_v2_XML_Util::createTagFromArray($tag);
-    * 
-    *
-    * @access   public
-    * @static
-    * @param    array   $tag               tag definition
-    * @param    integer $replaceEntities   whether to replace XML special chars in content, embedd it in a CData section or none of both
-    * @param    boolean $multiline         whether to create a multiline tag where each attribute gets written to a single line
-    * @param    string  $indent            string used to indent attributes (_auto indents attributes so they start at the same column)
-    * @param    string  $linebreak         string used for linebreaks
-    * @return   string  $string            XML tag
-    * @see      PEAR_PackageFile_Generator_v2_XML_Util::createTag()
-    * @uses     PEAR_PackageFile_Generator_v2_XML_Util::attributesToString() to serialize the attributes of the tag
-    * @uses     PEAR_PackageFile_Generator_v2_XML_Util::splitQualifiedName() to get local part and namespace of a qualified name
-    */
-    function createTagFromArray($tag, $replaceEntities = PEAR_PackageFile_Generator_v2_XML_Util_REPLACE_ENTITIES, $multiline = false, $indent = "_auto", $linebreak = "\n", $encoding = PEAR_PackageFile_Generator_v2_XML_Util_ENTITIES_XML)
-    {
-        if (isset($tag["content"]) && !is_scalar($tag["content"])) {
-            return PEAR_PackageFile_Generator_v2_XML_Util::raiseError( "Supplied non-scalar value as tag content", PEAR_PackageFile_Generator_v2_XML_Util_ERROR_NON_SCALAR_CONTENT );
-        }
-
-        if (!isset($tag['qname']) && !isset($tag['localPart'])) {
-            return PEAR_PackageFile_Generator_v2_XML_Util::raiseError( 'You must either supply a qualified name (qname) or local tag name (localPart).', PEAR_PackageFile_Generator_v2_XML_Util_ERROR_NO_TAG_NAME );
-        }
-
-        // if no attributes hav been set, use empty attributes
-        if (!isset($tag["attributes"]) || !is_array($tag["attributes"])) {
-            $tag["attributes"] = array();
-        }
-        
-        // qualified name is not given
-        if (!isset($tag["qname"])) {
-            // check for namespace
-            if (isset($tag["namespace"]) && !empty($tag["namespace"])) {
-                $tag["qname"] = $tag["namespace"].":".$tag["localPart"];
-            } else {
-                $tag["qname"] = $tag["localPart"];
-            }
-        // namespace URI is set, but no namespace
-        } elseif (isset($tag["namespaceUri"]) && !isset($tag["namespace"])) {
-            $parts = PEAR_PackageFile_Generator_v2_XML_Util::splitQualifiedName($tag["qname"]);
-            $tag["localPart"] = $parts["localPart"];
-            if (isset($parts["namespace"])) {
-                $tag["namespace"] = $parts["namespace"];
-            }
-        }
-
-        if (isset($tag["namespaceUri"]) && !empty($tag["namespaceUri"])) {
-            // is a namespace given
-            if (isset($tag["namespace"]) && !empty($tag["namespace"])) {
-                $tag["attributes"]["xmlns:".$tag["namespace"]] = $tag["namespaceUri"];
-            } else {
-                // define this Uri as the default namespace
-                $tag["attributes"]["xmlns"] = $tag["namespaceUri"];
-            }
-        }
-
-        // check for multiline attributes
-        if ($multiline === true) {
-            if ($indent === "_auto") {
-                $indent = str_repeat(" ", (strlen($tag["qname"])+2));
-            }
-        }
-        
-        // create attribute list
-        $attList    =   PEAR_PackageFile_Generator_v2_XML_Util::attributesToString($tag["attributes"], true, $multiline, $indent, $linebreak );
-        if (!isset($tag["content"]) || (string)$tag["content"] == '') {
-            $tag    =   sprintf("<%s%s />", $tag["qname"], $attList);
-        } else {
-            if ($replaceEntities == PEAR_PackageFile_Generator_v2_XML_Util_REPLACE_ENTITIES) {
-                $tag["content"] = PEAR_PackageFile_Generator_v2_XML_Util::replaceEntities($tag["content"], $encoding);
-            } elseif ($replaceEntities == PEAR_PackageFile_Generator_v2_XML_Util_CDATA_SECTION) {
-                $tag["content"] = PEAR_PackageFile_Generator_v2_XML_Util::createCDataSection($tag["content"]);
-            }
-            $tag    =   sprintf("<%s%s>%s", $tag["qname"], $attList, $tag["content"], $tag["qname"] );
-        }        
-        return  $tag;
-    }
-
-   /**
-    * create a start element
-    *
-    * 
-    * require_once 'XML/Util.php';
-    * 
-    * // create an XML start element:
-    * $tag = PEAR_PackageFile_Generator_v2_XML_Util::createStartElement("myNs:myTag", array("foo" => "bar") ,"http://www.w3c.org/myNs#");
-    * 
-    *
-    * @access   public
-    * @static
-    * @param    string  $qname             qualified tagname (including namespace)
-    * @param    array   $attributes        array containg attributes
-    * @param    string  $namespaceUri      URI of the namespace
-    * @param    boolean $multiline         whether to create a multiline tag where each attribute gets written to a single line
-    * @param    string  $indent            string used to indent attributes (_auto indents attributes so they start at the same column)
-    * @param    string  $linebreak         string used for linebreaks
-    * @return   string  $string            XML start element
-    * @see      PEAR_PackageFile_Generator_v2_XML_Util::createEndElement(), PEAR_PackageFile_Generator_v2_XML_Util::createTag()
-    */
-    function createStartElement($qname, $attributes = array(), $namespaceUri = null, $multiline = false, $indent = '_auto', $linebreak = "\n")
-    {
-        // if no attributes hav been set, use empty attributes
-        if (!isset($attributes) || !is_array($attributes)) {
-            $attributes = array();
-        }
-        
-        if ($namespaceUri != null) {
-            $parts = PEAR_PackageFile_Generator_v2_XML_Util::splitQualifiedName($qname);
-        }
-
-        // check for multiline attributes
-        if ($multiline === true) {
-            if ($indent === "_auto") {
-                $indent = str_repeat(" ", (strlen($qname)+2));
-            }
-        }
-
-        if ($namespaceUri != null) {
-            // is a namespace given
-            if (isset($parts["namespace"]) && !empty($parts["namespace"])) {
-                $attributes["xmlns:".$parts["namespace"]] = $namespaceUri;
-            } else {
-                // define this Uri as the default namespace
-                $attributes["xmlns"] = $namespaceUri;
-            }
-        }
-
-        // create attribute list
-        $attList    =   PEAR_PackageFile_Generator_v2_XML_Util::attributesToString($attributes, true, $multiline, $indent, $linebreak);
-        $element    =   sprintf("<%s%s>", $qname, $attList);
-        return  $element;
-    }
-
-   /**
-    * create an end element
-    *
-    * 
-    * require_once 'XML/Util.php';
-    * 
-    * // create an XML start element:
-    * $tag = PEAR_PackageFile_Generator_v2_XML_Util::createEndElement("myNs:myTag");
-    * 
-    *
-    * @access   public
-    * @static
-    * @param    string  $qname             qualified tagname (including namespace)
-    * @return   string  $string            XML end element
-    * @see      PEAR_PackageFile_Generator_v2_XML_Util::createStartElement(), PEAR_PackageFile_Generator_v2_XML_Util::createTag()
-    */
-    function createEndElement($qname)
-    {
-        $element    =   sprintf("", $qname);
-        return  $element;
-    }
-    
-   /**
-    * create an XML comment
-    *
-    * 
-    * require_once 'XML/Util.php';
-    * 
-    * // create an XML start element:
-    * $tag = PEAR_PackageFile_Generator_v2_XML_Util::createComment("I am a comment");
-    * 
-    *
-    * @access   public
-    * @static
-    * @param    string  $content           content of the comment
-    * @return   string  $comment           XML comment
-    */
-    function createComment($content)
-    {
-        $comment    =   sprintf("", $content);
-        return  $comment;
-    }
-    
-   /**
-    * create a CData section
-    *
-    * 
-    * require_once 'XML/Util.php';
-    * 
-    * // create a CData section
-    * $tag = PEAR_PackageFile_Generator_v2_XML_Util::createCDataSection("I am content.");
-    * 
-    *
-    * @access   public
-    * @static
-    * @param    string  $data              data of the CData section
-    * @return   string  $string            CData section with content
-    */
-    function createCDataSection($data)
-    {
-        return  sprintf("", $data);
-    }
-
-   /**
-    * split qualified name and return namespace and local part
-    *
-    * 
-    * require_once 'XML/Util.php';
-    * 
-    * // split qualified tag
-    * $parts = PEAR_PackageFile_Generator_v2_XML_Util::splitQualifiedName("xslt:stylesheet");
-    * 
-    * the returned array will contain two elements:
-    * 
    -    * array(
-    *       "namespace" => "xslt",
-    *       "localPart" => "stylesheet"
-    *      );
-    * 
    
-    *
-    * @access public
-    * @static
-    * @param  string    $qname      qualified tag name
-    * @param  string    $defaultNs  default namespace (optional)
-    * @return array     $parts      array containing namespace and local part
-    */
-    function splitQualifiedName($qname, $defaultNs = null)
-    {
-        if (strstr($qname, ':')) {
-            $tmp = explode(":", $qname);
-            return array(
-                          "namespace" => $tmp[0],
-                          "localPart" => $tmp[1]
-                        );
-        }
-        return array(
-                      "namespace" => $defaultNs,
-                      "localPart" => $qname
-                    );
-    }
-
-   /**
-    * check, whether string is valid XML name
-    *
-    * 
    XML names are used for tagname, attribute names and various
-    * other, lesser known entities.
    
-    * 
    An XML name may only consist of alphanumeric characters,
-    * dashes, undescores and periods, and has to start with a letter
-    * or an underscore.
-    * 
    
-    *
-    * 
-    * require_once 'XML/Util.php';
-    * 
-    * // verify tag name
-    * $result = PEAR_PackageFile_Generator_v2_XML_Util::isValidName("invalidTag?");
-    * if (PEAR_PackageFile_Generator_v2_XML_Util::isError($result)) {
-    *    print "Invalid XML name: " . $result->getMessage();
-    * }
-    * 
-    *
-    * @access  public
-    * @static
-    * @param   string  $string string that should be checked
-    * @return  mixed   $valid  true, if string is a valid XML name, PEAR error otherwise
-    * @todo    support for other charsets
-    */
-    function isValidName($string)
-    {
-        // check for invalid chars
-        if (!preg_match("/^[[:alnum:]_\-.]$/", $string{0})) {
-            return PEAR_PackageFile_Generator_v2_XML_Util::raiseError( "XML names may only start with letter or underscore", PEAR_PackageFile_Generator_v2_XML_Util_ERROR_INVALID_START );
-        }
-        
-        // check for invalid chars
-        if (!preg_match("/^([a-zA-Z_]([a-zA-Z0-9_\-\.]*)?:)?[a-zA-Z_]([a-zA-Z0-9_\-\.]+)?$/", $string)) {
-            return PEAR_PackageFile_Generator_v2_XML_Util::raiseError( "XML names may only contain alphanumeric chars, period, hyphen, colon and underscores", PEAR_PackageFile_Generator_v2_XML_Util_ERROR_INVALID_CHARS );
-         }
-        // XML name is valid
-        return true;
-    }
-
-   /**
-    * replacement for PEAR_PackageFile_Generator_v2_XML_Util::raiseError
-    *
-    * Avoids the necessity to always require
-    * PEAR.php
-    *
-    * @access   public
-    * @param    string      error message
-    * @param    integer     error code
-    * @return   object PEAR_Error
-    */
-    function raiseError($msg, $code)
-    {
-        require_once 'PEAR.php';
-        return PEAR::raiseError($msg, $code);
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/PackageFile/Parser/v1.php b/PEAR/PackageFile/Parser/v1.php
deleted file mode 100644
index 99391d4..0000000
--- a/PEAR/PackageFile/Parser/v1.php
+++ /dev/null
@@ -1,461 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: v1.php,v 1.22 2006/03/27 05:25:48 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * package.xml abstraction class
- */
-require_once 'PEAR/PackageFile/v1.php';
-/**
- * Parser for package.xml version 1.0
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: @PEAR-VER@
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile_Parser_v1
-{
-    var $_registry;
-    var $_config;
-    var $_logger;
-    /**
-     * BC hack to allow PEAR_Common::infoFromString() to sort of
-     * work with the version 2.0 format - there's no filelist though
-     * @param PEAR_PackageFile_v2
-     */
-    function fromV2($packagefile)
-    {
-        $info = $packagefile->getArray(true);
-        $ret = new PEAR_PackageFile_v1;
-        $ret->fromArray($info['old']);
-    }
-
-    function setConfig(&$c)
-    {
-        $this->_config = &$c;
-        $this->_registry = &$c->getRegistry();
-    }
-
-    function setLogger(&$l)
-    {
-        $this->_logger = &$l;
-    }
-
-    /**
-     * @param string contents of package.xml file, version 1.0
-     * @return bool success of parsing
-     */
-    function parse($data, $file, $archive = false)
-    {
-        if (!extension_loaded('xml')) {
-            return PEAR::raiseError('Cannot create xml parser for parsing package.xml, no xml extension');
-        }
-        $xp = xml_parser_create();
-        if (!$xp) {
-            return PEAR::raiseError('Cannot create xml parser for parsing package.xml');
-        }
-        xml_set_object($xp, $this);
-        xml_set_element_handler($xp, '_element_start_1_0', '_element_end_1_0');
-        xml_set_character_data_handler($xp, '_pkginfo_cdata_1_0');
-        xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, false);
-
-        $this->element_stack = array();
-        $this->_packageInfo = array('provides' => array());
-        $this->current_element = false;
-        unset($this->dir_install);
-        $this->_packageInfo['filelist'] = array();
-        $this->filelist =& $this->_packageInfo['filelist'];
-        $this->dir_names = array();
-        $this->in_changelog = false;
-        $this->d_i = 0;
-        $this->cdata = '';
-        $this->_isValid = true;
-
-        if (!xml_parse($xp, $data, 1)) {
-            $code = xml_get_error_code($xp);
-            $line = xml_get_current_line_number($xp);
-            xml_parser_free($xp);
-            return PEAR::raiseError(sprintf("XML error: %s at line %d",
-                           $str = xml_error_string($code), $line), 2);
-        }
-
-        xml_parser_free($xp);
-
-        $pf = new PEAR_PackageFile_v1;
-        $pf->setConfig($this->_config);
-        if (isset($this->_logger)) {
-            $pf->setLogger($this->_logger);
-        }
-        $pf->setPackagefile($file, $archive);
-        $pf->fromArray($this->_packageInfo);
-        return $pf;
-    }
-    // {{{ _unIndent()
-
-    /**
-     * Unindent given string
-     *
-     * @param string $str The string that has to be unindented.
-     * @return string
-     * @access private
-     */
-    function _unIndent($str)
-    {
-        // remove leading newlines
-        $str = preg_replace('/^[\r\n]+/', '', $str);
-        // find whitespace at the beginning of the first line
-        $indent_len = strspn($str, " \t");
-        $indent = substr($str, 0, $indent_len);
-        $data = '';
-        // remove the same amount of whitespace from following lines
-        foreach (explode("\n", $str) as $line) {
-            if (substr($line, 0, $indent_len) == $indent) {
-                $data .= substr($line, $indent_len) . "\n";
-            }
-        }
-        return $data;
-    }
-
-    // Support for package DTD v1.0:
-    // {{{ _element_start_1_0()
-
-    /**
-     * XML parser callback for ending elements.  Used for version 1.0
-     * packages.
-     *
-     * @param resource  $xp    XML parser resource
-     * @param string    $name  name of ending element
-     *
-     * @return void
-     *
-     * @access private
-     */
-    function _element_start_1_0($xp, $name, $attribs)
-    {
-        array_push($this->element_stack, $name);
-        $this->current_element = $name;
-        $spos = sizeof($this->element_stack) - 2;
-        $this->prev_element = ($spos >= 0) ? $this->element_stack[$spos] : '';
-        $this->current_attributes = $attribs;
-        $this->cdata = '';
-        switch ($name) {
-            case 'dir':
-                if ($this->in_changelog) {
-                    break;
-                }
-                if (array_key_exists('name', $attribs) && $attribs['name'] != '/') {
-                    $attribs['name'] = preg_replace(array('!\\\\+!', '!/+!'), array('/', '/'),
-                        $attribs['name']);
-                    if (strrpos($attribs['name'], '/') == strlen($attribs['name']) - 1) {
-                        $attribs['name'] = substr($attribs['name'], 0,
-                            strlen($attribs['name']) - 1);
-                    }
-                    if (strpos($attribs['name'], '/') === 0) {
-                        $attribs['name'] = substr($attribs['name'], 1);
-                    }
-                    $this->dir_names[] = $attribs['name'];
-                }
-                if (isset($attribs['baseinstalldir'])) {
-                    $this->dir_install = $attribs['baseinstalldir'];
-                }
-                if (isset($attribs['role'])) {
-                    $this->dir_role = $attribs['role'];
-                }
-                break;
-            case 'file':
-                if ($this->in_changelog) {
-                    break;
-                }
-                if (isset($attribs['name'])) {
-                    $path = '';
-                    if (count($this->dir_names)) {
-                        foreach ($this->dir_names as $dir) {
-                            $path .= $dir . '/';
-                        }
-                    }
-                    $path .= preg_replace(array('!\\\\+!', '!/+!'), array('/', '/'),
-                        $attribs['name']);
-                    unset($attribs['name']);
-                    $this->current_path = $path;
-                    $this->filelist[$path] = $attribs;
-                    // Set the baseinstalldir only if the file don't have this attrib
-                    if (!isset($this->filelist[$path]['baseinstalldir']) &&
-                        isset($this->dir_install))
-                    {
-                        $this->filelist[$path]['baseinstalldir'] = $this->dir_install;
-                    }
-                    // Set the Role
-                    if (!isset($this->filelist[$path]['role']) && isset($this->dir_role)) {
-                        $this->filelist[$path]['role'] = $this->dir_role;
-                    }
-                }
-                break;
-            case 'replace':
-                if (!$this->in_changelog) {
-                    $this->filelist[$this->current_path]['replacements'][] = $attribs;
-                }
-                break;
-            case 'maintainers':
-                $this->_packageInfo['maintainers'] = array();
-                $this->m_i = 0; // maintainers array index
-                break;
-            case 'maintainer':
-                // compatibility check
-                if (!isset($this->_packageInfo['maintainers'])) {
-                    $this->_packageInfo['maintainers'] = array();
-                    $this->m_i = 0;
-                }
-                $this->_packageInfo['maintainers'][$this->m_i] = array();
-                $this->current_maintainer =& $this->_packageInfo['maintainers'][$this->m_i];
-                break;
-            case 'changelog':
-                $this->_packageInfo['changelog'] = array();
-                $this->c_i = 0; // changelog array index
-                $this->in_changelog = true;
-                break;
-            case 'release':
-                if ($this->in_changelog) {
-                    $this->_packageInfo['changelog'][$this->c_i] = array();
-                    $this->current_release = &$this->_packageInfo['changelog'][$this->c_i];
-                } else {
-                    $this->current_release = &$this->_packageInfo;
-                }
-                break;
-            case 'deps':
-                if (!$this->in_changelog) {
-                    $this->_packageInfo['release_deps'] = array();
-                }
-                break;
-            case 'dep':
-                // dependencies array index
-                if (!$this->in_changelog) {
-                    $this->d_i++;
-                    isset($attribs['type']) ? ($attribs['type'] = strtolower($attribs['type'])) : false;
-                    $this->_packageInfo['release_deps'][$this->d_i] = $attribs;
-                }
-                break;
-            case 'configureoptions':
-                if (!$this->in_changelog) {
-                    $this->_packageInfo['configure_options'] = array();
-                }
-                break;
-            case 'configureoption':
-                if (!$this->in_changelog) {
-                    $this->_packageInfo['configure_options'][] = $attribs;
-                }
-                break;
-            case 'provides':
-                if (empty($attribs['type']) || empty($attribs['name'])) {
-                    break;
-                }
-                $attribs['explicit'] = true;
-                $this->_packageInfo['provides']["$attribs[type];$attribs[name]"] = $attribs;
-                break;
-            case 'package' :
-                if (isset($attribs['version'])) {
-                    $this->_packageInfo['xsdversion'] = trim($attribs['version']);
-                } else {
-                    $this->_packageInfo['xsdversion'] = '1.0';
-                }
-                if (isset($attribs['packagerversion'])) {
-                    $this->_packageInfo['packagerversion'] = $attribs['packagerversion'];
-                }
-                break;
-        }
-    }
-
-    // }}}
-    // {{{ _element_end_1_0()
-
-    /**
-     * XML parser callback for ending elements.  Used for version 1.0
-     * packages.
-     *
-     * @param resource  $xp    XML parser resource
-     * @param string    $name  name of ending element
-     *
-     * @return void
-     *
-     * @access private
-     */
-    function _element_end_1_0($xp, $name)
-    {
-        $data = trim($this->cdata);
-        switch ($name) {
-            case 'name':
-                switch ($this->prev_element) {
-                    case 'package':
-                        $this->_packageInfo['package'] = $data;
-                        break;
-                    case 'maintainer':
-                        $this->current_maintainer['name'] = $data;
-                        break;
-                }
-                break;
-            case 'extends' :
-                $this->_packageInfo['extends'] = $data;
-                break;
-            case 'summary':
-                $this->_packageInfo['summary'] = $data;
-                break;
-            case 'description':
-                $data = $this->_unIndent($this->cdata);
-                $this->_packageInfo['description'] = $data;
-                break;
-            case 'user':
-                $this->current_maintainer['handle'] = $data;
-                break;
-            case 'email':
-                $this->current_maintainer['email'] = $data;
-                break;
-            case 'role':
-                $this->current_maintainer['role'] = $data;
-                break;
-            case 'version':
-                //$data = ereg_replace ('[^a-zA-Z0-9._\-]', '_', $data);
-                if ($this->in_changelog) {
-                    $this->current_release['version'] = $data;
-                } else {
-                    $this->_packageInfo['version'] = $data;
-                }
-                break;
-            case 'date':
-                if ($this->in_changelog) {
-                    $this->current_release['release_date'] = $data;
-                } else {
-                    $this->_packageInfo['release_date'] = $data;
-                }
-                break;
-            case 'notes':
-                // try to "de-indent" release notes in case someone
-                // has been over-indenting their xml ;-)
-                $data = $this->_unIndent($this->cdata);
-                if ($this->in_changelog) {
-                    $this->current_release['release_notes'] = $data;
-                } else {
-                    $this->_packageInfo['release_notes'] = $data;
-                }
-                break;
-            case 'warnings':
-                if ($this->in_changelog) {
-                    $this->current_release['release_warnings'] = $data;
-                } else {
-                    $this->_packageInfo['release_warnings'] = $data;
-                }
-                break;
-            case 'state':
-                if ($this->in_changelog) {
-                    $this->current_release['release_state'] = $data;
-                } else {
-                    $this->_packageInfo['release_state'] = $data;
-                }
-                break;
-            case 'license':
-                if ($this->in_changelog) {
-                    $this->current_release['release_license'] = $data;
-                } else {
-                    $this->_packageInfo['release_license'] = $data;
-                }
-                break;
-            case 'dep':
-                if ($data && !$this->in_changelog) {
-                    $this->_packageInfo['release_deps'][$this->d_i]['name'] = $data;
-                }
-                break;
-            case 'dir':
-                if ($this->in_changelog) {
-                    break;
-                }
-                array_pop($this->dir_names);
-                break;
-            case 'file':
-                if ($this->in_changelog) {
-                    break;
-                }
-                if ($data) {
-                    $path = '';
-                    if (count($this->dir_names)) {
-                        foreach ($this->dir_names as $dir) {
-                            $path .= $dir . '/';
-                        }
-                    }
-                    $path .= $data;
-                    $this->filelist[$path] = $this->current_attributes;
-                    // Set the baseinstalldir only if the file don't have this attrib
-                    if (!isset($this->filelist[$path]['baseinstalldir']) &&
-                        isset($this->dir_install))
-                    {
-                        $this->filelist[$path]['baseinstalldir'] = $this->dir_install;
-                    }
-                    // Set the Role
-                    if (!isset($this->filelist[$path]['role']) && isset($this->dir_role)) {
-                        $this->filelist[$path]['role'] = $this->dir_role;
-                    }
-                }
-                break;
-            case 'maintainer':
-                if (empty($this->_packageInfo['maintainers'][$this->m_i]['role'])) {
-                    $this->_packageInfo['maintainers'][$this->m_i]['role'] = 'lead';
-                }
-                $this->m_i++;
-                break;
-            case 'release':
-                if ($this->in_changelog) {
-                    $this->c_i++;
-                }
-                break;
-            case 'changelog':
-                $this->in_changelog = false;
-                break;
-        }
-        array_pop($this->element_stack);
-        $spos = sizeof($this->element_stack) - 1;
-        $this->current_element = ($spos > 0) ? $this->element_stack[$spos] : '';
-        $this->cdata = '';
-    }
-
-    // }}}
-    // {{{ _pkginfo_cdata_1_0()
-
-    /**
-     * XML parser callback for character data.  Used for version 1.0
-     * packages.
-     *
-     * @param resource  $xp    XML parser resource
-     * @param string    $name  character data
-     *
-     * @return void
-     *
-     * @access private
-     */
-    function _pkginfo_cdata_1_0($xp, $data)
-    {
-        if (isset($this->cdata)) {
-            $this->cdata .= $data;
-        }
-    }
-
-    // }}}
-}
-?>
\ No newline at end of file
diff --git a/PEAR/PackageFile/Parser/v2.php b/PEAR/PackageFile/Parser/v2.php
deleted file mode 100644
index f118b72..0000000
--- a/PEAR/PackageFile/Parser/v2.php
+++ /dev/null
@@ -1,115 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: v2.php,v 1.19 2006/01/23 17:39:52 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * base xml parser class
- */
-require_once 'PEAR/XMLParser.php';
-require_once 'PEAR/PackageFile/v2.php';
-/**
- * Parser for package.xml version 2.0
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: @PEAR-VER@
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile_Parser_v2 extends PEAR_XMLParser
-{
-    var $_config;
-    var $_logger;
-    var $_registry;
-
-    function setConfig(&$c)
-    {
-        $this->_config = &$c;
-        $this->_registry = &$c->getRegistry();
-    }
-
-    function setLogger(&$l)
-    {
-        $this->_logger = &$l;
-    }
-    /**
-     * Unindent given string
-     *
-     * @param string $str The string that has to be unindented.
-     * @return string
-     * @access private
-     */
-    function _unIndent($str)
-    {
-        // remove leading newlines
-        $str = preg_replace('/^[\r\n]+/', '', $str);
-        // find whitespace at the beginning of the first line
-        $indent_len = strspn($str, " \t");
-        $indent = substr($str, 0, $indent_len);
-        $data = '';
-        // remove the same amount of whitespace from following lines
-        foreach (explode("\n", $str) as $line) {
-            if (substr($line, 0, $indent_len) == $indent) {
-                $data .= substr($line, $indent_len) . "\n";
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * post-process data
-     *
-     * @param string $data
-     * @param string $element element name
-     */
-    function postProcess($data, $element)
-    {
-        if ($element == 'notes') {
-            return trim($this->_unIndent($data));
-        }
-        return trim($data);
-    }
-
-    /**
-     * @param string
-     * @param string file name of the package.xml
-     * @param string|false name of the archive this package.xml came from, if any
-     * @param string class name to instantiate and return.  This must be PEAR_PackageFile_v2 or
-     *               a subclass
-     * @return PEAR_PackageFile_v2
-     */
-    function &parse($data, $file, $archive = false, $class = 'PEAR_PackageFile_v2')
-    {
-        if (PEAR::isError($err = parent::parse($data, $file))) {
-            return $err;
-        }
-        $ret = new $class;
-        $ret->setConfig($this->_config);
-        if (isset($this->_logger)) {
-            $ret->setLogger($this->_logger);
-        }
-        $ret->fromArray($this->_unserializedData);
-        $ret->setPackagefile($file, $archive);
-        return $ret;
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/PackageFile/v1.php b/PEAR/PackageFile/v1.php
deleted file mode 100644
index 713e1dc..0000000
--- a/PEAR/PackageFile/v1.php
+++ /dev/null
@@ -1,1600 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: v1.php,v 1.71 2006/04/12 21:44:50 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * For error handling
- */
-require_once 'PEAR/ErrorStack.php';
-
-/**
- * Error code if parsing is attempted with no xml extension
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_XML_EXT', 3);
-
-/**
- * Error code if creating the xml parser resource fails
- */
-define('PEAR_PACKAGEFILE_ERROR_CANT_MAKE_PARSER', 4);
-
-/**
- * Error code used for all sax xml parsing errors
- */
-define('PEAR_PACKAGEFILE_ERROR_PARSER_ERROR', 5);
-
-/**
- * Error code used when there is no name
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_NAME', 6);
-
-/**
- * Error code when a package name is not valid
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_NAME', 7);
-
-/**
- * Error code used when no summary is parsed
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_SUMMARY', 8);
-
-/**
- * Error code for summaries that are more than 1 line
- */
-define('PEAR_PACKAGEFILE_ERROR_MULTILINE_SUMMARY', 9);
-
-/**
- * Error code used when no description is present
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_DESCRIPTION', 10);
-
-/**
- * Error code used when no license is present
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_LICENSE', 11);
-
-/**
- * Error code used when a  version number is not present
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_VERSION', 12);
-
-/**
- * Error code used when a  version number is invalid
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_VERSION', 13);
-
-/**
- * Error code when release state is missing
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_STATE', 14);
-
-/**
- * Error code when release state is invalid
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_STATE', 15);
-
-/**
- * Error code when release state is missing
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_DATE', 16);
-
-/**
- * Error code when release state is invalid
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_DATE', 17);
-
-/**
- * Error code when no release notes are found
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_NOTES', 18);
-
-/**
- * Error code when no maintainers are found
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_MAINTAINERS', 19);
-
-/**
- * Error code when a maintainer has no handle
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_MAINTHANDLE', 20);
-
-/**
- * Error code when a maintainer has no handle
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_MAINTROLE', 21);
-
-/**
- * Error code when a maintainer has no name
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_MAINTNAME', 22);
-
-/**
- * Error code when a maintainer has no email
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_MAINTEMAIL', 23);
-
-/**
- * Error code when a maintainer has no handle
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_MAINTROLE', 24);
-
-/**
- * Error code when a dependency is not a PHP dependency, but has no name
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_DEPNAME', 25);
-
-/**
- * Error code when a dependency has no type (pkg, php, etc.)
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_DEPTYPE', 26);
-
-/**
- * Error code when a dependency has no relation (lt, ge, has, etc.)
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_DEPREL', 27);
-
-/**
- * Error code when a dependency is not a 'has' relation, but has no version
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_DEPVERSION', 28);
-
-/**
- * Error code when a dependency has an invalid relation
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_DEPREL', 29);
-
-/**
- * Error code when a dependency has an invalid type
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_DEPTYPE', 30);
-
-/**
- * Error code when a dependency has an invalid optional option
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_DEPOPTIONAL', 31);
-
-/**
- * Error code when a dependency is a pkg dependency, and has an invalid package name
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_DEPNAME', 32);
-
-/**
- * Error code when a dependency has a channel="foo" attribute, and foo is not a registered channel
- */
-define('PEAR_PACKAGEFILE_ERROR_UNKNOWN_DEPCHANNEL', 33);
-
-/**
- * Error code when rel="has" and version attribute is present.
- */
-define('PEAR_PACKAGEFILE_ERROR_DEPVERSION_IGNORED', 34);
-
-/**
- * Error code when type="php" and dependency name is present
- */
-define('PEAR_PACKAGEFILE_ERROR_DEPNAME_IGNORED', 35);
-
-/**
- * Error code when a configure option has no name
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_CONFNAME', 36);
-
-/**
- * Error code when a configure option has no name
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_CONFPROMPT', 37);
-
-/**
- * Error code when a file in the filelist has an invalid role
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_FILEROLE', 38);
-
-/**
- * Error code when a file in the filelist has no role
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_FILEROLE', 39);
-
-/**
- * Error code when analyzing a php source file that has parse errors
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_PHPFILE', 40);
-
-/**
- * Error code when analyzing a php source file reveals a source element
- * without a package name prefix
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_PNAME_PREFIX', 41);
-
-/**
- * Error code when an unknown channel is specified
- */
-define('PEAR_PACKAGEFILE_ERROR_UNKNOWN_CHANNEL', 42);
-
-/**
- * Error code when no files are found in the filelist
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_FILES', 43);
-
-/**
- * Error code when a file is not valid php according to _analyzeSourceCode()
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_FILE', 44);
-
-/**
- * Error code when the channel validator returns an error or warning
- */
-define('PEAR_PACKAGEFILE_ERROR_CHANNELVAL', 45);
-
-/**
- * Error code when a php5 package is packaged in php4 (analysis doesn't work)
- */
-define('PEAR_PACKAGEFILE_ERROR_PHP5', 46);
-
-/**
- * Error code when a file is listed in package.xml but does not exist
- */
-define('PEAR_PACKAGEFILE_ERROR_FILE_NOTFOUND', 47);
-
-/**
- * Error code when a 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile_v1
-{
-    /**
-     * @access private
-     * @var PEAR_ErrorStack
-     * @access private
-     */
-    var $_stack;
-
-    /**
-     * A registry object, used to access the package name validation regex for non-standard channels
-     * @var PEAR_Registry
-     * @access private
-     */
-    var $_registry;
-
-    /**
-     * An object that contains a log method that matches PEAR_Common::log's signature
-     * @var object
-     * @access private
-     */
-    var $_logger;
-
-    /**
-     * Parsed package information
-     * @var array
-     * @access private
-     */
-    var $_packageInfo;
-
-    /**
-     * path to package.xml
-     * @var string
-     * @access private
-     */
-    var $_packageFile;
-
-    /**
-     * path to package .tgz or false if this is a local/extracted package.xml
-     * @var string
-     * @access private
-     */
-    var $_archiveFile;
-
-    /**
-     * @var int
-     * @access private
-     */
-    var $_isValid = 0;
-
-    /**
-     * Determines whether this packagefile was initialized only with partial package info
-     *
-     * If this package file was constructed via parsing REST, it will only contain
-     *
-     * - package name
-     * - channel name
-     * - dependencies 
-     * @var boolean
-     * @access private
-     */
-    var $_incomplete = true;
-
-    /**
-     * @param bool determines whether to return a PEAR_Error object, or use the PEAR_ErrorStack
-     * @param string Name of Error Stack class to use.
-     */
-    function PEAR_PackageFile_v1()
-    {
-        $this->_stack = &new PEAR_ErrorStack('PEAR_PackageFile_v1');
-        $this->_stack->setErrorMessageTemplate($this->_getErrorMessage());
-        $this->_isValid = 0;
-    }
-
-    function installBinary($installer)
-    {
-        return false;
-    }
-
-    function isExtension($name)
-    {
-        return false;
-    }
-
-    function setConfig(&$config)
-    {
-        $this->_config = &$config;
-        $this->_registry = &$config->getRegistry();
-    }
-
-    function setRequestedGroup()
-    {
-        // placeholder
-    }
-
-    /**
-     * For saving in the registry.
-     *
-     * Set the last version that was installed
-     * @param string
-     */
-    function setLastInstalledVersion($version)
-    {
-        $this->_packageInfo['_lastversion'] = $version;
-    }
-
-    /**
-     * @return string|false
-     */
-    function getLastInstalledVersion()
-    {
-        if (isset($this->_packageInfo['_lastversion'])) {
-            return $this->_packageInfo['_lastversion'];
-        }
-        return false;
-    }
-
-    function getInstalledBinary()
-    {
-        return false;
-    }
-
-    function listPostinstallScripts()
-    {
-        return false;
-    }
-
-    function initPostinstallScripts()
-    {
-        return false;
-    }
-
-    function setLogger(&$logger)
-    {
-        if ($logger && (!is_object($logger) || !method_exists($logger, 'log'))) {
-            return PEAR::raiseError('Logger must be compatible with PEAR_Common::log');
-        }
-        $this->_logger = &$logger;
-    }
-
-    function setPackagefile($file, $archive = false)
-    {
-        $this->_packageFile = $file;
-        $this->_archiveFile = $archive ? $archive : $file;
-    }
-
-    function getPackageFile()
-    {
-        return isset($this->_packageFile) ? $this->_packageFile : false;
-    }
-
-    function getPackageType()
-    {
-        return 'php';
-    }
-
-    function getArchiveFile()
-    {
-        return $this->_archiveFile;
-    }
-
-    function packageInfo($field)
-    {
-        if (!is_string($field) || empty($field) ||
-            !isset($this->_packageInfo[$field])) {
-            return false;
-        }
-        return $this->_packageInfo[$field];
-    }
-
-    function setDirtree($path)
-    {
-        $this->_packageInfo['dirtree'][$path] = true;
-    }
-
-    function getDirtree()
-    {
-        if (isset($this->_packageInfo['dirtree']) && count($this->_packageInfo['dirtree'])) {
-            return $this->_packageInfo['dirtree'];
-        }
-        return false;
-    }
-
-    function resetDirtree()
-    {
-        unset($this->_packageInfo['dirtree']);
-    }
-
-    function fromArray($pinfo)
-    {
-        $this->_incomplete = false;
-        $this->_packageInfo = $pinfo;
-    }
-
-    function isIncomplete()
-    {
-        return $this->_incomplete;
-    }
-
-    function getChannel()
-    {
-        return 'pear.php.net';
-    }
-
-    function getUri()
-    {
-        return false;
-    }
-
-    function getTime()
-    {
-        return false;
-    }
-
-    function getExtends()
-    {
-        if (isset($this->_packageInfo['extends'])) {
-            return $this->_packageInfo['extends'];
-        }
-        return false;
-    }
-
-    /**
-     * @return array
-     */
-    function toArray()
-    {
-        if (!$this->validate(PEAR_VALIDATE_NORMAL)) {
-            return false;
-        }
-        return $this->getArray();
-    }
-
-    function getArray()
-    {
-        return $this->_packageInfo;
-    }
-
-    function getName()
-    {
-        return $this->getPackage();
-    }
-
-    function getPackage()
-    {
-        if (isset($this->_packageInfo['package'])) {
-            return $this->_packageInfo['package'];
-        }
-        return false;
-    }
-
-    /**
-     * WARNING - don't use this unless you know what you are doing
-     */
-    function setRawPackage($package)
-    {
-        $this->_packageInfo['package'] = $package;
-    }
-
-    function setPackage($package)
-    {
-        $this->_packageInfo['package'] = $package;
-        $this->_isValid = false;
-    }
-
-    function getVersion()
-    {
-        if (isset($this->_packageInfo['version'])) {
-            return $this->_packageInfo['version'];
-        }
-        return false;
-    }
-
-    function setVersion($version)
-    {
-        $this->_packageInfo['version'] = $version;
-        $this->_isValid = false;
-    }
-
-    function clearMaintainers()
-    {
-        unset($this->_packageInfo['maintainers']);
-    }
-
-    function getMaintainers()
-    {
-        if (isset($this->_packageInfo['maintainers'])) {
-            return $this->_packageInfo['maintainers'];
-        }
-        return false;
-    }
-
-    /**
-     * Adds a new maintainer - no checking of duplicates is performed, use
-     * updatemaintainer for that purpose.
-     */
-    function addMaintainer($role, $handle, $name, $email)
-    {
-        $this->_packageInfo['maintainers'][] =
-            array('handle' => $handle, 'role' => $role, 'email' => $email, 'name' => $name);
-        $this->_isValid = false;
-    }
-
-    function updateMaintainer($role, $handle, $name, $email)
-    {
-        $found = false;
-        if (!isset($this->_packageInfo['maintainers']) ||
-              !is_array($this->_packageInfo['maintainers'])) {
-            return $this->addMaintainer($role, $handle, $name, $email);
-        }
-        foreach ($this->_packageInfo['maintainers'] as $i => $maintainer) {
-            if ($maintainer['handle'] == $handle) {
-                $found = $i;
-                break;
-            }
-        }
-        if ($found !== false) {
-            unset($this->_packageInfo['maintainers'][$found]);
-            $this->_packageInfo['maintainers'] =
-                array_values($this->_packageInfo['maintainers']);
-        }
-        $this->addMaintainer($role, $handle, $name, $email);
-    }
-
-    function deleteMaintainer($handle)
-    {
-        $found = false;
-        foreach ($this->_packageInfo['maintainers'] as $i => $maintainer) {
-            if ($maintainer['handle'] == $handle) {
-                $found = $i;
-                break;
-            }
-        }
-        if ($found !== false) {
-            unset($this->_packageInfo['maintainers'][$found]);
-            $this->_packageInfo['maintainers'] =
-                array_values($this->_packageInfo['maintainers']);
-            return true;
-        }
-        return false;
-    }
-
-    function getState()
-    {
-        if (isset($this->_packageInfo['release_state'])) {
-            return $this->_packageInfo['release_state'];
-        }
-        return false;
-    }
-
-    function setRawState($state)
-    {
-        $this->_packageInfo['release_state'] = $state;
-    }
-
-    function setState($state)
-    {
-        $this->_packageInfo['release_state'] = $state;
-        $this->_isValid = false;
-    }
-
-    function getDate()
-    {
-        if (isset($this->_packageInfo['release_date'])) {
-            return $this->_packageInfo['release_date'];
-        }
-        return false;
-    }
-
-    function setDate($date)
-    {
-        $this->_packageInfo['release_date'] = $date;
-        $this->_isValid = false;
-    }
-
-    function getLicense()
-    {
-        if (isset($this->_packageInfo['release_license'])) {
-            return $this->_packageInfo['release_license'];
-        }
-        return false;
-    }
-
-    function setLicense($date)
-    {
-        $this->_packageInfo['release_license'] = $date;
-        $this->_isValid = false;
-    }
-
-    function getSummary()
-    {
-        if (isset($this->_packageInfo['summary'])) {
-            return $this->_packageInfo['summary'];
-        }
-        return false;
-    }
-
-    function setSummary($summary)
-    {
-        $this->_packageInfo['summary'] = $summary;
-        $this->_isValid = false;
-    }
-
-    function getDescription()
-    {
-        if (isset($this->_packageInfo['description'])) {
-            return $this->_packageInfo['description'];
-        }
-        return false;
-    }
-
-    function setDescription($desc)
-    {
-        $this->_packageInfo['description'] = $desc;
-        $this->_isValid = false;
-    }
-
-    function getNotes()
-    {
-        if (isset($this->_packageInfo['release_notes'])) {
-            return $this->_packageInfo['release_notes'];
-        }
-        return false;
-    }
-
-    function setNotes($notes)
-    {
-        $this->_packageInfo['release_notes'] = $notes;
-        $this->_isValid = false;
-    }
-
-    function getDeps()
-    {
-        if (isset($this->_packageInfo['release_deps'])) {
-            return $this->_packageInfo['release_deps'];
-        }
-        return false;
-    }
-
-    /**
-     * Reset dependencies prior to adding new ones
-     */
-    function clearDeps()
-    {
-        unset($this->_packageInfo['release_deps']);
-    }
-
-    function addPhpDep($version, $rel)
-    {
-        $this->_isValid = false;
-        $this->_packageInfo['release_deps'][] =
-            array('type' => 'php',
-                  'rel' => $rel,
-                  'version' => $version);
-    }
-
-    function addPackageDep($name, $version, $rel, $optional = 'no')
-    {
-        $this->_isValid = false;
-        $dep =
-            array('type' => 'pkg',
-                  'name' => $name,
-                  'rel' => $rel,
-                  'optional' => $optional);
-        if ($rel != 'has' && $rel != 'not') {
-            $dep['version'] = $version;
-        }
-        $this->_packageInfo['release_deps'][] = $dep;
-    }
-
-    function addExtensionDep($name, $version, $rel, $optional = 'no')
-    {
-        $this->_isValid = false;
-        $this->_packageInfo['release_deps'][] =
-            array('type' => 'ext',
-                  'name' => $name,
-                  'rel' => $rel,
-                  'version' => $version,
-                  'optional' => $optional);
-    }
-
-    /**
-     * WARNING - do not use this function directly unless you know what you're doing
-     */
-    function setDeps($deps)
-    {
-        $this->_packageInfo['release_deps'] = $deps;
-    }
-
-    function hasDeps()
-    {
-        return isset($this->_packageInfo['release_deps']) &&
-            count($this->_packageInfo['release_deps']);
-    }
-
-    function getDependencyGroup($group)
-    {
-        return false;
-    }
-
-    function isCompatible($pf)
-    {
-        return false;
-    }
-
-    function isSubpackageOf($p)
-    {
-        return $p->isSubpackage($this);
-    }
-
-    function isSubpackage($p)
-    {
-        return false;
-    }
-
-    function dependsOn($package, $channel)
-    {
-        if (strtolower($channel) != 'pear.php.net') {
-            return false;
-        }
-        if (!($deps = $this->getDeps())) {
-            return false;
-        }
-        foreach ($deps as $dep) {
-            if ($dep['type'] != 'pkg') {
-                continue;
-            }
-            if (strtolower($dep['name']) == strtolower($package)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function getConfigureOptions()
-    {
-        if (isset($this->_packageInfo['configure_options'])) {
-            return $this->_packageInfo['configure_options'];
-        }
-        return false;
-    }
-
-    function hasConfigureOptions()
-    {
-        return isset($this->_packageInfo['configure_options']) &&
-            count($this->_packageInfo['configure_options']);
-    }
-
-    function addConfigureOption($name, $prompt, $default = false)
-    {
-        $o = array('name' => $name, 'prompt' => $prompt);
-        if ($default !== false) {
-            $o['default'] = $default;
-        }
-        if (!isset($this->_packageInfo['configure_options'])) {
-            $this->_packageInfo['configure_options'] = array();
-        }
-        $this->_packageInfo['configure_options'][] = $o;
-    }
-
-    function clearConfigureOptions()
-    {
-        unset($this->_packageInfo['configure_options']);
-    }
-
-    function getProvides()
-    {
-        if (isset($this->_packageInfo['provides'])) {
-            return $this->_packageInfo['provides'];
-        }
-        return false;
-    }
-
-    function getProvidesExtension()
-    {
-        return false;
-    }
-
-    function addFile($dir, $file, $attrs)
-    {
-        $dir = preg_replace(array('!\\\\+!', '!/+!'), array('/', '/'), $dir);
-        if ($dir == '/' || $dir == '') {
-            $dir = '';
-        } else {
-            $dir .= '/';
-        }
-        $file = $dir . $file;
-        $file = preg_replace('![\\/]+!', '/', $file);
-        $this->_packageInfo['filelist'][$file] = $attrs;
-    }
-
-    function getInstallationFilelist()
-    {
-        return $this->getFilelist();
-    }
-
-    function getFilelist()
-    {
-        if (isset($this->_packageInfo['filelist'])) {
-            return $this->_packageInfo['filelist'];
-        }
-        return false;
-    }
-
-    function setFileAttribute($file, $attr, $value)
-    {
-        $this->_packageInfo['filelist'][$file][$attr] = $value;
-    }
-
-    function resetFilelist()
-    {
-        $this->_packageInfo['filelist'] = array();
-    }
-
-    function setInstalledAs($file, $path)
-    {
-        if ($path) {
-            return $this->_packageInfo['filelist'][$file]['installed_as'] = $path;
-        }
-        unset($this->_packageInfo['filelist'][$file]['installed_as']);
-    }
-
-    function installedFile($file, $atts)
-    {
-        if (isset($this->_packageInfo['filelist'][$file])) {
-            $this->_packageInfo['filelist'][$file] =
-                array_merge($this->_packageInfo['filelist'][$file], $atts);
-        } else {
-            $this->_packageInfo['filelist'][$file] = $atts;
-        }
-    }
-
-    function getChangelog()
-    {
-        if (isset($this->_packageInfo['changelog'])) {
-            return $this->_packageInfo['changelog'];
-        }
-        return false;
-    }
-
-    function getPackagexmlVersion()
-    {
-        return '1.0';
-    }
-
-    /**
-     * Wrapper to {@link PEAR_ErrorStack::getErrors()}
-     * @param boolean determines whether to purge the error stack after retrieving
-     * @return array
-     */
-    function getValidationWarnings($purge = true)
-    {
-        return $this->_stack->getErrors($purge);
-    }
-
-    // }}}
-    /**
-     * Validation error.  Also marks the object contents as invalid
-     * @param error code
-     * @param array error information
-     * @access private
-     */
-    function _validateError($code, $params = array())
-    {
-        $this->_stack->push($code, 'error', $params, false, false, debug_backtrace());
-        $this->_isValid = false;
-    }
-
-    /**
-     * Validation warning.  Does not mark the object contents invalid.
-     * @param error code
-     * @param array error information
-     * @access private
-     */
-    function _validateWarning($code, $params = array())
-    {
-        $this->_stack->push($code, 'warning', $params, false, false, debug_backtrace());
-    }
-
-    /**
-     * @param integer error code
-     * @access protected
-     */
-    function _getErrorMessage()
-    {
-        return array(
-                PEAR_PACKAGEFILE_ERROR_NO_NAME =>
-                    'Missing Package Name',
-                PEAR_PACKAGEFILE_ERROR_NO_SUMMARY =>
-                    'No summary found',
-                PEAR_PACKAGEFILE_ERROR_MULTILINE_SUMMARY =>
-                    'Summary should be on one line',
-                PEAR_PACKAGEFILE_ERROR_NO_DESCRIPTION =>
-                    'Missing description',
-                PEAR_PACKAGEFILE_ERROR_NO_LICENSE =>
-                    'Missing license',
-                PEAR_PACKAGEFILE_ERROR_NO_VERSION =>
-                    'No release version found',
-                PEAR_PACKAGEFILE_ERROR_NO_STATE =>
-                    'No release state found',
-                PEAR_PACKAGEFILE_ERROR_NO_DATE =>
-                    'No release date found',
-                PEAR_PACKAGEFILE_ERROR_NO_NOTES =>
-                    'No release notes found',
-                PEAR_PACKAGEFILE_ERROR_NO_LEAD =>
-                    'Package must have at least one lead maintainer',
-                PEAR_PACKAGEFILE_ERROR_NO_MAINTAINERS =>
-                    'No maintainers found, at least one must be defined',
-                PEAR_PACKAGEFILE_ERROR_NO_MAINTHANDLE =>
-                    'Maintainer %index% has no handle (user ID at channel server)',
-                PEAR_PACKAGEFILE_ERROR_NO_MAINTROLE =>
-                    'Maintainer %index% has no role',
-                PEAR_PACKAGEFILE_ERROR_NO_MAINTNAME =>
-                    'Maintainer %index% has no name',
-                PEAR_PACKAGEFILE_ERROR_NO_MAINTEMAIL =>
-                    'Maintainer %index% has no email',
-                PEAR_PACKAGEFILE_ERROR_NO_DEPNAME =>
-                    'Dependency %index% is not a php dependency, and has no name',
-                PEAR_PACKAGEFILE_ERROR_NO_DEPREL =>
-                    'Dependency %index% has no relation (rel)',
-                PEAR_PACKAGEFILE_ERROR_NO_DEPTYPE =>
-                    'Dependency %index% has no type',
-                PEAR_PACKAGEFILE_ERROR_DEPNAME_IGNORED =>
-                    'PHP Dependency %index% has a name attribute of "%name%" which will be' .
-                        ' ignored!',
-                PEAR_PACKAGEFILE_ERROR_NO_DEPVERSION =>
-                    'Dependency %index% is not a rel="has" or rel="not" dependency, ' .
-                        'and has no version',
-                PEAR_PACKAGEFILE_ERROR_NO_DEPPHPVERSION =>
-                    'Dependency %index% is a type="php" dependency, ' .
-                        'and has no version',
-                PEAR_PACKAGEFILE_ERROR_DEPVERSION_IGNORED =>
-                    'Dependency %index% is a rel="%rel%" dependency, versioning is ignored',
-                PEAR_PACKAGEFILE_ERROR_INVALID_DEPOPTIONAL =>
-                    'Dependency %index% has invalid optional value "%opt%", should be yes or no',
-                PEAR_PACKAGEFILE_PHP_NO_NOT =>
-                    'Dependency %index%: php dependencies cannot use "not" rel, use "ne"' .
-                        ' to exclude specific versions',
-                PEAR_PACKAGEFILE_ERROR_NO_CONFNAME =>
-                    'Configure Option %index% has no name',
-                PEAR_PACKAGEFILE_ERROR_NO_CONFPROMPT =>
-                    'Configure Option %index% has no prompt',
-                PEAR_PACKAGEFILE_ERROR_NO_FILES =>
-                    'No files in  section of package.xml',
-                PEAR_PACKAGEFILE_ERROR_NO_FILEROLE =>
-                    'File "%file%" has no role, expecting one of "%roles%"',
-                PEAR_PACKAGEFILE_ERROR_INVALID_FILEROLE =>
-                    'File "%file%" has invalid role "%role%", expecting one of "%roles%"',
-                PEAR_PACKAGEFILE_ERROR_INVALID_FILENAME =>
-                    'File "%file%" cannot start with ".", cannot package or install',
-                PEAR_PACKAGEFILE_ERROR_INVALID_PHPFILE =>
-                    'Parser error: invalid PHP found in file "%file%"',
-                PEAR_PACKAGEFILE_ERROR_NO_PNAME_PREFIX =>
-                    'in %file%: %type% "%name%" not prefixed with package name "%package%"',
-                PEAR_PACKAGEFILE_ERROR_INVALID_FILE =>
-                    'Parser error: invalid PHP file "%file%"',
-                PEAR_PACKAGEFILE_ERROR_CHANNELVAL =>
-                    'Channel validator error: field "%field%" - %reason%',
-                PEAR_PACKAGEFILE_ERROR_PHP5 =>
-                    'Error, PHP5 token encountered in %file%, analysis should be in PHP5',
-                PEAR_PACKAGEFILE_ERROR_FILE_NOTFOUND =>
-                    'File "%file%" in package.xml does not exist',
-                PEAR_PACKAGEFILE_ERROR_NON_ISO_CHARS =>
-                    'Package.xml contains non-ISO-8859-1 characters, and may not validate',
-            );
-    }
-
-    /**
-     * Validate XML package definition file.
-     *
-     * @access public
-     * @return boolean
-     */
-    function validate($state = PEAR_VALIDATE_NORMAL, $nofilechecking = false)
-    {
-        if (($this->_isValid & $state) == $state) {
-            return true;
-        }
-        $this->_isValid = true;
-        $info = $this->_packageInfo;
-        if (empty($info['package'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_NAME);
-            $this->_packageName = $pn = 'unknown';
-        } else {
-            $this->_packageName = $pn = $info['package'];
-        }
-
-        if (empty($info['summary'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_SUMMARY);
-        } elseif (strpos(trim($info['summary']), "\n") !== false) {
-            $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_MULTILINE_SUMMARY,
-                array('summary' => $info['summary']));
-        }
-        if (empty($info['description'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DESCRIPTION);
-        }
-        if (empty($info['release_license'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_LICENSE);
-        }
-        if (empty($info['version'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_VERSION);
-        }
-        if (empty($info['release_state'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_STATE);
-        }
-        if (empty($info['release_date'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DATE);
-        }
-        if (empty($info['release_notes'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_NOTES);
-        }
-        if (empty($info['maintainers'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_MAINTAINERS);
-        } else {
-            $haslead = false;
-            $i = 1;
-            foreach ($info['maintainers'] as $m) {
-                if (empty($m['handle'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_MAINTHANDLE,
-                        array('index' => $i));
-                }
-                if (empty($m['role'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_MAINTROLE,
-                        array('index' => $i, 'roles' => PEAR_Common::getUserRoles()));
-                } elseif ($m['role'] == 'lead') {
-                    $haslead = true;
-                }
-                if (empty($m['name'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_MAINTNAME,
-                        array('index' => $i));
-                }
-                if (empty($m['email'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_MAINTEMAIL,
-                        array('index' => $i));
-                }
-                $i++;
-            }
-            if (!$haslead) {
-                $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_LEAD);
-            }
-        }
-        if (!empty($info['release_deps'])) {
-            $i = 1;
-            foreach ($info['release_deps'] as $d) {
-                if (!isset($d['type']) || empty($d['type'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DEPTYPE,
-                        array('index' => $i, 'types' => PEAR_Common::getDependencyTypes()));
-                    continue;
-                }
-                if (!isset($d['rel']) || empty($d['rel'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DEPREL,
-                        array('index' => $i, 'rels' => PEAR_Common::getDependencyRelations()));
-                    continue;
-                }
-                if (!empty($d['optional'])) {
-                    if (!in_array($d['optional'], array('yes', 'no'))) {
-                        $this->_validateError(PEAR_PACKAGEFILE_ERROR_INVALID_DEPOPTIONAL,
-                            array('index' => $i, 'opt' => $d['optional']));
-                    }
-                }
-                if ($d['rel'] != 'has' && $d['rel'] != 'not' && empty($d['version'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DEPVERSION,
-                        array('index' => $i));
-                } elseif (($d['rel'] == 'has' || $d['rel'] == 'not') && !empty($d['version'])) {
-                    $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_DEPVERSION_IGNORED,
-                        array('index' => $i, 'rel' => $d['rel']));
-                }
-                if ($d['type'] == 'php' && !empty($d['name'])) {
-                    $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_DEPNAME_IGNORED,
-                        array('index' => $i, 'name' => $d['name']));
-                } elseif ($d['type'] != 'php' && empty($d['name'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DEPNAME,
-                        array('index' => $i));
-                }
-                if ($d['type'] == 'php' && empty($d['version'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DEPPHPVERSION,
-                        array('index' => $i));
-                }
-                if (($d['rel'] == 'not') && ($d['type'] == 'php')) {
-                    $this->_validateError(PEAR_PACKAGEFILE_PHP_NO_NOT,
-                        array('index' => $i));
-                }
-                $i++;
-            }
-        }
-        if (!empty($info['configure_options'])) {
-            $i = 1;
-            foreach ($info['configure_options'] as $c) {
-                if (empty($c['name'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_CONFNAME,
-                        array('index' => $i));
-                }
-                if (empty($c['prompt'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_CONFPROMPT,
-                        array('index' => $i));
-                }
-                $i++;
-            }
-        }
-        if (empty($info['filelist'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_FILES);
-            $errors[] = 'no files';
-        } else {
-            foreach ($info['filelist'] as $file => $fa) {
-                if (empty($fa['role'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_FILEROLE,
-                        array('file' => $file, 'roles' => PEAR_Common::getFileRoles()));
-                    continue;
-                } elseif (!in_array($fa['role'], PEAR_Common::getFileRoles())) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_INVALID_FILEROLE,
-                        array('file' => $file, 'role' => $fa['role'], 'roles' => PEAR_Common::getFileRoles()));
-                }
-                if ($file{0} == '.' && $file{1} == '/') {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_INVALID_FILENAME,
-                        array('file' => $file));
-                }
-            }
-        }
-        if (isset($this->_registry) && $this->_isValid) {
-            $chan = $this->_registry->getChannel('pear.php.net');
-            if (PEAR::isError($chan)) {
-                $this->_validateError(PEAR_PACKAGEFILE_ERROR_CHANNELVAL, $chan->getMessage());
-                return $this->_isValid = 0;
-            }
-            $validator = $chan->getValidationObject();
-            $validator->setPackageFile($this);
-            $validator->validate($state);
-            $failures = $validator->getFailures();
-            foreach ($failures['errors'] as $error) {
-                $this->_validateError(PEAR_PACKAGEFILE_ERROR_CHANNELVAL, $error);
-            }
-            foreach ($failures['warnings'] as $warning) {
-                $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_CHANNELVAL, $warning);
-            }
-        }
-        if ($this->_isValid && $state == PEAR_VALIDATE_PACKAGING && !$nofilechecking) {
-            if ($this->_analyzePhpFiles()) {
-                $this->_isValid = true;
-            }
-        }
-        if ($this->_isValid) {
-            return $this->_isValid = $state;
-        }
-        return $this->_isValid = 0;
-    }
-
-    function _analyzePhpFiles()
-    {
-        if (!$this->_isValid) {
-            return false;
-        }
-        if (!isset($this->_packageFile)) {
-            return false;
-        }
-        $dir_prefix = dirname($this->_packageFile);
-        $common = new PEAR_Common;
-        $log = isset($this->_logger) ? array(&$this->_logger, 'log') :
-            array($common, 'log');
-        $info = $this->getFilelist();
-        foreach ($info as $file => $fa) {
-            if (!file_exists($dir_prefix . DIRECTORY_SEPARATOR . $file)) {
-                $this->_validateError(PEAR_PACKAGEFILE_ERROR_FILE_NOTFOUND,
-                    array('file' => realpath($dir_prefix) . DIRECTORY_SEPARATOR . $file));
-                continue;
-            }
-            if ($fa['role'] == 'php' && $dir_prefix) {
-                call_user_func_array($log, array(1, "Analyzing $file"));
-                $srcinfo = $this->_analyzeSourceCode($dir_prefix . DIRECTORY_SEPARATOR . $file);
-                if ($srcinfo) {
-                    $this->_buildProvidesArray($srcinfo);
-                }
-            }
-        }
-        $this->_packageName = $pn = $this->getPackage();
-        $pnl = strlen($pn);
-        if (isset($this->_packageInfo['provides'])) {
-            foreach ((array) $this->_packageInfo['provides'] as $key => $what) {
-                if (isset($what['explicit'])) {
-                    // skip conformance checks if the provides entry is
-                    // specified in the package.xml file
-                    continue;
-                }
-                extract($what);
-                if ($type == 'class') {
-                    if (!strncasecmp($name, $pn, $pnl)) {
-                        continue;
-                    }
-                    $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_NO_PNAME_PREFIX,
-                        array('file' => $file, 'type' => $type, 'name' => $name, 'package' => $pn));
-                } elseif ($type == 'function') {
-                    if (strstr($name, '::') || !strncasecmp($name, $pn, $pnl)) {
-                        continue;
-                    }
-                    $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_NO_PNAME_PREFIX,
-                        array('file' => $file, 'type' => $type, 'name' => $name, 'package' => $pn));
-                }
-            }
-        }
-        return $this->_isValid;
-    }
-
-    /**
-     * Get the default xml generator object
-     *
-     * @return PEAR_PackageFile_Generator_v1
-     */
-    function &getDefaultGenerator()
-    {
-        if (!class_exists('PEAR_PackageFile_Generator_v1')) {
-            require_once 'PEAR/PackageFile/Generator/v1.php';
-        }
-        $a = &new PEAR_PackageFile_Generator_v1($this);
-        return $a;
-    }
-
-    /**
-     * Get the contents of a file listed within the package.xml
-     * @param string
-     * @return string
-     */
-    function getFileContents($file)
-    {
-        if ($this->_archiveFile == $this->_packageFile) { // unpacked
-            $dir = dirname($this->_packageFile);
-            $file = $dir . DIRECTORY_SEPARATOR . $file;
-            $file = str_replace(array('/', '\\'),
-                array(DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR), $file);
-            if (file_exists($file) && is_readable($file)) {
-                return implode('', file($file));
-            }
-        } else { // tgz
-            if (!class_exists('Archive_Tar')) {
-                require_once 'Archive/Tar.php';
-            }
-            $tar = &new Archive_Tar($this->_archiveFile);
-            $tar->pushErrorHandling(PEAR_ERROR_RETURN);
-            if ($file != 'package.xml' && $file != 'package2.xml') {
-                $file = $this->getPackage() . '-' . $this->getVersion() . '/' . $file;
-            }
-            $file = $tar->extractInString($file);
-            $tar->popErrorHandling();
-            if (PEAR::isError($file)) {
-                return PEAR::raiseError("Cannot locate file '$file' in archive");
-            }
-            return $file;
-        }
-    }
-
-    // {{{ analyzeSourceCode()
-    /**
-     * Analyze the source code of the given PHP file
-     *
-     * @param  string Filename of the PHP file
-     * @return mixed
-     * @access private
-     */
-    function _analyzeSourceCode($file)
-    {
-        if (!function_exists("token_get_all")) {
-            return false;
-        }
-        if (!defined('T_DOC_COMMENT')) {
-            define('T_DOC_COMMENT', T_COMMENT);
-        }
-        if (!defined('T_INTERFACE')) {
-            define('T_INTERFACE', -1);
-        }
-        if (!defined('T_IMPLEMENTS')) {
-            define('T_IMPLEMENTS', -1);
-        }
-        if (!$fp = @fopen($file, "r")) {
-            return false;
-        }
-        fclose($fp);
-        $contents = file_get_contents($file);
-        $tokens = token_get_all($contents);
-/*
-        for ($i = 0; $i < sizeof($tokens); $i++) {
-            @list($token, $data) = $tokens[$i];
-            if (is_string($token)) {
-                var_dump($token);
-            } else {
-                print token_name($token) . ' ';
-                var_dump(rtrim($data));
-            }
-        }
-*/
-        $look_for = 0;
-        $paren_level = 0;
-        $bracket_level = 0;
-        $brace_level = 0;
-        $lastphpdoc = '';
-        $current_class = '';
-        $current_interface = '';
-        $current_class_level = -1;
-        $current_function = '';
-        $current_function_level = -1;
-        $declared_classes = array();
-        $declared_interfaces = array();
-        $declared_functions = array();
-        $declared_methods = array();
-        $used_classes = array();
-        $used_functions = array();
-        $extends = array();
-        $implements = array();
-        $nodeps = array();
-        $inquote = false;
-        $interface = false;
-        for ($i = 0; $i < sizeof($tokens); $i++) {
-            if (is_array($tokens[$i])) {
-                list($token, $data) = $tokens[$i];
-            } else {
-                $token = $tokens[$i];
-                $data = '';
-            }
-            if ($inquote) {
-                if ($token != '"' && $token != T_END_HEREDOC) {
-                    continue;
-                } else {
-                    $inquote = false;
-                    continue;
-                }
-            }
-            switch ($token) {
-                case T_WHITESPACE :
-                    continue;
-                case ';':
-                    if ($interface) {
-                        $current_function = '';
-                        $current_function_level = -1;
-                    }
-                    break;
-                case '"':
-                case T_START_HEREDOC:
-                    $inquote = true;
-                    break;
-                case T_CURLY_OPEN:
-                case T_DOLLAR_OPEN_CURLY_BRACES:
-                case '{': $brace_level++; continue 2;
-                case '}':
-                    $brace_level--;
-                    if ($current_class_level == $brace_level) {
-                        $current_class = '';
-                        $current_class_level = -1;
-                    }
-                    if ($current_function_level == $brace_level) {
-                        $current_function = '';
-                        $current_function_level = -1;
-                    }
-                    continue 2;
-                case '[': $bracket_level++; continue 2;
-                case ']': $bracket_level--; continue 2;
-                case '(': $paren_level++;   continue 2;
-                case ')': $paren_level--;   continue 2;
-                case T_INTERFACE:
-                    $interface = true;
-                case T_CLASS:
-                    if (($current_class_level != -1) || ($current_function_level != -1)) {
-                        $this->_validateError(PEAR_PACKAGEFILE_ERROR_INVALID_PHPFILE,
-                            array('file' => $file));
-                        return false;
-                    }
-                case T_FUNCTION:
-                case T_NEW:
-                case T_EXTENDS:
-                case T_IMPLEMENTS:
-                    $look_for = $token;
-                    continue 2;
-                case T_STRING:
-                    if (version_compare(zend_version(), '2.0', '<')) {
-                        if (in_array(strtolower($data),
-                            array('public', 'private', 'protected', 'abstract',
-                                  'interface', 'implements', 'throw') 
-                                 )) {
-                            $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_PHP5,
-                                array($file));
-                        }
-                    }
-                    if ($look_for == T_CLASS) {
-                        $current_class = $data;
-                        $current_class_level = $brace_level;
-                        $declared_classes[] = $current_class;
-                    } elseif ($look_for == T_INTERFACE) {
-                        $current_interface = $data;
-                        $current_class_level = $brace_level;
-                        $declared_interfaces[] = $current_interface;
-                    } elseif ($look_for == T_IMPLEMENTS) {
-                        $implements[$current_class] = $data;
-                    } elseif ($look_for == T_EXTENDS) {
-                        $extends[$current_class] = $data;
-                    } elseif ($look_for == T_FUNCTION) {
-                        if ($current_class) {
-                            $current_function = "$current_class::$data";
-                            $declared_methods[$current_class][] = $data;
-                        } elseif ($current_interface) {
-                            $current_function = "$current_interface::$data";
-                            $declared_methods[$current_interface][] = $data;
-                        } else {
-                            $current_function = $data;
-                            $declared_functions[] = $current_function;
-                        }
-                        $current_function_level = $brace_level;
-                        $m = array();
-                    } elseif ($look_for == T_NEW) {
-                        $used_classes[$data] = true;
-                    }
-                    $look_for = 0;
-                    continue 2;
-                case T_VARIABLE:
-                    $look_for = 0;
-                    continue 2;
-                case T_DOC_COMMENT:
-                case T_COMMENT:
-                    if (preg_match('!^/\*\*\s!', $data)) {
-                        $lastphpdoc = $data;
-                        if (preg_match_all('/@nodep\s+(\S+)/', $lastphpdoc, $m)) {
-                            $nodeps = array_merge($nodeps, $m[1]);
-                        }
-                    }
-                    continue 2;
-                case T_DOUBLE_COLON:
-                    if (!($tokens[$i - 1][0] == T_WHITESPACE || $tokens[$i - 1][0] == T_STRING)) {
-                        $this->_validateError(PEAR_PACKAGEFILE_ERROR_INVALID_PHPFILE,
-                            array('file' => $file));
-                        return false;
-                    }
-                    $class = $tokens[$i - 1][1];
-                    if (strtolower($class) != 'parent') {
-                        $used_classes[$class] = true;
-                    }
-                    continue 2;
-            }
-        }
-        return array(
-            "source_file" => $file,
-            "declared_classes" => $declared_classes,
-            "declared_interfaces" => $declared_interfaces,
-            "declared_methods" => $declared_methods,
-            "declared_functions" => $declared_functions,
-            "used_classes" => array_diff(array_keys($used_classes), $nodeps),
-            "inheritance" => $extends,
-            "implements" => $implements,
-            );
-    }
-
-    /**
-     * Build a "provides" array from data returned by
-     * analyzeSourceCode().  The format of the built array is like
-     * this:
-     *
-     *  array(
-     *    'class;MyClass' => 'array('type' => 'class', 'name' => 'MyClass'),
-     *    ...
-     *  )
-     *
-     *
-     * @param array $srcinfo array with information about a source file
-     * as returned by the analyzeSourceCode() method.
-     *
-     * @return void
-     *
-     * @access private
-     *
-     */
-    function _buildProvidesArray($srcinfo)
-    {
-        if (!$this->_isValid) {
-            return false;
-        }
-        $file = basename($srcinfo['source_file']);
-        $pn = $this->getPackage();
-        $pnl = strlen($pn);
-        foreach ($srcinfo['declared_classes'] as $class) {
-            $key = "class;$class";
-            if (isset($this->_packageInfo['provides'][$key])) {
-                continue;
-            }
-            $this->_packageInfo['provides'][$key] =
-                array('file'=> $file, 'type' => 'class', 'name' => $class);
-            if (isset($srcinfo['inheritance'][$class])) {
-                $this->_packageInfo['provides'][$key]['extends'] =
-                    $srcinfo['inheritance'][$class];
-            }
-        }
-        foreach ($srcinfo['declared_methods'] as $class => $methods) {
-            foreach ($methods as $method) {
-                $function = "$class::$method";
-                $key = "function;$function";
-                if ($method{0} == '_' || !strcasecmp($method, $class) ||
-                    isset($this->_packageInfo['provides'][$key])) {
-                    continue;
-                }
-                $this->_packageInfo['provides'][$key] =
-                    array('file'=> $file, 'type' => 'function', 'name' => $function);
-            }
-        }
-
-        foreach ($srcinfo['declared_functions'] as $function) {
-            $key = "function;$function";
-            if ($function{0} == '_' || isset($this->_packageInfo['provides'][$key])) {
-                continue;
-            }
-            if (!strstr($function, '::') && strncasecmp($function, $pn, $pnl)) {
-                $warnings[] = "in1 " . $file . ": function \"$function\" not prefixed with package name \"$pn\"";
-            }
-            $this->_packageInfo['provides'][$key] =
-                array('file'=> $file, 'type' => 'function', 'name' => $function);
-        }
-    }
-
-    // }}}
-}
-?>
diff --git a/PEAR/PackageFile/v2.php b/PEAR/PackageFile/v2.php
deleted file mode 100644
index 879d8a6..0000000
--- a/PEAR/PackageFile/v2.php
+++ /dev/null
@@ -1,2028 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: v2.php,v 1.134 2006/09/25 05:12:21 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * For error handling
- */
-require_once 'PEAR/ErrorStack.php';
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile_v2
-{
-
-    /**
-     * Parsed package information
-     * @var array
-     * @access private
-     */
-    var $_packageInfo = array();
-
-    /**
-     * path to package .tgz or false if this is a local/extracted package.xml
-     * @var string|false
-     * @access private
-     */
-    var $_archiveFile;
-
-    /**
-     * path to package .xml or false if this is an abstract parsed-from-string xml
-     * @var string|false
-     * @access private
-     */
-    var $_packageFile;
-
-    /**
-     * This is used by file analysis routines to log progress information
-     * @var PEAR_Common
-     * @access protected
-     */
-    var $_logger;
-
-    /**
-     * This is set to the highest validation level that has been validated
-     *
-     * If the package.xml is invalid or unknown, this is set to 0.  If
-     * normal validation has occurred, this is set to PEAR_VALIDATE_NORMAL.  If
-     * downloading/installation validation has occurred it is set to PEAR_VALIDATE_DOWNLOADING
-     * or INSTALLING, and so on up to PEAR_VALIDATE_PACKAGING.  This allows validation
-     * "caching" to occur, which is particularly important for package validation, so
-     * that PHP files are not validated twice
-     * @var int
-     * @access private
-     */
-    var $_isValid = 0;
-
-    /**
-     * True if the filelist has been validated
-     * @param bool
-     */
-    var $_filesValid = false;
-
-    /**
-     * @var PEAR_Registry
-     * @access protected
-     */
-    var $_registry;
-
-    /**
-     * @var PEAR_Config
-     * @access protected
-     */
-    var $_config;
-
-    /**
-     * Optional Dependency group requested for installation
-     * @var string
-     * @access private
-     */
-    var $_requestedGroup = false;
-
-    /**
-     * @var PEAR_ErrorStack
-     * @access protected
-     */
-    var $_stack;
-
-    /**
-     * Namespace prefix used for tasks in this package.xml - use tasks: whenever possible
-     */
-    var $_tasksNs;
-
-    /**
-     * Determines whether this packagefile was initialized only with partial package info
-     *
-     * If this package file was constructed via parsing REST, it will only contain
-     *
-     * - package name
-     * - channel name
-     * - dependencies 
-     * @var boolean
-     * @access private
-     */
-    var $_incomplete = true;
-
-    /**
-     * @var PEAR_PackageFile_v2_Validator
-     */
-    var $_v2Validator;
-
-    /**
-     * The constructor merely sets up the private error stack
-     */
-    function PEAR_PackageFile_v2()
-    {
-        $this->_stack = new PEAR_ErrorStack('PEAR_PackageFile_v2', false, null);
-        $this->_isValid = false;
-    }
-
-    /**
-     * To make unit-testing easier
-     * @param PEAR_Frontend_*
-     * @param array options
-     * @param PEAR_Config
-     * @return PEAR_Downloader
-     * @access protected
-     */
-    function &getPEARDownloader(&$i, $o, &$c)
-    {
-        $z = &new PEAR_Downloader($i, $o, $c);
-        return $z;
-    }
-
-    /**
-     * To make unit-testing easier
-     * @param PEAR_Config
-     * @param array options
-     * @param array package name as returned from {@link PEAR_Registry::parsePackageName()}
-     * @param int PEAR_VALIDATE_* constant
-     * @return PEAR_Dependency2
-     * @access protected
-     */
-    function &getPEARDependency2(&$c, $o, $p, $s = PEAR_VALIDATE_INSTALLING)
-    {
-        if (!class_exists('PEAR_Dependency2')) {
-            require_once 'PEAR/Dependency2.php';
-        }
-        $z = &new PEAR_Dependency2($c, $o, $p, $s);
-        return $z;
-    }
-
-    function getInstalledBinary()
-    {
-        return isset($this->_packageInfo['#binarypackage']) ? $this->_packageInfo['#binarypackage'] :
-            false;
-    }
-
-    /**
-     * Installation of source package has failed, attempt to download and install the
-     * binary version of this package.
-     * @param PEAR_Installer
-     * @return array|false
-     */
-    function installBinary(&$installer)
-    {
-        if (!OS_WINDOWS) {
-            $a = false;
-            return $a;
-        }
-        if ($this->getPackageType() == 'extsrc' || $this->getPackageType() == 'zendextsrc') {
-            $releasetype = $this->getPackageType() . 'release';
-            if (!is_array($installer->getInstallPackages())) {
-                $a = false;
-                return $a;
-            }
-            foreach ($installer->getInstallPackages() as $p) {
-                if ($p->isExtension($this->_packageInfo['providesextension'])) {
-                    if ($p->getPackageType() != 'extsrc' && $p->getPackageType() != 'zendextsrc') {
-                        $a = false;
-                        return $a; // the user probably downloaded it separately
-                    }
-                }
-            }
-            if (isset($this->_packageInfo[$releasetype]['binarypackage'])) {
-                $installer->log(0, 'Attempting to download binary version of extension "' .
-                    $this->_packageInfo['providesextension'] . '"');
-                $params = $this->_packageInfo[$releasetype]['binarypackage'];
-                if (!is_array($params) || !isset($params[0])) {
-                    $params = array($params);
-                }
-                if (isset($this->_packageInfo['channel'])) {
-                    foreach ($params as $i => $param) {
-                        $params[$i] = array('channel' => $this->_packageInfo['channel'],
-                            'package' => $param, 'version' => $this->getVersion());
-                    }
-                }
-                $dl = &$this->getPEARDownloader($installer->ui, $installer->getOptions(),
-                    $installer->config);
-                $verbose = $dl->config->get('verbose');
-                $dl->config->set('verbose', -1);
-                foreach ($params as $param) {
-                    PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                    $ret = $dl->download(array($param));
-                    PEAR::popErrorHandling();
-                    if (is_array($ret) && count($ret)) {
-                        break;
-                    }
-                }
-                $dl->config->set('verbose', $verbose);
-                if (is_array($ret)) {
-                    if (count($ret) == 1) {
-                        $pf = $ret[0]->getPackageFile();
-                        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                        $err = $installer->install($ret[0]);
-                        PEAR::popErrorHandling();
-                        if (is_array($err)) {
-                            $this->_packageInfo['#binarypackage'] = $ret[0]->getPackage();
-                            // "install" self, so all dependencies will work transparently
-                            $this->_registry->addPackage2($this);
-                            $installer->log(0, 'Download and install of binary extension "' .
-                                $this->_registry->parsedPackageNameToString(
-                                    array('channel' => $pf->getChannel(),
-                                          'package' => $pf->getPackage()), true) . '" successful');
-                            $a = array($ret[0], $err);
-                            return $a;
-                        }
-                        $installer->log(0, 'Download and install of binary extension "' .
-                            $this->_registry->parsedPackageNameToString(
-                                    array('channel' => $pf->getChannel(),
-                                          'package' => $pf->getPackage()), true) . '" failed');
-                    }
-                }
-            }
-        }
-        $a = false;
-        return $a;
-    }
-
-    /**
-     * @return string|false Extension name
-     */
-    function getProvidesExtension()
-    {
-        if (in_array($this->getPackageType(),
-              array('extsrc', 'extbin', 'zendextsrc', 'zendextbin'))) {
-            if (isset($this->_packageInfo['providesextension'])) {
-                return $this->_packageInfo['providesextension'];
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param string Extension name
-     * @return bool
-     */
-    function isExtension($extension)
-    {
-        if (in_array($this->getPackageType(),
-              array('extsrc', 'extbin', 'zendextsrc', 'zendextbin'))) {
-            return $this->_packageInfo['providesextension'] == $extension;
-        }
-        return false;
-    }
-
-    /**
-     * Tests whether every part of the package.xml 1.0 is represented in
-     * this package.xml 2.0
-     * @param PEAR_PackageFile_v1
-     * @return bool
-     */
-    function isEquivalent($pf1)
-    {
-        if (!$pf1) {
-            return true;
-        }
-        if ($this->getPackageType() == 'bundle') {
-            return false;
-        }
-        $this->_stack->getErrors(true);
-        if (!$pf1->validate(PEAR_VALIDATE_NORMAL)) {
-            return false;
-        }
-        $pass = true;
-        if ($pf1->getPackage() != $this->getPackage()) {
-            $this->_differentPackage($pf1->getPackage());
-            $pass = false;
-        }
-        if ($pf1->getVersion() != $this->getVersion()) {
-            $this->_differentVersion($pf1->getVersion());
-            $pass = false;
-        }
-        if (trim($pf1->getSummary()) != $this->getSummary()) {
-            $this->_differentSummary($pf1->getSummary());
-            $pass = false;
-        }
-        if (preg_replace('/\s+/', '', $pf1->getDescription()) !=
-              preg_replace('/\s+/', '', $this->getDescription())) {
-            $this->_differentDescription($pf1->getDescription());
-            $pass = false;
-        }
-        if ($pf1->getState() != $this->getState()) {
-            $this->_differentState($pf1->getState());
-            $pass = false;
-        }
-        if (!strstr(preg_replace('/\s+/', '', $this->getNotes()),
-              preg_replace('/\s+/', '', $pf1->getNotes()))) {
-            $this->_differentNotes($pf1->getNotes());
-            $pass = false;
-        }
-        $mymaintainers = $this->getMaintainers();
-        $yourmaintainers = $pf1->getMaintainers();
-        for ($i1 = 0; $i1 < count($yourmaintainers); $i1++) {
-            $reset = false;
-            for ($i2 = 0; $i2 < count($mymaintainers); $i2++) {
-                if ($mymaintainers[$i2]['handle'] == $yourmaintainers[$i1]['handle']) {
-                    if ($mymaintainers[$i2]['role'] != $yourmaintainers[$i1]['role']) {
-                        $this->_differentRole($mymaintainers[$i2]['handle'],
-                            $yourmaintainers[$i1]['role'], $mymaintainers[$i2]['role']);
-                        $pass = false;
-                    }
-                    if ($mymaintainers[$i2]['email'] != $yourmaintainers[$i1]['email']) {
-                        $this->_differentEmail($mymaintainers[$i2]['handle'],
-                            $yourmaintainers[$i1]['email'], $mymaintainers[$i2]['email']);
-                        $pass = false;
-                    }
-                    if ($mymaintainers[$i2]['name'] != $yourmaintainers[$i1]['name']) {
-                        $this->_differentName($mymaintainers[$i2]['handle'],
-                            $yourmaintainers[$i1]['name'], $mymaintainers[$i2]['name']);
-                        $pass = false;
-                    }
-                    unset($mymaintainers[$i2]);
-                    $mymaintainers = array_values($mymaintainers);
-                    unset($yourmaintainers[$i1]);
-                    $yourmaintainers = array_values($yourmaintainers);
-                    $reset = true;
-                    break;
-                }
-            }
-            if ($reset) {
-                $i1 = -1;
-            }
-        }
-        $this->_unmatchedMaintainers($mymaintainers, $yourmaintainers);
-        $filelist = $this->getFilelist();
-        foreach ($pf1->getFilelist() as $file => $atts) {
-            if (!isset($filelist[$file])) {
-                $this->_missingFile($file);
-                $pass = false;
-            }
-        }
-        return $pass;
-    }
-
-    function _differentPackage($package)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('package' => $package,
-            'self' => $this->getPackage()),
-            'package.xml 1.0 package "%package%" does not match "%self%"');
-    }
-
-    function _differentVersion($version)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('version' => $version,
-            'self' => $this->getVersion()),
-            'package.xml 1.0 version "%version%" does not match "%self%"');
-    }
-
-    function _differentState($state)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('state' => $state,
-            'self' => $this->getState()),
-            'package.xml 1.0 state "%state%" does not match "%self%"');
-    }
-
-    function _differentRole($handle, $role, $selfrole)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('handle' => $handle,
-            'role' => $role, 'self' => $selfrole),
-            'package.xml 1.0 maintainer "%handle%" role "%role%" does not match "%self%"');
-    }
-
-    function _differentEmail($handle, $email, $selfemail)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('handle' => $handle,
-            'email' => $email, 'self' => $selfemail),
-            'package.xml 1.0 maintainer "%handle%" email "%email%" does not match "%self%"');
-    }
-
-    function _differentName($handle, $name, $selfname)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('handle' => $handle,
-            'name' => $name, 'self' => $selfname),
-            'package.xml 1.0 maintainer "%handle%" name "%name%" does not match "%self%"');
-    }
-
-    function _unmatchedMaintainers($my, $yours)
-    {
-        if ($my) {
-            array_walk($my, create_function('&$i, $k', '$i = $i["handle"];'));
-            $this->_stack->push(__FUNCTION__, 'error', array('handles' => $my),
-                'package.xml 2.0 has unmatched extra maintainers "%handles%"');
-        }
-        if ($yours) {
-            array_walk($yours, create_function('&$i, $k', '$i = $i["handle"];'));
-            $this->_stack->push(__FUNCTION__, 'error', array('handles' => $yours),
-                'package.xml 1.0 has unmatched extra maintainers "%handles%"');
-        }
-    }
-
-    function _differentNotes($notes)
-    {
-        $truncnotes = strlen($notes) < 25 ? $notes : substr($notes, 0, 24) . '...';
-        $truncmynotes = strlen($this->getNotes()) < 25 ? $this->getNotes() :
-            substr($this->getNotes(), 0, 24) . '...';
-        $this->_stack->push(__FUNCTION__, 'error', array('notes' => $truncnotes,
-            'self' => $truncmynotes),
-            'package.xml 1.0 release notes "%notes%" do not match "%self%"');
-    }
-
-    function _differentSummary($summary)
-    {
-        $truncsummary = strlen($summary) < 25 ? $summary : substr($summary, 0, 24) . '...';
-        $truncmysummary = strlen($this->getsummary()) < 25 ? $this->getSummary() :
-            substr($this->getsummary(), 0, 24) . '...';
-        $this->_stack->push(__FUNCTION__, 'error', array('summary' => $truncsummary,
-            'self' => $truncmysummary),
-            'package.xml 1.0 summary "%summary%" does not match "%self%"');
-    }
-
-    function _differentDescription($description)
-    {
-        $truncdescription = trim(strlen($description) < 25 ? $description : substr($description, 0, 24) . '...');
-        $truncmydescription = trim(strlen($this->getDescription()) < 25 ? $this->getDescription() :
-            substr($this->getdescription(), 0, 24) . '...');
-        $this->_stack->push(__FUNCTION__, 'error', array('description' => $truncdescription,
-            'self' => $truncmydescription),
-            'package.xml 1.0 description "%description%" does not match "%self%"');
-    }
-
-    function _missingFile($file)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('file' => $file),
-            'package.xml 1.0 file "%file%" is not present in ');
-    }
-
-    /**
-     * WARNING - do not use this function unless you know what you're doing
-     */
-    function setRawState($state)
-    {
-        $this->_packageInfo['stability']['release'] = $state;
-    }
-
-    /**
-     * WARNING - do not use this function unless you know what you're doing
-     */
-    function setRawCompatible($compatible)
-    {
-        $this->_packageInfo['compatible'] = $compatible;
-    }
-
-    /**
-     * WARNING - do not use this function unless you know what you're doing
-     */
-    function setRawPackage($package)
-    {
-        $this->_packageInfo['name'] = $package;
-    }
-
-    /**
-     * WARNING - do not use this function unless you know what you're doing
-     */
-    function setRawChannel($channel)
-    {
-        $this->_packageInfo['channel'] = $channel;
-    }
-
-    function setRequestedGroup($group)
-    {
-        $this->_requestedGroup = $group;
-    }
-
-    function getRequestedGroup()
-    {
-        if (isset($this->_requestedGroup)) {
-            return $this->_requestedGroup;
-        }
-        return false;
-    }
-
-    /**
-     * For saving in the registry.
-     *
-     * Set the last version that was installed
-     * @param string
-     */
-    function setLastInstalledVersion($version)
-    {
-        $this->_packageInfo['_lastversion'] = $version;
-    }
-
-    /**
-     * @return string|false
-     */
-    function getLastInstalledVersion()
-    {
-        if (isset($this->_packageInfo['_lastversion'])) {
-            return $this->_packageInfo['_lastversion'];
-        }
-        return false;
-    }
-
-    /**
-     * Determines whether this package.xml has post-install scripts or not
-     * @return array|false
-     */
-    function listPostinstallScripts()
-    {
-        $filelist = $this->getFilelist();
-        $contents = $this->getContents();
-        $contents = $contents['dir']['file'];
-        if (!is_array($contents) || !isset($contents[0])) {
-            $contents = array($contents);
-        }
-        $taskfiles = array();
-        foreach ($contents as $file) {
-            $atts = $file['attribs'];
-            unset($file['attribs']);
-            if (count($file)) {
-                $taskfiles[$atts['name']] = $file;
-            }
-        }
-        $common = new PEAR_Common;
-        $common->debug = $this->_config->get('verbose');
-        $this->_scripts = array();
-        $ret = array();
-        foreach ($taskfiles as $name => $tasks) {
-            if (!isset($filelist[$name])) {
-                // ignored files will not be in the filelist
-                continue;
-            }
-            $atts = $filelist[$name];
-            foreach ($tasks as $tag => $raw) {
-                $task = $this->getTask($tag);
-                $task = &new $task($this->_config, $common, PEAR_TASK_INSTALL);
-                if ($task->isScript()) {
-                    $ret[] = $filelist[$name]['installed_as'];
-                }
-            }
-        }
-        if (count($ret)) {
-            return $ret;
-        }
-        return false;
-    }
-
-    /**
-     * Initialize post-install scripts for running
-     *
-     * This method can be used to detect post-install scripts, as the return value
-     * indicates whether any exist
-     * @return bool
-     */
-    function initPostinstallScripts()
-    {
-        $filelist = $this->getFilelist();
-        $contents = $this->getContents();
-        $contents = $contents['dir']['file'];
-        if (!is_array($contents) || !isset($contents[0])) {
-            $contents = array($contents);
-        }
-        $taskfiles = array();
-        foreach ($contents as $file) {
-            $atts = $file['attribs'];
-            unset($file['attribs']);
-            if (count($file)) {
-                $taskfiles[$atts['name']] = $file;
-            }
-        }
-        $common = new PEAR_Common;
-        $common->debug = $this->_config->get('verbose');
-        $this->_scripts = array();
-        foreach ($taskfiles as $name => $tasks) {
-            if (!isset($filelist[$name])) {
-                // file was not installed due to installconditions
-                continue;
-            }
-            $atts = $filelist[$name];
-            foreach ($tasks as $tag => $raw) {
-                $taskname = $this->getTask($tag);
-                $task = &new $taskname($this->_config, $common, PEAR_TASK_INSTALL);
-                if (!$task->isScript()) {
-                    continue; // scripts are only handled after installation
-                }
-                $lastversion = isset($this->_packageInfo['_lastversion']) ?
-                    $this->_packageInfo['_lastversion'] : null;
-                $task->init($raw, $atts, $lastversion);
-                $res = $task->startSession($this, $atts['installed_as']);
-                if (!$res) {
-                    continue; // skip this file
-                }
-                if (PEAR::isError($res)) {
-                    return $res;
-                }
-                $assign = &$task;
-                $this->_scripts[] = &$assign;
-            }
-        }
-        if (count($this->_scripts)) {
-            return true;
-        }
-        return false;
-    }
-
-    function runPostinstallScripts()
-    {
-        if ($this->initPostinstallScripts()) {
-            $ui = &PEAR_Frontend::singleton();
-            if ($ui) {
-                $ui->runPostinstallScripts($this->_scripts, $this);
-            }
-        }
-    }
-
-
-    /**
-     * Convert a recursive set of  and  tags into a single  tag with
-     *  tags.
-     */
-    function flattenFilelist()
-    {
-        if (isset($this->_packageInfo['bundle'])) {
-            return;
-        }
-        $filelist = array();
-        if (isset($this->_packageInfo['contents']['dir']['dir'])) {
-            $this->_getFlattenedFilelist($filelist, $this->_packageInfo['contents']['dir']);
-            if (!isset($filelist[1])) {
-                $filelist = $filelist[0];
-            }
-            $this->_packageInfo['contents']['dir']['file'] = $filelist;
-            unset($this->_packageInfo['contents']['dir']['dir']);
-        } else {
-            // else already flattened but check for baseinstalldir propagation
-            if (isset($this->_packageInfo['contents']['dir']['attribs']['baseinstalldir'])) {
-                if (isset($this->_packageInfo['contents']['dir']['file'][0])) {
-                    foreach ($this->_packageInfo['contents']['dir']['file'] as $i => $file) {
-                        if (isset($file['attribs']['baseinstalldir'])) {
-                            continue;
-                        }
-                        $this->_packageInfo['contents']['dir']['file'][$i]['attribs']['baseinstalldir']
-                            = $this->_packageInfo['contents']['dir']['attribs']['baseinstalldir'];
-                    }
-                } else {
-                    if (!isset($this->_packageInfo['contents']['dir']['file']['attribs']['baseinstalldir'])) {
-                       $this->_packageInfo['contents']['dir']['file']['attribs']['baseinstalldir']
-                            = $this->_packageInfo['contents']['dir']['attribs']['baseinstalldir'];
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * @param array the final flattened file list
-     * @param array the current directory being processed
-     * @param string|false any recursively inherited baeinstalldir attribute
-     * @param string private recursion variable
-     * @return array
-     * @access protected
-     */
-    function _getFlattenedFilelist(&$files, $dir, $baseinstall = false, $path = '')
-    {
-        if (isset($dir['attribs']) && isset($dir['attribs']['baseinstalldir'])) {
-            $baseinstall = $dir['attribs']['baseinstalldir'];
-        }
-        if (isset($dir['dir'])) {
-            if (!isset($dir['dir'][0])) {
-                $dir['dir'] = array($dir['dir']);
-            }
-            foreach ($dir['dir'] as $subdir) {
-                if (!isset($subdir['attribs']) || !isset($subdir['attribs']['name'])) {
-                    $name = '*unknown*';
-                } else {
-                    $name = $subdir['attribs']['name'];
-                }
-                $newpath = empty($path) ? $name :
-                    $path . '/' . $name;
-                $this->_getFlattenedFilelist($files, $subdir,
-                    $baseinstall, $newpath);
-            }
-        }
-        if (isset($dir['file'])) {
-            if (!isset($dir['file'][0])) {
-                $dir['file'] = array($dir['file']);
-            }
-            foreach ($dir['file'] as $file) {
-                $attrs = $file['attribs'];
-                $name = $attrs['name'];
-                if ($baseinstall && !isset($attrs['baseinstalldir'])) {
-                    $attrs['baseinstalldir'] = $baseinstall;
-                }
-                $attrs['name'] = empty($path) ? $name : $path . '/' . $name;
-                $attrs['name'] = preg_replace(array('!\\\\+!', '!/+!'), array('/', '/'),
-                    $attrs['name']);
-                $file['attribs'] = $attrs;
-                $files[] = $file;
-            }
-        }
-    }
-
-    function setConfig(&$config)
-    {
-        $this->_config = &$config;
-        $this->_registry = &$config->getRegistry();
-    }
-
-    function setLogger(&$logger)
-    {
-        if (!is_object($logger) || !method_exists($logger, 'log')) {
-            return PEAR::raiseError('Logger must be compatible with PEAR_Common::log');
-        }
-        $this->_logger = &$logger;
-    }
-
-    /**
-     * WARNING - do not use this function directly unless you know what you're doing
-     */
-    function setDeps($deps)
-    {
-        $this->_packageInfo['dependencies'] = $deps;
-    }
-
-    function setPackagefile($file, $archive = false)
-    {
-        $this->_packageFile = $file;
-        $this->_archiveFile = $archive ? $archive : $file;
-    }
-
-    /**
-     * Wrapper to {@link PEAR_ErrorStack::getErrors()}
-     * @param boolean determines whether to purge the error stack after retrieving
-     * @return array
-     */
-    function getValidationWarnings($purge = true)
-    {
-        return $this->_stack->getErrors($purge);
-    }
-
-    function getPackageFile()
-    {
-        return $this->_packageFile;
-    }
-
-    function getArchiveFile()
-    {
-        return $this->_archiveFile;
-    }
-
-
-    /**
-     * Directly set the array that defines this packagefile
-     *
-     * WARNING: no validation.  This should only be performed by internal methods
-     * inside PEAR or by inputting an array saved from an existing PEAR_PackageFile_v2
-     * @param array
-     */
-    function fromArray($pinfo)
-    {
-        unset($pinfo['old']);
-        unset($pinfo['xsdversion']);
-        $this->_incomplete = false;
-        $this->_packageInfo = $pinfo;
-    }
-
-    function isIncomplete()
-    {
-        return $this->_incomplete;
-    }
-
-    /**
-     * @return array
-     */
-    function toArray($forreg = false)
-    {
-        if (!$this->validate(PEAR_VALIDATE_NORMAL)) {
-            return false;
-        }
-        return $this->getArray($forreg);
-    }
-
-    function getArray($forReg = false)
-    {
-        if ($forReg) {
-            $arr = $this->_packageInfo;
-            $arr['old'] = array();
-            $arr['old']['version'] = $this->getVersion();
-            $arr['old']['release_date'] = $this->getDate();
-            $arr['old']['release_state'] = $this->getState();
-            $arr['old']['release_license'] = $this->getLicense();
-            $arr['old']['release_notes'] = $this->getNotes();
-            $arr['old']['release_deps'] = $this->getDeps();
-            $arr['old']['maintainers'] = $this->getMaintainers();
-            $arr['xsdversion'] = '2.0';
-            return $arr;
-        } else {
-            $info = $this->_packageInfo;
-            unset($info['dirtree']);
-            if (isset($info['_lastversion'])) {
-                unset($info['_lastversion']);
-            }
-            if (isset($info['#binarypackage'])) {
-                unset($info['#binarypackage']);
-            }
-            return $info;
-        }
-    }
-
-    function packageInfo($field)
-    {
-        $arr = $this->getArray(true);
-        if ($field == 'state') {
-            return $arr['stability']['release'];
-        }
-        if ($field == 'api-version') {
-            return $arr['version']['api'];
-        }
-        if ($field == 'api-state') {
-            return $arr['stability']['api'];
-        }
-        if (isset($arr['old'][$field])) {
-            if (!is_string($arr['old'][$field])) {
-                return null;
-            }
-            return $arr['old'][$field];
-        }
-        if (isset($arr[$field])) {
-            if (!is_string($arr[$field])) {
-                return null;
-            }
-            return $arr[$field];
-        }
-        return null;
-    }
-
-    function getName()
-    {
-        return $this->getPackage();
-    }
-
-    function getPackage()
-    {
-        if (isset($this->_packageInfo['name'])) {
-            return $this->_packageInfo['name'];
-        }
-        return false;
-    }
-
-    function getChannel()
-    {
-        if (isset($this->_packageInfo['uri'])) {
-            return '__uri';
-        }
-        if (isset($this->_packageInfo['channel'])) {
-            return strtolower($this->_packageInfo['channel']);
-        }
-        return false;
-    }
-
-    function getUri()
-    {
-        if (isset($this->_packageInfo['uri'])) {
-            return $this->_packageInfo['uri'];
-        }
-        return false;
-    }
-
-    function getExtends()
-    {
-        if (isset($this->_packageInfo['extends'])) {
-            return $this->_packageInfo['extends'];
-        }
-        return false;
-    }
-
-    function getSummary()
-    {
-        if (isset($this->_packageInfo['summary'])) {
-            return $this->_packageInfo['summary'];
-        }
-        return false;
-    }
-
-    function getDescription()
-    {
-        if (isset($this->_packageInfo['description'])) {
-            return $this->_packageInfo['description'];
-        }
-        return false;
-    }
-
-    function getMaintainers($raw = false)
-    {
-        if (!isset($this->_packageInfo['lead'])) {
-            return false;
-        }
-        if ($raw) {
-            $ret = array('lead' => $this->_packageInfo['lead']);
-            (isset($this->_packageInfo['developer'])) ?
-                $ret['developer'] = $this->_packageInfo['developer'] :null;
-            (isset($this->_packageInfo['contributor'])) ?
-                $ret['contributor'] = $this->_packageInfo['contributor'] :null;
-            (isset($this->_packageInfo['helper'])) ?
-                $ret['helper'] = $this->_packageInfo['helper'] :null;
-            return $ret;
-        } else {
-            $ret = array();
-            $leads = isset($this->_packageInfo['lead'][0]) ? $this->_packageInfo['lead'] :
-                array($this->_packageInfo['lead']);
-            foreach ($leads as $lead) {
-                $s = $lead;
-                $s['handle'] = $s['user'];
-                unset($s['user']);
-                $s['role'] = 'lead';
-                $ret[] = $s;
-            }
-            if (isset($this->_packageInfo['developer'])) {
-                $leads = isset($this->_packageInfo['developer'][0]) ?
-                    $this->_packageInfo['developer'] :
-                    array($this->_packageInfo['developer']);
-                foreach ($leads as $maintainer) {
-                    $s = $maintainer;
-                    $s['handle'] = $s['user'];
-                    unset($s['user']);
-                    $s['role'] = 'developer';
-                    $ret[] = $s;
-                }
-            }
-            if (isset($this->_packageInfo['contributor'])) {
-                $leads = isset($this->_packageInfo['contributor'][0]) ?
-                    $this->_packageInfo['contributor'] :
-                    array($this->_packageInfo['contributor']);
-                foreach ($leads as $maintainer) {
-                    $s = $maintainer;
-                    $s['handle'] = $s['user'];
-                    unset($s['user']);
-                    $s['role'] = 'contributor';
-                    $ret[] = $s;
-                }
-            }
-            if (isset($this->_packageInfo['helper'])) {
-                $leads = isset($this->_packageInfo['helper'][0]) ?
-                    $this->_packageInfo['helper'] :
-                    array($this->_packageInfo['helper']);
-                foreach ($leads as $maintainer) {
-                    $s = $maintainer;
-                    $s['handle'] = $s['user'];
-                    unset($s['user']);
-                    $s['role'] = 'helper';
-                    $ret[] = $s;
-                }
-            }
-            return $ret;
-        }
-        return false;
-    }
-
-    function getLeads()
-    {
-        if (isset($this->_packageInfo['lead'])) {
-            return $this->_packageInfo['lead'];
-        }
-        return false;
-    }
-
-    function getDevelopers()
-    {
-        if (isset($this->_packageInfo['developer'])) {
-            return $this->_packageInfo['developer'];
-        }
-        return false;
-    }
-
-    function getContributors()
-    {
-        if (isset($this->_packageInfo['contributor'])) {
-            return $this->_packageInfo['contributor'];
-        }
-        return false;
-    }
-
-    function getHelpers()
-    {
-        if (isset($this->_packageInfo['helper'])) {
-            return $this->_packageInfo['helper'];
-        }
-        return false;
-    }
-
-    function setDate($date)
-    {
-        if (!isset($this->_packageInfo['date'])) {
-            // ensure that the extends tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('time', 'version',
-                    'stability', 'license', 'notes', 'contents', 'compatible',
-                    'dependencies', 'providesextension', 'srcpackage', 'srcuri',
-                    'phprelease', 'extsrcrelease', 'extbinrelease', 'zendextsrcrelease',
-                    'zendextbinrelease', 'bundle', 'changelog'), array(), 'date');
-        }
-        $this->_packageInfo['date'] = $date;
-        $this->_isValid = 0;
-    }
-
-    function setTime($time)
-    {
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['time'])) {
-            // ensure that the time tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                    array('version',
-                    'stability', 'license', 'notes', 'contents', 'compatible',
-                    'dependencies', 'providesextension', 'srcpackage', 'srcuri',
-                    'phprelease', 'extsrcrelease', 'extbinrelease', 'zendextsrcrelease',
-                    'zendextbinrelease', 'bundle', 'changelog'), $time, 'time');
-        }
-        $this->_packageInfo['time'] = $time;
-    }
-
-    function getDate()
-    {
-        if (isset($this->_packageInfo['date'])) {
-            return $this->_packageInfo['date'];
-        }
-        return false;
-    }
-
-    function getTime()
-    {
-        if (isset($this->_packageInfo['time'])) {
-            return $this->_packageInfo['time'];
-        }
-        return false;
-    }
-
-    /**
-     * @param package|api version category to return
-     */
-    function getVersion($key = 'release')
-    {
-        if (isset($this->_packageInfo['version'][$key])) {
-            return $this->_packageInfo['version'][$key];
-        }
-        return false;
-    }
-
-    function getStability()
-    {
-        if (isset($this->_packageInfo['stability'])) {
-            return $this->_packageInfo['stability'];
-        }
-        return false;
-    }
-
-    function getState($key = 'release')
-    {
-        if (isset($this->_packageInfo['stability'][$key])) {
-            return $this->_packageInfo['stability'][$key];
-        }
-        return false;
-    }
-
-    function getLicense($raw = false)
-    {
-        if (isset($this->_packageInfo['license'])) {
-            if ($raw) {
-                return $this->_packageInfo['license'];
-            }
-            if (is_array($this->_packageInfo['license'])) {
-                return $this->_packageInfo['license']['_content'];
-            } else {
-                return $this->_packageInfo['license'];
-            }
-        }
-        return false;
-    }
-
-    function getLicenseLocation()
-    {
-        if (!isset($this->_packageInfo['license']) || !is_array($this->_packageInfo['license'])) {
-            return false;
-        }
-        return $this->_packageInfo['license']['attribs'];
-    }
-
-    function getNotes()
-    {
-        if (isset($this->_packageInfo['notes'])) {
-            return $this->_packageInfo['notes'];
-        }
-        return false;
-    }
-
-    /**
-     * Return the  tag contents, if any
-     * @return array|false
-     */
-    function getUsesrole()
-    {
-        if (isset($this->_packageInfo['usesrole'])) {
-            return $this->_packageInfo['usesrole'];
-        }
-        return false;
-    }
-
-    /**
-     * Return the  tag contents, if any
-     * @return array|false
-     */
-    function getUsestask()
-    {
-        if (isset($this->_packageInfo['usestask'])) {
-            return $this->_packageInfo['usestask'];
-        }
-        return false;
-    }
-
-    /**
-     * This should only be used to retrieve filenames and install attributes
-     */
-    function getFilelist($preserve = false)
-    {
-        if (isset($this->_packageInfo['filelist']) && !$preserve) {
-            return $this->_packageInfo['filelist'];
-        }
-        $this->flattenFilelist();
-        if ($contents = $this->getContents()) {
-            $ret = array();
-            if (!isset($contents['dir']['file'][0])) {
-                $contents['dir']['file'] = array($contents['dir']['file']);
-            }
-            foreach ($contents['dir']['file'] as $file) {
-                $name = $file['attribs']['name'];
-                if (!$preserve) {
-                    $file = $file['attribs'];
-                }
-                $ret[$name] = $file;
-            }
-            if (!$preserve) {
-                $this->_packageInfo['filelist'] = $ret;
-            }
-            return $ret;
-        }
-        return false;
-    }
-
-    /**
-     * Return configure options array, if any
-     *
-     * @return array|false
-     */
-    function getConfigureOptions()
-    {
-        if ($this->getPackageType() != 'extsrc' && $this->getPackageType() != 'zendextsrc') {
-            return false;
-        }
-        $releases = $this->getReleases();
-        if (isset($releases[0])) {
-            $releases = $releases[0];
-        }
-        if (isset($releases['configureoption'])) {
-            if (!isset($releases['configureoption'][0])) {
-                $releases['configureoption'] = array($releases['configureoption']);
-            }
-            for ($i = 0; $i < count($releases['configureoption']); $i++) {
-                $releases['configureoption'][$i] = $releases['configureoption'][$i]['attribs'];
-            }
-            return $releases['configureoption'];
-        }
-        return false;
-    }
-
-    /**
-     * This is only used at install-time, after all serialization
-     * is over.
-     */
-    function resetFilelist()
-    {
-        $this->_packageInfo['filelist'] = array();
-    }
-
-    /**
-     * Retrieve a list of files that should be installed on this computer
-     * @return array
-     */
-    function getInstallationFilelist($forfilecheck = false)
-    {
-        $contents = $this->getFilelist(true);
-        if (isset($contents['dir']['attribs']['baseinstalldir'])) {
-            $base = $contents['dir']['attribs']['baseinstalldir'];
-        }
-        if (isset($this->_packageInfo['bundle'])) {
-            return PEAR::raiseError(
-                'Exception: bundles should be handled in download code only');
-        }
-        $release = $this->getReleases();
-        if ($release) {
-            if (!isset($release[0])) {
-                if (!isset($release['installconditions']) && !isset($release['filelist'])) {
-                    if ($forfilecheck) {
-                        return $this->getFilelist();
-                    }
-                    return $contents;
-                }
-                $release = array($release);
-            }
-            $depchecker = &$this->getPEARDependency2($this->_config, array(),
-                array('channel' => $this->getChannel(), 'package' => $this->getPackage()),
-                PEAR_VALIDATE_INSTALLING);
-            foreach ($release as $instance) {
-                if (isset($instance['installconditions'])) {
-                    $installconditions = $instance['installconditions'];
-                    if (is_array($installconditions)) {
-                        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                        foreach ($installconditions as $type => $conditions) {
-                            if (!isset($conditions[0])) {
-                                $conditions = array($conditions);
-                            }
-                            foreach ($conditions as $condition) {
-                                $ret = $depchecker->{"validate{$type}Dependency"}($condition);
-                                if (PEAR::isError($ret)) {
-                                    PEAR::popErrorHandling();
-                                    continue 3; // skip this release
-                                }
-                            }
-                        }
-                        PEAR::popErrorHandling();
-                    }
-                }
-                // this is the release to use
-                if (isset($instance['filelist'])) {
-                    // ignore files
-                    if (isset($instance['filelist']['ignore'])) {
-                        $ignore = isset($instance['filelist']['ignore'][0]) ?
-                            $instance['filelist']['ignore'] :
-                            array($instance['filelist']['ignore']);
-                        foreach ($ignore as $ig) {
-                            unset ($contents[$ig['attribs']['name']]);
-                        }
-                    }
-                    // install files as this name
-                    if (isset($instance['filelist']['install'])) {
-                        $installas = isset($instance['filelist']['install'][0]) ?
-                            $instance['filelist']['install'] :
-                            array($instance['filelist']['install']);
-                        foreach ($installas as $as) {
-                            $contents[$as['attribs']['name']]['attribs']['install-as'] =
-                                $as['attribs']['as'];
-                        }
-                    }
-                }
-                if ($forfilecheck) {
-                    foreach ($contents as $file => $attrs) {
-                        $contents[$file] = $attrs['attribs'];
-                    }
-                }
-                return $contents;
-            }
-        } else { // simple release - no installconditions or install-as
-            if ($forfilecheck) {
-                return $this->getFilelist();
-            }
-            return $contents;
-        }
-        // no releases matched
-        return PEAR::raiseError('No releases in package.xml matched the existing operating ' .
-            'system, extensions installed, or architecture, cannot install');
-    }
-
-    /**
-     * This is only used at install-time, after all serialization
-     * is over.
-     * @param string file name
-     * @param string installed path
-     */
-    function setInstalledAs($file, $path)
-    {
-        if ($path) {
-            return $this->_packageInfo['filelist'][$file]['installed_as'] = $path;
-        }
-        unset($this->_packageInfo['filelist'][$file]['installed_as']);
-    }
-
-    function getInstalledLocation($file)
-    {
-        if (isset($this->_packageInfo['filelist'][$file]['installed_as'])) {
-            return $this->_packageInfo['filelist'][$file]['installed_as'];
-        }
-        return false;
-    }
-
-    /**
-     * This is only used at install-time, after all serialization
-     * is over.
-     */
-    function installedFile($file, $atts)
-    {
-        if (isset($this->_packageInfo['filelist'][$file])) {
-            $this->_packageInfo['filelist'][$file] =
-                array_merge($this->_packageInfo['filelist'][$file], $atts['attribs']);
-        } else {
-            $this->_packageInfo['filelist'][$file] = $atts['attribs'];
-        }
-    }
-
-    /**
-     * Retrieve the contents tag
-     */
-    function getContents()
-    {
-        if (isset($this->_packageInfo['contents'])) {
-            return $this->_packageInfo['contents'];
-        }
-        return false;
-    }
-
-    /**
-     * @param string full path to file
-     * @param string attribute name
-     * @param string attribute value
-     * @param int risky but fast - use this to choose a file based on its position in the list
-     *            of files.  Index is zero-based like PHP arrays.
-     * @return bool success of operation
-     */
-    function setFileAttribute($filename, $attr, $value, $index = false)
-    {
-        $this->_isValid = 0;
-        if (in_array($attr, array('role', 'name', 'baseinstalldir'))) {
-            $this->_filesValid = false;
-        }
-        if ($index !== false &&
-              isset($this->_packageInfo['contents']['dir']['file'][$index]['attribs'])) {
-            $this->_packageInfo['contents']['dir']['file'][$index]['attribs'][$attr] = $value;
-            return true;
-        }
-        if (!isset($this->_packageInfo['contents']['dir']['file'])) {
-            return false;
-        }
-        $files = $this->_packageInfo['contents']['dir']['file'];
-        if (!isset($files[0])) {
-            $files = array($files);
-            $ind = false;
-        } else {
-            $ind = true;
-        }
-        foreach ($files as $i => $file) {
-            if (isset($file['attribs'])) {
-                if ($file['attribs']['name'] == $filename) {
-                    if ($ind) {
-                        $this->_packageInfo['contents']['dir']['file'][$i]['attribs'][$attr] = $value;
-                    } else {
-                        $this->_packageInfo['contents']['dir']['file']['attribs'][$attr] = $value;
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    function setDirtree($path)
-    {
-        $this->_packageInfo['dirtree'][$path] = true;
-    }
-
-    function getDirtree()
-    {
-        if (isset($this->_packageInfo['dirtree']) && count($this->_packageInfo['dirtree'])) {
-            return $this->_packageInfo['dirtree'];
-        }
-        return false;
-    }
-
-    function resetDirtree()
-    {
-        unset($this->_packageInfo['dirtree']);
-    }
-
-    /**
-     * Determines whether this package claims it is compatible with the version of
-     * the package that has a recommended version dependency
-     * @param PEAR_PackageFile_v2|PEAR_PackageFile_v1|PEAR_Downloader_Package
-     * @return boolean
-     */
-    function isCompatible($pf)
-    {
-        if (!isset($this->_packageInfo['compatible'])) {
-            return false;
-        }
-        if (!isset($this->_packageInfo['channel'])) {
-            return false;
-        }
-        $me = $pf->getVersion();
-        $compatible = $this->_packageInfo['compatible'];
-        if (!isset($compatible[0])) {
-            $compatible = array($compatible);
-        }
-        $found = false;
-        foreach ($compatible as $info) {
-            if (strtolower($info['name']) == strtolower($pf->getPackage())) {
-                if (strtolower($info['channel']) == strtolower($pf->getChannel())) {
-                    $found = true;
-                    break;
-                }
-            }
-        }
-        if (!$found) {
-            return false;
-        }
-        if (isset($info['exclude'])) {
-            if (!isset($info['exclude'][0])) {
-                $info['exclude'] = array($info['exclude']);
-            }
-            foreach ($info['exclude'] as $exclude) {
-                if (version_compare($me, $exclude, '==')) {
-                    return false;
-                }
-            }
-        }
-        if (version_compare($me, $info['min'], '>=') && version_compare($me, $info['max'], '<=')) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @return array|false
-     */
-    function getCompatible()
-    {
-        if (isset($this->_packageInfo['compatible'])) {
-            return $this->_packageInfo['compatible'];
-        }
-        return false;
-    }
-
-    function getDependencies()
-    {
-        if (isset($this->_packageInfo['dependencies'])) {
-            return $this->_packageInfo['dependencies'];
-        }
-        return false;
-    }
-
-    function isSubpackageOf($p)
-    {
-        return $p->isSubpackage($this);
-    }
-
-    /**
-     * Determines whether the passed in package is a subpackage of this package.
-     *
-     * No version checking is done, only name verification.
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @return bool
-     */
-    function isSubpackage($p)
-    {
-        $sub = array();
-        if (isset($this->_packageInfo['dependencies']['required']['subpackage'])) {
-            $sub = $this->_packageInfo['dependencies']['required']['subpackage'];
-            if (!isset($sub[0])) {
-                $sub = array($sub);
-            }
-        }
-        if (isset($this->_packageInfo['dependencies']['optional']['subpackage'])) {
-            $sub1 = $this->_packageInfo['dependencies']['optional']['subpackage'];
-            if (!isset($sub1[0])) {
-                $sub1 = array($sub1);
-            }
-            $sub = array_merge($sub, $sub1);
-        }
-        if (isset($this->_packageInfo['dependencies']['group'])) {
-            $group = $this->_packageInfo['dependencies']['group'];
-            if (!isset($group[0])) {
-                $group = array($group);
-            }
-            foreach ($group as $deps) {
-                if (isset($deps['subpackage'])) {
-                    $sub2 = $deps['subpackage'];
-                    if (!isset($sub2[0])) {
-                        $sub2 = array($sub2);
-                    }
-                    $sub = array_merge($sub, $sub2);
-                }
-            }
-        }
-        foreach ($sub as $dep) {
-            if (strtolower($dep['name']) == strtolower($p->getPackage())) {
-                if (isset($dep['channel'])) {
-                    if (strtolower($dep['channel']) == strtolower($p->getChannel())) {
-                        return true;
-                    }
-                } else {
-                    if ($dep['uri'] == $p->getURI()) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    function dependsOn($package, $channel)
-    {
-        if (!($deps = $this->getDependencies())) {
-            return false;
-        }
-        foreach (array('package', 'subpackage') as $type) {
-            foreach (array('required', 'optional') as $needed) {
-                if (isset($deps[$needed][$type])) {
-                    if (!isset($deps[$needed][$type][0])) {
-                        $deps[$needed][$type] = array($deps[$needed][$type]);
-                    }
-                    foreach ($deps[$needed][$type] as $dep) {
-                        $depchannel = isset($dep['channel']) ? $dep['channel'] : '__uri';
-                        if (strtolower($dep['name']) == strtolower($package) &&
-                              $depchannel == $channel) {
-                            return true;
-                        }  
-                    }
-                }
-            }
-            if (isset($deps['group'])) {
-                if (!isset($deps['group'][0])) {
-                    $dep['group'] = array($deps['group']);
-                }
-                foreach ($deps['group'] as $group) {
-                    if (isset($group[$type])) {
-                        if (!is_array($group[$type])) {
-                            $group[$type] = array($group[$type]);
-                        }
-                        foreach ($group[$type] as $dep) {
-                            $depchannel = isset($dep['channel']) ? $dep['channel'] : '__uri';
-                            if (strtolower($dep['name']) == strtolower($package) &&
-                                  $depchannel == $channel) {
-                                return true;
-                            }  
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Get the contents of a dependency group
-     * @param string
-     * @return array|false
-     */
-    function getDependencyGroup($name)
-    {
-        $name = strtolower($name);
-        if (!isset($this->_packageInfo['dependencies']['group'])) {
-            return false;
-        }
-        $groups = $this->_packageInfo['dependencies']['group'];
-        if (!isset($groups[0])) {
-            $groups = array($groups);
-        }
-        foreach ($groups as $group) {
-            if (strtolower($group['attribs']['name']) == $name) {
-                return $group;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Retrieve a partial package.xml 1.0 representation of dependencies
-     *
-     * a very limited representation of dependencies is returned by this method.
-     * The  tag for excluding certain versions of a dependency is
-     * completely ignored.  In addition, dependency groups are ignored, with the
-     * assumption that all dependencies in dependency groups are also listed in
-     * the optional group that work with all dependency groups
-     * @param boolean return package.xml 2.0  tag
-     * @return array|false
-     */
-    function getDeps($raw = false, $nopearinstaller = false)
-    {
-        if (isset($this->_packageInfo['dependencies'])) {
-            if ($raw) {
-                return $this->_packageInfo['dependencies'];
-            }
-            $ret = array();
-            $map = array(
-                'php' => 'php',
-                'package' => 'pkg',
-                'subpackage' => 'pkg',
-                'extension' => 'ext',
-                'os' => 'os',
-                'pearinstaller' => 'pkg',
-                );
-            foreach (array('required', 'optional') as $type) {
-                $optional = ($type == 'optional') ? 'yes' : 'no';
-                if (!isset($this->_packageInfo['dependencies'][$type])) {
-                    continue;
-                }
-                foreach ($this->_packageInfo['dependencies'][$type] as $dtype => $deps) {
-                    if ($dtype == 'pearinstaller' && $nopearinstaller) {
-                        continue;
-                    }
-                    if (!isset($deps[0])) {
-                        $deps = array($deps);
-                    }
-                    foreach ($deps as $dep) {
-                        if (!isset($map[$dtype])) {
-                            // no support for arch type
-                            continue;
-                        }
-                        if ($dtype == 'pearinstaller') {
-                            $dep['name'] = 'PEAR';
-                            $dep['channel'] = 'pear.php.net';
-                        }
-                        $s = array('type' => $map[$dtype]);
-                        if (isset($dep['channel'])) {
-                            $s['channel'] = $dep['channel'];
-                        }
-                        if (isset($dep['uri'])) {
-                            $s['uri'] = $dep['uri'];
-                        }
-                        if (isset($dep['name'])) {
-                            $s['name'] = $dep['name'];
-                        }
-                        if (isset($dep['conflicts'])) {
-                            $s['rel'] = 'not';
-                        } else {
-                            if (!isset($dep['min']) &&
-                                  !isset($dep['max'])) {
-                                $s['rel'] = 'has';
-                                $s['optional'] = $optional;
-                            } elseif (isset($dep['min']) &&
-                                  isset($dep['max'])) {
-                                $s['rel'] = 'ge';
-                                $s1 = $s;
-                                $s1['rel'] = 'le';
-                                $s['version'] = $dep['min'];
-                                $s1['version'] = $dep['max'];
-                                if (isset($dep['channel'])) {
-                                    $s1['channel'] = $dep['channel'];
-                                }
-                                if ($dtype != 'php') {
-                                    $s['name'] = $dep['name'];
-                                    $s1['name'] = $dep['name'];
-                                }
-                                $s['optional'] = $optional;
-                                $s1['optional'] = $optional;
-                                $ret[] = $s1;
-                            } elseif (isset($dep['min'])) {
-                                if (isset($dep['exclude']) &&
-                                      $dep['exclude'] == $dep['min']) {
-                                    $s['rel'] = 'gt';
-                                } else {
-                                    $s['rel'] = 'ge';
-                                }
-                                $s['version'] = $dep['min'];
-                                $s['optional'] = $optional;
-                                if ($dtype != 'php') {
-                                    $s['name'] = $dep['name'];
-                                }
-                            } elseif (isset($dep['max'])) {
-                                if (isset($dep['exclude']) &&
-                                      $dep['exclude'] == $dep['max']) {
-                                    $s['rel'] = 'lt';
-                                } else {
-                                    $s['rel'] = 'le';
-                                }
-                                $s['version'] = $dep['max'];
-                                $s['optional'] = $optional;
-                                if ($dtype != 'php') {
-                                    $s['name'] = $dep['name'];
-                                }
-                            }
-                        }
-                        $ret[] = $s;
-                    }
-                }
-            }
-            if (count($ret)) {
-                return $ret;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @return php|extsrc|extbin|zendextsrc|zendextbin|bundle|false
-     */
-    function getPackageType()
-    {
-        if (isset($this->_packageInfo['phprelease'])) {
-            return 'php';
-        }
-        if (isset($this->_packageInfo['extsrcrelease'])) {
-            return 'extsrc';
-        }
-        if (isset($this->_packageInfo['extbinrelease'])) {
-            return 'extbin';
-        }
-        if (isset($this->_packageInfo['zendextsrcrelease'])) {
-            return 'zendextsrc';
-        }
-        if (isset($this->_packageInfo['zendextbinrelease'])) {
-            return 'zendextbin';
-        }
-        if (isset($this->_packageInfo['bundle'])) {
-            return 'bundle';
-        }
-        return false;
-    }
-
-    /**
-     * @return array|false
-     */
-    function getReleases()
-    {
-        $type = $this->getPackageType();
-        if ($type != 'bundle') {
-            $type .= 'release';
-        }
-        if ($this->getPackageType() && isset($this->_packageInfo[$type])) {
-            return $this->_packageInfo[$type];
-        }
-        return false;
-    }
-
-    /**
-     * @return array
-     */
-    function getChangelog()
-    {
-        if (isset($this->_packageInfo['changelog'])) {
-            return $this->_packageInfo['changelog'];
-        }
-        return false;
-    }
-
-    function hasDeps()
-    {
-        return isset($this->_packageInfo['dependencies']);
-    }
-
-    function getPackagexmlVersion()
-    {
-        if (isset($this->_packageInfo['zendextsrcrelease'])) {
-            return '2.1';
-        }
-        if (isset($this->_packageInfo['zendextbinrelease'])) {
-            return '2.1';
-        }
-        return '2.0';
-    }
-
-    /**
-     * @return array|false
-     */
-    function getSourcePackage()
-    {
-        if (isset($this->_packageInfo['extbinrelease']) ||
-              isset($this->_packageInfo['zendextbinrelease'])) {
-            return array('channel' => $this->_packageInfo['srcchannel'],
-                         'package' => $this->_packageInfo['srcpackage']);
-        }
-        return false;
-    }
-
-    function getBundledPackages()
-    {
-        if (isset($this->_packageInfo['bundle'])) {
-            return $this->_packageInfo['contents']['bundledpackage'];
-        }
-        return false;
-    }
-
-    function getLastModified()
-    {
-        if (isset($this->_packageInfo['_lastmodified'])) {
-            return $this->_packageInfo['_lastmodified'];
-        }
-        return false;
-    }
-
-    /**
-     * Get the contents of a file listed within the package.xml
-     * @param string
-     * @return string
-     */
-    function getFileContents($file)
-    {
-        if ($this->_archiveFile == $this->_packageFile) { // unpacked
-            $dir = dirname($this->_packageFile);
-            $file = $dir . DIRECTORY_SEPARATOR . $file;
-            $file = str_replace(array('/', '\\'),
-                array(DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR), $file);
-            if (file_exists($file) && is_readable($file)) {
-                return implode('', file($file));
-            }
-        } else { // tgz
-            $tar = &new Archive_Tar($this->_archiveFile);
-            $tar->pushErrorHandling(PEAR_ERROR_RETURN);
-            if ($file != 'package.xml' && $file != 'package2.xml') {
-                $file = $this->getPackage() . '-' . $this->getVersion() . '/' . $file;
-            }
-            $file = $tar->extractInString($file);
-            $tar->popErrorHandling();
-            if (PEAR::isError($file)) {
-                return PEAR::raiseError("Cannot locate file '$file' in archive");
-            }
-            return $file;
-        }
-    }
-
-    function &getRW()
-    {
-        if (!class_exists('PEAR_PackageFile_v2_rw')) {
-            require_once 'PEAR/PackageFile/v2/rw.php';
-        }
-        $a = new PEAR_PackageFile_v2_rw;
-        foreach (get_object_vars($this) as $name => $unused) {
-            if (!isset($this->$name)) {
-                continue;
-            }
-            if ($name == '_config' || $name == '_logger'|| $name == '_registry' ||
-                  $name == '_stack') {
-                $a->$name = &$this->$name;
-            } else {
-                $a->$name = $this->$name;
-            }
-        }
-        return $a;
-    }
-
-    function &getDefaultGenerator()
-    {
-        if (!class_exists('PEAR_PackageFile_Generator_v2')) {
-            require_once 'PEAR/PackageFile/Generator/v2.php';
-        }
-        $a = &new PEAR_PackageFile_Generator_v2($this);
-        return $a;
-    }
-
-    function analyzeSourceCode($file, $string = false)
-    {
-        if (!isset($this->_v2Validator) ||
-              !is_a($this->_v2Validator, 'PEAR_PackageFile_v2_Validator')) {
-            if (!class_exists('PEAR_PackageFile_v2_Validator')) {
-                require_once 'PEAR/PackageFile/v2/Validator.php';
-            }
-            $this->_v2Validator = new PEAR_PackageFile_v2_Validator;
-        }
-        return $this->_v2Validator->analyzeSourceCode($file, $string);
-    }
-
-    function validate($state = PEAR_VALIDATE_NORMAL)
-    {
-        if (!isset($this->_packageInfo) || !is_array($this->_packageInfo)) {
-            return false;
-        }
-        if (!isset($this->_v2Validator) ||
-              !is_a($this->_v2Validator, 'PEAR_PackageFile_v2_Validator')) {
-            if (!class_exists('PEAR_PackageFile_v2_Validator')) {
-                require_once 'PEAR/PackageFile/v2/Validator.php';
-            }
-            $this->_v2Validator = new PEAR_PackageFile_v2_Validator;
-        }
-        if (isset($this->_packageInfo['xsdversion'])) {
-            unset($this->_packageInfo['xsdversion']);
-        }
-        return $this->_v2Validator->validate($this, $state);
-    }
-
-    function getTasksNs()
-    {
-        if (!isset($this->_tasksNs)) {
-            if (isset($this->_packageInfo['attribs'])) {
-                foreach ($this->_packageInfo['attribs'] as $name => $value) {
-                    if ($value == 'http://pear.php.net/dtd/tasks-1.0') {
-                        $this->_tasksNs = str_replace('xmlns:', '', $name);
-                        break;
-                    }
-                }
-            }
-        }
-        return $this->_tasksNs;
-    }
-
-    /**
-     * Determine whether a task name is a valid task.  Custom tasks may be defined
-     * using subdirectories by putting a "-" in the name, as in 
-     *
-     * Note that this method will auto-load the task class file and test for the existence
-     * of the name with "-" replaced by "_" as in PEAR/Task/mycustom/task.php makes class
-     * PEAR_Task_mycustom_task
-     * @param string
-     * @return boolean
-     */
-    function getTask($task)
-    {
-        $this->getTasksNs();
-        // transform all '-' to '/' and 'tasks:' to '' so tasks:replace becomes replace
-        $task = str_replace(array($this->_tasksNs . ':', '-'), array('', ' '), $task);
-        $task = str_replace(' ', '/', ucwords($task));
-        $ps = (strtolower(substr(PHP_OS, 0, 3)) == 'win') ? ';' : ':';
-        foreach (explode($ps, ini_get('include_path')) as $path) {
-            if (file_exists($path . "/PEAR/Task/$task.php")) {
-                include_once "PEAR/Task/$task.php";
-                $task = str_replace('/', '_', $task);
-                if (class_exists("PEAR_Task_$task")) {
-                    return "PEAR_Task_$task";
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Key-friendly array_splice
-     * @param tagname to splice a value in before
-     * @param mixed the value to splice in
-     * @param string the new tag name
-     */
-    function _ksplice($array, $key, $value, $newkey)
-    {
-        $offset = array_search($key, array_keys($array));
-        $after = array_slice($array, $offset);
-        $before = array_slice($array, 0, $offset);
-        $before[$newkey] = $value;
-        return array_merge($before, $after);
-    }
-
-    /**
-     * @param array a list of possible keys, in the order they may occur
-     * @param mixed contents of the new package.xml tag
-     * @param string tag name
-     * @access private
-     */
-    function _insertBefore($array, $keys, $contents, $newkey)
-    {
-        foreach ($keys as $key) {
-            if (isset($array[$key])) {
-                return $array = $this->_ksplice($array, $key, $contents, $newkey);
-            }
-        }
-        $array[$newkey] = $contents;
-        return $array;
-    }
-
-    /**
-     * @param subsection of {@link $_packageInfo}
-     * @param array|string tag contents
-     * @param array format:
-     * 
    -     * array(
-     *   tagname => array(list of tag names that follow this one),
-     *   childtagname => array(list of child tag names that follow this one),
-     * )
-     * 
    
-     *
-     * This allows construction of nested tags
-     * @access private
-     */
-    function _mergeTag($manip, $contents, $order)
-    {
-        if (count($order)) {
-            foreach ($order as $tag => $curorder) {
-                if (!isset($manip[$tag])) {
-                    // ensure that the tag is set up
-                    $manip = $this->_insertBefore($manip, $curorder, array(), $tag);
-                }
-                if (count($order) > 1) {
-                    $manip[$tag] = $this->_mergeTag($manip[$tag], $contents, array_slice($order, 1));
-                    return $manip;
-                }
-            }
-        } else {
-            return $manip;
-        }
-        if (is_array($manip[$tag]) && !empty($manip[$tag]) && isset($manip[$tag][0])) {
-            $manip[$tag][] = $contents;
-        } else {
-            if (!count($manip[$tag])) {
-                $manip[$tag] = $contents;
-            } else {
-                $manip[$tag] = array($manip[$tag]);
-                $manip[$tag][] = $contents;
-            }
-        }
-        return $manip;
-    }
-}
-?>
diff --git a/PEAR/PackageFile/v2/Validator.php b/PEAR/PackageFile/v2/Validator.php
deleted file mode 100644
index 5d99c86..0000000
--- a/PEAR/PackageFile/v2/Validator.php
+++ /dev/null
@@ -1,2047 +0,0 @@
-                                 |
-// |                                                                      |
-// +----------------------------------------------------------------------+
-//
-// $Id: Validator.php,v 1.93 2006/09/25 05:12:21 cellog Exp $
-/**
- * Private validation class used by PEAR_PackageFile_v2 - do not use directly, its
- * sole purpose is to split up the PEAR/PackageFile/v2.php file to make it smaller
- * @author Greg Beaver 
- * @access private
- */
-class PEAR_PackageFile_v2_Validator
-{
-    /**
-     * @var array
-     */
-    var $_packageInfo;
-    /**
-     * @var PEAR_PackageFile_v2
-     */
-    var $_pf;
-    /**
-     * @var PEAR_ErrorStack
-     */
-    var $_stack;
-    /**
-     * @var int
-     */
-    var $_isValid = 0;
-    /**
-     * @var int
-     */
-    var $_filesValid = 0;
-    /**
-     * @var int
-     */
-    var $_curState = 0;
-    /**
-     * @param PEAR_PackageFile_v2
-     * @param int
-     */
-    function validate(&$pf, $state = PEAR_VALIDATE_NORMAL)
-    {
-        $this->_pf = &$pf;
-        $this->_curState = $state;
-        $this->_packageInfo = $this->_pf->getArray();
-        $this->_isValid = $this->_pf->_isValid;
-        $this->_filesValid = $this->_pf->_filesValid;
-        $this->_stack = &$pf->_stack;
-        $this->_stack->getErrors(true);
-        if (($this->_isValid & $state) == $state) {
-            return true;
-        }
-        if (!isset($this->_packageInfo) || !is_array($this->_packageInfo)) {
-            return false;
-        }
-        if (!isset($this->_packageInfo['attribs']['version']) ||
-              ($this->_packageInfo['attribs']['version'] != '2.0' &&
-               $this->_packageInfo['attribs']['version'] != '2.1')) {
-            $this->_noPackageVersion();
-        }
-        $structure =
-        array(
-            'name',
-            'channel|uri',
-            '*extends', // can't be multiple, but this works fine
-            'summary',
-            'description',
-            '+lead', // these all need content checks
-            '*developer',
-            '*contributor',
-            '*helper',
-            'date',
-            '*time',
-            'version',
-            'stability',
-            'license->?uri->?filesource',
-            'notes',
-            'contents', //special validation needed
-            '*compatible',
-            'dependencies', //special validation needed
-            '*usesrole',
-            '*usestask', // reserve these for 1.4.0a1 to implement
-                         // this will allow a package.xml to gracefully say it
-                         // needs a certain package installed in order to implement a role or task
-            '*providesextension',
-            '*srcpackage|*srcuri',
-            '+phprelease|+extsrcrelease|+extbinrelease|' .
-                '+zendextsrcrelease|+zendextbinrelease|bundle', //special validation needed
-            '*changelog',
-        );
-        $test = $this->_packageInfo;
-        if (isset($test['dependencies']) &&
-              isset($test['dependencies']['required']) &&
-              isset($test['dependencies']['required']['pearinstaller']) &&
-              isset($test['dependencies']['required']['pearinstaller']['min']) &&
-              version_compare('1.5.0a1',
-                $test['dependencies']['required']['pearinstaller']['min'], '<')) {
-            $this->_pearVersionTooLow($test['dependencies']['required']['pearinstaller']['min']);
-            return false;
-        }
-        // ignore post-installation array fields
-        if (array_key_exists('filelist', $test)) {
-            unset($test['filelist']);
-        }
-        if (array_key_exists('_lastmodified', $test)) {
-            unset($test['_lastmodified']);
-        }
-        if (array_key_exists('#binarypackage', $test)) {
-            unset($test['#binarypackage']);
-        }
-        if (array_key_exists('old', $test)) {
-            unset($test['old']);
-        }
-        if (array_key_exists('_lastversion', $test)) {
-            unset($test['_lastversion']);
-        }
-        if (!$this->_stupidSchemaValidate($structure,
-                                          $test, '')) {
-            return false;
-        }
-        if (empty($this->_packageInfo['name'])) {
-            $this->_tagCannotBeEmpty('name');
-        }
-        if (isset($this->_packageInfo['uri'])) {
-            $test = 'uri';
-        } else {
-            $test = 'channel';
-        }
-        if (empty($this->_packageInfo[$test])) {
-            $this->_tagCannotBeEmpty($test);
-        }
-        if (is_array($this->_packageInfo['license']) &&
-              (!isset($this->_packageInfo['license']['_content']) ||
-              empty($this->_packageInfo['license']['_content']))) {
-            $this->_tagCannotBeEmpty('license');
-        } elseif (empty($this->_packageInfo['license'])) {
-            $this->_tagCannotBeEmpty('license');
-        }
-        if (empty($this->_packageInfo['summary'])) {
-            $this->_tagCannotBeEmpty('summary');
-        }
-        if (empty($this->_packageInfo['description'])) {
-            $this->_tagCannotBeEmpty('description');
-        }
-        if (empty($this->_packageInfo['date'])) {
-            $this->_tagCannotBeEmpty('date');
-        }
-        if (empty($this->_packageInfo['notes'])) {
-            $this->_tagCannotBeEmpty('notes');
-        }
-        if (isset($this->_packageInfo['time']) && empty($this->_packageInfo['time'])) {
-            $this->_tagCannotBeEmpty('time');
-        }
-        if (isset($this->_packageInfo['dependencies'])) {
-            $this->_validateDependencies();
-        }
-        if (isset($this->_packageInfo['compatible'])) {
-            $this->_validateCompatible();
-        }
-        if (!isset($this->_packageInfo['bundle'])) {
-            if (!isset($this->_packageInfo['contents']['dir'])) {
-                $this->_filelistMustContainDir('contents');
-                return false;
-            }
-            if (isset($this->_packageInfo['contents']['file'])) {
-                $this->_filelistCannotContainFile('contents');
-                return false;
-            }
-        }
-        $this->_validateMaintainers();
-        $this->_validateStabilityVersion();
-        $fail = false;
-        if (array_key_exists('usesrole', $this->_packageInfo)) {
-            $roles = $this->_packageInfo['usesrole'];
-            if (!is_array($roles) || !isset($roles[0])) {
-                $roles = array($roles);
-            }
-            foreach ($roles as $role) {
-                if (!isset($role['role'])) {
-                    $this->_usesroletaskMustHaveRoleTask('usesrole', 'role');
-                    $fail = true;
-                } else {
-                    if (!isset($role['channel'])) {
-                        if (!isset($role['uri'])) {
-                            $this->_usesroletaskMustHaveChannelOrUri($role['role'], 'usesrole');
-                            $fail = true;
-                        }
-                    } elseif (!isset($role['package'])) {
-                        $this->_usesroletaskMustHavePackage($role['role'], 'usesrole');
-                        $fail = true;
-                    }
-                }
-            }
-        }
-        if (array_key_exists('usestask', $this->_packageInfo)) {
-            $roles = $this->_packageInfo['usestask'];
-            if (!is_array($roles) || !isset($roles[0])) {
-                $roles = array($roles);
-            }
-            foreach ($roles as $role) {
-                if (!isset($role['task'])) {
-                    $this->_usesroletaskMustHaveRoleTask('usestask', 'task');
-                    $fail = true;
-                } else {
-                    if (!isset($role['channel'])) {
-                        if (!isset($role['uri'])) {
-                            $this->_usesroletaskMustHaveChannelOrUri($role['task'], 'usestask');
-                            $fail = true;
-                        }
-                    } elseif (!isset($role['package'])) {
-                        $this->_usesroletaskMustHavePackage($role['task'], 'usestask');
-                        $fail = true;
-                    }
-                }
-            }
-        }
-        if ($fail) {
-            return false;
-        }
-        $list = $this->_packageInfo['contents'];
-        if (isset($list['dir']) && is_array($list['dir']) && isset($list['dir'][0])) {
-            $this->_multipleToplevelDirNotAllowed();
-            return $this->_isValid = 0;
-        }
-        $this->_validateFilelist();
-        $this->_validateRelease();
-        if (!$this->_stack->hasErrors()) {
-            $chan = $this->_pf->_registry->getChannel($this->_pf->getChannel(), true);
-            if (PEAR::isError($chan)) {
-                $this->_unknownChannel($this->_pf->getChannel());
-            } else {
-                $valpack = $chan->getValidationPackage();
-                // for channel validator packages, always use the default PEAR validator.
-                // otherwise, they can't be installed or packaged
-                $validator = $chan->getValidationObject($this->_pf->getPackage());
-                if (!$validator) {
-                    $this->_stack->push(__FUNCTION__, 'error',
-                        array_merge(
-                            array('channel' => $chan->getName(),
-                                  'package' => $this->_pf->getPackage()),
-                              $valpack
-                            ),
-                        'package "%channel%/%package%" cannot be properly validated without ' .
-                        'validation package "%channel%/%name%-%version%"');
-                    return $this->_isValid = 0;
-                }
-                $validator->setPackageFile($this->_pf);
-                $validator->validate($state);
-                $failures = $validator->getFailures();
-                foreach ($failures['errors'] as $error) {
-                    $this->_stack->push(__FUNCTION__, 'error', $error,
-                        'Channel validator error: field "%field%" - %reason%');
-                }
-                foreach ($failures['warnings'] as $warning) {
-                    $this->_stack->push(__FUNCTION__, 'warning', $warning,
-                        'Channel validator warning: field "%field%" - %reason%');
-                }
-            }
-        }
-        $this->_pf->_isValid = $this->_isValid = !$this->_stack->hasErrors('error');
-        if ($this->_isValid && $state == PEAR_VALIDATE_PACKAGING && !$this->_filesValid) {
-            if ($this->_pf->getPackageType() == 'bundle') {
-                if ($this->_analyzeBundledPackages()) {
-                    $this->_filesValid = $this->_pf->_filesValid = true;
-                } else {
-                    $this->_pf->_isValid = $this->_isValid = 0;
-                }
-            } else {
-                if (!$this->_analyzePhpFiles()) {
-                    $this->_pf->_isValid = $this->_isValid = 0;
-                } else {
-                    $this->_filesValid = $this->_pf->_filesValid = true;
-                }
-            }
-        }
-        if ($this->_isValid) {
-            return $this->_pf->_isValid = $this->_isValid = $state;
-        }
-        return $this->_pf->_isValid = $this->_isValid = 0;
-    }
-
-    function _stupidSchemaValidate($structure, $xml, $root)
-    {
-        if (!is_array($xml)) {
-            $xml = array();
-        }
-        $keys = array_keys($xml);
-        reset($keys);
-        $key = current($keys);
-        while ($key == 'attribs' || $key == '_contents') {
-            $key = next($keys);
-        }
-        $unfoundtags = $optionaltags = array();
-        $ret = true;
-        $mismatch = false;
-        foreach ($structure as $struc) {
-            if ($key) {
-                $tag = $xml[$key];
-            }
-            $test = $this->_processStructure($struc);
-            if (isset($test['choices'])) {
-                $loose = true;
-                foreach ($test['choices'] as $choice) {
-                    if ($key == $choice['tag']) {
-                        $key = next($keys);
-                        while ($key == 'attribs' || $key == '_contents') {
-                            $key = next($keys);
-                        }
-                        $unfoundtags = $optionaltags = array();
-                        $mismatch = false;
-                        if ($key && $key != $choice['tag'] && isset($choice['multiple'])) {
-                            $unfoundtags[] = $choice['tag'];
-                            $optionaltags[] = $choice['tag'];
-                            if ($key) {
-                                $mismatch = true;
-                            }
-                        }
-                        $ret &= $this->_processAttribs($choice, $tag, $root);
-                        continue 2;
-                    } else {
-                        $unfoundtags[] = $choice['tag'];
-                        $mismatch = true;
-                    }
-                    if (!isset($choice['multiple']) || $choice['multiple'] != '*') {
-                        $loose = false;
-                    } else {
-                        $optionaltags[] = $choice['tag'];
-                    }
-                }
-                if (!$loose) {
-                    $this->_invalidTagOrder($unfoundtags, $key, $root);
-                    return false;
-                }
-            } else {
-                if ($key != $test['tag']) {
-                    if (isset($test['multiple']) && $test['multiple'] != '*') {
-                        $unfoundtags[] = $test['tag'];
-                        $this->_invalidTagOrder($unfoundtags, $key, $root);
-                        return false;
-                    } else {
-                        if ($key) {
-                            $mismatch = true;
-                        }
-                        $unfoundtags[] = $test['tag'];
-                        $optionaltags[] = $test['tag'];
-                    }
-                    if (!isset($test['multiple'])) {
-                        $this->_invalidTagOrder($unfoundtags, $key, $root);
-                        return false;
-                    }
-                    continue;
-                } else {
-                    $unfoundtags = $optionaltags = array();
-                    $mismatch = false;
-                }
-                $key = next($keys);
-                while ($key == 'attribs' || $key == '_contents') {
-                    $key = next($keys);
-                }
-                if ($key && $key != $test['tag'] && isset($test['multiple'])) {
-                    $unfoundtags[] = $test['tag'];
-                    $optionaltags[] = $test['tag'];
-                    $mismatch = true;
-                }
-                $ret &= $this->_processAttribs($test, $tag, $root);
-                continue;
-            }
-        }
-        if (!$mismatch && count($optionaltags)) {
-            // don't error out on any optional tags
-            $unfoundtags = array_diff($unfoundtags, $optionaltags);
-        }
-        if (count($unfoundtags)) {
-            $this->_invalidTagOrder($unfoundtags, $key, $root);
-        } elseif ($key) {
-            // unknown tags
-            $this->_invalidTagOrder('*no tags allowed here*', $key, $root);
-            while ($key = next($keys)) {
-                $this->_invalidTagOrder('*no tags allowed here*', $key, $root);
-            }
-        }
-        return $ret;
-    }
-
-    function _processAttribs($choice, $tag, $context)
-    {
-        if (isset($choice['attribs'])) {
-            if (!is_array($tag)) {
-                $tag = array($tag);
-            }
-            $tags = $tag;
-            if (!isset($tags[0])) {
-                $tags = array($tags);
-            }
-            $ret = true;
-            foreach ($tags as $i => $tag) {
-                if (!is_array($tag) || !isset($tag['attribs'])) {
-                    foreach ($choice['attribs'] as $attrib) {
-                        if ($attrib{0} != '?') {
-                            $ret &= $this->_tagHasNoAttribs($choice['tag'],
-                                $context);
-                            continue 2;
-                        }
-                    }
-                }
-                foreach ($choice['attribs'] as $attrib) {
-                    if ($attrib{0} != '?') {
-                        if (!isset($tag['attribs'][$attrib])) {
-                            $ret &= $this->_tagMissingAttribute($choice['tag'],
-                                $attrib, $context);
-                        }
-                    }
-                }
-            }
-            return $ret;
-        }
-        return true;
-    }
-
-    function _processStructure($key)
-    {
-        $ret = array();
-        if (count($pieces = explode('|', $key)) > 1) {
-            foreach ($pieces as $piece) {
-                $ret['choices'][] = $this->_processStructure($piece);
-            }
-            return $ret;
-        }
-        $multi = $key{0};
-        if ($multi == '+' || $multi == '*') {
-            $ret['multiple'] = $key{0};
-            $key = substr($key, 1);
-        }
-        if (count($attrs = explode('->', $key)) > 1) {
-            $ret['tag'] = array_shift($attrs);
-            $ret['attribs'] = $attrs;
-        } else {
-            $ret['tag'] = $key;
-        }
-        return $ret;
-    }
-
-    function _validateStabilityVersion()
-    {
-        $structure = array('release', 'api');
-        $a = $this->_stupidSchemaValidate($structure, $this->_packageInfo['version'], '');
-        $a &= $this->_stupidSchemaValidate($structure, $this->_packageInfo['stability'], '');
-        if ($a) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?$/',
-                  $this->_packageInfo['version']['release'])) {
-                $this->_invalidVersion('release', $this->_packageInfo['version']['release']);
-            }
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?$/',
-                  $this->_packageInfo['version']['api'])) {
-                $this->_invalidVersion('api', $this->_packageInfo['version']['api']);
-            }
-            if (!in_array($this->_packageInfo['stability']['release'],
-                  array('snapshot', 'devel', 'alpha', 'beta', 'stable'))) {
-                $this->_invalidState('release', $this->_packageinfo['stability']['release']);
-            }
-            if (!in_array($this->_packageInfo['stability']['api'],
-                  array('devel', 'alpha', 'beta', 'stable'))) {
-                $this->_invalidState('api', $this->_packageinfo['stability']['api']);
-            }
-        }
-    }
-
-    function _validateMaintainers()
-    {
-        $structure =
-            array(
-                'name',
-                'user',
-                'email',
-                'active',
-            );
-        foreach (array('lead', 'developer', 'contributor', 'helper') as $type) {
-            if (!isset($this->_packageInfo[$type])) {
-                continue;
-            }
-            if (isset($this->_packageInfo[$type][0])) {
-                foreach ($this->_packageInfo[$type] as $lead) {
-                    $this->_stupidSchemaValidate($structure, $lead, '<' . $type . '>');
-                }
-            } else {
-                $this->_stupidSchemaValidate($structure, $this->_packageInfo[$type],
-                    '<' . $type . '>');
-            }
-        }
-    }
-
-    function _validatePhpDep($dep, $installcondition = false)
-    {
-        $structure = array(
-            'min',
-            '*max',
-            '*exclude',
-        );
-        $type = $installcondition ? '' : '';
-        $this->_stupidSchemaValidate($structure, $dep, $type);
-        if (isset($dep['min'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?(?:-[a-zA-Z0-9]+)?$/',
-                  $dep['min'])) {
-                $this->_invalidVersion($type . '', $dep['min']);
-            }
-        }
-        if (isset($dep['max'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?(?:-[a-zA-Z0-9]+)?$/',
-                  $dep['max'])) {
-                $this->_invalidVersion($type . '', $dep['max']);
-            }
-        }
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-            foreach ($dep['exclude'] as $exclude) {
-                if (!preg_match(
-                     '/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?(?:-[a-zA-Z0-9]+)?$/',
-                     $exclude)) {
-                    $this->_invalidVersion($type . '', $exclude);
-                }
-            }
-        }
-    }
-
-    function _validatePearinstallerDep($dep)
-    {
-        $structure = array(
-            'min',
-            '*max',
-            '*recommended',
-            '*exclude',
-        );
-        $this->_stupidSchemaValidate($structure, $dep, '');
-        if (isset($dep['min'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?$/',
-                  $dep['min'])) {
-                $this->_invalidVersion('',
-                    $dep['min']);
-            }
-        }
-        if (isset($dep['max'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?$/',
-                  $dep['max'])) {
-                $this->_invalidVersion('',
-                    $dep['max']);
-            }
-        }
-        if (isset($dep['recommended'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?$/',
-                  $dep['recommended'])) {
-                $this->_invalidVersion('',
-                    $dep['recommended']);
-            }
-        }
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-            foreach ($dep['exclude'] as $exclude) {
-                if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?$/',
-                      $exclude)) {
-                    $this->_invalidVersion('',
-                        $exclude);
-                }
-            }
-        }
-    }
-
-    function _validatePackageDep($dep, $group, $type = '')
-    {
-        if (isset($dep['uri'])) {
-            if (isset($dep['conflicts'])) {
-                $structure = array(
-                    'name',
-                    'uri',
-                    'conflicts',
-                    '*providesextension',
-                );
-            } else {
-                $structure = array(
-                    'name',
-                    'uri',
-                    '*providesextension',
-                );
-            }
-        } else {
-            if (isset($dep['conflicts'])) {
-                $structure = array(
-                    'name',
-                    'channel',
-                    '*min',
-                    '*max',
-                    '*exclude',
-                    'conflicts',
-                    '*providesextension',
-                );
-            } else {
-                $structure = array(
-                    'name',
-                    'channel',
-                    '*min',
-                    '*max',
-                    '*recommended',
-                    '*exclude',
-                    '*nodefault',
-                    '*providesextension',
-                );
-            }
-        }
-        if (isset($dep['name'])) {
-            $type .= '' . $dep['name'] . '';
-        }
-        $this->_stupidSchemaValidate($structure, $dep, '' . $group . $type);
-        if (isset($dep['uri']) && (isset($dep['min']) || isset($dep['max']) ||
-              isset($dep['recommended']) || isset($dep['exclude']))) {
-            $this->_uriDepsCannotHaveVersioning('' . $group . $type);
-        }
-        if (isset($dep['channel']) && strtolower($dep['channel']) == '__uri') {
-            $this->_DepchannelCannotBeUri('' . $group . $type);
-        }
-        if (isset($dep['min'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?$/',
-                  $dep['min'])) {
-                $this->_invalidVersion('' . $group . $type . '', $dep['min']);
-            }
-        }
-        if (isset($dep['max'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?$/',
-                  $dep['max'])) {
-                $this->_invalidVersion('' . $group . $type . '', $dep['max']);
-            }
-        }
-        if (isset($dep['recommended'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?$/',
-                  $dep['recommended'])) {
-                $this->_invalidVersion('' . $group . $type . '',
-                    $dep['recommended']);
-            }
-        }
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-            foreach ($dep['exclude'] as $exclude) {
-                if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?$/',
-                      $exclude)) {
-                    $this->_invalidVersion('' . $group . $type . '',
-                        $exclude);
-                }
-            }
-        }
-    }
-
-    function _validateSubpackageDep($dep, $group)
-    {
-        $this->_validatePackageDep($dep, $group, '');
-        if (isset($dep['providesextension'])) {
-            $this->_subpackageCannotProvideExtension(isset($dep['name']) ? $dep['name'] : '');
-        }
-        if (isset($dep['conflicts'])) {
-            $this->_subpackagesCannotConflict(isset($dep['name']) ? $dep['name'] : '');
-        }
-    }
-
-    function _validateExtensionDep($dep, $group = false, $installcondition = false)
-    {
-        if (isset($dep['conflicts'])) {
-            $structure = array(
-                'name',
-                '*min',
-                '*max',
-                '*exclude',
-                'conflicts',
-            );
-        } else {
-            $structure = array(
-                'name',
-                '*min',
-                '*max',
-                '*recommended',
-                '*exclude',
-            );
-        }
-        if ($installcondition) {
-            $type = '';
-        } else {
-            $type = '' . $group . '';
-        }
-        if (isset($dep['name'])) {
-            $type .= '' . $dep['name'] . '';
-        }
-        $this->_stupidSchemaValidate($structure, $dep, $type);
-        if (isset($dep['min'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?$/',
-                  $dep['min'])) {
-                $this->_invalidVersion(substr($type, 1) . '_invalidVersion(substr($type, 1) . '_invalidVersion(substr($type, 1) . '_invalidVersion(substr($type, 1) . '' : '';
-        if ($this->_stupidSchemaValidate($structure, $dep, $type)) {
-            if ($dep['name'] == '*') {
-                if (array_key_exists('conflicts', $dep)) {
-                    $this->_cannotConflictWithAllOs($type);
-                }
-            }
-        }
-    }
-
-    function _validateArchDep($dep, $installcondition = false)
-    {
-        $structure = array(
-            'pattern',
-            '*conflicts',
-        );
-        $type = $installcondition ? '' : '';
-        $this->_stupidSchemaValidate($structure, $dep, $type);
-    }
-
-    function _validateInstallConditions($cond, $release)
-    {
-        $structure = array(
-            '*php',
-            '*extension',
-            '*os',
-            '*arch',
-        );
-        if (!$this->_stupidSchemaValidate($structure,
-              $cond, $release)) {
-            return false;
-        }
-        foreach (array('php', 'extension', 'os', 'arch') as $type) {
-            if (isset($cond[$type])) {
-                $iter = $cond[$type];
-                if (!is_array($iter) || !isset($iter[0])) {
-                    $iter = array($iter);
-                }
-                foreach ($iter as $package) {
-                    if ($type == 'extension') {
-                        $this->{"_validate{$type}Dep"}($package, false, true);
-                    } else {
-                        $this->{"_validate{$type}Dep"}($package, true);
-                    }
-                }
-            }
-        }
-    }
-
-    function _validateDependencies()
-    {
-        $structure = array(
-            'required',
-            '*optional',
-            '*group->name->hint'
-        );
-        if (!$this->_stupidSchemaValidate($structure,
-              $this->_packageInfo['dependencies'], '')) {
-            return false;
-        }
-        foreach (array('required', 'optional') as $simpledep) {
-            if (isset($this->_packageInfo['dependencies'][$simpledep])) {
-                if ($simpledep == 'optional') {
-                    $structure = array(
-                        '*package',
-                        '*subpackage',
-                        '*extension',
-                    );
-                } else {
-                    $structure = array(
-                        'php',
-                        'pearinstaller',
-                        '*package',
-                        '*subpackage',
-                        '*extension',
-                        '*os',
-                        '*arch',
-                    );
-                }
-                if ($this->_stupidSchemaValidate($structure,
-                      $this->_packageInfo['dependencies'][$simpledep],
-                      "<$simpledep>")) {
-                    foreach (array('package', 'subpackage', 'extension') as $type) {
-                        if (isset($this->_packageInfo['dependencies'][$simpledep][$type])) {
-                            $iter = $this->_packageInfo['dependencies'][$simpledep][$type];
-                            if (!isset($iter[0])) {
-                                $iter = array($iter);
-                            }
-                            foreach ($iter as $package) {
-                                if ($type != 'extension') {
-                                    if (isset($package['uri'])) {
-                                        if (isset($package['channel'])) {
-                                            $this->_UrlOrChannel($type,
-                                                $package['name']);
-                                        }
-                                    } else {
-                                        if (!isset($package['channel'])) {
-                                            $this->_NoChannel($type, $package['name']);
-                                        }
-                                    }
-                                }
-                                $this->{"_validate{$type}Dep"}($package, "<$simpledep>");
-                            }
-                        }
-                    }
-                    if ($simpledep == 'optional') {
-                        continue;
-                    }
-                    foreach (array('php', 'pearinstaller', 'os', 'arch') as $type) {
-                        if (isset($this->_packageInfo['dependencies'][$simpledep][$type])) {
-                            $iter = $this->_packageInfo['dependencies'][$simpledep][$type];
-                            if (!isset($iter[0])) {
-                                $iter = array($iter);
-                            }
-                            foreach ($iter as $package) {
-                                $this->{"_validate{$type}Dep"}($package);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        if (isset($this->_packageInfo['dependencies']['group'])) {
-            $groups = $this->_packageInfo['dependencies']['group'];
-            if (!isset($groups[0])) {
-                $groups = array($groups);
-            }
-            $structure = array(
-                '*package',
-                '*subpackage',
-                '*extension',
-            );
-            foreach ($groups as $group) {
-                if ($this->_stupidSchemaValidate($structure, $group, '')) {
-                    if (!PEAR_Validate::validGroupName($group['attribs']['name'])) {
-                        $this->_invalidDepGroupName($group['attribs']['name']);
-                    }
-                    foreach (array('package', 'subpackage', 'extension') as $type) {
-                        if (isset($group[$type])) {
-                            $iter = $group[$type];
-                            if (!isset($iter[0])) {
-                                $iter = array($iter);
-                            }
-                            foreach ($iter as $package) {
-                                if ($type != 'extension') {
-                                    if (isset($package['uri'])) {
-                                        if (isset($package['channel'])) {
-                                            $this->_UrlOrChannelGroup($type,
-                                                $package['name'],
-                                                $group['name']);
-                                        }
-                                    } else {
-                                        if (!isset($package['channel'])) {
-                                            $this->_NoChannelGroup($type,
-                                                $package['name'],
-                                                $group['name']);
-                                        }
-                                    }
-                                }
-                                $this->{"_validate{$type}Dep"}($package, '');
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    function _validateCompatible()
-    {
-        $compat = $this->_packageInfo['compatible'];
-        if (!isset($compat[0])) {
-            $compat = array($compat);
-        }
-        $required = array('name', 'channel', 'min', 'max', '*exclude');
-        foreach ($compat as $package) {
-            $type = '';
-            if (is_array($package) && array_key_exists('name', $package)) {
-                $type .= '' . $package['name'] . '';
-            }
-            $this->_stupidSchemaValidate($required, $package, $type);
-            if (is_array($package) && array_key_exists('min', $package)) {
-                if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?$/',
-                      $package['min'])) {
-                    $this->_invalidVersion(substr($type, 1) . '_invalidVersion(substr($type, 1) . '_invalidVersion(substr($type, 1) . '_NoBundledPackages();
-        }
-        if (!is_array($list['bundledpackage']) || !isset($list['bundledpackage'][0])) {
-            return $this->_AtLeast2BundledPackages();
-        }
-        foreach ($list['bundledpackage'] as $package) {
-            if (!is_string($package)) {
-                $this->_bundledPackagesMustBeFilename();
-            }
-        }
-    }
-
-    function _validateFilelist($list = false, $allowignore = false, $dirs = '')
-    {
-        $iscontents = false;
-        if (!$list) {
-            $iscontents = true;
-            $list = $this->_packageInfo['contents'];
-            if (isset($this->_packageInfo['bundle'])) {
-                return $this->_validateBundle($list);
-            }
-        }
-        if ($allowignore) {
-            $struc = array(
-                '*install->name->as',
-                '*ignore->name'
-            );
-        } else {
-            $struc = array(
-                '*dir->name->?baseinstalldir',
-                '*file->name->role->?baseinstalldir->?md5sum'
-            );
-            if (isset($list['dir']) && isset($list['file'])) {
-                // stave off validation errors without requiring a set order.
-                $_old = $list;
-                if (isset($list['attribs'])) {
-                    $list = array('attribs' => $_old['attribs']);
-                }
-                $list['dir'] = $_old['dir'];
-                $list['file'] = $_old['file'];
-            }
-        }
-        if (!isset($list['attribs']) || !isset($list['attribs']['name'])) {
-            $unknown = $allowignore ? '' : '';
-            $dirname = $iscontents ? '' : $unknown;
-        } else {
-            $dirname = '';
-        }
-        $res = $this->_stupidSchemaValidate($struc, $list, $dirname);
-        if ($allowignore && $res) {
-            $ignored_or_installed = array();
-            $this->_pf->getFilelist();
-            $fcontents = $this->_pf->getContents();
-            $filelist = array();
-            if (!isset($fcontents['dir']['file'][0])) {
-                $fcontents['dir']['file'] = array($fcontents['dir']['file']);
-            }
-            foreach ($fcontents['dir']['file'] as $file) {
-                $filelist[$file['attribs']['name']] = true;
-            }
-            if (isset($list['install'])) {
-                if (!isset($list['install'][0])) {
-                    $list['install'] = array($list['install']);
-                }
-                foreach ($list['install'] as $file) {
-                    if (!isset($filelist[$file['attribs']['name']])) {
-                        $this->_notInContents($file['attribs']['name'], 'install');
-                        continue;
-                    }
-                    if (array_key_exists($file['attribs']['name'], $ignored_or_installed)) {
-                        $this->_multipleInstallAs($file['attribs']['name']);
-                    }
-                    $ignored_or_installed[$file['attribs']['name']][] = 1;
-                }
-            }
-            if (isset($list['ignore'])) {
-                if (!isset($list['ignore'][0])) {
-                    $list['ignore'] = array($list['ignore']);
-                }
-                foreach ($list['ignore'] as $file) {
-                    if (!isset($filelist[$file['attribs']['name']])) {
-                        $this->_notInContents($file['attribs']['name'], 'ignore');
-                        continue;
-                    }
-                    if (array_key_exists($file['attribs']['name'], $ignored_or_installed)) {
-                        $this->_ignoreAndInstallAs($file['attribs']['name']);
-                    }
-                }
-            }
-        }
-        if (!$allowignore && isset($list['file'])) {
-            if (!isset($list['file'][0])) {
-                // single file
-                $list['file'] = array($list['file']);
-            }
-            foreach ($list['file'] as $i => $file)
-            {
-                if (isset($file['attribs']) && isset($file['attribs']['name']) &&
-                      $file['attribs']['name']{0} == '.' &&
-                        $file['attribs']['name']{1} == '/') {
-                    // name is something like "./doc/whatever.txt"
-                    $this->_invalidFileName($file['attribs']['name']);
-                }
-                if (isset($file['attribs']) && isset($file['attribs']['role'])) {
-                    if (!$this->_validateRole($file['attribs']['role'])) {
-                        if (isset($this->_packageInfo['usesrole'])) {
-                            $roles = $this->_packageInfo['usesrole'];
-                            if (!isset($roles[0])) {
-                                $roles = array($roles);
-                            }
-                            foreach ($roles as $role) {
-                                if ($role['role'] = $file['attribs']['role']) {
-                                    $msg = 'This package contains role "%role%" and requires ' .
-                                        'package "%package%" to be used';
-                                    if (isset($role['uri'])) {
-                                        $params = array('role' => $role['role'],
-                                            'package' => $role['uri']);
-                                    } else {
-                                        $params = array('role' => $role['role'],
-                                            'package' => $this->_pf->_registry->
-                                            parsedPackageNameToString(array('package' =>
-                                                $role['package'], 'channel' => $role['channel']),
-                                                true));
-                                    }
-                                    $this->_stack->push('_mustInstallRole', 'error', $params, $msg);
-                                }
-                            }
-                        }
-                        $this->_invalidFileRole($file['attribs']['name'],
-                            $dirname, $file['attribs']['role']);
-                    }
-                }
-                if (!isset($file['attribs'])) {
-                    continue;
-                }
-                $save = $file['attribs'];
-                if ($dirs) {
-                    $save['name'] = $dirs . '/' . $save['name'];
-                }
-                unset($file['attribs']);
-                if (count($file) && $this->_curState != PEAR_VALIDATE_DOWNLOADING) { // has tasks
-                    foreach ($file as $task => $value) {
-                        if ($tagClass = $this->_pf->getTask($task)) {
-                            if (!is_array($value) || !isset($value[0])) {
-                                $value = array($value);
-                            }
-                            foreach ($value as $v) {
-                                $ret = call_user_func(array($tagClass, 'validateXml'),
-                                    $this->_pf, $v, $this->_pf->_config, $save);
-                                if (is_array($ret)) {
-                                    $this->_invalidTask($task, $ret, isset($save['name']) ?
-                                        $save['name'] : '');
-                                }
-                            }
-                        } else {
-                            if (isset($this->_packageInfo['usestask'])) {
-                                $roles = $this->_packageInfo['usestask'];
-                                if (!isset($roles[0])) {
-                                    $roles = array($roles);
-                                }
-                                foreach ($roles as $role) {
-                                    if ($role['task'] = $task) {
-                                        $msg = 'This package contains task "%task%" and requires ' .
-                                            'package "%package%" to be used';
-                                        if (isset($role['uri'])) {
-                                            $params = array('task' => $role['task'],
-                                                'package' => $role['uri']);
-                                        } else {
-                                            $params = array('task' => $role['task'],
-                                                'package' => $this->_pf->_registry->
-                                                parsedPackageNameToString(array('package' =>
-                                                    $role['package'], 'channel' => $role['channel']),
-                                                    true));
-                                        }
-                                        $this->_stack->push('_mustInstallTask', 'error',
-                                            $params, $msg);
-                                    }
-                                }
-                            }
-                            $this->_unknownTask($task, $save['name']);
-                        }
-                    }
-                }
-            }
-        }
-        if (isset($list['ignore'])) {
-            if (!$allowignore) {
-                $this->_ignoreNotAllowed('ignore');
-            }
-        }
-        if (isset($list['install'])) {
-            if (!$allowignore) {
-                $this->_ignoreNotAllowed('install');
-            }
-        }
-        if (isset($list['file'])) {
-            if ($allowignore) {
-                $this->_fileNotAllowed('file');
-            }
-        }
-        if (isset($list['dir'])) {
-            if ($allowignore) {
-                $this->_fileNotAllowed('dir');
-            } else {
-                if (!isset($list['dir'][0])) {
-                    $list['dir'] = array($list['dir']);
-                }
-                foreach ($list['dir'] as $dir) {
-                    if (isset($dir['attribs']) && isset($dir['attribs']['name'])) {
-                        if ($dir['attribs']['name'] == '/' ||
-                              !isset($this->_packageInfo['contents']['dir']['dir'])) {
-                            // always use nothing if the filelist has already been flattened
-                            $newdirs = '';
-                        } elseif ($dirs == '') {
-                            $newdirs = $dir['attribs']['name'];
-                        } else {
-                            $newdirs = $dirs . '/' . $dir['attribs']['name'];
-                        }
-                    } else {
-                        $newdirs = $dirs;
-                    }
-                    $this->_validateFilelist($dir, $allowignore, $newdirs);
-                }
-            }
-        }
-    }
-
-    function _validateRelease()
-    {
-        if (isset($this->_packageInfo['phprelease'])) {
-            $release = 'phprelease';
-            if (isset($this->_packageInfo['providesextension'])) {
-                $this->_cannotProvideExtension($release);
-            }
-            if (isset($this->_packageInfo['srcpackage']) || isset($this->_packageInfo['srcuri'])) {
-                $this->_cannotHaveSrcpackage($release);
-            }
-            $releases = $this->_packageInfo['phprelease'];
-            if (!is_array($releases)) {
-                return true;
-            }
-            if (!isset($releases[0])) {
-                $releases = array($releases);
-            }
-            foreach ($releases as $rel) {
-                $this->_stupidSchemaValidate(array(
-                    '*installconditions',
-                    '*filelist',
-                ), $rel, '');
-            }
-        }
-        foreach (array('', 'zend') as $prefix) {
-            $releasetype = $prefix . 'extsrcrelease';
-            if (isset($this->_packageInfo[$releasetype])) {
-                $release = $releasetype;
-                if (!isset($this->_packageInfo['providesextension'])) {
-                    $this->_mustProvideExtension($release);
-                }
-                if (isset($this->_packageInfo['srcpackage']) || isset($this->_packageInfo['srcuri'])) {
-                    $this->_cannotHaveSrcpackage($release);
-                }
-                $releases = $this->_packageInfo[$releasetype];
-                if (!is_array($releases)) {
-                    return true;
-                }
-                if (!isset($releases[0])) {
-                    $releases = array($releases);
-                }
-                foreach ($releases as $rel) {
-                    $this->_stupidSchemaValidate(array(
-                        '*installconditions',
-                        '*configureoption->name->prompt->?default',
-                        '*binarypackage',
-                        '*filelist',
-                    ), $rel, '<' . $releasetype . '>');
-                    if (isset($rel['binarypackage'])) {
-                        if (!is_array($rel['binarypackage']) || !isset($rel['binarypackage'][0])) {
-                            $rel['binarypackage'] = array($rel['binarypackage']);
-                        }
-                        foreach ($rel['binarypackage'] as $bin) {
-                            if (!is_string($bin)) {
-                                $this->_binaryPackageMustBePackagename();
-                            }
-                        }
-                    }
-                }
-            }
-            $releasetype = 'extbinrelease';
-            if (isset($this->_packageInfo[$releasetype])) {
-                $release = $releasetype;
-                if (!isset($this->_packageInfo['providesextension'])) {
-                    $this->_mustProvideExtension($release);
-                }
-                if (isset($this->_packageInfo['channel']) &&
-                      !isset($this->_packageInfo['srcpackage'])) {
-                    $this->_mustSrcPackage($release);
-                }
-                if (isset($this->_packageInfo['uri']) && !isset($this->_packageInfo['srcuri'])) {
-                    $this->_mustSrcuri($release);
-                }
-                $releases = $this->_packageInfo[$releasetype];
-                if (!is_array($releases)) {
-                    return true;
-                }
-                if (!isset($releases[0])) {
-                    $releases = array($releases);
-                }
-                foreach ($releases as $rel) {
-                    $this->_stupidSchemaValidate(array(
-                        '*installconditions',
-                        '*filelist',
-                    ), $rel, '<' . $releasetype . '>');
-                }
-            }
-        }
-        if (isset($this->_packageInfo['bundle'])) {
-            $release = 'bundle';
-            if (isset($this->_packageInfo['providesextension'])) {
-                $this->_cannotProvideExtension($release);
-            }
-            if (isset($this->_packageInfo['srcpackage']) || isset($this->_packageInfo['srcuri'])) {
-                $this->_cannotHaveSrcpackage($release);
-            }
-            $releases = $this->_packageInfo['bundle'];
-            if (!is_array($releases) || !isset($releases[0])) {
-                $releases = array($releases);
-            }
-            foreach ($releases as $rel) {
-                $this->_stupidSchemaValidate(array(
-                    '*installconditions',
-                    '*filelist',
-                ), $rel, '');
-            }
-        }
-        foreach ($releases as $rel) {
-            if (is_array($rel) && array_key_exists('installconditions', $rel)) {
-                $this->_validateInstallConditions($rel['installconditions'],
-                    "<$release>");
-            }
-            if (is_array($rel) && array_key_exists('filelist', $rel)) {
-                if ($rel['filelist']) {
-                    
-                    $this->_validateFilelist($rel['filelist'], true);
-                }
-            }
-        }
-    }
-
-    /**
-     * This is here to allow role extension through plugins
-     * @param string
-     */
-    function _validateRole($role)
-    {
-        return in_array($role, PEAR_Installer_Role::getValidRoles($this->_pf->getPackageType()));
-    }
-
-    function _pearVersionTooLow($version)
-    {
-        $this->_stack->push(__FUNCTION__, 'error',
-            array('version' => $version),
-            'This package.xml requires PEAR version %version% to parse properly, we are ' .
-            'version 1.5.0a1');
-    }
-
-    function _invalidTagOrder($oktags, $actual, $root)
-    {
-        $this->_stack->push(__FUNCTION__, 'error',
-            array('oktags' => $oktags, 'actual' => $actual, 'root' => $root),
-            'Invalid tag order in %root%, found <%actual%> expected one of "%oktags%"');
-    }
-
-    function _ignoreNotAllowed($type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type),
-            '<%type%> is not allowed inside global , only inside ' .
-            '//, use  and  only');
-    }
-
-    function _fileNotAllowed($type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type),
-            '<%type%> is not allowed inside release , only inside ' .
-            ', use  and  only');
-    }
-
-    function _tagMissingAttribute($tag, $attr, $context)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $tag,
-            'attribute' => $attr, 'context' => $context),
-            'tag <%tag%> in context "%context%" has no attribute "%attribute%"');
-    }
-
-    function _tagHasNoAttribs($tag, $context)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $tag,
-            'context' => $context),
-            'tag <%tag%> has no attributes in context "%context%"');
-    }
-
-    function _invalidInternalStructure()
-    {
-        $this->_stack->push(__FUNCTION__, 'exception', array(),
-            'internal array was not generated by compatible parser, or extreme parser error, cannot continue');
-    }
-
-    function _invalidFileRole($file, $dir, $role)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(
-            'file' => $file, 'dir' => $dir, 'role' => $role,
-            'roles' => PEAR_Installer_Role::getValidRoles($this->_pf->getPackageType())),
-            'File "%file%" in directory "%dir%" has invalid role "%role%", should be one of %roles%');
-    }
-
-    function _invalidFileName($file, $dir)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(
-            'file' => $file),
-            'File "%file%" cannot begin with "."');
-    }
-
-    function _filelistCannotContainFile($filelist)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $filelist),
-            '<%tag%> can only contain , contains .  Use ' .
-            ' as the first dir element');
-    }
-
-    function _filelistMustContainDir($filelist)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $filelist),
-            '<%tag%> must contain .  Use  as the ' .
-            'first dir element');
-    }
-
-    function _tagCannotBeEmpty($tag)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $tag),
-            '<%tag%> cannot be empty (<%tag%/>)');
-    }
-
-    function _UrlOrChannel($type, $name)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type,
-            'name' => $name),
-            'Required dependency <%type%> "%name%" can have either url OR ' .
-            'channel attributes, and not both');
-    }
-
-    function _NoChannel($type, $name)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type,
-            'name' => $name),
-            'Required dependency <%type%> "%name%" must have either url OR ' .
-            'channel attributes');
-    }
-
-    function _UrlOrChannelGroup($type, $name, $group)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type,
-            'name' => $name, 'group' => $group),
-            'Group "%group%" dependency <%type%> "%name%" can have either url OR ' .
-            'channel attributes, and not both');
-    }
-
-    function _NoChannelGroup($type, $name, $group)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type,
-            'name' => $name, 'group' => $group),
-            'Group "%group%" dependency <%type%> "%name%" must have either url OR ' .
-            'channel attributes');
-    }
-
-    function _unknownChannel($channel)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('channel' => $channel),
-            'Unknown channel "%channel%"');
-    }
-
-    function _noPackageVersion()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            'package.xml  tag has no version attribute, or version is not 2.0');
-    }
-
-    function _NoBundledPackages()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            'No  tag was found in , required for bundle packages');
-    }
-
-    function _AtLeast2BundledPackages()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            'At least 2 packages must be bundled in a bundle package');
-    }
-
-    function _ChannelOrUri($name)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('name' => $name),
-            'Bundled package "%name%" can have either a uri or a channel, not both');
-    }
-
-    function _noChildTag($child, $tag)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('child' => $child, 'tag' => $tag),
-            'Tag <%tag%> is missing child tag <%child%>');
-    }
-
-    function _invalidVersion($type, $value)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type, 'value' => $value),
-            'Version type <%type%> is not a valid version (%value%)');
-    }
-
-    function _invalidState($type, $value)
-    {
-        $states = array('stable', 'beta', 'alpha', 'devel');
-        if ($type != 'api') {
-            $states[] = 'snapshot';
-        }
-        if (strtolower($value) == 'rc') {
-            $this->_stack->push(__FUNCTION__, 'error',
-                array('version' => $this->_packageInfo['version']['release']),
-                'RC is not a state, it is a version postfix, try %version%RC1, stability beta');
-        }
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type, 'value' => $value,
-            'types' => $states),
-            'Stability type <%type%> is not a valid stability (%value%), must be one of ' .
-            '%types%');
-    }
-
-    function _invalidTask($task, $ret, $file)
-    {
-        switch ($ret[0]) {
-            case PEAR_TASK_ERROR_MISSING_ATTRIB :
-                $info = array('attrib' => $ret[1], 'task' => $task, 'file' => $file);
-                $msg = 'task <%task%> is missing attribute "%attrib%" in file %file%';
-            break;
-            case PEAR_TASK_ERROR_NOATTRIBS :
-                $info = array('task' => $task, 'file' => $file);
-                $msg = 'task <%task%> has no attributes in file %file%';
-            break;
-            case PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE :
-                $info = array('attrib' => $ret[1], 'values' => $ret[3],
-                    'was' => $ret[2], 'task' => $task, 'file' => $file);
-                $msg = 'task <%task%> attribute "%attrib%" has the wrong value "%was%" '.
-                    'in file %file%, expecting one of "%values%"';
-            break;
-            case PEAR_TASK_ERROR_INVALID :
-                $info = array('reason' => $ret[1], 'task' => $task, 'file' => $file);
-                $msg = 'task <%task%> in file %file% is invalid because of "%reason%"';
-            break;
-        }
-        $this->_stack->push(__FUNCTION__, 'error', $info, $msg);
-    }
-
-    function _unknownTask($task, $file)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('task' => $task, 'file' => $file),
-            'Unknown task "%task%" passed in file ');
-    }
-
-    function _subpackageCannotProvideExtension($name)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('name' => $name),
-            'Subpackage dependency "%name%" cannot use , ' .
-            'only package dependencies can use this tag');
-    }
-
-    function _subpackagesCannotConflict($name)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('name' => $name),
-            'Subpackage dependency "%name%" cannot use , ' .
-            'only package dependencies can use this tag');
-    }
-
-    function _cannotProvideExtension($release)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('release' => $release),
-            '<%release%> packages cannot use , only extbinrelease, extsrcrelease, zendextsrcrelease, and zendextbinrelease can provide a PHP extension');
-    }
-
-    function _mustProvideExtension($release)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('release' => $release),
-            '<%release%> packages must use  to indicate which PHP extension is provided');
-    }
-
-    function _cannotHaveSrcpackage($release)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('release' => $release),
-            '<%release%> packages cannot specify a source code package, only extension binaries may use the  tag');
-    }
-
-    function _mustSrcPackage($release)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('release' => $release),
-            '/ packages must specify a source code package with ');
-    }
-
-    function _mustSrcuri($release)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('release' => $release),
-            '/ packages must specify a source code package with ');
-    }
-
-    function _uriDepsCannotHaveVersioning($type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type),
-            '%type%: dependencies with a  tag cannot have any versioning information');
-    }
-
-    function _conflictingDepsCannotHaveVersioning($type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type),
-            '%type%: conflicting dependencies cannot have versioning info, use  to ' .
-            'exclude specific versions of a dependency');
-    }
-
-    function _DepchannelCannotBeUri($type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type),
-            '%type%: channel cannot be __uri, this is a pseudo-channel reserved for uri ' .
-            'dependencies only');
-    }
-
-    function _bundledPackagesMustBeFilename()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            ' tags must contain only the filename of a package release ' .
-            'in the bundle');
-    }
-
-    function _binaryPackageMustBePackagename()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            ' tags must contain the name of a package that is ' .
-            'a compiled version of this extsrc/zendextsrc package');
-    }
-
-    function _fileNotFound($file)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('file' => $file),
-            'File "%file%" in package.xml does not exist');
-    }
-
-    function _notInContents($file, $tag)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('file' => $file, 'tag' => $tag),
-            '<%tag% name="%file%"> is invalid, file is not in ');
-    }
-
-    function _cannotValidateNoPathSet()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            'Cannot validate files, no path to package file is set (use setPackageFile())');
-    }
-
-    function _usesroletaskMustHaveChannelOrUri($role, $tag)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('role' => $role, 'tag' => $tag),
-            '<%tag%> must contain either , or  and ');
-    }
-
-    function _usesroletaskMustHavePackage($role, $tag)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('role' => $role, 'tag' => $tag),
-            '<%tag%> must contain ');
-    }
-
-    function _usesroletaskMustHaveRoleTask($tag, $type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $tag, 'type' => $type),
-            '<%tag%> must contain <%type%> defining the %type% to be used');
-    }
-
-    function _cannotConflictWithAllOs($type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $tag),
-            '%tag% cannot conflict with all OSes');
-    }
-
-    function _invalidDepGroupName($name)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('group' => $name),
-            'Invalid dependency group name "%name%"');
-    }
-
-    function _multipleToplevelDirNotAllowed()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            'Multiple top-level  tags are not allowed.  Enclose them ' .
-                'in a ');
-    }
-
-    function _multipleInstallAs($file)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('file' => $file),
-            'Only one  tag is allowed for file "%file%"');
-    }
-
-    function _ignoreAndInstallAs($file)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('file' => $file),
-            'Cannot have both  and  tags for file "%file%"');
-    }
-
-    function _analyzeBundledPackages()
-    {
-        if (!$this->_isValid) {
-            return false;
-        }
-        if (!$this->_pf->getPackageType() == 'bundle') {
-            return false;
-        }
-        if (!isset($this->_pf->_packageFile)) {
-            return false;
-        }
-        $dir_prefix = dirname($this->_pf->_packageFile);
-        $log = isset($this->_pf->_logger) ? array(&$this->_pf->_logger, 'log') :
-            array('PEAR_Common', 'log');
-        $info = $this->_pf->getContents();
-        $info = $info['bundledpackage'];
-        if (!is_array($info)) {
-            $info = array($info);
-        }
-        $pkg = &new PEAR_PackageFile($this->_pf->_config);
-        foreach ($info as $package) {
-            if (!file_exists($dir_prefix . DIRECTORY_SEPARATOR . $package)) {
-                $this->_fileNotFound($dir_prefix . DIRECTORY_SEPARATOR . $package);
-                $this->_isValid = 0;
-                continue;
-            }
-            call_user_func_array($log, array(1, "Analyzing bundled package $package"));
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            $ret = $pkg->fromAnyFile($dir_prefix . DIRECTORY_SEPARATOR . $package,
-                PEAR_VALIDATE_NORMAL);
-            PEAR::popErrorHandling();
-            if (PEAR::isError($ret)) {
-                call_user_func_array($log, array(0, "ERROR: package $package is not a valid " .
-                    'package'));
-                $inf = $ret->getUserInfo();
-                if (is_array($inf)) {
-                    foreach ($inf as $err) {
-                        call_user_func_array($log, array(1, $err['message']));
-                    }
-                }
-                return false;
-            }
-        }
-        return true;
-    }
-
-    function _analyzePhpFiles()
-    {
-        if (!$this->_isValid) {
-            return false;
-        }
-        if (!isset($this->_pf->_packageFile)) {
-            $this->_cannotValidateNoPathSet();
-            return false;
-        }
-        $dir_prefix = dirname($this->_pf->_packageFile);
-        $common = new PEAR_Common;
-        $log = isset($this->_pf->_logger) ? array(&$this->_pf->_logger, 'log') :
-            array(&$common, 'log');
-        $info = $this->_pf->getContents();
-        $info = $info['dir']['file'];
-        if (isset($info['attribs'])) {
-            $info = array($info);
-        }
-        $provides = array();
-        foreach ($info as $fa) {
-            $fa = $fa['attribs'];
-            $file = $fa['name'];
-            if (!file_exists($dir_prefix . DIRECTORY_SEPARATOR . $file)) {
-                $this->_fileNotFound($dir_prefix . DIRECTORY_SEPARATOR . $file);
-                $this->_isValid = 0;
-                continue;
-            }
-            if (in_array($fa['role'], PEAR_Installer_Role::getPhpRoles()) && $dir_prefix) {
-                call_user_func_array($log, array(1, "Analyzing $file"));
-                $srcinfo = $this->analyzeSourceCode($dir_prefix . DIRECTORY_SEPARATOR . $file);
-                if ($srcinfo) {
-                    $provides = array_merge($provides, $this->_buildProvidesArray($srcinfo));
-                }
-            }
-        }
-        $this->_packageName = $pn = $this->_pf->getPackage();
-        $pnl = strlen($pn);
-        foreach ($provides as $key => $what) {
-            if (isset($what['explicit']) || !$what) {
-                // skip conformance checks if the provides entry is
-                // specified in the package.xml file
-                continue;
-            }
-            extract($what);
-            if ($type == 'class') {
-                if (!strncasecmp($name, $pn, $pnl)) {
-                    continue;
-                }
-                $this->_stack->push(__FUNCTION__, 'warning',
-                    array('file' => $file, 'type' => $type, 'name' => $name, 'package' => $pn),
-                    'in %file%: %type% "%name%" not prefixed with package name "%package%"');
-            } elseif ($type == 'function') {
-                if (strstr($name, '::') || !strncasecmp($name, $pn, $pnl)) {
-                    continue;
-                }
-                $this->_stack->push(__FUNCTION__, 'warning',
-                    array('file' => $file, 'type' => $type, 'name' => $name, 'package' => $pn),
-                    'in %file%: %type% "%name%" not prefixed with package name "%package%"');
-            }
-        }
-        return $this->_isValid;
-    }
-
-    /**
-     * Analyze the source code of the given PHP file
-     *
-     * @param  string Filename of the PHP file
-     * @param  boolean whether to analyze $file as the file contents
-     * @return mixed
-     */
-    function analyzeSourceCode($file, $string = false)
-    {
-        if (!function_exists("token_get_all")) {
-            $this->_stack->push(__FUNCTION__, 'error', array('file' => $file),
-                'Parser error: token_get_all() function must exist to analyze source code');
-            return false;
-        }
-        if (!defined('T_DOC_COMMENT')) {
-            define('T_DOC_COMMENT', T_COMMENT);
-        }
-        if (!defined('T_INTERFACE')) {
-            define('T_INTERFACE', -1);
-        }
-        if (!defined('T_IMPLEMENTS')) {
-            define('T_IMPLEMENTS', -1);
-        }
-        if ($string) {
-            $contents = $file;
-        } else {
-            if (!$fp = @fopen($file, "r")) {
-                return false;
-            }
-            fclose($fp);
-            $contents = file_get_contents($file);
-        }
-        $tokens = token_get_all($contents);
-/*
-        for ($i = 0; $i < sizeof($tokens); $i++) {
-            @list($token, $data) = $tokens[$i];
-            if (is_string($token)) {
-                var_dump($token);
-            } else {
-                print token_name($token) . ' ';
-                var_dump(rtrim($data));
-            }
-        }
-*/
-        $look_for = 0;
-        $paren_level = 0;
-        $bracket_level = 0;
-        $brace_level = 0;
-        $lastphpdoc = '';
-        $current_class = '';
-        $current_interface = '';
-        $current_class_level = -1;
-        $current_function = '';
-        $current_function_level = -1;
-        $declared_classes = array();
-        $declared_interfaces = array();
-        $declared_functions = array();
-        $declared_methods = array();
-        $used_classes = array();
-        $used_functions = array();
-        $extends = array();
-        $implements = array();
-        $nodeps = array();
-        $inquote = false;
-        $interface = false;
-        for ($i = 0; $i < sizeof($tokens); $i++) {
-            if (is_array($tokens[$i])) {
-                list($token, $data) = $tokens[$i];
-            } else {
-                $token = $tokens[$i];
-                $data = '';
-            }
-            if ($inquote) {
-                if ($token != '"' && $token != T_END_HEREDOC) {
-                    continue;
-                } else {
-                    $inquote = false;
-                    continue;
-                }
-            }
-            switch ($token) {
-                case T_WHITESPACE :
-                    continue;
-                case ';':
-                    if ($interface) {
-                        $current_function = '';
-                        $current_function_level = -1;
-                    }
-                    break;
-                case '"':
-                case T_START_HEREDOC:
-                    $inquote = true;
-                    break;
-                case T_CURLY_OPEN:
-                case T_DOLLAR_OPEN_CURLY_BRACES:
-                case '{': $brace_level++; continue 2;
-                case '}':
-                    $brace_level--;
-                    if ($current_class_level == $brace_level) {
-                        $current_class = '';
-                        $current_class_level = -1;
-                    }
-                    if ($current_function_level == $brace_level) {
-                        $current_function = '';
-                        $current_function_level = -1;
-                    }
-                    continue 2;
-                case '[': $bracket_level++; continue 2;
-                case ']': $bracket_level--; continue 2;
-                case '(': $paren_level++;   continue 2;
-                case ')': $paren_level--;   continue 2;
-                case T_INTERFACE:
-                    $interface = true;
-                case T_CLASS:
-                    if (($current_class_level != -1) || ($current_function_level != -1)) {
-                        $this->_stack->push(__FUNCTION__, 'error', array('file' => $file),
-                        'Parser error: invalid PHP found in file "%file%"');
-                        return false;
-                    }
-                case T_FUNCTION:
-                case T_NEW:
-                case T_EXTENDS:
-                case T_IMPLEMENTS:
-                    $look_for = $token;
-                    continue 2;
-                case T_STRING:
-                    if (version_compare(zend_version(), '2.0', '<')) {
-                        if (in_array(strtolower($data),
-                            array('public', 'private', 'protected', 'abstract',
-                                  'interface', 'implements', 'throw') 
-                                 )) {
-                            $this->_stack->push(__FUNCTION__, 'warning', array(
-                                'file' => $file),
-                                'Error, PHP5 token encountered in %file%,' .
-                                ' analysis should be in PHP5');
-                        }
-                    }
-                    if ($look_for == T_CLASS) {
-                        $current_class = $data;
-                        $current_class_level = $brace_level;
-                        $declared_classes[] = $current_class;
-                    } elseif ($look_for == T_INTERFACE) {
-                        $current_interface = $data;
-                        $current_class_level = $brace_level;
-                        $declared_interfaces[] = $current_interface;
-                    } elseif ($look_for == T_IMPLEMENTS) {
-                        $implements[$current_class] = $data;
-                    } elseif ($look_for == T_EXTENDS) {
-                        $extends[$current_class] = $data;
-                    } elseif ($look_for == T_FUNCTION) {
-                        if ($current_class) {
-                            $current_function = "$current_class::$data";
-                            $declared_methods[$current_class][] = $data;
-                        } elseif ($current_interface) {
-                            $current_function = "$current_interface::$data";
-                            $declared_methods[$current_interface][] = $data;
-                        } else {
-                            $current_function = $data;
-                            $declared_functions[] = $current_function;
-                        }
-                        $current_function_level = $brace_level;
-                        $m = array();
-                    } elseif ($look_for == T_NEW) {
-                        $used_classes[$data] = true;
-                    }
-                    $look_for = 0;
-                    continue 2;
-                case T_VARIABLE:
-                    $look_for = 0;
-                    continue 2;
-                case T_DOC_COMMENT:
-                case T_COMMENT:
-                    if (preg_match('!^/\*\*\s!', $data)) {
-                        $lastphpdoc = $data;
-                        if (preg_match_all('/@nodep\s+(\S+)/', $lastphpdoc, $m)) {
-                            $nodeps = array_merge($nodeps, $m[1]);
-                        }
-                    }
-                    continue 2;
-                case T_DOUBLE_COLON:
-                    if (!($tokens[$i - 1][0] == T_WHITESPACE || $tokens[$i - 1][0] == T_STRING)) {
-                        $this->_stack->push(__FUNCTION__, 'warning', array('file' => $file),
-                            'Parser error: invalid PHP found in file "%file%"');
-                        return false;
-                    }
-                    $class = $tokens[$i - 1][1];
-                    if (strtolower($class) != 'parent') {
-                        $used_classes[$class] = true;
-                    }
-                    continue 2;
-            }
-        }
-        return array(
-            "source_file" => $file,
-            "declared_classes" => $declared_classes,
-            "declared_interfaces" => $declared_interfaces,
-            "declared_methods" => $declared_methods,
-            "declared_functions" => $declared_functions,
-            "used_classes" => array_diff(array_keys($used_classes), $nodeps),
-            "inheritance" => $extends,
-            "implements" => $implements,
-            );
-    }
-
-    /**
-     * Build a "provides" array from data returned by
-     * analyzeSourceCode().  The format of the built array is like
-     * this:
-     *
-     *  array(
-     *    'class;MyClass' => 'array('type' => 'class', 'name' => 'MyClass'),
-     *    ...
-     *  )
-     *
-     *
-     * @param array $srcinfo array with information about a source file
-     * as returned by the analyzeSourceCode() method.
-     *
-     * @return void
-     *
-     * @access private
-     *
-     */
-    function _buildProvidesArray($srcinfo)
-    {
-        if (!$this->_isValid) {
-            return array();
-        }
-        $providesret = array();
-        $file = basename($srcinfo['source_file']);
-        $pn = $this->_pf->getPackage();
-        $pnl = strlen($pn);
-        foreach ($srcinfo['declared_classes'] as $class) {
-            $key = "class;$class";
-            if (isset($providesret[$key])) {
-                continue;
-            }
-            $providesret[$key] =
-                array('file'=> $file, 'type' => 'class', 'name' => $class);
-            if (isset($srcinfo['inheritance'][$class])) {
-                $providesret[$key]['extends'] =
-                    $srcinfo['inheritance'][$class];
-            }
-        }
-        foreach ($srcinfo['declared_methods'] as $class => $methods) {
-            foreach ($methods as $method) {
-                $function = "$class::$method";
-                $key = "function;$function";
-                if ($method{0} == '_' || !strcasecmp($method, $class) ||
-                    isset($providesret[$key])) {
-                    continue;
-                }
-                $providesret[$key] =
-                    array('file'=> $file, 'type' => 'function', 'name' => $function);
-            }
-        }
-
-        foreach ($srcinfo['declared_functions'] as $function) {
-            $key = "function;$function";
-            if ($function{0} == '_' || isset($providesret[$key])) {
-                continue;
-            }
-            if (!strstr($function, '::') && strncasecmp($function, $pn, $pnl)) {
-                $warnings[] = "in1 " . $file . ": function \"$function\" not prefixed with package name \"$pn\"";
-            }
-            $providesret[$key] =
-                array('file'=> $file, 'type' => 'function', 'name' => $function);
-        }
-        return $providesret;
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/PackageFile/v2/rw.php b/PEAR/PackageFile/v2/rw.php
deleted file mode 100644
index 5c05a3e..0000000
--- a/PEAR/PackageFile/v2/rw.php
+++ /dev/null
@@ -1,1599 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: rw.php,v 1.18 2006/09/25 05:12:21 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a8
- */
-/**
- * For base class
- */
-require_once 'PEAR/PackageFile/v2.php';
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a8
- */
-class PEAR_PackageFile_v2_rw extends PEAR_PackageFile_v2
-{
-    /**
-     * @param string Extension name
-     * @return bool success of operation
-     */
-    function setProvidesExtension($extension)
-    {
-        if (in_array($this->getPackageType(),
-              array('extsrc', 'extbin', 'zendextsrc', 'zendextbin'))) {
-            if (!isset($this->_packageInfo['providesextension'])) {
-                // ensure that the channel tag is set up in the right location
-                $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                    array('usesrole', 'usestask', 'srcpackage', 'srcuri', 'phprelease',
-                    'extsrcrelease', 'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                    'bundle', 'changelog'),
-                    $extension, 'providesextension');
-            }
-            $this->_packageInfo['providesextension'] = $extension;
-            return true;
-        }
-        return false;
-    }
-
-    function setPackage($package)
-    {
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['attribs'])) {
-            $this->_packageInfo = array_merge(array('attribs' => array(
-                                 'version' => '2.0',
-                                 'xmlns' => 'http://pear.php.net/dtd/package-2.0',
-                                 'xmlns:tasks' => 'http://pear.php.net/dtd/tasks-1.0',
-                                 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-                                 'xsi:schemaLocation' => 'http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd',
-                             )), $this->_packageInfo);
-        }
-        if (!isset($this->_packageInfo['name'])) {
-            return $this->_packageInfo = array_merge(array('name' => $package),
-                $this->_packageInfo);
-        }
-        $this->_packageInfo['name'] = $package;
-    }
-
-    /**
-     * set this as a package.xml version 2.1
-     * @access private
-     */
-    function _setPackageVersion2_1()
-    {
-        $info = array(
-                                 'version' => '2.1',
-                                 'xmlns' => 'http://pear.php.net/dtd/package-2.1',
-                                 'xmlns:tasks' => 'http://pear.php.net/dtd/tasks-1.0',
-                                 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-                                 'xsi:schemaLocation' => 'http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.1
-    http://pear.php.net/dtd/package-2.1.xsd',
-                             );
-        if (!isset($this->_packageInfo['attribs'])) {
-            $this->_packageInfo = array_merge(array('attribs' => $info), $this->_packageInfo);
-        } else {
-            $this->_packageInfo['attribs'] = $info;
-        }
-    }
-
-    function setUri($uri)
-    {
-        unset($this->_packageInfo['channel']);
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['uri'])) {
-            // ensure that the uri tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo, 
-                array('extends', 'summary', 'description', 'lead',
-                'developer', 'contributor', 'helper', 'date', 'time', 'version',
-                'stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), $uri, 'uri');
-        }
-        $this->_packageInfo['uri'] = $uri;
-    }
-
-    function setChannel($channel)
-    {
-        unset($this->_packageInfo['uri']);
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['channel'])) {
-            // ensure that the channel tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('extends', 'summary', 'description', 'lead',
-                'developer', 'contributor', 'helper', 'date', 'time', 'version',
-                'stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), $channel, 'channel');
-        }
-        $this->_packageInfo['channel'] = $channel;
-    }
-
-    function setExtends($extends)
-    {
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['extends'])) {
-            // ensure that the extends tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('summary', 'description', 'lead',
-                'developer', 'contributor', 'helper', 'date', 'time', 'version',
-                'stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), $extends, 'extends');
-        }
-        $this->_packageInfo['extends'] = $extends;
-    }
-
-    function setSummary($summary)
-    {
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['summary'])) {
-            // ensure that the summary tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('description', 'lead',
-                'developer', 'contributor', 'helper', 'date', 'time', 'version',
-                'stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), $summary, 'summary');
-        }
-        $this->_packageInfo['summary'] = $summary;
-    }
-
-    function setDescription($desc)
-    {
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['description'])) {
-            // ensure that the description tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('lead',
-                'developer', 'contributor', 'helper', 'date', 'time', 'version',
-                'stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), $desc, 'description');
-        }
-        $this->_packageInfo['description'] = $desc;
-    }
-
-    /**
-     * Adds a new maintainer - no checking of duplicates is performed, use
-     * updatemaintainer for that purpose.
-     */
-    function addMaintainer($role, $handle, $name, $email, $active = 'yes')
-    {
-        if (!in_array($role, array('lead', 'developer', 'contributor', 'helper'))) {
-            return false;
-        }
-        if (isset($this->_packageInfo[$role])) {
-            if (!isset($this->_packageInfo[$role][0])) {
-                $this->_packageInfo[$role] = array($this->_packageInfo[$role]);
-            }
-            $this->_packageInfo[$role][] =
-                array(
-                    'name' => $name,
-                    'user' => $handle,
-                    'email' => $email,
-                    'active' => $active,
-                );
-        } else {
-            $testarr = array('lead',
-                    'developer', 'contributor', 'helper', 'date', 'time', 'version',
-                    'stability', 'license', 'notes', 'contents', 'compatible',
-                    'dependencies', 'providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease',
-                    'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog');
-            foreach (array('lead', 'developer', 'contributor', 'helper') as $testrole) {
-                array_shift($testarr);
-                if ($role == $testrole) {
-                    break;
-                }
-            }
-            if (!isset($this->_packageInfo[$role])) {
-                // ensure that the extends tag is set up in the right location
-                $this->_packageInfo = $this->_insertBefore($this->_packageInfo, $testarr,
-                    array(), $role);
-            }
-            $this->_packageInfo[$role] =
-                array(
-                    'name' => $name,
-                    'user' => $handle,
-                    'email' => $email,
-                    'active' => $active,
-                );
-        }
-        $this->_isValid = 0;
-    }
-
-    function updateMaintainer($newrole, $handle, $name, $email, $active = 'yes')
-    {
-        $found = false;
-        foreach (array('lead', 'developer', 'contributor', 'helper') as $role) {
-            if (!isset($this->_packageInfo[$role])) {
-                continue;
-            }
-            $info = $this->_packageInfo[$role];
-            if (!isset($info[0])) {
-                if ($info['user'] == $handle) {
-                    $found = true;
-                    break;
-                }
-            }
-            foreach ($info as $i => $maintainer) {
-                if ($maintainer['user'] == $handle) {
-                    $found = $i;
-                    break 2;
-                }
-            }
-        }
-        if ($found === false) {
-            return $this->addMaintainer($newrole, $handle, $name, $email, $active);
-        }
-        if ($found !== false) {
-            if ($found === true) {
-                unset($this->_packageInfo[$role]);
-            } else {
-                unset($this->_packageInfo[$role][$found]);
-                $this->_packageInfo[$role] = array_values($this->_packageInfo[$role]);
-            }
-        }
-        $this->addMaintainer($newrole, $handle, $name, $email, $active);
-        $this->_isValid = 0;
-    }
-
-    function deleteMaintainer($handle)
-    {
-        $found = false;
-        foreach (array('lead', 'developer', 'contributor', 'helper') as $role) {
-            if (!isset($this->_packageInfo[$role])) {
-                continue;
-            }
-            if (!isset($this->_packageInfo[$role][0])) {
-                $this->_packageInfo[$role] = array($this->_packageInfo[$role]);
-            }
-            foreach ($this->_packageInfo[$role] as $i => $maintainer) {
-                if ($maintainer['user'] == $handle) {
-                    $found = $i;
-                    break;
-                }
-            }
-            if ($found !== false) {
-                unset($this->_packageInfo[$role][$found]);
-                if (!count($this->_packageInfo[$role]) && $role == 'lead') {
-                    $this->_isValid = 0;
-                }
-                if (!count($this->_packageInfo[$role])) {
-                    unset($this->_packageInfo[$role]);
-                    return true;
-                }
-                $this->_packageInfo[$role] =
-                    array_values($this->_packageInfo[$role]);
-                if (count($this->_packageInfo[$role]) == 1) {
-                    $this->_packageInfo[$role] = $this->_packageInfo[$role][0];
-                }
-                return true;
-            }
-            if (count($this->_packageInfo[$role]) == 1) {
-                $this->_packageInfo[$role] = $this->_packageInfo[$role][0];
-            }
-        }
-        return false;
-    }
-
-    function setReleaseVersion($version)
-    {
-        if (isset($this->_packageInfo['version']) &&
-              isset($this->_packageInfo['version']['release'])) {
-            unset($this->_packageInfo['version']['release']);
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $version, array(
-            'version' => array('stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'),
-            'release' => array('api')));
-        $this->_isValid = 0;
-    }
-
-    function setAPIVersion($version)
-    {
-        if (isset($this->_packageInfo['version']) &&
-              isset($this->_packageInfo['version']['api'])) {
-            unset($this->_packageInfo['version']['api']);
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $version, array(
-            'version' => array('stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'),
-            'api' => array()));
-        $this->_isValid = 0;
-    }
-
-    /**
-     * snapshot|devel|alpha|beta|stable
-     */
-    function setReleaseStability($state)
-    {
-        if (isset($this->_packageInfo['stability']) &&
-              isset($this->_packageInfo['stability']['release'])) {
-            unset($this->_packageInfo['stability']['release']);
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $state, array(
-            'stability' => array('license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'),
-            'release' => array('api')));
-        $this->_isValid = 0;
-    }
-
-    /**
-     * @param devel|alpha|beta|stable
-     */
-    function setAPIStability($state)
-    {
-        if (isset($this->_packageInfo['stability']) &&
-              isset($this->_packageInfo['stability']['api'])) {
-            unset($this->_packageInfo['stability']['api']);
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $state, array(
-            'stability' => array('license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'),
-            'api' => array()));
-        $this->_isValid = 0;
-    }
-
-    function setLicense($license, $uri = false, $filesource = false)
-    {
-        if (!isset($this->_packageInfo['license'])) {
-            // ensure that the license tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), 0, 'license');
-        }
-        if ($uri || $filesource) {
-            $attribs = array();
-            if ($uri) {
-                $attribs['uri'] = $uri;
-            }
-            $uri = true; // for test below
-            if ($filesource) {
-                $attribs['filesource'] = $filesource;
-            }
-        }
-        $license = $uri ? array('attribs' => $attribs, '_content' => $license) : $license;
-        $this->_packageInfo['license'] = $license;
-        $this->_isValid = 0;
-    }
-
-    function setNotes($notes)
-    {
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['notes'])) {
-            // ensure that the notes tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), $notes, 'notes');
-        }
-        $this->_packageInfo['notes'] = $notes;
-    }
-
-    /**
-     * This is only used at install-time, after all serialization
-     * is over.
-     * @param string file name
-     * @param string installed path
-     */
-    function setInstalledAs($file, $path)
-    {
-        if ($path) {
-            return $this->_packageInfo['filelist'][$file]['installed_as'] = $path;
-        }
-        unset($this->_packageInfo['filelist'][$file]['installed_as']);
-    }
-
-    /**
-     * This is only used at install-time, after all serialization
-     * is over.
-     */
-    function installedFile($file, $atts)
-    {
-        if (isset($this->_packageInfo['filelist'][$file])) {
-            $this->_packageInfo['filelist'][$file] =
-                array_merge($this->_packageInfo['filelist'][$file], $atts['attribs']);
-        } else {
-            $this->_packageInfo['filelist'][$file] = $atts['attribs'];
-        }
-    }
-
-    /**
-     * Reset the listing of package contents
-     * @param string base installation dir for the whole package, if any
-     */
-    function clearContents($baseinstall = false)
-    {
-        $this->_filesValid = false;
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['contents'])) {
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('compatible',
-                    'dependencies', 'providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease',
-                    'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                    'bundle', 'changelog'), array(), 'contents');
-        }
-        if ($this->getPackageType() != 'bundle') {
-            $this->_packageInfo['contents'] = 
-                array('dir' => array('attribs' => array('name' => '/')));
-            if ($baseinstall) {
-                $this->_packageInfo['contents']['dir']['attribs']['baseinstalldir'] = $baseinstall;
-            }
-        }
-    }
-
-    /**
-     * @param string relative path of the bundled package.
-     */
-    function addBundledPackage($path)
-    {
-        if ($this->getPackageType() != 'bundle') {
-            return false;
-        }
-        $this->_filesValid = false;
-        $this->_isValid = 0;
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $path, array(
-                'contents' => array('compatible', 'dependencies', 'providesextension',
-                'usesrole', 'usestask', 'srcpackage', 'srcuri', 'phprelease',
-                'extsrcrelease', 'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'bundle', 'changelog'),
-                'bundledpackage' => array()));
-    }
-
-    /**
-     * @param string file name
-     * @param PEAR_Task_Common a read/write task
-     */
-    function addTaskToFile($filename, $task)
-    {
-        if (!method_exists($task, 'getXml')) {
-            return false;
-        }
-        if (!method_exists($task, 'getName')) {
-            return false;
-        }
-        if (!method_exists($task, 'validate')) {
-            return false;
-        }
-        if (!$task->validate()) {
-            return false;
-        }
-        if (!isset($this->_packageInfo['contents']['dir']['file'])) {
-            return false;
-        }
-        $this->getTasksNs(); // discover the tasks namespace if not done already
-        $files = $this->_packageInfo['contents']['dir']['file'];
-        if (!isset($files[0])) {
-            $files = array($files);
-            $ind = false;
-        } else {
-            $ind = true;
-        }
-        foreach ($files as $i => $file) {
-            if (isset($file['attribs'])) {
-                if ($file['attribs']['name'] == $filename) {
-                    if ($ind) {
-                        $t = isset($this->_packageInfo['contents']['dir']['file'][$i]
-                              ['attribs'][$this->_tasksNs .
-                              ':' . $task->getName()]) ?
-                              $this->_packageInfo['contents']['dir']['file'][$i]
-                              ['attribs'][$this->_tasksNs .
-                              ':' . $task->getName()] : false;
-                        if ($t && !isset($t[0])) {
-                            $this->_packageInfo['contents']['dir']['file'][$i]
-                                [$this->_tasksNs . ':' . $task->getName()] = array($t);
-                        }
-                        $this->_packageInfo['contents']['dir']['file'][$i][$this->_tasksNs .
-                            ':' . $task->getName()][] = $task->getXml();
-                    } else {
-                        $t = isset($this->_packageInfo['contents']['dir']['file']
-                              ['attribs'][$this->_tasksNs .
-                              ':' . $task->getName()]) ? $this->_packageInfo['contents']['dir']['file']
-                              ['attribs'][$this->_tasksNs .
-                              ':' . $task->getName()] : false;
-                        if ($t && !isset($t[0])) {
-                            $this->_packageInfo['contents']['dir']['file']
-                                [$this->_tasksNs . ':' . $task->getName()] = array($t);
-                        }
-                        $this->_packageInfo['contents']['dir']['file'][$this->_tasksNs .
-                            ':' . $task->getName()][] = $task->getXml();
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param string path to the file
-     * @param string filename
-     * @param array extra attributes
-     */
-    function addFile($dir, $file, $attrs)
-    {
-        if ($this->getPackageType() == 'bundle') {
-            return false;
-        }
-        $this->_filesValid = false;
-        $this->_isValid = 0;
-        $dir = preg_replace(array('!\\\\+!', '!/+!'), array('/', '/'), $dir);
-        if ($dir == '/' || $dir == '') {
-            $dir = '';
-        } else {
-            $dir .= '/';
-        }
-        $attrs['name'] = $dir . $file;
-        if (!isset($this->_packageInfo['contents'])) {
-            // ensure that the contents tag is set up
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('compatible', 'dependencies', 'providesextension', 'usesrole', 'usestask',
-                'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease',
-                'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'bundle', 'changelog'), array(), 'contents');
-        }
-        if (isset($this->_packageInfo['contents']['dir']['file'])) {
-            if (!isset($this->_packageInfo['contents']['dir']['file'][0])) {
-                $this->_packageInfo['contents']['dir']['file'] =
-                    array($this->_packageInfo['contents']['dir']['file']);
-            }
-            $this->_packageInfo['contents']['dir']['file'][]['attribs'] = $attrs;
-        } else {
-            $this->_packageInfo['contents']['dir']['file']['attribs'] = $attrs;
-        }
-    }
-
-    /**
-     * @param string Dependent package name
-     * @param string Dependent package's channel name
-     * @param string minimum version of specified package that this release is guaranteed to be
-     *               compatible with
-     * @param string maximum version of specified package that this release is guaranteed to be
-     *               compatible with
-     * @param string versions of specified package that this release is not compatible with
-     */
-    function addCompatiblePackage($name, $channel, $min, $max, $exclude = false)
-    {
-        $this->_isValid = 0;
-        $set = array(
-            'name' => $name,
-            'channel' => $channel,
-            'min' => $min,
-            'max' => $max,
-        );
-        if ($exclude) {
-            $set['exclude'] = $exclude;
-        }
-        $this->_isValid = 0;
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $set, array(
-                'compatible' => array('dependencies', 'providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog')
-            ));
-    }
-
-    /**
-     * Removes the  tag entirely
-     */
-    function resetUsesrole()
-    {
-        if (isset($this->_packageInfo['usesrole'])) {
-            unset($this->_packageInfo['usesrole']);
-        }
-    }
-
-    /**
-     * @param string
-     * @param string package name or uri
-     * @param string channel name if non-uri
-     */
-    function addUsesrole($role, $packageOrUri, $channel = false) {
-        $set = array('role' => $role);
-        if ($channel) {
-            $set['package'] = $packageOrUri;
-            $set['channel'] = $channel;
-        } else {
-            $set['uri'] = $packageOrUri;
-        }
-        $this->_isValid = 0;
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $set, array(
-                'usesrole' => array('usestask', 'srcpackage', 'srcuri',
-                    'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog')
-            ));
-    }
-
-    /**
-     * Removes the  tag entirely
-     */
-    function resetUsestask()
-    {
-        if (isset($this->_packageInfo['usestask'])) {
-            unset($this->_packageInfo['usestask']);
-        }
-    }
-
-
-    /**
-     * @param string
-     * @param string package name or uri
-     * @param string channel name if non-uri
-     */
-    function addUsestask($task, $packageOrUri, $channel = false) {
-        $set = array('task' => $task);
-        if ($channel) {
-            $set['package'] = $packageOrUri;
-            $set['channel'] = $channel;
-        } else {
-            $set['uri'] = $packageOrUri;
-        }
-        $this->_isValid = 0;
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $set, array(
-                'usestask' => array('srcpackage', 'srcuri',
-                    'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog')
-            ));
-    }
-
-    /**
-     * Remove all compatible tags
-     */
-    function clearCompatible()
-    {
-        unset($this->_packageInfo['compatible']);
-    }
-
-    /**
-     * Reset dependencies prior to adding new ones
-     */
-    function clearDeps()
-    {
-        if (!isset($this->_packageInfo['dependencies'])) {
-            $this->_packageInfo = $this->_mergeTag($this->_packageInfo, array(),
-                array(
-                    'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                        'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                        'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog')));
-        }
-        $this->_packageInfo['dependencies'] = array();
-    }
-
-    /**
-     * @param string minimum PHP version allowed
-     * @param string maximum PHP version allowed
-     * @param array $exclude incompatible PHP versions
-     */
-    function setPhpDep($min, $max = false, $exclude = false)
-    {
-        $this->_isValid = 0;
-        $dep =
-            array(
-                'min' => $min,
-            );
-        if ($max) {
-            $dep['max'] = $max;
-        }
-        if ($exclude) {
-            if (count($exclude) == 1) {
-                $exclude = $exclude[0];
-            }
-            $dep['exclude'] = $exclude;
-        }
-        if (isset($this->_packageInfo['dependencies']['required']['php'])) {
-            $this->_stack->push(__FUNCTION__, 'warning', array('dep' =>
-            $this->_packageInfo['dependencies']['required']['php']),
-                'warning: PHP dependency already exists, overwriting');
-            unset($this->_packageInfo['dependencies']['required']['php']);
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'required' => array('optional', 'group'),
-                'php' => array('pearinstaller', 'package', 'subpackage', 'extension', 'os', 'arch')
-            ));
-        return true;
-    }
-
-    /**
-     * @param string minimum allowed PEAR installer version
-     * @param string maximum allowed PEAR installer version
-     * @param string recommended PEAR installer version
-     * @param array incompatible version of the PEAR installer
-     */
-    function setPearinstallerDep($min, $max = false, $recommended = false, $exclude = false)
-    {
-        $this->_isValid = 0;
-        $dep =
-            array(
-                'min' => $min,
-            );
-        if ($max) {
-            $dep['max'] = $max;
-        }
-        if ($recommended) {
-            $dep['recommended'] = $recommended;
-        }
-        if ($exclude) {
-            if (count($exclude) == 1) {
-                $exclude = $exclude[0];
-            }
-            $dep['exclude'] = $exclude;
-        }
-        if (isset($this->_packageInfo['dependencies']['required']['pearinstaller'])) {
-            $this->_stack->push(__FUNCTION__, 'warning', array('dep' =>
-            $this->_packageInfo['dependencies']['required']['pearinstaller']),
-                'warning: PEAR Installer dependency already exists, overwriting');
-            unset($this->_packageInfo['dependencies']['required']['pearinstaller']);
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'required' => array('optional', 'group'),
-                'pearinstaller' => array('package', 'subpackage', 'extension', 'os', 'arch')
-            ));
-    }
-
-    /**
-     * Mark a package as conflicting with this package
-     * @param string package name
-     * @param string package channel
-     * @param string extension this package provides, if any
-     */
-    function addConflictingPackageDepWithChannel($name, $channel, $providesextension = false)
-    {
-        $this->_isValid = 0;
-        $dep =
-            array(
-                'name' => $name,
-                'channel' => $channel,
-                'conflicts' => '',
-            );
-        if ($providesextension) {
-            $dep['providesextension'] = $providesextension;
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'required' => array('optional', 'group'),
-                'package' => array('subpackage', 'extension', 'os', 'arch')
-            ));
-    }
-
-    /**
-     * Mark a package as conflicting with this package
-     * @param string package name
-     * @param string package channel
-     * @param string extension this package provides, if any
-     */
-    function addConflictingPackageDepWithUri($name, $uri, $providesextension = false)
-    {
-        $this->_isValid = 0;
-        $dep =
-            array(
-                'name' => $name,
-                'uri' => $uri,
-                'conflicts' => '',
-            );
-        if ($providesextension) {
-            $dep['providesextension'] = $providesextension;
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'required' => array('optional', 'group'),
-                'package' => array('subpackage', 'extension', 'os', 'arch')
-            ));
-    }
-
-    function addDependencyGroup($name, $hint)
-    {
-        $this->_isValid = 0;
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo,
-            array('attribs' => array('name' => $name, 'hint' => $hint)),
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'group' => array(),
-            ));
-    }
-
-    /**
-     * @param string package name
-     * @param string|false channel name, false if this is a uri
-     * @param string|false uri name, false if this is a channel
-     * @param string|false minimum version required
-     * @param string|false maximum version allowed
-     * @param string|false recommended installation version
-     * @param array|false versions to exclude from installation
-     * @param string extension this package provides, if any
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     * @return array
-     * @access private
-     */
-    function _constructDep($name, $channel, $uri, $min, $max, $recommended, $exclude,
-                           $providesextension = false, $nodefault = false)
-    {
-        $dep =
-            array(
-                'name' => $name,
-            );
-        if ($channel) {
-            $dep['channel'] = $channel;
-        } elseif ($uri) {
-            $dep['uri'] = $uri;
-        }
-        if ($min) {
-            $dep['min'] = $min;
-        }
-        if ($max) {
-            $dep['max'] = $max;
-        }
-        if ($recommended) {
-            $dep['recommended'] = $recommended;
-        }
-        if ($exclude) {
-            if (is_array($exclude) && count($exclude) == 1) {
-                $exclude = $exclude[0];
-            }
-            $dep['exclude'] = $exclude;
-        }
-        if ($nodefault) {
-            $dep['nodefault'] = '';
-        }
-        if ($providesextension) {
-            $dep['providesextension'] = $providesextension;
-        }
-        return $dep;
-    }
-
-    /**
-     * @param package|subpackage
-     * @param string group name
-     * @param string package name
-     * @param string package channel
-     * @param string minimum version
-     * @param string maximum version
-     * @param string recommended version
-     * @param array|false optional excluded versions
-     * @param string extension this package provides, if any
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     * @return bool false if the dependency group has not been initialized with
-     *              {@link addDependencyGroup()}, or a subpackage is added with
-     *              a providesextension
-     */
-    function addGroupPackageDepWithChannel($type, $groupname, $name, $channel, $min = false,
-                                      $max = false, $recommended = false, $exclude = false,
-                                      $providesextension = false, $nodefault = false)
-    {
-        if ($type == 'subpackage' && $providesextension) {
-            return false; // subpackages must be php packages
-        }
-        $dep = $this->_constructDep($name, $channel, false, $min, $max, $recommended, $exclude,
-            $providesextension, $nodefault);
-        return $this->_addGroupDependency($type, $dep, $groupname);
-    }
-
-    /**
-     * @param package|subpackage
-     * @param string group name
-     * @param string package name
-     * @param string package uri
-     * @param string extension this package provides, if any
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     * @return bool false if the dependency group has not been initialized with
-     *              {@link addDependencyGroup()}
-     */
-    function addGroupPackageDepWithURI($type, $groupname, $name, $uri, $providesextension = false,
-                                       $nodefault = false)
-    {
-        if ($type == 'subpackage' && $providesextension) {
-            return false; // subpackages must be php packages
-        }
-        $dep = $this->_constructDep($name, false, $uri, false, false, false, false,
-            $providesextension, $nodefault);
-        return $this->_addGroupDependency($type, $dep, $groupname);
-    }
-
-    /**
-     * @param string group name (must be pre-existing)
-     * @param string extension name
-     * @param string minimum version allowed
-     * @param string maximum version allowed
-     * @param string recommended version
-     * @param array incompatible versions
-     */
-    function addGroupExtensionDep($groupname, $name, $min = false, $max = false,
-                                         $recommended = false, $exclude = false)
-    {
-        $this->_isValid = 0;
-        $dep = $this->_constructDep($name, false, false, $min, $max, $recommended, $exclude);
-        return $this->_addGroupDependency('extension', $dep, $groupname);
-    }
-
-    /**
-     * @param package|subpackage|extension
-     * @param array dependency contents
-     * @param string name of the dependency group to add this to
-     * @return boolean
-     * @access private
-     */
-    function _addGroupDependency($type, $dep, $groupname)
-    {
-        $arr = array('subpackage', 'extension');
-        if ($type != 'package') {
-            array_shift($arr);
-        }
-        if ($type == 'extension') {
-            array_shift($arr);
-        }
-        if (!isset($this->_packageInfo['dependencies']['group'])) {
-            return false;
-        } else {
-            if (!isset($this->_packageInfo['dependencies']['group'][0])) {
-                if ($this->_packageInfo['dependencies']['group']['attribs']['name'] == $groupname) {
-                    $this->_packageInfo['dependencies']['group'] = $this->_mergeTag(
-                        $this->_packageInfo['dependencies']['group'], $dep,
-                        array(
-                            $type => $arr
-                        ));
-                    $this->_isValid = 0;
-                    return true;
-                } else {
-                    return false;
-                }
-            } else {
-                foreach ($this->_packageInfo['dependencies']['group'] as $i => $group) {
-                    if ($group['attribs']['name'] == $groupname) {
-                    $this->_packageInfo['dependencies']['group'][$i] = $this->_mergeTag(
-                        $this->_packageInfo['dependencies']['group'][$i], $dep,
-                        array(
-                            $type => $arr
-                        ));
-                        $this->_isValid = 0;
-                        return true;
-                    }
-                }
-                return false;
-            }
-        }
-    }
-
-    /**
-     * @param optional|required
-     * @param string package name
-     * @param string package channel
-     * @param string minimum version
-     * @param string maximum version
-     * @param string recommended version
-     * @param string extension this package provides, if any
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     * @param array|false optional excluded versions
-     */
-    function addPackageDepWithChannel($type, $name, $channel, $min = false, $max = false,
-                                      $recommended = false, $exclude = false,
-                                      $providesextension = false, $nodefault = false)
-    {
-        if (!in_array($type, array('optional', 'required'), true)) {
-            $type = 'required';
-        }
-        $this->_isValid = 0;
-        $arr = array('optional', 'group');
-        if ($type != 'required') {
-            array_shift($arr);
-        }
-        $dep = $this->_constructDep($name, $channel, false, $min, $max, $recommended, $exclude,
-            $providesextension, $nodefault);
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                $type => $arr,
-                'package' => array('subpackage', 'extension', 'os', 'arch')
-            ));
-    }
-
-    /**
-     * @param optional|required
-     * @param string name of the package
-     * @param string uri of the package
-     * @param string extension this package provides, if any
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     */
-    function addPackageDepWithUri($type, $name, $uri, $providesextension = false,
-                                  $nodefault = false)
-    {
-        $this->_isValid = 0;
-        $arr = array('optional', 'group');
-        if ($type != 'required') {
-            array_shift($arr);
-        }
-        $dep = $this->_constructDep($name, false, $uri, false, false, false, false,
-            $providesextension, $nodefault);
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                $type => $arr,
-                'package' => array('subpackage', 'extension', 'os', 'arch')
-            ));
-    }
-
-    /**
-     * @param optional|required optional, required
-     * @param string package name
-     * @param string package channel
-     * @param string minimum version
-     * @param string maximum version
-     * @param string recommended version
-     * @param array incompatible versions
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     */
-    function addSubpackageDepWithChannel($type, $name, $channel, $min = false, $max = false,
-                                         $recommended = false, $exclude = false,
-                                         $nodefault = false)
-    {
-        $this->_isValid = 0;
-        $arr = array('optional', 'group');
-        if ($type != 'required') {
-            array_shift($arr);
-        }
-        $dep = $this->_constructDep($name, $channel, false, $min, $max, $recommended, $exclude,
-            $nodefault);
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                $type => $arr,
-                'subpackage' => array('extension', 'os', 'arch')
-            ));
-    }
-
-    /**
-     * @param optional|required optional, required
-     * @param string package name
-     * @param string package uri for download
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     */
-    function addSubpackageDepWithUri($type, $name, $uri, $nodefault = false)
-    {
-        $this->_isValid = 0;
-        $arr = array('optional', 'group');
-        if ($type != 'required') {
-            array_shift($arr);
-        }
-        $dep = $this->_constructDep($name, false, $uri, false, false, false, false, $nodefault);
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                $type => $arr,
-                'subpackage' => array('extension', 'os', 'arch')
-            ));
-    }
-
-    /**
-     * @param optional|required optional, required
-     * @param string extension name
-     * @param string minimum version
-     * @param string maximum version
-     * @param string recommended version
-     * @param array incompatible versions
-     */
-    function addExtensionDep($type, $name, $min = false, $max = false, $recommended = false,
-                             $exclude = false)
-    {
-        $this->_isValid = 0;
-        $arr = array('optional', 'group');
-        if ($type != 'required') {
-            array_shift($arr);
-        }
-        $dep = $this->_constructDep($name, false, false, $min, $max, $recommended, $exclude);
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                $type => $arr,
-                'extension' => array('os', 'arch')
-            ));
-    }
-
-    /**
-     * @param string Operating system name
-     * @param boolean true if this package cannot be installed on this OS
-     */
-    function addOsDep($name, $conflicts = false)
-    {
-        $this->_isValid = 0;
-        $dep = array('name' => $name);
-        if ($conflicts) {
-            $dep['conflicts'] = '';
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'required' => array('optional', 'group'),
-                'os' => array('arch')
-            ));
-    }
-
-    /**
-     * @param string Architecture matching pattern
-     * @param boolean true if this package cannot be installed on this architecture
-     */
-    function addArchDep($pattern, $conflicts = false)
-    {
-        $this->_isValid = 0;
-        $dep = array('pattern' => $pattern);
-        if ($conflicts) {
-            $dep['conflicts'] = '';
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'required' => array('optional', 'group'),
-                'arch' => array()
-            ));
-    }
-
-    /**
-     * Set the kind of package, and erase all release tags
-     *
-     * - a php package is a PEAR-style package
-     * - an extbin package is a PECL-style extension binary
-     * - an extsrc package is a PECL-style source for a binary
-     * - an zendextbin package is a PECL-style zend extension binary
-     * - an zendextsrc package is a PECL-style source for a zend extension binary
-     * - a bundle package is a collection of other pre-packaged packages
-     * @param php|extbin|extsrc|zendextsrc|zendextbin|bundle
-     * @return bool success
-     */
-    function setPackageType($type)
-    {
-        $this->_isValid = 0;
-        if (!in_array($type, array('php', 'extbin', 'extsrc', 'zendextsrc',
-                                   'zendextbin', 'bundle'))) {
-            return false;
-        }
-        if (in_array($type, array('zendextsrc', 'zendextbin'))) {
-            $this->_setPackageVersion2_1();
-        }
-        if ($type != 'bundle') {
-            $type .= 'release';
-        }
-        foreach (array('phprelease', 'extbinrelease', 'extsrcrelease',
-                       'zendextsrcrelease', 'zendextbinrelease', 'bundle') as $test) {
-            unset($this->_packageInfo[$test]);
-        }
-        if (!isset($this->_packageInfo[$type])) {
-            // ensure that the release tag is set up
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo, array('changelog'),
-                array(), $type);
-        }
-        $this->_packageInfo[$type] = array();
-        return true;
-    }
-
-    /**
-     * @return bool true if package type is set up
-     */
-    function addRelease()
-    {
-        if ($type = $this->getPackageType()) {
-            if ($type != 'bundle') {
-                $type .= 'release';
-            }
-            $this->_packageInfo = $this->_mergeTag($this->_packageInfo, array(),
-                array($type => array('changelog')));
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get the current release tag in order to add to it
-     * @param bool returns only releases that have installcondition if true
-     * @return array|null
-     */
-    function &_getCurrentRelease($strict = true)
-    {
-        if ($p = $this->getPackageType()) {
-            if ($strict) {
-                if ($p == 'extsrc' || $p == 'zendextsrc') {
-                    $a = null;
-                    return $a;
-                }
-            }
-            if ($p != 'bundle') {
-                $p .= 'release';
-            }
-            if (isset($this->_packageInfo[$p][0])) {
-                return $this->_packageInfo[$p][count($this->_packageInfo[$p]) - 1];
-            } else {
-                return $this->_packageInfo[$p];
-            }
-        } else {
-            $a = null;
-            return $a;
-        }
-    }
-
-    /**
-     * Add a file to the current release that should be installed under a different name
-     * @param string  path to file
-     * @param string name the file should be installed as
-     */
-    function addInstallAs($path, $as)
-    {
-        $r = &$this->_getCurrentRelease();
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        $r = $this->_mergeTag($r, array('attribs' => array('name' => $path, 'as' => $as)),
-            array(
-                'filelist' => array(),
-                'install' => array('ignore')
-            ));
-    }
-
-    /**
-     * Add a file to the current release that should be ignored
-     * @param string  path to file
-     * @return bool success of operation
-     */
-    function addIgnore($path)
-    {
-        $r = &$this->_getCurrentRelease();
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        $r = $this->_mergeTag($r, array('attribs' => array('name' => $path)),
-            array(
-                'filelist' => array(),
-                'ignore' => array()
-            ));
-    }
-
-    /**
-     * Add an extension binary package for this extension source code release
-     *
-     * Note that the package must be from the same channel as the extension source package
-     * @param string
-     */
-    function addBinarypackage($package)
-    {
-        if ($this->getPackageType() != 'extsrc' && $this->getPackageType() != 'zendextsrc') {
-            return false;
-        }
-        $r = &$this->_getCurrentRelease(false);
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        $r = $this->_mergeTag($r, $package,
-            array(
-                'binarypackage' => array('filelist'),
-            ));
-    }
-
-    /**
-     * Add a configureoption to an extension source package
-     * @param string
-     * @param string
-     * @param string
-     */
-    function addConfigureOption($name, $prompt, $default = null)
-    {
-        if ($this->getPackageType() != 'extsrc' && $this->getPackageType() != 'zendextsrc') {
-            return false;
-        }
-        $r = &$this->_getCurrentRelease(false);
-        if ($r === null) {
-            return false;
-        }
-        $opt = array('attribs' => array('name' => $name, 'prompt' => $prompt));
-        if ($default !== null) {
-            $opt['default'] = $default;
-        }
-        $this->_isValid = 0;
-        $r = $this->_mergeTag($r, $opt,
-            array(
-                'configureoption' => array('binarypackage', 'filelist'),
-            ));
-    }
-
-    /**
-     * Set an installation condition based on php version for the current release set
-     * @param string minimum version
-     * @param string maximum version
-     * @param false|array incompatible versions of PHP
-     */
-    function setPhpInstallCondition($min, $max, $exclude = false)
-    {
-        $r = &$this->_getCurrentRelease();
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        if (isset($r['installconditions']['php'])) {
-            unset($r['installconditions']['php']);
-        }
-        $dep = array('min' => $min, 'max' => $max);
-        if ($exclude) {
-            if (is_array($exclude) && count($exclude) == 1) {
-                $exclude = $exclude[0];
-            }
-            $dep['exclude'] = $exclude;
-        }
-        if ($this->getPackageType() == 'extsrc' || $this->getPackageType() == 'zendextsrc') {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('configureoption', 'binarypackage',
-                        'filelist'),
-                    'php' => array('extension', 'os', 'arch')
-                ));
-        } else {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('filelist'),
-                    'php' => array('extension', 'os', 'arch')
-                ));
-        }
-    }
-
-    /**
-     * @param optional|required optional, required
-     * @param string extension name
-     * @param string minimum version
-     * @param string maximum version
-     * @param string recommended version
-     * @param array incompatible versions
-     */
-    function addExtensionInstallCondition($name, $min = false, $max = false, $recommended = false,
-                                          $exclude = false)
-    {
-        $r = &$this->_getCurrentRelease();
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        $dep = $this->_constructDep($name, false, false, $min, $max, $recommended, $exclude);
-        if ($this->getPackageType() == 'extsrc' || $this->getPackageType() == 'zendextsrc') {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('configureoption', 'binarypackage',
-                        'filelist'),
-                    'extension' => array('os', 'arch')
-                ));
-        } else {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('filelist'),
-                    'extension' => array('os', 'arch')
-                ));
-        }
-    }
-
-    /**
-     * Set an installation condition based on operating system for the current release set
-     * @param string OS name
-     * @param bool whether this OS is incompatible with the current release
-     */
-    function setOsInstallCondition($name, $conflicts = false)
-    {
-        $r = &$this->_getCurrentRelease();
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        if (isset($r['installconditions']['os'])) {
-            unset($r['installconditions']['os']);
-        }
-        $dep = array('name' => $name);
-        if ($conflicts) {
-            $dep['conflicts'] = '';
-        }
-        if ($this->getPackageType() == 'extsrc' || $this->getPackageType() == 'zendextsrc') {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('configureoption', 'binarypackage',
-                        'filelist'),
-                    'os' => array('arch')
-                ));
-        } else {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('filelist'),
-                    'os' => array('arch')
-                ));
-        }
-    }
-
-    /**
-     * Set an installation condition based on architecture for the current release set
-     * @param string architecture pattern
-     * @param bool whether this arch is incompatible with the current release
-     */
-    function setArchInstallCondition($pattern, $conflicts = false)
-    {
-        $r = &$this->_getCurrentRelease();
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        if (isset($r['installconditions']['arch'])) {
-            unset($r['installconditions']['arch']);
-        }
-        $dep = array('pattern' => $pattern);
-        if ($conflicts) {
-            $dep['conflicts'] = '';
-        }
-        if ($this->getPackageType() == 'extsrc' || $this->getPackageType() == 'zendextsrc') {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('configureoption', 'binarypackage',
-                        'filelist'),
-                    'arch' => array()
-                ));
-        } else {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('filelist'),
-                    'arch' => array()
-                ));
-        }
-    }
-
-    /**
-     * For extension binary releases, this is used to specify either the
-     * static URI to a source package, or the package name and channel of the extsrc/zendextsrc
-     * package it is based on.
-     * @param string Package name, or full URI to source package (extsrc/zendextsrc type)
-     */
-    function setSourcePackage($packageOrUri)
-    {
-        $this->_isValid = 0;
-        if (isset($this->_packageInfo['channel'])) {
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo, array('phprelease',
-                'extsrcrelease', 'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'bundle', 'changelog'),
-                $packageOrUri, 'srcpackage');
-        } else {
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo, array('phprelease',
-                'extsrcrelease', 'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'bundle', 'changelog'), $packageOrUri, 'srcuri');
-        }
-    }
-
-    /**
-     * Generate a valid change log entry from the current package.xml
-     * @param string|false
-     */
-    function generateChangeLogEntry($notes = false)
-    {
-        return array(
-            'version' => 
-                array(
-                    'release' => $this->getVersion('release'),
-                    'api' => $this->getVersion('api'),
-                    ),
-            'stability' =>
-                $this->getStability(),
-            'date' => $this->getDate(),
-            'license' => $this->getLicense(true),
-            'notes' => $notes ? $notes : $this->getNotes()
-            );
-    }
-
-    /**
-     * @param string release version to set change log notes for
-     * @param array output of {@link generateChangeLogEntry()}
-     */
-    function setChangelogEntry($releaseversion, $contents)
-    {
-        if (!isset($this->_packageInfo['changelog'])) {
-            $this->_packageInfo['changelog']['release'] = $contents;
-            return;
-        }
-        if (!isset($this->_packageInfo['changelog']['release'][0])) {
-            if ($this->_packageInfo['changelog']['release']['version']['release'] == $releaseversion) {
-                $this->_packageInfo['changelog']['release'] = array(
-                    $this->_packageInfo['changelog']['release']);
-            } else {
-                $this->_packageInfo['changelog']['release'] = array(
-                    $this->_packageInfo['changelog']['release']);
-                return $this->_packageInfo['changelog']['release'][] = $contents;
-            }
-        }
-        foreach($this->_packageInfo['changelog']['release'] as $index => $changelog) {
-            if (isset($changelog['version']) &&
-                  strnatcasecmp($changelog['version']['release'], $releaseversion) == 0) {
-                $curlog = $index;
-            }
-        }
-        if (isset($curlog)) {
-            $this->_packageInfo['changelog']['release'][$curlog] = $contents;
-        } else {
-            $this->_packageInfo['changelog']['release'][] = $contents;
-        }
-    }
-
-    /**
-     * Remove the changelog entirely
-     */
-    function clearChangeLog()
-    {
-        unset($this->_packageInfo['changelog']);
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Packager.php b/PEAR/Packager.php
deleted file mode 100644
index 58e39c3..0000000
--- a/PEAR/Packager.php
+++ /dev/null
@@ -1,199 +0,0 @@
-
- * @author     Tomas V. V. Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Packager.php,v 1.70 2006/09/25 05:12:21 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Common.php';
-require_once 'PEAR/PackageFile.php';
-require_once 'System.php';
-
-/**
- * Administration class used to make a PEAR release tarball.
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Packager extends PEAR_Common
-{
-    /**
-     * @var PEAR_Registry
-     */
-    var $_registry;
-    // {{{ package()
-
-    function package($pkgfile = null, $compress = true, $pkg2 = null)
-    {
-        // {{{ validate supplied package.xml file
-        if (empty($pkgfile)) {
-            $pkgfile = 'package.xml';
-        }
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $pkg = &new PEAR_PackageFile($this->config, $this->debug);
-        $pf = &$pkg->fromPackageFile($pkgfile, PEAR_VALIDATE_NORMAL);
-        $main = &$pf;
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($pf)) {
-            if (is_array($pf->getUserInfo())) {
-                foreach ($pf->getUserInfo() as $error) {
-                    $this->log(0, 'Error: ' . $error['message']);
-                }
-            }
-            $this->log(0, $pf->getMessage());
-            return $this->raiseError("Cannot package, errors in package file");
-        } else {
-            foreach ($pf->getValidationWarnings() as $warning) {
-                $this->log(1, 'Warning: ' . $warning['message']);
-            }
-        }
-
-        // }}}
-        if ($pkg2) {
-            $this->log(0, 'Attempting to process the second package file');
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $pf2 = &$pkg->fromPackageFile($pkg2, PEAR_VALIDATE_NORMAL);
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($pf2)) {
-                if (is_array($pf2->getUserInfo())) {
-                    foreach ($pf2->getUserInfo() as $error) {
-                        $this->log(0, 'Error: ' . $error['message']);
-                    }
-                }
-                $this->log(0, $pf2->getMessage());
-                return $this->raiseError("Cannot package, errors in second package file");
-            } else {
-                foreach ($pf2->getValidationWarnings() as $warning) {
-                    $this->log(1, 'Warning: ' . $warning['message']);
-                }
-            }
-            if ($pf2->getPackagexmlVersion() == '2.0' ||
-                  $pf2->getPackagexmlVersion() == '2.1') {
-                $main = &$pf2;
-                $other = &$pf;
-            } else {
-                $main = &$pf;
-                $other = &$pf2;
-            }
-            if ($main->getPackagexmlVersion() != '2.0' &&
-                  $main->getPackagexmlVersion() != '2.1') {
-                return PEAR::raiseError('Error: cannot package two package.xml version 1.0, can ' .
-                    'only package together a package.xml 1.0 and package.xml 2.0');
-            }
-            if ($other->getPackagexmlVersion() != '1.0') {
-                return PEAR::raiseError('Error: cannot package two package.xml version 2.0, can ' .
-                    'only package together a package.xml 1.0 and package.xml 2.0');
-            }
-        }
-        $main->setLogger($this);
-        if (!$main->validate(PEAR_VALIDATE_PACKAGING)) {
-            foreach ($main->getValidationWarnings() as $warning) {
-                $this->log(0, 'Error: ' . $warning['message']);
-            }
-            return $this->raiseError("Cannot package, errors in package");
-        } else {
-            foreach ($main->getValidationWarnings() as $warning) {
-                $this->log(1, 'Warning: ' . $warning['message']);
-            }
-        }
-        if ($pkg2) {
-            $other->setLogger($this);
-            $a = false;
-            if (!$other->validate(PEAR_VALIDATE_NORMAL) || $a = !$main->isEquivalent($other)) {
-                foreach ($other->getValidationWarnings() as $warning) {
-                    $this->log(0, 'Error: ' . $warning['message']);
-                }
-                foreach ($main->getValidationWarnings() as $warning) {
-                    $this->log(0, 'Error: ' . $warning['message']);
-                }
-                if ($a) {
-                    return $this->raiseError('The two package.xml files are not equivalent!');
-                }
-                return $this->raiseError("Cannot package, errors in package");
-            } else {
-                foreach ($other->getValidationWarnings() as $warning) {
-                    $this->log(1, 'Warning: ' . $warning['message']);
-                }
-            }
-            $gen = &$main->getDefaultGenerator();
-            $tgzfile = $gen->toTgz2($this, $other, $compress);
-            if (PEAR::isError($tgzfile)) {
-                return $tgzfile;
-            }
-            $dest_package = basename($tgzfile);
-            $pkgdir = dirname($pkgfile);
-    
-            // TAR the Package -------------------------------------------
-            $this->log(1, "Package $dest_package done");
-            if (file_exists("$pkgdir/CVS/Root")) {
-                $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $pf->getVersion());
-                $cvstag = "RELEASE_$cvsversion";
-                $this->log(1, 'Tag the released code with "pear cvstag ' .
-                    $main->getPackageFile() . '"');
-                $this->log(1, "(or set the CVS tag $cvstag by hand)");
-            }
-        } else { // this branch is executed for single packagefile packaging
-            $gen = &$pf->getDefaultGenerator();
-            $tgzfile = $gen->toTgz($this, $compress);
-            if (PEAR::isError($tgzfile)) {
-                $this->log(0, $tgzfile->getMessage());
-                return $this->raiseError("Cannot package, errors in package");
-            }
-            $dest_package = basename($tgzfile);
-            $pkgdir = dirname($pkgfile);
-    
-            // TAR the Package -------------------------------------------
-            $this->log(1, "Package $dest_package done");
-            if (file_exists("$pkgdir/CVS/Root")) {
-                $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $pf->getVersion());
-                $cvstag = "RELEASE_$cvsversion";
-                $this->log(1, "Tag the released code with `pear cvstag $pkgfile'");
-                $this->log(1, "(or set the CVS tag $cvstag by hand)");
-            }
-        }
-        return $dest_package;
-    }
-
-    // }}}
-}
-
-// {{{ md5_file() utility function
-if (!function_exists('md5_file')) {
-    function md5_file($file) {
-        if (!$fd = @fopen($file, 'r')) {
-            return false;
-        }
-        fclose($fd);
-        $md5 = md5(file_get_contents($file));
-        return $md5;
-    }
-}
-// }}}
-
-?>
diff --git a/PEAR/REST.php b/PEAR/REST.php
deleted file mode 100644
index f05de0c..0000000
--- a/PEAR/REST.php
+++ /dev/null
@@ -1,395 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: REST.php,v 1.21 2006/03/27 04:33:11 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * For downloading xml files
- */
-require_once 'PEAR.php';
-require_once 'PEAR/XMLParser.php';
-
-/**
- * Intelligently retrieve data, following hyperlinks if necessary, and re-directing
- * as well
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_REST
-{
-    var $config;
-    var $_options;
-    function PEAR_REST(&$config, $options = array())
-    {
-        $this->config = &$config;
-        $this->_options = $options;
-    }
-
-    /**
-     * Retrieve REST data, but always retrieve the local cache if it is available.
-     *
-     * This is useful for elements that should never change, such as information on a particular
-     * release
-     * @param string full URL to this resource
-     * @param array|false contents of the accept-encoding header
-     * @param boolean     if true, xml will be returned as a string, otherwise, xml will be
-     *                    parsed using PEAR_XMLParser
-     * @return string|array
-     */
-    function retrieveCacheFirst($url, $accept = false, $forcestring = false)
-    {
-        $cachefile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .
-            md5($url) . 'rest.cachefile';
-        if (file_exists($cachefile)) {
-            return unserialize(implode('', file($cachefile)));
-        }
-        return $this->retrieveData($url, $accept, $forcestring);
-    }
-
-    /**
-     * Retrieve a remote REST resource
-     * @param string full URL to this resource
-     * @param array|false contents of the accept-encoding header
-     * @param boolean     if true, xml will be returned as a string, otherwise, xml will be
-     *                    parsed using PEAR_XMLParser
-     * @return string|array
-     */
-    function retrieveData($url, $accept = false, $forcestring = false)
-    {
-        $cacheId = $this->getCacheId($url);
-        if ($ret = $this->useLocalCache($url, $cacheId)) {
-            return $ret;
-        }
-        if (!isset($this->_options['offline'])) {
-            $trieddownload = true;
-            $file = $this->downloadHttp($url, $cacheId ? $cacheId['lastChange'] : false, $accept);
-        } else {
-            $trieddownload = false;
-            $file = false;
-        }
-        if (PEAR::isError($file)) {
-            if ($file->getCode() == -9276) {
-                $trieddownload = false;
-                $file = false; // use local copy if available on socket connect error
-            } else {
-                return $file;
-            }
-        }
-        if (!$file) {
-            $ret = $this->getCache($url);
-            if (!PEAR::isError($ret) && $trieddownload) {
-                // reset the age of the cache if the server says it was unmodified
-                $this->saveCache($url, $ret, null, true, $cacheId);
-            }
-            return $ret;
-        }
-        if (is_array($file)) {
-            $headers = $file[2];
-            $lastmodified = $file[1];
-            $content = $file[0];
-        } else {
-            $content = $file;
-            $lastmodified = false;
-            $headers = array();
-        }
-        if ($forcestring) {
-            $this->saveCache($url, $content, $lastmodified, false, $cacheId);
-            return $content;
-        }
-        if (isset($headers['content-type'])) {
-            switch ($headers['content-type']) {
-                case 'text/xml' :
-                case 'application/xml' :
-                    $parser = new PEAR_XMLParser;
-                    PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                    $err = $parser->parse($content);
-                    PEAR::popErrorHandling();
-                    if (PEAR::isError($err)) {
-                        return PEAR::raiseError('Invalid xml downloaded from "' . $url . '": ' .
-                            $err->getMessage());
-                    }
-                    $content = $parser->getData();
-                case 'text/html' :
-                default :
-                    // use it as a string
-            }
-        } else {
-            // assume XML
-            $parser = new PEAR_XMLParser;
-            $parser->parse($content);
-            $content = $parser->getData();
-        }
-        $this->saveCache($url, $content, $lastmodified, false, $cacheId);
-        return $content;
-    }
-
-    function useLocalCache($url, $cacheid = null)
-    {
-        if ($cacheid === null) {
-            $cacheidfile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .
-                md5($url) . 'rest.cacheid';
-            if (file_exists($cacheidfile)) {
-                $cacheid = unserialize(implode('', file($cacheidfile)));
-            } else {
-                return false;
-            }
-        }
-        $cachettl = $this->config->get('cache_ttl');
-        // If cache is newer than $cachettl seconds, we use the cache!
-        if (time() - $cacheid['age'] < $cachettl) {
-            return $this->getCache($url);
-        }
-        return false;
-    }
-
-    function getCacheId($url)
-    {
-        $cacheidfile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .
-            md5($url) . 'rest.cacheid';
-        if (file_exists($cacheidfile)) {
-            $ret = unserialize(implode('', file($cacheidfile)));
-            return $ret;
-        } else {
-            return false;
-        }
-    }
-
-    function getCache($url)
-    {
-        $cachefile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .
-            md5($url) . 'rest.cachefile';
-        if (file_exists($cachefile)) {
-            return unserialize(implode('', file($cachefile)));
-        } else {
-            return PEAR::raiseError('No cached content available for "' . $url . '"');
-        }
-    }
-
-    /**
-     * @param string full URL to REST resource
-     * @param string original contents of the REST resource
-     * @param array  HTTP Last-Modified and ETag headers
-     * @param bool   if true, then the cache id file should be regenerated to
-     *               trigger a new time-to-live value
-     */
-    function saveCache($url, $contents, $lastmodified, $nochange = false, $cacheid = null)
-    {
-        $cacheidfile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .
-            md5($url) . 'rest.cacheid';
-        $cachefile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .
-            md5($url) . 'rest.cachefile';
-        if ($cacheid === null && $nochange) {
-            $cacheid = unserialize(implode('', file($cacheidfile)));
-        }
-
-        $fp = @fopen($cacheidfile, 'wb');
-        if (!$fp) {
-            $cache_dir = $this->config->get('cache_dir');
-            if (!is_dir($cache_dir)) {
-                System::mkdir(array('-p', $cache_dir));
-                $fp = @fopen($cacheidfile, 'wb');
-                if (!$fp) {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        }
-
-        if ($nochange) {
-            fwrite($fp, serialize(array(
-                'age'        => time(),
-                'lastChange' => $cacheid['lastChange'],
-                )));
-            fclose($fp);
-            return true;
-        } else {
-            fwrite($fp, serialize(array(
-                'age'        => time(),
-                'lastChange' => $lastmodified,
-                )));
-        }
-        fclose($fp);
-        $fp = @fopen($cachefile, 'wb');
-        if (!$fp) {
-            if (file_exists($cacheidfile)) {
-                @unlink($cacheidfile);
-            }
-            return false;
-        }
-        fwrite($fp, serialize($contents));
-        fclose($fp);
-        return true;
-    }
-
-    /**
-     * Efficiently Download a file through HTTP.  Returns downloaded file as a string in-memory
-     * This is best used for small files
-     *
-     * If an HTTP proxy has been configured (http_proxy PEAR_Config
-     * setting), the proxy will be used.
-     *
-     * @param string  $url       the URL to download
-     * @param string  $save_dir  directory to save file in
-     * @param false|string|array $lastmodified header values to check against for caching
-     *                           use false to return the header values from this download
-     * @param false|array $accept Accept headers to send
-     * @return string|array  Returns the contents of the downloaded file or a PEAR
-     *                       error on failure.  If the error is caused by
-     *                       socket-related errors, the error object will
-     *                       have the fsockopen error code available through
-     *                       getCode().  If caching is requested, then return the header
-     *                       values.
-     *
-     * @access public
-     */
-    function downloadHttp($url, $lastmodified = null, $accept = false)
-    {
-        $info = parse_url($url);
-        if (!isset($info['scheme']) || !in_array($info['scheme'], array('http', 'https'))) {
-            return PEAR::raiseError('Cannot download non-http URL "' . $url . '"');
-        }
-        if (!isset($info['host'])) {
-            return PEAR::raiseError('Cannot download from non-URL "' . $url . '"');
-        } else {
-            $host = $info['host'];
-            if (!array_key_exists('port', $info)) {
-                $info['port'] = null;
-            }
-            if (!array_key_exists('path', $info)) {
-                $info['path'] = null;
-            }
-            $port = $info['port'];
-            $path = $info['path'];
-        }
-        $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
-        if ($this->config->get('http_proxy')&& 
-              $proxy = parse_url($this->config->get('http_proxy'))) {
-            $proxy_host = isset($proxy['host']) ? $proxy['host'] : null;
-            if (isset($proxy['scheme']) && $proxy['scheme'] == 'https') {
-                $proxy_host = 'ssl://' . $proxy_host;
-            }
-            $proxy_port = isset($proxy['port']) ? $proxy['port'] : 8080;
-            $proxy_user = isset($proxy['user']) ? urldecode($proxy['user']) : null;
-            $proxy_pass = isset($proxy['pass']) ? urldecode($proxy['pass']) : null;
-        }
-        if (empty($port)) {
-            if (isset($info['scheme']) && $info['scheme'] == 'https') {
-                $port = 443;
-            } else {
-                $port = 80;
-            }
-        }
-        If (isset($proxy['host'])) {
-            $request = "GET $url HTTP/1.1\r\n";
-        } else {
-            $request = "GET $path HTTP/1.1\r\n";
-        }
-
-        $ifmodifiedsince = '';
-        if (is_array($lastmodified)) {
-            if (isset($lastmodified['Last-Modified'])) {
-                $ifmodifiedsince = 'If-Modified-Since: ' . $lastmodified['Last-Modified'] . "\r\n";
-            }
-            if (isset($lastmodified['ETag'])) {
-                $ifmodifiedsince .= "If-None-Match: $lastmodified[ETag]\r\n";
-            }
-        } else {
-            $ifmodifiedsince = ($lastmodified ? "If-Modified-Since: $lastmodified\r\n" : '');
-        }
-        $request .= "Host: $host:$port\r\n" . $ifmodifiedsince .
-            "User-Agent: PEAR/1.5.0a1/PHP/" . PHP_VERSION . "\r\n";
-        $username = $this->config->get('username');
-        $password = $this->config->get('password');
-        if ($username && $password) {
-            $tmp = base64_encode("$username:$password");
-            $request .= "Authorization: Basic $tmp\r\n";
-        }
-        if ($proxy_host != '' && $proxy_user != '') {
-            $request .= 'Proxy-Authorization: Basic ' .
-                base64_encode($proxy_user . ':' . $proxy_pass) . "\r\n";
-        }
-        if ($accept) {
-            $request .= 'Accept: ' . implode(', ', $accept) . "\r\n";
-        }
-        $request .= "Connection: close\r\n";
-        $request .= "\r\n";
-        if ($proxy_host != '') {
-            $fp = @fsockopen($proxy_host, $proxy_port, $errno, $errstr, 15);
-            if (!$fp) {
-                return PEAR::raiseError("Connection to `$proxy_host:$proxy_port' failed: $errstr",
-                    -9276);
-            }
-        } else {
-            if (isset($info['scheme']) && $info['scheme'] == 'https') {
-                $host = 'ssl://' . $host;
-            }
-            $fp = @fsockopen($host, $port, $errno, $errstr);
-            if (!$fp) {
-                return PEAR::raiseError("Connection to `$host:$port' failed: $errstr", $errno);
-            }
-        }
-        fwrite($fp, $request);
-        $headers = array();
-        while (trim($line = fgets($fp, 1024))) {
-            if (preg_match('/^([^:]+):\s+(.*)\s*$/', $line, $matches)) {
-                $headers[strtolower($matches[1])] = trim($matches[2]);
-            } elseif (preg_match('|^HTTP/1.[01] ([0-9]{3}) |', $line, $matches)) {
-                if ($matches[1] == 304 && ($lastmodified || ($lastmodified === false))) {
-                    return false;
-                }
-                if ($matches[1] != 200) {
-                    return PEAR::raiseError("File http://$host:$port$path not valid (received: $line)", (int) $matches[1]);
-                }
-            }
-        }
-        if (isset($headers['content-length'])) {
-            $length = $headers['content-length'];
-        } else {
-            $length = -1;
-        }
-        $data = '';
-        while ($chunk = @fread($fp, 8192)) {
-            $data .= $chunk;
-        }
-        fclose($fp);
-        if ($lastmodified === false || $lastmodified) {
-            if (isset($headers['etag'])) {
-                $lastmodified = array('ETag' => $headers['etag']);
-            }
-            if (isset($headers['last-modified'])) {
-                if (is_array($lastmodified)) {
-                    $lastmodified['Last-Modified'] = $headers['last-modified'];
-                } else {
-                    $lastmodified = $headers['last-modified'];
-                }
-            }
-            return array($data, $lastmodified, $headers);
-        }
-        return $data;
-    }
-}
-?>
diff --git a/PEAR/REST/10.php b/PEAR/REST/10.php
deleted file mode 100644
index e054f0a..0000000
--- a/PEAR/REST/10.php
+++ /dev/null
@@ -1,684 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: 10.php,v 1.42 2006/04/03 01:07:19 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a12
- */
-
-/**
- * For downloading REST xml/txt files
- */
-require_once 'PEAR/REST.php';
-
-/**
- * Implement REST 1.0
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a12
- */
-class PEAR_REST_10
-{
-    /**
-     * @var PEAR_REST
-     */
-    var $_rest;
-    function PEAR_REST_10($config, $options = array())
-    {
-        $this->_rest = &new PEAR_REST($config, $options);
-    }
-
-    /**
-     * Retrieve information about a remote package to be downloaded from a REST server
-     *
-     * @param string $base The uri to prepend to all REST calls
-     * @param array $packageinfo an array of format:
-     * 
    -     *  array(
-     *   'package' => 'packagename',
-     *   'channel' => 'channelname',
-     *  ['state' => 'alpha' (or valid state),]
-     *  -or-
-     *  ['version' => '1.whatever']
-     * 
    
-     * @param string $prefstate Current preferred_state config variable value
-     * @param bool $installed the installed version of this package to compare against
-     * @return array|false|PEAR_Error see {@link _returnDownloadURL()}
-     */
-    function getDownloadURL($base, $packageinfo, $prefstate, $installed)
-    {
-        $channel = $packageinfo['channel'];
-        $package = $packageinfo['package'];
-        $states = $this->betterStates($prefstate, true);
-        if (!$states) {
-            return PEAR::raiseError('"' . $prefstate . '" is not a valid state');
-        }
-        $state = $version = null;
-        if (isset($packageinfo['state'])) {
-            $state = $packageinfo['state'];
-        }
-        if (isset($packageinfo['version'])) {
-            $version = $packageinfo['version'];
-        }
-        $info = $this->_rest->retrieveData($base . 'r/' . strtolower($package) . '/allreleases.xml');
-        if (PEAR::isError($info)) {
-            return PEAR::raiseError('No releases available for package "' .
-                $channel . '/' . $package . '"');
-        }
-        if (!isset($info['r'])) {
-            return false;
-        }
-        $found = false;
-        $release = false;
-        if (!is_array($info['r']) || !isset($info['r'][0])) {
-            $info['r'] = array($info['r']);
-        }
-        foreach ($info['r'] as $release) {
-            if (!isset($this->_rest->_options['force']) && ($installed &&
-                  version_compare($release['v'], $installed, '<'))) {
-                continue;
-            }
-            if (isset($state)) {
-                // try our preferred state first
-                if ($release['s'] == $state) {
-                    $found = true;
-                    break;
-                }
-                // see if there is something newer and more stable
-                // bug #7221
-                if (in_array($release['s'], $this->betterStates($state), true)) {
-                    $found = true;
-                    break;
-                }
-            } elseif (isset($version)) {
-                if ($release['v'] == $version) {
-                    $found = true;
-                    break;
-                }
-            } else {
-                if (in_array($release['s'], $states)) {
-                    $found = true;
-                    break;
-                }
-            }
-        }
-        return $this->_returnDownloadURL($base, $package, $release, $info, $found);
-    }
-
-    function getDepDownloadURL($base, $xsdversion, $dependency, $deppackage,
-                               $prefstate = 'stable', $installed = false)
-    {
-        $channel = $dependency['channel'];
-        $package = $dependency['name'];
-        $states = $this->betterStates($prefstate, true);
-        if (!$states) {
-            return PEAR::raiseError('"' . $prefstate . '" is not a valid state');
-        }
-        $state = $version = null;
-        if (isset($packageinfo['state'])) {
-            $state = $packageinfo['state'];
-        }
-        if (isset($packageinfo['version'])) {
-            $version = $packageinfo['version'];
-        }
-        $info = $this->_rest->retrieveData($base . 'r/' . strtolower($package) . '/allreleases.xml');
-        if (PEAR::isError($info)) {
-            return PEAR::raiseError('Package "' . $deppackage['channel'] . '/' . $deppackage['package']
-                . '" dependency "' . $channel . '/' . $package . '" has no releases');
-        }
-        if (!is_array($info) || !isset($info['r'])) {
-            return false;
-        }
-        $exclude = array();
-        $min = $max = $recommended = false;
-        if ($xsdversion == '1.0') {
-            $pinfo['package'] = $dependency['name'];
-            $pinfo['channel'] = 'pear.php.net'; // this is always true - don't change this
-            switch ($dependency['rel']) {
-                case 'ge' :
-                    $min = $dependency['version'];
-                break;
-                case 'gt' :
-                    $min = $dependency['version'];
-                    $exclude = array($dependency['version']);
-                break;
-                case 'eq' :
-                    $recommended = $dependency['version'];
-                break;
-                case 'lt' :
-                    $max = $dependency['version'];
-                    $exclude = array($dependency['version']);
-                break;
-                case 'le' :
-                    $max = $dependency['version'];
-                break;
-                case 'ne' :
-                    $exclude = array($dependency['version']);
-                break;
-            }
-        } else {
-            $pinfo['package'] = $dependency['name'];
-            $min = isset($dependency['min']) ? $dependency['min'] : false;
-            $max = isset($dependency['max']) ? $dependency['max'] : false;
-            $recommended = isset($dependency['recommended']) ?
-                $dependency['recommended'] : false;
-            if (isset($dependency['exclude'])) {
-                if (!isset($dependency['exclude'][0])) {
-                    $exclude = array($dependency['exclude']);
-                }
-            }
-        }
-        $found = false;
-        $release = false;
-        if (!is_array($info['r']) || !isset($info['r'][0])) {
-            $info['r'] = array($info['r']);
-        }
-        foreach ($info['r'] as $release) {
-            if (!isset($this->_rest->_options['force']) && ($installed &&
-                  version_compare($release['v'], $installed, '<'))) {
-                continue;
-            }
-            if (in_array($release['v'], $exclude)) { // skip excluded versions
-                continue;
-            }
-            // allow newer releases to say "I'm OK with the dependent package"
-            if ($xsdversion == '2.0' && isset($release['co'])) {
-                if (!is_array($release['co']) || !isset($release['co'][0])) {
-                    $release['co'] = array($release['co']);
-                }
-                foreach ($release['co'] as $entry) {
-                    if (isset($entry['x']) && !is_array($entry['x'])) {
-                        $entry['x'] = array($entry['x']);
-                    } elseif (!isset($entry['x'])) {
-                        $entry['x'] = array();
-                    }
-                    if ($entry['c'] == $deppackage['channel'] &&
-                          strtolower($entry['p']) == strtolower($deppackage['package']) &&
-                          version_compare($deppackage['version'], $entry['min'], '>=') &&
-                          version_compare($deppackage['version'], $entry['max'], '<=') &&
-                          !in_array($release['v'], $entry['x'])) {
-                        $recommended = $release['v'];
-                        break;
-                    }
-                }
-            }
-            if ($recommended) {
-                if ($release['v'] != $recommended) { // if we want a specific
-                    // version, then skip all others
-                    continue;
-                } else {
-                    if (!in_array($release['s'], $states)) {
-                        // the stability is too low, but we must return the
-                        // recommended version if possible
-                        return $this->_returnDownloadURL($base, $package, $release, $info, true);
-                    }
-                }
-            }
-            if ($min && version_compare($release['v'], $min, 'lt')) { // skip too old versions
-                continue;
-            }
-            if ($max && version_compare($release['v'], $max, 'gt')) { // skip too new versions
-                continue;
-            }
-            if ($installed && version_compare($release['v'], $installed, '<')) {
-                continue;
-            }
-            if (in_array($release['s'], $states)) { // if in the preferred state...
-                $found = true; // ... then use it
-                break;
-            }
-        }
-        return $this->_returnDownloadURL($base, $package, $release, $info, $found);
-    }
-
-    /**
-     * Take raw data and return the array needed for processing a download URL
-     *
-     * @param string $base REST base uri
-     * @param string $package Package name
-     * @param array $release an array of format array('v' => version, 's' => state)
-     *                       describing the release to download
-     * @param array $info list of all releases as defined by allreleases.xml
-     * @param bool $found determines whether the release was found or this is the next
-     *                    best alternative
-     * @return array|PEAR_Error
-     * @access private
-     */
-    function _returnDownloadURL($base, $package, $release, $info, $found)
-    {
-        if (!$found) {
-            $release = $info['r'][0];
-        }
-        $pinfo = $this->_rest->retrieveCacheFirst($base . 'p/' . strtolower($package) . '/' . 
-            'info.xml');
-        if (PEAR::isError($pinfo)) {
-            return PEAR::raiseError('Package "' . $package .
-                '" does not have REST info xml available');
-        }
-        $releaseinfo = $this->_rest->retrieveCacheFirst($base . 'r/' . strtolower($package) . '/' . 
-            $release['v'] . '.xml');
-        if (PEAR::isError($releaseinfo)) {
-            return PEAR::raiseError('Package "' . $package . '" Version "' . $release['v'] .
-                '" does not have REST xml available');
-        }
-        $packagexml = $this->_rest->retrieveCacheFirst($base . 'r/' . strtolower($package) . '/' .
-            'deps.' . $release['v'] . '.txt', false, true);
-        if (PEAR::isError($packagexml)) {
-            return PEAR::raiseError('Package "' . $package . '" Version "' . $release['v'] .
-                '" does not have REST dependency information available');
-        }
-        $packagexml = unserialize($packagexml);
-        if (!$packagexml) {
-            $packagexml = array();
-        }
-        $allinfo = $this->_rest->retrieveData($base . 'r/' . strtolower($package) .
-            '/allreleases.xml');
-        if (!is_array($allinfo['r']) || !isset($allinfo['r'][0])) {
-            $allinfo['r'] = array($allinfo['r']);
-        }
-        $compatible = false;
-        foreach ($allinfo['r'] as $release) {
-            if ($release['v'] != $releaseinfo['v']) {
-                continue;
-            }
-            if (!isset($release['co'])) {
-                break;
-            }
-            $compatible = array();
-            if (!is_array($release['co']) || !isset($release['co'][0])) {
-                $release['co'] = array($release['co']);
-            }
-            foreach ($release['co'] as $entry) {
-                $comp = array();
-                $comp['name'] = $entry['p'];
-                $comp['channel'] = $entry['c'];
-                $comp['min'] = $entry['min'];
-                $comp['max'] = $entry['max'];
-                if (isset($entry['x']) && !is_array($entry['x'])) {
-                    $comp['exclude'] = $entry['x'];
-                }
-                $compatible[] = $comp;
-            }
-            if (count($compatible) == 1) {
-                $compatible = $compatible[0];
-            }
-            break;
-        }
-        if (isset($pinfo['dc']) && isset($pinfo['dp'])) {
-            $deprecated = array('channel' => (string) $pinfo['dc'],
-                                'package' => trim($pinfo['dp']['_content']));
-        } else {
-            $deprecated = false;
-        }
-        if ($found) {
-            return 
-                array('version' => $releaseinfo['v'],
-                      'info' => $packagexml,
-                      'package' => $releaseinfo['p']['_content'],
-                      'stability' => $releaseinfo['st'],
-                      'url' => $releaseinfo['g'],
-                      'compatible' => $compatible,
-                      'deprecated' => $deprecated,
-                );
-        } else {
-            return
-                array('version' => $releaseinfo['v'],
-                      'package' => $releaseinfo['p']['_content'],
-                      'stability' => $releaseinfo['st'],
-                      'info' => $packagexml,
-                      'compatible' => $compatible,
-                      'deprecated' => $deprecated,
-                );
-        }
-    }
-
-    function listPackages($base)
-    {
-        $packagelist = $this->_rest->retrieveData($base . 'p/packages.xml');
-        if (PEAR::isError($packagelist)) {
-            return $packagelist;
-        }
-        if (!is_array($packagelist) || !isset($packagelist['p'])) {
-            return array();
-        }
-        if (!is_array($packagelist['p'])) {
-            $packagelist['p'] = array($packagelist['p']);
-        }
-        return $packagelist['p'];
-    }
-
-    function listAll($base, $dostable, $basic = true, $searchpackage = false, $searchsummary = false)
-    {
-        $packagelist = $this->_rest->retrieveData($base . 'p/packages.xml');
-        if (PEAR::isError($packagelist)) {
-            return $packagelist;
-        }
-        if ($this->_rest->config->get('verbose') > 0) {
-            $ui = &PEAR_Frontend::singleton();
-            $ui->log('Retrieving data...0%', false);
-        }
-        $ret = array();
-        if (!is_array($packagelist) || !isset($packagelist['p'])) {
-            return $ret;
-        }
-        if (!is_array($packagelist['p'])) {
-            $packagelist['p'] = array($packagelist['p']);
-        }
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $next = .1;
-        foreach ($packagelist['p'] as $progress => $package) {
-            if ($this->_rest->config->get('verbose') > 0) {
-                if ($progress / count($packagelist['p']) >= $next) {
-                    if ($next == .5) {
-                        $ui->log('50%', false);
-                    } else {
-                        $ui->log('.', false);
-                    }
-                    $next += .1;
-                }
-            }
-            if ($basic) { // remote-list command
-                if ($dostable) {
-                    $latest = $this->_rest->retrieveData($base . 'r/' . strtolower($package) .
-                        '/stable.txt');
-                } else {
-                    $latest = $this->_rest->retrieveData($base . 'r/' . strtolower($package) .
-                        '/latest.txt');
-                }
-                if (PEAR::isError($latest)) {
-                    $latest = false;
-                }
-                $info = array('stable' => $latest);
-            } else { // list-all command
-                $inf = $this->_rest->retrieveData($base . 'p/' . strtolower($package) . '/info.xml');
-                if (PEAR::isError($inf)) {
-                    PEAR::popErrorHandling();
-                    return $inf;
-                }
-                if ($searchpackage) {
-                    $found = (!empty($searchpackage) && stristr($package, $searchpackage) !== false);
-                    if (!$found && !(isset($searchsummary) && !empty($searchsummary)
-                        && (stristr($inf['s'], $searchsummary) !== false
-                            || stristr($inf['d'], $searchsummary) !== false)))
-                    {
-                        continue;
-                    };
-                }
-                $releases = $this->_rest->retrieveData($base . 'r/' . strtolower($package) .
-                    '/allreleases.xml');
-                if (PEAR::isError($releases)) {
-                    continue;
-                }
-                if (!isset($releases['r'][0])) {
-                    $releases['r'] = array($releases['r']);
-                }
-                unset($latest);
-                unset($unstable);
-                unset($stable);
-                unset($state);
-                foreach ($releases['r'] as $release) {
-                    if (!isset($latest)) {
-                        if ($dostable && $release['s'] == 'stable') {
-                            $latest = $release['v'];
-                            $state = 'stable';
-                        }
-                        if (!$dostable) {
-                            $latest = $release['v'];
-                            $state = $release['s'];
-                        }
-                    }
-                    if (!isset($stable) && $release['s'] == 'stable') {
-                        $stable = $release['v'];
-                        if (!isset($unstable)) {
-                            $unstable = $stable;
-                        }
-                    }
-                    if (!isset($unstable) && $release['s'] != 'stable') {
-                        $latest = $unstable = $release['v'];
-                        $state = $release['s'];
-                    }
-                    if (isset($latest) && !isset($state)) {
-                        $state = $release['s'];
-                    }
-                    if (isset($latest) && isset($stable) && isset($unstable)) {
-                        break;
-                    }
-                }
-                $deps = array();
-                if (!isset($unstable)) {
-                    $unstable = false;
-                    $state = 'stable';
-                    if (isset($stable)) {
-                        $latest = $unstable = $stable;
-                    }
-                } else {
-                    $latest = $unstable;
-                }
-                if (!isset($latest)) {
-                    $latest = false;
-                }
-                if ($latest) {
-                    $d = $this->_rest->retrieveCacheFirst($base . 'r/' . strtolower($package) . '/deps.' .
-                        $latest . '.txt');
-                    if (!PEAR::isError($d)) {
-                        $d = unserialize($d);
-                        if ($d) {
-                            if (isset($d['required'])) {
-                                if (!class_exists('PEAR_PackageFile_v2')) {
-                                    require_once 'PEAR/PackageFile/v2.php';
-                                }
-                                if (!isset($pf)) {
-                                    $pf = new PEAR_PackageFile_v2;
-                                }
-                                $pf->setDeps($d);
-                                $tdeps = $pf->getDeps();
-                            } else {
-                                $tdeps = $d;
-                            }
-                            foreach ($tdeps as $dep) {
-                                if ($dep['type'] !== 'pkg') {
-                                    continue;
-                                }
-                                $deps[] = $dep;
-                            }
-                        }
-                    }
-                }
-                if (!isset($stable)) {
-                    $stable = '-n/a-';
-                }
-                if (!$searchpackage) {
-                    $info = array('stable' => $latest, 'summary' => $inf['s'], 'description' =>
-                        $inf['d'], 'deps' => $deps, 'category' => $inf['ca']['_content'],
-                        'unstable' => $unstable, 'state' => $state);
-                } else {
-                    $info = array('stable' => $stable, 'summary' => $inf['s'], 'description' =>
-                        $inf['d'], 'deps' => $deps, 'category' => $inf['ca']['_content'],
-                        'unstable' => $unstable, 'state' => $state);
-                }
-            }
-            $ret[$package] = $info;
-        }
-        PEAR::popErrorHandling();
-        return $ret;
-    }
-
-    function listLatestUpgrades($base, $state, $installed, $channel, &$reg)
-    {
-        $packagelist = $this->_rest->retrieveData($base . 'p/packages.xml');
-        if (PEAR::isError($packagelist)) {
-            return $packagelist;
-        }
-        $ret = array();
-        if (!is_array($packagelist) || !isset($packagelist['p'])) {
-            return $ret;
-        }
-        if (!is_array($packagelist['p'])) {
-            $packagelist['p'] = array($packagelist['p']);
-        }
-        if ($state) {
-            $states = $this->betterStates($state, true);
-        }
-        foreach ($packagelist['p'] as $package) {
-            if (!isset($installed[strtolower($package)])) {
-                continue;
-            }
-            $inst_version = $reg->packageInfo($package, 'version', $channel);
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            $info = $this->_rest->retrieveData($base . 'r/' . strtolower($package) .
-                '/allreleases.xml');
-            PEAR::popErrorHandling();
-            if (PEAR::isError($info)) {
-                continue; // no remote releases
-            }
-            if (!isset($info['r'])) {
-                continue;
-            }
-            $found = false;
-            $release = false;
-            if (!is_array($info['r']) || !isset($info['r'][0])) {
-                $info['r'] = array($info['r']);
-            }
-            foreach ($info['r'] as $release) {
-                if ($inst_version && version_compare($release['v'], $inst_version, '<=')) {
-                    continue;
-                }
-                if ($state) {
-                    if (in_array($release['s'], $states)) {
-                        $found = true;
-                        break;
-                    }
-                } else {
-                    $found = true;
-                    break;
-                }
-            }
-            if (!$found) {
-                continue;
-            }
-            $relinfo = $this->_rest->retrieveCacheFirst($base . 'r/' . strtolower($package) . '/' . 
-                $release['v'] . '.xml');
-            if (PEAR::isError($relinfo)) {
-                return $relinfo;
-            }
-            $ret[$package] = array(
-                    'version' => $release['v'],
-                    'state' => $release['s'],
-                    'filesize' => $relinfo['f'],
-                );
-        }
-        return $ret;
-    }
-
-    function packageInfo($base, $package)
-    {
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $pinfo = $this->_rest->retrieveData($base . 'p/' . strtolower($package) . '/info.xml');
-        if (PEAR::isError($pinfo)) {
-            PEAR::popErrorHandling();
-            return PEAR::raiseError('Unknown package: "' . $package . '" (Debug: ' .
-                $pinfo->getMessage() . ')');
-        }
-        $releases = array();
-        $allreleases = $this->_rest->retrieveData($base . 'r/' . strtolower($package) .
-            '/allreleases.xml');
-        if (!PEAR::isError($allreleases)) {
-            if (!class_exists('PEAR_PackageFile_v2')) {
-                require_once 'PEAR/PackageFile/v2.php';
-            }
-            if (!is_array($allreleases['r'])) {
-                $allreleases['r'] = array($allreleases['r']);
-            }
-            $pf = new PEAR_PackageFile_v2;
-            foreach ($allreleases['r'] as $release) {
-                $ds = $this->_rest->retrieveCacheFirst($base . 'r/' . strtolower($package) . '/deps.' .
-                    $release['v'] . '.txt');
-                if (PEAR::isError($ds)) {
-                    continue;
-                }
-                if (!isset($latest)) {
-                    $latest = $release['v'];
-                }
-                $pf->setDeps(unserialize($ds));
-                $ds = $pf->getDeps();
-                $info = $this->_rest->retrieveCacheFirst($base . 'r/' . strtolower($package)
-                    . '/' . $release['v'] . '.xml');
-                if (PEAR::isError($info)) {
-                    continue;
-                }
-                $releases[$release['v']] = array(
-                    'doneby' => $info['m'],
-                    'license' => $info['l'],
-                    'summary' => $info['s'],
-                    'description' => $info['d'],
-                    'releasedate' => $info['da'],
-                    'releasenotes' => $info['n'],
-                    'state' => $release['s'],
-                    'deps' => $ds ? $ds : array(),
-                );
-            }
-        } else {
-            $latest = '';
-        }
-        PEAR::popErrorHandling();
-        if (isset($pinfo['dc']) && isset($pinfo['dp'])) {
-            $deprecated = array('channel' => (string) $pinfo['dc'],
-                                'package' => trim($pinfo['dp']['_content']));
-        } else {
-            $deprecated = false;
-        }
-        return array(
-            'name' => $pinfo['n'],
-            'channel' => $pinfo['c'],
-            'category' => $pinfo['ca']['_content'],
-            'stable' => $latest,
-            'license' => $pinfo['l'],
-            'summary' => $pinfo['s'],
-            'description' => $pinfo['d'],
-            'releases' => $releases,
-            'deprecated' => $deprecated,
-            );
-    }
-
-    /**
-     * Return an array containing all of the states that are more stable than
-     * or equal to the passed in state
-     *
-     * @param string Release state
-     * @param boolean Determines whether to include $state in the list
-     * @return false|array False if $state is not a valid release state
-     */
-    function betterStates($state, $include = false)
-    {
-        static $states = array('snapshot', 'devel', 'alpha', 'beta', 'stable');
-        $i = array_search($state, $states);
-        if ($i === false) {
-            return false;
-        }
-        if ($include) {
-            $i--;
-        }
-        return array_slice($states, $i + 1);
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/REST/11.php b/PEAR/REST/11.php
deleted file mode 100644
index c301811..0000000
--- a/PEAR/REST/11.php
+++ /dev/null
@@ -1,223 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: 11.php,v 1.5 2006/04/01 16:59:56 pajoye Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.3
- */
-
-/**
- * For downloading REST xml/txt files
- */
-require_once 'PEAR/REST.php';
-
-/**
- * Implement REST 1.1
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.3
- */
-class PEAR_REST_11
-{
-    /**
-     * @var PEAR_REST
-     */
-    var $_rest;
-
-    function PEAR_REST_11($config, $options = array())
-    {
-        $this->_rest = &new PEAR_REST($config, $options);
-    }
-
-    function listAll($base, $dostable, $basic = true)
-    {
-        $categorylist = $this->_rest->retrieveData($base . 'c/categories.xml');
-        if (PEAR::isError($categorylist)) {
-            return $categorylist;
-        }
-        $ret = array();
-        if (!is_array($categorylist['c'])) {
-            $categorylist['c'] = array($categorylist['c']);
-        }
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-
-        foreach ($categorylist['c'] as $progress => $category) {
-            $category = $category['_content'];
-            $packagesinfo = $this->_rest->retrieveData($base .
-                'c/' . urlencode($category) . '/packagesinfo.xml');
-
-            if (PEAR::isError($packagesinfo)) {
-                continue;
-            }
-
-            if (!is_array($packagesinfo) || !isset($packagesinfo['pi'])) {
-                continue;
-            }
-
-            if (!is_array($packagesinfo['pi']) || !isset($packagesinfo['pi'][0])) {
-                $packagesinfo['pi'] = array($packagesinfo['pi']);
-            }
-
-            foreach ($packagesinfo['pi'] as $packageinfo) {
-                $info = $packageinfo['p'];
-                $package = $info['n'];
-                $releases = isset($packageinfo['a']) ? $packageinfo['a'] : false;
-                unset($latest);
-                unset($unstable);
-                unset($stable);
-                unset($state);
-
-                if ($releases) {
-                    if (!isset($releases['r'][0])) {
-                        $releases['r'] = array($releases['r']);
-                    }
-                    foreach ($releases['r'] as $release) {
-                        if (!isset($latest)) {
-                            if ($dostable && $release['s'] == 'stable') {
-                                $latest = $release['v'];
-                                $state = 'stable';
-                            }
-                            if (!$dostable) {
-                                $latest = $release['v'];
-                                $state = $release['s'];
-                            }
-                        }
-                        if (!isset($stable) && $release['s'] == 'stable') {
-                            $stable = $release['v'];
-                            if (!isset($unstable)) {
-                                $unstable = $stable;
-                            }
-                        }
-                        if (!isset($unstable) && $release['s'] != 'stable') {
-                            $latest = $unstable = $release['v'];
-                            $state = $release['s'];
-                        }
-                        if (isset($latest) && !isset($state)) {
-                            $state = $release['s'];
-                        }
-                        if (isset($latest) && isset($stable) && isset($unstable)) {
-                            break;
-                        }
-                    }
-                }
-
-                if ($basic) { // remote-list command
-                    if (!isset($latest)) {
-                        $latest = false;
-                    }
-                    if ($dostable) {
-                        if ($state == 'stable') {
-                            $ret[$package] = array('stable' => $latest);
-                        } else {
-                            $ret[$package] = array('stable' => '-n/a-');
-                        }
-                    } else {
-                            $ret[$package] = array('stable' => $latest);
-                    }
-                    continue;
-                }
-
-                // list-all command
-                $deps = array();
-                if (!isset($unstable)) {
-                    $unstable = false;
-                    $state = 'stable';
-                    if (isset($stable)) {
-                        $latest = $unstable = $stable;
-                    }
-                } else {
-                    $latest = $unstable;
-                }
-
-                if (!isset($latest)) {
-                    $latest = false;
-                }
-
-                if ($latest) {
-                    if (isset($packageinfo['deps'])) {
-                        if (!is_array($packageinfo['deps']) ||
-                              !isset($packageinfo['deps'][0])) {
-                            $packageinfo['deps'] = array($packageinfo['deps']);
-                        }
-                    }
-                    $d = false;
-                    foreach ($packageinfo['deps'] as $dep) {
-                        if ($dep['v'] == $latest) {
-                            $d = unserialize($dep['d']);
-                        }
-                    }
-                    if ($d) {
-                        if (isset($d['required'])) {
-                            if (!class_exists('PEAR_PackageFile_v2')) {
-                                require_once 'PEAR/PackageFile/v2.php';
-                            }
-                            if (!isset($pf)) {
-                                $pf = new PEAR_PackageFile_v2;
-                            }
-                            $pf->setDeps($d);
-                            $tdeps = $pf->getDeps();
-                        } else {
-                            $tdeps = $d;
-                        }
-                        foreach ($tdeps as $dep) {
-                            if ($dep['type'] !== 'pkg') {
-                                continue;
-                            }
-                            $deps[] = $dep;
-                        }
-                    }
-                }
-
-                $info = array('stable' => $latest, 'summary' => $info['s'],
-                    'description' =>
-                    $info['d'], 'deps' => $deps, 'category' => $info['ca']['_content'],
-                    'unstable' => $unstable, 'state' => $state);
-                $ret[$package] = $info;
-            }
-        }
-        PEAR::popErrorHandling();
-        return $ret;
-    }
-
-    /**
-     * Return an array containing all of the states that are more stable than
-     * or equal to the passed in state
-     *
-     * @param string Release state
-     * @param boolean Determines whether to include $state in the list
-     * @return false|array False if $state is not a valid release state
-     */
-    function betterStates($state, $include = false)
-    {
-        static $states = array('snapshot', 'devel', 'alpha', 'beta', 'stable');
-        $i = array_search($state, $states);
-        if ($i === false) {
-            return false;
-        }
-        if ($include) {
-            $i--;
-        }
-        return array_slice($states, $i + 1);
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Registry.php b/PEAR/Registry.php
deleted file mode 100644
index f020113..0000000
--- a/PEAR/Registry.php
+++ /dev/null
@@ -1,2196 +0,0 @@
-
- * @author     Tomas V. V. Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Registry.php,v 1.157 2006/09/22 02:48:43 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * for PEAR_Error
- */
-require_once 'PEAR.php';
-require_once 'PEAR/DependencyDB.php';
-
-define('PEAR_REGISTRY_ERROR_LOCK',   -2);
-define('PEAR_REGISTRY_ERROR_FORMAT', -3);
-define('PEAR_REGISTRY_ERROR_FILE',   -4);
-define('PEAR_REGISTRY_ERROR_CONFLICT', -5);
-define('PEAR_REGISTRY_ERROR_CHANNEL_FILE', -6);
-
-/**
- * Administration class used to maintain the installed package database.
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Tomas V. V. Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Registry extends PEAR
-{
-    // {{{ properties
-
-    /**
-     * File containing all channel information.
-     * @var string
-     */
-    var $channels = '';
-
-    /** Directory where registry files are stored.
-     * @var string
-     */
-    var $statedir = '';
-
-    /** File where the file map is stored
-     * @var string
-     */
-    var $filemap = '';
-
-    /** Directory where registry files for channels are stored.
-     * @var string
-     */
-    var $channelsdir = '';
-
-    /** Name of file used for locking the registry
-     * @var string
-     */
-    var $lockfile = '';
-
-    /** File descriptor used during locking
-     * @var resource
-     */
-    var $lock_fp = null;
-
-    /** Mode used during locking
-     * @var int
-     */
-    var $lock_mode = 0; // XXX UNUSED
-
-    /** Cache of package information.  Structure:
-     * array(
-     *   'package' => array('id' => ... ),
-     *   ... )
-     * @var array
-     */
-    var $pkginfo_cache = array();
-
-    /** Cache of file map.  Structure:
-     * array( '/path/to/file' => 'package', ... )
-     * @var array
-     */
-    var $filemap_cache = array();
-
-    /**
-     * @var false|PEAR_ChannelFile
-     */
-    var $_pearChannel;
-
-    /**
-     * @var false|PEAR_ChannelFile
-     */
-    var $_peclChannel;
-
-    /**
-     * @var PEAR_DependencyDB
-     */
-    var $_dependencyDB;
-
-    /**
-     * @var PEAR_Config
-     */
-    var $_config;
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Registry constructor.
-     *
-     * @param string (optional) PEAR install directory (for .php files)
-     * @param PEAR_ChannelFile PEAR_ChannelFile object representing the PEAR channel, if
-     *        default values are not desired.  Only used the very first time a PEAR
-     *        repository is initialized
-     * @param PEAR_ChannelFile PEAR_ChannelFile object representing the PECL channel, if
-     *        default values are not desired.  Only used the very first time a PEAR
-     *        repository is initialized
-     *
-     * @access public
-     */
-    function PEAR_Registry($pear_install_dir = PEAR_INSTALL_DIR, $pear_channel = false,
-                           $pecl_channel = false)
-    {
-        parent::PEAR();
-        $ds = DIRECTORY_SEPARATOR;
-        $this->install_dir = $pear_install_dir;
-        $this->channelsdir = $pear_install_dir.$ds.'.channels';
-        $this->statedir = $pear_install_dir.$ds.'.registry';
-        $this->filemap  = $pear_install_dir.$ds.'.filemap';
-        $this->lockfile = $pear_install_dir.$ds.'.lock';
-        $this->_pearChannel = $pear_channel;
-        $this->_peclChannel = $pecl_channel;
-        $this->_config = false;
-    }
-
-    function hasWriteAccess()
-    {
-        if (!file_exists($this->install_dir)) {
-            $dir = $this->install_dir;
-            while ($dir && $dir != '.') {
-                $dir = dirname($dir); // cd ..
-                if ($dir != '.' && file_exists($dir)) {
-                    if (is_writeable($dir)) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                }
-            }
-            return false;
-        }
-        return is_writeable($this->install_dir);
-    }
-
-    function setConfig(&$config)
-    {
-        $this->_config = &$config;
-    }
-
-    function _initializeChannelDirs()
-    {
-        static $running = false;
-        if (!$running) {
-            $running = true;
-            $ds = DIRECTORY_SEPARATOR;
-            if (!is_dir($this->channelsdir) ||
-                  !file_exists($this->channelsdir . $ds . 'pear.php.net.reg') ||
-                  !file_exists($this->channelsdir . $ds . 'pecl.php.net.reg') ||
-                  !file_exists($this->channelsdir . $ds . '__uri.reg')) {
-                if (!file_exists($this->channelsdir . $ds . 'pear.php.net.reg')) {
-                    $pear_channel = $this->_pearChannel;
-                    if (!is_a($pear_channel, 'PEAR_ChannelFile') || !$pear_channel->validate()) {
-                        if (!class_exists('PEAR_ChannelFile')) {
-                            require_once 'PEAR/ChannelFile.php';
-                        }
-                        $pear_channel = new PEAR_ChannelFile;
-                        $pear_channel->setName('pear.php.net');
-                        $pear_channel->setAlias('pear');
-                        $pear_channel->setServer('pear.php.net');
-                        $pear_channel->setSummary('PHP Extension and Application Repository');
-                        $pear_channel->setDefaultPEARProtocols();
-                        $pear_channel->setBaseURL('REST1.0', 'http://pear.php.net/rest/');
-                        $pear_channel->setBaseURL('REST1.1', 'http://pear.php.net/rest/');
-                    } else {
-                        $pear_channel->setName('pear.php.net');
-                        $pear_channel->setAlias('pear');
-                    }
-                    $pear_channel->validate();
-                    $this->_addChannel($pear_channel);
-                }
-                if (!file_exists($this->channelsdir . $ds . 'pecl.php.net.reg')) {
-                    $pecl_channel = $this->_peclChannel;
-                    if (!is_a($pecl_channel, 'PEAR_ChannelFile') || !$pecl_channel->validate()) {
-                        if (!class_exists('PEAR_ChannelFile')) {
-                            require_once 'PEAR/ChannelFile.php';
-                        }
-                        $pecl_channel = new PEAR_ChannelFile;
-                        $pecl_channel->setName('pecl.php.net');
-                        $pecl_channel->setAlias('pecl');
-                        $pecl_channel->setServer('pecl.php.net');
-                        $pecl_channel->setSummary('PHP Extension Community Library');
-                        $pecl_channel->setDefaultPEARProtocols();
-                        $pecl_channel->setBaseURL('REST1.0', 'http://pecl.php.net/rest/');
-                        $pecl_channel->setBaseURL('REST1.1', 'http://pecl.php.net/rest/');
-                        $pecl_channel->setValidationPackage('PEAR_Validator_PECL', '1.0');
-                    } else {
-                        $pecl_channel->setName('pecl.php.net');
-                        $pecl_channel->setAlias('pecl');
-                    }
-                    $pecl_channel->validate();
-                    $this->_addChannel($pecl_channel);
-                }
-                if (!file_exists($this->channelsdir . $ds . '__uri.reg')) {
-                    if (!class_exists('PEAR_ChannelFile')) {
-                        require_once 'PEAR/ChannelFile.php';
-                    }
-                    $private = new PEAR_ChannelFile;
-                    $private->setName('__uri');
-                    $private->addFunction('xmlrpc', '1.0', '****');
-                    $private->setSummary('Pseudo-channel for static packages');
-                    $this->_addChannel($private);
-                }
-                $this->_rebuildFileMap();
-            }
-            $running = false;
-        }
-    }
-
-    function _initializeDirs()
-    {
-        $ds = DIRECTORY_SEPARATOR;
-        // XXX Compatibility code should be removed in the future
-        // rename all registry files if any to lowercase
-        if (!OS_WINDOWS && file_exists($this->statedir) && is_dir($this->statedir) &&
-              $handle = opendir($this->statedir)) {
-            $dest = $this->statedir . $ds;
-            while (false !== ($file = readdir($handle))) {
-                if (preg_match('/^.*[A-Z].*\.reg$/', $file)) {
-                    rename($dest . $file, $dest . strtolower($file));
-                }
-            }
-            closedir($handle);
-        }
-        $this->_initializeChannelDirs();
-        if (!file_exists($this->filemap)) {
-            $this->_rebuildFileMap();
-        }
-        $this->_initializeDepDB();
-    }
-
-    function _initializeDepDB()
-    {
-        if (!isset($this->_dependencyDB)) {
-            static $initializing = false;
-            if (!$initializing) {
-                $initializing = true;
-                if (!$this->_config) { // never used?
-                    if (OS_WINDOWS) {
-                        $file = 'pear.ini';
-                    } else {
-                        $file = '.pearrc';
-                    }
-                    $this->_config = &new PEAR_Config($this->statedir . DIRECTORY_SEPARATOR .
-                        $file);
-                    $this->_config->setRegistry($this);
-                    $this->_config->set('php_dir', $this->install_dir);
-                }
-                $this->_dependencyDB = &PEAR_DependencyDB::singleton($this->_config);
-                if (PEAR::isError($this->_dependencyDB)) {
-                    // attempt to recover by removing the dep db
-                    if (file_exists($this->_config->get('php_dir', null, 'pear.php.net') .
-                        DIRECTORY_SEPARATOR . '.depdb')) {
-                        @unlink($this->_config->get('php_dir', null, 'pear.php.net') .
-                            DIRECTORY_SEPARATOR . '.depdb');
-                    }
-                    $this->_dependencyDB = &PEAR_DependencyDB::singleton($this->_config);
-                    if (PEAR::isError($this->_dependencyDB)) {
-                        echo $this->_dependencyDB->getMessage();
-                        echo 'Unrecoverable error';
-                        exit(1);
-                    }
-                }
-                $initializing = false;
-            }
-        }
-    }
-    // }}}
-    // {{{ destructor
-
-    /**
-     * PEAR_Registry destructor.  Makes sure no locks are forgotten.
-     *
-     * @access private
-     */
-    function _PEAR_Registry()
-    {
-        parent::_PEAR();
-        if (is_resource($this->lock_fp)) {
-            $this->_unlock();
-        }
-    }
-
-    // }}}
-
-    // {{{ _assertStateDir()
-
-    /**
-     * Make sure the directory where we keep registry files exists.
-     *
-     * @return bool TRUE if directory exists, FALSE if it could not be
-     * created
-     *
-     * @access private
-     */
-    function _assertStateDir($channel = false)
-    {
-        if ($channel && $this->_getChannelFromAlias($channel) != 'pear.php.net') {
-            return $this->_assertChannelStateDir($channel);
-        }
-        static $init = false;
-        if (!file_exists($this->statedir)) {
-            if (!$this->hasWriteAccess()) {
-                return false;
-            }
-            require_once 'System.php';
-            if (!System::mkdir(array('-p', $this->statedir))) {
-                return $this->raiseError("could not create directory '{$this->statedir}'");
-            }
-            $init = true;
-        } elseif (!is_dir($this->statedir)) {
-            return $this->raiseError('Cannot create directory ' . $this->statedir . ', ' .
-                'it already exists and is not a directory');
-        }
-        $ds = DIRECTORY_SEPARATOR;
-        if (!file_exists($this->channelsdir)) {
-            if (!file_exists($this->channelsdir . $ds . 'pear.php.net.reg') ||
-                  !file_exists($this->channelsdir . $ds . 'pecl.php.net.reg') ||
-                  !file_exists($this->channelsdir . $ds . '__uri.reg')) {
-                $init = true;
-            }
-        } elseif (!is_dir($this->channelsdir)) {
-            return $this->raiseError('Cannot create directory ' . $this->channelsdir . ', ' .
-                'it already exists and is not a directory');
-        }
-        if ($init) {
-            static $running = false;
-            if (!$running) {
-                $running = true;
-                $this->_initializeDirs();
-                $running = false;
-                $init = false;
-            }
-        } else {
-            $this->_initializeDepDB();
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ _assertChannelStateDir()
-
-    /**
-     * Make sure the directory where we keep registry files exists for a non-standard channel.
-     *
-     * @param string channel name
-     * @return bool TRUE if directory exists, FALSE if it could not be
-     * created
-     *
-     * @access private
-     */
-    function _assertChannelStateDir($channel)
-    {
-        $ds = DIRECTORY_SEPARATOR;
-        if (!$channel || $this->_getChannelFromAlias($channel) == 'pear.php.net') {
-            if (!file_exists($this->channelsdir . $ds . 'pear.php.net.reg')) {
-                $this->_initializeChannelDirs();
-            }
-            return $this->_assertStateDir($channel);
-        }
-        $channelDir = $this->_channelDirectoryName($channel);
-        if (!is_dir($this->channelsdir) ||
-              !file_exists($this->channelsdir . $ds . 'pear.php.net.reg')) {
-            $this->_initializeChannelDirs();
-        }
-        if (!file_exists($channelDir)) {
-            if (!$this->hasWriteAccess()) {
-                return false;
-            }
-            require_once 'System.php';
-            if (!System::mkdir(array('-p', $channelDir))) {
-                return $this->raiseError("could not create directory '" . $channelDir .
-                    "'");
-            }
-        } elseif (!is_dir($channelDir)) {
-            return $this->raiseError("could not create directory '" . $channelDir .
-                "', already exists and is not a directory");
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ _assertChannelDir()
-
-    /**
-     * Make sure the directory where we keep registry files for channels exists
-     *
-     * @return bool TRUE if directory exists, FALSE if it could not be
-     * created
-     *
-     * @access private
-     */
-    function _assertChannelDir()
-    {
-        if (!file_exists($this->channelsdir)) {
-            if (!$this->hasWriteAccess()) {
-                return false;
-            }
-            require_once 'System.php';
-            if (!System::mkdir(array('-p', $this->channelsdir))) {
-                return $this->raiseError("could not create directory '{$this->channelsdir}'");
-            }
-        } elseif (!is_dir($this->channelsdir)) {
-            return $this->raiseError("could not create directory '{$this->channelsdir}" .
-                "', it already exists and is not a directory");
-            
-        }
-        if (!file_exists($this->channelsdir . DIRECTORY_SEPARATOR . '.alias')) {
-            if (!$this->hasWriteAccess()) {
-                return false;
-            }
-            require_once 'System.php';
-            if (!System::mkdir(array('-p', $this->channelsdir . DIRECTORY_SEPARATOR . '.alias'))) {
-                return $this->raiseError("could not create directory '{$this->channelsdir}/.alias'");
-            }
-        } elseif (!is_dir($this->channelsdir . DIRECTORY_SEPARATOR . '.alias')) {
-            return $this->raiseError("could not create directory '{$this->channelsdir}" .
-                "/.alias', it already exists and is not a directory");
-            
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ _packageFileName()
-
-    /**
-     * Get the name of the file where data for a given package is stored.
-     *
-     * @param string channel name, or false if this is a PEAR package
-     * @param string package name
-     *
-     * @return string registry file name
-     *
-     * @access public
-     */
-    function _packageFileName($package, $channel = false)
-    {
-        if ($channel && $this->_getChannelFromAlias($channel) != 'pear.php.net') {
-            return $this->_channelDirectoryName($channel) . DIRECTORY_SEPARATOR .
-                strtolower($package) . '.reg';
-        }
-        return $this->statedir . DIRECTORY_SEPARATOR . strtolower($package) . '.reg';
-    }
-
-    // }}}
-    // {{{ _channelFileName()
-
-    /**
-     * Get the name of the file where data for a given channel is stored.
-     * @param string channel name
-     * @return string registry file name
-     */
-    function _channelFileName($channel, $noaliases = false)
-    {
-        if (!$noaliases) {
-            if (file_exists($this->_getChannelAliasFileName($channel))) {
-                $channel = implode('', file($this->_getChannelAliasFileName($channel)));
-            }
-        }
-        return $this->channelsdir . DIRECTORY_SEPARATOR . str_replace('/', '_',
-            strtolower($channel)) . '.reg';
-    }
-
-    // }}}
-    // {{{ getChannelAliasFileName()
-
-    /**
-     * @param string
-     * @return string
-     */
-    function _getChannelAliasFileName($alias)
-    {
-        return $this->channelsdir . DIRECTORY_SEPARATOR . '.alias' .
-              DIRECTORY_SEPARATOR . str_replace('/', '_', strtolower($alias)) . '.txt';
-    }
-
-    // }}}
-    // {{{ _getChannelFromAlias()
-
-    /**
-     * Get the name of a channel from its alias
-     */
-    function _getChannelFromAlias($channel)
-    {
-        if (!$this->_channelExists($channel)) {
-            if ($channel == 'pear.php.net') {
-                return 'pear.php.net';
-            }
-            if ($channel == 'pecl.php.net') {
-                return 'pecl.php.net';
-            }
-            if ($channel == '__uri') {
-                return '__uri';
-            }
-            return false;
-        }
-        $channel = strtolower($channel);
-        if (file_exists($this->_getChannelAliasFileName($channel))) {
-            // translate an alias to an actual channel
-            return implode('', file($this->_getChannelAliasFileName($channel)));
-        } else {
-            return $channel;
-        }
-    }    
-    // }}}
-    // {{{ _getChannelFromAlias()
-
-    /**
-     * Get the alias of a channel from its alias or its name
-     */
-    function _getAlias($channel)
-    {
-        if (!$this->_channelExists($channel)) {
-            if ($channel == 'pear.php.net') {
-                return 'pear';
-            }
-            if ($channel == 'pecl.php.net') {
-                return 'pecl';
-            }
-            return false;
-        }
-        $channel = $this->_getChannel($channel);
-        if (PEAR::isError($channel)) {
-            return $channel;
-        }
-        return $channel->getAlias();
-    }    
-    // }}}
-    // {{{ _channelDirectoryName()
-
-    /**
-     * Get the name of the file where data for a given package is stored.
-     *
-     * @param string channel name, or false if this is a PEAR package
-     * @param string package name
-     *
-     * @return string registry file name
-     *
-     * @access public
-     */
-    function _channelDirectoryName($channel)
-    {
-        if (!$channel || $this->_getChannelFromAlias($channel) == 'pear.php.net') {
-            return $this->statedir;
-        } else {
-            $ch = $this->_getChannelFromAlias($channel);
-            if (!$ch) {
-                $ch = $channel;
-            }
-            return $this->statedir . DIRECTORY_SEPARATOR . strtolower('.channel.' .
-                str_replace('/', '_', $ch));
-        }
-    }
-
-    // }}}
-    // {{{ _openPackageFile()
-
-    function _openPackageFile($package, $mode, $channel = false)
-    {
-        if (!$this->_assertStateDir($channel)) {
-            return null;
-        }
-        if (!in_array($mode, array('r', 'rb')) && !$this->hasWriteAccess()) {
-            return null;
-        }
-        $file = $this->_packageFileName($package, $channel);
-        if (!file_exists($file) && $mode == 'r' || $mode == 'rb') {
-            return null;
-        }
-        $fp = @fopen($file, $mode);
-        if (!$fp) {
-            return null;
-        }
-        return $fp;
-    }
-
-    // }}}
-    // {{{ _closePackageFile()
-
-    function _closePackageFile($fp)
-    {
-        fclose($fp);
-    }
-
-    // }}}
-    // {{{ _openChannelFile()
-
-    function _openChannelFile($channel, $mode)
-    {
-        if (!$this->_assertChannelDir()) {
-            return null;
-        }
-        if (!in_array($mode, array('r', 'rb')) && !$this->hasWriteAccess()) {
-            return null;
-        }
-        $file = $this->_channelFileName($channel);
-        if (!file_exists($file) && $mode == 'r' || $mode == 'rb') {
-            return null;
-        }
-        $fp = @fopen($file, $mode);
-        if (!$fp) {
-            return null;
-        }
-        return $fp;
-    }
-
-    // }}}
-    // {{{ _closePackageFile()
-
-    function _closeChannelFile($fp)
-    {
-        fclose($fp);
-    }
-
-    // }}}
-    // {{{ _rebuildFileMap()
-
-    function _rebuildFileMap()
-    {
-        if (!class_exists('PEAR_Installer_Role')) {
-            require_once 'PEAR/Installer/Role.php';
-        }
-        $channels = $this->_listAllPackages();
-        $files = array();
-        foreach ($channels as $channel => $packages) {
-            foreach ($packages as $package) {
-                $version = $this->_packageInfo($package, 'version', $channel);
-                $filelist = $this->_packageInfo($package, 'filelist', $channel);
-                if (!is_array($filelist)) {
-                    continue;
-                }
-                foreach ($filelist as $name => $attrs) {
-                    if (isset($attrs['attribs'])) {
-                        $attrs = $attrs['attribs'];
-                    }
-                    // it is possible for conflicting packages in different channels to
-                    // conflict with data files/doc files
-                    if ($name == 'dirtree') {
-                        continue;
-                    }
-                    if (isset($attrs['role']) && !in_array($attrs['role'],
-                          PEAR_Installer_Role::getInstallableRoles())) {
-                        // these are not installed
-                        continue;
-                    }
-                    if (isset($attrs['role']) && !in_array($attrs['role'],
-                          PEAR_Installer_Role::getBaseinstallRoles())) {
-                        $attrs['baseinstalldir'] = $package;
-                    }
-                    if (isset($attrs['baseinstalldir'])) {
-                        $file = $attrs['baseinstalldir'].DIRECTORY_SEPARATOR.$name;
-                    } else {
-                        $file = $name;
-                    }
-                    $file = preg_replace(',^/+,', '', $file);
-                    if ($channel != 'pear.php.net') {
-                        $files[$attrs['role']][$file] = array(strtolower($channel),
-                            strtolower($package));
-                    } else {
-                        $files[$attrs['role']][$file] = strtolower($package);
-                    }
-                }
-            }
-        }
-        $this->_assertStateDir();
-        if (!$this->hasWriteAccess()) {
-            return false;
-        }
-        $fp = @fopen($this->filemap, 'wb');
-        if (!$fp) {
-            return false;
-        }
-        $this->filemap_cache = $files;
-        fwrite($fp, serialize($files));
-        fclose($fp);
-        return true;
-    }
-
-    // }}}
-    // {{{ _readFileMap()
-
-    function _readFileMap()
-    {
-        if (!file_exists($this->filemap)) {
-            return array();
-        }
-        $fp = @fopen($this->filemap, 'r');
-        if (!$fp) {
-            return $this->raiseError('PEAR_Registry: could not open filemap "' . $this->filemap . '"', PEAR_REGISTRY_ERROR_FILE, null, null, $php_errormsg);
-        }
-        clearstatcache();
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        $fsize = filesize($this->filemap);
-        fclose($fp);
-        $data = file_get_contents($this->filemap);
-        set_magic_quotes_runtime($rt);
-        $tmp = unserialize($data);
-        if (!$tmp && $fsize > 7) {
-            return $this->raiseError('PEAR_Registry: invalid filemap data', PEAR_REGISTRY_ERROR_FORMAT, null, null, $data);
-        }
-        $this->filemap_cache = $tmp;
-        return true;
-    }
-
-    // }}}
-    // {{{ _lock()
-
-    /**
-     * Lock the registry.
-     *
-     * @param integer lock mode, one of LOCK_EX, LOCK_SH or LOCK_UN.
-     *                See flock manual for more information.
-     *
-     * @return bool TRUE on success, FALSE if locking failed, or a
-     *              PEAR error if some other error occurs (such as the
-     *              lock file not being writable).
-     *
-     * @access private
-     */
-    function _lock($mode = LOCK_EX)
-    {
-        if (!eregi('Windows 9', php_uname())) {
-            if ($mode != LOCK_UN && is_resource($this->lock_fp)) {
-                // XXX does not check type of lock (LOCK_SH/LOCK_EX)
-                return true;
-            }
-            if (!$this->_assertStateDir()) {
-                if ($mode == LOCK_EX) {
-                    return $this->raiseError('Registry directory is not writeable by the current user');
-                } else {
-                    return true;
-                }
-            }
-            $open_mode = 'w';
-            // XXX People reported problems with LOCK_SH and 'w'
-            if ($mode === LOCK_SH || $mode === LOCK_UN) {
-                if (!file_exists($this->lockfile)) {
-                    touch($this->lockfile);
-                }
-                $open_mode = 'r';
-            }
-
-            if (!is_resource($this->lock_fp)) {
-                $this->lock_fp = @fopen($this->lockfile, $open_mode);
-            }
-
-            if (!is_resource($this->lock_fp)) {
-                return $this->raiseError("could not create lock file" .
-                                         (isset($php_errormsg) ? ": " . $php_errormsg : ""));
-            }
-            if (!(int)flock($this->lock_fp, $mode)) {
-                switch ($mode) {
-                    case LOCK_SH: $str = 'shared';    break;
-                    case LOCK_EX: $str = 'exclusive'; break;
-                    case LOCK_UN: $str = 'unlock';    break;
-                    default:      $str = 'unknown';   break;
-                }
-                return $this->raiseError("could not acquire $str lock ($this->lockfile)",
-                                         PEAR_REGISTRY_ERROR_LOCK);
-            }
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ _unlock()
-
-    function _unlock()
-    {
-        $ret = $this->_lock(LOCK_UN);
-        if (is_resource($this->lock_fp)) {
-            fclose($this->lock_fp);
-        }
-        $this->lock_fp = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ _packageExists()
-
-    function _packageExists($package, $channel = false)
-    {
-        return file_exists($this->_packageFileName($package, $channel));
-    }
-
-    // }}}
-    // {{{ _channelExists()
-
-    /**
-     * Determine whether a channel exists in the registry
-     * @param string Channel name
-     * @param bool if true, then aliases will be ignored
-     * @return boolean
-     */
-    function _channelExists($channel, $noaliases = false)
-    {
-        $a = file_exists($this->_channelFileName($channel, $noaliases));
-        if (!$a && $channel == 'pear.php.net') {
-            return true;
-        }
-        if (!$a && $channel == 'pecl.php.net') {
-            return true;
-        }
-        return $a;
-    }
-
-    // }}}
-    // {{{ _addChannel()
-
-    /**
-     * @param PEAR_ChannelFile Channel object
-     * @param donotuse
-     * @param string Last-Modified HTTP tag from remote request
-     * @return boolean|PEAR_Error True on creation, false if it already exists
-     */
-    function _addChannel($channel, $update = false, $lastmodified = false)
-    {
-        if (!is_a($channel, 'PEAR_ChannelFile')) {
-            return false;
-        }
-        if (!$channel->validate()) {
-            return false;
-        }
-        if (file_exists($this->_channelFileName($channel->getName()))) {
-            if (!$update) {
-                return false;
-            }
-            $checker = $this->_getChannel($channel->getName());
-            if (PEAR::isError($checker)) {
-                return $checker;
-            }
-            if ($channel->getAlias() != $checker->getAlias()) {
-                if (file_exists($this->_getChannelAliasFileName($checker->getAlias()))) {
-                    @unlink($this->_getChannelAliasFileName($checker->getAlias()));
-                }
-            }
-        } else {
-            if ($update && !in_array($channel->getName(), array('pear.php.net', 'pecl.php.net'))) {
-                return false;
-            }
-        }
-        $ret = $this->_assertChannelDir();
-        if (PEAR::isError($ret)) {
-            return $ret;
-        }
-        $ret = $this->_assertChannelStateDir($channel->getName());
-        if (PEAR::isError($ret)) {
-            return $ret;
-        }
-        if ($channel->getAlias() != $channel->getName()) {
-            if (file_exists($this->_getChannelAliasFileName($channel->getAlias())) &&
-                  $this->_getChannelFromAlias($channel->getAlias()) != $channel->getName()) {
-                $channel->setAlias($channel->getName());
-            }
-            if (!$this->hasWriteAccess()) {
-                return false;
-            }
-            $fp = @fopen($this->_getChannelAliasFileName($channel->getAlias()), 'w');
-            if (!$fp) {
-                return false;
-            }
-            fwrite($fp, $channel->getName());
-            fclose($fp);
-        }
-        if (!$this->hasWriteAccess()) {
-            return false;
-        }
-        $fp = @fopen($this->_channelFileName($channel->getName()), 'wb');
-        if (!$fp) {
-            return false;
-        }
-        $info = $channel->toArray();
-        if ($lastmodified) {
-            $info['_lastmodified'] = $lastmodified;
-        } else {
-            $info['_lastmodified'] = date('r');
-        }
-        fwrite($fp, serialize($info));
-        fclose($fp);
-        return true;
-    }
-
-    // }}}
-    // {{{ _deleteChannel()
-
-    /**
-     * Deletion fails if there are any packages installed from the channel
-     * @param string|PEAR_ChannelFile channel name
-     * @return boolean|PEAR_Error True on deletion, false if it doesn't exist
-     */
-    function _deleteChannel($channel)
-    {
-        if (!is_string($channel)) {
-            if (is_a($channel, 'PEAR_ChannelFile')) {
-                if (!$channel->validate()) {
-                    return false;
-                }
-                $channel = $channel->getName();
-            } else {
-                return false;
-            }
-        }
-        if ($this->_getChannelFromAlias($channel) == '__uri') {
-            return false;
-        }
-        if ($this->_getChannelFromAlias($channel) == 'pecl.php.net') {
-            return false;
-        }
-        if (!$this->_channelExists($channel)) {
-            return false;
-        }
-        if (!$channel || $this->_getChannelFromAlias($channel) == 'pear.php.net') {
-            return false;
-        }
-        $channel = $this->_getChannelFromAlias($channel);
-        if ($channel == 'pear.php.net') {
-            return false;
-        }
-        $test = $this->_listChannelPackages($channel);
-        if (count($test)) {
-            return false;
-        }
-        $test = @rmdir($this->_channelDirectoryName($channel));
-        if (!$test) {
-            return false;
-        }
-        $file = $this->_getChannelAliasFileName($this->_getAlias($channel));
-        if (file_exists($file)) {
-            $test = @unlink($file);
-            if (!$test) {
-                return false;
-            }
-        }
-        $file = $this->_channelFileName($channel);
-        $ret = true;
-        if (file_exists($file)) {
-            $ret = @unlink($file);
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ _isChannelAlias()
-
-    /**
-     * Determine whether a channel exists in the registry
-     * @param string Channel Alias
-     * @return boolean
-     */
-    function _isChannelAlias($alias)
-    {
-        return file_exists($this->_getChannelAliasFileName($alias));
-    }
-
-    // }}}
-    // {{{ _packageInfo()
-
-    /**
-     * @param string|null
-     * @param string|null
-     * @param string|null
-     * @return array|null
-     * @access private
-     */
-    function _packageInfo($package = null, $key = null, $channel = 'pear.php.net')
-    {
-        if ($package === null) {
-            if ($channel === null) {
-                $channels = $this->_listChannels();
-                $ret = array();
-                foreach ($channels as $channel) {
-                    $channel = strtolower($channel);
-                    $ret[$channel] = array();
-                    $packages = $this->_listPackages($channel);
-                    foreach ($packages as $package) {
-                        $ret[$channel][] = $this->_packageInfo($package, null, $channel);
-                    }
-                }
-                return $ret;
-            }
-            $ps = $this->_listPackages($channel);
-            if (!count($ps)) {
-                return array();
-            }
-            return array_map(array(&$this, '_packageInfo'),
-                             $ps, array_fill(0, count($ps), null),
-                             array_fill(0, count($ps), $channel));
-        }
-        $fp = $this->_openPackageFile($package, 'r', $channel);
-        if ($fp === null) {
-            return null;
-        }
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        clearstatcache();
-        $this->_closePackageFile($fp);
-        $data = file_get_contents($this->_packageFileName($package, $channel));
-        set_magic_quotes_runtime($rt);
-        $data = unserialize($data);
-        if ($key === null) {
-            return $data;
-        }
-        // compatibility for package.xml version 2.0
-        if (isset($data['old'][$key])) {
-            return $data['old'][$key];
-        }
-        if (isset($data[$key])) {
-            return $data[$key];
-        }
-        return null;
-    }
-
-    // }}}
-    // {{{ _channelInfo()
-
-    /**
-     * @param string Channel name
-     * @param bool whether to strictly retrieve info of channels, not just aliases
-     * @return array|null
-     */
-    function _channelInfo($channel, $noaliases = false)
-    {
-        if (!$this->_channelExists($channel, $noaliases)) {
-            return null;
-        }
-        $fp = $this->_openChannelFile($channel, 'r');
-        if ($fp === null) {
-            return null;
-        }
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        clearstatcache();
-        $this->_closeChannelFile($fp);
-        $data = file_get_contents($this->_channelFileName($channel));
-        set_magic_quotes_runtime($rt);
-        $data = unserialize($data);
-        return $data;
-    }
-
-    // }}}
-    // {{{ _listChannels()
-
-    function _listChannels()
-    {
-        $channellist = array();
-        if (!file_exists($this->channelsdir) || !is_dir($this->channelsdir)) {
-            return array('pear.php.net', 'pecl.php.net', '__uri');
-        }
-        $dp = opendir($this->channelsdir);
-        while ($ent = readdir($dp)) {
-            if ($ent{0} == '.' || substr($ent, -4) != '.reg') {
-                continue;
-            }
-            if ($ent == '__uri.reg') {
-                $channellist[] = '__uri';
-                continue;
-            }
-            $channellist[] = str_replace('_', '/', substr($ent, 0, -4));
-        }
-        closedir($dp);
-        if (!in_array('pear.php.net', $channellist)) {
-            $channellist[] = 'pear.php.net';
-        }
-        if (!in_array('pecl.php.net', $channellist)) {
-            $channellist[] = 'pecl.php.net';
-        }
-        if (!in_array('__uri', $channellist)) {
-            $channellist[] = '__uri';
-        }
-        return $channellist;
-    }
-
-    // }}}
-    // {{{ _listPackages()
-
-    function _listPackages($channel = false)
-    {
-        if ($channel && $this->_getChannelFromAlias($channel) != 'pear.php.net') {
-            return $this->_listChannelPackages($channel);
-        }
-        if (!file_exists($this->statedir) || !is_dir($this->statedir)) {
-            return array();
-        }
-        $pkglist = array();
-        $dp = opendir($this->statedir);
-        if (!$dp) {
-            return $pkglist;
-        }
-        while ($ent = readdir($dp)) {
-            if ($ent{0} == '.' || substr($ent, -4) != '.reg') {
-                continue;
-            }
-            $pkglist[] = substr($ent, 0, -4);
-        }
-        closedir($dp);
-        return $pkglist;
-    }
-
-    // }}}
-    // {{{ _listChannelPackages()
-
-    function _listChannelPackages($channel)
-    {
-        $pkglist = array();
-        if (!file_exists($this->_channelDirectoryName($channel)) ||
-              !is_dir($this->_channelDirectoryName($channel))) {
-            return array();
-        }
-        $dp = opendir($this->_channelDirectoryName($channel));
-        if (!$dp) {
-            return $pkglist;
-        }
-        while ($ent = readdir($dp)) {
-            if ($ent{0} == '.' || substr($ent, -4) != '.reg') {
-                continue;
-            }
-            $pkglist[] = substr($ent, 0, -4);
-        }
-        closedir($dp);
-        return $pkglist;
-    }
-
-    // }}}
-    
-    function _listAllPackages()
-    {
-        $ret = array();
-        foreach ($this->_listChannels() as $channel) {
-            $ret[$channel] = $this->_listPackages($channel);
-        }
-        return $ret;
-    }
-
-    /**
-     * Add an installed package to the registry
-     * @param string package name
-     * @param array package info (parsed by PEAR_Common::infoFrom*() methods)
-     * @return bool success of saving
-     * @access private
-     */
-    function _addPackage($package, $info)
-    {
-        if ($this->_packageExists($package)) {
-            return false;
-        }
-        $fp = $this->_openPackageFile($package, 'wb');
-        if ($fp === null) {
-            return false;
-        }
-        $info['_lastmodified'] = time();
-        fwrite($fp, serialize($info));
-        $this->_closePackageFile($fp);
-        if (isset($info['filelist'])) {
-            $this->_rebuildFileMap();
-        }
-        return true;
-    }
-
-    /**
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @return bool
-     * @access private
-     */
-    function _addPackage2($info)
-    {
-        if (!$info->validate()) {
-            if (class_exists('PEAR_Common')) {
-                $ui = PEAR_Frontend::singleton();
-                if ($ui) {
-                    foreach ($info->getValidationWarnings() as $err) {
-                        $ui->log($err['message'], true);
-                    }
-                }
-            }
-            return false;
-        }
-        $channel = $info->getChannel();
-        $package = $info->getPackage();
-        $save = $info;
-        if ($this->_packageExists($package, $channel)) {
-            return false;
-        }
-        if (!$this->_channelExists($channel, true)) {
-            return false;
-        }
-        $info = $info->toArray(true);
-        if (!$info) {
-            return false;
-        }
-        $fp = $this->_openPackageFile($package, 'wb', $channel);
-        if ($fp === null) {
-            return false;
-        }
-        $info['_lastmodified'] = time();
-        fwrite($fp, serialize($info));
-        $this->_closePackageFile($fp);
-        $this->_rebuildFileMap();
-        return true;
-    }
-
-    /**
-     * @param string Package name
-     * @param array parsed package.xml 1.0
-     * @param bool this parameter is only here for BC.  Don't use it.
-     * @access private
-     */
-    function _updatePackage($package, $info, $merge = true)
-    {
-        $oldinfo = $this->_packageInfo($package);
-        if (empty($oldinfo)) {
-            return false;
-        }
-        $fp = $this->_openPackageFile($package, 'w');
-        if ($fp === null) {
-            return false;
-        }
-        if (is_object($info)) {
-            $info = $info->toArray();
-        }
-        $info['_lastmodified'] = time();
-        $newinfo = $info;
-        if ($merge) {
-            $info = array_merge($oldinfo, $info);
-        } else {
-            $diff = $info;
-        }
-        fwrite($fp, serialize($info));
-        $this->_closePackageFile($fp);
-        if (isset($newinfo['filelist'])) {
-            $this->_rebuildFileMap();
-        }
-        return true;
-    }
-
-    /**
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @return bool
-     * @access private
-     */
-    function _updatePackage2($info)
-    {
-        if (!$this->_packageExists($info->getPackage(), $info->getChannel())) {
-            return false;
-        }
-        $fp = $this->_openPackageFile($info->getPackage(), 'w', $info->getChannel());
-        if ($fp === null) {
-            return false;
-        }
-        $save = $info;
-        $info = $save->getArray(true);
-        $info['_lastmodified'] = time();
-        fwrite($fp, serialize($info));
-        $this->_closePackageFile($fp);
-        $this->_rebuildFileMap();
-        return true;
-    }
-
-    /**
-     * @param string Package name
-     * @param string Channel name
-     * @return PEAR_PackageFile_v1|PEAR_PackageFile_v2|null
-     * @access private
-     */
-    function &_getPackage($package, $channel = 'pear.php.net')
-    {
-        $info = $this->_packageInfo($package, null, $channel);
-        if ($info === null) {
-            return $info;
-        }
-        $a = $this->_config;
-        if (!$a) {
-            $this->_config = &new PEAR_Config;
-            $this->_config->set('php_dir', $this->statedir);
-        }
-        if (!class_exists('PEAR_PackageFile')) {
-            require_once 'PEAR/PackageFile.php';
-        }
-        $pkg = &new PEAR_PackageFile($this->_config);
-        $pf = &$pkg->fromArray($info);
-        return $pf;
-    }
-
-    /**
-     * @param string channel name
-     * @param bool whether to strictly retrieve channel names
-     * @return PEAR_ChannelFile|PEAR_Error
-     * @access private
-     */
-    function &_getChannel($channel, $noaliases = false)
-    {
-        $ch = false;
-        if ($this->_channelExists($channel, $noaliases)) {
-            $chinfo = $this->_channelInfo($channel, $noaliases);
-            if ($chinfo) {
-                if (!class_exists('PEAR_ChannelFile')) {
-                    require_once 'PEAR/ChannelFile.php';
-                }
-                $ch = &PEAR_ChannelFile::fromArrayWithErrors($chinfo);
-            }
-        }
-        if ($ch) {
-            if ($ch->validate()) {
-                return $ch;
-            }
-            foreach ($ch->getErrors(true) as $err) {
-                $message = $err['message'] . "\n";
-            }
-            $ch = PEAR::raiseError($message);
-            return $ch;
-        }
-        if ($this->_getChannelFromAlias($channel) == 'pear.php.net') {
-            // the registry is not properly set up, so use defaults
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
-            }
-            $pear_channel = new PEAR_ChannelFile;
-            $pear_channel->setName('pear.php.net');
-            $pear_channel->setAlias('pear');
-            $pear_channel->setSummary('PHP Extension and Application Repository');
-            $pear_channel->setDefaultPEARProtocols();
-            $pear_channel->setBaseURL('REST1.0', 'http://pear.php.net/rest/');
-            $pear_channel->setBaseURL('REST1.1', 'http://pear.php.net/rest/');
-            return $pear_channel;
-        }
-        if ($this->_getChannelFromAlias($channel) == 'pecl.php.net') {
-            // the registry is not properly set up, so use defaults
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
-            }
-            $pear_channel = new PEAR_ChannelFile;
-            $pear_channel->setName('pecl.php.net');
-            $pear_channel->setAlias('pecl');
-            $pear_channel->setSummary('PHP Extension Community Library');
-            $pear_channel->setDefaultPEARProtocols();
-            $pear_channel->setBaseURL('REST1.0', 'http://pecl.php.net/rest/');
-            $pear_channel->setBaseURL('REST1.1', 'http://pecl.php.net/rest/');
-            $pear_channel->setValidationPackage('PEAR_Validator_PECL', '1.0');
-            return $pear_channel;
-        }
-        if ($this->_getChannelFromAlias($channel) == '__uri') {
-            // the registry is not properly set up, so use defaults
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
-            }
-            $private = new PEAR_ChannelFile;
-            $private->setName('__uri');
-            $private->addFunction('xmlrpc', '1.0', '****');
-            $private->setSummary('Pseudo-channel for static packages');
-            return $private;
-        }
-        return $ch;
-    }
-
-    // {{{ packageExists()
-
-    /**
-     * @param string Package name
-     * @param string Channel name
-     * @return bool
-     */
-    function packageExists($package, $channel = 'pear.php.net')
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_packageExists($package, $channel);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-
-    // {{{ channelExists()
-
-    /**
-     * @param string channel name
-     * @param bool if true, then aliases will be ignored
-     * @return bool
-     */
-    function channelExists($channel, $noaliases = false)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_channelExists($channel, $noaliases);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-
-    // {{{ isAlias()
-
-    /**
-     * Determines whether the parameter is an alias of a channel
-     * @param string
-     * @return bool
-     */
-    function isAlias($alias)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_isChannelAlias($alias);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ packageInfo()
-
-    /**
-     * @param string|null
-     * @param string|null
-     * @param string
-     * @return array|null
-     */
-    function packageInfo($package = null, $key = null, $channel = 'pear.php.net')
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_packageInfo($package, $key, $channel);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ channelInfo()
-
-    /**
-     * Retrieve a raw array of channel data.
-     *
-     * Do not use this, instead use {@link getChannel()} for normal
-     * operations.  Array structure is undefined in this method
-     * @param string channel name
-     * @param bool whether to strictly retrieve information only on non-aliases
-     * @return array|null|PEAR_Error
-     */
-    function channelInfo($channel = null, $noaliases = false)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_channelInfo($channel, $noaliases);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-
-    /**
-     * @param string
-     */
-    function channelName($channel)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_getChannelFromAlias($channel);
-        $this->_unlock();
-        return $ret;
-    }
-
-    /**
-     * @param string
-     */
-    function channelAlias($channel)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_getAlias($channel);
-        $this->_unlock();
-        return $ret;
-    }
-    // {{{ listPackages()
-
-    function listPackages($channel = false)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_listPackages($channel);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ listAllPackages()
-
-    function listAllPackages()
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_listAllPackages();
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ listChannel()
-
-    function listChannels()
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_listChannels();
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ addPackage()
-
-    /**
-     * Add an installed package to the registry
-     * @param string|PEAR_PackageFile_v1|PEAR_PackageFile_v2 package name or object
-     *               that will be passed to {@link addPackage2()}
-     * @param array package info (parsed by PEAR_Common::infoFrom*() methods)
-     * @return bool success of saving
-     */
-    function addPackage($package, $info)
-    {
-        if (is_object($info)) {
-            return $this->addPackage2($info);
-        }
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        $ret = $this->_addPackage($package, $info);
-        $this->_unlock();
-        if ($ret) {
-            if (!class_exists('PEAR_PackageFile_v1')) {
-                require_once 'PEAR/PackageFile/v1.php';
-            }
-            $pf = new PEAR_PackageFile_v1;
-            $pf->setConfig($this->_config);
-            $pf->fromArray($info);
-            $this->_dependencyDB->uninstallPackage($pf);
-            $this->_dependencyDB->installPackage($pf);
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ addPackage2()
-
-    function addPackage2($info)
-    {
-        if (!is_object($info)) {
-            return $this->addPackage($info['package'], $info);
-        }
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        $ret = $this->_addPackage2($info);
-        $this->_unlock();
-        if ($ret) {
-            $this->_dependencyDB->uninstallPackage($info);
-            $this->_dependencyDB->installPackage($info);
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ updateChannel()
-
-    /**
-     * For future expandibility purposes, separate this
-     * @param PEAR_ChannelFile
-     */
-    function updateChannel($channel, $lastmodified = null)
-    {
-        if ($channel->getName() == '__uri') {
-            return false;
-        }
-        return $this->addChannel($channel, $lastmodified, true);
-    }
-
-    // }}}
-    // {{{ deleteChannel()
-
-    /**
-     * Deletion fails if there are any packages installed from the channel
-     * @param string|PEAR_ChannelFile channel name
-     * @return boolean|PEAR_Error True on deletion, false if it doesn't exist
-     */
-    function deleteChannel($channel)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        $ret = $this->_deleteChannel($channel);
-        $this->_unlock();
-        if ($ret && is_a($this->_config, 'PEAR_Config')) {
-            $this->_config->setChannels($this->listChannels());
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ addChannel()
-
-    /**
-     * @param PEAR_ChannelFile Channel object
-     * @param string Last-Modified header from HTTP for caching
-     * @return boolean|PEAR_Error True on creation, false if it already exists
-     */
-    function addChannel($channel, $lastmodified = false, $update = false)
-    {
-        if (!is_a($channel, 'PEAR_ChannelFile')) {
-            return false;
-        }
-        if (!$channel->validate()) {
-            return false;
-        }
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        $ret = $this->_addChannel($channel, $update, $lastmodified);
-        $this->_unlock();
-        if (!$update && $ret && is_a($this->_config, 'PEAR_Config')) {
-            $this->_config->setChannels($this->listChannels());
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ deletePackage()
-
-    function deletePackage($package, $channel = 'pear.php.net')
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        $file = $this->_packageFileName($package, $channel);
-        if (file_exists($file)) {
-            $ret = @unlink($file);
-        } else {
-            $ret = false;
-        }
-        $this->_rebuildFileMap();
-        $this->_unlock();
-        $p = array('channel' => $channel, 'package' => $package);
-        $this->_dependencyDB->uninstallPackage($p);
-        return $ret;
-    }
-
-    // }}}
-    // {{{ updatePackage()
-
-    function updatePackage($package, $info, $merge = true)
-    {
-        if (is_object($info)) {
-            return $this->updatePackage2($info, $merge);
-        }
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        $ret = $this->_updatePackage($package, $info, $merge);
-        $this->_unlock();
-        if ($ret) {
-            if (!class_exists('PEAR_PackageFile_v1')) {
-                require_once 'PEAR/PackageFile/v1.php';
-            }
-            $pf = new PEAR_PackageFile_v1;
-            $pf->setConfig($this->_config);
-            $pf->fromArray($this->packageInfo($package));
-            $this->_dependencyDB->uninstallPackage($pf);
-            $this->_dependencyDB->installPackage($pf);
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ updatePackage2()
-
-    function updatePackage2($info)
-    {
-        if (!is_object($info)) {
-            return $this->updatePackage($info['package'], $info, $merge);
-        }
-        if (!$info->validate(PEAR_VALIDATE_DOWNLOADING)) {
-            return false;
-        }
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        $ret = $this->_updatePackage2($info);
-        $this->_unlock();
-        if ($ret) {
-            $this->_dependencyDB->uninstallPackage($info);
-            $this->_dependencyDB->installPackage($info);
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ getChannel()
-    /**
-     * @param string channel name
-     * @param bool whether to strictly return raw channels (no aliases)
-     * @return PEAR_ChannelFile|PEAR_Error
-     */
-    function &getChannel($channel, $noaliases = false)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = &$this->_getChannel($channel, $noaliases);
-        if (!$ret) {
-            return PEAR::raiseError('Unknown channel: ' . $channel);
-        }
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ getPackage()
-    /**
-     * @param string package name
-     * @param string channel name
-     * @return PEAR_PackageFile_v1|PEAR_PackageFile_v2|null
-     */
-    function &getPackage($package, $channel = 'pear.php.net')
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $pf = &$this->_getPackage($package, $channel);
-        $this->_unlock();
-        return $pf;
-    }
-
-    // }}}
-
-    /**
-     * Get PEAR_PackageFile_v[1/2] objects representing the contents of
-     * a dependency group that are installed.
-     *
-     * This is used at uninstall-time
-     * @param array
-     * @return array|false
-     */
-    function getInstalledGroup($group)
-    {
-        $ret = array();
-        if (isset($group['package'])) {
-            if (!isset($group['package'][0])) {
-                $group['package'] = array($group['package']);
-            }
-            foreach ($group['package'] as $package) {
-                $depchannel = isset($package['channel']) ? $package['channel'] : '__uri';
-                $p = &$this->getPackage($package['name'], $depchannel);
-                if ($p) {
-                    $save = &$p;
-                    $ret[] = &$save;
-                }
-            }
-        }
-        if (isset($group['subpackage'])) {
-            if (!isset($group['subpackage'][0])) {
-                $group['subpackage'] = array($group['subpackage']);
-            }
-            foreach ($group['subpackage'] as $package) {
-                $depchannel = isset($package['channel']) ? $package['channel'] : '__uri';
-                $p = &$this->getPackage($package['name'], $depchannel);
-                if ($p) {
-                    $save = &$p;
-                    $ret[] = &$save;
-                }
-            }
-        }
-        if (!count($ret)) {
-            return false;
-        }
-        return $ret;
-    }
-
-    // {{{ getChannelValidator()
-    /**
-     * @param string channel name
-     * @return PEAR_Validate|false
-     */
-    function &getChannelValidator($channel)
-    {
-        $chan = $this->getChannel($channel);
-        if (PEAR::isError($chan)) {
-            return $chan;
-        }
-        $val = $chan->getValidationObject();
-        return $val;
-    }
-    // }}}
-    // {{{ getChannels()
-    /**
-     * @param string channel name
-     * @return array an array of PEAR_ChannelFile objects representing every installed channel
-     */
-    function &getChannels()
-    {
-        $ret = array();
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        foreach ($this->_listChannels() as $channel) {
-            $e = &$this->_getChannel($channel);
-            if (!$e || PEAR::isError($e)) {
-                continue;
-            }
-            $ret[] = $e;
-        }
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ checkFileMap()
-
-    /**
-     * Test whether a file or set of files belongs to a package.
-     *
-     * If an array is passed in
-     * @param string|array file path, absolute or relative to the pear
-     *                     install dir
-     * @param string|array name of PEAR package or array('package' => name, 'channel' =>
-     *                     channel) of a package that will be ignored
-     * @param string API version - 1.1 will exclude any files belonging to a package
-     * @param array private recursion variable
-     * @return array|false which package and channel the file belongs to, or an empty
-     *                     string if the file does not belong to an installed package,
-     *                     or belongs to the second parameter's package
-     */
-    function checkFileMap($path, $package = false, $api = '1.0', $attrs = false)
-    {
-        if (is_array($path)) {
-            static $notempty;
-            if (empty($notempty)) {
-                if (!class_exists('PEAR_Installer_Role')) {
-                    require_once 'PEAR/Installer/Role.php';
-                }
-                $notempty = create_function('$a','return !empty($a);');
-            }
-            $package = is_array($package) ? array(strtolower($package[0]), strtolower($package[1]))
-                : strtolower($package);
-            $pkgs = array();
-            foreach ($path as $name => $attrs) {
-                if (is_array($attrs)) {
-                    if (isset($attrs['install-as'])) {
-                        $name = $attrs['install-as'];
-                    }
-                    if (!in_array($attrs['role'], PEAR_Installer_Role::getInstallableRoles())) {
-                        // these are not installed
-                        continue;
-                    }
-                    if (!in_array($attrs['role'], PEAR_Installer_Role::getBaseinstallRoles())) {
-                        $attrs['baseinstalldir'] = is_array($package) ? $package[1] : $package;
-                    }
-                    if (isset($attrs['baseinstalldir'])) {
-                        $name = $attrs['baseinstalldir'] . DIRECTORY_SEPARATOR . $name;
-                    }
-                }
-                $pkgs[$name] = $this->checkFileMap($name, $package, $api, $attrs);
-                if (PEAR::isError($pkgs[$name])) {
-                    return $pkgs[$name];
-                }
-            }
-            return array_filter($pkgs, $notempty);
-        }
-        if (empty($this->filemap_cache)) {
-            if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-                return $e;
-            }
-            $err = $this->_readFileMap();
-            $this->_unlock();
-            if (PEAR::isError($err)) {
-                return $err;
-            }
-        }
-        if (!$attrs) {
-            $attrs = array('role' => 'php'); // any old call would be for PHP role only
-        }
-        if (isset($this->filemap_cache[$attrs['role']][$path])) {
-            if ($api >= '1.1' && $this->filemap_cache[$attrs['role']][$path] == $package) {
-                return false;
-            }
-            return $this->filemap_cache[$attrs['role']][$path];
-        }
-        $l = strlen($this->install_dir);
-        if (substr($path, 0, $l) == $this->install_dir) {
-            $path = preg_replace('!^'.DIRECTORY_SEPARATOR.'+!', '', substr($path, $l));
-        }
-        if (isset($this->filemap_cache[$attrs['role']][$path])) {
-            if ($api >= '1.1' && $this->filemap_cache[$attrs['role']][$path] == $package) {
-                return false;
-            }
-            return $this->filemap_cache[$attrs['role']][$path];
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ apiVersion()
-    /**
-     * Get the expected API version.  Channels API is version 1.1, as it is backwards
-     * compatible with 1.0
-     * @return string
-     */
-    function apiVersion()
-    {
-        return '1.1';
-    }
-    // }}}
-
-
-    /**
-     * Parse a package name, or validate a parsed package name array
-     * @param string|array pass in an array of format
-     *                     array(
-     *                      'package' => 'pname',
-     *                     ['channel' => 'channame',]
-     *                     ['version' => 'version',]
-     *                     ['state' => 'state',]
-     *                     ['group' => 'groupname'])
-     *                     or a string of format
-     *                     [channel://][channame/]pname[-version|-state][/group=groupname]
-     * @return array|PEAR_Error
-     */
-    function parsePackageName($param, $defaultchannel = 'pear.php.net')
-    {
-        $saveparam = $param;
-        if (is_array($param)) {
-            // convert to string for error messages
-            $saveparam = $this->parsedPackageNameToString($param);
-            // process the array
-            if (!isset($param['package'])) {
-                return PEAR::raiseError('parsePackageName(): array $param ' .
-                    'must contain a valid package name in index "param"',
-                    'package', null, null, $param);
-            }
-            if (!isset($param['uri'])) {
-                if (!isset($param['channel'])) {
-                    $param['channel'] = $defaultchannel;
-                }
-            } else {
-                $param['channel'] = '__uri';
-            }
-        } else {
-            $components = @parse_url((string) $param);
-            if (isset($components['scheme'])) {
-                if ($components['scheme'] == 'http') {
-                    // uri package
-                    $param = array('uri' => $param, 'channel' => '__uri');
-                } elseif($components['scheme'] != 'channel') {
-                    return PEAR::raiseError('parsePackageName(): only channel:// uris may ' .
-                        'be downloaded, not "' . $param . '"', 'invalid', null, null, $param);
-                }
-            }
-            if (!isset($components['path'])) {
-                return PEAR::raiseError('parsePackageName(): array $param ' .
-                    'must contain a valid package name in "' . $param . '"',
-                    'package', null, null, $param);
-            }
-            if (isset($components['host'])) {
-                // remove the leading "/"
-                $components['path'] = substr($components['path'], 1);
-            }
-            if (!isset($components['scheme'])) {
-                if (strpos($components['path'], '/') !== false) {
-                    if ($components['path']{0} == '/') {
-                        return PEAR::raiseError('parsePackageName(): this is not ' .
-                            'a package name, it begins with "/" in "' . $param . '"',
-                            'invalid', null, null, $param);
-                    }
-                    $parts = explode('/', $components['path']);
-                    $components['host'] = array_shift($parts);
-                    if (count($parts) > 1) {
-                        $components['path'] = array_pop($parts);
-                        $components['host'] .= '/' . implode('/', $parts);
-                    } else {
-                        $components['path'] = implode('/', $parts);
-                    }
-                } else {
-                    $components['host'] = $defaultchannel;
-                }
-            } else {
-                if (strpos($components['path'], '/')) {
-                    $parts = explode('/', $components['path']);
-                    $components['path'] = array_pop($parts);
-                    $components['host'] .= '/' . implode('/', $parts);
-                }
-            }
-
-            if (is_array($param)) {
-                $param['package'] = $components['path'];
-            } else {
-                $param = array(
-                    'package' => $components['path']
-                    );
-                if (isset($components['host'])) {
-                    $param['channel'] = $components['host'];
-                }
-            }
-            if (isset($components['fragment'])) {
-                $param['group'] = $components['fragment'];
-            }
-            if (isset($components['user'])) {
-                $param['user'] = $components['user'];
-            }
-            if (isset($components['pass'])) {
-                $param['pass'] = $components['pass'];
-            }
-            if (isset($components['query'])) {
-                parse_str($components['query'], $param['opts']);
-            }
-            // check for extension
-            $pathinfo = pathinfo($param['package']);
-            if (isset($pathinfo['extension']) &&
-                  in_array(strtolower($pathinfo['extension']), array('tgz', 'tar'))) {
-                $param['extension'] = $pathinfo['extension'];
-                $param['package'] = substr($pathinfo['basename'], 0,
-                    strlen($pathinfo['basename']) - 4);
-            }
-            // check for version
-            if (strpos($param['package'], '-')) {
-                $test = explode('-', $param['package']);
-                if (count($test) != 2) {
-                    return PEAR::raiseError('parsePackageName(): only one version/state ' .
-                        'delimiter "-" is allowed in "' . $saveparam . '"',
-                        'version', null, null, $param);
-                }
-                list($param['package'], $param['version']) = $test;
-            }
-        }
-        // validation
-        $info = $this->channelExists($param['channel']);
-        if (PEAR::isError($info)) {
-            return $info;
-        }
-        if (!$info) {
-            return PEAR::raiseError('unknown channel "' . $param['channel'] .
-                '" in "' . $saveparam . '"', 'channel', null, null, $param);
-        }
-        $chan = $this->getChannel($param['channel']);
-        if (PEAR::isError($chan)) {
-            return $chan;
-        }
-        if (!$chan) {
-            return PEAR::raiseError("Exception: corrupt registry, could not " .
-                "retrieve channel " . $param['channel'] . " information",
-                'registry', null, null, $param);
-        }
-        $param['channel'] = $chan->getName();
-        $validate = $chan->getValidationObject();
-        $vpackage = $chan->getValidationPackage();
-        // validate package name
-        if (!$validate->validPackageName($param['package'], $vpackage['_content'])) {
-            return PEAR::raiseError('parsePackageName(): invalid package name "' .
-                $param['package'] . '" in "' . $saveparam . '"',
-                'package', null, null, $param);
-        }
-        if (isset($param['group'])) {
-            if (!PEAR_Validate::validGroupName($param['group'])) {
-                return PEAR::raiseError('parsePackageName(): dependency group "' . $param['group'] .
-                    '" is not a valid group name in "' . $saveparam . '"', 'group', null, null,
-                    $param);
-            }
-        }
-        if (isset($param['state'])) {
-            if (!in_array(strtolower($param['state']), $validate->getValidStates())) {
-                return PEAR::raiseError('parsePackageName(): state "' . $param['state']
-                    . '" is not a valid state in "' . $saveparam . '"',
-                    'state', null, null, $param);
-            }
-        }
-        if (isset($param['version'])) {
-            if (isset($param['state'])) {
-                return PEAR::raiseError('parsePackageName(): cannot contain both ' .
-                    'a version and a stability (state) in "' . $saveparam . '"',
-                    'version/state', null, null, $param);
-            }
-            // check whether version is actually a state
-            if (in_array(strtolower($param['version']), $validate->getValidStates())) {
-                $param['state'] = strtolower($param['version']);
-                unset($param['version']);
-            } else {
-                if (!$validate->validVersion($param['version'])) {
-                    return PEAR::raiseError('parsePackageName(): "' . $param['version'] .
-                        '" is neither a valid version nor a valid state in "' .
-                        $saveparam . '"', 'version/state', null, null, $param);
-                }                    
-            }
-        }
-        return $param;
-    }
-
-    /**
-     * @param array
-     * @return string
-     */
-    function parsedPackageNameToString($parsed, $brief = false)
-    {
-        if (is_string($parsed)) {
-            return $parsed;
-        }
-        if (is_object($parsed)) {
-            $p = $parsed;
-            $parsed = array(
-                'package' => $p->getPackage(),
-                'channel' => $p->getChannel(),
-                'version' => $p->getVersion(),
-            );
-        }
-        if (isset($parsed['uri'])) {
-            return $parsed['uri'];
-        }
-        if ($brief) {
-            if ($channel = $this->channelAlias($parsed['channel'])) {
-                return $channel . '/' . $parsed['package'];
-            }
-        }
-        $upass = '';
-        if (isset($parsed['user'])) {
-            $upass = $parsed['user'];
-            if (isset($parsed['pass'])) {
-                $upass .= ':' . $parsed['pass'];
-            }
-            $upass = "$upass@";
-        }
-        $ret = 'channel://' . $upass . $parsed['channel'] . '/' . $parsed['package'];
-        if (isset($parsed['version']) || isset($parsed['state'])) {
-            $ver = isset($parsed['version']) ? $parsed['version'] : '';
-            $ver .= isset($parsed['state']) ? $parsed['state'] : '';
-            $ret .= '-' . $ver;
-        }
-        if (isset($parsed['extension'])) {
-            $ret .= '.' . $parsed['extension'];
-        }
-        if (isset($parsed['opts'])) {
-            $ret .= '?';
-            foreach ($parsed['opts'] as $name => $value) {
-                $parsed['opts'][$name] = "$name=$value";
-            }
-            $ret .= implode('&', $parsed['opts']);
-        }
-        if (isset($parsed['group'])) {
-            $ret .= '#' . $parsed['group'];
-        }
-        return $ret;
-    }
-}
-
-?>
diff --git a/PEAR/Remote.php b/PEAR/Remote.php
deleted file mode 100644
index 48b33d1..0000000
--- a/PEAR/Remote.php
+++ /dev/null
@@ -1,498 +0,0 @@
-
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Remote.php,v 1.79 2006/03/27 04:33:11 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * needed for PEAR_Error
- */
-require_once 'PEAR.php';
-require_once 'PEAR/Config.php';
-
-/**
- * This is a class for doing remote operations against the central
- * PEAR database.
- *
- * @nodep XML_RPC_Value
- * @nodep XML_RPC_Message
- * @nodep XML_RPC_Client
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Remote extends PEAR
-{
-    // {{{ properties
-
-    var $config = null;
-    var $cache  = null;
-    /**
-     * @var PEAR_Registry
-     * @access private
-     */
-    var $_registry;
-
-    // }}}
-
-    // {{{ PEAR_Remote(config_object)
-
-    function PEAR_Remote(&$config)
-    {
-        $this->PEAR();
-        $this->config = &$config;
-        $this->_registry = &$this->config->getRegistry();
-    }
-
-    // }}}
-    // {{{ setRegistry()
-    
-    function setRegistry(&$reg)
-    {
-        $this->_registry = &$reg;
-    }
-    // }}}
-    // {{{ getCache()
-
-
-    function getCache($args)
-    {
-        $id       = md5(serialize($args));
-        $cachedir = $this->config->get('cache_dir');
-        $filename = $cachedir . DIRECTORY_SEPARATOR . 'xmlrpc_cache_' . $id;
-        if (!file_exists($filename)) {
-            return null;
-        }
-
-        $fp = fopen($filename, 'rb');
-        if (!$fp) {
-            return null;
-        }
-        fclose($fp);
-        $content = file_get_contents($filename);
-        $result   = array(
-            'age'        => time() - filemtime($filename),
-            'lastChange' => filemtime($filename),
-            'content'    => unserialize($content),
-            );
-        return $result;
-    }
-
-    // }}}
-
-    // {{{ saveCache()
-
-    function saveCache($args, $data)
-    {
-        $id       = md5(serialize($args));
-        $cachedir = $this->config->get('cache_dir');
-        if (!file_exists($cachedir)) {
-            System::mkdir(array('-p', $cachedir));
-        }
-        $filename = $cachedir.'/xmlrpc_cache_'.$id;
-
-        $fp = @fopen($filename, "wb");
-        if ($fp) {
-            fwrite($fp, serialize($data));
-            fclose($fp);
-        }
-    }
-
-    // }}}
-
-    // {{{ clearCache()
-
-    function clearCache($method, $args)
-    {
-        array_unshift($args, $method);
-        array_unshift($args, $this->config->get('default_channel')); // cache by channel
-        $id       = md5(serialize($args));
-        $cachedir = $this->config->get('cache_dir');
-        $filename = $cachedir.'/xmlrpc_cache_'.$id;
-        if (file_exists($filename)) {
-            @unlink($filename);
-        }
-    }
-
-    // }}}
-    // {{{ call(method, [args...])
-
-    function call($method)
-    {
-        $_args = $args = func_get_args();
-
-        $server_channel = $this->config->get('default_channel');
-        $channel = $this->_registry->getChannel($server_channel);
-        if (!PEAR::isError($channel)) {
-            $mirror = $this->config->get('preferred_mirror');
-            if ($channel->getMirror($mirror)) {
-                if ($channel->supports('xmlrpc', $method, $mirror)) {
-                    $server_channel = $server_host = $mirror; // use the preferred mirror
-                    $server_port = $channel->getPort($mirror);
-                } elseif (!$channel->supports('xmlrpc', $method)) {
-                    return $this->raiseError("Channel $server_channel does not " .
-                        "support xml-rpc method $method");
-                }
-            }
-            if (!isset($server_host)) {
-                if (!$channel->supports('xmlrpc', $method)) {
-                    return $this->raiseError("Channel $server_channel does not support " .
-                        "xml-rpc method $method");
-                } else {
-                    $server_host = $server_channel;
-                    $server_port = $channel->getPort();
-                }
-            }
-        } else {
-            return $this->raiseError("Unknown channel '$server_channel'");
-        }
-
-        array_unshift($_args, $server_channel); // cache by channel
-        $this->cache = $this->getCache($_args);
-        $cachettl = $this->config->get('cache_ttl');
-        // If cache is newer than $cachettl seconds, we use the cache!
-        if ($this->cache !== null && $this->cache['age'] < $cachettl) {
-            return $this->cache['content'];
-        }
-        $fp = false;
-        if (extension_loaded("xmlrpc")) {
-            $result = call_user_func_array(array(&$this, 'call_epi'), $args);
-            if (!PEAR::isError($result)) {
-                $this->saveCache($_args, $result);
-            }
-            return $result;
-        } elseif (!($fp = fopen('XML/RPC.php', 'r', true))) {
-            return $this->raiseError("For this remote PEAR operation you need to load the xmlrpc extension or install XML_RPC");
-        }
-        include_once 'XML/RPC.php';
-        if ($fp) {
-            fclose($fp);
-        }
-
-        array_shift($args);
-        $username = $this->config->get('username');
-        $password = $this->config->get('password');
-        $eargs = array();
-        foreach($args as $arg) {
-            $eargs[] = $this->_encode($arg);
-        }
-        $f = new XML_RPC_Message($method, $eargs);
-        if ($this->cache !== null) {
-            $maxAge = '?maxAge='.$this->cache['lastChange'];
-        } else {
-            $maxAge = '';
-        }
-        $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
-        if ($proxy = parse_url($this->config->get('http_proxy'))) {
-            $proxy_host = isset($proxy['host']) ? $proxy['host'] : null;
-            if (isset($proxy['scheme']) && $proxy['scheme'] == 'https') {
-                $proxy_host = 'https://' . $proxy_host;
-            }
-            $proxy_port = isset($proxy['port']) ? $proxy['port'] : 8080;
-            $proxy_user = isset($proxy['user']) ? urldecode($proxy['user']) : null;
-            $proxy_pass = isset($proxy['pass']) ? urldecode($proxy['pass']) : null;
-        }
-        $shost = $server_host;
-        if ($channel->getSSL()) {
-            $shost = "https://$shost";
-        }
-        $c = new XML_RPC_Client('/' . $channel->getPath('xmlrpc')
-            . $maxAge, $shost, $server_port, $proxy_host, $proxy_port,
-            $proxy_user, $proxy_pass);
-        if ($username && $password) {
-            $c->setCredentials($username, $password);
-        }
-        if ($this->config->get('verbose') >= 3) {
-            $c->setDebug(1);
-        }
-        $r = $c->send($f);
-        if (!$r) {
-            return $this->raiseError("XML_RPC send failed");
-        }
-        $v = $r->value();
-        if ($e = $r->faultCode()) {
-            if ($e == $GLOBALS['XML_RPC_err']['http_error'] && strstr($r->faultString(), '304 Not Modified') !== false) {
-                return $this->cache['content'];
-            }
-            return $this->raiseError($r->faultString(), $e);
-        }
-
-        $result = XML_RPC_decode($v);
-        $this->saveCache($_args, $result);
-        return $result;
-    }
-
-    // }}}
-
-    // {{{ call_epi(method, [args...])
-
-    function call_epi($method)
-    {
-        if (!extension_loaded("xmlrpc")) {
-            return $this->raiseError("xmlrpc extension is not loaded");
-        }
-        $server_channel = $this->config->get('default_channel');
-        $channel = $this->_registry->getChannel($server_channel);
-        if (!PEAR::isError($channel)) {
-            $mirror = $this->config->get('preferred_mirror');
-            if ($channel->getMirror($mirror)) {
-                if ($channel->supports('xmlrpc', $method, $mirror)) {
-                    $server_channel = $server_host = $mirror; // use the preferred mirror
-                    $server_port = $channel->getPort($mirror);
-                } elseif (!$channel->supports('xmlrpc', $method)) {
-                    return $this->raiseError("Channel $server_channel does not " .
-                        "support xml-rpc method $method");
-                }
-            }
-            if (!isset($server_host)) {
-                if (!$channel->supports('xmlrpc', $method)) {
-                    return $this->raiseError("Channel $server_channel does not support " .
-                        "xml-rpc method $method");
-                } else {
-                    $server_host = $server_channel;
-                    $server_port = $channel->getPort();
-                }
-            }
-        } else {
-            return $this->raiseError("Unknown channel '$server_channel'");
-        }
-        $params = func_get_args();
-        array_shift($params);
-        $method = str_replace("_", ".", $method);
-        $request = xmlrpc_encode_request($method, $params);
-        if ($http_proxy = $this->config->get('http_proxy')) {
-            $proxy = parse_url($http_proxy);
-            $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
-            $proxy_host = isset($proxy['host']) ? $proxy['host'] : null;
-            if (isset($proxy['scheme']) && $proxy['scheme'] == 'https') {
-                $proxy_host = 'https://' . $proxy_host;
-            }
-            $proxy_port = isset($proxy['port']) ? $proxy['port'] : null;
-            $proxy_user = isset($proxy['user']) ? urldecode($proxy['user']) : null;
-            $proxy_pass = isset($proxy['pass']) ? urldecode($proxy['pass']) : null;
-            $fp = @fsockopen($proxy_host, $proxy_port);
-            $use_proxy = true;
-            if ($channel->getSSL()) {
-                $server_host = "https://$server_host";
-            }
-        } else {
-            $use_proxy = false;
-            $ssl = $channel->getSSL();
-            $fp = @fsockopen(($ssl ? 'ssl://' : '') . $server_host, $server_port);
-            if (!$fp) {
-                $server_host = "$ssl$server_host"; // for error-reporting
-            }
-        }
-        if (!$fp && $http_proxy) {
-            return $this->raiseError("PEAR_Remote::call: fsockopen(`$proxy_host', $proxy_port) failed");
-        } elseif (!$fp) {
-            return $this->raiseError("PEAR_Remote::call: fsockopen(`$server_host', $server_port) failed");
-        }
-        $len = strlen($request);
-        $req_headers = "Host: $server_host:$server_port\r\n" .
-             "Content-type: text/xml\r\n" .
-             "Content-length: $len\r\n";
-        $username = $this->config->get('username');
-        $password = $this->config->get('password');
-        if ($username && $password) {
-            $req_headers .= "Cookie: PEAR_USER=$username; PEAR_PW=$password\r\n";
-            $tmp = base64_encode("$username:$password");
-            $req_headers .= "Authorization: Basic $tmp\r\n";
-        }
-        if ($this->cache !== null) {
-            $maxAge = '?maxAge='.$this->cache['lastChange'];
-        } else {
-            $maxAge = '';
-        }
-
-        if ($use_proxy && $proxy_host != '' && $proxy_user != '') {
-            $req_headers .= 'Proxy-Authorization: Basic '
-                .base64_encode($proxy_user.':'.$proxy_pass)
-                ."\r\n";
-        }
-
-        if ($this->config->get('verbose') > 3) {
-            print "XMLRPC REQUEST HEADERS:\n";
-            var_dump($req_headers);
-            print "XMLRPC REQUEST BODY:\n";
-            var_dump($request);
-        }
-
-        if ($use_proxy && $proxy_host != '') {
-            $post_string = "POST http://".$server_host;
-            if ($proxy_port > '') {
-                $post_string .= ':'.$server_port;
-            }
-        } else {
-            $post_string = "POST ";
-        }
-
-        $path = '/' . $channel->getPath('xmlrpc');
-        fwrite($fp, ($post_string . $path . "$maxAge HTTP/1.0\r\n$req_headers\r\n$request"));
-        $response = '';
-        $line1 = fgets($fp, 2048);
-        if (!preg_match('!^HTTP/[0-9\.]+ (\d+) (.*)!', $line1, $matches)) {
-            return $this->raiseError("PEAR_Remote: invalid HTTP response from XML-RPC server");
-        }
-        switch ($matches[1]) {
-            case "200": // OK
-                break;
-            case "304": // Not Modified
-                return $this->cache['content'];
-            case "401": // Unauthorized
-                if ($username && $password) {
-                    return $this->raiseError("PEAR_Remote ($server_host:$server_port) " .
-                        ": authorization failed", 401);
-                } else {
-                    return $this->raiseError("PEAR_Remote ($server_host:$server_port) " .
-                        ": authorization required, please log in first", 401);
-                }
-            default:
-                return $this->raiseError("PEAR_Remote ($server_host:$server_port) : " .
-                    "unexpected HTTP response", (int)$matches[1], null, null,
-                    "$matches[1] $matches[2]");
-        }
-        while (trim(fgets($fp, 2048)) != ''); // skip rest of headers
-        while ($chunk = fread($fp, 10240)) {
-            $response .= $chunk;
-        }
-        fclose($fp);
-        if ($this->config->get('verbose') > 3) {
-            print "XMLRPC RESPONSE:\n";
-            var_dump($response);
-        }
-        $ret = xmlrpc_decode($response);
-        if (is_array($ret) && isset($ret['__PEAR_TYPE__'])) {
-            if ($ret['__PEAR_TYPE__'] == 'error') {
-                if (isset($ret['__PEAR_CLASS__'])) {
-                    $class = $ret['__PEAR_CLASS__'];
-                } else {
-                    $class = "PEAR_Error";
-                }
-                if ($ret['code']     === '') $ret['code']     = null;
-                if ($ret['message']  === '') $ret['message']  = null;
-                if ($ret['userinfo'] === '') $ret['userinfo'] = null;
-                if (strtolower($class) == 'db_error') {
-                    $ret = $this->raiseError(PEAR::errorMessage($ret['code']),
-                                             $ret['code'], null, null,
-                                             $ret['userinfo']);
-                } else {
-                    $ret = $this->raiseError($ret['message'], $ret['code'],
-                                             null, null, $ret['userinfo']);
-                }
-            }
-        } elseif (is_array($ret) && sizeof($ret) == 1 && isset($ret[0])
-                  && is_array($ret[0]) &&
-                  !empty($ret[0]['faultString']) &&
-                  !empty($ret[0]['faultCode'])) {
-            extract($ret[0]);
-            $faultString = "XML-RPC Server Fault: " .
-                 str_replace("\n", " ", $faultString);
-            return $this->raiseError($faultString, $faultCode);
-        } elseif (is_array($ret) && sizeof($ret) == 2 && !empty($ret['faultString']) &&
-              !empty($ret['faultCode'])) {
-            extract($ret);
-            $faultString = "XML-RPC Server Fault: " .
-                 str_replace("\n", " ", $faultString);
-            return $this->raiseError($faultString, $faultCode);
-        }
-        return $ret;
-    }
-
-    // }}}
-
-    // {{{ _encode
-
-    // a slightly extended version of XML_RPC_encode
-    function _encode($php_val)
-    {
-        global $XML_RPC_Boolean, $XML_RPC_Int, $XML_RPC_Double;
-        global $XML_RPC_String, $XML_RPC_Array, $XML_RPC_Struct;
-
-        $type = gettype($php_val);
-        $xmlrpcval = new XML_RPC_Value;
-
-        switch($type) {
-            case "array":
-                reset($php_val);
-                $firstkey = key($php_val);
-                end($php_val);
-                $lastkey = key($php_val);
-                reset($php_val);
-                if ($firstkey === 0 && is_int($lastkey) &&
-                    ($lastkey + 1) == count($php_val)) {
-                    $is_continuous = true;
-                    reset($php_val);
-                    $size = count($php_val);
-                    for ($expect = 0; $expect < $size; $expect++, next($php_val)) {
-                        if (key($php_val) !== $expect) {
-                            $is_continuous = false;
-                            break;
-                        }
-                    }
-                    if ($is_continuous) {
-                        reset($php_val);
-                        $arr = array();
-                        while (list($k, $v) = each($php_val)) {
-                            $arr[$k] = $this->_encode($v);
-                        }
-                        $xmlrpcval->addArray($arr);
-                        break;
-                    }
-                }
-                // fall though if not numerical and continuous
-            case "object":
-                $arr = array();
-                while (list($k, $v) = each($php_val)) {
-                    $arr[$k] = $this->_encode($v);
-                }
-                $xmlrpcval->addStruct($arr);
-                break;
-            case "integer":
-                $xmlrpcval->addScalar($php_val, $XML_RPC_Int);
-                break;
-            case "double":
-                $xmlrpcval->addScalar($php_val, $XML_RPC_Double);
-                break;
-            case "string":
-            case "NULL":
-                $xmlrpcval->addScalar($php_val, $XML_RPC_String);
-                break;
-            case "boolean":
-                $xmlrpcval->addScalar($php_val, $XML_RPC_Boolean);
-                break;
-            case "unknown type":
-            default:
-                return null;
-        }
-        return $xmlrpcval;
-    }
-
-    // }}}
-
-}
-
-?>
diff --git a/PEAR/RunTest.php b/PEAR/RunTest.php
deleted file mode 100644
index 63fc4cd..0000000
--- a/PEAR/RunTest.php
+++ /dev/null
@@ -1,447 +0,0 @@
-
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: RunTest.php,v 1.23 2006/03/28 05:33:42 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.3.3
- */
-
-/**
- * for error handling
- */
-require_once 'PEAR.php';
-require_once 'PEAR/Config.php';
-
-define('DETAILED', 1);
-putenv("PHP_PEAR_RUNTESTS=1");
-
-/**
- * Simplified version of PHP's test suite
- *
- * Try it with:
- *
- * $ php -r 'include "../PEAR/RunTest.php"; $t=new PEAR_RunTest; $o=$t->run("./pear_system.phpt");print_r($o);'
- *
- *
- * @category   pear
- * @package    PEAR
- * @author     Tomas V.V.Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.3.3
- */
-class PEAR_RunTest
-{
-    var $_logger;
-    var $_options;
-
-    /**
-     * An object that supports the PEAR_Common->log() signature, or null
-     * @param PEAR_Common|null
-     */
-    function PEAR_RunTest($logger = null, $options = array())
-    {
-        if (is_null($logger)) {
-            require_once 'PEAR/Common.php';
-            $logger = new PEAR_Common;
-        }
-        $this->_logger = $logger;
-        $this->_options = $options;
-    }
-
-    //
-    //  Run an individual test case.
-    //
-
-    function run($file, $ini_settings = '')
-    {
-        $cwd = getcwd();
-        $conf = &PEAR_Config::singleton();
-        $php = $conf->get('php_bin');
-        if (isset($this->_options['phpunit'])) {
-            $cmd = "$php$ini_settings -f $file";
-            if (isset($this->_logger)) {
-                $this->_logger->log(2, 'Running command "' . $cmd . '"');
-            }
-    
-            $savedir = getcwd(); // in case the test moves us around
-            chdir(dirname($file));
-            echo `$cmd`;
-            chdir($savedir);
-            return 'PASSED'; // we have no way of knowing this information so assume passing
-        }
-        //var_dump($php);exit;
-        global $log_format, $info_params, $ini_overwrites;
-
-        $info_params = '';
-        $log_format = 'LEOD';
-
-        // Load the sections of the test file.
-        $section_text = array(
-            'TEST'    => '(unnamed test)',
-            'SKIPIF'  => '',
-            'GET'     => '',
-            'ARGS'    => '',
-            'CLEAN'   => '',
-        );
-
-        $file = realpath($file);
-        if (!is_file($file) || !$fp = fopen($file, "r")) {
-            return PEAR::raiseError("Cannot open test file: $file");
-        }
-
-        $section = '';
-        while (!feof($fp)) {
-            $line = fgets($fp);
-
-            // Match the beginning of a section.
-            if (ereg('^--([A-Z]+)--',$line,$r)) {
-                $section = $r[1];
-                $section_text[$section] = '';
-                continue;
-            } elseif (empty($section)) {
-                fclose($fp);
-                return PEAR::raiseError("Invalid sections formats in test file: $file");
-			}
-
-            // Add to the section text.
-            $section_text[$section] .= $line;
-        }
-        fclose($fp);
-
-        $shortname = str_replace($cwd . DIRECTORY_SEPARATOR, '', $file);
-        if (!isset($this->_options['simple'])) {
-            $tested = trim($section_text['TEST']) . "[$shortname]";
-        } else {
-            $tested = trim($section_text['TEST']) . ' ';
-        }
-
-        $tmp = realpath(dirname($file));
-        $tmp_skipif = $tmp . uniqid('/phpt.');
-        $tmp_file   = ereg_replace('\.phpt$','.php',$file);
-        $tmp_post   = $tmp . uniqid('/phpt.');
-
-        if (file_exists($tmp_skipif)) {
-            unlink($tmp_skipif);
-        }
-        if (file_exists($tmp_file)) {
-            unlink($tmp_file);
-        }
-        if (file_exists($tmp_post)) {
-            unlink($tmp_post);
-        }
-
-        // unlink old test results
-        if (file_exists(ereg_replace('\.phpt$','.diff',$file))) {
-            unlink(ereg_replace('\.phpt$','.diff',$file));
-        }
-        if (file_exists(ereg_replace('\.phpt$','.log',$file))) {
-            unlink(ereg_replace('\.phpt$','.log',$file));
-        }
-        if (file_exists(ereg_replace('\.phpt$','.exp',$file))) {
-            unlink(ereg_replace('\.phpt$','.exp',$file));
-        }
-        if (file_exists(ereg_replace('\.phpt$','.out',$file))) {
-            unlink(ereg_replace('\.phpt$','.out',$file));
-        }
-
-        // Check if test should be skipped.
-        $info = '';
-        $warn = false;
-        if (array_key_exists('SKIPIF', $section_text)) {
-            if (trim($section_text['SKIPIF'])) {
-                $this->save_text($tmp_skipif, $section_text['SKIPIF']);
-                //$extra = substr(PHP_OS, 0, 3) !== "WIN" ?
-                //    "unset REQUEST_METHOD;": "";
-
-                //$output = `$extra $php $info_params -f $tmp_skipif`;
-                $output = `$php $info_params -f $tmp_skipif`;
-                unlink($tmp_skipif);
-                if (eregi("^skip", trim($output))) {
-                    $skipreason = "SKIP $tested";
-                    $reason = (eregi("^skip[[:space:]]*(.+)\$", trim($output))) ? eregi_replace("^skip[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
-                    if ($reason) {
-                        $skipreason .= " (reason: $reason)";
-                    }
-                    if (!isset($this->_options['quiet'])) {
-                        $this->_logger->log(0, $skipreason);
-                    }
-                    if (isset($old_php)) {
-                        $php = $old_php;
-                    }
-                    if (isset($this->_options['tapoutput'])) {
-                        return array('ok', ' # skip ' . $reason);
-                    }
-                    return 'SKIPPED';
-                }
-                if (eregi("^info", trim($output))) {
-                    $reason = (ereg("^info[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^info[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
-                    if ($reason) {
-                        $info = " (info: $reason)";
-                    }
-                }
-                if (eregi("^warn", trim($output))) {
-                    $reason = (ereg("^warn[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^warn[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
-                    if ($reason) {
-                        $warn = true; /* only if there is a reason */
-                        $info = " (warn: $reason)";
-                    }
-                }
-            }
-        }
-
-        // We've satisfied the preconditions - run the test!
-        $this->save_text($tmp_file,$section_text['FILE']);
-
-        $args = $section_text['ARGS'] ? ' -- '.$section_text['ARGS'] : '';
-
-        $cmd = "$php$ini_settings -f $tmp_file$args 2>&1";
-        if (isset($this->_logger)) {
-            $this->_logger->log(2, 'Running command "' . $cmd . '"');
-        }
-
-        $savedir = getcwd(); // in case the test moves us around
-        if (isset($section_text['RETURNS'])) {
-            ob_start();
-            system($cmd, $return_value);
-            $out = ob_get_contents();
-            ob_end_clean();
-            if (file_exists($tmp_post)) {
-                unlink($tmp_post);
-            }
-            $section_text['RETURNS'] = (int) trim($section_text['RETURNS']);
-            $returnfail = ($return_value != $section_text['RETURNS']);
-        } else {
-            $out = `$cmd`;
-            $returnfail = false;
-        }
-        chdir($savedir);
-
-        if ($section_text['CLEAN']) {
-            // perform test cleanup
-            $this->save_text($clean = $tmp . uniqid('/phpt.'), $section_text['CLEAN']);
-            `$php $clean`;
-            if (file_exists($clean)) {
-                unlink($clean);
-            }
-        }
-        // Does the output match what is expected?
-        $output = trim($out);
-        $output = preg_replace('/\r\n/', "\n", $output);
-
-        if (isset($section_text['EXPECTF']) || isset($section_text['EXPECTREGEX'])) {
-            if (isset($section_text['EXPECTF'])) {
-                $wanted = trim($section_text['EXPECTF']);
-            } else {
-                $wanted = trim($section_text['EXPECTREGEX']);
-            }
-            $wanted_re = preg_replace('/\r\n/',"\n",$wanted);
-            if (isset($section_text['EXPECTF'])) {
-                $wanted_re = preg_quote($wanted_re, '/');
-                // Stick to basics
-                $wanted_re = str_replace("%s", ".+?", $wanted_re); //not greedy
-                $wanted_re = str_replace("%i", "[+\-]?[0-9]+", $wanted_re);
-                $wanted_re = str_replace("%d", "[0-9]+", $wanted_re);
-                $wanted_re = str_replace("%x", "[0-9a-fA-F]+", $wanted_re);
-                $wanted_re = str_replace("%f", "[+\-]?\.?[0-9]+\.?[0-9]*(E-?[0-9]+)?", $wanted_re);
-                $wanted_re = str_replace("%c", ".", $wanted_re);
-                // %f allows two points "-.0.0" but that is the best *simple* expression
-            }
-    /* DEBUG YOUR REGEX HERE
-            var_dump($wanted_re);
-            print(str_repeat('=', 80) . "\n");
-            var_dump($output);
-    */
-            if (!$returnfail && preg_match("/^$wanted_re\$/s", $output)) {
-                if (file_exists($tmp_file)) {
-                    unlink($tmp_file);
-                }
-                if (!isset($this->_options['quiet'])) {
-                    $this->_logger->log(0, "PASS $tested$info");
-                }
-                if (isset($old_php)) {
-                    $php = $old_php;
-                }
-                if (isset($this->_options['tapoutput'])) {
-                    return array('ok', ' - ' . $tested);
-                }
-                return 'PASSED';
-            }
-
-        } else {
-            $wanted = trim($section_text['EXPECT']);
-            $wanted = preg_replace('/\r\n/',"\n",$wanted);
-        // compare and leave on success
-            $ok = (0 == strcmp($output,$wanted));
-            if (!$returnfail && $ok) {
-                if (file_exists($tmp_file)) {
-                    unlink($tmp_file);
-                }
-                if (!isset($this->_options['quiet'])) {
-                    $this->_logger->log(0, "PASS $tested$info");
-                }
-                if (isset($old_php)) {
-                    $php = $old_php;
-                }
-                if (isset($this->_options['tapoutput'])) {
-                    return array('ok', ' - ' . $tested);
-                }
-                return 'PASSED';
-            }
-        }
-
-        // Test failed so we need to report details.
-        if ($warn) {
-            $this->_logger->log(0, "WARN $tested$info");
-        } else {
-            $this->_logger->log(0, "FAIL $tested$info");
-        }
-
-        if (isset($section_text['RETURNS'])) {
-            $GLOBALS['__PHP_FAILED_TESTS__'][] = array(
-                            'name' => $file,
-                            'test_name' => $tested,
-                            'output' => ereg_replace('\.phpt$','.log', $file),
-                            'diff'   => ereg_replace('\.phpt$','.diff', $file),
-                            'info'   => $info,
-                            'return' => $return_value
-                            );
-        } else {
-            $GLOBALS['__PHP_FAILED_TESTS__'][] = array(
-                            'name' => $file,
-                            'test_name' => $tested,
-                            'output' => ereg_replace('\.phpt$','.log', $file),
-                            'diff'   => ereg_replace('\.phpt$','.diff', $file),
-                            'info'   => $info,
-                            );
-        }
-
-        // write .exp
-        if (strpos($log_format,'E') !== FALSE) {
-            $logname = ereg_replace('\.phpt$','.exp',$file);
-            if (!$log = fopen($logname,'w')) {
-                return PEAR::raiseError("Cannot create test log - $logname");
-            }
-            fwrite($log,$wanted);
-            fclose($log);
-        }
-
-        // write .out
-        if (strpos($log_format,'O') !== FALSE) {
-            $logname = ereg_replace('\.phpt$','.out',$file);
-            if (!$log = fopen($logname,'w')) {
-                return PEAR::raiseError("Cannot create test log - $logname");
-            }
-            fwrite($log,$output);
-            fclose($log);
-        }
-
-        // write .diff
-        if (strpos($log_format,'D') !== FALSE) {
-            $logname = ereg_replace('\.phpt$','.diff',$file);
-            if (!$log = fopen($logname,'w')) {
-                return PEAR::raiseError("Cannot create test log - $logname");
-            }
-            fwrite($log, $this->generate_diff($wanted, $output,
-                isset($section_text['RETURNS']) ? array(trim($section_text['RETURNS']),
-                    $return_value) : null));
-            fclose($log);
-        }
-
-        // write .log
-        if (strpos($log_format,'L') !== FALSE) {
-            $logname = ereg_replace('\.phpt$','.log',$file);
-            if (!$log = fopen($logname,'w')) {
-                return PEAR::raiseError("Cannot create test log - $logname");
-            }
-            fwrite($log,"
----- EXPECTED OUTPUT
-$wanted
----- ACTUAL OUTPUT
-$output
----- FAILED
-");
-            if ($returnfail) {
-                fwrite($log,"
----- EXPECTED RETURN
-$section_text[RETURNS]
----- ACTUAL RETURN
-$return_value
-");
-            }
-            fclose($log);
-            //error_report($file,$logname,$tested);
-        }
-
-        if (isset($old_php)) {
-            $php = $old_php;
-        }
-
-        if (isset($this->_options['tapoutput'])) {
-            $wanted = explode("\n", $wanted);
-            $wanted = "# Expected output:\n#\n#" . implode("\n#", $wanted);
-            $output = explode("\n", $output);
-            $output = "#\n#\n# Actual output:\n#\n#" . implode("\n#", $output);
-            return array($wanted . $output . 'not ok', ' - ' . $tested);
-        }
-        return $warn ? 'WARNED' : 'FAILED';
-    }
-
-    function generate_diff($wanted, $output, $return_value)
-    {
-        $w = explode("\n", $wanted);
-        $o = explode("\n", $output);
-        $w1 = array_diff_assoc($w,$o);
-        $o1 = array_diff_assoc($o,$w);
-        $w2 = array();
-        $o2 = array();
-        foreach($w1 as $idx => $val) $w2[sprintf("%03d<",$idx)] = sprintf("%03d- ", $idx+1).$val;
-        foreach($o1 as $idx => $val) $o2[sprintf("%03d>",$idx)] = sprintf("%03d+ ", $idx+1).$val;
-        $diff = array_merge($w2, $o2);
-        ksort($diff);
-        if ($return_value) {
-            $extra = "##EXPECTED: $return_value[0]\r\n##RETURNED: $return_value[1]";
-        } else {
-            $extra = '';
-        }
-        return implode("\r\n", $diff) . $extra;
-    }
-
-    //
-    //  Write the given text to a temporary file, and return the filename.
-    //
-
-    function save_text($filename, $text)
-    {
-        if (!$fp = fopen($filename, 'w')) {
-            return PEAR::raiseError("Cannot open file '" . $filename . "' (save_text)");
-        }
-        fwrite($fp,$text);
-        fclose($fp);
-    if (1 < DETAILED) echo "
-FILE $filename {{{
-$text
-}}}
-";
-    }
-
-}
-?>
diff --git a/PEAR/Task/Common.php b/PEAR/Task/Common.php
deleted file mode 100644
index bb92adb..0000000
--- a/PEAR/Task/Common.php
+++ /dev/null
@@ -1,208 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Common.php,v 1.15 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**#@+
- * Error codes for task validation routines
- */
-define('PEAR_TASK_ERROR_NOATTRIBS', 1);
-define('PEAR_TASK_ERROR_MISSING_ATTRIB', 2);
-define('PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE', 3);
-define('PEAR_TASK_ERROR_INVALID', 4);
-/**#@-*/
-define('PEAR_TASK_PACKAGE', 1);
-define('PEAR_TASK_INSTALL', 2);
-define('PEAR_TASK_PACKAGEANDINSTALL', 3);
-/**
- * A task is an operation that manipulates the contents of a file.
- *
- * Simple tasks operate on 1 file.  Multiple tasks are executed after all files have been
- * processed and installed, and are designed to operate on all files containing the task.
- * The Post-install script task simply takes advantage of the fact that it will be run
- * after installation, replace is a simple task.
- *
- * Combining tasks is possible, but ordering is significant.
- *
- * 
- *  
- *  
- * 
- *
- * This will first replace any instance of @data-dir@ in the test.php file
- * with the path to the current data directory.  Then, it will include the
- * test.php file and run the script it contains to configure the package post-installation.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- * @abstract
- */
-class PEAR_Task_Common
-{
-    /**
-     * Valid types for this version are 'simple' and 'multiple'
-     *
-     * - simple tasks operate on the contents of a file and write out changes to disk
-     * - multiple tasks operate on the contents of many files and write out the
-     *   changes directly to disk
-     *
-     * Child task classes must override this property.
-     * @access protected
-     */
-    var $type = 'simple';
-    /**
-     * Determines which install phase this task is executed under
-     */
-    var $phase = PEAR_TASK_INSTALL;
-    /**
-     * @access protected
-     */
-    var $config;
-    /**
-     * @access protected
-     */
-    var $registry;
-    /**
-     * @access protected
-     */
-    var $logger;
-    /**
-     * @access protected
-     */
-    var $installphase;
-    /**
-     * @param PEAR_Config
-     * @param PEAR_Common
-     */
-    function PEAR_Task_Common(&$config, &$logger, $phase)
-    {
-        $this->config = &$config;
-        $this->registry = &$config->getRegistry();
-        $this->logger = &$logger;
-        $this->installphase = $phase;
-        if ($this->type == 'multiple') {
-            $GLOBALS['_PEAR_TASK_POSTINSTANCES'][get_class($this)][] = &$this;
-        }
-    }
-
-    /**
-     * Validate the basic contents of a task tag.
-     * @param PEAR_PackageFile_v2
-     * @param array
-     * @param PEAR_Config
-     * @param array the entire parsed  tag
-     * @return true|array On error, return an array in format:
-     *    array(PEAR_TASK_ERROR_???[, param1][, param2][, ...])
-     *
-     *    For PEAR_TASK_ERROR_MISSING_ATTRIB, pass the attribute name in
-     *    For PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, pass the attribute name and an array
-     *    of legal values in
-     * @static
-     * @abstract
-     */
-    function validXml($pkg, $xml, &$config, $fileXml)
-    {
-    }
-
-    /**
-     * Initialize a task instance with the parameters
-     * @param array raw, parsed xml
-     * @param array attributes from the  tag containing this task
-     * @param string|null last installed version of this package
-     * @abstract
-     */
-    function init($xml, $fileAttributes, $lastVersion)
-    {
-    }
-
-    /**
-     * Begin a task processing session.  All multiple tasks will be processed after each file
-     * has been successfully installed, all simple tasks should perform their task here and
-     * return any errors using the custom throwError() method to allow forward compatibility
-     *
-     * This method MUST NOT write out any changes to disk
-     * @param PEAR_PackageFile_v2
-     * @param string file contents
-     * @param string the eventual final file location (informational only)
-     * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError), otherwise return the new contents
-     * @abstract
-     */
-    function startSession($pkg, $contents, $dest)
-    {
-    }
-
-    /**
-     * This method is used to process each of the tasks for a particular multiple class
-     * type.  Simple tasks need not implement this method.
-     * @param array an array of tasks
-     * @access protected
-     * @static
-     * @abstract
-     */
-    function run($tasks)
-    {
-    }
-
-    /**
-     * @static
-     * @final
-     */
-    function hasPostinstallTasks()
-    {
-        return isset($GLOBALS['_PEAR_TASK_POSTINSTANCES']);
-    }
-
-    /**
-     * @static
-     * @final
-     */
-     function runPostinstallTasks()
-     {
-         foreach ($GLOBALS['_PEAR_TASK_POSTINSTANCES'] as $class => $tasks) {
-             $err = call_user_func(array($class, 'run'),
-                  $GLOBALS['_PEAR_TASK_POSTINSTANCES'][$class]);
-             if ($err) {
-                 return PEAR_Task_Common::throwError($err);
-             }
-         }
-         unset($GLOBALS['_PEAR_TASK_POSTINSTANCES']);
-    }
-
-    /**
-     * Determines whether a role is a script
-     * @return bool
-     */
-    function isScript()
-    {
-        return $this->type == 'script';
-    }
-
-    function throwError($msg, $code = -1)
-    {
-        include_once 'PEAR.php';
-        return PEAR::raiseError($msg, $code);
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Task/Postinstallscript.php b/PEAR/Task/Postinstallscript.php
deleted file mode 100644
index d32473e..0000000
--- a/PEAR/Task/Postinstallscript.php
+++ /dev/null
@@ -1,329 +0,0 @@
-
- *
- * 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 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Postinstallscript.php,v 1.18 2006/02/08 01:21:47 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Common.php';
-/**
- * Implements the postinstallscript file task.
- *
- * Note that post-install scripts are handled separately from installation, by the
- * "pear run-scripts" command
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Task_Postinstallscript extends PEAR_Task_Common
-{
-    var $type = 'script';
-    var $_class;
-    var $_params;
-    var $_obj;
-    /**
-     *
-     * @var PEAR_PackageFile_v2
-     */
-    var $_pkg;
-    var $_contents;
-    var $phase = PEAR_TASK_INSTALL;
-
-    /**
-     * Validate the raw xml at parsing-time.
-     *
-     * This also attempts to validate the script to make sure it meets the criteria
-     * for a post-install script
-     * @param PEAR_PackageFile_v2
-     * @param array The XML contents of the  tag
-     * @param PEAR_Config
-     * @param array the entire parsed  tag
-     * @static
-     */
-    function validateXml($pkg, $xml, &$config, $fileXml)
-    {
-        if ($fileXml['role'] != 'php') {
-            return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-            $fileXml['name'] . '" must be role="php"');
-        }
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $file = $pkg->getFileContents($fileXml['name']);
-        if (PEAR::isError($file)) {
-            PEAR::popErrorHandling();
-            return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                $fileXml['name'] . '" is not valid: ' .
-                $file->getMessage());
-        } elseif ($file === null) {
-            return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                $fileXml['name'] . '" could not be retrieved for processing!');
-        } else {
-            $analysis = $pkg->analyzeSourceCode($file, true);
-            if (!$analysis) {
-                PEAR::popErrorHandling();
-                $warnings = '';
-                foreach ($pkg->getValidationWarnings() as $warn) {
-                    $warnings .= $warn['message'] . "\n";
-                }
-                return array(PEAR_TASK_ERROR_INVALID, 'Analysis of post-install script "' .
-                    $fileXml['name'] . '" failed: ' . $warnings);
-            }
-            if (count($analysis['declared_classes']) != 1) {
-                PEAR::popErrorHandling();
-                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                    $fileXml['name'] . '" must declare exactly 1 class');
-            }
-            $class = $analysis['declared_classes'][0];
-            if ($class != str_replace(array('/', '.php'), array('_', ''),
-                  $fileXml['name']) . '_postinstall') {
-                PEAR::popErrorHandling();
-                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                    $fileXml['name'] . '" class "' . $class . '" must be named "' .
-                    str_replace(array('/', '.php'), array('_', ''),
-                    $fileXml['name']) . '_postinstall"');
-            }
-            if (!isset($analysis['declared_methods'][$class])) {
-                PEAR::popErrorHandling();
-                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                    $fileXml['name'] . '" must declare methods init() and run()');
-            }
-            $methods = array('init' => 0, 'run' => 1);
-            foreach ($analysis['declared_methods'][$class] as $method) {
-                if (isset($methods[$method])) {
-                    unset($methods[$method]);
-                }
-            }
-            if (count($methods)) {
-                PEAR::popErrorHandling();
-                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                    $fileXml['name'] . '" must declare methods init() and run()');
-            }
-        }
-        PEAR::popErrorHandling();
-        $definedparams = array();
-        $tasksNamespace = $pkg->getTasksNs() . ':';
-        if (!isset($xml[$tasksNamespace . 'paramgroup']) && isset($xml['paramgroup'])) {
-            // in order to support the older betas, which did not expect internal tags
-            // to also use the namespace
-            $tasksNamespace = '';
-        }
-        if (isset($xml[$tasksNamespace . 'paramgroup'])) {
-            $params = $xml[$tasksNamespace . 'paramgroup'];
-            if (!is_array($params) || !isset($params[0])) {
-                $params = array($params);
-            }
-            foreach ($params as $param) {
-                if (!isset($param[$tasksNamespace . 'id'])) {
-                    return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                        $fileXml['name'] . '"  must have ' .
-                        'an ' . $tasksNamespace . 'id> tag');
-                }
-                if (isset($param[$tasksNamespace . 'name'])) {
-                    if (!in_array($param[$tasksNamespace . 'name'], $definedparams)) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" parameter "' . $param[$tasksNamespace . 'name'] .
-                            '" has not been previously defined');
-                    }
-                    if (!isset($param[$tasksNamespace . 'conditiontype'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace . 
-                            'conditiontype> tag containing either "=", ' .
-                            '"!=", or "preg_match"');
-                    }
-                    if (!in_array($param[$tasksNamespace . 'conditiontype'],
-                          array('=', '!=', 'preg_match'))) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace .
-                            'conditiontype> tag containing either "=", ' .
-                            '"!=", or "preg_match"');
-                    }
-                    if (!isset($param[$tasksNamespace . 'value'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace .
-                            'value> tag containing expected parameter value');
-                    }
-                }
-                if (isset($param[$tasksNamespace . 'instructions'])) {
-                    if (!is_string($param[$tasksNamespace . 'instructions'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" ' . $tasksNamespace . 'instructions> must be simple text');
-                    }
-                }
-                if (!isset($param[$tasksNamespace . 'param'])) {
-                    continue; //  is no longer required
-                }
-                $subparams = $param[$tasksNamespace . 'param'];
-                if (!is_array($subparams) || !isset($subparams[0])) {
-                    $subparams = array($subparams);
-                }
-                foreach ($subparams as $subparam) {
-                    if (!isset($subparam[$tasksNamespace . 'name'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" parameter for ' .
-                            $tasksNamespace . 'paramgroup> id "' .
-                            $param[$tasksNamespace . 'id'] . '" must have ' .
-                            'a ' . $tasksNamespace . 'name> tag');
-                    }
-                    if (!preg_match('/[a-zA-Z0-9]+/',
-                          $subparam[$tasksNamespace . 'name'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" parameter "' .
-                            $subparam[$tasksNamespace . 'name'] .
-                            '" for ' . $tasksNamespace . 'paramgroup> id "' .
-                            $param[$tasksNamespace . 'id'] .
-                            '" is not a valid name.  Must contain only alphanumeric characters');
-                    }
-                    if (!isset($subparam[$tasksNamespace . 'prompt'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" parameter "' .
-                            $subparam[$tasksNamespace . 'name'] .
-                            '" for ' . $tasksNamespace . 'paramgroup> id "' .
-                            $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace . 'prompt> tag');
-                    }
-                    if (!isset($subparam[$tasksNamespace . 'type'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" parameter "' .
-                            $subparam[$tasksNamespace . 'name'] .
-                            '" for ' . $tasksNamespace . 'paramgroup> id "' .
-                            $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace . 'type> tag');
-                    }
-                    $definedparams[] = $param[$tasksNamespace . 'id'] . '::' .
-                    $subparam[$tasksNamespace . 'name'];
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Initialize a task instance with the parameters
-     * @param array raw, parsed xml
-     * @param array attributes from the  tag containing this task
-     * @param string|null last installed version of this package, if any (useful for upgrades)
-     */
-    function init($xml, $fileattribs, $lastversion)
-    {
-        $this->_class = str_replace('/', '_', $fileattribs['name']);
-        $this->_filename = $fileattribs['name'];
-        $this->_class = str_replace ('.php', '', $this->_class) . '_postinstall';
-        $this->_params = $xml;
-        $this->_lastversion = $lastversion;
-    }
-
-    /**
-     * Strip the tasks: namespace from internal params
-     *
-     * @access private
-     */
-    function _stripNamespace($params = null)
-    {
-        if ($params === null) {
-            $params = array();
-            if (!is_array($this->_params)) {
-                return;
-            }
-            foreach ($this->_params as $i => $param) {
-                if (is_array($param)) {
-                    $param = $this->_stripNamespace($param);
-                }
-                $params[str_replace($this->_pkg->getTasksNs() . ':', '', $i)] = $param;
-            }
-            $this->_params = $params;
-        } else {
-            $newparams = array();
-            foreach ($params as $i => $param) {
-                if (is_array($param)) {
-                    $param = $this->_stripNamespace($param);
-                }
-                $newparams[str_replace($this->_pkg->getTasksNs() . ':', '', $i)] = $param;
-            }
-            return $newparams;
-        }
-    }
-
-    /**
-     * Unlike other tasks, the installed file name is passed in instead of the file contents,
-     * because this task is handled post-installation
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string file name
-     * @return bool|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError)
-     */
-    function startSession($pkg, $contents)
-    {
-        if ($this->installphase != PEAR_TASK_INSTALL) {
-            return false;
-        }
-        // remove the tasks: namespace if present
-        $this->_pkg = $pkg;
-        $this->_stripNamespace();
-        $this->logger->log(0, 'Including external post-installation script "' .
-            $contents . '" - any errors are in this script');
-        include_once $contents;
-        if (class_exists($this->_class)) {
-            $this->logger->log(0, 'Inclusion succeeded');
-        } else {
-            return $this->throwError('init of post-install script class "' . $this->_class
-                . '" failed');
-        }
-        $this->_obj = new $this->_class;
-        $this->logger->log(1, 'running post-install script "' . $this->_class . '->init()"');
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $res = $this->_obj->init($this->config, $pkg, $this->_lastversion);
-        PEAR::popErrorHandling();
-        if ($res) {
-            $this->logger->log(0, 'init succeeded');
-        } else {
-            return $this->throwError('init of post-install script "' . $this->_class .
-                '->init()" failed');
-        }
-        $this->_contents = $contents;
-        return true;
-    }
-
-    /**
-     * No longer used
-     * @see PEAR_PackageFile_v2::runPostinstallScripts()
-     * @param array an array of tasks
-     * @param string install or upgrade
-     * @access protected
-     * @static
-     */
-    function run()
-    {
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Task/Postinstallscript/rw.php b/PEAR/Task/Postinstallscript/rw.php
deleted file mode 100644
index c66510a..0000000
--- a/PEAR/Task/Postinstallscript/rw.php
+++ /dev/null
@@ -1,176 +0,0 @@
- - read/write version
- *
- * 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 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: rw.php,v 1.11 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a10
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Postinstallscript.php';
-/**
- * Abstracts the postinstallscript file task xml.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a10
- */
-class PEAR_Task_Postinstallscript_rw extends PEAR_Task_Postinstallscript
-{
-    /**
-     * parent package file object
-     *
-     * @var PEAR_PackageFile_v2_rw
-     */
-    var $_pkg;
-    /**
-     * Enter description here...
-     *
-     * @param PEAR_PackageFile_v2_rw $pkg
-     * @param PEAR_Config $config
-     * @param PEAR_Frontend $logger
-     * @param array $fileXml
-     * @return PEAR_Task_Postinstallscript_rw
-     */
-    function PEAR_Task_Postinstallscript_rw(&$pkg, &$config, &$logger, $fileXml)
-    {
-        parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
-        $this->_contents = $fileXml;
-        $this->_pkg = &$pkg;
-        $this->_params = array();
-    }
-
-    function validate()
-    {
-        return $this->validateXml($this->_pkg, $this->_params, $this->config, $this->_contents);
-    }
-
-    function getName()
-    {
-        return 'postinstallscript';
-    }
-
-    /**
-     * add a simple  to the post-install script
-     *
-     * Order is significant, so call this method in the same
-     * sequence the users should see the paramgroups.  The $params
-     * parameter should either be the result of a call to {@link getParam()}
-     * or an array of calls to getParam().
-     * 
-     * Use {@link addConditionTypeGroup()} to add a  containing
-     * a  tag
-     * @param string $id  id as seen by the script
-     * @param array|false $params array of getParam() calls, or false for no params
-     * @param string|false $instructions
-     */
-    function addParamGroup($id, $params = false, $instructions = false)
-    {
-        if ($params && isset($params[0]) && !isset($params[1])) {
-            $params = $params[0];
-        }
-        $stuff =
-            array(
-                $this->_pkg->getTasksNs() . ':id' => $id,
-            );
-        if ($instructions) {
-            $stuff[$this->_pkg->getTasksNs() . ':instructions'] = $instructions;
-        }
-        if ($params) {
-            $stuff[$this->_pkg->getTasksNs() . ':param'] = $params;
-        }
-        $this->_params[$this->_pkg->getTasksNs() . ':paramgroup'][] = $stuff;
-    }
-
-    /**
-     * add a complex  to the post-install script with conditions
-     *
-     * This inserts a  with
-     *
-     * Order is significant, so call this method in the same
-     * sequence the users should see the paramgroups.  The $params
-     * parameter should either be the result of a call to {@link getParam()}
-     * or an array of calls to getParam().
-     * 
-     * Use {@link addParamGroup()} to add a simple 
-     *
-     * @param string $id  id as seen by the script
-     * @param string $oldgroup  id of the section referenced by
-     *                         
-     * @param string $param name of the  from the older section referenced
-     *                      by 
-     * @param string $value value to match of the parameter
-     * @param string $conditiontype one of '=', '!=', 'preg_match'
-     * @param array|false $params array of getParam() calls, or false for no params
-     * @param string|false $instructions
-     */
-    function addConditionTypeGroup($id, $oldgroup, $param, $value, $conditiontype = '=',
-                                   $params = false, $instructions = false)
-    {
-        if ($params && isset($params[0]) && !isset($params[1])) {
-            $params = $params[0];
-        }
-        $stuff =
-            array(
-                $this->_pkg->getTasksNs() . ':id' => $id,
-            );
-        if ($instructions) {
-            $stuff[$this->_pkg->getTasksNs() . ':instructions'] = $instructions;
-        }
-        $stuff[$this->_pkg->getTasksNs() . ':name'] = $oldgroup . '::' . $param;
-        $stuff[$this->_pkg->getTasksNs() . ':conditiontype'] = $conditiontype;
-        $stuff[$this->_pkg->getTasksNs() . ':value'] = $value;
-        if ($params) {
-            $stuff[$this->_pkg->getTasksNs() . ':param'] = $params;
-        }
-        $this->_params[$this->_pkg->getTasksNs() . ':paramgroup'][] = $stuff;
-    }
-
-    function getXml()
-    {
-        return $this->_params;
-    }
-
-    /**
-     * Use to set up a param tag for use in creating a paramgroup
-     * @static
-     */
-    function getParam($name, $prompt, $type = 'string', $default = null)
-    {
-        if ($default !== null) {
-            return 
-            array(
-                $this->_pkg->getTasksNs() . ':name' => $name,
-                $this->_pkg->getTasksNs() . ':prompt' => $prompt,
-                $this->_pkg->getTasksNs() . ':type' => $type,
-                $this->_pkg->getTasksNs() . ':default' => $default
-            );
-        }
-        return
-            array(
-                $this->_pkg->getTasksNs() . ':name' => $name,
-                $this->_pkg->getTasksNs() . ':prompt' => $prompt,
-                $this->_pkg->getTasksNs() . ':type' => $type,
-            );
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Task/Replace.php b/PEAR/Task/Replace.php
deleted file mode 100644
index 508715a..0000000
--- a/PEAR/Task/Replace.php
+++ /dev/null
@@ -1,182 +0,0 @@
-
- *
- * 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 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Replace.php,v 1.15 2006/03/02 18:14:13 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Common.php';
-/**
- * Implements the replace file task.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Task_Replace extends PEAR_Task_Common
-{
-    var $type = 'simple';
-    var $phase = PEAR_TASK_PACKAGEANDINSTALL;
-    var $_replacements;
-
-    /**
-     * Validate the raw xml at parsing-time.
-     * @param PEAR_PackageFile_v2
-     * @param array raw, parsed xml
-     * @param PEAR_Config
-     * @static
-     */
-    function validateXml($pkg, $xml, &$config, $fileXml)
-    {
-        if (!isset($xml['attribs'])) {
-            return array(PEAR_TASK_ERROR_NOATTRIBS);
-        }
-        if (!isset($xml['attribs']['type'])) {
-            return array(PEAR_TASK_ERROR_MISSING_ATTRIB, 'type');
-        }
-        if (!isset($xml['attribs']['to'])) {
-            return array(PEAR_TASK_ERROR_MISSING_ATTRIB, 'to');
-        }
-        if (!isset($xml['attribs']['from'])) {
-            return array(PEAR_TASK_ERROR_MISSING_ATTRIB, 'from');
-        }
-        if ($xml['attribs']['type'] == 'pear-config') {
-            if (!in_array($xml['attribs']['to'], $config->getKeys())) {
-                return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'to', $xml['attribs']['to'],
-                    $config->getKeys());
-            }
-        } elseif ($xml['attribs']['type'] == 'php-const') {
-            if (defined($xml['attribs']['to'])) {
-                return true;
-            } else {
-                return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'to', $xml['attribs']['to'],
-                    array('valid PHP constant'));
-            }
-        } elseif ($xml['attribs']['type'] == 'package-info') {
-            if (in_array($xml['attribs']['to'],
-                array('name', 'summary', 'channel', 'notes', 'extends', 'description',
-                    'release_notes', 'license', 'release-license', 'license-uri',
-                    'version', 'api-version', 'state', 'api-state', 'release_date',
-                    'date', 'time'))) {
-                return true;
-            } else {
-                return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'to', $xml['attribs']['to'],
-                    array('name', 'summary', 'channel', 'notes', 'extends', 'description',
-                    'release_notes', 'license', 'release-license', 'license-uri',
-                    'version', 'api-version', 'state', 'api-state', 'release_date',
-                    'date', 'time'));
-            }
-        } else {
-            return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'type', $xml['attribs']['type'],
-                array('pear-config', 'package-info', 'php-const'));
-        }
-        return true;
-    }
-
-    /**
-     * Initialize a task instance with the parameters
-     * @param array raw, parsed xml
-     * @param unused
-     */
-    function init($xml, $attribs)
-    {
-        $this->_replacements = isset($xml['attribs']) ? array($xml) : $xml;
-    }
-
-    /**
-     * Do a package.xml 1.0 replacement, with additional package-info fields available
-     *
-     * See validateXml() source for the complete list of allowed fields
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string file contents
-     * @param string the eventual final file location (informational only)
-     * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError), otherwise return the new contents
-     */
-    function startSession($pkg, $contents, $dest)
-    {
-        $subst_from = $subst_to = array();
-        foreach ($this->_replacements as $a) {
-            $a = $a['attribs'];
-            $to = '';
-            if ($a['type'] == 'pear-config') {
-                if ($this->installphase == PEAR_TASK_PACKAGE) {
-                    return false;
-                }
-                if ($a['to'] == 'master_server') {
-                    $chan = $this->registry->getChannel($pkg->getChannel());
-                    if (!PEAR::isError($chan)) {
-                        $to = $chan->getServer();
-                    } else {
-                        $this->logger->log(0, "$dest: invalid pear-config replacement: $a[to]");
-                        return false;
-                    }
-                } else {
-                    if ($this->config->isDefinedLayer('ftp')) {
-                        // try the remote config file first
-                        $to = $this->config->get($a['to'], 'ftp', $pkg->getChannel());
-                        if (is_null($to)) {
-                            // then default to local
-                            $to = $this->config->get($a['to'], null, $pkg->getChannel());
-                        }
-                    } else {
-                        $to = $this->config->get($a['to'], null, $pkg->getChannel());
-                    }
-                }
-                if (is_null($to)) {
-                    $this->logger->log(0, "$dest: invalid pear-config replacement: $a[to]");
-                    return false;
-                }
-            } elseif ($a['type'] == 'php-const') {
-                if ($this->installphase == PEAR_TASK_PACKAGE) {
-                    return false;
-                }
-                if (defined($a['to'])) {
-                    $to = constant($a['to']);
-                } else {
-                    $this->logger->log(0, "$dest: invalid php-const replacement: $a[to]");
-                    return false;
-                }
-            } else {
-                if ($t = $pkg->packageInfo($a['to'])) {
-                    $to = $t;
-                } else {
-                    $this->logger->log(0, "$dest: invalid package-info replacement: $a[to]");
-                    return false;
-                }
-            }
-            if (!is_null($to)) {
-                $subst_from[] = $a['from'];
-                $subst_to[] = $to;
-            }
-        }
-        $this->logger->log(3, "doing " . sizeof($subst_from) .
-            " substitution(s) for $dest");
-        if (sizeof($subst_from)) {
-            $contents = str_replace($subst_from, $subst_to, $contents);
-        }
-        return $contents;
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Task/Replace/rw.php b/PEAR/Task/Replace/rw.php
deleted file mode 100644
index 237ff46..0000000
--- a/PEAR/Task/Replace/rw.php
+++ /dev/null
@@ -1,67 +0,0 @@
- - read/write version
- *
- * 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 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: rw.php,v 1.3 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a10
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Replace.php';
-/**
- * Abstracts the replace task xml.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a10
- */
-class PEAR_Task_Replace_rw extends PEAR_Task_Replace
-{
-    function PEAR_Task_Replace_rw(&$pkg, &$config, &$logger, $fileXml)
-    {
-        parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
-        $this->_contents = $fileXml;
-        $this->_pkg = &$pkg;
-        $this->_params = array();
-    }
-
-    function validate()
-    {
-        return $this->validateXml($this->_pkg, $this->_params, $this->config, $this->_contents);
-    }
-
-    function setInfo($from, $to, $type)
-    {
-        $this->_params = array('attribs' => array('from' => $from, 'to' => $to, 'type' => $type));
-    }
-
-    function getName()
-    {
-        return 'replace';
-    }
-
-    function getXml()
-    {
-        return $this->_params;
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Task/Unixeol.php b/PEAR/Task/Unixeol.php
deleted file mode 100644
index 645a6fc..0000000
--- a/PEAR/Task/Unixeol.php
+++ /dev/null
@@ -1,83 +0,0 @@
-
- *
- * 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 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Unixeol.php,v 1.8 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Common.php';
-/**
- * Implements the unix line endings file task.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Task_Unixeol extends PEAR_Task_Common
-{
-    var $type = 'simple';
-    var $phase = PEAR_TASK_PACKAGE;
-    var $_replacements;
-
-    /**
-     * Validate the raw xml at parsing-time.
-     * @param PEAR_PackageFile_v2
-     * @param array raw, parsed xml
-     * @param PEAR_Config
-     * @static
-     */
-    function validateXml($pkg, $xml, &$config, $fileXml)
-    {
-        if ($xml != '') {
-            return array(PEAR_TASK_ERROR_INVALID, 'no attributes allowed');
-        }
-        return true;
-    }
-
-    /**
-     * Initialize a task instance with the parameters
-     * @param array raw, parsed xml
-     * @param unused
-     */
-    function init($xml, $attribs)
-    {
-    }
-
-    /**
-     * Replace all line endings with line endings customized for the current OS
-     *
-     * See validateXml() source for the complete list of allowed fields
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string file contents
-     * @param string the eventual final file location (informational only)
-     * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError), otherwise return the new contents
-     */
-    function startSession($pkg, $contents, $dest)
-    {
-        $this->logger->log(3, "replacing all line endings with \\n in $dest");
-        return preg_replace("/\r\n|\n\r|\r|\n/", "\n", $contents);
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Task/Unixeol/rw.php b/PEAR/Task/Unixeol/rw.php
deleted file mode 100644
index 7a3c1c6..0000000
--- a/PEAR/Task/Unixeol/rw.php
+++ /dev/null
@@ -1,62 +0,0 @@
- - read/write version
- *
- * 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 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: rw.php,v 1.4 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a10
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Unixeol.php';
-/**
- * Abstracts the unixeol task xml.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a10
- */
-class PEAR_Task_Unixeol_rw extends PEAR_Task_Unixeol
-{
-    function PEAR_Task_Unixeol_rw(&$pkg, &$config, &$logger, $fileXml)
-    {
-        parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
-        $this->_contents = $fileXml;
-        $this->_pkg = &$pkg;
-        $this->_params = array();
-    }
-
-    function validate()
-    {
-        return true;
-    }
-
-    function getName()
-    {
-        return 'unixeol';
-    }
-
-    function getXml()
-    {
-        return '';
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Task/Windowseol.php b/PEAR/Task/Windowseol.php
deleted file mode 100644
index fcda6f8..0000000
--- a/PEAR/Task/Windowseol.php
+++ /dev/null
@@ -1,83 +0,0 @@
-
- *
- * 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 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Windowseol.php,v 1.7 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Common.php';
-/**
- * Implements the windows line endsings file task.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Task_Windowseol extends PEAR_Task_Common
-{
-    var $type = 'simple';
-    var $phase = PEAR_TASK_PACKAGE;
-    var $_replacements;
-
-    /**
-     * Validate the raw xml at parsing-time.
-     * @param PEAR_PackageFile_v2
-     * @param array raw, parsed xml
-     * @param PEAR_Config
-     * @static
-     */
-    function validateXml($pkg, $xml, &$config, $fileXml)
-    {
-        if ($xml != '') {
-            return array(PEAR_TASK_ERROR_INVALID, 'no attributes allowed');
-        }
-        return true;
-    }
-
-    /**
-     * Initialize a task instance with the parameters
-     * @param array raw, parsed xml
-     * @param unused
-     */
-    function init($xml, $attribs)
-    {
-    }
-
-    /**
-     * Replace all line endings with windows line endings
-     *
-     * See validateXml() source for the complete list of allowed fields
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string file contents
-     * @param string the eventual final file location (informational only)
-     * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError), otherwise return the new contents
-     */
-    function startSession($pkg, $contents, $dest)
-    {
-        $this->logger->log(3, "replacing all line endings with \\r\\n in $dest");
-        return preg_replace("/\r\n|\n\r|\r|\n/", "\r\n", $contents);
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Task/Windowseol/rw.php b/PEAR/Task/Windowseol/rw.php
deleted file mode 100644
index 73be5c5..0000000
--- a/PEAR/Task/Windowseol/rw.php
+++ /dev/null
@@ -1,62 +0,0 @@
- - read/write version
- *
- * 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 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: rw.php,v 1.4 2006/01/06 04:47:37 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a10
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Windowseol.php';
-/**
- * Abstracts the windowseol task xml.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a10
- */
-class PEAR_Task_Windowseol_rw extends PEAR_Task_Windowseol
-{
-    function PEAR_Task_Windowseol_rw(&$pkg, &$config, &$logger, $fileXml)
-    {
-        parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
-        $this->_contents = $fileXml;
-        $this->_pkg = &$pkg;
-        $this->_params = array();
-    }
-
-    function validate()
-    {
-        return true;
-    }
-
-    function getName()
-    {
-        return 'windowseol';
-    }
-
-    function getXml()
-    {
-        return '';
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/Validate.php b/PEAR/Validate.php
deleted file mode 100644
index 4678a1d..0000000
--- a/PEAR/Validate.php
+++ /dev/null
@@ -1,634 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Validate.php,v 1.50 2006/09/25 05:12:21 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**#@+
- * Constants for install stage
- */
-define('PEAR_VALIDATE_INSTALLING', 1);
-define('PEAR_VALIDATE_UNINSTALLING', 2); // this is not bit-mapped like the others
-define('PEAR_VALIDATE_NORMAL', 3);
-define('PEAR_VALIDATE_DOWNLOADING', 4); // this is not bit-mapped like the others
-define('PEAR_VALIDATE_PACKAGING', 7);
-/**#@-*/
-require_once 'PEAR/Common.php';
-require_once 'PEAR/Validator/PECL.php';
-
-/**
- * Validation class for package.xml - channel-level advanced validation
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Validate
-{
-    var $packageregex = _PEAR_COMMON_PACKAGE_NAME_PREG;
-    /**
-     * @var PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     */
-    var $_packagexml;
-    /**
-     * @var int one of the PEAR_VALIDATE_* constants
-     */
-    var $_state = PEAR_VALIDATE_NORMAL;
-    /**
-     * Format: ('error' => array('field' => name, 'reason' => reason), 'warning' => same)
-     * @var array
-     * @access private
-     */
-    var $_failures = array('error' => array(), 'warning' => array());
-
-    /**
-     * Override this method to handle validation of normal package names
-     * @param string
-     * @return bool
-     * @access protected
-     */
-    function _validPackageName($name)
-    {
-        return (bool) preg_match('/^' . $this->packageregex . '$/', $name);
-    }
-
-    /**
-     * @param string package name to validate
-     * @param string name of channel-specific validation package
-     * @final
-     */
-    function validPackageName($name, $validatepackagename = false)
-    {
-        if ($validatepackagename) {
-            if (strtolower($name) == strtolower($validatepackagename)) {
-                return (bool) preg_match('/^[a-zA-Z0-9_]+(?:\.[a-zA-Z0-9_]+)*$/', $name);
-            }
-        }
-        return $this->_validPackageName($name);
-    }
-
-    /**
-     * This validates a bundle name, and bundle names must conform
-     * to the PEAR naming convention, so the method is final and static.
-     * @param string
-     * @final
-     * @static
-     */
-    function validGroupName($name)
-    {
-        return (bool) preg_match('/^' . _PEAR_COMMON_PACKAGE_NAME_PREG . '$/', $name);
-    }
-
-    /**
-     * Determine whether $state represents a valid stability level
-     * @param string
-     * @return bool
-     * @static
-     * @final
-     */
-    function validState($state)
-    {
-        return in_array($state, array('snapshot', 'devel', 'alpha', 'beta', 'stable'));
-    }
-
-    /**
-     * Get a list of valid stability levels
-     * @return array
-     * @static
-     * @final
-     */
-    function getValidStates()
-    {
-        return array('snapshot', 'devel', 'alpha', 'beta', 'stable');
-    }
-
-    /**
-     * Determine whether a version is a properly formatted version number that can be used
-     * by version_compare
-     * @param string
-     * @return bool
-     * @static
-     * @final
-     */
-    function validVersion($ver)
-    {
-        return (bool) preg_match(PEAR_COMMON_PACKAGE_VERSION_PREG, $ver);
-    }
-
-    /**
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     */
-    function setPackageFile(&$pf)
-    {
-        $this->_packagexml = &$pf;
-    }
-
-    /**
-     * @access private
-     */
-    function _addFailure($field, $reason)
-    {
-        $this->_failures['errors'][] = array('field' => $field, 'reason' => $reason);
-    }
-
-    /**
-     * @access private
-     */
-    function _addWarning($field, $reason)
-    {
-        $this->_failures['warnings'][] = array('field' => $field, 'reason' => $reason);
-    }
-
-    function getFailures()
-    {
-        $failures = $this->_failures;
-        $this->_failures = array('warnings' => array(), 'errors' => array());
-        return $failures;
-    }
-
-    /**
-     * @param int one of the PEAR_VALIDATE_* constants
-     */
-    function validate($state = null)
-    {
-        if (!isset($this->_packagexml)) {
-            return false;
-        }
-        if ($state !== null) {
-            $this->_state = $state;
-        }
-        $this->_failures = array('warnings' => array(), 'errors' => array());
-        $this->validatePackageName();
-        $this->validateVersion();
-        $this->validateMaintainers();
-        $this->validateDate();
-        $this->validateSummary();
-        $this->validateDescription();
-        $this->validateLicense();
-        $this->validateNotes();
-        if ($this->_packagexml->getPackagexmlVersion() == '1.0') {
-            $this->validateState();
-            $this->validateFilelist();
-        } elseif ($this->_packagexml->getPackagexmlVersion() == '2.0' ||
-                  $this->_packagexml->getPackagexmlVersion() == '2.1') {
-            $this->validateTime();
-            $this->validateStability();
-            $this->validateDeps();
-            $this->validateMainFilelist();
-            $this->validateReleaseFilelist();
-            //$this->validateGlobalTasks();
-            $this->validateChangelog();
-        }
-        return !((bool) count($this->_failures['errors']));
-    }
-
-    /**
-     * @access protected
-     */
-    function validatePackageName()
-    {
-        if ($this->_state == PEAR_VALIDATE_PACKAGING ||
-              $this->_state == PEAR_VALIDATE_NORMAL) {
-            if (($this->_packagexml->getPackagexmlVersion() == '2.0' ||
-                 $this->_packagexml->getPackagexmlVersion() == '2.1') &&
-                  $this->_packagexml->getExtends()) {
-                $version = $this->_packagexml->getVersion() . '';
-                $name = $this->_packagexml->getPackage();
-                $test = array_shift($a = explode('.', $version));
-                if ($test == '0') {
-                    return true;
-                }
-                $vlen = strlen($test);
-                $majver = substr($name, strlen($name) - $vlen);
-                while ($majver && !is_numeric($majver{0})) {
-                    $majver = substr($majver, 1);
-                }
-                if ($majver != $test) {
-                    $this->_addWarning('package', "package $name extends package " .
-                        $this->_packagexml->getExtends() . ' and so the name should ' .
-                        'have a postfix equal to the major version like "' .
-                        $this->_packagexml->getExtends() . $test . '"');
-                    return true;
-                } elseif (substr($name, 0, strlen($name) - $vlen) !=
-                            $this->_packagexml->getExtends()) {
-                    $this->_addWarning('package', "package $name extends package " .
-                        $this->_packagexml->getExtends() . ' and so the name must ' .
-                        'be an extension like "' . $this->_packagexml->getExtends() .
-                        $test . '"');
-                    return true;
-                }
-            }
-        }
-        if (!$this->validPackageName($this->_packagexml->getPackage())) {
-            $this->_addFailure('name', 'package name "' .
-                $this->_packagexml->getPackage() . '" is invalid');
-            return false;
-        }
-    }
-
-    /**
-     * @access protected
-     */
-    function validateVersion()
-    {
-        if ($this->_state != PEAR_VALIDATE_PACKAGING) {
-            if (!$this->validVersion($this->_packagexml->getVersion())) {
-                $this->_addFailure('version',
-                    'Invalid version number "' . $this->_packagexml->getVersion() . '"');
-            }
-            return false;
-        }
-        $version = $this->_packagexml->getVersion();
-        $versioncomponents = explode('.', $version);
-        if (count($versioncomponents) != 3) {
-            $this->_addWarning('version',
-                'A version number should have 3 decimals (x.y.z)');
-            return true;
-        }
-        $name = $this->_packagexml->getPackage();
-        // version must be based upon state
-        switch ($this->_packagexml->getState()) {
-            case 'snapshot' :
-                return true;
-            case 'devel' :
-                if ($versioncomponents[0] . 'a' == '0a') {
-                    return true;
-                }
-                if ($versioncomponents[0] == 0) {
-                    $versioncomponents[0] = '0';
-                    $this->_addWarning('version',
-                        'version "' . $version . '" should be "' .
-                        implode('.' ,$versioncomponents) . '"');
-                } else {
-                    $this->_addWarning('version',
-                        'packages with devel stability must be < version 1.0.0');
-                }
-                return true;
-            break;
-            case 'alpha' :
-            case 'beta' :
-                // check for a package that extends a package,
-                // like Foo and Foo2
-                if ($this->_state == PEAR_VALIDATE_PACKAGING) {
-                    if (substr($versioncomponents[2], 1, 2) == 'rc') {
-                        $this->_addFailure('version', 'Release Candidate versions ' .
-                            'must have capital RC, not lower-case rc');
-                        return false;
-                    }
-                }
-                if (!$this->_packagexml->getExtends()) {
-                    if ($versioncomponents[0] == '1') {
-                        if ($versioncomponents[2]{0} == '0') {
-                            if ($versioncomponents[2] == '0') {
-                                // version 1.*.0000
-                                $this->_addWarning('version',
-                                    'version 1.' . $versioncomponents[1] .
-                                        '.0 probably should not be alpha or beta');
-                                return true;
-                            } elseif (strlen($versioncomponents[2]) > 1) {
-                                // version 1.*.0RC1 or 1.*.0beta24 etc.
-                                return true;
-                            } else {
-                                // version 1.*.0
-                                $this->_addWarning('version',
-                                    'version 1.' . $versioncomponents[1] .
-                                        '.0 probably should not be alpha or beta');
-                                return true;
-                            }
-                        } else {
-                            $this->_addWarning('version',
-                                'bugfix versions (1.3.x where x > 0) probably should ' .
-                                'not be alpha or beta');
-                            return true;
-                        }
-                    } elseif ($versioncomponents[0] != '0') {
-                        $this->_addWarning('version',
-                            'major versions greater than 1 are not allowed for packages ' .
-                            'without an  tag or an identical postfix (foo2 v2.0.0)');
-                        return true;
-                    }
-                    if ($versioncomponents[0] . 'a' == '0a') {
-                        return true;
-                    }
-                    if ($versioncomponents[0] == 0) {
-                        $versioncomponents[0] = '0';
-                        $this->_addWarning('version',
-                            'version "' . $version . '" should be "' .
-                            implode('.' ,$versioncomponents) . '"');
-                    }
-                } else {
-                    $vlen = strlen($versioncomponents[0] . '');
-                    $majver = substr($name, strlen($name) - $vlen);
-                    while ($majver && !is_numeric($majver{0})) {
-                        $majver = substr($majver, 1);
-                    }
-                    if (($versioncomponents[0] != 0) && $majver != $versioncomponents[0]) {
-                        $this->_addWarning('version', 'first version number "' .
-                            $versioncomponents[0] . '" must match the postfix of ' .
-                            'package name "' . $name . '" (' .
-                            $majver . ')');
-                        return true;
-                    }
-                    if ($versioncomponents[0] == $majver) {
-                        if ($versioncomponents[2]{0} == '0') {
-                            if ($versioncomponents[2] == '0') {
-                                // version 2.*.0000
-                                $this->_addWarning('version',
-                                    "version $majver." . $versioncomponents[1] .
-                                        '.0 probably should not be alpha or beta');
-                                return false;
-                            } elseif (strlen($versioncomponents[2]) > 1) {
-                                // version 2.*.0RC1 or 2.*.0beta24 etc.
-                                return true;
-                            } else {
-                                // version 2.*.0
-                                $this->_addWarning('version',
-                                    "version $majver." . $versioncomponents[1] .
-                                        '.0 cannot be alpha or beta');
-                                return true;
-                            }
-                        } else {
-                            $this->_addWarning('version',
-                                "bugfix versions ($majver.x.y where y > 0) should " .
-                                'not be alpha or beta');
-                            return true;
-                        }
-                    } elseif ($versioncomponents[0] != '0') {
-                        $this->_addWarning('version',
-                            "only versions 0.x.y and $majver.x.y are allowed for alpha/beta releases");
-                        return true;
-                    }
-                    if ($versioncomponents[0] . 'a' == '0a') {
-                        return true;
-                    }
-                    if ($versioncomponents[0] == 0) {
-                        $versioncomponents[0] = '0';
-                        $this->_addWarning('version',
-                            'version "' . $version . '" should be "' .
-                            implode('.' ,$versioncomponents) . '"');
-                    }
-                }
-                return true;
-            break;
-            case 'stable' :
-                if ($versioncomponents[0] == '0') {
-                    $this->_addWarning('version', 'versions less than 1.0.0 cannot ' .
-                    'be stable');
-                    return true;
-                }
-                if (!is_numeric($versioncomponents[2])) {
-                    if (preg_match('/\d+(rc|a|alpha|b|beta)\d*/i',
-                          $versioncomponents[2])) {
-                        $this->_addWarning('version', 'version "' . $version . '" or any ' .
-                            'RC/beta/alpha version cannot be stable');
-                        return true;
-                    }
-                }
-                // check for a package that extends a package,
-                // like Foo and Foo2
-                if ($this->_packagexml->getExtends()) {
-                    $vlen = strlen($versioncomponents[0] . '');
-                    $majver = substr($name, strlen($name) - $vlen);
-                    while ($majver && !is_numeric($majver{0})) {
-                        $majver = substr($majver, 1);
-                    }
-                    if (($versioncomponents[0] != 0) && $majver != $versioncomponents[0]) {
-                        $this->_addWarning('version', 'first version number "' .
-                            $versioncomponents[0] . '" must match the postfix of ' .
-                            'package name "' . $name . '" (' .
-                            $majver . ')');
-                        return true;
-                    }
-                } elseif ($versioncomponents[0] > 1) {
-                    $this->_addWarning('version', 'major version x in x.y.z may not be greater than ' .
-                        '1 for any package that does not have an  tag');
-                }
-                return true;
-            break;
-            default :
-                return false;
-            break;
-        }
-    }
-
-    /**
-     * @access protected
-     */
-    function validateMaintainers()
-    {
-        // maintainers can only be truly validated server-side for most channels
-        // but allow this customization for those who wish it
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateDate()
-    {
-        if ($this->_state == PEAR_VALIDATE_NORMAL ||
-              $this->_state == PEAR_VALIDATE_PACKAGING) {
-
-            if (!preg_match('/(\d\d\d\d)\-(\d\d)\-(\d\d)/',
-                  $this->_packagexml->getDate(), $res) ||
-                  count($res) < 4
-                  || !checkdate($res[2], $res[3], $res[1])
-                ) {
-                $this->_addFailure('date', 'invalid release date "' .
-                    $this->_packagexml->getDate() . '"');
-                return false;
-            }
-
-
-            if ($this->_state == PEAR_VALIDATE_PACKAGING &&
-                  $this->_packagexml->getDate() != date('Y-m-d')) {
-                $this->_addWarning('date', 'Release Date "' .
-                    $this->_packagexml->getDate() . '" is not today');
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateTime()
-    {
-        if (!$this->_packagexml->getTime()) {
-            // default of no time value set
-            return true;
-        }
-        // packager automatically sets time, so only validate if
-        // pear validate is called
-        if ($this->_state = PEAR_VALIDATE_NORMAL) {
-            if (!preg_match('/\d\d:\d\d:\d\d/',
-                  $this->_packagexml->getTime())) {
-                $this->_addFailure('time', 'invalid release time "' .
-                    $this->_packagexml->getTime() . '"');
-                return false;
-            }
-            if (strtotime($this->_packagexml->getTime()) == -1) {
-                $this->_addFailure('time', 'invalid release time "' .
-                    $this->_packagexml->getTime() . '"');
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateState()
-    {
-        // this is the closest to "final" php4 can get
-        if (!PEAR_Validate::validState($this->_packagexml->getState())) {
-            if (strtolower($this->_packagexml->getState() == 'rc')) {
-                $this->_addFailure('state', 'RC is not a state, it is a version ' .
-                    'postfix, use ' . $this->_packagexml->getVersion() . 'RC1, state beta');
-            }
-            $this->_addFailure('state', 'invalid release state "' .
-                $this->_packagexml->getState() . '", must be one of: ' .
-                implode(', ', PEAR_Validate::getValidStates()));
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateStability()
-    {
-        $ret = true;
-        $packagestability = $this->_packagexml->getState();
-        $apistability = $this->_packagexml->getState('api');
-        if (!PEAR_Validate::validState($packagestability)) {
-            $this->_addFailure('state', 'invalid release stability "' .
-                $this->_packagexml->getState() . '", must be one of: ' .
-                implode(', ', PEAR_Validate::getValidStates()));
-            $ret = false;
-        }
-        $apistates = PEAR_Validate::getValidStates();
-        array_shift($apistates); // snapshot is not allowed
-        if (!in_array($apistability, $apistates)) {
-            $this->_addFailure('state', 'invalid API stability "' .
-                $this->_packagexml->getState('api') . '", must be one of: ' .
-                implode(', ', $apistates));
-            $ret = false;
-        }
-        return $ret;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateSummary()
-    {
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateDescription()
-    {
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateLicense()
-    {
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateNotes()
-    {
-        return true;
-    }
-
-    /**
-     * for package.xml 2.0 only - channels can't use package.xml 1.0
-     * @access protected
-     */
-    function validateDependencies()
-    {
-        return true;
-    }
-
-    /**
-     * for package.xml 1.0 only
-     * @access private
-     */
-    function _validateFilelist()
-    {
-        return true; // placeholder for now
-    }
-
-    /**
-     * for package.xml 2.0 only
-     * @access protected
-     */
-    function validateMainFilelist()
-    {
-        return true; // placeholder for now
-    }
-
-    /**
-     * for package.xml 2.0 only
-     * @access protected
-     */
-    function validateReleaseFilelist()
-    {
-        return true; // placeholder for now
-    }
-
-    /**
-     * @access protected
-     */
-    function validateChangelog()
-    {
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateFilelist()
-    {
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateDeps()
-    {
-        return true;
-    }
-}
-?>
diff --git a/PEAR/Validator/PECL.php b/PEAR/Validator/PECL.php
deleted file mode 100644
index 42177aa..0000000
--- a/PEAR/Validator/PECL.php
+++ /dev/null
@@ -1,63 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: PECL.php,v 1.8 2006/05/12 02:38:58 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a5
- */
-/**
- * This is the parent class for all validators
- */
-require_once 'PEAR/Validate.php';
-/**
- * Channel Validator for the pecl.php.net channel
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a5
- */
-class PEAR_Validator_PECL extends PEAR_Validate
-{
-    function validateVersion()
-    {
-        if ($this->_state == PEAR_VALIDATE_PACKAGING) {
-            $version = $this->_packagexml->getVersion();
-            $versioncomponents = explode('.', $version);
-            $last = array_pop($versioncomponents);
-            if (substr($last, 1, 2) == 'rc') {
-                $this->_addFailure('version', 'Release Candidate versions must have ' .
-                'upper-case RC, not lower-case rc');
-                return false;
-            }
-        }
-        return true;
-    }
-
-    function validatePackageName()
-    {
-        $ret = parent::validatePackageName();
-        if ($this->_packagexml->getPackageType() == 'extsrc' ||
-              $this->_packagexml->getPackageType() == 'zendextsrc') {
-            if (strtolower($this->_packagexml->getPackage()) !=
-                  strtolower($this->_packagexml->getProvidesExtension())) {
-                $this->_addWarning('providesextension', 'package name "' .
-                    $this->_packagexml->getPackage() . '" is different from extension name "' .
-                    $this->_packagexml->getProvidesExtension() . '"');
-            }
-        }
-        return $ret;
-    }
-}
-?>
\ No newline at end of file
diff --git a/PEAR/XMLParser.php b/PEAR/XMLParser.php
deleted file mode 100644
index f188115..0000000
--- a/PEAR/XMLParser.php
+++ /dev/null
@@ -1,261 +0,0 @@
-
- * @author     Stephan Schmidt (original XML_Unserializer code)
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: XMLParser.php,v 1.12 2006/03/27 04:39:03 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * Parser for any xml file
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver 
- * @author     Stephan Schmidt (original XML_Unserializer code)
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.5.0a1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_XMLParser
-{
-    /**
-     * unserilialized data
-     * @var string $_serializedData
-     */
-    var $_unserializedData = null;
-
-    /**
-     * name of the root tag
-     * @var string $_root
-     */
-    var $_root = null;
-
-    /**
-     * stack for all data that is found
-     * @var array    $_dataStack
-     */
-    var $_dataStack  =   array();
-
-    /**
-     * stack for all values that are generated
-     * @var array    $_valStack
-     */
-    var $_valStack  =   array();
-
-    /**
-     * current tag depth
-     * @var int    $_depth
-     */
-    var $_depth = 0;
-
-    /**
-     * @return array
-     */
-    function getData()
-    {
-        return $this->_unserializedData;
-    }
-
-    /**
-     * @param string xml content
-     * @return true|PEAR_Error
-     */
-    function parse($data)
-    {
-        if (!extension_loaded('xml')) {
-            include_once 'PEAR.php';
-            return PEAR::raiseError("XML Extension not found", 1);
-        }
-        $this->_valStack = array();
-        $this->_dataStack = array();
-        $this->_depth = 0;
-
-        if (version_compare(phpversion(), '5.0.0', 'lt')) {
-            if (strpos($data, 'encoding="UTF-8"')) {
-                $data = utf8_decode($data);
-            }
-            $xp = xml_parser_create('ISO-8859-1');
-        } else {
-            if (strpos($data, 'encoding="UTF-8"')) {
-                $xp = xml_parser_create('UTF-8');
-            } else {
-                $xp = xml_parser_create('ISO-8859-1');
-            }
-        }
-        xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, 0);
-        xml_set_object($xp, $this);
-        xml_set_element_handler($xp, 'startHandler', 'endHandler');
-        xml_set_character_data_handler($xp, 'cdataHandler');
-        if (!xml_parse($xp, $data)) {
-            $msg = xml_error_string(xml_get_error_code($xp));
-            $line = xml_get_current_line_number($xp);
-            xml_parser_free($xp);
-            include_once 'PEAR.php';
-            return PEAR::raiseError("XML Error: '$msg' on line '$line'", 2);
-        }
-        xml_parser_free($xp);
-        return true;
-    }
-
-    /**
-     * Start element handler for XML parser
-     *
-     * @access private
-     * @param  object $parser  XML parser object
-     * @param  string $element XML element
-     * @param  array  $attribs attributes of XML tag
-     * @return void
-     */
-    function startHandler($parser, $element, $attribs)
-    {
-        $type = 'string';
-
-        $this->_depth++;
-        $this->_dataStack[$this->_depth] = null;
-
-        $val = array(
-                     'name'         => $element,
-                     'value'        => null,
-                     'type'         => $type,
-                     'childrenKeys' => array(),
-                     'aggregKeys'   => array()
-                    );
-
-        if (count($attribs) > 0) {
-            $val['children'] = array();
-            $val['type'] = 'array';
-
-            $val['children']['attribs'] = $attribs;
-
-        }
-
-        array_push($this->_valStack, $val);
-    }
-
-    /**
-     * post-process data
-     *
-     * @param string $data
-     * @param string $element element name
-     */
-    function postProcess($data, $element)
-    {
-        return trim($data);
-    }
-
-    /**
-     * End element handler for XML parser
-     *
-     * @access private
-     * @param  object XML parser object
-     * @param  string
-     * @return void
-     */
-    function endHandler($parser, $element)
-    {
-        $value = array_pop($this->_valStack);
-        $data  = $this->postProcess($this->_dataStack[$this->_depth], $element);
-
-        // adjust type of the value
-        switch(strtolower($value['type'])) {
-
-            /*
-             * unserialize an array
-             */
-            case 'array':
-                if ($data !== '') {
-                    $value['children']['_content'] = $data;
-                }
-                if (isset($value['children'])) {
-                    $value['value'] = $value['children'];
-                } else {
-                    $value['value'] = array();
-                }
-                break;
-
-            /*
-             * unserialize a null value
-             */
-            case 'null':
-                $data = null;
-                break;
-
-            /*
-             * unserialize any scalar value
-             */
-            default:
-                settype($data, $value['type']);
-                $value['value'] = $data;
-                break;
-        }
-        $parent = array_pop($this->_valStack);
-        if ($parent === null) {
-            $this->_unserializedData = &$value['value'];
-            $this->_root = &$value['name'];
-            return true;
-        } else {
-            // parent has to be an array
-            if (!isset($parent['children']) || !is_array($parent['children'])) {
-                $parent['children'] = array();
-                if ($parent['type'] != 'array') {
-                    $parent['type'] = 'array';
-                }
-            }
-
-            if (!empty($value['name'])) {
-                // there already has been a tag with this name
-                if (in_array($value['name'], $parent['childrenKeys'])) {
-                    // no aggregate has been created for this tag
-                    if (!in_array($value['name'], $parent['aggregKeys'])) {
-                        if (isset($parent['children'][$value['name']])) {
-                            $parent['children'][$value['name']] = array($parent['children'][$value['name']]);
-                        } else {
-                            $parent['children'][$value['name']] = array();
-                        }
-                        array_push($parent['aggregKeys'], $value['name']);
-                    }
-                    array_push($parent['children'][$value['name']], $value['value']);
-                } else {
-                    $parent['children'][$value['name']] = &$value['value'];
-                    array_push($parent['childrenKeys'], $value['name']);
-                }
-            } else {
-                array_push($parent['children'],$value['value']);
-            }
-            array_push($this->_valStack, $parent);
-        }
-
-        $this->_depth--;
-    }
-
-    /**
-     * Handler for character data
-     *
-     * @access private
-     * @param  object XML parser object
-     * @param  string CDATA
-     * @return void
-     */
-    function cdataHandler($parser, $cdata)
-    {
-        $this->_dataStack[$this->_depth] .= $cdata;
-    }
-}
-?>
\ No newline at end of file
diff --git a/RELEASE.fr b/RELEASE.fr
index 6476395..d30362b 100644
--- a/RELEASE.fr
+++ b/RELEASE.fr
@@ -1,3 +1,17 @@
+Version 0.8 beta :
+* reprise totale de l'application afin de la passer en PHP 5 (>= PHP 5.2)
+* les fonctionnalités existante ont été conservées
+* changement du système de cache (basé dorénavant sur des objets serialisés)
+* passage du système de template de PEAR à PHP
+* nouveau parseur XML pour le SVG afin de se passer de PEAR (via DOMDocument)
+* ajout d'une fonctionnalité de navigation via Ajax (l'image, les informations relatives au strip et les commentaires du forum, uniquement, sont rechargés en javascript)
+* un seul template pour le moment (lego)
+
+Version 0.7 :
+* fusion des flux RSS Strips et des annonces forum
+* correction du bug entre le système de commentaires et le cache
+* correction d'un problème d'encodage au niveau du "Word of the day"
+
 Version 0.6 :
 * affichage plus long des commentaires (128 caractères par défaut)
 * un lien vers la page des commentaires sur le forum
diff --git a/System.php b/System.php
deleted file mode 100644
index 58553d5..0000000
--- a/System.php
+++ /dev/null
@@ -1,591 +0,0 @@
-
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: System.php,v 1.55 2006/06/16 13:56:02 pajoye Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR.php';
-require_once 'Console/Getopt.php';
-
-$GLOBALS['_System_temp_files'] = array();
-
-/**
-* System offers cross plattform compatible system functions
-*
-* Static functions for different operations. Should work under
-* Unix and Windows. The names and usage has been taken from its respectively
-* GNU commands. The functions will return (bool) false on error and will
-* trigger the error with the PHP trigger_error() function (you can silence
-* the error by prefixing a '@' sign after the function call, but this
-* is not recommended practice.  Instead use an error handler with
-* {@link set_error_handler()}).
-*
-* Documentation on this class you can find in:
-* http://pear.php.net/manual/
-*
-* Example usage:
-* if (!@System::rm('-r file1 dir1')) {
-*    print "could not delete file1 or dir1";
-* }
-*
-* In case you need to to pass file names with spaces,
-* pass the params as an array:
-*
-* System::rm(array('-r', $file1, $dir1));
-*
-* @category   pear
-* @package    System
-* @author     Tomas V.V. Cox 
-* @copyright  1997-2006 The PHP Group
-* @license    http://www.php.net/license/3_0.txt  PHP License 3.0
-* @version    Release: 1.5.0a1
-* @link       http://pear.php.net/package/PEAR
-* @since      Class available since Release 0.1
-*/
-class System
-{
-    /**
-    * returns the commandline arguments of a function
-    *
-    * @param    string  $argv           the commandline
-    * @param    string  $short_options  the allowed option short-tags
-    * @param    string  $long_options   the allowed option long-tags
-    * @return   array   the given options and there values
-    * @access private
-    */
-    function _parseArgs($argv, $short_options, $long_options = null)
-    {
-        if (!is_array($argv) && $argv !== null) {
-            $argv = preg_split('/\s+/', $argv, -1, PREG_SPLIT_NO_EMPTY);
-        }
-        return Console_Getopt::getopt2($argv, $short_options);
-    }
-
-    /**
-    * Output errors with PHP trigger_error(). You can silence the errors
-    * with prefixing a "@" sign to the function call: @System::mkdir(..);
-    *
-    * @param mixed $error a PEAR error or a string with the error message
-    * @return bool false
-    * @access private
-    */
-    function raiseError($error)
-    {
-        if (PEAR::isError($error)) {
-            $error = $error->getMessage();
-        }
-        trigger_error($error, E_USER_WARNING);
-        return false;
-    }
-
-    /**
-    * Creates a nested array representing the structure of a directory
-    *
-    * System::_dirToStruct('dir1', 0) =>
-    *   Array
-    *    (
-    *    [dirs] => Array
-    *        (
-    *            [0] => dir1
-    *        )
-    *
-    *    [files] => Array
-    *        (
-    *            [0] => dir1/file2
-    *            [1] => dir1/file3
-    *        )
-    *    )
-    * @param    string  $sPath      Name of the directory
-    * @param    integer $maxinst    max. deep of the lookup
-    * @param    integer $aktinst    starting deep of the lookup
-    * @return   array   the structure of the dir
-    * @access   private
-    */
-
-    function _dirToStruct($sPath, $maxinst, $aktinst = 0)
-    {
-        $struct = array('dirs' => array(), 'files' => array());
-        if (($dir = @opendir($sPath)) === false) {
-            System::raiseError("Could not open dir $sPath");
-            return $struct; // XXX could not open error
-        }
-        $struct['dirs'][] = $sPath = realpath($sPath); // XXX don't add if '.' or '..' ?
-        $list = array();
-        while (false !== ($file = readdir($dir))) {
-            if ($file != '.' && $file != '..') {
-                $list[] = $file;
-            }
-        }
-        closedir($dir);
-        sort($list);
-        if ($aktinst < $maxinst || $maxinst == 0) {
-            foreach($list as $val) {
-                $path = $sPath . DIRECTORY_SEPARATOR . $val;
-                if (is_dir($path) && !is_link($path)) {
-                    $tmp = System::_dirToStruct($path, $maxinst, $aktinst+1);
-                    $struct = array_merge_recursive($tmp, $struct);
-                } else {
-                    $struct['files'][] = $path;
-                }
-            }
-        }
-        return $struct;
-    }
-
-    /**
-    * Creates a nested array representing the structure of a directory and files
-    *
-    * @param    array $files Array listing files and dirs
-    * @return   array
-    * @see System::_dirToStruct()
-    */
-    function _multipleToStruct($files)
-    {
-        $struct = array('dirs' => array(), 'files' => array());
-        settype($files, 'array');
-        foreach ($files as $file) {
-            if (is_dir($file) && !is_link($file)) {
-                $tmp = System::_dirToStruct($file, 0);
-                $struct = array_merge_recursive($tmp, $struct);
-            } else {
-                $struct['files'][] = $file;
-            }
-        }
-        return $struct;
-    }
-
-    /**
-    * The rm command for removing files.
-    * Supports multiple files and dirs and also recursive deletes
-    *
-    * @param    string  $args   the arguments for rm
-    * @return   mixed   PEAR_Error or true for success
-    * @access   public
-    */
-    function rm($args)
-    {
-        $opts = System::_parseArgs($args, 'rf'); // "f" do nothing but like it :-)
-        if (PEAR::isError($opts)) {
-            return System::raiseError($opts);
-        }
-        foreach($opts[0] as $opt) {
-            if ($opt[0] == 'r') {
-                $do_recursive = true;
-            }
-        }
-        $ret = true;
-        if (isset($do_recursive)) {
-            $struct = System::_multipleToStruct($opts[1]);
-            foreach($struct['files'] as $file) {
-                if (!@unlink($file)) {
-                    $ret = false;
-                }
-            }
-            foreach($struct['dirs'] as $dir) {
-                if (!@rmdir($dir)) {
-                    $ret = false;
-                }
-            }
-        } else {
-            foreach ($opts[1] as $file) {
-                $delete = (is_dir($file)) ? 'rmdir' : 'unlink';
-                if (!@$delete($file)) {
-                    $ret = false;
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-    * Make directories.
-    *
-    * The -p option will create parent directories
-    * @param    string  $args    the name of the director(y|ies) to create
-    * @return   bool    True for success
-    * @access   public
-    */
-    function mkDir($args)
-    {
-        $opts = System::_parseArgs($args, 'pm:');
-        if (PEAR::isError($opts)) {
-            return System::raiseError($opts);
-        }
-        $mode = 0777; // default mode
-        foreach($opts[0] as $opt) {
-            if ($opt[0] == 'p') {
-                $create_parents = true;
-            } elseif($opt[0] == 'm') {
-                // if the mode is clearly an octal number (starts with 0)
-                // convert it to decimal
-                if (strlen($opt[1]) && $opt[1]{0} == '0') {
-                    $opt[1] = octdec($opt[1]);
-                } else {
-                    // convert to int
-                    $opt[1] += 0;
-                }
-                $mode = $opt[1];
-            }
-        }
-        $ret = true;
-        if (isset($create_parents)) {
-            foreach($opts[1] as $dir) {
-                $dirstack = array();
-                while ((!file_exists($dir) || !is_dir($dir)) &&
-                        $dir != DIRECTORY_SEPARATOR) {
-                    array_unshift($dirstack, $dir);
-                    $dir = dirname($dir);
-                }
-                while ($newdir = array_shift($dirstack)) {
-                    if (!is_writeable(dirname($newdir))) {
-                        $ret = false;
-                        break;
-                    }
-                    if (!mkdir($newdir, $mode)) {
-                        $ret = false;
-                    }
-                }
-            }
-        } else {
-            foreach($opts[1] as $dir) {
-                if ((@file_exists($dir) || !is_dir($dir)) && !mkdir($dir, $mode)) {
-                    $ret = false;
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-    * Concatenate files
-    *
-    * Usage:
-    * 1) $var = System::cat('sample.txt test.txt');
-    * 2) System::cat('sample.txt test.txt > final.txt');
-    * 3) System::cat('sample.txt test.txt >> final.txt');
-    *
-    * Note: as the class use fopen, urls should work also (test that)
-    *
-    * @param    string  $args   the arguments
-    * @return   boolean true on success
-    * @access   public
-    */
-    function &cat($args)
-    {
-        $ret = null;
-        $files = array();
-        if (!is_array($args)) {
-            $args = preg_split('/\s+/', $args, -1, PREG_SPLIT_NO_EMPTY);
-        }
-        for($i=0; $i < count($args); $i++) {
-            if ($args[$i] == '>') {
-                $mode = 'wb';
-                $outputfile = $args[$i+1];
-                break;
-            } elseif ($args[$i] == '>>') {
-                $mode = 'ab+';
-                $outputfile = $args[$i+1];
-                break;
-            } else {
-                $files[] = $args[$i];
-            }
-        }
-        $outputfd = false;
-        if (isset($mode)) {
-            if (!$outputfd = fopen($outputfile, $mode)) {
-                $err = System::raiseError("Could not open $outputfile");
-                return $err;
-            }
-            $ret = true;
-        }
-        foreach ($files as $file) {
-            if (!$fd = fopen($file, 'r')) {
-                System::raiseError("Could not open $file");
-                continue;
-            }
-            while ($cont = fread($fd, 2048)) {
-                if (is_resource($outputfd)) {
-                    fwrite($outputfd, $cont);
-                } else {
-                    $ret .= $cont;
-                }
-            }
-            fclose($fd);
-        }
-        if (is_resource($outputfd)) {
-            fclose($outputfd);
-        }
-        return $ret;
-    }
-
-    /**
-    * Creates temporary files or directories. This function will remove
-    * the created files when the scripts finish its execution.
-    *
-    * Usage:
-    *   1) $tempfile = System::mktemp("prefix");
-    *   2) $tempdir  = System::mktemp("-d prefix");
-    *   3) $tempfile = System::mktemp();
-    *   4) $tempfile = System::mktemp("-t /var/tmp prefix");
-    *
-    * prefix -> The string that will be prepended to the temp name
-    *           (defaults to "tmp").
-    * -d     -> A temporary dir will be created instead of a file.
-    * -t     -> The target dir where the temporary (file|dir) will be created. If
-    *           this param is missing by default the env vars TMP on Windows or
-    *           TMPDIR in Unix will be used. If these vars are also missing
-    *           c:\windows\temp or /tmp will be used.
-    *
-    * @param   string  $args  The arguments
-    * @return  mixed   the full path of the created (file|dir) or false
-    * @see System::tmpdir()
-    * @access  public
-    */
-    function mktemp($args = null)
-    {
-        static $first_time = true;
-        $opts = System::_parseArgs($args, 't:d');
-        if (PEAR::isError($opts)) {
-            return System::raiseError($opts);
-        }
-        foreach($opts[0] as $opt) {
-            if($opt[0] == 'd') {
-                $tmp_is_dir = true;
-            } elseif($opt[0] == 't') {
-                $tmpdir = $opt[1];
-            }
-        }
-        $prefix = (isset($opts[1][0])) ? $opts[1][0] : 'tmp';
-        if (!isset($tmpdir)) {
-            $tmpdir = System::tmpdir();
-        }
-        if (!System::mkDir(array('-p', $tmpdir))) {
-            return false;
-        }
-        $tmp = tempnam($tmpdir, $prefix);
-        if (isset($tmp_is_dir)) {
-            unlink($tmp); // be careful possible race condition here
-            if (!mkdir($tmp, 0700)) {
-                return System::raiseError("Unable to create temporary directory $tmpdir");
-            }
-        }
-        $GLOBALS['_System_temp_files'][] = $tmp;
-        if ($first_time) {
-            PEAR::registerShutdownFunc(array('System', '_removeTmpFiles'));
-            $first_time = false;
-        }
-        return $tmp;
-    }
-
-    /**
-    * Remove temporary files created my mkTemp. This function is executed
-    * at script shutdown time
-    *
-    * @access private
-    */
-    function _removeTmpFiles()
-    {
-        if (count($GLOBALS['_System_temp_files'])) {
-            $delete = $GLOBALS['_System_temp_files'];
-            array_unshift($delete, '-r');
-            System::rm($delete);
-            $GLOBALS['_System_temp_files'] = array();
-        }
-    }
-
-    /**
-    * Get the path of the temporal directory set in the system
-    * by looking in its environments variables.
-    * Note: php.ini-recommended removes the "E" from the variables_order setting,
-    * making unavaible the $_ENV array, that s why we do tests with _ENV
-    *
-    * @return string The temporal directory on the system
-    */
-    function tmpdir()
-    {
-        if (OS_WINDOWS) {
-            if ($var = isset($_ENV['TEMP']) ? $_ENV['TEMP'] : getenv('TEMP')) {
-                return $var;
-            }
-            if ($var = isset($_ENV['TMP']) ? $_ENV['TMP'] : getenv('TMP')) {
-                return $var;
-            }
-            if ($var = isset($_ENV['windir']) ? $_ENV['windir'] : getenv('windir')) {
-                return $var;
-            }
-            return getenv('SystemRoot') . '\temp';
-        }
-        if ($var = isset($_ENV['TMPDIR']) ? $_ENV['TMPDIR'] : getenv('TMPDIR')) {
-            return $var;
-        }
-        return '/tmp';
-    }
-
-    /**
-    * The "which" command (show the full path of a command)
-    *
-    * @param string $program The command to search for
-    * @param mixed  $fallback Value to return if $program is not found
-    *
-    * @return mixed A string with the full path or false if not found
-    * @author Stig Bakken 
-    */
-    function which($program, $fallback = false)
-    {
-        // enforce API
-        if (!is_string($program) || '' == $program) {
-            return $fallback;
-        }
-
-        // available since 4.3.0RC2
-        if (defined('PATH_SEPARATOR')) {
-            $path_delim = PATH_SEPARATOR;
-        } else {
-            $path_delim = OS_WINDOWS ? ';' : ':';
-        }
-        // full path given
-        if (basename($program) != $program) {
-            $path_elements[] = dirname($program);
-            $program = basename($program);
-        } else {
-            // Honor safe mode
-            if (!ini_get('safe_mode') || !$path = ini_get('safe_mode_exec_dir')) {
-                $path = getenv('PATH');
-                if (!$path) {
-                    $path = getenv('Path'); // some OSes are just stupid enough to do this
-                }
-            }
-            $path_elements = explode($path_delim, $path);
-        }
-
-        if (OS_WINDOWS) {
-            $exe_suffixes = getenv('PATHEXT')
-                                ? explode($path_delim, getenv('PATHEXT'))
-                                : array('.exe','.bat','.cmd','.com');
-            // allow passing a command.exe param
-            if (strpos($program, '.') !== false) {
-                array_unshift($exe_suffixes, '');
-            }
-            // is_executable() is not available on windows for PHP4
-            $pear_is_executable = (function_exists('is_executable')) ? 'is_executable' : 'is_file';
-        } else {
-            $exe_suffixes = array('');
-            $pear_is_executable = 'is_executable';
-        }
-
-        foreach ($exe_suffixes as $suff) {
-            foreach ($path_elements as $dir) {
-                $file = $dir . DIRECTORY_SEPARATOR . $program . $suff;
-                if (@$pear_is_executable($file)) {
-                    return $file;
-                }
-            }
-        }
-        return $fallback;
-    }
-
-    /**
-    * The "find" command
-    *
-    * Usage:
-    *
-    * System::find($dir);
-    * System::find("$dir -type d");
-    * System::find("$dir -type f");
-    * System::find("$dir -name *.php");
-    * System::find("$dir -name *.php -name *.htm*");
-    * System::find("$dir -maxdepth 1");
-    *
-    * Params implmented:
-    * $dir            -> Start the search at this directory
-    * -type d         -> return only directories
-    * -type f         -> return only files
-    * -maxdepth    -> max depth of recursion
-    * -name  -> search pattern (bash style). Multiple -name param allowed
-    *
-    * @param  mixed Either array or string with the command line
-    * @return array Array of found files
-    *
-    */
-    function find($args)
-    {
-        if (!is_array($args)) {
-            $args = preg_split('/\s+/', $args, -1, PREG_SPLIT_NO_EMPTY);
-        }
-        $dir = array_shift($args);
-        $patterns = array();
-        $depth = 0;
-        $do_files = $do_dirs = true;
-        for ($i = 0; $i < count($args); $i++) {
-            switch ($args[$i]) {
-                case '-type':
-                    if (in_array($args[$i+1], array('d', 'f'))) {
-                        if ($args[$i+1] == 'd') {
-                            $do_files = false;
-                        } else {
-                            $do_dirs = false;
-                        }
-                    }
-                    $i++;
-                    break;
-                case '-name':
-                    if (OS_WINDOWS) {
-                        if ($args[$i+1]{0} == '\\') {
-                            // prepend drive
-                            $args[$i+1] = addslashes(substr(getcwd(), 0, 2) . $args[$i + 1]);
-                        }
-                        // escape path separators to avoid PCRE problems
-                        $args[$i+1] = str_replace('\\', '\\\\', $args[$i+1]);
-                    }
-                    $patterns[] = "(" . preg_replace(array('/\./', '/\*/'),
-                                                     array('\.', '.*', ),
-                                                     $args[$i+1])
-                                      . ")";
-                    $i++;
-                    break;
-                case '-maxdepth':
-                    $depth = $args[$i+1];
-                    break;
-            }
-        }
-        $path = System::_dirToStruct($dir, $depth);
-        if ($do_files && $do_dirs) {
-            $files = array_merge($path['files'], $path['dirs']);
-        } elseif ($do_dirs) {
-            $files = $path['dirs'];
-        } else {
-            $files = $path['files'];
-        }
-        if (count($patterns)) {
-            $patterns = implode('|', $patterns);
-            $ret = array();
-            for ($i = 0; $i < count($files); $i++) {
-                if (preg_match("#^$patterns\$#", $files[$i])) {
-                    $ret[] = $files[$i];
-                }
-            }
-            return $ret;
-        }
-        return $files;
-    }
-}
-?>
diff --git a/Zend/Feed.php b/Zend/Feed.php
deleted file mode 100644
index b4267cf..0000000
--- a/Zend/Feed.php
+++ /dev/null
@@ -1,403 +0,0 @@
- 'http://a9.com/-/spec/opensearchrss/1.0/',
-        'atom'       => 'http://www.w3.org/2005/Atom',
-        'rss'        => 'http://blogs.law.harvard.edu/tech/rss',
-    );
-
-
-    /**
-     * Set the HTTP client instance
-     *
-     * Sets the HTTP client object to use for retrieving the feeds.
-     *
-     * @param  Zend_Http_Client $httpClient
-     * @return void
-     */
-    public static function setHttpClient(Zend_Http_Client $httpClient)
-    {
-        self::$_httpClient = $httpClient;
-    }
-
-
-    /**
-     * Gets the HTTP client object. If none is set, a new Zend_Http_Client will be used.
-     *
-     * @return Zend_Http_Client_Abstract
-     */
-    public static function getHttpClient()
-    {
-        if (!self::$_httpClient instanceof Zend_Http_Client) {
-            /**
-             * @see Zend_Http_Client
-             */
-            require_once 'Zend/Http/Client.php';
-            self::$_httpClient = new Zend_Http_Client();
-        }
-
-        return self::$_httpClient;
-    }
-
-
-    /**
-     * Toggle using POST instead of PUT and DELETE HTTP methods
-     *
-     * Some feed implementations do not accept PUT and DELETE HTTP
-     * methods, or they can't be used because of proxies or other
-     * measures. This allows turning on using POST where PUT and
-     * DELETE would normally be used; in addition, an
-     * X-Method-Override header will be sent with a value of PUT or
-     * DELETE as appropriate.
-     *
-     * @param  boolean $override Whether to override PUT and DELETE.
-     * @return void
-     */
-    public static function setHttpMethodOverride($override = true)
-    {
-        self::$_httpMethodOverride = $override;
-    }
-
-
-    /**
-     * Get the HTTP override state
-     *
-     * @return boolean
-     */
-    public static function getHttpMethodOverride()
-    {
-        return self::$_httpMethodOverride;
-    }
-
-
-    /**
-     * Get the full version of a namespace prefix
-     *
-     * Looks up a prefix (atom:, etc.) in the list of registered
-     * namespaces and returns the full namespace URI if
-     * available. Returns the prefix, unmodified, if it's not
-     * registered.
-     *
-     * @return string
-     */
-    public static function lookupNamespace($prefix)
-    {
-        return isset(self::$_namespaces[$prefix]) ?
-            self::$_namespaces[$prefix] :
-            $prefix;
-    }
-
-
-    /**
-     * Add a namespace and prefix to the registered list
-     *
-     * Takes a prefix and a full namespace URI and adds them to the
-     * list of registered namespaces for use by
-     * Zend_Feed::lookupNamespace().
-     *
-     * @param  string $prefix The namespace prefix
-     * @param  string $namespaceURI The full namespace URI
-     * @return void
-     */
-    public static function registerNamespace($prefix, $namespaceURI)
-    {
-        self::$_namespaces[$prefix] = $namespaceURI;
-    }
-
-
-    /**
-     * Imports a feed located at $uri.
-     *
-     * @param  string $uri
-     * @throws Zend_Feed_Exception
-     * @return Zend_Feed_Abstract
-     */
-    public static function import($uri)
-    {
-        $client = self::getHttpClient();
-        $client->setUri($uri);
-        $response = $client->request('GET');
-        if ($response->getStatus() !== 200) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus());
-        }
-        $feed = $response->getBody();
-        return self::importString($feed);
-    }
-
-
-    /**
-     * Imports a feed represented by $string.
-     *
-     * @param  string $string
-     * @throws Zend_Feed_Exception
-     * @return Zend_Feed_Abstract
-     */
-    public static function importString($string)
-    {
-        // Load the feed as an XML DOMDocument object
-        @ini_set('track_errors', 1);
-        $doc = @DOMDocument::loadXML($string);
-        @ini_restore('track_errors');
-
-        if (!$doc) {
-            // prevent the class to generate an undefined variable notice (ZF-2590)
-            if (!isset($php_errormsg)) {
-                if (function_exists('xdebug_is_enabled')) {
-                    $php_errormsg = '(error message not available, when XDebug is running)';
-                } else {
-                    $php_errormsg = '(error message not available)';
-                }
-            }
-
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception("DOMDocument cannot parse XML: $php_errormsg");
-        }
-
-        // Try to find the base feed element or a single  of an Atom feed
-        if ($doc->getElementsByTagName('feed')->item(0) ||
-            $doc->getElementsByTagName('entry')->item(0)) {
-            /**
-             * @see Zend_Feed_Atom
-             */
-            require_once 'Zend/Feed/Atom.php';
-            // return a newly created Zend_Feed_Atom object
-            return new Zend_Feed_Atom(null, $string);
-        }
-
-        // Try to find the base feed element of an RSS feed
-        if ($doc->getElementsByTagName('channel')->item(0)) {
-            /**
-             * @see Zend_Feed_Rss
-             */
-            require_once 'Zend/Feed/Rss.php';
-            // return a newly created Zend_Feed_Rss object
-            return new Zend_Feed_Rss(null, $string);
-        }
-
-        // $string does not appear to be a valid feed of the supported types
-        /**
-         * @see Zend_Feed_Exception
-         */
-        require_once 'Zend/Feed/Exception.php';
-        throw new Zend_Feed_Exception('Invalid or unsupported feed format');
-    }
-
-
-    /**
-     * Imports a feed from a file located at $filename.
-     *
-     * @param  string $filename
-     * @throws Zend_Feed_Exception
-     * @return Zend_Feed_Abstract
-     */
-    public static function importFile($filename)
-    {
-        @ini_set('track_errors', 1);
-        $feed = @file_get_contents($filename);
-        @ini_restore('track_errors');
-        if ($feed === false) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception("File could not be loaded: $php_errormsg");
-        }
-        return self::importString($feed);
-    }
-
-
-    /**
-     * Attempts to find feeds at $uri referenced by  tags. Returns an
-     * array of the feeds referenced at $uri.
-     *
-     * @todo Allow findFeeds() to follow one, but only one, code 302.
-     *
-     * @param  string $uri
-     * @throws Zend_Feed_Exception
-     * @return array
-     */
-    public static function findFeeds($uri)
-    {
-        // Get the HTTP response from $uri and save the contents
-        $client = self::getHttpClient();
-        $client->setUri($uri);
-        $response = $client->request();
-        if ($response->getStatus() !== 200) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception("Failed to access $uri, got response code " . $response->getStatus());
-        }
-        $contents = $response->getBody();
-
-        // Parse the contents for appropriate  tags
-        @ini_set('track_errors', 1);
-        $pattern = '~(]+)/?>~i';
-        $result = @preg_match_all($pattern, $contents, $matches);
-        @ini_restore('track_errors');
-        if ($result === false) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception("Internal error: $php_errormsg");
-        }
-
-        // Try to fetch a feed for each link tag that appears to refer to a feed
-        $feeds = array();
-        if (isset($matches[1]) && count($matches[1]) > 0) {
-            foreach ($matches[1] as $link) {
-                // force string to be an utf-8 one
-                if (!mb_check_encoding($link, 'UTF-8')) {
-                    $link = mb_convert_encoding($link, 'UTF-8');
-                }
-                $xml = @simplexml_load_string(rtrim($link, ' /') . ' />');
-                if ($xml === false) {
-                    continue;
-                }
-                $attributes = $xml->attributes();
-                if (!isset($attributes['rel']) || !@preg_match('~^(?:alternate|service\.feed)~i', $attributes['rel'])) {
-                    continue;
-                }
-                if (!isset($attributes['type']) ||
-                        !@preg_match('~^application/(?:atom|rss|rdf)\+xml~', $attributes['type'])) {
-                    continue;
-                }
-                if (!isset($attributes['href'])) {
-                    continue;
-                }
-                try {
-                    // checks if we need to canonize the given uri
-                    try {
-                        $uri = Zend_Uri::factory((string) $attributes['href']);
-                    } catch (Zend_Uri_Exception $e) {
-                        // canonize the uri
-                        $path = (string) $attributes['href'];
-                        $query = $fragment = '';
-                        if (substr($path, 0, 1) != '/') {
-                            // add the current root path to this one
-                            $path = rtrim($client->getUri()->getPath(), '/') . '/' . $path;
-                        }
-                        if (strpos($path, '?') !== false) {
-                            list($path, $query) = explode('?', $path, 2);
-                        }
-                        if (strpos($query, '#') !== false) {
-                            list($query, $fragment) = explode('#', $query, 2);
-                        }
-                        $uri = Zend_Uri::factory($client->getUri(true));
-                        $uri->setPath($path);
-                        $uri->setQuery($query);
-                        $uri->setFragment($fragment);
-                    }
-
-                    $feed = self::import($uri);
-                } catch (Exception $e) {
-                    continue;
-                }
-                $feeds[] = $feed;
-            }
-        }
-
-        // Return the fetched feeds
-        return $feeds;
-    }
-
-    /**
-     * Construct a new Zend_Feed_Abstract object from a custom array
-     *
-     * @param  array  $data
-     * @param  string $format (rss|atom) the requested output format
-     * @return Zend_Feed_Abstract
-     */
-    public static function importArray(array $data, $format = 'atom')
-    {
-        $obj = 'Zend_Feed_' . ucfirst(strtolower($format));
-        /**
-         * @see Zend_Loader
-         */
-        require_once 'Zend/Loader.php';
-        Zend_Loader::loadClass($obj);
-        Zend_Loader::loadClass('Zend_Feed_Builder');
-
-        return new $obj(null, null, new Zend_Feed_Builder($data));
-    }
-
-    /**
-     * Construct a new Zend_Feed_Abstract object from a Zend_Feed_Builder_Interface data source
-     *
-     * @param  Zend_Feed_Builder_Interface $builder this object will be used to extract the data of the feed
-     * @param  string                      $format (rss|atom) the requested output format
-     * @return Zend_Feed_Abstract
-     */
-    public static function importBuilder(Zend_Feed_Builder_Interface $builder, $format = 'atom')
-    {
-        $obj = 'Zend_Feed_' . ucfirst(strtolower($format));
-        /**
-         * @see Zend_Loader
-         */
-        require_once 'Zend/Loader.php';
-        Zend_Loader::loadClass($obj);
-
-        return new $obj(null, null, $builder);
-    }
-}
diff --git a/Zend/Feed/Abstract.php b/Zend/Feed/Abstract.php
deleted file mode 100644
index 9910be5..0000000
--- a/Zend/Feed/Abstract.php
+++ /dev/null
@@ -1,258 +0,0 @@
-setUri($uri);
-            $response = $client->request('GET');
-            if ($response->getStatus() !== 200) {
-                /** 
-                 * @see Zend_Feed_Exception
-                 */
-                require_once 'Zend/Feed/Exception.php';
-            	throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus());
-            }
-            $this->_element = $response->getBody();
-            $this->__wakeup();
-        } elseif ($string !== null) {
-            // Retrieve the feed from $string
-            $this->_element = $string;
-            $this->__wakeup();
-        } else {
-            // Generate the feed from the array
-            $header = $builder->getHeader();
-            $this->_element = new DOMDocument('1.0', $header['charset']);
-            $root = $this->_mapFeedHeaders($header);
-            $this->_mapFeedEntries($root, $builder->getEntries());
-            $this->_element = $root;
-            $this->_buildEntryCache();
-        }
-    }
-
-
-    /**
-     * Load the feed as an XML DOMDocument object
-     *
-     * @return void
-     * @throws Zend_Feed_Exception
-     */
-    public function __wakeup()
-    {
-        @ini_set('track_errors', 1);
-        $doc = @DOMDocument::loadXML($this->_element);
-        @ini_restore('track_errors');
-
-        if (!$doc) {
-            // prevent the class to generate an undefined variable notice (ZF-2590)
-            if (!isset($php_errormsg)) {
-                if (function_exists('xdebug_is_enabled')) {
-                    $php_errormsg = '(error message not available, when XDebug is running)';
-                } else {
-                    $php_errormsg = '(error message not available)';
-                }
-            }
-            
-            /** 
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception("DOMDocument cannot parse XML: $php_errormsg");
-        }
-
-        $this->_element = $doc;
-    }
-
-
-    /**
-     * Prepare for serialiation
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        $this->_element = $this->saveXML();
-
-        return array('_element');
-    }
-
-
-    /**
-     * Cache the individual feed elements so they don't need to be
-     * searched for on every operation.
-     *
-     * @return void
-     */
-    protected function _buildEntryCache()
-    {
-        $this->_entries = array();
-        foreach ($this->_element->childNodes as $child) {
-            if ($child->localName == $this->_entryElementName) {
-                $this->_entries[] = $child;
-            }
-        }
-    }
-
-
-    /**
-     * Get the number of entries in this feed object.
-     *
-     * @return integer Entry count.
-     */
-    public function count()
-    {
-        return count($this->_entries);
-    }
-
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->_entryIndex = 0;
-    }
-
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return mixed The current row, or null if no rows.
-     */
-    public function current()
-    {
-        return new $this->_entryClassName(
-            null,
-            $this->_entries[$this->_entryIndex]);
-    }
-
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return mixed The current row number (starts at 0), or NULL if no rows
-     */
-    public function key()
-    {
-        return $this->_entryIndex;
-    }
-
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return mixed The next row, or null if no more rows.
-     */
-    public function next()
-    {
-        ++$this->_entryIndex;
-    }
-
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return boolean Whether the iteration is valid
-     */
-    public function valid()
-    {
-        return 0 <= $this->_entryIndex && $this->_entryIndex < $this->count();
-    }
-
-    /**
-     * Generate the header of the feed when working in write mode
-     *
-     * @param  array $array the data to use
-     * @return DOMElement root node
-     */
-    abstract protected function _mapFeedHeaders($array);
-
-    /**
-     * Generate the entries of the feed when working in write mode
-     *
-     * @param  DOMElement $root the root node to use
-     * @param  array $array the data to use
-     * @return DOMElement root node
-     */
-    abstract protected function _mapFeedEntries(DOMElement $root, $array);
-
-    /**
-     * Send feed to a http client with the correct header
-     *
-     * @throws Zend_Feed_Exception if headers have already been sent
-     * @return void
-     */
-    abstract public function send();
-}
diff --git a/Zend/Feed/Atom.php b/Zend/Feed/Atom.php
deleted file mode 100644
index 21b9b62..0000000
--- a/Zend/Feed/Atom.php
+++ /dev/null
@@ -1,390 +0,0 @@
-
-     * elements).
-     *
-     * @var string
-     */
-    protected $_entryElementName = 'entry';
-
-    /**
-     * The default namespace for Atom feeds.
-     *
-     * @var string
-     */
-    protected $_defaultNamespace = 'atom';
-
-
-    /**
-     * Override Zend_Feed_Abstract to set up the $_element and $_entries aliases.
-     *
-     * @return void
-     * @throws Zend_Feed_Exception
-     */
-    public function __wakeup()
-    {
-        parent::__wakeup();
-
-        // Find the base feed element and create an alias to it.
-        $element = $this->_element->getElementsByTagName('feed')->item(0);
-        if (!$element) {
-            // Try to find a single  instead.
-            $element = $this->_element->getElementsByTagName($this->_entryElementName)->item(0);
-            if (!$element) {
-                /** 
-                 * @see Zend_Feed_Exception
-                 */
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('No root  or <' . $this->_entryElementName
-                                              . '> element found, cannot parse feed.');
-            }
-
-            $doc = new DOMDocument($this->_element->version,
-                                   $this->_element->actualEncoding);
-            $feed = $doc->appendChild($doc->createElement('feed'));
-            $feed->appendChild($doc->importNode($element, true));
-            $element = $feed;
-        }
-
-        $this->_element = $element;
-
-        // Find the entries and save a pointer to them for speed and
-        // simplicity.
-        $this->_buildEntryCache();
-    }
-
-
-    /**
-     * Easy access to  tags keyed by "rel" attributes.
-     *
-     * If $elt->link() is called with no arguments, we will attempt to
-     * return the value of the  tag(s) like all other
-     * method-syntax attribute access. If an argument is passed to
-     * link(), however, then we will return the "href" value of the
-     * first  tag that has a "rel" attribute matching $rel:
-     *
-     * $elt->link(): returns the value of the link tag.
-     * $elt->link('self'): returns the href from the first  in the entry.
-     *
-     * @param  string $rel The "rel" attribute to look for.
-     * @return mixed
-     */
-    public function link($rel = null)
-    {
-        if ($rel === null) {
-            return parent::__call('link', null);
-        }
-
-        // index link tags by their "rel" attribute.
-        $links = parent::__get('link');
-        if (!is_array($links)) {
-            if ($links instanceof Zend_Feed_Element) {
-                $links = array($links);
-            } else {
-                return $links;
-            }
-        }
-
-        foreach ($links as $link) {
-            if (empty($link['rel'])) {
-                continue;
-            }
-            if ($rel == $link['rel']) {
-                return $link['href'];
-            }
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Make accessing some individual elements of the feed easier.
-     *
-     * Special accessors 'entry' and 'entries' are provided so that if
-     * you wish to iterate over an Atom feed's entries, you can do so
-     * using foreach ($feed->entries as $entry) or foreach
-     * ($feed->entry as $entry).
-     *
-     * @param  string $var The property to access.
-     * @return mixed
-     */
-    public function __get($var)
-    {
-        switch ($var) {
-            case 'entry':
-                // fall through to the next case
-            case 'entries':
-                return $this;
-
-            default:
-                return parent::__get($var);
-        }
-    }
-
-    /**
-     * Generate the header of the feed when working in write mode
-     *
-     * @param  array $array the data to use
-     * @return DOMElement root node
-     */
-    protected function _mapFeedHeaders($array)
-    {
-        $feed = $this->_element->createElement('feed');
-        $feed->setAttribute('xmlns', 'http://www.w3.org/2005/Atom');
-
-        $id = $this->_element->createElement('id', $array->link);
-        $feed->appendChild($id);
-
-        $title = $this->_element->createElement('title');
-        $title->appendChild($this->_element->createCDATASection($array->title));
-        $feed->appendChild($title);
-
-        if (isset($array->author)) {
-            $author = $this->_element->createElement('author');
-            $name = $this->_element->createElement('name', $array->author);
-            $author->appendChild($name);
-            if (isset($array->email)) {
-                $email = $this->_element->createElement('email', $array->email);
-                $author->appendChild($email);
-            }
-            $feed->appendChild($author);
-        }
-
-        $updated = isset($array->lastUpdate) ? $array->lastUpdate : time();
-        $updated = $this->_element->createElement('updated', date(DATE_ATOM, $updated));
-        $feed->appendChild($updated);
-
-        if (isset($array->published)) {
-            $published = $this->_element->createElement('published', date(DATE_ATOM, $array->published));
-            $feed->appendChild($published);
-        }
-
-        $link = $this->_element->createElement('link');
-        $link->setAttribute('rel', 'self');
-        $link->setAttribute('href', $array->link);
-        if (isset($array->language)) {
-            $link->setAttribute('hreflang', $array->language);
-        }
-        $feed->appendChild($link);
-
-        if (isset($array->description)) {
-            $subtitle = $this->_element->createElement('subtitle');
-            $subtitle->appendChild($this->_element->createCDATASection($array->description));
-            $feed->appendChild($subtitle);
-        }
-
-        if (isset($array->copyright)) {
-            $copyright = $this->_element->createElement('rights', $array->copyright);
-            $feed->appendChild($copyright);
-        }
-
-        if (isset($array->image)) {
-            $image = $this->_element->createElement('logo', $array->image);
-            $feed->appendChild($image);
-        }
-
-        $generator = !empty($array->generator) ? $array->generator : 'Zend_Feed';
-        $generator = $this->_element->createElement('generator', $generator);
-        $feed->appendChild($generator);
-
-        return $feed;
-    }
-
-    /**
-     * Generate the entries of the feed when working in write mode
-     *
-     * The following nodes are constructed for each feed entry
-     * 
-     *    url to feed entry
-     *    entry title
-     *    last update
-     *    
-     *    short text
-     *    long version, can contain html
-     * 
-     *
-     * @param  array      $array the data to use
-     * @param  DOMElement $root  the root node to use
-     * @return void
-     */
-    protected function _mapFeedEntries(DOMElement $root, $array)
-    {
-        foreach ($array as $dataentry) {
-            $entry = $this->_element->createElement('entry');
-
-            $id = $this->_element->createElement('id', isset($dataentry->guid) ? $dataentry->guid : $dataentry->link);
-            $entry->appendChild($id);
-
-            $title = $this->_element->createElement('title');
-            $title->appendChild($this->_element->createCDATASection($dataentry->title));
-            $entry->appendChild($title);
-
-            $updated = isset($dataentry->lastUpdate) ? $dataentry->lastUpdate : time();
-            $updated = $this->_element->createElement('updated', date(DATE_ATOM, $updated));
-            $entry->appendChild($updated);
-
-            $link = $this->_element->createElement('link');
-            $link->setAttribute('rel', 'alternate');
-            $link->setAttribute('href', $dataentry->link);
-            $entry->appendChild($link);
-
-            $summary = $this->_element->createElement('summary');
-            $summary->appendChild($this->_element->createCDATASection($dataentry->description));
-            $entry->appendChild($summary);
-
-            if (isset($dataentry->content)) {
-                $content = $this->_element->createElement('content');
-                $content->setAttribute('type', 'html');
-                $content->appendChild($this->_element->createCDATASection($dataentry->content));
-                $entry->appendChild($content);
-            }
-
-            if (isset($dataentry->category)) {
-                foreach ($dataentry->category as $category) {
-                    $node = $this->_element->createElement('category');
-                    $node->setAttribute('term', $category['term']);
-                    if (isset($category['scheme'])) {
-                        $node->setAttribute('scheme', $category['scheme']);
-                    }
-                    $entry->appendChild($node);
-                }
-            }
-
-            if (isset($dataentry->source)) {
-                $source = $this->_element->createElement('source');
-                $title = $this->_element->createElement('title', $dataentry->source['title']);
-                $source->appendChild($title);
-                $link = $this->_element->createElement('link', $dataentry->source['title']);
-                $link->setAttribute('rel', 'alternate');
-                $link->setAttribute('href', $dataentry->source['url']);
-                $source->appendChild($link);
-            }
-
-            if (isset($dataentry->enclosure)) {
-                foreach ($dataentry->enclosure as $enclosure) {
-                    $node = $this->_element->createElement('link');
-                    $node->setAttribute('rel', 'enclosure');
-                    $node->setAttribute('href', $enclosure['url']);
-                    if (isset($enclosure['type'])) {
-                        $node->setAttribute('type', $enclosure['type']);
-                    }
-                    if (isset($enclosure['length'])) {
-                        $node->setAttribute('length', $enclosure['length']);
-                    }
-                    $entry->appendChild($node);
-                }
-            }
-
-            if (isset($dataentry->comments)) {
-                $comments = $this->_element->createElementNS('http://wellformedweb.org/CommentAPI/',
-                                                             'wfw:comment',
-                                                             $dataentry->comments);
-                $entry->appendChild($comments);
-            }
-            if (isset($dataentry->commentRss)) {
-                $comments = $this->_element->createElementNS('http://wellformedweb.org/CommentAPI/',
-                                                             'wfw:commentRss',
-                                                             $dataentry->commentRss);
-                $entry->appendChild($comments);
-            }
-
-            $root->appendChild($entry);
-        }
-    }
-
-    /**
-     * Override Zend_Feed_Element to allow formated feeds
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        // Return a complete document including XML prologue.
-        $doc = new DOMDocument($this->_element->ownerDocument->version,
-                               $this->_element->ownerDocument->actualEncoding);
-        $doc->appendChild($doc->importNode($this->_element, true));
-        $doc->formatOutput = true;
-
-        return $doc->saveXML();
-    }
-
-    /**
-     * Send feed to a http client with the correct header
-     *
-     * @return void
-     * @throws Zend_Feed_Exception if headers have already been sent
-     */
-    public function send()
-    {
-        if (headers_sent()) {
-            /** 
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Cannot send ATOM because headers have already been sent.');
-        }
-
-        header('Content-type: application/atom+xml; charset: ' . $this->_element->ownerDocument->actualEncoding);
-
-        echo $this->saveXML();
-    }
-}
diff --git a/Zend/Feed/Builder.php b/Zend/Feed/Builder.php
deleted file mode 100644
index 343a312..0000000
--- a/Zend/Feed/Builder.php
+++ /dev/null
@@ -1,395 +0,0 @@
-
-     *  array(
-     *  'title'       => 'title of the feed', //required
-     *  'link'        => 'canonical url to the feed', //required
-     *  'lastUpdate'  => 'timestamp of the update date', // optional
-     *  'published'   => 'timestamp of the publication date', //optional
-     *  'charset'     => 'charset', // required
-     *  'description' => 'short description of the feed', //optional
-     *  'author'      => 'author/publisher of the feed', //optional
-     *  'email'       => 'email of the author', //optional
-     *  'webmaster'   => 'email address for person responsible for technical issues' // optional, ignored if atom is used
-     *  'copyright'   => 'copyright notice', //optional
-     *  'image'       => 'url to image', //optional
-     *  'generator'   => 'generator', // optional
-     *  'language'    => 'language the feed is written in', // optional
-     *  'ttl'         => 'how long in minutes a feed can be cached before refreshing', // optional, ignored if atom is used
-     *  'rating'      => 'The PICS rating for the channel.', // optional, ignored if atom is used
-     *  'cloud'       => array(
-     *                    'domain'            => 'domain of the cloud, e.g. rpc.sys.com' // required
-     *                    'port'              => 'port to connect to' // optional, default to 80
-     *                    'path'              => 'path of the cloud, e.g. /RPC2 //required
-     *                    'registerProcedure' => 'procedure to call, e.g. myCloud.rssPleaseNotify' // required
-     *                    'protocol'          => 'protocol to use, e.g. soap or xml-rpc' // required
-     *                    ), a cloud to be notified of updates // optional, ignored if atom is used
-     *  'textInput'   => array(
-     *                    'title'       => 'the label of the Submit button in the text input area' // required,
-     *                    'description' => 'explains the text input area' // required
-     *                    'name'        => 'the name of the text object in the text input area' // required
-     *                    'link'        => 'the URL of the CGI script that processes text input requests' // required
-     *                    ) // a text input box that can be displayed with the feed // optional, ignored if atom is used
-     *  'skipHours'   => array(
-     *                    'hour in 24 format', // e.g 13 (1pm)
-     *                    // up to 24 rows whose value is a number between 0 and 23
-     *                    ) // Hint telling aggregators which hours they can skip // optional, ignored if atom is used
-     *  'skipDays '   => array(
-     *                    'a day to skip', // e.g Monday
-     *                    // up to 7 rows whose value is a Monday, Tuesday, Wednesday, Thursday, Friday, Saturday or Sunday
-     *                    ) // Hint telling aggregators which days they can skip // optional, ignored if atom is used
-     *  'itunes'      => array(
-     *                    'author'       => 'Artist column' // optional, default to the main author value
-     *                    'owner'        => array(
-     *                                        'name' => 'name of the owner' // optional, default to main author value
-     *                                        'email' => 'email of the owner' // optional, default to main email value
-     *                                        ) // Owner of the podcast // optional
-     *                    'image'        => 'album/podcast art' // optional, default to the main image value
-     *                    'subtitle'     => 'short description' // optional, default to the main description value
-     *                    'summary'      => 'longer description' // optional, default to the main description value
-     *                    'block'        => 'Prevent an episode from appearing (yes|no)' // optional
-     *                    'category'     => array(
-     *                                      array('main' => 'main category', // required
-     *                                            'sub'  => 'sub category' // optional
-     *                                        ),
-     *                                        // up to 3 rows
-     *                                        ) // 'Category column and in iTunes Music Store Browse' // required
-     *                    'explicit'     => 'parental advisory graphic (yes|no|clean)' // optional
-     *                    'keywords'     => 'a comma separated list of 12 keywords maximum' // optional
-     *                    'new-feed-url' => 'used to inform iTunes of new feed URL location' // optional
-     *                    ) // Itunes extension data // optional, ignored if atom is used
-     *  'entries'     => array(
-     *                   array(
-     *                    'title'        => 'title of the feed entry', //required
-     *                    'link'         => 'url to a feed entry', //required
-     *                    'description'  => 'short version of a feed entry', // only text, no html, required
-     *                    'guid'         => 'id of the article, if not given link value will used', //optional
-     *                    'content'      => 'long version', // can contain html, optional
-     *                    'lastUpdate'   => 'timestamp of the publication date', // optional
-     *                    'comments'     => 'comments page of the feed entry', // optional
-     *                    'commentRss'   => 'the feed url of the associated comments', // optional
-     *                    'source'       => array(
-     *                                        'title' => 'title of the original source' // required,
-     *                                        'url' => 'url of the original source' // required
-     *                                           ) // original source of the feed entry // optional
-     *                    'category'     => array(
-     *                                      array(
-     *                                        'term' => 'first category label' // required,
-     *                                        'scheme' => 'url that identifies a categorization scheme' // optional
-     *                                            ),
-     *                                      array(
-     *                                         //data for the second category and so on
-     *                                           )
-     *                                        ) // list of the attached categories // optional
-     *                    'enclosure'    => array(
-     *                                      array(
-     *                                        'url' => 'url of the linked enclosure' // required
-     *                                        'type' => 'mime type of the enclosure' // optional
-     *                                        'length' => 'length of the linked content in octets' // optional
-     *                                           ),
-     *                                      array(
-     *                                         //data for the second enclosure and so on
-     *                                           )
-     *                                        ) // list of the enclosures of the feed entry // optional
-     *                   ),
-     *                   array(
-     *                   //data for the second entry and so on
-     *                   )
-     *                 )
-     * );
-     * 
-     *
-     * @param  array $data
-     * @return void
-     */
-    public function __construct(array $data)
-    {
-        $this->_data = $data;
-        $this->_createHeader($data);
-        if (isset($data['entries'])) {
-            $this->_createEntries($data['entries']);
-        }
-    }
-
-    /**
-     * Returns an instance of Zend_Feed_Builder_Header
-     * describing the header of the feed
-     *
-     * @return Zend_Feed_Builder_Header
-     */
-    public function getHeader()
-    {
-        return $this->_header;
-    }
-
-    /**
-     * Returns an array of Zend_Feed_Builder_Entry instances
-     * describing the entries of the feed
-     *
-     * @return array of Zend_Feed_Builder_Entry
-     */
-    public function getEntries()
-    {
-        return $this->_entries;
-    }
-
-    /**
-     * Create the Zend_Feed_Builder_Header instance
-     *
-     * @param  array $data
-     * @throws Zend_Feed_Builder_Exception
-     * @return void
-     */
-    private function _createHeader(array $data)
-    {
-        $mandatories = array('title', 'link', 'charset');
-        foreach ($mandatories as $mandatory) {
-            if (!isset($data[$mandatory])) {
-                /**
-                 * @see Zend_Feed_Builder_Exception
-                 */
-                require_once 'Zend/Feed/Builder/Exception.php';
-                throw new Zend_Feed_Builder_Exception("$mandatory key is missing");
-            }
-        }
-        $this->_header = new Zend_Feed_Builder_Header($data['title'], $data['link'], $data['charset']);
-        if (isset($data['lastUpdate'])) {
-            $this->_header->setLastUpdate($data['lastUpdate']);
-        }
-        if (isset($data['published'])) {
-            $this->_header->setPublishedDate($data['published']);
-        }
-        if (isset($data['description'])) {
-            $this->_header->setDescription($data['description']);
-        }
-        if (isset($data['author'])) {
-            $this->_header->setAuthor($data['author']);
-        }
-        if (isset($data['email'])) {
-            $this->_header->setEmail($data['email']);
-        }
-        if (isset($data['webmaster'])) {
-            $this->_header->setWebmaster($data['webmaster']);
-        }
-        if (isset($data['copyright'])) {
-            $this->_header->setCopyright($data['copyright']);
-        }
-        if (isset($data['image'])) {
-            $this->_header->setImage($data['image']);
-        }
-        if (isset($data['generator'])) {
-            $this->_header->setGenerator($data['generator']);
-        }
-        if (isset($data['language'])) {
-            $this->_header->setLanguage($data['language']);
-        }
-        if (isset($data['ttl'])) {
-            $this->_header->setTtl($data['ttl']);
-        }
-        if (isset($data['rating'])) {
-            $this->_header->setRating($data['rating']);
-        }
-        if (isset($data['cloud'])) {
-            $mandatories = array('domain', 'path', 'registerProcedure', 'protocol');
-            foreach ($mandatories as $mandatory) {
-                if (!isset($data['cloud'][$mandatory])) {
-                    /**
-                     * @see Zend_Feed_Builder_Exception
-                     */
-                    require_once 'Zend/Feed/Builder/Exception.php';
-                    throw new Zend_Feed_Builder_Exception("you have to define $mandatory property of your cloud");
-                }
-            }
-            $uri_str = 'http://' . $data['cloud']['domain'] . $data['cloud']['path'];
-            $this->_header->setCloud($uri_str, $data['cloud']['registerProcedure'], $data['cloud']['protocol']);
-        }
-        if (isset($data['textInput'])) {
-            $mandatories = array('title', 'description', 'name', 'link');
-            foreach ($mandatories as $mandatory) {
-                if (!isset($data['textInput'][$mandatory])) {
-                    /**
-                     * @see Zend_Feed_Builder_Exception
-                     */
-                    require_once 'Zend/Feed/Builder/Exception.php';
-                    throw new Zend_Feed_Builder_Exception("you have to define $mandatory property of your textInput");
-                }
-            }
-            $this->_header->setTextInput($data['textInput']['title'],
-                                         $data['textInput']['description'],
-                                         $data['textInput']['name'],
-                                         $data['textInput']['link']);
-        }
-        if (isset($data['skipHours'])) {
-            $this->_header->setSkipHours($data['skipHours']);
-        }
-        if (isset($data['skipDays'])) {
-            $this->_header->setSkipDays($data['skipDays']);
-        }
-        if (isset($data['itunes'])) {
-            $itunes = new Zend_Feed_Builder_Header_Itunes($data['itunes']['category']);
-            if (isset($data['itunes']['author'])) {
-                $itunes->setAuthor($data['itunes']['author']);
-            }
-            if (isset($data['itunes']['owner'])) {
-                $name = isset($data['itunes']['owner']['name']) ? $data['itunes']['owner']['name'] : '';
-                $email = isset($data['itunes']['owner']['email']) ? $data['itunes']['owner']['email'] : '';
-                $itunes->setOwner($name, $email);
-            }
-            if (isset($data['itunes']['image'])) {
-                $itunes->setImage($data['itunes']['image']);
-            }
-            if (isset($data['itunes']['subtitle'])) {
-                $itunes->setSubtitle($data['itunes']['subtitle']);
-            }
-            if (isset($data['itunes']['summary'])) {
-                $itunes->setSummary($data['itunes']['summary']);
-            }
-            if (isset($data['itunes']['block'])) {
-                $itunes->setBlock($data['itunes']['block']);
-            }
-            if (isset($data['itunes']['explicit'])) {
-                $itunes->setExplicit($data['itunes']['explicit']);
-            }
-            if (isset($data['itunes']['keywords'])) {
-                $itunes->setKeywords($data['itunes']['keywords']);
-            }
-            if (isset($data['itunes']['new-feed-url'])) {
-                $itunes->setNewFeedUrl($data['itunes']['new-feed-url']);
-            }
-
-            $this->_header->setITunes($itunes);
-        }
-    }
-
-    /**
-     * Create the array of article entries
-     *
-     * @param  array $data
-     * @throws Zend_Feed_Builder_Exception
-     * @return void
-     */
-    private function _createEntries(array $data)
-    {
-        foreach ($data as $row) {
-            $mandatories = array('title', 'link', 'description');
-            foreach ($mandatories as $mandatory) {
-                if (!isset($row[$mandatory])) {
-                    /**
-                     * @see Zend_Feed_Builder_Exception
-                     */
-                    require_once 'Zend/Feed/Builder/Exception.php';
-                    throw new Zend_Feed_Builder_Exception("$mandatory key is missing");
-                }
-            }
-            $entry = new Zend_Feed_Builder_Entry($row['title'], $row['link'], $row['description']);
-            if (isset($row['guid'])) {
-                $entry->setId($row['guid']);
-            }
-            if (isset($row['content'])) {
-                $entry->setContent($row['content']);
-            }
-            if (isset($row['lastUpdate'])) {
-                $entry->setLastUpdate($row['lastUpdate']);
-            }
-            if (isset($row['comments'])) {
-                $entry->setCommentsUrl($row['comments']);
-            }
-            if (isset($row['commentRss'])) {
-                $entry->setCommentsRssUrl($row['commentRss']);
-            }
-            if (isset($row['source'])) {
-                $mandatories = array('title', 'url');
-                foreach ($mandatories as $mandatory) {
-                    if (!isset($row['source'][$mandatory])) {
-                        /**
-                         * @see Zend_Feed_Builder_Exception
-                         */
-                        require_once 'Zend/Feed/Builder/Exception.php';
-                        throw new Zend_Feed_Builder_Exception("$mandatory key of source property is missing");
-                    }
-                }
-                $entry->setSource($row['source']['title'], $row['source']['url']);
-            }
-            if (isset($row['category'])) {
-                $entry->setCategories($row['category']);
-            }
-            if (isset($row['enclosure'])) {
-                $entry->setEnclosures($row['enclosure']);
-            }
-
-            $this->_entries[] = $entry;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Zend/Feed/Builder/Entry.php b/Zend/Feed/Builder/Entry.php
deleted file mode 100644
index 0482ca8..0000000
--- a/Zend/Feed/Builder/Entry.php
+++ /dev/null
@@ -1,285 +0,0 @@
-offsetSet('title', $title);
-        $this->offsetSet('link', $link);
-        $this->offsetSet('description', $description);
-        $this->setLastUpdate(time());
-    }
-
-    /**
-     * Read only properties accessor
-     *
-     * @param  string $name property to read
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        if (!$this->offsetExists($name)) {
-            return NULL;
-        }
-
-        return $this->offsetGet($name);
-    }
-
-    /**
-     * Write properties accessor
-     *
-     * @param  string $name name of the property to set
-     * @param  mixed $value value to set
-     * @return void
-     */
-    public function __set($name, $value)
-    {
-        $this->offsetSet($name, $value);
-    }
-
-    /**
-     * Isset accessor
-     *
-     * @param  string $key
-     * @return boolean
-     */
-    public function __isset($key)
-    {
-        return $this->offsetExists($key);
-    }
-
-    /**
-     * Unset accessor
-     *
-     * @param  string $key
-     * @return void
-     */
-    public function __unset($key)
-    {
-        if ($this->offsetExists($key)) {
-            $this->offsetUnset($key);
-        }
-    }
-
-    /**
-     * Sets the id/guid of the entry
-     *
-     * @param  string $id
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setId($id)
-    {
-        $this->offsetSet('guid', $id);
-        return $this;
-    }
-
-    /**
-     * Sets the full html content of the entry
-     *
-     * @param  string $content
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setContent($content)
-    {
-        $this->offsetSet('content', $content);
-        return $this;
-    }
-
-    /**
-     * Timestamp of the update date
-     *
-     * @param  int $lastUpdate
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setLastUpdate($lastUpdate)
-    {
-        $this->offsetSet('lastUpdate', $lastUpdate);
-        return $this;
-    }
-
-    /**
-     * Sets the url of the commented page associated to the entry
-     *
-     * @param  string $comments
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setCommentsUrl($comments)
-    {
-        $this->offsetSet('comments', $comments);
-        return $this;
-    }
-
-    /**
-     * Sets the url of the comments feed link
-     *
-     * @param  string $commentRss
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setCommentsRssUrl($commentRss)
-    {
-        $this->offsetSet('commentRss', $commentRss);
-        return $this;
-    }
-
-    /**
-     * Defines a reference to the original source
-     *
-     * @param  string $title
-     * @param  string $url
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setSource($title, $url)
-    {
-        $this->offsetSet('source', array('title' => $title,
-                                         'url' => $url));
-        return $this;
-    }
-
-    /**
-     * Sets the categories of the entry
-     * Format of the array:
-     * 
-     * array(
-     *   array(
-     *         'term' => 'first category label',
-     *         'scheme' => 'url that identifies a categorization scheme' // optional
-     *        ),
-     *   // second category and so one
-     * )
-     * 
-     *
-     * @param  array $categories
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setCategories(array $categories)
-    {
-        foreach ($categories as $category) {
-            $this->addCategory($category);
-        }
-        return $this;
-    }
-
-    /**
-     * Add a category to the entry
-     *
-     * @param  array $category see Zend_Feed_Builder_Entry::setCategories() for format
-     * @return Zend_Feed_Builder_Entry
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function addCategory(array $category)
-    {
-        if (empty($category['term'])) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to define the name of the category");
-        }
-
-        if (!$this->offsetExists('category')) {
-            $categories = array($category);
-        } else {
-            $categories = $this->offsetGet('category');
-            $categories[] = $category;
-        }
-        $this->offsetSet('category', $categories);
-        return $this;
-    }
-
-    /**
-     * Sets the enclosures of the entry
-     * Format of the array:
-     * 
-     * array(
-     *   array(
-     *         'url' => 'url of the linked enclosure',
-     *         'type' => 'mime type of the enclosure' // optional
-     *         'length' => 'length of the linked content in octets' // optional
-     *        ),
-     *   // second enclosure and so one
-     * )
-     * 
-     *
-     * @param  array $enclosures
-     * @return Zend_Feed_Builder_Entry
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setEnclosures(array $enclosures)
-    {
-        foreach ($enclosures as $enclosure) {
-            if (empty($enclosure['url'])) {
-                /**
-                 * @see Zend_Feed_Builder_Exception
-                 */
-                require_once 'Zend/Feed/Builder/Exception.php';
-                throw new Zend_Feed_Builder_Exception("you have to supply an url for your enclosure");
-            }
-            $type = isset($enclosure['type']) ? $enclosure['type'] : '';
-            $length = isset($enclosure['length']) ? $enclosure['length'] : '';
-            $this->addEnclosure($enclosure['url'], $type, $length);
-        }
-        return $this;
-    }
-
-    /**
-     * Add an enclosure to the entry
-     *
-     * @param  string $url
-     * @param  string $type
-     * @param  string $length
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function addEnclosure($url, $type = '', $length = '')
-    {
-        if (!$this->offsetExists('enclosure')) {
-            $enclosure = array();
-        } else {
-            $enclosure = $this->offsetGet('enclosure');
-        }
-        $enclosure[] = array('url' => $url,
-                             'type' => $type,
-                             'length' => $length);
-        $this->offsetSet('enclosure', $enclosure);
-        return $this;
-    }
-}
diff --git a/Zend/Feed/Builder/Exception.php b/Zend/Feed/Builder/Exception.php
deleted file mode 100644
index d2efcab..0000000
--- a/Zend/Feed/Builder/Exception.php
+++ /dev/null
@@ -1,40 +0,0 @@
-offsetSet('title', $title);
-        $this->offsetSet('link', $link);
-        $this->offsetSet('charset', $charset);
-        $this->setLastUpdate(time())
-             ->setGenerator('Zend_Feed');
-    }
-
-    /**
-     * Read only properties accessor
-     *
-     * @param  string $name property to read
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        if (!$this->offsetExists($name)) {
-            return NULL;
-        }
-
-        return $this->offsetGet($name);
-    }
-
-    /**
-     * Write properties accessor
-     *
-     * @param string $name  name of the property to set
-     * @param mixed  $value value to set
-     * @return void
-     */
-    public function __set($name, $value)
-    {
-        $this->offsetSet($name, $value);
-    }
-
-    /**
-     * Isset accessor
-     *
-     * @param  string $key
-     * @return boolean
-     */
-    public function __isset($key)
-    {
-        return $this->offsetExists($key);
-    }
-
-    /**
-     * Unset accessor
-     *
-     * @param  string $key
-     * @return void
-     */
-    public function __unset($key)
-    {
-        if ($this->offsetExists($key)) {
-            $this->offsetUnset($key);
-        }
-    }
-
-    /**
-     * Timestamp of the update date
-     *
-     * @param  int $lastUpdate
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setLastUpdate($lastUpdate)
-    {
-        $this->offsetSet('lastUpdate', $lastUpdate);
-        return $this;
-    }
-
-    /**
-     * Timestamp of the publication date
-     *
-     * @param  int $published
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setPublishedDate($published)
-    {
-        $this->offsetSet('published', $published);
-        return $this;
-    }
-
-    /**
-     * Short description of the feed
-     *
-     * @param  string $description
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setDescription($description)
-    {
-        $this->offsetSet('description', $description);
-        return $this;
-    }
-
-    /**
-     * Sets the author of the feed
-     *
-     * @param  string $author
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setAuthor($author)
-    {
-        $this->offsetSet('author', $author);
-        return $this;
-    }
-
-    /**
-     * Sets the author's email
-     *
-     * @param  string $email
-     * @return Zend_Feed_Builder_Header
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setEmail($email)
-    {
-        Zend_Loader::loadClass('Zend_Validate_EmailAddress');
-        $validate = new Zend_Validate_EmailAddress();
-        if (!$validate->isValid($email)) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set a valid email address into the email property");
-        }
-        $this->offsetSet('email', $email);
-        return $this;
-    }
-
-    /**
-     * Sets the copyright notice
-     *
-     * @param  string $copyright
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setCopyright($copyright)
-    {
-        $this->offsetSet('copyright', $copyright);
-        return $this;
-    }
-
-    /**
-     * Sets the image of the feed
-     *
-     * @param  string $image
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setImage($image)
-    {
-        $this->offsetSet('image', $image);
-        return $this;
-    }
-
-    /**
-     * Sets the generator of the feed
-     *
-     * @param  string $generator
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setGenerator($generator)
-    {
-        $this->offsetSet('generator', $generator);
-        return $this;
-    }
-
-    /**
-     * Sets the language of the feed
-     *
-     * @param  string $language
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setLanguage($language)
-    {
-        $this->offsetSet('language', $language);
-        return $this;
-    }
-
-    /**
-     * Email address for person responsible for technical issues
-     * Ignored if atom is used
-     *
-     * @param  string $webmaster
-     * @return Zend_Feed_Builder_Header
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setWebmaster($webmaster)
-    {
-        Zend_Loader::loadClass('Zend_Validate_EmailAddress');
-        $validate = new Zend_Validate_EmailAddress();
-        if (!$validate->isValid($webmaster)) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set a valid email address into the webmaster property");
-        }
-        $this->offsetSet('webmaster', $webmaster);
-        return $this;
-    }
-
-    /**
-     * How long in minutes a feed can be cached before refreshing
-     * Ignored if atom is used
-     *
-     * @param  int $ttl
-     * @return Zend_Feed_Builder_Header
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setTtl($ttl)
-    {
-        Zend_Loader::loadClass('Zend_Validate_Int');
-        $validate = new Zend_Validate_Int();
-        if (!$validate->isValid($ttl)) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set an integer value to the ttl property");
-        }
-        $this->offsetSet('ttl', $ttl);
-        return $this;
-    }
-
-    /**
-     * PICS rating for the feed
-     * Ignored if atom is used
-     *
-     * @param  string $rating
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setRating($rating)
-    {
-        $this->offsetSet('rating', $rating);
-        return $this;
-    }
-
-    /**
-     * Cloud to be notified of updates of the feed
-     * Ignored if atom is used
-     *
-     * @param  string|Zend_Uri_Http $uri
-     * @param  string               $procedure procedure to call, e.g. myCloud.rssPleaseNotify
-     * @param  string               $protocol  protocol to use, e.g. soap or xml-rpc
-     * @return Zend_Feed_Builder_Header
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setCloud($uri, $procedure, $protocol)
-    {
-        if (is_string($uri) && Zend_Uri_Http::check($uri)) {
-            $uri = Zend_Uri::factory($uri);
-        }
-        if (!$uri instanceof Zend_Uri_Http) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception('Passed parameter is not a valid HTTP URI');
-        }
-        if (!$uri->getPort()) {
-            $uri->setPort(80);
-        }
-        $this->offsetSet('cloud', array('uri' => $uri,
-                                        'procedure' => $procedure,
-                                        'protocol' => $protocol));
-        return $this;
-    }
-
-    /**
-     * A text input box that can be displayed with the feed
-     * Ignored if atom is used
-     *
-     * @param  string $title       the label of the Submit button in the text input area
-     * @param  string $description explains the text input area
-     * @param  string $name        the name of the text object in the text input area
-     * @param  string $link        the URL of the CGI script that processes text input requests
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setTextInput($title, $description, $name, $link)
-    {
-        $this->offsetSet('textInput', array('title' => $title,
-                                            'description' => $description,
-                                            'name' => $name,
-                                            'link' => $link));
-        return $this;
-    }
-
-    /**
-     * Hint telling aggregators which hours they can skip
-     * Ignored if atom is used
-     *
-     * @param  array $hours list of hours in 24 format
-     * @return Zend_Feed_Builder_Header
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setSkipHours(array $hours)
-    {
-        if (count($hours) > 24) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you can not have more than 24 rows in the skipHours property");
-        }
-        foreach ($hours as $hour) {
-            if ($hour < 0 || $hour > 23) {
-                /**
-                 * @see Zend_Feed_Builder_Exception
-                 */
-                require_once 'Zend/Feed/Builder/Exception.php';
-                throw new Zend_Feed_Builder_Exception("$hour has te be between 0 and 23");
-            }
-        }
-        $this->offsetSet('skipHours', $hours);
-        return $this;
-    }
-
-    /**
-     * Hint telling aggregators which days they can skip
-     * Ignored if atom is used
-     *
-     * @param  array $days list of days to skip, e.g. Monday
-     * @return Zend_Feed_Builder_Header
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setSkipDays(array $days)
-    {
-        if (count($days) > 7) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you can not have more than 7 days in the skipDays property");
-        }
-        $valid = array('monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday');
-        foreach ($days as $day) {
-            if (!in_array(strtolower($day), $valid)) {
-                /**
-                 * @see Zend_Feed_Builder_Exception
-                 */
-                require_once 'Zend/Feed/Builder/Exception.php';
-                throw new Zend_Feed_Builder_Exception("$day is not a valid day");
-            }
-        }
-        $this->offsetSet('skipDays', $days);
-        return $this;
-    }
-
-    /**
-     * Sets the iTunes rss extension
-     *
-     * @param  Zend_Feed_Builder_Header_Itunes $itunes
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setITunes(Zend_Feed_Builder_Header_Itunes $itunes)
-    {
-        $this->offsetSet('itunes', $itunes);
-        return $this;
-    }
-}
diff --git a/Zend/Feed/Builder/Header/Itunes.php b/Zend/Feed/Builder/Header/Itunes.php
deleted file mode 100644
index b8c3cff..0000000
--- a/Zend/Feed/Builder/Header/Itunes.php
+++ /dev/null
@@ -1,285 +0,0 @@
-setCategories($categories);
-    }
-
-    /**
-     * Sets the categories column and in iTunes Music Store Browse
-     * $categories must conform to the following format:
-     * 
-     * array(array('main' => 'main category',
-     *             'sub' => 'sub category' // optionnal
-     *            ),
-     *       // up to 3 rows
-     *      )
-     * 
-     *
-     * @param  array $categories
-     * @return Zend_Feed_Builder_Header_Itunes
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setCategories(array $categories)
-    {
-        $nb = count($categories);
-        if (0 === $nb) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set at least one itunes category");
-        }
-        if ($nb > 3) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set at most three itunes categories");
-        }
-        foreach ($categories as $i => $category) {
-            if (empty($category['main'])) {
-                /**
-                 * @see Zend_Feed_Builder_Exception
-                 */
-                require_once 'Zend/Feed/Builder/Exception.php';
-                throw new Zend_Feed_Builder_Exception("you have to set the main category (category #$i)");
-            }
-        }
-        $this->offsetSet('category', $categories);
-        return $this;
-    }
-
-    /**
-     * Sets the artist value, default to the feed's author value
-     *
-     * @param  string $author
-     * @return Zend_Feed_Builder_Header_Itunes
-     */
-    public function setAuthor($author)
-    {
-        $this->offsetSet('author', $author);
-        return $this;
-    }
-
-    /**
-     * Sets the owner of the postcast
-     *
-     * @param  string $name  default to the feed's author value
-     * @param  string $email default to the feed's email value
-     * @return Zend_Feed_Builder_Header_Itunes
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setOwner($name = '', $email = '')
-    {
-        if (!empty($email)) {
-            Zend_Loader::loadClass('Zend_Validate_EmailAddress');
-            $validate = new Zend_Validate_EmailAddress();
-            if (!$validate->isValid($email)) {
-                /**
-                 * @see Zend_Feed_Builder_Exception
-                 */
-                require_once 'Zend/Feed/Builder/Exception.php';
-                throw new Zend_Feed_Builder_Exception("you have to set a valid email address into the itunes owner's email property");
-            }
-        }
-        $this->offsetSet('owner', array('name' => $name, 'email' => $email));
-        return $this;
-    }
-
-    /**
-     * Sets the album/podcast art picture
-     * Default to the feed's image value
-     *
-     * @param  string $image
-     * @return Zend_Feed_Builder_Header_Itunes
-     */
-    public function setImage($image)
-    {
-        $this->offsetSet('image', $image);
-        return $this;
-    }
-
-    /**
-     * Sets the short description of the podcast
-     * Default to the feed's description
-     *
-     * @param  string $subtitle
-     * @return Zend_Feed_Builder_Header_Itunes
-     */
-    public function setSubtitle($subtitle)
-    {
-        $this->offsetSet('subtitle', $subtitle);
-        return $this;
-    }
-
-    /**
-     * Sets the longer description of the podcast
-     * Default to the feed's description
-     *
-     * @param  string $summary
-     * @return Zend_Feed_Builder_Header_Itunes
-     */
-    public function setSummary($summary)
-    {
-        $this->offsetSet('summary', $summary);
-        return $this;
-    }
-
-    /**
-     * Prevent a feed from appearing
-     *
-     * @param  string $block can be 'yes' or 'no'
-     * @return Zend_Feed_Builder_Header_Itunes
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setBlock($block)
-    {
-        $block = strtolower($block);
-        if (!in_array($block, array('yes', 'no'))) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set yes or no to the itunes block property");
-        }
-        $this->offsetSet('block', $block);
-        return $this;
-    }
-
-    /**
-     * Configuration of the parental advisory graphic
-     *
-     * @param  string $explicit can be 'yes', 'no' or 'clean'
-     * @return Zend_Feed_Builder_Header_Itunes
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setExplicit($explicit)
-    {
-        $explicit = strtolower($explicit);
-        if (!in_array($explicit, array('yes', 'no', 'clean'))) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set yes, no or clean to the itunes explicit property");
-        }
-        $this->offsetSet('explicit', $explicit);
-        return $this;
-    }
-
-    /**
-     * Sets a comma separated list of 12 keywords maximum
-     *
-     * @param  string $keywords
-     * @return Zend_Feed_Builder_Header_Itunes
-     */
-    public function setKeywords($keywords)
-    {
-        $this->offsetSet('keywords', $keywords);
-        return $this;
-    }
-
-    /**
-     * Sets the new feed URL location
-     *
-     * @param  string $url
-     * @return Zend_Feed_Builder_Header_Itunes
-     */
-    public function setNewFeedUrl($url)
-    {
-        $this->offsetSet('new_feed_url', $url);
-        return $this;
-    }
-
-    /**
-     * Read only properties accessor
-     *
-     * @param  string $name property to read
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        if (!$this->offsetExists($name)) {
-            return NULL;
-        }
-
-        return $this->offsetGet($name);
-    }
-
-    /**
-     * Write properties accessor
-     *
-     * @param  string $name  name of the property to set
-     * @param  mixed  $value value to set
-     * @return void
-     */
-    public function __set($name, $value)
-    {
-        $this->offsetSet($name, $value);
-    }
-
-    /**
-     * Isset accessor
-     *
-     * @param  string $key
-     * @return boolean
-     */
-    public function __isset($key)
-    {
-        return $this->offsetExists($key);
-    }
-
-    /**
-     * Unset accessor
-     *
-     * @param  string $key
-     * @return void
-     */
-    public function __unset($key)
-    {
-        if ($this->offsetExists($key)) {
-            $this->offsetUnset($key);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/Zend/Feed/Builder/Interface.php b/Zend/Feed/Builder/Interface.php
deleted file mode 100644
index 0c04143..0000000
--- a/Zend/Feed/Builder/Interface.php
+++ /dev/null
@@ -1,52 +0,0 @@
-_element = $element;
-    }
-
-
-    /**
-     * Get a DOM representation of the element
-     *
-     * Returns the underlying DOM object, which can then be
-     * manipulated with full DOM methods.
-     *
-     * @return DOMDocument
-     */
-    public function getDOM()
-    {
-        return $this->_element;
-    }
-
-
-    /**
-     * Update the object from a DOM element
-     *
-     * Take a DOMElement object, which may be originally from a call
-     * to getDOM() or may be custom created, and use it as the
-     * DOM tree for this Zend_Feed_Element.
-     *
-     * @param  DOMElement $element
-     * @return void
-     */
-    public function setDOM(DOMElement $element)
-    {
-        $this->_element = $this->_element->ownerDocument->importNode($element, true);
-    }
-
-    /**
-     * Set the parent element of this object to another
-     * Zend_Feed_Element.
-     *
-     * @param  Zend_Feed_Element $element
-     * @return void
-     */
-    public function setParent(Zend_Feed_Element $element)
-    {
-        $this->_parentElement = $element;
-        $this->_appended = false;
-    }
-
-
-    /**
-     * Appends this element to its parent if necessary.
-     *
-     * @return void
-     */
-    protected function ensureAppended()
-    {
-        if (!$this->_appended) {
-            $this->_parentElement->getDOM()->appendChild($this->_element);
-            $this->_appended = true;
-            $this->_parentElement->ensureAppended();
-        }
-    }
-
-
-    /**
-     * Get an XML string representation of this element
-     *
-     * Returns a string of this element's XML, including the XML
-     * prologue.
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        // Return a complete document including XML prologue.
-        $doc = new DOMDocument($this->_element->ownerDocument->version,
-                               $this->_element->ownerDocument->actualEncoding);
-        $doc->appendChild($doc->importNode($this->_element, true));
-        return $doc->saveXML();
-    }
-
-
-    /**
-     * Get the XML for only this element
-     *
-     * Returns a string of this element's XML without prologue.
-     *
-     * @return string
-     */
-    public function saveXmlFragment()
-    {
-        return $this->_element->ownerDocument->saveXML($this->_element);
-    }
-
-
-    /**
-     * Map variable access onto the underlying entry representation.
-     *
-     * Get-style access returns a Zend_Feed_Element representing the
-     * child element accessed. To get string values, use method syntax
-     * with the __call() overriding.
-     *
-     * @param  string $var The property to access.
-     * @return mixed
-     */
-    public function __get($var)
-    {
-        $nodes = $this->_children($var);
-        $length = count($nodes);
-
-        if ($length == 1) {
-            return new Zend_Feed_Element($nodes[0]);
-        } elseif ($length > 1) {
-            return array_map(create_function('$e', 'return new Zend_Feed_Element($e);'), $nodes);
-        } else {
-            // When creating anonymous nodes for __set chaining, don't
-            // call appendChild() on them. Instead we pass the current
-            // element to them as an extra reference; the child is
-            // then responsible for appending itself when it is
-            // actually set. This way "if ($foo->bar)" doesn't create
-            // a phantom "bar" element in our tree.
-            if (strpos($var, ':') !== false) {
-                list($ns, $elt) = explode(':', $var, 2);
-                $node = $this->_element->ownerDocument->createElementNS(Zend_Feed::lookupNamespace($ns), $elt);
-            } else {
-                $node = $this->_element->ownerDocument->createElement($var);
-            }
-            $node = new self($node);
-            $node->setParent($this);
-            return $node;
-        }
-    }
-
-
-    /**
-     * Map variable sets onto the underlying entry representation.
-     *
-     * @param  string $var The property to change.
-     * @param  string $val The property's new value.
-     * @return void
-     * @throws Zend_Feed_Exception
-     */
-    public function __set($var, $val)
-    {
-        $this->ensureAppended();
-
-        $nodes = $this->_children($var);
-        if (!$nodes) {
-            if (strpos($var, ':') !== false) {
-                list($ns, $elt) = explode(':', $var, 2);
-                $node = $this->_element->ownerDocument->createElementNS(Zend_Feed::lookupNamespace($ns), $var, $val);
-                $this->_element->appendChild($node);
-            } else {
-                $node = $this->_element->ownerDocument->createElement($var, $val);
-                $this->_element->appendChild($node);
-            }
-        } elseif (count($nodes) > 1) {
-            /** 
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Cannot set the value of multiple tags simultaneously.');
-        } else {
-            $nodes[0]->nodeValue = $val;
-        }
-    }
-
-
-    /**
-     * Map isset calls onto the underlying entry representation.
-     *
-     * @param  string $var
-     * @return boolean
-     */
-    public function __isset($var)
-    {
-        // Look for access of the form {ns:var}. We don't use
-        // _children() here because we can break out of the loop
-        // immediately once we find something.
-        if (strpos($var, ':') !== false) {
-            list($ns, $elt) = explode(':', $var, 2);
-            foreach ($this->_element->childNodes as $child) {
-                if ($child->localName == $elt && $child->prefix == $ns) {
-                    return true;
-                }
-            }
-        } else {
-            foreach ($this->_element->childNodes as $child) {
-                if ($child->localName == $var) {
-                    return true;
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Get the value of an element with method syntax.
-     *
-     * Map method calls to get the string value of the requested
-     * element. If there are multiple elements that match, this will
-     * return an array of those objects.
-     *
-     * @param  string $var    The element to get the string value of.
-     * @param  mixed  $unused This parameter is not used.
-     * @return mixed The node's value, null, or an array of nodes.
-     */
-    public function __call($var, $unused)
-    {
-        $nodes = $this->_children($var);
-
-        if (!$nodes) {
-            return null;
-        } elseif (count($nodes) > 1) {
-            return $nodes;
-        } else {
-            return $nodes[0]->nodeValue;
-        }
-    }
-
-
-    /**
-     * Remove all children matching $var.
-     *
-     * @param  string $var
-     * @return void
-     */
-    public function __unset($var)
-    {
-        $nodes = $this->_children($var);
-        foreach ($nodes as $node) {
-            $parent = $node->parentNode;
-            $parent->removeChild($node);
-        }
-    }
-
-
-    /**
-     * Returns the nodeValue of this element when this object is used
-     * in a string context.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->_element->nodeValue;
-    }
-
-
-    /**
-     * Finds children with tagnames matching $var
-     *
-     * Similar to SimpleXML's children() method.
-     *
-     * @param  string $var Tagname to match, can be either namespace:tagName or just tagName.
-     * @return array
-     */
-    protected function _children($var)
-    {
-        $found = array();
-
-        // Look for access of the form {ns:var}.
-        if (strpos($var, ':') !== false) {
-            list($ns, $elt) = explode(':', $var, 2);
-            foreach ($this->_element->childNodes as $child) {
-                if ($child->localName == $elt && $child->prefix == $ns) {
-                    $found[] = $child;
-                }
-            }
-        } else {
-            foreach ($this->_element->childNodes as $child) {
-                if ($child->localName == $var) {
-                    $found[] = $child;
-                }
-            }
-        }
-
-        return $found;
-    }
-
-
-    /**
-     * Required by the ArrayAccess interface.
-     *
-     * @param  string $offset
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        if (strpos($offset, ':') !== false) {
-            list($ns, $attr) = explode(':', $offset, 2);
-            return $this->_element->hasAttributeNS(Zend_Feed::lookupNamespace($ns), $attr);
-        } else {
-            return $this->_element->hasAttribute($offset);
-        }
-    }
-
-
-    /**
-     * Required by the ArrayAccess interface.
-     *
-     * @param  string $offset
-     * @return string
-     */
-    public function offsetGet($offset)
-    {
-        if (strpos($offset, ':') !== false) {
-            list($ns, $attr) = explode(':', $offset, 2);
-            return $this->_element->getAttributeNS(Zend_Feed::lookupNamespace($ns), $attr);
-        } else {
-            return $this->_element->getAttribute($offset);
-        }
-    }
-
-
-    /**
-     * Required by the ArrayAccess interface.
-     *
-     * @param  string $offset
-     * @param  string $value
-     * @return string
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->ensureAppended();
-
-        if (strpos($offset, ':') !== false) {
-            list($ns, $attr) = explode(':', $offset, 2);
-            return $this->_element->setAttributeNS(Zend_Feed::lookupNamespace($ns), $attr, $value);
-        } else {
-            return $this->_element->setAttribute($offset, $value);
-        }
-    }
-
-
-    /**
-     * Required by the ArrayAccess interface.
-     *
-     * @param  string $offset
-     * @return boolean
-     */
-    public function offsetUnset($offset)
-    {
-        if (strpos($offset, ':') !== false) {
-            list($ns, $attr) = explode(':', $offset, 2);
-            return $this->_element->removeAttributeNS(Zend_Feed::lookupNamespace($ns), $attr);
-        } else {
-            return $this->_element->removeAttribute($offset);
-        }
-    }
-
-}
diff --git a/Zend/Feed/Entry/Abstract.php b/Zend/Feed/Entry/Abstract.php
deleted file mode 100644
index 5b45d37..0000000
--- a/Zend/Feed/Entry/Abstract.php
+++ /dev/null
@@ -1,123 +0,0 @@
-getElementsByTagName($this->_rootElement)->item(0);
-                if (!$element) {
-                    /** 
-                     * @see Zend_Feed_Exception
-                     */
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception('No root <' . $this->_rootElement . '> element found, cannot parse feed.');
-                }
-            } else {
-                $doc = new DOMDocument('1.0', 'utf-8');
-                if ($this->_rootNamespace !== null) {
-                    $element = $doc->createElementNS(Zend_Feed::lookupNamespace($this->_rootNamespace), $this->_rootElement);
-                } else {
-                    $element = $doc->createElement($this->_rootElement);
-                }
-            }
-        }
-
-        parent::__construct($element);
-    }
-
-}
diff --git a/Zend/Feed/Entry/Atom.php b/Zend/Feed/Entry/Atom.php
deleted file mode 100644
index 42b5ceb..0000000
--- a/Zend/Feed/Entry/Atom.php
+++ /dev/null
@@ -1,273 +0,0 @@
-link('edit');
-        if (!$deleteUri) {
-            /** 
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Cannot delete entry; no link rel="edit" is present.');
-        }
-
-        // DELETE
-        $client = Zend_Feed::getHttpClient();
-        do {
-            $client->setUri($deleteUri);
-            if (Zend_Feed::getHttpMethodOverride()) {
-                $client->setHeader('X-HTTP-Method-Override', 'DELETE');
-                $response = $client->request('POST');
-            } else {
-                $response = $client->request('DELETE');
-            }
-            $httpStatus = $response->getStatus();
-            switch ((int) $httpStatus / 100) {
-                // Success
-                case 2:
-                    return true;
-                // Redirect
-                case 3:
-                    $deleteUri = $response->getHeader('Location');
-                    continue;
-                // Error
-                default:
-                    /** 
-                     * @see Zend_Feed_Exception
-                     */
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception("Expected response code 2xx, got $httpStatus");
-            }
-        } while (true);
-    }
-
-
-    /**
-     * Save a new or updated Atom entry.
-     *
-     * Save is used to either create new entries or to save changes to
-     * existing ones. If we have a link rel="edit", we are changing
-     * an existing entry. In this case we re-serialize the entry and
-     * PUT it to the edit URI, checking for a 200 OK result.
-     *
-     * For posting new entries, you must specify the $postUri
-     * parameter to save() to tell the object where to post itself.
-     * We use $postUri and POST the serialized entry there, checking
-     * for a 201 Created response. If the insert is successful, we
-     * then parse the response from the POST to get any values that
-     * the server has generated: an id, an updated time, and its new
-     * link rel="edit".
-     *
-     * @param  string $postUri Location to POST for creating new entries.
-     * @return void
-     * @throws Zend_Feed_Exception
-     */
-    public function save($postUri = null)
-    {
-        if ($this->id()) {
-            // If id is set, look for link rel="edit" in the
-            // entry object and PUT.
-            $editUri = $this->link('edit');
-            if (!$editUri) {
-                /** 
-                 * @see Zend_Feed_Exception
-                 */
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Cannot edit entry; no link rel="edit" is present.');
-            }
-
-            $client = Zend_Feed::getHttpClient();
-            $client->setUri($editUri);
-            if (Zend_Feed::getHttpMethodOverride()) {
-                $client->setHeaders(array('X-HTTP-Method-Override: PUT',
-                    'Content-Type: application/atom+xml'));
-                $client->setRawData($this->saveXML());
-                $response = $client->request('POST');
-            } else {
-                $client->setHeaders('Content-Type', 'application/atom+xml');
-                $client->setRawData($this->saveXML());
-                $response = $client->request('PUT');
-            }
-            if ($response->getStatus() !== 200) {
-                /** 
-                 * @see Zend_Feed_Exception
-                 */
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Expected response code 200, got ' . $response->getStatus());
-            }
-        } else {
-            if ($postUri === null) {
-                /** 
-                 * @see Zend_Feed_Exception
-                 */
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('PostURI must be specified to save new entries.');
-            }
-            $client = Zend_Feed::getHttpClient();
-            $client->setUri($postUri);
-            $client->setRawData($this->saveXML());
-            $response = $client->request('POST');
-
-            if ($response->getStatus() !== 201) {
-                /** 
-                 * @see Zend_Feed_Exception
-                 */
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Expected response code 201, got '
-                                              . $response->getStatus());
-            }
-        }
-
-        // Update internal properties using $client->responseBody;
-        @ini_set('track_errors', 1);
-        $newEntry = @DOMDocument::loadXML($response->getBody());
-        @ini_restore('track_errors');
-
-        if (!$newEntry) {
-            // prevent the class to generate an undefined variable notice (ZF-2590)
-            if (!isset($php_errormsg)) {
-                if (function_exists('xdebug_is_enabled')) {
-                    $php_errormsg = '(error message not available, when XDebug is running)';
-                } else {
-                    $php_errormsg = '(error message not available)';
-                }
-            }
-
-            /** 
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('XML cannot be parsed: ' . $php_errormsg);
-        }
-
-        $newEntry = $newEntry->getElementsByTagName($this->_rootElement)->item(0);
-        if (!$newEntry) {
-            /** 
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('No root  element found in server response:'
-                                          . "\n\n" . $client->responseBody);
-        }
-
-        if ($this->_element->parentNode) {
-            $oldElement = $this->_element;
-            $this->_element = $oldElement->ownerDocument->importNode($newEntry, true);
-            $oldElement->parentNode->replaceChild($this->_element, $oldElement);
-        } else {
-            $this->_element = $newEntry;
-        }
-    }
-
-
-    /**
-     * Easy access to  tags keyed by "rel" attributes.
-     *
-     * If $elt->link() is called with no arguments, we will attempt to
-     * return the value of the  tag(s) like all other
-     * method-syntax attribute access. If an argument is passed to
-     * link(), however, then we will return the "href" value of the
-     * first  tag that has a "rel" attribute matching $rel:
-     *
-     * $elt->link(): returns the value of the link tag.
-     * $elt->link('self'): returns the href from the first  in the entry.
-     *
-     * @param  string $rel The "rel" attribute to look for.
-     * @return mixed
-     */
-    public function link($rel = null)
-    {
-        if ($rel === null) {
-            return parent::__call('link', null);
-        }
-
-        // index link tags by their "rel" attribute.
-        $links = parent::__get('link');
-        if (!is_array($links)) {
-            if ($links instanceof Zend_Feed_Element) {
-                $links = array($links);
-            } else {
-                return $links;
-            }
-        }
-
-        foreach ($links as $link) {
-            if (empty($link['rel'])) {
-                continue;
-            }
-            if ($rel == $link['rel']) {
-                return $link['href'];
-            }
-        }
-
-        return null;
-    }
-
-}
diff --git a/Zend/Feed/Entry/Rss.php b/Zend/Feed/Entry/Rss.php
deleted file mode 100644
index ea060f9..0000000
--- a/Zend/Feed/Entry/Rss.php
+++ /dev/null
@@ -1,122 +0,0 @@
-_element->lookupPrefix('http://purl.org/rss/1.0/modules/content/');
-                return parent::__get("$prefix:encoded");
-            default:
-                return parent::__get($var);
-        }
-    }
-
-    /**
-     * Overwrites parent::_set method to enable write access
-     * to content:encoded element.
-     *
-     * @param  string $var The property to change.
-     * @param  string $val The property's new value.
-     * @return void
-     */
-    public function __set($var, $value)
-    {
-        switch ($var) {
-            case 'content':
-                parent::__set('content:encoded', $value);
-                break;
-            default:
-                parent::__set($var, $value);
-        }
-    }
-
-    /**
-     * Overwrites parent::_isset method to enable access
-     * to content:encoded element.
-     *
-     * @param  string $var
-     * @return boolean
-     */
-    public function __isset($var)
-    {
-        switch ($var) {
-            case 'content':
-                // don't use other callback to prevent invalid returned value
-                return $this->content() !== null;
-            default:
-                return parent::__isset($var);
-        }
-    }
-    
-    /**
-     * Overwrites parent::_call method to enable read access
-     * to content:encoded element.
-     * Please note that method-style write access is not currently supported
-     * by parent method, consequently this method doesn't as well.
-     *
-     * @param  string $var    The element to get the string value of.
-     * @param  mixed  $unused This parameter is not used.
-     * @return mixed The node's value, null, or an array of nodes.
-     */
-    public function __call($var, $unused)
-    {
-        switch ($var) {
-            case 'content':
-                $prefix = $this->_element->lookupPrefix('http://purl.org/rss/1.0/modules/content/');
-                return parent::__call("$prefix:encoded", $unused);
-            default:
-                return parent::__call($var, $unused);
-        }
-    }
-}
diff --git a/Zend/Feed/Exception.php b/Zend/Feed/Exception.php
deleted file mode 100644
index 4d905af..0000000
--- a/Zend/Feed/Exception.php
+++ /dev/null
@@ -1,42 +0,0 @@
-s).
-     *
-     * @var string
-     */
-    protected $_entryElementName = 'item';
-
-    /**
-     * The default namespace for RSS channels.
-     *
-     * @var string
-     */
-    protected $_defaultNamespace = 'rss';
-
-    /**
-     * Override Zend_Feed_Abstract to set up the $_element and $_entries aliases.
-     *
-     * @return void
-     * @throws Zend_Feed_Exception
-     */
-    public function __wakeup()
-    {
-        parent::__wakeup();
-
-        // Find the base channel element and create an alias to it.
-        $this->_element = $this->_element->getElementsByTagName('channel')->item(0);
-        if (!$this->_element) {
-            /** 
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('No root  element found, cannot parse channel.');
-        }
-
-        // Find the entries and save a pointer to them for speed and
-        // simplicity.
-        $this->_buildEntryCache();
-    }
-
-
-    /**
-     * Make accessing some individual elements of the channel easier.
-     *
-     * Special accessors 'item' and 'items' are provided so that if
-     * you wish to iterate over an RSS channel's items, you can do so
-     * using foreach ($channel->items as $item) or foreach
-     * ($channel->item as $item).
-     *
-     * @param  string $var The property to access.
-     * @return mixed
-     */
-    public function __get($var)
-    {
-        switch ($var) {
-            case 'item':
-                // fall through to the next case
-            case 'items':
-                return $this;
-
-            default:
-                return parent::__get($var);
-        }
-    }
-
-    /**
-     * Generate the header of the feed when working in write mode
-     *
-     * @param  array $array the data to use
-     * @return DOMElement root node
-     */
-    protected function _mapFeedHeaders($array)
-    {
-        $channel = $this->_element->createElement('channel');
-
-        $title = $this->_element->createElement('title');
-        $title->appendChild($this->_element->createCDATASection($array->title));
-        $channel->appendChild($title);
-
-        $link = $this->_element->createElement('link', $array->link);
-        $channel->appendChild($link);
-
-        $desc = isset($array->description) ? $array->description : '';
-        $description = $this->_element->createElement('description');
-        $description->appendChild($this->_element->createCDATASection($desc));
-        $channel->appendChild($description);
-
-        $pubdate = isset($array->lastUpdate) ? $array->lastUpdate : time();
-        $pubdate = $this->_element->createElement('pubDate', gmdate('r', $pubdate));
-        $channel->appendChild($pubdate);
-
-        if (isset($array->published)) {
-            $lastBuildDate = $this->_element->createElement('lastBuildDate', gmdate('r', $array->published));
-        }
-
-        $editor = '';
-        if (!empty($array->email)) {
-            $editor .= $array->email;
-        }
-        if (!empty($array->author)) {
-            $editor .= ' (' . $array->author . ')';
-        }
-        if (!empty($editor)) {
-            $author = $this->_element->createElement('managingEditor', ltrim($editor));
-            $channel->appendChild($author);
-        }
-        if (isset($array->webmaster)) {
-            $channel->appendChild($this->_element->createElement('webMaster', $array->webmaster));
-        }
-
-        if (!empty($array->copyright)) {
-            $copyright = $this->_element->createElement('copyright', $array->copyright);
-            $channel->appendChild($copyright);
-        }
-
-        if (!empty($array->image)) {
-            $image = $this->_element->createElement('image');
-            $url = $this->_element->createElement('url', $array->image);
-            $image->appendChild($url);
-            $imagetitle = $this->_element->createElement('title', $array->title);
-            $image->appendChild($imagetitle);
-            $imagelink = $this->_element->createElement('link', $array->link);
-            $image->appendChild($imagelink);
-
-            $channel->appendChild($image);
-        }
-
-        $generator = !empty($array->generator) ? $array->generator : 'Zend_Feed';
-        $generator = $this->_element->createElement('generator', $generator);
-        $channel->appendChild($generator);
-
-        if (!empty($array->language)) {
-            $language = $this->_element->createElement('language', $array->language);
-            $channel->appendChild($language);
-        }
-
-        $doc = $this->_element->createElement('docs', 'http://blogs.law.harvard.edu/tech/rss');
-        $channel->appendChild($doc);
-
-        if (isset($array->cloud)) {
-            $cloud = $this->_element->createElement('cloud');
-            $cloud->setAttribute('domain', $array->cloud['uri']->getHost());
-            $cloud->setAttribute('port', $array->cloud['uri']->getPort());
-            $cloud->setAttribute('path', $array->cloud['uri']->getPath());
-            $cloud->setAttribute('registerProcedure', $array->cloud['procedure']);
-            $cloud->setAttribute('protocol', $array->cloud['protocol']);
-            $channel->appendChild($cloud);
-        }
-
-        if (isset($array->rating)) {
-            $rating = $this->_element->createElement('rating', $array->rating);
-            $channel->appendChild($rating);
-        }
-
-        if (isset($array->textInput)) {
-            $textinput = $this->_element->createElement('textInput');
-            $textinput->appendChild($this->_element->createElement('title', $array->textInput['title']));
-            $textinput->appendChild($this->_element->createElement('description', $array->textInput['description']));
-            $textinput->appendChild($this->_element->createElement('name', $array->textInput['name']));
-            $textinput->appendChild($this->_element->createElement('link', $array->textInput['link']));
-            $channel->appendChild($textinput);
-        }
-
-        if (isset($array->skipHours)) {
-            $skipHours = $this->_element->createElement('skipHours');
-            foreach ($array->skipHours as $hour) {
-                $skipHours->appendChild($this->_element->createElement('hour', $hour));
-            }
-            $channel->appendChild($skipHours);
-        }
-
-        if (isset($array->skipDays)) {
-            $skipDays = $this->_element->createElement('skipDays');
-            foreach ($array->skipDays as $day) {
-                $skipDays->appendChild($this->_element->createElement('day', $day));
-            }
-            $channel->appendChild($skipDays);
-        }
-
-        if (isset($array->itunes)) {
-            $this->_buildiTunes($channel, $array);
-        }
-
-        return $channel;
-    }
-
-    /**
-     * Adds the iTunes extensions to a root node
-     *
-     * @param  DOMElement $root
-     * @param  array $array
-     * @return void
-     */
-    private function _buildiTunes(DOMElement $root, $array)
-    {
-        /* author node */
-        $author = '';
-        if (isset($array->itunes->author)) {
-            $author = $array->itunes->author;
-        } elseif (isset($array->author)) {
-            $author = $array->author;
-        }
-        if (!empty($author)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:author', $author);
-            $root->appendChild($node);
-        }
-
-        /* owner node */
-        $author = '';
-        $email = '';
-        if (isset($array->itunes->owner)) {
-            if (isset($array->itunes->owner['name'])) {
-                $author = $array->itunes->owner['name'];
-            }
-            if (isset($array->itunes->owner['email'])) {
-                $email = $array->itunes->owner['email'];
-            }
-        }
-        if (empty($author) && isset($array->author)) {
-            $author = $array->author;
-        }
-        if (empty($email) && isset($array->email)) {
-            $email = $array->email;
-        }
-        if (!empty($author) || !empty($email)) {
-            $owner = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:owner');
-            if (!empty($author)) {
-                $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:name', $author);
-                $owner->appendChild($node);
-            }
-            if (!empty($email)) {
-                $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:email', $email);
-                $owner->appendChild($node);
-            }
-            $root->appendChild($owner);
-        }
-        $image = '';
-        if (isset($array->itunes->image)) {
-            $image = $array->itunes->image;
-        } elseif (isset($array->image)) {
-            $image = $array->image;
-        }
-        if (!empty($image)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:image');
-            $node->setAttribute('href', $image);
-            $root->appendChild($node);
-        }
-        $subtitle = '';
-        if (isset($array->itunes->subtitle)) {
-            $subtitle = $array->itunes->subtitle;
-        } elseif (isset($array->description)) {
-            $subtitle = $array->description;
-        }
-        if (!empty($subtitle)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:subtitle', $subtitle);
-            $root->appendChild($node);
-        }
-        $summary = '';
-        if (isset($array->itunes->summary)) {
-            $summary = $array->itunes->summary;
-        } elseif (isset($array->description)) {
-            $summary = $array->description;
-        }
-        if (!empty($summary)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:summary', $summary);
-            $root->appendChild($node);
-        }
-        if (isset($array->itunes->block)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:block', $array->itunes->block);
-            $root->appendChild($node);
-        }
-        if (isset($array->itunes->explicit)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:explicit', $array->itunes->explicit);
-            $root->appendChild($node);
-        }
-        if (isset($array->itunes->keywords)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:keywords', $array->itunes->keywords);
-            $root->appendChild($node);
-        }
-        if (isset($array->itunes->new_feed_url)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:new-feed-url', $array->itunes->new_feed_url);
-            $root->appendChild($node);
-        }
-        if (isset($array->itunes->category)) {
-            foreach ($array->itunes->category as $i => $category) {
-                $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:category');
-                $node->setAttribute('text', $category['main']);
-                $root->appendChild($node);
-                $add_end_category = false;
-                if (!empty($category['sub'])) {
-                    $add_end_category = true;
-                    $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:category');
-                    $node->setAttribute('text', $category['sub']);
-                    $root->appendChild($node);
-                }
-                if ($i > 0 || $add_end_category) {
-                    $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:category');
-                    $root->appendChild($node);
-                }
-            }
-        }
-    }
-
-    /**
-     * Generate the entries of the feed when working in write mode
-     *
-     * The following nodes are constructed for each feed entry
-     * 
-     *    entry title
-     *    url to feed entry
-     *    url to feed entry
-     *    short text
-     *    long version, can contain html
-     * 
-     *
-     * @param  DOMElement $root the root node to use
-     * @param  array $array the data to use
-     * @return void
-     */
-    protected function _mapFeedEntries(DOMElement $root, $array)
-    {
-        Zend_Feed::registerNamespace('content', 'http://purl.org/rss/1.0/modules/content/');
-
-        foreach ($array as $dataentry) {
-            $item = $this->_element->createElement('item');
-
-            $title = $this->_element->createElement('title');
-            $title->appendChild($this->_element->createCDATASection($dataentry->title));
-            $item->appendChild($title);
-
-            $link = $this->_element->createElement('link', $dataentry->link);
-            $item->appendChild($link);
-
-            if (isset($dataentry->guid)) {
-                $guid = $this->_element->createElement('guid', $dataentry->guid);
-                $item->appendChild($guid);
-            }
-
-            $description = $this->_element->createElement('description');
-            $description->appendChild($this->_element->createCDATASection($dataentry->description));
-            $item->appendChild($description);
-
-            if (isset($dataentry->content)) {
-                $content = $this->_element->createElement('content:encoded');
-                $content->appendChild($this->_element->createCDATASection($dataentry->content));
-                $item->appendChild($content);
-            }
-
-            $pubdate = isset($dataentry->lastUpdate) ? $dataentry->lastUpdate : time();
-            $pubdate = $this->_element->createElement('pubDate', gmdate('r', $pubdate));
-            $item->appendChild($pubdate);
-
-            if (isset($dataentry->category)) {
-                foreach ($dataentry->category as $category) {
-                    $node = $this->_element->createElement('category', $category['term']);
-                    if (isset($category['scheme'])) {
-                        $node->setAttribute('domain', $category['scheme']);
-                    }
-                    $item->appendChild($node);
-                }
-            }
-
-            if (isset($dataentry->source)) {
-                $source = $this->_element->createElement('source', $dataentry->source['title']);
-                $source->setAttribute('url', $dataentry->source['url']);
-                $item->appendChild($source);
-            }
-
-            if (isset($dataentry->comments)) {
-                $comments = $this->_element->createElement('comments', $dataentry->comments);
-                $item->appendChild($comments);
-            }
-            if (isset($dataentry->commentRss)) {
-                $comments = $this->_element->createElementNS('http://wellformedweb.org/CommentAPI/',
-                                                             'wfw:commentRss',
-                                                             $dataentry->commentRss);
-                $item->appendChild($comments);
-            }
-
-
-            if (isset($dataentry->enclosure)) {
-                foreach ($dataentry->enclosure as $enclosure) {
-                    $node = $this->_element->createElement('enclosure');
-                    $node->setAttribute('url', $enclosure['url']);
-                    if (isset($enclosure['type'])) {
-                        $node->setAttribute('type', $enclosure['type']);
-                    }
-                    if (isset($enclosure['length'])) {
-                        $node->setAttribute('length', $enclosure['length']);
-                    }
-                    $item->appendChild($node);
-                }
-            }
-
-            $root->appendChild($item);
-        }
-    }
-
-    /**
-     * Override Zend_Feed_Element to include  root node
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        // Return a complete document including XML prologue.
-        $doc = new DOMDocument($this->_element->ownerDocument->version,
-                               $this->_element->ownerDocument->actualEncoding);
-        $root = $doc->createElement('rss');
-
-        // Use rss version 2.0
-        $root->setAttribute('version', '2.0');
-
-        // Content namespace
-        $root->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:content', 'http://purl.org/rss/1.0/modules/content/');
-        $root->appendChild($doc->importNode($this->_element, true));
-
-        // Append root node
-        $doc->appendChild($root);
-
-        // Format output
-        $doc->formatOutput = true;
-
-        return $doc->saveXML();
-    }
-
-    /**
-     * Send feed to a http client with the correct header
-     *
-     * @return void
-     * @throws Zend_Feed_Exception if headers have already been sent
-     */
-    public function send()
-    {
-        if (headers_sent()) {
-            /** 
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Cannot send RSS because headers have already been sent.');
-        }
-
-        header('Content-type: application/rss+xml; charset: ' . $this->_element->ownerDocument->actualEncoding);
-
-        echo $this->saveXml();
-    }
-
-}
diff --git a/Zend/Http/Client.php b/Zend/Http/Client.php
deleted file mode 100644
index de5ea99..0000000
--- a/Zend/Http/Client.php
+++ /dev/null
@@ -1,1086 +0,0 @@
- 5,
-        'strictredirects' => false,
-        'useragent'       => 'Zend_Http_Client',
-        'timeout'         => 10,
-        'adapter'         => 'Zend_Http_Client_Adapter_Socket',
-        'httpversion'     => self::HTTP_1,
-        'keepalive'       => false,
-        'storeresponse'   => true,
-        'strict'          => true
-    );
-
-    /**
-     * The adapter used to preform the actual connection to the server
-     *
-     * @var Zend_Http_Client_Adapter_Interface
-     */
-    protected $adapter = null;
-
-    /**
-     * Request URI
-     *
-     * @var Zend_Uri_Http
-     */
-    protected $uri;
-
-    /**
-     * Associative array of request headers
-     *
-     * @var array
-     */
-    protected $headers = array();
-
-    /**
-     * HTTP request method
-     *
-     * @var string
-     */
-    protected $method = self::GET;
-
-    /**
-     * Associative array of GET parameters
-     *
-     * @var array
-     */
-    protected $paramsGet = array();
-
-    /**
-     * Assiciative array of POST parameters
-     *
-     * @var array
-     */
-    protected $paramsPost = array();
-
-    /**
-     * Request body content type (for POST requests)
-     *
-     * @var string
-     */
-    protected $enctype = null;
-
-    /**
-     * The raw post data to send. Could be set by setRawData($data, $enctype).
-     *
-     * @var string
-     */
-    protected $raw_post_data = null;
-
-    /**
-     * HTTP Authentication settings
-     *
-     * Expected to be an associative array with this structure:
-     * $this->auth = array('user' => 'username', 'password' => 'password', 'type' => 'basic')
-     * Where 'type' should be one of the supported authentication types (see the AUTH_*
-     * constants), for example 'basic' or 'digest'.
-     *
-     * If null, no authentication will be used.
-     *
-     * @var array|null
-     */
-    protected $auth;
-
-    /**
-     * File upload arrays (used in POST requests)
-     *
-     * An associative array, where each element is of the format:
-     *   'name' => array('filename.txt', 'text/plain', 'This is the actual file contents')
-     *
-     * @var array
-     */
-    protected $files = array();
-
-    /**
-     * The client's cookie jar
-     *
-     * @var Zend_Http_CookieJar
-     */
-    protected $cookiejar = null;
-
-    /**
-     * The last HTTP request sent by the client, as string
-     *
-     * @var string
-     */
-    protected $last_request = null;
-
-    /**
-     * The last HTTP response received by the client
-     *
-     * @var Zend_Http_Response
-     */
-    protected $last_response = null;
-
-    /**
-     * Redirection counter
-     *
-     * @var int
-     */
-    protected $redirectCounter = 0;
-
-    /**
-     * Contructor method. Will create a new HTTP client. Accepts the target
-     * URL and optionally and array of headers.
-     *
-     * @param Zend_Uri_Http|string $uri
-     * @param array $headers Optional request headers to set
-     */
-    public function __construct($uri = null, $config = null)
-    {
-        if ($uri !== null) $this->setUri($uri);
-        if ($config !== null) $this->setConfig($config);
-    }
-
-    /**
-     * Set the URI for the next request
-     *
-     * @param  Zend_Uri_Http|string $uri
-     * @return Zend_Http_Client
-     * @throws Zend_Http_Client_Exception
-     */
-    public function setUri($uri)
-    {
-        if (is_string($uri)) {
-            $uri = Zend_Uri::factory($uri);
-        }
-
-        if (!$uri instanceof Zend_Uri_Http) {
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception('Passed parameter is not a valid HTTP URI.');
-        }
-
-        // We have no ports, set the defaults
-        if (! $uri->getPort()) {
-            $uri->setPort(($uri->getScheme() == 'https' ? 443 : 80));
-        }
-
-        $this->uri = $uri;
-
-        return $this;
-    }
-
-    /**
-     * Get the URI for the next request
-     *
-     * @param boolean $as_string If true, will return the URI as a string
-     * @return Zend_Uri_Http|string
-     */
-    public function getUri($as_string = false)
-    {
-        if ($as_string && $this->uri instanceof Zend_Uri_Http) {
-            return $this->uri->__toString();
-        } else {
-            return $this->uri;
-        }
-    }
-
-    /**
-     * Set configuration parameters for this HTTP client
-     *
-     * @param array $config
-     * @return Zend_Http_Client
-     */
-    public function setConfig($config = array())
-    {
-        if (! is_array($config)) {
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception('Expected array parameter, given ' . gettype($config));
-        }
-
-        foreach ($config as $k => $v)
-            $this->config[strtolower($k)] = $v;
-
-        return $this;
-    }
-
-    /**
-     * Set the next request's method
-     *
-     * Validated the passed method and sets it. If we have files set for
-     * POST requests, and the new method is not POST, the files are silently
-     * dropped.
-     *
-     * @param string $method
-     * @return Zend_Http_Client
-     */
-    public function setMethod($method = self::GET)
-    {
-        if (! preg_match('/^[A-Za-z_]+$/', $method)) {
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception("'{$method}' is not a valid HTTP request method.");
-        }
-
-        if ($method == self::POST && $this->enctype === null)
-            $this->setEncType(self::ENC_URLENCODED);
-
-        $this->method = $method;
-
-        return $this;
-    }
-
-    /**
-     * Set one or more request headers
-     *
-     * This function can be used in several ways to set the client's request
-     * headers:
-     * 1. By providing two parameters: $name as the header to set (eg. 'Host')
-     *    and $value as it's value (eg. 'www.example.com').
-     * 2. By providing a single header string as the only parameter
-     *    eg. 'Host: www.example.com'
-     * 3. By providing an array of headers as the first parameter
-     *    eg. array('host' => 'www.example.com', 'x-foo: bar'). In This case
-     *    the function will call itself recursively for each array item.
-     *
-     * @param string|array $name Header name, full header string ('Header: value')
-     *     or an array of headers
-     * @param mixed $value Header value or null
-     * @return Zend_Http_Client
-     */
-    public function setHeaders($name, $value = null)
-    {
-        // If we got an array, go recusive!
-        if (is_array($name)) {
-            foreach ($name as $k => $v) {
-                if (is_string($k)) {
-                    $this->setHeaders($k, $v);
-                } else {
-                    $this->setHeaders($v, null);
-                }
-            }
-        } else {
-            // Check if $name needs to be split
-            if ($value === null && (strpos($name, ':') > 0))
-                list($name, $value) = explode(':', $name, 2);
-
-            // Make sure the name is valid if we are in strict mode
-            if ($this->config['strict'] && (! preg_match('/^[a-zA-Z0-9-]+$/', $name))) {
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("{$name} is not a valid HTTP header name");
-            }
-            
-            $normalized_name = strtolower($name);
-
-            // If $value is null or false, unset the header
-            if ($value === null || $value === false) {
-                unset($this->headers[$normalized_name]);
-
-            // Else, set the header
-            } else {
-                // Header names are storred lowercase internally.
-                if (is_string($value)) $value = trim($value);
-                $this->headers[$normalized_name] = array($name, $value);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the value of a specific header
-     *
-     * Note that if the header has more than one value, an array
-     * will be returned.
-     *
-     * @param unknown_type $key
-     * @return string|array|null The header value or null if it is not set
-     */
-    public function getHeader($key)
-    {
-        $key = strtolower($key);
-        if (isset($this->headers[$key])) {
-            return $this->headers[$key][1];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Set a GET parameter for the request. Wrapper around _setParameter
-     *
-     * @param string|array $name
-     * @param string $value
-     * @return Zend_Http_Client
-     */
-    public function setParameterGet($name, $value = null)
-    {
-        if (is_array($name)) {
-            foreach ($name as $k => $v)
-                $this->_setParameter('GET', $k, $v);
-        } else {
-            $this->_setParameter('GET', $name, $value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set a POST parameter for the request. Wrapper around _setParameter
-     *
-     * @param string|array $name
-     * @param string $value
-     * @return Zend_Http_Client
-     */
-    public function setParameterPost($name, $value = null)
-    {
-        if (is_array($name)) {
-            foreach ($name as $k => $v)
-                $this->_setParameter('POST', $k, $v);
-        } else {
-            $this->_setParameter('POST', $name, $value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set a GET or POST parameter - used by SetParameterGet and SetParameterPost
-     *
-     * @param string $type GET or POST
-     * @param string $name
-     * @param string $value
-     */
-    protected function _setParameter($type, $name, $value)
-    {
-        $parray = array();
-        $type = strtolower($type);
-        switch ($type) {
-            case 'get':
-                $parray = &$this->paramsGet;
-                break;
-            case 'post':
-                $parray = &$this->paramsPost;
-                break;
-        }
-
-        if ($value === null) {
-            if (isset($parray[$name])) unset($parray[$name]);
-        } else {
-            $parray[$name] = $value;
-        }
-    }
-
-    /**
-     * Get the number of redirections done on the last request
-     *
-     * @return int
-     */
-    public function getRedirectionsCount()
-    {
-        return $this->redirectCounter;
-    }
-
-    /**
-     * Set HTTP authentication parameters
-     *
-     * $type should be one of the supported types - see the self::AUTH_*
-     * constants.
-     *
-     * To enable authentication:
-     * 
-     * $this->setAuth('shahar', 'secret', Zend_Http_Client::AUTH_BASIC);
-     * 
-     *
-     * To disable authentication:
-     * 
-     * $this->setAuth(false);
-     * 
-     *
-     * @see http://www.faqs.org/rfcs/rfc2617.html
-     * @param string|false $user User name or false disable authentication
-     * @param string $password Password
-     * @param string $type Authentication type
-     * @return Zend_Http_Client
-     */
-    public function setAuth($user, $password = '', $type = self::AUTH_BASIC)
-    {
-        // If we got false or null, disable authentication
-        if ($user === false || $user === null) {
-            $this->auth = null;
-
-        // Else, set up authentication
-        } else {
-            // Check we got a proper authentication type
-            if (! defined('self::AUTH_' . strtoupper($type))) {
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("Invalid or not supported authentication type: '$type'");
-            }
-
-            $this->auth = array(
-                'user' => (string) $user,
-                'password' => (string) $password,
-                'type' => $type
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the HTTP client's cookie jar.
-     *
-     * A cookie jar is an object that holds and maintains cookies across HTTP requests
-     * and responses.
-     *
-     * @param Zend_Http_CookieJar|boolean $cookiejar Existing cookiejar object, true to create a new one, false to disable
-     * @return Zend_Http_Client
-     */
-    public function setCookieJar($cookiejar = true)
-    {
-        if (! class_exists('Zend_Http_CookieJar'))
-            require_once 'Zend/Http/CookieJar.php';
-
-        if ($cookiejar instanceof Zend_Http_CookieJar) {
-            $this->cookiejar = $cookiejar;
-        } elseif ($cookiejar === true) {
-            $this->cookiejar = new Zend_Http_CookieJar();
-        } elseif (! $cookiejar) {
-            $this->cookiejar = null;
-        } else {
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception('Invalid parameter type passed as CookieJar');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return the current cookie jar or null if none.
-     *
-     * @return Zend_Http_CookieJar|null
-     */
-    public function getCookieJar()
-    {
-        return $this->cookiejar;
-    }
-
-    /**
-     * Add a cookie to the request. If the client has no Cookie Jar, the cookies
-     * will be added directly to the headers array as "Cookie" headers.
-     *
-     * @param Zend_Http_Cookie|string $cookie
-     * @param string|null $value If "cookie" is a string, this is the cookie value.
-     * @return Zend_Http_Client
-     */
-    public function setCookie($cookie, $value = null)
-    {
-        if (! class_exists('Zend_Http_Cookie'))
-            require_once 'Zend/Http/Cookie.php';
-
-        if (is_array($cookie)) {
-            foreach ($cookie as $c => $v) {
-                if (is_string($c)) {
-                    $this->setCookie($c, $v);
-                } else {
-                    $this->setCookie($v);
-                }
-            }
-
-            return $this;
-        }
-
-        if ($value !== null) $value = urlencode($value);
-
-        if (isset($this->cookiejar)) {
-            if ($cookie instanceof Zend_Http_Cookie) {
-                $this->cookiejar->addCookie($cookie);
-            } elseif (is_string($cookie) && $value !== null) {
-                $cookie = Zend_Http_Cookie::fromString("{$cookie}={$value}", $this->uri);
-                $this->cookiejar->addCookie($cookie);
-            }
-        } else {
-            if ($cookie instanceof Zend_Http_Cookie) {
-                $name = $cookie->getName();
-                $value = $cookie->getValue();
-                $cookie = $name;
-            }
-
-            if (preg_match("/[=,; \t\r\n\013\014]/", $cookie)) {
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("Cookie name cannot contain these characters: =,; \t\r\n\013\014 ({$cookie})");
-            }
-
-            $value = addslashes($value);
-
-            if (! isset($this->headers['cookie'])) $this->headers['cookie'] = array('Cookie', '');
-            $this->headers['cookie'][1] .= $cookie . '=' . $value . '; ';
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set a file to upload (using a POST request)
-     *
-     * Can be used in two ways:
-     *
-     * 1. $data is null (default): $filename is treated as the name if a local file which
-     *    will be read and sent. Will try to guess the content type using mime_content_type().
-     * 2. $data is set - $filename is sent as the file name, but $data is sent as the file
-     *    contents and no file is read from the file system. In this case, you need to
-     *    manually set the content-type ($ctype) or it will default to
-     *    application/octet-stream.
-     *
-     * @param string $filename Name of file to upload, or name to save as
-     * @param string $formname Name of form element to send as
-     * @param string $data Data to send (if null, $filename is read and sent)
-     * @param string $ctype Content type to use (if $data is set and $ctype is
-     *     null, will be application/octet-stream)
-     * @return Zend_Http_Client
-     */
-    public function setFileUpload($filename, $formname, $data = null, $ctype = null)
-    {
-        if ($data === null) {
-            if (($data = @file_get_contents($filename)) === false) {
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("Unable to read file '{$filename}' for upload");
-            }
-
-            if (! $ctype && function_exists('mime_content_type')) $ctype = mime_content_type($filename);
-        }
-
-        // Force enctype to multipart/form-data
-        $this->setEncType(self::ENC_FORMDATA);
-
-        if ($ctype === null) $ctype = 'application/octet-stream';
-        $this->files[$formname] = array(basename($filename), $ctype, $data);
-
-        return $this;
-    }
-
-    /**
-     * Set the encoding type for POST data
-     *
-     * @param string $enctype
-     * @return Zend_Http_Client
-     */
-    public function setEncType($enctype = self::ENC_URLENCODED)
-    {
-        $this->enctype = $enctype;
-
-        return $this;
-    }
-
-    /**
-     * Set the raw (already encoded) POST data.
-     *
-     * This function is here for two reasons:
-     * 1. For advanced user who would like to set their own data, already encoded
-     * 2. For backwards compatibilty: If someone uses the old post($data) method.
-     *    this method will be used to set the encoded data.
-     *
-     * @param string $data
-     * @param string $enctype
-     * @return Zend_Http_Client
-     */
-    public function setRawData($data, $enctype = null)
-    {
-        $this->raw_post_data = $data;
-        $this->setEncType($enctype);
-
-        return $this;
-    }
-
-    /**
-     * Clear all GET and POST parameters
-     *
-     * Should be used to reset the request parameters if the client is
-     * used for several concurrent requests.
-     *
-     * @return Zend_Http_Client
-     */
-    public function resetParameters()
-    {
-        // Reset parameter data
-        $this->paramsGet     = array();
-        $this->paramsPost    = array();
-        $this->files         = array();
-        $this->raw_post_data = null;
-
-        // Clear outdated headers
-        if (isset($this->headers['content-type'])) unset($this->headers['content-type']);
-        if (isset($this->headers['content-length'])) unset($this->headers['content-length']);
-
-        return $this;
-    }
-
-    /**
-     * Get the last HTTP request as string
-     *
-     * @return string
-     */
-    public function getLastRequest()
-    {
-        return $this->last_request;
-    }
-
-    /**
-     * Get the last HTTP response received by this client
-     *
-     * If $config['storeresponse'] is set to false, or no response was
-     * stored yet, will return null
-     *
-     * @return Zend_Http_Response or null if none
-     */
-    public function getLastResponse()
-    {
-        return $this->last_response;
-    }
-
-    /**
-     * Load the connection adapter
-     *
-     * While this method is not called more than one for a client, it is
-     * seperated from ->request() to preserve logic and readability
-     *
-     * @param Zend_Http_Client_Adapter_Interface|string $adapter
-     */
-    public function setAdapter($adapter)
-    {
-        if (is_string($adapter)) {
-            try {
-                Zend_Loader::loadClass($adapter);
-            } catch (Zend_Exception $e) {
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("Unable to load adapter '$adapter': {$e->getMessage()}");
-            }
-
-            $adapter = new $adapter;
-        }
-
-        if (! $adapter instanceof Zend_Http_Client_Adapter_Interface) {
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception('Passed adapter is not a HTTP connection adapter');
-        }
-
-        $this->adapter = $adapter;
-        $config = $this->config;
-        unset($config['adapter']);
-        $this->adapter->setConfig($config);
-    }
-
-    /**
-     * Send the HTTP request and return an HTTP response object
-     *
-     * @param string $method
-     * @return Zend_Http_Response
-     */
-    public function request($method = null)
-    {
-        if (! $this->uri instanceof Zend_Uri_Http) {
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception('No valid URI has been passed to the client');
-        }
-
-        if ($method) $this->setMethod($method);
-        $this->redirectCounter = 0;
-        $response = null;
-
-        // Make sure the adapter is loaded
-        if ($this->adapter == null) $this->setAdapter($this->config['adapter']);
-
-        // Send the first request. If redirected, continue.
-        do {
-            // Clone the URI and add the additional GET parameters to it
-            $uri = clone $this->uri;
-            if (! empty($this->paramsGet)) {
-                $query = $uri->getQuery();
-                   if (! empty($query)) $query .= '&';
-                $query .= http_build_query($this->paramsGet, null, '&');
-
-                $uri->setQuery($query);
-            }
-
-            $body = $this->prepare_body();
-            $headers = $this->prepare_headers();
-
-            // Open the connection, send the request and read the response
-            $this->adapter->connect($uri->getHost(), $uri->getPort(),
-                ($uri->getScheme() == 'https' ? true : false));
-
-            $this->last_request = $this->adapter->write($this->method,
-                $uri, $this->config['httpversion'], $headers, $body);
-
-            $response = $this->adapter->read();
-            if (! $response) {
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception('Unable to read response, or response is empty');
-            }
-
-            $response = Zend_Http_Response::fromString($response);
-            if ($this->config['storeresponse']) $this->last_response = $response;
-
-            // Load cookies into cookie jar
-            if (isset($this->cookiejar)) $this->cookiejar->addCookiesFromResponse($response, $uri);
-
-            // If we got redirected, look for the Location header
-            if ($response->isRedirect() && ($location = $response->getHeader('location'))) {
-
-                // Check whether we send the exact same request again, or drop the parameters
-                // and send a GET request
-                if ($response->getStatus() == 303 ||
-                   ((! $this->config['strictredirects']) && ($response->getStatus() == 302 ||
-                       $response->getStatus() == 301))) {
-
-                    $this->resetParameters();
-                    $this->setMethod(self::GET);
-                }
-
-                // If we got a well formed absolute URI
-                if (Zend_Uri_Http::check($location)) {
-                    $this->setHeaders('host', null);
-                    $this->setUri($location);
-
-                } else {
-
-                    // Split into path and query and set the query
-                    if (strpos($location, '?') !== false) {
-                        list($location, $query) = explode('?', $location, 2);
-                    } else {
-                        $query = '';
-                    }
-                    $this->uri->setQuery($query);
-
-                    // Else, if we got just an absolute path, set it
-                    if(strpos($location, '/') === 0) {
-                        $this->uri->setPath($location);
-
-                        // Else, assume we have a relative path
-                    } else {
-                        // Get the current path directory, removing any trailing slashes
-                        $path = $this->uri->getPath();
-                        $path = rtrim(substr($path, 0, strrpos($path, '/')), "/");
-                        $this->uri->setPath($path . '/' . $location);
-                    }
-                }
-                ++$this->redirectCounter;
-
-            } else {
-                // If we didn't get any location, stop redirecting
-                break;
-            }
-
-        } while ($this->redirectCounter < $this->config['maxredirects']);
-
-        return $response;
-    }
-
-    /**
-     * Prepare the request headers
-     *
-     * @return array
-     */
-    protected function prepare_headers()
-    {
-        $headers = array();
-
-        // Set the host header
-        if (! isset($this->headers['host'])) {
-            $host = $this->uri->getHost();
-
-            // If the port is not default, add it
-            if (! (($this->uri->getScheme() == 'http' && $this->uri->getPort() == 80) ||
-                  ($this->uri->getScheme() == 'https' && $this->uri->getPort() == 443))) {
-                $host .= ':' . $this->uri->getPort();
-            }
-
-            $headers[] = "Host: {$host}";
-        }
-
-        // Set the connection header
-        if (! isset($this->headers['connection'])) {
-            if (! $this->config['keepalive']) $headers[] = "Connection: close";
-        }
-
-        // Set the Accept-encoding header if not set - depending on whether
-        // zlib is available or not.
-        if (! isset($this->headers['accept-encoding'])) {
-        	if (function_exists('gzinflate')) {
-        		$headers[] = 'Accept-encoding: gzip, deflate';
-        	} else {
-        		$headers[] = 'Accept-encoding: identity';
-        	}
-        }
-        
-        // Set the content-type header
-        if ($this->method == self::POST &&
-           (! isset($this->headers['content-type']) && isset($this->enctype))) {
-
-            $headers[] = "Content-type: {$this->enctype}";
-        }
-
-        // Set the user agent header
-        if (! isset($this->headers['user-agent']) && isset($this->config['useragent'])) {
-            $headers[] = "User-agent: {$this->config['useragent']}";
-        }
-
-        // Set HTTP authentication if needed
-        if (is_array($this->auth)) {
-            $auth = self::encodeAuthHeader($this->auth['user'], $this->auth['password'], $this->auth['type']);
-            $headers[] = "Authorization: {$auth}";
-        }
-
-        // Load cookies from cookie jar
-        if (isset($this->cookiejar)) {
-            $cookstr = $this->cookiejar->getMatchingCookies($this->uri,
-                true, Zend_Http_CookieJar::COOKIE_STRING_CONCAT);
-
-            if ($cookstr) $headers[] = "Cookie: {$cookstr}";
-        }
-
-        // Add all other user defined headers
-        foreach ($this->headers as $header) {
-        	list($name, $value) = $header;
-            if (is_array($value))
-                $value = implode(', ', $value);
-
-            $headers[] = "$name: $value";
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Prepare the request body (for POST and PUT requests)
-     *
-     * @return string
-     */
-    protected function prepare_body()
-    {
-        // According to RFC2616, a TRACE request should not have a body.
-        if ($this->method == self::TRACE) {
-            return '';
-        }
-
-        // If we have raw_post_data set, just use it as the body.
-        if (isset($this->raw_post_data)) {
-            $this->setHeaders('Content-length', strlen($this->raw_post_data));
-            return $this->raw_post_data;
-        }
-
-        $body = '';
-
-        // If we have files to upload, force enctype to multipart/form-data
-        if (count ($this->files) > 0) $this->setEncType(self::ENC_FORMDATA);
-
-        // If we have POST parameters or files, encode and add them to the body
-        if (count($this->paramsPost) > 0 || count($this->files) > 0) {
-            switch($this->enctype) {
-                case self::ENC_FORMDATA:
-                    // Encode body as multipart/form-data
-                    $boundary = '---ZENDHTTPCLIENT-' . md5(microtime());
-                    $this->setHeaders('Content-type', self::ENC_FORMDATA . "; boundary={$boundary}");
-
-                    // Get POST parameters and encode them
-                    $params = $this->_getParametersRecursive($this->paramsPost);
-                    foreach ($params as $pp) {
-                        $body .= self::encodeFormData($boundary, $pp[0], $pp[1]);
-                    }
-
-                    // Encode files
-                    foreach ($this->files as $name => $file) {
-                        $fhead = array('Content-type' => $file[1]);
-                        $body .= self::encodeFormData($boundary, $name, $file[2], $file[0], $fhead);
-                    }
-
-                    $body .= "--{$boundary}--\r\n";
-                    break;
-
-                case self::ENC_URLENCODED:
-                    // Encode body as application/x-www-form-urlencoded
-                    $this->setHeaders('Content-type', self::ENC_URLENCODED);
-                    $body = http_build_query($this->paramsPost, '', '&');
-                    break;
-
-                default:
-                    require_once 'Zend/Http/Client/Exception.php';
-                    throw new Zend_Http_Client_Exception("Cannot handle content type '{$this->enctype}' automatically." .
-                        " Please use Zend_Http_Client::setRawData to send this kind of content.");
-                    break;
-            }
-        }
-
-        if ($body) $this->setHeaders('Content-length', strlen($body));
-        return $body;
-    }
-
-    /**
-     * Helper method that gets a possibly multi-level parameters array (get or
-     * post) and flattens it.
-     *
-     * The method returns an array of (key, value) pairs (because keys are not
-     * necessarily unique. If one of the parameters in as array, it will also
-     * add a [] suffix to the key.
-     *
-     * @param array $parray The parameters array
-     * @param bool $urlencode Whether to urlencode the name and value
-     * @return array
-     */
-    protected function _getParametersRecursive($parray, $urlencode = false)
-    {
-        if (! is_array($parray)) return $parray;
-        $parameters = array();
-
-        foreach ($parray as $name => $value) {
-            if ($urlencode) $name = urlencode($name);
-
-            // If $value is an array, iterate over it
-            if (is_array($value)) {
-                $name .= ($urlencode ? '%5B%5D' : '[]');
-                foreach ($value as $subval) {
-                    if ($urlencode) $subval = urlencode($subval);
-                    $parameters[] = array($name, $subval);
-                }
-            } else {
-                if ($urlencode) $value = urlencode($value);
-                $parameters[] = array($name, $value);
-            }
-        }
-
-        return $parameters;
-    }
-
-    /**
-     * Encode data to a multipart/form-data part suitable for a POST request.
-     *
-     * @param string $boundary
-     * @param string $name
-     * @param mixed $value
-     * @param string $filename
-     * @param array $headers Associative array of optional headers @example ("Content-transfer-encoding" => "binary")
-     * @return string
-     */
-    public static function encodeFormData($boundary, $name, $value, $filename = null, $headers = array()) {
-        $ret = "--{$boundary}\r\n" .
-            'Content-disposition: form-data; name="' . $name .'"';
-
-        if ($filename) $ret .= '; filename="' . $filename . '"';
-        $ret .= "\r\n";
-
-        foreach ($headers as $hname => $hvalue) {
-            $ret .= "{$hname}: {$hvalue}\r\n";
-        }
-        $ret .= "\r\n";
-
-        $ret .= "{$value}\r\n";
-
-        return $ret;
-    }
-
-    /**
-     * Create a HTTP authentication "Authorization:" header according to the
-     * specified user, password and authentication method.
-     *
-     * @see http://www.faqs.org/rfcs/rfc2617.html
-     * @param string $user
-     * @param string $password
-     * @param string $type
-     * @return string
-     */
-    public static function encodeAuthHeader($user, $password, $type = self::AUTH_BASIC)
-    {
-        $authHeader = null;
-
-        switch ($type) {
-            case self::AUTH_BASIC:
-                // In basic authentication, the user name cannot contain ":"
-                if (strpos($user, ':') !== false) {
-                    require_once 'Zend/Http/Client/Exception.php';
-                    throw new Zend_Http_Client_Exception("The user name cannot contain ':' in 'Basic' HTTP authentication");
-                }
-
-                $authHeader = 'Basic ' . base64_encode($user . ':' . $password);
-                break;
-
-            //case self::AUTH_DIGEST:
-                /**
-                 * @todo Implement digest authentication
-                 */
-            //    break;
-
-            default:
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("Not a supported HTTP authentication type: '$type'");
-        }
-
-        return $authHeader;
-    }
-}
diff --git a/Zend/Http/Client/Adapter/Exception.php b/Zend/Http/Client/Adapter/Exception.php
deleted file mode 100644
index dfbe904..0000000
--- a/Zend/Http/Client/Adapter/Exception.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'ssl',
-        'proxy_host'    => '',
-        'proxy_port'    => 8080,
-        'proxy_user'    => '',
-        'proxy_pass'    => '',
-        'proxy_auth'    => Zend_Http_Client::AUTH_BASIC
-    );
-
-    /**
-     * Whether HTTPS CONNECT was already negotiated with the proxy or not
-     *
-     * @var boolean
-     */
-    protected $negotiated = false;
-    
-    /**
-     * Connect to the remote server
-     *
-     * Will try to connect to the proxy server. If no proxy was set, will
-     * fall back to the target server (behave like regular Socket adapter)
-     *
-     * @param string  $host
-     * @param int     $port
-     * @param boolean $secure
-     * @param int     $timeout
-     */
-    public function connect($host, $port = 80, $secure = false)
-    {
-        // If no proxy is set, fall back to Socket adapter
-        if (! $this->config['proxy_host']) return parent::connect($host, $port, $secure);
-
-        // Go through a proxy - the connection is actually to the proxy server
-        $host = $this->config['proxy_host'];
-        $port = $this->config['proxy_port'];
-
-        // If we are connected to the wrong proxy, disconnect first
-        if (($this->connected_to[0] != $host || $this->connected_to[1] != $port)) {
-            if (is_resource($this->socket)) $this->close();
-        }
-
-        // Now, if we are not connected, connect
-        if (! is_resource($this->socket) || ! $this->config['keepalive']) {
-            $this->socket = @fsockopen($host, $port, $errno, $errstr, (int) $this->config['timeout']);
-            if (! $this->socket) {
-                $this->close();
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-		throw new Zend_Http_Client_Adapter_Exception(
-                    'Unable to Connect to proxy server ' . $host . ':' . $port . '. Error #' . $errno . ': ' . $errstr);
-            }
-
-            // Set the stream timeout
-            if (!stream_set_timeout($this->socket, (int) $this->config['timeout'])) {
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-                throw new Zend_Http_Client_Adapter_Exception('Unable to set the connection timeout');
-            }
-
-            // Update connected_to
-            $this->connected_to = array($host, $port);
-        }
-    }
-
-    /**
-     * Send request to the proxy server
-     *
-     * @param string        $method
-     * @param Zend_Uri_Http $uri
-     * @param string        $http_ver
-     * @param array         $headers
-     * @param string        $body
-     * @return string Request as string
-     */
-    public function write($method, $uri, $http_ver = '1.1', $headers = array(), $body = '')
-    {
-        // If no proxy is set, fall back to default Socket adapter
-        if (! $this->config['proxy_host']) return parent::write($method, $uri, $http_ver, $headers, $body);
-
-        // Make sure we're properly connected
-        if (! $this->socket) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are not connected");
-	}
-
-        $host = $this->config['proxy_host'];
-        $port = $this->config['proxy_port'];
-
-        if ($this->connected_to[0] != $host || $this->connected_to[1] != $port) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are connected to the wrong proxy server");
-	}
-
-        // Add Proxy-Authorization header
-        if ($this->config['proxy_user'] && ! isset($headers['proxy-authorization']))
-            $headers['proxy-authorization'] = Zend_Http_Client::encodeAuthHeader(
-                $this->config['proxy_user'], $this->config['proxy_pass'], $this->config['proxy_auth']
-            );
-                
-        // if we are proxying HTTPS, preform CONNECT handshake with the proxy
-        if ($uri->getScheme() == 'https' && (! $this->negotiated)) {
-            $this->connectHandshake($uri->getHost(), $uri->getPort(), $http_ver, $headers);
-            $this->negotiated = true;
-        }
-        
-        // Save request method for later
-        $this->method = $method;
-
-        // Build request headers
-        $request = "{$method} {$uri->__toString()} HTTP/{$http_ver}\r\n";
-
-        // Add all headers to the request string
-        foreach ($headers as $k => $v) {
-            if (is_string($k)) $v = "$k: $v";
-            $request .= "$v\r\n";
-        }
-
-        // Add the request body
-        $request .= "\r\n" . $body;
-
-        // Send the request
-        if (! @fwrite($this->socket, $request)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Error writing request to proxy server");
-        }
-
-        return $request;
-    }
-
-    /**
-     * Preform handshaking with HTTPS proxy using CONNECT method
-     *
-     * @param string  $host
-     * @param integer $port
-     * @param string  $http_ver
-     * @param array   $headers
-     */
-    protected function connectHandshake($host, $port = 443, $http_ver = '1.1', array &$headers = array())
-    {
-    	$request = "CONNECT $host:$port HTTP/$http_ver\r\n" . 
-    	           "Host: " . $this->config['proxy_host'] . "\r\n";
-
-    	// Add the user-agent header
-    	if (isset($this->config['useragent'])) {
-    		$request .= "User-agent: " . $this->config['useragent'] . "\r\n";
-    	}
-    	
-    	// If the proxy-authorization header is set, send it to proxy but remove
-    	// it from headers sent to target host
-    	if (isset($headers['proxy-authorization'])) {
-    	    $request .= "Proxy-authorization: " . $headers['proxy-authorization'] . "\r\n";
-    	    unset($headers['proxy-authorization']);
-    	}
-    	
-        $request .= "\r\n";
-
-        // Send the request
-        if (! @fwrite($this->socket, $request)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Error writing request to proxy server");
-        }
-
-        // Read response headers only
-        $response = '';
-        $gotStatus = false;
-        while ($line = @fgets($this->socket)) {
-            $gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false);
-            if ($gotStatus) {
-                $response .= $line;
-                if (!chop($line)) break;
-            }
-        }
-        
-        // Check that the response from the proxy is 200
-        if (Zend_Http_Response::extractCode($response) != 200) {
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-        	throw new Zend_Http_Client_Adapter_Exception("Unable to connect to HTTPS proxy. Server response: " . $response);
-        }
-        
-        // If all is good, switch socket to secure mode. We have to fall back
-        // through the different modes 
-        $modes = array(
-            STREAM_CRYPTO_METHOD_TLS_CLIENT, 
-            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT 
-        );
-        
-        $success = false; 
-        foreach($modes as $mode) {
-            $success = stream_socket_enable_crypto($this->socket, true, $mode);
-        	if ($success) break;
-        }
-        
-        if (! $success) {
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-        	throw new Zend_Http_Client_Adapter_Exception("Unable to connect to" . 
-        	    " HTTPS server through proxy: could not negotiate secure connection.");
-        }
-    }
-    
-    /**
-     * Close the connection to the server
-     *
-     */
-    public function close()
-    {
-        parent::close();
-        $this->negotiated = false;
-    }
-    
-    /**
-     * Destructor: make sure the socket is disconnected
-     *
-     */
-    public function __destruct()
-    {
-        if ($this->socket) $this->close();
-    }
-}
diff --git a/Zend/Http/Client/Adapter/Socket.php b/Zend/Http/Client/Adapter/Socket.php
deleted file mode 100644
index 013d337..0000000
--- a/Zend/Http/Client/Adapter/Socket.php
+++ /dev/null
@@ -1,319 +0,0 @@
- 'ssl',
-        'sslcert'       => null,
-        'sslpassphrase' => null
-    );
-
-    /**
-     * Request method - will be set by write() and might be used by read()
-     *
-     * @var string
-     */
-    protected $method = null;
-
-    /**
-     * Adapter constructor, currently empty. Config is set using setConfig()
-     *
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Set the configuration array for the adapter
-     *
-     * @param array $config
-     */
-    public function setConfig($config = array())
-    {
-        if (! is_array($config)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception(
-                '$config expects an array, ' . gettype($config) . ' recieved.');
-        }
-
-        foreach ($config as $k => $v) {
-            $this->config[strtolower($k)] = $v;
-        }
-    }
-
-    /**
-     * Connect to the remote server
-     *
-     * @param string  $host
-     * @param int     $port
-     * @param boolean $secure
-     * @param int     $timeout
-     */
-    public function connect($host, $port = 80, $secure = false)
-    {
-        // If the URI should be accessed via SSL, prepend the Hostname with ssl://
-        $host = ($secure ? $this->config['ssltransport'] : 'tcp') . '://' . $host;
-
-        // If we are connected to the wrong host, disconnect first
-        if (($this->connected_to[0] != $host || $this->connected_to[1] != $port)) {
-            if (is_resource($this->socket)) $this->close();
-        }
-
-        // Now, if we are not connected, connect
-        if (! is_resource($this->socket) || ! $this->config['keepalive']) {
-            $context = stream_context_create();
-            if ($secure) {
-                if ($this->config['sslcert'] !== null) {
-                    if (! stream_context_set_option($context, 'ssl', 'local_cert',
-                                                    $this->config['sslcert'])) {
-                        require_once 'Zend/Http/Client/Adapter/Exception.php';
-                        throw new Zend_Http_Client_Adapter_Exception('Unable to set sslcert option');
-                    }
-                }
-                if ($this->config['sslpassphrase'] !== null) {
-                    if (! stream_context_set_option($context, 'ssl', 'passphrase',
-                                                    $this->config['sslpassphrase'])) {
-                        require_once 'Zend/Http/Client/Adapter/Exception.php';
-                        throw new Zend_Http_Client_Adapter_Exception('Unable to set sslpassphrase option');
-                    }
-                }
-            }
-
-            $this->socket = @stream_socket_client($host . ':' . $port,
-                                                  $errno,
-                                                  $errstr,
-                                                  (int) $this->config['timeout'],
-                                                  STREAM_CLIENT_CONNECT,
-                                                  $context);
-            if (! $this->socket) {
-                $this->close();
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-                throw new Zend_Http_Client_Adapter_Exception(
-                    'Unable to Connect to ' . $host . ':' . $port . '. Error #' . $errno . ': ' . $errstr);
-            }
-
-            // Set the stream timeout
-            if (! stream_set_timeout($this->socket, (int) $this->config['timeout'])) {
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-                throw new Zend_Http_Client_Adapter_Exception('Unable to set the connection timeout');
-            }
-
-            // Update connected_to
-            $this->connected_to = array($host, $port);
-        }
-    }
-
-    /**
-     * Send request to the remote server
-     *
-     * @param string        $method
-     * @param Zend_Uri_Http $uri
-     * @param string        $http_ver
-     * @param array         $headers
-     * @param string        $body
-     * @return string Request as string
-     */
-    public function write($method, $uri, $http_ver = '1.1', $headers = array(), $body = '')
-    {
-        // Make sure we're properly connected
-        if (! $this->socket) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception('Trying to write but we are not connected');
-        }
-
-        $host = $uri->getHost();
-        $host = (strtolower($uri->getScheme()) == 'https' ? $this->config['ssltransport'] : 'tcp') . '://' . $host;
-        if ($this->connected_to[0] != $host || $this->connected_to[1] != $uri->getPort()) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception('Trying to write but we are connected to the wrong host');
-        }
-
-        // Save request method for later
-        $this->method = $method;
-
-        // Build request headers
-        $path = $uri->getPath();
-        if ($uri->getQuery()) $path .= '?' . $uri->getQuery();
-        $request = "{$method} {$path} HTTP/{$http_ver}\r\n";
-        foreach ($headers as $k => $v) {
-            if (is_string($k)) $v = ucfirst($k) . ": $v";
-            $request .= "$v\r\n";
-        }
-
-        // Add the request body
-        $request .= "\r\n" . $body;
-
-        // Send the request
-        if (! @fwrite($this->socket, $request)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception('Error writing request to server');
-        }
-
-        return $request;
-    }
-
-    /**
-     * Read response from server
-     *
-     * @return string
-     */
-    public function read()
-    {
-        // First, read headers only
-        $response = '';
-        $gotStatus = false;
-        while ($line = @fgets($this->socket)) {
-            $gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false);
-            if ($gotStatus) {
-                $response .= $line;
-                if (!chop($line)) break;
-            }
-        }
-
-        // Handle 100 and 101 responses internally by restarting the read again
-        if (Zend_Http_Response::extractCode($response) == 100 ||
-            Zend_Http_Response::extractCode($response) == 101) return $this->read();
-
-        // If this was a HEAD request, return after reading the header (no need to read body)
-        if ($this->method == Zend_Http_Client::HEAD) return $response;
-
-        // Check headers to see what kind of connection / transfer encoding we have
-        $headers = Zend_Http_Response::extractHeaders($response);
-
-        // if the connection is set to close, just read until socket closes
-        if (isset($headers['connection']) && $headers['connection'] == 'close') {
-            while ($buff = @fread($this->socket, 8192)) {
-                $response .= $buff;
-            }
-
-            $this->close();
-
-        // Else, if we got a transfer-encoding header (chunked body)
-        } elseif (isset($headers['transfer-encoding'])) {
-            if ($headers['transfer-encoding'] == 'chunked') {
-                do {
-                    $chunk = '';
-                    $line = @fgets($this->socket);
-                    $chunk .= $line;
-
-                    $hexchunksize = ltrim(chop($line), '0');
-                    $hexchunksize = strlen($hexchunksize) ? strtolower($hexchunksize) : 0;
-
-                    $chunksize = hexdec(chop($line));
-                    if (dechex($chunksize) != $hexchunksize) {
-                        @fclose($this->socket);
-                        require_once 'Zend/Http/Client/Adapter/Exception.php';
-                        throw new Zend_Http_Client_Adapter_Exception('Invalid chunk size "' .
-                            $hexchunksize . '" unable to read chunked body');
-                    }
-
-                    $left_to_read = $chunksize;
-                    while ($left_to_read > 0) {
-                        $line = @fread($this->socket, $left_to_read);
-                        $chunk .= $line;
-                        $left_to_read -= strlen($line);
-                    }
-
-                    $chunk .= @fgets($this->socket);
-                    $response .= $chunk;
-                } while ($chunksize > 0);
-            } else {
-                throw new Zend_Http_Client_Adapter_Exception('Cannot handle "' .
-                    $headers['transfer-encoding'] . '" transfer encoding');
-            }
-
-        // Else, if we got the content-length header, read this number of bytes
-        } elseif (isset($headers['content-length'])) {
-            $left_to_read = $headers['content-length'];
-            $chunk = '';
-            while ($left_to_read > 0) {
-                $chunk = @fread($this->socket, $left_to_read);
-                $left_to_read -= strlen($chunk);
-                $response .= $chunk;
-            }
-
-        // Fallback: just read the response (should not happen)
-        } else {
-            while ($buff = @fread($this->socket, 8192)) {
-                $response .= $buff;
-            }
-
-            $this->close();
-        }
-
-        return $response;
-    }
-
-    /**
-     * Close the connection to the server
-     *
-     */
-    public function close()
-    {
-        if (is_resource($this->socket)) @fclose($this->socket);
-        $this->socket = null;
-        $this->connected_to = array(null, null);
-    }
-
-    /**
-     * Destructor: make sure the socket is disconnected
-     *
-     */
-    public function __destruct()
-    {
-        if ($this->socket) $this->close();
-    }
-}
diff --git a/Zend/Http/Client/Adapter/Test.php b/Zend/Http/Client/Adapter/Test.php
deleted file mode 100644
index ce5c468..0000000
--- a/Zend/Http/Client/Adapter/Test.php
+++ /dev/null
@@ -1,193 +0,0 @@
- $v) {
-            $this->config[strtolower($k)] = $v;
-        }
-    }
-
-    /**
-     * Connect to the remote server
-     *
-     * @param string  $host
-     * @param int     $port
-     * @param boolean $secure
-     * @param int     $timeout
-     */
-    public function connect($host, $port = 80, $secure = false)
-    { }
-
-    /**
-     * Send request to the remote server
-     *
-     * @param string        $method
-     * @param Zend_Uri_Http $uri
-     * @param string        $http_ver
-     * @param array         $headers
-     * @param string        $body
-     * @return string Request as string
-     */
-    public function write($method, $uri, $http_ver = '1.1', $headers = array(), $body = '')
-    {
-        $host = $uri->getHost();
-            $host = (strtolower($uri->getScheme()) == 'https' ? 'sslv2://' . $host : $host);
-
-        // Build request headers
-        $path = $uri->getPath();
-        if ($uri->getQuery()) $path .= '?' . $uri->getQuery();
-        $request = "{$method} {$path} HTTP/{$http_ver}\r\n";
-        foreach ($headers as $k => $v) {
-            if (is_string($k)) $v = ucfirst($k) . ": $v";
-            $request .= "$v\r\n";
-        }
-
-        // Add the request body
-        $request .= "\r\n" . $body;
-
-        // Do nothing - just return the request as string
-
-        return $request;
-    }
-
-    /**
-     * Return the response set in $this->setResponse()
-     *
-     * @return string
-     */
-    public function read()
-    {
-        if ($this->responseIndex >= count($this->responses)) {
-            $this->responseIndex = 0;
-        }
-        return $this->responses[$this->responseIndex++];
-    }
-
-    /**
-     * Close the connection (dummy)
-     *
-     */
-    public function close()
-    { }
-
-    /**
-     * Set the HTTP response(s) to be returned by this adapter
-     *
-     * @param Zend_Http_Response|array|string $response
-     */
-    public function setResponse($response)
-    {
-        if ($response instanceof Zend_Http_Response) {
-            $response = $response->asString();
-        }
-
-        $this->responses = (array)$response;
-        $this->responseIndex = 0;
-    }
-
-    /**
-     * Add another response to the response buffer.
-     *
-     * @param string $response
-     */
-    public function addResponse($response)
-    {
-        $this->responses[] = $response;
-    }
-
-    /**
-     * Sets the position of the response buffer.  Selects which
-     * response will be returned on the next call to read().
-     *
-     * @param integer $index
-     */
-    public function setResponseIndex($index)
-    {
-        if ($index < 0 || $index >= count($this->responses)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception(
-                'Index out of range of response buffer size');
-        }
-        $this->responseIndex = $index;
-    }
-}
diff --git a/Zend/Http/Client/Exception.php b/Zend/Http/Client/Exception.php
deleted file mode 100644
index 70c8e01..0000000
--- a/Zend/Http/Client/Exception.php
+++ /dev/null
@@ -1,33 +0,0 @@
-name = (string) $name) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('Cookies must have a name');
-        }
-
-        if (! $this->domain = (string) $domain) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('Cookies must have a domain');
-        }
-
-        $this->value = (string) $value;
-        $this->expires = ($expires === null ? null : (int) $expires);
-        $this->path = ($path ? $path : '/');
-        $this->secure = $secure;
-    }
-
-    /**
-     * Get Cookie name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Get cookie value
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Get cookie domain
-     *
-     * @return string
-     */
-    public function getDomain()
-    {
-        return $this->domain;
-    }
-
-    /**
-     * Get the cookie path
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Get the expiry time of the cookie, or null if no expiry time is set
-     *
-     * @return int|null
-     */
-    public function getExpiryTime()
-    {
-        return $this->expires;
-    }
-
-    /**
-     * Check whether the cookie should only be sent over secure connections
-     *
-     * @return boolean
-     */
-    public function isSecure()
-    {
-        return $this->secure;
-    }
-
-    /**
-     * Check whether the cookie has expired
-     *
-     * Always returns false if the cookie is a session cookie (has no expiry time)
-     *
-     * @param int $now Timestamp to consider as "now"
-     * @return boolean
-     */
-    public function isExpired($now = null)
-    {
-        if ($now === null) $now = time();
-        if (is_int($this->expires) && $this->expires < $now) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Check whether the cookie is a session cookie (has no expiry time set)
-     *
-     * @return boolean
-     */
-    public function isSessionCookie()
-    {
-        return ($this->expires === null);
-    }
-
-    /**
-     * Checks whether the cookie should be sent or not in a specific scenario
-     *
-     * @param string|Zend_Uri_Http $uri URI to check against (secure, domain, path)
-     * @param boolean $matchSessionCookies Whether to send session cookies
-     * @param int $now Override the current time when checking for expiry time
-     * @return boolean
-     */
-    public function match($uri, $matchSessionCookies = true, $now = null)
-    {
-        if (is_string ($uri)) {
-            $uri = Zend_Uri_Http::factory($uri);
-        }
-
-        // Make sure we have a valid Zend_Uri_Http object
-        if (! ($uri->valid() && ($uri->getScheme() == 'http' || $uri->getScheme() =='https'))) {
-            require_once 'Zend/Http/Exception.php';    
-            throw new Zend_Http_Exception('Passed URI is not a valid HTTP or HTTPS URI');
-        }
-
-        // Check that the cookie is secure (if required) and not expired
-        if ($this->secure && $uri->getScheme() != 'https') return false;
-        if ($this->isExpired($now)) return false;
-        if ($this->isSessionCookie() && ! $matchSessionCookies) return false;
-
-        // Validate domain and path
-        // Domain is validated using tail match, while path is validated using head match
-        $domain_preg = preg_quote($this->getDomain(), "/");
-        if (! preg_match("/{$domain_preg}$/", $uri->getHost())) return false;
-        $path_preg = preg_quote($this->getPath(), "/");
-        if (! preg_match("/^{$path_preg}/", $uri->getPath())) return false;
-
-        // If we didn't die until now, return true.
-        return true;
-    }
-
-    /**
-     * Get the cookie as a string, suitable for sending as a "Cookie" header in an
-     * HTTP request
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->name . '=' . urlencode($this->value) . ';';
-    }
-
-    /**
-     * Generate a new Cookie object from a cookie string
-     * (for example the value of the Set-Cookie HTTP header)
-     *
-     * @param string $cookieStr
-     * @param Zend_Uri_Http|string $ref_uri Reference URI for default values (domain, path)
-     * @return Zend_Http_Cookie A new Zend_Http_Cookie object or false on failure.
-     */
-    public static function fromString($cookieStr, $ref_uri = null)
-    {
-        // Set default values
-        if (is_string($ref_uri)) {
-            $ref_uri = Zend_Uri_Http::factory($ref_uri);
-        }
-
-        $name    = '';
-        $value   = '';
-        $domain  = '';
-        $path    = '';
-        $expires = null;
-        $secure  = false;
-        $parts   = explode(';', $cookieStr);
-
-        // If first part does not include '=', fail
-        if (strpos($parts[0], '=') === false) return false;
-
-        // Get the name and value of the cookie
-        list($name, $value) = explode('=', trim(array_shift($parts)), 2);
-        $name  = trim($name);
-        $value = urldecode(trim($value));
-
-        // Set default domain and path
-        if ($ref_uri instanceof Zend_Uri_Http) {
-            $domain = $ref_uri->getHost();
-            $path = $ref_uri->getPath();
-            $path = substr($path, 0, strrpos($path, '/'));
-        }
-
-        // Set other cookie parameters
-        foreach ($parts as $part) {
-            $part = trim($part);
-            if (strtolower($part) == 'secure') {
-                $secure = true;
-                continue;
-            }
-
-            $keyValue = explode('=', $part, 2);
-            if (count($keyValue) == 2) {
-                list($k, $v) = $keyValue;
-                switch (strtolower($k))    {
-                    case 'expires':
-                        $expires = strtotime($v);
-                        break;
-                    case 'path':
-                        $path = $v;
-                        break;
-                    case 'domain':
-                        $domain = $v;
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-
-        if ($name !== '') {
-            return new Zend_Http_Cookie($name, $value, $domain, $expires, $path, $secure);
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/Zend/Http/CookieJar.php b/Zend/Http/CookieJar.php
deleted file mode 100644
index 03a2a7e..0000000
--- a/Zend/Http/CookieJar.php
+++ /dev/null
@@ -1,350 +0,0 @@
-getDomain();
-            $path = $cookie->getPath();
-            if (! isset($this->cookies[$domain])) $this->cookies[$domain] = array();
-            if (! isset($this->cookies[$domain][$path])) $this->cookies[$domain][$path] = array();
-            $this->cookies[$domain][$path][$cookie->getName()] = $cookie;
-        } else {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('Supplient argument is not a valid cookie string or object');
-        }
-    }
-
-    /**
-     * Parse an HTTP response, adding all the cookies set in that response
-     * to the cookie jar.
-     *
-     * @param Zend_Http_Response $response
-     * @param Zend_Uri_Http|string $ref_uri Requested URI
-     */
-    public function addCookiesFromResponse($response, $ref_uri)
-    {
-        if (! $response instanceof Zend_Http_Response) {
-            require_once 'Zend/Http/Exception.php';        
-            throw new Zend_Http_Exception('$response is expected to be a Response object, ' .
-                gettype($response) . ' was passed');
-        }
-
-        $cookie_hdrs = $response->getHeader('Set-Cookie');
-
-        if (is_array($cookie_hdrs)) {
-            foreach ($cookie_hdrs as $cookie) {
-                $this->addCookie($cookie, $ref_uri);
-            }
-        } elseif (is_string($cookie_hdrs)) {
-            $this->addCookie($cookie_hdrs, $ref_uri);
-        }
-    }
-
-    /**
-     * Get all cookies in the cookie jar as an array
-     *
-     * @param int $ret_as Whether to return cookies as objects of Zend_Http_Cookie or as strings
-     * @return array|string
-     */
-    public function getAllCookies($ret_as = self::COOKIE_OBJECT)
-    {
-        $cookies = $this->_flattenCookiesArray($this->cookies, $ret_as);
-        return $cookies;
-    }
-
-    /**
-     * Return an array of all cookies matching a specific request according to the request URI,
-     * whether session cookies should be sent or not, and the time to consider as "now" when
-     * checking cookie expiry time.
-     *
-     * @param string|Zend_Uri_Http $uri URI to check against (secure, domain, path)
-     * @param boolean $matchSessionCookies Whether to send session cookies
-     * @param int $ret_as Whether to return cookies as objects of Zend_Http_Cookie or as strings
-     * @param int $now Override the current time when checking for expiry time
-     * @return array|string
-     */
-    public function getMatchingCookies($uri, $matchSessionCookies = true,
-        $ret_as = self::COOKIE_OBJECT, $now = null)
-    {
-        if (is_string($uri)) $uri = Zend_Uri::factory($uri);
-        if (! $uri instanceof Zend_Uri_Http) {
-            require_once 'Zend/Http/Exception.php';    
-            throw new Zend_Http_Exception("Invalid URI string or object passed");
-        }
-
-        // Set path
-        $path = $uri->getPath();
-        $path = substr($path, 0, strrpos($path, '/'));
-        if (! $path) $path = '/';
-
-        // First, reduce the array of cookies to only those matching domain and path
-        $cookies = $this->_matchDomain($uri->getHost());
-        $cookies = $this->_matchPath($cookies, $path);
-        $cookies = $this->_flattenCookiesArray($cookies, self::COOKIE_OBJECT);
-
-        // Next, run Cookie->match on all cookies to check secure, time and session mathcing
-        $ret = array();
-        foreach ($cookies as $cookie)
-            if ($cookie->match($uri, $matchSessionCookies, $now))
-                $ret[] = $cookie;
-
-        // Now, use self::_flattenCookiesArray again - only to convert to the return format ;)
-        $ret = $this->_flattenCookiesArray($ret, $ret_as);
-
-        return $ret;
-    }
-
-    /**
-     * Get a specific cookie according to a URI and name
-     *
-     * @param Zend_Uri_Http|string $uri The uri (domain and path) to match
-     * @param string $cookie_name The cookie's name
-     * @param int $ret_as Whether to return cookies as objects of Zend_Http_Cookie or as strings
-     * @return Zend_Http_Cookie|string
-     */
-    public function getCookie($uri, $cookie_name, $ret_as = self::COOKIE_OBJECT)
-    {
-        if (is_string($uri)) {
-            $uri = Zend_Uri::factory($uri);
-        }
-
-        if (! $uri instanceof Zend_Uri_Http) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('Invalid URI specified');
-        }
-
-        // Get correct cookie path
-        $path = $uri->getPath();
-        $path = substr($path, 0, strrpos($path, '/'));
-        if (! $path) $path = '/';
-
-        if (isset($this->cookies[$uri->getHost()][$path][$cookie_name])) {
-            $cookie = $this->cookies[$uri->getHost()][$path][$cookie_name];
-
-            switch ($ret_as) {
-                case self::COOKIE_OBJECT:
-                    return $cookie;
-                    break;
-
-                case self::COOKIE_STRING_ARRAY:
-                case self::COOKIE_STRING_CONCAT:
-                    return $cookie->__toString();
-                    break;
-
-                default:
-                    require_once 'Zend/Http/Exception.php';
-                    throw new Zend_Http_Exception("Invalid value passed for \$ret_as: {$ret_as}");
-                    break;
-            }
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Helper function to recursivly flatten an array. Shoud be used when exporting the
-     * cookies array (or parts of it)
-     *
-     * @param Zend_Http_Cookie|array $ptr
-     * @param int $ret_as What value to return
-     * @return array|string
-     */
-    protected function _flattenCookiesArray($ptr, $ret_as = self::COOKIE_OBJECT) {
-        if (is_array($ptr)) {
-            $ret = ($ret_as == self::COOKIE_STRING_CONCAT ? '' : array());
-            foreach ($ptr as $item) {
-                if ($ret_as == self::COOKIE_STRING_CONCAT) {
-                    $ret .= $this->_flattenCookiesArray($item, $ret_as);
-                } else {
-                    $ret = array_merge($ret, $this->_flattenCookiesArray($item, $ret_as));
-                }
-            }
-            return $ret;
-        } elseif ($ptr instanceof Zend_Http_Cookie) {
-            switch ($ret_as) {
-                case self::COOKIE_STRING_ARRAY:
-                    return array($ptr->__toString());
-                    break;
-
-                case self::COOKIE_STRING_CONCAT:
-                    return $ptr->__toString();
-                    break;
-
-                case self::COOKIE_OBJECT:
-                default:
-                    return array($ptr);
-                    break;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Return a subset of the cookies array matching a specific domain
-     *
-     * Returned array is actually an array of pointers to items in the $this->cookies array.
-     *
-     * @param string $domain
-     * @return array
-     */
-    protected function _matchDomain($domain) {
-        $ret = array();
-
-        foreach (array_keys($this->cookies) as $cdom) {
-            $regex = "/" . preg_quote($cdom, "/") . "$/i";
-            if (preg_match($regex, $domain)) $ret[$cdom] = &$this->cookies[$cdom];
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Return a subset of a domain-matching cookies that also match a specified path
-     *
-     * Returned array is actually an array of pointers to items in the $passed array.
-     *
-     * @param array $dom_array
-     * @param string $path
-     * @return array
-     */
-    protected function _matchPath($domains, $path) {
-        $ret = array();
-        if (substr($path, -1) != '/') $path .= '/';
-
-        foreach ($domains as $dom => $paths_array) {
-            foreach (array_keys($paths_array) as $cpath) {
-                $regex = "|^" . preg_quote($cpath, "|") . "|i";
-                if (preg_match($regex, $path)) {
-                    if (! isset($ret[$dom])) $ret[$dom] = array();
-                    $ret[$dom][$cpath] = &$paths_array[$cpath];
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Create a new CookieJar object and automatically load into it all the
-     * cookies set in an Http_Response object. If $uri is set, it will be
-     * considered as the requested URI for setting default domain and path
-     * of the cookie.
-     *
-     * @param Zend_Http_Response $response HTTP Response object
-     * @param Zend_Uri_Http|string $uri The requested URI
-     * @return Zend_Http_CookieJar
-     * @todo Add the $uri functionality.
-     */
-    public static function fromResponse(Zend_Http_Response $response, $ref_uri)
-    {
-        $jar = new self();
-        $jar->addCookiesFromResponse($response, $ref_uri);
-        return $jar;
-    }
-}
diff --git a/Zend/Http/Exception.php b/Zend/Http/Exception.php
deleted file mode 100644
index 76e2a8d..0000000
--- a/Zend/Http/Exception.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'Continue',
-        101 => 'Switching Protocols',
-
-        // Success 2xx
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-
-        // Redirection 3xx
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',  // 1.1
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        // 306 is deprecated but reserved
-        307 => 'Temporary Redirect',
-
-        // Client Error 4xx
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-
-        // Server Error 5xx
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        509 => 'Bandwidth Limit Exceeded'
-    );
-
-    /**
-     * The HTTP version (1.0, 1.1)
-     *
-     * @var string
-     */
-    protected $version;
-
-    /**
-     * The HTTP response code
-     *
-     * @var int
-     */
-    protected $code;
-
-    /**
-     * The HTTP response code as string
-     * (e.g. 'Not Found' for 404 or 'Internal Server Error' for 500)
-     *
-     * @var string
-     */
-    protected $message;
-
-    /**
-     * The HTTP response headers array
-     *
-     * @var array
-     */
-    protected $headers = array();
-
-    /**
-     * The HTTP response body
-     *
-     * @var string
-     */
-    protected $body;
-
-    /**
-     * HTTP response constructor
-     *
-     * In most cases, you would use Zend_Http_Response::fromString to parse an HTTP
-     * response string and create a new Zend_Http_Response object.
-     *
-     * NOTE: The constructor no longer accepts nulls or empty values for the code and
-     * headers and will throw an exception if the passed values do not form a valid HTTP
-     * responses.
-     *
-     * If no message is passed, the message will be guessed according to the response code.
-     *
-     * @param int $code Response code (200, 404, ...)
-     * @param array $headers Headers array
-     * @param string $body Response body
-     * @param string $version HTTP version
-     * @param string $message Response code as text
-     * @throws Zend_Http_Exception
-     */
-    public function __construct($code, $headers, $body = null, $version = '1.1', $message = null)
-    {
-        // Make sure the response code is valid and set it
-        if (self::responseCodeAsText($code) === null) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception("{$code} is not a valid HTTP response code");
-        }
-
-        $this->code = $code;
-
-        // Make sure we got valid headers and set them
-        if (! is_array($headers)) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('No valid headers were passed');
-	}
-
-        foreach ($headers as $name => $value) {
-            if (is_int($name))
-                list($name, $value) = explode(": ", $value, 1);
-
-            $this->headers[ucwords(strtolower($name))] = $value;
-        }
-
-        // Set the body
-        $this->body = $body;
-
-        // Set the HTTP version
-        if (! preg_match('|^\d\.\d$|', $version)) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception("Invalid HTTP response version: $version");
-        }
-
-        $this->version = $version;
-
-        // If we got the response message, set it. Else, set it according to
-        // the response code
-        if (is_string($message)) {
-            $this->message = $message;
-        } else {
-            $this->message = self::responseCodeAsText($code);
-        }
-    }
-
-    /**
-     * Check whether the response is an error
-     *
-     * @return boolean
-     */
-    public function isError()
-    {
-        $restype = floor($this->code / 100);
-        if ($restype == 4 || $restype == 5) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Check whether the response in successful
-     *
-     * @return boolean
-     */
-    public function isSuccessful()
-    {
-        $restype = floor($this->code / 100);
-        if ($restype == 2 || $restype == 1) { // Shouldn't 3xx count as success as well ???
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Check whether the response is a redirection
-     *
-     * @return boolean
-     */
-    public function isRedirect()
-    {
-        $restype = floor($this->code / 100);
-        if ($restype == 3) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the response body as string
-     *
-     * This method returns the body of the HTTP response (the content), as it
-     * should be in it's readable version - that is, after decoding it (if it
-     * was decoded), deflating it (if it was gzip compressed), etc.
-     *
-     * If you want to get the raw body (as transfered on wire) use
-     * $this->getRawBody() instead.
-     *
-     * @return string
-     */
-    public function getBody()
-    {
-        $body = '';
-
-        // Decode the body if it was transfer-encoded
-        switch ($this->getHeader('transfer-encoding')) {
-
-            // Handle chunked body
-            case 'chunked':
-                $body = self::decodeChunkedBody($this->body);
-                break;
-
-            // No transfer encoding, or unknown encoding extension:
-            // return body as is
-            default:
-                $body = $this->body;
-                break;
-        }
-
-        // Decode any content-encoding (gzip or deflate) if needed
-        switch (strtolower($this->getHeader('content-encoding'))) {
-
-            // Handle gzip encoding
-            case 'gzip':
-                $body = self::decodeGzip($body);
-                break;
-
-            // Handle deflate encoding
-            case 'deflate':
-                $body = self::decodeDeflate($body);
-                break;
-
-            default:
-                break;
-        }
-
-        return $body;
-    }
-
-    /**
-     * Get the raw response body (as transfered "on wire") as string
-     *
-     * If the body is encoded (with Transfer-Encoding, not content-encoding -
-     * IE "chunked" body), gzip compressed, etc. it will not be decoded.
-     *
-     * @return string
-     */
-    public function getRawBody()
-    {
-        return $this->body;
-    }
-
-    /**
-     * Get the HTTP version of the response
-     *
-     * @return string
-     */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-
-    /**
-     * Get the HTTP response status code
-     *
-     * @return int
-     */
-    public function getStatus()
-    {
-        return $this->code;
-    }
-
-    /**
-     * Return a message describing the HTTP response code
-     * (Eg. "OK", "Not Found", "Moved Permanently")
-     *
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * Get the response headers
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    /**
-     * Get a specific header as string, or null if it is not set
-     *
-     * @param string$header
-     * @return string|array|null
-     */
-    public function getHeader($header)
-    {
-        $header = ucwords(strtolower($header));
-        if (! is_string($header) || ! isset($this->headers[$header])) return null;
-
-        return $this->headers[$header];
-    }
-
-    /**
-     * Get all headers as string
-     *
-     * @param boolean $status_line Whether to return the first status line (IE "HTTP 200 OK")
-     * @param string $br Line breaks (eg. "\n", "\r\n", "
    ")
-     * @return string
-     */
-    public function getHeadersAsString($status_line = true, $br = "\n")
-    {
-        $str = '';
-
-        if ($status_line) {
-            $str = "HTTP/{$this->version} {$this->code} {$this->message}{$br}";
-        }
-
-        // Iterate over the headers and stringify them
-        foreach ($this->headers as $name => $value)
-        {
-            if (is_string($value))
-                $str .= "{$name}: {$value}{$br}";
-
-            elseif (is_array($value)) {
-                foreach ($value as $subval) {
-                    $str .= "{$name}: {$subval}{$br}";
-                }
-            }
-        }
-
-        return $str;
-    }
-
-    /**
-     * Get the entire response as string
-     *
-     * @param string $br Line breaks (eg. "\n", "\r\n", "
    ")
-     * @return string
-     */
-    public function asString($br = "\n")
-    {
-        return $this->getHeadersAsString(true, $br) . $br . $this->getBody();
-    }
-
-    /**
-     * A convenience function that returns a text representation of
-     * HTTP response codes. Returns 'Unknown' for unknown codes.
-     * Returns array of all codes, if $code is not specified.
-     *
-     * Conforms to HTTP/1.1 as defined in RFC 2616 (except for 'Unknown')
-     * See http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10 for reference
-     *
-     * @param int $code HTTP response code
-     * @param boolean $http11 Use HTTP version 1.1
-     * @return string
-     */
-    public static function responseCodeAsText($code = null, $http11 = true)
-    {
-        $messages = self::$messages;
-        if (! $http11) $messages[302] = 'Moved Temporarily';
-
-        if ($code === null) {
-            return $messages;
-        } elseif (isset($messages[$code])) {
-            return $messages[$code];
-        } else {
-            return 'Unknown';
-        }
-    }
-
-    /**
-     * Extract the response code from a response string
-     *
-     * @param string $response_str
-     * @return int
-     */
-    public static function extractCode($response_str)
-    {
-        preg_match("|^HTTP/[\d\.x]+ (\d+)|", $response_str, $m);
-
-        if (isset($m[1])) {
-            return (int) $m[1];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Extract the HTTP message from a response
-     *
-     * @param string $response_str
-     * @return string
-     */
-    public static function extractMessage($response_str)
-    {
-        preg_match("|^HTTP/[\d\.x]+ \d+ ([^\r\n]+)|", $response_str, $m);
-
-        if (isset($m[1])) {
-            return $m[1];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Extract the HTTP version from a response
-     *
-     * @param string $response_str
-     * @return string
-     */
-    public static function extractVersion($response_str)
-    {
-        preg_match("|^HTTP/([\d\.x]+) \d+|", $response_str, $m);
-
-        if (isset($m[1])) {
-            return $m[1];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Extract the headers from a response string
-     *
-     * @param string $response_str
-     * @return array
-     */
-    public static function extractHeaders($response_str)
-    {
-        $headers = array();
-        
-        // First, split body and headers
-        $parts = preg_split('|(?:\r?\n){2}|m', $response_str, 2);
-        if (! $parts[0]) return $headers;
-        
-        // Split headers part to lines
-        $lines = explode("\n", $parts[0]);
-        unset($parts);
-        $last_header = null;
-
-        foreach($lines as $line) {
-            $line = trim($line, "\r\n");
-            if ($line == "") break;
-
-            if (preg_match("|^([\w-]+):\s+(.+)|", $line, $m)) {
-                unset($last_header);
-                $h_name = strtolower($m[1]);
-                $h_value = $m[2];
-
-                if (isset($headers[$h_name])) {
-                    if (! is_array($headers[$h_name])) {
-                        $headers[$h_name] = array($headers[$h_name]);
-                    }
-
-                    $headers[$h_name][] = $h_value;
-                } else {
-                    $headers[$h_name] = $h_value;
-                }
-                $last_header = $h_name;
-            } elseif (preg_match("|^\s+(.+)$|", $line, $m) && $last_header !== null) {
-                if (is_array($headers[$last_header])) {
-                    end($headers[$last_header]);
-                    $last_header_key = key($headers[$last_header]);
-                    $headers[$last_header][$last_header_key] .= $m[1];
-                } else {
-                    $headers[$last_header] .= $m[1];
-                }
-            }
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Extract the body from a response string
-     *
-     * @param string $response_str
-     * @return string
-     */
-    public static function extractBody($response_str)
-    {
-        $parts = preg_split('|(?:\r?\n){2}|m', $response_str, 2);
-        if (isset($parts[1])) { 
-        	return $parts[1];
-        } else {
-        	return '';
-        }
-    }
-
-    /**
-     * Decode a "chunked" transfer-encoded body and return the decoded text
-     *
-     * @param string $body
-     * @return string
-     */
-    public static function decodeChunkedBody($body)
-    {
-        $decBody = '';
-        
-        while (trim($body)) {
-            if (! preg_match("/^([\da-fA-F]+)[^\r\n]*\r\n/sm", $body, $m)) {
-                require_once 'Zend/Http/Exception.php';
-                throw new Zend_Http_Exception("Error parsing body - doesn't seem to be a chunked message");
-            }
-
-            $length = hexdec(trim($m[1]));
-            $cut = strlen($m[0]);
-
-            $decBody .= substr($body, $cut, $length);
-            $body = substr($body, $cut + $length + 2);
-        }
-
-        return $decBody;
-    }
-
-    /**
-     * Decode a gzip encoded message (when Content-encoding = gzip)
-     *
-     * Currently requires PHP with zlib support
-     *
-     * @param string $body
-     * @return string
-     */
-    public static function decodeGzip($body)
-    {
-        if (! function_exists('gzinflate')) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('Unable to decode gzipped response ' . 
-                'body: perhaps the zlib extension is not loaded?'); 
-        }
-
-        return gzinflate(substr($body, 10));
-    }
-
-    /**
-     * Decode a zlib deflated message (when Content-encoding = deflate)
-     *
-     * Currently requires PHP with zlib support
-     *
-     * @param string $body
-     * @return string
-     */
-    public static function decodeDeflate($body)
-    {
-        if (! function_exists('gzuncompress')) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('Unable to decode deflated response ' . 
-                'body: perhaps the zlib extension is not loaded?'); 
-        }
-
-    	return gzuncompress($body);
-    }
-
-    /**
-     * Create a new Zend_Http_Response object from a string
-     *
-     * @param string $response_str
-     * @return Zend_Http_Response
-     */
-    public static function fromString($response_str)
-    {
-        $code    = self::extractCode($response_str);
-        $headers = self::extractHeaders($response_str);
-        $body    = self::extractBody($response_str);
-        $version = self::extractVersion($response_str);
-        $message = self::extractMessage($response_str);
-
-        return new Zend_Http_Response($code, $headers, $body, $version, $message);
-    }
-}
diff --git a/Zend/Loader.php b/Zend/Loader.php
deleted file mode 100644
index 4f339d4..0000000
--- a/Zend/Loader.php
+++ /dev/null
@@ -1,258 +0,0 @@
- $dir) {
-                if ($dir == '.') {
-                    $dirs[$key] = $dirPath;
-                } else {
-                    $dir = rtrim($dir, '\\/');
-                    $dirs[$key] = $dir . DIRECTORY_SEPARATOR . $dirPath;
-                }
-            }
-            $file = basename($file);
-            self::loadFile($file, $dirs, true);
-        } else {
-            self::_securityCheck($file);
-            include_once $file;
-        }
-
-        if (!class_exists($class, false) && !interface_exists($class, false)) {
-            require_once 'Zend/Exception.php';
-            throw new Zend_Exception("File \"$file\" does not exist or class \"$class\" was not found in the file");
-        }
-    }
-
-    /**
-     * Loads a PHP file.  This is a wrapper for PHP's include() function.
-     *
-     * $filename must be the complete filename, including any
-     * extension such as ".php".  Note that a security check is performed that
-     * does not permit extended characters in the filename.  This method is
-     * intended for loading Zend Framework files.
-     *
-     * If $dirs is a string or an array, it will search the directories
-     * in the order supplied, and attempt to load the first matching file.
-     *
-     * If the file was not found in the $dirs, or if no $dirs were specified,
-     * it will attempt to load it from PHP's include_path.
-     *
-     * If $once is TRUE, it will use include_once() instead of include().
-     *
-     * @param  string        $filename
-     * @param  string|array  $dirs - OPTIONAL either a path or array of paths
-     *                       to search.
-     * @param  boolean       $once
-     * @return boolean
-     * @throws Zend_Exception
-     */
-    public static function loadFile($filename, $dirs = null, $once = false)
-    {
-        self::_securityCheck($filename);
-
-        /**
-         * Search in provided directories, as well as include_path
-         */
-        $incPath = false;
-        if (!empty($dirs) && (is_array($dirs) || is_string($dirs))) {
-            if (is_array($dirs)) {
-                $dirs = implode(PATH_SEPARATOR, $dirs);
-            }
-            $incPath = get_include_path();
-            set_include_path($dirs . PATH_SEPARATOR . $incPath);
-        }
-
-        /**
-         * Try finding for the plain filename in the include_path.
-         */
-        if ($once) {
-            include_once $filename;
-        } else {
-            include $filename;
-        }
-
-        /**
-         * If searching in directories, reset include_path
-         */
-        if ($incPath) {
-            set_include_path($incPath);
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns TRUE if the $filename is readable, or FALSE otherwise.
-     * This function uses the PHP include_path, where PHP's is_readable()
-     * does not.
-     *
-     * @param string   $filename
-     * @return boolean
-     */
-    public static function isReadable($filename)
-    {
-        if (!$fh = @fopen($filename, 'r', true)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * spl_autoload() suitable implementation for supporting class autoloading.
-     *
-     * Attach to spl_autoload() using the following:
-     * 
-     * spl_autoload_register(array('Zend_Loader', 'autoload'));
-     * 
-     *
-     * @param string $class
-     * @return string|false Class name on success; false on failure
-     */
-    public static function autoload($class)
-    {
-        try {
-            self::loadClass($class);
-            return $class;
-        } catch (Exception $e) {
-            return false;
-        }
-    }
-
-    /**
-     * Register {@link autoload()} with spl_autoload()
-     *
-     * @param string $class (optional)
-     * @param boolean $enabled (optional)
-     * @return void
-     * @throws Zend_Exception if spl_autoload() is not found
-     * or if the specified class does not have an autoload() method.
-     */
-    public static function registerAutoload($class = 'Zend_Loader', $enabled = true)
-    {
-        if (!function_exists('spl_autoload_register')) {
-            require_once 'Zend/Exception.php';
-            throw new Zend_Exception('spl_autoload does not exist in this PHP installation');
-        }
-
-        self::loadClass($class);
-        $methods = get_class_methods($class);
-        if (!in_array('autoload', (array) $methods)) {
-            require_once 'Zend/Exception.php';
-            throw new Zend_Exception("The class \"$class\" does not have an autoload() method");
-        }
-
-        if ($enabled === true) {
-            spl_autoload_register(array($class, 'autoload'));
-        } else {
-            spl_autoload_unregister(array($class, 'autoload'));
-        }
-    }
-
-    /**
-     * Ensure that filename does not contain exploits
-     *
-     * @param  string $filename
-     * @return void
-     * @throws Zend_Exception
-     */
-    protected static function _securityCheck($filename)
-    {
-        /**
-         * Security check
-         */
-        if (preg_match('/[^a-z0-9\\/\\\\_.-]/i', $filename)) {
-            require_once 'Zend/Exception.php';
-            throw new Zend_Exception('Security check: Illegal character in filename');
-        }
-    }
-
-    /**
-     * Attempt to include() the file.
-     *
-     * include() is not prefixed with the @ operator because if
-     * the file is loaded and contains a parse error, execution
-     * will halt silently and this is difficult to debug.
-     *
-     * Always set display_errors = Off on production servers!
-     *
-     * @param  string  $filespec
-     * @param  boolean $once
-     * @return boolean
-     * @deprecated Since 1.5.0; use loadFile() instead
-     */
-    protected static function _includeFile($filespec, $once = false)
-    {
-        if ($once) {
-            return include_once $filespec;
-        } else {
-            return include $filespec ;
-        }
-    }
-}
diff --git a/Zend/Registry.php b/Zend/Registry.php
deleted file mode 100644
index 62d9ceb..0000000
--- a/Zend/Registry.php
+++ /dev/null
@@ -1,195 +0,0 @@
-offsetExists($index)) {
-            require_once 'Zend/Exception.php';
-            throw new Zend_Exception("No entry is registered for key '$index'");
-        }
-
-        return $instance->offsetGet($index);
-    }
-
-    /**
-     * setter method, basically same as offsetSet().
-     *
-     * This method can be called from an object of type Zend_Registry, or it
-     * can be called statically.  In the latter case, it uses the default
-     * static instance stored in the class.
-     *
-     * @param string $index The location in the ArrayObject in which to store
-     *   the value.
-     * @param mixed $value The object to store in the ArrayObject.
-     * @return void
-     */
-    public static function set($index, $value)
-    {
-        $instance = self::getInstance();
-        $instance->offsetSet($index, $value);
-    }
-
-    /**
-     * Returns TRUE if the $index is a named value in the registry,
-     * or FALSE if $index was not found in the registry.
-     *
-     * @param  string $index
-     * @return boolean
-     */
-    public static function isRegistered($index)
-    {
-        if (self::$_registry === null) {
-            return false;
-        }
-        return self::$_registry->offsetExists($index);
-    }
-
-    /**
-     * @param string $index
-     * @returns mixed
-     *
-     * Workaround for http://bugs.php.net/bug.php?id=40442 (ZF-960).
-     */
-    public function offsetExists($index)
-    {
-        return array_key_exists($index, $this);
-    }
-
-}
diff --git a/Zend/Uri.php b/Zend/Uri.php
deleted file mode 100644
index cac721b..0000000
--- a/Zend/Uri.php
+++ /dev/null
@@ -1,158 +0,0 @@
-getUri();
-    }
-
-    /**
-     * Convenience function, checks that a $uri string is well-formed
-     * by validating it but not returning an object.  Returns TRUE if
-     * $uri is a well-formed URI, or FALSE otherwise.
-     *
-     * @param string $uri
-     * @return boolean
-     */
-    public static function check($uri)
-    {
-        try {
-            $uri = self::factory($uri);
-        } catch (Exception $e) {
-            return false;
-        }
-
-        return $uri->valid();
-    }
-
-    /**
-     * Create a new Zend_Uri object for a URI.  If building a new URI, then $uri should contain
-     * only the scheme (http, ftp, etc).  Otherwise, supply $uri with the complete URI.
-     *
-     * @param string $uri
-     * @throws Zend_Uri_Exception
-     * @return Zend_Uri
-     */
-    public static function factory($uri = 'http')
-    {
-        /**
-         * Separate the scheme from the scheme-specific parts
-         * @link http://www.faqs.org/rfcs/rfc2396.html
-         */
-        $uri = explode(':', $uri, 2);
-        $scheme = strtolower($uri[0]);
-        $schemeSpecific = isset($uri[1]) ? $uri[1] : '';
-
-        if (!strlen($scheme)) {
-            require_once 'Zend/Uri/Exception.php';   
-            throw new Zend_Uri_Exception('An empty string was supplied for the scheme');
-        }
-
-        // Security check: $scheme is used to load a class file, so only alphanumerics are allowed.
-        if (!ctype_alnum($scheme)) {
-            require_once 'Zend/Uri/Exception.php';   
-            throw new Zend_Uri_Exception('Illegal scheme supplied, only alphanumeric characters are permitted');
-        }
-
-        /**
-         * Create a new Zend_Uri object for the $uri. If a subclass of Zend_Uri exists for the
-         * scheme, return an instance of that class. Otherwise, a Zend_Uri_Exception is thrown.
-         */
-        switch ($scheme) {
-            case 'http':
-            case 'https':
-                $className = 'Zend_Uri_Http';
-                break;
-            case 'mailto':
-                // @todo
-            default:
-                require_once 'Zend/Uri/Exception.php';   
-                throw new Zend_Uri_Exception("Scheme \"$scheme\" is not supported");
-        }
-        Zend_Loader::loadClass($className);
-        return new $className($scheme, $schemeSpecific);
-
-    }
-
-    /**
-     * Get the URI's scheme
-     *
-     * @return string|false Scheme or false if no scheme is set.
-     */
-    public function getScheme()
-    {
-        if (!empty($this->_scheme)) {
-            return $this->_scheme;
-        } else {
-            return false;
-        }
-    }
-
-    /******************************************************************************
-     * Abstract Methods
-     *****************************************************************************/
-
-    /**
-     * Zend_Uri and its subclasses cannot be instantiated directly.
-     * Use Zend_Uri::factory() to return a new Zend_Uri object.
-     */
-    abstract protected function __construct($scheme, $schemeSpecific = '');
-
-    /**
-     * Return a string representation of this URI.
-     *
-     * @return string
-     */
-    abstract public function getUri();
-
-    /**
-     * Returns TRUE if this URI is valid, or FALSE otherwise.
-     *
-     * @return boolean
-     */
-    abstract public function valid();
-}
diff --git a/Zend/Uri/Exception.php b/Zend/Uri/Exception.php
deleted file mode 100644
index 706260a..0000000
--- a/Zend/Uri/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-_scheme = $scheme;
-
-        // Set up grammar rules for validation via regular expressions. These
-        // are to be used with slash-delimited regular expression strings.
-        $this->_regex['alphanum']   = '[^\W_]';
-        $this->_regex['escaped']    = '(?:%[\da-fA-F]{2})';
-        $this->_regex['mark']       = '[-_.!~*\'()\[\]]';
-        $this->_regex['reserved']   = '[;\/?:@&=+$,]';
-        $this->_regex['unreserved'] = '(?:' . $this->_regex['alphanum'] . '|' . $this->_regex['mark'] . ')';
-        $this->_regex['segment']    = '(?:(?:' . $this->_regex['unreserved'] . '|' . $this->_regex['escaped']
-                                    . '|[:@&=+$,;])*)';
-        $this->_regex['path']       = '(?:\/' . $this->_regex['segment'] . '?)+';
-        $this->_regex['uric']       = '(?:' . $this->_regex['reserved'] . '|' . $this->_regex['unreserved'] . '|'
-                                    . $this->_regex['escaped'] . ')';
-        // If no scheme-specific part was supplied, the user intends to create
-        // a new URI with this object.  No further parsing is required.
-        if (strlen($schemeSpecific) == 0) {
-            return;
-        }
-
-        // Parse the scheme-specific URI parts into the instance variables.
-        $this->_parseUri($schemeSpecific);
-
-        // Validate the URI
-        if (!$this->valid()) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Invalid URI supplied');
-        }
-    }
-
-    /**
-     * Parse the scheme-specific portion of the URI and place its parts into instance variables.
-     *
-     * @param string $schemeSpecific
-     * @throws Zend_Uri_Exception
-     * @return void
-     */
-    protected function _parseUri($schemeSpecific)
-    {
-        // High-level decomposition parser
-        $pattern = '~^((//)([^/?#]*))([^?#]*)(\?([^#]*))?(#(.*))?$~';
-        $status = @preg_match($pattern, $schemeSpecific, $matches);
-        if ($status === false) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: scheme-specific decomposition failed');
-        }
-
-        // Failed decomposition; no further processing needed
-        if (!$status) {
-            return;
-        }
-
-        // Save URI components that need no further decomposition
-        $this->_path     = isset($matches[4]) ? $matches[4] : '';
-        $this->_query    = isset($matches[6]) ? $matches[6] : '';
-        $this->_fragment = isset($matches[8]) ? $matches[8] : '';
-
-        // Additional decomposition to get username, password, host, and port
-        $combo = isset($matches[3]) ? $matches[3] : '';
-        $pattern = '~^(([^:@]*)(:([^@]*))?@)?([^:]+)(:(.*))?$~';
-        $status = @preg_match($pattern, $combo, $matches);
-        if ($status === false) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: authority decomposition failed');
-        }
-
-        // Failed decomposition; no further processing needed
-        if (!$status) {
-            return;
-        }
-
-        // Save remaining URI components
-        $this->_username = isset($matches[2]) ? $matches[2] : '';
-        $this->_password = isset($matches[4]) ? $matches[4] : '';
-        $this->_host     = isset($matches[5]) ? $matches[5] : '';
-        $this->_port     = isset($matches[7]) ? $matches[7] : '';
-
-    }
-
-    /**
-     * Returns a URI based on current values of the instance variables. If any
-     * part of the URI does not pass validation, then an exception is thrown.
-     *
-     * @throws Zend_Uri_Exception
-     * @return string
-     */
-    public function getUri()
-    {
-        if (!$this->valid()) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('One or more parts of the URI are invalid');
-        }
-        $password = strlen($this->_password) ? ":$this->_password" : '';
-        $auth = strlen($this->_username) ? "$this->_username$password@" : '';
-        $port = strlen($this->_port) ? ":$this->_port" : '';
-        $query = strlen($this->_query) ? "?$this->_query" : '';
-        $fragment = strlen($this->_fragment) ? "#$this->_fragment" : '';
-        return "$this->_scheme://$auth$this->_host$port$this->_path$query$fragment";
-    }
-
-    /**
-     * Validate the current URI from the instance variables. Returns true if and only if all
-     * parts pass validation.
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        /**
-         * Return true if and only if all parts of the URI have passed validation
-         */
-        return $this->validateUsername()
-            && $this->validatePassword()
-            && $this->validateHost()
-            && $this->validatePort()
-            && $this->validatePath()
-            && $this->validateQuery()
-            && $this->validateFragment();
-    }
-
-    /**
-     * Returns the username portion of the URL, or FALSE if none.
-     *
-     * @return string
-     */
-    public function getUsername()
-    {
-        return strlen($this->_username) ? $this->_username : false;
-    }
-
-    /**
-     * Returns true if and only if the username passes validation. If no username is passed,
-     * then the username contained in the instance variable is used.
-     *
-     * @param string $username
-     * @throws Zend_Uri_Exception
-     * @return boolean
-     */
-    public function validateUsername($username = null)
-    {
-        if ($username === null) {
-            $username = $this->_username;
-        }
-
-        // If the username is empty, then it is considered valid
-        if (strlen($username) == 0) {
-            return true;
-        }
-        /**
-         * Check the username against the allowed values
-         *
-         * @link http://www.faqs.org/rfcs/rfc2396.html
-         */
-        $status = @preg_match('/^(' . $this->_regex['alphanum']  . '|' . $this->_regex['mark'] . '|'
-                            . $this->_regex['escaped'] . '|[;:&=+$,])+$/', $username);
-        if ($status === false) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: username validation failed');
-        }
-
-        return $status == 1;
-    }
-
-    /**
-     * Sets the username for the current URI, and returns the old username
-     *
-     * @param string $username
-     * @throws Zend_Uri_Exception
-     * @return string
-     */
-    public function setUsername($username)
-    {
-        if (!$this->validateUsername($username)) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("Username \"$username\" is not a valid HTTP username");
-        }
-        $oldUsername = $this->_username;
-        $this->_username = $username;
-        return $oldUsername;
-    }
-
-    /**
-     * Returns the password portion of the URL, or FALSE if none.
-     *
-     * @return string
-     */
-    public function getPassword()
-    {
-        return strlen($this->_password) ? $this->_password : false;
-    }
-
-    /**
-     * Returns true if and only if the password passes validation. If no password is passed,
-     * then the password contained in the instance variable is used.
-     *
-     * @param string $password
-     * @throws Zend_Uri_Exception
-     * @return boolean
-     */
-    public function validatePassword($password = null)
-    {
-        if ($password === null) {
-            $password = $this->_password;
-        }
-
-        // If the password is empty, then it is considered valid
-        if (strlen($password) == 0) {
-            return true;
-        }
-
-        // If the password is nonempty, but there is no username, then it is considered invalid
-        if (strlen($password) > 0 && strlen($this->_username) == 0) {
-            return false;
-        }
-
-        /**
-         * Check the password against the allowed values
-         *
-         * @link http://www.faqs.org/rfcs/rfc2396.html
-         */
-        $status = @preg_match('/^(' . $this->_regex['alphanum']  . '|' . $this->_regex['mark'] . '|'
-                             . $this->_regex['escaped'] . '|[;:&=+$,])+$/', $password);
-        if ($status === false) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: password validation failed.');
-        }
-        return $status == 1;
-    }
-
-    /**
-     * Sets the password for the current URI, and returns the old password
-     *
-     * @param string $password
-     * @throws Zend_Uri_Exception
-     * @return string
-     */
-    public function setPassword($password)
-    {
-        if (!$this->validatePassword($password)) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("Password \"$password\" is not a valid HTTP password.");
-        }
-        $oldPassword = $this->_password;
-        $this->_password = $password;
-        return $oldPassword;
-    }
-
-    /**
-     * Returns the domain or host IP portion of the URL, or FALSE if none.
-     *
-     * @return string
-     */
-    public function getHost()
-    {
-        return strlen($this->_host) ? $this->_host : false;
-    }
-
-    /**
-     * Returns true if and only if the host string passes validation. If no host is passed,
-     * then the host contained in the instance variable is used.
-     *
-     * @param string $host
-     * @return boolean
-     * @uses Zend_Filter
-     */
-    public function validateHost($host = null)
-    {
-        if ($host === null) {
-            $host = $this->_host;
-        }
-
-        /**
-         * If the host is empty, then it is considered invalid
-         */
-        if (strlen($host) == 0) {
-            return false;
-        }
-
-        /**
-         * Check the host against the allowed values; delegated to Zend_Filter.
-         */
-        $validate = new Zend_Validate_Hostname(Zend_Validate_Hostname::ALLOW_ALL);
-        return $validate->isValid($host);
-    }
-
-    /**
-     * Sets the host for the current URI, and returns the old host
-     *
-     * @param string $host
-     * @throws Zend_Uri_Exception
-     * @return string
-     */
-    public function setHost($host)
-    {
-        if (!$this->validateHost($host)) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("Host \"$host\" is not a valid HTTP host");
-        }
-        $oldHost = $this->_host;
-        $this->_host = $host;
-        return $oldHost;
-    }
-
-    /**
-     * Returns the TCP port, or FALSE if none.
-     *
-     * @return string
-     */
-    public function getPort()
-    {
-        return strlen($this->_port) ? $this->_port : false;
-    }
-
-    /**
-     * Returns true if and only if the TCP port string passes validation. If no port is passed,
-     * then the port contained in the instance variable is used.
-     *
-     * @param string $port
-     * @return boolean
-     */
-    public function validatePort($port = null)
-    {
-        if ($port === null) {
-            $port = $this->_port;
-        }
-
-        // If the port is empty, then it is considered valid
-        if (!strlen($port)) {
-            return true;
-        }
-
-        // Check the port against the allowed values
-        return ctype_digit((string)$port) && 1 <= $port && $port <= 65535;
-    }
-
-    /**
-     * Sets the port for the current URI, and returns the old port
-     *
-     * @param string $port
-     * @throws Zend_Uri_Exception
-     * @return string
-     */
-    public function setPort($port)
-    {
-        if (!$this->validatePort($port)) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("Port \"$port\" is not a valid HTTP port.");
-        }
-        $oldPort = $this->_port;
-        $this->_port = $port;
-        return $oldPort;
-    }
-
-    /**
-     * Returns the path and filename portion of the URL, or FALSE if none.
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return strlen($this->_path) ? $this->_path : '/';
-    }
-
-    /**
-     * Returns true if and only if the path string passes validation. If no path is passed,
-     * then the path contained in the instance variable is used.
-     *
-     * @param string $path
-     * @throws Zend_Uri_Exception
-     * @return boolean
-     */
-    public function validatePath($path = null)
-    {
-        if ($path === null) {
-            $path = $this->_path;
-        }
-        /**
-         * If the path is empty, then it is considered valid
-         */
-        if (strlen($path) == 0) {
-            return true;
-        }
-        /**
-         * Determine whether the path is well-formed
-         */
-        $pattern = '/^' . $this->_regex['path'] . '$/';
-        $status = @preg_match($pattern, $path);
-        if ($status === false) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: path validation failed');
-        }
-        return (boolean) $status;
-    }
-
-    /**
-     * Sets the path for the current URI, and returns the old path
-     *
-     * @param string $path
-     * @throws Zend_Uri_Exception
-     * @return string
-     */
-    public function setPath($path)
-    {
-        if (!$this->validatePath($path)) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("Path \"$path\" is not a valid HTTP path");
-        }
-        $oldPath = $this->_path;
-        $this->_path = $path;
-        return $oldPath;
-    }
-
-    /**
-     * Returns the query portion of the URL (after ?), or FALSE if none.
-     *
-     * @return string
-     */
-    public function getQuery()
-    {
-        return strlen($this->_query) ? $this->_query : false;
-    }
-
-    /**
-     * Returns true if and only if the query string passes validation. If no query is passed,
-     * then the query string contained in the instance variable is used.
-     *
-     * @param string $query
-     * @throws Zend_Uri_Exception
-     * @return boolean
-     */
-    public function validateQuery($query = null)
-    {
-        if ($query === null) {
-            $query = $this->_query;
-        }
-
-        // If query is empty, it is considered to be valid
-        if (strlen($query) == 0) {
-            return true;
-        }
-
-        /**
-         * Determine whether the query is well-formed
-         *
-         * @link http://www.faqs.org/rfcs/rfc2396.html
-         */
-        $pattern = '/^' . $this->_regex['uric'] . '*$/';
-        $status = @preg_match($pattern, $query);
-        if ($status === false) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: query validation failed');
-        }
-
-        return $status == 1;
-    }
-
-    /**
-     * Set the query string for the current URI, and return the old query
-     * string This method accepts both strings and arrays.
-     *
-     * @param  string|array $query The query string or array
-     * @return string              Old query string
-     */
-    public function setQuery($query)
-    {
-        $oldQuery = $this->_query;
-        
-        // If query is empty, set an empty string
-        if (empty($query)) {
-            $this->_query = '';
-            return $oldQuery;
-        }
-
-        // If query is an array, make a string out of it
-        if (is_array($query)) {
-            $query = http_build_query($query, '', '&');
-        
-        // If it is a string, make sure it is valid. If not parse and encode it
-        } else {
-            $query = (string) $query;
-            if (! $this->validateQuery($query)) {
-                parse_str($query, $query_array);
-                $query = http_build_query($query_array, '', '&');   
-            }
-        }
-
-        // Make sure the query is valid, and set it
-        if (! $this->validateQuery($query)) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("'$query' is not a valid query string");
-        }
-        
-        $this->_query = $query;
-        
-        return $oldQuery;
-    }
-
-    /**
-     * Returns the fragment portion of the URL (after #), or FALSE if none.
-     *
-     * @return string|false
-     */
-    public function getFragment()
-    {
-        return strlen($this->_fragment) ? $this->_fragment : false;
-    }
-
-    /**
-     * Returns true if and only if the fragment passes validation. If no fragment is passed,
-     * then the fragment contained in the instance variable is used.
-     *
-     * @param string $fragment
-     * @throws Zend_Uri_Exception
-     * @return boolean
-     */
-    public function validateFragment($fragment = null)
-    {
-        if ($fragment === null) {
-            $fragment = $this->_fragment;
-        }
-
-        // If fragment is empty, it is considered to be valid
-        if (strlen($fragment) == 0) {
-            return true;
-        }
-
-        /**
-         * Determine whether the fragment is well-formed
-         *
-         * @link http://www.faqs.org/rfcs/rfc2396.html
-         */
-        $pattern = '/^' . $this->_regex['uric'] . '*$/';
-        $status = @preg_match($pattern, $fragment);
-        if ($status === false) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: fragment validation failed');
-        }
-
-        return (boolean) $status;
-    }
-
-    /**
-     * Sets the fragment for the current URI, and returns the old fragment
-     *
-     * @param string $fragment
-     * @throws Zend_Uri_Exception
-     * @return string
-     */
-    public function setFragment($fragment)
-    {
-        if (!$this->validateFragment($fragment)) {
-	    require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("Fragment \"$fragment\" is not a valid HTTP fragment");
-        }
-        $oldFragment = $this->_fragment;
-        $this->_fragment = $fragment;
-        return $oldFragment;
-    }
-}
-
diff --git a/Zend/Validate/Abstract.php b/Zend/Validate/Abstract.php
deleted file mode 100644
index 97dc2b4..0000000
--- a/Zend/Validate/Abstract.php
+++ /dev/null
@@ -1,346 +0,0 @@
-_messages;
-    }
-
-    /**
-     * Returns an array of the names of variables that are used in constructing validation failure messages
-     *
-     * @return array
-     */
-    public function getMessageVariables()
-    {
-        return array_keys($this->_messageVariables);
-    }
-
-    /**
-     * Sets the validation failure message template for a particular key
-     *
-     * @param  string $messageString
-     * @param  string $messageKey     OPTIONAL
-     * @return Zend_Validate_Abstract Provides a fluent interface
-     * @throws Zend_Validate_Exception
-     */
-    public function setMessage($messageString, $messageKey = null)
-    {
-        if ($messageKey === null) {
-            $keys = array_keys($this->_messageTemplates);
-            $messageKey = current($keys);
-        }
-        if (!isset($this->_messageTemplates[$messageKey])) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("No message template exists for key '$messageKey'");
-        }
-        $this->_messageTemplates[$messageKey] = $messageString;
-        return $this;
-    }
-
-    /**
-     * Sets validation failure message templates given as an array, where the array keys are the message keys,
-     * and the array values are the message template strings.
-     *
-     * @param  array $messages
-     * @return Zend_Validate_Abstract
-     */
-    public function setMessages(array $messages)
-    {
-        foreach ($messages as $key => $message) {
-            $this->setMessage($message, $key);
-        }
-        return $this;
-    }
-
-    /**
-     * Magic function returns the value of the requested property, if and only if it is the value or a
-     * message variable.
-     *
-     * @param  string $property
-     * @return mixed
-     * @throws Zend_Validate_Exception
-     */
-    public function __get($property)
-    {
-        if ($property == 'value') {
-            return $this->_value;
-        }
-        if (array_key_exists($property, $this->_messageVariables)) {
-            return $this->{$this->_messageVariables[$property]};
-        }
-        /**
-         * @see Zend_Validate_Exception
-         */
-        require_once 'Zend/Validate/Exception.php';
-        throw new Zend_Validate_Exception("No property exists by the name '$property'");
-    }
-
-    /**
-     * Constructs and returns a validation failure message with the given message key and value.
-     *
-     * Returns null if and only if $messageKey does not correspond to an existing template.
-     *
-     * If a translator is available and a translation exists for $messageKey, 
-     * the translation will be used.
-     *
-     * @param  string $messageKey
-     * @param  string $value
-     * @return string
-     */
-    protected function _createMessage($messageKey, $value)
-    {
-        if (!isset($this->_messageTemplates[$messageKey])) {
-            return null;
-        }
-
-        $message = $this->_messageTemplates[$messageKey];
-
-        if (null !== ($translator = $this->getTranslator())) {
-            if ($translator->isTranslated($messageKey)) {
-                $message = $translator->translate($messageKey);
-            }
-        }
-
-        if ($this->getObscureValue()) {
-            $value = str_repeat('*', strlen($value));
-        }
-
-        $message = str_replace('%value%', (string) $value, $message);
-        foreach ($this->_messageVariables as $ident => $property) {
-            $message = str_replace("%$ident%", $this->$property, $message);
-        }
-        return $message;
-    }
-
-    /**
-     * @param  string $messageKey OPTIONAL
-     * @param  string $value      OPTIONAL
-     * @return void
-     */
-    protected function _error($messageKey = null, $value = null)
-    {
-        if ($messageKey === null) {
-            $keys = array_keys($this->_messageTemplates);
-            $messageKey = current($keys);
-        }
-        if ($value === null) {
-            $value = $this->_value;
-        }
-        $this->_errors[]              = $messageKey;
-        $this->_messages[$messageKey] = $this->_createMessage($messageKey, $value);
-    }
-
-    /**
-     * Sets the value to be validated and clears the messages and errors arrays
-     *
-     * @param  mixed $value
-     * @return void
-     */
-    protected function _setValue($value)
-    {
-        $this->_value    = $value;
-        $this->_messages = array();
-        $this->_errors   = array();
-    }
-
-    /**
-     * Returns array of validation failure message codes
-     *
-     * @return array
-     * @deprecated Since 1.5.0
-     */
-    public function getErrors()
-    {
-        return $this->_errors;
-    }
-
-    /**
-     * Set flag indicating whether or not value should be obfuscated in messages
-     * 
-     * @param  bool $flag 
-     * @return Zend_Validate_Abstract
-     */
-    public function setObscureValue($flag)
-    {
-        $this->_obscureValue = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Retrieve flag indicating whether or not value should be obfuscated in 
-     * messages
-     * 
-     * @return bool
-     */
-    public function getObscureValue()
-    {
-        return $this->_obscureValue;
-    }
-
-    /**
-     * Set translation object
-     * 
-     * @param  Zend_Translate|Zend_Translate_Adapter|null $translator 
-     * @return Zend_Validate_Abstract
-     */
-    public function setTranslator($translator = null)
-    {
-        if ((null === $translator) || ($translator instanceof Zend_Translate_Adapter)) {
-            $this->_translator = $translator;
-        } elseif ($translator instanceof Zend_Translate) {
-            $this->_translator = $translator->getAdapter();
-        } else {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid translator specified');
-        }
-        return $this;
-    }
-
-    /**
-     * Return translation object
-     * 
-     * @return Zend_Translate_Adapter|null
-     */
-    public function getTranslator()
-    {
-        if (null === $this->_translator) {
-            return self::getDefaultTranslator();
-        }
-
-        return $this->_translator;
-    }
-
-    /**
-     * Set default translation object for all validate objects
-     * 
-     * @param  Zend_Translate|Zend_Translate_Adapter|null $translator 
-     * @return void
-     */
-    public static function setDefaultTranslator($translator = null)
-    {
-        if ((null === $translator) || ($translator instanceof Zend_Translate_Adapter)) {
-            self::$_defaultTranslator = $translator;
-        } elseif ($translator instanceof Zend_Translate) {
-            self::$_defaultTranslator = $translator->getAdapter();
-        } else {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid translator specified');
-        }
-    }
-
-    /**
-     * Get default translation object for all validate objects
-     * 
-     * @return Zend_Translate_Adapter|null
-     */
-    public static function getDefaultTranslator()
-    {
-        if (null === self::$_defaultTranslator) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Translate')) {
-                $translator = Zend_Registry::get('Zend_Translate');
-                if ($translator instanceof Zend_Translate_Adapter) {
-                    return $translator;
-                } elseif ($translator instanceof Zend_Translate) {
-                    return $translator->getAdapter();
-                }
-            }
-        }
-        return self::$_defaultTranslator;
-    }
-}
diff --git a/Zend/Validate/Alnum.php b/Zend/Validate/Alnum.php
deleted file mode 100644
index 36b0adc..0000000
--- a/Zend/Validate/Alnum.php
+++ /dev/null
@@ -1,120 +0,0 @@
- "'%value%' has not only alphabetic and digit characters",
-        self::STRING_EMPTY => "'%value%' is an empty string"
-    );
-
-    /**
-     * Sets default option values for this instance
-     *
-     * @param  boolean $allowWhiteSpace
-     * @return void
-     */
-    public function __construct($allowWhiteSpace = false)
-    {
-        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value contains only alphabetic and digit characters
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-
-        $this->_setValue($valueString);
-
-        if ('' === $valueString) {
-            $this->_error(self::STRING_EMPTY);
-            return false;
-        }
-
-        if (null === self::$_filter) {
-            /**
-             * @see Zend_Filter_Alnum
-             */
-            require_once 'Zend/Filter/Alnum.php';
-            self::$_filter = new Zend_Filter_Alnum();
-        }
-
-        self::$_filter->allowWhiteSpace = $this->allowWhiteSpace;
-
-        if ($valueString !== self::$_filter->filter($valueString)) {
-            $this->_error(self::NOT_ALNUM);
-            return false;
-        }
-
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/Alpha.php b/Zend/Validate/Alpha.php
deleted file mode 100644
index 0f2298e..0000000
--- a/Zend/Validate/Alpha.php
+++ /dev/null
@@ -1,120 +0,0 @@
- "'%value%' has not only alphabetic characters",
-        self::STRING_EMPTY => "'%value%' is an empty string"
-    );
-
-    /**
-     * Sets default option values for this instance
-     *
-     * @param  boolean $allowWhiteSpace
-     * @return void
-     */
-    public function __construct($allowWhiteSpace = false)
-    {
-        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value contains only alphabetic characters
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-
-        $this->_setValue($valueString);
-
-        if ('' === $valueString) {
-            $this->_error(self::STRING_EMPTY);
-            return false;
-        }
-
-        if (null === self::$_filter) {
-            /**
-             * @see Zend_Filter_Alpha
-             */
-            require_once 'Zend/Filter/Alpha.php';
-            self::$_filter = new Zend_Filter_Alpha();
-        }
-
-        self::$_filter->allowWhiteSpace = $this->allowWhiteSpace;
-
-        if ($valueString !== self::$_filter->filter($valueString)) {
-            $this->_error(self::NOT_ALPHA);
-            return false;
-        }
-
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/Barcode.php b/Zend/Validate/Barcode.php
deleted file mode 100644
index d51f11b..0000000
--- a/Zend/Validate/Barcode.php
+++ /dev/null
@@ -1,99 +0,0 @@
-setType($barcodeType);
-    }
-
-    /**
-     * Sets a new barcode validator
-     *
-     * @param  string $barcodeType - Barcode validator to use
-     * @return void
-     * @throws Zend_Validate_Exception
-     */
-    public function setType($barcodeType)
-    {
-        switch (strtolower($barcodeType)) {
-            case 'upc':
-            case 'upc-a':
-                $className = 'UpcA';
-                break;
-            case 'ean13':
-            case 'ean-13':
-                $className = 'Ean13';
-                break;
-            default:
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception("Barcode type '$barcodeType' is not supported'");
-                break;
-        }
-
-        require_once 'Zend/Validate/Barcode/' . $className . '.php';
-
-        $class = 'Zend_Validate_Barcode_' . $className;
-        $this->_barcodeValidator = new $class;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value contains a valid barcode
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        return call_user_func(array($this->_barcodeValidator, 'isValid'), $value);
-    }
-}
diff --git a/Zend/Validate/Barcode/Ean13.php b/Zend/Validate/Barcode/Ean13.php
deleted file mode 100644
index 7be797d..0000000
--- a/Zend/Validate/Barcode/Ean13.php
+++ /dev/null
@@ -1,100 +0,0 @@
- "'%value%' is an invalid EAN-13 barcode",
-        self::INVALID_LENGTH => "'%value%' should be 13 characters",
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value contains a valid barcode
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-        $this->_setValue($valueString);
-
-        if (strlen($valueString) !== 13) {
-            $this->_error(self::INVALID_LENGTH);
-            return false;
-        }
-
-        $barcode = strrev(substr($valueString, 0, -1));
-        $oddSum  = 0;
-        $evenSum = 0;
-
-        for ($i = 0; $i < 12; $i++) {
-            if ($i % 2 === 0) {
-                $oddSum += $barcode[$i] * 3;
-            } elseif ($i % 2 === 1) {
-                $evenSum += $barcode[$i];
-            }
-        }
-
-        $calculation = ($oddSum + $evenSum) % 10;
-        $checksum    = ($calculation === 0) ? 0 : 10 - $calculation;
-
-        if ($valueString[12] != $checksum) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/Zend/Validate/Barcode/UpcA.php b/Zend/Validate/Barcode/UpcA.php
deleted file mode 100644
index c584e81..0000000
--- a/Zend/Validate/Barcode/UpcA.php
+++ /dev/null
@@ -1,100 +0,0 @@
- "'%value%' is an invalid UPC-A barcode",
-        self::INVALID_LENGTH => "'%value%' should be 12 characters",
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value contains a valid barcode
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-        $this->_setValue($valueString);
-
-        if (strlen($valueString) !== 12) {
-            $this->_error(self::INVALID_LENGTH);
-            return false;
-        }
-
-        $barcode = substr($valueString, 0, -1);
-        $oddSum  = 0;
-        $evenSum = 0;
-
-        for ($i = 0; $i < 11; $i++) {
-            if ($i % 2 === 0) {
-                $oddSum += $barcode[$i] * 3;
-            } elseif ($i % 2 === 1) {
-                $evenSum += $barcode[$i];
-            }
-        }
-
-        $calculation = ($oddSum + $evenSum) % 10;
-        $checksum    = ($calculation === 0) ? 0 : 10 - $calculation;
-
-        if ($valueString[11] != $checksum) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/Zend/Validate/Between.php b/Zend/Validate/Between.php
deleted file mode 100644
index bb0b726..0000000
--- a/Zend/Validate/Between.php
+++ /dev/null
@@ -1,200 +0,0 @@
- "'%value%' is not between '%min%' and '%max%', inclusively",
-        self::NOT_BETWEEN_STRICT => "'%value%' is not strictly between '%min%' and '%max%'"
-    );
-
-    /**
-     * Additional variables available for validation failure messages
-     *
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'min' => '_min',
-        'max' => '_max'
-    );
-
-    /**
-     * Minimum value
-     *
-     * @var mixed
-     */
-    protected $_min;
-
-    /**
-     * Maximum value
-     *
-     * @var mixed
-     */
-    protected $_max;
-
-    /**
-     * Whether to do inclusive comparisons, allowing equivalence to min and/or max
-     *
-     * If false, then strict comparisons are done, and the value may equal neither
-     * the min nor max options
-     *
-     * @var boolean
-     */
-    protected $_inclusive;
-
-    /**
-     * Sets validator options
-     *
-     * @param  mixed   $min
-     * @param  mixed   $max
-     * @param  boolean $inclusive
-     * @return void
-     */
-    public function __construct($min, $max, $inclusive = true)
-    {
-        $this->setMin($min)
-             ->setMax($max)
-             ->setInclusive($inclusive);
-    }
-
-    /**
-     * Returns the min option
-     *
-     * @return mixed
-     */
-    public function getMin()
-    {
-        return $this->_min;
-    }
-
-    /**
-     * Sets the min option
-     *
-     * @param  mixed $min
-     * @return Zend_Validate_Between Provides a fluent interface
-     */
-    public function setMin($min)
-    {
-        $this->_min = $min;
-        return $this;
-    }
-
-    /**
-     * Returns the max option
-     *
-     * @return mixed
-     */
-    public function getMax()
-    {
-        return $this->_max;
-    }
-
-    /**
-     * Sets the max option
-     *
-     * @param  mixed $max
-     * @return Zend_Validate_Between Provides a fluent interface
-     */
-    public function setMax($max)
-    {
-        $this->_max = $max;
-        return $this;
-    }
-
-    /**
-     * Returns the inclusive option
-     *
-     * @return boolean
-     */
-    public function getInclusive()
-    {
-        return $this->_inclusive;
-    }
-
-    /**
-     * Sets the inclusive option
-     *
-     * @param  boolean $inclusive
-     * @return Zend_Validate_Between Provides a fluent interface
-     */
-    public function setInclusive($inclusive)
-    {
-        $this->_inclusive = $inclusive;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is between min and max options, inclusively
-     * if inclusive option is true.
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-
-        if ($this->_inclusive) {
-            if ($this->_min > $value || $value > $this->_max) {
-                $this->_error(self::NOT_BETWEEN);
-                return false;
-            }
-        } else {
-            if ($this->_min >= $value || $value >= $this->_max) {
-                $this->_error(self::NOT_BETWEEN_STRICT);
-                return false;
-            }
-        }
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/Ccnum.php b/Zend/Validate/Ccnum.php
deleted file mode 100644
index 227a4ec..0000000
--- a/Zend/Validate/Ccnum.php
+++ /dev/null
@@ -1,111 +0,0 @@
- "'%value%' must contain between 13 and 19 digits",
-        self::CHECKSUM => "Luhn algorithm (mod-10 checksum) failed on '%value%'"
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value follows the Luhn algorithm (mod-10 checksum)
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-
-        if (null === self::$_filter) {
-            /**
-             * @see Zend_Filter_Digits
-             */
-            require_once 'Zend/Filter/Digits.php';
-            self::$_filter = new Zend_Filter_Digits();
-        }
-
-        $valueFiltered = self::$_filter->filter($value);
-
-        $length = strlen($valueFiltered);
-
-        if ($length < 13 || $length > 19) {
-            $this->_error(self::LENGTH);
-            return false;
-        }
-
-        $sum    = 0;
-        $weight = 2;
-
-        for ($i = $length - 2; $i >= 0; $i--) {
-            $digit = $weight * $valueFiltered[$i];
-            $sum += floor($digit / 10) + $digit % 10;
-            $weight = $weight % 2 + 1;
-        }
-
-        if ((10 - $sum % 10) % 10 != $valueFiltered[$length - 1]) {
-            $this->_error(self::CHECKSUM, $valueFiltered);
-            return false;
-        }
-
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/Date.php b/Zend/Validate/Date.php
deleted file mode 100644
index 4eced4c..0000000
--- a/Zend/Validate/Date.php
+++ /dev/null
@@ -1,181 +0,0 @@
- "'%value%' is not of the format YYYY-MM-DD",
-        self::INVALID        => "'%value%' does not appear to be a valid date",
-        self::FALSEFORMAT    => "'%value%' does not fit given date format"
-    );
-
-    /**
-     * Optional format
-     *
-     * @var string|null
-     */
-    protected $_format;
-
-    /**
-     * Optional locale
-     *
-     * @var string|Zend_Locale|null
-     */
-    protected $_locale;
-
-    /**
-     * Sets validator options
-     *
-     * @param  string             $format OPTIONAL
-     * @param  string|Zend_Locale $locale OPTIONAL
-     * @return void
-     */
-    public function __construct($format = null, $locale = null)
-    {
-        $this->setFormat($format);
-        $this->setLocale($locale);
-    }
-
-    /**
-     * Returns the locale option
-     *
-     * @return string|Zend_Locale|null
-     */
-    public function getLocale()
-    {
-        return $this->_locale;
-    }
-
-    /**
-     * Sets the locale option
-     *
-     * @param  string|Zend_Locale $locale
-     * @return Zend_Validate_Date provides a fluent interface
-     */
-    public function setLocale($locale = null)
-    {
-        if ($locale !== null) {
-            require_once 'Zend/Locale.php';
-            if (!Zend_Locale::isLocale($locale)) {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception("The locale '$locale' is no known locale");
-            }
-        }
-        $this->_locale = $locale;
-        return $this;
-    }
-
-    /**
-     * Returns the locale option
-     *
-     * @return string|null
-     */
-    public function getFormat()
-    {
-        return $this->_format;
-    }
-
-    /**
-     * Sets the format option
-     *
-     * @param  string $format
-     * @return Zend_Validate_Date provides a fluent interface
-     */
-    public function setFormat($format = null)
-    {
-        $this->_format = $format;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if $value is a valid date of the format YYYY-MM-DD
-     * If optional $format or $locale is set the date format is checked
-     * according to Zend_Date, see Zend_Date::isDate()
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-
-        $this->_setValue($valueString);
-
-        if (($this->_format !== null) or ($this->_locale !== null)) {
-            require_once 'Zend/Date.php';
-            if (!Zend_Date::isDate($value, $this->_format, $this->_locale)) {
-                $this->_error(self::FALSEFORMAT);
-                return false;
-            }
-        } else {
-            if (!preg_match('/^\d{4}-\d{2}-\d{2}$/', $valueString)) {
-                $this->_error(self::NOT_YYYY_MM_DD);
-                return false;
-            }
-
-            list($year, $month, $day) = sscanf($valueString, '%d-%d-%d');
-
-            if (!checkdate($month, $day, $year)) {
-                $this->_error(self::INVALID);
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/Digits.php b/Zend/Validate/Digits.php
deleted file mode 100644
index c42ec0a..0000000
--- a/Zend/Validate/Digits.php
+++ /dev/null
@@ -1,100 +0,0 @@
- "'%value%' contains not only digit characters",
-        self::STRING_EMPTY => "'%value%' is an empty string"
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value only contains digit characters
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-
-        $this->_setValue($valueString);
-
-        if ('' === $valueString) {
-            $this->_error(self::STRING_EMPTY);
-            return false;
-        }
-
-        if (null === self::$_filter) {
-            /**
-             * @see Zend_Filter_Digits
-             */
-            require_once 'Zend/Filter/Digits.php';
-            self::$_filter = new Zend_Filter_Digits();
-        }
-
-        if ($valueString !== self::$_filter->filter($valueString)) {
-            $this->_error(self::NOT_DIGITS);
-            return false;
-        }
-
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/EmailAddress.php b/Zend/Validate/EmailAddress.php
deleted file mode 100644
index efb3597..0000000
--- a/Zend/Validate/EmailAddress.php
+++ /dev/null
@@ -1,245 +0,0 @@
- "'%value%' is not a valid email address in the basic format local-part@hostname",
-        self::INVALID_HOSTNAME   => "'%hostname%' is not a valid hostname for email address '%value%'",
-        self::INVALID_MX_RECORD  => "'%hostname%' does not appear to have a valid MX record for the email address '%value%'",
-        self::DOT_ATOM           => "'%localPart%' not matched against dot-atom format",
-        self::QUOTED_STRING      => "'%localPart%' not matched against quoted-string format",
-        self::INVALID_LOCAL_PART => "'%localPart%' is not a valid local part for email address '%value%'"
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'hostname'  => '_hostname',
-        'localPart' => '_localPart'
-    );
-
-    /**
-     * Local object for validating the hostname part of an email address
-     *
-     * @var Zend_Validate_Hostname
-     */
-    public $hostnameValidator;
-
-    /**
-     * Whether we check for a valid MX record via DNS
-     *
-     * @var boolean
-     */
-    protected $_validateMx = false;
-
-    /**
-     * @var string
-     */
-    protected $_hostname;
-
-    /**
-     * @var string
-     */
-    protected $_localPart;
-
-    /**
-     * Instantiates hostname validator for local use
-     *
-     * You can pass a bitfield to determine what types of hostnames are allowed.
-     * These bitfields are defined by the ALLOW_* constants in Zend_Validate_Hostname
-     * The default is to allow DNS hostnames only
-     *
-     * @param integer                $allow             OPTIONAL
-     * @param bool                   $validateMx        OPTIONAL
-     * @param Zend_Validate_Hostname $hostnameValidator OPTIONAL
-     * @return void
-     */
-    public function __construct($allow = Zend_Validate_Hostname::ALLOW_DNS, $validateMx = false, Zend_Validate_Hostname $hostnameValidator = null)
-    {
-        $this->setValidateMx($validateMx);
-        $this->setHostnameValidator($hostnameValidator, $allow);
-    }
-
-    /**
-     * @param Zend_Validate_Hostname $hostnameValidator OPTIONAL
-     * @param int                    $allow             OPTIONAL
-     * @return void
-     */
-    public function setHostnameValidator(Zend_Validate_Hostname $hostnameValidator = null, $allow = Zend_Validate_Hostname::ALLOW_DNS)
-    {
-        if ($hostnameValidator === null) {
-            $hostnameValidator = new Zend_Validate_Hostname($allow);
-        }
-        $this->hostnameValidator = $hostnameValidator;
-    }
-
-    /**
-     * Whether MX checking via dns_get_mx is supported or not
-     *
-     * This currently only works on UNIX systems
-     *
-     * @return boolean
-     */
-    public function validateMxSupported()
-    {
-        return function_exists('dns_get_mx');
-    }
-
-    /**
-     * Set whether we check for a valid MX record via DNS
-     *
-     * This only applies when DNS hostnames are validated
-     *
-     * @param boolean $allowed Set allowed to true to validate for MX records, and false to not validate them
-     */
-    public function setValidateMx($allowed)
-    {
-        $this->_validateMx = (bool) $allowed;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is a valid email address
-     * according to RFC2822
-     *
-     * @link   http://www.ietf.org/rfc/rfc2822.txt RFC2822
-     * @link   http://www.columbia.edu/kermit/ascii.html US-ASCII characters
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-
-        $this->_setValue($valueString);
-
-        // Split email address up
-        if (!preg_match('/^(.+)@([^@]+)$/', $valueString, $matches)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_localPart = $matches[1];
-        $this->_hostname  = $matches[2];
-
-        // Match hostname part
-        $hostnameResult = $this->hostnameValidator->setTranslator($this->getTranslator())
-                               ->isValid($this->_hostname);
-        if (!$hostnameResult) {
-            $this->_error(self::INVALID_HOSTNAME);
-
-            // Get messages and errors from hostnameValidator
-            foreach ($this->hostnameValidator->getMessages() as $message) {
-                $this->_messages[] = $message;
-            }
-            foreach ($this->hostnameValidator->getErrors() as $error) {
-                $this->_errors[] = $error;
-            }
-        }
-
-        // MX check on hostname via dns_get_record()
-        if ($this->_validateMx) {
-            if ($this->validateMxSupported()) {
-                $result = dns_get_mx($this->_hostname, $mxHosts);
-                if (count($mxHosts) < 1) {
-                    $hostnameResult = false;
-                    $this->_error(self::INVALID_MX_RECORD);
-                }
-            } else {
-                /**
-                 * MX checks are not supported by this system
-                 * @see Zend_Validate_Exception
-                 */
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception('Internal error: MX checking not available on this system');
-            }
-        }
-
-        // First try to match the local part on the common dot-atom format
-        $localResult = false;
-
-        // Dot-atom characters are: 1*atext *("." 1*atext)
-        // atext: ALPHA / DIGIT / and "!", "#", "$", "%", "&", "'", "*",
-        //        "-", "/", "=", "?", "^", "_", "`", "{", "|", "}", "~"
-        $atext = 'a-zA-Z0-9\x21\x23\x24\x25\x26\x27\x2a\x2b\x2d\x2f\x3d\x3f\x5e\x5f\x60\x7b\x7c\x7d';
-        if (preg_match('/^[' . $atext . ']+(\x2e+[' . $atext . ']+)*$/', $this->_localPart)) {
-            $localResult = true;
-        } else {
-            // Try quoted string format
-
-            // Quoted-string characters are: DQUOTE *([FWS] qtext/quoted-pair) [FWS] DQUOTE
-            // qtext: Non white space controls, and the rest of the US-ASCII characters not
-            //   including "\" or the quote character
-            $noWsCtl    = '\x01-\x08\x0b\x0c\x0e-\x1f\x7f';
-            $qtext      = $noWsCtl . '\x21\x23-\x5b\x5d-\x7e';
-            $ws         = '\x20\x09';
-            if (preg_match('/^\x22([' . $ws . $qtext . '])*[$ws]?\x22$/', $this->_localPart)) {
-                $localResult = true;
-            } else {
-                $this->_error(self::DOT_ATOM);
-                $this->_error(self::QUOTED_STRING);
-                $this->_error(self::INVALID_LOCAL_PART);
-            }
-        }
-
-        // If both parts valid, return true
-        if ($localResult && $hostnameResult) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-}
diff --git a/Zend/Validate/Exception.php b/Zend/Validate/Exception.php
deleted file mode 100644
index a38077e..0000000
--- a/Zend/Validate/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
- "'%value%' does not appear to be a float"
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is a floating-point value
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-
-        $this->_setValue($valueString);
-
-        $locale = localeconv();
-
-        $valueFiltered = str_replace($locale['thousands_sep'], '', $valueString);
-        $valueFiltered = str_replace($locale['decimal_point'], '.', $valueFiltered);
-
-        if (strval(floatval($valueFiltered)) != $valueFiltered) {
-            $this->_error();
-            return false;
-        }
-
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/GreaterThan.php b/Zend/Validate/GreaterThan.php
deleted file mode 100644
index 35e658c..0000000
--- a/Zend/Validate/GreaterThan.php
+++ /dev/null
@@ -1,114 +0,0 @@
- "'%value%' is not greater than '%min%'"
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'min' => '_min'
-    );
-
-    /**
-     * Minimum value
-     *
-     * @var mixed
-     */
-    protected $_min;
-
-    /**
-     * Sets validator options
-     *
-     * @param  mixed $min
-     * @return void
-     */
-    public function __construct($min)
-    {
-        $this->setMin($min);
-    }
-
-    /**
-     * Returns the min option
-     *
-     * @return mixed
-     */
-    public function getMin()
-    {
-        return $this->_min;
-    }
-
-    /**
-     * Sets the min option
-     *
-     * @param  mixed $min
-     * @return Zend_Validate_GreaterThan Provides a fluent interface
-     */
-    public function setMin($min)
-    {
-        $this->_min = $min;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is greater than min option
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-
-        if ($this->_min >= $value) {
-            $this->_error();
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/Hex.php b/Zend/Validate/Hex.php
deleted file mode 100644
index 9512eda..0000000
--- a/Zend/Validate/Hex.php
+++ /dev/null
@@ -1,74 +0,0 @@
- "'%value%' has not only hexadecimal digit characters"
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value contains only hexadecimal digit characters
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-
-        $this->_setValue($valueString);
-
-        if (!ctype_xdigit($valueString)) {
-            $this->_error();
-            return false;
-        }
-
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/Hostname.php b/Zend/Validate/Hostname.php
deleted file mode 100644
index b7a3799..0000000
--- a/Zend/Validate/Hostname.php
+++ /dev/null
@@ -1,444 +0,0 @@
- "'%value%' appears to be an IP address, but IP addresses are not allowed",
-        self::UNKNOWN_TLD             => "'%value%' appears to be a DNS hostname but cannot match TLD against known list",
-        self::INVALID_DASH            => "'%value%' appears to be a DNS hostname but contains a dash (-) in an invalid position",
-        self::INVALID_HOSTNAME_SCHEMA => "'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'",
-        self::UNDECIPHERABLE_TLD      => "'%value%' appears to be a DNS hostname but cannot extract TLD part",
-        self::INVALID_HOSTNAME        => "'%value%' does not match the expected structure for a DNS hostname",
-        self::INVALID_LOCAL_NAME      => "'%value%' does not appear to be a valid local network name",
-        self::LOCAL_NAME_NOT_ALLOWED  => "'%value%' appears to be a local network name but local network names are not allowed"
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'tld' => '_tld'
-    );
-
-    /**
-     * Allows Internet domain names (e.g., example.com)
-     */
-    const ALLOW_DNS   = 1;
-
-    /**
-     * Allows IP addresses
-     */
-    const ALLOW_IP    = 2;
-
-    /**
-     * Allows local network names (e.g., localhost, www.localdomain)
-     */
-    const ALLOW_LOCAL = 4;
-
-    /**
-     * Allows all types of hostnames
-     */
-    const ALLOW_ALL   = 7;
-
-    /**
-     * Whether IDN domains are validated
-     *
-     * @var boolean
-     */
-    private $_validateIdn = true;
-
-    /**
-     * Whether TLDs are validated against a known list
-     *
-     * @var boolean
-     */
-    private $_validateTld = true;
-
-    /**
-     * Bit field of ALLOW constants; determines which types of hostnames are allowed
-     *
-     * @var integer
-     */
-    protected $_allow;
-
-    /**
-     * Bit field of CHECK constants; determines what additional hostname checks to make
-     *
-     * @var unknown_type
-     */
-    // protected $_check;
-
-    /**
-     * Array of valid top-level-domains
-     *
-     * @var array
-     * @see ftp://data.iana.org/TLD/tlds-alpha-by-domain.txt  List of all TLDs by domain
-     */
-    protected $_validTlds = array(
-        'ac', 'ad', 'ae', 'aero', 'af', 'ag', 'ai', 'al', 'am', 'an', 'ao',
-        'aq', 'ar', 'arpa', 'as', 'asia', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bb',
-        'bd', 'be', 'bf', 'bg', 'bh', 'bi', 'biz', 'bj', 'bm', 'bn', 'bo',
-        'br', 'bs', 'bt', 'bv', 'bw', 'by', 'bz', 'ca', 'cat', 'cc', 'cd',
-        'cf', 'cg', 'ch', 'ci', 'ck', 'cl', 'cm', 'cn', 'co', 'com', 'coop',
-        'cr', 'cu', 'cv', 'cx', 'cy', 'cz', 'de', 'dj', 'dk', 'dm', 'do',
-        'dz', 'ec', 'edu', 'ee', 'eg', 'er', 'es', 'et', 'eu', 'fi', 'fj',
-        'fk', 'fm', 'fo', 'fr', 'ga', 'gb', 'gd', 'ge', 'gf', 'gg', 'gh',
-        'gi', 'gl', 'gm', 'gn', 'gov', 'gp', 'gq', 'gr', 'gs', 'gt', 'gu',
-        'gw', 'gy', 'hk', 'hm', 'hn', 'hr', 'ht', 'hu', 'id', 'ie', 'il',
-        'im', 'in', 'info', 'int', 'io', 'iq', 'ir', 'is', 'it', 'je', 'jm',
-        'jo', 'jobs', 'jp', 'ke', 'kg', 'kh', 'ki', 'km', 'kn', 'kp', 'kr', 'kw',
-        'ky', 'kz', 'la', 'lb', 'lc', 'li', 'lk', 'lr', 'ls', 'lt', 'lu',
-        'lv', 'ly', 'ma', 'mc', 'md', 'me', 'mg', 'mh', 'mil', 'mk', 'ml', 'mm',
-        'mn', 'mo', 'mobi', 'mp', 'mq', 'mr', 'ms', 'mt', 'mu', 'museum', 'mv',
-        'mw', 'mx', 'my', 'mz', 'na', 'name', 'nc', 'ne', 'net', 'nf', 'ng',
-        'ni', 'nl', 'no', 'np', 'nr', 'nu', 'nz', 'om', 'org', 'pa', 'pe',
-        'pf', 'pg', 'ph', 'pk', 'pl', 'pm', 'pn', 'pr', 'pro', 'ps', 'pt',
-        'pw', 'py', 'qa', 're', 'ro', 'rs', 'ru', 'rw', 'sa', 'sb', 'sc', 'sd',
-        'se', 'sg', 'sh', 'si', 'sj', 'sk', 'sl', 'sm', 'sn', 'so', 'sr',
-        'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tel', 'tf', 'tg', 'th', 'tj',
-        'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'travel', 'tt', 'tv', 'tw',
-        'tz', 'ua', 'ug', 'uk', 'um', 'us', 'uy', 'uz', 'va', 'vc', 've',
-        'vg', 'vi', 'vn', 'vu', 'wf', 'ws', 'ye', 'yt', 'yu', 'za', 'zm',
-        'zw'
-        );
-
-    /**
-     * @var string
-     */
-    protected $_tld;
-
-    /**
-     * Sets validator options
-     *
-     * @param integer          $allow       OPTIONAL Set what types of hostname to allow (default ALLOW_DNS)
-     * @param boolean          $validateIdn OPTIONAL Set whether IDN domains are validated (default true)
-     * @param boolean          $validateTld OPTIONAL Set whether the TLD element of a hostname is validated (default true)
-     * @param Zend_Validate_Ip $ipValidator OPTIONAL
-     * @return void
-     * @see http://www.iana.org/cctld/specifications-policies-cctlds-01apr02.htm  Technical Specifications for ccTLDs
-     */
-    public function __construct($allow = self::ALLOW_DNS, $validateIdn = true, $validateTld = true, Zend_Validate_Ip $ipValidator = null)
-    {
-        // Set allow options
-        $this->setAllow($allow);
-
-        // Set validation options
-        $this->_validateIdn = $validateIdn;
-        $this->_validateTld = $validateTld;
-
-        $this->setIpValidator($ipValidator);
-    }
-
-    /**
-     * @param Zend_Validate_Ip $ipValidator OPTIONAL
-     * @return void;
-     */
-    public function setIpValidator(Zend_Validate_Ip $ipValidator = null)
-    {
-        if ($ipValidator === null) {
-            $ipValidator = new Zend_Validate_Ip();
-        }
-        $this->_ipValidator = $ipValidator;
-    }
-
-    /**
-     * Returns the allow option
-     *
-     * @return integer
-     */
-    public function getAllow()
-    {
-        return $this->_allow;
-    }
-
-    /**
-     * Sets the allow option
-     *
-     * @param  integer $allow
-     * @return Zend_Validate_Hostname Provides a fluent interface
-     */
-    public function setAllow($allow)
-    {
-        $this->_allow = $allow;
-        return $this;
-    }
-
-    /**
-     * Set whether IDN domains are validated
-     *
-     * This only applies when DNS hostnames are validated
-     *
-     * @param boolean $allowed Set allowed to true to validate IDNs, and false to not validate them
-     */
-    public function setValidateIdn ($allowed)
-    {
-        $this->_validateIdn = (bool) $allowed;
-    }
-
-    /**
-     * Set whether the TLD element of a hostname is validated
-     *
-     * This only applies when DNS hostnames are validated
-     *
-     * @param boolean $allowed Set allowed to true to validate TLDs, and false to not validate them
-     */
-    public function setValidateTld ($allowed)
-    {
-        $this->_validateTld = (bool) $allowed;
-    }
-
-    /**
-     * Sets the check option
-     *
-     * @param  integer $check
-     * @return Zend_Validate_Hostname Provides a fluent interface
-     */
-    /*
-    public function setCheck($check)
-    {
-        $this->_check = $check;
-        return $this;
-    }
-     */
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the $value is a valid hostname with respect to the current allow option
-     *
-     * @param  string $value
-     * @throws Zend_Validate_Exception if a fatal error occurs for validation process
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-
-        $this->_setValue($valueString);
-
-        // Check input against IP address schema
-        if ($this->_ipValidator->setTranslator($this->getTranslator())->isValid($valueString)) {
-            if (!($this->_allow & self::ALLOW_IP)) {
-                $this->_error(self::IP_ADDRESS_NOT_ALLOWED);
-                return false;
-            } else{
-                return true;
-            }
-        }
-
-        // Check input against DNS hostname schema
-        $domainParts = explode('.', $valueString);
-        if ((count($domainParts) > 1) && (strlen($valueString) >= 4) && (strlen($valueString) <= 254)) {
-            $status = false;
-
-            do {
-                // First check TLD
-                if (preg_match('/([a-z]{2,10})$/i', end($domainParts), $matches)) {
-
-                    reset($domainParts);
-
-                    // Hostname characters are: *(label dot)(label dot label); max 254 chars
-                    // label: id-prefix [*ldh{61} id-prefix]; max 63 chars
-                    // id-prefix: alpha / digit
-                    // ldh: alpha / digit / dash
-
-                    // Match TLD against known list
-                    $this->_tld = strtolower($matches[1]);
-                    if ($this->_validateTld) {
-                        if (!in_array($this->_tld, $this->_validTlds)) {
-                            $this->_error(self::UNKNOWN_TLD);
-                            $status = false;
-                            break;
-                        }
-                    }
-
-                    /**
-                     * Match against IDN hostnames
-                     * @see Zend_Validate_Hostname_Interface
-                     */
-                    $labelChars = 'a-z0-9';
-                    $utf8 = false;
-                    $classFile = 'Zend/Validate/Hostname/' . ucfirst($this->_tld) . '.php';
-                    if ($this->_validateIdn) {
-                        if (Zend_Loader::isReadable($classFile)) {
-
-                            // Load additional characters
-                            $className = 'Zend_Validate_Hostname_' . ucfirst($this->_tld);
-                            Zend_Loader::loadClass($className);
-                            $labelChars .= call_user_func(array($className, 'getCharacters'));
-                            $utf8 = true;
-                        }
-                    }
-
-                    // Keep label regex short to avoid issues with long patterns when matching IDN hostnames
-                    $regexLabel = '/^[' . $labelChars . '\x2d]{1,63}$/i';
-                    if ($utf8) {
-                        $regexLabel .= 'u';
-                    }
-
-                    // Check each hostname part
-                    $valid = true;
-                    foreach ($domainParts as $domainPart) {
-
-                        // Check dash (-) does not start, end or appear in 3rd and 4th positions
-                        if (strpos($domainPart, '-') === 0 ||
-                        (strlen($domainPart) > 2 && strpos($domainPart, '-', 2) == 2 && strpos($domainPart, '-', 3) == 3) ||
-                        strrpos($domainPart, '-') === strlen($domainPart) - 1) {
-
-                            $this->_error(self::INVALID_DASH);
-                            $status = false;
-                            break 2;
-                        }
-
-                        // Check each domain part
-                        $status = @preg_match($regexLabel, $domainPart);
-                        if ($status === false) {
-                            /**
-                             * Regex error
-                             * @see Zend_Validate_Exception
-                             */
-                            require_once 'Zend/Validate/Exception.php';
-                            throw new Zend_Validate_Exception('Internal error: DNS validation failed');
-                        } elseif ($status === 0) {
-                            $valid = false;
-                        }
-                    }
-
-                    // If all labels didn't match, the hostname is invalid
-                    if (!$valid) {
-                        $this->_error(self::INVALID_HOSTNAME_SCHEMA);
-                        $status = false;
-                    }
-
-                } else {
-                    // Hostname not long enough
-                    $this->_error(self::UNDECIPHERABLE_TLD);
-                    $status = false;
-                }
-            } while (false);
-
-            // If the input passes as an Internet domain name, and domain names are allowed, then the hostname
-            // passes validation
-            if ($status && ($this->_allow & self::ALLOW_DNS)) {
-                return true;
-            }
-        } else {
-            $this->_error(self::INVALID_HOSTNAME);
-        }
-
-        // Check input against local network name schema; last chance to pass validation
-        $regexLocal = '/^(([a-zA-Z0-9\x2d]{1,63}\x2e)*[a-zA-Z0-9\x2d]{1,63}){1,254}$/';
-        $status = @preg_match($regexLocal, $valueString);
-        if (false === $status) {
-            /**
-             * Regex error
-             * @see Zend_Validate_Exception
-             */
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Internal error: local network name validation failed');
-        }
-
-        // If the input passes as a local network name, and local network names are allowed, then the
-        // hostname passes validation
-        $allowLocal = $this->_allow & self::ALLOW_LOCAL;
-        if ($status && $allowLocal) {
-            return true;
-        }
-
-        // If the input does not pass as a local network name, add a message
-        if (!$status) {
-            $this->_error(self::INVALID_LOCAL_NAME);
-        }
-
-        // If local network names are not allowed, add a message
-        if (!$allowLocal) {
-            $this->_error(self::LOCAL_NAME_NOT_ALLOWED);
-        }
-
-        return false;
-    }
-
-    /**
-     * Throws an exception if a regex for $type does not exist
-     *
-     * @param  string $type
-     * @throws Zend_Validate_Exception
-     * @return Zend_Validate_Hostname Provides a fluent interface
-     */
-    /*
-    protected function _checkRegexType($type)
-    {
-        if (!isset($this->_regex[$type])) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("'$type' must be one of ('" . implode(', ', array_keys($this->_regex))
-                                            . "')");
-        }
-        return $this;
-    }
-     */
-
-}
diff --git a/Zend/Validate/Hostname/At.php b/Zend/Validate/Hostname/At.php
deleted file mode 100644
index fff6bf2..0000000
--- a/Zend/Validate/Hostname/At.php
+++ /dev/null
@@ -1,50 +0,0 @@
- 'Tokens do not match',
-        self::MISSING_TOKEN => 'No token was provided to match against',
-    );
-
-    /**
-     * Original token against which to validate
-     * @var string
-     */
-    protected $_token;
-
-    /**
-     * Sets validator options
-     *
-     * @param  string $token
-     * @return void
-     */
-    public function __construct($token = null)
-    {
-        if (null !== $token) {
-            $this->setToken($token);
-        }
-    }
-
-    /**
-     * Set token against which to compare
-     * 
-     * @param  string $token 
-     * @return Zend_Validate_Identical
-     */
-    public function setToken($token)
-    {
-        $this->_token = (string) $token;
-        return $this;
-    }
-
-    /**
-     * Retrieve token
-     * 
-     * @return string
-     */
-    public function getToken()
-    {
-        return $this->_token;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if a token has been set and the provided value 
-     * matches that token.
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-        $token = $this->getToken();
-
-        if (empty($token)) {
-            $this->_error(self::MISSING_TOKEN);
-            return false;
-        }
-
-        if ($value !== $token)  {
-            $this->_error(self::NOT_SAME);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/Zend/Validate/InArray.php b/Zend/Validate/InArray.php
deleted file mode 100644
index 1c7725a..0000000
--- a/Zend/Validate/InArray.php
+++ /dev/null
@@ -1,138 +0,0 @@
- "'%value%' was not found in the haystack"
-    );
-
-    /**
-     * Haystack of possible values
-     *
-     * @var array
-     */
-    protected $_haystack;
-
-    /**
-     * Whether a strict in_array() invocation is used
-     *
-     * @var boolean
-     */
-    protected $_strict;
-
-    /**
-     * Sets validator options
-     *
-     * @param  array   $haystack
-     * @param  boolean $strict
-     * @return void
-     */
-    public function __construct(array $haystack, $strict = false)
-    {
-        $this->setHaystack($haystack)
-             ->setStrict($strict);
-    }
-
-    /**
-     * Returns the haystack option
-     *
-     * @return mixed
-     */
-    public function getHaystack()
-    {
-        return $this->_haystack;
-    }
-
-    /**
-     * Sets the haystack option
-     *
-     * @param  mixed $haystack
-     * @return Zend_Validate_InArray Provides a fluent interface
-     */
-    public function setHaystack(array $haystack)
-    {
-        $this->_haystack = $haystack;
-        return $this;
-    }
-
-    /**
-     * Returns the strict option
-     *
-     * @return boolean
-     */
-    public function getStrict()
-    {
-        return $this->_strict;
-    }
-
-    /**
-     * Sets the strict option
-     *
-     * @param  boolean $strict
-     * @return Zend_Validate_InArray Provides a fluent interface
-     */
-    public function setStrict($strict)
-    {
-        $this->_strict = $strict;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is contained in the haystack option. If the strict
-     * option is true, then the type of $value is also checked.
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-        if (!in_array($value, $this->_haystack, $this->_strict)) {
-            $this->_error();
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/Int.php b/Zend/Validate/Int.php
deleted file mode 100644
index 0bde2cb..0000000
--- a/Zend/Validate/Int.php
+++ /dev/null
@@ -1,75 +0,0 @@
- "'%value%' does not appear to be an integer"
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is a valid integer
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-
-        $this->_setValue($valueString);
-
-        $locale = localeconv();
-
-        $valueFiltered = str_replace($locale['decimal_point'], '.', $valueString);
-        $valueFiltered = str_replace($locale['thousands_sep'], '', $valueFiltered);
-
-        if (strval(intval($valueFiltered)) != $valueFiltered) {
-            $this->_error();
-            return false;
-        }
-
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/Interface.php b/Zend/Validate/Interface.php
deleted file mode 100644
index 4fcd525..0000000
--- a/Zend/Validate/Interface.php
+++ /dev/null
@@ -1,71 +0,0 @@
- "'%value%' does not appear to be a valid IP address"
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is a valid IP address
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-
-        $this->_setValue($valueString);
-
-        if (ip2long($valueString) === false) {
-            $this->_error();
-            return false;
-        }
-
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/LessThan.php b/Zend/Validate/LessThan.php
deleted file mode 100644
index 9f7b72c..0000000
--- a/Zend/Validate/LessThan.php
+++ /dev/null
@@ -1,113 +0,0 @@
- "'%value%' is not less than '%max%'"
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'max' => '_max'
-    );
-
-    /**
-     * Maximum value
-     *
-     * @var mixed
-     */
-    protected $_max;
-
-    /**
-     * Sets validator options
-     *
-     * @param  mixed $max
-     * @return void
-     */
-    public function __construct($max)
-    {
-        $this->setMax($max);
-    }
-
-    /**
-     * Returns the max option
-     *
-     * @return mixed
-     */
-    public function getMax()
-    {
-        return $this->_max;
-    }
-
-    /**
-     * Sets the max option
-     *
-     * @param  mixed $max
-     * @return Zend_Validate_LessThan Provides a fluent interface
-     */
-    public function setMax($max)
-    {
-        $this->_max = $max;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is less than max option
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-        if ($this->_max <= $value) {
-            $this->_error();
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/NotEmpty.php b/Zend/Validate/NotEmpty.php
deleted file mode 100644
index 2c34814..0000000
--- a/Zend/Validate/NotEmpty.php
+++ /dev/null
@@ -1,70 +0,0 @@
- "Value is empty, but a non-empty value is required"
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is not an empty value.
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-
-        $this->_setValue($valueString);
-
-        if (empty($value)) {
-            $this->_error();
-            return false;
-        }
-
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/Regex.php b/Zend/Validate/Regex.php
deleted file mode 100644
index 1566f07..0000000
--- a/Zend/Validate/Regex.php
+++ /dev/null
@@ -1,125 +0,0 @@
- "'%value%' does not match against pattern '%pattern%'"
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'pattern' => '_pattern'
-    );
-
-    /**
-     * Regular expression pattern
-     *
-     * @var string
-     */
-    protected $_pattern;
-
-    /**
-     * Sets validator options
-     *
-     * @param  string $pattern
-     * @return void
-     */
-    public function __construct($pattern)
-    {
-        $this->setPattern($pattern);
-    }
-
-    /**
-     * Returns the pattern option
-     *
-     * @return string
-     */
-    public function getPattern()
-    {
-        return $this->_pattern;
-    }
-
-    /**
-     * Sets the pattern option
-     *
-     * @param  string $pattern
-     * @return Zend_Validate_Regex Provides a fluent interface
-     */
-    public function setPattern($pattern)
-    {
-        $this->_pattern = (string) $pattern;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value matches against the pattern option
-     *
-     * @param  string $value
-     * @throws Zend_Validate_Exception if there is a fatal error in pattern matching
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-
-        $this->_setValue($valueString);
-
-        $status = @preg_match($this->_pattern, $valueString);
-        if (false === $status) {
-            /**
-             * @see Zend_Validate_Exception
-             */
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("Internal error matching pattern '$this->_pattern' against value '$valueString'");
-        }
-        if (!$status) {
-            $this->_error();
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/Zend/Validate/StringLength.php b/Zend/Validate/StringLength.php
deleted file mode 100644
index c43f2ca..0000000
--- a/Zend/Validate/StringLength.php
+++ /dev/null
@@ -1,180 +0,0 @@
- "'%value%' is less than %min% characters long",
-        self::TOO_LONG  => "'%value%' is greater than %max% characters long"
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'min' => '_min',
-        'max' => '_max'
-    );
-
-    /**
-     * Minimum length
-     *
-     * @var integer
-     */
-    protected $_min;
-
-    /**
-     * Maximum length
-     *
-     * If null, there is no maximum length
-     *
-     * @var integer|null
-     */
-    protected $_max;
-
-    /**
-     * Sets validator options
-     *
-     * @param  integer $min
-     * @param  integer $max
-     * @return void
-     */
-    public function __construct($min = 0, $max = null)
-    {
-        $this->setMin($min);
-        $this->setMax($max);
-    }
-
-    /**
-     * Returns the min option
-     *
-     * @return integer
-     */
-    public function getMin()
-    {
-        return $this->_min;
-    }
-
-    /**
-     * Sets the min option
-     *
-     * @param  integer $min
-     * @throws Zend_Validate_Exception
-     * @return Zend_Validate_StringLength Provides a fluent interface
-     */
-    public function setMin($min)
-    {
-        if (null !== $this->_max && $min > $this->_max) {
-            /**
-             * @see Zend_Validate_Exception
-             */
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum length, but $min >"
-                                            . " $this->_max");
-        }
-        $this->_min = max(0, (integer) $min);
-        return $this;
-    }
-
-    /**
-     * Returns the max option
-     *
-     * @return integer|null
-     */
-    public function getMax()
-    {
-        return $this->_max;
-    }
-
-    /**
-     * Sets the max option
-     *
-     * @param  integer|null $max
-     * @throws Zend_Validate_Exception
-     * @return Zend_Validate_StringLength Provides a fluent interface
-     */
-    public function setMax($max)
-    {
-        if (null === $max) {
-            $this->_max = null;
-        } else if ($max < $this->_min) {
-            /**
-             * @see Zend_Validate_Exception
-             */
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum length, but "
-                                            . "$max < $this->_min");
-        } else {
-            $this->_max = (integer) $max;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the string length of $value is at least the min option and
-     * no greater than the max option (when the max option is not null).
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $valueString = (string) $value;
-        $this->_setValue($valueString);
-        $length = iconv_strlen($valueString);
-        if ($length < $this->_min) {
-            $this->_error(self::TOO_SHORT);
-        }
-        if (null !== $this->_max && $this->_max < $length) {
-            $this->_error(self::TOO_LONG);
-        }
-        if (count($this->_messages)) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-}
diff --git a/cache.class.php b/cache.class.php
deleted file mode 100644
index 0943e3a..0000000
--- a/cache.class.php
+++ /dev/null
@@ -1,317 +0,0 @@
-
-* @license http://www.gnu.org/licenses/gpl.html GPL
-* @copyright 2008 Leblanc Simon
-*
-* @package stripit 
-*/
-class STRIPIT_Cache
-{
-	/**
-	 * cache folder
-	 * @var string
-	 */
-	var $cache_folder;
-	
-	/**
-	 * template filename
-	 * @var string
-	 */
-	var $template;
-	
-	/**
-	 * template name
-	 * @var string
-	 */
-	var $template_name;
-	
-	/**
-	 * name of strip
-	 * @var string
-	 */
-	var $page;
-	
-	/**
-	 * name of the strip folder
-	 * @var	string
-	 */
-	var $strip_folder;
-	
-	/**
-	 * Stat about the strip file
-	 * @var array
-	 */
-	var $stats;
-	
-	/**
-	 * cache data
-	 * @var	string
-	 */
-	var $cache_data;
-	
-	/**
-	 * Constructor
-	 *
-	 * Init the param of class
-	 *
-	 * @access	public
-	 */
-	function STRIPIT_Cache()
-	{
-		$this->cache_folder	= '';
-		$this->template		= '';
-		$this->template_name	= '';
-		$this->page		= '';
-		$this->strip_folder	= '';
-		$this->stats		= array();
-		$this->cache_data	= '';
-	}
-	
-	
-	/**
-	 * Init the param of class and check the cache folder
-	 *
-	 * @param	string	$page		Name of the strip for HTML or number of strip for RSS
-	 * @param	string	$template	Name of the template file
-	 * @param	string	$template_name	Name of the template
-	 * @param	string	$strip_folder	Name of the strip folder
-	 * @param	string	$cache_folder	Name of the folder where the cache file is save
-	 * @param	string	$language	The language to use
-	 * @param	bool	$is_rss		True if the page is for rss, False else
-	 * @access	public
-	 * @return	bool			True if all is OK, false else
-	 */
-	function init($page, $template, $template_name, $strip_folder, $cache_folder, $language, $is_rss = false)
-	{
-		$this->template_name	= $template_name;
-		$this->_getName($page, $language, $is_rss);
-		$this->template		= $template;
-		$this->strip_folder	= $strip_folder;
-		$this->cache_data	= '';
-		
-		if (!empty($cache_folder) && file_exists($cache_folder)) {
-			$this->cache_folder = $cache_folder;
-		} else {
-			$this->cache_folder = $this->template.'/cache';
-		}
-		
-		return $this->_initFolder();
-	}
-	
-	
-	/**
-	 * check if the page is in cache or if we must generate the page and the cache
-	 *
-	 * @access	public
-	 * @return	bool		True if the page is in cache, false else
-	 */
-	function isInCache()
-	{
-		if (!$this->_cacheExist()) {
-			return false;
-		} else {
-			include_once $this->cache_folder.'/'.$this->page;
-			$this->_getStats();
-			// a variable $stat_cache exist in the file cache
-			if (!is_array($stat_cache)) {
-				// the variable isn't good, generate cache
-				return false;
-			}
-			
-			$count_cache = count($stat_cache);
-			$count_model = count($this->stats);
-			
-			if ($count_cache != $count_model) {
-				// the number of file is different, generate cache
-				return false;
-			}
-			
-			$compare = array_diff_assoc($stat_cache, $this->stats);
-			if (count($compare) == 0) {
-				// the variable $cache_data exist in the template file
-				$this->cache_data = $cache_data;
-				return true;
-			} else {
-				return false;
-			}
-		}
-	}
-	
-	/**
-	 * Init the folder name and create, if necessary, the folder for the cache
-	 *
-	 * @access	private
-	 * @return	bool			True if it's ok, false if error
-	 */
-	function _initFolder($cache_folder = '')
-	{	
-		if (!is_dir($this->cache_folder)) {
-			// the directory doesn't exist, we create it!
-			if (!mkdir($this->cache_folder, 0777, true)) {
-				return false;
-			}
-		}
-		
-		return true;
-	}
-	
-	
-	/**
-	 * Generate the cache file
-	 * 
-	 * @param	string	$data	The contain HTML or RSS to put in cache
-	 * @access	private
-	 * @return	bool		True if it's OK, false else
-	 */
-	function putInCache($data)
-	{
-		$cache = $this->_genCache($data);
-		
-		// write in the cache, delete the contain of file, if it exists.
-		$handle = fopen($this->cache_folder.'/'.$this->page, 'w');
-		if (!$handle) {
-			return false;
-		}
-		
-		if (fwrite($handle, $cache) === false) {
-			return false;
-		}
-		
-		fclose($handle);
-		
-		$this->cache_data = $data;
-		
-		return true;
-	}
-	
-	
-	/**
-	 * Generate the code to insert in the cache
-	 *
-	 * @param	string	$data	The contain HTML or RSS to put in cache
-	 * @access	private
-	 * @return	string		The code PHP + HTML or RSS to put in the cache file
-	 */
-	function _genCache($data)
-	{
-		$br = "\n";
-		$cache = '_genStats();
-		
-		$cache .= $br.$br;
-		$cache .= 'ob_start();'.$br;
-		$cache .= '?>'.$br;
-		
-		$cache .= $data;
-		
-		$cache .= $br.$br;
-		$cache .= ''.$br;
-		
-		return $cache;
-	}
-	
-	
-	/**
-	 * print cache
-	 *
-	 * @access	public
-	 */
-	function getCache()
-	{
-		echo $this->cache_data;
-	}
-	
-	
-	/**
-	 * calculate the stats for the strips file
-	 *
-	 * @access	private
-	 */
-	function _getStats()
-	{
-		// Open the given directory
-		$handle = opendir($this->strip_folder);
-
-		// Browse the directory
-		while($file = readdir($handle)) {
-			if($file != "." && $file != "..") {
-				// Get the extension of the file
-				$ext = pathinfo($file);
-				// If it is an SVG
-				if( $ext['extension'] == 'svg' ) {
-					// Add it to the list
-					clearstatcache();
-					$this->stats[$file] = filemtime($this->strip_folder.'/'.$file);
-				}
-			}
-		}
-
-		closedir($handle);
-	}
-	
-	/**
-	 * Generate the PHP variable $stat_cache
-	 *
-	 * @access	private
-	 * @return	string	The PHP code to insert in the cache file for have the stat at the generation time
-	 */
-	function _genStats()
-	{
-		$br = "\n";
-		$str = '';
-		$i = 0;
-		
-		if (count($this->stats) == 0) {
-			$this->_getStats();
-		}
-		$str .= '$stat_cache = array(';
-		foreach($this->stats as $key => $value) {
-			if ($i != 0) {
-				$str .= ',';
-			}
-			$str .= '\''.str_replace("'", "\'", $key).'\' => \''.$value.'\''.$br;
-			$i++;
-		}
-		$str .= ');'.$br;
-		
-		return $str;
-	}
-	
-	
-	/**
-	 * check if the cache file exist
-	 *
-	 * @access	private
-	 * @return	bool		True if the cache file exist, false else
-	 */
-	function _cacheExist()
-	{
-		if (file_exists($this->cache_folder.'/'.$this->page)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-	
-	
-	/**
-	 * Generate the filename for cache
-	 *
-	 * @access	private
-	 */
-	function _getName($page, $language, $is_rss)
-	{
-		if ($is_rss) {
-			$this->page = $page.'_'.$this->template_name.'_'.$language.'_cache_rss.php';
-		} else {
-			$this->page = $page.'_'.$this->template_name.'_'.$language.'_cache_html.php';
-		}
-	}
-}
-?>
\ No newline at end of file
diff --git a/conf/configuration-dist.php b/conf/configuration-dist.php
deleted file mode 100644
index 239e253..0000000
--- a/conf/configuration-dist.php
+++ /dev/null
@@ -1,123 +0,0 @@
-
-* @license http://www.gnu.org/licenses/gpl.html GPL
-* @copyright 2007 Johann Dréo
-*
-* @package stripit 
-*/
-
-/**
-* Configuration 
-*/
-class configuration
-{
-	/**
-	* Software version
-	*/
-	var $version = '0.6';
-
-	/**
-	* URL of the website
-	*/
-	var $url = 'http://localhost/stripit';
-	
-	/**
-	* Title of the website
-	*/
-	var $title = 'Stripit';
-
-	/**
-	* Short description
-	*
-	* Is displayed as a subtitle
-	*/
-	var $description = 'Ce serait mieux avec des strips libres !';
-
-	/**
-	* Default language of the interface
-	*/
-	var $language = 'fr-FR';
-
-	/**
-	* Webmaster's name
-	*/
-	var $webmaster = 'inconnu';
-	
-	/**
-	* Webmaster's email
-	*/
-	var $email = 'inconnu';
-
-	/**
-	* Forum URL
-	*/
-	var $forum = 'http://perdu.com';
-
-	/**
-	* Use PunBB integration ?
-	*/
-	var $use_punbb = false;
-
-	/**
-	* PunBB's forum ID to use for strips comment
-	*/
-	var $punbb_forum_id = '1';
-
-	/**
-	* PunBB's forum ID to use for word of the day
-	*/
-	var $punbb_wotd_id = '1';
-
-	/**
-	* PunBB's forum max length for the message
-	*/
-	var $punbb_max_length = 60;
-
-	/**
-	* Additional URL
-	*/
-	var $see_also = array(
-		'Geekscottes' => 'http://www.nojhan.net/geekscottes'
-	);
-
-	/**
-	* Shop URL
-	*/
-	var $shop = 'http://perdu.com';
-	
-	/**
-	 * Use cache feature?
-	 */
-	var $use_cache = true;
-	
-	/**
-	 * HTML template folder
-	 */
-	var $template_folder = './template';
-	
-	/**
-	 * Name of HTML template
-	 */
-	var $template_name = 'default';
-	
-	/**
-	 * Name of RSS template
-	 */
-	var $template_rss = 'rss';
-
-	/**
-	* Number of thumbnails per gallery page
-	*/
-	var $thumbs_per_page = 5;
-
-	/**
-	 * Size of the thumbnails
-	 */
-	var $thumb_size = 200;
-}
-
-?>
-
diff --git a/conf/lang/en-EN.php b/conf/lang/en-EN.php
deleted file mode 100644
index e6c0a34..0000000
--- a/conf/lang/en-EN.php
+++ /dev/null
@@ -1,36 +0,0 @@
- $value) {
-			$this->$key = $value;
-		}
-	}
-}
-?>
diff --git a/conf/lang/fr-FR.php b/conf/lang/fr-FR.php
deleted file mode 100644
index 00cc2e5..0000000
--- a/conf/lang/fr-FR.php
+++ /dev/null
@@ -1,37 +0,0 @@
- $value) {
-			$this->$key = $value;
-
-		}
-	}
-}
-?>
diff --git a/feed_merge.php b/feed_merge.php
deleted file mode 100644
index 6c1d231..0000000
--- a/feed_merge.php
+++ /dev/null
@@ -1,74 +0,0 @@
- $entry->title(),
-				'link' => $entry->link(),
-				'guid' => $entry->guid(),
-				'lastUpdate' =>strtotime($entry->pubDate()),
-				'description' => $entry->description(),
-				'pubDate' => $entry->pubDate(),
-			);
-			// TODO ajouter les champs qui manquent
-			// TODO vérifier que les deux RSS n'aient pas de champs différents
-		}
-	return $entries;
-}
-
-// sorting operator
-function cmpEntries ($a , $b) {
-	$a_time = $a['lastUpdate'];
-	$b_time = $b['lastUpdate'];
-	if ($a_time == $b_time) {
-		return 0;
-	}
-	return ($a_time > $b_time) ? -1 : 1;
-}
-
-
-
-
-
-// Feed for merge
-$merged_feed = array (
-	'title'     => 'Test merge feed',
-	'link'         => 'http://localhost/~nojhan/feed_merge.php',
-	'charset'   => 'UTF-8', 
-	'entries'     => array (),
-);
-
-
-$feed1 = loadFeed( "http://www.nojhan.net/geekscottes/rss.php?limit=10" );
-$feed2 = loadFeed( "http://www.nojhan.net/geekscottes/forum/extern.php?action=new&fid=5&type=rss" );
-
-$merged_feed['entries'] = array_merge (
-	getEntriesAsArray ($feed1), 
-	getEntriesAsArray ($feed2)
-);
-
-usort ($merged_feed['entries'], 'cmpEntries');
-
-// 	create an object
-$rssFeedFromArray = Zend_Feed::importArray($merged_feed, 'rss');
-
-// outut
-$rssFeedFromArray->send();
-
-?>
diff --git a/gallery.php b/gallery.php
index 5659fb2..5b32766 100644
--- a/gallery.php
+++ b/gallery.php
@@ -1,206 +1,85 @@
 
-* @license http://www.gnu.org/licenses/gpl.html GPL
-* @copyright 2007 Johann Dréo
-*
-* @package stripit 
-*/
+ * Strip-It HTML gallery
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GPL
+ * @copyright 2009 Johann Dréo, Simon Leblanc
+ * @author Johann "nojhan" Dréo 
+ * @author Simon Leblanc 
+ * @package stripit
+ */
 
-set_include_path(get_include_path() . PATH_SEPARATOR . getcwd());
 
-require_once 'strip_manager.php';
-require_once 'conf/configuration.php';
+require_once 'inc/functions.php';
 
-// hack for passing objects by values instead of reference under PHP5 (but not PHP4)
-// damn clone keyword !
-if (version_compare(phpversion(), '5.0') < 0) {
-	eval('function clone($object) {return $object;}');
+//Launch Cron
+Cron::exec();
+
+// Obtain the Config
+$config = new Config();
+
+// Obtain the cache
+$cache = Cache::getCache();
+
+// Obtain the id asked
+$last = Cache::getLastId();
+
+// Obtain the limit
+if (isset($_GET['limit']) && is_numeric($_GET['limit'])) {
+  $limit = $_GET['limit'];
+
+  if ($limit <= 0 || $limit > $last + 1) {
+    $limit = Config::getThumbsPerPage();
+  }
+} else {
+  $limit = Config::getThumbsPerPage();
 }
 
-/**
-* Gallery manager
-*/
-class gallery_manager
-{
-	/**
-	* Items list
-	* @var array
-	*/
-	var $items_list = array();
-
-	/**
-	* Configuration
-	* @var array
-	*/
-	var $general;
-
-	/** 
-	* Base url for asking for strips in gallery
-	* @var string
-	*/
-	var $nav_base_url = "gallery.php?page=";
-	
-	/**
-	 * Strip manager object
-	 * @var	object
-	 */
-	var $strip_manager;
-
-	/**
-	* Constructor
-	* 
-	* Use the {@link strip_manager} to do the stuff, and convert date from the iso8601 to RFC822 format.
-	*/
-	function gallery_manager() {
-
-		$this->strip_manager = new strip_manager();
-
-		$this->general = $this->strip_manager->general;
-		$this->lang = $this->strip_manager->lang;	
-	
-	}
-
-	/**
-	* Generate the Gallery output with the template engine.
-	*
-	* @access	public
-	*/
-	function generate() {
-		// if one want to use punbb as forum
-		if( $this->general->use_punbb ) {
-			// get the word of the day
-			$fh = fopen( $this->general->forum.'/extern.php?action=new&show=1&fid='.$this->general->punbb_wotd_id, 'r');
-
-			if (!$fh) {
-				$this->general->wotd = $this->lang->forum_error;
-			} else {
-				$this->general->wotd = stream_get_contents($fh);
-				fclose($fh);
-			}
-		}
-		
-		if ($this->general->use_cache) {
-			// use the cache system
-			include_once 'cache.class.php';
-			$cache = new STRIPIT_Cache();
-			
-			// limit the number of strips in Gallery
-			$limit = $this->general->thumbs_per_page;
-			if (isset($_GET['limit']) && is_numeric($_GET['limit'])) {
-				$limit = $_GET['limit'];
-
-				if ($limit <= 0) {
-					$limit = $this->general->thumbs_per_page;
-				}
-			}
-			// the page to view
-			if( !isset($_GET['page']) || $_GET['page'] == '' || !is_numeric($_GET['page']) ) {
-				$page = 0;
-			} else {
-				$page = $_GET['page'];
-
-				if ($page < 0) {
-					$page = 0;
-				}
-			}
-			
-			$template_folder	= $this->general->template_folder.'/'.$this->general->template_name;
-			$strip_folder		= $this->strip_manager->strips_path;
-			$cache_folder		= $this->strip_manager->options['compileDir'];
-			$language		= $this->general->language;
-			if ($cache->init('gallery-'.$limit.'-'.$page, $template_folder, $this->general->template_name, $strip_folder, $cache_folder, $language)) {
-				if ($cache->isInCache()) {
-					// the page is in cache, show cache
-					$cache->getCache();
-				} else {
-					// the cache must be re-generate
-					ob_start();
-					
-					$this->_genGallery();
-					
-					$cache_data = ob_get_contents();
-					ob_end_clean();
-					$cache->putInCache($cache_data);
-					$cache->getCache();
-				}
-			} else {
-				// error in the configuration cache, don't use the cache system
-				$this->_genGallery();
-			}
-		} else {
-			// don't use the cache system
-			$this->_genGallery();
-		}
-		
-	}
-	
-	
-	/**
-	 * Generate the HTML template of gallery
-	 *
-	 * @access	private
-	 */
-	function _genGallery()
-	{
-		$this->strip_manager->strips_list_get();
-		
-		// limit the number of strips in Gallery
-		$limit = $this->general->thumbs_per_page;
-		if (isset($_GET['limit']) && is_numeric($_GET['limit'])) {
-			$limit = $_GET['limit'];
-
-			if ($limit <= 0) {
-				$limit = $this->general->thumbs_per_page;
-			}
-		}
-
-		$lastpage = intval(($this->strip_manager->strips_count - 1) / $limit);
-
-		if( !isset($_GET['page']) || $_GET['page'] == '' || !is_numeric($_GET['page']) ) {
-			$element_asked = 0;
-		} else {
-			$element_asked = $_GET['page'];
-
-			if ($element_asked < 0) {
-				$element_asked = 0;
-			}
-
-			if ($element_asked > $lastpage) {
-				$element_asked = $lastpage;
-			}
-		}
-
-		$start = $element_asked * $limit;
-		$end = $start + $limit;
-
-		if ($end > $this->strip_manager->strips_count) {
-			$end = $this->strip_manager->strips_count;
-		}
-
-		for( $i = $start; $i < $end;  $i++ ) {
-			$this->strip_manager->strip_info_get( $i );
-			
-			$this->items_list[] = clone($this->strip_manager); // hack for php4/5 compat
-		}
-
-		$this->nav_prev = $this->nav_base_url . ($element_asked - 1) . "&limit=$limit" . $this->strip_manager->nav_lang_url;
-		$this->nav_next = $this->nav_base_url . ($element_asked + 1) . "&limit=$limit" . $this->strip_manager->nav_lang_url;
-		$this->nav_last = $this->nav_base_url . $lastpage . "&limit=$limit" . $this->strip_manager->nav_lang_url;
-		$this->nav_first = $this->nav_base_url . "&limit=$limit" . $this->strip_manager->nav_lang_url;
-		
-		$output = new HTML_Template_Flexy($this->strip_manager->options);
-		$output->compile($this->general->template_folder.'/'.$this->general->template_name.'/gallery_template.html');
-		$output->outputObject($this,$this->items_list);
-	}
+// Obtain the page
+$last_page = (int) ($last / $limit);
+if (isset($_GET['page']) && is_numeric($_GET['page'])) {
+  $page = $_GET['page'];
+  
+  if ($page < 0 || $page > $last_page) {
+    $page = $last_page;
+  }
+} else {
+  $page = $last_page;
 }
 
-/**
-* Instanciation and output.
-*/
-$gallerym = new gallery_manager();
-$gallerym->generate();
+// Obtain the list of strip
+$begin = $page * $limit;
+$end = $begin + $limit;
 
-?>
\ No newline at end of file
+if ($end > $last + 1) {
+  $end = $last + 1;
+}
+
+for ($i = $begin; $i < $end; $i++) {
+  $list[$i] = Cache::getStrip($i);
+}
+
+// Obtain the language
+if (isset($_GET['lang'])) {
+  $lang = $_GET['lang'];
+} else {
+  $lang = Config::getLanguage();
+}
+$lang = getLang($lang);
+
+// Obtain the navigation
+list($nav_first, $nav_last, $nav_prev, $nav_next) = getNavigationGallery($page, $last_page, $limit, $lang);
+$nav_lang = '';
+if (isset($_GET['lang'])) {
+  $nav_lang = 'lang='.$lang.'&';
+}
+$nav_img = Config::getUrl().'/'.Config::getIndex().'?'.$nav_lang.'id=';
+
+// If necessary, obtain the forum data
+$wotd = '';
+if (Config::getUseFluxbb() === true) {
+  $wotd = Forum::getWotd($lang);
+}
+
+// show the template
+include_once Config::getTemplateFolder().'/'.Config::getTemplateName().'/gallery.html';
diff --git a/inc/class/abstractlang.class.php b/inc/class/abstractlang.class.php
new file mode 100644
index 0000000..6dab91f
--- /dev/null
+++ b/inc/class/abstractlang.class.php
@@ -0,0 +1,75 @@
+language; }
+  
+  /*
+   All getter for access to protected attributes
+   */
+  public function getSuivant() { return $this->suivant; }
+  public function getPrecedent() { return $this->precedent; }
+  public function getPremier() { return $this->premier; }
+  public function getDernier() { return $this->dernier; }
+  public function getAccueil() { return $this->accueil; }
+  public function getContact() { return $this->contact; }
+  public function getRss() { return $this->rss; }
+  public function getLicence() { return $this->licence; }
+  public function getBoutique() { return $this->boutique; }
+  public function getTeeshirt() { return $this->teeshirt; }
+  public function getPropulse() { return $this->propulse; }
+  public function getDescstrip() { return $this->descstrip; }
+  public function getSource() { return $this->source; }
+  public function getSourceRss() { return $this->source_rss; }
+  public function getSeeAlso() { return $this->see_also; }
+  public function getForum() { return $this->forum; }
+  public function getForumNew() { return $this->forum_new; }
+  public function getForumView() { return $this->forum_view; }
+  public function getForumError() { return $this->forum_error; }
+  public function getComments() { return $this->comments; }
+  public function getWotd() { return $this->wotd; }
+  public function getGallery() { return $this->gallery; }
+}
\ No newline at end of file
diff --git a/inc/class/cache.class.php b/inc/class/cache.class.php
new file mode 100644
index 0000000..242e70e
--- /dev/null
+++ b/inc/class/cache.class.php
@@ -0,0 +1,153 @@
+isDot() === true || $file->isFile() === false) {
+        continue;
+      }
+      
+      $extension = pathinfo($file->getPathname(), PATHINFO_EXTENSION);
+      if (strtolower($extension) !== 'svg') {
+        continue;
+      }
+      
+     $files[$file->getBasename()] = $file->getMTime();
+    }
+    
+    // We must use ksort for sort the array by filename (the DirectoryIterator have his self sort :-)), in PHP 5.3, we can use GlobIterator directly
+    ksort($files);
+    
+    $cache = ' $time) {
+      $cache .= '"'.str_replace('"', '\"', $name).'" => '.$time.', ';
+    }
+    $cache .= ');';
+    
+    // if file wrinting fail, throw an Exception
+    if (file_put_contents(self::$filename, $cache) === false) {
+      throw new Exception('Impossible to write in the cache file : "'.self::$filename.'"');
+    }
+  }
+  
+  
+  /**
+   * Return the last numeric key of the cache array
+   *
+   * @access public
+   * @static
+   * @return integer the last numeric key of the cache array
+   */
+  public static function getLastId()
+  {
+    if (self::$cache === null) {
+      self::getCache();
+    }
+    
+    return (count(self::$cache) - 1);
+  }
+  
+  
+  /**
+   * Return the strip with the numeric key of the cache
+   *
+   * @access public
+   * @static
+   * @return Strip The strip wanted
+   */
+  public static function getStrip($id = 0)
+  {
+    $last_id = self::getLastId();
+    
+    // if the id of strip isn't valid, return a new strip
+    if ($last_id === -1 || $id > $last_id) {
+      return new Strip();
+    }
+    
+    $cache_iterator = new ArrayIterator(self::$cache);
+    $cache_iterator->seek($id);
+    
+    return Strip::getCache($cache_iterator->key());
+  }
+}
\ No newline at end of file
diff --git a/inc/class/cron.class.php b/inc/class/cron.class.php
new file mode 100644
index 0000000..a7dc11c
--- /dev/null
+++ b/inc/class/cron.class.php
@@ -0,0 +1,42 @@
+getForumError();
+    } else {
+      $text = utf8_encode($text);
+    }
+    return $text;
+  }
+  
+  
+  /**
+   * Return the word of the day in RSS format
+   *
+   * @param Lang $lang The language object is use when the connection with forum isn't ok
+   * @access public
+   * @static
+   * @return string The word of the day or an error message if the connection with forum isn't ok
+   */
+  public static function getWotdRss($lang)
+  {
+    $url = Config::getFluxbbForum().'/extern.php?action=new&show=1&type=last_rss&fid='.Config::getFluxbbWotdId();
+    $text = file_get_contents($url);
+    
+    if ($text === false) {
+      $text = $lang->getForumError();
+    } else {
+      $text = utf8_encode($text);
+    }
+    return $text;
+  }
+  
+  
+  /**
+   * Return the comments for a strip
+   *
+   * @param Strip $strip The strip for which we want obtain the comments
+   * @param Lang $lang The language object is use when the connection with forum isn't ok
+   * @access public
+   * @static
+   * @return string The comments for the strip or an error message if the connection with forum isn't ok
+   */
+  public static function getComments(Strip $strip, Lang $lang)
+  {
+    $url = Config::getFluxbbForum().'/extern.php?action=topic&ttitle='.urlencode($strip->getTitle()).'&max_subject_length='.Config::getFluxbbMaxLength();
+    $text = file_get_contents($url);
+    
+    if ($text === false) {
+      $text = $lang->getForumError();
+    } else {
+      $text = utf8_encode($text);
+    }
+    return $text;
+  }
+}
\ No newline at end of file
diff --git a/inc/class/strip.class.php b/inc/class/strip.class.php
new file mode 100644
index 0000000..cf9bf73
--- /dev/null
+++ b/inc/class/strip.class.php
@@ -0,0 +1,495 @@
+init($file);
+      if ($parse === true) {
+        $this->parse();
+      }
+    }
+  }
+  
+  
+  /**
+   * Initialize the object with the filename
+   *
+   * @param string $file The filename of the string (only filename, not the path)
+   * @access protected
+   */
+  protected function init($file)
+  {
+    $this->setFilename($file);
+  }
+  
+  
+  /**
+   * Parse the SVG file and call the setter of the object
+   *
+   * @access protected
+   * @todo look for resolv the problem with the namespace which change with Inkscape
+   */
+  protected function parse()
+  {
+    $dom = new DOMDocument();
+    $dom->load(Config::getStripFolder().'/'.$this->getFilename());
+    
+    // define the namespace use
+    $ns_cc    = 'http://creativecommons.org/ns#';
+    $ns_oldcc = 'http://web.resource.org/cc/'; // Fucking inkscape, they change namespace in rev 20897, we must control the old if the new return null
+    $ns_dc    = 'http://purl.org/dc/elements/1.1/';
+    $ns_rdf   = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
+    
+    // The license
+    $license = $this->searchDomItem($dom, $ns_cc, 'license', true, $ns_rdf, 'resource');
+    if ($licence === null) {
+      $license = $this->searchDomItem($dom, $ns_oldcc, 'license', true, $ns_rdf, 'resource');
+    }
+    $this->setLicense($license);
+    
+    // The title
+    $title = $this->searchDomItem($dom, $ns_dc, 'title', false, null, null, array($ns_cc => 'Work'));
+    if ($title === null) {
+      $title = $this->searchDomItem($dom, $ns_dc, 'title', false, null, null, array($ns_oldcc => 'Work'));
+    }
+    $this->setTitle($title);
+    
+    // The author
+    $author = $this->searchDomItem($dom, $ns_dc, 'title', false, null, null, array($ns_cc => 'Agent', $ns_dc => 'creator'));
+    if ($author === null) {
+      $author = $this->searchDomItem($dom, $ns_dc, 'title', false, null, null, array($ns_oldcc => 'Agent', $ns_dc => 'creator'));
+    }
+    $this->setAuthor($author);
+    
+    // The date
+    $date = $this->searchDomItem($dom, $ns_dc, 'date');
+    $this->setDate($date);
+    
+    // The description
+    $description = $this->searchDomItem($dom, $ns_dc, 'description');
+    $this->setDescription($description);
+    
+    // The text
+    $text = $this->searchDomItem($dom, '*', 'tspan');
+    $this->setText($text);
+  }
+  
+  
+  /**
+   * Create the cache for this strip
+   *
+   * @access protected
+   * @throws Exception If the Strip object isn't initalize an exception is throwed
+   * @throws Exception If the cache can't be writing an exception is throwed
+   */
+  protected function setCache()
+  {
+    if ($this->filename === null) {
+      throw new Exception('This object isn\'t initialized!');
+    }
+    
+    $cache = serialize($this);
+    if (file_put_contents(Config::getCacheFolder().'/'.$this->getFilename().'.php', $cache) === 0) {
+      throw new Exception('The cache file "'.Config::getCacheFolder.'/'.$this->getFilename().'.php" can\'t be writing');
+    }
+  }
+  
+  
+  /**
+   * Get the cache and return the Strip object cached
+   *
+   * @param string $file The filename of the strip (only the filename and not the path)
+   * @access public
+   * @static
+   * @throws Exception If the cache doesn't exist, an exception is throwed
+   * @return Strip The Strip object related with the cache
+   */
+  public static function getCache($file)
+  {
+    $strip_tmp = new Strip($file);
+    $cache_file = Config::getCacheFolder().'/'.$strip_tmp->getFilename().'.php';
+    if (file_exists($cache_file) === false) {
+      throw new Exception('The cache for "'.$file.'" doesn\'t exist!');
+    }
+    
+    $strip = file_get_contents($cache_file);
+    
+    return unserialize($strip);
+  }
+  
+  
+  /**
+   * Create cache for one or all necessary strips
+   *
+   * @param string $file The filename of the strip for which we must regenerate cache or null if we must regenerate all cache file necessary
+   * @access public
+   * @static
+   */
+  public static function createCache($file = null)
+  {
+    if ($file === null) {
+      // we must regenerate all SVG cache
+      $actual_cache = Cache::getCache();
+      
+      Cache::setCache();
+      
+      $new_cache = Cache::getCache();
+      
+      $compare = array_diff($new_cache, $actual_cache);
+      foreach ($compare as $filename => $time) {
+        $strip = new Strip($filename, true);
+        $strip->setCache();
+      }
+    } else {
+      $strip = new Strip($file, true);
+      $strip->setCache();
+    }
+  }
+  
+  
+  /**
+   * Return the filename of the SVG
+   * @return string the filename of the SVG
+   * @access public
+   */
+  public function getFilename() { return $this->filename; }
+  
+  /**
+   * Return the license
+   * @return string the license
+   * @access public
+   */
+  public function getLicense() { return $this->license; }
+  
+  /**
+   * Return the title
+   * @return string the title
+   * @access public
+   */
+  public function getTitle() { return $this->title; }
+  
+  /**
+   * Return the author
+   * @return string the author
+   * @access public
+   */
+  public function getAuthor() { return $this->author; }
+  
+  /**
+   * Return the date of creation
+   * @param boolean $rfc True if you want the date in the RFC format, False if you want the date like in the SVG
+   * @return string the date of creation
+   * @access public
+   */
+  public function getDate($rfc = false) { return ($rfc === true) ? date('r', strtotime($this->date)) : $this->date; }
+  
+  /**
+   * Return the description
+   * @return string the description
+   * @access public
+   */
+  public function getDescription() { return $this->description; }
+  
+  /**
+   * Return the text
+   * @return string the text
+   * @access public
+   */
+  public function getText() { return htmlentities($this->text, ENT_QUOTES, 'UTF-8'); }
+  
+  /**
+   * Return the size of the SVG
+   * @return integer the size of the SVG
+   * @access public
+   */
+  public function getSourceSize() { return $this->source_size; }
+  
+  
+  /**
+   * Return the path with filename of of the strip in PNG format
+   * @return string the path with filename of file of the strip in PNG format
+   * @access public
+   */
+  public function getFilenamePng()
+  {
+    $filename = pathinfo(Config::getStripFolder().'/'.$this->getFilename(), PATHINFO_FILENAME);
+    return Config::getStripFolder().'/'.$filename.'.png';
+  }
+  
+  
+  /**
+   * Return the path with filename of file of the strip in SVG format
+   * @return string the path with filename of file of the strip in SVG format
+   * @access public
+   */
+  public function getFilenameSrc()
+  {
+    return Config::getStripFolder().'/'.$this->getFilename();
+  }
+  
+  
+  /**
+   * Return the path with filename of thumbnail of the strip in PNG format
+   * @return string the path with filename of thumbnail of the strip in PNG format
+   * @access public
+   */
+  public function getThumbSrc()
+  {
+    $original = $this->getFilenamePng();
+    $dest = Config::getThumbFolder().'/'.pathinfo(Config::getStripFolder().'/'.$this->getFilename(), PATHINFO_FILENAME).'.png';
+    
+    if (createThumb($original, $dest) === true) {
+      return $dest;
+    } else {
+      return $original;
+    }
+  }
+  
+  /**
+   * Setter for the filename
+   * @param string $file The filename
+   * @throws Exception If the file doesn't exist an exception is throwed
+   * @access public
+   */
+  protected function setFilename($file)
+  {
+    if (file_exists(Config::getStripFolder().'/'.$file) === false) {
+      throw new Exception('The filename "'.$file.'" isn\'t a valid file!');
+    }
+    
+    $this->filename = $file;
+    $this->setSourceSize();
+  }
+  
+  /**
+   * Setter for the license
+   * @param string $file The license
+   * @access public
+   */
+  public function setLicense($license)
+  {
+    if (is_string($license) === false) {
+      $license = (string) $license;
+    }
+    
+    $this->license = $license;
+  }
+  
+  /**
+   * Setter for the license
+   * @param string $file The license
+   * @access public
+   */
+  protected function setTitle($title)
+  {
+    if (is_string($title) === false) {
+      $title = (string) $title;
+    }
+    
+    $this->title = $title;
+  }
+  
+  /**
+   * Setter for the author
+   * @param string $file The author
+   * @access public
+   */
+  protected function setAuthor($author)
+  {
+    if (is_string($author) === false) {
+      $author = (string) $author;
+    }
+    
+    $this->author = $author;
+  }
+  
+  /**
+   * Setter for the date
+   * @param string $file The date
+   * @access public
+   */
+  protected function setDate($date)
+  {
+    if (is_string($date) === false) {
+      $date = (string) $date;
+    }
+    
+    $this->date = $date;
+  }
+  
+  /**
+   * Setter for the description
+   * @param string $file The description
+   * @access public
+   */
+  protected function setDescription($description)
+  {
+    if (is_string($description) === false) {
+      $description = (string) $description;
+    }
+    
+    $this->description = $description;
+  }
+  
+  /**
+   * Setter for the text
+   * @param string $file The text
+   * @access public
+   */
+  protected function setText($text)
+  {
+    if (is_string($text) === false) {
+      $text = (string) $text;
+    }
+    
+    $this->text = $text;
+  }
+  
+  /**
+   * Setter for the source_size
+   * @access public
+   */
+  protected function setSourceSize()
+  {
+    $this->source_size = filesize($this->getFilenameSrc());
+  }
+  
+  
+  /**
+   * Return the value search in the SVG
+   *
+   * @param DOMDocument $dom The DOMDocument object of the SVG
+   * @param string $namespace The namespace where you want search
+   * @param string $item The item search
+   * @param boolean $search_attribute True if you want the value of an attribute, False if you want the content
+   * @param string $attribute_namespace The namespace of the attribute where you want search
+   * @param string $attribute_name The attribute search
+   * @param array $parents The list (namespace and item) of the parent for get the value of only one item which exist more than one
+   * @access public
+   * @return string The value of your search (null if doesn't exist)
+   * @todo decompose this method to have one method by type of search
+   */
+  protected function searchDomItem(DOMDocument $dom, $namespace, $item, $search_attribute = false, $attribute_namespace = null, $attribute_name = null, $parents = array())
+  {
+    $items = $dom->getElementsByTagNameNS($namespace, $item);
+    
+    if ($items->length === 1) {
+      // there are only one element with $namespace and $item
+      $item = $items->item(0);
+      
+      if ($search_attribute === false) {
+        // we want the content of node
+        return $item->textContent;
+      } else {
+        // we want the value of one attribute
+        $attributes = $item->attributes;
+        if ($attributes === null) {
+          return null;
+        }
+        
+        $attr = $attributes->getNamedItemNS($attribute_namespace, $attribute_name);
+        return $attr->nodeValue;
+      }
+    } elseif ($items->length > 1) {
+      if (count($parents) === 0) {
+        // we want a return with all content of the elements
+        $return_value = '';
+        for ($i = 0; $i < $items->length; $i++) {
+          $return_value .= $items->item($i)->textContent.' ';
+        }
+        
+        return $return_value;
+      } else {
+        // we want check the parent for return only the content of one element
+        for ($i = 0; $i < $items->length; $i++) {
+          $item = $items->item($i);
+          $parent = $item->parentNode;
+          foreach ($parents as $namespace => $local_name) {
+            if ($parent->namespaceURI !== $namespace || $parent->localName !== $local_name) {
+              continue 2;
+            }
+            $parent = $parent->parentNode;
+          }
+          
+          return $item->textContent;
+        }
+        
+        return null;
+      }
+    } else {
+      return null;
+    }
+  }
+}
\ No newline at end of file
diff --git a/inc/config/config.php b/inc/config/config.php
new file mode 100644
index 0000000..69567a4
--- /dev/null
+++ b/inc/config/config.php
@@ -0,0 +1,239 @@
+ 'http://www.nojhan.net/geekscottes',
+  );
+  
+  /**
+   * Shop URL
+   * @var string
+   * @access protected
+   */
+  protected static $shop               = 'http://perdu.com';
+  
+  
+  /**
+   * The cache directory path
+   * @var string
+   * @access protected
+   */
+  protected static $cache_folder       = './cache';
+  
+  /**
+   * The filename of cache for list of strip
+   * @var string
+   * @access protected
+   */
+  protected static $cache_filename     = 'cache.php';
+  
+  /**
+   * The cache time before regenerated the new cache
+   * @var integer
+   * @access protected
+   */
+  protected static $cache_time         = 1440; // in minutes : 1440 = 1 day
+  
+  
+  /**
+   * HTML template folder
+   * @var string
+   * @access protected
+   */
+  protected static $template_folder    = './inc/tpl';
+  
+  /**
+   * Name of HTML template
+   * @var string
+   * @access protected
+   */
+  protected static $template_name      = 'lego';
+  
+  /**
+   * Name of RSS template
+   * @var string
+   * @access protected
+   */
+  protected static $template_rss       = 'rss';
+  
+  
+  /**
+   * Diretory path for the strips
+   * @var string
+   * @access protected
+   */
+  protected static $strip_folder       = './strips';
+  
+  
+  /**
+   * Number of thumbnails per gallery page
+   * @var integer
+   * @access protected
+   */
+  protected static $thumbs_per_page    = 5;
+  
+  /**
+   * Size of the thumbnails
+   * @var integer
+   * @access protected
+   */
+  protected static $thumb_size         = 200;
+  
+  /**
+   * Diretory path for the strips thumbnails
+   * @var string
+   * @access protected
+   */
+  protected static $thumb_folder       = './strips/th';
+  
+  
+  /**
+   * Use FluxBB integration ?
+   * @var boolean
+   * @access protected
+   */
+  protected static $use_fluxbb         = true;
+  
+  /**
+   * FluxBB's forum ID to use for strips comment
+   * @var integer
+   * @access protected
+   */
+  protected static $fluxbb_forum_id    = 1;
+  
+  /**
+   * FluxBB's forum ID to use for word of the day
+   * @var integer
+   * @access protected
+   */
+  protected static $fluxbb_wotd_id     = 2;
+  
+  /**
+   * FluxBB's forum max length for the message
+   * @var integer
+   * @access protected
+   */
+  protected static $fluxbb_max_length  = 128;
+  
+  /**
+   * Forum URL
+   * @var string
+   * @access protected
+   */
+  protected static $fluxbb_forum       = 'http://localhost/projects/fluxbb-1.2.21/upload';
+  
+  
+  /*
+   All getter for access to protected attributes
+   */
+  public static function getVersion() { return self::$version; }
+  public static function getUrl() { return self::$url; }
+  public static function getIndex() { return self::$index; }
+  public static function getGallery() { return self::$gallery; }
+  public static function getTitle() { return self::$title; }
+  public static function getLanguage() { return self::$language; }
+  public static function getDescription() { return self::$description; }
+  public static function getWebmaster() { return self::$webmaster; }
+  public static function getEmail() { return self::$email; }
+  
+  public static function getSeeAlso() { return self::$see_also; }
+  public static function getShop() { return self::$shop; }
+  
+  public static function getUseCache() { return self::$use_cache; }
+  public static function getCacheFolder() { return self::$cache_folder; }
+  public static function getCacheFilename() { return self::$cache_filename; }
+  public static function getCacheTime() { return self::$cache_time; }
+  
+  public static function getTemplateFolder() { return self::$template_folder; }
+  public static function getTemplateName() { return self::$template_name; }
+  public static function getTemplateRss() { return self::$template_rss; }
+  
+  public static function getStripFolder() { return self::$strip_folder; }
+  
+  public static function getThumbsPerPage() { return self::$thumbs_per_page; }
+  public static function getThumbSize() { return self::$thumb_size; }
+  public static function getThumbFolder() { return self::$thumb_folder; }
+  
+  public static function getUseFluxbb() { return self::$use_fluxbb; }
+  public static function getFluxbbForumId() { return self::$fluxbb_forum_id; }
+  public static function getFluxbbWotdId() { return self::$fluxbb_wotd_id; }
+  public static function getFluxbbMaxLength() { return self::$fluxbb_max_length; }
+  public static function getFluxbbForum() { return self::$fluxbb_forum; }
+}
diff --git a/inc/functions.php b/inc/functions.php
new file mode 100644
index 0000000..05ab0e4
--- /dev/null
+++ b/inc/functions.php
@@ -0,0 +1,194 @@
+ $width) {
+    $rapport = $size[0] / $width;
+    $height = $size[1] / $rapport;
+  } else {
+    $width = $size[0];
+    $height = $size[1];
+  }
+  
+  $img_src = imagecreatefrompng($src);
+  $img_dst = imagecreatetruecolor($width, $height);
+  
+  // Preserve alpha transparency : thank crash 
+  imagecolortransparent($img_dst, imagecolorallocate($img_dst, 0, 0, 0));
+  imagealphablending($img_dst, false);
+  imagesavealpha($img_dst, true);
+  
+  $res = imagecopyresampled($img_dst, $img_src, 0, 0, 0, 0, $width, $height, $size[0], $size[1]);
+  if (!$res) {
+    return false;
+  }
+  
+  $res = imagepng($img_dst, $dest);
+  if (!$res) {
+    return false;
+  }
+  
+  return true;
+}
\ No newline at end of file
diff --git a/inc/lang/en-EN.php b/inc/lang/en-EN.php
new file mode 100644
index 0000000..c95eaf7
--- /dev/null
+++ b/inc/lang/en-EN.php
@@ -0,0 +1,44 @@
+language     = 'en-EN';
+    
+    $this->suivant      = "Next";
+    $this->precedent    = "Previous";
+    $this->premier      = "First";
+    $this->dernier      = "Last";
+    $this->accueil      = "Index";
+    $this->contact      = "Contact";
+    $this->rss          = "RSS";
+    $this->licence      = "License";
+    $this->boutique     = "Shop";
+    $this->teeshirt     = "(t-shirts & gifts)";
+    $this->propulse     = "Powered by";
+    $this->descstrip    = "free software for SVG webcomics management";
+    $this->source       = "source (SVG)";
+    $this->source_rss   = "Click on the image for the source file in the SVG format.";
+    $this->see_also     = "See also:";
+    $this->forum        = "Forum";
+    $this->forum_new    = "New";
+    $this->forum_view   = "Show the topic";
+    $this->forum_error  = "Cannot read comments";
+    $this->comments     = "Comments";
+    $this->wotd         = "Word of the day";
+    $this->gallery      = "Gallery";
+  }
+}
\ No newline at end of file
diff --git a/inc/lang/fr-FR.php b/inc/lang/fr-FR.php
new file mode 100644
index 0000000..a82ec80
--- /dev/null
+++ b/inc/lang/fr-FR.php
@@ -0,0 +1,44 @@
+language     = 'fr-FR';
+    
+    $this->suivant      = "Suivant";
+    $this->precedent    = "Précedent";
+    $this->premier      = "Premier";
+    $this->dernier      = "Dernier";
+    $this->accueil      = "Accueil";
+    $this->contact      = "Contact";
+    $this->rss          = "RSS";
+    $this->licence      = "Licence";
+    $this->boutique     = "Boutique";
+    $this->teeshirt     = "(t-shirts & cadeaux)";
+    $this->propulse     = "Propulsé par";
+    $this->descstrip    = "logiciel libre de gestion de webcomics en SVG";
+    $this->source       = "source (SVG)";
+    $this->source_rss   = "Cliquez sur l'image pour le fichier source au format SVG.";
+    $this->see_also     = "Voir aussi :";
+    $this->forum        = "Forum";
+    $this->forum_new    = "Nouveau";
+    $this->forum_view   = "Voir le sujet";
+    $this->forum_error  = "Impossible de lire les commentaires";
+    $this->comments     = "Commentaires";
+    $this->wotd         = "Dernier message du webmaster";
+    $this->gallery      = "Galerie";
+  }
+}
\ No newline at end of file
diff --git a/inc/tpl/functions.js b/inc/tpl/functions.js
new file mode 100644
index 0000000..5fa419f
--- /dev/null
+++ b/inc/tpl/functions.js
@@ -0,0 +1,126 @@
+var actual_id = 0;
+
+/**
+ * Create an Ajax instance
+ *
+ * @return  XMLHttpRequest Object     The XMLHttpRequest object 
+ */
+function instance_ajax()
+{
+  var xhr;
+  
+  try {
+    xhr = new ActiveXObject('Msxml2.XMLHTTP');
+  } catch (e) {
+    try {
+      xhr = new ActiveXObject('Microsoft.XMLHTTP');
+    } catch (e2) {
+      try {
+        xhr = new XMLHttpRequest();
+      } catch (e3) {
+        xhr = false;
+      }
+    }
+  }
+
+  return xhr;
+}
+
+
+function getStrip(link)
+{
+  var xhr = instance_ajax();
+  var page = link.href + '&ajax=1';
+  
+  xhr.onreadystatechange = function() {
+    if(xhr.readyState == 4 && xhr.status == 200) {
+      var docXml, item, nb_item, i, id, value, select, icone;
+      
+      docXml  = xhr.responseXML.documentElement;
+      item    = docXml.getElementsByTagName('item');
+      nb_item = item.length;
+      for(i = 0; i < nb_item; i++){
+        // image url
+        id = item[i].getAttribute('id');
+        value = getNodeValue(item[i]);
+        switch (id) {
+          case 'png':
+            document.getElementById('strip').src = value;
+            break;
+          case 'text':
+            document.getElementById('strip').alt = value;
+            break;
+          case 'title':
+            document.getElementById('title').innerHTML = '« ' + value + ' »';
+            break;
+          case 'description':
+            document.getElementById('description').innerHTML = value;
+            break;
+          case 'comments':
+            document.getElementById('comments').innerHTML = value;
+            break;
+          case 'author':
+            document.getElementById('author').innerHTML = '© ' + value;
+            break;
+          case 'date':
+            document.getElementById('date').innerHTML = value;
+            break;
+          case 'license':
+            document.getElementById('link_license').innerHTML = value;
+            document.getElementById('link_license').href = value;
+            break;
+          case 'source':
+            document.getElementById('link_source').href = value;
+            break;
+          case 'navfirst':
+            document.getElementById('t_navfirst').href = value;
+            document.getElementById('b_navfirst').href = value;
+            break;
+          case 'navprev':
+            document.getElementById('t_navprev').href = value;
+            document.getElementById('b_navprev').href = value;
+            break;
+          case 'navnext':
+            document.getElementById('t_navnext').href = value;
+            document.getElementById('b_navnext').href = value;
+            break;
+          case 'navlast':
+            document.getElementById('t_navlast').href = value;
+            document.getElementById('b_navlast').href = value;
+            break;
+          case 'navgallery':
+            document.getElementById('t_navgallery').href = value;
+            document.getElementById('b_navgallery').href = value;
+            break;
+          case 'nav_forum_post':
+            document.getElementById('nav_forum_post').href = value;
+            break;
+          case 'nav_forum_view':
+            document.getElementById('nav_forum_view').href = value;
+            break;
+        }
+      }
+    }
+  }
+  
+  xhr.open('GET', page, true);
+  xhr.send(null);
+}
+
+/**
+ * Fonction permettant de récupèrer la valeur d'un noeud XML quelque soit le navigateur
+ *
+ * @param   DOM Object    node      Le noeud sur lequel on travaille
+ */
+function getNodeValue(node)
+{
+  var return_value = null;
+  
+  return_value = node.textContent;
+  if(return_value == undefined){
+    // On a à faire à un IE, donc on fait le boulot de Microsoft : on le debugge
+    return_value = node.firstChild.nodeValue;
+  }
+  
+  return return_value;
+}
diff --git a/template/lego/design/gradient_blue.png b/inc/tpl/lego/design/gradient_blue.png
similarity index 100%
rename from template/lego/design/gradient_blue.png
rename to inc/tpl/lego/design/gradient_blue.png
diff --git a/template/lego/design/gradient_gray.png b/inc/tpl/lego/design/gradient_gray.png
similarity index 100%
rename from template/lego/design/gradient_gray.png
rename to inc/tpl/lego/design/gradient_gray.png
diff --git a/template/lego/design/gradient_gray_small.png b/inc/tpl/lego/design/gradient_gray_small.png
similarity index 100%
rename from template/lego/design/gradient_gray_small.png
rename to inc/tpl/lego/design/gradient_gray_small.png
diff --git a/template/lego/design/gradient_gray_small_2.png b/inc/tpl/lego/design/gradient_gray_small_2.png
similarity index 100%
rename from template/lego/design/gradient_gray_small_2.png
rename to inc/tpl/lego/design/gradient_gray_small_2.png
diff --git a/template/lego/design/gradient_orange.png b/inc/tpl/lego/design/gradient_orange.png
similarity index 100%
rename from template/lego/design/gradient_orange.png
rename to inc/tpl/lego/design/gradient_orange.png
diff --git a/template/lego/design/gradient_purple.png b/inc/tpl/lego/design/gradient_purple.png
similarity index 100%
rename from template/lego/design/gradient_purple.png
rename to inc/tpl/lego/design/gradient_purple.png
diff --git a/template/lego/design/rss_big.png b/inc/tpl/lego/design/rss_big.png
similarity index 100%
rename from template/lego/design/rss_big.png
rename to inc/tpl/lego/design/rss_big.png
diff --git a/inc/tpl/lego/gallery.html b/inc/tpl/lego/gallery.html
new file mode 100644
index 0000000..a854380
--- /dev/null
+++ b/inc/tpl/lego/gallery.html
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+  <?php echo $config->getTitle() ?>
+
+  
+  
+  
+  
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+   $strip) { ?>
+  
    
+        
+            
+         
+  
    
+  
+
    
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/template/lego/style.css b/inc/tpl/lego/style.css
similarity index 100%
rename from template/lego/style.css
rename to inc/tpl/lego/style.css
diff --git a/inc/tpl/lego/template.html b/inc/tpl/lego/template.html
new file mode 100644
index 0000000..6bc2717
--- /dev/null
+++ b/inc/tpl/lego/template.html
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+  <?php echo $config->getTitle() ?> - <?php echo $strip->getTitle() ?>
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+  <?php echo $strip->getText() ?>
+
+  
+  
+    
+    
+    
+  
+  
+  
+    
+  
+
+  
    
+        
    « getTitle() ?> »
    
+        
    getDescription() ?>
    
+        		
+        getComments() ?> :
+        
      
+          
+        
    
+        getForumNew() ?> | 
+        getForumView() ?>
+    
    
+        
    © getAuthor() ?>
    
+        
    getDate() ?>
    
+        
    getSource() ?>
    
+        
    getLicence() ?> : getLicense() ?>
    
+    
    
+
+
    
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/inc/tpl/rss/template.rss b/inc/tpl/rss/template.rss
new file mode 100644
index 0000000..4e8c618
--- /dev/null
+++ b/inc/tpl/rss/template.rss
@@ -0,0 +1,47 @@
+
+
+
+  
+  <![CDATA[<?php echo $config->getTitle() ?>]]>
+  getUrl() ?>
+  1440
+  getDescription() ?>]]>
+  
+  http://stripit.sourceforge.net
+  
+    getUrl() ?>/favicon.png
+    <![CDATA[<?php echo $config->getTitle() ?>]]>
+    getUrl() ?>
+  
+  getEmail() ?> (getWebmaster() ?>)]]>
+  getEmail() ?> (getWebmaster() ?>)]]>
+  getWebmaster() ?>]]>
+  http://cyber.law.harvard.edu/rss/
+  
+   $strip) { ?>
+  
+    <![CDATA[<?php echo $strip->getTitle() ?>]]>
+    
+    getUrl().'/'.$strip->getFilenameSrc() ?>
+    
+    getDate(true) ?>
+    getAuthor() ?>]]>
+    getSourceRss() ?>" href="">
+      <?php echo $strip->getText() ?>
+            
+            
    getdescription() ?>
    
+            
    getlicence() ?> : getLicense() ?>
    
+
+            getForum() ?>
+            getBoutique() ?>
+    ]]>
+  
+  
+
+
+
\ No newline at end of file
diff --git a/inc/tpl/stripit.xml b/inc/tpl/stripit.xml
new file mode 100644
index 0000000..2e3993a
--- /dev/null
+++ b/inc/tpl/stripit.xml
@@ -0,0 +1,19 @@
+' ?>
+
+  getFilenamePng() ?>]]>
+  getText() ?>]]>
+  getTitle() ?>]]>
+  getDescription() ?>]]>
+  ]]>
+  getAuthor() ?>]]>
+  getDate() ?>]]>
+  getLicense() ?>]]>
+  getFilenameSrc() ?>]]>
+  ]]>
+  ]]>
+  ]]>
+  ]]>
+  ]]>
+  ]]>
+  ]]>
+
\ No newline at end of file
diff --git a/index.php b/index.php
index dcaf617..67aba0a 100644
--- a/index.php
+++ b/index.php
@@ -1,21 +1,68 @@
 
-* @license http://www.gnu.org/licenses/gpl.html GPL
-* @copyright 2007 Johann Dréo
-*
-* @package stripit 
-*/
+ * Strip-It HTML index
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GPL
+ * @copyright 2009 Johann Dréo, Simon Leblanc
+ * @author Johann "nojhan" Dréo 
+ * @author Simon Leblanc 
+ * @package stripit
+ */
 
 
-set_include_path(get_include_path() . PATH_SEPARATOR . getcwd());
+require_once 'inc/functions.php';
 
-require_once 'strip_manager.php';
+//Launch Cron
+Cron::exec();
 
-// instanciation and ouput
-$ctl = new strip_manager;
-$ctl->generate();
+// Obtain the Config
+$config = new Config();
 
-?>
+// Obtain the cache
+$cache = Cache::getCache();
+
+// Obtain the id asked
+$last = Cache::getLastId();
+
+if (isset($_GET['id']) === true && is_numeric($id) === true) {
+  $id = $_GET['id'];
+  
+  if ($id > $last || $id < 0) {
+    $id = $last;
+  }
+} else {
+  $id = $last;
+}
+
+// Obtain the strip
+$strip = Cache::getStrip($id);
+
+// Obtain the language
+if (isset($_GET['lang'])) {
+  $lang = $_GET['lang'];
+} else {
+  $lang = Config::getLanguage();
+}
+$lang = getLang($lang);
+
+// Obtain the navigation
+list($nav_first, $nav_last, $nav_prev, $nav_next, $nav_gallery) = getNavigation($id, $last, $lang);
+$nav_forum_post = Config::getFluxbbForum().'/post.php?ttitle='.urlencode($strip->getTitle()).'&fid='.Config::getFluxbbForumId();
+$nav_forum_view = Config::getFluxbbForum().'/redirect_stripit.php?ttitle='.urlencode($strip->getTitle());
+
+// If necessary, obtain the forum data
+$comments = '';
+$wotd = '';
+if (Config::getUseFluxbb() === true) {
+  $comments = Forum::getComments($strip, $lang);
+  $wotd = Forum::getWotd($lang);
+}
+
+// show the template
+if (isset($_GET['ajax']) === true) {
+  // it's an ajax call, return an XML
+  header('Content-type: text/xml');
+  include_once Config::getTemplateFolder().'/stripit.xml';
+} else {
+  include_once Config::getTemplateFolder().'/'.Config::getTemplateName().'/template.html';
+}
\ No newline at end of file
diff --git a/punbb-1.2.15_extern.php b/punbb-1.2.15_extern.php
deleted file mode 100644
index 606e3dd..0000000
--- a/punbb-1.2.15_extern.php
+++ /dev/null
@@ -1,395 +0,0 @@
-
-
-    Show board statistics:
-    
-
-  And finally some examples using extern.php to output an RSS 0.91
-  feed.
-
-    Output the 15 most recently active topics:
-    http://host.com/extern.php?action=active&type=RSS
-
-    Output the 15 newest topics from forum with ID=2:
-    http://host.com/extern.php?action=active&type=RSS&fid=2
-
-  Below you will find some variables you can edit to tailor the
-  scripts behaviour to your needs.
-
-
-/***********************************************************************/
-
-// The maximum number of topics that will be displayed
-$show_max_topics = 60;
-
-// The length at which topic subjects will be truncated (for HTML output)
-$max_subject_length = 30;
-
-/***********************************************************************/
-
-// DO NOT EDIT ANYTHING BELOW THIS LINE! (unless you know what you are doing)
-
-
-define('PUN_ROOT', './');
-@include PUN_ROOT.'config.php';
-
-// If PUN isn't defined, config.php is missing or corrupt
-if (!defined('PUN'))
-	exit('The file \'config.php\' doesn\'t exist or is corrupt. Please run install.php to install PunBB first.');
-
-
-// Make sure PHP reports all errors except E_NOTICE
-error_reporting(E_ALL ^ E_NOTICE);
-
-// Turn off magic_quotes_runtime
-set_magic_quotes_runtime(0);
-
-
-// Load the functions script
-require PUN_ROOT.'include/functions.php';
-
-// Load DB abstraction layer and try to connect
-require PUN_ROOT.'include/dblayer/common_db.php';
-
-// Load cached config
-@include PUN_ROOT.'cache/cache_config.php';
-if (!defined('PUN_CONFIG_LOADED'))
-{
-    require PUN_ROOT.'include/cache.php';
-    generate_config_cache();
-    require PUN_ROOT.'cache/cache_config.php';
-}
-
-// Make sure we (guests) have permission to read the forums
-$result = $db->query('SELECT g_read_board FROM '.$db->prefix.'groups WHERE g_id=3') or error('Unable to fetch group info', __FILE__, __LINE__, $db->error());
-if ($db->result($result) == '0')
-	exit('No permission');
-
-
-// Attempt to load the common language file
-@include PUN_ROOT.'lang/'.$pun_config['o_default_lang'].'/common.php';
-if (!isset($lang_common))
-	exit('There is no valid language pack \''.$pun_config['o_default_lang'].'\' installed. Please reinstall a language of that name.');
-
-// Check if we are to display a maintenance message
-if ($pun_config['o_maintenance'] && !defined('PUN_TURN_OFF_MAINT'))
-	maintenance_message();
-
-if (!isset($_GET['action']))
-	exit('No parameters supplied. See extern.php for instructions.');
-
-
-//
-// Converts the CDATA end sequence ]]> into ]]>
-//
-function escape_cdata($str)
-{
-	return str_replace(']]>', ']]>', $str);
-}
-
-
-//
-// Show recent discussions
-//
-if ($_GET['action'] == 'active' || $_GET['action'] == 'new')
-{
-	$order_by = ($_GET['action'] == 'active') ? 't.last_post' : 't.posted';
-	$forum_sql = '';
-
-	// Was any specific forum ID's supplied?
-	if (isset($_GET['fid']) && $_GET['fid'] != '')
-	{
-		$fids = explode(',', trim($_GET['fid']));
-		$fids = array_map('intval', $fids);
-
-		if (!empty($fids))
-			$forum_sql = ' AND f.id IN('.implode(',', $fids).')';
-	}
-
-	// Any forum ID's to exclude?
-	if (isset($_GET['nfid']) && $_GET['nfid'] != '')
-	{
-		$nfids = explode(',', trim($_GET['nfid']));
-		$nfids = array_map('intval', $nfids);
-
-		if (!empty($nfids))
-			$forum_sql = ' AND f.id NOT IN('.implode(',', $nfids).')';
-	}
-
-	// Should we output this as RSS?
-	if (isset($_GET['type']) && strtoupper($_GET['type']) == 'RSS')
-	{
-		$rss_description = ($_GET['action'] == 'active') ? $lang_common['RSS Desc Active'] : $lang_common['RSS Desc New'];
-		$url_action = ($_GET['action'] == 'active') ? '&action=new' : '';
-
-		// Send XML/no cache headers
-		header('Content-Type: text/xml');
-		header('Expires: '.gmdate('D, d M Y H:i:s').' GMT');
-		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-		header('Pragma: public');
-
-		// It's time for some syndication!
-		echo ''."\r\n";
-		echo ''."\r\n";
-		echo ''."\r\n";
-		echo ''."\r\n";
-		echo "\t".''.pun_htmlspecialchars($pun_config['o_board_title']).''."\r\n";
-		echo "\t".''.$pun_config['o_base_url'].'/'."\r\n";
-		echo "\t".''.pun_htmlspecialchars($rss_description.' '.$pun_config['o_board_title']).''."\r\n";
-		echo "\t".'en-us'."\r\n";
-
-		// Fetch 15 topics
-		$result = $db->query('SELECT t.id, t.poster, t.subject, t.posted, t.last_post, f.id AS fid, f.forum_name FROM '.$db->prefix.'topics AS t INNER JOIN '.$db->prefix.'forums AS f ON f.id=t.forum_id LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id=f.id AND fp.group_id=3) WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND t.moved_to IS NULL'.$forum_sql.' ORDER BY '.$order_by.' DESC LIMIT 15') or error('Unable to fetch topic list', __FILE__, __LINE__, $db->error());
-
-		while ($cur_topic = $db->fetch_assoc($result))
-		{
-			if ($pun_config['o_censoring'] == '1')
-				$cur_topic['subject'] = censor_words($cur_topic['subject']);
-
-			echo "\t".''."\r\n";
-			echo "\t\t".''.pun_htmlspecialchars($cur_topic['subject']).''."\r\n";
-			echo "\t\t".''.$pun_config['o_base_url'].'/viewtopic.php?id='.$cur_topic['id'].$url_action.''."\r\n";
-			echo "\t\t".''.$cur_topic['forum_name'].'
    '."\r\n".$lang_common['Author'].': '.$cur_topic['poster'].'
    '."\r\n".$lang_common['Posted'].': '.date('r', $cur_topic['posted']).'
    '."\r\n".$lang_common['Last post'].': '.date('r', $cur_topic['last_post'])).']]>    '."\r\n";
-			echo "\t".'    '."\r\n";
-		}
-
-		echo '    '."\r\n";
-		echo '    ';
-	}
-
-
-	// Output regular HTML
-	else
-	{
-		$show = isset($_GET['show']) ? intval($_GET['show']) : 15;
-		if ($show < 1 || $show > 50)
-			$show = 15;
-
-		// Fetch $show topics
-		$result = $db->query('SELECT t.id, t.subject FROM '.$db->prefix.'topics AS t INNER JOIN '.$db->prefix.'forums AS f ON f.id=t.forum_id LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id=f.id AND fp.group_id=3) WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND t.moved_to IS NULL'.$forum_sql.' ORDER BY '.$order_by.' DESC LIMIT '.$show) or error('Unable to fetch topic list', __FILE__, __LINE__, $db->error());
-
-		while ($cur_topic = $db->fetch_assoc($result))
-		{
-			if ($pun_config['o_censoring'] == '1')
-				$cur_topic['subject'] = censor_words($cur_topic['subject']);
-
-			if (pun_strlen($cur_topic['subject']) > $max_subject_length)
-				$subject_truncated = pun_htmlspecialchars(trim(substr($cur_topic['subject'], 0, ($max_subject_length-5)))).' …';
-			else
-				$subject_truncated = pun_htmlspecialchars($cur_topic['subject']);
-
-			echo '
  • '.$subject_truncated.'
    • '."\n";
-		}
-	}
-
-	return;
-}
-
-
-//
-// Show users online
-//
-else if ($_GET['action'] == 'online' || $_GET['action'] == 'online_full')
-{
-	// Load the index.php language file
-	require PUN_ROOT.'lang/'.$pun_config['o_default_lang'].'/index.php';
-	
-	// Fetch users online info and generate strings for output
-	$num_guests = $num_users = 0;
-	$users = array();
-	$result = $db->query('SELECT user_id, ident FROM '.$db->prefix.'online WHERE idle=0 ORDER BY ident', true) or error('Unable to fetch online list', __FILE__, __LINE__, $db->error());
-
-	while ($pun_user_online = $db->fetch_assoc($result))
-	{
-		if ($pun_user_online['user_id'] > 1)
-		{
-			$users[] = ''.pun_htmlspecialchars($pun_user_online['ident']).'';
-			++$num_users;
-		}
-		else
-			++$num_guests;
-	}
-
-	echo $lang_index['Guests online'].': '.$num_guests.'
    ';
-
-	if ($_GET['action'] == 'online_full')
-		echo $lang_index['Users online'].': '.implode(', ', $users).'
    ';
-	else
-		echo $lang_index['Users online'].': '.$num_users.'
    ';
-
-	return;
-}
-
-
-//
-// Show board statistics
-//
-else if ($_GET['action'] == 'stats')
-{
-	// Load the index.php language file
-	require PUN_ROOT.'lang/'.$pun_config['o_default_lang'].'/index.php';
-
-	// Collect some statistics from the database
-	$result = $db->query('SELECT COUNT(id)-1 FROM '.$db->prefix.'users') or error('Unable to fetch total user count', __FILE__, __LINE__, $db->error());
-	$stats['total_users'] = $db->result($result);
-
-	$result = $db->query('SELECT id, username FROM '.$db->prefix.'users ORDER BY registered DESC LIMIT 1') or error('Unable to fetch newest registered user', __FILE__, __LINE__, $db->error());
-	$stats['last_user'] = $db->fetch_assoc($result);
-
-	$result = $db->query('SELECT SUM(num_topics), SUM(num_posts) FROM '.$db->prefix.'forums') or error('Unable to fetch topic/post count', __FILE__, __LINE__, $db->error());
-	list($stats['total_topics'], $stats['total_posts']) = $db->fetch_row($result);
-
-	echo $lang_index['No of users'].': '.$stats['total_users'].'
    ';
-	echo $lang_index['Newest user'].': '.pun_htmlspecialchars($stats['last_user']['username']).'
    ';
-	echo $lang_index['No of topics'].': '.$stats['total_topics'].'
    ';
-	echo $lang_index['No of posts'].': '.$stats['total_posts'];
-
-	return;
-}
-
-/***********************************************************************/
-/* PATCH TOPIC EXPORT                                                  */
-/***********************************************************************/
-
-else if ( $_GET['action'] == 'topic') {
-
-
-	$sql = '';
-
-	if( isset( $_GET['ttitle']) ) {
-		$sql = 'SELECT
-				t.id
-			FROM
-				'.$db->prefix.'topics AS t
-			WHERE
-				t.subject="'.utf8_decode($_GET['ttitle']).'"
-			
-		;';
-
-		$res = $db->query( $sql );
-		$_tid = $db->fetch_row( $res );
-		$_GET['tid'] = intval( $_tid[0] );
-		
-	}
-
-	if( $_GET['tid'] > 0 ) {
-
-		$sql = 'SELECT
-				p.id, p.message, p.poster
-			FROM
-				'.$db->prefix.'posts AS p
-			WHERE
-				p.topic_id='.$_GET['tid'].'
-			ORDER BY
-				p.edited
-			;';
-
-		$result = $db->query($sql) or error('Unable to fetch posts list', __FILE__, __LINE__, $db->error());
-                
-                if (isset($_GET['max_subject_length']) && is_numeric($_GET['max_subject_length']) && !empty($_GET['max_subject_length'])) {
-                    $max_subject_length = $_GET['max_subject_length'];
-                }
-
-		while ($cur_post = $db->fetch_assoc($result))
-		{
-			if ($pun_config['o_censoring'] == '1')
-				$cur_post['message'] = censor_words($cur_post['message']);
-
-			$subject_truncated = $cur_post['message'];
-			if (pun_strlen($cur_post['message']) > $max_subject_length) {
-				$subject_truncated = pun_htmlspecialchars(trim(substr($cur_post['message'], 0, ($max_subject_length-5)))).' …';
-			} else {
-				$subject_truncated = pun_htmlspecialchars($cur_post['message']);
-			}
-
-			echo '
  • '.$subject_truncated.'
    • ';
-		}
-	} else {
-		// No error for a nice show in strip-it :-)
-		//error( 'Unable to fetch posts list, you must ask for a topic id or title', __FILE__, __LINE__, $db->error() );
-	}
-
-}
-
-/***********************************************************************/
-
-else
-		exit('Bad request');
diff --git a/punbb-1.2.15_post.php b/punbb-1.2.15_post.php
deleted file mode 100644
index 939cb38..0000000
--- a/punbb-1.2.15_post.php
+++ /dev/null
@@ -1,652 +0,0 @@
-prefix.'topics AS t 
-			INNER JOIN 
-			'.$db->prefix.'forums AS f 
-			ON f.id=t.forum_id 
-			LEFT JOIN 
-			'.$db->prefix.'forum_perms AS fp 
-			ON (fp.forum_id=f.id 
-			AND 
-			fp.group_id='.$pun_user['g_id'].') 
-		WHERE 
-			(fp.read_forum IS NULL OR fp.read_forum=1) 
-			AND 
-			t.subject="'.$ttitle.'"';
-	
-	$result = $db->query($sql) or error('Unable to fetch forum info', __FILE__, __LINE__, $db->error());
-	
-	$ids = $db->fetch_row($result);
-	
-	//var_dump( $ids );
-	
-	// fetch only one value
-	$_tid = intval( $ids[0] );
-	
-	
-	// if the topic exists, consider that tid is set, else, consider that this is a new one
-	if( $_tid ) {
-		$tid = $_tid;
-		
-		// the topic exists, so that we must not consider the forum
-		$fid = 0;
-	} else {
-		
-		// the topic does not exists, but as a title is suggested, we put it in the entry field
-		$_POST['req_subject'] = $ttitle;
-		$subject = $ttitle;
-	}
-}
-
-/************************************************************************/
-		
-if ($tid < 1 && $fid < 1 || $tid > 0 && $fid > 0)
-	message($lang_common['Bad request']);
-
-// Fetch some info about the topic and/or the forum
-if ($tid)
-	$result = $db->query('SELECT f.id, f.forum_name, f.moderators, f.redirect_url, fp.post_replies, fp.post_topics, t.subject, t.closed FROM '.$db->prefix.'topics AS t INNER JOIN '.$db->prefix.'forums AS f ON f.id=t.forum_id LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id=f.id AND fp.group_id='.$pun_user['g_id'].') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND t.id='.$tid) or error('Unable to fetch forum info', __FILE__, __LINE__, $db->error());
-else
-	$result = $db->query('SELECT f.id, f.forum_name, f.moderators, f.redirect_url, fp.post_replies, fp.post_topics FROM '.$db->prefix.'forums AS f LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id=f.id AND fp.group_id='.$pun_user['g_id'].') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND f.id='.$fid) or error('Unable to fetch forum info', __FILE__, __LINE__, $db->error());
-
-if (!$db->num_rows($result))
-	message($lang_common['Bad request']);
-
-$cur_posting = $db->fetch_assoc($result);
-
-// Is someone trying to post into a redirect forum?
-if ($cur_posting['redirect_url'] != '')
-	message($lang_common['Bad request']);
-
-// Sort out who the moderators are and if we are currently a moderator (or an admin)
-$mods_array = ($cur_posting['moderators'] != '') ? unserialize($cur_posting['moderators']) : array();
-$is_admmod = ($pun_user['g_id'] == PUN_ADMIN || ($pun_user['g_id'] == PUN_MOD && array_key_exists($pun_user['username'], $mods_array))) ? true : false;
-
-// Do we have permission to post?
-if ((($tid && (($cur_posting['post_replies'] == '' && $pun_user['g_post_replies'] == '0') || $cur_posting['post_replies'] == '0')) ||
-	($fid && (($cur_posting['post_topics'] == '' && $pun_user['g_post_topics'] == '0') || $cur_posting['post_topics'] == '0')) ||
-	(isset($cur_posting['closed']) && $cur_posting['closed'] == '1')) &&
-	!$is_admmod)
-	message($lang_common['No permission']);
-
-// Load the post.php language file
-require PUN_ROOT.'lang/'.$pun_user['language'].'/post.php';
-
-// Start with a clean slate
-$errors = array();
-
-
-// Did someone just hit "Submit" or "Preview"?
-if (isset($_POST['form_sent']))
-{
-	// Make sure form_user is correct
-	if (($pun_user['is_guest'] && $_POST['form_user'] != 'Guest') || (!$pun_user['is_guest'] && $_POST['form_user'] != $pun_user['username']))
-		message($lang_common['Bad request']);
-
-	// Flood protection
-	if (!$pun_user['is_guest'] && !isset($_POST['preview']) && $pun_user['last_post'] != '' && (time() - $pun_user['last_post']) < $pun_user['g_post_flood'])
-		$errors[] = $lang_post['Flood start'].' '.$pun_user['g_post_flood'].' '.$lang_post['flood end'];
-
-	// If it's a new topic
-	if ($fid)
-	{
-		$subject = pun_trim($_POST['req_subject']);
-
-		if ($subject == '')
-			$errors[] = $lang_post['No subject'];
-		else if (pun_strlen($subject) > 70)
-			$errors[] = $lang_post['Too long subject'];
-		else if ($pun_config['p_subject_all_caps'] == '0' && strtoupper($subject) == $subject && $pun_user['g_id'] > PUN_MOD)
-			$subject = ucwords(strtolower($subject));
-	}
-
-	// If the user is logged in we get the username and e-mail from $pun_user
-	if (!$pun_user['is_guest'])
-	{
-		$username = $pun_user['username'];
-		$email = $pun_user['email'];
-	}
-	// Otherwise it should be in $_POST
-	else
-	{
-		$username = trim($_POST['req_username']);
-		$email = strtolower(trim(($pun_config['p_force_guest_email'] == '1') ? $_POST['req_email'] : $_POST['email']));
-
-		// Load the register.php/profile.php language files
-		require PUN_ROOT.'lang/'.$pun_user['language'].'/prof_reg.php';
-		require PUN_ROOT.'lang/'.$pun_user['language'].'/register.php';
-
-		// It's a guest, so we have to validate the username
-		if (strlen($username) < 2)
-			$errors[] = $lang_prof_reg['Username too short'];
-		else if (!strcasecmp($username, 'Guest') || !strcasecmp($username, $lang_common['Guest']))
-			$errors[] = $lang_prof_reg['Username guest'];
-		else if (preg_match('/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/', $username))
-			$errors[] = $lang_prof_reg['Username IP'];
-
-		if ((strpos($username, '[') !== false || strpos($username, ']') !== false) && strpos($username, '\'') !== false && strpos($username, '"') !== false)
-			$errors[] = $lang_prof_reg['Username reserved chars'];
-		if (preg_match('#\[b\]|\[/b\]|\[u\]|\[/u\]|\[i\]|\[/i\]|\[color|\[/color\]|\[quote\]|\[quote=|\[/quote\]|\[code\]|\[/code\]|\[img\]|\[/img\]|\[url|\[/url\]|\[email|\[/email\]#i', $username))
-			$errors[] = $lang_prof_reg['Username BBCode'];
-
-		// Check username for any censored words
-		$temp = censor_words($username);
-		if ($temp != $username)
-			$errors[] = $lang_register['Username censor'];
-
-		// Check that the username (or a too similar username) is not already registered
-		$result = $db->query('SELECT username FROM '.$db->prefix.'users WHERE (username=\''.$db->escape($username).'\' OR username=\''.$db->escape(preg_replace('/[^\w]/', '', $username)).'\') AND id>1') or error('Unable to fetch user info', __FILE__, __LINE__, $db->error());
-		if ($db->num_rows($result))
-		{
-			$busy = $db->result($result);
-			$errors[] = $lang_register['Username dupe 1'].' '.pun_htmlspecialchars($busy).'. '.$lang_register['Username dupe 2'];
-		}
-
-		if ($pun_config['p_force_guest_email'] == '1' || $email != '')
-		{
-			require PUN_ROOT.'include/email.php';
-			if (!is_valid_email($email))
-				$errors[] = $lang_common['Invalid e-mail'];
-		}
-	}
-
-	// Clean up message from POST
-	$message = pun_linebreaks(pun_trim($_POST['req_message']));
-
-	if ($message == '')
-		$errors[] = $lang_post['No message'];
-	else if (strlen($message) > 65535)
-		$errors[] = $lang_post['Too long message'];
-	else if ($pun_config['p_message_all_caps'] == '0' && strtoupper($message) == $message && $pun_user['g_id'] > PUN_MOD)
-		$message = ucwords(strtolower($message));
-
-	// Validate BBCode syntax
-	if ($pun_config['p_message_bbcode'] == '1' && strpos($message, '[') !== false && strpos($message, ']') !== false)
-	{
-		require PUN_ROOT.'include/parser.php';
-		$message = preparse_bbcode($message, $errors);
-	}
-
-
-	require PUN_ROOT.'include/search_idx.php';
-
-	$hide_smilies = isset($_POST['hide_smilies']) ? 1 : 0;
-	$subscribe = isset($_POST['subscribe']) ? 1 : 0;
-
-	$now = time();
-
-	// Did everything go according to plan?
-	if (empty($errors) && !isset($_POST['preview']))
-	{
-		// If it's a reply
-		if ($tid)
-		{
-			if (!$pun_user['is_guest'])
-			{
-				// Insert the new post
-				$db->query('INSERT INTO '.$db->prefix.'posts (poster, poster_id, poster_ip, message, hide_smilies, posted, topic_id) VALUES(\''.$db->escape($username).'\', '.$pun_user['id'].', \''.get_remote_address().'\', \''.$db->escape($message).'\', \''.$hide_smilies.'\', '.$now.', '.$tid.')') or error('Unable to create post', __FILE__, __LINE__, $db->error());
-				$new_pid = $db->insert_id();
-
-				// To subscribe or not to subscribe, that ...
-				if ($pun_config['o_subscriptions'] == '1' && $subscribe)
-				{
-					$result = $db->query('SELECT 1 FROM '.$db->prefix.'subscriptions WHERE user_id='.$pun_user['id'].' AND topic_id='.$tid) or error('Unable to fetch subscription info', __FILE__, __LINE__, $db->error());
-					if (!$db->num_rows($result))
-						$db->query('INSERT INTO '.$db->prefix.'subscriptions (user_id, topic_id) VALUES('.$pun_user['id'].' ,'.$tid.')') or error('Unable to add subscription', __FILE__, __LINE__, $db->error());
-				}
-			}
-			else
-			{
-				// It's a guest. Insert the new post
-				$email_sql = ($pun_config['p_force_guest_email'] == '1' || $email != '') ? '\''.$email.'\'' : 'NULL';
-				$db->query('INSERT INTO '.$db->prefix.'posts (poster, poster_ip, poster_email, message, hide_smilies, posted, topic_id) VALUES(\''.$db->escape($username).'\', \''.get_remote_address().'\', '.$email_sql.', \''.$db->escape($message).'\', \''.$hide_smilies.'\', '.$now.', '.$tid.')') or error('Unable to create post', __FILE__, __LINE__, $db->error());
-				$new_pid = $db->insert_id();
-			}
-
-			// Count number of replies in the topic
-			$result = $db->query('SELECT COUNT(id) FROM '.$db->prefix.'posts WHERE topic_id='.$tid) or error('Unable to fetch post count for topic', __FILE__, __LINE__, $db->error());
-			$num_replies = $db->result($result, 0) - 1;
-
-			// Update topic
-			$db->query('UPDATE '.$db->prefix.'topics SET num_replies='.$num_replies.', last_post='.$now.', last_post_id='.$new_pid.', last_poster=\''.$db->escape($username).'\' WHERE id='.$tid) or error('Unable to update topic', __FILE__, __LINE__, $db->error());
-
-			update_search_index('post', $new_pid, $message);
-
-			update_forum($cur_posting['id']);
-
-			// Should we send out notifications?
-			if ($pun_config['o_subscriptions'] == '1')
-			{
-				// Get the post time for the previous post in this topic
-				$result = $db->query('SELECT posted FROM '.$db->prefix.'posts WHERE topic_id='.$tid.' ORDER BY id DESC LIMIT 1, 1') or error('Unable to fetch post info', __FILE__, __LINE__, $db->error());
-				$previous_post_time = $db->result($result);
-
-				// Get any subscribed users that should be notified (banned users are excluded)
-				$result = $db->query('SELECT u.id, u.email, u.notify_with_post, u.language FROM '.$db->prefix.'users AS u INNER JOIN '.$db->prefix.'subscriptions AS s ON u.id=s.user_id LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id='.$cur_posting['id'].' AND fp.group_id=u.group_id) LEFT JOIN '.$db->prefix.'online AS o ON u.id=o.user_id LEFT JOIN '.$db->prefix.'bans AS b ON u.username=b.username WHERE b.username IS NULL AND COALESCE(o.logged, u.last_visit)>'.$previous_post_time.' AND (fp.read_forum IS NULL OR fp.read_forum=1) AND s.topic_id='.$tid.' AND u.id!='.intval($pun_user['id'])) or error('Unable to fetch subscription info', __FILE__, __LINE__, $db->error());
-				if ($db->num_rows($result))
-				{
-					require_once PUN_ROOT.'include/email.php';
-
-					$notification_emails = array();
-
-					// Loop through subscribed users and send e-mails
-					while ($cur_subscriber = $db->fetch_assoc($result))
-					{
-						// Is the subscription e-mail for $cur_subscriber['language'] cached or not?
-						if (!isset($notification_emails[$cur_subscriber['language']]))
-						{
-							if (file_exists(PUN_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl'))
-							{
-								// Load the "new reply" template
-								$mail_tpl = trim(file_get_contents(PUN_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_reply.tpl'));
-
-								// Load the "new reply full" template (with post included)
-								$mail_tpl_full = trim(file_get_contents(PUN_ROOT.'lang/'.$cur_subscriber['language'].'/mail_templates/new_reply_full.tpl'));
-
-								// The first row contains the subject (it also starts with "Subject:")
-								$first_crlf = strpos($mail_tpl, "\n");
-								$mail_subject = trim(substr($mail_tpl, 8, $first_crlf-8));
-								$mail_message = trim(substr($mail_tpl, $first_crlf));
-
-								$first_crlf = strpos($mail_tpl_full, "\n");
-								$mail_subject_full = trim(substr($mail_tpl_full, 8, $first_crlf-8));
-								$mail_message_full = trim(substr($mail_tpl_full, $first_crlf));
-
-								$mail_subject = str_replace('', '\''.$cur_posting['subject'].'\'', $mail_subject);
-								$mail_message = str_replace('', '\''.$cur_posting['subject'].'\'', $mail_message);
-								$mail_message = str_replace('', $username, $mail_message);
-								$mail_message = str_replace('', $pun_config['o_base_url'].'/viewtopic.php?pid='.$new_pid.'#p'.$new_pid, $mail_message);
-								$mail_message = str_replace('', $pun_config['o_base_url'].'/misc.php?unsubscribe='.$tid, $mail_message);
-								$mail_message = str_replace('', $pun_config['o_board_title'].' '.$lang_common['Mailer'], $mail_message);
-
-								$mail_subject_full = str_replace('', '\''.$cur_posting['subject'].'\'', $mail_subject_full);
-								$mail_message_full = str_replace('', '\''.$cur_posting['subject'].'\'', $mail_message_full);
-								$mail_message_full = str_replace('', $username, $mail_message_full);
-								$mail_message_full = str_replace('', $message, $mail_message_full);
-								$mail_message_full = str_replace('', $pun_config['o_base_url'].'/viewtopic.php?pid='.$new_pid.'#p'.$new_pid, $mail_message_full);
-								$mail_message_full = str_replace('', $pun_config['o_base_url'].'/misc.php?unsubscribe='.$tid, $mail_message_full);
-								$mail_message_full = str_replace('', $pun_config['o_board_title'].' '.$lang_common['Mailer'], $mail_message_full);
-
-								$notification_emails[$cur_subscriber['language']][0] = $mail_subject;
-								$notification_emails[$cur_subscriber['language']][1] = $mail_message;
-								$notification_emails[$cur_subscriber['language']][2] = $mail_subject_full;
-								$notification_emails[$cur_subscriber['language']][3] = $mail_message_full;
-
-								$mail_subject = $mail_message = $mail_subject_full = $mail_message_full = null;
-							}
-						}
-
-						// We have to double check here because the templates could be missing
-						if (isset($notification_emails[$cur_subscriber['language']]))
-						{
-							if ($cur_subscriber['notify_with_post'] == '0')
-								pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][0], $notification_emails[$cur_subscriber['language']][1]);
-							else
-								pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][2], $notification_emails[$cur_subscriber['language']][3]);
-						}
-					}
-				}
-			}
-		}
-		// If it's a new topic
-		else if ($fid)
-		{
-			// Create the topic
-			$db->query('INSERT INTO '.$db->prefix.'topics (poster, subject, posted, last_post, last_poster, forum_id) VALUES(\''.$db->escape($username).'\', \''.$db->escape($subject).'\', '.$now.', '.$now.', \''.$db->escape($username).'\', '.$fid.')') or error('Unable to create topic', __FILE__, __LINE__, $db->error());
-			$new_tid = $db->insert_id();
-
-			if (!$pun_user['is_guest'])
-			{
-				// To subscribe or not to subscribe, that ...
-				if ($pun_config['o_subscriptions'] == '1' && (isset($_POST['subscribe']) && $_POST['subscribe'] == '1'))
-					$db->query('INSERT INTO '.$db->prefix.'subscriptions (user_id, topic_id) VALUES('.$pun_user['id'].' ,'.$new_tid.')') or error('Unable to add subscription', __FILE__, __LINE__, $db->error());
-
-				// Create the post ("topic post")
-				$db->query('INSERT INTO '.$db->prefix.'posts (poster, poster_id, poster_ip, message, hide_smilies, posted, topic_id) VALUES(\''.$db->escape($username).'\', '.$pun_user['id'].', \''.get_remote_address().'\', \''.$db->escape($message).'\', \''.$hide_smilies.'\', '.$now.', '.$new_tid.')') or error('Unable to create post', __FILE__, __LINE__, $db->error());
-			}
-			else
-			{
-				// Create the post ("topic post")
-				$email_sql = ($pun_config['p_force_guest_email'] == '1' || $email != '') ? '\''.$email.'\'' : 'NULL';
-				$db->query('INSERT INTO '.$db->prefix.'posts (poster, poster_ip, poster_email, message, hide_smilies, posted, topic_id) VALUES(\''.$db->escape($username).'\', \''.get_remote_address().'\', '.$email_sql.', \''.$db->escape($message).'\', \''.$hide_smilies.'\', '.$now.', '.$new_tid.')') or error('Unable to create post', __FILE__, __LINE__, $db->error());
-			}
-			$new_pid = $db->insert_id();
-
-			// Update the topic with last_post_id
-			$db->query('UPDATE '.$db->prefix.'topics SET last_post_id='.$new_pid.' WHERE id='.$new_tid) or error('Unable to update topic', __FILE__, __LINE__, $db->error());
-
-			update_search_index('post', $new_pid, $message, $subject);
-
-			update_forum($fid);
-		}
-
-		// If the posting user is logged in, increment his/her post count
-		if (!$pun_user['is_guest'])
-		{
-			$low_prio = ($db_type == 'mysql') ? 'LOW_PRIORITY ' : '';
-			$db->query('UPDATE '.$low_prio.$db->prefix.'users SET num_posts=num_posts+1, last_post='.$now.' WHERE id='.$pun_user['id']) or error('Unable to update user', __FILE__, __LINE__, $db->error());
-		}
-
-		redirect('viewtopic.php?pid='.$new_pid.'#p'.$new_pid, $lang_post['Post redirect']);
-	}
-}
-
-
-// If a topic id was specified in the url (it's a reply).
-if ($tid)
-{
-	$action = $lang_post['Post a reply'];
-	$form = '
    ';
-
-	// If a quote-id was specified in the url.
-	if (isset($_GET['qid']))
-	{
-		$qid = intval($_GET['qid']);
-		if ($qid < 1)
-			message($lang_common['Bad request']);
-
-		$result = $db->query('SELECT poster, message FROM '.$db->prefix.'posts WHERE id='.$qid.' AND topic_id='.$tid) or error('Unable to fetch quote info', __FILE__, __LINE__, $db->error());
-		if (!$db->num_rows($result))
-			message($lang_common['Bad request']);
-
-		list($q_poster, $q_message) = $db->fetch_row($result);
-
-		$q_message = str_replace('[img]', '[url]', $q_message);
-		$q_message = str_replace('[/img]', '[/url]', $q_message);
-		$q_message = pun_htmlspecialchars($q_message);
-
-		if ($pun_config['p_message_bbcode'] == '1')
-		{
-			// If username contains a square bracket, we add "" or '' around it (so we know when it starts and ends)
-			if (strpos($q_poster, '[') !== false || strpos($q_poster, ']') !== false)
-			{
-				if (strpos($q_poster, '\'') !== false)
-					$q_poster = '"'.$q_poster.'"';
-				else
-					$q_poster = '\''.$q_poster.'\'';
-			}
-			else
-			{
-				// Get the characters at the start and end of $q_poster
-				$ends = substr($q_poster, 0, 1).substr($q_poster, -1, 1);
-
-				// Deal with quoting "Username" or 'Username' (becomes '"Username"' or "'Username'")
-				if ($ends == '\'\'')
-					$q_poster = '"'.$q_poster.'"';
-				else if ($ends == '""')
-					$q_poster = '\''.$q_poster.'\'';
-			}
-
-			$quote = '[quote='.$q_poster.']'.$q_message.'[/quote]'."\n";
-		}
-		else
-			$quote = '> '.$q_poster.' '.$lang_common['wrote'].':'."\n\n".'> '.$q_message."\n";
-	}
-
-	$forum_name = ''.pun_htmlspecialchars($cur_posting['forum_name']).'';
-}
-// If a forum_id was specified in the url (new topic).
-else if ($fid)
-{
-	$action = $lang_post['Post new topic'];
-	$form = '';
-
-	$forum_name = pun_htmlspecialchars($cur_posting['forum_name']);
-}
-else
-	message($lang_common['Bad request']);
-
-
-$page_title = pun_htmlspecialchars($pun_config['o_board_title']).' / '.$action;
-$required_fields = array('req_email' => $lang_common['E-mail'], 'req_subject' => $lang_common['Subject'], 'req_message' => $lang_common['Message']);
-$focus_element = array('post');
-
-if (!$pun_user['is_guest'])
-	$focus_element[] = ($fid) ? 'req_subject' : 'req_message';
-else
-{
-	$required_fields['req_username'] = $lang_post['Guest name'];
-	$focus_element[] = 'req_username';
-}
-
-require PUN_ROOT.'header.php';
-
-?>
-
    
-	
    
-		
    •  » 
    •  » '.pun_htmlspecialchars($cur_posting['subject']) ?>
    
-	
    
-
    
-
-
-
    
-	
    
-	
    
-		
    
-			
    
-			
      
-'.$cur_error.''."\n";
-?>
-			
    
-		
    
-	
    
-
    
-
-
-
    
-	
    
-	
    
-		
    
-			
    
-				
    
-					
-				
    
-			
    
-		
    
-	
    
-
    
-
-
-
    
-	
    
-	
    
-		
-			
    
-				
    
-					
-					
    
-						
-						
-'.$lang_common['E-mail'].'' : $lang_common['E-mail'];
-	$email_form_name = ($pun_config['p_force_guest_email'] == '1') ? 'req_email' : 'email';
-
-?>						
-						
-						
    
-
-						
-						
-						
      
-							
    • : 
      • 
-							
    • : 
      • 
-							
    • : 
      • 
-						
    
-					
    
-				
    
-'.$lang_post['Hide smilies'];
-
-	if ($pun_config['o_subscriptions'] == '1')
-		$checkboxes[] = '
    
-			
    
-				
    
-					
-					
    
-						
    
-							'."\n\t\t\t\t", $checkboxes).'
    '."\n" ?>
-						
    
-					
    
-				
    
-
-			
    
-			
    
-		
-	
    
-
    
-
-query('SELECT poster, message, hide_smilies, posted FROM '.$db->prefix.'posts WHERE topic_id='.$tid.' ORDER BY id DESC LIMIT '.$pun_config['o_topic_review']) or error('Unable to fetch topic review', __FILE__, __LINE__, $db->error());
-
-?>
-
-
    
-	
    
-fetch_assoc($result))
-	{
-		// Switch the background color for every message.
-		$bg_switch = ($bg_switch) ? $bg_switch = false : $bg_switch = true;
-		$vtbg = ($bg_switch) ? ' roweven' : ' rowodd';
-		$post_count++;
-
-		$cur_post['message'] = parse_message($cur_post['message'], $cur_post['hide_smilies']);
-
-?>
-	
    
-		
    
-			
    
-				
    
-					
    
-					
    
-				
    
-			
    
-			
    
-				
    
-					
-				
    
-			
    
-			
    
-		
    
-	
    
-
-
    
-query('SELECT g_read_board FROM '.$db->prefix.'groups WHERE g_id=3') or error('Unable to fetch group info', __FILE__, __LINE__, $db->error());
-if ($db->result($result) == '0')
-	exit('No permission');
-
-
-// Attempt to load the common language file
-@include PUN_ROOT.'lang/'.$pun_config['o_default_lang'].'/common.php';
-if (!isset($lang_common))
-	exit('There is no valid language pack \''.$pun_config['o_default_lang'].'\' installed. Please reinstall a language of that name.');
-
-// Check if we are to display a maintenance message
-if ($pun_config['o_maintenance'] && !defined('PUN_TURN_OFF_MAINT'))
-	maintenance_message();
-
-if (!isset($_GET['ttitle']))
-	exit('No parameters supplied. See redirect_stripit.php for instructions.');
-
-
-$sql = 'SELECT t.id
-        FROM '.$db->prefix.'topics AS t
-        WHERE t.subject="'.utf8_decode($_GET['ttitle']).'";';
-
-$res = $db->query( $sql );
-
-if ($res != false && $db->num_rows($res) > 0) {
-    $_tid = $db->fetch_row( $res );
-    $tid = intval( $_tid[0] );
-} else {
-    $tid = 0;
-}
-
-if( $tid > 0 ) {
-    header('Location: viewtopic.php?id='.$tid);
-} else {
-    header('Location: index.php');
-}
-exit;
\ No newline at end of file
diff --git a/rss.php b/rss.php
index 80a517e..172a479 100644
--- a/rss.php
+++ b/rss.php
@@ -1,220 +1,65 @@
 
-* @license http://www.gnu.org/licenses/gpl.html GPL
-* @copyright 2007 Johann Dréo
-*
-* @package stripit 
-*/
+ * Strip-It Rss
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GPL
+ * @copyright 2009 Johann Dréo, Simon Leblanc
+ * @author Johann "nojhan" Dréo 
+ * @author Simon Leblanc 
+ * @package stripit
+ */
 
-set_include_path(get_include_path() . PATH_SEPARATOR . getcwd());
 
-require_once 'strip_manager.php';
-require_once 'conf/configuration.php';
+require_once 'inc/functions.php';
 
-// hack for passing objects by values instead of reference under PHP5 (but not PHP4)
-// damn clone keyword !
-if (version_compare(phpversion(), '5.0') < 0) {
-	eval('function clone($object) {return $object;}');
+//Launch Cron
+Cron::exec();
+
+// Obtain the Config
+$config = new Config();
+
+// Obtain the cache
+$cache = Cache::getCache();
+
+// Obtain the id asked
+$last = Cache::getLastId();
+
+// Obtain the limit
+if (isset($_GET['limit']) && is_numeric($_GET['limit'])) {
+  $limit = $_GET['limit'];
+
+  if ($limit <= 0 || $limit > $last + 1) {
+    $limit = $last + 1;
+  }
+} else {
+  $limit = $last + 1;
+}
+$end = $last - $limit;
+
+// Obtain the strips
+$list = array();
+for ($i = $last; $i > $end; $i--) {
+  $list[$i] = Cache::getStrip($i);
 }
 
-/**
-* RSS manager
-*/
-class rss_manager
-{
-	/**
-	* Items list
-	* @var array
-	*/
-	var $items_list = array();
+// Obtain the language
+if (isset($_GET['lang'])) {
+  $lang = $_GET['lang'];
+} else {
+  $lang = Config::getLanguage();
+}
+$lang = getLang($lang);
 
-	/**
-	* Configuration
-	* @var array
-	*/
-	var $general;
-	
-	/**
-	 * Strip manager object
-	 * @var	object
-	 */
-	var $strip_manager;
+// Navigation
+$nav_img = Config::getUrl().'/'.Config::getIndex().'?id=';
 
-	/**
-	* Constructor
-	* 
-	* Use the {@link strip_manager} to do the stuff, and convert date from the iso8601 to RFC822 format.
-	*
-	* @access	public
-	*/
-	function rss_manager() {
-
-		$this->strip_manager = new strip_manager();
-
-		$this->general = $this->strip_manager->general;
-		$this->lang = $this->strip_manager->lang;
-	}
-	
-	
-	/**
-	 * Init the strip manager
-	 *
-	 * Use the {@link strip_manager} to do the stuff, and convert date from the iso8601 to RFC822 format.
-	 * 
-	 * @access	private
-	 */
-	function _init()
-	{
-		$this->strip_manager->strips_list_get();
-		
-		// limit the number of strip in RSS
-		$limit = 0;
-		if (isset($_GET['limit']) && is_numeric($_GET['limit'])) {
-			// check for have no infinite for
-			if ($_GET['limit'] > 0 && $_GET['limit'] < $this->strip_manager->strips_count) {
-				$limit = $this->strip_manager->strips_count - $_GET['limit'];
-			}
-		}
-
-		for( $i = $this->strip_manager->strips_count-1; $i >= $limit;  $i-- ) { // reverser order
-			$this->strip_manager->strip_info_get( $i );
-			
-			// conversion iso8601 -> RFC822
-			$this->strip_manager->date = date('r', strtotime($this->strip_manager->date));
-
-			$this->items_list[] = clone($this->strip_manager); // hack for php4/5 compat
-		}
-	}
-
-	/**
-	* Generate the RSS output with the template engine.
-	*
-	* @access	public
-	*/
-	function generate() {		
-		if ($this->general->use_cache) {
-			// use the cache system
-			include_once 'cache.class.php';
-			$cache = new STRIPIT_Cache();
-			
-			$limit = 0;
-			if (isset($_GET['limit']) && is_numeric($_GET['limit'])) {
-				$limit = $_GET['limit'];
-			}
-			
-			$template_folder	= $this->general->template_folder.'/'.$this->general->template_rss;
-			$strip_folder		= $this->strip_manager->strips_path;
-			$cache_folder		= $this->strip_manager->options['compileDir'];
-			if ($cache->init($limit, $template_folder, $this->general->template_rss, $strip_folder, $cache_folder, '', true)) {
-				if ($cache->isInCache()) {
-					// the page is in cache, show cache
-					$this->_sendHeader();
-					$cache->getCache();
-				} else {
-					// the cache must be re-generate
-					ob_start();
-					
-					$this->_genRss();
-					
-					$cache_data = ob_get_contents();
-					ob_end_clean();
-					$cache->putInCache($cache_data);
-					if ($this->general->use_punbb) {
-						// if we generate the cache the first time with comments
-						// redirect in the same page for use the cache (because the first
-						// time we see the php code)
-						header('Location: '.$_SERVER['REQUEST_URI']);
-						exit();
-					} else {
-						$this->_sendHeader();
-						$cache->getCache();
-					}
-				}
-			} else {
-				// error in the configuration cache, don't use the cache system
-				$this->_sendHeader();
-				$this->_genRss();
-			}
-		} else {
-			// don't use the cache system
-			$this->_sendHeader();
-			$this->_genRss();
-		}
-	}
-	
-	
-	/**
-	 * Generate the RSS page
-	 *
-	 * @access	private
-	 */
-	function _genRss()
-	{
-		$this->_init();
-		
-		$this->_genAnnonce();
-		
-		$output = new HTML_Template_Flexy($this->strip_manager->options);
-		$output->compile($this->general->template_folder.'/'.$this->general->template_rss.'/template.rss');
-		$output->outputObject($this,$this->items_list);
-	}
-	
-	
-	/**
-	 * Generate the RSS item for announce of webmaster
-	 *
-	 * @access	private
-	 */
-	function _genAnnonce()
-	{
-		// if one want to use punbb as forum
-		if( $this->general->use_punbb ) {
-			if ($this->general->use_cache) {
-				// get the word of the day
-				$this->general->wotd = 'general->forum.'/extern.php?action=new&show=1&type=last_rss&fid='.$this->general->punbb_wotd_id.'\', \'r\');
-	
-				if (!$fh) {
-					echo \''.str_replace("'", "\'", $this->lang->forum_error).'\';
-				} else {
-					echo utf8_encode(stream_get_contents($fh));
-					fclose($fh);
-				}
-				?>';
-			} else {
-				// get the word of the day
-				$fh = fopen( $this->general->forum.'/extern.php?action=new&show=1&type=last_rss&fid='.$this->general->punbb_wotd_id, 'r');
-	
-				if (!$fh) {
-					$this->general->wotd = $this->lang->forum_error;
-				} else {
-					$this->general->wotd = utf8_encode(stream_get_contents($fh));
-					fclose($fh);
-				}
-			}
-		}
-	}
-	
-	
-	/**
-	 * Send the header XML
-	 *
-	 * @access private
-	 */
-	function _sendHeader()
-	{
-		header('Content-Type: application/rss+xml');
-		echo "";
-	}
+// If necessary, obtain the forum data
+$wotd = '';
+if (Config::getUseFluxbb() === true) {
+  $wotd = Forum::getWotdRss($lang);
 }
 
-/**
-* Instanciation and output.
-*/
-$rssm = new rss_manager();
-$rssm->generate();
-
-?>
+// show the template
+header('Content-Type: application/rss+xml');
+echo "";
+include_once Config::getTemplateFolder().'/'.Config::getTemplateRss().'/template.rss';
diff --git a/strip_manager.php b/strip_manager.php
deleted file mode 100644
index 053c7d6..0000000
--- a/strip_manager.php
+++ /dev/null
@@ -1,604 +0,0 @@
-
-* @license http://www.gnu.org/licenses/gpl.html GPL
-* @copyright 2007 Johann Dréo
-*
-* @package stripit 
-*/
-
-set_include_path(get_include_path() . PATH_SEPARATOR . getcwd());
-
-require_once 'HTML/Template/Flexy.php';
-require_once 'PEAR/XMLParser.php';
-// trying to give some meaningful info if there's no configuration file
-(@include_once 'conf/configuration.php') or
-	die("Strip It isn't configured yet: conf/configuration.php file is missing.
    See README for details.");
-
-class svg_parser extends PEAR_XMLParser
-{
-	/**
-	* Strip Manager object
-	*/
-	var $strip_manager;
-	/**
-	* Stack of current xml elements the parser is in
-	* @var array
-	*/
-	var $elem;
-	/**
-	* Value of current xml element
-	* @var string
-	*/
-	var $currentvalue;
-
-	function svg_parser($strip_manager)
-	{
-		$this->strip_manager = $strip_manager;
-		$this->elem = array();
-	}
-
-	function startHandler($xp, $name, $attribs)
-	{
-		array_push($this->elem, $name);
-		$this->currentvalue = "";
-
-		switch($name)
-		{
-			case "cc:license":
-				$this->strip_manager->license = $attribs["rdf:resource"];
-				break;
-		}
-	}
-
-	function endHandler($xp, $name)
-	{
-		$elem = array_pop($this->elem);
-		switch($elem)
-		{
-			case "dc:title":
-				// dc:title can appear multiple times, we're checking where we are
-				switch($this->elem[count($this->elem) - 2])
-				{
-					case "dc:creator":
-						$this->strip_manager->author =  $this->currentvalue;
-						break;
-					case "rdf:RDF":
-						$this->strip_manager->title =  $this->currentvalue;
-						break;
-				}
-				break;
-			case "dc:date":
-				$this->strip_manager->date = $this->currentvalue;
-				break;
-			case "dc:description":
-				$this->strip_manager->description = $this->currentvalue;
-				break;
-			case "tspan":
-				$this->strip_manager->text .= $this->currentvalue;
-				break;
-		}
-	}
-
-	function cdataHandler($xp, $cdata)
-	{
-		$this->currentvalue .= $cdata;
-	}
-}
-
-/**
-* Main manager
-*
-* @todo use correct XML parsing to avoid the tring dependencies among Inkscape way of generate the SVG
-*/
-class strip_manager
-{
-	/**
-	* Directory where to find strips
-	* @var string
-	*/
-	var $strips_path = "./strips";
-	
-	/**
-	* Directory where to find strips thumbnail
-	* @var string
-	*/
-	var $strips_th_path = "./strips/th";
-
-	/**
-	* Directory where to find translations files
-	* @var string
-	*/
-	var $lang_path = "./conf/lang";
-
-	/** 
-	* Base url for asking for strips
-	* @var string
-	*/
-	var $nav_base_url = 'index.php?strip=';
-
-	/**
-	* Base keyword for languages management
-	* @var string
-	*/
-	var $lang_base_key = "lang";
-
-	/**
-	* Constructed URL for languages
-	* @var string
-	*/
-	var $nav_lang_url = '';
-
-	/**#@+
-	* Navigation constants
-	* @var integer
-	*/
-	/**
-	* Previous
-	*/
-	var $nav_prev = 0;
-	/**
-	* Next
-	*/
-	var $nav_next = 1;
-	/**
-	* Last
-	*/
-	var $nav_last = 1;
-	/**
-	* First
-	*/
-	var $nav_first = 0;
-	/**
-	* First
-	*/
-	var $nav_gallery = "gallery.php";
-
-	/**
-	* Variable concerning the current strip
-	* @var string
-	*/
-	/** 
-	* URL of the displayed file
-	*/
-	var $img_src ='';
-	/** 
-	* URL of the thumbnail
-	*/
-	var $thumbnail ='';
-	/**
-	* Title
-	*/
-	var $title = '';
-	/**
-	* Author
-	*/
-	var $author = '';
-	/**
-	* Date
-	*/
-	var $date = '';
-	/**
-	* License
-	*/
-	var $license = '';
-	/**
-	* URL of the SVG source file
-	*/
-	var $source = '';
-	/**
-	* Size of the source file
-	*/
-	var $source_size = 0;
-	/**
-	* Description
-	*/
-	var $description;
-	/**
-	* Alternate text for the image
-	*/
-	var $text;
-
-	/**
-	* List of the strips
-	* @var array
-	*/
-	var $strips_list = array();
-	
-	/** 
-	* Total number of strips
-	* @var integer
-	*/
-	var $strips_count = 0;
-
-	/**
-	* Strip ID on the website
-	*
-	* This ID is not extracted from the filename, but depends of the lexical order in the filelist.
-	* If you do not want to see ID variations, always preserve the lexial order of the file list.
-	*
-	* @var integer
-	*/
-	var $current_id = 0;
-
-	/**
-	* Comments associated to a strip
-	*/
-	var $comments = '';
-
-	/**
-	* Link to the post page related to the strip on the forum
-	*/
-	var $forum_post_url = '';
-
-	/**
-	* Additional variables
-	*
-	* These ones are passed to the template engine.
-	*
-	* @var array
-	*/
-	var $elements = array();
-
-	/**
-	* Options for the template engine
-	* @var array
-	*/
-	var $options = array(
-		'templateDir'   => '.',
-		'compileDir'    => 'cache',
-		'forceCompile'  => 1,
-		'debug'         => 0,
-		'locale'        => 'fr',
-		'compiler'      => 'Standard',
-	);
-
-	/**
-	* General configuration variables
-	*
-	* Used to store the configuration options.
-	* @var array
-	*/
-	var $general;
-	/**
-	* Languages configuration
-	* @var array
-	*/
-	var $lang;
-
-	/**
-	* Constructor
-	*
-	* Load the {@link configuration}
-	*
-	* @access	public
-	*/
-	function strip_manager() {
-		$this->general = new configuration;
-		$this->_language();
-	}
-
-
-	/**
-	* Check the asked language and search for translation files
-	*
-	* @access	private
-	*/
-	function _language() {
-		if (isset($_GET[$this->lang_base_key]) && !empty($_GET[$this->lang_base_key])) {
-			$lang = $_GET[$this->lang_base_key];
-			$this->nav_lang_url = '&'.$this->lang_base_key.'='.$_GET[$this->lang_base_key];
-		} else {
-			$lang = $this->general->language;
-		}
-
-		if (file_exists($this->lang_path.'/'.$lang.'.php')) {
-			require_once $this->lang_path.'/'.$lang.'.php';
-			$this->lang = new language;
-			$this->general->language = $lang;
-		}
-	}
-
-
-	/**
-	 * Parse the file list and generate the output
-	 *
-	 * @access public
-	 */
-	function generate() {
-		if ($this->general->use_cache) {
-			// use the cache system
-			include_once 'cache.class.php';
-			$cache = new STRIPIT_Cache();
-			if( !isset($_GET['strip']) || $_GET['strip'] == '' || !is_numeric($_GET['strip']) ) {
-				// we must give the last, so we must calculate the last strip :-(
-				$this->strips_list_get();
-				$get_strip = $this->strips_count-1;
-			} else {
-				$get_strip = $_GET['strip'];
-			}
-			
-			if ($get_strip < 0) { 
-				$get_strip = 0;
-			}
-			
-			$template_folder	= $this->general->template_folder.'/'.$this->general->template_name;
-			$strip_folder		= $this->strips_path;
-			$cache_folder		= $this->options['compileDir'];
-			$language		= $this->general->language;
-			if ($cache->init($get_strip, $template_folder, $this->general->template_name, $strip_folder, $cache_folder, $language)) {
-				if ($cache->isInCache()) {
-					// the page is in cache, show cache
-					$cache->getCache();
-				} else {
-					// the cache must be re-generate
-					ob_start();
-					
-					$this->start();
-					$this->output();
-					
-					$cache_data = ob_get_contents();
-					ob_end_clean();
-					$cache->putInCache($cache_data);
-					if ($this->general->use_punbb) {
-						// if we generate the cache the first time with comments
-						// redirect in the same page for use the cache (because the first
-						// time we see the php code)
-						header('Location: '.$_SERVER['REQUEST_URI']);
-						exit();
-					} else {
-						$cache->getCache();
-					}
-				}
-			} else {
-				// error in the configuration cache, don't use the cache system
-				$this->start();
-				$this->output();
-			}
-		} else {
-			// don't use the cache system
-			$this->start();
-			$this->output();
-		}
-	}
-
-
-	/**
-	* Construct the file list
-	*
-	* Add SVG files in the {@link $strips_path} directory and sort them lexically.
-	* @access	public
-	*/
-	function strips_list_get() {
-		// init the array
-		$this->strips_list = array();
-		
-		// Open the given directory
-		$handle = opendir($this->strips_path);
-
-		// Browse the directory
-		while($file = readdir($handle)) {
-			if($file != "." && $file != "..") {
-				// Get the extension of the file
-				$ext = pathinfo($file);
-				// If it is an SVG
-				if( $ext['extension'] == 'svg' ) {
-					// Add it to the list
-					$this->strips_list[] = $file;
-				}
-			}
-		}
-
-		closedir($handle);
-
-		// Sort the array based on file name
-		sort($this->strips_list);
-
-		$this->strips_count = count($this->strips_list);
-	}
-
-
-	/**
-	* Parse meta-data of a given SVG
-	*
-	* @param integer index of the file to parse in the {@link $strips_list}
-	* @access	public
-	*/
-	function strip_info_get( $element_asked ) {
-		$this->current_id = $element_asked;
-
-		$file = $this->strips_list[$element_asked];
-
-		$svg = $this->strips_path.'/'.$file;
-
-		// change the extension for {@link $img_src}
-		$png = explode( '.', $file);
-		$this->img_src = $this->strips_path.'/'.$png[0].'.png';
-		$this->thumbnail = $this->strips_th_path.'/'.$png[0].'.png';
-		if (!$this->_getThumbnail()) {
-			// Error in generation of thumbnail, the thumbnail will be the original
-			$this->thumbnail = $this->strips_path.'/'.$png[0].'.png';
-		}
-
-		$this->source = $svg;
-		$this->source_size = filesize( $svg );
-		
-		if( file_exists($svg) ) {
-			$data = file_get_contents( $svg );
-
-			$parser = new svg_parser($this);
-			$parser->parse($data);
-		}
-
-		// if one want to use punbb as forum
-		if( $this->general->use_punbb ) {
-			if ($this->general->use_cache) {
-				// if we use cache, we must add the php code in the cache else the new comment can't be show
-				// lasts posts associated to the strip
-				$this->comments = 'general->forum.'/extern.php?action=topic&ttitle='.urlencode($this->title).'&max_subject_length='.$this->general->punbb_max_length.'\', \'r\');
-	
-				if (!$fh) {
-					// TODO traduction
-					echo \''.str_replace("'", "\'", $this->lang->forum_error).'\';
-				} else {
-					echo utf8_encode(stream_get_contents($fh));
-					fclose($fh);
-				}
-				?>';
-			} else {
-				// lasts posts associated to the strip
-				$fh = fopen( $this->general->forum.'/extern.php?action=topic&ttitle='.urlencode($this->title).'&max_subject_length='.$this->general->punbb_max_length, 'r');
-	
-				if (!$fh) {
-					// TODO traduction
-					$this->comments = $this->lang->forum_error;
-				} else {
-					$this->comments = utf8_encode(stream_get_contents($fh));
-					fclose($fh);
-				}
-			}
-			// link for posting a new comment
-			$this->forum_post_url = $this->general->forum . '/post.php?ttitle='.urlencode($this->title).'&fid='.$this->general->punbb_forum_id;
-			$this->forum_view_url = $this->general->forum . '/redirect_stripit.php?ttitle='.urlencode($this->title);
-		}
-	}
-	
-	
-	/**
-	 * Return the link for the thumbnail (and create the thumbnail if neccesary)
-	 *
-	 * @return	bool			True if the thumbail is created, False else
-	 */
-	function _getThumbnail()
-	{
-		// check if the thumbnail exist
-		if (file_exists($this->thumbnail)) {
-			// the file exist, check if the original is create before the thumbnail
-			clearstatcache();
-			$original_time = filemtime($this->img_src);
-			$thumbnail_time = filemtime($this->thumbnail);
-			
-			if ($original_time >= $thumbnail_time) {
-				// There is a modification since the creation of thumbnail
-				return $this->_genThumbnail();
-			} else {
-				return true;
-			}
-		} else {
-			return $this->_genThumbnail();
-		}
-	}
-	
-	
-	/**
-	 * Create the thumbnail 
-	 *
-	 * @return	bool			True if the creation is OK, False else
-	 */
-	function _genThumbnail()
-	{
-		// check if the directory of thumbnail exists
-		if (!is_dir($this->strips_th_path)) {
-			return false;
-		}
-		
-		// calculate the width and height of thumbnail
-		$width = $this->general->thumb_size;
-		$size = getimagesize($this->img_src);
-		if ($size[0] > $width) {
-			$rapport = $size[0] / $width;
-			$height = $size[1] / $rapport;
-		} else {
-			$width = $size[0];
-			$height = $size[1];
-		}
-		
-		$img_src = imagecreatefrompng($this->img_src);
-		$img_dst = imagecreatetruecolor($width, $height);
-		
-		// Preserve alpha transparency : thank crash 
-		imagecolortransparent($img_dst, imagecolorallocate($img_dst, 0, 0, 0));
-		imagealphablending($img_dst, false);
-		imagesavealpha($img_dst, true);
-		
-		$res = imagecopyresampled($img_dst, $img_src, 0, 0, 0, 0, $width, $height, $size[0], $size[1]);
-		if (!$res) {
-			return false;
-		}
-		
-		$res = imagepng($img_dst, $this->thumbnail);
-		if (!$res) {
-			return false;
-		}
-		
-		return true;
-	}
-
-
-	/**
-	* Launch {@link strips_list_get}, check the asked strip, construct naviguation menu, launch {@link strip_info_get} on it
-	* @access	public
-	*/
-	function start() {
-
-		$this->strips_list_get();
-
-		$element_asked = -1;
-
-		// If one ask for a particular strip
-		if( !isset($_GET['strip']) || $_GET['strip'] == '' || !is_numeric($_GET['strip']) ) {
-			$element_asked = $this->strips_count-1;
-
-		} else {
-			$element_asked = $_GET['strip'];
-
-			// else, the last one
-			if( $element_asked >= $this->strips_count ) {
-				$element_asked = $this->strips_count-1;
-			}
-
-			if ( $element_asked < 0 ) {
-				$element_asked = 0;
-			}
-		}
-
-		// Relative navigation menu
-		$this->nav_prev = $this->nav_base_url.($element_asked-1).$this->nav_lang_url;
-		$this->nav_next = $this->nav_base_url.($element_asked+1).$this->nav_lang_url;
-		$this->nav_last = $this->nav_base_url.($this->strips_count-1).$this->nav_lang_url;
-		$this->nav_first = $this->nav_base_url."0".$this->nav_lang_url;
-		$this->nav_gallery = $this->nav_gallery.'?page='.floor($element_asked / $this->general->thumbs_per_page).'&limit='.$this->general->thumbs_per_page;
-
-		
-		// if one want to use punbb as forum
-		if( $this->general->use_punbb ) {
-			// get the word of the day
-			$fh = fopen( $this->general->forum.'/extern.php?action=new&show=1&fid='.$this->general->punbb_wotd_id, 'r');
-
-			if (!$fh) {
-				$this->general->wotd = $this->lang->forum_error;
-			} else {
-				$this->general->wotd = utf8_encode(stream_get_contents($fh));
-				fclose($fh);
-			}
-		}
-
-		$this->strip_info_get( $element_asked );
-	}
-
-
-	/**
-	* Generate the HTML output with the template engine
-	* @access	public
-	*/
-	function output() {
-		$output = new HTML_Template_Flexy($this->options);
-		$output->compile($this->general->template_folder.'/'.$this->general->template_name.'/template.html');
-		$output->outputObject($this,$this->elements);
-	}
-}
-
-?>
diff --git a/template.spec b/template.spec
deleted file mode 100644
index 92e04d7..0000000
--- a/template.spec
+++ /dev/null
@@ -1,72 +0,0 @@
-Summary: PEAR: @summary@
-Name: @rpm_package@
-Version: @version@
-Release: 1
-License: @release_license@
-Group: Development/Libraries
-Source: http://@master_server@/get/@package@-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-root
-URL: http://@master_server@/package/@package@
-Prefix: %{_prefix}
-BuildArchitectures: @arch@
-@extra_headers@
-
-%description
-@description@
-
-%prep
-rm -rf %{buildroot}/*
-%setup -c -T
-# XXX Source files location is missing here in pear cmd
-pear -v -c %{buildroot}/pearrc \
-        -d php_dir=%{_libdir}/php/pear \
-        -d doc_dir=/docs \
-        -d bin_dir=%{_bindir} \
-        -d data_dir=%{_libdir}/php/pear/data \
-        -d test_dir=%{_libdir}/php/pear/tests \
-        -d ext_dir=%{_libdir} \@extra_config@
-        -s
-
-%build
-echo BuildRoot=%{buildroot}
-
-%postun
-# if refcount = 0 then package has been removed (not upgraded)
-if [ "$1" -eq "0" ]; then
-    pear uninstall --nodeps -r @possible_channel@@package@
-    rm @rpm_xml_dir@/@package@.xml
-fi
-
-
-%post
-# if refcount = 2 then package has been upgraded
-if [ "$1" -ge "2" ]; then
-    pear upgrade --nodeps -r @rpm_xml_dir@/@package@.xml
-else
-    pear install --nodeps -r @rpm_xml_dir@/@package@.xml
-fi
-
-%install
-pear -c %{buildroot}/pearrc install --nodeps -R %{buildroot} \
-        $RPM_SOURCE_DIR/@package@-%{version}.tgz
-rm %{buildroot}/pearrc
-rm %{buildroot}/%{_libdir}/php/pear/.filemap
-rm %{buildroot}/%{_libdir}/php/pear/.lock
-rm -rf %{buildroot}/%{_libdir}/php/pear/.registry
-if [ "@doc_files@" != "" ]; then
-     mv %{buildroot}/docs/@package@/* .
-     rm -rf %{buildroot}/docs
-fi
-mkdir -p %{buildroot}@rpm_xml_dir@
-tar -xzf $RPM_SOURCE_DIR/@package@-%{version}.tgz package@package2xml@.xml
-cp -p package@package2xml@.xml %{buildroot}@rpm_xml_dir@/@package@.xml
-
-#rm -rf %{buildroot}/*
-#pear -q install -R %{buildroot} -n package@package2xml@.xml
-#mkdir -p %{buildroot}@rpm_xml_dir@
-#cp -p package@package2xml@.xml %{buildroot}@rpm_xml_dir@/@package@.xml
-
-%files
-    %defattr(-,root,root)
-    %doc @doc_files@
-    /
diff --git a/template/default/design/bouton_etoile_petit_droite.png b/template/default/design/bouton_etoile_petit_droite.png
deleted file mode 100644
index 1d1c396..0000000
Binary files a/template/default/design/bouton_etoile_petit_droite.png and /dev/null differ
diff --git a/template/default/design/bouton_etoile_petit_droite_over.png b/template/default/design/bouton_etoile_petit_droite_over.png
deleted file mode 100644
index 36050f3..0000000
Binary files a/template/default/design/bouton_etoile_petit_droite_over.png and /dev/null differ
diff --git a/template/default/design/bouton_etoile_petit_gauche.png b/template/default/design/bouton_etoile_petit_gauche.png
deleted file mode 100644
index 6b4c8e3..0000000
Binary files a/template/default/design/bouton_etoile_petit_gauche.png and /dev/null differ
diff --git a/template/default/design/bouton_etoile_petit_gauche_over.png b/template/default/design/bouton_etoile_petit_gauche_over.png
deleted file mode 100644
index e4a225d..0000000
Binary files a/template/default/design/bouton_etoile_petit_gauche_over.png and /dev/null differ
diff --git a/template/default/design/bouton_fleche_grand_droite.png b/template/default/design/bouton_fleche_grand_droite.png
deleted file mode 100644
index 345e61e..0000000
Binary files a/template/default/design/bouton_fleche_grand_droite.png and /dev/null differ
diff --git a/template/default/design/bouton_fleche_grand_droite_over.png b/template/default/design/bouton_fleche_grand_droite_over.png
deleted file mode 100644
index 11ea790..0000000
Binary files a/template/default/design/bouton_fleche_grand_droite_over.png and /dev/null differ
diff --git a/template/default/design/bouton_fleche_grand_gauche.png b/template/default/design/bouton_fleche_grand_gauche.png
deleted file mode 100644
index 450da31..0000000
Binary files a/template/default/design/bouton_fleche_grand_gauche.png and /dev/null differ
diff --git a/template/default/design/bouton_fleche_grand_gauche_over.png b/template/default/design/bouton_fleche_grand_gauche_over.png
deleted file mode 100644
index adf8dee..0000000
Binary files a/template/default/design/bouton_fleche_grand_gauche_over.png and /dev/null differ
diff --git a/template/default/design/feed-icon-16x16.png b/template/default/design/feed-icon-16x16.png
deleted file mode 100644
index 8631398..0000000
Binary files a/template/default/design/feed-icon-16x16.png and /dev/null differ
diff --git a/template/default/design/gradient.png b/template/default/design/gradient.png
deleted file mode 100644
index 5c15f5a..0000000
Binary files a/template/default/design/gradient.png and /dev/null differ
diff --git a/template/default/design/gradient2.png b/template/default/design/gradient2.png
deleted file mode 100644
index 4ef036f..0000000
Binary files a/template/default/design/gradient2.png and /dev/null differ
diff --git a/template/default/gallery_template.html b/template/default/gallery_template.html
deleted file mode 100644
index b764dc5..0000000
--- a/template/default/gallery_template.html
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-	{general.title}
-
-	
-	
-	
-	
-
-
-
-
-
-
-
-
    
-
-
    
-
-
    
-{foreach:items_list,id,strip}
-	
    
-        
-            
-         
-	
    
-    {end:}
-
    
-
-
    
-    
    {lang.forum}
    
-    
    {comments:h}
    
-    
    {lang.forum_new}
    
-    
    {lang.boutique} {general.title} {lang.teeshirt}.
    
-    {lang.see_also}
-    
-    
    {lang.propulse} Strip-It, {lang.descstrip} ({general.version}).
    
-
    
-
-
-
-
-
\ No newline at end of file
diff --git a/template/default/style.css b/template/default/style.css
deleted file mode 100644
index 6a69ff3..0000000
--- a/template/default/style.css
+++ /dev/null
@@ -1,218 +0,0 @@
-html {
-    margin:0px;
-    padding:0px;
-}
-
-body {
-	background-color:#bebfc1;
-	text-align:center;
-	margin:0px;
-	padding:0px;
-}
-
-a {
-	color:#ddf;
-}
-
-a:hover {
-	color:white;
-}
-
-#navbar {
-	text-align:center;
-	background-color:#1f6cd0;
-	background-image:url("design/gradient.png");
-	background-repeat:repeat-x;
-	background-position:top left;
-	height:94px;
-	border-bottom:thin solid black;
-	color:white;
-}
-
-#footbar {
-	color:white;
-	font-size:small;
-	text-align:center;
-	background-color:#1f6cd0;
-	background-image:url("design/gradient2.png");
-	background-position:bottom left;
-	background-repeat:repeat-x;
-	border-top:thin solid black;
-	border-bottom:thin solid black;
-	margin-top:1em;
-	padding-bottom:1em;
-	clear:left;
-}
-#title {
-	font-size:large;
-	padding:5px;
-
-	text-align:center;
-}
-
-#stripbar {
-	text-align:center;
-	margin-top:2em;
-	width:100%;
-}
-
-.stripbox {
-	border:1px solid black;
-	background-color:white;
-	float:left;
-}
-
-#strip {
-	border:1px solid black;
-	background-color:white;
-}
-
-#infobar {
-	color:white;
-	padding:5px;
-	text-align:center;
-	background-color:#1f6cd0;
-	border:thin solid black;
-	background-image:url("design/gradient.png");
-	background-repeat:repeat-x;
-	background-position:top left;
-	/*height:70px;*/
-}
-
-#infos {
-	font-size:small;
-	padding:5px;
-}
-
-#infoblock {
-	margin-top:1em;
-}
-
-#navfirst {
-	font-size:small;
-
-	padding-bottom:35px;
-	background-image:url("design/bouton_etoile_petit_gauche.png");
-	background-repeat:no-repeat;
-	background-position:bottom center;
-}
-
-#navfirst:hover {
-	background-image:url("design/bouton_etoile_petit_gauche_over.png");
-}
-
-
-#navlast {
-	font-size:small;
-	padding-bottom:35px;
-	background-image:url("design/bouton_etoile_petit_droite.png");
-	background-repeat:no-repeat;
-	background-position:bottom center;
-}
-
-#navlast:hover {
-	background-image:url("design/bouton_etoile_petit_droite_over.png");
-}
-
-#navprev {
-	font-size:small;
-	padding-bottom:49px;
-	background-image:url("design/bouton_fleche_grand_gauche.png");
-	background-repeat:no-repeat;
-	background-position:bottom center;
-}
-
-#navprev:hover {
-	background-image:url("design/bouton_fleche_grand_gauche_over.png");
-}
-
-#navnext {
-	font-size:small;
-	padding-bottom:49px;
-	background-image:url("design/bouton_fleche_grand_droite.png");
-	background-repeat:no-repeat;
-	background-position:bottom center;
-}
-
-#navnext:hover {
-	background-image:url("design/bouton_fleche_grand_droite_over.png");
-}
-
-.shadow, .content {
-	position: relative;
-	bottom: 5px;
-	right: 5px;
-}
-
-.shadow {
-	background-color: #9e9fa1; /*couleur de l'ombre */
-	border:1px solid #aeafb1;
-	margin-left: 5px;
-	margin-top: 5px;
-	float:left;
-}
-
-.shadow_simple {
-	padding-bottom:3px;
-	background-color: #9e9fa1; /*couleur de l'ombre */
-	border-bottom:1px solid #aeafb1;
-}
-
-.centering {
-	display : table;
-	margin : 0 auto;
-}
-
-#site_title {
-	position:absolute;
-	top:1px;
-	left:1px;
-	text-align:left;
-	margin-top:5px;
-}
-
-#site_title > p {
-	margin:0px;
-}
-
-#site_head {
-	font-weight:bold;
-	font-size:large;
-	font-variant:small-caps;
-}
-
-#site_desc {
-	font-size:x-small;
-}
-
-#feed {
-	padding-right:18px;
-	background-image:url("design/feed-icon-16x16.png");
-	background-repeat:no-repeat;
-	background-position:center right;
-}
-
-
-#linkbar {
-	display:inline;
-	margin-top:2em;
-	list-style:none;
-}
-
-ul#linkbar li {
-	display:inline;
-}
-
-#main {
-	float:right;
-}
-
-#shop_infos {
-	font-size:medium;
-	font-weight:bold;
-}
-
-#forum {
-	font-size:medium;
-	font-weight:bold;
-}
\ No newline at end of file
diff --git a/template/default/template.html b/template/default/template.html
deleted file mode 100644
index 46d498c..0000000
--- a/template/default/template.html
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-	{general.title} - {title}
-
-	
-	
-	
-	
-
-
-
-
-
-
-
-
    
-
-
    
-
-
    
-	
    
-		
    
-		{text}
-		
    
-	
    
-
    
-
-
    
-
    
-
    
-	
    
-		
    « {title} »
    
-        
    
-            
    {description:h}
    
-	    
    © {author} 
    
-	    
     {date} 
    
-	    
    {lang.source}
    
-            
    {lang.licence} : {license}
    
-		
    
-	
    
-
    
-
    
-
    
-
-
-
    
-    
    {lang.forum}
    
-    
    {comments:h}
    
-    
    {lang.forum_new}
    
-    
    {lang.boutique} {general.title} {lang.teeshirt}.
    
-    {lang.see_also}
-    
-    
    {lang.propulse} Strip-It, {lang.descstrip} ({general.version}).
    
-
    
-
-
-
-
-
diff --git a/template/lego/gallery_template.html b/template/lego/gallery_template.html
deleted file mode 100644
index b6d4cb7..0000000
--- a/template/lego/gallery_template.html
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
-
-	{general.title}
-
-	
-	
-	
-	
-	
-	
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-    {foreach:items_list,id,strip}
-	
    
-        
-            
-         
-	
    
-    {end:}
-
    
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/template/lego/template.html b/template/lego/template.html
deleted file mode 100644
index 03d2510..0000000
--- a/template/lego/template.html
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
-
-	{general.title} - {title}
-
-	
-	
-	
-	
-	
-	
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-	{text}
-
-	
-	
-		
-		
-		
-	
-	
-	
-		
-	
-
-	
    
-				
    « {title} »
    
-				
    {description:h}
    
-		    		
-				{lang.comments} :
-				
      
-					{comments:h}
-				
    
-				{lang.forum_new} | 
-				{lang.forum_view}
-		
    
-				
    © {author}
    
-				
    {date}
    
-				
    {lang.source}
    
-				
    {lang.licence} : {license}
    
-		
    
-
-
    
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/rss/template.rss b/template/rss/template.rss
deleted file mode 100644
index 41f0f3a..0000000
--- a/template/rss/template.rss
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-	
-	{general.title}
-	{general.url}
-	1440
-	{general.description}
-	{general.language}
-	http://stripit.sourceforge.net
-	
-		{general.url}/favicon.png
-		{general.title}
-		{general.url}
-	
-	{general.email} ({general.webmaster})
-	{general.email} ({general.webmaster})
-	Copyright {general.webmaster}
-	http://cyber.law.harvard.edu/rss/
-	{general.wotd:h}
-{foreach:items_list,id,strip}
-	
-		{strip.title}
-		{general.url}/{strip.nav_base_url}{strip.current_id}
-		{general.url}/{strip.source}"
-		
-		{strip.date}
-		{strip.author}
-		
-			<a
-                title="{lang.source_rss}"
-                href="{general.url}/{strip.nav_base_url}{strip.current_id}"
-            >
-            <img src="{general.url}/{strip.img_src}" alt="{general.text}" />
-            </a>
-            <p>{strip.description}<p>
-            <p>{lang.licence} : <a href="{strip.license}">{strip.license}</a><p>
-
-            <a href="{general.forum}">{lang.forum}</a>
-            <a href="{general.shop}">{lang.boutique}</a>
-		
-	
-{end:}
-
-
-