Dolibarr / dolibarr

htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php

Indentation +71 added lines, -71 removed lines

@@ -15,84 +15,84 @@
 
 class EventDispatcher
 {
-    private $listeners = array();
-    protected static $_waitList = array();
+	private $listeners = array();
+	protected static $_waitList = array();
 
-    public static $self;
-    protected $events = array();
+	public static $self;
+	protected $events = array();
 
-    public function __construct() {
-        static::$self = $this;
-        if (!empty(static::$_waitList)) {
-            foreach (static::$_waitList as $param) {
-                call_user_func_array(array($this,$param[0]), $param[1]);
-            }
-        }
-    }
+	public function __construct() {
+		static::$self = $this;
+		if (!empty(static::$_waitList)) {
+			foreach (static::$_waitList as $param) {
+				call_user_func_array(array($this,$param[0]), $param[1]);
+			}
+		}
+	}
 
-    public static function __callStatic($eventName, $params)
-    {
-        if (0 === strpos($eventName, 'on')) {
-            if(static::$self){
-                return call_user_func_array(array(static::$self, $eventName), $params);
-            }
-            static::$_waitList[] = func_get_args();
-            return false;
-        }
-    }
+	public static function __callStatic($eventName, $params)
+	{
+		if (0 === strpos($eventName, 'on')) {
+			if(static::$self){
+				return call_user_func_array(array(static::$self, $eventName), $params);
+			}
+			static::$_waitList[] = func_get_args();
+			return false;
+		}
+	}
 
-    public function __call($eventName, $params)
-    {
-        if (0 === strpos($eventName, 'on')) {
-            if (!isset($this->listeners[$eventName]) || !is_array($this->listeners[$eventName]))
-                $this->listeners[$eventName] = array();
-            $this->listeners[$eventName][] = $params[0];
-        }
-        return $this;
-    }
+	public function __call($eventName, $params)
+	{
+		if (0 === strpos($eventName, 'on')) {
+			if (!isset($this->listeners[$eventName]) || !is_array($this->listeners[$eventName]))
+				$this->listeners[$eventName] = array();
+			$this->listeners[$eventName][] = $params[0];
+		}
+		return $this;
+	}
 
-    public static function addListener($eventName, Closure $callback)
-    {
-        return static::$eventName($callback);
-    }
+	public static function addListener($eventName, Closure $callback)
+	{
+		return static::$eventName($callback);
+	}
 
-    public function on(array $eventHandlers)
-    {
-        for (
-            $count = count($eventHandlers),
-                $events = array_map(
-                    'ucfirst',
-                    $keys = array_keys(
-                        $eventHandlers = array_change_key_case(
-                            $eventHandlers,
-                            CASE_LOWER
-                        )
-                    )
-                ),
-                $i = 0;
-            $i < $count;
-            call_user_func(
-                array($this, "on{$events[$i]}"),
-                $eventHandlers[$keys[$i++]]
-            )
-        );
-    }
+	public function on(array $eventHandlers)
+	{
+		for (
+			$count = count($eventHandlers),
+				$events = array_map(
+					'ucfirst',
+					$keys = array_keys(
+						$eventHandlers = array_change_key_case(
+							$eventHandlers,
+							CASE_LOWER
+						)
+					)
+				),
+				$i = 0;
+			$i < $count;
+			call_user_func(
+				array($this, "on{$events[$i]}"),
+				$eventHandlers[$keys[$i++]]
+			)
+		);
+	}
 
-    /**
-     * Fire an event to notify all listeners
-     *
-     * @param string $eventName name of the event
-     * @param array  $params    event related data
-     */
-    protected function dispatch($eventName, array $params = array())
-    {
-        $this->events[] = $eventName;
-        $params = func_get_args();
-        $eventName = 'on'.ucfirst(array_shift($params));
-        if (isset($this->listeners[$eventName]))
-            foreach ($this->listeners[$eventName] as $callback)
-                call_user_func_array($callback, $params);
-    }
+	/**
+	 * Fire an event to notify all listeners
+	 *
+	 * @param string $eventName name of the event
+	 * @param array  $params    event related data
+	 */
+	protected function dispatch($eventName, array $params = array())
+	{
+		$this->events[] = $eventName;
+		$params = func_get_args();
+		$eventName = 'on'.ucfirst(array_shift($params));
+		if (isset($this->listeners[$eventName]))
+			foreach ($this->listeners[$eventName] as $callback)
+				call_user_func_array($callback, $params);
+	}
 
 }
 

htdocs/includes/restler/framework/Luracast/Restler/ExplorerInfo.php

Indentation +12 added lines, -12 removed lines

@@ -8,16 +8,16 @@
  */
 class ExplorerInfo
 {
-    public static $title = 'Restler API Explorer';
-    public static $description = 'Live API Documentation';
-    public static $termsOfService = null;
-    public static $contact = array(
-        'name'  => 'Restler Support',
-        'url'   => 'luracast.com/products/restler',
-        'email' => 'arul@luracast.com',
-    );
-    public static $license = array(
-        'name' => 'LGPL-2.1',
-        'url'  => 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html',
-    );
+	public static $title = 'Restler API Explorer';
+	public static $description = 'Live API Documentation';
+	public static $termsOfService = null;
+	public static $contact = array(
+		'name'  => 'Restler Support',
+		'url'   => 'luracast.com/products/restler',
+		'email' => 'arul@luracast.com',
+	);
+	public static $license = array(
+		'name' => 'LGPL-2.1',
+		'url'  => 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html',
+	);
 }
\ No newline at end of file

htdocs/includes/printipp/CupsPrintIPP.php

Indentation +721 added lines, -721 removed lines

@@ -40,735 +40,735 @@
 
 class CupsPrintIPP extends ExtendedPrintIPP
 {
-    public $printers_attributes;
-    public $defaults_attributes;
+	public $printers_attributes;
+	public $defaults_attributes;
 
-    protected $parsed;
-    protected $output;
+	protected $parsed;
+	protected $output;
 
-    public function __construct()
-    {
-        parent::__construct();
-        self::_initTags();
-    }
+	public function __construct()
+	{
+		parent::__construct();
+		self::_initTags();
+	}
 
 //
 // OPERATIONS
 //
-    public function cupsGetDefaults($attributes=array("all"))
-    {
-        //The CUPS-Get-Default operation returns the default printer URI and attributes
-
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en');
-        }
-
-        self::_setOperationId();
-
-        for($i = 0 ; $i < count($attributes) ; $i++)
-        {
-            if ($i == 0)
-            {
-                $this->meta->attributes = chr(0x44) // Keyword
-                                        . self::_giveMeStringLength('requested-attributes')
-                                        . 'requested-attributes'
-                                        . self::_giveMeStringLength($attributes[0])
-                                        . $attributes[0];
-            }
-            else
-            {
-                $this->meta->attributes .= chr(0x44) // Keyword
-                                        .  chr(0x0).chr(0x0) // zero-length name
-                                        .  self::_giveMeStringLength($attributes[$i])
-                                        .  $attributes[$i];
-            }
-        }
-
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x01) // operation:  cups vendor extension: get defaults
-                         . $this->meta->operation_id // request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->attributes
-                         . chr(0x03); // end operations attribute
-
-        $this->output = $this->stringjob;
-
-        self::_putDebug("Request: ".$this->output);
-
-        $post_values = array( "Content-Type" => "application/ipp",
-                              "Data" => $this->output);
-
-        if (self::_sendHttp ($post_values,'/'))
-        {
-
-            if(self::_parseServerOutput())
-            {
-                self::_parsePrinterAttributes();
-            }
-        }
-
-       $this->attributes = &$this->printer_attributes;
-
-       if (isset($this->printer_attributes->printer_type))
-       {
-                    $printer_type = $this->printer_attributes->printer_type->_value0;
-                    $table = self::_interpretPrinterType($printer_type);
-
-                    for($i = 0 ; $i < count($table) ; $i++ )
-                    {
-                        $index = '_value'.$i;
-                        $this->printer_attributes->printer_type->$index = $table[$i];
-                        }
-                    }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
-            }
-            else
-            {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status;
-        }
-        else
-        {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
-            }
-    return false;
-    }
-
-
-    public function cupsAcceptJobs($printer_uri)
-    {
-    //The CUPS-Get-Default operation returns the default printer URI and attributes
-
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en');
-        }
-
-        self::_setOperationId();
-
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x08) // operation:  cups vendor extension: Accept-Jobs
-                         . $this->meta->operation_id // request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . chr(0x45) // uri
-                         . self::_giveMeStringLength('printer-uri')
-                         . 'printer-uri'
-                         . self::_giveMeStringLength($printer_uri)
-                         . $printer_uri
-                         . chr(0x03); // end operations attribute
-
-        $this->output = $this->stringjob;
-
-        self::_putDebug("Request: ".$this->output);
-
-        $post_values = array( "Content-Type" => "application/ipp",
-                              "Data" => $this->output);
-
-        if (self::_sendHttp ($post_values,'/admin/'))
-        {
-
-            if(self::_parseServerOutput())
-            {
-                self::_parseAttributes();
-            }
-        }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
-            }
-            else
-            {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status;
-        }
-        else
-        {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
-            }
-    return false;
-    }
-
-
-    public function cupsRejectJobs($printer_uri,$printer_state_message)
-    {
-    //The CUPS-Get-Default operation returns the default printer URI and attributes
-
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-        $this->parsed = array();
-        unset($this->attributes);
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en');
-        }
-
-        self::_setOperationId();
-
-        $message = "";
-        if ($printer_state_message)
-        {
-            $message = chr(0x04) // start printer-attributes
-                     . chr(0x41) // textWithoutLanguage
-                     . self::_giveMeStringLength("printer-state-message")
-                     . "printer-state-message"
-                     . self::_giveMeStringLength($printer_state_message)
-                     . $printer_state_message;
-        }
-
-       $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x09) // operation:  cups vendor extension: Reject-Jobs
-                         . $this->meta->operation_id // request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . chr(0x45) // uri
-                         . self::_giveMeStringLength('printer-uri')
-                         . 'printer-uri'
-                         . self::_giveMeStringLength($printer_uri)
-                         . $printer_uri
-                         . $message
-                         . chr(0x03); // end operations attribute
-
-        $this->output = $this->stringjob;
-
-        self::_putDebug("Request: ".$this->output);
-
-        $post_values = array( "Content-Type" => "application/ipp",
-                              "Data" => $this->output);
-
-        if (self::_sendHttp ($post_values,'/admin/'))
-        {
-
-            if(self::_parseServerOutput())
-            {
-                self::_parseAttributes();
-            }
-        }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
-            }
-            else
-            {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status;
-        }
-        else
-        {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
-        }
-        return false;
-    }
-
-
-    public function getPrinters($printer_location=false,$printer_info=false,$attributes=array())
-    {
-        if (count($attributes) == 0)
-        {
-            true;
-        }
-        $attributes=array('printer-uri-supported', 'printer-location', 'printer-info', 'printer-type', 'color-supported', 'printer-name');
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-
-        unset ($this->printers_attributes);
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en-us');
-        }
-
-        self::_setOperationId();
-
-        $this->meta->attributes='';
-
-        if ($printer_location)
-        {
-            $this->meta->attributes .= chr(0x41) // textWithoutLanguage
-                                    . self::_giveMeStringLength('printer-location')
-                                    . 'printer-location'
-                                    . self::_giveMeStringLength($printer_location)
-                                    . $printer_location;
-        }
-
-        if ($printer_info)
-        {
-            $this->meta->attributes .= chr(0x41) // textWithoutLanguage
-                                    . self::_giveMeStringLength('printer-info')
-                                    . 'printer-info'
-                                    . self::_giveMeStringLength($printer_info)
-                                    . $printer_info;
-        }
-
-        for($i = 0 ; $i < count($attributes) ; $i++)
-        {
-            if ($i == 0)
-            {
-                $this->meta->attributes .= chr(0x44) // Keyword
-                                        . self::_giveMeStringLength('requested-attributes')
-                                        . 'requested-attributes'
-                                        . self::_giveMeStringLength($attributes[0])
-                                        . $attributes[0];
-            }
-            else
-            {
-                $this->meta->attributes .= chr(0x44) // Keyword
-                                        .  chr(0x0).chr(0x0) // zero-length name
-                                        .  self::_giveMeStringLength($attributes[$i])
-                                        .  $attributes[$i];
-            }
-        }
-
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x02) // operation:  cups vendor extension: get printers
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->attributes
-                         . chr(0x03); // end operations attribute
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type" => "application/ipp",
-                              "Data" => $this->output);
-
-        if (self::_sendHttp ($post_values,'/'))
-        {
-
-            if(self::_parseServerOutput())
-            {
-                $this->_getAvailablePrinters();
-            }
-        }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog("getting printers: ".$this->serveroutput->status,3);
-            }
-            else
-            {
-                self::_errorLog("getting printers: ".$this->serveroutput->status,1);
-            }
-            return $this->serveroutput->status;
-        }
-        else
-        {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting printers : OPERATION FAILED",1);
-        }
-        return false;
-    }
-
-
-    public function cupsGetPrinters ()
-    {
-        // alias for getPrinters();
-        self::getPrinters();
-    }
-
-
-    public function getPrinterAttributes()
-    {
-        // complete informations from parent with Cups-specific stuff
-
-        if(!$result = parent::getPrinterAttributes())
-        {
-            return FALSE;
-        }
-        if(!isset($this->printer_attributes))
-        {
-            return FALSE;
-        }
-
-        if (isset ($this->printer_attributes->printer_type))
-        {
-            $printer_type = $this->printer_attributes->printer_type->_value0;
-            $table = self::_interpretPrinterType($printer_type);
-
-            for($i = 0 ; $i < count($table) ; $i++ )
-            {
-                $index = '_value'.$i;
-                $this->printer_attributes->printer_type->$index = $table[$i];
-            }
-        }
-
-        return $result;
-    }
+	public function cupsGetDefaults($attributes=array("all"))
+	{
+		//The CUPS-Get-Default operation returns the default printer URI and attributes
+
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en');
+		}
+
+		self::_setOperationId();
+
+		for($i = 0 ; $i < count($attributes) ; $i++)
+		{
+			if ($i == 0)
+			{
+				$this->meta->attributes = chr(0x44) // Keyword
+										. self::_giveMeStringLength('requested-attributes')
+										. 'requested-attributes'
+										. self::_giveMeStringLength($attributes[0])
+										. $attributes[0];
+			}
+			else
+			{
+				$this->meta->attributes .= chr(0x44) // Keyword
+										.  chr(0x0).chr(0x0) // zero-length name
+										.  self::_giveMeStringLength($attributes[$i])
+										.  $attributes[$i];
+			}
+		}
+
+		$this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
+						 . chr(0x40). chr(0x01) // operation:  cups vendor extension: get defaults
+						 . $this->meta->operation_id // request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->attributes
+						 . chr(0x03); // end operations attribute
+
+		$this->output = $this->stringjob;
+
+		self::_putDebug("Request: ".$this->output);
+
+		$post_values = array( "Content-Type" => "application/ipp",
+							  "Data" => $this->output);
+
+		if (self::_sendHttp ($post_values,'/'))
+		{
+
+			if(self::_parseServerOutput())
+			{
+				self::_parsePrinterAttributes();
+			}
+		}
+
+	   $this->attributes = &$this->printer_attributes;
+
+	   if (isset($this->printer_attributes->printer_type))
+	   {
+					$printer_type = $this->printer_attributes->printer_type->_value0;
+					$table = self::_interpretPrinterType($printer_type);
+
+					for($i = 0 ; $i < count($table) ; $i++ )
+					{
+						$index = '_value'.$i;
+						$this->printer_attributes->printer_type->$index = $table[$i];
+						}
+					}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
+			}
+			else
+			{
+				self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status;
+		}
+		else
+		{
+			$this->status = array_merge($this->status,array("OPERATION FAILED"));
+			self::_errorLog("getting defaults : OPERATION FAILED",1);
+			}
+	return false;
+	}
+
+
+	public function cupsAcceptJobs($printer_uri)
+	{
+	//The CUPS-Get-Default operation returns the default printer URI and attributes
+
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en');
+		}
+
+		self::_setOperationId();
+
+		$this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
+						 . chr(0x40). chr(0x08) // operation:  cups vendor extension: Accept-Jobs
+						 . $this->meta->operation_id // request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . chr(0x45) // uri
+						 . self::_giveMeStringLength('printer-uri')
+						 . 'printer-uri'
+						 . self::_giveMeStringLength($printer_uri)
+						 . $printer_uri
+						 . chr(0x03); // end operations attribute
+
+		$this->output = $this->stringjob;
+
+		self::_putDebug("Request: ".$this->output);
+
+		$post_values = array( "Content-Type" => "application/ipp",
+							  "Data" => $this->output);
+
+		if (self::_sendHttp ($post_values,'/admin/'))
+		{
+
+			if(self::_parseServerOutput())
+			{
+				self::_parseAttributes();
+			}
+		}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
+			}
+			else
+			{
+				self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status;
+		}
+		else
+		{
+			$this->status = array_merge($this->status,array("OPERATION FAILED"));
+			self::_errorLog("getting defaults : OPERATION FAILED",1);
+			}
+	return false;
+	}
+
+
+	public function cupsRejectJobs($printer_uri,$printer_state_message)
+	{
+	//The CUPS-Get-Default operation returns the default printer URI and attributes
+
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+		$this->parsed = array();
+		unset($this->attributes);
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en');
+		}
+
+		self::_setOperationId();
+
+		$message = "";
+		if ($printer_state_message)
+		{
+			$message = chr(0x04) // start printer-attributes
+					 . chr(0x41) // textWithoutLanguage
+					 . self::_giveMeStringLength("printer-state-message")
+					 . "printer-state-message"
+					 . self::_giveMeStringLength($printer_state_message)
+					 . $printer_state_message;
+		}
+
+	   $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
+						 . chr(0x40). chr(0x09) // operation:  cups vendor extension: Reject-Jobs
+						 . $this->meta->operation_id // request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . chr(0x45) // uri
+						 . self::_giveMeStringLength('printer-uri')
+						 . 'printer-uri'
+						 . self::_giveMeStringLength($printer_uri)
+						 . $printer_uri
+						 . $message
+						 . chr(0x03); // end operations attribute
+
+		$this->output = $this->stringjob;
+
+		self::_putDebug("Request: ".$this->output);
+
+		$post_values = array( "Content-Type" => "application/ipp",
+							  "Data" => $this->output);
+
+		if (self::_sendHttp ($post_values,'/admin/'))
+		{
+
+			if(self::_parseServerOutput())
+			{
+				self::_parseAttributes();
+			}
+		}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
+			}
+			else
+			{
+				self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status;
+		}
+		else
+		{
+			$this->status = array_merge($this->status,array("OPERATION FAILED"));
+			self::_errorLog("getting defaults : OPERATION FAILED",1);
+		}
+		return false;
+	}
+
+
+	public function getPrinters($printer_location=false,$printer_info=false,$attributes=array())
+	{
+		if (count($attributes) == 0)
+		{
+			true;
+		}
+		$attributes=array('printer-uri-supported', 'printer-location', 'printer-info', 'printer-type', 'color-supported', 'printer-name');
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+
+		unset ($this->printers_attributes);
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en-us');
+		}
+
+		self::_setOperationId();
+
+		$this->meta->attributes='';
+
+		if ($printer_location)
+		{
+			$this->meta->attributes .= chr(0x41) // textWithoutLanguage
+									. self::_giveMeStringLength('printer-location')
+									. 'printer-location'
+									. self::_giveMeStringLength($printer_location)
+									. $printer_location;
+		}
+
+		if ($printer_info)
+		{
+			$this->meta->attributes .= chr(0x41) // textWithoutLanguage
+									. self::_giveMeStringLength('printer-info')
+									. 'printer-info'
+									. self::_giveMeStringLength($printer_info)
+									. $printer_info;
+		}
+
+		for($i = 0 ; $i < count($attributes) ; $i++)
+		{
+			if ($i == 0)
+			{
+				$this->meta->attributes .= chr(0x44) // Keyword
+										. self::_giveMeStringLength('requested-attributes')
+										. 'requested-attributes'
+										. self::_giveMeStringLength($attributes[0])
+										. $attributes[0];
+			}
+			else
+			{
+				$this->meta->attributes .= chr(0x44) // Keyword
+										.  chr(0x0).chr(0x0) // zero-length name
+										.  self::_giveMeStringLength($attributes[$i])
+										.  $attributes[$i];
+			}
+		}
+
+		$this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
+						 . chr(0x40). chr(0x02) // operation:  cups vendor extension: get printers
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->attributes
+						 . chr(0x03); // end operations attribute
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type" => "application/ipp",
+							  "Data" => $this->output);
+
+		if (self::_sendHttp ($post_values,'/'))
+		{
+
+			if(self::_parseServerOutput())
+			{
+				$this->_getAvailablePrinters();
+			}
+		}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog("getting printers: ".$this->serveroutput->status,3);
+			}
+			else
+			{
+				self::_errorLog("getting printers: ".$this->serveroutput->status,1);
+			}
+			return $this->serveroutput->status;
+		}
+		else
+		{
+			$this->status = array_merge($this->status,array("OPERATION FAILED"));
+			self::_errorLog("getting printers : OPERATION FAILED",1);
+		}
+		return false;
+	}
+
+
+	public function cupsGetPrinters ()
+	{
+		// alias for getPrinters();
+		self::getPrinters();
+	}
+
+
+	public function getPrinterAttributes()
+	{
+		// complete informations from parent with Cups-specific stuff
+
+		if(!$result = parent::getPrinterAttributes())
+		{
+			return FALSE;
+		}
+		if(!isset($this->printer_attributes))
+		{
+			return FALSE;
+		}
+
+		if (isset ($this->printer_attributes->printer_type))
+		{
+			$printer_type = $this->printer_attributes->printer_type->_value0;
+			$table = self::_interpretPrinterType($printer_type);
+
+			for($i = 0 ; $i < count($table) ; $i++ )
+			{
+				$index = '_value'.$i;
+				$this->printer_attributes->printer_type->$index = $table[$i];
+			}
+		}
+
+		return $result;
+	}
 
 //
 // SETUP
 //
-    protected function _initTags ()
-    {
-        // override parent with specific cups attributes
-
-        $operation_tags = array ();
-        $this->operation_tags = array_merge ($this->operation_tags, $operation_tags);
-
-        $job_tags = array ( "job-billing" => array("tag" => "textWithoutLanguage"),
-                            "blackplot" => array("tag" => "boolean"),
-                            "brightness" => array("tag" => "integer"),
-                            "columns" => array("tag" => "integer"),
-                            "cpi" => array("tag" => "enum"),
-                            "fitplot" => array("tag" => "boolean"),
-                            "gamma" => array("tag" => "integer"),
-                            "hue" => array("tag" => "integer"),
-                            "lpi" => array("tag" => "enum"),
-                            "mirror" => array("tag","boolean"),
-                            "natural-scaling" => array("tag" => "integer"),
-                            "number-up-layout" => array("tag" => "keyword"),
-                            "page-border" => array("tag" => "keyword"),
-                            "page-bottom" => array("tag" => "integer"),
-                            "page-label" => array("tag" => "textWithoutLanguage"),
-                            "page-left" => array("tag" => "integer"),
-                            "page-right" => array("tag" => "integer"),
-                            "page-set" => array("tag" => "keyword"),
-                            "page-top" => array("tag" => "integer"),
-                            "penwidth" => array("tag" => "integer"),
-                            "position" => array("tag" => "keyword"),
-                            "ppi" => array("tag" => "integer"),
-                            "prettyprint" => array("tag","boolean"),
-                            "saturation" => array("tag" => "integer"),
-                            "scaling" => array("tag" => "integer"),
-                            "wrap" => array("tag","boolean"),
-
-                            );
-        $this->job_tags = array_merge ($this->job_tags, $job_tags);
-    }
-
-    //
-    // REQUEST BUILDING
-    //
-    protected function _enumBuild ($tag,$value)
-    {
-        $value_built = parent::_enumBuild($tag,$value);
-
-        switch ($tag)
-        {
-           case "cpi":
-                switch ($value)
-                {
-                    case '10':
-                        $value_built = chr(10);
-                        break;
-                    case '12':
-                        $value_built = chr(12);
-                        break;
-                    case '17':
-                        $value_built = chr(17);
-                        break;
-                    default:
-                        $value_built = chr(10);
-                }
-            break;
-            case "lpi":
-                switch ($value)
-                {
-                    case '6':
-                        $value_built = chr(6);
-                        break;
-                    case '8':
-                        $value_built = chr(8);
-                        break;
-                    default:
-                        $value_built = chr(6);
-                }
-            break;
-            }
-
-        $prepend = '';
-        while ((strlen($value_built) + strlen($prepend)) < 4)
-            $prepend .= chr(0);
-        return $prepend.$value_built;
-    }
-
-    //
-    // RESPONSE PARSING
-    //
-    private function _getAvailablePrinters ()
-    {
-        $this->available_printers = array();
-        $this->printer_map = array();
-        $k = 0;
-        $this->printers_attributes = new \stdClass();
-
-        for ($i = 0 ; (array_key_exists($i,$this->serveroutput->response)) ; $i ++)
-        {
-            if (($this->serveroutput->response[$i]['attributes']) == "printer-attributes")
-            {
-                $phpname = "_printer".$k;
-                $this->printers_attributes->$phpname = new \stdClass();
-                for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
-                {
-
-                    $value = $this->serveroutput->response[$i][$j]['value'];
-                    $name = str_replace("-","_",$this->serveroutput->response[$i][$j]['name']);
-
-                    switch ($name)
-                    {
-                        case "printer_uri_supported":
-                            $this->available_printers = array_merge($this->available_printers,array($value));
-                            break;
-                        case "printer_type":
-                            $table = self::_interpretPrinterType($value);
-                            $this->printers_attributes->$phpname->$name = new \stdClass();
-
-                            for($l = 0 ; $l < count($table) ; $l++ )
-                            {
-                                $index = '_value'.$l;
-                                $this->printers_attributes->$phpname->$name->$index = $table[$l];
-                            }
-
-                            break;
-                        case '':
-                            break;
-                        case 'printer_name':
-                            $this->printer_map[$value] = $k;
-                            break;
-                        default:
-                            $this->printers_attributes->$phpname->$name = $value;
-                            break;
-                    }
-                }
-                $k ++;
-            }
-        }
-    }
-
-    protected function _getEnumVendorExtensions ($value_parsed)
-    {
-        switch ($value_parsed)
-        {
-            case 0x4002:
-                $value = 'Get-Availables-Printers';
-                break;
-            default:
-                $value = sprintf('Unknown(Cups extension for operations): 0x%x',$value_parsed);
-                break;
-        }
-
-        if (isset($value))
-        {
-            return ($value);
-        }
-
-        return sprintf('Unknown: 0x%x',$value_parsed);
-    }
-
-
-    private function _interpretPrinterType($value)
-    {
-        $value_parsed = 0;
-        for ($i = strlen($value) ; $i > 0 ; $i --)
-        {
-            $value_parsed += pow(256,($i - 1)) * ord($value[strlen($value) - $i]);
-        }
-
-        $type[0] = $type[1] = $type[2] = $type[3] = $type[4] = $type[5] = '';
-        $type[6] = $type[7] = $type[8] = $type[9] = $type[10] = '';
-        $type[11] = $type[12] = $type[13] = $type[14] = $type[15] = '';
-        $type[16] = $type[17] = $type[18] = $type[19] = '';
-
-        if ($value_parsed %2 == 1)
-        {
-            $type[0] = 'printer-class';
-            $value_parsed -= 1;
-        }
-
-        if ($value_parsed %4 == 2 )
-        {
-            $type[1] = 'remote-destination';
-            $value_parsed -= 2;
-        }
-
-        if ($value_parsed %8 == 4 )
-        {
-            $type[2] = 'print-black';
-            $value_parsed -= 4;
-        }
-
-        if ($value_parsed %16 == 8 )
-        {
-            $type[3] = 'print-color';
-            $value_parsed -= 8;
-        }
-
-        if ($value_parsed %32 == 16)
-        {
-            $type[4] = 'hardware-print-on-both-sides';
-            $value_parsed -= 16;
-        }
-
-        if ($value_parsed %64 == 32)
-        {
-            $type[5] = 'hardware-staple-output';
-            $value_parsed -= 32;
-        }
-
-        if ($value_parsed %128 == 64)
-        {
-            $type[6] = 'hardware-fast-copies';
-            $value_parsed -= 64;
-        }
-
-        if ($value_parsed %256 == 128)
-        {
-            $type[7] = 'hardware-fast-copy-collation';
-            $value_parsed -= 128;
-        }
-
-        if ($value_parsed %512 == 256)
-        {
-            $type[8] = 'punch-output';
-            $value_parsed -= 256;
-        }
-
-        if ($value_parsed %1024 == 512)
-        {
-            $type[9] = 'cover-output';
-            $value_parsed -= 512;
-        }
-
-        if ($value_parsed %2048 == 1024)
-        {
-            $type[10] = 'bind-output';
-            $value_parsed -= 1024;
-        }
-
-        if ($value_parsed %4096 == 2048)
-        {
-            $type[11] = 'sort-output';
-            $value_parsed -= 2048;
-        }
-
-        if ($value_parsed %8192 == 4096)
-        {
-            $type[12] = 'handle-media-up-to-US-Legal-A4';
-            $value_parsed -= 4096;
-        }
-
-        if ($value_parsed %16384 == 8192)
-        {
-            $type[13] = 'handle-media-between-US-Legal-A4-and-ISO_C-A2';
-            $value_parsed -= 8192;
-        }
-
-        if ($value_parsed %32768 == 16384)
-        {
-            $type[14] = 'handle-media-larger-than-ISO_C-A2';
-            $value_parsed -= 16384;
-        }
-
-        if ($value_parsed %65536 == 32768)
-        {
-            $type[15] = 'handle-user-defined-media-sizes';
-            $value_parsed -= 32768;
-        }
-
-        if ($value_parsed %131072 == 65536)
-        {
-            $type[16] = 'implicit-server-generated-class';
-            $value_parsed -= 65536;
-        }
-
-        if ($value_parsed %262144 == 131072)
-        {
-            $type[17] = 'network-default-printer';
-            $value_parsed -= 131072;
-        }
-
-        if ($value_parsed %524288 == 262144)
-        {
-            $type[18] = 'fax-device';
-            $value_parsed -= 262144;
-        }
-
-        return $type;
-    }
-
-
-    protected function _interpretEnum($attribute_name,$value)
-    {
-        $value_parsed = self::_interpretInteger($value);
-
-        switch ($attribute_name)
-        {
-            case 'cpi':
-            case 'lpi':
-                $value = $value_parsed;
-                break;
-            default:
-                $value = parent::_interpretEnum($attribute_name,$value);
-                break;
-        }
-
-        return $value;
-    }
+	protected function _initTags ()
+	{
+		// override parent with specific cups attributes
+
+		$operation_tags = array ();
+		$this->operation_tags = array_merge ($this->operation_tags, $operation_tags);
+
+		$job_tags = array ( "job-billing" => array("tag" => "textWithoutLanguage"),
+							"blackplot" => array("tag" => "boolean"),
+							"brightness" => array("tag" => "integer"),
+							"columns" => array("tag" => "integer"),
+							"cpi" => array("tag" => "enum"),
+							"fitplot" => array("tag" => "boolean"),
+							"gamma" => array("tag" => "integer"),
+							"hue" => array("tag" => "integer"),
+							"lpi" => array("tag" => "enum"),
+							"mirror" => array("tag","boolean"),
+							"natural-scaling" => array("tag" => "integer"),
+							"number-up-layout" => array("tag" => "keyword"),
+							"page-border" => array("tag" => "keyword"),
+							"page-bottom" => array("tag" => "integer"),
+							"page-label" => array("tag" => "textWithoutLanguage"),
+							"page-left" => array("tag" => "integer"),
+							"page-right" => array("tag" => "integer"),
+							"page-set" => array("tag" => "keyword"),
+							"page-top" => array("tag" => "integer"),
+							"penwidth" => array("tag" => "integer"),
+							"position" => array("tag" => "keyword"),
+							"ppi" => array("tag" => "integer"),
+							"prettyprint" => array("tag","boolean"),
+							"saturation" => array("tag" => "integer"),
+							"scaling" => array("tag" => "integer"),
+							"wrap" => array("tag","boolean"),
+
+							);
+		$this->job_tags = array_merge ($this->job_tags, $job_tags);
+	}
+
+	//
+	// REQUEST BUILDING
+	//
+	protected function _enumBuild ($tag,$value)
+	{
+		$value_built = parent::_enumBuild($tag,$value);
+
+		switch ($tag)
+		{
+		   case "cpi":
+				switch ($value)
+				{
+					case '10':
+						$value_built = chr(10);
+						break;
+					case '12':
+						$value_built = chr(12);
+						break;
+					case '17':
+						$value_built = chr(17);
+						break;
+					default:
+						$value_built = chr(10);
+				}
+			break;
+			case "lpi":
+				switch ($value)
+				{
+					case '6':
+						$value_built = chr(6);
+						break;
+					case '8':
+						$value_built = chr(8);
+						break;
+					default:
+						$value_built = chr(6);
+				}
+			break;
+			}
+
+		$prepend = '';
+		while ((strlen($value_built) + strlen($prepend)) < 4)
+			$prepend .= chr(0);
+		return $prepend.$value_built;
+	}
+
+	//
+	// RESPONSE PARSING
+	//
+	private function _getAvailablePrinters ()
+	{
+		$this->available_printers = array();
+		$this->printer_map = array();
+		$k = 0;
+		$this->printers_attributes = new \stdClass();
+
+		for ($i = 0 ; (array_key_exists($i,$this->serveroutput->response)) ; $i ++)
+		{
+			if (($this->serveroutput->response[$i]['attributes']) == "printer-attributes")
+			{
+				$phpname = "_printer".$k;
+				$this->printers_attributes->$phpname = new \stdClass();
+				for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
+				{
+
+					$value = $this->serveroutput->response[$i][$j]['value'];
+					$name = str_replace("-","_",$this->serveroutput->response[$i][$j]['name']);
+
+					switch ($name)
+					{
+						case "printer_uri_supported":
+							$this->available_printers = array_merge($this->available_printers,array($value));
+							break;
+						case "printer_type":
+							$table = self::_interpretPrinterType($value);
+							$this->printers_attributes->$phpname->$name = new \stdClass();
+
+							for($l = 0 ; $l < count($table) ; $l++ )
+							{
+								$index = '_value'.$l;
+								$this->printers_attributes->$phpname->$name->$index = $table[$l];
+							}
+
+							break;
+						case '':
+							break;
+						case 'printer_name':
+							$this->printer_map[$value] = $k;
+							break;
+						default:
+							$this->printers_attributes->$phpname->$name = $value;
+							break;
+					}
+				}
+				$k ++;
+			}
+		}
+	}
+
+	protected function _getEnumVendorExtensions ($value_parsed)
+	{
+		switch ($value_parsed)
+		{
+			case 0x4002:
+				$value = 'Get-Availables-Printers';
+				break;
+			default:
+				$value = sprintf('Unknown(Cups extension for operations): 0x%x',$value_parsed);
+				break;
+		}
+
+		if (isset($value))
+		{
+			return ($value);
+		}
+
+		return sprintf('Unknown: 0x%x',$value_parsed);
+	}
+
+
+	private function _interpretPrinterType($value)
+	{
+		$value_parsed = 0;
+		for ($i = strlen($value) ; $i > 0 ; $i --)
+		{
+			$value_parsed += pow(256,($i - 1)) * ord($value[strlen($value) - $i]);
+		}
+
+		$type[0] = $type[1] = $type[2] = $type[3] = $type[4] = $type[5] = '';
+		$type[6] = $type[7] = $type[8] = $type[9] = $type[10] = '';
+		$type[11] = $type[12] = $type[13] = $type[14] = $type[15] = '';
+		$type[16] = $type[17] = $type[18] = $type[19] = '';
+
+		if ($value_parsed %2 == 1)
+		{
+			$type[0] = 'printer-class';
+			$value_parsed -= 1;
+		}
+
+		if ($value_parsed %4 == 2 )
+		{
+			$type[1] = 'remote-destination';
+			$value_parsed -= 2;
+		}
+
+		if ($value_parsed %8 == 4 )
+		{
+			$type[2] = 'print-black';
+			$value_parsed -= 4;
+		}
+
+		if ($value_parsed %16 == 8 )
+		{
+			$type[3] = 'print-color';
+			$value_parsed -= 8;
+		}
+
+		if ($value_parsed %32 == 16)
+		{
+			$type[4] = 'hardware-print-on-both-sides';
+			$value_parsed -= 16;
+		}
+
+		if ($value_parsed %64 == 32)
+		{
+			$type[5] = 'hardware-staple-output';
+			$value_parsed -= 32;
+		}
+
+		if ($value_parsed %128 == 64)
+		{
+			$type[6] = 'hardware-fast-copies';
+			$value_parsed -= 64;
+		}
+
+		if ($value_parsed %256 == 128)
+		{
+			$type[7] = 'hardware-fast-copy-collation';
+			$value_parsed -= 128;
+		}
+
+		if ($value_parsed %512 == 256)
+		{
+			$type[8] = 'punch-output';
+			$value_parsed -= 256;
+		}
+
+		if ($value_parsed %1024 == 512)
+		{
+			$type[9] = 'cover-output';
+			$value_parsed -= 512;
+		}
+
+		if ($value_parsed %2048 == 1024)
+		{
+			$type[10] = 'bind-output';
+			$value_parsed -= 1024;
+		}
+
+		if ($value_parsed %4096 == 2048)
+		{
+			$type[11] = 'sort-output';
+			$value_parsed -= 2048;
+		}
+
+		if ($value_parsed %8192 == 4096)
+		{
+			$type[12] = 'handle-media-up-to-US-Legal-A4';
+			$value_parsed -= 4096;
+		}
+
+		if ($value_parsed %16384 == 8192)
+		{
+			$type[13] = 'handle-media-between-US-Legal-A4-and-ISO_C-A2';
+			$value_parsed -= 8192;
+		}
+
+		if ($value_parsed %32768 == 16384)
+		{
+			$type[14] = 'handle-media-larger-than-ISO_C-A2';
+			$value_parsed -= 16384;
+		}
+
+		if ($value_parsed %65536 == 32768)
+		{
+			$type[15] = 'handle-user-defined-media-sizes';
+			$value_parsed -= 32768;
+		}
+
+		if ($value_parsed %131072 == 65536)
+		{
+			$type[16] = 'implicit-server-generated-class';
+			$value_parsed -= 65536;
+		}
+
+		if ($value_parsed %262144 == 131072)
+		{
+			$type[17] = 'network-default-printer';
+			$value_parsed -= 131072;
+		}
+
+		if ($value_parsed %524288 == 262144)
+		{
+			$type[18] = 'fax-device';
+			$value_parsed -= 262144;
+		}
+
+		return $type;
+	}
+
+
+	protected function _interpretEnum($attribute_name,$value)
+	{
+		$value_parsed = self::_interpretInteger($value);
+
+		switch ($attribute_name)
+		{
+			case 'cpi':
+			case 'lpi':
+				$value = $value_parsed;
+				break;
+			default:
+				$value = parent::_interpretEnum($attribute_name,$value);
+				break;
+		}
+
+		return $value;
+	}
 }
\ No newline at end of file

htdocs/includes/printipp/PrintIPP.php

Indentation +1976 added lines, -1976 removed lines

@@ -44,1944 +44,1944 @@ 
 
 class PrintIPP extends BasicIPP
 {
-    public function __construct()
-    {
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		parent::__construct();
+	}
 
 // OPERATIONS
-    public function printJob()
-    {
-        self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
-
-        if (!$this->_stringJob())
-        {
-            return FALSE;
-        }
-
-        if (is_readable($this->data))
-        {
-            self::_putDebug( _("Printing a FILE\n"),3); 
-
-            $this->output = $this->stringjob;
-
-            if ($this->setup->datatype == "TEXT")
-            {
-                $this->output .= chr(0x16);
-            }
-
-            $post_values = array( "Content-Type" => "application/ipp",
-                                  "Data" => $this->output,
-                                  "File" => $this->data);
-
-            if ($this->setup->datatype == "TEXT" && !isset($this->setup->noFormFeed))
-            {
-                $post_values = array_merge($post_values,array("Filetype"=>"TEXT"));
-            }
-        }
-        else
-        {
-            self::_putDebug( _("Printing DATA\n"),3); 
-
-            $this->output = $this->stringjob;
-            $this->output .= $this->datahead;    
-            $this->output .= $this->data;
-            $this->output .= $this->datatail;
+	public function printJob()
+	{
+		self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
+
+		if (!$this->_stringJob())
+		{
+			return FALSE;
+		}
+
+		if (is_readable($this->data))
+		{
+			self::_putDebug( _("Printing a FILE\n"),3); 
+
+			$this->output = $this->stringjob;
+
+			if ($this->setup->datatype == "TEXT")
+			{
+				$this->output .= chr(0x16);
+			}
+
+			$post_values = array( "Content-Type" => "application/ipp",
+								  "Data" => $this->output,
+								  "File" => $this->data);
+
+			if ($this->setup->datatype == "TEXT" && !isset($this->setup->noFormFeed))
+			{
+				$post_values = array_merge($post_values,array("Filetype"=>"TEXT"));
+			}
+		}
+		else
+		{
+			self::_putDebug( _("Printing DATA\n"),3); 
+
+			$this->output = $this->stringjob;
+			$this->output .= $this->datahead;    
+			$this->output .= $this->data;
+			$this->output .= $this->datatail;
             
-            $post_values = array( "Content-Type" => "application/ipp",
-                                  "Data" => $this->output);
-        }
-
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
-        {
-            if(self::_parseServerOutput())
-            {
-                $this->_getJobId();
-                $this->_getJobUri();
-                $this->_parseJobAttributes();
-            }
-            else
-            {
-                $this->jobs = array_merge($this->jobs,array(''));
-                $this->jobs_uri = array_merge($this->jobs_uri,array(''));
-                }
-            }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-              self::_errorLog(sprintf("printing job %s: ",$this->last_job) .$this->serveroutput->status,3);
-            }
-            else
-            {
-                $this->jobs = array_merge($this->jobs,array(""));
-                $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-                self::_errorLog(sprintf("printing job: ",$this->last_job) .$this->serveroutput->status,1);
-                if ($this->with_exceptions)
-                {
-                    throw new ippException(sprintf("job status: %s",
-                    $this->serveroutput->status));
-                }
-            }
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-        self::_errorLog("printing job : OPERATION FAILED",1);
-
-        return false;
-    }
-
-    public function cancelJob ($job_uri)
-    {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-
-        self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
-
-        if (!$this->_stringCancel($job_uri))
-        {
-            return FALSE;
-        }
-
-        self::_putDebug( _("Cancelling Job $job_uri\n"),3); 
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
-        {
-            self::_parseServerOutput();
-        }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status,3);
-            }
-            else
-            {
-                self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status,1);
-            }
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog("cancelling job : OPERATION FAILED",3);
-
-        return false;
-    }
-
-    public function validateJob ()
-    {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-
-        $this->serveroutput->response = '';
-
-        self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
-
-        self::_putDebug( _("Validate Job\n"),2); 
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-        if (!isset($this->setup->datatype))
-        {
-            self::setBinary();
-        }
-
-        if (!isset($this->setup->uri))
-        {
-            $this->getPrinters();
-            unset($this->jobs[count($this->jobs) - 1]);
-            unset($this->jobs_uri[count($this->jobs_uri) - 1]);
-            unset($this->status[count($this->status) - 1]);
-
-            if (array_key_exists(0,$this->available_printers))
-            {
-               self::setPrinterURI($this->available_printers[0]);
-            }
-            else
-            {
-                trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
-                self::_errorLog(" Printer URI is not set, die",2);
-                return FALSE;
-                }
-            }
-
-        if (!isset($this->meta->copies))
-        {
-            self::setCopies(1);
-        }
-
-        if (!isset($this->setup->copies))
-        {
-            self::setCopies(1);
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->setup->mime_media_type))
-        {
-            self::setMimeMediaType();
-        }
-
-        if ($this->setup->datatype != "TEXT")
-        {
-            unset ($this->setup->mime_media_type);
-        }
-
-        if (!isset($this->setup->jobname))
-        {
-            if (is_readable($this->data))
-            {
-                self::setJobName(basename($this->data),true);
-            }
-            else
-            {
-                self::setJobName();
-            }
-        }
-        unset($this->setup->jobname);
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        if (!isset($this->meta->fidelity))
-        {
-            $this->meta->fidelity = '';
-        }
-
-        if (!isset($this->meta->document_name))
-        {
-            $this->meta->document_name = '';
-        }
-
-        if (!isset($this->meta->sides))
-        {
-            $this->meta->sides = '';
-        }
-
-        if (!isset($this->meta->page_ranges))
-        {
-            $this->meta->page_ranges = '';
-        }
-
-        $jobattributes = '';
-        $operationattributes = '';
-        $printerattributes = '';
-        self::_buildValues ($operationattributes,$jobattributes,$printerattributes);
-
-        self::_setOperationId();
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x04) // Validate-Job | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->printer_uri
-                         . $this->meta->username
-                         . $this->meta->jobname
-                         . $this->meta->fidelity
-                         . $this->meta->document_name
-                         . $this->meta->mime_media_type
-                         . $operationattributes
-                         . chr(0x02) // start job-attributes | job-attributes-tag
-                         . $this->meta->copies
-                         . $this->meta->sides
-                         . $this->meta->page_ranges
-                         . $jobattributes
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
-        {
-            if(self::_parseServerOutput())
-            {
-                self::_parseAttributes();
-            }
-        }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog("validate job: ".$this->serveroutput->status,3);
-            }
-            else
-            {
-                self::_errorLog("validate job: ".$this->serveroutput->status,1);
-            }
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog("validate job : OPERATION FAILED",3);
-
-        return false;
-    }
-
-    public function getPrinterAttributes()
-    {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-
-        $jobattributes = '';
-        $operationattributes = '';
-        self::_buildValues($operationattributes,$jobattributes,$printerattributes);
-        self::_setOperationId();
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->uri))
-        {
-            $this->getPrinters();
-            unset($this->jobs[count($this->jobs) - 1]);
-            unset($this->jobs_uri[count($this->jobs_uri) - 1]);
-            unset($this->status[count($this->status) - 1]);
-
-            if (array_key_exists(0,$this->available_printers))
-            {
-               self::setPrinterURI($this->available_printers[0]);
-            }
-            else
-            {
-                trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
-                self::_errorLog(" Printer URI is not set, die",2);
-                return FALSE;
-                }
-            }
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x0b) // Print-URI | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->printer_uri
-                         . $this->meta->username
-                         . $printerattributes
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-
-        self::_putDebug(sprintf(_("Getting printer attributes of %s\n"),$this->printer_uri),2); 
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['root']))
-        {
-            if (self::_parseServerOutput())
-            {
-                self::_parsePrinterAttributes(); 
-            }
-        }
-
-        $this->attributes = &$this->printer_attributes;
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if  ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf(_("getting printer attributes of %s: %s"),$this->printer_uri,
-                                                                        $this->serveroutput->status),3);
-            }
-            else 
-            {
-                self::_errorLog(sprintf(_("getting printer attributes of %s: %s"),$this->printer_uri,
-                                                                        $this->serveroutput->status),1);
-            }
-
-            return $this->serveroutput->status;
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog(date("Y-m-d H:i:s : ")
-            .basename($_SERVER['PHP_SELF'])
-            .sprintf(_("getting printer's attributes of %s : OPERATION FAILED"),
-                $this->printer_uri),3);
-
-        return false;
-    }
-
-    public function getJobs($my_jobs=true,$limit=0,$which_jobs="not-completed",$subset=false)
-    {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-
-        self::_setOperationId();
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->uri))
-        {
-            $this->getPrinters();
-            unset($this->jobs[count($this->jobs) - 1]);
-            unset($this->jobs_uri[count($this->jobs_uri) - 1]);
-            unset($this->status[count($this->status) - 1]);
-
-            if (array_key_exists(0,$this->available_printers))
-            {
-               self::setPrinterURI($this->available_printers[0]);
-            }
-            else
-            {
-                trigger_error(_("getJobs: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
-                self::_errorLog("getJobs: Printer URI is not set, die",2);
-                return FALSE;
-                }
-            }
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        if ($limit)
-        {
-            $limit = self::_integerBuild($limit);
-            $this->meta->limit = chr(0x21) // integer
-                               . self::_giveMeStringLength('limit')
-                               . 'limit'
-                               . self::_giveMeStringLength($limit)
-                               . $limit;
-        }
-        else
-        {
-            $this->meta->limit = '';
-        }
-
-        if ($which_jobs == 'completed')
-        {
-                $this->meta->which_jobs = chr(0x44) // keyword
-                                        . self::_giveMeStringLength('which-jobs')
-                                        . 'which-jobs'
-                                        . self::_giveMeStringLength($which_jobs)
-                                        . $which_jobs;
-        }
-        else
-        {
-            $this->meta->which_jobs = "";
-        }
-
-        if ($my_jobs)
-        {
-            $this->meta->my_jobs = chr(0x22) // boolean
-                                 . self::_giveMeStringLength('my-jobs')
-                                 . 'my-jobs'
-                                 . self::_giveMeStringLength(chr(0x01))
-                                 . chr(0x01);
-        }
-        else
-        {
-            $this->meta->my_jobs = '';
-        }
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x0A) // Get-Jobs | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->printer_uri
-                         . $this->meta->username
-                         . $this->meta->limit
-                         . $this->meta->which_jobs 
-                         . $this->meta->my_jobs;
-       if ($subset)
-       {
-           $this->stringjob .=
-                          chr(0x44) // keyword
-                         . self::_giveMeStringLength('requested-attributes')
-                         . 'requested-attributes'
-                         . self::_giveMeStringLength('job-uri')
-                         . 'job-uri'
-                         . chr(0x44) // keyword
-                         . self::_giveMeStringLength('')
-                         . ''
-                         . self::_giveMeStringLength('job-name')
-                         . 'job-name'
-                         . chr(0x44) // keyword
-                         . self::_giveMeStringLength('')
-                         . ''
-                         . self::_giveMeStringLength('job-state')
-                         . 'job-state'
-                         . chr(0x44) // keyword
-                         . self::_giveMeStringLength('')
-                         . ''
-                         . self::_giveMeStringLength('job-state-reason')
-                         . 'job-state-reason';
-        }
-        else
-        { # cups 1.4.4 doesn't return much of anything without this
-            $this->stringjob .=
-                          chr(0x44) // keyword
-                         . self::_giveMeStringLength('requested-attributes')
-                         . 'requested-attributes'
-                         . self::_giveMeStringLength('all')
-                         . 'all';
-        }
-        $this->stringjob .= chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-
-        self::_putDebug(sprintf(_("getting jobs of %s\n"),$this->printer_uri),2); 
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
-        {
-            if (self::_parseServerOutput())
-            {
-                self::_parseJobsAttributes();
-            }
-        }
-
-        $this->attributes = &$this->jobs_attributes;
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf(_("getting jobs of printer %s: "),$this->printer_uri)
-                            .$this->serveroutput->status,3);
-            }
-            else
-            {
-                 self::_errorLog(sprintf(_("getting jobs of printer %s: "),$this->printer_uri)
-                                             .$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status;
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog(date("Y-m-d H:i:s : ")
-                        .basename($_SERVER['PHP_SELF'])
-                        .sprintf(_("getting jobs of %s : OPERATION FAILED"),
-                                     $this->printer_uri),3);
-
-    return false;
-    }
-
-
-    public function getJobAttributes($job_uri,$subset=false,$attributes_group="all")
-    {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-
-        if (!$job_uri)
-        {
-            trigger_error(_("getJobAttributes: Job URI is not set, die."));
-            return FALSE;
-            }
-
-        self::_setOperationId();
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->uri))
-        {
-            $this->getPrinters();
-            unset($this->jobs[count($this->jobs) - 1]);
-            unset($this->jobs_uri[count($this->jobs_uri) - 1]);
-            unset($this->status[count($this->status) - 1]);
-
-            if (array_key_exists(0,$this->available_printers))
-            {
-               self::setPrinterURI($this->available_printers[0]);
-            }
-            else
-            {
-                trigger_error(_("getJobs: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
-                self::_errorLog("getJobs: Printer URI is not set, die",2);
-                return FALSE;
-            }
-        }
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        $this->meta->job_uri = chr(0x45) // URI
-                             . self::_giveMeStringLength('job-uri')
-                             . 'job-uri'
-                             . self::_giveMeStringLength($job_uri)
-                             . $job_uri;
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x09) // Get-Job-Attributes | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->job_uri
-                         . $this->meta->username;
-        if ($subset)
-        {
-            $this->stringjob .=
-                          chr(0x44) // keyword
-                         . self::_giveMeStringLength('requested-attributes')
-                         . 'requested-attributes'
-                         . self::_giveMeStringLength('job-uri')
-                         . 'job-uri'
-                         . chr(0x44) // keyword
-                         . self::_giveMeStringLength('')
-                         . ''
-                         . self::_giveMeStringLength('job-name')
-                         . 'job-name'
-                         . chr(0x44) // keyword
-                         . self::_giveMeStringLength('')
-                         . ''
-                         . self::_giveMeStringLength('job-state')
-                         . 'job-state'
-                         . chr(0x44) // keyword
-                         . self::_giveMeStringLength('')
-                         . ''
-                         . self::_giveMeStringLength('job-state-reason')
-                         . 'job-state-reason';
-        }
-        elseif($attributes_group)
-        {
-            switch($attributes_group)
-            {
-                case 'job-template':
-                    break;
-                case 'job-description':
-                    break;
-                case 'all':
-                    break;
-                default:
-                    trigger_error(_('not a valid attribute group: ').$attributes_group,E_USER_NOTICE);
-                    $attributes_group = '';
-                    break;
-            }
-            $this->stringjob .=
-                          chr(0x44) // keyword
-                         . self::_giveMeStringLength('requested-attributes')
-                         . 'requested-attributes'
-                         . self::_giveMeStringLength($attributes_group)
-                         . $attributes_group;
-        }
-        $this->stringjob .= chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-
-        self::_putDebug(sprintf(_("getting jobs of %s\n"),$this->printer_uri),2); 
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
-        {
-            if (self::_parseServerOutput())
-            {
-                self::_parseJobAttributes();
-            }
-        }
-
-        $this->attributes = &$this->job_attributes;
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf(_("getting job attributes for %s: "),$job_uri)
-                            .$this->serveroutput->status,3);
-            }
-            else
-            {
-                 self::_errorLog(sprintf(_("getting job attributes for %s: "),$job_uri)
-                                             .$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status;
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog(date("Y-m-d H:i:s : ")
-                        .basename($_SERVER['PHP_SELF'])
-                        .sprintf(_("getting jobs attributes of %s : OPERATION FAILED"),
-                                     $job_uri),3);
-
-        return false;
-    }
-
-    public function getPrinters()
-    {
-        // placeholder for vendor extension operation (getAvailablePrinters for CUPS)
-        $this->jobs = array_merge($this->jobs,array(''));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(''));
-        $this->status = array_merge($this->status,array(''));    
-    }
-
-    public function generateError ($error)
-    {
-        switch ($error)
-        {
-            case "request_body_malformed":
-                $this->error_generation->request_body_malformed = chr(0xFF);
-                break;
-            default:
-                true;
-                break;
-        }
-
-        trigger_error(sprintf(_('Setting Error %s'),$error),E_USER_NOTICE);
-    }
+			$post_values = array( "Content-Type" => "application/ipp",
+								  "Data" => $this->output);
+		}
+
+		if (self::_sendHttp ($post_values,$this->paths['printers']))
+		{
+			if(self::_parseServerOutput())
+			{
+				$this->_getJobId();
+				$this->_getJobUri();
+				$this->_parseJobAttributes();
+			}
+			else
+			{
+				$this->jobs = array_merge($this->jobs,array(''));
+				$this->jobs_uri = array_merge($this->jobs_uri,array(''));
+				}
+			}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+			  self::_errorLog(sprintf("printing job %s: ",$this->last_job) .$this->serveroutput->status,3);
+			}
+			else
+			{
+				$this->jobs = array_merge($this->jobs,array(""));
+				$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+				self::_errorLog(sprintf("printing job: ",$this->last_job) .$this->serveroutput->status,1);
+				if ($this->with_exceptions)
+				{
+					throw new ippException(sprintf("job status: %s",
+					$this->serveroutput->status));
+				}
+			}
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+		self::_errorLog("printing job : OPERATION FAILED",1);
+
+		return false;
+	}
+
+	public function cancelJob ($job_uri)
+	{
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+
+		self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
+
+		if (!$this->_stringCancel($job_uri))
+		{
+			return FALSE;
+		}
+
+		self::_putDebug( _("Cancelling Job $job_uri\n"),3); 
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['jobs']))
+		{
+			self::_parseServerOutput();
+		}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status,3);
+			}
+			else
+			{
+				self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status,1);
+			}
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog("cancelling job : OPERATION FAILED",3);
+
+		return false;
+	}
+
+	public function validateJob ()
+	{
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+
+		$this->serveroutput->response = '';
+
+		self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
+
+		self::_putDebug( _("Validate Job\n"),2); 
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+		if (!isset($this->setup->datatype))
+		{
+			self::setBinary();
+		}
+
+		if (!isset($this->setup->uri))
+		{
+			$this->getPrinters();
+			unset($this->jobs[count($this->jobs) - 1]);
+			unset($this->jobs_uri[count($this->jobs_uri) - 1]);
+			unset($this->status[count($this->status) - 1]);
+
+			if (array_key_exists(0,$this->available_printers))
+			{
+			   self::setPrinterURI($this->available_printers[0]);
+			}
+			else
+			{
+				trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
+				self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
+				self::_errorLog(" Printer URI is not set, die",2);
+				return FALSE;
+				}
+			}
+
+		if (!isset($this->meta->copies))
+		{
+			self::setCopies(1);
+		}
+
+		if (!isset($this->setup->copies))
+		{
+			self::setCopies(1);
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->setup->mime_media_type))
+		{
+			self::setMimeMediaType();
+		}
+
+		if ($this->setup->datatype != "TEXT")
+		{
+			unset ($this->setup->mime_media_type);
+		}
+
+		if (!isset($this->setup->jobname))
+		{
+			if (is_readable($this->data))
+			{
+				self::setJobName(basename($this->data),true);
+			}
+			else
+			{
+				self::setJobName();
+			}
+		}
+		unset($this->setup->jobname);
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		if (!isset($this->meta->fidelity))
+		{
+			$this->meta->fidelity = '';
+		}
+
+		if (!isset($this->meta->document_name))
+		{
+			$this->meta->document_name = '';
+		}
+
+		if (!isset($this->meta->sides))
+		{
+			$this->meta->sides = '';
+		}
+
+		if (!isset($this->meta->page_ranges))
+		{
+			$this->meta->page_ranges = '';
+		}
+
+		$jobattributes = '';
+		$operationattributes = '';
+		$printerattributes = '';
+		self::_buildValues ($operationattributes,$jobattributes,$printerattributes);
+
+		self::_setOperationId();
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x04) // Validate-Job | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->printer_uri
+						 . $this->meta->username
+						 . $this->meta->jobname
+						 . $this->meta->fidelity
+						 . $this->meta->document_name
+						 . $this->meta->mime_media_type
+						 . $operationattributes
+						 . chr(0x02) // start job-attributes | job-attributes-tag
+						 . $this->meta->copies
+						 . $this->meta->sides
+						 . $this->meta->page_ranges
+						 . $jobattributes
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['printers']))
+		{
+			if(self::_parseServerOutput())
+			{
+				self::_parseAttributes();
+			}
+		}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog("validate job: ".$this->serveroutput->status,3);
+			}
+			else
+			{
+				self::_errorLog("validate job: ".$this->serveroutput->status,1);
+			}
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog("validate job : OPERATION FAILED",3);
+
+		return false;
+	}
+
+	public function getPrinterAttributes()
+	{
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+
+		$jobattributes = '';
+		$operationattributes = '';
+		self::_buildValues($operationattributes,$jobattributes,$printerattributes);
+		self::_setOperationId();
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->uri))
+		{
+			$this->getPrinters();
+			unset($this->jobs[count($this->jobs) - 1]);
+			unset($this->jobs_uri[count($this->jobs_uri) - 1]);
+			unset($this->status[count($this->status) - 1]);
+
+			if (array_key_exists(0,$this->available_printers))
+			{
+			   self::setPrinterURI($this->available_printers[0]);
+			}
+			else
+			{
+				trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
+				self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
+				self::_errorLog(" Printer URI is not set, die",2);
+				return FALSE;
+				}
+			}
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x0b) // Print-URI | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->printer_uri
+						 . $this->meta->username
+						 . $printerattributes
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+
+		self::_putDebug(sprintf(_("Getting printer attributes of %s\n"),$this->printer_uri),2); 
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['root']))
+		{
+			if (self::_parseServerOutput())
+			{
+				self::_parsePrinterAttributes(); 
+			}
+		}
+
+		$this->attributes = &$this->printer_attributes;
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if  ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf(_("getting printer attributes of %s: %s"),$this->printer_uri,
+																		$this->serveroutput->status),3);
+			}
+			else 
+			{
+				self::_errorLog(sprintf(_("getting printer attributes of %s: %s"),$this->printer_uri,
+																		$this->serveroutput->status),1);
+			}
+
+			return $this->serveroutput->status;
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog(date("Y-m-d H:i:s : ")
+			.basename($_SERVER['PHP_SELF'])
+			.sprintf(_("getting printer's attributes of %s : OPERATION FAILED"),
+				$this->printer_uri),3);
+
+		return false;
+	}
+
+	public function getJobs($my_jobs=true,$limit=0,$which_jobs="not-completed",$subset=false)
+	{
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+
+		self::_setOperationId();
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->uri))
+		{
+			$this->getPrinters();
+			unset($this->jobs[count($this->jobs) - 1]);
+			unset($this->jobs_uri[count($this->jobs_uri) - 1]);
+			unset($this->status[count($this->status) - 1]);
+
+			if (array_key_exists(0,$this->available_printers))
+			{
+			   self::setPrinterURI($this->available_printers[0]);
+			}
+			else
+			{
+				trigger_error(_("getJobs: Printer URI is not set: die"),E_USER_WARNING);
+				self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
+				self::_errorLog("getJobs: Printer URI is not set, die",2);
+				return FALSE;
+				}
+			}
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		if ($limit)
+		{
+			$limit = self::_integerBuild($limit);
+			$this->meta->limit = chr(0x21) // integer
+							   . self::_giveMeStringLength('limit')
+							   . 'limit'
+							   . self::_giveMeStringLength($limit)
+							   . $limit;
+		}
+		else
+		{
+			$this->meta->limit = '';
+		}
+
+		if ($which_jobs == 'completed')
+		{
+				$this->meta->which_jobs = chr(0x44) // keyword
+										. self::_giveMeStringLength('which-jobs')
+										. 'which-jobs'
+										. self::_giveMeStringLength($which_jobs)
+										. $which_jobs;
+		}
+		else
+		{
+			$this->meta->which_jobs = "";
+		}
+
+		if ($my_jobs)
+		{
+			$this->meta->my_jobs = chr(0x22) // boolean
+								 . self::_giveMeStringLength('my-jobs')
+								 . 'my-jobs'
+								 . self::_giveMeStringLength(chr(0x01))
+								 . chr(0x01);
+		}
+		else
+		{
+			$this->meta->my_jobs = '';
+		}
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x0A) // Get-Jobs | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->printer_uri
+						 . $this->meta->username
+						 . $this->meta->limit
+						 . $this->meta->which_jobs 
+						 . $this->meta->my_jobs;
+	   if ($subset)
+	   {
+		   $this->stringjob .=
+						  chr(0x44) // keyword
+						 . self::_giveMeStringLength('requested-attributes')
+						 . 'requested-attributes'
+						 . self::_giveMeStringLength('job-uri')
+						 . 'job-uri'
+						 . chr(0x44) // keyword
+						 . self::_giveMeStringLength('')
+						 . ''
+						 . self::_giveMeStringLength('job-name')
+						 . 'job-name'
+						 . chr(0x44) // keyword
+						 . self::_giveMeStringLength('')
+						 . ''
+						 . self::_giveMeStringLength('job-state')
+						 . 'job-state'
+						 . chr(0x44) // keyword
+						 . self::_giveMeStringLength('')
+						 . ''
+						 . self::_giveMeStringLength('job-state-reason')
+						 . 'job-state-reason';
+		}
+		else
+		{ # cups 1.4.4 doesn't return much of anything without this
+			$this->stringjob .=
+						  chr(0x44) // keyword
+						 . self::_giveMeStringLength('requested-attributes')
+						 . 'requested-attributes'
+						 . self::_giveMeStringLength('all')
+						 . 'all';
+		}
+		$this->stringjob .= chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+
+		self::_putDebug(sprintf(_("getting jobs of %s\n"),$this->printer_uri),2); 
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['jobs']))
+		{
+			if (self::_parseServerOutput())
+			{
+				self::_parseJobsAttributes();
+			}
+		}
+
+		$this->attributes = &$this->jobs_attributes;
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf(_("getting jobs of printer %s: "),$this->printer_uri)
+							.$this->serveroutput->status,3);
+			}
+			else
+			{
+				 self::_errorLog(sprintf(_("getting jobs of printer %s: "),$this->printer_uri)
+											 .$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status;
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog(date("Y-m-d H:i:s : ")
+						.basename($_SERVER['PHP_SELF'])
+						.sprintf(_("getting jobs of %s : OPERATION FAILED"),
+									 $this->printer_uri),3);
+
+	return false;
+	}
+
+
+	public function getJobAttributes($job_uri,$subset=false,$attributes_group="all")
+	{
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+
+		if (!$job_uri)
+		{
+			trigger_error(_("getJobAttributes: Job URI is not set, die."));
+			return FALSE;
+			}
+
+		self::_setOperationId();
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->uri))
+		{
+			$this->getPrinters();
+			unset($this->jobs[count($this->jobs) - 1]);
+			unset($this->jobs_uri[count($this->jobs_uri) - 1]);
+			unset($this->status[count($this->status) - 1]);
+
+			if (array_key_exists(0,$this->available_printers))
+			{
+			   self::setPrinterURI($this->available_printers[0]);
+			}
+			else
+			{
+				trigger_error(_("getJobs: Printer URI is not set: die"),E_USER_WARNING);
+				self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
+				self::_errorLog("getJobs: Printer URI is not set, die",2);
+				return FALSE;
+			}
+		}
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		$this->meta->job_uri = chr(0x45) // URI
+							 . self::_giveMeStringLength('job-uri')
+							 . 'job-uri'
+							 . self::_giveMeStringLength($job_uri)
+							 . $job_uri;
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x09) // Get-Job-Attributes | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->job_uri
+						 . $this->meta->username;
+		if ($subset)
+		{
+			$this->stringjob .=
+						  chr(0x44) // keyword
+						 . self::_giveMeStringLength('requested-attributes')
+						 . 'requested-attributes'
+						 . self::_giveMeStringLength('job-uri')
+						 . 'job-uri'
+						 . chr(0x44) // keyword
+						 . self::_giveMeStringLength('')
+						 . ''
+						 . self::_giveMeStringLength('job-name')
+						 . 'job-name'
+						 . chr(0x44) // keyword
+						 . self::_giveMeStringLength('')
+						 . ''
+						 . self::_giveMeStringLength('job-state')
+						 . 'job-state'
+						 . chr(0x44) // keyword
+						 . self::_giveMeStringLength('')
+						 . ''
+						 . self::_giveMeStringLength('job-state-reason')
+						 . 'job-state-reason';
+		}
+		elseif($attributes_group)
+		{
+			switch($attributes_group)
+			{
+				case 'job-template':
+					break;
+				case 'job-description':
+					break;
+				case 'all':
+					break;
+				default:
+					trigger_error(_('not a valid attribute group: ').$attributes_group,E_USER_NOTICE);
+					$attributes_group = '';
+					break;
+			}
+			$this->stringjob .=
+						  chr(0x44) // keyword
+						 . self::_giveMeStringLength('requested-attributes')
+						 . 'requested-attributes'
+						 . self::_giveMeStringLength($attributes_group)
+						 . $attributes_group;
+		}
+		$this->stringjob .= chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+
+		self::_putDebug(sprintf(_("getting jobs of %s\n"),$this->printer_uri),2); 
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['jobs']))
+		{
+			if (self::_parseServerOutput())
+			{
+				self::_parseJobAttributes();
+			}
+		}
+
+		$this->attributes = &$this->job_attributes;
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf(_("getting job attributes for %s: "),$job_uri)
+							.$this->serveroutput->status,3);
+			}
+			else
+			{
+				 self::_errorLog(sprintf(_("getting job attributes for %s: "),$job_uri)
+											 .$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status;
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog(date("Y-m-d H:i:s : ")
+						.basename($_SERVER['PHP_SELF'])
+						.sprintf(_("getting jobs attributes of %s : OPERATION FAILED"),
+									 $job_uri),3);
+
+		return false;
+	}
+
+	public function getPrinters()
+	{
+		// placeholder for vendor extension operation (getAvailablePrinters for CUPS)
+		$this->jobs = array_merge($this->jobs,array(''));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(''));
+		$this->status = array_merge($this->status,array(''));    
+	}
+
+	public function generateError ($error)
+	{
+		switch ($error)
+		{
+			case "request_body_malformed":
+				$this->error_generation->request_body_malformed = chr(0xFF);
+				break;
+			default:
+				true;
+				break;
+		}
+
+		trigger_error(sprintf(_('Setting Error %s'),$error),E_USER_NOTICE);
+	}
     
-    public function resetError ($error)
-    {
-        unset ($this->error_generation->$error);
-        trigger_error(sprintf(_('Reset Error %s'),$error),E_USER_NOTICE);
-    }
-
-    // SETUP
-    protected function _setOperationId ()
-    {
-            $prepend = '';
-            $this->operation_id += 1;
-            $this->meta->operation_id = self::_integerBuild($this->operation_id);
-            self::_putDebug( "operation id is: ".$this->operation_id."\n",2);
-    }
+	public function resetError ($error)
+	{
+		unset ($this->error_generation->$error);
+		trigger_error(sprintf(_('Reset Error %s'),$error),E_USER_NOTICE);
+	}
+
+	// SETUP
+	protected function _setOperationId ()
+	{
+			$prepend = '';
+			$this->operation_id += 1;
+			$this->meta->operation_id = self::_integerBuild($this->operation_id);
+			self::_putDebug( "operation id is: ".$this->operation_id."\n",2);
+	}
     
-    protected function _setJobId()
-    {
-
-        $this->meta->jobid +=1;
-        $prepend = '';
-        $prepend_length = 4 - strlen($this->meta->jobid);
-        for ($i = 0; $i < $prepend_length ; $i++ )
-        {
-            $prepend .= '0';
-        }
-
-    return $prepend.$this->meta->jobid;
-    }
+	protected function _setJobId()
+	{
+
+		$this->meta->jobid +=1;
+		$prepend = '';
+		$prepend_length = 4 - strlen($this->meta->jobid);
+		for ($i = 0; $i < $prepend_length ; $i++ )
+		{
+			$prepend .= '0';
+		}
+
+	return $prepend.$this->meta->jobid;
+	}
     
-    protected function _setJobUri ($job_uri)
-    {
-        $this->meta->job_uri = chr(0x45) // type uri
-                             . chr(0x00).chr(0x07) // name-length
-                             . "job-uri"
-                             //. chr(0x00).chr(strlen($job_uri))
-                             . self::_giveMeStringLength($job_uri)
-                             . $job_uri;
+	protected function _setJobUri ($job_uri)
+	{
+		$this->meta->job_uri = chr(0x45) // type uri
+							 . chr(0x00).chr(0x07) // name-length
+							 . "job-uri"
+							 //. chr(0x00).chr(strlen($job_uri))
+							 . self::_giveMeStringLength($job_uri)
+							 . $job_uri;
         
-        self::_putDebug( "job-uri is: ".$job_uri."\n",2);
-    }
-
-    // RESPONSE PARSING
-    protected function _parsePrinterAttributes()
-    {
-        //if (!preg_match('#successful#',$this->serveroutput->status))
-        //   return false;
-
-        $k = -1;
-        $l = 0;
-        for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
-        {
-            for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
-            {
-                if (!empty($this->serveroutput->response[$i][$j]['name']))
-                {
-                    $k++;
-                    $l = 0;
-                    $this->parsed[$k]['range'] = $this->serveroutput->response[$i]['attributes'];
-                    $this->parsed[$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
-                    $this->parsed[$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
-                    $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-                else
-                {
-                    $l ++;
-                    $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                    }
-            }
-        }
-        $this->serveroutput->response = array();
-
-        $this->printer_attributes = new \stdClass();
-        for ($i = 0 ; $i < count($this->parsed) ; $i ++)
-        {
-                    $name = $this->parsed[$i]['name'];
-                    $php_name = str_replace('-','_',$name);
-                    $type = $this->parsed[$i]['type'];
-                    $range = $this->parsed[$i]['range'];
-                    $this->printer_attributes->$php_name = new \stdClass();
-                    $this->printer_attributes->$php_name->_type = $type;
-                    $this->printer_attributes->$php_name->_range = $range;
-                    for ($j = 0 ; $j < (count($this->parsed[$i]) - 3) ; $j ++)
-                    {
-                        $value = $this->parsed[$i][$j];
-                        $index = '_value'.$j;
-                        $this->printer_attributes->$php_name->$index = $value;
-                        }
-                    }
-
-        $this->parsed = array();
-    }
-
-    protected function _parseJobsAttributes()
-    {
-        //if ($this->serveroutput->status != "successfull-ok")
-        //    return false;
-
-        $job = -1;
-        $l = 0;
-        for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
-        {
-            if ($this->serveroutput->response[$i]['attributes'] == "job-attributes")
-            {
-                $job ++;
-            }
-            $k = -1; 
-            for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
-            {
-                if (!empty($this->serveroutput->response[$i][$j]['name']))
-                {
-                    $k++;
-                    $l = 0;
-                    $this->parsed[$job][$k]['range'] = $this->serveroutput->response[$i]['attributes'];
-                    $this->parsed[$job][$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
-                    $this->parsed[$job][$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
-                    $this->parsed[$job][$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-                else
-                {
-                    $l ++;
-                    $this->parsed[$job][$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-            }
-        }
-
-        $this->serveroutput->response = array();
-        $this->jobs_attributes = new \stdClass();
-        for ($job_nbr = 0 ; $job_nbr <= $job ; $job_nbr ++)
-        {
-            $job_index = "job_".$job_nbr;
-            $this->jobs_attributes->$job_index = new \stdClass();
-            for ($i = 0 ; $i < count($this->parsed[$job_nbr]) ; $i ++)
-            {
-                $name = $this->parsed[$job_nbr][$i]['name'];
-                $php_name = str_replace('-','_',$name);
-                $type = $this->parsed[$job_nbr][$i]['type'];
-                $range = $this->parsed[$job_nbr][$i]['range'];
-                $this->jobs_attributes->$job_index->$php_name = new \stdClass();
-                $this->jobs_attributes->$job_index->$php_name->_type = $type;
-                $this->jobs_attributes->$job_index->$php_name->_range = $range;
-                for ($j = 0 ; $j < (count($this->parsed[$job_nbr][$i]) - 3) ; $j ++)
-                {
-                    # This causes incorrect parsing of integer job attributes.
-                    # 2010-08-16
-                    # bpkroth
-                    #$value = self::_interpretAttribute($name,$type,$this->parsed[$job_nbr][$i][$j]);
-                    $value = $this->parsed[$job_nbr][$i][$j];
-                    $index = '_value'.$j;
-                    $this->jobs_attributes->$job_index->$php_name->$index = $value;
-                }
-            }
-        }
-
-        $this->parsed = array();
-    }
-
-    protected function _readAttribute($attributes_type)
-    {
-        $tag = ord($this->serveroutput->body[$this->_parsing->offset]);
-
-        $this->_parsing->offset += 1;
-        $j = $this->index;
-
-        $tag = self::_readTag($tag);
-
-        switch ($tag)
-        {
-            case "begCollection": //RFC3382 (BLIND CODE)
-                if ($this->end_collection)
-                {
-                    $this->index --;
-                }
-                $this->end_collection = false;
-                $this->serveroutput->response[$attributes_type][$j]['type'] = "collection";
-                self::_putDebug( "tag is: begCollection\n");
-                self::_readAttributeName ($attributes_type,$j);
-                if (!$this->serveroutput->response[$attributes_type][$j]['name'])
-                { // it is a multi-valued collection
-                    $this->collection_depth ++;
-                    $this->index --;
-                    $this->collection_nbr[$this->collection_depth] ++;
-                }
-                else
-                {
-                    $this->collection_depth ++;
-                    if ($this->collection_depth == 0)
-                    {
-                        $this->collection = (object) 'collection';
-                    }
-                    if (array_key_exists($this->collection_depth,$this->collection_nbr))
-                    {
-                        $this->collection_nbr[$this->collection_depth] ++;
-                    }
-                    else
-                    {
-                        $this->collection_nbr[$this->collection_depth] = 0;
-                    }
-                    unset($this->end_collection);
-                }
-                self::_readValue ("begCollection",$attributes_type,$j);
-                break;
-            case "endCollection": //RFC3382 (BLIND CODE)
-                $this->serveroutput->response[$attributes_type][$j]['type'] = "collection";
-                self::_putDebug( "tag is: endCollection\n");
-                self::_readAttributeName ($attributes_type,$j,0);
-                self::_readValue ('name',$attributes_type,$j,0);
-                $this->collection_depth --;
-                $this->collection_key[$this->collection_depth] = 0;
-                $this->end_collection = true;
-                break;
-            case "memberAttrName": // RFC3382 (BLIND CODE)
-                $this->serveroutput->response[$attributes_type][$j]['type'] = "memberAttrName";
-                $this->index -- ;
-                self::_putDebug( "tag is: memberAttrName\n");
-                self::_readCollection ($attributes_type,$j);
-                break;
-
-            default:
-                $this->collection_depth = -1;
-                $this->collection_key = array();
-                $this->collection_nbr = array();
-                $this->serveroutput->response[$attributes_type][$j]['type'] = $tag;
-                self::_putDebug( "tag is: $tag\n");
-                $attribute_name = self::_readAttributeName ($attributes_type,$j);
-                if (!$attribute_name)
-                {
-                    $attribute_name = $this->attribute_name;
-                }
-                else
-                {
-                    $this->attribute_name = $attribute_name;
-                }
-                $value = self::_readValue ($tag,$attributes_type,$j);
-                $this->serveroutput->response[$attributes_type][$j]['value'] = 
-                self::_interpretAttribute($attribute_name,$tag,$this->serveroutput->response[$attributes_type][$j]['value']);
-                break;
-        }
-        return;
-    }
-
-    protected function _readTag($tag)
-    {
-        switch ($tag)
-        {
-            case 0x10:
-                $tag = "unsupported";
-                break;
-            case 0x11:
-                $tag = "reserved for 'default'";
-                break;
-            case 0x12:
-                $tag = "unknown";
-                break;
-            case 0x13:
-                $tag = "no-value";
-                break;
-            case 0x15: // RFC 3380
-                $tag = "not-settable";
-                break;
-            case 0x16: // RFC 3380
-                $tag = "delete-attribute";
-                break;
-            case 0x17: // RFC 3380
-                $tag = "admin-define";
-                break;
-            case 0x20:
-                $tag = "IETF reserved (generic integer)";
-                break;
-            case 0x21:
-                $tag = "integer";
-                break;
-            case 0x22:
-                $tag = "boolean";
-                break;
-            case 0x23:
-                $tag = "enum";
-                break;
-            case 0x30:
-                $tag = "octetString";
-                break;
-            case 0x31:
-                $tag = "datetime";
-                break;
-            case 0x32:
-                $tag = "resolution";
-                break;
-            case 0x33:
-                $tag = "rangeOfInteger";
-                break;
-            case 0x34: //RFC3382 (BLIND CODE)
-                $tag = "begCollection";
-                break;
-            case 0x35:
-                $tag = "textWithLanguage";
-                break;
-            case 0x36:
-                $tag = "nameWithLanguage";
-                break;
-            case 0x37: //RFC3382 (BLIND CODE)
-                $tag = "endCollection";
-                break;
-            case 0x40:
-                $tag = "IETF reserved text string";
-                break;
-            case 0x41:
-                $tag = "textWithoutLanguage";
-                break;
-            case 0x42:
-                $tag = "nameWithoutLanguage";
-                break;
-            case 0x43:
-                $tag = "IETF reserved for future";
-                break;
-            case 0x44:
-                $tag = "keyword";
-                break;
-            case 0x45:
-                $tag = "uri";
-                break;
-            case 0x46:
-                $tag = "uriScheme";
-                break;
-            case 0x47:
-                $tag = "charset";
-                break;
-            case 0x48:
-                $tag = "naturalLanguage";
-                break;
-            case 0x49:
-                $tag = "mimeMediaType";
-                break;
-            case 0x4A: // RFC3382 (BLIND CODE)
-                $tag = "memberAttrName";
-                break;
-            case 0x7F:
-                $tag = "extended type";
-                break;
-            default:
-                if ($tag >= 0x14 && $tag < 0x15 && $tag > 0x17 && $tag <= 0x1f) 
-                {
-                    $tag = "out-of-band";
-                }
-                elseif (0x24 <= $tag && $tag <= 0x2f) 
-                {
-                    $tag = "new integer type";
-                }
-                elseif (0x38 <= $tag && $tag <= 0x3F) 
-                {
-                    $tag = "new octet-stream type";
-                }
-                elseif (0x4B <= $tag && $tag <= 0x5F) 
-                {
-                    $tag = "new character string type";
-                }
-                elseif ((0x60 <= $tag && $tag < 0x7f) || $tag >= 0x80 )
-                {
-                    $tag = "IETF reserved for future";
-                }
-                else
-                {
-                    $tag = sprintf("UNKNOWN: 0x%x (%u)",$tag,$tag);
-                }
-                break;                                                            
-        }
-
-        return $tag; 
-    }
-
-    protected function _readCollection($attributes_type,$j)
-    {
-        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
-                     +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
-
-        $this->_parsing->offset += 2;
-
-        self::_putDebug( "Collection name_length ". $name_length ."\n");
-
-        $name = '';
-        for ($i = 0; $i < $name_length; $i++)
-        {
-            $name .= $this->serveroutput->body[$this->_parsing->offset];
-            $this->_parsing->offset += 1;
-            if ($this->_parsing->offset > strlen($this->serveroutput->body))
-            {
-                return;
-            }
-        }
-
-        $collection_name = $name;
-
-        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
-                     +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
-        $this->_parsing->offset += 2;
-
-        self::_putDebug( "Attribute name_length ". $name_length ."\n");
-
-        $name = '';
-        for ($i = 0; $i < $name_length; $i++)
-        {
-            $name .= $this->serveroutput->body[$this->_parsing->offset];
-            $this->_parsing->offset += 1;
-            if ($this->_parsing->offset > strlen($this->serveroutput->body))
-            {
-                return;
-            }
-        }
-
-        $attribute_name = $name;
-        if ($attribute_name == "")
-        {
-            $attribute_name = $this->last_attribute_name;
-            $this->collection_key[$this->collection_depth] ++;
-        }
-        else
-        {
-            $this->collection_key[$this->collection_depth] = 0;
-        }
-        $this->last_attribute_name = $attribute_name;
-
-        self::_putDebug( "Attribute name ".$name."\n");
-
-        $tag = self::_readTag(ord($this->serveroutput->body[$this->_parsing->offset]));
-        $this->_parsing->offset ++;
-
-        $type = $tag;
-
-        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
-                     +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
-        $this->_parsing->offset += 2;
-
-        self::_putDebug( "Collection2 name_length ". $name_length ."\n");
-
-        $name = '';
-        for ($i = 0; $i < $name_length; $i++)
-        {
-            $name .= $this->serveroutput->body[$this->_parsing->offset];
-            $this->_parsing->offset += 1;
-            if ($this->_parsing->offset > strlen($this->serveroutput->body))
-            {
-                return;
-            }
-        }
-
-        $collection_value = $name;
-        $value_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
-                      +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
-
-        self::_putDebug( "Collection value_length ".$this->serveroutput->body[ $this->_parsing->offset]
-                                       . $this->serveroutput->body[$this->_parsing->offset + 1]
-                                       .": "
-                                       . $value_length
-                                       . " ");
-
-        $this->_parsing->offset += 2;
-
-        $value = '';
-        for ($i = 0; $i < $value_length; $i++)
-        {
-            if ($this->_parsing->offset >= strlen($this->serveroutput->body))
-            {
-                return;
-            }
-            $value .= $this->serveroutput->body[$this->_parsing->offset];
-            $this->_parsing->offset += 1;
-        }
-
-        $object = &$this->collection;
-        for ($i = 0 ; $i <= $this->collection_depth ; $i ++)
-        {
-            $indice = "_indice".$this->collection_nbr[$i];
-            if (!isset($object->$indice))
-            {
-                $object->$indice = (object) 'indice';
-            }
-            $object = &$object->$indice;
-        }
-
-        $value_key = "_value".$this->collection_key[$this->collection_depth];
-        $col_name_key = "_collection_name".$this->collection_key[$this->collection_depth];
-        $col_val_key = "_collection_value".$this->collection_key[$this->collection_depth];
-
-        $attribute_value = self::_interpretAttribute($attribute_name,$tag,$value);
-        $attribute_name = str_replace('-','_',$attribute_name);
-
-        self::_putDebug( sprintf("Value: %s\n",$value));
-        $object->$attribute_name->_type = $type;
-        $object->$attribute_name->$value_key = $attribute_value;
-        $object->$attribute_name->$col_name_key = $collection_name;
-        $object->$attribute_name->$col_val_key = $collection_value;
-
-        $this->serveroutput->response[$attributes_type][$j]['value'] = $this->collection;
-    }
-
-    protected function _readAttributeName ($attributes_type,$j,$write=1)
-    {
-        $name_length = ord($this->serveroutput->body[ $this->_parsing->offset]) *  256
-                     +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
-        $this->_parsing->offset += 2;
-
-        self::_putDebug( "name_length ". $name_length ."\n");
-
-        $name = '';
-        for ($i = 0; $i < $name_length; $i++)
-        {
-            if ($this->_parsing->offset >= strlen($this->serveroutput->body))
-            {
-                return;
-            }
-            $name .= $this->serveroutput->body[$this->_parsing->offset];
-            $this->_parsing->offset += 1;
-        }
-
-        if($write)
-        {
-            $this->serveroutput->response[$attributes_type][$j]['name'] = $name;
-        }
-
-        self::_putDebug( "name " . $name . "\n");
-
-        return $name;   
-    }
-
-    protected function _readValue ($type,$attributes_type,$j,$write=1)
-    {
-        $value_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
-                      +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
+		self::_putDebug( "job-uri is: ".$job_uri."\n",2);
+	}
+
+	// RESPONSE PARSING
+	protected function _parsePrinterAttributes()
+	{
+		//if (!preg_match('#successful#',$this->serveroutput->status))
+		//   return false;
+
+		$k = -1;
+		$l = 0;
+		for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
+		{
+			for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
+			{
+				if (!empty($this->serveroutput->response[$i][$j]['name']))
+				{
+					$k++;
+					$l = 0;
+					$this->parsed[$k]['range'] = $this->serveroutput->response[$i]['attributes'];
+					$this->parsed[$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
+					$this->parsed[$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
+					$this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
+				}
+				else
+				{
+					$l ++;
+					$this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
+					}
+			}
+		}
+		$this->serveroutput->response = array();
+
+		$this->printer_attributes = new \stdClass();
+		for ($i = 0 ; $i < count($this->parsed) ; $i ++)
+		{
+					$name = $this->parsed[$i]['name'];
+					$php_name = str_replace('-','_',$name);
+					$type = $this->parsed[$i]['type'];
+					$range = $this->parsed[$i]['range'];
+					$this->printer_attributes->$php_name = new \stdClass();
+					$this->printer_attributes->$php_name->_type = $type;
+					$this->printer_attributes->$php_name->_range = $range;
+					for ($j = 0 ; $j < (count($this->parsed[$i]) - 3) ; $j ++)
+					{
+						$value = $this->parsed[$i][$j];
+						$index = '_value'.$j;
+						$this->printer_attributes->$php_name->$index = $value;
+						}
+					}
+
+		$this->parsed = array();
+	}
+
+	protected function _parseJobsAttributes()
+	{
+		//if ($this->serveroutput->status != "successfull-ok")
+		//    return false;
+
+		$job = -1;
+		$l = 0;
+		for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
+		{
+			if ($this->serveroutput->response[$i]['attributes'] == "job-attributes")
+			{
+				$job ++;
+			}
+			$k = -1; 
+			for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
+			{
+				if (!empty($this->serveroutput->response[$i][$j]['name']))
+				{
+					$k++;
+					$l = 0;
+					$this->parsed[$job][$k]['range'] = $this->serveroutput->response[$i]['attributes'];
+					$this->parsed[$job][$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
+					$this->parsed[$job][$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
+					$this->parsed[$job][$k][$l] = $this->serveroutput->response[$i][$j]['value'];
+				}
+				else
+				{
+					$l ++;
+					$this->parsed[$job][$k][$l] = $this->serveroutput->response[$i][$j]['value'];
+				}
+			}
+		}
+
+		$this->serveroutput->response = array();
+		$this->jobs_attributes = new \stdClass();
+		for ($job_nbr = 0 ; $job_nbr <= $job ; $job_nbr ++)
+		{
+			$job_index = "job_".$job_nbr;
+			$this->jobs_attributes->$job_index = new \stdClass();
+			for ($i = 0 ; $i < count($this->parsed[$job_nbr]) ; $i ++)
+			{
+				$name = $this->parsed[$job_nbr][$i]['name'];
+				$php_name = str_replace('-','_',$name);
+				$type = $this->parsed[$job_nbr][$i]['type'];
+				$range = $this->parsed[$job_nbr][$i]['range'];
+				$this->jobs_attributes->$job_index->$php_name = new \stdClass();
+				$this->jobs_attributes->$job_index->$php_name->_type = $type;
+				$this->jobs_attributes->$job_index->$php_name->_range = $range;
+				for ($j = 0 ; $j < (count($this->parsed[$job_nbr][$i]) - 3) ; $j ++)
+				{
+					# This causes incorrect parsing of integer job attributes.
+					# 2010-08-16
+					# bpkroth
+					#$value = self::_interpretAttribute($name,$type,$this->parsed[$job_nbr][$i][$j]);
+					$value = $this->parsed[$job_nbr][$i][$j];
+					$index = '_value'.$j;
+					$this->jobs_attributes->$job_index->$php_name->$index = $value;
+				}
+			}
+		}
+
+		$this->parsed = array();
+	}
+
+	protected function _readAttribute($attributes_type)
+	{
+		$tag = ord($this->serveroutput->body[$this->_parsing->offset]);
+
+		$this->_parsing->offset += 1;
+		$j = $this->index;
+
+		$tag = self::_readTag($tag);
+
+		switch ($tag)
+		{
+			case "begCollection": //RFC3382 (BLIND CODE)
+				if ($this->end_collection)
+				{
+					$this->index --;
+				}
+				$this->end_collection = false;
+				$this->serveroutput->response[$attributes_type][$j]['type'] = "collection";
+				self::_putDebug( "tag is: begCollection\n");
+				self::_readAttributeName ($attributes_type,$j);
+				if (!$this->serveroutput->response[$attributes_type][$j]['name'])
+				{ // it is a multi-valued collection
+					$this->collection_depth ++;
+					$this->index --;
+					$this->collection_nbr[$this->collection_depth] ++;
+				}
+				else
+				{
+					$this->collection_depth ++;
+					if ($this->collection_depth == 0)
+					{
+						$this->collection = (object) 'collection';
+					}
+					if (array_key_exists($this->collection_depth,$this->collection_nbr))
+					{
+						$this->collection_nbr[$this->collection_depth] ++;
+					}
+					else
+					{
+						$this->collection_nbr[$this->collection_depth] = 0;
+					}
+					unset($this->end_collection);
+				}
+				self::_readValue ("begCollection",$attributes_type,$j);
+				break;
+			case "endCollection": //RFC3382 (BLIND CODE)
+				$this->serveroutput->response[$attributes_type][$j]['type'] = "collection";
+				self::_putDebug( "tag is: endCollection\n");
+				self::_readAttributeName ($attributes_type,$j,0);
+				self::_readValue ('name',$attributes_type,$j,0);
+				$this->collection_depth --;
+				$this->collection_key[$this->collection_depth] = 0;
+				$this->end_collection = true;
+				break;
+			case "memberAttrName": // RFC3382 (BLIND CODE)
+				$this->serveroutput->response[$attributes_type][$j]['type'] = "memberAttrName";
+				$this->index -- ;
+				self::_putDebug( "tag is: memberAttrName\n");
+				self::_readCollection ($attributes_type,$j);
+				break;
+
+			default:
+				$this->collection_depth = -1;
+				$this->collection_key = array();
+				$this->collection_nbr = array();
+				$this->serveroutput->response[$attributes_type][$j]['type'] = $tag;
+				self::_putDebug( "tag is: $tag\n");
+				$attribute_name = self::_readAttributeName ($attributes_type,$j);
+				if (!$attribute_name)
+				{
+					$attribute_name = $this->attribute_name;
+				}
+				else
+				{
+					$this->attribute_name = $attribute_name;
+				}
+				$value = self::_readValue ($tag,$attributes_type,$j);
+				$this->serveroutput->response[$attributes_type][$j]['value'] = 
+				self::_interpretAttribute($attribute_name,$tag,$this->serveroutput->response[$attributes_type][$j]['value']);
+				break;
+		}
+		return;
+	}
+
+	protected function _readTag($tag)
+	{
+		switch ($tag)
+		{
+			case 0x10:
+				$tag = "unsupported";
+				break;
+			case 0x11:
+				$tag = "reserved for 'default'";
+				break;
+			case 0x12:
+				$tag = "unknown";
+				break;
+			case 0x13:
+				$tag = "no-value";
+				break;
+			case 0x15: // RFC 3380
+				$tag = "not-settable";
+				break;
+			case 0x16: // RFC 3380
+				$tag = "delete-attribute";
+				break;
+			case 0x17: // RFC 3380
+				$tag = "admin-define";
+				break;
+			case 0x20:
+				$tag = "IETF reserved (generic integer)";
+				break;
+			case 0x21:
+				$tag = "integer";
+				break;
+			case 0x22:
+				$tag = "boolean";
+				break;
+			case 0x23:
+				$tag = "enum";
+				break;
+			case 0x30:
+				$tag = "octetString";
+				break;
+			case 0x31:
+				$tag = "datetime";
+				break;
+			case 0x32:
+				$tag = "resolution";
+				break;
+			case 0x33:
+				$tag = "rangeOfInteger";
+				break;
+			case 0x34: //RFC3382 (BLIND CODE)
+				$tag = "begCollection";
+				break;
+			case 0x35:
+				$tag = "textWithLanguage";
+				break;
+			case 0x36:
+				$tag = "nameWithLanguage";
+				break;
+			case 0x37: //RFC3382 (BLIND CODE)
+				$tag = "endCollection";
+				break;
+			case 0x40:
+				$tag = "IETF reserved text string";
+				break;
+			case 0x41:
+				$tag = "textWithoutLanguage";
+				break;
+			case 0x42:
+				$tag = "nameWithoutLanguage";
+				break;
+			case 0x43:
+				$tag = "IETF reserved for future";
+				break;
+			case 0x44:
+				$tag = "keyword";
+				break;
+			case 0x45:
+				$tag = "uri";
+				break;
+			case 0x46:
+				$tag = "uriScheme";
+				break;
+			case 0x47:
+				$tag = "charset";
+				break;
+			case 0x48:
+				$tag = "naturalLanguage";
+				break;
+			case 0x49:
+				$tag = "mimeMediaType";
+				break;
+			case 0x4A: // RFC3382 (BLIND CODE)
+				$tag = "memberAttrName";
+				break;
+			case 0x7F:
+				$tag = "extended type";
+				break;
+			default:
+				if ($tag >= 0x14 && $tag < 0x15 && $tag > 0x17 && $tag <= 0x1f) 
+				{
+					$tag = "out-of-band";
+				}
+				elseif (0x24 <= $tag && $tag <= 0x2f) 
+				{
+					$tag = "new integer type";
+				}
+				elseif (0x38 <= $tag && $tag <= 0x3F) 
+				{
+					$tag = "new octet-stream type";
+				}
+				elseif (0x4B <= $tag && $tag <= 0x5F) 
+				{
+					$tag = "new character string type";
+				}
+				elseif ((0x60 <= $tag && $tag < 0x7f) || $tag >= 0x80 )
+				{
+					$tag = "IETF reserved for future";
+				}
+				else
+				{
+					$tag = sprintf("UNKNOWN: 0x%x (%u)",$tag,$tag);
+				}
+				break;                                                            
+		}
+
+		return $tag; 
+	}
+
+	protected function _readCollection($attributes_type,$j)
+	{
+		$name_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
+					 +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
+
+		$this->_parsing->offset += 2;
+
+		self::_putDebug( "Collection name_length ". $name_length ."\n");
+
+		$name = '';
+		for ($i = 0; $i < $name_length; $i++)
+		{
+			$name .= $this->serveroutput->body[$this->_parsing->offset];
+			$this->_parsing->offset += 1;
+			if ($this->_parsing->offset > strlen($this->serveroutput->body))
+			{
+				return;
+			}
+		}
+
+		$collection_name = $name;
+
+		$name_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
+					 +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
+		$this->_parsing->offset += 2;
+
+		self::_putDebug( "Attribute name_length ". $name_length ."\n");
+
+		$name = '';
+		for ($i = 0; $i < $name_length; $i++)
+		{
+			$name .= $this->serveroutput->body[$this->_parsing->offset];
+			$this->_parsing->offset += 1;
+			if ($this->_parsing->offset > strlen($this->serveroutput->body))
+			{
+				return;
+			}
+		}
+
+		$attribute_name = $name;
+		if ($attribute_name == "")
+		{
+			$attribute_name = $this->last_attribute_name;
+			$this->collection_key[$this->collection_depth] ++;
+		}
+		else
+		{
+			$this->collection_key[$this->collection_depth] = 0;
+		}
+		$this->last_attribute_name = $attribute_name;
+
+		self::_putDebug( "Attribute name ".$name."\n");
+
+		$tag = self::_readTag(ord($this->serveroutput->body[$this->_parsing->offset]));
+		$this->_parsing->offset ++;
+
+		$type = $tag;
+
+		$name_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
+					 +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
+		$this->_parsing->offset += 2;
+
+		self::_putDebug( "Collection2 name_length ". $name_length ."\n");
+
+		$name = '';
+		for ($i = 0; $i < $name_length; $i++)
+		{
+			$name .= $this->serveroutput->body[$this->_parsing->offset];
+			$this->_parsing->offset += 1;
+			if ($this->_parsing->offset > strlen($this->serveroutput->body))
+			{
+				return;
+			}
+		}
+
+		$collection_value = $name;
+		$value_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
+					  +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
+
+		self::_putDebug( "Collection value_length ".$this->serveroutput->body[ $this->_parsing->offset]
+									   . $this->serveroutput->body[$this->_parsing->offset + 1]
+									   .": "
+									   . $value_length
+									   . " ");
+
+		$this->_parsing->offset += 2;
+
+		$value = '';
+		for ($i = 0; $i < $value_length; $i++)
+		{
+			if ($this->_parsing->offset >= strlen($this->serveroutput->body))
+			{
+				return;
+			}
+			$value .= $this->serveroutput->body[$this->_parsing->offset];
+			$this->_parsing->offset += 1;
+		}
+
+		$object = &$this->collection;
+		for ($i = 0 ; $i <= $this->collection_depth ; $i ++)
+		{
+			$indice = "_indice".$this->collection_nbr[$i];
+			if (!isset($object->$indice))
+			{
+				$object->$indice = (object) 'indice';
+			}
+			$object = &$object->$indice;
+		}
+
+		$value_key = "_value".$this->collection_key[$this->collection_depth];
+		$col_name_key = "_collection_name".$this->collection_key[$this->collection_depth];
+		$col_val_key = "_collection_value".$this->collection_key[$this->collection_depth];
+
+		$attribute_value = self::_interpretAttribute($attribute_name,$tag,$value);
+		$attribute_name = str_replace('-','_',$attribute_name);
+
+		self::_putDebug( sprintf("Value: %s\n",$value));
+		$object->$attribute_name->_type = $type;
+		$object->$attribute_name->$value_key = $attribute_value;
+		$object->$attribute_name->$col_name_key = $collection_name;
+		$object->$attribute_name->$col_val_key = $collection_value;
+
+		$this->serveroutput->response[$attributes_type][$j]['value'] = $this->collection;
+	}
+
+	protected function _readAttributeName ($attributes_type,$j,$write=1)
+	{
+		$name_length = ord($this->serveroutput->body[ $this->_parsing->offset]) *  256
+					 +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
+		$this->_parsing->offset += 2;
+
+		self::_putDebug( "name_length ". $name_length ."\n");
+
+		$name = '';
+		for ($i = 0; $i < $name_length; $i++)
+		{
+			if ($this->_parsing->offset >= strlen($this->serveroutput->body))
+			{
+				return;
+			}
+			$name .= $this->serveroutput->body[$this->_parsing->offset];
+			$this->_parsing->offset += 1;
+		}
+
+		if($write)
+		{
+			$this->serveroutput->response[$attributes_type][$j]['name'] = $name;
+		}
+
+		self::_putDebug( "name " . $name . "\n");
+
+		return $name;   
+	}
+
+	protected function _readValue ($type,$attributes_type,$j,$write=1)
+	{
+		$value_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
+					  +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
         
-        self::_putDebug( "value_length ".$this->serveroutput->body[ $this->_parsing->offset]
-                                       . $this->serveroutput->body[$this->_parsing->offset + 1]
-                                       .": "
-                                       . $value_length
-                                       . " ");
-
-        $this->_parsing->offset += 2;
-
-        $value = '';
-        for ($i = 0; $i < $value_length; $i++)
-        {
-            if ($this->_parsing->offset >= strlen($this->serveroutput->body))
-            {
-                return;
-            }
-            $value .= $this->serveroutput->body[$this->_parsing->offset];
-            $this->_parsing->offset += 1;
-            }
-
-        self::_putDebug( sprintf("Value: %s\n",$value));
-
-        if ($write)
-        {
-            $this->serveroutput->response[$attributes_type][$j]['value'] = $value;
-        }
-
-        return $value;
-    }
-
-    protected function _parseAttributes()
-    {
-        $k = -1;
-        $l = 0;
-        for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
-        {
-            for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
-            {
-                if (!empty($this->serveroutput->response[$i][$j]['name']))
-                {
-                    $k++;
-                    $l = 0;
-                    $this->parsed[$k]['range'] = $this->serveroutput->response[$i]['attributes'];
-                    $this->parsed[$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
-                    $this->parsed[$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
-                    $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-                else
-                {
-                    $l ++;
-                    $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-            }
-        }
-        $this->serveroutput->response = array();
-        $this->attributes  = new \stdClass();
-        for ($i = 0 ; $i < count($this->parsed) ; $i ++)
-        {
-                    $name = $this->parsed[$i]['name'];
-                    $php_name = str_replace('-','_',$name);
-                    $type = $this->parsed[$i]['type'];
-                    $range = $this->parsed[$i]['range'];
-                    $this->attributes->$php_name = new \stdClass();
-                    $this->attributes->$php_name->_type = $type;
-                    $this->attributes->$php_name->_range = $range;
-                    for ($j = 0 ; $j < (count($this->parsed[$i]) - 3) ; $j ++)
-                    {
-                        $value = $this->parsed[$i][$j];
-                        $index = '_value'.$j;
-                        $this->attributes->$php_name->$index = $value;
-                        }
-                    }
-
-        $this->parsed = array();
-    }
-
-    protected function _parseJobAttributes()
-    {
-        //if (!preg_match('#successful#',$this->serveroutput->status))
-        //    return false;
-        $k = -1;
-        $l = 0;
-        for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
-        {
-            for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
-            {
-                if (!empty($this->serveroutput->response[$i][$j]['name']))
-                {
-                    $k++;
-                    $l = 0;
-                    $this->parsed[$k]['range'] = $this->serveroutput->response[$i]['attributes'];
-                    $this->parsed[$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
-                    $this->parsed[$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
-                    $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-                else
-                {
-                    $l ++;
-                    $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-            }
-        }
-
-        $this->serveroutput->response = array();
-
-        $this->job_attributes = new \stdClass();
-        for ($i = 0 ; $i < count($this->parsed) ; $i ++)
-        {
-                    $name = $this->parsed[$i]['name'];
-                    $php_name = str_replace('-','_',$name);
-                    $type = $this->parsed[$i]['type'];
-                    $range = $this->parsed[$i]['range'];
-                    $this->job_attributes->$php_name = new \stdClass();
-                    $this->job_attributes->$php_name->_type = $type;
-                    $this->job_attributes->$php_name->_range = $range;
-                    for ($j = 0 ; $j < (count($this->parsed[$i]) - 3) ; $j ++)
-                    {
-                        $value = $this->parsed[$i][$j];
-                        $index = '_value'.$j;
-                        $this->job_attributes->$php_name->$index = $value;
-                        }
-                    }
-
-        $this->parsed = array();
-    }
-
-    protected function _interpretAttribute($attribute_name,$type,$value)
-    {
-        switch ($type)
-        {
-            case "integer":
-                $value = self::_interpretInteger($value);
-                break;
-            case "rangeOfInteger":
-                $value = self::_interpretRangeOfInteger($value);
-                break;
-            case 'boolean':
-                $value = ord($value);
-                if ($value == 0x00)
-                {
-                    $value = 'false';
-                }
-                else
-                {
-                    $value = 'true';
-                }
-                break;
-            case 'datetime':
-                $value = self::_interpretDateTime($value);
-                break;
-            case 'enum':
-                $value = $this->_interpretEnum($attribute_name,$value); // must be overwritten by children
-                break;
-            case 'resolution':
-                $unit = $value[8];
-                $value = self::_interpretRangeOfInteger(substr($value,0,8));
-                switch($unit)
-                {
-                    case chr(0x03):
-                        $unit = "dpi";
-                        break;
-                    case chr(0x04):
-                        $unit = "dpc";
-                        break;
-                    }
-                $value = $value." ".$unit;
-                break;
-            default:
-                break;
-        }
-        return $value;
-    }
-
-    protected function _interpretRangeOfInteger($value)
-    {
-        $value_parsed = 0;
-        $integer1 = $integer2 = 0;
-
-        $halfsize = strlen($value) / 2;
-
-        $integer1 = self::_interpretInteger(substr($value,0,$halfsize));
-        $integer2 = self::_interpretInteger(substr($value,$halfsize,$halfsize));
-
-        $value_parsed = sprintf('%s-%s',$integer1,$integer2);
-
-        return $value_parsed;
-    }
-
-    protected function _interpretDateTime($date)
-    {
-        $year = self::_interpretInteger(substr($date,0,2));
-        $month =  self::_interpretInteger(substr($date,2,1));
-        $day =  self::_interpretInteger(substr($date,3,1));
-        $hour =  self::_interpretInteger(substr($date,4,1));
-        $minute =  self::_interpretInteger(substr($date,5,1));
-        $second =  self::_interpretInteger(substr($date,6,1));
-        $direction = substr($date,8,1);
-        $hours_from_utc = self::_interpretInteger(substr($date,9,1));
-        $minutes_from_utc = self::_interpretInteger(substr($date,10,1));
-
-        $date = sprintf('%s-%s-%s %s:%s:%s %s%s:%s',$year,$month,$day,$hour,$minute,$second,$direction,$hours_from_utc,$minutes_from_utc);
-
-        return $date;
-    }
-
-    protected function _interpretEnum($attribute_name,$value)
-    {
-        $value_parsed = self::_interpretInteger($value);
-
-        switch ($attribute_name)
-        {
-            case 'job-state':
-                switch ($value_parsed)
-                {
-                    case 0x03:
-                        $value = 'pending';
-                        break;
-                    case 0x04:
-                        $value = 'pending-held';
-                        break;
-                    case 0x05:
-                        $value = 'processing';
-                        break;
-                    case 0x06:
-                        $value = 'processing-stopped';
-                        break;
-                    case 0x07:
-                        $value = 'canceled';
-                        break;
-                    case 0x08:
-                        $value = 'aborted';
-                        break;
-                    case 0x09:
-                        $value = 'completed';
-                        break;
-                }
-                if ($value_parsed > 0x09)
-                {
-                    $value = sprintf('Unknown(IETF standards track "job-state" reserved): 0x%x',$value_parsed);
-                }
-                break;
-            case 'print-quality':
-            case 'print-quality-supported':
-            case 'print-quality-default':
-                switch ($value_parsed)
-                {
-                    case 0x03:
-                        $value = 'draft';
-                        break;
-                    case 0x04:
-                        $value = 'normal';
-                        break;
-                    case 0x05:
-                        $value = 'high';
-                        break;
-                    }
-                break;
-            case 'printer-state':
-                switch ($value_parsed)
-                {
-                    case 0x03:
-                        $value = 'idle';
-                        break;
-                    case 0x04:
-                        $value = 'processing';
-                        break;
-                    case 0x05:
-                        $value = 'stopped';
-                        break;
-                }
-                if ($value_parsed > 0x05)
-                {
-                    $value = sprintf('Unknown(IETF standards track "printer-state" reserved): 0x%x',$value_parsed);
-                }
-                break;
-
-            case 'operations-supported':
-                switch($value_parsed)
-                {
-                    case 0x0000:
-                    case 0x0001:
-                        $value = sprintf('Unknown(reserved) : %s',ord($value));
-                        break;
-                    case 0x0002:
-                        $value = 'Print-Job';
-                        break;
-                    case 0x0003:
-                        $value = 'Print-URI';
-                        break;
-                    case 0x0004:
-                        $value = 'Validate-Job';
-                        break;
-                    case 0x0005:
-                        $value = 'Create-Job';
-                        break;
-                    case 0x0006:
-                        $value = 'Send-Document';
-                        break;
-                    case 0x0007:
-                        $value = 'Send-URI';
-                        break;
-                    case 0x0008:
-                        $value = 'Cancel-Job';
-                        break;
-                    case 0x0009:
-                        $value = 'Get-Job-Attributes';
-                        break;
-                    case 0x000A:
-                        $value = 'Get-Jobs';
-                        break;
-                    case 0x000B:
-                        $value = 'Get-Printer-Attributes';
-                        break;
-                    case 0x000C:
-                        $value = 'Hold-Job';
-                        break;
-                    case 0x000D:
-                        $value = 'Release-Job';
-                        break;
-                    case 0x000E:
-                        $value = 'Restart-Job';
-                        break;
-                    case 0x000F:
-                        $value = 'Unknown(reserved for a future operation)';
-                        break;
-                    case 0x0010:
-                        $value = 'Pause-Printer';
-                        break;
-                    case 0x0011:
-                        $value = 'Resume-Printer';
-                        break;
-                    case 0x0012:
-                        $value = 'Purge-Jobs';
-                        break;
-                    case 0x0013:
-                        $value = 'Set-Printer-Attributes'; // RFC3380
-                        break;
-                    case 0x0014:
-                        $value = 'Set-Job-Attributes'; // RFC3380
-                        break;
-                    case 0x0015:
-                        $value = 'Get-Printer-Supported-Values'; // RFC3380
-                        break;
-                    case 0x0016:
-                        $value = 'Create-Printer-Subscriptions';
-                        break;
-                    case 0x0017:
-                        $value = 'Create-Job-Subscriptions';
-                        break;
-                    case 0x0018:
-                        $value = 'Get-Subscription-Attributes';
-                        break;
-                    case 0x0019:
-                        $value = 'Get-Subscriptions';
-                        break;
-                    case 0x001A:
-                        $value = 'Renew-Subscription';
-                        break;
-                    case 0x001B:
-                        $value = 'Cancel-Subscription';
-                        break;
-                    case 0x001C:
-                        $value = 'Get-Notifications';
-                        break;
-                    case 0x001D:
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
-                        break;
-                    case 0x001E:
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
-                        break;
-                    case 0x001F:
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
-                        break;
-                    case 0x0020:
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
-                        break;
-                    case 0x0021:
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
-                        break;
-                    case 0x0022: 
-                        $value = 'Enable-Printer';
-                        break;
-                    case 0x0023: 
-                        $value = 'Disable-Printer';
-                        break;
-                    case 0x0024: 
-                        $value = 'Pause-Printer-After-Current-Job';
-                        break;
-                    case 0x0025: 
-                        $value = 'Hold-New-Jobs';
-                        break;
-                    case 0x0026: 
-                        $value = 'Release-Held-New-Jobs';
-                        break;
-                    case 0x0027: 
-                        $value = 'Deactivate-Printer';
-                        break;
-                    case 0x0028: 
-                        $value = 'Activate-Printer';
-                        break;
-                    case 0x0029: 
-                        $value = 'Restart-Printer';
-                        break;
-                    case 0x002A: 
-                        $value = 'Shutdown-Printer';
-                        break;
-                    case 0x002B: 
-                        $value = 'Startup-Printer';
-                        break;
-                }
-                if ($value_parsed > 0x002B && $value_parsed <= 0x3FFF)
-                {
-                    $value = sprintf('Unknown(IETF standards track operations reserved): 0x%x',$value_parsed);
-                }
-                elseif ($value_parsed >= 0x4000 && $value_parsed <= 0x8FFF)
-                {
-                    if (method_exists($this,'_getEnumVendorExtensions'))
-                    {
-                        $value = $this->_getEnumVendorExtensions($value_parsed);
-                    }
-                    else
-                    {
-                        $value = sprintf('Unknown(Vendor extension for operations): 0x%x',$value_parsed);
-                    }
-                }
-                elseif ($value_parsed > 0x8FFF)
-                {
-                    $value = sprintf('Unknown operation (should not exists): 0x%x',$value_parsed);
-                }
-
-                break;
-            case 'finishings':
-            case 'finishings-default':
-            case 'finishings-supported':
-                switch ($value_parsed)
-                {
-                    case 3:
-                        $value = 'none';
-                        break;
-                    case 4:
-                        $value = 'staple';
-                        break;
-                    case 5:
-                        $value = 'punch';
-                        break;
-                    case 6:
-                        $value = 'cover';
-                        break;
-                    case 7:
-                        $value = 'bind';
-                        break;
-                    case 8:
-                        $value = 'saddle-stitch';
-                        break;
-                    case 9:
-                        $value = 'edge-stitch';
-                        break;
-                    case 20:
-                        $value = 'staple-top-left';
-                        break;
-                    case 21:
-                        $value = 'staple-bottom-left';
-                        break;
-                    case 22:
-                        $value = 'staple-top-right';
-                        break;
-                    case 23:
-                        $value = 'staple-bottom-right';
-                        break;
-                    case 24:
-                        $value = 'edge-stitch-left';
-                        break;
-                    case 25:
-                        $value = 'edge-stitch-top';
-                        break;
-                    case 26:
-                        $value = 'edge-stitch-right';
-                        break;
-                    case 27:
-                        $value = 'edge-stitch-bottom';
-                        break;
-                    case 28:
-                        $value = 'staple-dual-left';
-                        break;
-                    case 29:
-                        $value = 'staple-dual-top';
-                        break;
-                    case 30:
-                        $value = 'staple-dual-right';
-                        break;
-                    case 31:
-                        $value = 'staple-dual-bottom';
-                        break;
-                }
-                if ($value_parsed > 31)
-                {
-                    $value = sprintf('Unknown(IETF standards track "finishing" reserved): 0x%x',$value_parsed);
-                }
-                break;
-
-            case 'orientation-requested':
-            case 'orientation-requested-supported':
-            case 'orientation-requested-default':
-                switch ($value_parsed)
-                {
-                    case 0x03:
-                        $value = 'portrait';
-                        break;
-                    case 0x04:
-                        $value = 'landscape';
-                        break;
-                    case 0x05:
-                        $value = 'reverse-landscape';
-                        break;
-                    case 0x06:
-                        $value = 'reverse-portrait';
-                        break;
-                }
-                if ($value_parsed > 0x06)
-                {
-                    $value = sprintf('Unknown(IETF standards track "orientation" reserved): 0x%x',$value_parsed);
-                }
-                break;
-
-            default:
-                break;
-        }
-        return $value;
-    }
-
-    protected function _getJobId ()
-    {
-        if (!isset($this->serveroutput->response))
-        {
-            $this->jobs = array_merge($this->jobs,array('NO JOB'));
-        }
-
-        $jobfinded = false;
-        for ($i = 0 ; (!$jobfinded && array_key_exists($i,$this->serveroutput->response)) ; $i ++)
-        {
-            if (($this->serveroutput->response[$i]['attributes']) == "job-attributes")
-            {
-                for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
-                {
-                    if ($this->serveroutput->response[$i][$j]['name'] == "job-id")
-                    {
-                        $this->last_job = $this->serveroutput->response[$i][$j]['value'];
-                        $this->jobs = array_merge($this->jobs,array($this->serveroutput->response[$i][$j]['value']));
-                        return;
-                    }
-                }
-            }
-        }
-    }
-
-    protected function _getJobUri ()
-    {
-        if (!isset($this->jobs_uri))
-        {
-            $this->jobs_uri = array();
-        }
-
-        $jobfinded = false;
-        for ($i = 0 ; (!$jobfinded && array_key_exists($i,$this->serveroutput->response)) ; $i ++)
-        {
-            if (($this->serveroutput->response[$i]['attributes']) == "job-attributes")
-            {
-                for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
-                {
-                    if ($this->serveroutput->response[$i][$j]['name'] == "job-uri")
-                    {
-                        $this->last_job = $this->serveroutput->response[$i][$j]['value'];
-                        $this->jobs_uri = array_merge($this->jobs_uri,array($this->last_job));
-                        return;
-                    }
-                }
-            }
-        }
-        $this->last_job = '';
-    }
-
-    protected function _parseResponse ()
+		self::_putDebug( "value_length ".$this->serveroutput->body[ $this->_parsing->offset]
+									   . $this->serveroutput->body[$this->_parsing->offset + 1]
+									   .": "
+									   . $value_length
+									   . " ");
+
+		$this->_parsing->offset += 2;
+
+		$value = '';
+		for ($i = 0; $i < $value_length; $i++)
+		{
+			if ($this->_parsing->offset >= strlen($this->serveroutput->body))
+			{
+				return;
+			}
+			$value .= $this->serveroutput->body[$this->_parsing->offset];
+			$this->_parsing->offset += 1;
+			}
+
+		self::_putDebug( sprintf("Value: %s\n",$value));
+
+		if ($write)
+		{
+			$this->serveroutput->response[$attributes_type][$j]['value'] = $value;
+		}
+
+		return $value;
+	}
+
+	protected function _parseAttributes()
+	{
+		$k = -1;
+		$l = 0;
+		for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
+		{
+			for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
+			{
+				if (!empty($this->serveroutput->response[$i][$j]['name']))
+				{
+					$k++;
+					$l = 0;
+					$this->parsed[$k]['range'] = $this->serveroutput->response[$i]['attributes'];
+					$this->parsed[$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
+					$this->parsed[$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
+					$this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
+				}
+				else
+				{
+					$l ++;
+					$this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
+				}
+			}
+		}
+		$this->serveroutput->response = array();
+		$this->attributes  = new \stdClass();
+		for ($i = 0 ; $i < count($this->parsed) ; $i ++)
+		{
+					$name = $this->parsed[$i]['name'];
+					$php_name = str_replace('-','_',$name);
+					$type = $this->parsed[$i]['type'];
+					$range = $this->parsed[$i]['range'];
+					$this->attributes->$php_name = new \stdClass();
+					$this->attributes->$php_name->_type = $type;
+					$this->attributes->$php_name->_range = $range;
+					for ($j = 0 ; $j < (count($this->parsed[$i]) - 3) ; $j ++)
+					{
+						$value = $this->parsed[$i][$j];
+						$index = '_value'.$j;
+						$this->attributes->$php_name->$index = $value;
+						}
+					}
+
+		$this->parsed = array();
+	}
+
+	protected function _parseJobAttributes()
+	{
+		//if (!preg_match('#successful#',$this->serveroutput->status))
+		//    return false;
+		$k = -1;
+		$l = 0;
+		for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
+		{
+			for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
+			{
+				if (!empty($this->serveroutput->response[$i][$j]['name']))
+				{
+					$k++;
+					$l = 0;
+					$this->parsed[$k]['range'] = $this->serveroutput->response[$i]['attributes'];
+					$this->parsed[$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
+					$this->parsed[$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
+					$this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
+				}
+				else
+				{
+					$l ++;
+					$this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
+				}
+			}
+		}
+
+		$this->serveroutput->response = array();
+
+		$this->job_attributes = new \stdClass();
+		for ($i = 0 ; $i < count($this->parsed) ; $i ++)
+		{
+					$name = $this->parsed[$i]['name'];
+					$php_name = str_replace('-','_',$name);
+					$type = $this->parsed[$i]['type'];
+					$range = $this->parsed[$i]['range'];
+					$this->job_attributes->$php_name = new \stdClass();
+					$this->job_attributes->$php_name->_type = $type;
+					$this->job_attributes->$php_name->_range = $range;
+					for ($j = 0 ; $j < (count($this->parsed[$i]) - 3) ; $j ++)
+					{
+						$value = $this->parsed[$i][$j];
+						$index = '_value'.$j;
+						$this->job_attributes->$php_name->$index = $value;
+						}
+					}
+
+		$this->parsed = array();
+	}
+
+	protected function _interpretAttribute($attribute_name,$type,$value)
+	{
+		switch ($type)
+		{
+			case "integer":
+				$value = self::_interpretInteger($value);
+				break;
+			case "rangeOfInteger":
+				$value = self::_interpretRangeOfInteger($value);
+				break;
+			case 'boolean':
+				$value = ord($value);
+				if ($value == 0x00)
+				{
+					$value = 'false';
+				}
+				else
+				{
+					$value = 'true';
+				}
+				break;
+			case 'datetime':
+				$value = self::_interpretDateTime($value);
+				break;
+			case 'enum':
+				$value = $this->_interpretEnum($attribute_name,$value); // must be overwritten by children
+				break;
+			case 'resolution':
+				$unit = $value[8];
+				$value = self::_interpretRangeOfInteger(substr($value,0,8));
+				switch($unit)
+				{
+					case chr(0x03):
+						$unit = "dpi";
+						break;
+					case chr(0x04):
+						$unit = "dpc";
+						break;
+					}
+				$value = $value." ".$unit;
+				break;
+			default:
+				break;
+		}
+		return $value;
+	}
+
+	protected function _interpretRangeOfInteger($value)
+	{
+		$value_parsed = 0;
+		$integer1 = $integer2 = 0;
+
+		$halfsize = strlen($value) / 2;
+
+		$integer1 = self::_interpretInteger(substr($value,0,$halfsize));
+		$integer2 = self::_interpretInteger(substr($value,$halfsize,$halfsize));
+
+		$value_parsed = sprintf('%s-%s',$integer1,$integer2);
+
+		return $value_parsed;
+	}
+
+	protected function _interpretDateTime($date)
+	{
+		$year = self::_interpretInteger(substr($date,0,2));
+		$month =  self::_interpretInteger(substr($date,2,1));
+		$day =  self::_interpretInteger(substr($date,3,1));
+		$hour =  self::_interpretInteger(substr($date,4,1));
+		$minute =  self::_interpretInteger(substr($date,5,1));
+		$second =  self::_interpretInteger(substr($date,6,1));
+		$direction = substr($date,8,1);
+		$hours_from_utc = self::_interpretInteger(substr($date,9,1));
+		$minutes_from_utc = self::_interpretInteger(substr($date,10,1));
+
+		$date = sprintf('%s-%s-%s %s:%s:%s %s%s:%s',$year,$month,$day,$hour,$minute,$second,$direction,$hours_from_utc,$minutes_from_utc);
+
+		return $date;
+	}
+
+	protected function _interpretEnum($attribute_name,$value)
+	{
+		$value_parsed = self::_interpretInteger($value);
+
+		switch ($attribute_name)
+		{
+			case 'job-state':
+				switch ($value_parsed)
+				{
+					case 0x03:
+						$value = 'pending';
+						break;
+					case 0x04:
+						$value = 'pending-held';
+						break;
+					case 0x05:
+						$value = 'processing';
+						break;
+					case 0x06:
+						$value = 'processing-stopped';
+						break;
+					case 0x07:
+						$value = 'canceled';
+						break;
+					case 0x08:
+						$value = 'aborted';
+						break;
+					case 0x09:
+						$value = 'completed';
+						break;
+				}
+				if ($value_parsed > 0x09)
+				{
+					$value = sprintf('Unknown(IETF standards track "job-state" reserved): 0x%x',$value_parsed);
+				}
+				break;
+			case 'print-quality':
+			case 'print-quality-supported':
+			case 'print-quality-default':
+				switch ($value_parsed)
+				{
+					case 0x03:
+						$value = 'draft';
+						break;
+					case 0x04:
+						$value = 'normal';
+						break;
+					case 0x05:
+						$value = 'high';
+						break;
+					}
+				break;
+			case 'printer-state':
+				switch ($value_parsed)
+				{
+					case 0x03:
+						$value = 'idle';
+						break;
+					case 0x04:
+						$value = 'processing';
+						break;
+					case 0x05:
+						$value = 'stopped';
+						break;
+				}
+				if ($value_parsed > 0x05)
+				{
+					$value = sprintf('Unknown(IETF standards track "printer-state" reserved): 0x%x',$value_parsed);
+				}
+				break;
+
+			case 'operations-supported':
+				switch($value_parsed)
+				{
+					case 0x0000:
+					case 0x0001:
+						$value = sprintf('Unknown(reserved) : %s',ord($value));
+						break;
+					case 0x0002:
+						$value = 'Print-Job';
+						break;
+					case 0x0003:
+						$value = 'Print-URI';
+						break;
+					case 0x0004:
+						$value = 'Validate-Job';
+						break;
+					case 0x0005:
+						$value = 'Create-Job';
+						break;
+					case 0x0006:
+						$value = 'Send-Document';
+						break;
+					case 0x0007:
+						$value = 'Send-URI';
+						break;
+					case 0x0008:
+						$value = 'Cancel-Job';
+						break;
+					case 0x0009:
+						$value = 'Get-Job-Attributes';
+						break;
+					case 0x000A:
+						$value = 'Get-Jobs';
+						break;
+					case 0x000B:
+						$value = 'Get-Printer-Attributes';
+						break;
+					case 0x000C:
+						$value = 'Hold-Job';
+						break;
+					case 0x000D:
+						$value = 'Release-Job';
+						break;
+					case 0x000E:
+						$value = 'Restart-Job';
+						break;
+					case 0x000F:
+						$value = 'Unknown(reserved for a future operation)';
+						break;
+					case 0x0010:
+						$value = 'Pause-Printer';
+						break;
+					case 0x0011:
+						$value = 'Resume-Printer';
+						break;
+					case 0x0012:
+						$value = 'Purge-Jobs';
+						break;
+					case 0x0013:
+						$value = 'Set-Printer-Attributes'; // RFC3380
+						break;
+					case 0x0014:
+						$value = 'Set-Job-Attributes'; // RFC3380
+						break;
+					case 0x0015:
+						$value = 'Get-Printer-Supported-Values'; // RFC3380
+						break;
+					case 0x0016:
+						$value = 'Create-Printer-Subscriptions';
+						break;
+					case 0x0017:
+						$value = 'Create-Job-Subscriptions';
+						break;
+					case 0x0018:
+						$value = 'Get-Subscription-Attributes';
+						break;
+					case 0x0019:
+						$value = 'Get-Subscriptions';
+						break;
+					case 0x001A:
+						$value = 'Renew-Subscription';
+						break;
+					case 0x001B:
+						$value = 'Cancel-Subscription';
+						break;
+					case 0x001C:
+						$value = 'Get-Notifications';
+						break;
+					case 0x001D:
+						$value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
+						break;
+					case 0x001E:
+						$value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
+						break;
+					case 0x001F:
+						$value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
+						break;
+					case 0x0020:
+						$value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
+						break;
+					case 0x0021:
+						$value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
+						break;
+					case 0x0022: 
+						$value = 'Enable-Printer';
+						break;
+					case 0x0023: 
+						$value = 'Disable-Printer';
+						break;
+					case 0x0024: 
+						$value = 'Pause-Printer-After-Current-Job';
+						break;
+					case 0x0025: 
+						$value = 'Hold-New-Jobs';
+						break;
+					case 0x0026: 
+						$value = 'Release-Held-New-Jobs';
+						break;
+					case 0x0027: 
+						$value = 'Deactivate-Printer';
+						break;
+					case 0x0028: 
+						$value = 'Activate-Printer';
+						break;
+					case 0x0029: 
+						$value = 'Restart-Printer';
+						break;
+					case 0x002A: 
+						$value = 'Shutdown-Printer';
+						break;
+					case 0x002B: 
+						$value = 'Startup-Printer';
+						break;
+				}
+				if ($value_parsed > 0x002B && $value_parsed <= 0x3FFF)
+				{
+					$value = sprintf('Unknown(IETF standards track operations reserved): 0x%x',$value_parsed);
+				}
+				elseif ($value_parsed >= 0x4000 && $value_parsed <= 0x8FFF)
+				{
+					if (method_exists($this,'_getEnumVendorExtensions'))
+					{
+						$value = $this->_getEnumVendorExtensions($value_parsed);
+					}
+					else
+					{
+						$value = sprintf('Unknown(Vendor extension for operations): 0x%x',$value_parsed);
+					}
+				}
+				elseif ($value_parsed > 0x8FFF)
+				{
+					$value = sprintf('Unknown operation (should not exists): 0x%x',$value_parsed);
+				}
+
+				break;
+			case 'finishings':
+			case 'finishings-default':
+			case 'finishings-supported':
+				switch ($value_parsed)
+				{
+					case 3:
+						$value = 'none';
+						break;
+					case 4:
+						$value = 'staple';
+						break;
+					case 5:
+						$value = 'punch';
+						break;
+					case 6:
+						$value = 'cover';
+						break;
+					case 7:
+						$value = 'bind';
+						break;
+					case 8:
+						$value = 'saddle-stitch';
+						break;
+					case 9:
+						$value = 'edge-stitch';
+						break;
+					case 20:
+						$value = 'staple-top-left';
+						break;
+					case 21:
+						$value = 'staple-bottom-left';
+						break;
+					case 22:
+						$value = 'staple-top-right';
+						break;
+					case 23:
+						$value = 'staple-bottom-right';
+						break;
+					case 24:
+						$value = 'edge-stitch-left';
+						break;
+					case 25:
+						$value = 'edge-stitch-top';
+						break;
+					case 26:
+						$value = 'edge-stitch-right';
+						break;
+					case 27:
+						$value = 'edge-stitch-bottom';
+						break;
+					case 28:
+						$value = 'staple-dual-left';
+						break;
+					case 29:
+						$value = 'staple-dual-top';
+						break;
+					case 30:
+						$value = 'staple-dual-right';
+						break;
+					case 31:
+						$value = 'staple-dual-bottom';
+						break;
+				}
+				if ($value_parsed > 31)
+				{
+					$value = sprintf('Unknown(IETF standards track "finishing" reserved): 0x%x',$value_parsed);
+				}
+				break;
+
+			case 'orientation-requested':
+			case 'orientation-requested-supported':
+			case 'orientation-requested-default':
+				switch ($value_parsed)
+				{
+					case 0x03:
+						$value = 'portrait';
+						break;
+					case 0x04:
+						$value = 'landscape';
+						break;
+					case 0x05:
+						$value = 'reverse-landscape';
+						break;
+					case 0x06:
+						$value = 'reverse-portrait';
+						break;
+				}
+				if ($value_parsed > 0x06)
+				{
+					$value = sprintf('Unknown(IETF standards track "orientation" reserved): 0x%x',$value_parsed);
+				}
+				break;
+
+			default:
+				break;
+		}
+		return $value;
+	}
+
+	protected function _getJobId ()
+	{
+		if (!isset($this->serveroutput->response))
+		{
+			$this->jobs = array_merge($this->jobs,array('NO JOB'));
+		}
+
+		$jobfinded = false;
+		for ($i = 0 ; (!$jobfinded && array_key_exists($i,$this->serveroutput->response)) ; $i ++)
+		{
+			if (($this->serveroutput->response[$i]['attributes']) == "job-attributes")
+			{
+				for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
+				{
+					if ($this->serveroutput->response[$i][$j]['name'] == "job-id")
+					{
+						$this->last_job = $this->serveroutput->response[$i][$j]['value'];
+						$this->jobs = array_merge($this->jobs,array($this->serveroutput->response[$i][$j]['value']));
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	protected function _getJobUri ()
+	{
+		if (!isset($this->jobs_uri))
+		{
+			$this->jobs_uri = array();
+		}
+
+		$jobfinded = false;
+		for ($i = 0 ; (!$jobfinded && array_key_exists($i,$this->serveroutput->response)) ; $i ++)
+		{
+			if (($this->serveroutput->response[$i]['attributes']) == "job-attributes")
+			{
+				for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
+				{
+					if ($this->serveroutput->response[$i][$j]['name'] == "job-uri")
+					{
+						$this->last_job = $this->serveroutput->response[$i][$j]['value'];
+						$this->jobs_uri = array_merge($this->jobs_uri,array($this->last_job));
+						return;
+					}
+				}
+			}
+		}
+		$this->last_job = '';
+	}
+
+	protected function _parseResponse ()
    {
-        $j = -1;
-        $this->index = 0;
-        for ($i = $this->_parsing->offset; $i < strlen($this->serveroutput->body) ; $i = $this->_parsing->offset)
-        {
-            $tag = ord($this->serveroutput->body[$this->_parsing->offset]);
-
-            if ($tag > 0x0F)
-            {
-                self::_readAttribute($j);
-                $this->index ++;
-                continue;
-            }
-
-            switch ($tag)
-            {
-                case 0x01:
-                    $j += 1;
-                    $this->serveroutput->response[$j]['attributes'] = "operation-attributes";
-                    $this->index = 0;
-                    $this->_parsing->offset += 1;
-                    break;
-                case 0x02:
-                    $j += 1;
-                    $this->serveroutput->response[$j]['attributes'] = "job-attributes";
-                    $this->index = 0;
-                    $this->_parsing->offset += 1;
-                    break;
-                case 0x03:
-                    $j +=1;
-                    $this->serveroutput->response[$j]['attributes'] = "end-of-attributes";
-                    self::_putDebug( "tag is: ".$this->serveroutput->response[$j]['attributes']."\n");
-                    if ($this->alert_on_end_tag === 1)
-                    {
-                        echo "END tag OK<br />";
-                    }
-                    $this->response_completed[(count($this->response_completed) -1)] = "completed";
-                    return;
-                case 0x04:
-                    $j += 1;
-                    $this->serveroutput->response[$j]['attributes'] = "printer-attributes";
-                    $this->index = 0;
-                    $this->_parsing->offset += 1;
-                    break;
-                case 0x05:
-                    $j += 1;
-                    $this->serveroutput->response[$j]['attributes'] = "unsupported-attributes";
-                    $this->index = 0;
-                    $this->_parsing->offset += 1;
-                    break;
-                default:
-                    $j += 1;
-                    $this->serveroutput->response[$j]['attributes'] = sprintf(_("0x%x (%u) : attributes tag Unknown (reserved for future versions of IPP"),$tag,$tag);
-                    $this->index = 0;
-                    $this->_parsing->offset += 1;
-                    break;
-            }
-
-            self::_putDebug( "tag is: ".$this->serveroutput->response[$j]['attributes']."\n\n\n");
-        }
-        return;
-    }
-
-    /*
+		$j = -1;
+		$this->index = 0;
+		for ($i = $this->_parsing->offset; $i < strlen($this->serveroutput->body) ; $i = $this->_parsing->offset)
+		{
+			$tag = ord($this->serveroutput->body[$this->_parsing->offset]);
+
+			if ($tag > 0x0F)
+			{
+				self::_readAttribute($j);
+				$this->index ++;
+				continue;
+			}
+
+			switch ($tag)
+			{
+				case 0x01:
+					$j += 1;
+					$this->serveroutput->response[$j]['attributes'] = "operation-attributes";
+					$this->index = 0;
+					$this->_parsing->offset += 1;
+					break;
+				case 0x02:
+					$j += 1;
+					$this->serveroutput->response[$j]['attributes'] = "job-attributes";
+					$this->index = 0;
+					$this->_parsing->offset += 1;
+					break;
+				case 0x03:
+					$j +=1;
+					$this->serveroutput->response[$j]['attributes'] = "end-of-attributes";
+					self::_putDebug( "tag is: ".$this->serveroutput->response[$j]['attributes']."\n");
+					if ($this->alert_on_end_tag === 1)
+					{
+						echo "END tag OK<br />";
+					}
+					$this->response_completed[(count($this->response_completed) -1)] = "completed";
+					return;
+				case 0x04:
+					$j += 1;
+					$this->serveroutput->response[$j]['attributes'] = "printer-attributes";
+					$this->index = 0;
+					$this->_parsing->offset += 1;
+					break;
+				case 0x05:
+					$j += 1;
+					$this->serveroutput->response[$j]['attributes'] = "unsupported-attributes";
+					$this->index = 0;
+					$this->_parsing->offset += 1;
+					break;
+				default:
+					$j += 1;
+					$this->serveroutput->response[$j]['attributes'] = sprintf(_("0x%x (%u) : attributes tag Unknown (reserved for future versions of IPP"),$tag,$tag);
+					$this->index = 0;
+					$this->_parsing->offset += 1;
+					break;
+			}
+
+			self::_putDebug( "tag is: ".$this->serveroutput->response[$j]['attributes']."\n\n\n");
+		}
+		return;
+	}
+
+	/*
     // NOTICE : HAVE TO READ AGAIN RFC 2911 TO SEE IF IT IS PART OF SERVER'S RESPONSE (CUPS DO NOT)
 
     protected function _getPrinterUri () {
@@ -2002,53 +2002,53 @@ 
 
     */
 
-    // REQUEST BUILDING
-    protected function _stringCancel ($job_uri)
-    {
+	// REQUEST BUILDING
+	protected function _stringCancel ($job_uri)
+	{
     
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-        if (!isset($this->setup->datatype))
-        {
-            self::setBinary();
-        }
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-        if (!$this->requesting_user)   
-        {
-            self::setUserName();
-        }
-        if (!isset($this->meta->message))
-        {
-            $this->meta->message = '';
-        }
-
-        self::_setOperationId();
-
-        self::_setJobUri($job_uri);
-
-        if (!isset($this->error_generation->request_body_malformed))
-        {
-            $this->error_generation->request_body_malformed = "";
-        }
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x08) // cancel-Job | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . $this->error_generation->request_body_malformed
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->job_uri
-                         . $this->meta->username
-                         . $this->meta->message
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+		if (!isset($this->setup->datatype))
+		{
+			self::setBinary();
+		}
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+		if (!$this->requesting_user)   
+		{
+			self::setUserName();
+		}
+		if (!isset($this->meta->message))
+		{
+			$this->meta->message = '';
+		}
+
+		self::_setOperationId();
+
+		self::_setJobUri($job_uri);
+
+		if (!isset($this->error_generation->request_body_malformed))
+		{
+			$this->error_generation->request_body_malformed = "";
+		}
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x08) // cancel-Job | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . $this->error_generation->request_body_malformed
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->job_uri
+						 . $this->meta->username
+						 . $this->meta->message
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
                          
-        self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-        return TRUE;
-    }
+		self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+		return TRUE;
+	}
 }

htdocs/includes/printipp/BasicIPP.php

Indentation +1922 added lines, -1922 removed lines

@@ -40,333 +40,333 @@ 
 
 class ippException extends \Exception
 {
-    protected $errno;
-
-    public function __construct($msg, $errno = null)
-    {
-        parent::__construct($msg);
-        $this->errno = $errno;
-    }
-
-    public function getErrorFormatted()
-    {
-        $return = sprintf("[ipp]: %s -- " . _(" file %s, line %s"),
-            $this->getMessage() , $this->getFile() , $this->getLine());
-        return $return;
-    }
-
-    public function getErrno()
-    {
-        return $this->errno;
-    }
+	protected $errno;
+
+	public function __construct($msg, $errno = null)
+	{
+		parent::__construct($msg);
+		$this->errno = $errno;
+	}
+
+	public function getErrorFormatted()
+	{
+		$return = sprintf("[ipp]: %s -- " . _(" file %s, line %s"),
+			$this->getMessage() , $this->getFile() , $this->getLine());
+		return $return;
+	}
+
+	public function getErrno()
+	{
+		return $this->errno;
+	}
 }
 
 class BasicIPP
 {
-    public $paths = array(
-        "root" => "/",
-        "admin" => "/admin/",
-        "printers" => "/printers/",
-        "jobs" => "/jobs/"
-    );
-    public $http_timeout = 30; // timeout at http connection (seconds) 0 => default => 30.
-    public $http_data_timeout = 30; // data reading timeout (milliseconds) 0 => default => 30.
-    public $ssl = false;
-    public $debug_level = 3; // max 3: almost silent
-    public $alert_on_end_tag; // debugging purpose: echo "END tag OK" if (1 and  reads while end tag)
-    public $with_exceptions = 1; // compatibility mode for old scripts		// DOL_LDR_CHANGE set this to 1
-    public $handle_http_exceptions = 1;
-
-    // readables variables
-    public $jobs = array();
-    public $jobs_uri = array();
-    public $status = array();
-    public $response_completed = array();
-    public $last_job = "";
-    public $attributes; // object you can read: attributes after validateJob()
-    public $printer_attributes; // object you can read: printer's attributes after getPrinterAttributes()
-    public $job_attributes; // object you can read: last job attributes
-    public $jobs_attributes; // object you can read: jobs attributes after getJobs()
-    public $available_printers = array();
-    public $printer_map = array();
-    public $printers_uri = array();
-    public $debug = array();
-    public $response;
-    public $meta;
-
-    // protected variables;
-    protected $log_level = 2; // max 3: very verbose
-    protected $log_type = 3; // 3: file | 1: e-mail | 0: logger
-    protected $log_destination; // e-mail or file
-    protected $serveroutput;
-    protected $setup;
-    protected $stringjob;
-    protected $data;
-    protected $debug_count = 0;
-    protected $username;
-    protected $charset;
-    protected $password;
-    protected $requesring_user;
-    protected $client_hostname = "localhost";
-    protected $stream;
-    protected $host = "localhost";
-    protected $port = "631";
-    protected $requesting_user = '';
-    protected $printer_uri;
-    protected $timeout = "20"; //20 secs
-    protected $errNo;
-    protected $errStr;
-    protected $datatype;
-    protected $datahead;
-    protected $datatail;
-    protected $operation_id;
-    protected $delay;
-    protected $error_generation; //devel feature
-    protected $debug_http = 0;
-    protected $no_disconnect;
-    protected $job_tags;
-    protected $operation_tags;
-    protected $index;
-    protected $collection; //RFC3382
-    protected $collection_index; //RFC3382
-    protected $collection_key = array(); //RFC3382
-    protected $collection_depth = - 1; //RFC3382
-    protected $end_collection = false; //RFC3382
-    protected $collection_nbr = array(); //RFC3382
-    protected $unix = false; // true -> use unix sockets instead of http
-    protected $output;
-
-    public function __construct()
-    {
-        $tz = getenv("date.timezone");
-        if (!$tz)
-        {
-            $tz = @date_default_timezone_get();
-        }
-
-        date_default_timezone_set($tz);
-        $this->meta = new \stdClass();
-        $this->setup = new \stdClass();
-        $this->values = new \stdClass();
-        $this->serveroutput = new \stdClass();
-        $this->error_generation = new \stdClass();
-        $this->_parsing = new \stdClass();
-        self::_initTags();
-    }
-
-    public function setPort($port = '631')
-    {
-        $this->port = $port;
-        self::_putDebug("Port is " . $this->port, 2);
-    }
-
-    public function setUnix($socket = '/var/run/cups/cups.sock')
-    {
-        $this->host = $socket;
-        $this->unix = true;
-        self::_putDebug("Host is " . $this->host, 2);
-    }
-
-    public function setHost($host = 'localhost')
-    {
-        $this->host = $host;
-        $this->unix = false;
-        self::_putDebug("Host is " . $this->host, 2);
-    }
-
-    public function setTimeout($timeout)
-    {
-        $this->timeout = $timeout;
-    }
-
-    public function setPrinterURI($uri)
-    {
-        $length = strlen($uri);
-        $length = chr($length);
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
-        $this->meta->printer_uri = chr(0x45) // uri type | value-tag
-            . chr(0x00) . chr(0x0B) // name-length
-            . "printer-uri" // printer-uri | name
-            . $length . $uri;
-        $this->printer_uri = $uri;
-        self::_putDebug(sprintf(_("Printer URI: %s") , $uri) , 2);
-        $this->setup->uri = 1;
-    }
-
-    public function setData($data)
-    {
-        $this->data = $data;
-        self::_putDebug("Data set", 2);
-    }
-
-    public function setRawText()
-    {
-        $this->setup->datatype = 'TEXT';
-        $this->meta->mime_media_type = "";
-        $this->setup->mime_media_type = 1;
-        $this->datahead = chr(0x16);
-        if (is_readable($this->data))
-        {
-            //It's a filename.  Open and stream.
-            $data = fopen($this->data, "rb");
-            while (!feof($data)) $output = fread($data, 8192);
-        }
-        else
-        {
-            $output = $this->data;
-        }
-        if (substr($output, -1, 1) != chr(0x0c)) {
-            if (!isset($this->setup->noFormFeed))
-            {
-                $this->datatail = chr(0x0c);
-            }
-        }
-        self::_putDebug(_("Forcing data to be interpreted as RAW TEXT") , 2);
-    }
-
-    public function unsetRawText()
-    {
-        $this->setup->datatype = 'BINARY';
-        $this->datahead = '';
-        $this->datatail = '';
-        self::_putDebug(_("Unset forcing data to be interpreted as RAW TEXT") , 2);
-    }
-
-    public function setBinary()
-    {
-        self::unsetRawText();
-    }
-
-    public function setFormFeed()
-    {
-        $this->datatail = "\r\n" . chr(0x0c);
-        unset($this->setup->noFormFeed);
-    }
-
-    public function unsetFormFeed()
-    {
-        $this->datatail = '';
-        $this->setup->noFormFeed = 1;
-    }
-
-    public function setCharset($charset = 'utf-8')
-    {
-        $charset = strtolower($charset);
-        $this->charset = $charset;
-        $this->meta->charset = chr(0x47) // charset type | value-tag
-            . chr(0x00) . chr(0x12) // name-length
-            . "attributes-charset" // attributes-charset | name
-            . self::_giveMeStringLength($charset) // value-length
-            . $charset; // value
-        self::_putDebug(sprintf(_("Charset: %s") , $charset) , 2);
-        $this->setup->charset = 1;
-    }
-
-    public function setLanguage($language = 'en_us')
-    {
-        $language = strtolower($language);
-        $this->meta->language = chr(0x48) // natural-language type | value-tag
-            . chr(0x00) . chr(0x1B) //  name-length
-            . "attributes-natural-language" //attributes-natural-language
-            . self::_giveMeStringLength($language) // value-length
-            . $language; // value
-        self::_putDebug(sprintf(_("Language: %s") , $language) , 2);
-        $this->setup->language = 1;
-    }
-
-    public function setDocumentFormat($mime_media_type = 'application/octet-stream')
-    {
-        self::setBinary();
-        $length = chr(strlen($mime_media_type));
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
-        self::_putDebug(sprintf(_("mime type: %s") , $mime_media_type) , 2);
-        $this->meta->mime_media_type = chr(0x49) // document-format tag
-            . self::_giveMeStringLength('document-format') . 'document-format' //
-            . self::_giveMeStringLength($mime_media_type) . $mime_media_type; // value
-        $this->setup->mime_media_type = 1;
-    }
-
-    // setDocumentFormat alias for backward compatibility
-    public function setMimeMediaType($mime_media_type = "application/octet-stream")
-    {
-        self::setDocumentFormat($mime_media_type);
-    }
-
-    public function setCopies($nbrcopies = 1)
-    {
-        $this->meta->copies = "";
-
-        if ($nbrcopies == 1 || !$nbrcopies)
-        {
-            return true;
-        }
-
-        $copies = self::_integerBuild($nbrcopies);
-        $this->meta->copies = chr(0x21) // integer type | value-tag
-            . chr(0x00) . chr(0x06) //             name-length
-            . "copies" // copies    |             name
-            . self::_giveMeStringLength($copies) // value-length
-            . $copies;
-        self::_putDebug(sprintf(_("Copies: %s") , $nbrcopies) , 2);
-        $this->setup->copies = 1;
-    }
-
-    public function setDocumentName($document_name = "")
-    {
-        $this->meta->document_name = "";
-        if (!$document_name) {
-            return true;
-        }
-        $document_name = substr($document_name, 0, 1023);
-        $length = strlen($document_name);
-        $length = chr($length);
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
-        self::_putDebug(sprintf(_("document name: %s") , $document_name) , 2);
-        $this->meta->document_name = chr(0x41) // textWithoutLanguage tag
-            . chr(0x00) . chr(0x0d) // name-length
-            . "document-name" // mimeMediaType
-            . self::_giveMeStringLength($document_name) . $document_name; // value
-
-    }
-
-    public function setJobName($jobname = '', $absolute = false)
-    {
-        $this->meta->jobname = '';
-        if ($jobname == '')
-        {
-            $this->meta->jobname = '';
-            return true;
-        }
-        $postpend = date('-H:i:s-') . $this->_setJobId();
-        if ($absolute) {
-            $postpend = '';
-        }
-        if (isset($this->values->jobname) && $jobname == '(PHP)')
-        {
-            $jobname = $this->values->jobname;
-        }
-        $this->values->jobname = $jobname;
-        $jobname.= $postpend;
-        $this->meta->jobname = chr(0x42) // nameWithoutLanguage type || value-tag
-            . chr(0x00) . chr(0x08) //  name-length
-            . "job-name" //  job-name || name
-            . self::_giveMeStringLength($jobname) // value-length
-            . $jobname; // value
-        self::_putDebug(sprintf(_("Job name: %s") , $jobname) , 2);
-        $this->setup->jobname = 1;
-    }
-
-    public function setUserName($username = 'PHP-SERVER')
-    {
-        $this->requesting_user = $username;
-        $this->meta->username = '';
-        if (!$username) {
-            return true;
-        }
-        if ($username == 'PHP-SERVER' && isset($this->meta->username)) {
-            return TRUE;
-        }
-        /*
+	public $paths = array(
+		"root" => "/",
+		"admin" => "/admin/",
+		"printers" => "/printers/",
+		"jobs" => "/jobs/"
+	);
+	public $http_timeout = 30; // timeout at http connection (seconds) 0 => default => 30.
+	public $http_data_timeout = 30; // data reading timeout (milliseconds) 0 => default => 30.
+	public $ssl = false;
+	public $debug_level = 3; // max 3: almost silent
+	public $alert_on_end_tag; // debugging purpose: echo "END tag OK" if (1 and  reads while end tag)
+	public $with_exceptions = 1; // compatibility mode for old scripts		// DOL_LDR_CHANGE set this to 1
+	public $handle_http_exceptions = 1;
+
+	// readables variables
+	public $jobs = array();
+	public $jobs_uri = array();
+	public $status = array();
+	public $response_completed = array();
+	public $last_job = "";
+	public $attributes; // object you can read: attributes after validateJob()
+	public $printer_attributes; // object you can read: printer's attributes after getPrinterAttributes()
+	public $job_attributes; // object you can read: last job attributes
+	public $jobs_attributes; // object you can read: jobs attributes after getJobs()
+	public $available_printers = array();
+	public $printer_map = array();
+	public $printers_uri = array();
+	public $debug = array();
+	public $response;
+	public $meta;
+
+	// protected variables;
+	protected $log_level = 2; // max 3: very verbose
+	protected $log_type = 3; // 3: file | 1: e-mail | 0: logger
+	protected $log_destination; // e-mail or file
+	protected $serveroutput;
+	protected $setup;
+	protected $stringjob;
+	protected $data;
+	protected $debug_count = 0;
+	protected $username;
+	protected $charset;
+	protected $password;
+	protected $requesring_user;
+	protected $client_hostname = "localhost";
+	protected $stream;
+	protected $host = "localhost";
+	protected $port = "631";
+	protected $requesting_user = '';
+	protected $printer_uri;
+	protected $timeout = "20"; //20 secs
+	protected $errNo;
+	protected $errStr;
+	protected $datatype;
+	protected $datahead;
+	protected $datatail;
+	protected $operation_id;
+	protected $delay;
+	protected $error_generation; //devel feature
+	protected $debug_http = 0;
+	protected $no_disconnect;
+	protected $job_tags;
+	protected $operation_tags;
+	protected $index;
+	protected $collection; //RFC3382
+	protected $collection_index; //RFC3382
+	protected $collection_key = array(); //RFC3382
+	protected $collection_depth = - 1; //RFC3382
+	protected $end_collection = false; //RFC3382
+	protected $collection_nbr = array(); //RFC3382
+	protected $unix = false; // true -> use unix sockets instead of http
+	protected $output;
+
+	public function __construct()
+	{
+		$tz = getenv("date.timezone");
+		if (!$tz)
+		{
+			$tz = @date_default_timezone_get();
+		}
+
+		date_default_timezone_set($tz);
+		$this->meta = new \stdClass();
+		$this->setup = new \stdClass();
+		$this->values = new \stdClass();
+		$this->serveroutput = new \stdClass();
+		$this->error_generation = new \stdClass();
+		$this->_parsing = new \stdClass();
+		self::_initTags();
+	}
+
+	public function setPort($port = '631')
+	{
+		$this->port = $port;
+		self::_putDebug("Port is " . $this->port, 2);
+	}
+
+	public function setUnix($socket = '/var/run/cups/cups.sock')
+	{
+		$this->host = $socket;
+		$this->unix = true;
+		self::_putDebug("Host is " . $this->host, 2);
+	}
+
+	public function setHost($host = 'localhost')
+	{
+		$this->host = $host;
+		$this->unix = false;
+		self::_putDebug("Host is " . $this->host, 2);
+	}
+
+	public function setTimeout($timeout)
+	{
+		$this->timeout = $timeout;
+	}
+
+	public function setPrinterURI($uri)
+	{
+		$length = strlen($uri);
+		$length = chr($length);
+		while (strlen($length) < 2) $length = chr(0x00) . $length;
+		$this->meta->printer_uri = chr(0x45) // uri type | value-tag
+			. chr(0x00) . chr(0x0B) // name-length
+			. "printer-uri" // printer-uri | name
+			. $length . $uri;
+		$this->printer_uri = $uri;
+		self::_putDebug(sprintf(_("Printer URI: %s") , $uri) , 2);
+		$this->setup->uri = 1;
+	}
+
+	public function setData($data)
+	{
+		$this->data = $data;
+		self::_putDebug("Data set", 2);
+	}
+
+	public function setRawText()
+	{
+		$this->setup->datatype = 'TEXT';
+		$this->meta->mime_media_type = "";
+		$this->setup->mime_media_type = 1;
+		$this->datahead = chr(0x16);
+		if (is_readable($this->data))
+		{
+			//It's a filename.  Open and stream.
+			$data = fopen($this->data, "rb");
+			while (!feof($data)) $output = fread($data, 8192);
+		}
+		else
+		{
+			$output = $this->data;
+		}
+		if (substr($output, -1, 1) != chr(0x0c)) {
+			if (!isset($this->setup->noFormFeed))
+			{
+				$this->datatail = chr(0x0c);
+			}
+		}
+		self::_putDebug(_("Forcing data to be interpreted as RAW TEXT") , 2);
+	}
+
+	public function unsetRawText()
+	{
+		$this->setup->datatype = 'BINARY';
+		$this->datahead = '';
+		$this->datatail = '';
+		self::_putDebug(_("Unset forcing data to be interpreted as RAW TEXT") , 2);
+	}
+
+	public function setBinary()
+	{
+		self::unsetRawText();
+	}
+
+	public function setFormFeed()
+	{
+		$this->datatail = "\r\n" . chr(0x0c);
+		unset($this->setup->noFormFeed);
+	}
+
+	public function unsetFormFeed()
+	{
+		$this->datatail = '';
+		$this->setup->noFormFeed = 1;
+	}
+
+	public function setCharset($charset = 'utf-8')
+	{
+		$charset = strtolower($charset);
+		$this->charset = $charset;
+		$this->meta->charset = chr(0x47) // charset type | value-tag
+			. chr(0x00) . chr(0x12) // name-length
+			. "attributes-charset" // attributes-charset | name
+			. self::_giveMeStringLength($charset) // value-length
+			. $charset; // value
+		self::_putDebug(sprintf(_("Charset: %s") , $charset) , 2);
+		$this->setup->charset = 1;
+	}
+
+	public function setLanguage($language = 'en_us')
+	{
+		$language = strtolower($language);
+		$this->meta->language = chr(0x48) // natural-language type | value-tag
+			. chr(0x00) . chr(0x1B) //  name-length
+			. "attributes-natural-language" //attributes-natural-language
+			. self::_giveMeStringLength($language) // value-length
+			. $language; // value
+		self::_putDebug(sprintf(_("Language: %s") , $language) , 2);
+		$this->setup->language = 1;
+	}
+
+	public function setDocumentFormat($mime_media_type = 'application/octet-stream')
+	{
+		self::setBinary();
+		$length = chr(strlen($mime_media_type));
+		while (strlen($length) < 2) $length = chr(0x00) . $length;
+		self::_putDebug(sprintf(_("mime type: %s") , $mime_media_type) , 2);
+		$this->meta->mime_media_type = chr(0x49) // document-format tag
+			. self::_giveMeStringLength('document-format') . 'document-format' //
+			. self::_giveMeStringLength($mime_media_type) . $mime_media_type; // value
+		$this->setup->mime_media_type = 1;
+	}
+
+	// setDocumentFormat alias for backward compatibility
+	public function setMimeMediaType($mime_media_type = "application/octet-stream")
+	{
+		self::setDocumentFormat($mime_media_type);
+	}
+
+	public function setCopies($nbrcopies = 1)
+	{
+		$this->meta->copies = "";
+
+		if ($nbrcopies == 1 || !$nbrcopies)
+		{
+			return true;
+		}
+
+		$copies = self::_integerBuild($nbrcopies);
+		$this->meta->copies = chr(0x21) // integer type | value-tag
+			. chr(0x00) . chr(0x06) //             name-length
+			. "copies" // copies    |             name
+			. self::_giveMeStringLength($copies) // value-length
+			. $copies;
+		self::_putDebug(sprintf(_("Copies: %s") , $nbrcopies) , 2);
+		$this->setup->copies = 1;
+	}
+
+	public function setDocumentName($document_name = "")
+	{
+		$this->meta->document_name = "";
+		if (!$document_name) {
+			return true;
+		}
+		$document_name = substr($document_name, 0, 1023);
+		$length = strlen($document_name);
+		$length = chr($length);
+		while (strlen($length) < 2) $length = chr(0x00) . $length;
+		self::_putDebug(sprintf(_("document name: %s") , $document_name) , 2);
+		$this->meta->document_name = chr(0x41) // textWithoutLanguage tag
+			. chr(0x00) . chr(0x0d) // name-length
+			. "document-name" // mimeMediaType
+			. self::_giveMeStringLength($document_name) . $document_name; // value
+
+	}
+
+	public function setJobName($jobname = '', $absolute = false)
+	{
+		$this->meta->jobname = '';
+		if ($jobname == '')
+		{
+			$this->meta->jobname = '';
+			return true;
+		}
+		$postpend = date('-H:i:s-') . $this->_setJobId();
+		if ($absolute) {
+			$postpend = '';
+		}
+		if (isset($this->values->jobname) && $jobname == '(PHP)')
+		{
+			$jobname = $this->values->jobname;
+		}
+		$this->values->jobname = $jobname;
+		$jobname.= $postpend;
+		$this->meta->jobname = chr(0x42) // nameWithoutLanguage type || value-tag
+			. chr(0x00) . chr(0x08) //  name-length
+			. "job-name" //  job-name || name
+			. self::_giveMeStringLength($jobname) // value-length
+			. $jobname; // value
+		self::_putDebug(sprintf(_("Job name: %s") , $jobname) , 2);
+		$this->setup->jobname = 1;
+	}
+
+	public function setUserName($username = 'PHP-SERVER')
+	{
+		$this->requesting_user = $username;
+		$this->meta->username = '';
+		if (!$username) {
+			return true;
+		}
+		if ($username == 'PHP-SERVER' && isset($this->meta->username)) {
+			return TRUE;
+		}
+		/*
         $value_length = 0x00;
         for ($i = 0; $i < strlen($username); $i++)
         {
@@ -375,1610 +375,1610 @@ 
         $value_length = chr($value_length);
         while (strlen($value_length) < 2) $value_length = chr(0x00) . $value_length;
         */
-        $this->meta->username = chr(0x42) // keyword type || value-tag
-            . chr(0x00) . chr(0x14) // name-length
-            . "requesting-user-name"
-            . self::_giveMeStringLength($username) // value-length
-            . $username;
-        self::_putDebug(sprintf(_("Username: %s") , $username) , 2);
-        $this->setup->username = 1;
-    }
-
-    public function setAuthentification($username, $password)
-    {
-        self::setAuthentication($username, $password);
-    }
-
-    public function setAuthentication($username, $password)
-    {
-        $this->password = $password;
-        $this->username = $username;
-        self::_putDebug(_("Setting password") , 2);
-        $this->setup->password = 1;
-    }
-
-    public function setSides($sides = 2)
-    {
-        $this->meta->sides = '';
-        if (!$sides)
-        {
-            return true;
-        }
-
-        switch ($sides)
-        {
-            case 1:
-                $sides = "one-sided";
-                break;
-
-            case 2:
-                $sides = "two-sided-long-edge";
-                break;
-
-            case "2CE":
-                $sides = "two-sided-short-edge";
-                break;
-        }
-
-        $this->meta->sides = chr(0x44) // keyword type | value-tag
-            . chr(0x00) . chr(0x05) //        name-length
-            . "sides" // sides |             name
-            . self::_giveMeStringLength($sides) //               value-length
-            . $sides; // one-sided |          value
-        self::_putDebug(sprintf(_("Sides value set to %s") , $sides) , 2);
-    }
-
-    public function setFidelity()
-    {
-        // whether the server can't replace any attributes
-        // (eg, 2 sided print is not possible,
-        // so print one sided) and DO NOT THE JOB.
-        $this->meta->fidelity = chr(0x22) // boolean type  |  value-tag
-            . chr(0x00) . chr(0x16) //                  name-length
-            . "ipp-attribute-fidelity" // ipp-attribute-fidelity | name
-            . chr(0x00) . chr(0x01) //  value-length
-            . chr(0x01); //  true | value
-        self::_putDebug(_("Fidelity attribute is set (paranoid mode)") , 3);
-    }
-
-    public function unsetFidelity()
-    {
-        // whether the server can replace any attributes
-        // (eg, 2 sided print is not possible,
-        // so print one sided) and DO THE JOB.
-        $this->meta->fidelity = chr(0x22) //  boolean type | value-tag
-            . chr(0x00) . chr(0x16) //        name-length
-            . "ipp-attribute-fidelity" // ipp-attribute-fidelity | name
-            . chr(0x00) . chr(0x01) //               value-length
-            . chr(0x00); // false |                   value
-        self::_putDebug(_("Fidelity attribute is unset") , 2);
-    }
-
-    public function setMessage($message = '')
-    {
-        $this->meta->message = '';
-        if (!$message) {
-            return true;
-        }
-        $this->meta->message =
-            chr(0x41) // attribute type = textWithoutLanguage
-                . chr(0x00)
-                . chr(0x07)
-                . "message"
-                . self::_giveMeStringLength(substr($message, 0, 127))
-                . substr($message, 0, 127);
-        self::_putDebug(sprintf(_('Setting message to "%s"') , $message) , 2);
-    }
-
-    public function setPageRanges($page_ranges)
-    {
-        // $pages_ranges = string:  "1:5 10:25 40:52 ..."
-        // to unset, specify an empty string.
-        $this->meta->page_range = '';
-        if (!$page_ranges) {
-            return true;
-        }
-        $page_ranges = trim(str_replace("-", ":", $page_ranges));
-        $first = true;
-        #$page_ranges = split(' ', $page_ranges);
-        $page_ranges = preg_split('# #', $page_ranges);
-        foreach($page_ranges as $page_range)
-        {
-            $value = self::_rangeOfIntegerBuild($page_range);
-            if ($first)
-            {
-                $this->meta->page_ranges .=
-                $this->tags_types['rangeOfInteger']['tag']
-                    . self::_giveMeStringLength('page-ranges')
-                    . 'page-ranges'
-                    . self::_giveMeStringLength($value)
-                    . $value;
-            }
-            else
-            {
-                $this->meta->page_ranges .=
-                $this->tags_types['rangeOfInteger']['tag']
-                    . self::_giveMeStringLength('')
-                    . self::_giveMeStringLength($value)
-                    . $value;
-                $first = false;
-            }
-        }
-    }
-
-    public function setAttribute($attribute, $values)
-    {
-        $operation_attributes_tags = array_keys($this->operation_tags);
-        $job_attributes_tags = array_keys($this->job_tags);
-        $printer_attributes_tags = array_keys($this->printer_tags);
-        self::unsetAttribute($attribute);
-        if (in_array($attribute, $operation_attributes_tags))
-        {
-            if (!is_array($values))
-            {
-                self::_setOperationAttribute($attribute, $values);
-            }
-            else
-            {
-                foreach($values as $value)
-                {
-                    self::_setOperationAttribute($attribute, $value);
-                }
-            }
-        }
-        elseif (in_array($attribute, $job_attributes_tags))
-        {
-            if (!is_array($values))
-            {
-                self::_setJobAttribute($attribute, $values);
-            }
-            else
-            {
-                foreach($values as $value)
-                {
-                    self::_setJobAttribute($attribute, $value);
-                }
-            }
-        }
-        elseif (in_array($attribute, $printer_attributes_tags))
-        {
-            if (!is_array($values))
-            {
-                self::_setPrinterAttribute($attribute, $values);
-            }
-            else
-            {
-                foreach($values as $value)
-                {
-                    self::_setPrinterAttribute($attribute, $value);
-                }
-            }
-        }
-        else
-        {
-            trigger_error(
-                sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
-                    $attribute) , E_USER_NOTICE);
-            self::_putDebug(
-                sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
-                    $attribute) , 3);
-            self::_errorLog(
-                sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
-                    $attribute) , 2);
-            return FALSE;
-        }
-    }
-
-    public function unsetAttribute($attribute)
-    {
-        $operation_attributes_tags = array_keys($this->operation_tags);
-        $job_attributes_tags = array_keys($this->job_tags);
-        $printer_attributes_tags = array_keys($this->printer_tags);
-        if (in_array($attribute, $operation_attributes_tags))
-        {
-            unset(
-                $this->operation_tags[$attribute]['value'],
-                $this->operation_tags[$attribute]['systag']
-            );
-        }
-        elseif (in_array($attribute, $job_attributes_tags))
-        {
-            unset(
-                $this->job_tags[$attribute]['value'],
-                $this->job_tags[$attribute]['systag']
-            );
-        }
-        elseif (in_array($attribute, $printer_attributes_tags))
-        {
-            unset(
-                $this->printer_tags[$attribute]['value'],
-                $this->printer_tags[$attribute]['systag']
-            );
-        }
-        else
-        {
-            trigger_error(
-                sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
-                    $attribute) , E_USER_NOTICE);
-            self::_putDebug(
-                sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
-                    $attribute) , 3);
-            self::_errorLog(
-                sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
-                    $attribute) , 2);
-            return FALSE;
-        }
-        return true;
-    }
-
-    //
-    // LOGGING / DEBUGGING
-    //
-    /**
-     * Sets log file destination. Creates the file if has permission.
-     *
-     * @param string $log_destination
-     * @param string $destination_type
-     * @param int $level
-     *
-     * @throws ippException
-     */
-    public function setLog($log_destination, $destination_type = 'file', $level = 2)
-    {
-        if (!file_exists($log_destination) && is_writable(dirname($log_destination)))
-        {
-            touch($log_destination);
-            chmod($log_destination, 0777);
-        }
-
-        switch ($destination_type)
-        {
-            case 'file':
-            case 3:
-                $this->log_destination = $log_destination;
-                $this->log_type = 3;
-                break;
-
-            case 'logger':
-            case 0:
-                $this->log_destination = '';
-                $this->log_type = 0;
-                break;
-
-            case 'e-mail':
-            case 1:
-                $this->log_destination = $log_destination;
-                $this->log_type = 1;
-                break;
-        }
-        $this->log_level = $level;
-    }
-
-    public function printDebug()
-    {
-        for ($i = 0; $i < $this->debug_count; $i++)
-        {
-            echo $this->debug[$i], "\n";
-        }
-        $this->debug = array();
-        $this->debug_count = 0;
-    }
-
-    public function getDebug()
-    {
-        $debug = '';
-        for ($i = 0; $i < $this->debug_count; $i++)
-        {
-            $debug.= $this->debug[$i];
-        }
-        $this->debug = array();
-        $this->debug_count = 0;
-        return $debug;
-    }
-
-    //
-    // OPERATIONS
-    //
-    public function printJob()
-    {
-        // this BASIC version of printJob do not parse server
-        // output for job's attributes
-        self::_putDebug(
-            sprintf(
-                "************** Date: %s ***********",
-                date('Y-m-d H:i:s')
-            )
-        );
-        if (!$this->_stringJob()) {
-            return FALSE;
-        }
-        if (is_readable($this->data))
-        {
-            self::_putDebug(_("Printing a FILE"));
-            $this->output = $this->stringjob;
-            if ($this->setup->datatype == "TEXT")
-            {
-                $this->output.= chr(0x16);
-            }
-            $post_values = array(
-                "Content-Type" => "application/ipp",
-                "Data" => $this->output,
-                "File" => $this->data
-            );
-            if ($this->setup->datatype == "TEXT" && !isset($this->setup->noFormFeed))
-            {
-                $post_values = array_merge(
-                    $post_values,
-                    array(
-                        "Filetype" => "TEXT"
-                    )
-                );
-            }
-        }
-        else
-        {
-            self::_putDebug(_("Printing DATA"));
-            $this->output =
-                $this->stringjob
-                    . $this->datahead
-                    . $this->data
-                    . $this->datatail;
-            $post_values = array(
-                "Content-Type" => "application/ipp",
-                "Data" => $this->output
-            );
-        }
-        if (self::_sendHttp($post_values, $this->paths["printers"]))
-        {
-            self::_parseServerOutput();
-        }
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status, array(
-                $this->serveroutput->status
-            ));
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(
-                    sprintf("printing job %s: ", $this->last_job)
-                        . $this->serveroutput->status,
-                    3);
-            }
-            else
-            {
-                self::_errorLog(
-                    sprintf("printing job: ", $this->last_job)
-                        . $this->serveroutput->status,
-                    1);
-            }
-                return $this->serveroutput->status;
-        }
-
-    $this->status =
-        array_merge($this->status, array("OPERATION FAILED"));
-        $this->jobs =
-            array_merge($this->jobs, array(""));
-        $this->jobs_uri =
-            array_merge($this->jobs_uri, array(""));
-
-        self::_errorLog("printing job : OPERATION FAILED", 1);
-        return false;
-    }
-
-    //
-    // HTTP OUTPUT
-    //
-    protected function _sendHttp($post_values, $uri)
-    {
-        /*
+		$this->meta->username = chr(0x42) // keyword type || value-tag
+			. chr(0x00) . chr(0x14) // name-length
+			. "requesting-user-name"
+			. self::_giveMeStringLength($username) // value-length
+			. $username;
+		self::_putDebug(sprintf(_("Username: %s") , $username) , 2);
+		$this->setup->username = 1;
+	}
+
+	public function setAuthentification($username, $password)
+	{
+		self::setAuthentication($username, $password);
+	}
+
+	public function setAuthentication($username, $password)
+	{
+		$this->password = $password;
+		$this->username = $username;
+		self::_putDebug(_("Setting password") , 2);
+		$this->setup->password = 1;
+	}
+
+	public function setSides($sides = 2)
+	{
+		$this->meta->sides = '';
+		if (!$sides)
+		{
+			return true;
+		}
+
+		switch ($sides)
+		{
+			case 1:
+				$sides = "one-sided";
+				break;
+
+			case 2:
+				$sides = "two-sided-long-edge";
+				break;
+
+			case "2CE":
+				$sides = "two-sided-short-edge";
+				break;
+		}
+
+		$this->meta->sides = chr(0x44) // keyword type | value-tag
+			. chr(0x00) . chr(0x05) //        name-length
+			. "sides" // sides |             name
+			. self::_giveMeStringLength($sides) //               value-length
+			. $sides; // one-sided |          value
+		self::_putDebug(sprintf(_("Sides value set to %s") , $sides) , 2);
+	}
+
+	public function setFidelity()
+	{
+		// whether the server can't replace any attributes
+		// (eg, 2 sided print is not possible,
+		// so print one sided) and DO NOT THE JOB.
+		$this->meta->fidelity = chr(0x22) // boolean type  |  value-tag
+			. chr(0x00) . chr(0x16) //                  name-length
+			. "ipp-attribute-fidelity" // ipp-attribute-fidelity | name
+			. chr(0x00) . chr(0x01) //  value-length
+			. chr(0x01); //  true | value
+		self::_putDebug(_("Fidelity attribute is set (paranoid mode)") , 3);
+	}
+
+	public function unsetFidelity()
+	{
+		// whether the server can replace any attributes
+		// (eg, 2 sided print is not possible,
+		// so print one sided) and DO THE JOB.
+		$this->meta->fidelity = chr(0x22) //  boolean type | value-tag
+			. chr(0x00) . chr(0x16) //        name-length
+			. "ipp-attribute-fidelity" // ipp-attribute-fidelity | name
+			. chr(0x00) . chr(0x01) //               value-length
+			. chr(0x00); // false |                   value
+		self::_putDebug(_("Fidelity attribute is unset") , 2);
+	}
+
+	public function setMessage($message = '')
+	{
+		$this->meta->message = '';
+		if (!$message) {
+			return true;
+		}
+		$this->meta->message =
+			chr(0x41) // attribute type = textWithoutLanguage
+				. chr(0x00)
+				. chr(0x07)
+				. "message"
+				. self::_giveMeStringLength(substr($message, 0, 127))
+				. substr($message, 0, 127);
+		self::_putDebug(sprintf(_('Setting message to "%s"') , $message) , 2);
+	}
+
+	public function setPageRanges($page_ranges)
+	{
+		// $pages_ranges = string:  "1:5 10:25 40:52 ..."
+		// to unset, specify an empty string.
+		$this->meta->page_range = '';
+		if (!$page_ranges) {
+			return true;
+		}
+		$page_ranges = trim(str_replace("-", ":", $page_ranges));
+		$first = true;
+		#$page_ranges = split(' ', $page_ranges);
+		$page_ranges = preg_split('# #', $page_ranges);
+		foreach($page_ranges as $page_range)
+		{
+			$value = self::_rangeOfIntegerBuild($page_range);
+			if ($first)
+			{
+				$this->meta->page_ranges .=
+				$this->tags_types['rangeOfInteger']['tag']
+					. self::_giveMeStringLength('page-ranges')
+					. 'page-ranges'
+					. self::_giveMeStringLength($value)
+					. $value;
+			}
+			else
+			{
+				$this->meta->page_ranges .=
+				$this->tags_types['rangeOfInteger']['tag']
+					. self::_giveMeStringLength('')
+					. self::_giveMeStringLength($value)
+					. $value;
+				$first = false;
+			}
+		}
+	}
+
+	public function setAttribute($attribute, $values)
+	{
+		$operation_attributes_tags = array_keys($this->operation_tags);
+		$job_attributes_tags = array_keys($this->job_tags);
+		$printer_attributes_tags = array_keys($this->printer_tags);
+		self::unsetAttribute($attribute);
+		if (in_array($attribute, $operation_attributes_tags))
+		{
+			if (!is_array($values))
+			{
+				self::_setOperationAttribute($attribute, $values);
+			}
+			else
+			{
+				foreach($values as $value)
+				{
+					self::_setOperationAttribute($attribute, $value);
+				}
+			}
+		}
+		elseif (in_array($attribute, $job_attributes_tags))
+		{
+			if (!is_array($values))
+			{
+				self::_setJobAttribute($attribute, $values);
+			}
+			else
+			{
+				foreach($values as $value)
+				{
+					self::_setJobAttribute($attribute, $value);
+				}
+			}
+		}
+		elseif (in_array($attribute, $printer_attributes_tags))
+		{
+			if (!is_array($values))
+			{
+				self::_setPrinterAttribute($attribute, $values);
+			}
+			else
+			{
+				foreach($values as $value)
+				{
+					self::_setPrinterAttribute($attribute, $value);
+				}
+			}
+		}
+		else
+		{
+			trigger_error(
+				sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
+					$attribute) , E_USER_NOTICE);
+			self::_putDebug(
+				sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
+					$attribute) , 3);
+			self::_errorLog(
+				sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
+					$attribute) , 2);
+			return FALSE;
+		}
+	}
+
+	public function unsetAttribute($attribute)
+	{
+		$operation_attributes_tags = array_keys($this->operation_tags);
+		$job_attributes_tags = array_keys($this->job_tags);
+		$printer_attributes_tags = array_keys($this->printer_tags);
+		if (in_array($attribute, $operation_attributes_tags))
+		{
+			unset(
+				$this->operation_tags[$attribute]['value'],
+				$this->operation_tags[$attribute]['systag']
+			);
+		}
+		elseif (in_array($attribute, $job_attributes_tags))
+		{
+			unset(
+				$this->job_tags[$attribute]['value'],
+				$this->job_tags[$attribute]['systag']
+			);
+		}
+		elseif (in_array($attribute, $printer_attributes_tags))
+		{
+			unset(
+				$this->printer_tags[$attribute]['value'],
+				$this->printer_tags[$attribute]['systag']
+			);
+		}
+		else
+		{
+			trigger_error(
+				sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
+					$attribute) , E_USER_NOTICE);
+			self::_putDebug(
+				sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
+					$attribute) , 3);
+			self::_errorLog(
+				sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
+					$attribute) , 2);
+			return FALSE;
+		}
+		return true;
+	}
+
+	//
+	// LOGGING / DEBUGGING
+	//
+	/**
+	 * Sets log file destination. Creates the file if has permission.
+	 *
+	 * @param string $log_destination
+	 * @param string $destination_type
+	 * @param int $level
+	 *
+	 * @throws ippException
+	 */
+	public function setLog($log_destination, $destination_type = 'file', $level = 2)
+	{
+		if (!file_exists($log_destination) && is_writable(dirname($log_destination)))
+		{
+			touch($log_destination);
+			chmod($log_destination, 0777);
+		}
+
+		switch ($destination_type)
+		{
+			case 'file':
+			case 3:
+				$this->log_destination = $log_destination;
+				$this->log_type = 3;
+				break;
+
+			case 'logger':
+			case 0:
+				$this->log_destination = '';
+				$this->log_type = 0;
+				break;
+
+			case 'e-mail':
+			case 1:
+				$this->log_destination = $log_destination;
+				$this->log_type = 1;
+				break;
+		}
+		$this->log_level = $level;
+	}
+
+	public function printDebug()
+	{
+		for ($i = 0; $i < $this->debug_count; $i++)
+		{
+			echo $this->debug[$i], "\n";
+		}
+		$this->debug = array();
+		$this->debug_count = 0;
+	}
+
+	public function getDebug()
+	{
+		$debug = '';
+		for ($i = 0; $i < $this->debug_count; $i++)
+		{
+			$debug.= $this->debug[$i];
+		}
+		$this->debug = array();
+		$this->debug_count = 0;
+		return $debug;
+	}
+
+	//
+	// OPERATIONS
+	//
+	public function printJob()
+	{
+		// this BASIC version of printJob do not parse server
+		// output for job's attributes
+		self::_putDebug(
+			sprintf(
+				"************** Date: %s ***********",
+				date('Y-m-d H:i:s')
+			)
+		);
+		if (!$this->_stringJob()) {
+			return FALSE;
+		}
+		if (is_readable($this->data))
+		{
+			self::_putDebug(_("Printing a FILE"));
+			$this->output = $this->stringjob;
+			if ($this->setup->datatype == "TEXT")
+			{
+				$this->output.= chr(0x16);
+			}
+			$post_values = array(
+				"Content-Type" => "application/ipp",
+				"Data" => $this->output,
+				"File" => $this->data
+			);
+			if ($this->setup->datatype == "TEXT" && !isset($this->setup->noFormFeed))
+			{
+				$post_values = array_merge(
+					$post_values,
+					array(
+						"Filetype" => "TEXT"
+					)
+				);
+			}
+		}
+		else
+		{
+			self::_putDebug(_("Printing DATA"));
+			$this->output =
+				$this->stringjob
+					. $this->datahead
+					. $this->data
+					. $this->datatail;
+			$post_values = array(
+				"Content-Type" => "application/ipp",
+				"Data" => $this->output
+			);
+		}
+		if (self::_sendHttp($post_values, $this->paths["printers"]))
+		{
+			self::_parseServerOutput();
+		}
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status, array(
+				$this->serveroutput->status
+			));
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(
+					sprintf("printing job %s: ", $this->last_job)
+						. $this->serveroutput->status,
+					3);
+			}
+			else
+			{
+				self::_errorLog(
+					sprintf("printing job: ", $this->last_job)
+						. $this->serveroutput->status,
+					1);
+			}
+				return $this->serveroutput->status;
+		}
+
+	$this->status =
+		array_merge($this->status, array("OPERATION FAILED"));
+		$this->jobs =
+			array_merge($this->jobs, array(""));
+		$this->jobs_uri =
+			array_merge($this->jobs_uri, array(""));
+
+		self::_errorLog("printing job : OPERATION FAILED", 1);
+		return false;
+	}
+
+	//
+	// HTTP OUTPUT
+	//
+	protected function _sendHttp($post_values, $uri)
+	{
+		/*
             This function Copyright (C) 2005-2006 Thomas Harding, Manuel Lemos
         */
-        $this->response_completed[] = "no";
-        unset($this->serverouptut);
-        self::_putDebug(_("Processing HTTP request") , 2);
-        $this->serveroutput->headers = array();
-        $this->serveroutput->body = "";
-        $http = new http_class;
-        if (!$this->unix) {
-        	// DOL_LDR_CHANGE
-        	if (empty($this->host)) $this->host='127.0.0.1';
-            $http->host = $this->host;
-        }
-        else {
-            $http->host = "localhost";
-        }
-        $http->with_exceptions = $this->with_exceptions;
-        if ($this->debug_http)
-        {
-            $http->debug = 1;
-            $http->html_debug = 0;
-        }
-        else
-        {
-            $http->debug = 0;
-            $http->html_debug = 0;
-        }
-        $url = "http://" . $this->host;
-        if ($this->ssl) {
-            $url = "https://" . $this->host;
-        }
-        if ($this->unix) {
-            $url = "unix://" . $this->host;
-        }
-        $http->port = $this->port;
-        $http->timeout = $this->http_timeout;
-        $http->data_timeout = $this->http_data_timeout;
-        $http->force_multipart_form_post = false;
-        $http->user = $this->username;
-        $http->password = $this->password;
-        $error = $http->GetRequestArguments($url, $arguments);
-        $arguments["RequestMethod"] = "POST";
-        $arguments["Headers"] = array(
-            "Content-Type" => "application/ipp"
-        );
-        $arguments["BodyStream"] = array(
-            array(
-                "Data" => $post_values["Data"]
-            )
-        );
-        if (isset($post_values["File"])) {
-            $arguments["BodyStream"][] = array(
-                "File" => $post_values["File"]
-            );
-        }
-        if (isset($post_values["FileType"])
-            && !strcmp($post_values["FileType"], "TEXT")
-        )
-        {
-            $arguments["BodyStream"][] = array("Data" => Chr(12));
-        }
-        $arguments["RequestURI"] = $uri;
-        if ($this->with_exceptions && $this->handle_http_exceptions)
-        {
-            try
-            {
-                $success = $http->Open($arguments);
-            }
-            catch(httpException $e)
-            {
-                throw new ippException(
-                    sprintf("http error: %s", $e->getMessage()),
-                        $e->getErrno());
-            }
-        }
-        else
-        {
-        	$success = $http->Open($arguments);
-        }
-        if ($success[0] == true)
-        {
-            $success = $http->SendRequest($arguments);
-            if ($success[0] == true)
-            {
-                self::_putDebug("H T T P    R E Q U E S T :");
-                self::_putDebug("Request headers:");
-                for (Reset($http->request_headers) , $header = 0; $header < count($http->request_headers); Next($http->request_headers) , $header++)
-                {
-                    $header_name = Key($http->request_headers);
-                    if (GetType($http->request_headers[$header_name]) == "array")
-                    {
-                        for ($header_value = 0; $header_value < count($http->request_headers[$header_name]); $header_value++)
-                        {
-                            self::_putDebug($header_name . ": " . $http->request_headers[$header_name][$header_value]);
-                        }
-                    }
-                    else
-                    {
-                        self::_putDebug($header_name . ": " . $http->request_headers[$header_name]);
-                    }
-                }
-                self::_putDebug("Request body:");
-                self::_putDebug(
-                    htmlspecialchars($http->request_body)
-                        . "*********** END REQUEST BODY *********"
-                );
-                $i = 0;
-                $headers = array();
-                unset($this->serveroutput->headers);
-                $http->ReadReplyHeaders($headers);
-                self::_putDebug("H T T P    R E S P O N S E :");
-                self::_putDebug("Response headers:");
-                for (Reset($headers) , $header = 0; $header < count($headers); Next($headers) , $header++)
-                {
-                    $header_name = Key($headers);
-                    if (GetType($headers[$header_name]) == "array")
-                    {
-                        for ($header_value = 0; $header_value < count($headers[$header_name]); $header_value++)
-                        {
-                            self::_putDebug($header_name . ": " . $headers[$header_name][$header_value]);
-                            $this->serveroutput->headers[$i] =
-                                $header_name . ": "
-                                    . $headers[$header_name][$header_value];
-                            $i++;
-                        }
-                    }
-                    else
-                    {
-                        self::_putDebug($header_name . ": " . $headers[$header_name]);
-                        $this->serveroutput->headers[$i] =
-                            $header_name
-                                . ": "
-                                . $headers[$header_name];
-                        $i++;
-                    }
-                }
-                self::_putDebug("\n\nResponse body:\n");
-                $this->serveroutput->body = "";
-                for (;;)
-                {
-                    $http->ReadReplyBody($body, 1024);
-                    if (strlen($body) == 0) {
-                        break;
-                    }
-
-                    self::_putDebug(htmlentities($body));
-                    $this->serveroutput->body.= $body;
-                }
-                self::_putDebug("********* END RESPONSE BODY ********");
-            }
-        }
-        $http->Close();
-        return true;
-    }
-
-    //
-    // INIT
-    //
-    protected function _initTags()
-    {
-        $this->tags_types = array(
-            "unsupported" => array(
-                "tag" => chr(0x10) ,
-                "build" => ""
-            ) ,
-            "reserved" => array(
-                "tag" => chr(0x11) ,
-                "build" => ""
-            ) ,
-            "unknown" => array(
-                "tag" => chr(0x12) ,
-                "build" => ""
-            ) ,
-            "no-value" => array(
-                "tag" => chr(0x13) ,
-                "build" => "no_value"
-            ) ,
-            "integer" => array(
-                "tag" => chr(0x21) ,
-                "build" => "integer"
-            ) ,
-            "boolean" => array(
-                "tag" => chr(0x22) ,
-                "build" => "boolean"
-            ) ,
-            "enum" => array(
-                "tag" => chr(0x23) ,
-                "build" => "enum"
-            ) ,
-            "octetString" => array(
-                "tag" => chr(0x30) ,
-                "build" => "octet_string"
-            ) ,
-            "datetime" => array(
-                "tag" => chr(0x31) ,
-                "build" => "datetime"
-            ) ,
-            "resolution" => array(
-                "tag" => chr(0x32) ,
-                "build" => "resolution"
-            ) ,
-            "rangeOfInteger" => array(
-                "tag" => chr(0x33) ,
-                "build" => "range_of_integers"
-            ) ,
-            "textWithLanguage" => array(
-                "tag" => chr(0x35) ,
-                "build" => "string"
-            ) ,
-            "nameWithLanguage" => array(
-                "tag" => chr(0x36) ,
-                "build" => "string"
-            ) ,
-            /*
+		$this->response_completed[] = "no";
+		unset($this->serverouptut);
+		self::_putDebug(_("Processing HTTP request") , 2);
+		$this->serveroutput->headers = array();
+		$this->serveroutput->body = "";
+		$http = new http_class;
+		if (!$this->unix) {
+			// DOL_LDR_CHANGE
+			if (empty($this->host)) $this->host='127.0.0.1';
+			$http->host = $this->host;
+		}
+		else {
+			$http->host = "localhost";
+		}
+		$http->with_exceptions = $this->with_exceptions;
+		if ($this->debug_http)
+		{
+			$http->debug = 1;
+			$http->html_debug = 0;
+		}
+		else
+		{
+			$http->debug = 0;
+			$http->html_debug = 0;
+		}
+		$url = "http://" . $this->host;
+		if ($this->ssl) {
+			$url = "https://" . $this->host;
+		}
+		if ($this->unix) {
+			$url = "unix://" . $this->host;
+		}
+		$http->port = $this->port;
+		$http->timeout = $this->http_timeout;
+		$http->data_timeout = $this->http_data_timeout;
+		$http->force_multipart_form_post = false;
+		$http->user = $this->username;
+		$http->password = $this->password;
+		$error = $http->GetRequestArguments($url, $arguments);
+		$arguments["RequestMethod"] = "POST";
+		$arguments["Headers"] = array(
+			"Content-Type" => "application/ipp"
+		);
+		$arguments["BodyStream"] = array(
+			array(
+				"Data" => $post_values["Data"]
+			)
+		);
+		if (isset($post_values["File"])) {
+			$arguments["BodyStream"][] = array(
+				"File" => $post_values["File"]
+			);
+		}
+		if (isset($post_values["FileType"])
+			&& !strcmp($post_values["FileType"], "TEXT")
+		)
+		{
+			$arguments["BodyStream"][] = array("Data" => Chr(12));
+		}
+		$arguments["RequestURI"] = $uri;
+		if ($this->with_exceptions && $this->handle_http_exceptions)
+		{
+			try
+			{
+				$success = $http->Open($arguments);
+			}
+			catch(httpException $e)
+			{
+				throw new ippException(
+					sprintf("http error: %s", $e->getMessage()),
+						$e->getErrno());
+			}
+		}
+		else
+		{
+			$success = $http->Open($arguments);
+		}
+		if ($success[0] == true)
+		{
+			$success = $http->SendRequest($arguments);
+			if ($success[0] == true)
+			{
+				self::_putDebug("H T T P    R E Q U E S T :");
+				self::_putDebug("Request headers:");
+				for (Reset($http->request_headers) , $header = 0; $header < count($http->request_headers); Next($http->request_headers) , $header++)
+				{
+					$header_name = Key($http->request_headers);
+					if (GetType($http->request_headers[$header_name]) == "array")
+					{
+						for ($header_value = 0; $header_value < count($http->request_headers[$header_name]); $header_value++)
+						{
+							self::_putDebug($header_name . ": " . $http->request_headers[$header_name][$header_value]);
+						}
+					}
+					else
+					{
+						self::_putDebug($header_name . ": " . $http->request_headers[$header_name]);
+					}
+				}
+				self::_putDebug("Request body:");
+				self::_putDebug(
+					htmlspecialchars($http->request_body)
+						. "*********** END REQUEST BODY *********"
+				);
+				$i = 0;
+				$headers = array();
+				unset($this->serveroutput->headers);
+				$http->ReadReplyHeaders($headers);
+				self::_putDebug("H T T P    R E S P O N S E :");
+				self::_putDebug("Response headers:");
+				for (Reset($headers) , $header = 0; $header < count($headers); Next($headers) , $header++)
+				{
+					$header_name = Key($headers);
+					if (GetType($headers[$header_name]) == "array")
+					{
+						for ($header_value = 0; $header_value < count($headers[$header_name]); $header_value++)
+						{
+							self::_putDebug($header_name . ": " . $headers[$header_name][$header_value]);
+							$this->serveroutput->headers[$i] =
+								$header_name . ": "
+									. $headers[$header_name][$header_value];
+							$i++;
+						}
+					}
+					else
+					{
+						self::_putDebug($header_name . ": " . $headers[$header_name]);
+						$this->serveroutput->headers[$i] =
+							$header_name
+								. ": "
+								. $headers[$header_name];
+						$i++;
+					}
+				}
+				self::_putDebug("\n\nResponse body:\n");
+				$this->serveroutput->body = "";
+				for (;;)
+				{
+					$http->ReadReplyBody($body, 1024);
+					if (strlen($body) == 0) {
+						break;
+					}
+
+					self::_putDebug(htmlentities($body));
+					$this->serveroutput->body.= $body;
+				}
+				self::_putDebug("********* END RESPONSE BODY ********");
+			}
+		}
+		$http->Close();
+		return true;
+	}
+
+	//
+	// INIT
+	//
+	protected function _initTags()
+	{
+		$this->tags_types = array(
+			"unsupported" => array(
+				"tag" => chr(0x10) ,
+				"build" => ""
+			) ,
+			"reserved" => array(
+				"tag" => chr(0x11) ,
+				"build" => ""
+			) ,
+			"unknown" => array(
+				"tag" => chr(0x12) ,
+				"build" => ""
+			) ,
+			"no-value" => array(
+				"tag" => chr(0x13) ,
+				"build" => "no_value"
+			) ,
+			"integer" => array(
+				"tag" => chr(0x21) ,
+				"build" => "integer"
+			) ,
+			"boolean" => array(
+				"tag" => chr(0x22) ,
+				"build" => "boolean"
+			) ,
+			"enum" => array(
+				"tag" => chr(0x23) ,
+				"build" => "enum"
+			) ,
+			"octetString" => array(
+				"tag" => chr(0x30) ,
+				"build" => "octet_string"
+			) ,
+			"datetime" => array(
+				"tag" => chr(0x31) ,
+				"build" => "datetime"
+			) ,
+			"resolution" => array(
+				"tag" => chr(0x32) ,
+				"build" => "resolution"
+			) ,
+			"rangeOfInteger" => array(
+				"tag" => chr(0x33) ,
+				"build" => "range_of_integers"
+			) ,
+			"textWithLanguage" => array(
+				"tag" => chr(0x35) ,
+				"build" => "string"
+			) ,
+			"nameWithLanguage" => array(
+				"tag" => chr(0x36) ,
+				"build" => "string"
+			) ,
+			/*
             "text" => array ("tag" => chr(0x40),
             "build" => "string"),
             "text string" => array ("tag" => chr(0x40),
             "build" => "string"),
             */
-            "textWithoutLanguage" => array(
-                "tag" => chr(0x41) ,
-                "build" => "string"
-            ) ,
-            "nameWithoutLanguage" => array(
-                "tag" => chr(0x42) ,
-                "buid" => "string"
-            ) ,
-            "keyword" => array(
-                "tag" => chr(0x44) ,
-                "build" => "string"
-            ) ,
-            "uri" => array(
-                "tag" => chr(0x45) ,
-                "build" => "string"
-            ) ,
-            "uriScheme" => array(
-                "tag" => chr(0x46) ,
-                "build" => "string"
-            ) ,
-            "charset" => array(
-                "tag" => chr(0x47) ,
-                "build" => "string"
-            ) ,
-            "naturalLanguage" => array(
-                "tag" => chr(0x48) ,
-                "build" => "string"
-            ) ,
-            "mimeMediaType" => array(
-                "tag" => chr(0x49) ,
-                "build" => "string"
-            ) ,
-            "extendedAttributes" => array(
-                "tag" => chr(0x7F) ,
-                "build" => "extended"
-            ) ,
-        );
-        $this->operation_tags = array(
-            "compression" => array(
-                "tag" => "keyword"
-            ) ,
-            "document-natural-language" => array(
-                "tag" => "naturalLanguage"
-            ) ,
-            "job-k-octets" => array(
-                "tag" => "integer"
-            ) ,
-            "job-impressions" => array(
-                "tag" => "integer"
-            ) ,
-            "job-media-sheets" => array(
-                "tag" => "integer"
-            ) ,
-        );
-        $this->job_tags = array(
-            "job-priority" => array(
-                "tag" => "integer"
-            ) ,
-            "job-hold-until" => array(
-                "tag" => "keyword"
-            ) ,
-            "job-sheets" => array(
-                "tag" => "keyword"
-            ) , //banner page
-            "multiple-document-handling" => array(
-                "tag" => "keyword"
-            ) ,
-            //"copies" => array("tag" => "integer"),
-            "finishings" => array(
-                "tag" => "enum"
-            ) ,
-            //"page-ranges" => array("tag" => "rangeOfInteger"), // has its own function
-            //"sides" => array("tag" => "keyword"), // has its own function
-            "number-up" => array(
-                "tag" => "integer"
-            ) ,
-            "orientation-requested" => array(
-                "tag" => "enum"
-            ) ,
-            "media" => array(
-                "tag" => "keyword"
-            ) ,
-            "printer-resolution" => array(
-                "tag" => "resolution"
-            ) ,
-            "print-quality" => array(
-                "tag" => "enum"
-            ) ,
-            "job-message-from-operator" => array(
-                "tag" => "textWithoutLanguage"
-            ) ,
-        );
-        $this->printer_tags = array(
-            "requested-attributes" => array(
-                "tag" => "keyword"
-            )
-        );
-    }
-
-    //
-    // SETUP
-    //
-    protected function _setOperationId()
-    {
-        $prepend = '';
-        $this->operation_id+= 1;
-        $this->meta->operation_id = self::_integerBuild($this->operation_id);
-        self::_putDebug("operation id is: " . $this->operation_id, 2);
-    }
-
-    protected function _setJobId()
-    {
-        $this->meta->jobid+= 1;
-        $prepend = '';
-        $prepend_length = 4 - strlen($this->meta->jobid);
-        for ($i = 0; $i < $prepend_length; $i++) {
-            $prepend.= '0';
-        }
-        return $prepend . $this->meta->jobid;
-    }
-
-    protected function _setJobUri($job_uri)
-    {
-        $this->meta->job_uri = chr(0x45) // type uri
-            . chr(0x00) . chr(0x07) // name-length
-            . "job-uri"
-            //. chr(0x00).chr(strlen($job_uri))
-            . self::_giveMeStringLength($job_uri) . $job_uri;
-        self::_putDebug("job-uri is: " . $job_uri, 2);
-    }
-
-    //
-    // RESPONSE PARSING
-    //
-    protected function _parseServerOutput()
-    {
-        $this->serveroutput->response = array();
-        if (!self::_parseHttpHeaders()) {
-            return FALSE;
-        }
-        $this->_parsing->offset = 0;
-        self::_parseIppVersion();
-        self::_parseStatusCode();
-        self::_parseRequestID();
-        $this->_parseResponse();
-        //devel
-        self::_putDebug(
-            sprintf("***** IPP STATUS: %s ******", $this->serveroutput->status),
-            4);
-        self::_putDebug("****** END OF OPERATION ****");
-        return true;
-    }
-
-    protected function _parseHttpHeaders()
-    {
-        $response = "";
-        switch ($this->serveroutput->headers[0])
-        {
-            case "http/1.1 200 ok: ":
-                $this->serveroutput->httpstatus = "HTTP/1.1 200 OK";
-                $response = "OK";
-                break;
-
-            // primitive http/1.0 for Lexmark printers (from Rick Baril)
-            case "http/1.0 200 ok: ":
-                $this->serveroutput->httpstatus = "HTTP/1.0 200 OK";
-                $response = "OK";
-                break;
-
-            case "http/1.1 100 continue: ":
-                $this->serveroutput->httpstatus = "HTTP/1.1 100 CONTINUE";
-                $response = "OK";
-                break;
-
-            case "":
-                $this->serveroutput->httpstatus = "HTTP/1.1 000 No Response From Server";
-                $this->serveroutput->status = "HTTP-ERROR-000_NO_RESPONSE_FROM_SERVER";
-                trigger_error("No Response From Server", E_USER_WARNING);
-                self::_errorLog("No Response From Server", 1);
-                $this->disconnected = 1;
-                return FALSE;
-                break;
-
-            default:
-                $server_response = preg_replace("/: $/", '', $this->serveroutput->headers[0]);
-                #$strings = split(' ', $server_response, 3);
-                $strings = preg_split('# #', $server_response, 3);
-                $errno = $strings[1];
-                $string = strtoupper(str_replace(' ', '_', $strings[2]));
-                trigger_error(
-                    sprintf(_("server responds %s") , $server_response),
-                    E_USER_WARNING);
-                self::_errorLog("server responds " . $server_response, 1);
-                $this->serveroutput->httpstatus =
-                    strtoupper($strings[0])
-                        . " "
-                        . $errno
-                        . " "
-                        . ucfirst($strings[2]);
-
-                $this->serveroutput->status =
-                    "HTTP-ERROR-"
-                        . $errno
-                        . "-"
-                        . $string;
-                $this->disconnected = 1;
-                return FALSE;
-                break;
-        }
-        unset($this->serveroutput->headers);
-        return TRUE;
-    }
-
-    protected function _parseIppVersion()
-    {
-        $ippversion =
-            (ord($this->serveroutput->body[$this->_parsing->offset]) * 256)
-                + ord($this->serveroutput->body[$this->_parsing->offset + 1]);
-        switch ($ippversion)
-        {
-            case 0x0101:
-                $this->serveroutput->ipp_version = "1.1";
-                break;
-
-            default:
-                $this->serveroutput->ipp_version =
-                    sprintf("%u.%u (Unknown)",
-                        ord($this->serveroutput->body[$this->_parsing->offset]) * 256,
-                        ord($this->serveroutput->body[$this->_parsing->offset + 1]));
-                break;
-        }
-        self::_putDebug("I P P    R E S P O N S E :\n\n");
-        self::_putDebug(
-            sprintf("IPP version %s%s: %s",
-                ord($this->serveroutput->body[$this->_parsing->offset]),
-                ord($this->serveroutput->body[$this->_parsing->offset + 1]),
-                $this->serveroutput->ipp_version));
-        $this->_parsing->offset+= 2;
-        return;
-    }
-
-    protected function _parseStatusCode()
-    {
-        $status_code =
-            (ord($this->serveroutput->body[$this->_parsing->offset]) * 256)
-            + ord($this->serveroutput->body[$this->_parsing->offset + 1]);
-        $this->serveroutput->status = "NOT PARSED";
-        $this->_parsing->offset+= 2;
-        if (strlen($this->serveroutput->body) < $this->_parsing->offset)
-        {
-            return false;
-        }
-        if ($status_code < 0x00FF)
-        {
-            $this->serveroutput->status = "successfull";
-        }
-        elseif ($status_code < 0x01FF)
-        {
-            $this->serveroutput->status = "informational";
-        }
-        elseif ($status_code < 0x02FF)
-        {
-            $this->serveroutput->status = "redirection";
-        }
-        elseif ($status_code < 0x04FF)
-        {
-            $this->serveroutput->status = "client-error";
-        }
-        elseif ($status_code < 0x05FF)
-        {
-            $this->serveroutput->status = "server-error";
-        }
-        switch ($status_code)
-        {
-            case 0x0000:
-                $this->serveroutput->status = "successfull-ok";
-                break;
-
-            case 0x0001:
-                $this->serveroutput->status = "successful-ok-ignored-or-substituted-attributes";
-                break;
-
-            case 0x002:
-                $this->serveroutput->status = "successful-ok-conflicting-attributes";
-                break;
-
-            case 0x0400:
-                $this->serveroutput->status = "client-error-bad-request";
-                break;
-
-            case 0x0401:
-                $this->serveroutput->status = "client-error-forbidden";
-                break;
-
-            case 0x0402:
-                $this->serveroutput->status = "client-error-not-authenticated";
-                break;
-
-            case 0x0403:
-                $this->serveroutput->status = "client-error-not-authorized";
-                break;
-
-            case 0x0404:
-                $this->serveroutput->status = "client-error-not-possible";
-                break;
-
-            case 0x0405:
-                $this->serveroutput->status = "client-error-timeout";
-                break;
-
-            case 0x0406:
-                $this->serveroutput->status = "client-error-not-found";
-                break;
-
-            case 0x0407:
-                $this->serveroutput->status = "client-error-gone";
-                break;
-
-            case 0x0408:
-                $this->serveroutput->status = "client-error-request-entity-too-large";
-                break;
-
-            case 0x0409:
-                $this->serveroutput->status = "client-error-request-value-too-long";
-                break;
-
-            case 0x040A:
-                $this->serveroutput->status = "client-error-document-format-not-supported";
-                break;
-
-            case 0x040B:
-                $this->serveroutput->status = "client-error-attributes-or-values-not-supported";
-                break;
-
-            case 0x040C:
-                $this->serveroutput->status = "client-error-uri-scheme-not-supported";
-                break;
-
-            case 0x040D:
-                $this->serveroutput->status = "client-error-charset-not-supported";
-                break;
-
-            case 0x040E:
-                $this->serveroutput->status = "client-error-conflicting-attributes";
-                break;
-
-            case 0x040F:
-                $this->serveroutput->status = "client-error-compression-not-supported";
-                break;
-
-            case 0x0410:
-                $this->serveroutput->status = "client-error-compression-error";
-                break;
-
-            case 0x0411:
-                $this->serveroutput->status = "client-error-document-format-error";
-                break;
-
-            case 0x0412:
-                $this->serveroutput->status = "client-error-document-access-error";
-                break;
-
-            case 0x0413: // RFC3380
-                $this->serveroutput->status = "client-error-attributes-not-settable";
-                break;
-
-            case 0x0500:
-                $this->serveroutput->status = "server-error-internal-error";
-                break;
-
-            case 0x0501:
-                $this->serveroutput->status = "server-error-operation-not-supported";
-                break;
-
-            case 0x0502:
-                $this->serveroutput->status = "server-error-service-unavailable";
-                break;
-
-            case 0x0503:
-                $this->serveroutput->status = "server-error-version-not-supported";
-                break;
-
-            case 0x0504:
-                $this->serveroutput->status = "server-error-device-error";
-                break;
-
-            case 0x0505:
-                $this->serveroutput->status = "server-error-temporary-error";
-                break;
-
-            case 0x0506:
-                $this->serveroutput->status = "server-error-not-accepting-jobs";
-                break;
-
-            case 0x0507:
-                $this->serveroutput->status = "server-error-busy";
-                break;
-
-            case 0x0508:
-                $this->serveroutput->status = "server-error-job-canceled";
-                break;
-
-            case 0x0509:
-                $this->serveroutput->status = "server-error-multiple-document-jobs-not-supported";
-                break;
-
-            default:
-                break;
-        }
-        self::_putDebug(
-            sprintf(
-                "status-code: %s%s: %s ",
-                $this->serveroutput->body[$this->_parsing->offset],
-                $this->serveroutput->body[$this->_parsing->offset + 1],
-                $this->serveroutput->status),
-            4);
-        return;
-    }
-
-    protected function _parseRequestID()
-    {
-        $this->serveroutput->request_id =
-            self::_interpretInteger(
-                substr($this->serveroutput->body, $this->_parsing->offset, 4)
-            );
-        self::_putDebug("request-id " . $this->serveroutput->request_id, 2);
-        $this->_parsing->offset+= 4;
-        return;
-    }
-
-    protected function _interpretInteger($value)
-    {
-        // they are _signed_ integers
-        $value_parsed = 0;
-        for ($i = strlen($value); $i > 0; $i --)
-        {
-            $value_parsed +=
-                (
-                    (1 << (($i - 1) * 8))
-                        *
-                        ord($value[strlen($value) - $i])
-                );
-        }
-        if ($value_parsed >= 2147483648)
-        {
-            $value_parsed -= 4294967296;
-        }
-        return $value_parsed;
-    }
-
-    protected function _parseResponse()
-    {
-    }
-
-    //
-    // REQUEST BUILDING
-    //
-    protected function _stringJob()
-    {
-        if (!isset($this->setup->charset)) {
-            self::setCharset();
-        }
-        if (!isset($this->setup->datatype)) {
-            self::setBinary();
-        }
-        if (!isset($this->setup->uri))
-        {
-            $this->getPrinters();
-            unset($this->jobs[count($this->jobs) - 1]);
-            unset($this->jobs_uri[count($this->jobs_uri) - 1]);
-            unset($this->status[count($this->status) - 1]);
-            if (array_key_exists(0, $this->available_printers))
-            {
-                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
-            {
-                trigger_error(
-                    _("_stringJob: Printer URI is not set: die"),
-                    E_USER_WARNING);
-                self::_putDebug(_("_stringJob: Printer URI is not set: die") , 4);
-                self::_errorLog(" Printer URI is not set, die", 2);
-                return FALSE;
-            }
-        }
-        if (!isset($this->setup->copies)) {
-            self::setCopies(1);
-        }
-        if (!isset($this->setup->language)) {
-            self::setLanguage('en_us');
-        }
-        if (!isset($this->setup->mime_media_type)) {
-            self::setMimeMediaType();
-        }
-        if (!isset($this->setup->jobname)) {
-            self::setJobName();
-        }
-        unset($this->setup->jobname);
-        if (!isset($this->meta->username)) {
-            self::setUserName();
-        }
-        if (!isset($this->meta->fidelity)) {
-            $this->meta->fidelity = '';
-        }
-        if (!isset($this->meta->document_name)) {
-            $this->meta->document_name = '';
-        }
-        if (!isset($this->meta->sides)) {
-            $this->meta->sides = '';
-        }
-        if (!isset($this->meta->page_ranges)) {
-            $this->meta->page_ranges = '';
-        }
-        $jobattributes = '';
-        $operationattributes = '';
-        $printerattributes = '';
-        $this->_buildValues($operationattributes, $jobattributes, $printerattributes);
-        self::_setOperationId();
-        if (!isset($this->error_generation->request_body_malformed))
-        {
-            $this->error_generation->request_body_malformed = "";
-        }
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-            . chr(0x00) . chr(0x02) // Print-Job | operation-id
-            . $this->meta->operation_id //           request-id
-            . chr(0x01) // start operation-attributes | operation-attributes-tag
-            . $this->meta->charset
-            . $this->meta->language
-            . $this->meta->printer_uri
-            . $this->meta->username
-            . $this->meta->jobname
-            . $this->meta->fidelity
-            . $this->meta->document_name
-            . $this->meta->mime_media_type
-            . $operationattributes;
-        if ($this->meta->copies || $this->meta->sides || $this->meta->page_ranges || !empty($jobattributes))
-        {
-            $this->stringjob .=
-                chr(0x02) // start job-attributes | job-attributes-tag
-                    . $this->meta->copies
-                    . $this->meta->sides
-                    . $this->meta->page_ranges
-                    . $jobattributes;
-        }
-        $this->stringjob.= chr(0x03); // end-of-attributes | end-of-attributes-tag
-        self::_putDebug(
-            sprintf(_("String sent to the server is: %s"),
-                $this->stringjob)
-            );
-        return TRUE;
-    }
-
-    protected function _buildValues(&$operationattributes, &$jobattributes, &$printerattributes)
-    {
-        $operationattributes = '';
-        foreach($this->operation_tags as $key => $values)
-        {
-            $item = 0;
-            if (array_key_exists('value', $values))
-            {
-                foreach($values['value'] as $item_value)
-                {
-                    if ($item == 0)
-                    {
-                        $operationattributes .=
-                            $values['systag']
-                                . self::_giveMeStringLength($key)
-                                . $key
-                                . self::_giveMeStringLength($item_value)
-                                . $item_value;
-                    }
-                    else
-                    {
-                        $operationattributes .=
-                            $values['systag']
-                                . self::_giveMeStringLength('')
-                                . self::_giveMeStringLength($item_value)
-                                . $item_value;
-                    }
-                    $item++;
-                }
-            }
-        }
-        $jobattributes = '';
-        foreach($this->job_tags as $key => $values)
-        {
-            $item = 0;
-            if (array_key_exists('value', $values))
-            {
-                foreach($values['value'] as $item_value)
-                {
-                    if ($item == 0)
-                    {
-                        $jobattributes .=
-                            $values['systag']
-                                . self::_giveMeStringLength($key)
-                                . $key
-                                . self::_giveMeStringLength($item_value)
-                                . $item_value;
-                    }
-                    else
-                    {
-                        $jobattributes .=
-                            $values['systag']
-                                . self::_giveMeStringLength('')
-                                . self::_giveMeStringLength($item_value)
-                                . $item_value;
-                    }
-                    $item++;
-                }
-            }
-        }
-        $printerattributes = '';
-        foreach($this->printer_tags as $key => $values)
-        {
-            $item = 0;
-            if (array_key_exists('value', $values))
-            {
-                foreach($values['value'] as $item_value)
-                {
-                    if ($item == 0)
-                    {
-                        $printerattributes .=
-                            $values['systag']
-                                . self::_giveMeStringLength($key)
-                                . $key
-                                . self::_giveMeStringLength($item_value)
-                                . $item_value;
-                    }
-                    else
-                    {
-                        $printerattributes .=
-                            $values['systag']
-                                . self::_giveMeStringLength('')
-                                . self::_giveMeStringLength($item_value)
-                                . $item_value;
-                    }
-                    $item++;
-                }
-            }
-        }
-        reset($this->job_tags);
-        reset($this->operation_tags);
-        reset($this->printer_tags);
-        return true;
-    }
-
-    protected function _giveMeStringLength($string)
-    {
-        $length = strlen($string);
-        if ($length > ((0xFF << 8) + 0xFF)  )
-        {
-            $errmsg = sprintf (
-                _('max string length for an ipp meta-information = %d, while here %d'),
-                ((0xFF << 8) + 0xFF), $length);
-
-            if ($this->with_exceptions)
-            {
-                throw new ippException($errmsg);
-            }
-            else
-            {
-                trigger_error ($errmsg, E_USER_ERROR);
-            }
-        }
-        $int1 = $length & 0xFF;
-        $length -= $int1;
-        $length = $length >> 8;
-        $int2 = $length & 0xFF;
-        return chr($int2) . chr($int1);
-    }
-
-    protected function _enumBuild($tag, $value)
-    {
-        switch ($tag)
-        {
-            case "orientation-requested":
-                switch ($value)
-                {
-                    case 'portrait':
-                        $value = chr(3);
-                        break;
-
-                    case 'landscape':
-                        $value = chr(4);
-                        break;
-
-                    case 'reverse-landscape':
-                        $value = chr(5);
-                        break;
-
-                    case 'reverse-portrait':
-                        $value = chr(6);
-                        break;
-                }
-                break;
-
-            case "print-quality":
-                switch ($value)
-                {
-                    case 'draft':
-                        $value = chr(3);
-                        break;
-
-                    case 'normal':
-                        $value = chr(4);
-                        break;
-
-                    case 'high':
-                        $value = chr(5);
-                        break;
-                }
-                break;
-
-            case "finishing":
-                switch ($value)
-                {
-                    case 'none':
-                        $value = chr(3);
-                        break;
-
-                    case 'staple':
-                        $value = chr(4);
-                        break;
-
-                    case 'punch':
-                        $value = chr(5);
-                        break;
-
-                    case 'cover':
-                        $value = chr(6);
-                        break;
-
-                    case 'bind':
-                        $value = chr(7);
-                        break;
-
-                    case 'saddle-stitch':
-                        $value = chr(8);
-                        break;
-
-                    case 'edge-stitch':
-                        $value = chr(9);
-                        break;
-
-                    case 'staple-top-left':
-                        $value = chr(20);
-                        break;
-
-                    case 'staple-bottom-left':
-                        $value = chr(21);
-                        break;
-
-                    case 'staple-top-right':
-                        $value = chr(22);
-                        break;
-
-                    case 'staple-bottom-right':
-                        $value = chr(23);
-                        break;
-
-                    case 'edge-stitch-left':
-                        $value = chr(24);
-                        break;
-
-                    case 'edge-stitch-top':
-                        $value = chr(25);
-                        break;
-
-                    case 'edge-stitch-right':
-                        $value = chr(26);
-                        break;
-
-                    case 'edge-stitch-bottom':
-                        $value = chr(27);
-                        break;
-
-                    case 'staple-dual-left':
-                        $value = chr(28);
-                        break;
-
-                    case 'staple-dual-top':
-                        $value = chr(29);
-                        break;
-
-                    case 'staple-dual-right':
-                        $value = chr(30);
-                        break;
-
-                    case 'staple-dual-bottom':
-                        $value = chr(31);
-                        break;
-                }
-                break;
-        }
-        $prepend = '';
-        while ((strlen($value) + strlen($prepend)) < 4)
-        {
-            $prepend .= chr(0);
-        }
-        return $prepend . $value;
-    }
-
-    protected function _integerBuild($value)
-    {
-        if ($value >= 2147483647 || $value < - 2147483648)
-        {
-            trigger_error(
-                _("Values must be between -2147483648 and 2147483647: assuming '0'") , E_USER_WARNING);
-            return chr(0x00) . chr(0x00) . chr(0x00) . chr(0x00);
-        }
-        $initial_value = $value;
-        $int1 = $value & 0xFF;
-        $value -= $int1;
-        $value = $value >> 8;
-        $int2 = $value & 0xFF;
-        $value-= $int2;
-        $value = $value >> 8;
-        $int3 = $value & 0xFF;
-        $value-= $int3;
-        $value = $value >> 8;
-        $int4 = $value & 0xFF; //64bits
-        if ($initial_value < 0) {
-            $int4 = chr($int4) | chr(0x80);
-        }
-        else {
-            $int4 = chr($int4);
-        }
-        $value = $int4 . chr($int3) . chr($int2) . chr($int1);
-        return $value;
-    }
-
-    protected function _rangeOfIntegerBuild($integers)
-    {
-        #$integers = split(":", $integers);
-        $integers = preg_split("#:#", $integers);
-        for ($i = 0; $i < 2; $i++) {
-            $outvalue[$i] = self::_integerBuild($integers[$i]);
-        }
-        return $outvalue[0] . $outvalue[1];
-    }
-
-    protected function _setJobAttribute($attribute, $value)
-    {
-        //used by setAttribute
-        $tag_type = $this->job_tags[$attribute]['tag'];
-        switch ($tag_type)
-        {
-            case 'integer':
-                $this->job_tags[$attribute]['value'][] = self::_integerBuild($value);
-                break;
-
-            case 'boolean':
-            case 'nameWithoutLanguage':
-            case 'nameWithLanguage':
-            case 'textWithoutLanguage':
-            case 'textWithLanguage':
-            case 'keyword':
-            case 'naturalLanguage':
-                $this->job_tags[$attribute]['value'][] = $value;
-                break;
-
-            case 'enum':
-                $value = $this->_enumBuild($attribute, $value); // may be overwritten by children
-                $this->job_tags[$attribute]['value'][] = $value;
-                break;
-
-            case 'rangeOfInteger':
-                // $value have to be: INT1:INT2 , eg 100:1000
-                $this->job_tags[$attribute]['value'][] = self::_rangeOfIntegerBuild($value);
-                break;
-
-            case 'resolution':
-                if (preg_match("#dpi#", $value)) {
-                    $unit = chr(0x3);
-                }
-                if (preg_match("#dpc#", $value)) {
-                    $unit = chr(0x4);
-                }
-                $search = array(
-                    "#(dpi|dpc)#",
-                    '#(x|-)#'
-                );
-                $replace = array(
-                    "",
-                    ":"
-                );
-                $value = self::_rangeOfIntegerBuild(preg_replace($search, $replace, $value)) . $unit;
-                $this->job_tags[$attribute]['value'][] = $value;
-                break;
-
-            default:
-                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , E_USER_NOTICE);
-                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
-                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
-                return FALSE;
-                break;
-        }
-        $this->job_tags[$attribute]['systag'] = $this->tags_types[$tag_type]['tag'];
-    }
-
-    protected function _setOperationAttribute($attribute, $value)
-    {
-        //used by setAttribute
-        $tag_type = $this->operation_tags[$attribute]['tag'];
-        switch ($tag_type)
-        {
-            case 'integer':
-                $this->operation_tags[$attribute]['value'][] = self::_integerBuild($value);
-                break;
-
-            case 'keyword':
-            case 'naturalLanguage':
-                $this->operation_tags[$attribute]['value'][] = $value;
-                break;
-
-            default:
-                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , E_USER_NOTICE);
-                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
-                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
-                return FALSE;
-                break;
-        }
-        $this->operation_tags[$attribute]['systag'] = $this->tags_types[$tag_type]['tag'];
-    }
-
-    protected function _setPrinterAttribute($attribute, $value)
-    {
-        //used by setAttribute
-        $tag_type = $this->printer_tags[$attribute]['tag'];
-        switch ($tag_type)
-        {
-            case 'integer':
-                $this->printer_tags[$attribute]['value'][] = self::_integerBuild($value);
-                break;
-
-            case 'keyword':
-            case 'naturalLanguage':
-                $this->printer_tags[$attribute]['value'][] = $value;
-                break;
-
-            default:
-                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , E_USER_NOTICE);
-                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
-                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
-                return FALSE;
-                break;
-        }
-        $this->printer_tags[$attribute]['systag'] = $this->tags_types[$tag_type]['tag'];
-    }
-
-    //
-    // DEBUGGING
-    //
-    protected function _putDebug($string, $level = 1)
-    {
-        if ($level === false) {
-            return;
-        }
-
-        if ($level < $this->debug_level) {
-            return;
-        }
-
-        $this->debug[$this->debug_count] = substr($string, 0, 1024);
-        $this->debug_count++;
-        //$this->debug .= substr($string,0,1024);
-
-    }
-
-    //
-    // LOGGING
-    //
-    protected function _errorLog($string_to_log, $level)
-    {
-        if ($level > $this->log_level) {
-            return;
-        }
-
-        $string = sprintf('%s : %s:%s user %s : %s', basename($_SERVER['PHP_SELF']) , $this->host, $this->port, $this->requesting_user, $string_to_log);
-
-        if ($this->log_type == 0)
-        {
-            error_log($string);
-            return;
-        }
-
-        $string = sprintf("%s %s Host %s:%s user %s : %s\n", date('M d H:i:s') , basename($_SERVER['PHP_SELF']) , $this->host, $this->port, $this->requesting_user, $string_to_log);
-        error_log($string, $this->log_type, $this->log_destination);
-        return;
-    }
+			"textWithoutLanguage" => array(
+				"tag" => chr(0x41) ,
+				"build" => "string"
+			) ,
+			"nameWithoutLanguage" => array(
+				"tag" => chr(0x42) ,
+				"buid" => "string"
+			) ,
+			"keyword" => array(
+				"tag" => chr(0x44) ,
+				"build" => "string"
+			) ,
+			"uri" => array(
+				"tag" => chr(0x45) ,
+				"build" => "string"
+			) ,
+			"uriScheme" => array(
+				"tag" => chr(0x46) ,
+				"build" => "string"
+			) ,
+			"charset" => array(
+				"tag" => chr(0x47) ,
+				"build" => "string"
+			) ,
+			"naturalLanguage" => array(
+				"tag" => chr(0x48) ,
+				"build" => "string"
+			) ,
+			"mimeMediaType" => array(
+				"tag" => chr(0x49) ,
+				"build" => "string"
+			) ,
+			"extendedAttributes" => array(
+				"tag" => chr(0x7F) ,
+				"build" => "extended"
+			) ,
+		);
+		$this->operation_tags = array(
+			"compression" => array(
+				"tag" => "keyword"
+			) ,
+			"document-natural-language" => array(
+				"tag" => "naturalLanguage"
+			) ,
+			"job-k-octets" => array(
+				"tag" => "integer"
+			) ,
+			"job-impressions" => array(
+				"tag" => "integer"
+			) ,
+			"job-media-sheets" => array(
+				"tag" => "integer"
+			) ,
+		);
+		$this->job_tags = array(
+			"job-priority" => array(
+				"tag" => "integer"
+			) ,
+			"job-hold-until" => array(
+				"tag" => "keyword"
+			) ,
+			"job-sheets" => array(
+				"tag" => "keyword"
+			) , //banner page
+			"multiple-document-handling" => array(
+				"tag" => "keyword"
+			) ,
+			//"copies" => array("tag" => "integer"),
+			"finishings" => array(
+				"tag" => "enum"
+			) ,
+			//"page-ranges" => array("tag" => "rangeOfInteger"), // has its own function
+			//"sides" => array("tag" => "keyword"), // has its own function
+			"number-up" => array(
+				"tag" => "integer"
+			) ,
+			"orientation-requested" => array(
+				"tag" => "enum"
+			) ,
+			"media" => array(
+				"tag" => "keyword"
+			) ,
+			"printer-resolution" => array(
+				"tag" => "resolution"
+			) ,
+			"print-quality" => array(
+				"tag" => "enum"
+			) ,
+			"job-message-from-operator" => array(
+				"tag" => "textWithoutLanguage"
+			) ,
+		);
+		$this->printer_tags = array(
+			"requested-attributes" => array(
+				"tag" => "keyword"
+			)
+		);
+	}
+
+	//
+	// SETUP
+	//
+	protected function _setOperationId()
+	{
+		$prepend = '';
+		$this->operation_id+= 1;
+		$this->meta->operation_id = self::_integerBuild($this->operation_id);
+		self::_putDebug("operation id is: " . $this->operation_id, 2);
+	}
+
+	protected function _setJobId()
+	{
+		$this->meta->jobid+= 1;
+		$prepend = '';
+		$prepend_length = 4 - strlen($this->meta->jobid);
+		for ($i = 0; $i < $prepend_length; $i++) {
+			$prepend.= '0';
+		}
+		return $prepend . $this->meta->jobid;
+	}
+
+	protected function _setJobUri($job_uri)
+	{
+		$this->meta->job_uri = chr(0x45) // type uri
+			. chr(0x00) . chr(0x07) // name-length
+			. "job-uri"
+			//. chr(0x00).chr(strlen($job_uri))
+			. self::_giveMeStringLength($job_uri) . $job_uri;
+		self::_putDebug("job-uri is: " . $job_uri, 2);
+	}
+
+	//
+	// RESPONSE PARSING
+	//
+	protected function _parseServerOutput()
+	{
+		$this->serveroutput->response = array();
+		if (!self::_parseHttpHeaders()) {
+			return FALSE;
+		}
+		$this->_parsing->offset = 0;
+		self::_parseIppVersion();
+		self::_parseStatusCode();
+		self::_parseRequestID();
+		$this->_parseResponse();
+		//devel
+		self::_putDebug(
+			sprintf("***** IPP STATUS: %s ******", $this->serveroutput->status),
+			4);
+		self::_putDebug("****** END OF OPERATION ****");
+		return true;
+	}
+
+	protected function _parseHttpHeaders()
+	{
+		$response = "";
+		switch ($this->serveroutput->headers[0])
+		{
+			case "http/1.1 200 ok: ":
+				$this->serveroutput->httpstatus = "HTTP/1.1 200 OK";
+				$response = "OK";
+				break;
+
+			// primitive http/1.0 for Lexmark printers (from Rick Baril)
+			case "http/1.0 200 ok: ":
+				$this->serveroutput->httpstatus = "HTTP/1.0 200 OK";
+				$response = "OK";
+				break;
+
+			case "http/1.1 100 continue: ":
+				$this->serveroutput->httpstatus = "HTTP/1.1 100 CONTINUE";
+				$response = "OK";
+				break;
+
+			case "":
+				$this->serveroutput->httpstatus = "HTTP/1.1 000 No Response From Server";
+				$this->serveroutput->status = "HTTP-ERROR-000_NO_RESPONSE_FROM_SERVER";
+				trigger_error("No Response From Server", E_USER_WARNING);
+				self::_errorLog("No Response From Server", 1);
+				$this->disconnected = 1;
+				return FALSE;
+				break;
+
+			default:
+				$server_response = preg_replace("/: $/", '', $this->serveroutput->headers[0]);
+				#$strings = split(' ', $server_response, 3);
+				$strings = preg_split('# #', $server_response, 3);
+				$errno = $strings[1];
+				$string = strtoupper(str_replace(' ', '_', $strings[2]));
+				trigger_error(
+					sprintf(_("server responds %s") , $server_response),
+					E_USER_WARNING);
+				self::_errorLog("server responds " . $server_response, 1);
+				$this->serveroutput->httpstatus =
+					strtoupper($strings[0])
+						. " "
+						. $errno
+						. " "
+						. ucfirst($strings[2]);
+
+				$this->serveroutput->status =
+					"HTTP-ERROR-"
+						. $errno
+						. "-"
+						. $string;
+				$this->disconnected = 1;
+				return FALSE;
+				break;
+		}
+		unset($this->serveroutput->headers);
+		return TRUE;
+	}
+
+	protected function _parseIppVersion()
+	{
+		$ippversion =
+			(ord($this->serveroutput->body[$this->_parsing->offset]) * 256)
+				+ ord($this->serveroutput->body[$this->_parsing->offset + 1]);
+		switch ($ippversion)
+		{
+			case 0x0101:
+				$this->serveroutput->ipp_version = "1.1";
+				break;
+
+			default:
+				$this->serveroutput->ipp_version =
+					sprintf("%u.%u (Unknown)",
+						ord($this->serveroutput->body[$this->_parsing->offset]) * 256,
+						ord($this->serveroutput->body[$this->_parsing->offset + 1]));
+				break;
+		}
+		self::_putDebug("I P P    R E S P O N S E :\n\n");
+		self::_putDebug(
+			sprintf("IPP version %s%s: %s",
+				ord($this->serveroutput->body[$this->_parsing->offset]),
+				ord($this->serveroutput->body[$this->_parsing->offset + 1]),
+				$this->serveroutput->ipp_version));
+		$this->_parsing->offset+= 2;
+		return;
+	}
+
+	protected function _parseStatusCode()
+	{
+		$status_code =
+			(ord($this->serveroutput->body[$this->_parsing->offset]) * 256)
+			+ ord($this->serveroutput->body[$this->_parsing->offset + 1]);
+		$this->serveroutput->status = "NOT PARSED";
+		$this->_parsing->offset+= 2;
+		if (strlen($this->serveroutput->body) < $this->_parsing->offset)
+		{
+			return false;
+		}
+		if ($status_code < 0x00FF)
+		{
+			$this->serveroutput->status = "successfull";
+		}
+		elseif ($status_code < 0x01FF)
+		{
+			$this->serveroutput->status = "informational";
+		}
+		elseif ($status_code < 0x02FF)
+		{
+			$this->serveroutput->status = "redirection";
+		}
+		elseif ($status_code < 0x04FF)
+		{
+			$this->serveroutput->status = "client-error";
+		}
+		elseif ($status_code < 0x05FF)
+		{
+			$this->serveroutput->status = "server-error";
+		}
+		switch ($status_code)
+		{
+			case 0x0000:
+				$this->serveroutput->status = "successfull-ok";
+				break;
+
+			case 0x0001:
+				$this->serveroutput->status = "successful-ok-ignored-or-substituted-attributes";
+				break;
+
+			case 0x002:
+				$this->serveroutput->status = "successful-ok-conflicting-attributes";
+				break;
+
+			case 0x0400:
+				$this->serveroutput->status = "client-error-bad-request";
+				break;
+
+			case 0x0401:
+				$this->serveroutput->status = "client-error-forbidden";
+				break;
+
+			case 0x0402:
+				$this->serveroutput->status = "client-error-not-authenticated";
+				break;
+
+			case 0x0403:
+				$this->serveroutput->status = "client-error-not-authorized";
+				break;
+
+			case 0x0404:
+				$this->serveroutput->status = "client-error-not-possible";
+				break;
+
+			case 0x0405:
+				$this->serveroutput->status = "client-error-timeout";
+				break;
+
+			case 0x0406:
+				$this->serveroutput->status = "client-error-not-found";
+				break;
+
+			case 0x0407:
+				$this->serveroutput->status = "client-error-gone";
+				break;
+
+			case 0x0408:
+				$this->serveroutput->status = "client-error-request-entity-too-large";
+				break;
+
+			case 0x0409:
+				$this->serveroutput->status = "client-error-request-value-too-long";
+				break;
+
+			case 0x040A:
+				$this->serveroutput->status = "client-error-document-format-not-supported";
+				break;
+
+			case 0x040B:
+				$this->serveroutput->status = "client-error-attributes-or-values-not-supported";
+				break;
+
+			case 0x040C:
+				$this->serveroutput->status = "client-error-uri-scheme-not-supported";
+				break;
+
+			case 0x040D:
+				$this->serveroutput->status = "client-error-charset-not-supported";
+				break;
+
+			case 0x040E:
+				$this->serveroutput->status = "client-error-conflicting-attributes";
+				break;
+
+			case 0x040F:
+				$this->serveroutput->status = "client-error-compression-not-supported";
+				break;
+
+			case 0x0410:
+				$this->serveroutput->status = "client-error-compression-error";
+				break;
+
+			case 0x0411:
+				$this->serveroutput->status = "client-error-document-format-error";
+				break;
+
+			case 0x0412:
+				$this->serveroutput->status = "client-error-document-access-error";
+				break;
+
+			case 0x0413: // RFC3380
+				$this->serveroutput->status = "client-error-attributes-not-settable";
+				break;
+
+			case 0x0500:
+				$this->serveroutput->status = "server-error-internal-error";
+				break;
+
+			case 0x0501:
+				$this->serveroutput->status = "server-error-operation-not-supported";
+				break;
+
+			case 0x0502:
+				$this->serveroutput->status = "server-error-service-unavailable";
+				break;
+
+			case 0x0503:
+				$this->serveroutput->status = "server-error-version-not-supported";
+				break;
+
+			case 0x0504:
+				$this->serveroutput->status = "server-error-device-error";
+				break;
+
+			case 0x0505:
+				$this->serveroutput->status = "server-error-temporary-error";
+				break;
+
+			case 0x0506:
+				$this->serveroutput->status = "server-error-not-accepting-jobs";
+				break;
+
+			case 0x0507:
+				$this->serveroutput->status = "server-error-busy";
+				break;
+
+			case 0x0508:
+				$this->serveroutput->status = "server-error-job-canceled";
+				break;
+
+			case 0x0509:
+				$this->serveroutput->status = "server-error-multiple-document-jobs-not-supported";
+				break;
+
+			default:
+				break;
+		}
+		self::_putDebug(
+			sprintf(
+				"status-code: %s%s: %s ",
+				$this->serveroutput->body[$this->_parsing->offset],
+				$this->serveroutput->body[$this->_parsing->offset + 1],
+				$this->serveroutput->status),
+			4);
+		return;
+	}
+
+	protected function _parseRequestID()
+	{
+		$this->serveroutput->request_id =
+			self::_interpretInteger(
+				substr($this->serveroutput->body, $this->_parsing->offset, 4)
+			);
+		self::_putDebug("request-id " . $this->serveroutput->request_id, 2);
+		$this->_parsing->offset+= 4;
+		return;
+	}
+
+	protected function _interpretInteger($value)
+	{
+		// they are _signed_ integers
+		$value_parsed = 0;
+		for ($i = strlen($value); $i > 0; $i --)
+		{
+			$value_parsed +=
+				(
+					(1 << (($i - 1) * 8))
+						*
+						ord($value[strlen($value) - $i])
+				);
+		}
+		if ($value_parsed >= 2147483648)
+		{
+			$value_parsed -= 4294967296;
+		}
+		return $value_parsed;
+	}
+
+	protected function _parseResponse()
+	{
+	}
+
+	//
+	// REQUEST BUILDING
+	//
+	protected function _stringJob()
+	{
+		if (!isset($this->setup->charset)) {
+			self::setCharset();
+		}
+		if (!isset($this->setup->datatype)) {
+			self::setBinary();
+		}
+		if (!isset($this->setup->uri))
+		{
+			$this->getPrinters();
+			unset($this->jobs[count($this->jobs) - 1]);
+			unset($this->jobs_uri[count($this->jobs_uri) - 1]);
+			unset($this->status[count($this->status) - 1]);
+			if (array_key_exists(0, $this->available_printers))
+			{
+				self::setPrinterURI($this->available_printers[0]);
+			}
+			else
+			{
+				trigger_error(
+					_("_stringJob: Printer URI is not set: die"),
+					E_USER_WARNING);
+				self::_putDebug(_("_stringJob: Printer URI is not set: die") , 4);
+				self::_errorLog(" Printer URI is not set, die", 2);
+				return FALSE;
+			}
+		}
+		if (!isset($this->setup->copies)) {
+			self::setCopies(1);
+		}
+		if (!isset($this->setup->language)) {
+			self::setLanguage('en_us');
+		}
+		if (!isset($this->setup->mime_media_type)) {
+			self::setMimeMediaType();
+		}
+		if (!isset($this->setup->jobname)) {
+			self::setJobName();
+		}
+		unset($this->setup->jobname);
+		if (!isset($this->meta->username)) {
+			self::setUserName();
+		}
+		if (!isset($this->meta->fidelity)) {
+			$this->meta->fidelity = '';
+		}
+		if (!isset($this->meta->document_name)) {
+			$this->meta->document_name = '';
+		}
+		if (!isset($this->meta->sides)) {
+			$this->meta->sides = '';
+		}
+		if (!isset($this->meta->page_ranges)) {
+			$this->meta->page_ranges = '';
+		}
+		$jobattributes = '';
+		$operationattributes = '';
+		$printerattributes = '';
+		$this->_buildValues($operationattributes, $jobattributes, $printerattributes);
+		self::_setOperationId();
+		if (!isset($this->error_generation->request_body_malformed))
+		{
+			$this->error_generation->request_body_malformed = "";
+		}
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+			. chr(0x00) . chr(0x02) // Print-Job | operation-id
+			. $this->meta->operation_id //           request-id
+			. chr(0x01) // start operation-attributes | operation-attributes-tag
+			. $this->meta->charset
+			. $this->meta->language
+			. $this->meta->printer_uri
+			. $this->meta->username
+			. $this->meta->jobname
+			. $this->meta->fidelity
+			. $this->meta->document_name
+			. $this->meta->mime_media_type
+			. $operationattributes;
+		if ($this->meta->copies || $this->meta->sides || $this->meta->page_ranges || !empty($jobattributes))
+		{
+			$this->stringjob .=
+				chr(0x02) // start job-attributes | job-attributes-tag
+					. $this->meta->copies
+					. $this->meta->sides
+					. $this->meta->page_ranges
+					. $jobattributes;
+		}
+		$this->stringjob.= chr(0x03); // end-of-attributes | end-of-attributes-tag
+		self::_putDebug(
+			sprintf(_("String sent to the server is: %s"),
+				$this->stringjob)
+			);
+		return TRUE;
+	}
+
+	protected function _buildValues(&$operationattributes, &$jobattributes, &$printerattributes)
+	{
+		$operationattributes = '';
+		foreach($this->operation_tags as $key => $values)
+		{
+			$item = 0;
+			if (array_key_exists('value', $values))
+			{
+				foreach($values['value'] as $item_value)
+				{
+					if ($item == 0)
+					{
+						$operationattributes .=
+							$values['systag']
+								. self::_giveMeStringLength($key)
+								. $key
+								. self::_giveMeStringLength($item_value)
+								. $item_value;
+					}
+					else
+					{
+						$operationattributes .=
+							$values['systag']
+								. self::_giveMeStringLength('')
+								. self::_giveMeStringLength($item_value)
+								. $item_value;
+					}
+					$item++;
+				}
+			}
+		}
+		$jobattributes = '';
+		foreach($this->job_tags as $key => $values)
+		{
+			$item = 0;
+			if (array_key_exists('value', $values))
+			{
+				foreach($values['value'] as $item_value)
+				{
+					if ($item == 0)
+					{
+						$jobattributes .=
+							$values['systag']
+								. self::_giveMeStringLength($key)
+								. $key
+								. self::_giveMeStringLength($item_value)
+								. $item_value;
+					}
+					else
+					{
+						$jobattributes .=
+							$values['systag']
+								. self::_giveMeStringLength('')
+								. self::_giveMeStringLength($item_value)
+								. $item_value;
+					}
+					$item++;
+				}
+			}
+		}
+		$printerattributes = '';
+		foreach($this->printer_tags as $key => $values)
+		{
+			$item = 0;
+			if (array_key_exists('value', $values))
+			{
+				foreach($values['value'] as $item_value)
+				{
+					if ($item == 0)
+					{
+						$printerattributes .=
+							$values['systag']
+								. self::_giveMeStringLength($key)
+								. $key
+								. self::_giveMeStringLength($item_value)
+								. $item_value;
+					}
+					else
+					{
+						$printerattributes .=
+							$values['systag']
+								. self::_giveMeStringLength('')
+								. self::_giveMeStringLength($item_value)
+								. $item_value;
+					}
+					$item++;
+				}
+			}
+		}
+		reset($this->job_tags);
+		reset($this->operation_tags);
+		reset($this->printer_tags);
+		return true;
+	}
+
+	protected function _giveMeStringLength($string)
+	{
+		$length = strlen($string);
+		if ($length > ((0xFF << 8) + 0xFF)  )
+		{
+			$errmsg = sprintf (
+				_('max string length for an ipp meta-information = %d, while here %d'),
+				((0xFF << 8) + 0xFF), $length);
+
+			if ($this->with_exceptions)
+			{
+				throw new ippException($errmsg);
+			}
+			else
+			{
+				trigger_error ($errmsg, E_USER_ERROR);
+			}
+		}
+		$int1 = $length & 0xFF;
+		$length -= $int1;
+		$length = $length >> 8;
+		$int2 = $length & 0xFF;
+		return chr($int2) . chr($int1);
+	}
+
+	protected function _enumBuild($tag, $value)
+	{
+		switch ($tag)
+		{
+			case "orientation-requested":
+				switch ($value)
+				{
+					case 'portrait':
+						$value = chr(3);
+						break;
+
+					case 'landscape':
+						$value = chr(4);
+						break;
+
+					case 'reverse-landscape':
+						$value = chr(5);
+						break;
+
+					case 'reverse-portrait':
+						$value = chr(6);
+						break;
+				}
+				break;
+
+			case "print-quality":
+				switch ($value)
+				{
+					case 'draft':
+						$value = chr(3);
+						break;
+
+					case 'normal':
+						$value = chr(4);
+						break;
+
+					case 'high':
+						$value = chr(5);
+						break;
+				}
+				break;
+
+			case "finishing":
+				switch ($value)
+				{
+					case 'none':
+						$value = chr(3);
+						break;
+
+					case 'staple':
+						$value = chr(4);
+						break;
+
+					case 'punch':
+						$value = chr(5);
+						break;
+
+					case 'cover':
+						$value = chr(6);
+						break;
+
+					case 'bind':
+						$value = chr(7);
+						break;
+
+					case 'saddle-stitch':
+						$value = chr(8);
+						break;
+
+					case 'edge-stitch':
+						$value = chr(9);
+						break;
+
+					case 'staple-top-left':
+						$value = chr(20);
+						break;
+
+					case 'staple-bottom-left':
+						$value = chr(21);
+						break;
+
+					case 'staple-top-right':
+						$value = chr(22);
+						break;
+
+					case 'staple-bottom-right':
+						$value = chr(23);
+						break;
+
+					case 'edge-stitch-left':
+						$value = chr(24);
+						break;
+
+					case 'edge-stitch-top':
+						$value = chr(25);
+						break;
+
+					case 'edge-stitch-right':
+						$value = chr(26);
+						break;
+
+					case 'edge-stitch-bottom':
+						$value = chr(27);
+						break;
+
+					case 'staple-dual-left':
+						$value = chr(28);
+						break;
+
+					case 'staple-dual-top':
+						$value = chr(29);
+						break;
+
+					case 'staple-dual-right':
+						$value = chr(30);
+						break;
+
+					case 'staple-dual-bottom':
+						$value = chr(31);
+						break;
+				}
+				break;
+		}
+		$prepend = '';
+		while ((strlen($value) + strlen($prepend)) < 4)
+		{
+			$prepend .= chr(0);
+		}
+		return $prepend . $value;
+	}
+
+	protected function _integerBuild($value)
+	{
+		if ($value >= 2147483647 || $value < - 2147483648)
+		{
+			trigger_error(
+				_("Values must be between -2147483648 and 2147483647: assuming '0'") , E_USER_WARNING);
+			return chr(0x00) . chr(0x00) . chr(0x00) . chr(0x00);
+		}
+		$initial_value = $value;
+		$int1 = $value & 0xFF;
+		$value -= $int1;
+		$value = $value >> 8;
+		$int2 = $value & 0xFF;
+		$value-= $int2;
+		$value = $value >> 8;
+		$int3 = $value & 0xFF;
+		$value-= $int3;
+		$value = $value >> 8;
+		$int4 = $value & 0xFF; //64bits
+		if ($initial_value < 0) {
+			$int4 = chr($int4) | chr(0x80);
+		}
+		else {
+			$int4 = chr($int4);
+		}
+		$value = $int4 . chr($int3) . chr($int2) . chr($int1);
+		return $value;
+	}
+
+	protected function _rangeOfIntegerBuild($integers)
+	{
+		#$integers = split(":", $integers);
+		$integers = preg_split("#:#", $integers);
+		for ($i = 0; $i < 2; $i++) {
+			$outvalue[$i] = self::_integerBuild($integers[$i]);
+		}
+		return $outvalue[0] . $outvalue[1];
+	}
+
+	protected function _setJobAttribute($attribute, $value)
+	{
+		//used by setAttribute
+		$tag_type = $this->job_tags[$attribute]['tag'];
+		switch ($tag_type)
+		{
+			case 'integer':
+				$this->job_tags[$attribute]['value'][] = self::_integerBuild($value);
+				break;
+
+			case 'boolean':
+			case 'nameWithoutLanguage':
+			case 'nameWithLanguage':
+			case 'textWithoutLanguage':
+			case 'textWithLanguage':
+			case 'keyword':
+			case 'naturalLanguage':
+				$this->job_tags[$attribute]['value'][] = $value;
+				break;
+
+			case 'enum':
+				$value = $this->_enumBuild($attribute, $value); // may be overwritten by children
+				$this->job_tags[$attribute]['value'][] = $value;
+				break;
+
+			case 'rangeOfInteger':
+				// $value have to be: INT1:INT2 , eg 100:1000
+				$this->job_tags[$attribute]['value'][] = self::_rangeOfIntegerBuild($value);
+				break;
+
+			case 'resolution':
+				if (preg_match("#dpi#", $value)) {
+					$unit = chr(0x3);
+				}
+				if (preg_match("#dpc#", $value)) {
+					$unit = chr(0x4);
+				}
+				$search = array(
+					"#(dpi|dpc)#",
+					'#(x|-)#'
+				);
+				$replace = array(
+					"",
+					":"
+				);
+				$value = self::_rangeOfIntegerBuild(preg_replace($search, $replace, $value)) . $unit;
+				$this->job_tags[$attribute]['value'][] = $value;
+				break;
+
+			default:
+				trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , E_USER_NOTICE);
+				self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
+				self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
+				return FALSE;
+				break;
+		}
+		$this->job_tags[$attribute]['systag'] = $this->tags_types[$tag_type]['tag'];
+	}
+
+	protected function _setOperationAttribute($attribute, $value)
+	{
+		//used by setAttribute
+		$tag_type = $this->operation_tags[$attribute]['tag'];
+		switch ($tag_type)
+		{
+			case 'integer':
+				$this->operation_tags[$attribute]['value'][] = self::_integerBuild($value);
+				break;
+
+			case 'keyword':
+			case 'naturalLanguage':
+				$this->operation_tags[$attribute]['value'][] = $value;
+				break;
+
+			default:
+				trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , E_USER_NOTICE);
+				self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
+				self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
+				return FALSE;
+				break;
+		}
+		$this->operation_tags[$attribute]['systag'] = $this->tags_types[$tag_type]['tag'];
+	}
+
+	protected function _setPrinterAttribute($attribute, $value)
+	{
+		//used by setAttribute
+		$tag_type = $this->printer_tags[$attribute]['tag'];
+		switch ($tag_type)
+		{
+			case 'integer':
+				$this->printer_tags[$attribute]['value'][] = self::_integerBuild($value);
+				break;
+
+			case 'keyword':
+			case 'naturalLanguage':
+				$this->printer_tags[$attribute]['value'][] = $value;
+				break;
+
+			default:
+				trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , E_USER_NOTICE);
+				self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
+				self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
+				return FALSE;
+				break;
+		}
+		$this->printer_tags[$attribute]['systag'] = $this->tags_types[$tag_type]['tag'];
+	}
+
+	//
+	// DEBUGGING
+	//
+	protected function _putDebug($string, $level = 1)
+	{
+		if ($level === false) {
+			return;
+		}
+
+		if ($level < $this->debug_level) {
+			return;
+		}
+
+		$this->debug[$this->debug_count] = substr($string, 0, 1024);
+		$this->debug_count++;
+		//$this->debug .= substr($string,0,1024);
+
+	}
+
+	//
+	// LOGGING
+	//
+	protected function _errorLog($string_to_log, $level)
+	{
+		if ($level > $this->log_level) {
+			return;
+		}
+
+		$string = sprintf('%s : %s:%s user %s : %s', basename($_SERVER['PHP_SELF']) , $this->host, $this->port, $this->requesting_user, $string_to_log);
+
+		if ($this->log_type == 0)
+		{
+			error_log($string);
+			return;
+		}
+
+		$string = sprintf("%s %s Host %s:%s user %s : %s\n", date('M d H:i:s') , basename($_SERVER['PHP_SELF']) , $this->host, $this->port, $this->requesting_user, $string_to_log);
+		error_log($string, $this->log_type, $this->log_destination);
+		return;
+	}
 }

htdocs/includes/printipp/ExtendedPrintIPP.php

Indentation +1575 added lines, -1575 removed lines

@@ -45,1084 +45,1084 @@ 
 
 class ExtendedPrintIPP extends PrintIPP
 {
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-
-    // OPERATIONS
-    public function printURI ($uri)
-    {
-
-        self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
-
-        if (!empty($uri))
-        {
-            $this->document_uri = $uri;
-            $this->setup->uri = 1;
-        }
-
-        if(!$this->_stringUri())
-        {
-            return FALSE;
-        }
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type" => "application/ipp",
-                              "Data" => $this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
-        {
-            if(self::_parseServerOutput())
-            {
-                $this->_parseJobAttributes();
-                $this->_getJobId();
-                //$this->_getPrinterUri();
-                $this->_getJobUri();
-                }
-            }
-
-        $this->attributes = &$this->job_attributes;
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf("printing uri %s, job %s: ",$uri,$this->last_job)
-                            .$this->serveroutput->status,3);
-            }
-            else
-            {
-                $this->jobs = array_merge($this->jobs,array(""));
-                $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-                self::_errorLog(sprintf("printing uri %s: ",$uri,$this->last_job)
-                            .$this->serveroutput->status,1);
-            }
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog("printing uri $uri : OPERATION FAILED",1);
-
-        return false;
-    }
-
-
-    public function purgeJobs()
-    {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-
-        self::_setOperationId();
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->uri))
-        {
-            $this->getPrinters();
-            unset($this->jobs[count($this->jobs) - 1]);
-            unset($this->jobs_uri[count($this->jobs_uri) - 1]);
-            unset($this->status[count($this->status) - 1]);
-
-            if (array_key_exists(0,$this->available_printers))
-            {
-               self::setPrinterURI($this->available_printers[0]);
-            }
-            else
-            {
-                trigger_error(_("purgeJobs: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("purgeJobs: Printer URI is not set: die\n"));
-                self::_errorLog("purgeJobs: Printer URI is not set, die",2);
-                return FALSE;
-                }
-            }
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x12) // purge-Jobs | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->printer_uri
-                         . $this->meta->username
-                         . chr(0x22)
-                         . self::_giveMeStringLength("purge-jobs")
-                         . "purge-jobs"
-                         . self::_giveMeStringLength(chr(0x01))
-                         . chr(0x01)
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-
-        self::_putDebug(sprintf(_("purging jobs of %s\n"),$this->printer_uri)); 
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['admin']))
-        {
-            self::_parseServerOutput();
-            self::_parseAttributes();
-            }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf(_("purging jobs of %s: "),$this->printer_uri)
-                            .$this->serveroutput->status,3);
-            }
-            else
-            {
-                 self::_errorLog(sprintf(_("purging jobs of %s: "),$this->printer_uri)
-                                             .$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog(date("Y-m-d H:i:s : ")
-                        .basename($_SERVER['PHP_SELF'])
-                        .sprintf(_("purging jobs of %s : OPERATION FAILED"),
-                                     $this->printer_uri),3);
-
-        return false;
-    }
-
-    public function createJob()
-    {
-        self::_setOperationId();
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->uri))
-        {
-            $this->getPrinters();
-            unset($this->jobs[count($this->jobs) - 1]);
-            unset($this->jobs_uri[count($this->jobs_uri) - 1]);
-            unset($this->status[count($this->status) - 1]);
-
-            if (array_key_exists(0,$this->available_printers))
-            {
-               self::setPrinterURI($this->available_printers[0]);
-            }
-            else
-            {
-                trigger_error(_("createJob: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("createJob: Printer URI is not set: die\n"));
-                self::_errorLog("createJob: Printer URI is not set, die",2);
-                return FALSE;
-                }
-            }
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        if (!isset($this->setup->copies))
-        {
-            self::setCopies(1);
-        }
-
-        if (!isset($this->meta->fidelity))
-        {
-            $this->meta->fidelity = '';
-        }
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+
+	// OPERATIONS
+	public function printURI ($uri)
+	{
+
+		self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
+
+		if (!empty($uri))
+		{
+			$this->document_uri = $uri;
+			$this->setup->uri = 1;
+		}
+
+		if(!$this->_stringUri())
+		{
+			return FALSE;
+		}
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type" => "application/ipp",
+							  "Data" => $this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['printers']))
+		{
+			if(self::_parseServerOutput())
+			{
+				$this->_parseJobAttributes();
+				$this->_getJobId();
+				//$this->_getPrinterUri();
+				$this->_getJobUri();
+				}
+			}
+
+		$this->attributes = &$this->job_attributes;
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf("printing uri %s, job %s: ",$uri,$this->last_job)
+							.$this->serveroutput->status,3);
+			}
+			else
+			{
+				$this->jobs = array_merge($this->jobs,array(""));
+				$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+				self::_errorLog(sprintf("printing uri %s: ",$uri,$this->last_job)
+							.$this->serveroutput->status,1);
+			}
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog("printing uri $uri : OPERATION FAILED",1);
+
+		return false;
+	}
+
+
+	public function purgeJobs()
+	{
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+
+		self::_setOperationId();
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->uri))
+		{
+			$this->getPrinters();
+			unset($this->jobs[count($this->jobs) - 1]);
+			unset($this->jobs_uri[count($this->jobs_uri) - 1]);
+			unset($this->status[count($this->status) - 1]);
+
+			if (array_key_exists(0,$this->available_printers))
+			{
+			   self::setPrinterURI($this->available_printers[0]);
+			}
+			else
+			{
+				trigger_error(_("purgeJobs: Printer URI is not set: die"),E_USER_WARNING);
+				self::_putDebug( _("purgeJobs: Printer URI is not set: die\n"));
+				self::_errorLog("purgeJobs: Printer URI is not set, die",2);
+				return FALSE;
+				}
+			}
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x12) // purge-Jobs | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->printer_uri
+						 . $this->meta->username
+						 . chr(0x22)
+						 . self::_giveMeStringLength("purge-jobs")
+						 . "purge-jobs"
+						 . self::_giveMeStringLength(chr(0x01))
+						 . chr(0x01)
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+
+		self::_putDebug(sprintf(_("purging jobs of %s\n"),$this->printer_uri)); 
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['admin']))
+		{
+			self::_parseServerOutput();
+			self::_parseAttributes();
+			}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf(_("purging jobs of %s: "),$this->printer_uri)
+							.$this->serveroutput->status,3);
+			}
+			else
+			{
+				 self::_errorLog(sprintf(_("purging jobs of %s: "),$this->printer_uri)
+											 .$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog(date("Y-m-d H:i:s : ")
+						.basename($_SERVER['PHP_SELF'])
+						.sprintf(_("purging jobs of %s : OPERATION FAILED"),
+									 $this->printer_uri),3);
+
+		return false;
+	}
+
+	public function createJob()
+	{
+		self::_setOperationId();
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->uri))
+		{
+			$this->getPrinters();
+			unset($this->jobs[count($this->jobs) - 1]);
+			unset($this->jobs_uri[count($this->jobs_uri) - 1]);
+			unset($this->status[count($this->status) - 1]);
+
+			if (array_key_exists(0,$this->available_printers))
+			{
+			   self::setPrinterURI($this->available_printers[0]);
+			}
+			else
+			{
+				trigger_error(_("createJob: Printer URI is not set: die"),E_USER_WARNING);
+				self::_putDebug( _("createJob: Printer URI is not set: die\n"));
+				self::_errorLog("createJob: Printer URI is not set, die",2);
+				return FALSE;
+				}
+			}
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		if (!isset($this->setup->copies))
+		{
+			self::setCopies(1);
+		}
+
+		if (!isset($this->meta->fidelity))
+		{
+			$this->meta->fidelity = '';
+		}
  
-        if (!isset($this->meta->sides))
-        {
-            $this->meta->sides = '';
-        }
-
-        if (!isset($this->meta->page_ranges))
-        {
-            $this->meta->page_ranges = '';
-        }
-
-        if (!isset($this->setup->jobname))
-        {
-            if (is_readable($this->data))
-            {
-                self::setJobName(basename($this->data),true);
-            }
-            else
-            {
-                self::setJobName();
-            }
-        }
-        unset($this->setup->jobname);
-
-        if (!isset($this->timeout))
-        {
-            $this->timeout = 60;
-        }
-
-        $timeout = self::_integerBuild($this->timeout);
+		if (!isset($this->meta->sides))
+		{
+			$this->meta->sides = '';
+		}
+
+		if (!isset($this->meta->page_ranges))
+		{
+			$this->meta->page_ranges = '';
+		}
+
+		if (!isset($this->setup->jobname))
+		{
+			if (is_readable($this->data))
+			{
+				self::setJobName(basename($this->data),true);
+			}
+			else
+			{
+				self::setJobName();
+			}
+		}
+		unset($this->setup->jobname);
+
+		if (!isset($this->timeout))
+		{
+			$this->timeout = 60;
+		}
+
+		$timeout = self::_integerBuild($this->timeout);
         
-        $this->meta->timeout = chr(0x21) // integer
-                             . self::_giveMeStringLength("multiple-operation-time-out")
-                             . "multiple-operation-time-out"
-                             . self::_giveMeStringLength($timeout)
-                             . $timeout;
-
-        $jobattributes = '';
-        $operationattributes = '';
-        $printerattributes = '';
-        self::_buildValues($operationattributes,$jobattributes,$printerattributes);
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x05) // Create-Job | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->printer_uri
-                         . $this->meta->username
-                         . $this->meta->jobname
-                         . $this->meta->fidelity
-                         . $this->meta->timeout
-                         . $operationattributes
-                         . chr(0x02) // start job-attributes | job-attributes-tag
-                         . $this->meta->copies
-                         . $this->meta->sides
-                         . $this->meta->page_ranges
-                         . $jobattributes
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        unset ($this->meta->copies,$this->meta->sides,$this->meta->page_ranges);
-
-        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-
-        self::_putDebug(sprintf(_("creating job %s, printer %s\n"),$this->last_job,$this->printer_uri)); 
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
-        {
-            if(self::_parseServerOutput())
-            {
-                $this->_getJobId();
-                $this->_getJobUri();
-                $this->_parseJobAttributes();
-            }
-            else
-            {
-                $this->jobs = array_merge($this->jobs,array(''));
-                $this->jobs_uri = array_merge($this->jobs_uri,array(''));
-            }
-        }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf(_("Create job: job %s"),$this->last_job)
-                            .$this->serveroutput->status,3);
-            }
-            else
-            {
-
-                $this->jobs = array_merge($this->jobs,array(""));
-                $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-                self::_errorLog(sprintf(_("Create-Job: %s"),$this->serveroutput->status),1);
-                }                             
-            return $this->serveroutput->status; 
-            }    
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog(date("Y-m-d H:i:s : ")
-                        .basename($_SERVER['PHP_SELF'])
-                        .sprintf(_("Creating job on %s : OPERATION FAILED"),
-                                     $this->printer_uri),3);
-
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-        return false;
-    }
-
-    public function sendDocument($job,$is_last=false)
-    {
-        self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
-
-        if (!$this->_stringDocument($job,$is_last))
-        {
-            return FALSE;
-        }
-
-        if (is_readable($this->data))
-        {
-            self::_putDebug( _("sending Document\n")); 
-
-            $this->output = $this->stringjob;
-
-            if ($this->setup->datatype == "TEXT")
-            {
-                $this->output .= chr(0x16);
-            } // ASCII "SYN"
-
-            $post_values = array( "Content-Type" => "application/ipp",
-                                  "Data" => $this->output,
-                                  "File" => $this->data);
-
-            if ($this->setup->datatype == "TEXT" && !isset($this->setup->noFormFeed))
-            {
-                $post_values = array_merge($post_values,array("Filetype"=>"TEXT"));
-            }
-        }
-        else
-        {
-            self::_putDebug( _("sending DATA as document\n")); 
-
-            $this->output = $this->stringjob;
-            $this->output .= $this->datahead;    
-            $this->output .= $this->data;
-            $this->output .= $this->datatail;
-
-            $post_values = array( "Content-Type" => "application/ipp",
-                                  "Data" => $this->output);
-        }
-
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
-        {
-
-            if(self::_parseServerOutput())
-            {
-                $this->_getJobId();
-                //$this->_getPrinterUri();
-                $this->_getJobUri();
-                $this->_parseJobAttributes();
-            }
-            else
-            {
-                $this->jobs = array_merge($this->jobs,array($job));
-                $this->jobs_uri = array_merge($this->jobs_uri,array($job));
-                }
-            }
+		$this->meta->timeout = chr(0x21) // integer
+							 . self::_giveMeStringLength("multiple-operation-time-out")
+							 . "multiple-operation-time-out"
+							 . self::_giveMeStringLength($timeout)
+							 . $timeout;
+
+		$jobattributes = '';
+		$operationattributes = '';
+		$printerattributes = '';
+		self::_buildValues($operationattributes,$jobattributes,$printerattributes);
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x05) // Create-Job | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->printer_uri
+						 . $this->meta->username
+						 . $this->meta->jobname
+						 . $this->meta->fidelity
+						 . $this->meta->timeout
+						 . $operationattributes
+						 . chr(0x02) // start job-attributes | job-attributes-tag
+						 . $this->meta->copies
+						 . $this->meta->sides
+						 . $this->meta->page_ranges
+						 . $jobattributes
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		unset ($this->meta->copies,$this->meta->sides,$this->meta->page_ranges);
+
+		self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+
+		self::_putDebug(sprintf(_("creating job %s, printer %s\n"),$this->last_job,$this->printer_uri)); 
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['printers']))
+		{
+			if(self::_parseServerOutput())
+			{
+				$this->_getJobId();
+				$this->_getJobUri();
+				$this->_parseJobAttributes();
+			}
+			else
+			{
+				$this->jobs = array_merge($this->jobs,array(''));
+				$this->jobs_uri = array_merge($this->jobs_uri,array(''));
+			}
+		}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf(_("Create job: job %s"),$this->last_job)
+							.$this->serveroutput->status,3);
+			}
+			else
+			{
+
+				$this->jobs = array_merge($this->jobs,array(""));
+				$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+				self::_errorLog(sprintf(_("Create-Job: %s"),$this->serveroutput->status),1);
+				}                             
+			return $this->serveroutput->status; 
+			}    
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog(date("Y-m-d H:i:s : ")
+						.basename($_SERVER['PHP_SELF'])
+						.sprintf(_("Creating job on %s : OPERATION FAILED"),
+									 $this->printer_uri),3);
+
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+		return false;
+	}
+
+	public function sendDocument($job,$is_last=false)
+	{
+		self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
+
+		if (!$this->_stringDocument($job,$is_last))
+		{
+			return FALSE;
+		}
+
+		if (is_readable($this->data))
+		{
+			self::_putDebug( _("sending Document\n")); 
+
+			$this->output = $this->stringjob;
+
+			if ($this->setup->datatype == "TEXT")
+			{
+				$this->output .= chr(0x16);
+			} // ASCII "SYN"
+
+			$post_values = array( "Content-Type" => "application/ipp",
+								  "Data" => $this->output,
+								  "File" => $this->data);
+
+			if ($this->setup->datatype == "TEXT" && !isset($this->setup->noFormFeed))
+			{
+				$post_values = array_merge($post_values,array("Filetype"=>"TEXT"));
+			}
+		}
+		else
+		{
+			self::_putDebug( _("sending DATA as document\n")); 
+
+			$this->output = $this->stringjob;
+			$this->output .= $this->datahead;    
+			$this->output .= $this->data;
+			$this->output .= $this->datatail;
+
+			$post_values = array( "Content-Type" => "application/ipp",
+								  "Data" => $this->output);
+		}
+
+		if (self::_sendHttp ($post_values,$this->paths['printers']))
+		{
+
+			if(self::_parseServerOutput())
+			{
+				$this->_getJobId();
+				//$this->_getPrinterUri();
+				$this->_getJobUri();
+				$this->_parseJobAttributes();
+			}
+			else
+			{
+				$this->jobs = array_merge($this->jobs,array($job));
+				$this->jobs_uri = array_merge($this->jobs_uri,array($job));
+				}
+			}
         
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf("sending document, job %s: %s",$job,$this->serveroutput->status),3);
-            }
-            else
-            {
-                $this->jobs = array_merge($this->jobs,array(""));
-                $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-                self::_errorLog(sprintf("sending document, job %s: %s",$job,$this->serveroutput->status),1);
-            }
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        $this->jobs = array_merge($this->jobs,array($job));
-        $this->jobs_uri = array_merge($this->jobs_uri,array($job));
-        self::_errorLog(sprintf("sending document, job %s : OPERATION FAILED",$job),1);
-
-        return false;
-    }
-
-
-    public function sendURI ($uri,$job,$is_last=false)
-    {
-        self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
-
-        if (!$this->_stringSendUri($uri,$job,$is_last))
-        {
-            return FALSE;
-        }
-
-            self::_putDebug( _("sending URI $uri\n")); 
-
-            $this->output = $this->stringjob;
-
-            $post_values = array( "Content-Type" => "application/ipp",
-                                  "Data" => $this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
-        {
-            if(self::_parseServerOutput())
-            {
-                $this->_getJobId();
-                //$this->_getPrinterUri();
-                $this->_getJobUri();
-                $this->_parseJobAttributes();
-            }
-            else
-            {
-                $this->jobs = array_merge($this->jobs,array($job));
-                $this->jobs_uri = array_merge($this->jobs_uri,array($job));
-                }
-            }
-
-        $this->attributes = &$this->job_attributes;
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf("sending uri %s, job %s: %s",$uri,$job,$this->serveroutput->status),3);
-            }
-            else
-            {
-                $this->jobs = array_merge($this->jobs,array(""));
-                $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-                self::_errorLog(sprintf("sending uri, job %s: %s",$uri,$job,$this->serveroutput->status),1);
-            }
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        $this->jobs = array_merge($this->jobs,array($job));
-        $this->jobs_uri = array_merge($this->jobs_uri,array($job));
-        self::_errorLog(sprintf("sending uri %s, job %s : OPERATION FAILED",$uri,$job),1);
-
-        return false;
-    }
-
-
-    public function pausePrinter()
-    {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-
-        self::_setOperationId();
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->uri))
-        {
-            $this->getPrinters();
-            unset($this->jobs[count($this->jobs) - 1]);
-            unset($this->jobs_uri[count($this->jobs_uri) - 1]);
-            unset($this->status[count($this->status) - 1]);
-
-            if (array_key_exists(0,$this->available_printers))
-            {
-               self::setPrinterURI($this->available_printers[0]);
-            }
-            else
-            {
-                trigger_error(_("pausePrinter: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("pausePrinter: Printer URI is not set: die\n"));
-                self::_errorLog("pausePrinter: Printer URI is not set, die",2);
-                return FALSE;
-            }
-        }
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x10) // Pause-Printer | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->printer_uri
-                         . $this->meta->username
-                         /* . chr(0x22)
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf("sending document, job %s: %s",$job,$this->serveroutput->status),3);
+			}
+			else
+			{
+				$this->jobs = array_merge($this->jobs,array(""));
+				$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+				self::_errorLog(sprintf("sending document, job %s: %s",$job,$this->serveroutput->status),1);
+			}
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		$this->jobs = array_merge($this->jobs,array($job));
+		$this->jobs_uri = array_merge($this->jobs_uri,array($job));
+		self::_errorLog(sprintf("sending document, job %s : OPERATION FAILED",$job),1);
+
+		return false;
+	}
+
+
+	public function sendURI ($uri,$job,$is_last=false)
+	{
+		self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
+
+		if (!$this->_stringSendUri($uri,$job,$is_last))
+		{
+			return FALSE;
+		}
+
+			self::_putDebug( _("sending URI $uri\n")); 
+
+			$this->output = $this->stringjob;
+
+			$post_values = array( "Content-Type" => "application/ipp",
+								  "Data" => $this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['printers']))
+		{
+			if(self::_parseServerOutput())
+			{
+				$this->_getJobId();
+				//$this->_getPrinterUri();
+				$this->_getJobUri();
+				$this->_parseJobAttributes();
+			}
+			else
+			{
+				$this->jobs = array_merge($this->jobs,array($job));
+				$this->jobs_uri = array_merge($this->jobs_uri,array($job));
+				}
+			}
+
+		$this->attributes = &$this->job_attributes;
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf("sending uri %s, job %s: %s",$uri,$job,$this->serveroutput->status),3);
+			}
+			else
+			{
+				$this->jobs = array_merge($this->jobs,array(""));
+				$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+				self::_errorLog(sprintf("sending uri, job %s: %s",$uri,$job,$this->serveroutput->status),1);
+			}
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		$this->jobs = array_merge($this->jobs,array($job));
+		$this->jobs_uri = array_merge($this->jobs_uri,array($job));
+		self::_errorLog(sprintf("sending uri %s, job %s : OPERATION FAILED",$uri,$job),1);
+
+		return false;
+	}
+
+
+	public function pausePrinter()
+	{
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+
+		self::_setOperationId();
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->uri))
+		{
+			$this->getPrinters();
+			unset($this->jobs[count($this->jobs) - 1]);
+			unset($this->jobs_uri[count($this->jobs_uri) - 1]);
+			unset($this->status[count($this->status) - 1]);
+
+			if (array_key_exists(0,$this->available_printers))
+			{
+			   self::setPrinterURI($this->available_printers[0]);
+			}
+			else
+			{
+				trigger_error(_("pausePrinter: Printer URI is not set: die"),E_USER_WARNING);
+				self::_putDebug( _("pausePrinter: Printer URI is not set: die\n"));
+				self::_errorLog("pausePrinter: Printer URI is not set, die",2);
+				return FALSE;
+			}
+		}
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x10) // Pause-Printer | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->printer_uri
+						 . $this->meta->username
+						 /* . chr(0x22)
                          . self::_giveMeStringLength("purge-jobs")
                          . "purge-jobs"
                          . self::_giveMeStringLength(chr(0x01))
                          . chr(0x01) */
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-
-        self::_putDebug(sprintf(_("pause printer %s\n"),$this->printer_uri)); 
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['admin']))
-        {
-            self::_parseServerOutput();
-            self::_parseAttributes();
-        }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf(_("Pause printer %s: "),$this->printer_uri)
-                            .$this->serveroutput->status,3);
-            }
-            else
-            {
-                 self::_errorLog(sprintf(_("pause printer %s: "),$this->printer_uri)
-                                             .$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog(date("Y-m-d H:i:s : ")
-                        .basename($_SERVER['PHP_SELF'])
-                        .sprintf(_("pause printer %s : OPERATION FAILED"),
-                                     $this->printer_uri),3);
-
-        return false;
-    }
-
-
-    public function resumePrinter()
-    {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-
-        self::_setOperationId();
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->uri))
-        {
-            $this->getPrinters();
-            unset($this->jobs[count($this->jobs) - 1]);
-            unset($this->jobs_uri[count($this->jobs_uri) - 1]);
-            unset($this->status[count($this->status) - 1]);
-
-            if (array_key_exists(0,$this->available_printers))
-            {
-               self::setPrinterURI($this->available_printers[0]);
-            }
-            else
-            {
-                trigger_error(_("resumePrinter: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("resumePrinter: Printer URI is not set: die\n"));
-                self::_errorLog(" Printer URI is not set, die",2);
-                return FALSE;
-            }
-        }
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x11) // suse-Printer | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->printer_uri
-                         . $this->meta->username
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-
-        self::_putDebug(sprintf(_("resume printer %s\n"),$this->printer_uri)); 
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['admin']))
-        {
-            self::_parseServerOutput();
-            self::_parseAttributes();
-        }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf(_("resume printer %s: "),$this->printer_uri)
-                            .$this->serveroutput->status,3);
-            }
-            else
-            {
-                 self::_errorLog(sprintf(_("resume printer %s: "),$this->printer_uri)
-                                             .$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog(date("Y-m-d H:i:s : ")
-                        .basename($_SERVER['PHP_SELF'])
-                        .sprintf(_("resume printer %s : OPERATION FAILED"),
-                                     $this->printer_uri),3);
-
-        return false;
-    }
-
-
-    public function holdJob ($job_uri,$until='indefinite')
-    {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(trim($job_uri)));
-
-        self::_setOperationId();
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        if (!isset($this->meta->message))
-        {
-            $this->meta->message = '';
-        }
-
-        self::_setJobUri($job_uri);
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+
+		self::_putDebug(sprintf(_("pause printer %s\n"),$this->printer_uri)); 
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['admin']))
+		{
+			self::_parseServerOutput();
+			self::_parseAttributes();
+		}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf(_("Pause printer %s: "),$this->printer_uri)
+							.$this->serveroutput->status,3);
+			}
+			else
+			{
+				 self::_errorLog(sprintf(_("pause printer %s: "),$this->printer_uri)
+											 .$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog(date("Y-m-d H:i:s : ")
+						.basename($_SERVER['PHP_SELF'])
+						.sprintf(_("pause printer %s : OPERATION FAILED"),
+									 $this->printer_uri),3);
+
+		return false;
+	}
+
+
+	public function resumePrinter()
+	{
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+
+		self::_setOperationId();
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->uri))
+		{
+			$this->getPrinters();
+			unset($this->jobs[count($this->jobs) - 1]);
+			unset($this->jobs_uri[count($this->jobs_uri) - 1]);
+			unset($this->status[count($this->status) - 1]);
+
+			if (array_key_exists(0,$this->available_printers))
+			{
+			   self::setPrinterURI($this->available_printers[0]);
+			}
+			else
+			{
+				trigger_error(_("resumePrinter: Printer URI is not set: die"),E_USER_WARNING);
+				self::_putDebug( _("resumePrinter: Printer URI is not set: die\n"));
+				self::_errorLog(" Printer URI is not set, die",2);
+				return FALSE;
+			}
+		}
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x11) // suse-Printer | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->printer_uri
+						 . $this->meta->username
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+
+		self::_putDebug(sprintf(_("resume printer %s\n"),$this->printer_uri)); 
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['admin']))
+		{
+			self::_parseServerOutput();
+			self::_parseAttributes();
+		}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf(_("resume printer %s: "),$this->printer_uri)
+							.$this->serveroutput->status,3);
+			}
+			else
+			{
+				 self::_errorLog(sprintf(_("resume printer %s: "),$this->printer_uri)
+											 .$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog(date("Y-m-d H:i:s : ")
+						.basename($_SERVER['PHP_SELF'])
+						.sprintf(_("resume printer %s : OPERATION FAILED"),
+									 $this->printer_uri),3);
+
+		return false;
+	}
+
+
+	public function holdJob ($job_uri,$until='indefinite')
+	{
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(trim($job_uri)));
+
+		self::_setOperationId();
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		if (!isset($this->meta->message))
+		{
+			$this->meta->message = '';
+		}
+
+		self::_setJobUri($job_uri);
         
-        $until_strings = array('no-hold','day-time','evening','night','weekend','second-shift','third-shift');
-        if (in_array($until,$until_strings))
-        {
-            true;
-        }
-        else 
-        {
-            $until = 'indefinite';
-        }
-
-        $this->meta->job_hold_until = chr(0x42) // keyword
-                                    . self::_giveMeStringLength('job-hold-until')
-                                    . 'job-hold-until'
-                                    . self::_giveMeStringLength($until)
-                                    . $until;
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x0C) // Hold-Job | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->username
-                         . $this->meta->job_uri
-                         . $this->meta->message
-                         . $this->meta->job_hold_until
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-
-        self::_putDebug(sprintf(_("hold job %s until %s\n"),$job_uri,$until)); 
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
-        {
-            self::_parseServerOutput();
-            self::_parseAttributes();
-            }
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
+		$until_strings = array('no-hold','day-time','evening','night','weekend','second-shift','third-shift');
+		if (in_array($until,$until_strings))
+		{
+			true;
+		}
+		else 
+		{
+			$until = 'indefinite';
+		}
+
+		$this->meta->job_hold_until = chr(0x42) // keyword
+									. self::_giveMeStringLength('job-hold-until')
+									. 'job-hold-until'
+									. self::_giveMeStringLength($until)
+									. $until;
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x0C) // Hold-Job | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->username
+						 . $this->meta->job_uri
+						 . $this->meta->message
+						 . $this->meta->job_hold_until
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+
+		self::_putDebug(sprintf(_("hold job %s until %s\n"),$job_uri,$until)); 
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['jobs']))
+		{
+			self::_parseServerOutput();
+			self::_parseAttributes();
+			}
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
             
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
             
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf(_("hold job %s until %s: "),$job_uri,$until)
-                            .$this->serveroutput->status,3);
-            }
-            else
-            {
-                 self::_errorLog(sprintf(_("hold job %s until %s: "),$job_uri,$until)
-                                             .$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog(date("Y-m-d H:i:s : ")
-                        .basename($_SERVER['PHP_SELF'])
-                        .sprintf(_("hold job %s until %s : OPERATION FAILED"),
-                                     $job_uri,$until),3);
-
-        return false;
-    }
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf(_("hold job %s until %s: "),$job_uri,$until)
+							.$this->serveroutput->status,3);
+			}
+			else
+			{
+				 self::_errorLog(sprintf(_("hold job %s until %s: "),$job_uri,$until)
+											 .$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog(date("Y-m-d H:i:s : ")
+						.basename($_SERVER['PHP_SELF'])
+						.sprintf(_("hold job %s until %s : OPERATION FAILED"),
+									 $job_uri,$until),3);
+
+		return false;
+	}
     
 
-    public function releaseJob ($job_uri)
-    {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(trim($job_uri)));
-
-        self::_setOperationId();
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        if (!isset($this->meta->message))
-        {
-            $this->meta->message = '';
-        }
-
-        self::_setJobUri($job_uri);
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x0D) // Hold-Job | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->job_uri
-                         . $this->meta->username
-                         . $this->meta->message
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-
-        self::_putDebug(sprintf(_("release job %s\n"),$job_uri)); 
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
-        {
-            self::_parseServerOutput();
-            self::_parseAttributes();
-        }
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+	public function releaseJob ($job_uri)
+	{
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(trim($job_uri)));
+
+		self::_setOperationId();
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		if (!isset($this->meta->message))
+		{
+			$this->meta->message = '';
+		}
+
+		self::_setJobUri($job_uri);
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x0D) // Hold-Job | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->job_uri
+						 . $this->meta->username
+						 . $this->meta->message
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+
+		self::_putDebug(sprintf(_("release job %s\n"),$job_uri)); 
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['jobs']))
+		{
+			self::_parseServerOutput();
+			self::_parseAttributes();
+		}
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
             
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf(_("release job %s: "),$job_uri)
-                            .$this->serveroutput->status,3);
-            }
-            else
-            {
-                 self::_errorLog(sprintf(_("release job %s: "),$job_uri)
-                                             .$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog(date("Y-m-d H:i:s : ")
-                        .basename($_SERVER['PHP_SELF'])
-                        .sprintf(_("release job %s: OPERATION FAILED"),
-                                     $job_uri),3);
-
-        return false;
-    }
-
-
-    public function restartJob ($job_uri)
-    {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(trim($job_uri)));
-
-        self::_setOperationId();
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        if (!isset($this->meta->message))
-        {
-            $this->meta->message = '';
-        }
-
-        self::_setJobUri($job_uri);
-
-        $jobattributes = '';
-        $operationattributes = '';
-        $printerattributes = '';
-        self::_buildValues ($operationattributes,$jobattributes,$printerattributes); 
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf(_("release job %s: "),$job_uri)
+							.$this->serveroutput->status,3);
+			}
+			else
+			{
+				 self::_errorLog(sprintf(_("release job %s: "),$job_uri)
+											 .$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog(date("Y-m-d H:i:s : ")
+						.basename($_SERVER['PHP_SELF'])
+						.sprintf(_("release job %s: OPERATION FAILED"),
+									 $job_uri),3);
+
+		return false;
+	}
+
+
+	public function restartJob ($job_uri)
+	{
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(trim($job_uri)));
+
+		self::_setOperationId();
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		if (!isset($this->meta->message))
+		{
+			$this->meta->message = '';
+		}
+
+		self::_setJobUri($job_uri);
+
+		$jobattributes = '';
+		$operationattributes = '';
+		$printerattributes = '';
+		self::_buildValues ($operationattributes,$jobattributes,$printerattributes); 
  
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x0E) // Hold-Job | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->job_uri
-                         . $this->meta->username
-                         . $this->meta->message
-                         . $jobattributes // job-hold-until is set by setAttribute($attribute,$value)
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-
-        self::_putDebug(sprintf(_("release job %s\n"),$job_uri)); 
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
-        {
-            self::_parseServerOutput();
-            self::_parseAttributes();
-        }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf(_("release job %s: "),$job_uri)
-                            .$this->serveroutput->status,3);
-            }
-            else
-            {
-                 self::_errorLog(sprintf(_("release job %s: "),$job_uri)
-                                             .$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog(date("Y-m-d H:i:s : ")
-                        .basename($_SERVER['PHP_SELF'])
-                        .sprintf(_("release job %s: OPERATION FAILED"),
-                                     $job_uri),3);
-
-        return false;
-    }
-
-
-    public function setJobAttributes ($job_uri,$deleted_attributes=array())
-    {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(trim($job_uri)));
-
-        self::_setOperationId();
-        $this->parsed = array();
-        unset ($this->attributes);
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        if (!isset($this->meta->message))
-        {
-            $this->meta->message = '';
-        }
-
-        if (!isset($this->meta->copies))
-        {
-            $this->meta->copies = '';
-        }
-
-        if (!isset($this->meta->sides))
-        {
-            $this->meta->sides = '';
-        }
-
-        if (!isset($this->meta->page_ranges))
-        {
-            $this->meta->page_ranges = '';
-        }
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x0E) // Hold-Job | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->job_uri
+						 . $this->meta->username
+						 . $this->meta->message
+						 . $jobattributes // job-hold-until is set by setAttribute($attribute,$value)
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+
+		self::_putDebug(sprintf(_("release job %s\n"),$job_uri)); 
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['jobs']))
+		{
+			self::_parseServerOutput();
+			self::_parseAttributes();
+		}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf(_("release job %s: "),$job_uri)
+							.$this->serveroutput->status,3);
+			}
+			else
+			{
+				 self::_errorLog(sprintf(_("release job %s: "),$job_uri)
+											 .$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog(date("Y-m-d H:i:s : ")
+						.basename($_SERVER['PHP_SELF'])
+						.sprintf(_("release job %s: OPERATION FAILED"),
+									 $job_uri),3);
+
+		return false;
+	}
+
+
+	public function setJobAttributes ($job_uri,$deleted_attributes=array())
+	{
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(trim($job_uri)));
+
+		self::_setOperationId();
+		$this->parsed = array();
+		unset ($this->attributes);
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		if (!isset($this->meta->message))
+		{
+			$this->meta->message = '';
+		}
+
+		if (!isset($this->meta->copies))
+		{
+			$this->meta->copies = '';
+		}
+
+		if (!isset($this->meta->sides))
+		{
+			$this->meta->sides = '';
+		}
+
+		if (!isset($this->meta->page_ranges))
+		{
+			$this->meta->page_ranges = '';
+		}
   
-        self::_setJobUri($job_uri);
-
-        $operationattributes = '';
-        $jobattributes = '';
-        $printerattributes = '';
-        self::_buildValues ($operationattributes,$jobattributes,$printerattributes); 
-
-        $this->meta->deleted_attributes = "";
-        for ($i = 0 ; $i < count($deleted_attributes) ; $i++)
-        {
-            $this->meta->deleted_attributes .= chr(0x16) // out-of-band value
-                . self::_giveMeStringLength($deleted_attributes[$i])
-                . $deleted_attributes[$i]
-                . chr(0x0).chr(0x0);
-        } // value-length = 0;
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x14) // Set-Job-Attributes | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->job_uri
-                         . $this->meta->username
-                         . $this->meta->message
-                         . chr(0x02) // start job-attributes
-                         . $jobattributes // setteds by setAttribute($attribute,$value)
-                         . $this->meta->copies
-                         . $this->meta->sides
-                         . $this->meta->page_ranges
-                         . $this->meta->deleted_attributes
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-
-        self::_putDebug(sprintf(_("set job attributes for job %s\n"),$job_uri)); 
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
-        {
-            self::_parseServerOutput();
-            self::_parseAttributes();
-        }
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf(_("set job attributes for job %s: "),$job_uri)
-                            .$this->serveroutput->status,3);
-            }
-            else
-            {
-                 self::_errorLog(sprintf(_("set job attributes for job %s: "),$job_uri)
-                                             .$this->serveroutput->status,1);
-            }
-            $this->last_job = $job_uri;
-            $this->jobs_uri[count($this->jobs_uri) - 1] = $job_uri;
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog(date("Y-m-d H:i:s : ")
-                        .basename($_SERVER['PHP_SELF'])
-                        .sprintf(_("set job attributes for job %s: OPERATION FAILED"),
-                                     $job_uri),3);
-
-        return false;
-    }
-
-
-    public function setPrinterAttributes ($document_format='',$deleted_attributes=array())
-    {
-        /* $document_format (RFC 3380)
+		self::_setJobUri($job_uri);
+
+		$operationattributes = '';
+		$jobattributes = '';
+		$printerattributes = '';
+		self::_buildValues ($operationattributes,$jobattributes,$printerattributes); 
+
+		$this->meta->deleted_attributes = "";
+		for ($i = 0 ; $i < count($deleted_attributes) ; $i++)
+		{
+			$this->meta->deleted_attributes .= chr(0x16) // out-of-band value
+				. self::_giveMeStringLength($deleted_attributes[$i])
+				. $deleted_attributes[$i]
+				. chr(0x0).chr(0x0);
+		} // value-length = 0;
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x14) // Set-Job-Attributes | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->job_uri
+						 . $this->meta->username
+						 . $this->meta->message
+						 . chr(0x02) // start job-attributes
+						 . $jobattributes // setteds by setAttribute($attribute,$value)
+						 . $this->meta->copies
+						 . $this->meta->sides
+						 . $this->meta->page_ranges
+						 . $this->meta->deleted_attributes
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+
+		self::_putDebug(sprintf(_("set job attributes for job %s\n"),$job_uri)); 
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['jobs']))
+		{
+			self::_parseServerOutput();
+			self::_parseAttributes();
+		}
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf(_("set job attributes for job %s: "),$job_uri)
+							.$this->serveroutput->status,3);
+			}
+			else
+			{
+				 self::_errorLog(sprintf(_("set job attributes for job %s: "),$job_uri)
+											 .$this->serveroutput->status,1);
+			}
+			$this->last_job = $job_uri;
+			$this->jobs_uri[count($this->jobs_uri) - 1] = $job_uri;
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog(date("Y-m-d H:i:s : ")
+						.basename($_SERVER['PHP_SELF'])
+						.sprintf(_("set job attributes for job %s: OPERATION FAILED"),
+									 $job_uri),3);
+
+		return false;
+	}
+
+
+	public function setPrinterAttributes ($document_format='',$deleted_attributes=array())
+	{
+		/* $document_format (RFC 3380)
          If the client includes this attribute, the Printer MUST change
          the supplied attributes for the document format specified by
          this attribute.  If a supplied attribute is a member of the
@@ -1140,517 +1140,517 @@ 
          they vary by document-format.
          */
 
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-        unset ($this->attributes);
-
-        self::_setOperationId();
-        $this->parsed = array();
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        if (!isset($this->meta->message))
-        {
-            $this->meta->message = '';
-        }
-
-        if (!isset($this->meta->copies))
-        {
-            $this->meta->copies = '';
-        }
-
-        if (!isset($this->meta->sides))
-        {
-            $this->meta->sides = '';
-        }
-
-        if (!isset($this->meta->page_ranges))
-        {
-            $this->meta->page_ranges = '';
-        }
-
-        if ($document_format)
-        {
-        $document_format = chr(0x49) // document-format tag
-            . self::_giveMeStringLength('document-format')
-            . 'document-format' // 
-            . self::_giveMeStringLength($document_format)
-            . $document_format;
-        } // value
-
-        $operationattributes = '';
-        $jobattributes = '';
-        $printerattributes = '';
-        self::_buildValues ($operationattributes,$jobattributes,$printerattributes); 
-
-        $this->meta->deleted_attributes = "";
-        for ($i = 0 ; $i < count($deleted_attributes) ; $i++)
-        {
-                $this->meta->deleted_attributes .= chr(0x16) // out-of-band "deleted" value
-                                                . self::_giveMeStringLength($deleted_attributes[$i])
-                                                . $deleted_attributes[$i]
-                                                . chr(0x0).chr(0x0);
-        } // value-length = 0;
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x13) // Set-Printer-Attributes | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->printer_uri
-                         . $this->meta->username
-                         . $this->meta->message
-                         . $operationattributes
-                         . chr(0x02) // start job-attributes
-                         . $jobattributes // setteds by setAttribute($attribute,$value)
-                         . $this->meta->copies
-                         . $this->meta->sides
-                         . $this->meta->page_ranges
-                         . $this->meta->deleted_attributes
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-
-        self::_putDebug(sprintf(_("set printer attributes for job %s\n"),$this->printer_uri)); 
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type"=>"application/ipp",
-                              "Data"=>$this->output);
-
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
-        {
-            self::_parseServerOutput();
-            self::_parseAttributes();
-        }
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog(sprintf(_("set printer attributes for printer %s: "),$this->printer_uri)
-                            .$this->serveroutput->status,3);
-            }
-            else
-            {
-                 self::_errorLog(sprintf(_("set printer attributes for printer %s: "),$this->printer_uri)
-                                             .$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status; 
-        }
-
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog(date("Y-m-d H:i:s : ")
-                        .basename($_SERVER['PHP_SELF'])
-                        .sprintf(_("set printer attributes for printer %s: OPERATION FAILED"),
-                                     $this->printer_uri),1);
-
-        return false;
-    }
-
-    // REQUEST BUILDING
-    protected function _setDocumentUri ()
-    {
-        $this->meta->document_uri = chr(0x45) // type uri
-                                . chr(0x00).chr(0x0c) // name-length
-                                . "document-uri"
-                                . self::_giveMeStringLength($this->document_uri)
-                                . $this->document_uri;
-
-        self::_putDebug( "document uri is: ".$this->document_uri."\n");
-        $this->setup->document_uri = 1;
-    }
-
-
-    protected function _stringUri ()
-    {
-        self::_setDocumentUri();
-
-        if (!isset($this->setup->document_uri))
-        {
-            trigger_error(_("_stringUri: Document URI is not set: die"),E_USER_WARNING);
-            self::_putDebug( _("_stringUri: Document URI is not set: die\n"));
-            self::_errorLog("Document URI is not set, die",2);
-            return FALSE;
-        }
-        unset ($this->setup->document_uri);
-
-        if (!isset($this->setup->uri))
-        {
-            $this->getPrinters();
-            unset($this->jobs[count($this->jobs) - 1]);
-            unset($this->jobs_uri[count($this->jobs) - 1]);
-            unset($this->status[count($this->status) - 1]);
-
-            if (array_key_exists(0,$this->available_printers))
-            {
-               self::setPrinterURI($this->available_printers[0]);
-            }
-            else
-            {
-                trigger_error(_("_stringUri: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("_stringUri: Printer URI is not set: die\n"));
-                self::_errorLog("_stringUri: Printer URI is not set, die",2);
-                return FALSE;
-            }
-        }
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+		unset ($this->attributes);
+
+		self::_setOperationId();
+		$this->parsed = array();
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		if (!isset($this->meta->message))
+		{
+			$this->meta->message = '';
+		}
+
+		if (!isset($this->meta->copies))
+		{
+			$this->meta->copies = '';
+		}
+
+		if (!isset($this->meta->sides))
+		{
+			$this->meta->sides = '';
+		}
+
+		if (!isset($this->meta->page_ranges))
+		{
+			$this->meta->page_ranges = '';
+		}
+
+		if ($document_format)
+		{
+		$document_format = chr(0x49) // document-format tag
+			. self::_giveMeStringLength('document-format')
+			. 'document-format' // 
+			. self::_giveMeStringLength($document_format)
+			. $document_format;
+		} // value
+
+		$operationattributes = '';
+		$jobattributes = '';
+		$printerattributes = '';
+		self::_buildValues ($operationattributes,$jobattributes,$printerattributes); 
+
+		$this->meta->deleted_attributes = "";
+		for ($i = 0 ; $i < count($deleted_attributes) ; $i++)
+		{
+				$this->meta->deleted_attributes .= chr(0x16) // out-of-band "deleted" value
+												. self::_giveMeStringLength($deleted_attributes[$i])
+												. $deleted_attributes[$i]
+												. chr(0x0).chr(0x0);
+		} // value-length = 0;
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x13) // Set-Printer-Attributes | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->printer_uri
+						 . $this->meta->username
+						 . $this->meta->message
+						 . $operationattributes
+						 . chr(0x02) // start job-attributes
+						 . $jobattributes // setteds by setAttribute($attribute,$value)
+						 . $this->meta->copies
+						 . $this->meta->sides
+						 . $this->meta->page_ranges
+						 . $this->meta->deleted_attributes
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+
+		self::_putDebug(sprintf(_("set printer attributes for job %s\n"),$this->printer_uri)); 
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type"=>"application/ipp",
+							  "Data"=>$this->output);
+
+		if (self::_sendHttp ($post_values,$this->paths['printers']))
+		{
+			self::_parseServerOutput();
+			self::_parseAttributes();
+		}
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog(sprintf(_("set printer attributes for printer %s: "),$this->printer_uri)
+							.$this->serveroutput->status,3);
+			}
+			else
+			{
+				 self::_errorLog(sprintf(_("set printer attributes for printer %s: "),$this->printer_uri)
+											 .$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status; 
+		}
+
+		$this->status = array_merge($this->status,array("OPERATION FAILED"));
+		self::_errorLog(date("Y-m-d H:i:s : ")
+						.basename($_SERVER['PHP_SELF'])
+						.sprintf(_("set printer attributes for printer %s: OPERATION FAILED"),
+									 $this->printer_uri),1);
+
+		return false;
+	}
+
+	// REQUEST BUILDING
+	protected function _setDocumentUri ()
+	{
+		$this->meta->document_uri = chr(0x45) // type uri
+								. chr(0x00).chr(0x0c) // name-length
+								. "document-uri"
+								. self::_giveMeStringLength($this->document_uri)
+								. $this->document_uri;
+
+		self::_putDebug( "document uri is: ".$this->document_uri."\n");
+		$this->setup->document_uri = 1;
+	}
+
+
+	protected function _stringUri ()
+	{
+		self::_setDocumentUri();
+
+		if (!isset($this->setup->document_uri))
+		{
+			trigger_error(_("_stringUri: Document URI is not set: die"),E_USER_WARNING);
+			self::_putDebug( _("_stringUri: Document URI is not set: die\n"));
+			self::_errorLog("Document URI is not set, die",2);
+			return FALSE;
+		}
+		unset ($this->setup->document_uri);
+
+		if (!isset($this->setup->uri))
+		{
+			$this->getPrinters();
+			unset($this->jobs[count($this->jobs) - 1]);
+			unset($this->jobs_uri[count($this->jobs) - 1]);
+			unset($this->status[count($this->status) - 1]);
+
+			if (array_key_exists(0,$this->available_printers))
+			{
+			   self::setPrinterURI($this->available_printers[0]);
+			}
+			else
+			{
+				trigger_error(_("_stringUri: Printer URI is not set: die"),E_USER_WARNING);
+				self::_putDebug( _("_stringUri: Printer URI is not set: die\n"));
+				self::_errorLog("_stringUri: Printer URI is not set, die",2);
+				return FALSE;
+			}
+		}
   
-        if (!isset($this->setup->charset))
-        {
-            $this->meta->charset = "";
-        }
-        if (!isset($this->setup->datatype))
-        {
-            self::setBinary();
-        }
-        if (!isset($this->setup->uri))
-        {
-            trigger_error(_("_stringUri: Printer URI is not set: die"),E_USER_WARNING);
-            self::_putDebug( _("_stringUri: Printer URI is not set: die\n"));
-            self::_errorLog("Printer URI is not set, die",2);
-            return FALSE;
-        }
-        if (!isset($this->setup->copies))
-        {
-            self::setCopies(1);
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->setup->mime_media_type))
-        {
-            self::setMimeMediaType();
-        }
-        unset ($this->setup->mime_media_type);
-
-        if (!isset($this->setup->jobname))
-        {
-            if (is_readable($this->data))
-            {
-                self::setJobName(basename($this->data),true);
-            }
-            else
-            {
-                self::setJobName();
-            }
-        }
-        unset($this->setup->jobname);
-
-        if (!isset($this->meta->username))
-        {
-            self::setUserName();
-        }
-
-        if (!isset($this->meta->fidelity))
-        {
-            $this->meta->fidelity = '';
-        }
-
-        if (!isset($this->meta->document_name))
-        {
-            $this->meta->document_name = '';
-        }
-
-        if (!isset($this->meta->sides))
-        {
-            $this->meta->sides = '';
-        }
-
-        if (!isset($this->meta->page_ranges))
-        {
-            $this->meta->page_ranges = '';
-        }
-
-        $jobattributes = '';
-        $operationattributes = '';
-        $printerattributes = '';
-        self::_buildValues($operationattributes,$jobattributes,$printerattributes);
-
-        self::_setOperationId();
-
-        if (!isset($this->error_generation->request_body_malformed))
-        {
-            $this->error_generation->request_body_malformed = "";
-        }
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x03) // Print-URI | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . $this->error_generation->request_body_malformed
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->printer_uri
-                         . $this->meta->jobname
-                         . $this->meta->username
-                         . $this->meta->fidelity
-                         . $this->meta->document_name
-                         . $this->meta->document_uri
-                         . $operationattributes
-                         . chr(0x02) // start job-attributes | job-attributes-tag
-                         . $this->meta->copies
-                         . $this->meta->sides
-                         . $this->meta->page_ranges
-                         . $jobattributes
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-        return TRUE;
-    }
-
-
-    protected function _stringDocument ($job,$is_last)
-    {
-        if ($is_last == false)
-        {
-            $is_last = chr(0x00);
-        }
-        else
-        {
-            $is_last = chr(0x01);
-        }
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-        if (!isset($this->setup->datatype))
-        {
-            self::setBinary();
-        }
-
-        if (!isset($this->setup->uri))
-        {
-            $this->getPrinters();
-            unset($this->jobs[count($this->jobs) - 1]);
-            unset($this->jobs_uri[count($this->jobs_uri) - 1]);
-            unset($this->status[count($this->status) - 1]);
-
-            if (array_key_exists(0,$this->available_printers))
-            {
-               self::setPrinterURI($this->available_printers[0]);
-            }
-            else
-            {
-                trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"));
-                self::_errorLog(" Printer URI is not set, die",2);
-                return FALSE;
-                }
-            }
-
-        if (!isset($this->setup->copies))
-        {
-            $this->meta->copies = "";
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->setup->mime_media_type))
-        {
-            $this->meta->mime_media_type = "";
-        }
-        if ($this->setup->datatype != "TEXT")
-        {
-        unset ($this->setup->mime_media_type);
-        }
-
-        if (!isset($this->meta->fidelity))
-        {
-            $this->meta->fidelity = '';
-        }
-
-        if (!isset($this->meta->document_name))
-        {
-            $this->meta->document_name = '';
-        }
-
-        if (!isset($this->meta->sides))
-        {
-            $this->meta->sides = '';
-        }
-
-        if (!isset($this->meta->page_ranges))
-        {
-            $this->meta->page_ranges = '';
-        }
-
-        $operationattributes = '';
-        $jobattributes = '';
-        $printerattributes = '';
-        self::_buildValues($operationattributes,$jobattributes,$printerattributes);
-
-        self::_setOperationId();
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x06) // Send-Document | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . chr(0x45) // attribute-type: uri
-                         . self::_giveMeStringLength("job-uri")
-                         . "job-uri"
-                         . self::_giveMeStringLength($job)
-                         . $job
-                         . $this->meta->username
-                         . $this->meta->document_name
-                         . $this->meta->fidelity
-                         . $this->meta->mime_media_type
-                         . $operationattributes
-                         . chr(0x22) // boolean
-                         . self::_giveMeStringLength("last-document")
-                         . "last-document"
-                         . self::_giveMeStringLength($is_last)
-                         . $is_last
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-        return TRUE;
-    }
-
-
-    protected function _stringSendUri ($uri,$job,$is_last)
-    {
-        $this->document_uri = $uri;
-        self::_setDocumentUri();
-
-        if (!isset($this->setup->document_uri))
-        {
-            trigger_error(_("_stringUri: Document URI is not set: die"),E_USER_WARNING);
-            self::_putDebug( _("_stringUri: Document URI is not set: die\n"));
-            self::_errorLog("Document URI is not set, die",2);
-            return FALSE;
-        }
-        unset ($this->setup->document_uri);
-
-        if ($is_last == false)
-        {
-            $is_last = chr(0x00);
-        }
-        else
-        {
-            $is_last = chr(0x01);
-        }
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-        if (!isset($this->setup->datatype))
-        {
-            self::setBinary();
-        }
-
-        if (!isset($this->setup->uri))
-        {
-            $this->getPrinters();
-            unset($this->jobs[count($this->jobs) - 1]);
-            unset($this->jobs_uri[count($this->jobs_uri) - 1]);
-            unset($this->status[count($this->status) - 1]);
-
-            if (array_key_exists(0,$this->available_printers))
-            {
-               self::setPrinterURI($this->available_printers[0]);
-            } 
-            else
-            {
-                trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"));
-                self::_errorLog(" Printer URI is not set, die",2);
-                return FALSE;
-                }
-            }
-
-        if (!isset($this->setup->copies))
-        {
-            $this->meta->copies = "";
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en_us');
-        }
-
-        if (!isset($this->setup->mime_media_type))
-        {
-            $this->meta->mime_media_type = "";
-        }
-        unset ($this->setup->mime_media_type);
-
-        if (!isset($this->meta->fidelity))
-        {
-            $this->meta->fidelity = '';
-        }
-
-        if (!isset($this->meta->document_name))
-        {
-            $this->meta->document_name = '';
-        }
-
-        if (!isset($this->meta->sides))
-        {
-            $this->meta->sides = '';
-        }
-
-        if (!isset($this->meta->page_ranges))
-        {
-            $this->meta->page_ranges = '';
-        }
-
-        $operationattributes = '';
-        $jobattributes = '';
-        $printerattributes = '';
-        self::_buildValues($operationattributes,$jobattributes,$printerattributes);
-
-        self::_setOperationId();
-
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x07) // Send-Uri | operation-id
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . chr(0x45) // attribute-type: uri
-                         . self::_giveMeStringLength("job-uri")
-                         . "job-uri"
-                         . self::_giveMeStringLength($job)
-                         . $job
-                         . $this->meta->username
-                         . $this->meta->document_uri
-                         . $this->meta->fidelity
-                         . $this->meta->mime_media_type
-                         . $operationattributes
-                         . chr(0x22) // boolean
-                         . self::_giveMeStringLength("last-document")
-                         . "last-document"
-                         . self::_giveMeStringLength($is_last)
-                         . $is_last
-                         . chr(0x03); // end-of-attributes | end-of-attributes-tag
-
-        self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
-        return TRUE;
-    }
+		if (!isset($this->setup->charset))
+		{
+			$this->meta->charset = "";
+		}
+		if (!isset($this->setup->datatype))
+		{
+			self::setBinary();
+		}
+		if (!isset($this->setup->uri))
+		{
+			trigger_error(_("_stringUri: Printer URI is not set: die"),E_USER_WARNING);
+			self::_putDebug( _("_stringUri: Printer URI is not set: die\n"));
+			self::_errorLog("Printer URI is not set, die",2);
+			return FALSE;
+		}
+		if (!isset($this->setup->copies))
+		{
+			self::setCopies(1);
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->setup->mime_media_type))
+		{
+			self::setMimeMediaType();
+		}
+		unset ($this->setup->mime_media_type);
+
+		if (!isset($this->setup->jobname))
+		{
+			if (is_readable($this->data))
+			{
+				self::setJobName(basename($this->data),true);
+			}
+			else
+			{
+				self::setJobName();
+			}
+		}
+		unset($this->setup->jobname);
+
+		if (!isset($this->meta->username))
+		{
+			self::setUserName();
+		}
+
+		if (!isset($this->meta->fidelity))
+		{
+			$this->meta->fidelity = '';
+		}
+
+		if (!isset($this->meta->document_name))
+		{
+			$this->meta->document_name = '';
+		}
+
+		if (!isset($this->meta->sides))
+		{
+			$this->meta->sides = '';
+		}
+
+		if (!isset($this->meta->page_ranges))
+		{
+			$this->meta->page_ranges = '';
+		}
+
+		$jobattributes = '';
+		$operationattributes = '';
+		$printerattributes = '';
+		self::_buildValues($operationattributes,$jobattributes,$printerattributes);
+
+		self::_setOperationId();
+
+		if (!isset($this->error_generation->request_body_malformed))
+		{
+			$this->error_generation->request_body_malformed = "";
+		}
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x03) // Print-URI | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . $this->error_generation->request_body_malformed
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->printer_uri
+						 . $this->meta->jobname
+						 . $this->meta->username
+						 . $this->meta->fidelity
+						 . $this->meta->document_name
+						 . $this->meta->document_uri
+						 . $operationattributes
+						 . chr(0x02) // start job-attributes | job-attributes-tag
+						 . $this->meta->copies
+						 . $this->meta->sides
+						 . $this->meta->page_ranges
+						 . $jobattributes
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+		return TRUE;
+	}
+
+
+	protected function _stringDocument ($job,$is_last)
+	{
+		if ($is_last == false)
+		{
+			$is_last = chr(0x00);
+		}
+		else
+		{
+			$is_last = chr(0x01);
+		}
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+		if (!isset($this->setup->datatype))
+		{
+			self::setBinary();
+		}
+
+		if (!isset($this->setup->uri))
+		{
+			$this->getPrinters();
+			unset($this->jobs[count($this->jobs) - 1]);
+			unset($this->jobs_uri[count($this->jobs_uri) - 1]);
+			unset($this->status[count($this->status) - 1]);
+
+			if (array_key_exists(0,$this->available_printers))
+			{
+			   self::setPrinterURI($this->available_printers[0]);
+			}
+			else
+			{
+				trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
+				self::_putDebug( _("_stringJob: Printer URI is not set: die\n"));
+				self::_errorLog(" Printer URI is not set, die",2);
+				return FALSE;
+				}
+			}
+
+		if (!isset($this->setup->copies))
+		{
+			$this->meta->copies = "";
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->setup->mime_media_type))
+		{
+			$this->meta->mime_media_type = "";
+		}
+		if ($this->setup->datatype != "TEXT")
+		{
+		unset ($this->setup->mime_media_type);
+		}
+
+		if (!isset($this->meta->fidelity))
+		{
+			$this->meta->fidelity = '';
+		}
+
+		if (!isset($this->meta->document_name))
+		{
+			$this->meta->document_name = '';
+		}
+
+		if (!isset($this->meta->sides))
+		{
+			$this->meta->sides = '';
+		}
+
+		if (!isset($this->meta->page_ranges))
+		{
+			$this->meta->page_ranges = '';
+		}
+
+		$operationattributes = '';
+		$jobattributes = '';
+		$printerattributes = '';
+		self::_buildValues($operationattributes,$jobattributes,$printerattributes);
+
+		self::_setOperationId();
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x06) // Send-Document | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . chr(0x45) // attribute-type: uri
+						 . self::_giveMeStringLength("job-uri")
+						 . "job-uri"
+						 . self::_giveMeStringLength($job)
+						 . $job
+						 . $this->meta->username
+						 . $this->meta->document_name
+						 . $this->meta->fidelity
+						 . $this->meta->mime_media_type
+						 . $operationattributes
+						 . chr(0x22) // boolean
+						 . self::_giveMeStringLength("last-document")
+						 . "last-document"
+						 . self::_giveMeStringLength($is_last)
+						 . $is_last
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+		return TRUE;
+	}
+
+
+	protected function _stringSendUri ($uri,$job,$is_last)
+	{
+		$this->document_uri = $uri;
+		self::_setDocumentUri();
+
+		if (!isset($this->setup->document_uri))
+		{
+			trigger_error(_("_stringUri: Document URI is not set: die"),E_USER_WARNING);
+			self::_putDebug( _("_stringUri: Document URI is not set: die\n"));
+			self::_errorLog("Document URI is not set, die",2);
+			return FALSE;
+		}
+		unset ($this->setup->document_uri);
+
+		if ($is_last == false)
+		{
+			$is_last = chr(0x00);
+		}
+		else
+		{
+			$is_last = chr(0x01);
+		}
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+		if (!isset($this->setup->datatype))
+		{
+			self::setBinary();
+		}
+
+		if (!isset($this->setup->uri))
+		{
+			$this->getPrinters();
+			unset($this->jobs[count($this->jobs) - 1]);
+			unset($this->jobs_uri[count($this->jobs_uri) - 1]);
+			unset($this->status[count($this->status) - 1]);
+
+			if (array_key_exists(0,$this->available_printers))
+			{
+			   self::setPrinterURI($this->available_printers[0]);
+			} 
+			else
+			{
+				trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
+				self::_putDebug( _("_stringJob: Printer URI is not set: die\n"));
+				self::_errorLog(" Printer URI is not set, die",2);
+				return FALSE;
+				}
+			}
+
+		if (!isset($this->setup->copies))
+		{
+			$this->meta->copies = "";
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en_us');
+		}
+
+		if (!isset($this->setup->mime_media_type))
+		{
+			$this->meta->mime_media_type = "";
+		}
+		unset ($this->setup->mime_media_type);
+
+		if (!isset($this->meta->fidelity))
+		{
+			$this->meta->fidelity = '';
+		}
+
+		if (!isset($this->meta->document_name))
+		{
+			$this->meta->document_name = '';
+		}
+
+		if (!isset($this->meta->sides))
+		{
+			$this->meta->sides = '';
+		}
+
+		if (!isset($this->meta->page_ranges))
+		{
+			$this->meta->page_ranges = '';
+		}
+
+		$operationattributes = '';
+		$jobattributes = '';
+		$printerattributes = '';
+		self::_buildValues($operationattributes,$jobattributes,$printerattributes);
+
+		self::_setOperationId();
+
+		$this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
+						 . chr(0x00) . chr (0x07) // Send-Uri | operation-id
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . chr(0x45) // attribute-type: uri
+						 . self::_giveMeStringLength("job-uri")
+						 . "job-uri"
+						 . self::_giveMeStringLength($job)
+						 . $job
+						 . $this->meta->username
+						 . $this->meta->document_uri
+						 . $this->meta->fidelity
+						 . $this->meta->mime_media_type
+						 . $operationattributes
+						 . chr(0x22) // boolean
+						 . self::_giveMeStringLength("last-document")
+						 . "last-document"
+						 . self::_giveMeStringLength($is_last)
+						 . $is_last
+						 . chr(0x03); // end-of-attributes | end-of-attributes-tag
+
+		self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+		return TRUE;
+	}
 }
\ No newline at end of file

htdocs/includes/parsedown/Parsedown.php

Indentation +1641 added lines, -1641 removed lines

@@ -15,1698 +15,1698 @@
 
 class Parsedown
 {
-    # ~
+	# ~
 
-    const version = '1.7.4';
-
-    # ~
-
-    function text($text)
-    {
-        # make sure no definitions are set
-        $this->DefinitionData = array();
-
-        # standardize line breaks
-        $text = str_replace(array("\r\n", "\r"), "\n", $text);
-
-        # remove surrounding line breaks
-        $text = trim($text, "\n");
-
-        # split text into lines
-        $lines = explode("\n", $text);
-
-        # iterate through lines to identify blocks
-        $markup = $this->lines($lines);
-
-        # trim line breaks
-        $markup = trim($markup, "\n");
-
-        return $markup;
-    }
-
-    #
-    # Setters
-    #
-
-    function setBreaksEnabled($breaksEnabled)
-    {
-        $this->breaksEnabled = $breaksEnabled;
-
-        return $this;
-    }
-
-    protected $breaksEnabled;
-
-    function setMarkupEscaped($markupEscaped)
-    {
-        $this->markupEscaped = $markupEscaped;
-
-        return $this;
-    }
-
-    protected $markupEscaped;
-
-    function setUrlsLinked($urlsLinked)
-    {
-        $this->urlsLinked = $urlsLinked;
-
-        return $this;
-    }
-
-    protected $urlsLinked = true;
-
-    function setSafeMode($safeMode)
-    {
-        $this->safeMode = (bool) $safeMode;
-
-        return $this;
-    }
-
-    protected $safeMode;
-
-    protected $safeLinksWhitelist = array(
-        'http://',
-        'https://',
-        'ftp://',
-        'ftps://',
-        'mailto:',
-        'data:image/png;base64,',
-        'data:image/gif;base64,',
-        'data:image/jpeg;base64,',
-        'irc:',
-        'ircs:',
-        'git:',
-        'ssh:',
-        'news:',
-        'steam:',
-    );
-
-    #
-    # Lines
-    #
-
-    protected $BlockTypes = array(
-        '#' => array('Header'),
-        '*' => array('Rule', 'List'),
-        '+' => array('List'),
-        '-' => array('SetextHeader', 'Table', 'Rule', 'List'),
-        '0' => array('List'),
-        '1' => array('List'),
-        '2' => array('List'),
-        '3' => array('List'),
-        '4' => array('List'),
-        '5' => array('List'),
-        '6' => array('List'),
-        '7' => array('List'),
-        '8' => array('List'),
-        '9' => array('List'),
-        ':' => array('Table'),
-        '<' => array('Comment', 'Markup'),
-        '=' => array('SetextHeader'),
-        '>' => array('Quote'),
-        '[' => array('Reference'),
-        '_' => array('Rule'),
-        '`' => array('FencedCode'),
-        '|' => array('Table'),
-        '~' => array('FencedCode'),
-    );
-
-    # ~
-
-    protected $unmarkedBlockTypes = array(
-        'Code',
-    );
-
-    #
-    # Blocks
-    #
-
-    protected function lines(array $lines)
-    {
-        $CurrentBlock = null;
-
-        foreach ($lines as $line)
-        {
-            if (chop($line) === '')
-            {
-                if (isset($CurrentBlock))
-                {
-                    $CurrentBlock['interrupted'] = true;
-                }
-
-                continue;
-            }
-
-            if (strpos($line, "\t") !== false)
-            {
-                $parts = explode("\t", $line);
-
-                $line = $parts[0];
-
-                unset($parts[0]);
-
-                foreach ($parts as $part)
-                {
-                    $shortage = 4 - mb_strlen($line, 'utf-8') % 4;
-
-                    $line .= str_repeat(' ', $shortage);
-                    $line .= $part;
-                }
-            }
-
-            $indent = 0;
-
-            while (isset($line[$indent]) and $line[$indent] === ' ')
-            {
-                $indent ++;
-            }
-
-            $text = $indent > 0 ? substr($line, $indent) : $line;
-
-            # ~
-
-            $Line = array('body' => $line, 'indent' => $indent, 'text' => $text);
-
-            # ~
-
-            if (isset($CurrentBlock['continuable']))
-            {
-                $Block = $this->{'block'.$CurrentBlock['type'].'Continue'}($Line, $CurrentBlock);
-
-                if (isset($Block))
-                {
-                    $CurrentBlock = $Block;
-
-                    continue;
-                }
-                else
-                {
-                    if ($this->isBlockCompletable($CurrentBlock['type']))
-                    {
-                        $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
-                    }
-                }
-            }
+	const version = '1.7.4';
+
+	# ~
+
+	function text($text)
+	{
+		# make sure no definitions are set
+		$this->DefinitionData = array();
+
+		# standardize line breaks
+		$text = str_replace(array("\r\n", "\r"), "\n", $text);
+
+		# remove surrounding line breaks
+		$text = trim($text, "\n");
+
+		# split text into lines
+		$lines = explode("\n", $text);
+
+		# iterate through lines to identify blocks
+		$markup = $this->lines($lines);
+
+		# trim line breaks
+		$markup = trim($markup, "\n");
+
+		return $markup;
+	}
+
+	#
+	# Setters
+	#
+
+	function setBreaksEnabled($breaksEnabled)
+	{
+		$this->breaksEnabled = $breaksEnabled;
+
+		return $this;
+	}
+
+	protected $breaksEnabled;
+
+	function setMarkupEscaped($markupEscaped)
+	{
+		$this->markupEscaped = $markupEscaped;
+
+		return $this;
+	}
+
+	protected $markupEscaped;
+
+	function setUrlsLinked($urlsLinked)
+	{
+		$this->urlsLinked = $urlsLinked;
+
+		return $this;
+	}
+
+	protected $urlsLinked = true;
+
+	function setSafeMode($safeMode)
+	{
+		$this->safeMode = (bool) $safeMode;
+
+		return $this;
+	}
+
+	protected $safeMode;
+
+	protected $safeLinksWhitelist = array(
+		'http://',
+		'https://',
+		'ftp://',
+		'ftps://',
+		'mailto:',
+		'data:image/png;base64,',
+		'data:image/gif;base64,',
+		'data:image/jpeg;base64,',
+		'irc:',
+		'ircs:',
+		'git:',
+		'ssh:',
+		'news:',
+		'steam:',
+	);
+
+	#
+	# Lines
+	#
+
+	protected $BlockTypes = array(
+		'#' => array('Header'),
+		'*' => array('Rule', 'List'),
+		'+' => array('List'),
+		'-' => array('SetextHeader', 'Table', 'Rule', 'List'),
+		'0' => array('List'),
+		'1' => array('List'),
+		'2' => array('List'),
+		'3' => array('List'),
+		'4' => array('List'),
+		'5' => array('List'),
+		'6' => array('List'),
+		'7' => array('List'),
+		'8' => array('List'),
+		'9' => array('List'),
+		':' => array('Table'),
+		'<' => array('Comment', 'Markup'),
+		'=' => array('SetextHeader'),
+		'>' => array('Quote'),
+		'[' => array('Reference'),
+		'_' => array('Rule'),
+		'`' => array('FencedCode'),
+		'|' => array('Table'),
+		'~' => array('FencedCode'),
+	);
+
+	# ~
+
+	protected $unmarkedBlockTypes = array(
+		'Code',
+	);
+
+	#
+	# Blocks
+	#
+
+	protected function lines(array $lines)
+	{
+		$CurrentBlock = null;
+
+		foreach ($lines as $line)
+		{
+			if (chop($line) === '')
+			{
+				if (isset($CurrentBlock))
+				{
+					$CurrentBlock['interrupted'] = true;
+				}
+
+				continue;
+			}
+
+			if (strpos($line, "\t") !== false)
+			{
+				$parts = explode("\t", $line);
+
+				$line = $parts[0];
+
+				unset($parts[0]);
+
+				foreach ($parts as $part)
+				{
+					$shortage = 4 - mb_strlen($line, 'utf-8') % 4;
+
+					$line .= str_repeat(' ', $shortage);
+					$line .= $part;
+				}
+			}
+
+			$indent = 0;
+
+			while (isset($line[$indent]) and $line[$indent] === ' ')
+			{
+				$indent ++;
+			}
+
+			$text = $indent > 0 ? substr($line, $indent) : $line;
+
+			# ~
+
+			$Line = array('body' => $line, 'indent' => $indent, 'text' => $text);
+
+			# ~
+
+			if (isset($CurrentBlock['continuable']))
+			{
+				$Block = $this->{'block'.$CurrentBlock['type'].'Continue'}($Line, $CurrentBlock);
+
+				if (isset($Block))
+				{
+					$CurrentBlock = $Block;
+
+					continue;
+				}
+				else
+				{
+					if ($this->isBlockCompletable($CurrentBlock['type']))
+					{
+						$CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
+					}
+				}
+			}
 
-            # ~
+			# ~
 
-            $marker = $text[0];
+			$marker = $text[0];
 
-            # ~
+			# ~
 
-            $blockTypes = $this->unmarkedBlockTypes;
+			$blockTypes = $this->unmarkedBlockTypes;
 
-            if (isset($this->BlockTypes[$marker]))
-            {
-                foreach ($this->BlockTypes[$marker] as $blockType)
-                {
-                    $blockTypes []= $blockType;
-                }
-            }
+			if (isset($this->BlockTypes[$marker]))
+			{
+				foreach ($this->BlockTypes[$marker] as $blockType)
+				{
+					$blockTypes []= $blockType;
+				}
+			}
 
-            #
-            # ~
+			#
+			# ~
 
-            foreach ($blockTypes as $blockType)
-            {
-                $Block = $this->{'block'.$blockType}($Line, $CurrentBlock);
+			foreach ($blockTypes as $blockType)
+			{
+				$Block = $this->{'block'.$blockType}($Line, $CurrentBlock);
 
-                if (isset($Block))
-                {
-                    $Block['type'] = $blockType;
+				if (isset($Block))
+				{
+					$Block['type'] = $blockType;
 
-                    if ( ! isset($Block['identified']))
-                    {
-                        $Blocks []= $CurrentBlock;
+					if ( ! isset($Block['identified']))
+					{
+						$Blocks []= $CurrentBlock;
 
-                        $Block['identified'] = true;
-                    }
+						$Block['identified'] = true;
+					}
 
-                    if ($this->isBlockContinuable($blockType))
-                    {
-                        $Block['continuable'] = true;
-                    }
+					if ($this->isBlockContinuable($blockType))
+					{
+						$Block['continuable'] = true;
+					}
 
-                    $CurrentBlock = $Block;
+					$CurrentBlock = $Block;
 
-                    continue 2;
-                }
-            }
+					continue 2;
+				}
+			}
 
-            # ~
+			# ~
 
-            if (isset($CurrentBlock) and ! isset($CurrentBlock['type']) and ! isset($CurrentBlock['interrupted']))
-            {
-                $CurrentBlock['element']['text'] .= "\n".$text;
-            }
-            else
-            {
-                $Blocks []= $CurrentBlock;
+			if (isset($CurrentBlock) and ! isset($CurrentBlock['type']) and ! isset($CurrentBlock['interrupted']))
+			{
+				$CurrentBlock['element']['text'] .= "\n".$text;
+			}
+			else
+			{
+				$Blocks []= $CurrentBlock;
 
-                $CurrentBlock = $this->paragraph($Line);
+				$CurrentBlock = $this->paragraph($Line);
 
-                $CurrentBlock['identified'] = true;
-            }
-        }
+				$CurrentBlock['identified'] = true;
+			}
+		}
 
-        # ~
+		# ~
 
-        if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type']))
-        {
-            $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
-        }
+		if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type']))
+		{
+			$CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
+		}
 
-        # ~
+		# ~
 
-        $Blocks []= $CurrentBlock;
+		$Blocks []= $CurrentBlock;
 
-        unset($Blocks[0]);
+		unset($Blocks[0]);
 
-        # ~
+		# ~
 
-        $markup = '';
+		$markup = '';
 
-        foreach ($Blocks as $Block)
-        {
-            if (isset($Block['hidden']))
-            {
-                continue;
-            }
+		foreach ($Blocks as $Block)
+		{
+			if (isset($Block['hidden']))
+			{
+				continue;
+			}
 
-            $markup .= "\n";
-            $markup .= isset($Block['markup']) ? $Block['markup'] : $this->element($Block['element']);
-        }
+			$markup .= "\n";
+			$markup .= isset($Block['markup']) ? $Block['markup'] : $this->element($Block['element']);
+		}
 
-        $markup .= "\n";
+		$markup .= "\n";
 
-        # ~
+		# ~
 
-        return $markup;
-    }
+		return $markup;
+	}
 
-    protected function isBlockContinuable($Type)
-    {
-        return method_exists($this, 'block'.$Type.'Continue');
-    }
+	protected function isBlockContinuable($Type)
+	{
+		return method_exists($this, 'block'.$Type.'Continue');
+	}
 
-    protected function isBlockCompletable($Type)
-    {
-        return method_exists($this, 'block'.$Type.'Complete');
-    }
+	protected function isBlockCompletable($Type)
+	{
+		return method_exists($this, 'block'.$Type.'Complete');
+	}
 
-    #
-    # Code
+	#
+	# Code
 
-    protected function blockCode($Line, $Block = null)
-    {
-        if (isset($Block) and ! isset($Block['type']) and ! isset($Block['interrupted']))
-        {
-            return;
-        }
+	protected function blockCode($Line, $Block = null)
+	{
+		if (isset($Block) and ! isset($Block['type']) and ! isset($Block['interrupted']))
+		{
+			return;
+		}
 
-        if ($Line['indent'] >= 4)
-        {
-            $text = substr($Line['body'], 4);
+		if ($Line['indent'] >= 4)
+		{
+			$text = substr($Line['body'], 4);
 
-            $Block = array(
-                'element' => array(
-                    'name' => 'pre',
-                    'handler' => 'element',
-                    'text' => array(
-                        'name' => 'code',
-                        'text' => $text,
-                    ),
-                ),
-            );
-
-            return $Block;
-        }
-    }
-
-    protected function blockCodeContinue($Line, $Block)
-    {
-        if ($Line['indent'] >= 4)
-        {
-            if (isset($Block['interrupted']))
-            {
-                $Block['element']['text']['text'] .= "\n";
-
-                unset($Block['interrupted']);
-            }
-
-            $Block['element']['text']['text'] .= "\n";
-
-            $text = substr($Line['body'], 4);
-
-            $Block['element']['text']['text'] .= $text;
-
-            return $Block;
-        }
-    }
-
-    protected function blockCodeComplete($Block)
-    {
-        $text = $Block['element']['text']['text'];
-
-        $Block['element']['text']['text'] = $text;
-
-        return $Block;
-    }
-
-    #
-    # Comment
-
-    protected function blockComment($Line)
-    {
-        if ($this->markupEscaped or $this->safeMode)
-        {
-            return;
-        }
-
-        if (isset($Line['text'][3]) and $Line['text'][3] === '-' and $Line['text'][2] === '-' and $Line['text'][1] === '!')
-        {
-            $Block = array(
-                'markup' => $Line['body'],
-            );
-
-            if (preg_match('/-->$/', $Line['text']))
-            {
-                $Block['closed'] = true;
-            }
-
-            return $Block;
-        }
-    }
-
-    protected function blockCommentContinue($Line, array $Block)
-    {
-        if (isset($Block['closed']))
-        {
-            return;
-        }
-
-        $Block['markup'] .= "\n" . $Line['body'];
-
-        if (preg_match('/-->$/', $Line['text']))
-        {
-            $Block['closed'] = true;
-        }
-
-        return $Block;
-    }
-
-    #
-    # Fenced Code
-
-    protected function blockFencedCode($Line)
-    {
-        if (preg_match('/^['.$Line['text'][0].']{3,}[ ]*([^`]+)?[ ]*$/', $Line['text'], $matches))
-        {
-            $Element = array(
-                'name' => 'code',
-                'text' => '',
-            );
-
-            if (isset($matches[1]))
-            {
-                /**
-                 * https://www.w3.org/TR/2011/WD-html5-20110525/elements.html#classes
-                 * Every HTML element may have a class attribute specified.
-                 * The attribute, if specified, must have a value that is a set
-                 * of space-separated tokens representing the various classes
-                 * that the element belongs to.
-                 * [...]
-                 * The space characters, for the purposes of this specification,
-                 * are U+0020 SPACE, U+0009 CHARACTER TABULATION (tab),
-                 * U+000A LINE FEED (LF), U+000C FORM FEED (FF), and
-                 * U+000D CARRIAGE RETURN (CR).
-                 */
-                $language = substr($matches[1], 0, strcspn($matches[1], " \t\n\f\r"));
-
-                $class = 'language-'.$language;
-
-                $Element['attributes'] = array(
-                    'class' => $class,
-                );
-            }
-
-            $Block = array(
-                'char' => $Line['text'][0],
-                'element' => array(
-                    'name' => 'pre',
-                    'handler' => 'element',
-                    'text' => $Element,
-                ),
-            );
-
-            return $Block;
-        }
-    }
-
-    protected function blockFencedCodeContinue($Line, $Block)
-    {
-        if (isset($Block['complete']))
-        {
-            return;
-        }
-
-        if (isset($Block['interrupted']))
-        {
-            $Block['element']['text']['text'] .= "\n";
-
-            unset($Block['interrupted']);
-        }
-
-        if (preg_match('/^'.$Block['char'].'{3,}[ ]*$/', $Line['text']))
-        {
-            $Block['element']['text']['text'] = substr($Block['element']['text']['text'], 1);
-
-            $Block['complete'] = true;
-
-            return $Block;
-        }
-
-        $Block['element']['text']['text'] .= "\n".$Line['body'];
-
-        return $Block;
-    }
-
-    protected function blockFencedCodeComplete($Block)
-    {
-        $text = $Block['element']['text']['text'];
-
-        $Block['element']['text']['text'] = $text;
-
-        return $Block;
-    }
-
-    #
-    # Header
-
-    protected function blockHeader($Line)
-    {
-        if (isset($Line['text'][1]))
-        {
-            $level = 1;
-
-            while (isset($Line['text'][$level]) and $Line['text'][$level] === '#')
-            {
-                $level ++;
-            }
-
-            if ($level > 6)
-            {
-                return;
-            }
-
-            $text = trim($Line['text'], '# ');
-
-            $Block = array(
-                'element' => array(
-                    'name' => 'h' . min(6, $level),
-                    'text' => $text,
-                    'handler' => 'line',
-                ),
-            );
-
-            return $Block;
-        }
-    }
-
-    #
-    # List
-
-    protected function blockList($Line)
-    {
-        list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]+[.]');
-
-        if (preg_match('/^('.$pattern.'[ ]+)(.*)/', $Line['text'], $matches))
-        {
-            $Block = array(
-                'indent' => $Line['indent'],
-                'pattern' => $pattern,
-                'element' => array(
-                    'name' => $name,
-                    'handler' => 'elements',
-                ),
-            );
-
-            if($name === 'ol')
-            {
-                $listStart = stristr($matches[0], '.', true);
-
-                if($listStart !== '1')
-                {
-                    $Block['element']['attributes'] = array('start' => $listStart);
-                }
-            }
-
-            $Block['li'] = array(
-                'name' => 'li',
-                'handler' => 'li',
-                'text' => array(
-                    $matches[2],
-                ),
-            );
-
-            $Block['element']['text'] []= & $Block['li'];
-
-            return $Block;
-        }
-    }
-
-    protected function blockListContinue($Line, array $Block)
-    {
-        if ($Block['indent'] === $Line['indent'] and preg_match('/^'.$Block['pattern'].'(?:[ ]+(.*)|$)/', $Line['text'], $matches))
-        {
-            if (isset($Block['interrupted']))
-            {
-                $Block['li']['text'] []= '';
-
-                $Block['loose'] = true;
-
-                unset($Block['interrupted']);
-            }
-
-            unset($Block['li']);
-
-            $text = isset($matches[1]) ? $matches[1] : '';
-
-            $Block['li'] = array(
-                'name' => 'li',
-                'handler' => 'li',
-                'text' => array(
-                    $text,
-                ),
-            );
-
-            $Block['element']['text'] []= & $Block['li'];
-
-            return $Block;
-        }
-
-        if ($Line['text'][0] === '[' and $this->blockReference($Line))
-        {
-            return $Block;
-        }
-
-        if ( ! isset($Block['interrupted']))
-        {
-            $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
-
-            $Block['li']['text'] []= $text;
-
-            return $Block;
-        }
-
-        if ($Line['indent'] > 0)
-        {
-            $Block['li']['text'] []= '';
-
-            $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
-
-            $Block['li']['text'] []= $text;
-
-            unset($Block['interrupted']);
-
-            return $Block;
-        }
-    }
-
-    protected function blockListComplete(array $Block)
-    {
-        if (isset($Block['loose']))
-        {
-            foreach ($Block['element']['text'] as &$li)
-            {
-                if (end($li['text']) !== '')
-                {
-                    $li['text'] []= '';
-                }
-            }
-        }
-
-        return $Block;
-    }
-
-    #
-    # Quote
-
-    protected function blockQuote($Line)
-    {
-        if (preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
-        {
-            $Block = array(
-                'element' => array(
-                    'name' => 'blockquote',
-                    'handler' => 'lines',
-                    'text' => (array) $matches[1],
-                ),
-            );
-
-            return $Block;
-        }
-    }
-
-    protected function blockQuoteContinue($Line, array $Block)
-    {
-        if ($Line['text'][0] === '>' and preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
-        {
-            if (isset($Block['interrupted']))
-            {
-                $Block['element']['text'] []= '';
-
-                unset($Block['interrupted']);
-            }
-
-            $Block['element']['text'] []= $matches[1];
-
-            return $Block;
-        }
-
-        if ( ! isset($Block['interrupted']))
-        {
-            $Block['element']['text'] []= $Line['text'];
-
-            return $Block;
-        }
-    }
-
-    #
-    # Rule
-
-    protected function blockRule($Line)
-    {
-        if (preg_match('/^(['.$Line['text'][0].'])([ ]*\1){2,}[ ]*$/', $Line['text']))
-        {
-            $Block = array(
-                'element' => array(
-                    'name' => 'hr'
-                ),
-            );
-
-            return $Block;
-        }
-    }
-
-    #
-    # Setext
-
-    protected function blockSetextHeader($Line, array $Block = null)
-    {
-        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
-        {
-            return;
-        }
-
-        if (chop($Line['text'], $Line['text'][0]) === '')
-        {
-            $Block['element']['name'] = $Line['text'][0] === '=' ? 'h1' : 'h2';
-
-            return $Block;
-        }
-    }
-
-    #
-    # Markup
-
-    protected function blockMarkup($Line)
-    {
-        if ($this->markupEscaped or $this->safeMode)
-        {
-            return;
-        }
-
-        if (preg_match('/^<(\w[\w-]*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches))
-        {
-            $element = strtolower($matches[1]);
-
-            if (in_array($element, $this->textLevelElements))
-            {
-                return;
-            }
-
-            $Block = array(
-                'name' => $matches[1],
-                'depth' => 0,
-                'markup' => $Line['text'],
-            );
-
-            $length = strlen($matches[0]);
-
-            $remainder = substr($Line['text'], $length);
-
-            if (trim($remainder) === '')
-            {
-                if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
-                {
-                    $Block['closed'] = true;
-
-                    $Block['void'] = true;
-                }
-            }
-            else
-            {
-                if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
-                {
-                    return;
-                }
-
-                if (preg_match('/<\/'.$matches[1].'>[ ]*$/i', $remainder))
-                {
-                    $Block['closed'] = true;
-                }
-            }
-
-            return $Block;
-        }
-    }
-
-    protected function blockMarkupContinue($Line, array $Block)
-    {
-        if (isset($Block['closed']))
-        {
-            return;
-        }
-
-        if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
-        {
-            $Block['depth'] ++;
-        }
-
-        if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
-        {
-            if ($Block['depth'] > 0)
-            {
-                $Block['depth'] --;
-            }
-            else
-            {
-                $Block['closed'] = true;
-            }
-        }
-
-        if (isset($Block['interrupted']))
-        {
-            $Block['markup'] .= "\n";
-
-            unset($Block['interrupted']);
-        }
-
-        $Block['markup'] .= "\n".$Line['body'];
-
-        return $Block;
-    }
-
-    #
-    # Reference
-
-    protected function blockReference($Line)
-    {
-        if (preg_match('/^\[(.+?)\]:[ ]*<?(\S+?)>?(?:[ ]+["\'(](.+)["\')])?[ ]*$/', $Line['text'], $matches))
-        {
-            $id = strtolower($matches[1]);
-
-            $Data = array(
-                'url' => $matches[2],
-                'title' => null,
-            );
-
-            if (isset($matches[3]))
-            {
-                $Data['title'] = $matches[3];
-            }
-
-            $this->DefinitionData['Reference'][$id] = $Data;
-
-            $Block = array(
-                'hidden' => true,
-            );
-
-            return $Block;
-        }
-    }
-
-    #
-    # Table
-
-    protected function blockTable($Line, array $Block = null)
-    {
-        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
-        {
-            return;
-        }
-
-        if (strpos($Block['element']['text'], '|') !== false and chop($Line['text'], ' -:|') === '')
-        {
-            $alignments = array();
-
-            $divider = $Line['text'];
-
-            $divider = trim($divider);
-            $divider = trim($divider, '|');
-
-            $dividerCells = explode('|', $divider);
-
-            foreach ($dividerCells as $dividerCell)
-            {
-                $dividerCell = trim($dividerCell);
-
-                if ($dividerCell === '')
-                {
-                    continue;
-                }
-
-                $alignment = null;
-
-                if ($dividerCell[0] === ':')
-                {
-                    $alignment = 'left';
-                }
-
-                if (substr($dividerCell, - 1) === ':')
-                {
-                    $alignment = $alignment === 'left' ? 'center' : 'right';
-                }
-
-                $alignments []= $alignment;
-            }
-
-            # ~
-
-            $HeaderElements = array();
-
-            $header = $Block['element']['text'];
-
-            $header = trim($header);
-            $header = trim($header, '|');
+			$Block = array(
+				'element' => array(
+					'name' => 'pre',
+					'handler' => 'element',
+					'text' => array(
+						'name' => 'code',
+						'text' => $text,
+					),
+				),
+			);
+
+			return $Block;
+		}
+	}
+
+	protected function blockCodeContinue($Line, $Block)
+	{
+		if ($Line['indent'] >= 4)
+		{
+			if (isset($Block['interrupted']))
+			{
+				$Block['element']['text']['text'] .= "\n";
+
+				unset($Block['interrupted']);
+			}
+
+			$Block['element']['text']['text'] .= "\n";
+
+			$text = substr($Line['body'], 4);
+
+			$Block['element']['text']['text'] .= $text;
+
+			return $Block;
+		}
+	}
+
+	protected function blockCodeComplete($Block)
+	{
+		$text = $Block['element']['text']['text'];
+
+		$Block['element']['text']['text'] = $text;
+
+		return $Block;
+	}
+
+	#
+	# Comment
+
+	protected function blockComment($Line)
+	{
+		if ($this->markupEscaped or $this->safeMode)
+		{
+			return;
+		}
+
+		if (isset($Line['text'][3]) and $Line['text'][3] === '-' and $Line['text'][2] === '-' and $Line['text'][1] === '!')
+		{
+			$Block = array(
+				'markup' => $Line['body'],
+			);
+
+			if (preg_match('/-->$/', $Line['text']))
+			{
+				$Block['closed'] = true;
+			}
+
+			return $Block;
+		}
+	}
+
+	protected function blockCommentContinue($Line, array $Block)
+	{
+		if (isset($Block['closed']))
+		{
+			return;
+		}
+
+		$Block['markup'] .= "\n" . $Line['body'];
+
+		if (preg_match('/-->$/', $Line['text']))
+		{
+			$Block['closed'] = true;
+		}
+
+		return $Block;
+	}
+
+	#
+	# Fenced Code
+
+	protected function blockFencedCode($Line)
+	{
+		if (preg_match('/^['.$Line['text'][0].']{3,}[ ]*([^`]+)?[ ]*$/', $Line['text'], $matches))
+		{
+			$Element = array(
+				'name' => 'code',
+				'text' => '',
+			);
+
+			if (isset($matches[1]))
+			{
+				/**
+				 * https://www.w3.org/TR/2011/WD-html5-20110525/elements.html#classes
+				 * Every HTML element may have a class attribute specified.
+				 * The attribute, if specified, must have a value that is a set
+				 * of space-separated tokens representing the various classes
+				 * that the element belongs to.
+				 * [...]
+				 * The space characters, for the purposes of this specification,
+				 * are U+0020 SPACE, U+0009 CHARACTER TABULATION (tab),
+				 * U+000A LINE FEED (LF), U+000C FORM FEED (FF), and
+				 * U+000D CARRIAGE RETURN (CR).
+				 */
+				$language = substr($matches[1], 0, strcspn($matches[1], " \t\n\f\r"));
+
+				$class = 'language-'.$language;
+
+				$Element['attributes'] = array(
+					'class' => $class,
+				);
+			}
+
+			$Block = array(
+				'char' => $Line['text'][0],
+				'element' => array(
+					'name' => 'pre',
+					'handler' => 'element',
+					'text' => $Element,
+				),
+			);
+
+			return $Block;
+		}
+	}
+
+	protected function blockFencedCodeContinue($Line, $Block)
+	{
+		if (isset($Block['complete']))
+		{
+			return;
+		}
+
+		if (isset($Block['interrupted']))
+		{
+			$Block['element']['text']['text'] .= "\n";
+
+			unset($Block['interrupted']);
+		}
+
+		if (preg_match('/^'.$Block['char'].'{3,}[ ]*$/', $Line['text']))
+		{
+			$Block['element']['text']['text'] = substr($Block['element']['text']['text'], 1);
+
+			$Block['complete'] = true;
+
+			return $Block;
+		}
+
+		$Block['element']['text']['text'] .= "\n".$Line['body'];
+
+		return $Block;
+	}
+
+	protected function blockFencedCodeComplete($Block)
+	{
+		$text = $Block['element']['text']['text'];
+
+		$Block['element']['text']['text'] = $text;
+
+		return $Block;
+	}
+
+	#
+	# Header
+
+	protected function blockHeader($Line)
+	{
+		if (isset($Line['text'][1]))
+		{
+			$level = 1;
+
+			while (isset($Line['text'][$level]) and $Line['text'][$level] === '#')
+			{
+				$level ++;
+			}
+
+			if ($level > 6)
+			{
+				return;
+			}
+
+			$text = trim($Line['text'], '# ');
+
+			$Block = array(
+				'element' => array(
+					'name' => 'h' . min(6, $level),
+					'text' => $text,
+					'handler' => 'line',
+				),
+			);
+
+			return $Block;
+		}
+	}
+
+	#
+	# List
+
+	protected function blockList($Line)
+	{
+		list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]+[.]');
+
+		if (preg_match('/^('.$pattern.'[ ]+)(.*)/', $Line['text'], $matches))
+		{
+			$Block = array(
+				'indent' => $Line['indent'],
+				'pattern' => $pattern,
+				'element' => array(
+					'name' => $name,
+					'handler' => 'elements',
+				),
+			);
+
+			if($name === 'ol')
+			{
+				$listStart = stristr($matches[0], '.', true);
+
+				if($listStart !== '1')
+				{
+					$Block['element']['attributes'] = array('start' => $listStart);
+				}
+			}
+
+			$Block['li'] = array(
+				'name' => 'li',
+				'handler' => 'li',
+				'text' => array(
+					$matches[2],
+				),
+			);
+
+			$Block['element']['text'] []= & $Block['li'];
+
+			return $Block;
+		}
+	}
+
+	protected function blockListContinue($Line, array $Block)
+	{
+		if ($Block['indent'] === $Line['indent'] and preg_match('/^'.$Block['pattern'].'(?:[ ]+(.*)|$)/', $Line['text'], $matches))
+		{
+			if (isset($Block['interrupted']))
+			{
+				$Block['li']['text'] []= '';
+
+				$Block['loose'] = true;
+
+				unset($Block['interrupted']);
+			}
+
+			unset($Block['li']);
+
+			$text = isset($matches[1]) ? $matches[1] : '';
+
+			$Block['li'] = array(
+				'name' => 'li',
+				'handler' => 'li',
+				'text' => array(
+					$text,
+				),
+			);
+
+			$Block['element']['text'] []= & $Block['li'];
+
+			return $Block;
+		}
+
+		if ($Line['text'][0] === '[' and $this->blockReference($Line))
+		{
+			return $Block;
+		}
+
+		if ( ! isset($Block['interrupted']))
+		{
+			$text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
+
+			$Block['li']['text'] []= $text;
+
+			return $Block;
+		}
+
+		if ($Line['indent'] > 0)
+		{
+			$Block['li']['text'] []= '';
+
+			$text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
+
+			$Block['li']['text'] []= $text;
+
+			unset($Block['interrupted']);
+
+			return $Block;
+		}
+	}
+
+	protected function blockListComplete(array $Block)
+	{
+		if (isset($Block['loose']))
+		{
+			foreach ($Block['element']['text'] as &$li)
+			{
+				if (end($li['text']) !== '')
+				{
+					$li['text'] []= '';
+				}
+			}
+		}
+
+		return $Block;
+	}
+
+	#
+	# Quote
+
+	protected function blockQuote($Line)
+	{
+		if (preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
+		{
+			$Block = array(
+				'element' => array(
+					'name' => 'blockquote',
+					'handler' => 'lines',
+					'text' => (array) $matches[1],
+				),
+			);
+
+			return $Block;
+		}
+	}
+
+	protected function blockQuoteContinue($Line, array $Block)
+	{
+		if ($Line['text'][0] === '>' and preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
+		{
+			if (isset($Block['interrupted']))
+			{
+				$Block['element']['text'] []= '';
+
+				unset($Block['interrupted']);
+			}
+
+			$Block['element']['text'] []= $matches[1];
+
+			return $Block;
+		}
+
+		if ( ! isset($Block['interrupted']))
+		{
+			$Block['element']['text'] []= $Line['text'];
+
+			return $Block;
+		}
+	}
+
+	#
+	# Rule
+
+	protected function blockRule($Line)
+	{
+		if (preg_match('/^(['.$Line['text'][0].'])([ ]*\1){2,}[ ]*$/', $Line['text']))
+		{
+			$Block = array(
+				'element' => array(
+					'name' => 'hr'
+				),
+			);
+
+			return $Block;
+		}
+	}
+
+	#
+	# Setext
+
+	protected function blockSetextHeader($Line, array $Block = null)
+	{
+		if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+		{
+			return;
+		}
+
+		if (chop($Line['text'], $Line['text'][0]) === '')
+		{
+			$Block['element']['name'] = $Line['text'][0] === '=' ? 'h1' : 'h2';
+
+			return $Block;
+		}
+	}
+
+	#
+	# Markup
+
+	protected function blockMarkup($Line)
+	{
+		if ($this->markupEscaped or $this->safeMode)
+		{
+			return;
+		}
+
+		if (preg_match('/^<(\w[\w-]*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches))
+		{
+			$element = strtolower($matches[1]);
+
+			if (in_array($element, $this->textLevelElements))
+			{
+				return;
+			}
+
+			$Block = array(
+				'name' => $matches[1],
+				'depth' => 0,
+				'markup' => $Line['text'],
+			);
+
+			$length = strlen($matches[0]);
+
+			$remainder = substr($Line['text'], $length);
+
+			if (trim($remainder) === '')
+			{
+				if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
+				{
+					$Block['closed'] = true;
+
+					$Block['void'] = true;
+				}
+			}
+			else
+			{
+				if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
+				{
+					return;
+				}
+
+				if (preg_match('/<\/'.$matches[1].'>[ ]*$/i', $remainder))
+				{
+					$Block['closed'] = true;
+				}
+			}
+
+			return $Block;
+		}
+	}
+
+	protected function blockMarkupContinue($Line, array $Block)
+	{
+		if (isset($Block['closed']))
+		{
+			return;
+		}
+
+		if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
+		{
+			$Block['depth'] ++;
+		}
+
+		if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
+		{
+			if ($Block['depth'] > 0)
+			{
+				$Block['depth'] --;
+			}
+			else
+			{
+				$Block['closed'] = true;
+			}
+		}
+
+		if (isset($Block['interrupted']))
+		{
+			$Block['markup'] .= "\n";
+
+			unset($Block['interrupted']);
+		}
+
+		$Block['markup'] .= "\n".$Line['body'];
+
+		return $Block;
+	}
+
+	#
+	# Reference
+
+	protected function blockReference($Line)
+	{
+		if (preg_match('/^\[(.+?)\]:[ ]*<?(\S+?)>?(?:[ ]+["\'(](.+)["\')])?[ ]*$/', $Line['text'], $matches))
+		{
+			$id = strtolower($matches[1]);
+
+			$Data = array(
+				'url' => $matches[2],
+				'title' => null,
+			);
+
+			if (isset($matches[3]))
+			{
+				$Data['title'] = $matches[3];
+			}
+
+			$this->DefinitionData['Reference'][$id] = $Data;
+
+			$Block = array(
+				'hidden' => true,
+			);
+
+			return $Block;
+		}
+	}
+
+	#
+	# Table
+
+	protected function blockTable($Line, array $Block = null)
+	{
+		if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+		{
+			return;
+		}
+
+		if (strpos($Block['element']['text'], '|') !== false and chop($Line['text'], ' -:|') === '')
+		{
+			$alignments = array();
+
+			$divider = $Line['text'];
+
+			$divider = trim($divider);
+			$divider = trim($divider, '|');
+
+			$dividerCells = explode('|', $divider);
+
+			foreach ($dividerCells as $dividerCell)
+			{
+				$dividerCell = trim($dividerCell);
+
+				if ($dividerCell === '')
+				{
+					continue;
+				}
+
+				$alignment = null;
+
+				if ($dividerCell[0] === ':')
+				{
+					$alignment = 'left';
+				}
+
+				if (substr($dividerCell, - 1) === ':')
+				{
+					$alignment = $alignment === 'left' ? 'center' : 'right';
+				}
+
+				$alignments []= $alignment;
+			}
+
+			# ~
+
+			$HeaderElements = array();
+
+			$header = $Block['element']['text'];
+
+			$header = trim($header);
+			$header = trim($header, '|');
 
-            $headerCells = explode('|', $header);
+			$headerCells = explode('|', $header);
 
-            foreach ($headerCells as $index => $headerCell)
-            {
-                $headerCell = trim($headerCell);
+			foreach ($headerCells as $index => $headerCell)
+			{
+				$headerCell = trim($headerCell);
 
-                $HeaderElement = array(
-                    'name' => 'th',
-                    'text' => $headerCell,
-                    'handler' => 'line',
-                );
+				$HeaderElement = array(
+					'name' => 'th',
+					'text' => $headerCell,
+					'handler' => 'line',
+				);
 
-                if (isset($alignments[$index]))
-                {
-                    $alignment = $alignments[$index];
-
-                    $HeaderElement['attributes'] = array(
-                        'style' => 'text-align: '.$alignment.';',
-                    );
-                }
-
-                $HeaderElements []= $HeaderElement;
-            }
-
-            # ~
-
-            $Block = array(
-                'alignments' => $alignments,
-                'identified' => true,
-                'element' => array(
-                    'name' => 'table',
-                    'handler' => 'elements',
-                ),
-            );
-
-            $Block['element']['text'] []= array(
-                'name' => 'thead',
-                'handler' => 'elements',
-            );
-
-            $Block['element']['text'] []= array(
-                'name' => 'tbody',
-                'handler' => 'elements',
-                'text' => array(),
-            );
-
-            $Block['element']['text'][0]['text'] []= array(
-                'name' => 'tr',
-                'handler' => 'elements',
-                'text' => $HeaderElements,
-            );
-
-            return $Block;
-        }
-    }
-
-    protected function blockTableContinue($Line, array $Block)
-    {
-        if (isset($Block['interrupted']))
-        {
-            return;
-        }
-
-        if ($Line['text'][0] === '|' or strpos($Line['text'], '|'))
-        {
-            $Elements = array();
-
-            $row = $Line['text'];
-
-            $row = trim($row);
-            $row = trim($row, '|');
-
-            preg_match_all('/(?:(\\\\[|])|[^|`]|`[^`]+`|`)+/', $row, $matches);
-
-            foreach ($matches[0] as $index => $cell)
-            {
-                $cell = trim($cell);
-
-                $Element = array(
-                    'name' => 'td',
-                    'handler' => 'line',
-                    'text' => $cell,
-                );
-
-                if (isset($Block['alignments'][$index]))
-                {
-                    $Element['attributes'] = array(
-                        'style' => 'text-align: '.$Block['alignments'][$index].';',
-                    );
-                }
-
-                $Elements []= $Element;
-            }
-
-            $Element = array(
-                'name' => 'tr',
-                'handler' => 'elements',
-                'text' => $Elements,
-            );
-
-            $Block['element']['text'][1]['text'] []= $Element;
-
-            return $Block;
-        }
-    }
-
-    #
-    # ~
-    #
-
-    protected function paragraph($Line)
-    {
-        $Block = array(
-            'element' => array(
-                'name' => 'p',
-                'text' => $Line['text'],
-                'handler' => 'line',
-            ),
-        );
+				if (isset($alignments[$index]))
+				{
+					$alignment = $alignments[$index];
+
+					$HeaderElement['attributes'] = array(
+						'style' => 'text-align: '.$alignment.';',
+					);
+				}
+
+				$HeaderElements []= $HeaderElement;
+			}
+
+			# ~
+
+			$Block = array(
+				'alignments' => $alignments,
+				'identified' => true,
+				'element' => array(
+					'name' => 'table',
+					'handler' => 'elements',
+				),
+			);
+
+			$Block['element']['text'] []= array(
+				'name' => 'thead',
+				'handler' => 'elements',
+			);
+
+			$Block['element']['text'] []= array(
+				'name' => 'tbody',
+				'handler' => 'elements',
+				'text' => array(),
+			);
+
+			$Block['element']['text'][0]['text'] []= array(
+				'name' => 'tr',
+				'handler' => 'elements',
+				'text' => $HeaderElements,
+			);
+
+			return $Block;
+		}
+	}
+
+	protected function blockTableContinue($Line, array $Block)
+	{
+		if (isset($Block['interrupted']))
+		{
+			return;
+		}
+
+		if ($Line['text'][0] === '|' or strpos($Line['text'], '|'))
+		{
+			$Elements = array();
+
+			$row = $Line['text'];
+
+			$row = trim($row);
+			$row = trim($row, '|');
+
+			preg_match_all('/(?:(\\\\[|])|[^|`]|`[^`]+`|`)+/', $row, $matches);
+
+			foreach ($matches[0] as $index => $cell)
+			{
+				$cell = trim($cell);
+
+				$Element = array(
+					'name' => 'td',
+					'handler' => 'line',
+					'text' => $cell,
+				);
+
+				if (isset($Block['alignments'][$index]))
+				{
+					$Element['attributes'] = array(
+						'style' => 'text-align: '.$Block['alignments'][$index].';',
+					);
+				}
+
+				$Elements []= $Element;
+			}
+
+			$Element = array(
+				'name' => 'tr',
+				'handler' => 'elements',
+				'text' => $Elements,
+			);
+
+			$Block['element']['text'][1]['text'] []= $Element;
+
+			return $Block;
+		}
+	}
+
+	#
+	# ~
+	#
+
+	protected function paragraph($Line)
+	{
+		$Block = array(
+			'element' => array(
+				'name' => 'p',
+				'text' => $Line['text'],
+				'handler' => 'line',
+			),
+		);
 
-        return $Block;
-    }
+		return $Block;
+	}
 
-    #
-    # Inline Elements
-    #
+	#
+	# Inline Elements
+	#
 
-    protected $InlineTypes = array(
-        '"' => array('SpecialCharacter'),
-        '!' => array('Image'),
-        '&' => array('SpecialCharacter'),
-        '*' => array('Emphasis'),
-        ':' => array('Url'),
-        '<' => array('UrlTag', 'EmailTag', 'Markup', 'SpecialCharacter'),
-        '>' => array('SpecialCharacter'),
-        '[' => array('Link'),
-        '_' => array('Emphasis'),
-        '`' => array('Code'),
-        '~' => array('Strikethrough'),
-        '\\' => array('EscapeSequence'),
-    );
+	protected $InlineTypes = array(
+		'"' => array('SpecialCharacter'),
+		'!' => array('Image'),
+		'&' => array('SpecialCharacter'),
+		'*' => array('Emphasis'),
+		':' => array('Url'),
+		'<' => array('UrlTag', 'EmailTag', 'Markup', 'SpecialCharacter'),
+		'>' => array('SpecialCharacter'),
+		'[' => array('Link'),
+		'_' => array('Emphasis'),
+		'`' => array('Code'),
+		'~' => array('Strikethrough'),
+		'\\' => array('EscapeSequence'),
+	);
 
-    # ~
+	# ~
 
-    protected $inlineMarkerList = '!"*_&[:<>`~\\';
+	protected $inlineMarkerList = '!"*_&[:<>`~\\';
 
-    #
-    # ~
-    #
+	#
+	# ~
+	#
 
-    public function line($text, $nonNestables=array())
-    {
-        $markup = '';
+	public function line($text, $nonNestables=array())
+	{
+		$markup = '';
 
-        # $excerpt is based on the first occurrence of a marker
+		# $excerpt is based on the first occurrence of a marker
 
-        while ($excerpt = strpbrk($text, $this->inlineMarkerList))
-        {
-            $marker = $excerpt[0];
+		while ($excerpt = strpbrk($text, $this->inlineMarkerList))
+		{
+			$marker = $excerpt[0];
 
-            $markerPosition = strpos($text, $marker);
+			$markerPosition = strpos($text, $marker);
 
-            $Excerpt = array('text' => $excerpt, 'context' => $text);
+			$Excerpt = array('text' => $excerpt, 'context' => $text);
 
-            foreach ($this->InlineTypes[$marker] as $inlineType)
-            {
-                # check to see if the current inline type is nestable in the current context
+			foreach ($this->InlineTypes[$marker] as $inlineType)
+			{
+				# check to see if the current inline type is nestable in the current context
 
-                if ( ! empty($nonNestables) and in_array($inlineType, $nonNestables))
-                {
-                    continue;
-                }
-
-                $Inline = $this->{'inline'.$inlineType}($Excerpt);
-
-                if ( ! isset($Inline))
-                {
-                    continue;
-                }
-
-                # makes sure that the inline belongs to "our" marker
-
-                if (isset($Inline['position']) and $Inline['position'] > $markerPosition)
-                {
-                    continue;
-                }
-
-                # sets a default inline position
-
-                if ( ! isset($Inline['position']))
-                {
-                    $Inline['position'] = $markerPosition;
-                }
-
-                # cause the new element to 'inherit' our non nestables
-
-                foreach ($nonNestables as $non_nestable)
-                {
-                    $Inline['element']['nonNestables'][] = $non_nestable;
-                }
-
-                # the text that comes before the inline
-                $unmarkedText = substr($text, 0, $Inline['position']);
-
-                # compile the unmarked text
-                $markup .= $this->unmarkedText($unmarkedText);
-
-                # compile the inline
-                $markup .= isset($Inline['markup']) ? $Inline['markup'] : $this->element($Inline['element']);
-
-                # remove the examined text
-                $text = substr($text, $Inline['position'] + $Inline['extent']);
-
-                continue 2;
-            }
-
-            # the marker does not belong to an inline
-
-            $unmarkedText = substr($text, 0, $markerPosition + 1);
-
-            $markup .= $this->unmarkedText($unmarkedText);
-
-            $text = substr($text, $markerPosition + 1);
-        }
-
-        $markup .= $this->unmarkedText($text);
-
-        return $markup;
-    }
-
-    #
-    # ~
-    #
-
-    protected function inlineCode($Excerpt)
-    {
-        $marker = $Excerpt['text'][0];
-
-        if (preg_match('/^('.$marker.'+)[ ]*(.+?)[ ]*(?<!'.$marker.')\1(?!'.$marker.')/s', $Excerpt['text'], $matches))
-        {
-            $text = $matches[2];
-            $text = preg_replace("/[ ]*\n/", ' ', $text);
-
-            return array(
-                'extent' => strlen($matches[0]),
-                'element' => array(
-                    'name' => 'code',
-                    'text' => $text,
-                ),
-            );
-        }
-    }
-
-    protected function inlineEmailTag($Excerpt)
-    {
-        if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<((mailto:)?\S+?@\S+?)>/i', $Excerpt['text'], $matches))
-        {
-            $url = $matches[1];
-
-            if ( ! isset($matches[2]))
-            {
-                $url = 'mailto:' . $url;
-            }
-
-            return array(
-                'extent' => strlen($matches[0]),
-                'element' => array(
-                    'name' => 'a',
-                    'text' => $matches[1],
-                    'attributes' => array(
-                        'href' => $url,
-                    ),
-                ),
-            );
-        }
-    }
-
-    protected function inlineEmphasis($Excerpt)
-    {
-        if ( ! isset($Excerpt['text'][1]))
-        {
-            return;
-        }
-
-        $marker = $Excerpt['text'][0];
-
-        if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
-        {
-            $emphasis = 'strong';
-        }
-        elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
-        {
-            $emphasis = 'em';
-        }
-        else
-        {
-            return;
-        }
-
-        return array(
-            'extent' => strlen($matches[0]),
-            'element' => array(
-                'name' => $emphasis,
-                'handler' => 'line',
-                'text' => $matches[1],
-            ),
-        );
-    }
-
-    protected function inlineEscapeSequence($Excerpt)
-    {
-        if (isset($Excerpt['text'][1]) and in_array($Excerpt['text'][1], $this->specialCharacters))
-        {
-            return array(
-                'markup' => $Excerpt['text'][1],
-                'extent' => 2,
-            );
-        }
-    }
-
-    protected function inlineImage($Excerpt)
-    {
-        if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
-        {
-            return;
-        }
-
-        $Excerpt['text']= substr($Excerpt['text'], 1);
-
-        $Link = $this->inlineLink($Excerpt);
-
-        if ($Link === null)
-        {
-            return;
-        }
-
-        $Inline = array(
-            'extent' => $Link['extent'] + 1,
-            'element' => array(
-                'name' => 'img',
-                'attributes' => array(
-                    'src' => $Link['element']['attributes']['href'],
-                    'alt' => $Link['element']['text'],
-                ),
-            ),
-        );
-
-        $Inline['element']['attributes'] += $Link['element']['attributes'];
-
-        unset($Inline['element']['attributes']['href']);
-
-        return $Inline;
-    }
-
-    protected function inlineLink($Excerpt)
-    {
-        $Element = array(
-            'name' => 'a',
-            'handler' => 'line',
-            'nonNestables' => array('Url', 'Link'),
-            'text' => null,
-            'attributes' => array(
-                'href' => null,
-                'title' => null,
-            ),
-        );
-
-        $extent = 0;
-
-        $remainder = $Excerpt['text'];
-
-        if (preg_match('/\[((?:[^][]++|(?R))*+)\]/', $remainder, $matches))
-        {
-            $Element['text'] = $matches[1];
-
-            $extent += strlen($matches[0]);
-
-            $remainder = substr($remainder, $extent);
-        }
-        else
-        {
-            return;
-        }
-
-        if (preg_match('/^[(]\s*+((?:[^ ()]++|[(][^ )]+[)])++)(?:[ ]+("[^"]*"|\'[^\']*\'))?\s*[)]/', $remainder, $matches))
-        {
-            $Element['attributes']['href'] = $matches[1];
-
-            if (isset($matches[2]))
-            {
-                $Element['attributes']['title'] = substr($matches[2], 1, - 1);
-            }
-
-            $extent += strlen($matches[0]);
-        }
-        else
-        {
-            if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches))
-            {
-                $definition = strlen($matches[1]) ? $matches[1] : $Element['text'];
-                $definition = strtolower($definition);
-
-                $extent += strlen($matches[0]);
-            }
-            else
-            {
-                $definition = strtolower($Element['text']);
-            }
-
-            if ( ! isset($this->DefinitionData['Reference'][$definition]))
-            {
-                return;
-            }
-
-            $Definition = $this->DefinitionData['Reference'][$definition];
-
-            $Element['attributes']['href'] = $Definition['url'];
-            $Element['attributes']['title'] = $Definition['title'];
-        }
-
-        return array(
-            'extent' => $extent,
-            'element' => $Element,
-        );
-    }
-
-    protected function inlineMarkup($Excerpt)
-    {
-        if ($this->markupEscaped or $this->safeMode or strpos($Excerpt['text'], '>') === false)
-        {
-            return;
-        }
-
-        if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w[\w-]*[ ]*>/s', $Excerpt['text'], $matches))
-        {
-            return array(
-                'markup' => $matches[0],
-                'extent' => strlen($matches[0]),
-            );
-        }
-
-        if ($Excerpt['text'][1] === '!' and preg_match('/^<!---?[^>-](?:-?[^-])*-->/s', $Excerpt['text'], $matches))
-        {
-            return array(
-                'markup' => $matches[0],
-                'extent' => strlen($matches[0]),
-            );
-        }
-
-        if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w[\w-]*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $Excerpt['text'], $matches))
-        {
-            return array(
-                'markup' => $matches[0],
-                'extent' => strlen($matches[0]),
-            );
-        }
-    }
-
-    protected function inlineSpecialCharacter($Excerpt)
-    {
-        if ($Excerpt['text'][0] === '&' and ! preg_match('/^&#?\w+;/', $Excerpt['text']))
-        {
-            return array(
-                'markup' => '&amp;',
-                'extent' => 1,
-            );
-        }
-
-        $SpecialCharacter = array('>' => 'gt', '<' => 'lt', '"' => 'quot');
-
-        if (isset($SpecialCharacter[$Excerpt['text'][0]]))
-        {
-            return array(
-                'markup' => '&'.$SpecialCharacter[$Excerpt['text'][0]].';',
-                'extent' => 1,
-            );
-        }
-    }
-
-    protected function inlineStrikethrough($Excerpt)
-    {
-        if ( ! isset($Excerpt['text'][1]))
-        {
-            return;
-        }
-
-        if ($Excerpt['text'][1] === '~' and preg_match('/^~~(?=\S)(.+?)(?<=\S)~~/', $Excerpt['text'], $matches))
-        {
-            return array(
-                'extent' => strlen($matches[0]),
-                'element' => array(
-                    'name' => 'del',
-                    'text' => $matches[1],
-                    'handler' => 'line',
-                ),
-            );
-        }
-    }
-
-    protected function inlineUrl($Excerpt)
-    {
-        if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
-        {
-            return;
-        }
-
-        if (preg_match('/\bhttps?:[\/]{2}[^\s<]+\b\/*/ui', $Excerpt['context'], $matches, PREG_OFFSET_CAPTURE))
-        {
-            $url = $matches[0][0];
-
-            $Inline = array(
-                'extent' => strlen($matches[0][0]),
-                'position' => $matches[0][1],
-                'element' => array(
-                    'name' => 'a',
-                    'text' => $url,
-                    'attributes' => array(
-                        'href' => $url,
-                    ),
-                ),
-            );
-
-            return $Inline;
-        }
-    }
-
-    protected function inlineUrlTag($Excerpt)
-    {
-        if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(\w+:\/{2}[^ >]+)>/i', $Excerpt['text'], $matches))
-        {
-            $url = $matches[1];
-
-            return array(
-                'extent' => strlen($matches[0]),
-                'element' => array(
-                    'name' => 'a',
-                    'text' => $url,
-                    'attributes' => array(
-                        'href' => $url,
-                    ),
-                ),
-            );
-        }
-    }
-
-    # ~
-
-    protected function unmarkedText($text)
-    {
-        if ($this->breaksEnabled)
-        {
-            $text = preg_replace('/[ ]*\n/', "<br />\n", $text);
-        }
-        else
-        {
-            $text = preg_replace('/(?:[ ][ ]+|[ ]*\\\\)\n/', "<br />\n", $text);
-            $text = str_replace(" \n", "\n", $text);
-        }
-
-        return $text;
-    }
-
-    #
-    # Handlers
-    #
-
-    protected function element(array $Element)
-    {
-        if ($this->safeMode)
-        {
-            $Element = $this->sanitiseElement($Element);
-        }
-
-        $markup = '<'.$Element['name'];
-
-        if (isset($Element['attributes']))
-        {
-            foreach ($Element['attributes'] as $name => $value)
-            {
-                if ($value === null)
-                {
-                    continue;
-                }
-
-                $markup .= ' '.$name.'="'.self::escape($value).'"';
-            }
-        }
-
-        $permitRawHtml = false;
-
-        if (isset($Element['text']))
-        {
-            $text = $Element['text'];
-        }
-        // very strongly consider an alternative if you're writing an
-        // extension
-        elseif (isset($Element['rawHtml']))
-        {
-            $text = $Element['rawHtml'];
-            $allowRawHtmlInSafeMode = isset($Element['allowRawHtmlInSafeMode']) && $Element['allowRawHtmlInSafeMode'];
-            $permitRawHtml = !$this->safeMode || $allowRawHtmlInSafeMode;
-        }
-
-        if (isset($text))
-        {
-            $markup .= '>';
-
-            if (!isset($Element['nonNestables']))
-            {
-                $Element['nonNestables'] = array();
-            }
-
-            if (isset($Element['handler']))
-            {
-                $markup .= $this->{$Element['handler']}($text, $Element['nonNestables']);
-            }
-            elseif (!$permitRawHtml)
-            {
-                $markup .= self::escape($text, true);
-            }
-            else
-            {
-                $markup .= $text;
-            }
-
-            $markup .= '</'.$Element['name'].'>';
-        }
-        else
-        {
-            $markup .= ' />';
-        }
-
-        return $markup;
-    }
-
-    protected function elements(array $Elements)
-    {
-        $markup = '';
-
-        foreach ($Elements as $Element)
-        {
-            $markup .= "\n" . $this->element($Element);
-        }
-
-        $markup .= "\n";
-
-        return $markup;
-    }
-
-    # ~
-
-    protected function li($lines)
-    {
-        $markup = $this->lines($lines);
-
-        $trimmedMarkup = trim($markup);
-
-        if ( ! in_array('', $lines) and substr($trimmedMarkup, 0, 3) === '<p>')
-        {
-            $markup = $trimmedMarkup;
-            $markup = substr($markup, 3);
-
-            $position = strpos($markup, "</p>");
-
-            $markup = substr_replace($markup, '', $position, 4);
-        }
-
-        return $markup;
-    }
-
-    #
-    # Deprecated Methods
-    #
-
-    function parse($text)
-    {
-        $markup = $this->text($text);
-
-        return $markup;
-    }
-
-    protected function sanitiseElement(array $Element)
-    {
-        static $goodAttribute = '/^[a-zA-Z0-9][a-zA-Z0-9-_]*+$/';
-        static $safeUrlNameToAtt  = array(
-            'a'   => 'href',
-            'img' => 'src',
-        );
-
-        if (isset($safeUrlNameToAtt[$Element['name']]))
-        {
-            $Element = $this->filterUnsafeUrlInAttribute($Element, $safeUrlNameToAtt[$Element['name']]);
-        }
-
-        if ( ! empty($Element['attributes']))
-        {
-            foreach ($Element['attributes'] as $att => $val)
-            {
-                # filter out badly parsed attribute
-                if ( ! preg_match($goodAttribute, $att))
-                {
-                    unset($Element['attributes'][$att]);
-                }
-                # dump onevent attribute
-                elseif (self::striAtStart($att, 'on'))
-                {
-                    unset($Element['attributes'][$att]);
-                }
-            }
-        }
-
-        return $Element;
-    }
-
-    protected function filterUnsafeUrlInAttribute(array $Element, $attribute)
-    {
-        foreach ($this->safeLinksWhitelist as $scheme)
-        {
-            if (self::striAtStart($Element['attributes'][$attribute], $scheme))
-            {
-                return $Element;
-            }
-        }
-
-        $Element['attributes'][$attribute] = str_replace(':', '%3A', $Element['attributes'][$attribute]);
-
-        return $Element;
-    }
-
-    #
-    # Static Methods
-    #
-
-    protected static function escape($text, $allowQuotes = false)
-    {
-        return htmlspecialchars($text, $allowQuotes ? ENT_NOQUOTES : ENT_QUOTES, 'UTF-8');
-    }
-
-    protected static function striAtStart($string, $needle)
-    {
-        $len = strlen($needle);
-
-        if ($len > strlen($string))
-        {
-            return false;
-        }
-        else
-        {
-            return strtolower(substr($string, 0, $len)) === strtolower($needle);
-        }
-    }
-
-    static function instance($name = 'default')
-    {
-        if (isset(self::$instances[$name]))
-        {
-            return self::$instances[$name];
-        }
-
-        $instance = new static();
-
-        self::$instances[$name] = $instance;
-
-        return $instance;
-    }
-
-    private static $instances = array();
-
-    #
-    # Fields
-    #
-
-    protected $DefinitionData;
-
-    #
-    # Read-Only
-
-    protected $specialCharacters = array(
-        '\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!', '|',
-    );
-
-    protected $StrongRegex = array(
-        '*' => '/^[*]{2}((?:\\\\\*|[^*]|[*][^*]*[*])+?)[*]{2}(?![*])/s',
-        '_' => '/^__((?:\\\\_|[^_]|_[^_]*_)+?)__(?!_)/us',
-    );
-
-    protected $EmRegex = array(
-        '*' => '/^[*]((?:\\\\\*|[^*]|[*][*][^*]+?[*][*])+?)[*](?![*])/s',
-        '_' => '/^_((?:\\\\_|[^_]|__[^_]*__)+?)_(?!_)\b/us',
-    );
-
-    protected $regexHtmlAttribute = '[a-zA-Z_:][\w:.-]*(?:\s*=\s*(?:[^"\'=<>`\s]+|"[^"]*"|\'[^\']*\'))?';
-
-    protected $voidElements = array(
-        'area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source',
-    );
-
-    protected $textLevelElements = array(
-        'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
-        'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
-        'i', 'rp', 'del', 'code',          'strike', 'marquee',
-        'q', 'rt', 'ins', 'font',          'strong',
-        's', 'tt', 'kbd', 'mark',
-        'u', 'xm', 'sub', 'nobr',
-                   'sup', 'ruby',
-                   'var', 'span',
-                   'wbr', 'time',
-    );
+				if ( ! empty($nonNestables) and in_array($inlineType, $nonNestables))
+				{
+					continue;
+				}
+
+				$Inline = $this->{'inline'.$inlineType}($Excerpt);
+
+				if ( ! isset($Inline))
+				{
+					continue;
+				}
+
+				# makes sure that the inline belongs to "our" marker
+
+				if (isset($Inline['position']) and $Inline['position'] > $markerPosition)
+				{
+					continue;
+				}
+
+				# sets a default inline position
+
+				if ( ! isset($Inline['position']))
+				{
+					$Inline['position'] = $markerPosition;
+				}
+
+				# cause the new element to 'inherit' our non nestables
+
+				foreach ($nonNestables as $non_nestable)
+				{
+					$Inline['element']['nonNestables'][] = $non_nestable;
+				}
+
+				# the text that comes before the inline
+				$unmarkedText = substr($text, 0, $Inline['position']);
+
+				# compile the unmarked text
+				$markup .= $this->unmarkedText($unmarkedText);
+
+				# compile the inline
+				$markup .= isset($Inline['markup']) ? $Inline['markup'] : $this->element($Inline['element']);
+
+				# remove the examined text
+				$text = substr($text, $Inline['position'] + $Inline['extent']);
+
+				continue 2;
+			}
+
+			# the marker does not belong to an inline
+
+			$unmarkedText = substr($text, 0, $markerPosition + 1);
+
+			$markup .= $this->unmarkedText($unmarkedText);
+
+			$text = substr($text, $markerPosition + 1);
+		}
+
+		$markup .= $this->unmarkedText($text);
+
+		return $markup;
+	}
+
+	#
+	# ~
+	#
+
+	protected function inlineCode($Excerpt)
+	{
+		$marker = $Excerpt['text'][0];
+
+		if (preg_match('/^('.$marker.'+)[ ]*(.+?)[ ]*(?<!'.$marker.')\1(?!'.$marker.')/s', $Excerpt['text'], $matches))
+		{
+			$text = $matches[2];
+			$text = preg_replace("/[ ]*\n/", ' ', $text);
+
+			return array(
+				'extent' => strlen($matches[0]),
+				'element' => array(
+					'name' => 'code',
+					'text' => $text,
+				),
+			);
+		}
+	}
+
+	protected function inlineEmailTag($Excerpt)
+	{
+		if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<((mailto:)?\S+?@\S+?)>/i', $Excerpt['text'], $matches))
+		{
+			$url = $matches[1];
+
+			if ( ! isset($matches[2]))
+			{
+				$url = 'mailto:' . $url;
+			}
+
+			return array(
+				'extent' => strlen($matches[0]),
+				'element' => array(
+					'name' => 'a',
+					'text' => $matches[1],
+					'attributes' => array(
+						'href' => $url,
+					),
+				),
+			);
+		}
+	}
+
+	protected function inlineEmphasis($Excerpt)
+	{
+		if ( ! isset($Excerpt['text'][1]))
+		{
+			return;
+		}
+
+		$marker = $Excerpt['text'][0];
+
+		if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
+		{
+			$emphasis = 'strong';
+		}
+		elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
+		{
+			$emphasis = 'em';
+		}
+		else
+		{
+			return;
+		}
+
+		return array(
+			'extent' => strlen($matches[0]),
+			'element' => array(
+				'name' => $emphasis,
+				'handler' => 'line',
+				'text' => $matches[1],
+			),
+		);
+	}
+
+	protected function inlineEscapeSequence($Excerpt)
+	{
+		if (isset($Excerpt['text'][1]) and in_array($Excerpt['text'][1], $this->specialCharacters))
+		{
+			return array(
+				'markup' => $Excerpt['text'][1],
+				'extent' => 2,
+			);
+		}
+	}
+
+	protected function inlineImage($Excerpt)
+	{
+		if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
+		{
+			return;
+		}
+
+		$Excerpt['text']= substr($Excerpt['text'], 1);
+
+		$Link = $this->inlineLink($Excerpt);
+
+		if ($Link === null)
+		{
+			return;
+		}
+
+		$Inline = array(
+			'extent' => $Link['extent'] + 1,
+			'element' => array(
+				'name' => 'img',
+				'attributes' => array(
+					'src' => $Link['element']['attributes']['href'],
+					'alt' => $Link['element']['text'],
+				),
+			),
+		);
+
+		$Inline['element']['attributes'] += $Link['element']['attributes'];
+
+		unset($Inline['element']['attributes']['href']);
+
+		return $Inline;
+	}
+
+	protected function inlineLink($Excerpt)
+	{
+		$Element = array(
+			'name' => 'a',
+			'handler' => 'line',
+			'nonNestables' => array('Url', 'Link'),
+			'text' => null,
+			'attributes' => array(
+				'href' => null,
+				'title' => null,
+			),
+		);
+
+		$extent = 0;
+
+		$remainder = $Excerpt['text'];
+
+		if (preg_match('/\[((?:[^][]++|(?R))*+)\]/', $remainder, $matches))
+		{
+			$Element['text'] = $matches[1];
+
+			$extent += strlen($matches[0]);
+
+			$remainder = substr($remainder, $extent);
+		}
+		else
+		{
+			return;
+		}
+
+		if (preg_match('/^[(]\s*+((?:[^ ()]++|[(][^ )]+[)])++)(?:[ ]+("[^"]*"|\'[^\']*\'))?\s*[)]/', $remainder, $matches))
+		{
+			$Element['attributes']['href'] = $matches[1];
+
+			if (isset($matches[2]))
+			{
+				$Element['attributes']['title'] = substr($matches[2], 1, - 1);
+			}
+
+			$extent += strlen($matches[0]);
+		}
+		else
+		{
+			if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches))
+			{
+				$definition = strlen($matches[1]) ? $matches[1] : $Element['text'];
+				$definition = strtolower($definition);
+
+				$extent += strlen($matches[0]);
+			}
+			else
+			{
+				$definition = strtolower($Element['text']);
+			}
+
+			if ( ! isset($this->DefinitionData['Reference'][$definition]))
+			{
+				return;
+			}
+
+			$Definition = $this->DefinitionData['Reference'][$definition];
+
+			$Element['attributes']['href'] = $Definition['url'];
+			$Element['attributes']['title'] = $Definition['title'];
+		}
+
+		return array(
+			'extent' => $extent,
+			'element' => $Element,
+		);
+	}
+
+	protected function inlineMarkup($Excerpt)
+	{
+		if ($this->markupEscaped or $this->safeMode or strpos($Excerpt['text'], '>') === false)
+		{
+			return;
+		}
+
+		if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w[\w-]*[ ]*>/s', $Excerpt['text'], $matches))
+		{
+			return array(
+				'markup' => $matches[0],
+				'extent' => strlen($matches[0]),
+			);
+		}
+
+		if ($Excerpt['text'][1] === '!' and preg_match('/^<!---?[^>-](?:-?[^-])*-->/s', $Excerpt['text'], $matches))
+		{
+			return array(
+				'markup' => $matches[0],
+				'extent' => strlen($matches[0]),
+			);
+		}
+
+		if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w[\w-]*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $Excerpt['text'], $matches))
+		{
+			return array(
+				'markup' => $matches[0],
+				'extent' => strlen($matches[0]),
+			);
+		}
+	}
+
+	protected function inlineSpecialCharacter($Excerpt)
+	{
+		if ($Excerpt['text'][0] === '&' and ! preg_match('/^&#?\w+;/', $Excerpt['text']))
+		{
+			return array(
+				'markup' => '&amp;',
+				'extent' => 1,
+			);
+		}
+
+		$SpecialCharacter = array('>' => 'gt', '<' => 'lt', '"' => 'quot');
+
+		if (isset($SpecialCharacter[$Excerpt['text'][0]]))
+		{
+			return array(
+				'markup' => '&'.$SpecialCharacter[$Excerpt['text'][0]].';',
+				'extent' => 1,
+			);
+		}
+	}
+
+	protected function inlineStrikethrough($Excerpt)
+	{
+		if ( ! isset($Excerpt['text'][1]))
+		{
+			return;
+		}
+
+		if ($Excerpt['text'][1] === '~' and preg_match('/^~~(?=\S)(.+?)(?<=\S)~~/', $Excerpt['text'], $matches))
+		{
+			return array(
+				'extent' => strlen($matches[0]),
+				'element' => array(
+					'name' => 'del',
+					'text' => $matches[1],
+					'handler' => 'line',
+				),
+			);
+		}
+	}
+
+	protected function inlineUrl($Excerpt)
+	{
+		if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
+		{
+			return;
+		}
+
+		if (preg_match('/\bhttps?:[\/]{2}[^\s<]+\b\/*/ui', $Excerpt['context'], $matches, PREG_OFFSET_CAPTURE))
+		{
+			$url = $matches[0][0];
+
+			$Inline = array(
+				'extent' => strlen($matches[0][0]),
+				'position' => $matches[0][1],
+				'element' => array(
+					'name' => 'a',
+					'text' => $url,
+					'attributes' => array(
+						'href' => $url,
+					),
+				),
+			);
+
+			return $Inline;
+		}
+	}
+
+	protected function inlineUrlTag($Excerpt)
+	{
+		if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(\w+:\/{2}[^ >]+)>/i', $Excerpt['text'], $matches))
+		{
+			$url = $matches[1];
+
+			return array(
+				'extent' => strlen($matches[0]),
+				'element' => array(
+					'name' => 'a',
+					'text' => $url,
+					'attributes' => array(
+						'href' => $url,
+					),
+				),
+			);
+		}
+	}
+
+	# ~
+
+	protected function unmarkedText($text)
+	{
+		if ($this->breaksEnabled)
+		{
+			$text = preg_replace('/[ ]*\n/', "<br />\n", $text);
+		}
+		else
+		{
+			$text = preg_replace('/(?:[ ][ ]+|[ ]*\\\\)\n/', "<br />\n", $text);
+			$text = str_replace(" \n", "\n", $text);
+		}
+
+		return $text;
+	}
+
+	#
+	# Handlers
+	#
+
+	protected function element(array $Element)
+	{
+		if ($this->safeMode)
+		{
+			$Element = $this->sanitiseElement($Element);
+		}
+
+		$markup = '<'.$Element['name'];
+
+		if (isset($Element['attributes']))
+		{
+			foreach ($Element['attributes'] as $name => $value)
+			{
+				if ($value === null)
+				{
+					continue;
+				}
+
+				$markup .= ' '.$name.'="'.self::escape($value).'"';
+			}
+		}
+
+		$permitRawHtml = false;
+
+		if (isset($Element['text']))
+		{
+			$text = $Element['text'];
+		}
+		// very strongly consider an alternative if you're writing an
+		// extension
+		elseif (isset($Element['rawHtml']))
+		{
+			$text = $Element['rawHtml'];
+			$allowRawHtmlInSafeMode = isset($Element['allowRawHtmlInSafeMode']) && $Element['allowRawHtmlInSafeMode'];
+			$permitRawHtml = !$this->safeMode || $allowRawHtmlInSafeMode;
+		}
+
+		if (isset($text))
+		{
+			$markup .= '>';
+
+			if (!isset($Element['nonNestables']))
+			{
+				$Element['nonNestables'] = array();
+			}
+
+			if (isset($Element['handler']))
+			{
+				$markup .= $this->{$Element['handler']}($text, $Element['nonNestables']);
+			}
+			elseif (!$permitRawHtml)
+			{
+				$markup .= self::escape($text, true);
+			}
+			else
+			{
+				$markup .= $text;
+			}
+
+			$markup .= '</'.$Element['name'].'>';
+		}
+		else
+		{
+			$markup .= ' />';
+		}
+
+		return $markup;
+	}
+
+	protected function elements(array $Elements)
+	{
+		$markup = '';
+
+		foreach ($Elements as $Element)
+		{
+			$markup .= "\n" . $this->element($Element);
+		}
+
+		$markup .= "\n";
+
+		return $markup;
+	}
+
+	# ~
+
+	protected function li($lines)
+	{
+		$markup = $this->lines($lines);
+
+		$trimmedMarkup = trim($markup);
+
+		if ( ! in_array('', $lines) and substr($trimmedMarkup, 0, 3) === '<p>')
+		{
+			$markup = $trimmedMarkup;
+			$markup = substr($markup, 3);
+
+			$position = strpos($markup, "</p>");
+
+			$markup = substr_replace($markup, '', $position, 4);
+		}
+
+		return $markup;
+	}
+
+	#
+	# Deprecated Methods
+	#
+
+	function parse($text)
+	{
+		$markup = $this->text($text);
+
+		return $markup;
+	}
+
+	protected function sanitiseElement(array $Element)
+	{
+		static $goodAttribute = '/^[a-zA-Z0-9][a-zA-Z0-9-_]*+$/';
+		static $safeUrlNameToAtt  = array(
+			'a'   => 'href',
+			'img' => 'src',
+		);
+
+		if (isset($safeUrlNameToAtt[$Element['name']]))
+		{
+			$Element = $this->filterUnsafeUrlInAttribute($Element, $safeUrlNameToAtt[$Element['name']]);
+		}
+
+		if ( ! empty($Element['attributes']))
+		{
+			foreach ($Element['attributes'] as $att => $val)
+			{
+				# filter out badly parsed attribute
+				if ( ! preg_match($goodAttribute, $att))
+				{
+					unset($Element['attributes'][$att]);
+				}
+				# dump onevent attribute
+				elseif (self::striAtStart($att, 'on'))
+				{
+					unset($Element['attributes'][$att]);
+				}
+			}
+		}
+
+		return $Element;
+	}
+
+	protected function filterUnsafeUrlInAttribute(array $Element, $attribute)
+	{
+		foreach ($this->safeLinksWhitelist as $scheme)
+		{
+			if (self::striAtStart($Element['attributes'][$attribute], $scheme))
+			{
+				return $Element;
+			}
+		}
+
+		$Element['attributes'][$attribute] = str_replace(':', '%3A', $Element['attributes'][$attribute]);
+
+		return $Element;
+	}
+
+	#
+	# Static Methods
+	#
+
+	protected static function escape($text, $allowQuotes = false)
+	{
+		return htmlspecialchars($text, $allowQuotes ? ENT_NOQUOTES : ENT_QUOTES, 'UTF-8');
+	}
+
+	protected static function striAtStart($string, $needle)
+	{
+		$len = strlen($needle);
+
+		if ($len > strlen($string))
+		{
+			return false;
+		}
+		else
+		{
+			return strtolower(substr($string, 0, $len)) === strtolower($needle);
+		}
+	}
+
+	static function instance($name = 'default')
+	{
+		if (isset(self::$instances[$name]))
+		{
+			return self::$instances[$name];
+		}
+
+		$instance = new static();
+
+		self::$instances[$name] = $instance;
+
+		return $instance;
+	}
+
+	private static $instances = array();
+
+	#
+	# Fields
+	#
+
+	protected $DefinitionData;
+
+	#
+	# Read-Only
+
+	protected $specialCharacters = array(
+		'\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!', '|',
+	);
+
+	protected $StrongRegex = array(
+		'*' => '/^[*]{2}((?:\\\\\*|[^*]|[*][^*]*[*])+?)[*]{2}(?![*])/s',
+		'_' => '/^__((?:\\\\_|[^_]|_[^_]*_)+?)__(?!_)/us',
+	);
+
+	protected $EmRegex = array(
+		'*' => '/^[*]((?:\\\\\*|[^*]|[*][*][^*]+?[*][*])+?)[*](?![*])/s',
+		'_' => '/^_((?:\\\\_|[^_]|__[^_]*__)+?)_(?!_)\b/us',
+	);
+
+	protected $regexHtmlAttribute = '[a-zA-Z_:][\w:.-]*(?:\s*=\s*(?:[^"\'=<>`\s]+|"[^"]*"|\'[^\']*\'))?';
+
+	protected $voidElements = array(
+		'area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source',
+	);
+
+	protected $textLevelElements = array(
+		'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
+		'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
+		'i', 'rp', 'del', 'code',          'strike', 'marquee',
+		'q', 'rt', 'ins', 'font',          'strong',
+		's', 'tt', 'kbd', 'mark',
+		'u', 'xm', 'sub', 'nobr',
+				   'sup', 'ruby',
+				   'var', 'span',
+				   'wbr', 'time',
+	);
 }

htdocs/includes/nusoap/lib/Mail/mimePart.php

Indentation +1171 added lines, -1171 removed lines

@@ -75,520 +75,520 @@ 
  */
 class Mail_mimePart
 {
-    /**
-    * The encoding type of this part
-    *
-    * @var string
-    * @access private
-    */
-    var $_encoding;
-
-    /**
-    * An array of subparts
-    *
-    * @var array
-    * @access private
-    */
-    var $_subparts;
-
-    /**
-    * The output of this part after being built
-    *
-    * @var string
-    * @access private
-    */
-    var $_encoded;
-
-    /**
-    * Headers for this part
-    *
-    * @var array
-    * @access private
-    */
-    var $_headers;
-
-    /**
-    * The body of this part (not encoded)
-    *
-    * @var string
-    * @access private
-    */
-    var $_body;
-
-    /**
-    * The location of file with body of this part (not encoded)
-    *
-    * @var string
-    * @access private
-    */
-    var $_body_file;
-
-    /**
-    * The end-of-line sequence
-    *
-    * @var string
-    * @access private
-    */
-    var $_eol = "\r\n";
-
-
-    /**
-    * Constructor.
-    *
-    * Sets up the object.
-    *
-    * @param string $body   The body of the mime part if any.
-    * @param array  $params An associative array of optional parameters:
-    *     content_type      - The content type for this part eg multipart/mixed
-    *     encoding          - The encoding to use, 7bit, 8bit,
-    *                         base64, or quoted-printable
-    *     charset           - Content character set
-    *     cid               - Content ID to apply
-    *     disposition       - Content disposition, inline or attachment
-    *     filename          - Filename parameter for content disposition
-    *     description       - Content description
-    *     name_encoding     - Encoding of the attachment name (Content-Type)
-    *                         By default filenames are encoded using RFC2231
-    *                         Here you can set RFC2047 encoding (quoted-printable
-    *                         or base64) instead
-    *     filename_encoding - Encoding of the attachment filename (Content-Disposition)
-    *                         See 'name_encoding'
-    *     headers_charset   - Charset of the headers e.g. filename, description.
-    *                         If not set, 'charset' will be used
-    *     eol               - End of line sequence. Default: "\r\n"
-    *     headers           - Hash array with additional part headers. Array keys can be
-    *                         in form of <header_name>:<parameter_name>
-    *     body_file         - Location of file with part's body (instead of $body)
-    *
-    * @access public
-    */
-    function Mail_mimePart($body = '', $params = array())
-    {
-        if (!empty($params['eol'])) {
-            $this->_eol = $params['eol'];
-        } else if (defined('MAIL_MIMEPART_CRLF')) { // backward-copat.
-            $this->_eol = MAIL_MIMEPART_CRLF;
-        }
-
-        // Additional part headers
-        if (!empty($params['headers']) && is_array($params['headers'])) {
-            $headers = $params['headers'];
-        }
-
-        foreach ($params as $key => $value) {
-            switch ($key) {
-            case 'encoding':
-                $this->_encoding = $value;
-                $headers['Content-Transfer-Encoding'] = $value;
-                break;
-
-            case 'cid':
-                $headers['Content-ID'] = '<' . $value . '>';
-                break;
-
-            case 'location':
-                $headers['Content-Location'] = $value;
-                break;
-
-            case 'body_file':
-                $this->_body_file = $value;
-                break;
-
-            // for backward compatibility
-            case 'dfilename':
-                $params['filename'] = $value;
-                break;
-            }
-        }
-
-        // Default content-type
-        if (empty($params['content_type'])) {
-            $params['content_type'] = 'text/plain';
-        }
-
-        // Content-Type
-        $headers['Content-Type'] = $params['content_type'];
-        if (!empty($params['charset'])) {
-            $charset = "charset={$params['charset']}";
-            // place charset parameter in the same line, if possible
-            if ((strlen($headers['Content-Type']) + strlen($charset) + 16) <= 76) {
-                $headers['Content-Type'] .= '; ';
-            } else {
-                $headers['Content-Type'] .= ';' . $this->_eol . ' ';
-            }
-            $headers['Content-Type'] .= $charset;
-
-            // Default headers charset
-            if (!isset($params['headers_charset'])) {
-                $params['headers_charset'] = $params['charset'];
-            }
-        }
-
-        // header values encoding parameters
-        $h_charset  = !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII';
-        $h_language = !empty($params['language']) ? $params['language'] : null;
-        $h_encoding = !empty($params['name_encoding']) ? $params['name_encoding'] : null;
-
-
-        if (!empty($params['filename'])) {
-            $headers['Content-Type'] .= ';' . $this->_eol;
-            $headers['Content-Type'] .= $this->_buildHeaderParam(
-                'name', $params['filename'], $h_charset, $h_language, $h_encoding
-            );
-        }
-
-        // Content-Disposition
-        if (!empty($params['disposition'])) {
-            $headers['Content-Disposition'] = $params['disposition'];
-            if (!empty($params['filename'])) {
-                $headers['Content-Disposition'] .= ';' . $this->_eol;
-                $headers['Content-Disposition'] .= $this->_buildHeaderParam(
-                    'filename', $params['filename'], $h_charset, $h_language,
-                    !empty($params['filename_encoding']) ? $params['filename_encoding'] : null
-                );
-            }
-
-            // add attachment size
-            $size = $this->_body_file ? filesize($this->_body_file) : strlen($body);
-            if ($size) {
-                $headers['Content-Disposition'] .= ';' . $this->_eol . ' size=' . $size;
-            }
-        }
-
-        if (!empty($params['description'])) {
-            $headers['Content-Description'] = $this->encodeHeader(
-                'Content-Description', $params['description'], $h_charset, $h_encoding,
-                $this->_eol
-            );
-        }
-
-        // Search and add existing headers' parameters
-        foreach ($headers as $key => $value) {
-            $items = explode(':', $key);
-            if (count($items) == 2) {
-                $header = $items[0];
-                $param  = $items[1];
-                if (isset($headers[$header])) {
-                    $headers[$header] .= ';' . $this->_eol;
-                }
-                $headers[$header] .= $this->_buildHeaderParam(
-                    $param, $value, $h_charset, $h_language, $h_encoding
-                );
-                unset($headers[$key]);
-            }
-        }
-
-        // Default encoding
-        if (!isset($this->_encoding)) {
-            $this->_encoding = '7bit';
-        }
-
-        // Assign stuff to member variables
-        $this->_encoded  = array();
-        $this->_headers  = $headers;
-        $this->_body     = $body;
-    }
-
-    /**
-     * Encodes and returns the email. Also stores
-     * it in the encoded member variable
-     *
-     * @param string $boundary Pre-defined boundary string
-     *
-     * @return An associative array containing two elements,
-     *         body and headers. The headers element is itself
-     *         an indexed array. On error returns PEAR error object.
-     * @access public
-     */
-    function encode($boundary=null)
-    {
-        $encoded =& $this->_encoded;
-
-        if (count($this->_subparts)) {
-            $boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
-            $eol = $this->_eol;
-
-            $this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
-
-            $encoded['body'] = ''; 
-
-            for ($i = 0; $i < count($this->_subparts); $i++) {
-                $encoded['body'] .= '--' . $boundary . $eol;
-                $tmp = $this->_subparts[$i]->encode();
-                if ($this->_isError($tmp)) {
-                    return $tmp;
-                }
-                foreach ($tmp['headers'] as $key => $value) {
-                    $encoded['body'] .= $key . ': ' . $value . $eol;
-                }
-                $encoded['body'] .= $eol . $tmp['body'] . $eol;
-            }
-
-            $encoded['body'] .= '--' . $boundary . '--' . $eol;
-
-        } else if ($this->_body) {
-            $encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding);
-        } else if ($this->_body_file) {
-            // Temporarily reset magic_quotes_runtime for file reads and writes
-            if ($magic_quote_setting = get_magic_quotes_runtime()) {
-                @ini_set('magic_quotes_runtime', 0);
-            }
-            $body = $this->_getEncodedDataFromFile($this->_body_file, $this->_encoding);
-            if ($magic_quote_setting) {
-                @ini_set('magic_quotes_runtime', $magic_quote_setting);
-            }
-
-            if ($this->_isError($body)) {
-                return $body;
-            }
-            $encoded['body'] = $body;
-        } else {
-            $encoded['body'] = '';
-        }
-
-        // Add headers to $encoded
-        $encoded['headers'] =& $this->_headers;
-
-        return $encoded;
-    }
-
-    /**
-     * Encodes and saves the email into file. File must exist.
-     * Data will be appended to the file.
-     *
-     * @param string  $filename  Output file location
-     * @param string  $boundary  Pre-defined boundary string
-     * @param boolean $skip_head True if you don't want to save headers
-     *
-     * @return array An associative array containing message headers
-     *               or PEAR error object
-     * @access public
-     * @since 1.6.0
-     */
-    function encodeToFile($filename, $boundary=null, $skip_head=false)
-    {
-        if (file_exists($filename) && !is_writable($filename)) {
-            $err = $this->_raiseError('File is not writeable: ' . $filename);
-            return $err;
-        }
-
-        if (!($fh = fopen($filename, 'ab'))) {
-            $err = $this->_raiseError('Unable to open file: ' . $filename);
-            return $err;
-        }
-
-        // Temporarily reset magic_quotes_runtime for file reads and writes
-        if ($magic_quote_setting = get_magic_quotes_runtime()) {
-            @ini_set('magic_quotes_runtime', 0);
-        }
-
-        $res = $this->_encodePartToFile($fh, $boundary, $skip_head);
-
-        fclose($fh);
-
-        if ($magic_quote_setting) {
-            @ini_set('magic_quotes_runtime', $magic_quote_setting);
-        }
-
-        return $this->_isError($res) ? $res : $this->_headers;
-    }
-
-    /**
-     * Encodes given email part into file
-     *
-     * @param string  $fh        Output file handle
-     * @param string  $boundary  Pre-defined boundary string
-     * @param boolean $skip_head True if you don't want to save headers
-     *
-     * @return array True on sucess or PEAR error object
-     * @access private
-     */
-    function _encodePartToFile($fh, $boundary=null, $skip_head=false)
-    {
-        $eol = $this->_eol;
-
-        if (count($this->_subparts)) {
-            $boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
-            $this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
-        }
-
-        if (!$skip_head) {
-            foreach ($this->_headers as $key => $value) {
-                fwrite($fh, $key . ': ' . $value . $eol);
-            }
-            $f_eol = $eol;
-        } else {
-            $f_eol = '';
-        }
-
-        if (count($this->_subparts)) {
-            for ($i = 0; $i < count($this->_subparts); $i++) {
-                fwrite($fh, $f_eol . '--' . $boundary . $eol);
-                $res = $this->_subparts[$i]->_encodePartToFile($fh);
-                if ($this->_isError($res)) {
-                    return $res;
-                }
-                $f_eol = $eol;
-            }
-
-            fwrite($fh, $eol . '--' . $boundary . '--' . $eol);
-
-        } else if ($this->_body) {
-            fwrite($fh, $f_eol . $this->_getEncodedData($this->_body, $this->_encoding));
-        } else if ($this->_body_file) {
-            fwrite($fh, $f_eol);
-            $res = $this->_getEncodedDataFromFile(
-                $this->_body_file, $this->_encoding, $fh
-            );
-            if ($this->_isError($res)) {
-                return $res;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Adds a subpart to current mime part and returns
-     * a reference to it
-     *
-     * @param string $body   The body of the subpart, if any.
-     * @param array  $params The parameters for the subpart, same
-     *                       as the $params argument for constructor.
-     *
-     * @return Mail_mimePart A reference to the part you just added. In PHP4, it is
-     *                       crucial if using multipart/* in your subparts that
-     *                       you use =& in your script when calling this function,
-     *                       otherwise you will not be able to add further subparts.
-     * @access public
-     */
-    function &addSubpart($body, $params)
-    {
-        $this->_subparts[] = $part = new Mail_mimePart($body, $params);
-        return $part;
-    }
-
-    /**
-     * Returns encoded data based upon encoding passed to it
-     *
-     * @param string $data     The data to encode.
-     * @param string $encoding The encoding type to use, 7bit, base64,
-     *                         or quoted-printable.
-     *
-     * @return string
-     * @access private
-     */
-    function _getEncodedData($data, $encoding)
-    {
-        switch ($encoding) {
-        case 'quoted-printable':
-            return $this->_quotedPrintableEncode($data);
-            break;
-
-        case 'base64':
-            return rtrim(chunk_split(base64_encode($data), 76, $this->_eol));
-            break;
-
-        case '8bit':
-        case '7bit':
-        default:
-            return $data;
-        }
-    }
-
-    /**
-     * Returns encoded data based upon encoding passed to it
-     *
-     * @param string   $filename Data file location
-     * @param string   $encoding The encoding type to use, 7bit, base64,
-     *                           or quoted-printable.
-     * @param resource $fh       Output file handle. If set, data will be
-     *                           stored into it instead of returning it
-     *
-     * @return string Encoded data or PEAR error object
-     * @access private
-     */
-    function _getEncodedDataFromFile($filename, $encoding, $fh=null)
-    {
-        if (!is_readable($filename)) {
-            $err = $this->_raiseError('Unable to read file: ' . $filename);
-            return $err;
-        }
-
-        if (!($fd = fopen($filename, 'rb'))) {
-            $err = $this->_raiseError('Could not open file: ' . $filename);
-            return $err;
-        }
-
-        $data = '';
-
-        switch ($encoding) {
-        case 'quoted-printable':
-            while (!feof($fd)) {
-                $buffer = $this->_quotedPrintableEncode(fgets($fd));
-                if ($fh) {
-                    fwrite($fh, $buffer);
-                } else {
-                    $data .= $buffer;
-                }
-            }
-            break;
-
-        case 'base64':
-            while (!feof($fd)) {
-                // Should read in a multiple of 57 bytes so that
-                // the output is 76 bytes per line. Don't use big chunks
-                // because base64 encoding is memory expensive
-                $buffer = fread($fd, 57 * 9198); // ca. 0.5 MB
-                $buffer = base64_encode($buffer);
-                $buffer = chunk_split($buffer, 76, $this->_eol);
-                if (feof($fd)) {
-                    $buffer = rtrim($buffer);
-                }
-
-                if ($fh) {
-                    fwrite($fh, $buffer);
-                } else {
-                    $data .= $buffer;
-                }
-            }
-            break;
-
-        case '8bit':
-        case '7bit':
-        default:
-            while (!feof($fd)) {
-                $buffer = fread($fd, 1048576); // 1 MB
-                if ($fh) {
-                    fwrite($fh, $buffer);
-                } else {
-                    $data .= $buffer;
-                }
-            }
-        }
-
-        fclose($fd);
-
-        if (!$fh) {
-            return $data;
-        }
-    }
-
-    /**
-     * Encodes data to quoted-printable standard.
-     *
-     * @param string $input    The data to encode
-     * @param int    $line_max Optional max line length. Should
-     *                         not be more than 76 chars
-     *
-     * @return string Encoded data
-     *
-     * @access private
-     */
-    function _quotedPrintableEncode($input , $line_max = 76)
-    {
-        $eol = $this->_eol;
-        /*
+	/**
+	 * The encoding type of this part
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_encoding;
+
+	/**
+	 * An array of subparts
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_subparts;
+
+	/**
+	 * The output of this part after being built
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_encoded;
+
+	/**
+	 * Headers for this part
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_headers;
+
+	/**
+	 * The body of this part (not encoded)
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_body;
+
+	/**
+	 * The location of file with body of this part (not encoded)
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_body_file;
+
+	/**
+	 * The end-of-line sequence
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_eol = "\r\n";
+
+
+	/**
+	 * Constructor.
+	 *
+	 * Sets up the object.
+	 *
+	 * @param string $body   The body of the mime part if any.
+	 * @param array  $params An associative array of optional parameters:
+	 *     content_type      - The content type for this part eg multipart/mixed
+	 *     encoding          - The encoding to use, 7bit, 8bit,
+	 *                         base64, or quoted-printable
+	 *     charset           - Content character set
+	 *     cid               - Content ID to apply
+	 *     disposition       - Content disposition, inline or attachment
+	 *     filename          - Filename parameter for content disposition
+	 *     description       - Content description
+	 *     name_encoding     - Encoding of the attachment name (Content-Type)
+	 *                         By default filenames are encoded using RFC2231
+	 *                         Here you can set RFC2047 encoding (quoted-printable
+	 *                         or base64) instead
+	 *     filename_encoding - Encoding of the attachment filename (Content-Disposition)
+	 *                         See 'name_encoding'
+	 *     headers_charset   - Charset of the headers e.g. filename, description.
+	 *                         If not set, 'charset' will be used
+	 *     eol               - End of line sequence. Default: "\r\n"
+	 *     headers           - Hash array with additional part headers. Array keys can be
+	 *                         in form of <header_name>:<parameter_name>
+	 *     body_file         - Location of file with part's body (instead of $body)
+	 *
+	 * @access public
+	 */
+	function Mail_mimePart($body = '', $params = array())
+	{
+		if (!empty($params['eol'])) {
+			$this->_eol = $params['eol'];
+		} else if (defined('MAIL_MIMEPART_CRLF')) { // backward-copat.
+			$this->_eol = MAIL_MIMEPART_CRLF;
+		}
+
+		// Additional part headers
+		if (!empty($params['headers']) && is_array($params['headers'])) {
+			$headers = $params['headers'];
+		}
+
+		foreach ($params as $key => $value) {
+			switch ($key) {
+			case 'encoding':
+				$this->_encoding = $value;
+				$headers['Content-Transfer-Encoding'] = $value;
+				break;
+
+			case 'cid':
+				$headers['Content-ID'] = '<' . $value . '>';
+				break;
+
+			case 'location':
+				$headers['Content-Location'] = $value;
+				break;
+
+			case 'body_file':
+				$this->_body_file = $value;
+				break;
+
+			// for backward compatibility
+			case 'dfilename':
+				$params['filename'] = $value;
+				break;
+			}
+		}
+
+		// Default content-type
+		if (empty($params['content_type'])) {
+			$params['content_type'] = 'text/plain';
+		}
+
+		// Content-Type
+		$headers['Content-Type'] = $params['content_type'];
+		if (!empty($params['charset'])) {
+			$charset = "charset={$params['charset']}";
+			// place charset parameter in the same line, if possible
+			if ((strlen($headers['Content-Type']) + strlen($charset) + 16) <= 76) {
+				$headers['Content-Type'] .= '; ';
+			} else {
+				$headers['Content-Type'] .= ';' . $this->_eol . ' ';
+			}
+			$headers['Content-Type'] .= $charset;
+
+			// Default headers charset
+			if (!isset($params['headers_charset'])) {
+				$params['headers_charset'] = $params['charset'];
+			}
+		}
+
+		// header values encoding parameters
+		$h_charset  = !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII';
+		$h_language = !empty($params['language']) ? $params['language'] : null;
+		$h_encoding = !empty($params['name_encoding']) ? $params['name_encoding'] : null;
+
+
+		if (!empty($params['filename'])) {
+			$headers['Content-Type'] .= ';' . $this->_eol;
+			$headers['Content-Type'] .= $this->_buildHeaderParam(
+				'name', $params['filename'], $h_charset, $h_language, $h_encoding
+			);
+		}
+
+		// Content-Disposition
+		if (!empty($params['disposition'])) {
+			$headers['Content-Disposition'] = $params['disposition'];
+			if (!empty($params['filename'])) {
+				$headers['Content-Disposition'] .= ';' . $this->_eol;
+				$headers['Content-Disposition'] .= $this->_buildHeaderParam(
+					'filename', $params['filename'], $h_charset, $h_language,
+					!empty($params['filename_encoding']) ? $params['filename_encoding'] : null
+				);
+			}
+
+			// add attachment size
+			$size = $this->_body_file ? filesize($this->_body_file) : strlen($body);
+			if ($size) {
+				$headers['Content-Disposition'] .= ';' . $this->_eol . ' size=' . $size;
+			}
+		}
+
+		if (!empty($params['description'])) {
+			$headers['Content-Description'] = $this->encodeHeader(
+				'Content-Description', $params['description'], $h_charset, $h_encoding,
+				$this->_eol
+			);
+		}
+
+		// Search and add existing headers' parameters
+		foreach ($headers as $key => $value) {
+			$items = explode(':', $key);
+			if (count($items) == 2) {
+				$header = $items[0];
+				$param  = $items[1];
+				if (isset($headers[$header])) {
+					$headers[$header] .= ';' . $this->_eol;
+				}
+				$headers[$header] .= $this->_buildHeaderParam(
+					$param, $value, $h_charset, $h_language, $h_encoding
+				);
+				unset($headers[$key]);
+			}
+		}
+
+		// Default encoding
+		if (!isset($this->_encoding)) {
+			$this->_encoding = '7bit';
+		}
+
+		// Assign stuff to member variables
+		$this->_encoded  = array();
+		$this->_headers  = $headers;
+		$this->_body     = $body;
+	}
+
+	/**
+	 * Encodes and returns the email. Also stores
+	 * it in the encoded member variable
+	 *
+	 * @param string $boundary Pre-defined boundary string
+	 *
+	 * @return An associative array containing two elements,
+	 *         body and headers. The headers element is itself
+	 *         an indexed array. On error returns PEAR error object.
+	 * @access public
+	 */
+	function encode($boundary=null)
+	{
+		$encoded =& $this->_encoded;
+
+		if (count($this->_subparts)) {
+			$boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
+			$eol = $this->_eol;
+
+			$this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
+
+			$encoded['body'] = ''; 
+
+			for ($i = 0; $i < count($this->_subparts); $i++) {
+				$encoded['body'] .= '--' . $boundary . $eol;
+				$tmp = $this->_subparts[$i]->encode();
+				if ($this->_isError($tmp)) {
+					return $tmp;
+				}
+				foreach ($tmp['headers'] as $key => $value) {
+					$encoded['body'] .= $key . ': ' . $value . $eol;
+				}
+				$encoded['body'] .= $eol . $tmp['body'] . $eol;
+			}
+
+			$encoded['body'] .= '--' . $boundary . '--' . $eol;
+
+		} else if ($this->_body) {
+			$encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding);
+		} else if ($this->_body_file) {
+			// Temporarily reset magic_quotes_runtime for file reads and writes
+			if ($magic_quote_setting = get_magic_quotes_runtime()) {
+				@ini_set('magic_quotes_runtime', 0);
+			}
+			$body = $this->_getEncodedDataFromFile($this->_body_file, $this->_encoding);
+			if ($magic_quote_setting) {
+				@ini_set('magic_quotes_runtime', $magic_quote_setting);
+			}
+
+			if ($this->_isError($body)) {
+				return $body;
+			}
+			$encoded['body'] = $body;
+		} else {
+			$encoded['body'] = '';
+		}
+
+		// Add headers to $encoded
+		$encoded['headers'] =& $this->_headers;
+
+		return $encoded;
+	}
+
+	/**
+	 * Encodes and saves the email into file. File must exist.
+	 * Data will be appended to the file.
+	 *
+	 * @param string  $filename  Output file location
+	 * @param string  $boundary  Pre-defined boundary string
+	 * @param boolean $skip_head True if you don't want to save headers
+	 *
+	 * @return array An associative array containing message headers
+	 *               or PEAR error object
+	 * @access public
+	 * @since 1.6.0
+	 */
+	function encodeToFile($filename, $boundary=null, $skip_head=false)
+	{
+		if (file_exists($filename) && !is_writable($filename)) {
+			$err = $this->_raiseError('File is not writeable: ' . $filename);
+			return $err;
+		}
+
+		if (!($fh = fopen($filename, 'ab'))) {
+			$err = $this->_raiseError('Unable to open file: ' . $filename);
+			return $err;
+		}
+
+		// Temporarily reset magic_quotes_runtime for file reads and writes
+		if ($magic_quote_setting = get_magic_quotes_runtime()) {
+			@ini_set('magic_quotes_runtime', 0);
+		}
+
+		$res = $this->_encodePartToFile($fh, $boundary, $skip_head);
+
+		fclose($fh);
+
+		if ($magic_quote_setting) {
+			@ini_set('magic_quotes_runtime', $magic_quote_setting);
+		}
+
+		return $this->_isError($res) ? $res : $this->_headers;
+	}
+
+	/**
+	 * Encodes given email part into file
+	 *
+	 * @param string  $fh        Output file handle
+	 * @param string  $boundary  Pre-defined boundary string
+	 * @param boolean $skip_head True if you don't want to save headers
+	 *
+	 * @return array True on sucess or PEAR error object
+	 * @access private
+	 */
+	function _encodePartToFile($fh, $boundary=null, $skip_head=false)
+	{
+		$eol = $this->_eol;
+
+		if (count($this->_subparts)) {
+			$boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
+			$this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
+		}
+
+		if (!$skip_head) {
+			foreach ($this->_headers as $key => $value) {
+				fwrite($fh, $key . ': ' . $value . $eol);
+			}
+			$f_eol = $eol;
+		} else {
+			$f_eol = '';
+		}
+
+		if (count($this->_subparts)) {
+			for ($i = 0; $i < count($this->_subparts); $i++) {
+				fwrite($fh, $f_eol . '--' . $boundary . $eol);
+				$res = $this->_subparts[$i]->_encodePartToFile($fh);
+				if ($this->_isError($res)) {
+					return $res;
+				}
+				$f_eol = $eol;
+			}
+
+			fwrite($fh, $eol . '--' . $boundary . '--' . $eol);
+
+		} else if ($this->_body) {
+			fwrite($fh, $f_eol . $this->_getEncodedData($this->_body, $this->_encoding));
+		} else if ($this->_body_file) {
+			fwrite($fh, $f_eol);
+			$res = $this->_getEncodedDataFromFile(
+				$this->_body_file, $this->_encoding, $fh
+			);
+			if ($this->_isError($res)) {
+				return $res;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Adds a subpart to current mime part and returns
+	 * a reference to it
+	 *
+	 * @param string $body   The body of the subpart, if any.
+	 * @param array  $params The parameters for the subpart, same
+	 *                       as the $params argument for constructor.
+	 *
+	 * @return Mail_mimePart A reference to the part you just added. In PHP4, it is
+	 *                       crucial if using multipart/* in your subparts that
+	 *                       you use =& in your script when calling this function,
+	 *                       otherwise you will not be able to add further subparts.
+	 * @access public
+	 */
+	function &addSubpart($body, $params)
+	{
+		$this->_subparts[] = $part = new Mail_mimePart($body, $params);
+		return $part;
+	}
+
+	/**
+	 * Returns encoded data based upon encoding passed to it
+	 *
+	 * @param string $data     The data to encode.
+	 * @param string $encoding The encoding type to use, 7bit, base64,
+	 *                         or quoted-printable.
+	 *
+	 * @return string
+	 * @access private
+	 */
+	function _getEncodedData($data, $encoding)
+	{
+		switch ($encoding) {
+		case 'quoted-printable':
+			return $this->_quotedPrintableEncode($data);
+			break;
+
+		case 'base64':
+			return rtrim(chunk_split(base64_encode($data), 76, $this->_eol));
+			break;
+
+		case '8bit':
+		case '7bit':
+		default:
+			return $data;
+		}
+	}
+
+	/**
+	 * Returns encoded data based upon encoding passed to it
+	 *
+	 * @param string   $filename Data file location
+	 * @param string   $encoding The encoding type to use, 7bit, base64,
+	 *                           or quoted-printable.
+	 * @param resource $fh       Output file handle. If set, data will be
+	 *                           stored into it instead of returning it
+	 *
+	 * @return string Encoded data or PEAR error object
+	 * @access private
+	 */
+	function _getEncodedDataFromFile($filename, $encoding, $fh=null)
+	{
+		if (!is_readable($filename)) {
+			$err = $this->_raiseError('Unable to read file: ' . $filename);
+			return $err;
+		}
+
+		if (!($fd = fopen($filename, 'rb'))) {
+			$err = $this->_raiseError('Could not open file: ' . $filename);
+			return $err;
+		}
+
+		$data = '';
+
+		switch ($encoding) {
+		case 'quoted-printable':
+			while (!feof($fd)) {
+				$buffer = $this->_quotedPrintableEncode(fgets($fd));
+				if ($fh) {
+					fwrite($fh, $buffer);
+				} else {
+					$data .= $buffer;
+				}
+			}
+			break;
+
+		case 'base64':
+			while (!feof($fd)) {
+				// Should read in a multiple of 57 bytes so that
+				// the output is 76 bytes per line. Don't use big chunks
+				// because base64 encoding is memory expensive
+				$buffer = fread($fd, 57 * 9198); // ca. 0.5 MB
+				$buffer = base64_encode($buffer);
+				$buffer = chunk_split($buffer, 76, $this->_eol);
+				if (feof($fd)) {
+					$buffer = rtrim($buffer);
+				}
+
+				if ($fh) {
+					fwrite($fh, $buffer);
+				} else {
+					$data .= $buffer;
+				}
+			}
+			break;
+
+		case '8bit':
+		case '7bit':
+		default:
+			while (!feof($fd)) {
+				$buffer = fread($fd, 1048576); // 1 MB
+				if ($fh) {
+					fwrite($fh, $buffer);
+				} else {
+					$data .= $buffer;
+				}
+			}
+		}
+
+		fclose($fd);
+
+		if (!$fh) {
+			return $data;
+		}
+	}
+
+	/**
+	 * Encodes data to quoted-printable standard.
+	 *
+	 * @param string $input    The data to encode
+	 * @param int    $line_max Optional max line length. Should
+	 *                         not be more than 76 chars
+	 *
+	 * @return string Encoded data
+	 *
+	 * @access private
+	 */
+	function _quotedPrintableEncode($input , $line_max = 76)
+	{
+		$eol = $this->_eol;
+		/*
         // imap_8bit() is extremely fast, but doesn't handle properly some characters
         if (function_exists('imap_8bit') && $line_max == 76) {
             $input = preg_replace('/\r?\n/', "\r\n", $input);
@@ -599,662 +599,662 @@ 
             return $input;
         }
         */
-        $lines  = preg_split("/\r?\n/", $input);
-        $escape = '=';
-        $output = '';
-
-        while (list($idx, $line) = each($lines)) {
-            $newline = '';
-            $i = 0;
-
-            while (isset($line[$i])) {
-                $char = $line[$i];
-                $dec  = ord($char);
-                $i++;
-
-                if (($dec == 32) && (!isset($line[$i]))) {
-                    // convert space at eol only
-                    $char = '=20';
-                } elseif ($dec == 9 && isset($line[$i])) {
-                    ; // Do nothing if a TAB is not on eol
-                } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) {
-                    $char = $escape . sprintf('%02X', $dec);
-                } elseif (($dec == 46) && (($newline == '')
-                    || ((strlen($newline) + strlen("=2E")) >= $line_max))
-                ) {
-                    // Bug #9722: convert full-stop at bol,
-                    // some Windows servers need this, won't break anything (cipri)
-                    // Bug #11731: full-stop at bol also needs to be encoded
-                    // if this line would push us over the line_max limit.
-                    $char = '=2E';
-                }
-
-                // Note, when changing this line, also change the ($dec == 46)
-                // check line, as it mimics this line due to Bug #11731
-                // EOL is not counted
-                if ((strlen($newline) + strlen($char)) >= $line_max) {
-                    // soft line break; " =\r\n" is okay
-                    $output  .= $newline . $escape . $eol;
-                    $newline  = '';
-                }
-                $newline .= $char;
-            } // end of for
-            $output .= $newline . $eol;
-            unset($lines[$idx]);
-        }
-        // Don't want last crlf
-        $output = substr($output, 0, -1 * strlen($eol));
-        return $output;
-    }
-
-    /**
-     * Encodes the parameter of a header.
-     *
-     * @param string $name      The name of the header-parameter
-     * @param string $value     The value of the paramter
-     * @param string $charset   The characterset of $value
-     * @param string $language  The language used in $value
-     * @param string $encoding  Parameter encoding. If not set, parameter value
-     *                          is encoded according to RFC2231
-     * @param int    $maxLength The maximum length of a line. Defauls to 75
-     *
-     * @return string
-     *
-     * @access private
-     */
-    function _buildHeaderParam($name, $value, $charset=null, $language=null,
-        $encoding=null, $maxLength=75
-    ) {
-        // RFC 2045:
-        // value needs encoding if contains non-ASCII chars or is longer than 78 chars
-        if (!preg_match('#[^\x20-\x7E]#', $value)) {
-            $token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
-                . '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
-            if (!preg_match($token_regexp, $value)) {
-                // token
-                if (strlen($name) + strlen($value) + 3 <= $maxLength) {
-                    return " {$name}={$value}";
-                }
-            } else {
-                // quoted-string
-                $quoted = addcslashes($value, '\\"');
-                if (strlen($name) + strlen($quoted) + 5 <= $maxLength) {
-                    return " {$name}=\"{$quoted}\"";
-                }
-            }
-        }
-
-        // RFC2047: use quoted-printable/base64 encoding
-        if ($encoding == 'quoted-printable' || $encoding == 'base64') {
-            return $this->_buildRFC2047Param($name, $value, $charset, $encoding);
-        }
-
-        // RFC2231:
-        $encValue = preg_replace_callback(
-            '/([^\x21\x23\x24\x26\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E])/',
-            array($this, '_encodeReplaceCallback'), $value
-        );
-        $value = "$charset'$language'$encValue";
-
-        $header = " {$name}*={$value}";
-        if (strlen($header) <= $maxLength) {
-            return $header;
-        }
-
-        $preLength = strlen(" {$name}*0*=");
-        $maxLength = max(16, $maxLength - $preLength - 3);
-        $maxLengthReg = "|(.{0,$maxLength}[^\%][^\%])|";
-
-        $headers = array();
-        $headCount = 0;
-        while ($value) {
-            $matches = array();
-            $found = preg_match($maxLengthReg, $value, $matches);
-            if ($found) {
-                $headers[] = " {$name}*{$headCount}*={$matches[0]}";
-                $value = substr($value, strlen($matches[0]));
-            } else {
-                $headers[] = " {$name}*{$headCount}*={$value}";
-                $value = '';
-            }
-            $headCount++;
-        }
-
-        $headers = implode(';' . $this->_eol, $headers);
-        return $headers;
-    }
-
-    /**
-     * Encodes header parameter as per RFC2047 if needed
-     *
-     * @param string $name      The parameter name
-     * @param string $value     The parameter value
-     * @param string $charset   The parameter charset
-     * @param string $encoding  Encoding type (quoted-printable or base64)
-     * @param int    $maxLength Encoded parameter max length. Default: 76
-     *
-     * @return string Parameter line
-     * @access private
-     */
-    function _buildRFC2047Param($name, $value, $charset,
-        $encoding='quoted-printable', $maxLength=76
-    ) {
-        // WARNING: RFC 2047 says: "An 'encoded-word' MUST NOT be used in
-        // parameter of a MIME Content-Type or Content-Disposition field",
-        // but... it's supported by many clients/servers
-        $quoted = '';
-
-        if ($encoding == 'base64') {
-            $value = base64_encode($value);
-            $prefix = '=?' . $charset . '?B?';
-            $suffix = '?=';
-
-            // 2 x SPACE, 2 x '"', '=', ';'
-            $add_len = strlen($prefix . $suffix) + strlen($name) + 6;
-            $len = $add_len + strlen($value);
-
-            while ($len > $maxLength) { 
-                // We can cut base64-encoded string every 4 characters
-                $real_len = floor(($maxLength - $add_len) / 4) * 4;
-                $_quote = substr($value, 0, $real_len);
-                $value = substr($value, $real_len);
-
-                $quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
-                $add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
-                $len = strlen($value) + $add_len;
-            }
-            $quoted .= $prefix . $value . $suffix;
-
-        } else {
-            // quoted-printable
-            $value = $this->encodeQP($value);
-            $prefix = '=?' . $charset . '?Q?';
-            $suffix = '?=';
-
-            // 2 x SPACE, 2 x '"', '=', ';'
-            $add_len = strlen($prefix . $suffix) + strlen($name) + 6;
-            $len = $add_len + strlen($value);
-
-            while ($len > $maxLength) {
-                $length = $maxLength - $add_len;
-                // don't break any encoded letters
-                if (preg_match("/^(.{0,$length}[^\=][^\=])/", $value, $matches)) {
-                    $_quote = $matches[1];
-                }
-
-                $quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
-                $value = substr($value, strlen($_quote));
-                $add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
-                $len = strlen($value) + $add_len;
-            }
-
-            $quoted .= $prefix . $value . $suffix;
-        }
-
-        return " {$name}=\"{$quoted}\"";
-    }
-
-    /**
-     * Encodes a header as per RFC2047
-     *
-     * @param string $name     The header name
-     * @param string $value    The header data to encode
-     * @param string $charset  Character set name
-     * @param string $encoding Encoding name (base64 or quoted-printable)
-     * @param string $eol      End-of-line sequence. Default: "\r\n"
-     *
-     * @return string          Encoded header data (without a name)
-     * @access public
-     * @since 1.6.1
-     */
-    function encodeHeader($name, $value, $charset='ISO-8859-1',
-        $encoding='quoted-printable', $eol="\r\n"
-    ) {
-        // Structured headers
-        $comma_headers = array(
-            'from', 'to', 'cc', 'bcc', 'sender', 'reply-to',
-            'resent-from', 'resent-to', 'resent-cc', 'resent-bcc',
-            'resent-sender', 'resent-reply-to',
-            'mail-reply-to', 'mail-followup-to',
-            'return-receipt-to', 'disposition-notification-to',
-        );
-        $other_headers = array(
-            'references', 'in-reply-to', 'message-id', 'resent-message-id',
-        );
-
-        $name = strtolower($name);
-
-        if (in_array($name, $comma_headers)) {
-            $separator = ',';
-        } else if (in_array($name, $other_headers)) {
-            $separator = ' ';
-        }
-
-        if (!$charset) {
-            $charset = 'ISO-8859-1';
-        }
-
-        // Structured header (make sure addr-spec inside is not encoded)
-        if (!empty($separator)) {
-            // Simple e-mail address regexp
-            $email_regexp = '([^\s<]+|("[^\r\n"]+"))@\S+';
-
-            $parts = Mail_mimePart::_explodeQuotedString("[\t$separator]", $value);
-            $value = '';
-
-            foreach ($parts as $part) {
-                $part = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $part);
-                $part = trim($part);
-
-                if (!$part) {
-                    continue;
-                }
-                if ($value) {
-                    $value .= $separator == ',' ? $separator . ' ' : ' ';
-                } else {
-                    $value = $name . ': ';
-                }
-
-                // let's find phrase (name) and/or addr-spec
-                if (preg_match('/^<' . $email_regexp . '>$/', $part)) {
-                    $value .= $part;
-                } else if (preg_match('/^' . $email_regexp . '$/', $part)) {
-                    // address without brackets and without name
-                    $value .= $part;
-                } else if (preg_match('/<*' . $email_regexp . '>*$/', $part, $matches)) {
-                    // address with name (handle name)
-                    $address = $matches[0];
-                    $word = str_replace($address, '', $part);
-                    $word = trim($word);
-                    // check if phrase requires quoting
-                    if ($word) {
-                        // non-ASCII: require encoding
-                        if (preg_match('#([^\s\x21-\x7E]){1}#', $word)) {
-                            if ($word[0] == '"' && $word[strlen($word)-1] == '"') {
-                                // de-quote quoted-string, encoding changes
-                                // string to atom
-                                $search = array("\\\"", "\\\\");
-                                $replace = array("\"", "\\");
-                                $word = str_replace($search, $replace, $word);
-                                $word = substr($word, 1, -1);
-                            }
-                            // find length of last line
-                            if (($pos = strrpos($value, $eol)) !== false) {
-                                $last_len = strlen($value) - $pos;
-                            } else {
-                                $last_len = strlen($value);
-                            }
-                            $word = Mail_mimePart::encodeHeaderValue(
-                                $word, $charset, $encoding, $last_len, $eol
-                            );
-                        } else if (($word[0] != '"' || $word[strlen($word)-1] != '"')
-                            && preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $word)
-                        ) {
-                            // ASCII: quote string if needed
-                            $word = '"'.addcslashes($word, '\\"').'"';
-                        }
-                    }
-                    $value .= $word.' '.$address;
-                } else {
-                    // addr-spec not found, don't encode (?)
-                    $value .= $part;
-                }
-
-                // RFC2822 recommends 78 characters limit, use 76 from RFC2047
-                $value = wordwrap($value, 76, $eol . ' ');
-            }
-
-            // remove header name prefix (there could be EOL too)
-            $value = preg_replace(
-                '/^'.$name.':('.preg_quote($eol, '/').')* /', '', $value
-            );
-        } else {
-            // Unstructured header
-            // non-ASCII: require encoding
-            if (preg_match('#([^\s\x21-\x7E]){1}#', $value)) {
-                if ($value[0] == '"' && $value[strlen($value)-1] == '"') {
-                    // de-quote quoted-string, encoding changes
-                    // string to atom
-                    $search = array("\\\"", "\\\\");
-                    $replace = array("\"", "\\");
-                    $value = str_replace($search, $replace, $value);
-                    $value = substr($value, 1, -1);
-                }
-                $value = Mail_mimePart::encodeHeaderValue(
-                    $value, $charset, $encoding, strlen($name) + 2, $eol
-                );
-            } else if (strlen($name.': '.$value) > 78) {
-                // ASCII: check if header line isn't too long and use folding
-                $value = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $value);
-                $tmp = wordwrap($name.': '.$value, 78, $eol . ' ');
-                $value = preg_replace('/^'.$name.':\s*/', '', $tmp);
-                // hard limit 998 (RFC2822)
-                $value = wordwrap($value, 998, $eol . ' ', true);
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Explode quoted string
-     *
-     * @param string $delimiter Delimiter expression string for preg_match()
-     * @param string $string    Input string
-     *
-     * @return array            String tokens array
-     * @access private
-     */
-    function _explodeQuotedString($delimiter, $string)
-    {
-        $result = array();
-        $strlen = strlen($string);
-
-        for ($q=$p=$i=0; $i < $strlen; $i++) {
-            if ($string[$i] == "\""
-                && (empty($string[$i-1]) || $string[$i-1] != "\\")
-            ) {
-                $q = $q ? false : true;
-            } else if (!$q && preg_match("/$delimiter/", $string[$i])) {
-                $result[] = substr($string, $p, $i - $p);
-                $p = $i + 1;
-            }
-        }
-
-        $result[] = substr($string, $p);
-        return $result;
-    }
-
-    /**
-     * Encodes a header value as per RFC2047
-     *
-     * @param string $value      The header data to encode
-     * @param string $charset    Character set name
-     * @param string $encoding   Encoding name (base64 or quoted-printable)
-     * @param int    $prefix_len Prefix length. Default: 0
-     * @param string $eol        End-of-line sequence. Default: "\r\n"
-     *
-     * @return string            Encoded header data
-     * @access public
-     * @since 1.6.1
-     */
-    function encodeHeaderValue($value, $charset, $encoding, $prefix_len=0, $eol="\r\n")
-    {
-        // #17311: Use multibyte aware method (requires mbstring extension)
-        if ($result = Mail_mimePart::encodeMB($value, $charset, $encoding, $prefix_len, $eol)) {
-            return $result;
-        }
-
-        // Generate the header using the specified params and dynamicly
-        // determine the maximum length of such strings.
-        // 75 is the value specified in the RFC.
-        $encoding = $encoding == 'base64' ? 'B' : 'Q';
-        $prefix = '=?' . $charset . '?' . $encoding .'?';
-        $suffix = '?=';
-        $maxLength = 75 - strlen($prefix . $suffix);
-        $maxLength1stLine = $maxLength - $prefix_len;
-
-        if ($encoding == 'B') {
-            // Base64 encode the entire string
-            $value = base64_encode($value);
-
-            // We can cut base64 every 4 characters, so the real max
-            // we can get must be rounded down.
-            $maxLength = $maxLength - ($maxLength % 4);
-            $maxLength1stLine = $maxLength1stLine - ($maxLength1stLine % 4);
-
-            $cutpoint = $maxLength1stLine;
-            $output = '';
-
-            while ($value) {
-                // Split translated string at every $maxLength
-                $part = substr($value, 0, $cutpoint);
-                $value = substr($value, $cutpoint);
-                $cutpoint = $maxLength;
-                // RFC 2047 specifies that any split header should
-                // be separated by a CRLF SPACE.
-                if ($output) {
-                    $output .= $eol . ' ';
-                }
-                $output .= $prefix . $part . $suffix;
-            }
-            $value = $output;
-        } else {
-            // quoted-printable encoding has been selected
-            $value = Mail_mimePart::encodeQP($value);
-
-            // This regexp will break QP-encoded text at every $maxLength
-            // but will not break any encoded letters.
-            $reg1st = "|(.{0,$maxLength1stLine}[^\=][^\=])|";
-            $reg2nd = "|(.{0,$maxLength}[^\=][^\=])|";
-
-            if (strlen($value) > $maxLength1stLine) {
-                // Begin with the regexp for the first line.
-                $reg = $reg1st;
-                $output = '';
-                while ($value) {
-                    // Split translated string at every $maxLength
-                    // But make sure not to break any translated chars.
-                    $found = preg_match($reg, $value, $matches);
-
-                    // After this first line, we need to use a different
-                    // regexp for the first line.
-                    $reg = $reg2nd;
-
-                    // Save the found part and encapsulate it in the
-                    // prefix & suffix. Then remove the part from the
-                    // $value_out variable.
-                    if ($found) {
-                        $part = $matches[0];
-                        $len = strlen($matches[0]);
-                        $value = substr($value, $len);
-                    } else {
-                        $part = $value;
-                        $value = '';
-                    }
-
-                    // RFC 2047 specifies that any split header should
-                    // be separated by a CRLF SPACE
-                    if ($output) {
-                        $output .= $eol . ' ';
-                    }
-                    $output .= $prefix . $part . $suffix;
-                }
-                $value = $output;
-            } else {
-                $value = $prefix . $value . $suffix;
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Encodes the given string using quoted-printable
-     *
-     * @param string $str String to encode
-     *
-     * @return string     Encoded string
-     * @access public
-     * @since 1.6.0
-     */
-    function encodeQP($str)
-    {
-        // Bug #17226 RFC 2047 restricts some characters
-        // if the word is inside a phrase, permitted chars are only:
-        // ASCII letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
-
-        // "=",  "_",  "?" must be encoded
-        $regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
-        $str = preg_replace_callback(
-            $regexp, array('Mail_mimePart', '_qpReplaceCallback'), $str
-        );
-
-        return str_replace(' ', '_', $str);
-    }
-
-    /**
-     * Encodes the given string using base64 or quoted-printable.
-     * This method makes sure that encoded-word represents an integral
-     * number of characters as per RFC2047.
-     *
-     * @param string $str        String to encode
-     * @param string $charset    Character set name
-     * @param string $encoding   Encoding name (base64 or quoted-printable)
-     * @param int    $prefix_len Prefix length. Default: 0
-     * @param string $eol        End-of-line sequence. Default: "\r\n"
-     *
-     * @return string     Encoded string
-     * @access public
-     * @since 1.8.0
-     */
-    function encodeMB($str, $charset, $encoding, $prefix_len=0, $eol="\r\n")
-    {
-        if (!function_exists('mb_substr') || !function_exists('mb_strlen')) {
-            return;
-        }
-
-        $encoding = $encoding == 'base64' ? 'B' : 'Q';
-        // 75 is the value specified in the RFC
-        $prefix = '=?' . $charset . '?'.$encoding.'?';
-        $suffix = '?=';
-        $maxLength = 75 - strlen($prefix . $suffix);
-
-        // A multi-octet character may not be split across adjacent encoded-words
-        // So, we'll loop over each character
-        // mb_stlen() with wrong charset will generate a warning here and return null
-        $length      = mb_strlen($str, $charset);
-        $result      = '';
-        $line_length = $prefix_len;
-
-        if ($encoding == 'B') {
-            // base64
-            $start = 0;
-            $prev  = '';
-
-            for ($i=1; $i<=$length; $i++) {
-                // See #17311
-                $chunk = mb_substr($str, $start, $i-$start, $charset);
-                $chunk = base64_encode($chunk);
-                $chunk_len = strlen($chunk);
-
-                if ($line_length + $chunk_len == $maxLength || $i == $length) {
-                    if ($result) {
-                        $result .= "\n";
-                    }
-                    $result .= $chunk;
-                    $line_length = 0;
-                    $start = $i;
-                } else if ($line_length + $chunk_len > $maxLength) {
-                    if ($result) {
-                        $result .= "\n";
-                    }
-                    if ($prev) {
-                        $result .= $prev;
-                    }
-                    $line_length = 0;
-                    $start = $i - 1;
-                } else {
-                    $prev = $chunk;
-                }
-            }
-        } else {
-            // quoted-printable
-            // see encodeQP()
-            $regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
-
-            for ($i=0; $i<=$length; $i++) {
-                $char = mb_substr($str, $i, 1, $charset);
-                // RFC recommends underline (instead of =20) in place of the space
-                // that's one of the reasons why we're not using iconv_mime_encode()
-                if ($char == ' ') {
-                    $char = '_';
-                    $char_len = 1;
-                } else {
-                    $char = preg_replace_callback(
-                        $regexp, array('Mail_mimePart', '_qpReplaceCallback'), $char
-                    );
-                    $char_len = strlen($char);
-                }
-
-                if ($line_length + $char_len > $maxLength) {
-                    if ($result) {
-                        $result .= "\n";
-                    }
-                    $line_length = 0;
-                }
-
-                $result      .= $char;
-                $line_length += $char_len;
-            }
-        }
-
-        if ($result) {
-            $result = $prefix
-                .str_replace("\n", $suffix.$eol.' '.$prefix, $result).$suffix;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Callback function to replace extended characters (\x80-xFF) with their
-     * ASCII values (RFC2047: quoted-printable)
-     *
-     * @param array $matches Preg_replace's matches array
-     *
-     * @return string        Encoded character string
-     * @access private
-     */
-    function _qpReplaceCallback($matches)
-    {
-        return sprintf('=%02X', ord($matches[1]));
-    }
-
-    /**
-     * Callback function to replace extended characters (\x80-xFF) with their
-     * ASCII values (RFC2231)
-     *
-     * @param array $matches Preg_replace's matches array
-     *
-     * @return string        Encoded character string
-     * @access private
-     */
-    function _encodeReplaceCallback($matches)
-    {
-        return sprintf('%%%02X', ord($matches[1]));
-    }
-
-    /**
-     * PEAR::isError implementation
-     *
-     * @param mixed $data Object
-     *
-     * @return bool True if object is an instance of PEAR_Error
-     * @access private
-     */
-    function _isError($data)
-    {
-        // PEAR::isError() is not PHP 5.4 compatible (see Bug #19473)
-        if (is_object($data) && is_a($data, 'PEAR_Error')) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * PEAR::raiseError implementation
-     *
-     * @param $message A text error message
-     *
-     * @return PEAR_Error Instance of PEAR_Error
-     * @access private
-     */
-    function _raiseError($message)
-    {
-        // PEAR::raiseError() is not PHP 5.4 compatible
-        return new PEAR_Error($message);
-    }
+		$lines  = preg_split("/\r?\n/", $input);
+		$escape = '=';
+		$output = '';
+
+		while (list($idx, $line) = each($lines)) {
+			$newline = '';
+			$i = 0;
+
+			while (isset($line[$i])) {
+				$char = $line[$i];
+				$dec  = ord($char);
+				$i++;
+
+				if (($dec == 32) && (!isset($line[$i]))) {
+					// convert space at eol only
+					$char = '=20';
+				} elseif ($dec == 9 && isset($line[$i])) {
+					; // Do nothing if a TAB is not on eol
+				} elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) {
+					$char = $escape . sprintf('%02X', $dec);
+				} elseif (($dec == 46) && (($newline == '')
+					|| ((strlen($newline) + strlen("=2E")) >= $line_max))
+				) {
+					// Bug #9722: convert full-stop at bol,
+					// some Windows servers need this, won't break anything (cipri)
+					// Bug #11731: full-stop at bol also needs to be encoded
+					// if this line would push us over the line_max limit.
+					$char = '=2E';
+				}
+
+				// Note, when changing this line, also change the ($dec == 46)
+				// check line, as it mimics this line due to Bug #11731
+				// EOL is not counted
+				if ((strlen($newline) + strlen($char)) >= $line_max) {
+					// soft line break; " =\r\n" is okay
+					$output  .= $newline . $escape . $eol;
+					$newline  = '';
+				}
+				$newline .= $char;
+			} // end of for
+			$output .= $newline . $eol;
+			unset($lines[$idx]);
+		}
+		// Don't want last crlf
+		$output = substr($output, 0, -1 * strlen($eol));
+		return $output;
+	}
+
+	/**
+	 * Encodes the parameter of a header.
+	 *
+	 * @param string $name      The name of the header-parameter
+	 * @param string $value     The value of the paramter
+	 * @param string $charset   The characterset of $value
+	 * @param string $language  The language used in $value
+	 * @param string $encoding  Parameter encoding. If not set, parameter value
+	 *                          is encoded according to RFC2231
+	 * @param int    $maxLength The maximum length of a line. Defauls to 75
+	 *
+	 * @return string
+	 *
+	 * @access private
+	 */
+	function _buildHeaderParam($name, $value, $charset=null, $language=null,
+		$encoding=null, $maxLength=75
+	) {
+		// RFC 2045:
+		// value needs encoding if contains non-ASCII chars or is longer than 78 chars
+		if (!preg_match('#[^\x20-\x7E]#', $value)) {
+			$token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
+				. '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
+			if (!preg_match($token_regexp, $value)) {
+				// token
+				if (strlen($name) + strlen($value) + 3 <= $maxLength) {
+					return " {$name}={$value}";
+				}
+			} else {
+				// quoted-string
+				$quoted = addcslashes($value, '\\"');
+				if (strlen($name) + strlen($quoted) + 5 <= $maxLength) {
+					return " {$name}=\"{$quoted}\"";
+				}
+			}
+		}
+
+		// RFC2047: use quoted-printable/base64 encoding
+		if ($encoding == 'quoted-printable' || $encoding == 'base64') {
+			return $this->_buildRFC2047Param($name, $value, $charset, $encoding);
+		}
+
+		// RFC2231:
+		$encValue = preg_replace_callback(
+			'/([^\x21\x23\x24\x26\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E])/',
+			array($this, '_encodeReplaceCallback'), $value
+		);
+		$value = "$charset'$language'$encValue";
+
+		$header = " {$name}*={$value}";
+		if (strlen($header) <= $maxLength) {
+			return $header;
+		}
+
+		$preLength = strlen(" {$name}*0*=");
+		$maxLength = max(16, $maxLength - $preLength - 3);
+		$maxLengthReg = "|(.{0,$maxLength}[^\%][^\%])|";
+
+		$headers = array();
+		$headCount = 0;
+		while ($value) {
+			$matches = array();
+			$found = preg_match($maxLengthReg, $value, $matches);
+			if ($found) {
+				$headers[] = " {$name}*{$headCount}*={$matches[0]}";
+				$value = substr($value, strlen($matches[0]));
+			} else {
+				$headers[] = " {$name}*{$headCount}*={$value}";
+				$value = '';
+			}
+			$headCount++;
+		}
+
+		$headers = implode(';' . $this->_eol, $headers);
+		return $headers;
+	}
+
+	/**
+	 * Encodes header parameter as per RFC2047 if needed
+	 *
+	 * @param string $name      The parameter name
+	 * @param string $value     The parameter value
+	 * @param string $charset   The parameter charset
+	 * @param string $encoding  Encoding type (quoted-printable or base64)
+	 * @param int    $maxLength Encoded parameter max length. Default: 76
+	 *
+	 * @return string Parameter line
+	 * @access private
+	 */
+	function _buildRFC2047Param($name, $value, $charset,
+		$encoding='quoted-printable', $maxLength=76
+	) {
+		// WARNING: RFC 2047 says: "An 'encoded-word' MUST NOT be used in
+		// parameter of a MIME Content-Type or Content-Disposition field",
+		// but... it's supported by many clients/servers
+		$quoted = '';
+
+		if ($encoding == 'base64') {
+			$value = base64_encode($value);
+			$prefix = '=?' . $charset . '?B?';
+			$suffix = '?=';
+
+			// 2 x SPACE, 2 x '"', '=', ';'
+			$add_len = strlen($prefix . $suffix) + strlen($name) + 6;
+			$len = $add_len + strlen($value);
+
+			while ($len > $maxLength) { 
+				// We can cut base64-encoded string every 4 characters
+				$real_len = floor(($maxLength - $add_len) / 4) * 4;
+				$_quote = substr($value, 0, $real_len);
+				$value = substr($value, $real_len);
+
+				$quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
+				$add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
+				$len = strlen($value) + $add_len;
+			}
+			$quoted .= $prefix . $value . $suffix;
+
+		} else {
+			// quoted-printable
+			$value = $this->encodeQP($value);
+			$prefix = '=?' . $charset . '?Q?';
+			$suffix = '?=';
+
+			// 2 x SPACE, 2 x '"', '=', ';'
+			$add_len = strlen($prefix . $suffix) + strlen($name) + 6;
+			$len = $add_len + strlen($value);
+
+			while ($len > $maxLength) {
+				$length = $maxLength - $add_len;
+				// don't break any encoded letters
+				if (preg_match("/^(.{0,$length}[^\=][^\=])/", $value, $matches)) {
+					$_quote = $matches[1];
+				}
+
+				$quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
+				$value = substr($value, strlen($_quote));
+				$add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
+				$len = strlen($value) + $add_len;
+			}
+
+			$quoted .= $prefix . $value . $suffix;
+		}
+
+		return " {$name}=\"{$quoted}\"";
+	}
+
+	/**
+	 * Encodes a header as per RFC2047
+	 *
+	 * @param string $name     The header name
+	 * @param string $value    The header data to encode
+	 * @param string $charset  Character set name
+	 * @param string $encoding Encoding name (base64 or quoted-printable)
+	 * @param string $eol      End-of-line sequence. Default: "\r\n"
+	 *
+	 * @return string          Encoded header data (without a name)
+	 * @access public
+	 * @since 1.6.1
+	 */
+	function encodeHeader($name, $value, $charset='ISO-8859-1',
+		$encoding='quoted-printable', $eol="\r\n"
+	) {
+		// Structured headers
+		$comma_headers = array(
+			'from', 'to', 'cc', 'bcc', 'sender', 'reply-to',
+			'resent-from', 'resent-to', 'resent-cc', 'resent-bcc',
+			'resent-sender', 'resent-reply-to',
+			'mail-reply-to', 'mail-followup-to',
+			'return-receipt-to', 'disposition-notification-to',
+		);
+		$other_headers = array(
+			'references', 'in-reply-to', 'message-id', 'resent-message-id',
+		);
+
+		$name = strtolower($name);
+
+		if (in_array($name, $comma_headers)) {
+			$separator = ',';
+		} else if (in_array($name, $other_headers)) {
+			$separator = ' ';
+		}
+
+		if (!$charset) {
+			$charset = 'ISO-8859-1';
+		}
+
+		// Structured header (make sure addr-spec inside is not encoded)
+		if (!empty($separator)) {
+			// Simple e-mail address regexp
+			$email_regexp = '([^\s<]+|("[^\r\n"]+"))@\S+';
+
+			$parts = Mail_mimePart::_explodeQuotedString("[\t$separator]", $value);
+			$value = '';
+
+			foreach ($parts as $part) {
+				$part = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $part);
+				$part = trim($part);
+
+				if (!$part) {
+					continue;
+				}
+				if ($value) {
+					$value .= $separator == ',' ? $separator . ' ' : ' ';
+				} else {
+					$value = $name . ': ';
+				}
+
+				// let's find phrase (name) and/or addr-spec
+				if (preg_match('/^<' . $email_regexp . '>$/', $part)) {
+					$value .= $part;
+				} else if (preg_match('/^' . $email_regexp . '$/', $part)) {
+					// address without brackets and without name
+					$value .= $part;
+				} else if (preg_match('/<*' . $email_regexp . '>*$/', $part, $matches)) {
+					// address with name (handle name)
+					$address = $matches[0];
+					$word = str_replace($address, '', $part);
+					$word = trim($word);
+					// check if phrase requires quoting
+					if ($word) {
+						// non-ASCII: require encoding
+						if (preg_match('#([^\s\x21-\x7E]){1}#', $word)) {
+							if ($word[0] == '"' && $word[strlen($word)-1] == '"') {
+								// de-quote quoted-string, encoding changes
+								// string to atom
+								$search = array("\\\"", "\\\\");
+								$replace = array("\"", "\\");
+								$word = str_replace($search, $replace, $word);
+								$word = substr($word, 1, -1);
+							}
+							// find length of last line
+							if (($pos = strrpos($value, $eol)) !== false) {
+								$last_len = strlen($value) - $pos;
+							} else {
+								$last_len = strlen($value);
+							}
+							$word = Mail_mimePart::encodeHeaderValue(
+								$word, $charset, $encoding, $last_len, $eol
+							);
+						} else if (($word[0] != '"' || $word[strlen($word)-1] != '"')
+							&& preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $word)
+						) {
+							// ASCII: quote string if needed
+							$word = '"'.addcslashes($word, '\\"').'"';
+						}
+					}
+					$value .= $word.' '.$address;
+				} else {
+					// addr-spec not found, don't encode (?)
+					$value .= $part;
+				}
+
+				// RFC2822 recommends 78 characters limit, use 76 from RFC2047
+				$value = wordwrap($value, 76, $eol . ' ');
+			}
+
+			// remove header name prefix (there could be EOL too)
+			$value = preg_replace(
+				'/^'.$name.':('.preg_quote($eol, '/').')* /', '', $value
+			);
+		} else {
+			// Unstructured header
+			// non-ASCII: require encoding
+			if (preg_match('#([^\s\x21-\x7E]){1}#', $value)) {
+				if ($value[0] == '"' && $value[strlen($value)-1] == '"') {
+					// de-quote quoted-string, encoding changes
+					// string to atom
+					$search = array("\\\"", "\\\\");
+					$replace = array("\"", "\\");
+					$value = str_replace($search, $replace, $value);
+					$value = substr($value, 1, -1);
+				}
+				$value = Mail_mimePart::encodeHeaderValue(
+					$value, $charset, $encoding, strlen($name) + 2, $eol
+				);
+			} else if (strlen($name.': '.$value) > 78) {
+				// ASCII: check if header line isn't too long and use folding
+				$value = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $value);
+				$tmp = wordwrap($name.': '.$value, 78, $eol . ' ');
+				$value = preg_replace('/^'.$name.':\s*/', '', $tmp);
+				// hard limit 998 (RFC2822)
+				$value = wordwrap($value, 998, $eol . ' ', true);
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Explode quoted string
+	 *
+	 * @param string $delimiter Delimiter expression string for preg_match()
+	 * @param string $string    Input string
+	 *
+	 * @return array            String tokens array
+	 * @access private
+	 */
+	function _explodeQuotedString($delimiter, $string)
+	{
+		$result = array();
+		$strlen = strlen($string);
+
+		for ($q=$p=$i=0; $i < $strlen; $i++) {
+			if ($string[$i] == "\""
+				&& (empty($string[$i-1]) || $string[$i-1] != "\\")
+			) {
+				$q = $q ? false : true;
+			} else if (!$q && preg_match("/$delimiter/", $string[$i])) {
+				$result[] = substr($string, $p, $i - $p);
+				$p = $i + 1;
+			}
+		}
+
+		$result[] = substr($string, $p);
+		return $result;
+	}
+
+	/**
+	 * Encodes a header value as per RFC2047
+	 *
+	 * @param string $value      The header data to encode
+	 * @param string $charset    Character set name
+	 * @param string $encoding   Encoding name (base64 or quoted-printable)
+	 * @param int    $prefix_len Prefix length. Default: 0
+	 * @param string $eol        End-of-line sequence. Default: "\r\n"
+	 *
+	 * @return string            Encoded header data
+	 * @access public
+	 * @since 1.6.1
+	 */
+	function encodeHeaderValue($value, $charset, $encoding, $prefix_len=0, $eol="\r\n")
+	{
+		// #17311: Use multibyte aware method (requires mbstring extension)
+		if ($result = Mail_mimePart::encodeMB($value, $charset, $encoding, $prefix_len, $eol)) {
+			return $result;
+		}
+
+		// Generate the header using the specified params and dynamicly
+		// determine the maximum length of such strings.
+		// 75 is the value specified in the RFC.
+		$encoding = $encoding == 'base64' ? 'B' : 'Q';
+		$prefix = '=?' . $charset . '?' . $encoding .'?';
+		$suffix = '?=';
+		$maxLength = 75 - strlen($prefix . $suffix);
+		$maxLength1stLine = $maxLength - $prefix_len;
+
+		if ($encoding == 'B') {
+			// Base64 encode the entire string
+			$value = base64_encode($value);
+
+			// We can cut base64 every 4 characters, so the real max
+			// we can get must be rounded down.
+			$maxLength = $maxLength - ($maxLength % 4);
+			$maxLength1stLine = $maxLength1stLine - ($maxLength1stLine % 4);
+
+			$cutpoint = $maxLength1stLine;
+			$output = '';
+
+			while ($value) {
+				// Split translated string at every $maxLength
+				$part = substr($value, 0, $cutpoint);
+				$value = substr($value, $cutpoint);
+				$cutpoint = $maxLength;
+				// RFC 2047 specifies that any split header should
+				// be separated by a CRLF SPACE.
+				if ($output) {
+					$output .= $eol . ' ';
+				}
+				$output .= $prefix . $part . $suffix;
+			}
+			$value = $output;
+		} else {
+			// quoted-printable encoding has been selected
+			$value = Mail_mimePart::encodeQP($value);
+
+			// This regexp will break QP-encoded text at every $maxLength
+			// but will not break any encoded letters.
+			$reg1st = "|(.{0,$maxLength1stLine}[^\=][^\=])|";
+			$reg2nd = "|(.{0,$maxLength}[^\=][^\=])|";
+
+			if (strlen($value) > $maxLength1stLine) {
+				// Begin with the regexp for the first line.
+				$reg = $reg1st;
+				$output = '';
+				while ($value) {
+					// Split translated string at every $maxLength
+					// But make sure not to break any translated chars.
+					$found = preg_match($reg, $value, $matches);
+
+					// After this first line, we need to use a different
+					// regexp for the first line.
+					$reg = $reg2nd;
+
+					// Save the found part and encapsulate it in the
+					// prefix & suffix. Then remove the part from the
+					// $value_out variable.
+					if ($found) {
+						$part = $matches[0];
+						$len = strlen($matches[0]);
+						$value = substr($value, $len);
+					} else {
+						$part = $value;
+						$value = '';
+					}
+
+					// RFC 2047 specifies that any split header should
+					// be separated by a CRLF SPACE
+					if ($output) {
+						$output .= $eol . ' ';
+					}
+					$output .= $prefix . $part . $suffix;
+				}
+				$value = $output;
+			} else {
+				$value = $prefix . $value . $suffix;
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Encodes the given string using quoted-printable
+	 *
+	 * @param string $str String to encode
+	 *
+	 * @return string     Encoded string
+	 * @access public
+	 * @since 1.6.0
+	 */
+	function encodeQP($str)
+	{
+		// Bug #17226 RFC 2047 restricts some characters
+		// if the word is inside a phrase, permitted chars are only:
+		// ASCII letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
+
+		// "=",  "_",  "?" must be encoded
+		$regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
+		$str = preg_replace_callback(
+			$regexp, array('Mail_mimePart', '_qpReplaceCallback'), $str
+		);
+
+		return str_replace(' ', '_', $str);
+	}
+
+	/**
+	 * Encodes the given string using base64 or quoted-printable.
+	 * This method makes sure that encoded-word represents an integral
+	 * number of characters as per RFC2047.
+	 *
+	 * @param string $str        String to encode
+	 * @param string $charset    Character set name
+	 * @param string $encoding   Encoding name (base64 or quoted-printable)
+	 * @param int    $prefix_len Prefix length. Default: 0
+	 * @param string $eol        End-of-line sequence. Default: "\r\n"
+	 *
+	 * @return string     Encoded string
+	 * @access public
+	 * @since 1.8.0
+	 */
+	function encodeMB($str, $charset, $encoding, $prefix_len=0, $eol="\r\n")
+	{
+		if (!function_exists('mb_substr') || !function_exists('mb_strlen')) {
+			return;
+		}
+
+		$encoding = $encoding == 'base64' ? 'B' : 'Q';
+		// 75 is the value specified in the RFC
+		$prefix = '=?' . $charset . '?'.$encoding.'?';
+		$suffix = '?=';
+		$maxLength = 75 - strlen($prefix . $suffix);
+
+		// A multi-octet character may not be split across adjacent encoded-words
+		// So, we'll loop over each character
+		// mb_stlen() with wrong charset will generate a warning here and return null
+		$length      = mb_strlen($str, $charset);
+		$result      = '';
+		$line_length = $prefix_len;
+
+		if ($encoding == 'B') {
+			// base64
+			$start = 0;
+			$prev  = '';
+
+			for ($i=1; $i<=$length; $i++) {
+				// See #17311
+				$chunk = mb_substr($str, $start, $i-$start, $charset);
+				$chunk = base64_encode($chunk);
+				$chunk_len = strlen($chunk);
+
+				if ($line_length + $chunk_len == $maxLength || $i == $length) {
+					if ($result) {
+						$result .= "\n";
+					}
+					$result .= $chunk;
+					$line_length = 0;
+					$start = $i;
+				} else if ($line_length + $chunk_len > $maxLength) {
+					if ($result) {
+						$result .= "\n";
+					}
+					if ($prev) {
+						$result .= $prev;
+					}
+					$line_length = 0;
+					$start = $i - 1;
+				} else {
+					$prev = $chunk;
+				}
+			}
+		} else {
+			// quoted-printable
+			// see encodeQP()
+			$regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
+
+			for ($i=0; $i<=$length; $i++) {
+				$char = mb_substr($str, $i, 1, $charset);
+				// RFC recommends underline (instead of =20) in place of the space
+				// that's one of the reasons why we're not using iconv_mime_encode()
+				if ($char == ' ') {
+					$char = '_';
+					$char_len = 1;
+				} else {
+					$char = preg_replace_callback(
+						$regexp, array('Mail_mimePart', '_qpReplaceCallback'), $char
+					);
+					$char_len = strlen($char);
+				}
+
+				if ($line_length + $char_len > $maxLength) {
+					if ($result) {
+						$result .= "\n";
+					}
+					$line_length = 0;
+				}
+
+				$result      .= $char;
+				$line_length += $char_len;
+			}
+		}
+
+		if ($result) {
+			$result = $prefix
+				.str_replace("\n", $suffix.$eol.' '.$prefix, $result).$suffix;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Callback function to replace extended characters (\x80-xFF) with their
+	 * ASCII values (RFC2047: quoted-printable)
+	 *
+	 * @param array $matches Preg_replace's matches array
+	 *
+	 * @return string        Encoded character string
+	 * @access private
+	 */
+	function _qpReplaceCallback($matches)
+	{
+		return sprintf('=%02X', ord($matches[1]));
+	}
+
+	/**
+	 * Callback function to replace extended characters (\x80-xFF) with their
+	 * ASCII values (RFC2231)
+	 *
+	 * @param array $matches Preg_replace's matches array
+	 *
+	 * @return string        Encoded character string
+	 * @access private
+	 */
+	function _encodeReplaceCallback($matches)
+	{
+		return sprintf('%%%02X', ord($matches[1]));
+	}
+
+	/**
+	 * PEAR::isError implementation
+	 *
+	 * @param mixed $data Object
+	 *
+	 * @return bool True if object is an instance of PEAR_Error
+	 * @access private
+	 */
+	function _isError($data)
+	{
+		// PEAR::isError() is not PHP 5.4 compatible (see Bug #19473)
+		if (is_object($data) && is_a($data, 'PEAR_Error')) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * PEAR::raiseError implementation
+	 *
+	 * @param $message A text error message
+	 *
+	 * @return PEAR_Error Instance of PEAR_Error
+	 * @access private
+	 */
+	function _raiseError($message)
+	{
+		// PEAR::raiseError() is not PHP 5.4 compatible
+		return new PEAR_Error($message);
+	}
 
 } // End of class

htdocs/includes/nusoap/lib/Mail/mime.php

Indentation +1378 added lines, -1378 removed lines

@@ -94,852 +94,852 @@ 
  */
 class Mail_mime
 {
-    /**
-     * Contains the plain text part of the email
-     *
-     * @var string
-     * @access private
-     */
-    var $_txtbody;
-
-    /**
-     * Contains the html part of the email
-     *
-     * @var string
-     * @access private
-     */
-    var $_htmlbody;
-
-    /**
-     * list of the attached images
-     *
-     * @var array
-     * @access private
-     */
-    var $_html_images = array();
-
-    /**
-     * list of the attachements
-     *
-     * @var array
-     * @access private
-     */
-    var $_parts = array();
-
-    /**
-     * Headers for the mail
-     *
-     * @var array
-     * @access private
-     */
-    var $_headers = array();
-
-    /**
-     * Build parameters
-     *
-     * @var array
-     * @access private
-     */
-    var $_build_params = array(
-        // What encoding to use for the headers
-        // Options: quoted-printable or base64
-        'head_encoding' => 'quoted-printable',
-        // What encoding to use for plain text
-        // Options: 7bit, 8bit, base64, or quoted-printable
-        'text_encoding' => 'quoted-printable',
-        // What encoding to use for html
-        // Options: 7bit, 8bit, base64, or quoted-printable
-        'html_encoding' => 'quoted-printable',
-        // The character set to use for html
-        'html_charset'  => 'ISO-8859-1',
-        // The character set to use for text
-        'text_charset'  => 'ISO-8859-1',
-        // The character set to use for headers
-        'head_charset'  => 'ISO-8859-1',
-        // End-of-line sequence
-        'eol'           => "\r\n",
-        // Delay attachment files IO until building the message
-        'delay_file_io' => false
-    );
-
-    /**
-     * Constructor function
-     *
-     * @param mixed $params Build parameters that change the way the email
-     *                      is built. Should be an associative array.
-     *                      See $_build_params.
-     *
-     * @return void
-     * @access public
-     */
-    function Mail_mime($params = array())
-    {
-        // Backward-compatible EOL setting
-        if (is_string($params)) {
-            $this->_build_params['eol'] = $params;
-        } else if (defined('MAIL_MIME_CRLF') && !isset($params['eol'])) {
-            $this->_build_params['eol'] = MAIL_MIME_CRLF;
-        }
-
-        // Update build parameters
-        if (!empty($params) && is_array($params)) {
-            while (list($key, $value) = each($params)) {
-                $this->_build_params[$key] = $value;
-            }
-        }
-    }
-
-    /**
-     * Set build parameter value
-     *
-     * @param string $name  Parameter name
-     * @param string $value Parameter value
-     *
-     * @return void
-     * @access public
-     * @since 1.6.0
-     */
-    function setParam($name, $value)
-    {
-        $this->_build_params[$name] = $value;
-    }
-
-    /**
-     * Get build parameter value
-     *
-     * @param string $name Parameter name
-     *
-     * @return mixed Parameter value
-     * @access public
-     * @since 1.6.0
-     */
-    function getParam($name)
-    {
-        return isset($this->_build_params[$name]) ? $this->_build_params[$name] : null;
-    }
-
-    /**
-     * Accessor function to set the body text. Body text is used if
-     * it's not an html mail being sent or else is used to fill the
-     * text/plain part that emails clients who don't support
-     * html should show.
-     *
-     * @param string $data   Either a string or
-     *                       the file name with the contents
-     * @param bool   $isfile If true the first param should be treated
-     *                       as a file name, else as a string (default)
-     * @param bool   $append If true the text or file is appended to
-     *                       the existing body, else the old body is
-     *                       overwritten
-     *
-     * @return mixed         True on success or PEAR_Error object
-     * @access public
-     */
-    function setTXTBody($data, $isfile = false, $append = false)
-    {
-        if (!$isfile) {
-            if (!$append) {
-                $this->_txtbody = $data;
-            } else {
-                $this->_txtbody .= $data;
-            }
-        } else {
-            $cont = $this->_file2str($data);
-            if ($this->_isError($cont)) {
-                return $cont;
-            }
-            if (!$append) {
-                $this->_txtbody = $cont;
-            } else {
-                $this->_txtbody .= $cont;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Get message text body
-     *
-     * @return string Text body
-     * @access public
-     * @since 1.6.0
-     */
-    function getTXTBody()
-    {
-        return $this->_txtbody;
-    }
-
-    /**
-     * Adds a html part to the mail.
-     *
-     * @param string $data   Either a string or the file name with the
-     *                       contents
-     * @param bool   $isfile A flag that determines whether $data is a
-     *                       filename, or a string(false, default)
-     *
-     * @return bool          True on success
-     * @access public
-     */
-    function setHTMLBody($data, $isfile = false)
-    {
-        if (!$isfile) {
-            $this->_htmlbody = $data;
-        } else {
-            $cont = $this->_file2str($data);
-            if ($this->_isError($cont)) {
-                return $cont;
-            }
-            $this->_htmlbody = $cont;
-        }
-
-        return true;
-    }
-
-    /**
-     * Get message HTML body
-     *
-     * @return string HTML body
-     * @access public
-     * @since 1.6.0
-     */
-    function getHTMLBody()
-    {
-        return $this->_htmlbody;
-    }
-
-    /**
-     * Adds an image to the list of embedded images.
-     *
-     * @param string $file       The image file name OR image data itself
-     * @param string $c_type     The content type
-     * @param string $name       The filename of the image.
-     *                           Only used if $file is the image data.
-     * @param bool   $isfile     Whether $file is a filename or not.
-     *                           Defaults to true
-     * @param string $content_id Desired Content-ID of MIME part
-     *                           Defaults to generated unique ID
-     *
-     * @return bool          True on success
-     * @access public
-     */
-    function addHTMLImage($file,
-        $c_type='application/octet-stream',
-        $name = '',
-        $isfile = true,
-        $content_id = null
-    ) {
-        $bodyfile = null;
-
-        if ($isfile) {
-            // Don't load file into memory
-            if ($this->_build_params['delay_file_io']) {
-                $filedata = null;
-                $bodyfile = $file;
-            } else {
-                if ($this->_isError($filedata = $this->_file2str($file))) {
-                    return $filedata;
-                }
-            }
-            $filename = ($name ? $name : $file);
-        } else {
-            $filedata = $file;
-            $filename = $name;
-        }
-
-        if (!$content_id) {
-            $content_id = preg_replace('/[^0-9a-zA-Z]/', '', uniqid(time(), true));
-        }
-
-        $this->_html_images[] = array(
-            'body'      => $filedata,
-            'body_file' => $bodyfile,
-            'name'      => $filename,
-            'c_type'    => $c_type,
-            'cid'       => $content_id
-        );
-
-        return true;
-    }
-
-    /**
-     * Adds a file to the list of attachments.
-     *
-     * @param string $file        The file name of the file to attach
-     *                            or the file contents itself
-     * @param string $c_type      The content type
-     * @param string $name        The filename of the attachment
-     *                            Only use if $file is the contents
-     * @param bool   $isfile      Whether $file is a filename or not. Defaults to true
-     * @param string $encoding    The type of encoding to use. Defaults to base64.
-     *                            Possible values: 7bit, 8bit, base64 or quoted-printable.
-     * @param string $disposition The content-disposition of this file
-     *                            Defaults to attachment.
-     *                            Possible values: attachment, inline.
-     * @param string $charset     The character set of attachment's content.
-     * @param string $language    The language of the attachment
-     * @param string $location    The RFC 2557.4 location of the attachment
-     * @param string $n_encoding  Encoding of the attachment's name in Content-Type
-     *                            By default filenames are encoded using RFC2231 method
-     *                            Here you can set RFC2047 encoding (quoted-printable
-     *                            or base64) instead
-     * @param string $f_encoding  Encoding of the attachment's filename
-     *                            in Content-Disposition header.
-     * @param string $description Content-Description header
-     * @param string $h_charset   The character set of the headers e.g. filename
-     *                            If not specified, $charset will be used
-     * @param array  $add_headers Additional part headers. Array keys can be in form
-     *                            of <header_name>:<parameter_name>
-     *
-     * @return mixed              True on success or PEAR_Error object
-     * @access public
-     */
-    function addAttachment($file,
-        $c_type      = 'application/octet-stream',
-        $name        = '',
-        $isfile      = true,
-        $encoding    = 'base64',
-        $disposition = 'attachment',
-        $charset     = '',
-        $language    = '',
-        $location    = '',
-        $n_encoding  = null,
-        $f_encoding  = null,
-        $description = '',
-        $h_charset   = null,
-        $add_headers = array()
-    ) {
-        $bodyfile = null;
-
-        if ($isfile) {
-            // Don't load file into memory
-            if ($this->_build_params['delay_file_io']) {
-                $filedata = null;
-                $bodyfile = $file;
-            } else {
-                if ($this->_isError($filedata = $this->_file2str($file))) {
-                    return $filedata;
-                }
-            }
-            // Force the name the user supplied, otherwise use $file
-            $filename = ($name ? $name : $this->_basename($file));
-        } else {
-            $filedata = $file;
-            $filename = $name;
-        }
-
-        if (!strlen($filename)) {
-            $msg = "The supplied filename for the attachment can't be empty";
-            return $this->_raiseError($msg);
-        }
-
-        $this->_parts[] = array(
-            'body'        => $filedata,
-            'body_file'   => $bodyfile,
-            'name'        => $filename,
-            'c_type'      => $c_type,
-            'charset'     => $charset,
-            'encoding'    => $encoding,
-            'language'    => $language,
-            'location'    => $location,
-            'disposition' => $disposition,
-            'description' => $description,
-            'add_headers' => $add_headers,
-            'name_encoding'     => $n_encoding,
-            'filename_encoding' => $f_encoding,
-            'headers_charset'   => $h_charset,
-        );
-
-        return true;
-    }
-
-    /**
-     * Get the contents of the given file name as string
-     *
-     * @param string $file_name Path of file to process
-     *
-     * @return string           Contents of $file_name
-     * @access private
-     */
-    function _file2str($file_name)
-    {
-        // Check state of file and raise an error properly
-        if (!file_exists($file_name)) {
-            return $this->_raiseError('File not found: ' . $file_name);
-        }
-        if (!is_file($file_name)) {
-            return $this->_raiseError('Not a regular file: ' . $file_name);
-        }
-        if (!is_readable($file_name)) {
-            return $this->_raiseError('File is not readable: ' . $file_name);
-        }
-
-        // Temporarily reset magic_quotes_runtime and read file contents
-        if ($magic_quote_setting = get_magic_quotes_runtime()) {
-            @ini_set('magic_quotes_runtime', 0);
-        }
-        $cont = file_get_contents($file_name);
-        if ($magic_quote_setting) {
-            @ini_set('magic_quotes_runtime', $magic_quote_setting);
-        }
-
-        return $cont;
-    }
-
-    /**
-     * Adds a text subpart to the mimePart object and
-     * returns it during the build process.
-     *
-     * @param mixed  &$obj The object to add the part to, or
-     *                     anything else if a new object is to be created.
-     * @param string $text The text to add.
-     *
-     * @return object      The text mimePart object
-     * @access private
-     */
-    function &_addTextPart(&$obj, $text = '')
-    {
-        $params['content_type'] = 'text/plain';
-        $params['encoding']     = $this->_build_params['text_encoding'];
-        $params['charset']      = $this->_build_params['text_charset'];
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (is_object($obj)) {
-            $ret = $obj->addSubpart($text, $params);
-        } else {
-            $ret = new Mail_mimePart($text, $params);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Adds a html subpart to the mimePart object and
-     * returns it during the build process.
-     *
-     * @param mixed &$obj The object to add the part to, or
-     *                    anything else if a new object is to be created.
-     *
-     * @return object     The html mimePart object
-     * @access private
-     */
-    function &_addHtmlPart(&$obj)
-    {
-        $params['content_type'] = 'text/html';
-        $params['encoding']     = $this->_build_params['html_encoding'];
-        $params['charset']      = $this->_build_params['html_charset'];
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (is_object($obj)) {
-            $ret = $obj->addSubpart($this->_htmlbody, $params);
-        } else {
-            $ret = new Mail_mimePart($this->_htmlbody, $params);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Creates a new mimePart object, using multipart/mixed as
-     * the initial content-type and returns it during the
-     * build process.
-     *
-     * @return object The multipart/mixed mimePart object
-     * @access private
-     */
-    function &_addMixedPart()
-    {
-        $params['content_type'] = 'multipart/mixed';
-        $params['eol']          = $this->_build_params['eol'];
-
-        // Create empty multipart/mixed Mail_mimePart object to return
-        $ret = new Mail_mimePart('', $params);
-        return $ret;
-    }
-
-    /**
-     * Adds a multipart/alternative part to a mimePart
-     * object (or creates one), and returns it during
-     * the build process.
-     *
-     * @param mixed &$obj The object to add the part to, or
-     *                    anything else if a new object is to be created.
-     *
-     * @return object     The multipart/mixed mimePart object
-     * @access private
-     */
-    function &_addAlternativePart(&$obj)
-    {
-        $params['content_type'] = 'multipart/alternative';
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (is_object($obj)) {
-            $ret = $obj->addSubpart('', $params);
-        } else {
-            $ret = new Mail_mimePart('', $params);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Adds a multipart/related part to a mimePart
-     * object (or creates one), and returns it during
-     * the build process.
-     *
-     * @param mixed &$obj The object to add the part to, or
-     *                    anything else if a new object is to be created
-     *
-     * @return object     The multipart/mixed mimePart object
-     * @access private
-     */
-    function &_addRelatedPart(&$obj)
-    {
-        $params['content_type'] = 'multipart/related';
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (is_object($obj)) {
-            $ret = $obj->addSubpart('', $params);
-        } else {
-            $ret = new Mail_mimePart('', $params);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Adds an html image subpart to a mimePart object
-     * and returns it during the build process.
-     *
-     * @param object &$obj  The mimePart to add the image to
-     * @param array  $value The image information
-     *
-     * @return object       The image mimePart object
-     * @access private
-     */
-    function &_addHtmlImagePart(&$obj, $value)
-    {
-        $params['content_type'] = $value['c_type'];
-        $params['encoding']     = 'base64';
-        $params['disposition']  = 'inline';
-        $params['filename']     = $value['name'];
-        $params['cid']          = $value['cid'];
-        $params['body_file']    = $value['body_file'];
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (!empty($value['name_encoding'])) {
-            $params['name_encoding'] = $value['name_encoding'];
-        }
-        if (!empty($value['filename_encoding'])) {
-            $params['filename_encoding'] = $value['filename_encoding'];
-        }
-
-        $ret = $obj->addSubpart($value['body'], $params);
-        return $ret;
-    }
-
-    /**
-     * Adds an attachment subpart to a mimePart object
-     * and returns it during the build process.
-     *
-     * @param object &$obj  The mimePart to add the image to
-     * @param array  $value The attachment information
-     *
-     * @return object       The image mimePart object
-     * @access private
-     */
-    function &_addAttachmentPart(&$obj, $value)
-    {
-        $params['eol']          = $this->_build_params['eol'];
-        $params['filename']     = $value['name'];
-        $params['encoding']     = $value['encoding'];
-        $params['content_type'] = $value['c_type'];
-        $params['body_file']    = $value['body_file'];
-        $params['disposition']  = isset($value['disposition']) ? 
-                                  $value['disposition'] : 'attachment';
-
-        // content charset
-        if (!empty($value['charset'])) {
-            $params['charset'] = $value['charset'];
-        }
-        // headers charset (filename, description)
-        if (!empty($value['headers_charset'])) {
-            $params['headers_charset'] = $value['headers_charset'];
-        }
-        if (!empty($value['language'])) {
-            $params['language'] = $value['language'];
-        }
-        if (!empty($value['location'])) {
-            $params['location'] = $value['location'];
-        }
-        if (!empty($value['name_encoding'])) {
-            $params['name_encoding'] = $value['name_encoding'];
-        }
-        if (!empty($value['filename_encoding'])) {
-            $params['filename_encoding'] = $value['filename_encoding'];
-        }
-        if (!empty($value['description'])) {
-            $params['description'] = $value['description'];
-        }
-        if (is_array($value['add_headers'])) {
-            $params['headers'] = $value['add_headers'];
-        }
-
-        $ret = $obj->addSubpart($value['body'], $params);
-        return $ret;
-    }
-
-    /**
-     * Returns the complete e-mail, ready to send using an alternative
-     * mail delivery method. Note that only the mailpart that is made
-     * with Mail_Mime is created. This means that,
-     * YOU WILL HAVE NO TO: HEADERS UNLESS YOU SET IT YOURSELF 
-     * using the $headers parameter!
-     * 
-     * @param string $separation The separation between these two parts.
-     * @param array  $params     The Build parameters passed to the
-     *                           get() function. See get() for more info.
-     * @param array  $headers    The extra headers that should be passed
-     *                           to the headers() method.
-     *                           See that function for more info.
-     * @param bool   $overwrite  Overwrite the existing headers with new.
-     *
-     * @return mixed The complete e-mail or PEAR error object
-     * @access public
-     */
-    function getMessage($separation = null, $params = null, $headers = null,
-        $overwrite = false
-    ) {
-        if ($separation === null) {
-            $separation = $this->_build_params['eol'];
-        }
-
-        $body = $this->get($params);
-
-        if ($this->_isError($body)) {
-            return $body;
-        }
-
-        return $this->txtHeaders($headers, $overwrite) . $separation . $body;
-    }
-
-    /**
-     * Returns the complete e-mail body, ready to send using an alternative
-     * mail delivery method.
-     * 
-     * @param array $params The Build parameters passed to the
-     *                      get() method. See get() for more info.
-     *
-     * @return mixed The e-mail body or PEAR error object
-     * @access public
-     * @since 1.6.0
-     */
-    function getMessageBody($params = null)
-    {
-        return $this->get($params, null, true);
-    }
-
-    /**
-     * Writes (appends) the complete e-mail into file.
-     * 
-     * @param string $filename  Output file location
-     * @param array  $params    The Build parameters passed to the
-     *                          get() method. See get() for more info.
-     * @param array  $headers   The extra headers that should be passed
-     *                          to the headers() function.
-     *                          See that function for more info.
-     * @param bool   $overwrite Overwrite the existing headers with new.
-     *
-     * @return mixed True or PEAR error object
-     * @access public
-     * @since 1.6.0
-     */
-    function saveMessage($filename, $params = null, $headers = null, $overwrite = false)
-    {
-        // Check state of file and raise an error properly
-        if (file_exists($filename) && !is_writable($filename)) {
-            return $this->_raiseError('File is not writable: ' . $filename);
-        }
-
-        // Temporarily reset magic_quotes_runtime and read file contents
-        if ($magic_quote_setting = get_magic_quotes_runtime()) {
-            @ini_set('magic_quotes_runtime', 0);
-        }
-
-        if (!($fh = fopen($filename, 'ab'))) {
-            return $this->_raiseError('Unable to open file: ' . $filename);
-        }
-
-        // Write message headers into file (skipping Content-* headers)
-        $head = $this->txtHeaders($headers, $overwrite, true);
-        if (fwrite($fh, $head) === false) {
-            return $this->_raiseError('Error writing to file: ' . $filename);
-        }
-
-        fclose($fh);
-
-        if ($magic_quote_setting) {
-            @ini_set('magic_quotes_runtime', $magic_quote_setting);
-        }
-
-        // Write the rest of the message into file
-        $res = $this->get($params, $filename);
-
-        return $res ? $res : true;
-    }
-
-    /**
-     * Writes (appends) the complete e-mail body into file.
-     *
-     * @param string $filename Output file location
-     * @param array  $params   The Build parameters passed to the
-     *                         get() method. See get() for more info.
-     *
-     * @return mixed True or PEAR error object
-     * @access public
-     * @since 1.6.0
-     */
-    function saveMessageBody($filename, $params = null)
-    {
-        // Check state of file and raise an error properly
-        if (file_exists($filename) && !is_writable($filename)) {
-            return $this->_raiseError('File is not writable: ' . $filename);
-        }
-
-        // Temporarily reset magic_quotes_runtime and read file contents
-        if ($magic_quote_setting = get_magic_quotes_runtime()) {
-            @ini_set('magic_quotes_runtime', 0);
-        }
-
-        if (!($fh = fopen($filename, 'ab'))) {
-            return $this->_raiseError('Unable to open file: ' . $filename);
-        }
-
-        // Write the rest of the message into file
-        $res = $this->get($params, $filename, true);
-
-        return $res ? $res : true;
-    }
-
-    /**
-     * Builds the multipart message from the list ($this->_parts) and
-     * returns the mime content.
-     *
-     * @param array    $params    Build parameters that change the way the email
-     *                            is built. Should be associative. See $_build_params.
-     * @param resource $filename  Output file where to save the message instead of
-     *                            returning it
-     * @param boolean  $skip_head True if you want to return/save only the message
-     *                            without headers
-     *
-     * @return mixed The MIME message content string, null or PEAR error object
-     * @access public
-     */
-    function get($params = null, $filename = null, $skip_head = false)
-    {
-        if (isset($params)) {
-            while (list($key, $value) = each($params)) {
-                $this->_build_params[$key] = $value;
-            }
-        }
-
-        if (isset($this->_headers['From'])) {
-            // Bug #11381: Illegal characters in domain ID
-            if (preg_match('#(@[0-9a-zA-Z\-\.]+)#', $this->_headers['From'], $matches)) {
-                $domainID = $matches[1];
-            } else {
-                $domainID = '@localhost';
-            }
-            foreach ($this->_html_images as $i => $img) {
-                $cid = $this->_html_images[$i]['cid']; 
-                if (!preg_match('#'.preg_quote($domainID).'$#', $cid)) {
-                    $this->_html_images[$i]['cid'] = $cid . $domainID;
-                }
-            }
-        }
-
-        if (count($this->_html_images) && isset($this->_htmlbody)) {
-            foreach ($this->_html_images as $key => $value) {
-                $regex   = array();
-                $regex[] = '#(\s)((?i)src|background|href(?-i))\s*=\s*(["\']?)' .
-                            preg_quote($value['name'], '#') . '\3#';
-                $regex[] = '#(?i)url(?-i)\(\s*(["\']?)' .
-                            preg_quote($value['name'], '#') . '\1\s*\)#';
-
-                $rep   = array();
-                $rep[] = '\1\2=\3cid:' . $value['cid'] .'\3';
-                $rep[] = 'url(\1cid:' . $value['cid'] . '\1)';
-
-                $this->_htmlbody = preg_replace($regex, $rep, $this->_htmlbody);
-                $this->_html_images[$key]['name']
-                    = $this->_basename($this->_html_images[$key]['name']);
-            }
-        }
-
-        $this->_checkParams();
-
-        $null        = -1;
-        $attachments = count($this->_parts) > 0;
-        $html_images = count($this->_html_images) > 0;
-        $html        = strlen($this->_htmlbody) > 0;
-        $text        = !$html && strlen($this->_txtbody);
-
-        switch (true) {
-        case $text && !$attachments:
-            $message =& $this->_addTextPart($null, $this->_txtbody);
-            break;
-
-        case !$text && !$html && $attachments:
-            $message =& $this->_addMixedPart();
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-
-        case $text && $attachments:
-            $message =& $this->_addMixedPart();
-            $this->_addTextPart($message, $this->_txtbody);
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-
-        case $html && !$attachments && !$html_images:
-            if (isset($this->_txtbody)) {
-                $message =& $this->_addAlternativePart($null);
-                $this->_addTextPart($message, $this->_txtbody);
-                $this->_addHtmlPart($message);
-            } else {
-                $message =& $this->_addHtmlPart($null);
-            }
-            break;
-
-        case $html && !$attachments && $html_images:
-            // * Content-Type: multipart/alternative;
-            //    * text
-            //    * Content-Type: multipart/related;
-            //       * html
-            //       * image...
-            if (isset($this->_txtbody)) {
-                $message =& $this->_addAlternativePart($null);
-                $this->_addTextPart($message, $this->_txtbody);
-
-                $ht =& $this->_addRelatedPart($message);
-                $this->_addHtmlPart($ht);
-                for ($i = 0; $i < count($this->_html_images); $i++) {
-                    $this->_addHtmlImagePart($ht, $this->_html_images[$i]);
-                }
-            } else {
-                // * Content-Type: multipart/related;
-                //    * html
-                //    * image...
-                $message =& $this->_addRelatedPart($null);
-                $this->_addHtmlPart($message);
-                for ($i = 0; $i < count($this->_html_images); $i++) {
-                    $this->_addHtmlImagePart($message, $this->_html_images[$i]);
-                }
-            }
-            /*
+	/**
+	 * Contains the plain text part of the email
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_txtbody;
+
+	/**
+	 * Contains the html part of the email
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_htmlbody;
+
+	/**
+	 * list of the attached images
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_html_images = array();
+
+	/**
+	 * list of the attachements
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_parts = array();
+
+	/**
+	 * Headers for the mail
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_headers = array();
+
+	/**
+	 * Build parameters
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_build_params = array(
+		// What encoding to use for the headers
+		// Options: quoted-printable or base64
+		'head_encoding' => 'quoted-printable',
+		// What encoding to use for plain text
+		// Options: 7bit, 8bit, base64, or quoted-printable
+		'text_encoding' => 'quoted-printable',
+		// What encoding to use for html
+		// Options: 7bit, 8bit, base64, or quoted-printable
+		'html_encoding' => 'quoted-printable',
+		// The character set to use for html
+		'html_charset'  => 'ISO-8859-1',
+		// The character set to use for text
+		'text_charset'  => 'ISO-8859-1',
+		// The character set to use for headers
+		'head_charset'  => 'ISO-8859-1',
+		// End-of-line sequence
+		'eol'           => "\r\n",
+		// Delay attachment files IO until building the message
+		'delay_file_io' => false
+	);
+
+	/**
+	 * Constructor function
+	 *
+	 * @param mixed $params Build parameters that change the way the email
+	 *                      is built. Should be an associative array.
+	 *                      See $_build_params.
+	 *
+	 * @return void
+	 * @access public
+	 */
+	function Mail_mime($params = array())
+	{
+		// Backward-compatible EOL setting
+		if (is_string($params)) {
+			$this->_build_params['eol'] = $params;
+		} else if (defined('MAIL_MIME_CRLF') && !isset($params['eol'])) {
+			$this->_build_params['eol'] = MAIL_MIME_CRLF;
+		}
+
+		// Update build parameters
+		if (!empty($params) && is_array($params)) {
+			while (list($key, $value) = each($params)) {
+				$this->_build_params[$key] = $value;
+			}
+		}
+	}
+
+	/**
+	 * Set build parameter value
+	 *
+	 * @param string $name  Parameter name
+	 * @param string $value Parameter value
+	 *
+	 * @return void
+	 * @access public
+	 * @since 1.6.0
+	 */
+	function setParam($name, $value)
+	{
+		$this->_build_params[$name] = $value;
+	}
+
+	/**
+	 * Get build parameter value
+	 *
+	 * @param string $name Parameter name
+	 *
+	 * @return mixed Parameter value
+	 * @access public
+	 * @since 1.6.0
+	 */
+	function getParam($name)
+	{
+		return isset($this->_build_params[$name]) ? $this->_build_params[$name] : null;
+	}
+
+	/**
+	 * Accessor function to set the body text. Body text is used if
+	 * it's not an html mail being sent or else is used to fill the
+	 * text/plain part that emails clients who don't support
+	 * html should show.
+	 *
+	 * @param string $data   Either a string or
+	 *                       the file name with the contents
+	 * @param bool   $isfile If true the first param should be treated
+	 *                       as a file name, else as a string (default)
+	 * @param bool   $append If true the text or file is appended to
+	 *                       the existing body, else the old body is
+	 *                       overwritten
+	 *
+	 * @return mixed         True on success or PEAR_Error object
+	 * @access public
+	 */
+	function setTXTBody($data, $isfile = false, $append = false)
+	{
+		if (!$isfile) {
+			if (!$append) {
+				$this->_txtbody = $data;
+			} else {
+				$this->_txtbody .= $data;
+			}
+		} else {
+			$cont = $this->_file2str($data);
+			if ($this->_isError($cont)) {
+				return $cont;
+			}
+			if (!$append) {
+				$this->_txtbody = $cont;
+			} else {
+				$this->_txtbody .= $cont;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get message text body
+	 *
+	 * @return string Text body
+	 * @access public
+	 * @since 1.6.0
+	 */
+	function getTXTBody()
+	{
+		return $this->_txtbody;
+	}
+
+	/**
+	 * Adds a html part to the mail.
+	 *
+	 * @param string $data   Either a string or the file name with the
+	 *                       contents
+	 * @param bool   $isfile A flag that determines whether $data is a
+	 *                       filename, or a string(false, default)
+	 *
+	 * @return bool          True on success
+	 * @access public
+	 */
+	function setHTMLBody($data, $isfile = false)
+	{
+		if (!$isfile) {
+			$this->_htmlbody = $data;
+		} else {
+			$cont = $this->_file2str($data);
+			if ($this->_isError($cont)) {
+				return $cont;
+			}
+			$this->_htmlbody = $cont;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get message HTML body
+	 *
+	 * @return string HTML body
+	 * @access public
+	 * @since 1.6.0
+	 */
+	function getHTMLBody()
+	{
+		return $this->_htmlbody;
+	}
+
+	/**
+	 * Adds an image to the list of embedded images.
+	 *
+	 * @param string $file       The image file name OR image data itself
+	 * @param string $c_type     The content type
+	 * @param string $name       The filename of the image.
+	 *                           Only used if $file is the image data.
+	 * @param bool   $isfile     Whether $file is a filename or not.
+	 *                           Defaults to true
+	 * @param string $content_id Desired Content-ID of MIME part
+	 *                           Defaults to generated unique ID
+	 *
+	 * @return bool          True on success
+	 * @access public
+	 */
+	function addHTMLImage($file,
+		$c_type='application/octet-stream',
+		$name = '',
+		$isfile = true,
+		$content_id = null
+	) {
+		$bodyfile = null;
+
+		if ($isfile) {
+			// Don't load file into memory
+			if ($this->_build_params['delay_file_io']) {
+				$filedata = null;
+				$bodyfile = $file;
+			} else {
+				if ($this->_isError($filedata = $this->_file2str($file))) {
+					return $filedata;
+				}
+			}
+			$filename = ($name ? $name : $file);
+		} else {
+			$filedata = $file;
+			$filename = $name;
+		}
+
+		if (!$content_id) {
+			$content_id = preg_replace('/[^0-9a-zA-Z]/', '', uniqid(time(), true));
+		}
+
+		$this->_html_images[] = array(
+			'body'      => $filedata,
+			'body_file' => $bodyfile,
+			'name'      => $filename,
+			'c_type'    => $c_type,
+			'cid'       => $content_id
+		);
+
+		return true;
+	}
+
+	/**
+	 * Adds a file to the list of attachments.
+	 *
+	 * @param string $file        The file name of the file to attach
+	 *                            or the file contents itself
+	 * @param string $c_type      The content type
+	 * @param string $name        The filename of the attachment
+	 *                            Only use if $file is the contents
+	 * @param bool   $isfile      Whether $file is a filename or not. Defaults to true
+	 * @param string $encoding    The type of encoding to use. Defaults to base64.
+	 *                            Possible values: 7bit, 8bit, base64 or quoted-printable.
+	 * @param string $disposition The content-disposition of this file
+	 *                            Defaults to attachment.
+	 *                            Possible values: attachment, inline.
+	 * @param string $charset     The character set of attachment's content.
+	 * @param string $language    The language of the attachment
+	 * @param string $location    The RFC 2557.4 location of the attachment
+	 * @param string $n_encoding  Encoding of the attachment's name in Content-Type
+	 *                            By default filenames are encoded using RFC2231 method
+	 *                            Here you can set RFC2047 encoding (quoted-printable
+	 *                            or base64) instead
+	 * @param string $f_encoding  Encoding of the attachment's filename
+	 *                            in Content-Disposition header.
+	 * @param string $description Content-Description header
+	 * @param string $h_charset   The character set of the headers e.g. filename
+	 *                            If not specified, $charset will be used
+	 * @param array  $add_headers Additional part headers. Array keys can be in form
+	 *                            of <header_name>:<parameter_name>
+	 *
+	 * @return mixed              True on success or PEAR_Error object
+	 * @access public
+	 */
+	function addAttachment($file,
+		$c_type      = 'application/octet-stream',
+		$name        = '',
+		$isfile      = true,
+		$encoding    = 'base64',
+		$disposition = 'attachment',
+		$charset     = '',
+		$language    = '',
+		$location    = '',
+		$n_encoding  = null,
+		$f_encoding  = null,
+		$description = '',
+		$h_charset   = null,
+		$add_headers = array()
+	) {
+		$bodyfile = null;
+
+		if ($isfile) {
+			// Don't load file into memory
+			if ($this->_build_params['delay_file_io']) {
+				$filedata = null;
+				$bodyfile = $file;
+			} else {
+				if ($this->_isError($filedata = $this->_file2str($file))) {
+					return $filedata;
+				}
+			}
+			// Force the name the user supplied, otherwise use $file
+			$filename = ($name ? $name : $this->_basename($file));
+		} else {
+			$filedata = $file;
+			$filename = $name;
+		}
+
+		if (!strlen($filename)) {
+			$msg = "The supplied filename for the attachment can't be empty";
+			return $this->_raiseError($msg);
+		}
+
+		$this->_parts[] = array(
+			'body'        => $filedata,
+			'body_file'   => $bodyfile,
+			'name'        => $filename,
+			'c_type'      => $c_type,
+			'charset'     => $charset,
+			'encoding'    => $encoding,
+			'language'    => $language,
+			'location'    => $location,
+			'disposition' => $disposition,
+			'description' => $description,
+			'add_headers' => $add_headers,
+			'name_encoding'     => $n_encoding,
+			'filename_encoding' => $f_encoding,
+			'headers_charset'   => $h_charset,
+		);
+
+		return true;
+	}
+
+	/**
+	 * Get the contents of the given file name as string
+	 *
+	 * @param string $file_name Path of file to process
+	 *
+	 * @return string           Contents of $file_name
+	 * @access private
+	 */
+	function _file2str($file_name)
+	{
+		// Check state of file and raise an error properly
+		if (!file_exists($file_name)) {
+			return $this->_raiseError('File not found: ' . $file_name);
+		}
+		if (!is_file($file_name)) {
+			return $this->_raiseError('Not a regular file: ' . $file_name);
+		}
+		if (!is_readable($file_name)) {
+			return $this->_raiseError('File is not readable: ' . $file_name);
+		}
+
+		// Temporarily reset magic_quotes_runtime and read file contents
+		if ($magic_quote_setting = get_magic_quotes_runtime()) {
+			@ini_set('magic_quotes_runtime', 0);
+		}
+		$cont = file_get_contents($file_name);
+		if ($magic_quote_setting) {
+			@ini_set('magic_quotes_runtime', $magic_quote_setting);
+		}
+
+		return $cont;
+	}
+
+	/**
+	 * Adds a text subpart to the mimePart object and
+	 * returns it during the build process.
+	 *
+	 * @param mixed  &$obj The object to add the part to, or
+	 *                     anything else if a new object is to be created.
+	 * @param string $text The text to add.
+	 *
+	 * @return object      The text mimePart object
+	 * @access private
+	 */
+	function &_addTextPart(&$obj, $text = '')
+	{
+		$params['content_type'] = 'text/plain';
+		$params['encoding']     = $this->_build_params['text_encoding'];
+		$params['charset']      = $this->_build_params['text_charset'];
+		$params['eol']          = $this->_build_params['eol'];
+
+		if (is_object($obj)) {
+			$ret = $obj->addSubpart($text, $params);
+		} else {
+			$ret = new Mail_mimePart($text, $params);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Adds a html subpart to the mimePart object and
+	 * returns it during the build process.
+	 *
+	 * @param mixed &$obj The object to add the part to, or
+	 *                    anything else if a new object is to be created.
+	 *
+	 * @return object     The html mimePart object
+	 * @access private
+	 */
+	function &_addHtmlPart(&$obj)
+	{
+		$params['content_type'] = 'text/html';
+		$params['encoding']     = $this->_build_params['html_encoding'];
+		$params['charset']      = $this->_build_params['html_charset'];
+		$params['eol']          = $this->_build_params['eol'];
+
+		if (is_object($obj)) {
+			$ret = $obj->addSubpart($this->_htmlbody, $params);
+		} else {
+			$ret = new Mail_mimePart($this->_htmlbody, $params);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Creates a new mimePart object, using multipart/mixed as
+	 * the initial content-type and returns it during the
+	 * build process.
+	 *
+	 * @return object The multipart/mixed mimePart object
+	 * @access private
+	 */
+	function &_addMixedPart()
+	{
+		$params['content_type'] = 'multipart/mixed';
+		$params['eol']          = $this->_build_params['eol'];
+
+		// Create empty multipart/mixed Mail_mimePart object to return
+		$ret = new Mail_mimePart('', $params);
+		return $ret;
+	}
+
+	/**
+	 * Adds a multipart/alternative part to a mimePart
+	 * object (or creates one), and returns it during
+	 * the build process.
+	 *
+	 * @param mixed &$obj The object to add the part to, or
+	 *                    anything else if a new object is to be created.
+	 *
+	 * @return object     The multipart/mixed mimePart object
+	 * @access private
+	 */
+	function &_addAlternativePart(&$obj)
+	{
+		$params['content_type'] = 'multipart/alternative';
+		$params['eol']          = $this->_build_params['eol'];
+
+		if (is_object($obj)) {
+			$ret = $obj->addSubpart('', $params);
+		} else {
+			$ret = new Mail_mimePart('', $params);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Adds a multipart/related part to a mimePart
+	 * object (or creates one), and returns it during
+	 * the build process.
+	 *
+	 * @param mixed &$obj The object to add the part to, or
+	 *                    anything else if a new object is to be created
+	 *
+	 * @return object     The multipart/mixed mimePart object
+	 * @access private
+	 */
+	function &_addRelatedPart(&$obj)
+	{
+		$params['content_type'] = 'multipart/related';
+		$params['eol']          = $this->_build_params['eol'];
+
+		if (is_object($obj)) {
+			$ret = $obj->addSubpart('', $params);
+		} else {
+			$ret = new Mail_mimePart('', $params);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Adds an html image subpart to a mimePart object
+	 * and returns it during the build process.
+	 *
+	 * @param object &$obj  The mimePart to add the image to
+	 * @param array  $value The image information
+	 *
+	 * @return object       The image mimePart object
+	 * @access private
+	 */
+	function &_addHtmlImagePart(&$obj, $value)
+	{
+		$params['content_type'] = $value['c_type'];
+		$params['encoding']     = 'base64';
+		$params['disposition']  = 'inline';
+		$params['filename']     = $value['name'];
+		$params['cid']          = $value['cid'];
+		$params['body_file']    = $value['body_file'];
+		$params['eol']          = $this->_build_params['eol'];
+
+		if (!empty($value['name_encoding'])) {
+			$params['name_encoding'] = $value['name_encoding'];
+		}
+		if (!empty($value['filename_encoding'])) {
+			$params['filename_encoding'] = $value['filename_encoding'];
+		}
+
+		$ret = $obj->addSubpart($value['body'], $params);
+		return $ret;
+	}
+
+	/**
+	 * Adds an attachment subpart to a mimePart object
+	 * and returns it during the build process.
+	 *
+	 * @param object &$obj  The mimePart to add the image to
+	 * @param array  $value The attachment information
+	 *
+	 * @return object       The image mimePart object
+	 * @access private
+	 */
+	function &_addAttachmentPart(&$obj, $value)
+	{
+		$params['eol']          = $this->_build_params['eol'];
+		$params['filename']     = $value['name'];
+		$params['encoding']     = $value['encoding'];
+		$params['content_type'] = $value['c_type'];
+		$params['body_file']    = $value['body_file'];
+		$params['disposition']  = isset($value['disposition']) ? 
+								  $value['disposition'] : 'attachment';
+
+		// content charset
+		if (!empty($value['charset'])) {
+			$params['charset'] = $value['charset'];
+		}
+		// headers charset (filename, description)
+		if (!empty($value['headers_charset'])) {
+			$params['headers_charset'] = $value['headers_charset'];
+		}
+		if (!empty($value['language'])) {
+			$params['language'] = $value['language'];
+		}
+		if (!empty($value['location'])) {
+			$params['location'] = $value['location'];
+		}
+		if (!empty($value['name_encoding'])) {
+			$params['name_encoding'] = $value['name_encoding'];
+		}
+		if (!empty($value['filename_encoding'])) {
+			$params['filename_encoding'] = $value['filename_encoding'];
+		}
+		if (!empty($value['description'])) {
+			$params['description'] = $value['description'];
+		}
+		if (is_array($value['add_headers'])) {
+			$params['headers'] = $value['add_headers'];
+		}
+
+		$ret = $obj->addSubpart($value['body'], $params);
+		return $ret;
+	}
+
+	/**
+	 * Returns the complete e-mail, ready to send using an alternative
+	 * mail delivery method. Note that only the mailpart that is made
+	 * with Mail_Mime is created. This means that,
+	 * YOU WILL HAVE NO TO: HEADERS UNLESS YOU SET IT YOURSELF 
+	 * using the $headers parameter!
+	 * 
+	 * @param string $separation The separation between these two parts.
+	 * @param array  $params     The Build parameters passed to the
+	 *                           get() function. See get() for more info.
+	 * @param array  $headers    The extra headers that should be passed
+	 *                           to the headers() method.
+	 *                           See that function for more info.
+	 * @param bool   $overwrite  Overwrite the existing headers with new.
+	 *
+	 * @return mixed The complete e-mail or PEAR error object
+	 * @access public
+	 */
+	function getMessage($separation = null, $params = null, $headers = null,
+		$overwrite = false
+	) {
+		if ($separation === null) {
+			$separation = $this->_build_params['eol'];
+		}
+
+		$body = $this->get($params);
+
+		if ($this->_isError($body)) {
+			return $body;
+		}
+
+		return $this->txtHeaders($headers, $overwrite) . $separation . $body;
+	}
+
+	/**
+	 * Returns the complete e-mail body, ready to send using an alternative
+	 * mail delivery method.
+	 * 
+	 * @param array $params The Build parameters passed to the
+	 *                      get() method. See get() for more info.
+	 *
+	 * @return mixed The e-mail body or PEAR error object
+	 * @access public
+	 * @since 1.6.0
+	 */
+	function getMessageBody($params = null)
+	{
+		return $this->get($params, null, true);
+	}
+
+	/**
+	 * Writes (appends) the complete e-mail into file.
+	 * 
+	 * @param string $filename  Output file location
+	 * @param array  $params    The Build parameters passed to the
+	 *                          get() method. See get() for more info.
+	 * @param array  $headers   The extra headers that should be passed
+	 *                          to the headers() function.
+	 *                          See that function for more info.
+	 * @param bool   $overwrite Overwrite the existing headers with new.
+	 *
+	 * @return mixed True or PEAR error object
+	 * @access public
+	 * @since 1.6.0
+	 */
+	function saveMessage($filename, $params = null, $headers = null, $overwrite = false)
+	{
+		// Check state of file and raise an error properly
+		if (file_exists($filename) && !is_writable($filename)) {
+			return $this->_raiseError('File is not writable: ' . $filename);
+		}
+
+		// Temporarily reset magic_quotes_runtime and read file contents
+		if ($magic_quote_setting = get_magic_quotes_runtime()) {
+			@ini_set('magic_quotes_runtime', 0);
+		}
+
+		if (!($fh = fopen($filename, 'ab'))) {
+			return $this->_raiseError('Unable to open file: ' . $filename);
+		}
+
+		// Write message headers into file (skipping Content-* headers)
+		$head = $this->txtHeaders($headers, $overwrite, true);
+		if (fwrite($fh, $head) === false) {
+			return $this->_raiseError('Error writing to file: ' . $filename);
+		}
+
+		fclose($fh);
+
+		if ($magic_quote_setting) {
+			@ini_set('magic_quotes_runtime', $magic_quote_setting);
+		}
+
+		// Write the rest of the message into file
+		$res = $this->get($params, $filename);
+
+		return $res ? $res : true;
+	}
+
+	/**
+	 * Writes (appends) the complete e-mail body into file.
+	 *
+	 * @param string $filename Output file location
+	 * @param array  $params   The Build parameters passed to the
+	 *                         get() method. See get() for more info.
+	 *
+	 * @return mixed True or PEAR error object
+	 * @access public
+	 * @since 1.6.0
+	 */
+	function saveMessageBody($filename, $params = null)
+	{
+		// Check state of file and raise an error properly
+		if (file_exists($filename) && !is_writable($filename)) {
+			return $this->_raiseError('File is not writable: ' . $filename);
+		}
+
+		// Temporarily reset magic_quotes_runtime and read file contents
+		if ($magic_quote_setting = get_magic_quotes_runtime()) {
+			@ini_set('magic_quotes_runtime', 0);
+		}
+
+		if (!($fh = fopen($filename, 'ab'))) {
+			return $this->_raiseError('Unable to open file: ' . $filename);
+		}
+
+		// Write the rest of the message into file
+		$res = $this->get($params, $filename, true);
+
+		return $res ? $res : true;
+	}
+
+	/**
+	 * Builds the multipart message from the list ($this->_parts) and
+	 * returns the mime content.
+	 *
+	 * @param array    $params    Build parameters that change the way the email
+	 *                            is built. Should be associative. See $_build_params.
+	 * @param resource $filename  Output file where to save the message instead of
+	 *                            returning it
+	 * @param boolean  $skip_head True if you want to return/save only the message
+	 *                            without headers
+	 *
+	 * @return mixed The MIME message content string, null or PEAR error object
+	 * @access public
+	 */
+	function get($params = null, $filename = null, $skip_head = false)
+	{
+		if (isset($params)) {
+			while (list($key, $value) = each($params)) {
+				$this->_build_params[$key] = $value;
+			}
+		}
+
+		if (isset($this->_headers['From'])) {
+			// Bug #11381: Illegal characters in domain ID
+			if (preg_match('#(@[0-9a-zA-Z\-\.]+)#', $this->_headers['From'], $matches)) {
+				$domainID = $matches[1];
+			} else {
+				$domainID = '@localhost';
+			}
+			foreach ($this->_html_images as $i => $img) {
+				$cid = $this->_html_images[$i]['cid']; 
+				if (!preg_match('#'.preg_quote($domainID).'$#', $cid)) {
+					$this->_html_images[$i]['cid'] = $cid . $domainID;
+				}
+			}
+		}
+
+		if (count($this->_html_images) && isset($this->_htmlbody)) {
+			foreach ($this->_html_images as $key => $value) {
+				$regex   = array();
+				$regex[] = '#(\s)((?i)src|background|href(?-i))\s*=\s*(["\']?)' .
+							preg_quote($value['name'], '#') . '\3#';
+				$regex[] = '#(?i)url(?-i)\(\s*(["\']?)' .
+							preg_quote($value['name'], '#') . '\1\s*\)#';
+
+				$rep   = array();
+				$rep[] = '\1\2=\3cid:' . $value['cid'] .'\3';
+				$rep[] = 'url(\1cid:' . $value['cid'] . '\1)';
+
+				$this->_htmlbody = preg_replace($regex, $rep, $this->_htmlbody);
+				$this->_html_images[$key]['name']
+					= $this->_basename($this->_html_images[$key]['name']);
+			}
+		}
+
+		$this->_checkParams();
+
+		$null        = -1;
+		$attachments = count($this->_parts) > 0;
+		$html_images = count($this->_html_images) > 0;
+		$html        = strlen($this->_htmlbody) > 0;
+		$text        = !$html && strlen($this->_txtbody);
+
+		switch (true) {
+		case $text && !$attachments:
+			$message =& $this->_addTextPart($null, $this->_txtbody);
+			break;
+
+		case !$text && !$html && $attachments:
+			$message =& $this->_addMixedPart();
+			for ($i = 0; $i < count($this->_parts); $i++) {
+				$this->_addAttachmentPart($message, $this->_parts[$i]);
+			}
+			break;
+
+		case $text && $attachments:
+			$message =& $this->_addMixedPart();
+			$this->_addTextPart($message, $this->_txtbody);
+			for ($i = 0; $i < count($this->_parts); $i++) {
+				$this->_addAttachmentPart($message, $this->_parts[$i]);
+			}
+			break;
+
+		case $html && !$attachments && !$html_images:
+			if (isset($this->_txtbody)) {
+				$message =& $this->_addAlternativePart($null);
+				$this->_addTextPart($message, $this->_txtbody);
+				$this->_addHtmlPart($message);
+			} else {
+				$message =& $this->_addHtmlPart($null);
+			}
+			break;
+
+		case $html && !$attachments && $html_images:
+			// * Content-Type: multipart/alternative;
+			//    * text
+			//    * Content-Type: multipart/related;
+			//       * html
+			//       * image...
+			if (isset($this->_txtbody)) {
+				$message =& $this->_addAlternativePart($null);
+				$this->_addTextPart($message, $this->_txtbody);
+
+				$ht =& $this->_addRelatedPart($message);
+				$this->_addHtmlPart($ht);
+				for ($i = 0; $i < count($this->_html_images); $i++) {
+					$this->_addHtmlImagePart($ht, $this->_html_images[$i]);
+				}
+			} else {
+				// * Content-Type: multipart/related;
+				//    * html
+				//    * image...
+				$message =& $this->_addRelatedPart($null);
+				$this->_addHtmlPart($message);
+				for ($i = 0; $i < count($this->_html_images); $i++) {
+					$this->_addHtmlImagePart($message, $this->_html_images[$i]);
+				}
+			}
+			/*
             // #13444, #9725: the code below was a non-RFC compliant hack
             // * Content-Type: multipart/related;
             //    * Content-Type: multipart/alternative;
@@ -958,537 +958,537 @@ 
                 $this->_addHtmlImagePart($message, $this->_html_images[$i]);
             }
             */
-            break;
-
-        case $html && $attachments && !$html_images:
-            $message =& $this->_addMixedPart();
-            if (isset($this->_txtbody)) {
-                $alt =& $this->_addAlternativePart($message);
-                $this->_addTextPart($alt, $this->_txtbody);
-                $this->_addHtmlPart($alt);
-            } else {
-                $this->_addHtmlPart($message);
-            }
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-
-        case $html && $attachments && $html_images:
-            $message =& $this->_addMixedPart();
-            if (isset($this->_txtbody)) {
-                $alt =& $this->_addAlternativePart($message);
-                $this->_addTextPart($alt, $this->_txtbody);
-                $rel =& $this->_addRelatedPart($alt);
-            } else {
-                $rel =& $this->_addRelatedPart($message);
-            }
-            $this->_addHtmlPart($rel);
-            for ($i = 0; $i < count($this->_html_images); $i++) {
-                $this->_addHtmlImagePart($rel, $this->_html_images[$i]);
-            }
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-        }
-
-        if (!isset($message)) {
-            return null;
-        }
-
-        // Use saved boundary
-        if (!empty($this->_build_params['boundary'])) {
-            $boundary = $this->_build_params['boundary'];
-        } else {
-            $boundary = null;
-        }
-
-        // Write output to file
-        if ($filename) {
-            // Append mimePart message headers and body into file
-            $headers = $message->encodeToFile($filename, $boundary, $skip_head);
-            if ($this->_isError($headers)) {
-                return $headers;
-            }
-            $this->_headers = array_merge($this->_headers, $headers);
-            return null;
-        } else {
-            $output = $message->encode($boundary, $skip_head);
-            if ($this->_isError($output)) {
-                return $output;
-            }
-            $this->_headers = array_merge($this->_headers, $output['headers']);
-            return $output['body'];
-        }
-    }
-
-    /**
-     * Returns an array with the headers needed to prepend to the email
-     * (MIME-Version and Content-Type). Format of argument is:
-     * $array['header-name'] = 'header-value';
-     *
-     * @param array $xtra_headers Assoc array with any extra headers (optional)
-     *                            (Don't set Content-Type for multipart messages here!)
-     * @param bool  $overwrite    Overwrite already existing headers.
-     * @param bool  $skip_content Don't return content headers: Content-Type,
-     *                            Content-Disposition and Content-Transfer-Encoding
-     * 
-     * @return array              Assoc array with the mime headers
-     * @access public
-     */
-    function headers($xtra_headers = null, $overwrite = false, $skip_content = false)
-    {
-        // Add mime version header
-        $headers['MIME-Version'] = '1.0';
-
-        // Content-Type and Content-Transfer-Encoding headers should already
-        // be present if get() was called, but we'll re-set them to make sure
-        // we got them when called before get() or something in the message
-        // has been changed after get() [#14780]
-        if (!$skip_content) {
-            $headers += $this->_contentHeaders();
-        }
-
-        if (!empty($xtra_headers)) {
-            $headers = array_merge($headers, $xtra_headers);
-        }
-
-        if ($overwrite) {
-            $this->_headers = array_merge($this->_headers, $headers);
-        } else {
-            $this->_headers = array_merge($headers, $this->_headers);
-        }
-
-        $headers = $this->_headers;
-
-        if ($skip_content) {
-            unset($headers['Content-Type']);
-            unset($headers['Content-Transfer-Encoding']);
-            unset($headers['Content-Disposition']);
-        } else if (!empty($this->_build_params['ctype'])) {
-            $headers['Content-Type'] = $this->_build_params['ctype'];
-        }
-
-        $encodedHeaders = $this->_encodeHeaders($headers);
-        return $encodedHeaders;
-    }
-
-    /**
-     * Get the text version of the headers
-     * (usefull if you want to use the PHP mail() function)
-     *
-     * @param array $xtra_headers Assoc array with any extra headers (optional)
-     *                            (Don't set Content-Type for multipart messages here!)
-     * @param bool  $overwrite    Overwrite the existing headers with new.
-     * @param bool  $skip_content Don't return content headers: Content-Type,
-     *                            Content-Disposition and Content-Transfer-Encoding
-     *
-     * @return string             Plain text headers
-     * @access public
-     */
-    function txtHeaders($xtra_headers = null, $overwrite = false, $skip_content = false)
-    {
-        $headers = $this->headers($xtra_headers, $overwrite, $skip_content);
-
-        // Place Received: headers at the beginning of the message
-        // Spam detectors often flag messages with it after the Subject: as spam
-        if (isset($headers['Received'])) {
-            $received = $headers['Received'];
-            unset($headers['Received']);
-            $headers = array('Received' => $received) + $headers;
-        }
-
-        $ret = '';
-        $eol = $this->_build_params['eol'];
-
-        foreach ($headers as $key => $val) {
-            if (is_array($val)) {
-                foreach ($val as $value) {
-                    $ret .= "$key: $value" . $eol;
-                }
-            } else {
-                $ret .= "$key: $val" . $eol;
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Sets message Content-Type header.
-     * Use it to build messages with various content-types e.g. miltipart/raport
-     * not supported by _contentHeaders() function.
-     *
-     * @param string $type   Type name
-     * @param array  $params Hash array of header parameters
-     *
-     * @return void
-     * @access public
-     * @since 1.7.0
-     */
-    function setContentType($type, $params = array())
-    {
-        $header = $type;
-
-        $eol = !empty($this->_build_params['eol'])
-            ? $this->_build_params['eol'] : "\r\n";
-
-        // add parameters
-        $token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
-            . '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
-        if (is_array($params)) {
-            foreach ($params as $name => $value) {
-                if ($name == 'boundary') {
-                    $this->_build_params['boundary'] = $value;
-                }
-                if (!preg_match($token_regexp, $value)) {
-                    $header .= ";$eol $name=$value";
-                } else {
-                    $value = addcslashes($value, '\\"');
-                    $header .= ";$eol $name=\"$value\"";
-                }
-            }
-        }
-
-        // add required boundary parameter if not defined
-        if (preg_match('/^multipart\//i', $type)) {
-            if (empty($this->_build_params['boundary'])) {
-                $this->_build_params['boundary'] = '=_' . md5(rand() . microtime());
-            }
-
-            $header .= ";$eol boundary=\"".$this->_build_params['boundary']."\"";
-        }
-
-        $this->_build_params['ctype'] = $header;
-    }
-
-    /**
-     * Sets the Subject header
-     *
-     * @param string $subject String to set the subject to.
-     *
-     * @return void
-     * @access public
-     */
-    function setSubject($subject)
-    {
-        $this->_headers['Subject'] = $subject;
-    }
-
-    /**
-     * Set an email to the From (the sender) header
-     *
-     * @param string $email The email address to use
-     *
-     * @return void
-     * @access public
-     */
-    function setFrom($email)
-    {
-        $this->_headers['From'] = $email;
-    }
-
-    /**
-     * Add an email to the To header
-     * (multiple calls to this method are allowed)
-     *
-     * @param string $email The email direction to add
-     *
-     * @return void
-     * @access public
-     */
-    function addTo($email)
-    {
-        if (isset($this->_headers['To'])) {
-            $this->_headers['To'] .= ", $email";
-        } else {
-            $this->_headers['To'] = $email;
-        }
-    }
-
-    /**
-     * Add an email to the Cc (carbon copy) header
-     * (multiple calls to this method are allowed)
-     *
-     * @param string $email The email direction to add
-     *
-     * @return void
-     * @access public
-     */
-    function addCc($email)
-    {
-        if (isset($this->_headers['Cc'])) {
-            $this->_headers['Cc'] .= ", $email";
-        } else {
-            $this->_headers['Cc'] = $email;
-        }
-    }
-
-    /**
-     * Add an email to the Bcc (blank carbon copy) header
-     * (multiple calls to this method are allowed)
-     *
-     * @param string $email The email direction to add
-     *
-     * @return void
-     * @access public
-     */
-    function addBcc($email)
-    {
-        if (isset($this->_headers['Bcc'])) {
-            $this->_headers['Bcc'] .= ", $email";
-        } else {
-            $this->_headers['Bcc'] = $email;
-        }
-    }
-
-    /**
-     * Since the PHP send function requires you to specify
-     * recipients (To: header) separately from the other
-     * headers, the To: header is not properly encoded.
-     * To fix this, you can use this public method to 
-     * encode your recipients before sending to the send
-     * function
-     *
-     * @param string $recipients A comma-delimited list of recipients
-     *
-     * @return string            Encoded data
-     * @access public
-     */
-    function encodeRecipients($recipients)
-    {
-        $input = array("To" => $recipients);
-        $retval = $this->_encodeHeaders($input);
-        return $retval["To"] ;
-    }
-
-    /**
-     * Encodes headers as per RFC2047
-     *
-     * @param array $input  The header data to encode
-     * @param array $params Extra build parameters
-     *
-     * @return array        Encoded data
-     * @access private
-     */
-    function _encodeHeaders($input, $params = array())
-    {
-        $build_params = $this->_build_params;
-        while (list($key, $value) = each($params)) {
-            $build_params[$key] = $value;
-        }
-
-        foreach ($input as $hdr_name => $hdr_value) {
-            if (is_array($hdr_value)) {
-                foreach ($hdr_value as $idx => $value) {
-                    $input[$hdr_name][$idx] = $this->encodeHeader(
-                        $hdr_name, $value,
-                        $build_params['head_charset'], $build_params['head_encoding']
-                    );
-                }
-            } else {
-                $input[$hdr_name] = $this->encodeHeader(
-                    $hdr_name, $hdr_value,
-                    $build_params['head_charset'], $build_params['head_encoding']
-                );
-            }
-        }
-
-        return $input;
-    }
-
-    /**
-     * Encodes a header as per RFC2047
-     *
-     * @param string $name     The header name
-     * @param string $value    The header data to encode
-     * @param string $charset  Character set name
-     * @param string $encoding Encoding name (base64 or quoted-printable)
-     *
-     * @return string          Encoded header data (without a name)
-     * @access public
-     * @since 1.5.3
-     */
-    function encodeHeader($name, $value, $charset, $encoding)
-    {
-        $mime_part = new Mail_mimePart;
-        return $mime_part->encodeHeader(
-            $name, $value, $charset, $encoding, $this->_build_params['eol']
-        );
-    }
-
-    /**
-     * Get file's basename (locale independent) 
-     *
-     * @param string $filename Filename
-     *
-     * @return string          Basename
-     * @access private
-     */
-    function _basename($filename)
-    {
-        // basename() is not unicode safe and locale dependent
-        if (stristr(PHP_OS, 'win') || stristr(PHP_OS, 'netware')) {
-            return preg_replace('/^.*[\\\\\\/]/', '', $filename);
-        } else {
-            return preg_replace('/^.*[\/]/', '', $filename);
-        }
-    }
-
-    /**
-     * Get Content-Type and Content-Transfer-Encoding headers of the message
-     *
-     * @return array Headers array
-     * @access private
-     */
-    function _contentHeaders()
-    {
-        $attachments = count($this->_parts)                 ? true : false;
-        $html_images = count($this->_html_images)           ? true : false;
-        $html        = strlen($this->_htmlbody)             ? true : false;
-        $text        = (!$html && strlen($this->_txtbody))  ? true : false;
-        $headers     = array();
-
-        // See get()
-        switch (true) {
-        case $text && !$attachments:
-            $headers['Content-Type'] = 'text/plain';
-            break;
-
-        case !$text && !$html && $attachments:
-        case $text && $attachments:
-        case $html && $attachments && !$html_images:
-        case $html && $attachments && $html_images:
-            $headers['Content-Type'] = 'multipart/mixed';
-            break;
-
-        case $html && !$attachments && !$html_images && isset($this->_txtbody):
-        case $html && !$attachments && $html_images && isset($this->_txtbody):
-            $headers['Content-Type'] = 'multipart/alternative';
-            break;
-
-        case $html && !$attachments && !$html_images && !isset($this->_txtbody):
-            $headers['Content-Type'] = 'text/html';
-            break;
-
-        case $html && !$attachments && $html_images && !isset($this->_txtbody):
-            $headers['Content-Type'] = 'multipart/related';
-            break;
-
-        default:
-            return $headers;
-        }
-
-        $this->_checkParams();
-
-        $eol = !empty($this->_build_params['eol'])
-            ? $this->_build_params['eol'] : "\r\n";
-
-        if ($headers['Content-Type'] == 'text/plain') {
-            // single-part message: add charset and encoding
-            $charset = 'charset=' . $this->_build_params['text_charset'];
-            // place charset parameter in the same line, if possible
-            // 26 = strlen("Content-Type: text/plain; ")
-            $headers['Content-Type']
-                .= (strlen($charset) + 26 <= 76) ? "; $charset" : ";$eol $charset";
-            $headers['Content-Transfer-Encoding']
-                = $this->_build_params['text_encoding'];
-        } else if ($headers['Content-Type'] == 'text/html') {
-            // single-part message: add charset and encoding
-            $charset = 'charset=' . $this->_build_params['html_charset'];
-            // place charset parameter in the same line, if possible
-            $headers['Content-Type']
-                .= (strlen($charset) + 25 <= 76) ? "; $charset" : ";$eol $charset";
-            $headers['Content-Transfer-Encoding']
-                = $this->_build_params['html_encoding'];
-        } else {
-            // multipart message: and boundary
-            if (!empty($this->_build_params['boundary'])) {
-                $boundary = $this->_build_params['boundary'];
-            } else if (!empty($this->_headers['Content-Type'])
-                && preg_match('/boundary="([^"]+)"/', $this->_headers['Content-Type'], $m)
-            ) {
-                $boundary = $m[1];
-            } else {
-                $boundary = '=_' . md5(rand() . microtime());
-            }
-
-            $this->_build_params['boundary'] = $boundary;
-            $headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Validate and set build parameters
-     *
-     * @return void
-     * @access private
-     */
-    function _checkParams()
-    {
-        $encodings = array('7bit', '8bit', 'base64', 'quoted-printable');
-
-        $this->_build_params['text_encoding']
-            = strtolower($this->_build_params['text_encoding']);
-        $this->_build_params['html_encoding']
-            = strtolower($this->_build_params['html_encoding']);
-
-        if (!in_array($this->_build_params['text_encoding'], $encodings)) {
-            $this->_build_params['text_encoding'] = '7bit';
-        }
-        if (!in_array($this->_build_params['html_encoding'], $encodings)) {
-            $this->_build_params['html_encoding'] = '7bit';
-        }
-
-        // text body
-        if ($this->_build_params['text_encoding'] == '7bit'
-            && !preg_match('/ascii/i', $this->_build_params['text_charset'])
-            && preg_match('/[^\x00-\x7F]/', $this->_txtbody)
-        ) {
-            $this->_build_params['text_encoding'] = 'quoted-printable';
-        }
-        // html body
-        if ($this->_build_params['html_encoding'] == '7bit'
-            && !preg_match('/ascii/i', $this->_build_params['html_charset'])
-            && preg_match('/[^\x00-\x7F]/', $this->_htmlbody)
-        ) {
-            $this->_build_params['html_encoding'] = 'quoted-printable';
-        }
-    }
-
-    /**
-     * PEAR::isError implementation
-     *
-     * @param mixed $data Object
-     *
-     * @return bool True if object is an instance of PEAR_Error
-     * @access private
-     */
-    function _isError($data)
-    {
-        // PEAR::isError() is not PHP 5.4 compatible (see Bug #19473)
-        if (is_object($data) && is_a($data, 'PEAR_Error')) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * PEAR::raiseError implementation
-     *
-     * @param $message A text error message
-     *
-     * @return PEAR_Error Instance of PEAR_Error
-     * @access private
-     */
-    function _raiseError($message)
-    {
-        // PEAR::raiseError() is not PHP 5.4 compatible
-        return new PEAR_Error($message);
-    }
+			break;
+
+		case $html && $attachments && !$html_images:
+			$message =& $this->_addMixedPart();
+			if (isset($this->_txtbody)) {
+				$alt =& $this->_addAlternativePart($message);
+				$this->_addTextPart($alt, $this->_txtbody);
+				$this->_addHtmlPart($alt);
+			} else {
+				$this->_addHtmlPart($message);
+			}
+			for ($i = 0; $i < count($this->_parts); $i++) {
+				$this->_addAttachmentPart($message, $this->_parts[$i]);
+			}
+			break;
+
+		case $html && $attachments && $html_images:
+			$message =& $this->_addMixedPart();
+			if (isset($this->_txtbody)) {
+				$alt =& $this->_addAlternativePart($message);
+				$this->_addTextPart($alt, $this->_txtbody);
+				$rel =& $this->_addRelatedPart($alt);
+			} else {
+				$rel =& $this->_addRelatedPart($message);
+			}
+			$this->_addHtmlPart($rel);
+			for ($i = 0; $i < count($this->_html_images); $i++) {
+				$this->_addHtmlImagePart($rel, $this->_html_images[$i]);
+			}
+			for ($i = 0; $i < count($this->_parts); $i++) {
+				$this->_addAttachmentPart($message, $this->_parts[$i]);
+			}
+			break;
+		}
+
+		if (!isset($message)) {
+			return null;
+		}
+
+		// Use saved boundary
+		if (!empty($this->_build_params['boundary'])) {
+			$boundary = $this->_build_params['boundary'];
+		} else {
+			$boundary = null;
+		}
+
+		// Write output to file
+		if ($filename) {
+			// Append mimePart message headers and body into file
+			$headers = $message->encodeToFile($filename, $boundary, $skip_head);
+			if ($this->_isError($headers)) {
+				return $headers;
+			}
+			$this->_headers = array_merge($this->_headers, $headers);
+			return null;
+		} else {
+			$output = $message->encode($boundary, $skip_head);
+			if ($this->_isError($output)) {
+				return $output;
+			}
+			$this->_headers = array_merge($this->_headers, $output['headers']);
+			return $output['body'];
+		}
+	}
+
+	/**
+	 * Returns an array with the headers needed to prepend to the email
+	 * (MIME-Version and Content-Type). Format of argument is:
+	 * $array['header-name'] = 'header-value';
+	 *
+	 * @param array $xtra_headers Assoc array with any extra headers (optional)
+	 *                            (Don't set Content-Type for multipart messages here!)
+	 * @param bool  $overwrite    Overwrite already existing headers.
+	 * @param bool  $skip_content Don't return content headers: Content-Type,
+	 *                            Content-Disposition and Content-Transfer-Encoding
+	 * 
+	 * @return array              Assoc array with the mime headers
+	 * @access public
+	 */
+	function headers($xtra_headers = null, $overwrite = false, $skip_content = false)
+	{
+		// Add mime version header
+		$headers['MIME-Version'] = '1.0';
+
+		// Content-Type and Content-Transfer-Encoding headers should already
+		// be present if get() was called, but we'll re-set them to make sure
+		// we got them when called before get() or something in the message
+		// has been changed after get() [#14780]
+		if (!$skip_content) {
+			$headers += $this->_contentHeaders();
+		}
+
+		if (!empty($xtra_headers)) {
+			$headers = array_merge($headers, $xtra_headers);
+		}
+
+		if ($overwrite) {
+			$this->_headers = array_merge($this->_headers, $headers);
+		} else {
+			$this->_headers = array_merge($headers, $this->_headers);
+		}
+
+		$headers = $this->_headers;
+
+		if ($skip_content) {
+			unset($headers['Content-Type']);
+			unset($headers['Content-Transfer-Encoding']);
+			unset($headers['Content-Disposition']);
+		} else if (!empty($this->_build_params['ctype'])) {
+			$headers['Content-Type'] = $this->_build_params['ctype'];
+		}
+
+		$encodedHeaders = $this->_encodeHeaders($headers);
+		return $encodedHeaders;
+	}
+
+	/**
+	 * Get the text version of the headers
+	 * (usefull if you want to use the PHP mail() function)
+	 *
+	 * @param array $xtra_headers Assoc array with any extra headers (optional)
+	 *                            (Don't set Content-Type for multipart messages here!)
+	 * @param bool  $overwrite    Overwrite the existing headers with new.
+	 * @param bool  $skip_content Don't return content headers: Content-Type,
+	 *                            Content-Disposition and Content-Transfer-Encoding
+	 *
+	 * @return string             Plain text headers
+	 * @access public
+	 */
+	function txtHeaders($xtra_headers = null, $overwrite = false, $skip_content = false)
+	{
+		$headers = $this->headers($xtra_headers, $overwrite, $skip_content);
+
+		// Place Received: headers at the beginning of the message
+		// Spam detectors often flag messages with it after the Subject: as spam
+		if (isset($headers['Received'])) {
+			$received = $headers['Received'];
+			unset($headers['Received']);
+			$headers = array('Received' => $received) + $headers;
+		}
+
+		$ret = '';
+		$eol = $this->_build_params['eol'];
+
+		foreach ($headers as $key => $val) {
+			if (is_array($val)) {
+				foreach ($val as $value) {
+					$ret .= "$key: $value" . $eol;
+				}
+			} else {
+				$ret .= "$key: $val" . $eol;
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Sets message Content-Type header.
+	 * Use it to build messages with various content-types e.g. miltipart/raport
+	 * not supported by _contentHeaders() function.
+	 *
+	 * @param string $type   Type name
+	 * @param array  $params Hash array of header parameters
+	 *
+	 * @return void
+	 * @access public
+	 * @since 1.7.0
+	 */
+	function setContentType($type, $params = array())
+	{
+		$header = $type;
+
+		$eol = !empty($this->_build_params['eol'])
+			? $this->_build_params['eol'] : "\r\n";
+
+		// add parameters
+		$token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
+			. '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
+		if (is_array($params)) {
+			foreach ($params as $name => $value) {
+				if ($name == 'boundary') {
+					$this->_build_params['boundary'] = $value;
+				}
+				if (!preg_match($token_regexp, $value)) {
+					$header .= ";$eol $name=$value";
+				} else {
+					$value = addcslashes($value, '\\"');
+					$header .= ";$eol $name=\"$value\"";
+				}
+			}
+		}
+
+		// add required boundary parameter if not defined
+		if (preg_match('/^multipart\//i', $type)) {
+			if (empty($this->_build_params['boundary'])) {
+				$this->_build_params['boundary'] = '=_' . md5(rand() . microtime());
+			}
+
+			$header .= ";$eol boundary=\"".$this->_build_params['boundary']."\"";
+		}
+
+		$this->_build_params['ctype'] = $header;
+	}
+
+	/**
+	 * Sets the Subject header
+	 *
+	 * @param string $subject String to set the subject to.
+	 *
+	 * @return void
+	 * @access public
+	 */
+	function setSubject($subject)
+	{
+		$this->_headers['Subject'] = $subject;
+	}
+
+	/**
+	 * Set an email to the From (the sender) header
+	 *
+	 * @param string $email The email address to use
+	 *
+	 * @return void
+	 * @access public
+	 */
+	function setFrom($email)
+	{
+		$this->_headers['From'] = $email;
+	}
+
+	/**
+	 * Add an email to the To header
+	 * (multiple calls to this method are allowed)
+	 *
+	 * @param string $email The email direction to add
+	 *
+	 * @return void
+	 * @access public
+	 */
+	function addTo($email)
+	{
+		if (isset($this->_headers['To'])) {
+			$this->_headers['To'] .= ", $email";
+		} else {
+			$this->_headers['To'] = $email;
+		}
+	}
+
+	/**
+	 * Add an email to the Cc (carbon copy) header
+	 * (multiple calls to this method are allowed)
+	 *
+	 * @param string $email The email direction to add
+	 *
+	 * @return void
+	 * @access public
+	 */
+	function addCc($email)
+	{
+		if (isset($this->_headers['Cc'])) {
+			$this->_headers['Cc'] .= ", $email";
+		} else {
+			$this->_headers['Cc'] = $email;
+		}
+	}
+
+	/**
+	 * Add an email to the Bcc (blank carbon copy) header
+	 * (multiple calls to this method are allowed)
+	 *
+	 * @param string $email The email direction to add
+	 *
+	 * @return void
+	 * @access public
+	 */
+	function addBcc($email)
+	{
+		if (isset($this->_headers['Bcc'])) {
+			$this->_headers['Bcc'] .= ", $email";
+		} else {
+			$this->_headers['Bcc'] = $email;
+		}
+	}
+
+	/**
+	 * Since the PHP send function requires you to specify
+	 * recipients (To: header) separately from the other
+	 * headers, the To: header is not properly encoded.
+	 * To fix this, you can use this public method to 
+	 * encode your recipients before sending to the send
+	 * function
+	 *
+	 * @param string $recipients A comma-delimited list of recipients
+	 *
+	 * @return string            Encoded data
+	 * @access public
+	 */
+	function encodeRecipients($recipients)
+	{
+		$input = array("To" => $recipients);
+		$retval = $this->_encodeHeaders($input);
+		return $retval["To"] ;
+	}
+
+	/**
+	 * Encodes headers as per RFC2047
+	 *
+	 * @param array $input  The header data to encode
+	 * @param array $params Extra build parameters
+	 *
+	 * @return array        Encoded data
+	 * @access private
+	 */
+	function _encodeHeaders($input, $params = array())
+	{
+		$build_params = $this->_build_params;
+		while (list($key, $value) = each($params)) {
+			$build_params[$key] = $value;
+		}
+
+		foreach ($input as $hdr_name => $hdr_value) {
+			if (is_array($hdr_value)) {
+				foreach ($hdr_value as $idx => $value) {
+					$input[$hdr_name][$idx] = $this->encodeHeader(
+						$hdr_name, $value,
+						$build_params['head_charset'], $build_params['head_encoding']
+					);
+				}
+			} else {
+				$input[$hdr_name] = $this->encodeHeader(
+					$hdr_name, $hdr_value,
+					$build_params['head_charset'], $build_params['head_encoding']
+				);
+			}
+		}
+
+		return $input;
+	}
+
+	/**
+	 * Encodes a header as per RFC2047
+	 *
+	 * @param string $name     The header name
+	 * @param string $value    The header data to encode
+	 * @param string $charset  Character set name
+	 * @param string $encoding Encoding name (base64 or quoted-printable)
+	 *
+	 * @return string          Encoded header data (without a name)
+	 * @access public
+	 * @since 1.5.3
+	 */
+	function encodeHeader($name, $value, $charset, $encoding)
+	{
+		$mime_part = new Mail_mimePart;
+		return $mime_part->encodeHeader(
+			$name, $value, $charset, $encoding, $this->_build_params['eol']
+		);
+	}
+
+	/**
+	 * Get file's basename (locale independent) 
+	 *
+	 * @param string $filename Filename
+	 *
+	 * @return string          Basename
+	 * @access private
+	 */
+	function _basename($filename)
+	{
+		// basename() is not unicode safe and locale dependent
+		if (stristr(PHP_OS, 'win') || stristr(PHP_OS, 'netware')) {
+			return preg_replace('/^.*[\\\\\\/]/', '', $filename);
+		} else {
+			return preg_replace('/^.*[\/]/', '', $filename);
+		}
+	}
+
+	/**
+	 * Get Content-Type and Content-Transfer-Encoding headers of the message
+	 *
+	 * @return array Headers array
+	 * @access private
+	 */
+	function _contentHeaders()
+	{
+		$attachments = count($this->_parts)                 ? true : false;
+		$html_images = count($this->_html_images)           ? true : false;
+		$html        = strlen($this->_htmlbody)             ? true : false;
+		$text        = (!$html && strlen($this->_txtbody))  ? true : false;
+		$headers     = array();
+
+		// See get()
+		switch (true) {
+		case $text && !$attachments:
+			$headers['Content-Type'] = 'text/plain';
+			break;
+
+		case !$text && !$html && $attachments:
+		case $text && $attachments:
+		case $html && $attachments && !$html_images:
+		case $html && $attachments && $html_images:
+			$headers['Content-Type'] = 'multipart/mixed';
+			break;
+
+		case $html && !$attachments && !$html_images && isset($this->_txtbody):
+		case $html && !$attachments && $html_images && isset($this->_txtbody):
+			$headers['Content-Type'] = 'multipart/alternative';
+			break;
+
+		case $html && !$attachments && !$html_images && !isset($this->_txtbody):
+			$headers['Content-Type'] = 'text/html';
+			break;
+
+		case $html && !$attachments && $html_images && !isset($this->_txtbody):
+			$headers['Content-Type'] = 'multipart/related';
+			break;
+
+		default:
+			return $headers;
+		}
+
+		$this->_checkParams();
+
+		$eol = !empty($this->_build_params['eol'])
+			? $this->_build_params['eol'] : "\r\n";
+
+		if ($headers['Content-Type'] == 'text/plain') {
+			// single-part message: add charset and encoding
+			$charset = 'charset=' . $this->_build_params['text_charset'];
+			// place charset parameter in the same line, if possible
+			// 26 = strlen("Content-Type: text/plain; ")
+			$headers['Content-Type']
+				.= (strlen($charset) + 26 <= 76) ? "; $charset" : ";$eol $charset";
+			$headers['Content-Transfer-Encoding']
+				= $this->_build_params['text_encoding'];
+		} else if ($headers['Content-Type'] == 'text/html') {
+			// single-part message: add charset and encoding
+			$charset = 'charset=' . $this->_build_params['html_charset'];
+			// place charset parameter in the same line, if possible
+			$headers['Content-Type']
+				.= (strlen($charset) + 25 <= 76) ? "; $charset" : ";$eol $charset";
+			$headers['Content-Transfer-Encoding']
+				= $this->_build_params['html_encoding'];
+		} else {
+			// multipart message: and boundary
+			if (!empty($this->_build_params['boundary'])) {
+				$boundary = $this->_build_params['boundary'];
+			} else if (!empty($this->_headers['Content-Type'])
+				&& preg_match('/boundary="([^"]+)"/', $this->_headers['Content-Type'], $m)
+			) {
+				$boundary = $m[1];
+			} else {
+				$boundary = '=_' . md5(rand() . microtime());
+			}
+
+			$this->_build_params['boundary'] = $boundary;
+			$headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
+		}
+
+		return $headers;
+	}
+
+	/**
+	 * Validate and set build parameters
+	 *
+	 * @return void
+	 * @access private
+	 */
+	function _checkParams()
+	{
+		$encodings = array('7bit', '8bit', 'base64', 'quoted-printable');
+
+		$this->_build_params['text_encoding']
+			= strtolower($this->_build_params['text_encoding']);
+		$this->_build_params['html_encoding']
+			= strtolower($this->_build_params['html_encoding']);
+
+		if (!in_array($this->_build_params['text_encoding'], $encodings)) {
+			$this->_build_params['text_encoding'] = '7bit';
+		}
+		if (!in_array($this->_build_params['html_encoding'], $encodings)) {
+			$this->_build_params['html_encoding'] = '7bit';
+		}
+
+		// text body
+		if ($this->_build_params['text_encoding'] == '7bit'
+			&& !preg_match('/ascii/i', $this->_build_params['text_charset'])
+			&& preg_match('/[^\x00-\x7F]/', $this->_txtbody)
+		) {
+			$this->_build_params['text_encoding'] = 'quoted-printable';
+		}
+		// html body
+		if ($this->_build_params['html_encoding'] == '7bit'
+			&& !preg_match('/ascii/i', $this->_build_params['html_charset'])
+			&& preg_match('/[^\x00-\x7F]/', $this->_htmlbody)
+		) {
+			$this->_build_params['html_encoding'] = 'quoted-printable';
+		}
+	}
+
+	/**
+	 * PEAR::isError implementation
+	 *
+	 * @param mixed $data Object
+	 *
+	 * @return bool True if object is an instance of PEAR_Error
+	 * @access private
+	 */
+	function _isError($data)
+	{
+		// PEAR::isError() is not PHP 5.4 compatible (see Bug #19473)
+		if (is_object($data) && is_a($data, 'PEAR_Error')) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * PEAR::raiseError implementation
+	 *
+	 * @param $message A text error message
+	 *
+	 * @return PEAR_Error Instance of PEAR_Error
+	 * @access private
+	 */
+	function _raiseError($message)
+	{
+		// PEAR::raiseError() is not PHP 5.4 compatible
+		return new PEAR_Error($message);
+	}
 
 } // End of class