chamilo / chamilo-lms

main/mySpace/lp_tracking.php

Indentation +11 added lines, -11 removed lines

@@ -11,10 +11,10 @@ 
 $from_myspace = false;
 $from_link = '';
 if (isset($_GET['from']) && $_GET['from'] == 'myspace') {
-	$from_link = '&from=myspace';
-	$this_section = SECTION_TRACKING;
+    $from_link = '&from=myspace';
+    $this_section = SECTION_TRACKING;
 } else {
-	$this_section = SECTION_COURSES;
+    $this_section = SECTION_COURSES;
 }
 
 $session_id  = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id();
@@ -35,19 +35,19 @@ 
 if (!api_is_platform_admin(true) &&
     !CourseManager :: is_course_teacher(api_get_user_id(), $courseCode) &&
     !Tracking :: is_allowed_to_coach_student(api_get_user_id(), $user_id) && !api_is_drh() && !api_is_course_tutor()) {
-	api_not_allowed();
+    api_not_allowed();
 }
 
 if ($origin == 'user_course') {
-	$interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
-	$interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
+    $interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
+    $interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
 } else if($origin == 'tracking_course') {
-	$interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
+    $interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
 } else {
-	$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
-	$interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents"));
- 	$interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
- 	$nameTools=get_lang("DetailsStudentInCourse");
+    $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+    $interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents"));
+        $interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
+        $nameTools=get_lang("DetailsStudentInCourse");
 }
 
 $interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id."&course=".$courseCode."&details=true&origin=".$origin , "name" => get_lang("DetailsStudentInCourse"));

main/inc/lib/magpierss/rss_parse.inc

Indentation +41 added lines, -41 removed lines

@@ -100,8 +100,8 @@ 
         #
         if (!function_exists('xml_parser_create')) {
             $this->error( "Failed to load PHP's XML Extension. " . 
-                          "http://www.php.net/manual/en/ref.xml.php",
-                           E_USER_ERROR );
+                            "http://www.php.net/manual/en/ref.xml.php",
+                            E_USER_ERROR );
         }
         
         list($parser, $source) = $this->create_parser($source, 
@@ -110,8 +110,8 @@ 
         
         if (!is_resource($parser)) {
             $this->error( "Failed to create an instance of PHP's XML parser. " .
-                          "http://www.php.net/manual/en/ref.xml.php",
-                          E_USER_ERROR );
+                            "http://www.php.net/manual/en/ref.xml.php",
+                            E_USER_ERROR );
         }
 
         
@@ -447,9 +447,9 @@ 
     }
 
     /**
-    * return XML parser, and possibly re-encoded source
-    *
-    */
+     * return XML parser, and possibly re-encoded source
+     *
+     */
     public function create_parser($source, $out_enc, $in_enc, $detect) {
         if ( substr(phpversion(),0,1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
@@ -466,14 +466,14 @@ 
     }
     
     /**
-    * Instantiate an XML parser under PHP5
-    *
-    * PHP5 will do a fine job of detecting input encoding
-    * if passed an empty string as the encoding. 
-    *
-    * All hail libxml2!
-    *
-    */
+     * Instantiate an XML parser under PHP5
+     *
+     * PHP5 will do a fine job of detecting input encoding
+     * if passed an empty string as the encoding. 
+     *
+     * All hail libxml2!
+     *
+     */
     public function php5_create_parser($in_enc, $detect) {
         // by default php5 does a fine job of detecting input encodings
         if(!$detect && $in_enc) {
@@ -485,20 +485,20 @@ 
     }
     
     /**
-    * Instaniate an XML parser under PHP4
-    *
-    * Unfortunately PHP4's support for character encodings
-    * and especially XML and character encodings sucks.  As
-    * long as the documents you parse only contain characters
-    * from the ISO-8859-1 character set (a superset of ASCII,
-    * and a subset of UTF-8) you're fine.  However once you
-    * step out of that comfy little world things get mad, bad,
-    * and dangerous to know.
-    *
-    * The following code is based on SJM's work with FoF
-    * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
-    *
-    */
+     * Instaniate an XML parser under PHP4
+     *
+     * Unfortunately PHP4's support for character encodings
+     * and especially XML and character encodings sucks.  As
+     * long as the documents you parse only contain characters
+     * from the ISO-8859-1 character set (a superset of ASCII,
+     * and a subset of UTF-8) you're fine.  However once you
+     * step out of that comfy little world things get mad, bad,
+     * and dangerous to know.
+     *
+     * The following code is based on SJM's work with FoF
+     * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
+     *
+     */
     public function php4_create_parser($source, $in_enc, $detect) {
         if ( !$detect ) {
             return array(xml_parser_create($in_enc), $source);
@@ -542,8 +542,8 @@ 
         
         // else 
         $this->error("Feed is in an unsupported character encoding. ($in_enc) " .
-                     "You may see strange artifacts, and mangled characters.",
-                     E_USER_NOTICE);
+                        "You may see strange artifacts, and mangled characters.",
+                        E_USER_NOTICE);
             
         return array(xml_parser_create(), $source);
     }
@@ -589,17 +589,17 @@ 
 // courtesy, Ryan Currie, ryan@digibliss.com
 
 if (!function_exists('array_change_key_case')) {
-	define("CASE_UPPER",1);
-	define("CASE_LOWER",0);
+    define("CASE_UPPER",1);
+    define("CASE_LOWER",0);
 
 
-	function array_change_key_case($array,$case=CASE_LOWER) {
-       if ($case=CASE_LOWER) $cmd=strtolower;
-       elseif ($case=CASE_UPPER) $cmd=strtoupper;
-       foreach($array as $key=>$value) {
-               $output[$cmd($key)]=$value;
-       }
-       return $output;
-	}
+    function array_change_key_case($array,$case=CASE_LOWER) {
+        if ($case=CASE_LOWER) $cmd=strtolower;
+        elseif ($case=CASE_UPPER) $cmd=strtoupper;
+        foreach($array as $key=>$value) {
+                $output[$cmd($key)]=$value;
+        }
+        return $output;
+    }
 
 }

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

Indentation +168 added lines, -168 removed lines

@@ -47,199 +47,199 @@
  * @version $Revision: 822448 $
  * @package log4php
  */
- /*
+    /*
   * TODO:
   * - addHierarchyEventListener($listener) not supported
   * - emitNoAppenderWarning($cat) not supported
   * - fireAddAppenderEvent not supported
   */
 class LoggerHierarchy {
-	/** Default Factory  */
-	protected $defaultFactory;
+    /** Default Factory  */
+    protected $defaultFactory;
 	
-	/** array hierarchy tree. saves here all loggers */
-	protected $ht = array();
+    /** array hierarchy tree. saves here all loggers */
+    protected $ht = array();
 	
-	/** The root Logger */
-	protected $root = null;
+    /** The root Logger */
+    protected $root = null;
 	
-	/** LoggerRendererMap */
-	protected $rendererMap;
+    /** LoggerRendererMap */
+    protected $rendererMap;
 
-	/** LoggerLevel main level threshold */
-	protected $threshold;
+    /** LoggerLevel main level threshold */
+    protected $threshold;
 	
-	/**
-	 * Create a new logger hierarchy.
-	 * @param object $root the root logger
-	 */
-	public function __construct(LoggerRoot $root) {
-		$this->root = $root;
-		$this->setThreshold(LoggerLevel::getLevelAll());
-		$this->rendererMap = new LoggerRendererMap();
-	}
+    /**
+     * Create a new logger hierarchy.
+     * @param object $root the root logger
+     */
+    public function __construct(LoggerRoot $root) {
+        $this->root = $root;
+        $this->setThreshold(LoggerLevel::getLevelAll());
+        $this->rendererMap = new LoggerRendererMap();
+    }
 	 
-	/**
-	 * This call will clear all logger definitions from the internal hashtable.
-	 */
-	public function clear() {
-		$this->ht = array();
-	}
+    /**
+     * This call will clear all logger definitions from the internal hashtable.
+     */
+    public function clear() {
+        $this->ht = array();
+    }
 	  
-	/**
-	 * Check if the named logger exists in the hierarchy.
-	 * @param string $name
-	 * @return boolean
-	 */
-	public function exists($name) {
-		return isset($this->ht[$name]);
-	}
+    /**
+     * Check if the named logger exists in the hierarchy.
+     * @param string $name
+     * @return boolean
+     */
+    public function exists($name) {
+        return isset($this->ht[$name]);
+    }
 
-	/**
-	 * Returns all the currently defined categories in this hierarchy as an array.
-	 * @return array
-	 */	 
-	public function getCurrentLoggers() {
-		return array_values($this->ht);
-	}
+    /**
+     * Returns all the currently defined categories in this hierarchy as an array.
+     * @return array
+     */	 
+    public function getCurrentLoggers() {
+        return array_values($this->ht);
+    }
 	
-	/**
-	 * Return a new logger instance named as the first parameter using the default factory.
-	 * 
-	 * @param string $name logger name
-	 * @param LoggerFactory $factory a {@link LoggerFactory} instance or null	  
-	 * @return Logger
-	 */
-	public function getLogger($name) {
-		if(!isset($this->ht[$name])) {
-			$this->ht[$name] = new Logger($name);;
-			// TODO: isn't necessary, access via singleton?
-			// $this->ht[$name]->setHierarchy($this);
-			$nodes = explode('.', $name);
-			$firstNode = array_shift($nodes);
+    /**
+     * Return a new logger instance named as the first parameter using the default factory.
+     * 
+     * @param string $name logger name
+     * @param LoggerFactory $factory a {@link LoggerFactory} instance or null	  
+     * @return Logger
+     */
+    public function getLogger($name) {
+        if(!isset($this->ht[$name])) {
+            $this->ht[$name] = new Logger($name);;
+            // TODO: isn't necessary, access via singleton?
+            // $this->ht[$name]->setHierarchy($this);
+            $nodes = explode('.', $name);
+            $firstNode = array_shift($nodes);
 			
-			// if name is not a first node but another first node is their
-			if($firstNode != $name and isset($this->ht[$firstNode])) {
-				$this->ht[$name]->setParent($this->ht[$firstNode]);
-			} else {
-				// if there is no father, set root logger as father
-				$this->ht[$name]->setParent($this->root);
-			} 
+            // if name is not a first node but another first node is their
+            if($firstNode != $name and isset($this->ht[$firstNode])) {
+                $this->ht[$name]->setParent($this->ht[$firstNode]);
+            } else {
+                // if there is no father, set root logger as father
+                $this->ht[$name]->setParent($this->root);
+            } 
 		
-			// if there are more nodes than one
-			if(count($nodes) > 0) {
-				// find parent node
-				foreach($nodes as $node) {
-					$parentNode = "$firstNode.$node";
-					if(isset($this->ht[$parentNode]) and $parentNode != $name) {
+            // if there are more nodes than one
+            if(count($nodes) > 0) {
+                // find parent node
+                foreach($nodes as $node) {
+                    $parentNode = "$firstNode.$node";
+                    if(isset($this->ht[$parentNode]) and $parentNode != $name) {
 		
-						$this->ht[$name]->setParent($this->ht[$parentNode]);
-					}
-					$firstNode .= ".$node";
-				}
-			}
-		}		
+                        $this->ht[$name]->setParent($this->ht[$parentNode]);
+                    }
+                    $firstNode .= ".$node";
+                }
+            }
+        }		
 		
-		return $this->ht[$name];
-	} 
+        return $this->ht[$name];
+    } 
 	
-	/**
-	 * @return LoggerRendererMap Get the renderer map for this hierarchy.
-	 */
-	public function getRendererMap() {
-		return $this->rendererMap;
-	}
+    /**
+     * @return LoggerRendererMap Get the renderer map for this hierarchy.
+     */
+    public function getRendererMap() {
+        return $this->rendererMap;
+    }
 	
-	/**
-	 * @return LoggerRoot Get the root of this hierarchy.
-	 */ 
-	public function getRootLogger() {
-		if(!isset($this->root) or $this->root == null) {
-			$this->root = new LoggerRoot();
-		}
-		return $this->root;
-	}
+    /**
+     * @return LoggerRoot Get the root of this hierarchy.
+     */ 
+    public function getRootLogger() {
+        if(!isset($this->root) or $this->root == null) {
+            $this->root = new LoggerRoot();
+        }
+        return $this->root;
+    }
 	 
-	/**
-	 * @return LoggerLevel Returns the threshold Level.
-	 */
-	public function getThreshold() {
-		return $this->threshold;
-	} 
+    /**
+     * @return LoggerLevel Returns the threshold Level.
+     */
+    public function getThreshold() {
+        return $this->threshold;
+    } 
 
-	/**
-	 * This method will return true if this repository is disabled 
-	 * for level object passed as parameter and false otherwise.
-	 * @return boolean
-	 */
-	public function isDisabled(LoggerLevel $level) {
-		return ($this->threshold->toInt() > $level->toInt());
-	}
+    /**
+     * This method will return true if this repository is disabled 
+     * for level object passed as parameter and false otherwise.
+     * @return boolean
+     */
+    public function isDisabled(LoggerLevel $level) {
+        return ($this->threshold->toInt() > $level->toInt());
+    }
 	
-	/**
-	 * Reset all values contained in this hierarchy instance to their
-	 * default. 
-	 *
-	 * This removes all appenders from all categories, sets
-	 * the level of all non-root categories to <i>null</i>,
-	 * sets their additivity flag to <i>true</i> and sets the level
-	 * of the root logger to {@link LOGGER_LEVEL_DEBUG}.  Moreover,
-	 * message disabling is set its default "off" value.
-	 * 
-	 * <p>Existing categories are not removed. They are just reset.
-	 *
-	 * <p>This method should be used sparingly and with care as it will
-	 * block all logging until it is completed.</p>
-	 */
-	public function resetConfiguration() {
-		$root = $this->getRootLogger();
+    /**
+     * Reset all values contained in this hierarchy instance to their
+     * default. 
+     *
+     * This removes all appenders from all categories, sets
+     * the level of all non-root categories to <i>null</i>,
+     * sets their additivity flag to <i>true</i> and sets the level
+     * of the root logger to {@link LOGGER_LEVEL_DEBUG}.  Moreover,
+     * message disabling is set its default "off" value.
+     * 
+     * <p>Existing categories are not removed. They are just reset.
+     *
+     * <p>This method should be used sparingly and with care as it will
+     * block all logging until it is completed.</p>
+     */
+    public function resetConfiguration() {
+        $root = $this->getRootLogger();
 		
-		$root->setLevel(LoggerLevel::getLevelDebug());
-		$this->setThreshold(LoggerLevel::getLevelAll());
-		$this->shutDown();
-		$loggers = $this->getCurrentLoggers();
-		$enumLoggers = count($loggers);
-		for($i = 0; $i < $enumLoggers; $i++) {
-			$loggers[$i]->setLevel(null);
-			$loggers[$i]->setAdditivity(true);
-			$loggers[$i]->removeAllAppenders();
-		}
-		$this->rendererMap->clear();
-	}
+        $root->setLevel(LoggerLevel::getLevelDebug());
+        $this->setThreshold(LoggerLevel::getLevelAll());
+        $this->shutDown();
+        $loggers = $this->getCurrentLoggers();
+        $enumLoggers = count($loggers);
+        for($i = 0; $i < $enumLoggers; $i++) {
+            $loggers[$i]->setLevel(null);
+            $loggers[$i]->setAdditivity(true);
+            $loggers[$i]->removeAllAppenders();
+        }
+        $this->rendererMap->clear();
+    }
 	
-	/**
-	 * set a new threshold level
-	 *
-	 * @param LoggerLevel $l
-	 */
-	public function setThreshold(LoggerLevel $l) {
-		if($l !== null) {
-			$this->threshold = $l;
-		}
-	}
+    /**
+     * set a new threshold level
+     *
+     * @param LoggerLevel $l
+     */
+    public function setThreshold(LoggerLevel $l) {
+        if($l !== null) {
+            $this->threshold = $l;
+        }
+    }
 	
-	/**
-	 * Shutting down a hierarchy will <i>safely</i> close and remove
-	 * all appenders in all categories including the root logger.
-	 * 
-	 * <p>Some appenders such as {@link LoggerSocketAppender}
-	 * need to be closed before the
-	 * application exists. Otherwise, pending logging events might be
-	 * lost.
-	 * 
-	 * <p>The shutdown method is careful to close nested
-	 * appenders before closing regular appenders. This is allows
-	 * configurations where a regular appender is attached to a logger
-	 * and again to a nested appender.
-	 */
-	public function shutdown() {
-		$this->root->removeAllAppenders();
-		$cats = $this->getCurrentLoggers();
-		$enumCats = count($cats);		  
-		if($enumCats > 0) {
-			for($i = 0; $i < $enumCats; $i++) {
-				$cats[$i]->removeAllAppenders();
-			}
-		}
-	}
+    /**
+     * Shutting down a hierarchy will <i>safely</i> close and remove
+     * all appenders in all categories including the root logger.
+     * 
+     * <p>Some appenders such as {@link LoggerSocketAppender}
+     * need to be closed before the
+     * application exists. Otherwise, pending logging events might be
+     * lost.
+     * 
+     * <p>The shutdown method is careful to close nested
+     * appenders before closing regular appenders. This is allows
+     * configurations where a regular appender is attached to a logger
+     * and again to a nested appender.
+     */
+    public function shutdown() {
+        $this->root->removeAllAppenders();
+        $cats = $this->getCurrentLoggers();
+        $enumCats = count($cats);		  
+        if($enumCats > 0) {
+            for($i = 0; $i < $enumCats; $i++) {
+                $cats[$i]->removeAllAppenders();
+            }
+        }
+    }
 } 

main/inc/lib/phpdocx/lib/log4php/configurators/LoggerConfiguratorPhp.php

Indentation +72 added lines, -72 removed lines

@@ -38,97 +38,97 @@
  */
 class LoggerConfiguratorPhp implements LoggerConfigurator {
 	
-	public function configure(LoggerHierarchy $hierarchy, $url = '') {
-		return $this->doConfigure($url, $hierarchy);
-	}
+    public function configure(LoggerHierarchy $hierarchy, $url = '') {
+        return $this->doConfigure($url, $hierarchy);
+    }
 	
-	private function doConfigure($url, LoggerHierarchy $hierarchy) {
+    private function doConfigure($url, LoggerHierarchy $hierarchy) {
 		
-		$config = require $url;
+        $config = require $url;
 		
-		// set threshold
-		if(isset($config['threshold'])) {
-			$hierarchy->setThreshold(LoggerOptionConverter::toLevel($config['threshold'], LoggerLevel::getLevelAll()));
-		}
+        // set threshold
+        if(isset($config['threshold'])) {
+            $hierarchy->setThreshold(LoggerOptionConverter::toLevel($config['threshold'], LoggerLevel::getLevelAll()));
+        }
 		
-		// parse and create appenders
-		if(isset($config['appenders'])) {
+        // parse and create appenders
+        if(isset($config['appenders'])) {
 			
-			foreach($config['appenders'] as $appenderName => $appenderProperties) {
+            foreach($config['appenders'] as $appenderName => $appenderProperties) {
 				
-				$appender = LoggerAppenderPool::getAppenderFromPool($appenderName, $appenderProperties['class']);
+                $appender = LoggerAppenderPool::getAppenderFromPool($appenderName, $appenderProperties['class']);
 				
-				if($appender->requiresLayout()) {
+                if($appender->requiresLayout()) {
 					
-					if(isset($appenderProperties['layout'])) {
+                    if(isset($appenderProperties['layout'])) {
 						
-						if(isset($appenderProperties['layout']['class']) and !empty($appenderProperties['layout']['class'])) {
-							$layoutClass = $appenderProperties['layout']['class'];							
-						} else {
-							$layoutClass = 'LoggerLayoutSimple';
-						}
+                        if(isset($appenderProperties['layout']['class']) and !empty($appenderProperties['layout']['class'])) {
+                            $layoutClass = $appenderProperties['layout']['class'];							
+                        } else {
+                            $layoutClass = 'LoggerLayoutSimple';
+                        }
 						
-						$layout = LoggerReflectionUtils::createObject($layoutClass);
-						if($layout === null) {
-							$layout = LoggerReflectionUtils::createObject('LoggerLayoutSimple');
-						}
+                        $layout = LoggerReflectionUtils::createObject($layoutClass);
+                        if($layout === null) {
+                            $layout = LoggerReflectionUtils::createObject('LoggerLayoutSimple');
+                        }
 						
-						if($layout instanceof LoggerLayoutPattern) {
-							$layout->setConversionPattern($appenderProperties['layout']['conversionPattern']);
-						}
+                        if($layout instanceof LoggerLayoutPattern) {
+                            $layout->setConversionPattern($appenderProperties['layout']['conversionPattern']);
+                        }
 						
-						$appender->setLayout($layout);
+                        $appender->setLayout($layout);
 						
-					} else {
-						// TODO: throw exception?
-					}
+                    } else {
+                        // TODO: throw exception?
+                    }
 					
-				}
+                }
 				
-			}
+            }
 			
-		}
+        }
 		
-		// parse and create root logger
-		if(isset($config['rootLogger'])) {
-			$rootLogger = $hierarchy->getRootLogger();
-			if(isset($config['rootLogger']['level'])) {
-				$rootLogger->setLevel(LoggerOptionConverter::toLevel($config['rootLogger']['level'], LoggerLevel::getLevelDebug()));
-				if(isset($config['rootLogger']['appenders'])) {
-					foreach($config['rootLogger']['appenders'] as $appenderName) {
-						$appender = LoggerAppenderPool::getAppenderFromPool($appenderName);
-						if($appender !== null) {
-							$rootLogger->addAppender($appender);
-						}
-					}
-				}	
-			}
-		}
+        // parse and create root logger
+        if(isset($config['rootLogger'])) {
+            $rootLogger = $hierarchy->getRootLogger();
+            if(isset($config['rootLogger']['level'])) {
+                $rootLogger->setLevel(LoggerOptionConverter::toLevel($config['rootLogger']['level'], LoggerLevel::getLevelDebug()));
+                if(isset($config['rootLogger']['appenders'])) {
+                    foreach($config['rootLogger']['appenders'] as $appenderName) {
+                        $appender = LoggerAppenderPool::getAppenderFromPool($appenderName);
+                        if($appender !== null) {
+                            $rootLogger->addAppender($appender);
+                        }
+                    }
+                }	
+            }
+        }
 		
-		// parse and create loggers
-		if(isset($config['loggers'])) {
-			foreach($config['loggers'] as $loggerName => $loggerProperties) {
-				if(is_string($loggerName)) {
-					$logger = $hierarchy->getLogger($loggerName);
+        // parse and create loggers
+        if(isset($config['loggers'])) {
+            foreach($config['loggers'] as $loggerName => $loggerProperties) {
+                if(is_string($loggerName)) {
+                    $logger = $hierarchy->getLogger($loggerName);
 					
-					if(isset($loggerProperties['level'])) {
-						$logger->setLevel(LoggerOptionConverter::toLevel($loggerProperties['level'], LoggerLevel::getLevelDebug()));
-						if(isset($loggerProperties['appenders'])) {
-							foreach($loggerProperties['appenders'] as $appenderName) {
-								$appender = LoggerAppenderPool::getAppenderFromPool($appenderName);
-								if($appender !== null) {
-									$logger->addAppender($appender);
-								}
-							}
-						}	
-					}
-				} else {
-					// TODO: throw exception
-				}
-			}
-		}
+                    if(isset($loggerProperties['level'])) {
+                        $logger->setLevel(LoggerOptionConverter::toLevel($loggerProperties['level'], LoggerLevel::getLevelDebug()));
+                        if(isset($loggerProperties['appenders'])) {
+                            foreach($loggerProperties['appenders'] as $appenderName) {
+                                $appender = LoggerAppenderPool::getAppenderFromPool($appenderName);
+                                if($appender !== null) {
+                                    $logger->addAppender($appender);
+                                }
+                            }
+                        }	
+                    }
+                } else {
+                    // TODO: throw exception
+                }
+            }
+        }
 		
-		return true;
-	}
+        return true;
+    }
 	
 }

main/inc/lib/phpdocx/lib/log4php/helpers/LoggerPatternConverter.php

Indentation +81 added lines, -81 removed lines

@@ -26,12 +26,12 @@ 
  * @subpackage helpers
  */
 $GLOBALS['log4php.LoggerPatternConverter.spaces'] = array(
-	" ", // 1 space
-	"  ", // 2 spaces
-	"    ", // 4 spaces
-	"        ", // 8 spaces
-	"                ", // 16 spaces
-	"                                " ); // 32 spaces
+    " ", // 1 space
+    "  ", // 2 spaces
+    "    ", // 4 spaces
+    "        ", // 8 spaces
+    "                ", // 16 spaces
+    "                                " ); // 32 spaces
 
 
 /**
@@ -50,89 +50,89 @@ 
  */
 class LoggerPatternConverter {
 
-	/**
-	 * @var LoggerPatternConverter next converter in converter chain
-	 */
-	public $next = null;
+    /**
+     * @var LoggerPatternConverter next converter in converter chain
+     */
+    public $next = null;
 	
-	public $min = -1;
-	public $max = 0x7FFFFFFF;
-	public $leftAlign = false;
+    public $min = -1;
+    public $max = 0x7FFFFFFF;
+    public $leftAlign = false;
 
-	/**
-	 * Constructor 
-	 *
-	 * @param LoggerFormattingInfo $fi
-	 */
-	public function __construct($fi = null) {  
-		if($fi !== null) {
-			$this->min = $fi->min;
-			$this->max = $fi->max;
-			$this->leftAlign = $fi->leftAlign;
-		}
-	}
+    /**
+     * Constructor 
+     *
+     * @param LoggerFormattingInfo $fi
+     */
+    public function __construct($fi = null) {  
+        if($fi !== null) {
+            $this->min = $fi->min;
+            $this->max = $fi->max;
+            $this->leftAlign = $fi->leftAlign;
+        }
+    }
   
-	/**
-	 * Derived pattern converters must override this method in order to
-	 * convert conversion specifiers in the correct way.
-	 *
-	 * @param LoggerLoggingEvent $event
-	 */
-	public function convert($event) {}
+    /**
+     * Derived pattern converters must override this method in order to
+     * convert conversion specifiers in the correct way.
+     *
+     * @param LoggerLoggingEvent $event
+     */
+    public function convert($event) {}
 
-	/**
-	 * A template method for formatting in a converter specific way.
-	 *
-	 * @param string &$sbuf string buffer
-	 * @param LoggerLoggingEvent $e
-	 */
-	public function format(&$sbuf, $e) {
-		$s = $this->convert($e);
+    /**
+     * A template method for formatting in a converter specific way.
+     *
+     * @param string &$sbuf string buffer
+     * @param LoggerLoggingEvent $e
+     */
+    public function format(&$sbuf, $e) {
+        $s = $this->convert($e);
 		
-		if($s == null or empty($s)) {
-			if(0 < $this->min) {
-				$this->spacePad($sbuf, $this->min);
-			}
-			return;
-		}
+        if($s == null or empty($s)) {
+            if(0 < $this->min) {
+                $this->spacePad($sbuf, $this->min);
+            }
+            return;
+        }
 		
-		$len = strlen($s);
+        $len = strlen($s);
 	
-		if($len > $this->max) {
-			$sbuf .= substr($s , 0, ($len - $this->max));
-		} else if($len < $this->min) {
-			if($this->leftAlign) {		
-				$sbuf .= $s;
-				$this->spacePad($sbuf, ($this->min - $len));
-			} else {
-				$this->spacePad($sbuf, ($this->min - $len));
-				$sbuf .= $s;
-			}
-		} else {
-			$sbuf .= $s;
-		}
-	}	
+        if($len > $this->max) {
+            $sbuf .= substr($s , 0, ($len - $this->max));
+        } else if($len < $this->min) {
+            if($this->leftAlign) {		
+                $sbuf .= $s;
+                $this->spacePad($sbuf, ($this->min - $len));
+            } else {
+                $this->spacePad($sbuf, ($this->min - $len));
+                $sbuf .= $s;
+            }
+        } else {
+            $sbuf .= $s;
+        }
+    }	
 
-	/**
-	 * Fast space padding method.
-	 *
-	 * @param string	$sbuf	   string buffer
-	 * @param integer	$length	   pad length
-	 *
-	 * @todo reimplement using PHP string functions
-	 */
-	public function spacePad($sbuf, $length) {
-		while($length >= 32) {
-		  $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5];
-		  $length -= 32;
-		}
+    /**
+     * Fast space padding method.
+     *
+     * @param string	$sbuf	   string buffer
+     * @param integer	$length	   pad length
+     *
+     * @todo reimplement using PHP string functions
+     */
+    public function spacePad($sbuf, $length) {
+        while($length >= 32) {
+            $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5];
+            $length -= 32;
+        }
 		
-		for($i = 4; $i >= 0; $i--) {	
-			if(($length & (1<<$i)) != 0) {
-				$sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][$i];
-			}
-		}
+        for($i = 4; $i >= 0; $i--) {	
+            if(($length & (1<<$i)) != 0) {
+                $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][$i];
+            }
+        }
 
-		// $sbuf = str_pad($sbuf, $length);
-	}
+        // $sbuf = str_pad($sbuf, $length);
+    }
 }

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

Indentation +13 added lines, -14 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: table_row_group_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,11 +46,11 @@ 
  */
 class Table_Row_Group_Frame_Reflower extends Frame_Reflower {
 
-  function __construct($frame) {
+    function __construct($frame) {
     parent::__construct($frame);
-  }
+    }
 
-  function reflow() {
+    function reflow() {
     $page = $this->_frame->get_root();
 
     $style = $this->_frame->get_style();
@@ -62,20 +61,20 @@ 
     $cb = $this->_frame->get_containing_block();
     
     foreach ( $this->_frame->get_children() as $child) {
-      // Bail if the page is full
-      if ( $page->is_full() )
+        // Bail if the page is full
+        if ( $page->is_full() )
         return;
 
-      $child->set_containing_block($cb["x"], $cb["y"], $cb["w"], $cb["h"]);
-      $child->reflow();
+        $child->set_containing_block($cb["x"], $cb["y"], $cb["w"], $cb["h"]);
+        $child->reflow();
 
-      // Check if a split has occured
-      $page->check_page_break($child);
+        // Check if a split has occured
+        $page->check_page_break($child);
 
     }
 
     if ( $page->is_full() )
-      return;
+        return;
 
     $cellmap = $table->get_cellmap();
     $style->width = $cellmap->get_frame_width($this->_frame);
@@ -84,9 +83,9 @@ 
     $this->_frame->set_position($cellmap->get_frame_position($this->_frame));
     
     if ( $table->get_style()->border_collapse === "collapse" ) 
-      // Unset our borders because our cells are now using them
-      $style->border_style = "none";
+        // Unset our borders because our cells are now using them
+        $style->border_style = "none";
  
-  }
+    }
 
 }

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

Indentation +3 added lines, -4 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: null_positioner.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,10 +46,10 @@ 
  */
 class Null_Positioner extends Positioner {
 
-  function __construct(Frame_Decorator $frame) {
+    function __construct(Frame_Decorator $frame) {
     parent::__construct($frame);
-  }
+    }
 
-  function position() { return; }
+    function position() { return; }
   
 }

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

Indentation +33 added lines, -34 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: inline_renderer.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,13 +46,13 @@ 
  */
 class Inline_Renderer extends Abstract_Renderer {
   
-  //........................................................................
+    //........................................................................
 
-  function render(Frame $frame) {
+    function render(Frame $frame) {
     $style = $frame->get_style();
 
     if ( !$frame->get_first_child() )
-      return; // No children, no service
+        return; // No children, no service
     
     // Draw the left border if applicable
     $bp = $style->get_border_properties();
@@ -73,10 +72,10 @@ 
     $first_row = true;
 
     foreach ($frame->get_children() as $child) {
-      list($child_x, $child_y, $child_w, $child_h) = $child->get_padding_box();
-      $child_h += $widths[2];
+        list($child_x, $child_y, $child_w, $child_h) = $child->get_padding_box();
+        $child_h += $widths[2];
       
-      if ( !is_null($w) && $child_x < $x + $w ) {
+        if ( !is_null($w) && $child_x < $x + $w ) {
         //This branch seems to be supposed to being called on the first part
         //of an inline html element, and the part after the if clause for the
         //parts after a line break.
@@ -88,37 +87,37 @@ 
 
         // Background:
         if ( ($bg = $style->background_color) !== "transparent" )
-          $this->_canvas->filled_rectangle( $x, $y, $w, $h, $style->background_color);
+            $this->_canvas->filled_rectangle( $x, $y, $w, $h, $style->background_color);
 
         if ( ($url = $style->background_image) && $url !== "none" ) {
-          $this->_background_image($url, $x, $y, $w, $h, $style);
+            $this->_background_image($url, $x, $y, $w, $h, $style);
         }
 
         // If this is the first row, draw the left border
         if ( $first_row ) {
 
-          if ( $bp["left"]["style"] !== "none" && $bp["left"]["width"] > 0 ) {
+            if ( $bp["left"]["style"] !== "none" && $bp["left"]["width"] > 0 ) {
             $method = "_border_" . $bp["left"]["style"];            
             $this->$method($x, $y, $h + $widths[0] + $widths[2], $bp["left"]["color"], $widths, "left");
-          }
-          $first_row = false;
+            }
+            $first_row = false;
         }
 
         // Draw the top & bottom borders
         if ( $bp["top"]["style"] !== "none" && $bp["top"]["width"] > 0 ) {
-          $method = "_border_" . $bp["top"]["style"];
-          $this->$method($x, $y, $w + $widths[1] + $widths[3], $bp["top"]["color"], $widths, "top");
+            $method = "_border_" . $bp["top"]["style"];
+            $this->$method($x, $y, $w + $widths[1] + $widths[3], $bp["top"]["color"], $widths, "top");
         }
         
         if ( $bp["bottom"]["style"] !== "none" && $bp["bottom"]["width"] > 0 ) {
-          $method = "_border_" . $bp["bottom"]["style"];
-          $this->$method($x, $y + $h + $widths[0] + $widths[2], $w + $widths[1] + $widths[3], $bp["bottom"]["color"], $widths, "bottom");
+            $method = "_border_" . $bp["bottom"]["style"];
+            $this->$method($x, $y + $h + $widths[0] + $widths[2], $w + $widths[1] + $widths[3], $bp["bottom"]["color"], $widths, "bottom");
         }
 
         // Handle anchors & links
         if ( $frame->get_node()->nodeName === "a" ) {
                     
-          if ( $href = $frame->get_node()->getAttribute("href") )
+            if ( $href = $frame->get_node()->getAttribute("href") )
             $this->_canvas->add_link($href, $x, $y, $w, $h);
 
         }
@@ -128,20 +127,20 @@ 
         $w = $child_w;
         $h = $child_h;
         continue;
-      }
+        }
 
-      if ( is_null($w) )
+        if ( is_null($w) )
         $w = $child_w;
-      else
+        else
         $w += $child_w;
       
-      $h = max($h, $child_h);
+        $h = max($h, $child_h);
     }
 
     
     // Handle the last child
     if ( ($bg = $style->background_color) !== "transparent" ) 
-      $this->_canvas->filled_rectangle( $x + $widths[3], $y + $widths[0], $w, $h, $style->background_color);
+        $this->_canvas->filled_rectangle( $x + $widths[3], $y + $widths[0], $w, $h, $style->background_color);
 
     //On continuation lines (after line break) of inline elements, the style got copied.
     //But a non repeatable background image should not be repeated on the next line.
@@ -152,7 +151,7 @@ 
     // ... && (!($repeat = $style->background_repeat) || $repeat === "repeat" ...
     //different position? $this->_background_image($url, $x, $y, $w, $h, $style);
     if ( ($url = $style->background_image) && $url !== "none" )           
-      $this->_background_image($url, $x + $widths[3], $y + $widths[0], $w, $h, $style);
+        $this->_background_image($url, $x + $widths[3], $y + $widths[0], $w, $h, $style);
         
     // Add the border widths
     $w += $widths[1] + $widths[3];
@@ -164,37 +163,37 @@ 
 
     // If this is the first row, draw the left border too
     if ( $first_row && $bp["left"]["style"] !== "none" && $widths[3] > 0 ) {
-      $method = "_border_" . $bp["left"]["style"];
-      $this->$method($x, $y, $h, $bp["left"]["color"], $widths, "left");
+        $method = "_border_" . $bp["left"]["style"];
+        $this->$method($x, $y, $h, $bp["left"]["color"], $widths, "left");
     }
     
     // Draw the top & bottom borders
     if ( $bp["top"]["style"] !== "none" && $widths[0] > 0 ) {
-      $method = "_border_" . $bp["top"]["style"];
-      $this->$method($x, $y, $w, $bp["top"]["color"], $widths, "top");
+        $method = "_border_" . $bp["top"]["style"];
+        $this->$method($x, $y, $w, $bp["top"]["color"], $widths, "top");
     }
     
     if ( $bp["bottom"]["style"] !== "none" && $widths[2] > 0 ) {
-      $method = "_border_" . $bp["bottom"]["style"];
-      $this->$method($x, $y + $h, $w, $bp["bottom"]["color"], $widths, "bottom");
+        $method = "_border_" . $bp["bottom"]["style"];
+        $this->$method($x, $y + $h, $w, $bp["bottom"]["color"], $widths, "bottom");
     }
 
     //    pre_var_dump(get_class($frame->get_next_sibling()));
     //    $last_row = get_class($frame->get_next_sibling()) !== 'Inline_Frame_Decorator';
     // Draw the right border if this is the last row
     if ( $bp["right"]["style"] !== "none" && $widths[1] > 0 ) {
-      $method = "_border_" . $bp["right"]["style"];
-      $this->$method($x + $w, $y, $h, $bp["right"]["color"], $widths, "right");
+        $method = "_border_" . $bp["right"]["style"];
+        $this->$method($x + $w, $y, $h, $bp["right"]["color"], $widths, "right");
     }
 
     // Handle anchors & links
     if ( $frame->get_node()->nodeName === "a" ) {
 
-      if ( $name = $frame->get_node()->getAttribute("name") )
+        if ( $name = $frame->get_node()->getAttribute("name") )
         $this->_canvas->add_named_dest($name);
 
-      if ( $href = $frame->get_node()->getAttribute("href") )
+        if ( $href = $frame->get_node()->getAttribute("href") )
         $this->_canvas->add_link($href, $x, $y, $w, $h);
     }
-  }
+    }
 }

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

Indentation +64 added lines, -64 removed lines

@@ -61,25 +61,25 @@ 
  */
 class Image_Cache {
 
-  /**
-   * Array of downloaded images.  Cached so that identical images are
-   * not needlessly downloaded.
-   *
-   * @var array
-   */
-  static protected $_cache = array();
-
-
-  /**
-   * Resolve and fetch an image for use.
-   *
-   * @param string $url        The url of the image
-   * @param string $proto      Default protocol if none specified in $url
-   * @param string $host       Default host if none specified in $url
-   * @param string $base_path  Default path if none specified in $url
-   * @return array             An array with two elements: The local path to the image and the image extension
-   */
-  static function resolve_url($url, $proto, $host, $base_path) {
+    /**
+     * Array of downloaded images.  Cached so that identical images are
+     * not needlessly downloaded.
+     *
+     * @var array
+     */
+    static protected $_cache = array();
+
+
+    /**
+     * Resolve and fetch an image for use.
+     *
+     * @param string $url        The url of the image
+     * @param string $proto      Default protocol if none specified in $url
+     * @param string $host       Default host if none specified in $url
+     * @param string $base_path  Default path if none specified in $url
+     * @return array             An array with two elements: The local path to the image and the image extension
+     */
+    static function resolve_url($url, $proto, $host, $base_path) {
     global $_dompdf_warnings;
 
     $parsed_url = explode_url($url);
@@ -94,23 +94,23 @@ 
     $remote = $remote || ($parsed_url['protocol'] != "");
 
     if ( !DOMPDF_ENABLE_REMOTE && $remote ) {
-      $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
-      $ext = "png";
+        $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
+        $ext = "png";
 
-      //debugpng
-      if ($DEBUGPNG) $full_url_dbg = '(blockedremote)';
+        //debugpng
+        if ($DEBUGPNG) $full_url_dbg = '(blockedremote)';
 
     } else if ( DOMPDF_ENABLE_REMOTE && $remote ) {
-      // Download remote files to a temporary directory
-      $full_url = build_url($proto, $host, $base_path, $url);
+        // Download remote files to a temporary directory
+        $full_url = build_url($proto, $host, $base_path, $url);
 
-      if ( isset(self::$_cache[$full_url]) ) {
+        if ( isset(self::$_cache[$full_url]) ) {
         list($resolved_url,$ext) = self::$_cache[$full_url];
 
         //debugpng
         if ($DEBUGPNG) $full_url_dbg = $full_url.'(cache)';
 
-      } else {
+        } else {
 
         $resolved_url = tempnam(DOMPDF_TEMP_DIR, "ca_dompdf_img_");
         //debugpng
@@ -121,21 +121,21 @@ 
         restore_error_handler();
 
         if ( strlen($image) == 0 ) {
-          //target image not found
-          $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
-          $ext = "png";
+            //target image not found
+            $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
+            $ext = "png";
 
-          //debugpng
-          if ($DEBUGPNG) $full_url_dbg = $full_url.'(missing)';
+            //debugpng
+            if ($DEBUGPNG) $full_url_dbg = $full_url.'(missing)';
 
         } else {
 
         file_put_contents($resolved_url, $image);
 
-		//e.g. fetch.php?media=url.jpg&cache=1
-		//- Image file name might be one of the dynamic parts of the url, don't strip off!
-		//  if ( preg_match("/.*\.(\w+)/",$url,$match) ) $ext = $match[1];
-		//- a remote url does not need to have a file extension at all
+        //e.g. fetch.php?media=url.jpg&cache=1
+        //- Image file name might be one of the dynamic parts of the url, don't strip off!
+        //  if ( preg_match("/.*\.(\w+)/",$url,$match) ) $ext = $match[1];
+        //- a remote url does not need to have a file extension at all
         //- local cached file does not have a matching file extension
         //Therefore get image type from the content
 
@@ -146,33 +146,33 @@ 
         $imagetypes = array('','gif','jpeg','png','swf');
         $ext = $imagetypes[$imagedim[2]];
         if ( rename($resolved_url,$resolved_url.'.'.$ext) ) {
-          $resolved_url .= '.'.$ext;
+            $resolved_url .= '.'.$ext;
         }
  
- 		//Don't put replacement image into cache - otherwise it will be deleted on cache cleanup.
- 		//Only execute on successfull caching of remote image.
+            //Don't put replacement image into cache - otherwise it will be deleted on cache cleanup.
+            //Only execute on successfull caching of remote image.
         self::$_cache[$full_url] = array($resolved_url,$ext);
 
         } else {
-          //target image is not valid.
-          unlink($resolved_url);
+            //target image is not valid.
+            unlink($resolved_url);
           
-          $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
-          $ext = "png";
+            $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
+            $ext = "png";
         }
         }
 
-      }
+        }
 
     } else {
 
-      $resolved_url = build_url($proto, $host, $base_path, $url);
-      if ($DEBUGPNG) print 'build_url('.$proto.','.$host.','.$base_path.','.$url.')('.$resolved_url.')';
+        $resolved_url = build_url($proto, $host, $base_path, $url);
+        if ($DEBUGPNG) print 'build_url('.$proto.','.$host.','.$base_path.','.$url.')('.$resolved_url.')';
 
-      if ( !preg_match("/.*\.(\w+)/",$url,$match) ) {
+        if ( !preg_match("/.*\.(\w+)/",$url,$match) ) {
         //debugpng
         if ($DEBUGPNG) print '[resolve_url exception '.$url.']';
-          throw new DOMPDF_Exception("Unknown image type: $url.");
+            throw new DOMPDF_Exception("Unknown image type: $url.");
         }
 
         $ext = $match[1];
@@ -184,35 +184,35 @@ 
 
     if ( !is_readable($resolved_url) || !filesize($resolved_url) ) {
 
-      //debugpng
-      if ($DEBUGPNG) $full_url_dbg .= '(nocache'.$resolved_url.')';
+        //debugpng
+        if ($DEBUGPNG) $full_url_dbg .= '(nocache'.$resolved_url.')';
 
-      $_dompdf_warnings[] = "File " .$resolved_url . " is not readable or is an empty file.\n";
-      $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
-      $ext = "png";
+        $_dompdf_warnings[] = "File " .$resolved_url . " is not readable or is an empty file.\n";
+        $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
+        $ext = "png";
     }
 
     //debugpng
     if ($DEBUGPNG) print '[resolve_url '.$url.'|'.$full_url_dbg.'|'.$resolved_url.'|'.$ext.']';
 
     return array($resolved_url, $ext);
-  }
+    }
 
-  /**
-   * Unlink all cached images (i.e. temporary images either downloaded
-   * or converted)
-   */
-  static function clear() {
+    /**
+     * Unlink all cached images (i.e. temporary images either downloaded
+     * or converted)
+     */
+    static function clear() {
     if ( count(self::$_cache) ) {
-      while ($entry = array_shift(self::$_cache)) {
+        while ($entry = array_shift(self::$_cache)) {
         list($file, $ext) = $entry;
         //debugpng
         if (DEBUGPNG) print '[clear unlink '.$file.']';
         if (!DEBUGKEEPTEMP)
-          //XXX: Should we have some kind of fallback or warning if unlink() fails?
-          unlink($file);
-      }
+            //XXX: Should we have some kind of fallback or warning if unlink() fails?
+            unlink($file);
+        }
+    }
     }
-  }
 
 }