chamilo / chamilo-lms

main/inc/lib/fileManage.lib.php

Indentation +231 added lines, -232 removed lines

@@ -170,37 +170,37 @@ 
  */
 function my_rename($file_path, $new_file_name) {
 
-	$save_dir = getcwd();
-	$path = dirname($file_path);
-	$old_file_name = basename($file_path);
-	$new_file_name = api_replace_dangerous_char($new_file_name);
-
-	// If no extension, take the old one
-	if ((strpos($new_file_name, '.') === false) && ($dotpos = strrpos($old_file_name, '.'))) {
-		$new_file_name .= substr($old_file_name, $dotpos);
-	}
-
-	// Note: still possible: 'xx.yy' -rename-> '.yy' -rename-> 'zz'
-	// This is useful for folder names, where otherwise '.' would be sticky
-
-	// Extension PHP is not allowed, change to PHPS
-	$new_file_name = php2phps($new_file_name);
-
-	if ($new_file_name == $old_file_name) {
-		return $old_file_name;
-	}
-
-	if (strtolower($new_file_name) != strtolower($old_file_name) && check_name_exist($path.'/'.$new_file_name)) {
-		return false;
-	}
-	// On a Windows server, it would be better not to do the above check
-	// because it succeeds for some new names resembling the old name.
-	// But on Unix/Linux the check must be done because rename overwrites.
-
-	chdir($path);
-	$res = rename($old_file_name, $new_file_name) ? $new_file_name : false;
-	chdir($save_dir);
-	return $res;
+    $save_dir = getcwd();
+    $path = dirname($file_path);
+    $old_file_name = basename($file_path);
+    $new_file_name = api_replace_dangerous_char($new_file_name);
+
+    // If no extension, take the old one
+    if ((strpos($new_file_name, '.') === false) && ($dotpos = strrpos($old_file_name, '.'))) {
+        $new_file_name .= substr($old_file_name, $dotpos);
+    }
+
+    // Note: still possible: 'xx.yy' -rename-> '.yy' -rename-> 'zz'
+    // This is useful for folder names, where otherwise '.' would be sticky
+
+    // Extension PHP is not allowed, change to PHPS
+    $new_file_name = php2phps($new_file_name);
+
+    if ($new_file_name == $old_file_name) {
+        return $old_file_name;
+    }
+
+    if (strtolower($new_file_name) != strtolower($old_file_name) && check_name_exist($path.'/'.$new_file_name)) {
+        return false;
+    }
+    // On a Windows server, it would be better not to do the above check
+    // because it succeeds for some new names resembling the old name.
+    // But on Unix/Linux the check must be done because rename overwrites.
+
+    chdir($path);
+    $res = rename($old_file_name, $new_file_name) ? $new_file_name : false;
+    chdir($save_dir);
+    return $res;
 }
 
 /**
@@ -217,38 +217,38 @@ 
  */
 function move($source, $target, $forceMove = false, $moveContent = false)
 {
-	if (check_name_exist($source)) {
-		$file_name = basename($source);
+    if (check_name_exist($source)) {
+        $file_name = basename($source);
         $isWindowsOS = api_is_windows_os();
         $canExec = function_exists('exec');
 
-		/* File case */
-		if (is_file($source)) {
-			if ($forceMove && !$isWindowsOS && $canExec) {
-				exec('mv ' . $source . ' ' . $target . '/' . $file_name);
-			} else {
-				copy($source, $target . '/' . $file_name);
-				unlink($source);
-			}
-			return true;
-		} elseif (is_dir($source)) {
-			/* Directory */
-			if ($forceMove && !$isWindowsOS && $canExec) {
-				if ($moveContent) {
-					$base = basename($source);
-					exec('mv '.$source.'/* '.$target.$base.'/');
-					exec('rm -rf '.$source);
-				} else {
-					exec('mv $source $target');
-				}
-			} else {
-				copyDirTo($source, $target);
-			}
-			return true;
-		}
-	} else {
-		return false;
-	}
+        /* File case */
+        if (is_file($source)) {
+            if ($forceMove && !$isWindowsOS && $canExec) {
+                exec('mv ' . $source . ' ' . $target . '/' . $file_name);
+            } else {
+                copy($source, $target . '/' . $file_name);
+                unlink($source);
+            }
+            return true;
+        } elseif (is_dir($source)) {
+            /* Directory */
+            if ($forceMove && !$isWindowsOS && $canExec) {
+                if ($moveContent) {
+                    $base = basename($source);
+                    exec('mv '.$source.'/* '.$target.$base.'/');
+                    exec('rm -rf '.$source);
+                } else {
+                    exec('mv $source $target');
+                }
+            } else {
+                copyDirTo($source, $target);
+            }
+            return true;
+        }
+    } else {
+        return false;
+    }
 }
 
 /**
@@ -261,54 +261,54 @@ 
  */
 function copyDirTo($orig_dir_path, $destination, $move = true)
 {
-	if ($orig_dir_path == $destination) {
-		return false;
-	}
+    if ($orig_dir_path == $destination) {
+        return false;
+    }
 
-	$save_dir = getcwd();
-	// Extract directory name - create it at destination - update destination trail
-	$dir_name = basename($orig_dir_path);
+    $save_dir = getcwd();
+    // Extract directory name - create it at destination - update destination trail
+    $dir_name = basename($orig_dir_path);
     $dir_to_copy = array();
-	if (is_dir($orig_dir_path)) {
-		if (!is_dir($destination.'/'.$dir_name)) {
-			mkdir(
-				$destination.'/'.$dir_name,
-				api_get_permissions_for_new_directories()
-			);
-		}
-		$destination_trail = $destination.'/'.$dir_name;
-		if (is_dir($destination)) {
-			chdir($orig_dir_path) ;
-			$handle = opendir($orig_dir_path);
-
-			while ($element = readdir($handle)) {
-				if ($element == '.' || $element == '..') {
-					continue; // Skip the current and parent directories
-				} elseif (is_file($element)) {
-					copy($element, $destination_trail.'/'.$element);
-
-					if ($move) {
-						unlink($element) ;
-					}
-				} elseif (is_dir($element)) {
-					$dir_to_copy[] = $orig_dir_path.'/'.$element;
-				}
-			}
-
-			closedir($handle) ;
-
-			if (sizeof($dir_to_copy) > 0) {
-				foreach ($dir_to_copy as $this_dir) {
-					copyDirTo($this_dir, $destination_trail, $move); // Recursivity
-				}
-			}
-
-			if ($move) {
-				rmdir($orig_dir_path) ;
-			}
-			chdir($save_dir);
-		}
-	}
+    if (is_dir($orig_dir_path)) {
+        if (!is_dir($destination.'/'.$dir_name)) {
+            mkdir(
+                $destination.'/'.$dir_name,
+                api_get_permissions_for_new_directories()
+            );
+        }
+        $destination_trail = $destination.'/'.$dir_name;
+        if (is_dir($destination)) {
+            chdir($orig_dir_path) ;
+            $handle = opendir($orig_dir_path);
+
+            while ($element = readdir($handle)) {
+                if ($element == '.' || $element == '..') {
+                    continue; // Skip the current and parent directories
+                } elseif (is_file($element)) {
+                    copy($element, $destination_trail.'/'.$element);
+
+                    if ($move) {
+                        unlink($element) ;
+                    }
+                } elseif (is_dir($element)) {
+                    $dir_to_copy[] = $orig_dir_path.'/'.$element;
+                }
+            }
+
+            closedir($handle) ;
+
+            if (sizeof($dir_to_copy) > 0) {
+                foreach ($dir_to_copy as $this_dir) {
+                    copyDirTo($this_dir, $destination_trail, $move); // Recursivity
+                }
+            }
+
+            if ($move) {
+                rmdir($orig_dir_path) ;
+            }
+            chdir($save_dir);
+        }
+    }
 }
 
 
@@ -319,8 +319,8 @@ 
  * @param 	string	$filename 		filename
  */
 function getextension($filename) {
-	$bouts = explode('.', $filename);
-	return array(array_pop($bouts), implode('.', $bouts));
+    $bouts = explode('.', $filename);
+    return array(array_pop($bouts), implode('.', $bouts));
 }
 
 /**
@@ -331,19 +331,19 @@ 
  * @param 	boolean $recursive if true , include subdir in total
  */
 function dirsize($root, $recursive = true) {
-	$dir = @opendir($root);
-	$size = 0;
-	while ($file = @readdir($dir)) {
-		if (!in_array($file, array('.', '..'))) {
-			if (is_dir($root.'/'.$file)) {
-				$size += $recursive ? dirsize($root.'/'.$file) : 0;
-			} else {
-				$size += @filesize($root.'/'.$file);
-			}
-		}
-	}
-	@closedir($dir);
-	return $size;
+    $dir = @opendir($root);
+    $size = 0;
+    while ($file = @readdir($dir)) {
+        if (!in_array($file, array('.', '..'))) {
+            if (is_dir($root.'/'.$file)) {
+                $size += $recursive ? dirsize($root.'/'.$file) : 0;
+            } else {
+                $size += @filesize($root.'/'.$file);
+            }
+        }
+    }
+    @closedir($dir);
+    return $size;
 }
 
 /*	CLASS FileManager */
@@ -362,7 +362,7 @@ 
 */
 class FileManager
 {
-	/**
+    /**
 		Returns a list of all directories, except the base dir,
 		of the current course. This function uses recursion.
 
@@ -370,131 +370,130 @@ 
 
 		@author Roan Embrechts
 		@version 1.0.1
-	*/
-	function list_all_directories($path)
+     */
+    function list_all_directories($path)
     {
-		$result_array = array();
-		if (is_dir($path)) {
-			$save_dir = getcwd();
-			chdir($path);
-			$handle = opendir($path);
-			while ($element = readdir($handle)) {
-				if ($element == '.' || $element == '..') continue;
+        $result_array = array();
+        if (is_dir($path)) {
+            $save_dir = getcwd();
+            chdir($path);
+            $handle = opendir($path);
+            while ($element = readdir($handle)) {
+                if ($element == '.' || $element == '..') continue;
                 // Skip the current and parent directories
-				if (is_dir($element)) {
-					$dir_array[] = $path.'/'.$element;
-				}
-			}
-			closedir($handle);
-			// Recursive operation if subdirectories exist
-			$dir_number = sizeof($dir_array);
-			if ($dir_number > 0) {
-				for ($i = 0 ; $i < $dir_number ; $i++) {
-					$sub_dir_array = FileManager::list_all_directories($dir_array[$i]); // Function recursivity
-					if (is_array($dir_array) && is_array($sub_dir_array)) {
-						$dir_array  =  array_merge($dir_array, $sub_dir_array); // Data merge
-					}
-				}
-			}
-			$result_array  =  $dir_array;
-			chdir($save_dir) ;
-		}
-		return $result_array ;
-	}
-
-	/**
+                if (is_dir($element)) {
+                    $dir_array[] = $path.'/'.$element;
+                }
+            }
+            closedir($handle);
+            // Recursive operation if subdirectories exist
+            $dir_number = sizeof($dir_array);
+            if ($dir_number > 0) {
+                for ($i = 0 ; $i < $dir_number ; $i++) {
+                    $sub_dir_array = FileManager::list_all_directories($dir_array[$i]); // Function recursivity
+                    if (is_array($dir_array) && is_array($sub_dir_array)) {
+                        $dir_array  =  array_merge($dir_array, $sub_dir_array); // Data merge
+                    }
+                }
+            }
+            $result_array  =  $dir_array;
+            chdir($save_dir) ;
+        }
+        return $result_array ;
+    }
+
+    /**
 		This function receives a list of directories.
 		It returns a list of all files in these directories
 
 		@author Roan Embrechts
 		@version 1.0
-	*/
-	function list_all_files($dir_array)
+     */
+    function list_all_files($dir_array)
     {
-		$element_array = array();
-		if (is_dir($dir_array)) {
-
-			$save_dir = getcwd();
-			foreach ($dir_array as $directory) {
-				chdir($directory);
-				$handle = opendir($directory);
-			   	while ($element = readdir($handle)) {
-					if ($element == '.' || $element == '..' || $element == '.htaccess') continue;
+        $element_array = array();
+        if (is_dir($dir_array)) {
+
+            $save_dir = getcwd();
+            foreach ($dir_array as $directory) {
+                chdir($directory);
+                $handle = opendir($directory);
+                    while ($element = readdir($handle)) {
+                    if ($element == '.' || $element == '..' || $element == '.htaccess') continue;
                     // Skip the current and parent directories
-					if (!is_dir($element)) {
-						$element_array[] = $directory.'/'.$element;
-					}
-				}
-				closedir($handle);
-				chdir('..');
-				chdir($save_dir);
-			}
-		}
-
-		return $element_array;
-	}
-
-	/**
+                    if (!is_dir($element)) {
+                        $element_array[] = $directory.'/'.$element;
+                    }
+                }
+                closedir($handle);
+                chdir('..');
+                chdir($save_dir);
+            }
+        }
+
+        return $element_array;
+    }
+
+    /**
 		Loads contents of file $filename into memory and returns them as a string.
 		Function kept for compatibility with older PHP versions.
 		Function is binary safe (is needed on Windows)
-	*/
-	function compat_load_file($file_name)
+     */
+    function compat_load_file($file_name)
     {
-		$buffer = '';
-		if (file_exists($file_name)) {
-			$fp = fopen($file_name, 'rb');
-			$buffer = fread ($fp, filesize($file_name));
-			fclose ($fp);
-		}
-		return $buffer;
-	}
-
-	/**
-	 * Adds file/folder to document table in database
-	 * improvement from set_default_settings (see below):
-	 * take all info from function parameters
-	 * no global variables needed
-	 *
-	 * NOTE $glued_table should already have backticks around it
-	 * (get it from the database library, and it is done automatically)
-	 *
-	 * @param	path, filename, filetype,
-				$glued_table, default_visibility
+        $buffer = '';
+        if (file_exists($file_name)) {
+            $fp = fopen($file_name, 'rb');
+            $buffer = fread ($fp, filesize($file_name));
+            fclose ($fp);
+        }
+        return $buffer;
+    }
 
-	 * action:	Adds an entry to the document table with the default settings.
-	 * @author	Olivier Cauberghe <olivier.cauberghe@ugent.be>
-	 * @author	Roan Embrechts
-	 * @version 1.2
-	 */
-	function set_default_settings($upload_path, $filename, $filetype = 'file', $glued_table, $default_visibility = 'v')
+    /**
+     * Adds file/folder to document table in database
+     * improvement from set_default_settings (see below):
+     * take all info from function parameters
+     * no global variables needed
+     *
+     * NOTE $glued_table should already have backticks around it
+     * (get it from the database library, and it is done automatically)
+     *
+     * @param	path, filename, filetype,
+				$glued_table, default_visibility
+     * action:	Adds an entry to the document table with the default settings.
+     * @author	Olivier Cauberghe <olivier.cauberghe@ugent.be>
+     * @author	Roan Embrechts
+     * @version 1.2
+     */
+    function set_default_settings($upload_path, $filename, $filetype = 'file', $glued_table, $default_visibility = 'v')
     {
-		if (!$default_visibility) $default_visibility = 'v';
-
-		// Make sure path is not wrongly formed
-		$upload_path = !empty($upload_path) ? "/$upload_path" : '';
-
-		$endchar = substr($filename, strlen($filename) - 1, 1);
-		if ($endchar == "\\" || $endchar == '/') {
-			$filename = substr($filename, 0, strlen($filename) - 1);
-		}
-
-		$full_file_name = $upload_path.'/'.$filename;
-		$full_file_name = str_replace("//", '/', $full_file_name);
-
-		$sql_query = "SELECT count(*) as number_existing FROM $glued_table WHERE path='$full_file_name'";
-		$sql_result = Database::query($sql_query);
-		$result = Database::fetch_array($sql_result);
-		// Determine which query to execute
-		if ($result['number_existing'] > 0) {
-			// Entry exists, update
-			$query = "UPDATE $glued_table SET path='$full_file_name',visibility='$default_visibility', filetype='$filetype'
+        if (!$default_visibility) $default_visibility = 'v';
+
+        // Make sure path is not wrongly formed
+        $upload_path = !empty($upload_path) ? "/$upload_path" : '';
+
+        $endchar = substr($filename, strlen($filename) - 1, 1);
+        if ($endchar == "\\" || $endchar == '/') {
+            $filename = substr($filename, 0, strlen($filename) - 1);
+        }
+
+        $full_file_name = $upload_path.'/'.$filename;
+        $full_file_name = str_replace("//", '/', $full_file_name);
+
+        $sql_query = "SELECT count(*) as number_existing FROM $glued_table WHERE path='$full_file_name'";
+        $sql_result = Database::query($sql_query);
+        $result = Database::fetch_array($sql_result);
+        // Determine which query to execute
+        if ($result['number_existing'] > 0) {
+            // Entry exists, update
+            $query = "UPDATE $glued_table SET path='$full_file_name',visibility='$default_visibility', filetype='$filetype'
 			          WHERE path='$full_file_name'";
-		} else {
-			// No entry exists, create new one
-			$query = "INSERT INTO $glued_table (path,visibility,filetype)
+        } else {
+            // No entry exists, create new one
+            $query = "INSERT INTO $glued_table (path,visibility,filetype)
 			          VALUES ('$full_file_name','$default_visibility','$filetype')";
-		}
-		Database::query($query);
-	}
+        }
+        Database::query($query);
+    }
 }

plugin/ticket/src/assign_tickets.php

Indentation +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 api_protect_course_script();
 if (!api_is_allowed_to_edit()) {
-	api_not_allowed();
+    api_not_allowed();
 }
 $course_info = api_get_course_info();
 $course_code = $course_info['code'];

plugin/openmeetings/lib/openmeetings.class.php

Indentation +6 added lines, -6 removed lines

@@ -126,7 +126,7 @@ 
             return false;
         }
     }
-    */
+     */
 
     /*
      * Creating a Room for the meeting
@@ -256,10 +256,10 @@ 
         return true;
     }
 
-     /**
-     * Gets the password for a specific meeting for the current user
-     * @return string A moderator password if user is teacher, or the course code otherwise
-     */
+        /**
+         * Gets the password for a specific meeting for the current user
+         * @return string A moderator password if user is teacher, or the course code otherwise
+         */
     public function getMeetingUserPassword()
     {
         if ($this->isTeacher()) {
@@ -538,7 +538,7 @@ 
     //
     //            }
     //
-                 //$item['created_at'] = api_convert_and_format_date($meetingDb['created_at']);
+                    //$item['created_at'] = api_convert_and_format_date($meetingDb['created_at']);
     //            //created_at
     //
     //            $item['publish_url'] = api_get_self().'?action=publish&id='.$meetingDb['id'];

plugin/dashboard/block_session/block_session.class.php

Indentation +72 added lines, -72 removed lines

@@ -15,36 +15,36 @@ 
 class BlockSession extends Block
 {
     private $user_id;
-	private $sessions;
-	private $path;
-	private $permission = array(DRH, SESSIONADMIN);
+    private $sessions;
+    private $path;
+    private $permission = array(DRH, SESSIONADMIN);
 
-	/**
-	 * Constructor
-	 */
+    /**
+     * Constructor
+     */
     public function __construct ($user_id)
     {
-    	$this->user_id 	= $user_id;
-    	$this->path = 'block_session';
-    	if ($this->is_block_visible_for_user($user_id)) {
+        $this->user_id 	= $user_id;
+        $this->path = 'block_session';
+        if ($this->is_block_visible_for_user($user_id)) {
             $this->sessions = SessionManager::get_sessions_followed_by_drh($user_id);
-    	}
+        }
     }
 
-	/**
-	 * This method check if a user is allowed to see the block inside dashboard interface
-	 * @param	int		User id
-	 * @return	bool	Is block visible for user
-	 */
+    /**
+     * This method check if a user is allowed to see the block inside dashboard interface
+     * @param	int		User id
+     * @return	bool	Is block visible for user
+     */
     public function is_block_visible_for_user($user_id)
     {
-    	$user_info = api_get_user_info($user_id);
-		$user_status = $user_info['status'];
-		$is_block_visible_for_user = false;
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
-    		$is_block_visible_for_user = true;
-    	}
-    	return $is_block_visible_for_user;
+        $user_info = api_get_user_info($user_id);
+        $user_status = $user_info['status'];
+        $is_block_visible_for_user = false;
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
+            $is_block_visible_for_user = true;
+        }
+        return $is_block_visible_for_user;
     }
 
     /**
@@ -55,14 +55,14 @@ 
     public function get_block()
     {
 
-		global $charset;
+        global $charset;
 
-    	$column = 2;
-    	$data   = array();
+        $column = 2;
+        $data   = array();
 
-		$content = $this->get_content_html();
+        $content = $this->get_content_html();
 
-		$content_html = '
+        $content_html = '
 			            <div class="panel panel-default" id="intro">
 			                <div class="panel-heading">
 			                    '.get_lang('SessionsInformation').'
@@ -76,78 +76,78 @@ 
 			            </div>
 				';
 
-    	$data['column'] = $column;
-    	$data['content_html'] = $content_html;
+        $data['column'] = $column;
+        $data['content_html'] = $content_html;
 
-    	return $data;
+        return $data;
     }
 
     /**
- 	 * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
- 	 * @return string  content html
- 	 */
+     * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
+     * @return string  content html
+     */
     public function get_content_html()
     {
 
- 		$content = '';
-		$sessions = $this->sessions;
+            $content = '';
+        $sessions = $this->sessions;
 
-		//$content = '<div style="margin:10px;">';
-		$content .= '<h4>'.get_lang('YourSessionsList').'</h4>';
+        //$content = '<div style="margin:10px;">';
+        $content .= '<h4>'.get_lang('YourSessionsList').'</h4>';
 
-		if (count($sessions) > 0) {
-			$sessions_table = '<table class="data_table" width:"95%">';
- 			$sessions_table .= '<tr>
+        if (count($sessions) > 0) {
+            $sessions_table = '<table class="data_table" width:"95%">';
+                $sessions_table .= '<tr>
 									<th >'.get_lang('Title').'</th>
 									<th >'.get_lang('Date').'</th>
 									<th width="100px">'.get_lang('NbCoursesPerSession').'</th>
 								</tr>';
-			$i = 1;
-			foreach ($sessions as $session) {
+            $i = 1;
+            foreach ($sessions as $session) {
 
-				$session_id = intval($session['id']);
-				$title = $session['name'];
+                $session_id = intval($session['id']);
+                $title = $session['name'];
 
-				if ($session['access_start_date'] != '0000-00-00 00:00:00' && $session['access_end_date'] != '0000-00-00 00:00:00') {
-					$date = get_lang('From').' '.api_convert_and_format_date($session['access_start_date'], DATE_FORMAT_SHORT, date_default_timezone_get()).' '.get_lang('To').' '.api_convert_and_format_date($session['access_end_date'], DATE_FORMAT_SHORT, date_default_timezone_get());
-				} else {
-					$date = ' - ';
-				}
+                if ($session['access_start_date'] != '0000-00-00 00:00:00' && $session['access_end_date'] != '0000-00-00 00:00:00') {
+                    $date = get_lang('From').' '.api_convert_and_format_date($session['access_start_date'], DATE_FORMAT_SHORT, date_default_timezone_get()).' '.get_lang('To').' '.api_convert_and_format_date($session['access_end_date'], DATE_FORMAT_SHORT, date_default_timezone_get());
+                } else {
+                    $date = ' - ';
+                }
 
-	 			$count_courses_in_session = count(Tracking::get_courses_list_from_session($session_id));
+                    $count_courses_in_session = count(Tracking::get_courses_list_from_session($session_id));
 
-				if ($i%2 == 0) $class_tr = 'row_odd';
-	    		else $class_tr = 'row_even';
+                if ($i%2 == 0) $class_tr = 'row_odd';
+                else $class_tr = 'row_even';
 
-				$sessions_table .= '<tr class="'.$class_tr.'">
+                $sessions_table .= '<tr class="'.$class_tr.'">
 										<td>'.$title.'</td>
 										<td align="center">'.$date.'</td>
 										<td align="center">'.$count_courses_in_session.'</td>
 								   </tr>';
-				$i++;
-			}
-			$sessions_table .= '</table>';
-			$content .= $sessions_table;
-		} else {
-			$content .= get_lang('ThereIsNoInformationAboutYourSessions');
-		}
+                $i++;
+            }
+            $sessions_table .= '</table>';
+            $content .= $sessions_table;
+        } else {
+            $content .= get_lang('ThereIsNoInformationAboutYourSessions');
+        }
 
-		if (count($sessions) > 0) {
-			$content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/session.php">'.get_lang('SeeMore').'</a></div>';
-		}
+        if (count($sessions) > 0) {
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/session.php">'.get_lang('SeeMore').'</a></div>';
+        }
 
-		//$content .= '</div>';
+        //$content .= '</div>';
 
- 		return $content;
- 	}
+            return $content;
+        }
 
     /**
-	 * Get number of sessions
-	 * @return int
-	 */
-	function get_number_of_sessions()
+     * Get number of sessions
+     * @return int
+     */
+    function get_number_of_sessions()
     {
-		return count($this->sessions);
-	}
+        return count($this->sessions);
+    }
 
 }

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

Indentation +57 added lines, -57 removed lines

@@ -43,70 +43,70 @@
  */
 class LoggerAppenderConsole extends LoggerAppender {
 
-	const STDOUT = 'php://stdout';
-	const STDERR = 'php://stderr';
+    const STDOUT = 'php://stdout';
+    const STDERR = 'php://stderr';
 
-	/**
-	 * Can be 'php://stdout' or 'php://stderr'. But it's better to use keywords <b>STDOUT</b> and <b>STDERR</b> (case insensitive). 
-	 * Default is STDOUT
-	 * @var string	  
-	 */
-	private $target = self::STDOUT;
+    /**
+     * Can be 'php://stdout' or 'php://stderr'. But it's better to use keywords <b>STDOUT</b> and <b>STDERR</b> (case insensitive). 
+     * Default is STDOUT
+     * @var string	  
+     */
+    private $target = self::STDOUT;
 	
-	/**
-	 * @var boolean
-	 * @access private	   
-	 */
-	protected $requiresLayout = true;
+    /**
+     * @var boolean
+     * @access private	   
+     */
+    protected $requiresLayout = true;
 
-	/**
-	 * @var mixed the resource used to open stdout/stderr
-	 * @access private	   
-	 */
-	protected $fp = null;
+    /**
+     * @var mixed the resource used to open stdout/stderr
+     * @access private	   
+     */
+    protected $fp = null;
 
-	public function __destruct() {
-       $this->close();
-   	}
+    public function __destruct() {
+        $this->close();
+        }
    	
-	/**
-	 * Set console target.
-	 * @param mixed $value a constant or a string
-	 */
-	public function setTarget($value) {
-		$v = trim($value);
-		if ($v == self::STDOUT || strtoupper($v) == 'STDOUT') {
-			$this->target = self::STDOUT;
-		} elseif ($v == self::STDERR || strtoupper($v) == 'STDERR') {
-			$this->target = self::STDERR;
-		} 
-	}
+    /**
+     * Set console target.
+     * @param mixed $value a constant or a string
+     */
+    public function setTarget($value) {
+        $v = trim($value);
+        if ($v == self::STDOUT || strtoupper($v) == 'STDOUT') {
+            $this->target = self::STDOUT;
+        } elseif ($v == self::STDERR || strtoupper($v) == 'STDERR') {
+            $this->target = self::STDERR;
+        } 
+    }
 
-	public function activateOptions() {
-		$this->fp = fopen($this->target, 'w');
-		if(is_resource($this->fp) && $this->layout !== null) {
-			fwrite($this->fp, $this->layout->getHeader());
-		}
-		$this->closed = (bool)is_resource($this->fp) === false; 
-	}
+    public function activateOptions() {
+        $this->fp = fopen($this->target, 'w');
+        if(is_resource($this->fp) && $this->layout !== null) {
+            fwrite($this->fp, $this->layout->getHeader());
+        }
+        $this->closed = (bool)is_resource($this->fp) === false; 
+    }
 	
-	/**
-	 * @see LoggerAppender::close()
-	 */
-	public function close() {
-		if($this->closed != true) {
-			if (is_resource($this->fp) && $this->layout !== null) {
-				fwrite($this->fp, $this->layout->getFooter());
-				fclose($this->fp);
-			}
-			$this->closed = true;
-		}			 
-	}
+    /**
+     * @see LoggerAppender::close()
+     */
+    public function close() {
+        if($this->closed != true) {
+            if (is_resource($this->fp) && $this->layout !== null) {
+                fwrite($this->fp, $this->layout->getFooter());
+                fclose($this->fp);
+            }
+            $this->closed = true;
+        }			 
+    }
 
-	public function append(LoggerLoggingEvent $event) {
-		if (is_resource($this->fp) && $this->layout !== null) {
-			fwrite($this->fp, $this->layout->format($event));
-		} 
-	}
+    public function append(LoggerLoggingEvent $event) {
+        if (is_resource($this->fp) && $this->layout !== null) {
+            fwrite($this->fp, $this->layout->format($event));
+        } 
+    }
 }
 

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

Indentation +206 added lines, -206 removed lines

@@ -26,236 +26,236 @@
  */
 abstract class LoggerAppender {
 	
-	/**
-	 * @var boolean closed appender flag
-	 */
-	protected $closed = false;
+    /**
+     * @var boolean closed appender flag
+     */
+    protected $closed = false;
 	
-	/**
-	 * The first filter in the filter chain
-	 * @var LoggerFilter
-	 */
-	protected $filter = null;
+    /**
+     * The first filter in the filter chain
+     * @var LoggerFilter
+     */
+    protected $filter = null;
 			
-	/**
-	 * LoggerLayout for this appender. It can be null if appender has its own layout
-	 * @var LoggerLayout
-	 */
-	protected $layout = null; 
+    /**
+     * LoggerLayout for this appender. It can be null if appender has its own layout
+     * @var LoggerLayout
+     */
+    protected $layout = null; 
 		   
-	/**
-	 * @var string Appender name
-	 */
-	protected $name;
+    /**
+     * @var string Appender name
+     */
+    protected $name;
 		   
-	/**
-	 * @var LoggerLevel There is no level threshold filtering by default.
-	 */
-	protected $threshold = null;
+    /**
+     * @var LoggerLevel There is no level threshold filtering by default.
+     */
+    protected $threshold = null;
 	
-	/**
-	 * @var boolean needs a layout formatting ?
-	 */
-	protected $requiresLayout = false;
+    /**
+     * @var boolean needs a layout formatting ?
+     */
+    protected $requiresLayout = false;
 	
-	/**
-	 * Constructor
-	 *
-	 * @param string $name appender name
-	 */
-	public function __construct($name = '') {
-		$this->name = $name;
-	}
+    /**
+     * Constructor
+     *
+     * @param string $name appender name
+     */
+    public function __construct($name = '') {
+        $this->name = $name;
+    }
 
-	/**
-	 * Add a filter to the end of the filter list.
-	 *
-	 * @param LoggerFilter $newFilter add a new LoggerFilter
-	 */
-	public function addFilter($newFilter) {
-		if($this->filter === null) {
-			$this->filter = $newFilter;
-		} else {
-			$this->filter->addNext($newFilter);
-		}
-	}
+    /**
+     * Add a filter to the end of the filter list.
+     *
+     * @param LoggerFilter $newFilter add a new LoggerFilter
+     */
+    public function addFilter($newFilter) {
+        if($this->filter === null) {
+            $this->filter = $newFilter;
+        } else {
+            $this->filter->addNext($newFilter);
+        }
+    }
 	
-	/**
-	 * Clear the list of filters by removing all the filters in it.
-	 * @abstract
-	 */
-	public function clearFilters() {
-		unset($this->filter);
-		$this->filter = null;
-	}
+    /**
+     * Clear the list of filters by removing all the filters in it.
+     * @abstract
+     */
+    public function clearFilters() {
+        unset($this->filter);
+        $this->filter = null;
+    }
 
-	/**
-	 * Return the first filter in the filter chain for this Appender. 
-	 * The return value may be <i>null</i> if no is filter is set.
-	 * @return LoggerFilter
-	 */
-	public function getFilter() {
-		return $this->filter;
-	} 
+    /**
+     * Return the first filter in the filter chain for this Appender. 
+     * The return value may be <i>null</i> if no is filter is set.
+     * @return LoggerFilter
+     */
+    public function getFilter() {
+        return $this->filter;
+    } 
 	
-	/** 
-	 * Return the first filter in the filter chain for this Appender. 
-	 * The return value may be <i>null</i> if no is filter is set.
-	 * @return LoggerFilter
-	 */
-	public function getFirstFilter() {
-		return $this->filter;
-	}
+    /** 
+     * Return the first filter in the filter chain for this Appender. 
+     * The return value may be <i>null</i> if no is filter is set.
+     * @return LoggerFilter
+     */
+    public function getFirstFilter() {
+        return $this->filter;
+    }
 	
 	
-	/**
-	 * This method performs threshold checks and invokes filters before
-	 * delegating actual logging to the subclasses specific <i>append()</i> method.
-	 * @see LoggerAppender::doAppend()
-	 * @param LoggerLoggingEvent $event
-	 */
-	public function doAppend(LoggerLoggingEvent $event) {
-		if($this->closed) {
-			return;
-		}
+    /**
+     * This method performs threshold checks and invokes filters before
+     * delegating actual logging to the subclasses specific <i>append()</i> method.
+     * @see LoggerAppender::doAppend()
+     * @param LoggerLoggingEvent $event
+     */
+    public function doAppend(LoggerLoggingEvent $event) {
+        if($this->closed) {
+            return;
+        }
 		
-		if(!$this->isAsSevereAsThreshold($event->getLevel())) {
-			return;
-		}
+        if(!$this->isAsSevereAsThreshold($event->getLevel())) {
+            return;
+        }
 
-		$f = $this->getFirstFilter();
-		while($f !== null) {
-			switch ($f->decide($event)) {
-				case LoggerFilter::DENY: return;
-				case LoggerFilter::ACCEPT: return $this->append($event);
-				case LoggerFilter::NEUTRAL: $f = $f->getNext();
-			}
-		}
-		$this->append($event);	  
-	}	 
+        $f = $this->getFirstFilter();
+        while($f !== null) {
+            switch ($f->decide($event)) {
+                case LoggerFilter::DENY: return;
+                case LoggerFilter::ACCEPT: return $this->append($event);
+                case LoggerFilter::NEUTRAL: $f = $f->getNext();
+            }
+        }
+        $this->append($event);	  
+    }	 
 
-	/**
-	 * Set the Layout for this appender.
-	 * @see LoggerAppender::setLayout()
-	 * @param LoggerLayout $layout
-	 */
-	public function setLayout($layout) {
-		if($this->requiresLayout()) {
-			$this->layout = $layout;
-		}
-	} 
+    /**
+     * Set the Layout for this appender.
+     * @see LoggerAppender::setLayout()
+     * @param LoggerLayout $layout
+     */
+    public function setLayout($layout) {
+        if($this->requiresLayout()) {
+            $this->layout = $layout;
+        }
+    } 
 	
-	/**
-	 * Returns this appender layout.
-	 * @see LoggerAppender::getLayout()
-	 * @return LoggerLayout
-	 */
-	public function getLayout() {
-		return $this->layout;
-	}
+    /**
+     * Returns this appender layout.
+     * @see LoggerAppender::getLayout()
+     * @return LoggerLayout
+     */
+    public function getLayout() {
+        return $this->layout;
+    }
 	
-	/**
-	 * Configurators call this method to determine if the appender
-	 * requires a layout. 
-	 *
-	 * <p>If this method returns <i>true</i>, meaning that layout is required, 
-	 * then the configurator will configure a layout using the configuration 
-	 * information at its disposal.	 If this method returns <i>false</i>, 
-	 * meaning that a layout is not required, then layout configuration will be
-	 * skipped even if there is available layout configuration
-	 * information at the disposal of the configurator.</p>
-	 *
-	 * <p>In the rather exceptional case, where the appender
-	 * implementation admits a layout but can also work without it, then
-	 * the appender should return <i>true</i>.</p>
-	 * 
-	 * @see LoggerAppender::requiresLayout()
-	 * @return boolean
-	 */
-	public function requiresLayout() {
-		return $this->requiresLayout;
-	}
+    /**
+     * Configurators call this method to determine if the appender
+     * requires a layout. 
+     *
+     * <p>If this method returns <i>true</i>, meaning that layout is required, 
+     * then the configurator will configure a layout using the configuration 
+     * information at its disposal.	 If this method returns <i>false</i>, 
+     * meaning that a layout is not required, then layout configuration will be
+     * skipped even if there is available layout configuration
+     * information at the disposal of the configurator.</p>
+     *
+     * <p>In the rather exceptional case, where the appender
+     * implementation admits a layout but can also work without it, then
+     * the appender should return <i>true</i>.</p>
+     * 
+     * @see LoggerAppender::requiresLayout()
+     * @return boolean
+     */
+    public function requiresLayout() {
+        return $this->requiresLayout;
+    }
 	
-	/**
-	 * Get the name of this appender.
-	 * @see LoggerAppender::getName()
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
+    /**
+     * Get the name of this appender.
+     * @see LoggerAppender::getName()
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
 	
 /**
-	 * Set the name of this appender.
-	 *
-	 * The name is used by other components to identify this appender.
-	 *
-	 * 
-	 * @param string $name
-	 */
-	public function setName($name) {
-		$this->name = $name;	
-	}
+ * Set the name of this appender.
+ *
+ * The name is used by other components to identify this appender.
+ *
+ * 
+ * @param string $name
+ */
+    public function setName($name) {
+        $this->name = $name;	
+    }
 	
-	/**
-	 * Returns this appenders threshold level. 
-	 * See the {@link setThreshold()} method for the meaning of this option.
-	 * @return LoggerLevel
-	 */
-	public function getThreshold() { 
-		return $this->threshold;
-	}
+    /**
+     * Returns this appenders threshold level. 
+     * See the {@link setThreshold()} method for the meaning of this option.
+     * @return LoggerLevel
+     */
+    public function getThreshold() { 
+        return $this->threshold;
+    }
 	
-	/**
-	 * Set the threshold level of this appender.
-	 *
-	 * @param mixed $threshold can be a {@link LoggerLevel} object or a string.
-	 * @see LoggerOptionConverter::toLevel()
-	 */
-	public function setThreshold($threshold) {
-		if(is_string($threshold)) {
-		   $this->threshold = LoggerOptionConverter::toLevel($threshold, null);
-		} else if($threshold instanceof LoggerLevel) {
-		   $this->threshold = $threshold;
-		}
-	}
+    /**
+     * Set the threshold level of this appender.
+     *
+     * @param mixed $threshold can be a {@link LoggerLevel} object or a string.
+     * @see LoggerOptionConverter::toLevel()
+     */
+    public function setThreshold($threshold) {
+        if(is_string($threshold)) {
+            $this->threshold = LoggerOptionConverter::toLevel($threshold, null);
+        } else if($threshold instanceof LoggerLevel) {
+            $this->threshold = $threshold;
+        }
+    }
 	
-	/**
-	 * Check whether the message level is below the appender's threshold. 
-	 *
-	 *
-	 * If there is no threshold set, then the return value is always <i>true</i>.
-	 * @param LoggerLevel $level
-	 * @return boolean true if priority is greater or equal than threshold	
-	 */
-	public function isAsSevereAsThreshold($level) {
-		if($this->threshold === null) {
-			return true;
-		}
-		return $level->isGreaterOrEqual($this->getThreshold());
-	}
+    /**
+     * Check whether the message level is below the appender's threshold. 
+     *
+     *
+     * If there is no threshold set, then the return value is always <i>true</i>.
+     * @param LoggerLevel $level
+     * @return boolean true if priority is greater or equal than threshold	
+     */
+    public function isAsSevereAsThreshold($level) {
+        if($this->threshold === null) {
+            return true;
+        }
+        return $level->isGreaterOrEqual($this->getThreshold());
+    }
 
-	/**
-	 * Derived appenders should override this method if option structure
-	 * requires it.
-	 */
-	abstract public function activateOptions();	   
+    /**
+     * Derived appenders should override this method if option structure
+     * requires it.
+     */
+    abstract public function activateOptions();	   
 	
-	/**
-	 * Subclasses of {@link LoggerAppender} should implement 
-	 * this method to perform actual logging.
-	 *
-	 * @param LoggerLoggingEvent $event
-	 * @see doAppend()
-	 * @abstract
-	 */
-	abstract protected function append(LoggerLoggingEvent $event); 
+    /**
+     * Subclasses of {@link LoggerAppender} should implement 
+     * this method to perform actual logging.
+     *
+     * @param LoggerLoggingEvent $event
+     * @see doAppend()
+     * @abstract
+     */
+    abstract protected function append(LoggerLoggingEvent $event); 
 
-	/**
-	 * Release any resources allocated.
-	 * Subclasses of {@link LoggerAppender} should implement 
-	 * this method to perform proper closing procedures.
-	 * @abstract
-	 */
-	abstract public function close();
+    /**
+     * Release any resources allocated.
+     * Subclasses of {@link LoggerAppender} should implement 
+     * this method to perform proper closing procedures.
+     * @abstract
+     */
+    abstract public function close();
 }

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

Indentation +15 added lines, -15 removed lines

@@ -44,19 +44,19 @@ 
  * @since 0.4 
  */
 class LoggerConfiguratorXml implements LoggerConfigurator {
-	const APPENDER_STATE = 1000;
-	const LAYOUT_STATE = 1010;
-	const ROOT_STATE = 1020;
-	const LOGGER_STATE = 1030;
-	const FILTER_STATE = 1040;
+    const APPENDER_STATE = 1000;
+    const LAYOUT_STATE = 1010;
+    const ROOT_STATE = 1020;
+    const LOGGER_STATE = 1030;
+    const FILTER_STATE = 1040;
 	
-	const DEFAULT_FILENAME = './log4php.xml';
+    const DEFAULT_FILENAME = './log4php.xml';
 	
-	/**
-	 * @var string the default configuration document
-	 */
-	const DEFAULT_CONFIGURATION = 
-	'<?xml version="1.0" ?>
+    /**
+     * @var string the default configuration document
+     */
+    const DEFAULT_CONFIGURATION = 
+    '<?xml version="1.0" ?>
 	<log4php:configuration threshold="all">
 	    <appender name="A1" class="LoggerAppenderEcho">
 	        <layout class="LoggerLayoutSimple" />
@@ -67,10 +67,10 @@ 
 	    </root>
 	</log4php:configuration>';
 	
-	/**
-	 * @var string the elements namespace
-	 */
-	const XMLNS = 'HTTP://LOGGING.APACHE.ORG/LOG4PHP/'; 
+    /**
+     * @var string the elements namespace
+     */
+    const XMLNS = 'HTTP://LOGGING.APACHE.ORG/LOG4PHP/'; 
 
     /**
      * @var LoggerHierarchy

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

Indentation +252 added lines, -252 removed lines

@@ -29,193 +29,193 @@ 
  */
 class LoggerOptionConverter {
 
-	const DELIM_START = '${';
-	const DELIM_STOP = '}';
-	const DELIM_START_LEN = 2;
-	const DELIM_STOP_LEN = 1;
+    const DELIM_START = '${';
+    const DELIM_STOP = '}';
+    const DELIM_START_LEN = 2;
+    const DELIM_STOP_LEN = 1;
 
-   /**
-	* Read a predefined var.
-	*
-	* It returns a value referenced by <var>$key</var> using this search criteria:
-	* - if <var>$key</var> is a constant then return it. Else
-	* - if <var>$key</var> is set in <var>$_ENV</var> then return it. Else
-	* - return <var>$def</var>. 
-	*
-	* @param string $key The key to search for.
-	* @param string $def The default value to return.
-	* @return string	the string value of the system property, or the default
-	*					value if there is no property with that key.
-	*
-	* @static
-	*/
-	public static function getSystemProperty($key, $def) {
-		if(defined($key)) {
-			return (string)constant($key);
-		} else if(isset($_SERVER[$key])) {
-			return (string)$_SERVER[$key];
-		} else if(isset($_ENV[$key])) {
-			return (string)$_ENV[$key];
-		} else {
-			return $def;
-		}
-	}
+    /**
+     * Read a predefined var.
+     *
+     * It returns a value referenced by <var>$key</var> using this search criteria:
+     * - if <var>$key</var> is a constant then return it. Else
+     * - if <var>$key</var> is set in <var>$_ENV</var> then return it. Else
+     * - return <var>$def</var>. 
+     *
+     * @param string $key The key to search for.
+     * @param string $def The default value to return.
+     * @return string	the string value of the system property, or the default
+     *					value if there is no property with that key.
+     *
+     * @static
+     */
+    public static function getSystemProperty($key, $def) {
+        if(defined($key)) {
+            return (string)constant($key);
+        } else if(isset($_SERVER[$key])) {
+            return (string)$_SERVER[$key];
+        } else if(isset($_ENV[$key])) {
+            return (string)$_ENV[$key];
+        } else {
+            return $def;
+        }
+    }
 
-	/**
-	 * If <var>$value</var> is <i>true</i>, then <i>true</i> is
-	 * returned. If <var>$value</var> is <i>false</i>, then
-	 * <i>true</i> is returned. Otherwise, <var>$default</var> is
-	 * returned.
-	 *
-	 * <p>Case of value is unimportant.</p>
-	 *
-	 * @param string $value
-	 * @param boolean $default
-	 * @return boolean
-	 *
-	 * @static
-	 */
-	public static function toBoolean($value, $default=true) {
-	    if (is_null($value)) {
-			return $default;
-	    } elseif (is_string($value)) {
-		$trimmedVal = strtolower(trim($value));
+    /**
+     * If <var>$value</var> is <i>true</i>, then <i>true</i> is
+     * returned. If <var>$value</var> is <i>false</i>, then
+     * <i>true</i> is returned. Otherwise, <var>$default</var> is
+     * returned.
+     *
+     * <p>Case of value is unimportant.</p>
+     *
+     * @param string $value
+     * @param boolean $default
+     * @return boolean
+     *
+     * @static
+     */
+    public static function toBoolean($value, $default=true) {
+        if (is_null($value)) {
+            return $default;
+        } elseif (is_string($value)) {
+        $trimmedVal = strtolower(trim($value));
 	
             if("1" == $trimmedVal or "true" == $trimmedVal or "yes" == $trimmedVal or "on" == $trimmedVal) {
-			return true;
+            return true;
             } else if ("" == $trimmedVal or "0" == $trimmedVal or "false" == $trimmedVal or "no" == $trimmedVal or "off" == $trimmedVal) {
-			return false;
-		}
-		} elseif (is_bool($value)) {
-		    return $value;
-		} elseif (is_int($value)) {
-		    return !($value == 0); // true is everything but 0 like in C 
-		}
+            return false;
+        }
+        } elseif (is_bool($value)) {
+            return $value;
+        } elseif (is_int($value)) {
+            return !($value == 0); // true is everything but 0 like in C 
+        }
 		
-		trigger_error("Could not convert ".var_export($value,1)." to boolean!", E_USER_WARNING);
-		return $default;
-	}
+        trigger_error("Could not convert ".var_export($value,1)." to boolean!", E_USER_WARNING);
+        return $default;
+    }
 
-	/**
-	 * @param string $value
-	 * @param integer $default
-	 * @return integer
-	 * @static
-	 */
-	public static function toInt($value, $default) {
-		$value = trim($value);
-		if(is_numeric($value)) {
-			return (int)$value;
-		} else {
-			return $default;
-		}
-	}
+    /**
+     * @param string $value
+     * @param integer $default
+     * @return integer
+     * @static
+     */
+    public static function toInt($value, $default) {
+        $value = trim($value);
+        if(is_numeric($value)) {
+            return (int)$value;
+        } else {
+            return $default;
+        }
+    }
 
-	/**
-	 * Converts a standard or custom priority level to a Level
-	 * object.
-	 *
-	 * <p> If <var>$value</var> is of form "<b>level#full_file_classname</b>",
-	 * where <i>full_file_classname</i> means the class filename with path
-	 * but without php extension, then the specified class' <i>toLevel()</i> method
-	 * is called to process the specified level string; if no '#'
-	 * character is present, then the default {@link LoggerLevel}
-	 * class is used to process the level value.</p>
-	 *
-	 * <p>As a special case, if the <var>$value</var> parameter is
-	 * equal to the string "NULL", then the value <i>null</i> will
-	 * be returned.</p>
-	 *
-	 * <p>If any error occurs while converting the value to a level,
-	 * the <var>$defaultValue</var> parameter, which may be
-	 * <i>null</i>, is returned.</p>
-	 *
-	 * <p>Case of <var>$value</var> is insignificant for the level level, but is
-	 * significant for the class name part, if present.</p>
-	 *
-	 * @param string $value
-	 * @param LoggerLevel $defaultValue
-	 * @return LoggerLevel a {@link LoggerLevel} or null
-	 * @static
-	 */
-	public static function toLevel($value, $defaultValue) {
-		if($value === null) {
-			return $defaultValue;
-		}
-		$hashIndex = strpos($value, '#');
-		if($hashIndex === false) {
-			if("NULL" == strtoupper($value)) {
-				return null;
-			} else {
-				// no class name specified : use standard Level class
-				return LoggerLevel::toLevel($value, $defaultValue);
-			}
-		}
+    /**
+     * Converts a standard or custom priority level to a Level
+     * object.
+     *
+     * <p> If <var>$value</var> is of form "<b>level#full_file_classname</b>",
+     * where <i>full_file_classname</i> means the class filename with path
+     * but without php extension, then the specified class' <i>toLevel()</i> method
+     * is called to process the specified level string; if no '#'
+     * character is present, then the default {@link LoggerLevel}
+     * class is used to process the level value.</p>
+     *
+     * <p>As a special case, if the <var>$value</var> parameter is
+     * equal to the string "NULL", then the value <i>null</i> will
+     * be returned.</p>
+     *
+     * <p>If any error occurs while converting the value to a level,
+     * the <var>$defaultValue</var> parameter, which may be
+     * <i>null</i>, is returned.</p>
+     *
+     * <p>Case of <var>$value</var> is insignificant for the level level, but is
+     * significant for the class name part, if present.</p>
+     *
+     * @param string $value
+     * @param LoggerLevel $defaultValue
+     * @return LoggerLevel a {@link LoggerLevel} or null
+     * @static
+     */
+    public static function toLevel($value, $defaultValue) {
+        if($value === null) {
+            return $defaultValue;
+        }
+        $hashIndex = strpos($value, '#');
+        if($hashIndex === false) {
+            if("NULL" == strtoupper($value)) {
+                return null;
+            } else {
+                // no class name specified : use standard Level class
+                return LoggerLevel::toLevel($value, $defaultValue);
+            }
+        }
 
-		$result = $defaultValue;
+        $result = $defaultValue;
 
-		$clazz = substr($value, ($hashIndex + 1));
-		$levelName = substr($value, 0, $hashIndex);
+        $clazz = substr($value, ($hashIndex + 1));
+        $levelName = substr($value, 0, $hashIndex);
 
-		// This is degenerate case but you never know.
-		if("NULL" == strtoupper($levelName)) {
-			return null;
-		}
+        // This is degenerate case but you never know.
+        if("NULL" == strtoupper($levelName)) {
+            return null;
+        }
 
-		$clazz = basename($clazz);
+        $clazz = basename($clazz);
 
-		if(class_exists($clazz)) {
-			$result = @call_user_func(array($clazz, 'toLevel'), $levelName, $defaultValue);
-			if(!$result instanceof LoggerLevel) {
-				$result = $defaultValue;
-			}
-		} 
-		return $result;
-	}
+        if(class_exists($clazz)) {
+            $result = @call_user_func(array($clazz, 'toLevel'), $levelName, $defaultValue);
+            if(!$result instanceof LoggerLevel) {
+                $result = $defaultValue;
+            }
+        } 
+        return $result;
+    }
 
-	/**
-	 * @param string $value
-	 * @param float $default
-	 * @return float
-	 *
-	 * @static
-	 */
-	public static function toFileSize($value, $default) {
-		if($value === null) {
-			return $default;
-		}
+    /**
+     * @param string $value
+     * @param float $default
+     * @return float
+     *
+     * @static
+     */
+    public static function toFileSize($value, $default) {
+        if($value === null) {
+            return $default;
+        }
 
-		$s = strtoupper(trim($value));
-		$multiplier = (float)1;
-		if(($index = strpos($s, 'KB')) !== false) {
-			$multiplier = 1024;
-			$s = substr($s, 0, $index);
-		} else if(($index = strpos($s, 'MB')) !== false) {
-			$multiplier = 1024 * 1024;
-			$s = substr($s, 0, $index);
-		} else if(($index = strpos($s, 'GB')) !== false) {
-			$multiplier = 1024 * 1024 * 1024;
-			$s = substr($s, 0, $index);
-		}
-		if(is_numeric($s)) {
-			return (float)$s * $multiplier;
-		} 
-		return $default;
-	}
+        $s = strtoupper(trim($value));
+        $multiplier = (float)1;
+        if(($index = strpos($s, 'KB')) !== false) {
+            $multiplier = 1024;
+            $s = substr($s, 0, $index);
+        } else if(($index = strpos($s, 'MB')) !== false) {
+            $multiplier = 1024 * 1024;
+            $s = substr($s, 0, $index);
+        } else if(($index = strpos($s, 'GB')) !== false) {
+            $multiplier = 1024 * 1024 * 1024;
+            $s = substr($s, 0, $index);
+        }
+        if(is_numeric($s)) {
+            return (float)$s * $multiplier;
+        } 
+        return $default;
+    }
 
-	/**
-	 * Find the value corresponding to <var>$key</var> in
-	 * <var>$props</var>. Then perform variable substitution on the
-	 * found value.
-	 *
-	 * @param string $key
-	 * @param array $props
-	 * @return string
-	 *
-	 * @static
-	 */
-	public static function findAndSubst($key, $props) {
-		$value = @$props[$key];
+    /**
+     * Find the value corresponding to <var>$key</var> in
+     * <var>$props</var>. Then perform variable substitution on the
+     * found value.
+     *
+     * @param string $key
+     * @param array $props
+     * @return string
+     *
+     * @static
+     */
+    public static function findAndSubst($key, $props) {
+        $value = @$props[$key];
 
         // If coming from the LoggerConfiguratorIni, some options were
         // already mangled by parse_ini_file:
@@ -233,90 +233,90 @@ 
         // explicitly set by the user and is different from an option which
         // has not been specified and therefore keeps its default value.
         //
-		// if(!empty($value)) {
-			return LoggerOptionConverter::substVars($value, $props);
-		// }
+        // if(!empty($value)) {
+            return LoggerOptionConverter::substVars($value, $props);
+        // }
     }
 
-	/**
-	 * Perform variable substitution in string <var>$val</var> from the
-	 * values of keys found with the {@link getSystemProperty()} method.
-	 * 
-	 * <p>The variable substitution delimeters are <b>${</b> and <b>}</b>.
-	 * 
-	 * <p>For example, if the "MY_CONSTANT" contains "value", then
-	 * the call
-	 * <code>
-	 * $s = LoggerOptionConverter::substituteVars("Value of key is ${MY_CONSTANT}.");
-	 * </code>
-	 * will set the variable <i>$s</i> to "Value of key is value.".</p>
-	 * 
-	 * <p>If no value could be found for the specified key, then the
-	 * <var>$props</var> parameter is searched, if the value could not
-	 * be found there, then substitution defaults to the empty string.</p>
-	 * 
-	 * <p>For example, if {@link getSystemProperty()} cannot find any value for the key
-	 * "inexistentKey", then the call
-	 * <code>
-	 * $s = LoggerOptionConverter::substVars("Value of inexistentKey is [${inexistentKey}]");
-	 * </code>
-	 * will set <var>$s</var> to "Value of inexistentKey is []".</p>
-	 * 
-	 * <p>A warn is thrown if <var>$val</var> contains a start delimeter "${" 
-	 * which is not balanced by a stop delimeter "}" and an empty string is returned.</p>
-	 * 
-	 * @author Avy Sharell
-	 * 
-	 * @param string $val The string on which variable substitution is performed.
-	 * @param array $props
-	 * @return string
-	 *
-	 * @static
-	 */
-	 // TODO: this method doesn't work correctly with key = true, it needs key = "true" which is odd
-	public static function substVars($val, $props = null) {
-		$sbuf = '';
-		$i = 0;
-		while(true) {
-			$j = strpos($val, self::DELIM_START, $i);
-			if($j === false) {
-				// no more variables
-				if($i == 0) { // this is a simple string
-					return $val;
-				} else { // add the tail string which contails no variables and return the result.
-					$sbuf .= substr($val, $i);
-					return $sbuf;
-				}
-			} else {
+    /**
+     * Perform variable substitution in string <var>$val</var> from the
+     * values of keys found with the {@link getSystemProperty()} method.
+     * 
+     * <p>The variable substitution delimeters are <b>${</b> and <b>}</b>.
+     * 
+     * <p>For example, if the "MY_CONSTANT" contains "value", then
+     * the call
+     * <code>
+     * $s = LoggerOptionConverter::substituteVars("Value of key is ${MY_CONSTANT}.");
+     * </code>
+     * will set the variable <i>$s</i> to "Value of key is value.".</p>
+     * 
+     * <p>If no value could be found for the specified key, then the
+     * <var>$props</var> parameter is searched, if the value could not
+     * be found there, then substitution defaults to the empty string.</p>
+     * 
+     * <p>For example, if {@link getSystemProperty()} cannot find any value for the key
+     * "inexistentKey", then the call
+     * <code>
+     * $s = LoggerOptionConverter::substVars("Value of inexistentKey is [${inexistentKey}]");
+     * </code>
+     * will set <var>$s</var> to "Value of inexistentKey is []".</p>
+     * 
+     * <p>A warn is thrown if <var>$val</var> contains a start delimeter "${" 
+     * which is not balanced by a stop delimeter "}" and an empty string is returned.</p>
+     * 
+     * @author Avy Sharell
+     * 
+     * @param string $val The string on which variable substitution is performed.
+     * @param array $props
+     * @return string
+     *
+     * @static
+     */
+        // TODO: this method doesn't work correctly with key = true, it needs key = "true" which is odd
+    public static function substVars($val, $props = null) {
+        $sbuf = '';
+        $i = 0;
+        while(true) {
+            $j = strpos($val, self::DELIM_START, $i);
+            if($j === false) {
+                // no more variables
+                if($i == 0) { // this is a simple string
+                    return $val;
+                } else { // add the tail string which contails no variables and return the result.
+                    $sbuf .= substr($val, $i);
+                    return $sbuf;
+                }
+            } else {
 			
-				$sbuf .= substr($val, $i, $j-$i);
-				$k = strpos($val, self::DELIM_STOP, $j);
-				if($k === false) {
-					// LoggerOptionConverter::substVars() has no closing brace. Opening brace
-					return '';
-				} else {
-					$j += self::START_LEN;
-					$key = substr($val, $j, $k - $j);
-					// first try in System properties
-					$replacement = LoggerOptionConverter::getSystemProperty($key, null);
-					// then try props parameter
-					if($replacement == null and $props !== null) {
-						$replacement = @$props[$key];
-					}
+                $sbuf .= substr($val, $i, $j-$i);
+                $k = strpos($val, self::DELIM_STOP, $j);
+                if($k === false) {
+                    // LoggerOptionConverter::substVars() has no closing brace. Opening brace
+                    return '';
+                } else {
+                    $j += self::START_LEN;
+                    $key = substr($val, $j, $k - $j);
+                    // first try in System properties
+                    $replacement = LoggerOptionConverter::getSystemProperty($key, null);
+                    // then try props parameter
+                    if($replacement == null and $props !== null) {
+                        $replacement = @$props[$key];
+                    }
 
-					if(!empty($replacement)) {
-						// Do variable substitution on the replacement string
-						// such that we can solve "Hello ${x2}" as "Hello p1" 
-						// the where the properties are
-						// x1=p1
-						// x2=${x1}
-						$recursiveReplacement = LoggerOptionConverter::substVars($replacement, $props);
-						$sbuf .= $recursiveReplacement;
-					}
-					$i = $k + self::DELIM_STOP_LEN;
-				}
-			}
-		}
-	}
+                    if(!empty($replacement)) {
+                        // Do variable substitution on the replacement string
+                        // such that we can solve "Hello ${x2}" as "Hello p1" 
+                        // the where the properties are
+                        // x1=p1
+                        // x2=${x1}
+                        $recursiveReplacement = LoggerOptionConverter::substVars($replacement, $props);
+                        $sbuf .= $recursiveReplacement;
+                    }
+                    $i = $k + self::DELIM_STOP_LEN;
+                }
+            }
+        }
+    }
 
 }

main/inc/lib/phpdocx/lib/log4php/layouts/LoggerLayoutTTCC.php

Indentation +12 added lines, -12 removed lines

@@ -50,19 +50,19 @@
  */
 class LoggerLayoutTTCC extends LoggerLayout {
 
-	/**
-	 * String constant designating no time information. Current value of
-	 * this constant is <b>NULL</b>.
-	 */
-	 // TODO: not used?
-	const LOG4PHP_LOGGER_LAYOUT_NULL_DATE_FORMAT = 'NULL';
+    /**
+     * String constant designating no time information. Current value of
+     * this constant is <b>NULL</b>.
+     */
+        // TODO: not used?
+    const LOG4PHP_LOGGER_LAYOUT_NULL_DATE_FORMAT = 'NULL';
 	
-	/**
-	 * String constant designating relative time. Current value of
-	 * this constant is <b>RELATIVE</b>.
-	 */
-	 // TODO: not used?
-	const LOG4PHP_LOGGER_LAYOUT_RELATIVE_TIME_DATE_FORMAT = 'RELATIVE';
+    /**
+     * String constant designating relative time. Current value of
+     * this constant is <b>RELATIVE</b>.
+     */
+        // TODO: not used?
+    const LOG4PHP_LOGGER_LAYOUT_RELATIVE_TIME_DATE_FORMAT = 'RELATIVE';
 	
     // Internal representation of options
     protected $threadPrinting    = true;