chamilo / chamilo-lms

main/inc/lib/phpdocx/lib/log4php/LoggerLocationInfo.php

Indentation +69 added lines, -69 removed lines

@@ -26,85 +26,85 @@
  * @since 0.3
  */
 class LoggerLocationInfo {
-	/**
-	 * When location information is not available the constant
-	 * <i>NA</i> is returned. Current value of this string
-	 * constant is <b>?</b>.  
-	 */
-	const LOCATION_INFO_NA = 'NA';
+    /**
+     * When location information is not available the constant
+     * <i>NA</i> is returned. Current value of this string
+     * constant is <b>?</b>.  
+     */
+    const LOCATION_INFO_NA = 'NA';
 	
-	/**
-	* @var string Caller's line number.
-	*/
-	protected $lineNumber = null;
+    /**
+     * @var string Caller's line number.
+     */
+    protected $lineNumber = null;
 	
-	/**
-	* @var string Caller's file name.
-	*/
-	protected $fileName = null;
+    /**
+     * @var string Caller's file name.
+     */
+    protected $fileName = null;
 	
-	/**
-	* @var string Caller's fully qualified class name.
-	*/
-	protected $className = null;
+    /**
+     * @var string Caller's fully qualified class name.
+     */
+    protected $className = null;
 	
-	/**
-	* @var string Caller's method name.
-	*/
-	protected $methodName = null;
+    /**
+     * @var string Caller's method name.
+     */
+    protected $methodName = null;
 	
-	/**
-	* @var string 
-	*/
-	protected $fullInfo = null;
+    /**
+     * @var string 
+     */
+    protected $fullInfo = null;
 
-	/**
-	 * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}.
-	 *
-	 * @param array $trace
-	 * @param mixed $caller
-	 */
-	public function __construct($trace, $fqcn = null) {
-		$this->lineNumber = isset($trace['line']) ? $trace['line'] : null;
-		$this->fileName = isset($trace['file']) ? $trace['file'] : null;
-		$this->className = isset($trace['class']) ? $trace['class'] : null;
-		$this->methodName = isset($trace['function']) ? $trace['function'] : null;
-		$this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . 
-			'(' . $this->getFileName() . ':' . $this->getLineNumber() . ')';
-	}
+    /**
+     * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}.
+     *
+     * @param array $trace
+     * @param mixed $caller
+     */
+    public function __construct($trace, $fqcn = null) {
+        $this->lineNumber = isset($trace['line']) ? $trace['line'] : null;
+        $this->fileName = isset($trace['file']) ? $trace['file'] : null;
+        $this->className = isset($trace['class']) ? $trace['class'] : null;
+        $this->methodName = isset($trace['function']) ? $trace['function'] : null;
+        $this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . 
+            '(' . $this->getFileName() . ':' . $this->getLineNumber() . ')';
+    }
 
-	public function getClassName() {
-		return ($this->className === null) ? self::LOCATION_INFO_NA : $this->className; 
-	}
+    public function getClassName() {
+        return ($this->className === null) ? self::LOCATION_INFO_NA : $this->className; 
+    }
 
-	/**
-	 *	Return the file name of the caller.
-	 *	<p>This information is not always available.
-	 */
-	public function getFileName() {
-		return ($this->fileName === null) ? self::LOCATION_INFO_NA : $this->fileName; 
-	}
+    /**
+     *	Return the file name of the caller.
+     *	<p>This information is not always available.
+     */
+    public function getFileName() {
+        return ($this->fileName === null) ? self::LOCATION_INFO_NA : $this->fileName; 
+    }
 
-	/**
-	 *	Returns the line number of the caller.
-	 *	<p>This information is not always available.
-	 */
-	public function getLineNumber() {
-		return ($this->lineNumber === null) ? self::LOCATION_INFO_NA : $this->lineNumber; 
-	}
+    /**
+     *	Returns the line number of the caller.
+     *	<p>This information is not always available.
+     */
+    public function getLineNumber() {
+        return ($this->lineNumber === null) ? self::LOCATION_INFO_NA : $this->lineNumber; 
+    }
 
-	/**
-	 *	Returns the method name of the caller.
-	 */
-	public function getMethodName() {
-		return ($this->methodName === null) ? self::LOCATION_INFO_NA : $this->methodName; 
-	}
+    /**
+     *	Returns the method name of the caller.
+     */
+    public function getMethodName() {
+        return ($this->methodName === null) ? self::LOCATION_INFO_NA : $this->methodName; 
+    }
 
-	/**
-	 *	Returns the full information of the caller.
-	 */
-	public function getFullInfo() {
-		return ($this->fullInfo === null) ? self::LOCATION_INFO_NA : $this->fullInfo;
-	}
+    /**
+     *	Returns the full information of the caller.
+     */
+    public function getFullInfo() {
+        return ($this->fullInfo === null) ? self::LOCATION_INFO_NA : $this->fullInfo;
+    }
 
 }

main/inc/lib/phpdocx/lib/log4php/LoggerLoggingEvent.php

Indentation +293 added lines, -293 removed lines

@@ -26,334 +26,334 @@
  */
 class LoggerLoggingEvent {
 
-	private static $startTime;
+    private static $startTime;
 
-	/** 
-	* @var string Fully Qualified Class Name of the calling category class.
-	*/
-	private $fqcn;
+    /** 
+     * @var string Fully Qualified Class Name of the calling category class.
+     */
+    private $fqcn;
 	
-	/**
-	* @var Logger reference
-	*/
-	private $logger = null;
+    /**
+     * @var Logger reference
+     */
+    private $logger = null;
 	
-	/** 
-	* The category (logger) name.
-	* This field will be marked as private in future
-	* releases. Please do not access it directly. 
-	* Use the {@link getLoggerName()} method instead.
-	* @deprecated 
-	*/
-	private $categoryName;
+    /** 
+     * The category (logger) name.
+     * This field will be marked as private in future
+     * releases. Please do not access it directly. 
+     * Use the {@link getLoggerName()} method instead.
+     * @deprecated 
+     */
+    private $categoryName;
 	
-	/** 
-	* Level of logging event.
-	* <p> This field should not be accessed directly. You shoud use the
-	* {@link getLevel()} method instead.
-	*
-	* @deprecated
-	* @var LoggerLevel
-	*/
-	protected $level;
+    /** 
+     * Level of logging event.
+     * <p> This field should not be accessed directly. You shoud use the
+     * {@link getLevel()} method instead.
+     *
+     * @deprecated
+     * @var LoggerLevel
+     */
+    protected $level;
 	
-	/** 
-	 * @var string The nested diagnostic context (NDC) of logging event. 
-	 */
-	private $ndc;
+    /** 
+     * @var string The nested diagnostic context (NDC) of logging event. 
+     */
+    private $ndc;
 	
-	/** 
-	 * Have we tried to do an NDC lookup? If we did, there is no need
-	 * to do it again.	Note that its value is always false when
-	 * serialized. Thus, a receiving SocketNode will never use it's own
-	 * (incorrect) NDC. See also writeObject method.
-	 * @var boolean
-	 */
-	private $ndcLookupRequired = true;
+    /** 
+     * Have we tried to do an NDC lookup? If we did, there is no need
+     * to do it again.	Note that its value is always false when
+     * serialized. Thus, a receiving SocketNode will never use it's own
+     * (incorrect) NDC. See also writeObject method.
+     * @var boolean
+     */
+    private $ndcLookupRequired = true;
 	
-	/** 
-	 * Have we tried to do an MDC lookup? If we did, there is no need
-	 * to do it again.	Note that its value is always false when
-	 * serialized. See also the getMDC and getMDCCopy methods.
-	 * @var boolean	 
-	 */
-	private $mdcCopyLookupRequired = true;
+    /** 
+     * Have we tried to do an MDC lookup? If we did, there is no need
+     * to do it again.	Note that its value is always false when
+     * serialized. See also the getMDC and getMDCCopy methods.
+     * @var boolean	 
+     */
+    private $mdcCopyLookupRequired = true;
 	
-	/** 
-	 * @var mixed The application supplied message of logging event. 
-	 */
-	private $message;
+    /** 
+     * @var mixed The application supplied message of logging event. 
+     */
+    private $message;
 	
-	/** 
-	 * The application supplied message rendered through the log4php
-	 * objet rendering mechanism. At present renderedMessage == message.
-	 * @var string
-	 */
-	private $renderedMessage = null;
+    /** 
+     * The application supplied message rendered through the log4php
+     * objet rendering mechanism. At present renderedMessage == message.
+     * @var string
+     */
+    private $renderedMessage = null;
 	
-	/** 
-	 * The name of thread in which this logging event was generated.
-	 * log4php saves here the process id via {@link PHP_MANUAL#getmypid getmypid()} 
-	 * @var mixed
-	 */
-	private $threadName = null;
+    /** 
+     * The name of thread in which this logging event was generated.
+     * log4php saves here the process id via {@link PHP_MANUAL#getmypid getmypid()} 
+     * @var mixed
+     */
+    private $threadName = null;
 	
-	/** 
-	* The number of seconds elapsed from 1/1/1970 until logging event
-	* was created plus microseconds if available.
-	* @var float
-	*/
-	public $timeStamp;
+    /** 
+     * The number of seconds elapsed from 1/1/1970 until logging event
+     * was created plus microseconds if available.
+     * @var float
+     */
+    public $timeStamp;
 	
-	/** 
-	* @var LoggerLocationInfo Location information for the caller. 
-	*/
-	private $locationInfo = null;
+    /** 
+     * @var LoggerLocationInfo Location information for the caller. 
+     */
+    private $locationInfo = null;
 	
-	/**
-	* Instantiate a LoggingEvent from the supplied parameters.
-	*
-	* <p>Except {@link $timeStamp} all the other fields of
-	* LoggerLoggingEvent are filled when actually needed.
-	*
-	* @param string $fqcn name of the caller class.
-	* @param mixed $logger The {@link Logger} category of this event or the logger name.
-	* @param LoggerLevel $priority The level of this event.
-	* @param mixed $message The message of this event.
-	* @param integer $timeStamp the timestamp of this logging event.
-	*/
-	public function __construct($fqcn, $logger, $priority, $message, $timeStamp = null) {
-		$this->fqcn = $fqcn;
-		if($logger instanceof Logger) {
-			$this->logger = $logger;
-			$this->categoryName = $logger->getName();
-		} else {
-			$this->categoryName = strval($logger);
-		}
-		$this->level = $priority;
-		$this->message = $message;
-		if($timeStamp !== null && is_float($timeStamp)) {
-			$this->timeStamp = $timeStamp;
-		} else {
-			if(function_exists('microtime')) {
-				// get microtime as float
-				$this->timeStamp = microtime(true);
-			} else {
-				$this->timeStamp = floatval(time());
-			}
-		}
-	}
+    /**
+     * Instantiate a LoggingEvent from the supplied parameters.
+     *
+     * <p>Except {@link $timeStamp} all the other fields of
+     * LoggerLoggingEvent are filled when actually needed.
+     *
+     * @param string $fqcn name of the caller class.
+     * @param mixed $logger The {@link Logger} category of this event or the logger name.
+     * @param LoggerLevel $priority The level of this event.
+     * @param mixed $message The message of this event.
+     * @param integer $timeStamp the timestamp of this logging event.
+     */
+    public function __construct($fqcn, $logger, $priority, $message, $timeStamp = null) {
+        $this->fqcn = $fqcn;
+        if($logger instanceof Logger) {
+            $this->logger = $logger;
+            $this->categoryName = $logger->getName();
+        } else {
+            $this->categoryName = strval($logger);
+        }
+        $this->level = $priority;
+        $this->message = $message;
+        if($timeStamp !== null && is_float($timeStamp)) {
+            $this->timeStamp = $timeStamp;
+        } else {
+            if(function_exists('microtime')) {
+                // get microtime as float
+                $this->timeStamp = microtime(true);
+            } else {
+                $this->timeStamp = floatval(time());
+            }
+        }
+    }
 
-	/**
-	 * Set the location information for this logging event. The collected
-	 * information is cached for future use.
-	 *
-	 * <p>This method uses {@link PHP_MANUAL#debug_backtrace debug_backtrace()} function (if exists)
-	 * to collect informations about caller.</p>
-	 * <p>It only recognize informations generated by {@link Logger} and its subclasses.</p>
-	 * @return LoggerLocationInfo
-	 */
-	public function getLocationInformation() {
-		if($this->locationInfo === null) {
+    /**
+     * Set the location information for this logging event. The collected
+     * information is cached for future use.
+     *
+     * <p>This method uses {@link PHP_MANUAL#debug_backtrace debug_backtrace()} function (if exists)
+     * to collect informations about caller.</p>
+     * <p>It only recognize informations generated by {@link Logger} and its subclasses.</p>
+     * @return LoggerLocationInfo
+     */
+    public function getLocationInformation() {
+        if($this->locationInfo === null) {
 
-			$locationInfo = array();
+            $locationInfo = array();
 
-			if(function_exists('debug_backtrace')) {
-				$trace = debug_backtrace();
-				$prevHop = null;
-				// make a downsearch to identify the caller
-				$hop = array_pop($trace);
-				while($hop !== null) {
-					if(isset($hop['class'])) {
-						// we are sometimes in functions = no class available: avoid php warning here
-						$className = strtolower($hop['class']);
-						if(!empty($className) and ($className == 'logger' or $className == 'loggercategory' or 
-							strtolower(get_parent_class($className)) == 'logger' or
-							strtolower(get_parent_class($className)) == 'loggercategory')) {
-							$locationInfo['line'] = $hop['line'];
-							$locationInfo['file'] = $hop['file'];
-							break;
-						}
-					}
-					$prevHop = $hop;
-					$hop = array_pop($trace);
-				}
-				$locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
-				if(isset($prevHop['function']) and
-					$prevHop['function'] !== 'include' and
-					$prevHop['function'] !== 'include_once' and
-					$prevHop['function'] !== 'require' and
-					$prevHop['function'] !== 'require_once') {
+            if(function_exists('debug_backtrace')) {
+                $trace = debug_backtrace();
+                $prevHop = null;
+                // make a downsearch to identify the caller
+                $hop = array_pop($trace);
+                while($hop !== null) {
+                    if(isset($hop['class'])) {
+                        // we are sometimes in functions = no class available: avoid php warning here
+                        $className = strtolower($hop['class']);
+                        if(!empty($className) and ($className == 'logger' or $className == 'loggercategory' or 
+                            strtolower(get_parent_class($className)) == 'logger' or
+                            strtolower(get_parent_class($className)) == 'loggercategory')) {
+                            $locationInfo['line'] = $hop['line'];
+                            $locationInfo['file'] = $hop['file'];
+                            break;
+                        }
+                    }
+                    $prevHop = $hop;
+                    $hop = array_pop($trace);
+                }
+                $locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
+                if(isset($prevHop['function']) and
+                    $prevHop['function'] !== 'include' and
+                    $prevHop['function'] !== 'include_once' and
+                    $prevHop['function'] !== 'require' and
+                    $prevHop['function'] !== 'require_once') {
 	
-					$locationInfo['function'] = $prevHop['function'];
-				} else {
-					$locationInfo['function'] = 'main';
-				}
-			}
+                    $locationInfo['function'] = $prevHop['function'];
+                } else {
+                    $locationInfo['function'] = 'main';
+                }
+            }
 					 
-			$this->locationInfo = new LoggerLocationInfo($locationInfo, $this->fqcn);
-		}
-		return $this->locationInfo;
-	}
+            $this->locationInfo = new LoggerLocationInfo($locationInfo, $this->fqcn);
+        }
+        return $this->locationInfo;
+    }
 
-	/**
-	 * Return the level of this event. Use this form instead of directly
-	 * accessing the {@link $level} field.
-	 * @return LoggerLevel	
-	 */
-	public function getLevel() {
-		return $this->level;
-	}
+    /**
+     * Return the level of this event. Use this form instead of directly
+     * accessing the {@link $level} field.
+     * @return LoggerLevel	
+     */
+    public function getLevel() {
+        return $this->level;
+    }
 
-	/**
-	 * Return the name of the logger. Use this form instead of directly
-	 * accessing the {@link $categoryName} field.
-	 * @return string  
-	 */
-	public function getLoggerName() {
-		return $this->categoryName;
-	}
+    /**
+     * Return the name of the logger. Use this form instead of directly
+     * accessing the {@link $categoryName} field.
+     * @return string  
+     */
+    public function getLoggerName() {
+        return $this->categoryName;
+    }
 
-	/**
-	 * Return the message for this logging event.
-	 *
-	 * <p>Before serialization, the returned object is the message
-	 * passed by the user to generate the logging event. After
-	 * serialization, the returned value equals the String form of the
-	 * message possibly after object rendering.
-	 * @return mixed
-	 */
-	public function getMessage() {
-		if($this->message !== null) {
-			return $this->message;
-		} else {
-			return $this->getRenderedMessage();
-		}
-	}
+    /**
+     * Return the message for this logging event.
+     *
+     * <p>Before serialization, the returned object is the message
+     * passed by the user to generate the logging event. After
+     * serialization, the returned value equals the String form of the
+     * message possibly after object rendering.
+     * @return mixed
+     */
+    public function getMessage() {
+        if($this->message !== null) {
+            return $this->message;
+        } else {
+            return $this->getRenderedMessage();
+        }
+    }
 
-	/**
-	 * This method returns the NDC for this event. It will return the
-	 * correct content even if the event was generated in a different
-	 * thread or even on a different machine. The {@link LoggerNDC::get()} method
-	 * should <b>never</b> be called directly.
-	 * @return string  
-	 */
-	public function getNDC() {
-		if($this->ndcLookupRequired) {
-			$this->ndcLookupRequired = false;
-			$this->ndc = implode(' ', LoggerNDC::get());
-		}
-		return $this->ndc;
-	}
+    /**
+     * This method returns the NDC for this event. It will return the
+     * correct content even if the event was generated in a different
+     * thread or even on a different machine. The {@link LoggerNDC::get()} method
+     * should <b>never</b> be called directly.
+     * @return string  
+     */
+    public function getNDC() {
+        if($this->ndcLookupRequired) {
+            $this->ndcLookupRequired = false;
+            $this->ndc = implode(' ', LoggerNDC::get());
+        }
+        return $this->ndc;
+    }
 
-	/**
-	 * Returns the the context corresponding to the <code>key</code>
-	 * parameter.
-	 * @return string
-	 */
-	public function getMDC($key) {
-		return LoggerMDC::get($key);
-	}
+    /**
+     * Returns the the context corresponding to the <code>key</code>
+     * parameter.
+     * @return string
+     */
+    public function getMDC($key) {
+        return LoggerMDC::get($key);
+    }
 
-	/**
-	 * Render message.
-	 * @return string
-	 */
-	public function getRenderedMessage() {
-		if($this->renderedMessage === null and $this->message !== null) {
-			if(is_string($this->message)) {
-					$this->renderedMessage = $this->message;
-			} else {
-			    // $this->logger might be null or an instance of Logger or RootLogger
-			    // But in contrast to log4j, in log4php there is only have one LoggerHierarchy so there is
-			    // no need figure out which one is $this->logger part of.
-			    // TODO: Logger::getHierarchy() is marked @deprecated!
-				$repository = Logger::getHierarchy();
-				$rendererMap = $repository->getRendererMap();
-				$this->renderedMessage= $rendererMap->findAndRender($this->message);
-			}
-		}
-		return $this->renderedMessage;
-	}
+    /**
+     * Render message.
+     * @return string
+     */
+    public function getRenderedMessage() {
+        if($this->renderedMessage === null and $this->message !== null) {
+            if(is_string($this->message)) {
+                    $this->renderedMessage = $this->message;
+            } else {
+                // $this->logger might be null or an instance of Logger or RootLogger
+                // But in contrast to log4j, in log4php there is only have one LoggerHierarchy so there is
+                // no need figure out which one is $this->logger part of.
+                // TODO: Logger::getHierarchy() is marked @deprecated!
+                $repository = Logger::getHierarchy();
+                $rendererMap = $repository->getRendererMap();
+                $this->renderedMessage= $rendererMap->findAndRender($this->message);
+            }
+        }
+        return $this->renderedMessage;
+    }
 
-	/**
-	 * Returns the time when the application started, in seconds
-	 * elapsed since 01.01.1970 plus microseconds if available.
-	 *
-	 * @return float
-	 * @static
-	 */
-	public static function getStartTime() {
-		if(!isset(self::$startTime)) {
-			if (function_exists('microtime')) {
-				// microtime as float
-				self::$startTime = microtime(true);
-			} else {
-				self::$startTime = floatval(time());
-			}
-		}
-		return self::$startTime; 
-	}
+    /**
+     * Returns the time when the application started, in seconds
+     * elapsed since 01.01.1970 plus microseconds if available.
+     *
+     * @return float
+     * @static
+     */
+    public static function getStartTime() {
+        if(!isset(self::$startTime)) {
+            if (function_exists('microtime')) {
+                // microtime as float
+                self::$startTime = microtime(true);
+            } else {
+                self::$startTime = floatval(time());
+            }
+        }
+        return self::$startTime; 
+    }
 
-	/**
-	 * @return float
-	 */
-	public function getTimeStamp() {
-		return $this->timeStamp;
-	}
+    /**
+     * @return float
+     */
+    public function getTimeStamp() {
+        return $this->timeStamp;
+    }
 	
-	/**
-	 * Calculates the time of this event.
-	 * @return the time after event starttime when this event has occured
-	 */
-	public function getTime() {
+    /**
+     * Calculates the time of this event.
+     * @return the time after event starttime when this event has occured
+     */
+    public function getTime() {
         $eventTime = (float)$this->getTimeStamp();
         $eventStartTime = (float)LoggerLoggingEvent::getStartTime();
         return number_format(($eventTime - $eventStartTime) * 1000, 0, '', '');
     }
 	
-	/**
-	 * @return mixed
-	 */
-	public function getThreadName() {
-		if ($this->threadName === null) {
-			$this->threadName = (string)getmypid();
-		}
-		return $this->threadName;
-	}
+    /**
+     * @return mixed
+     */
+    public function getThreadName() {
+        if ($this->threadName === null) {
+            $this->threadName = (string)getmypid();
+        }
+        return $this->threadName;
+    }
 
-	/**
-	 * @return mixed null
-	 */
-	public function getThrowableInformation() {
-		return null;
-	}
+    /**
+     * @return mixed null
+     */
+    public function getThrowableInformation() {
+        return null;
+    }
 	
-	/**
-	 * Serialize this object
-	 * @return string
-	 */
-	public function toString() {
-		serialize($this);
-	}
+    /**
+     * Serialize this object
+     * @return string
+     */
+    public function toString() {
+        serialize($this);
+    }
 	
-	/**
-	 * Avoid serialization of the {@link $logger} object
-	 */
-	public function __sleep() {
-		return array(
-			'fqcn',
-			'categoryName',
-			'level',
-			'ndc',
-			'ndcLookupRequired',
-			'message',
-			'renderedMessage',
-			'threadName',
-			'timeStamp',
-			'locationInfo',
-		);
-	}
+    /**
+     * Avoid serialization of the {@link $logger} object
+     */
+    public function __sleep() {
+        return array(
+            'fqcn',
+            'categoryName',
+            'level',
+            'ndc',
+            'ndcLookupRequired',
+            'message',
+            'renderedMessage',
+            'threadName',
+            'timeStamp',
+            'locationInfo',
+        );
+    }
 
 }
 

main/inc/lib/phpdocx/lib/log4php/appenders/LoggerAppenderMail.php

Indentation +60 added lines, -61 removed lines

@@ -47,85 +47,84 @@
  *      Tue Sep  8 21:51:04 2009,120 [5485] FATAL root - Some critical message!
  *      Tue Sep  8 21:51:06 2009,120 [5485] FATAL root - Some more critical message!
  * </pre>
-
  * @version $Revision: 883108 $
  * @package log4php
  * @subpackage appenders
  */
 class LoggerAppenderMail extends LoggerAppender {
 
-	/** @var string 'from' field */
-	private $from = null;
+    /** @var string 'from' field */
+    private $from = null;
 
-	/** @var string 'subject' field */
-	private $subject = 'Log4php Report';
+    /** @var string 'subject' field */
+    private $subject = 'Log4php Report';
 	
-	/** @var string 'to' field */
-	private $to = null;
+    /** @var string 'to' field */
+    private $to = null;
 
-	/** @var indiciates if this appender should run in dry mode */
-	private $dry = false;
+    /** @var indiciates if this appender should run in dry mode */
+    private $dry = false;
 
-	/** @var string used to create mail body */
-	private $body = '';
+    /** @var string used to create mail body */
+    private $body = '';
 	
-	/**
-	 * Constructor.
-	 *
-	 * @param string $name appender name
-	 */
-	public function __construct($name = '') {
-		parent::__construct($name);
-		$this->requiresLayout = true;
-	}
+    /**
+     * Constructor.
+     *
+     * @param string $name appender name
+     */
+    public function __construct($name = '') {
+        parent::__construct($name);
+        $this->requiresLayout = true;
+    }
 
-	public function __destruct() {
-       $this->close();
-   	}
+    public function __destruct() {
+        $this->close();
+        }
 
-	public function activateOptions() {
-		$this->closed = false;
-	}
+    public function activateOptions() {
+        $this->closed = false;
+    }
 	
-	public function close() {
-		if($this->closed != true) {
-			$from = $this->from;
-			$to = $this->to;
+    public function close() {
+        if($this->closed != true) {
+            $from = $this->from;
+            $to = $this->to;
 	
-			if(!empty($this->body) and $from !== null and $to !== null and $this->layout !== null) {
-				$subject = $this->subject;
-				if(!$this->dry) {
-					mail(
-						$to, $subject, 
-						$this->layout->getHeader() . $this->body . $this->layout->getFooter(),
-						"From: {$from}\r\n");
-				} else {
-				    echo "DRY MODE OF MAIL APP.: Send mail to: ".$to." with content: ".$this->body;
-				}
-			}
-			$this->closed = true;
-		}
-	}
+            if(!empty($this->body) and $from !== null and $to !== null and $this->layout !== null) {
+                $subject = $this->subject;
+                if(!$this->dry) {
+                    mail(
+                        $to, $subject, 
+                        $this->layout->getHeader() . $this->body . $this->layout->getFooter(),
+                        "From: {$from}\r\n");
+                } else {
+                    echo "DRY MODE OF MAIL APP.: Send mail to: ".$to." with content: ".$this->body;
+                }
+            }
+            $this->closed = true;
+        }
+    }
 	
-	public function setSubject($subject) {
-		$this->subject = $subject;
-	}
+    public function setSubject($subject) {
+        $this->subject = $subject;
+    }
 	
-	public function setTo($to) {
-		$this->to = $to;
-	}
+    public function setTo($to) {
+        $this->to = $to;
+    }
 
-	public function setFrom($from) {
-		$this->from = $from;
-	}  
+    public function setFrom($from) {
+        $this->from = $from;
+    }  
 
-	public function setDry($dry) {
-		$this->dry = $dry;
-	}
+    public function setDry($dry) {
+        $this->dry = $dry;
+    }
 	
-	public function append(LoggerLoggingEvent $event) {
-		if($this->layout !== null) {
-			$this->body .= $this->layout->format($event);
-		}
-	}
+    public function append(LoggerLoggingEvent $event) {
+        if($this->layout !== null) {
+            $this->body .= $this->layout->format($event);
+        }
+    }
 }

main/inc/lib/phpdocx/lib/log4php/appenders/LoggerAppenderDailyFile.php

Indentation +37 added lines, -37 removed lines

@@ -46,47 +46,47 @@
  */
 class LoggerAppenderDailyFile extends LoggerAppenderFile {
 
-	/**
-	 * Format date. 
-	 * It follows the {@link PHP_MANUAL#date()} formatting rules and <b>should always be set before {@link $file} param</b>.
-	 * @var string
-	 */
-	public $datePattern = "Ymd";
+    /**
+     * Format date. 
+     * It follows the {@link PHP_MANUAL#date()} formatting rules and <b>should always be set before {@link $file} param</b>.
+     * @var string
+     */
+    public $datePattern = "Ymd";
 	
-	public function __destruct() {
-       parent::__destruct();
-   	}
+    public function __destruct() {
+        parent::__destruct();
+        }
    	
-	/**
-	* Sets date format for the file name.
-	* @param string $format a regular date() string format
-	*/
-	public function setDatePattern($format) {
-		$this->datePattern = $format;
-	}
+    /**
+     * Sets date format for the file name.
+     * @param string $format a regular date() string format
+     */
+    public function setDatePattern($format) {
+        $this->datePattern = $format;
+    }
 	
-	/**
-	* @return string returns date format for the filename
-	*/
-	public function getDatePattern() {
-		return $this->datePattern;
-	}
+    /**
+     * @return string returns date format for the filename
+     */
+    public function getDatePattern() {
+        return $this->datePattern;
+    }
 	
-	/**
-	* The File property takes a string value which should be the name of the file to append to.
-	* Sets and opens the file where the log output will go.
-	*
-	* @see LoggerAppenderFile::setFile()
-	*/
-	public function setFile() {
-		$numargs = func_num_args();
-		$args = func_get_args();
+    /**
+     * The File property takes a string value which should be the name of the file to append to.
+     * Sets and opens the file where the log output will go.
+     *
+     * @see LoggerAppenderFile::setFile()
+     */
+    public function setFile() {
+        $numargs = func_num_args();
+        $args = func_get_args();
 		
-		if($numargs == 1 and is_string($args[0])) {
-			parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())) );
-		} else if ($numargs == 2 and is_string($args[0]) and is_bool($args[1])) {
-			parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())), $args[1] );
-		}
-	} 
+        if($numargs == 1 and is_string($args[0])) {
+            parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())) );
+        } else if ($numargs == 2 and is_string($args[0]) and is_bool($args[1])) {
+            parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())), $args[1] );
+        }
+    } 
 
 }

main/inc/lib/phpdocx/lib/log4php/appenders/LoggerAppenderFile.php

Indentation +109 added lines, -109 removed lines

@@ -42,129 +42,129 @@
  */
 class LoggerAppenderFile extends LoggerAppender {
 
-	/**
-	 * @var boolean if {@link $file} exists, appends events.
-	 */
-	private $append = true;
-	/**
-	 * @var string the file name used to append events
-	 */
-	protected $fileName;
-	/**
-	 * @var mixed file resource
-	 */
-	protected $fp = false;
+    /**
+     * @var boolean if {@link $file} exists, appends events.
+     */
+    private $append = true;
+    /**
+     * @var string the file name used to append events
+     */
+    protected $fileName;
+    /**
+     * @var mixed file resource
+     */
+    protected $fp = false;
 	
-	public function __construct($name = '') {
-		parent::__construct($name);
-		$this->requiresLayout = true;
-	}
+    public function __construct($name = '') {
+        parent::__construct($name);
+        $this->requiresLayout = true;
+    }
 
-	public function __destruct() {
-       $this->close();
-   	}
+    public function __destruct() {
+        $this->close();
+        }
    	
-	public function activateOptions() {
-		$fileName = $this->getFile();
+    public function activateOptions() {
+        $fileName = $this->getFile();
 
-		if(!is_file($fileName)) {
-			$dir = dirname($fileName);
-			if(!is_dir($dir)) {
-				mkdir($dir, 0777, true);
-			}
-		}
+        if(!is_file($fileName)) {
+            $dir = dirname($fileName);
+            if(!is_dir($dir)) {
+                mkdir($dir, 0777, true);
+            }
+        }
 
-		$this->fp = fopen($fileName, ($this->getAppend()? 'a':'w'));
-		if($this->fp) {
-			if(flock($this->fp, LOCK_EX)) {
-				if($this->getAppend()) {
-					fseek($this->fp, 0, SEEK_END);
-				}
-				fwrite($this->fp, $this->layout->getHeader());
-				flock($this->fp, LOCK_UN);
-				$this->closed = false;
-			} else {
-				// TODO: should we take some action in this case?
-				$this->closed = true;
-			}		 
-		} else {
-			$this->closed = true;
-		}
-	}
+        $this->fp = fopen($fileName, ($this->getAppend()? 'a':'w'));
+        if($this->fp) {
+            if(flock($this->fp, LOCK_EX)) {
+                if($this->getAppend()) {
+                    fseek($this->fp, 0, SEEK_END);
+                }
+                fwrite($this->fp, $this->layout->getHeader());
+                flock($this->fp, LOCK_UN);
+                $this->closed = false;
+            } else {
+                // TODO: should we take some action in this case?
+                $this->closed = true;
+            }		 
+        } else {
+            $this->closed = true;
+        }
+    }
 	
-	public function close() {
-		if($this->closed != true) {
-			if($this->fp and $this->layout !== null) {
-				if(flock($this->fp, LOCK_EX)) {
-					fwrite($this->fp, $this->layout->getFooter());
-					flock($this->fp, LOCK_UN);
-				}
-				fclose($this->fp);
-			}
-			$this->closed = true;
-		}
-	}
+    public function close() {
+        if($this->closed != true) {
+            if($this->fp and $this->layout !== null) {
+                if(flock($this->fp, LOCK_EX)) {
+                    fwrite($this->fp, $this->layout->getFooter());
+                    flock($this->fp, LOCK_UN);
+                }
+                fclose($this->fp);
+            }
+            $this->closed = true;
+        }
+    }
 
-	public function append(LoggerLoggingEvent $event) {
-		if($this->fp and $this->layout !== null) {
-			if(flock($this->fp, LOCK_EX)) {
-				fwrite($this->fp, $this->layout->format($event));
-				flock($this->fp, LOCK_UN);
-			} else {
-				$this->closed = true;
-			}
-		} 
-	}
+    public function append(LoggerLoggingEvent $event) {
+        if($this->fp and $this->layout !== null) {
+            if(flock($this->fp, LOCK_EX)) {
+                fwrite($this->fp, $this->layout->format($event));
+                flock($this->fp, LOCK_UN);
+            } else {
+                $this->closed = true;
+            }
+        } 
+    }
 	
-	/**
-	 * Sets and opens the file where the log output will go.
-	 *
-	 * This is an overloaded method. It can be called with:
-	 * - setFile(string $fileName) to set filename.
-	 * - setFile(string $fileName, boolean $append) to set filename and append.
-	 * 
-	 * TODO: remove overloading. Use only file as alias to filename
-	 */
-	public function setFile() {
-		$numargs = func_num_args();
-		$args	 = func_get_args();
+    /**
+     * Sets and opens the file where the log output will go.
+     *
+     * This is an overloaded method. It can be called with:
+     * - setFile(string $fileName) to set filename.
+     * - setFile(string $fileName, boolean $append) to set filename and append.
+     * 
+     * TODO: remove overloading. Use only file as alias to filename
+     */
+    public function setFile() {
+        $numargs = func_num_args();
+        $args	 = func_get_args();
 
-		if($numargs == 1 and is_string($args[0])) {
-			$this->setFileName($args[0]);
-		} else if ($numargs >=2 and is_string($args[0]) and is_bool($args[1])) {
-			$this->setFile($args[0]);
-			$this->setAppend($args[1]);
-		}
-	}
+        if($numargs == 1 and is_string($args[0])) {
+            $this->setFileName($args[0]);
+        } else if ($numargs >=2 and is_string($args[0]) and is_bool($args[1])) {
+            $this->setFile($args[0]);
+            $this->setAppend($args[1]);
+        }
+    }
 	
-	/**
-	 * @return string
-	 */
-	public function getFile() {
-		return $this->getFileName();
-	}
+    /**
+     * @return string
+     */
+    public function getFile() {
+        return $this->getFileName();
+    }
 	
-	/**
-	 * @return boolean
-	 */
-	public function getAppend() {
-		return $this->append;
-	}
+    /**
+     * @return boolean
+     */
+    public function getAppend() {
+        return $this->append;
+    }
 
-	public function setAppend($flag) {
-		$this->append = LoggerOptionConverter::toBoolean($flag, true);		  
-	}
+    public function setAppend($flag) {
+        $this->append = LoggerOptionConverter::toBoolean($flag, true);		  
+    }
 
-	public function setFileName($fileName) {
-		$this->fileName = $fileName;
-	}
+    public function setFileName($fileName) {
+        $this->fileName = $fileName;
+    }
 	
-	/**
-	 * @return string
-	 */
-	public function getFileName() {
-		return $this->fileName;
-	}
+    /**
+     * @return string
+     */
+    public function getFileName() {
+        return $this->fileName;
+    }
 	
 	 
 }

main/inc/lib/phpdocx/pdf/include/image_renderer.cls.php

Indentation +2 added lines, -3 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: image_renderer.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,7 +46,7 @@ 
  */
 class Image_Renderer extends Abstract_Renderer {
 
-  function render(Frame $frame) {
+    function render(Frame $frame) {
 
     // Render background & borders
     //parent::render($frame);
@@ -65,5 +64,5 @@ 
 
     $this->_canvas->image( $frame->get_image_url(), $frame->get_image_ext(), $x, $y, $w, $h);
 
-  }
+    }
 }

main/inc/lib/phpdocx/pdf/include/block_frame_decorator.cls.php

Indentation +71 added lines, -72 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: block_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,16 +46,16 @@ 
  */
 class Block_Frame_Decorator extends Frame_Decorator {
 
-  const DEFAULT_COUNTER = "-dompdf-default-counter";
+    const DEFAULT_COUNTER = "-dompdf-default-counter";
 
-  protected $_lines; // array( [num] => array([frames] => array(<frame list>),
-                     //                 y, w, h) )
-  protected $_counters; // array([id] => counter_value) (for generated content)
-  protected $_cl;    // current line index
+    protected $_lines; // array( [num] => array([frames] => array(<frame list>),
+                        //                 y, w, h) )
+    protected $_counters; // array([id] => counter_value) (for generated content)
+    protected $_cl;    // current line index
 
-  //........................................................................
+    //........................................................................
 
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_lines = array(array("frames" => array(),
                                 "wc" => 0,
@@ -66,11 +65,11 @@ 
     $this->_counters = array(self::DEFAULT_COUNTER => 0);
     $this->_cl = 0;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reset() {
+    function reset() {
     parent::reset();
     $this->_lines = array(array("frames" => array(),
                                 "wc" => 0,
@@ -79,67 +78,67 @@ 
                                 "h" => 0));
     $this->_counters = array(self::DEFAULT_COUNTER => 0);
     $this->_cl = 0;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Accessor methods
+    // Accessor methods
 
-  function get_current_line($i = null) {
+    function get_current_line($i = null) {
     $cl = $this->_lines[$this->_cl];
     if ( isset($i) )
-      return $cl[$i];
+        return $cl[$i];
     return $cl;
-  }
+    }
 
-  function get_lines() { return $this->_lines; }
+    function get_lines() { return $this->_lines; }
 
-  //........................................................................
+    //........................................................................
 
-  // Set methods
-  function set_current_line($y = null, $w = null, $h = null) {
+    // Set methods
+    function set_current_line($y = null, $w = null, $h = null) {
     $this->set_line($this->_cl, $y, $w, $h);
-  }
+    }
 
-  function clear_line($i) {
+    function clear_line($i) {
     if ( isset($this->_lines[$i]) )
-      unset($this->_lines[$i]);
-  }
+        unset($this->_lines[$i]);
+    }
 
-  function set_line($lineno, $y = null, $w = null, $h = null) {
+    function set_line($lineno, $y = null, $w = null, $h = null) {
 
     if ( is_array($y) )
-      extract($y);
+        extract($y);
 
     if (is_numeric($y))
-      $this->_lines[$lineno]["y"] = $y;
+        $this->_lines[$lineno]["y"] = $y;
 
     if (is_numeric($w))
-      $this->_lines[$lineno]["w"] = $w;
+        $this->_lines[$lineno]["w"] = $w;
 
     if (is_numeric($h))
-      $this->_lines[$lineno]["h"] = $h;
+        $this->_lines[$lineno]["h"] = $h;
 
-  }
+    }
 
 
-  function add_frame_to_line(Frame $frame) {
+    function add_frame_to_line(Frame $frame) {
 
     // Handle inline frames (which are effectively wrappers)
     if ( $frame instanceof Inline_Frame_Decorator ) {
 
-      // Handle line breaks
-      if ( $frame->get_node()->nodeName === "br" ) {
+        // Handle line breaks
+        if ( $frame->get_node()->nodeName === "br" ) {
         $this->maximize_line_height( $frame->get_style()->length_in_pt($frame->get_style()->line_height) );
         $this->add_line();
         return;
-      }
+        }
 
-      // Add each child of the inline frame to the line individually
-      foreach ($frame->get_children() as $child)
+        // Add each child of the inline frame to the line individually
+        foreach ($frame->get_children() as $child)
         $this->add_frame_to_line( $child );
 
-      return;
+        return;
     }
 
     // Trim leading text if this is an empty line.  Kinda a hack to put it here,
@@ -149,15 +148,15 @@ 
          ($frame->get_style()->white_space !== "pre" ||
           $frame->get_style()->white_space !== "pre-wrap") ) {
 
-      $frame->set_text( ltrim($frame->get_text()) );
-      $frame->recalculate_width();
+        $frame->set_text( ltrim($frame->get_text()) );
+        $frame->recalculate_width();
 
     }
 
     $w = $frame->get_margin_width();
 
     if ( $w == 0 )
-      return;
+        return;
 
     // Debugging code:
     /*
@@ -177,7 +176,7 @@ 
     // End debugging
 
     if ($this->_lines[$this->_cl]["w"] + $w > $this->get_containing_block("w"))
-      $this->add_line();
+        $this->add_line();
 
     $frame->position();
 
@@ -185,55 +184,55 @@ 
     $this->_lines[$this->_cl]["frames"][] = $frame;
 
     if ( $frame->get_node()->nodeName === "#text")
-      $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
+        $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
 
     $this->_lines[$this->_cl]["w"] += $w;
     $this->_lines[$this->_cl]["h"] = max($this->_lines[$this->_cl]["h"], $frame->get_margin_height());
 
-  }
+    }
 
-  function remove_frames_from_line(Frame $frame) {
+    function remove_frames_from_line(Frame $frame) {
     // Search backwards through the lines for $frame
     $i = $this->_cl;
 
     while ($i >= 0) {
-      if ( ($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false )
+        if ( ($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false )
         break;
-      $i--;
+        $i--;
     }
 
     if ( $j === false )
-      return;
+        return;
 
     // Remove $frame and all frames that follow
     while ($j < count($this->_lines[$i]["frames"])) {
-      $f = $this->_lines[$i]["frames"][$j];
-      unset($this->_lines[$i]["frames"][$j++]);
-      $this->_lines[$i]["w"] -= $f->get_margin_width();
+        $f = $this->_lines[$i]["frames"][$j];
+        unset($this->_lines[$i]["frames"][$j++]);
+        $this->_lines[$i]["w"] -= $f->get_margin_width();
     }
 
     // Recalculate the height of the line
     $h = 0;
     foreach ($this->_lines[$i]["frames"] as $f)
-      $h = max( $h, $f->get_margin_height() );
+        $h = max( $h, $f->get_margin_height() );
 
     $this->_lines[$i]["h"] = $h;
 
     // Remove all lines that follow
     while ($this->_cl > $i)
-      unset($this->_lines[ $this->_cl-- ]);
+        unset($this->_lines[ $this->_cl-- ]);
 
-  }
+    }
 
-  function increase_line_width($w) {
+    function increase_line_width($w) {
     $this->_lines[ $this->_cl ]["w"] += $w;
-  }
+    }
 
-  function maximize_line_height($val) {
+    function maximize_line_height($val) {
     $this->_lines[ $this->_cl ]["h"] = max($this->_lines[ $this->_cl ]["h"], $val);
-  }
+    }
 
-  function add_line() {
+    function add_line() {
 
 //     if ( $this->_lines[$this->_cl]["h"] == 0 ) //count($this->_lines[$i]["frames"]) == 0 ||
 //       return;
@@ -241,28 +240,28 @@ 
     $y = $this->_lines[$this->_cl]["y"] + $this->_lines[$this->_cl]["h"];
 
     $this->_lines[ ++$this->_cl ] = array("frames" => array(),
-                                          "wc" => 0,
-                                          "y" => $y, "w" => 0, "h" => 0);
-  }
+                                            "wc" => 0,
+                                            "y" => $y, "w" => 0, "h" => 0);
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reset_counter($id = self::DEFAULT_COUNTER, $value = 0) {
+    function reset_counter($id = self::DEFAULT_COUNTER, $value = 0) {
     $this->_counters[$id] = $value;
-  }
+    }
 
-  function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1) {
+    function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1) {
     if ( !isset($this->_counters[$id]) )
-      $this->_counters[$id] = $increment;
+        $this->_counters[$id] = $increment;
     else
-      $this->_counters[$id] += $increment;
+        $this->_counters[$id] += $increment;
 
-  }
+    }
 
-  function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal") {
+    function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal") {
     $type = mb_strtolower($type);
     if ( !isset($this->_counters[$id]) )
-      $this->_counters[$id] = 0;
+        $this->_counters[$id] = 0;
 
     switch ($type) {
 
@@ -293,5 +292,5 @@ 
     case "upper-greek":
       return chr($this->_counters[$id] + 912);
     }
-  }
+    }
 }

main/inc/lib/phpdocx/pdf/include/frame_tree.cls.php

Indentation +114 added lines, -115 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: frame_tree.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -52,118 +51,118 @@ 
  */
 class Frame_Tree {
     
-  /**
-   * Tags to ignore while parsing the tree
-   *
-   * @var array
-   */
-  static protected $_HIDDEN_TAGS = array("area", "base", "basefont", "head", "style",
-                                         "meta", "title", "colgroup",
-                                         "noembed", "noscript", "param", "#comment");  
-  /**
-   * The main DomDocument
-   *
-   * @see http://ca2.php.net/manual/en/ref.dom.php
-   * @var DomDocument
-   */
-  protected $_dom;
-
-  /**
-   * The root node of the FrameTree.
-   *
-   * @var Frame
-   */
-  protected $_root;
-
-  /**
-   * Subtrees of absolutely positioned elements
-   *
-   * @var array of Frames
-   */
-  protected $_absolute_frames;
-
-  /**
-   * A mapping of {@link Frame} objects to DomNode objects
-   *
-   * @var array
-   */
-  protected $_registry;
+    /**
+     * Tags to ignore while parsing the tree
+     *
+     * @var array
+     */
+    static protected $_HIDDEN_TAGS = array("area", "base", "basefont", "head", "style",
+                                            "meta", "title", "colgroup",
+                                            "noembed", "noscript", "param", "#comment");  
+    /**
+     * The main DomDocument
+     *
+     * @see http://ca2.php.net/manual/en/ref.dom.php
+     * @var DomDocument
+     */
+    protected $_dom;
+
+    /**
+     * The root node of the FrameTree.
+     *
+     * @var Frame
+     */
+    protected $_root;
+
+    /**
+     * Subtrees of absolutely positioned elements
+     *
+     * @var array of Frames
+     */
+    protected $_absolute_frames;
+
+    /**
+     * A mapping of {@link Frame} objects to DomNode objects
+     *
+     * @var array
+     */
+    protected $_registry;
   
 
-  /**
-   * Class constructor
-   *
-   * @param DomDocument $dom the main DomDocument object representing the current html document
-   */
-  function __construct(DomDocument $dom) {
+    /**
+     * Class constructor
+     *
+     * @param DomDocument $dom the main DomDocument object representing the current html document
+     */
+    function __construct(DomDocument $dom) {
     $this->_dom = $dom;
     $this->_root = null;
     $this->_registry = array();
-  }
-
-  /**
-   * Returns the DomDocument object representing the curent html document
-   *
-   * @return DomDocument
-   */
-  function get_dom() { return $this->_dom; }
-
-  /**
-   * Returns the root frame of the tree
-   *
-   * @return Frame
-   */
-  function get_root() { return $this->_root; }
-
-  /**
-   * Returns a specific frame given its id
-   *
-   * @param string $id
-   * @return Frame
-   */
-  function get_frame($id) { return isset($this->_registry[$id]) ? $this->_registry[$id] : null; }
-
-  /**
-   * Returns a post-order iterator for all frames in the tree
-   *
-   * @return FrameTreeList
-   */
-  function get_frames() { return new FrameTreeList($this->_root); }
+    }
+
+    /**
+     * Returns the DomDocument object representing the curent html document
+     *
+     * @return DomDocument
+     */
+    function get_dom() { return $this->_dom; }
+
+    /**
+     * Returns the root frame of the tree
+     *
+     * @return Frame
+     */
+    function get_root() { return $this->_root; }
+
+    /**
+     * Returns a specific frame given its id
+     *
+     * @param string $id
+     * @return Frame
+     */
+    function get_frame($id) { return isset($this->_registry[$id]) ? $this->_registry[$id] : null; }
+
+    /**
+     * Returns a post-order iterator for all frames in the tree
+     *
+     * @return FrameTreeList
+     */
+    function get_frames() { return new FrameTreeList($this->_root); }
       
-  /**
-   * Builds the tree
-   */
-  function build_tree() {
+    /**
+     * Builds the tree
+     */
+    function build_tree() {
     $html = $this->_dom->getElementsByTagName("html")->item(0);
     if ( is_null($html) )
-      $html = $this->_dom->firstChild;
+        $html = $this->_dom->firstChild;
 
     if ( is_null($html) )
-      throw new DOMPDF_Exception("Requested HTML document contains no data.");
+        throw new DOMPDF_Exception("Requested HTML document contains no data.");
 
     $this->_root = $this->_build_tree_r($html);
 
-  }
-
-  /**
-   * Recursively adds {@link Frame} objects to the tree
-   *
-   * Recursively build a tree of Frame objects based on a dom tree.
-   * No layout information is calculated at this time, although the
-   * tree may be adjusted (i.e. nodes and frames for generated content
-   * and images may be created).
-   *
-   * @param DomNode $node the current DomNode being considered
-   * @return Frame
-   */
-  protected function _build_tree_r(DomNode $node) {
+    }
+
+    /**
+     * Recursively adds {@link Frame} objects to the tree
+     *
+     * Recursively build a tree of Frame objects based on a dom tree.
+     * No layout information is calculated at this time, although the
+     * tree may be adjusted (i.e. nodes and frames for generated content
+     * and images may be created).
+     *
+     * @param DomNode $node the current DomNode being considered
+     * @return Frame
+     */
+    protected function _build_tree_r(DomNode $node) {
     
     $frame = new Frame($node);
     $id = $frame->get_id();
     $this->_registry[ $id ] = $frame;
     
     if ( !$node->hasChildNodes() )
-      return $frame;
+        return $frame;
 
     // Fixes 'cannot access undefined property for object with
     // overloaded access', fix by Stefan radulian
@@ -173,55 +172,55 @@ 
     // Store the children in an array so that the tree can be modified
     $children = array();
     for ($i = 0; $i < $node->childNodes->length; $i++)
-      $children[] = $node->childNodes->item($i);
+        $children[] = $node->childNodes->item($i);
 
     foreach ($children as $child) {
-      // Skip non-displaying nodes
-      if ( in_array( mb_strtolower($child->nodeName), self::$_HIDDEN_TAGS) )  {
+        // Skip non-displaying nodes
+        if ( in_array( mb_strtolower($child->nodeName), self::$_HIDDEN_TAGS) )  {
         if ( mb_strtolower($child->nodeName) !== "head" &&
              mb_strtolower($child->nodeName) !== "style" ) 
-          $child->parentNode->removeChild($child);
+            $child->parentNode->removeChild($child);
         continue;
-      }
+        }
 
-      // Skip empty text nodes
-      if ( $child->nodeName === "#text" && $child->nodeValue == "" ) {
+        // Skip empty text nodes
+        if ( $child->nodeName === "#text" && $child->nodeValue == "" ) {
         $child->parentNode->removeChild($child);
         continue;
-      }
+        }
 
-      // Skip empty image nodes
-      if ( $child->nodeName === "img" && $child->getAttribute("src") == "" ) {
+        // Skip empty image nodes
+        if ( $child->nodeName === "img" && $child->getAttribute("src") == "" ) {
         $child->parentNode->removeChild($child);
         continue;
-      }
+        }
 
-      // Add a container frame for images
-      if ( $child->nodeName === "img" ) {
+        // Add a container frame for images
+        if ( $child->nodeName === "img" ) {
         $img_node = $child->ownerDocument->createElement("img_inner");
      
         // Move attributes to inner node        
         foreach ( $child->attributes as $attr => $attr_node ) {
-          // Skip style, but move all other attributes
-          if ( $attr === "style" )
+            // Skip style, but move all other attributes
+            if ( $attr === "style" )
             continue;
        
-          $img_node->setAttribute($attr, $attr_node->value);
+            $img_node->setAttribute($attr, $attr_node->value);
         }
 
         foreach ( $child->attributes as $attr => $node ) {
-          if ( $attr === "style" )
+            if ( $attr === "style" )
             continue;
-          $child->removeAttribute($attr);
+            $child->removeAttribute($attr);
         }
 
         $child->appendChild($img_node);
-      }
+        }
       
-      $frame->append_child($this->_build_tree_r($child), false);
+        $frame->append_child($this->_build_tree_r($child), false);
 
     }
     
     return $frame;
-  }
+    }
 }

main/inc/lib/phpdocx/pdf/include/canvas.cls.php

Indentation +185 added lines, -186 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: canvas.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -54,207 +53,207 @@ 
  */
 interface Canvas {
 
-  /**
-   * Returns the current page number
-   *
-   * @return int
-   */
-  function get_page_number();
+    /**
+     * Returns the current page number
+     *
+     * @return int
+     */
+    function get_page_number();
 
-  /**
-   * Returns the total number of pages
-   *
-   * @return int
-   */
-  function get_page_count();
+    /**
+     * Returns the total number of pages
+     *
+     * @return int
+     */
+    function get_page_count();
 
-  /**
-   * Sets the total number of pages
-   *
-   * @param int $count
-   */
-  function set_page_count($count);
+    /**
+     * Sets the total number of pages
+     *
+     * @param int $count
+     */
+    function set_page_count($count);
 
-  /**
-   * Draws a line from x1,y1 to x2,y2
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the format of the
-   * $style parameter (aka dash).
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $x2
-   * @param float $y2
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = null);
+    /**
+     * Draws a line from x1,y1 to x2,y2
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the format of the
+     * $style parameter (aka dash).
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $x2
+     * @param float $y2
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = null);
 
-  /**
-   * Draws a rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */   
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = null);
+    /**
+     * Draws a rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */   
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = null);
 
-  /**
-   * Draws a filled rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   */   
-  function filled_rectangle($x1, $y1, $w, $h, $color);
+    /**
+     * Draws a filled rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     */   
+    function filled_rectangle($x1, $y1, $w, $h, $color);
 
-  /**
-   * Draws a polygon
-   *
-   * The polygon is formed by joining all the points stored in the $points
-   * array.  $points has the following structure:
-   * <code>
-   * array(0 => x1,
-   *       1 => y1,
-   *       2 => x2,
-   *       3 => y2,
-   *       ...
-   *       );
-   * </code>
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)   
-   *
-   * @param array $points
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool  $fill  Fills the polygon if true
-   */
-  function polygon($points, $color, $width = null, $style = null, $fill = false);
+    /**
+     * Draws a polygon
+     *
+     * The polygon is formed by joining all the points stored in the $points
+     * array.  $points has the following structure:
+     * <code>
+     * array(0 => x1,
+     *       1 => y1,
+     *       2 => x2,
+     *       3 => y2,
+     *       ...
+     *       );
+     * </code>
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)   
+     *
+     * @param array $points
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool  $fill  Fills the polygon if true
+     */
+    function polygon($points, $color, $width = null, $style = null, $fill = false);
 
-  /**
-   * Draws a circle at $x,$y with radius $r
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x
-   * @param float $y
-   * @param float $r
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool $fill Fills the circle if true   
-   */   
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false);
+    /**
+     * Draws a circle at $x,$y with radius $r
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x
+     * @param float $y
+     * @param float $r
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool $fill Fills the circle if true   
+     */   
+    function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false);
 
-  /**
-   * Add an image to the pdf.
-   *
-   * The image is placed at the specified x and y coordinates with the
-   * given width and height.
-   *
-   * @param string $img_url the path to the image
-   * @param string $img_type the type (e.g. extension) of the image
-   * @param float $x x position
-   * @param float $y y position
-   * @param int $w width (in pixels)
-   * @param int $h height (in pixels)
-   */
-  function image($img_url, $img_type, $x, $y, $w, $h);
+    /**
+     * Add an image to the pdf.
+     *
+     * The image is placed at the specified x and y coordinates with the
+     * given width and height.
+     *
+     * @param string $img_url the path to the image
+     * @param string $img_type the type (e.g. extension) of the image
+     * @param float $x x position
+     * @param float $y y position
+     * @param int $w width (in pixels)
+     * @param int $h height (in pixels)
+     */
+    function image($img_url, $img_type, $x, $y, $w, $h);
 
-  /**
-   * Writes text at the specified x and y coordinates
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   *
-   * @param float $x
-   * @param float $y
-   * @param string $text the text to write
-   * @param string $font the font file to use
-   * @param float $size the font size, in points
-   * @param array $color
-   * @param float $adjust word spacing adjustment
-   */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0);
+    /**
+     * Writes text at the specified x and y coordinates
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     *
+     * @param float $x
+     * @param float $y
+     * @param string $text the text to write
+     * @param string $font the font file to use
+     * @param float $size the font size, in points
+     * @param array $color
+     * @param float $adjust word spacing adjustment
+     */
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0);
 
-  /**
-   * Add a named destination (similar to <a name="foo">...</a> in html)
-   *
-   * @param string $anchorname The name of the named destination
-   */
-  function add_named_dest($anchorname);
+    /**
+     * Add a named destination (similar to <a name="foo">...</a> in html)
+     *
+     * @param string $anchorname The name of the named destination
+     */
+    function add_named_dest($anchorname);
 
-  /**
-   * Add a link to the pdf
-   *
-   * @param string $url The url to link to
-   * @param float  $x   The x position of the link
-   * @param float  $y   The y position of the link
-   * @param float  $width   The width of the link
-   * @param float  $height   The height of the link
-   */
-  function add_link($url, $x, $y, $width, $height);
+    /**
+     * Add a link to the pdf
+     *
+     * @param string $url The url to link to
+     * @param float  $x   The x position of the link
+     * @param float  $y   The y position of the link
+     * @param float  $width   The width of the link
+     * @param float  $height   The height of the link
+     */
+    function add_link($url, $x, $y, $width, $height);
   
-  /**
-   * Calculates text size, in points
-   *
-   * @param string $text the text to be sized
-   * @param string $font the desired font
-   * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
-   * @return float
-   */
-  function get_text_width($text, $font, $size, $spacing = 0);
+    /**
+     * Calculates text size, in points
+     *
+     * @param string $text the text to be sized
+     * @param string $font the desired font
+     * @param float  $size the desired font size
+     * @param float  $spacing word spacing, if any
+     * @return float
+     */
+    function get_text_width($text, $font, $size, $spacing = 0);
 
-  /**
-   * Calculates font height, in points
-   *
-   * @param string $font
-   * @param float $size
-   * @return float
-   */
-  function get_font_height($font, $size);
+    /**
+     * Calculates font height, in points
+     *
+     * @param string $font
+     * @param float $size
+     * @return float
+     */
+    function get_font_height($font, $size);
 
   
-  /**
-   * Starts a new page
-   *
-   * Subsequent drawing operations will appear on the new page.
-   */
-  function new_page();
+    /**
+     * Starts a new page
+     *
+     * Subsequent drawing operations will appear on the new page.
+     */
+    function new_page();
 
-  /**
-   * Streams the PDF directly to the browser
-   *
-   * @param string $filename the name of the PDF file
-   * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
-   */
-  function stream($filename, $options = null);
+    /**
+     * Streams the PDF directly to the browser
+     *
+     * @param string $filename the name of the PDF file
+     * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
+     */
+    function stream($filename, $options = null);
 
-  /**
-   * Returns the PDF as a string
-   *
-   * @param array  $options associative array: 'compress' => 1 or 0
-   * @return string
-   */
-  function output($options = null);
+    /**
+     * Returns the PDF as a string
+     *
+     * @param array  $options associative array: 'compress' => 1 or 0
+     * @return string
+     */
+    function output($options = null);
   
 }