thorsten / phpMyFAQ

phpmyfaq/admin/editor/plugins/ajaxfilemanager/inc/class.file.php

Doc Comments +9 added lines, -2 removed lines

@@ -88,6 +88,7 @@ 
 		 * check if a file or folder writable
 		 *
 		 * @param file path $path
+		 * @param string $path
 		 * @return boolean
 		 */
 	function isWritable($path=null)
@@ -124,6 +125,7 @@ 
 	/**
 	 * Returns true if the files is readable.
 	 *
+	 * @param string $path
 	 * @return boolean true if the files is readable.
 	 */
 	function isReadable($path =null) 
@@ -151,6 +153,7 @@ 
 		 * @path the path for the new folder
 		 * @mask
 		 * @dirOwner
+		 * @param string $path
 		 * @return boolean
 		 */
 		function mkdir($path = null, $mask=null, $dirOwner='') 
@@ -177,7 +180,8 @@ 
 	 * change the own of a file or folder
 	 *
 	 * @param the file path $path
-	 * @param  $owner
+	 * @param  string $owner
+	 * @param string $path
 	 */
 	function chown($path, $owner) 
 	{
@@ -305,7 +309,7 @@ 
     /**
      * get file information
      *
-     * @return array
+     * @return string
      */
     function getFileInfo()
     {
@@ -358,6 +362,9 @@ 
 		return false;
 	}
 	
+	/**
+	 * @param string $info
+	 */
 	function _debug($info)
 	{
 		if($this->debug)

Indentation +382 added lines, -382 removed lines

@@ -1,264 +1,264 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php
-	/**
-	 * file modification
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/April/2007
-	 *
-	 */
-	class file
-	{
-		var $fileInfo = "";
-		var $filePath = "";
-		var $fileStat = "";
-		var $mask = '0775';
-		var $debug = false;
-		var $errors = array();
-		/**
-		 * constructor
-		 *
-		 * @param string $path the path to a file or folder
-		 */
-		function __construct($path = null)
-		{
-			if(!is_null($path))
-			{
-			if(file_exists($path))
-			{
-				$this->filePath = $path;
-				if(is_file($this->filePath))
-				{
-					$this->fileStat = @stat($path);
-					$this->fileInfo['size'] = $this->fileStat[7];
-					$this->fileInfo['atime'] = $this->fileStat[8];
-					$this->fileInfo['ctime'] = $this->fileStat[10];	
-					$this->fileInfo['mtime'] = $this->fileStat[9];
-					$this->fileInfo['path'] = $path;
-					$this->fileInfo['name'] = basename($path);	
-					$this->fileInfo['is_writable'] = $this->isWritable();
-					$this->fileInfo['is_readable'] = $this->isReadable();
-					$imageSize = @getimagesize($path);
-					if(is_array($imageSize) && !empty($imageSize))
-					{
-						$this->fileInfo['is_image'] = 1;
-						$this->fileInfo['x'] = $imageSize[0];
-						$this->fileInfo['y'] = $imageSize[1];
-					}else 
-					{
-						$this->fileInfo['is_image'] = 0;
-					}
+    /**
+     * file modification
+     * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @link www.phpletter.com
+     * @since 22/April/2007
+     *
+     */
+    class file
+    {
+        var $fileInfo = "";
+        var $filePath = "";
+        var $fileStat = "";
+        var $mask = '0775';
+        var $debug = false;
+        var $errors = array();
+        /**
+         * constructor
+         *
+         * @param string $path the path to a file or folder
+         */
+        function __construct($path = null)
+        {
+            if(!is_null($path))
+            {
+            if(file_exists($path))
+            {
+                $this->filePath = $path;
+                if(is_file($this->filePath))
+                {
+                    $this->fileStat = @stat($path);
+                    $this->fileInfo['size'] = $this->fileStat[7];
+                    $this->fileInfo['atime'] = $this->fileStat[8];
+                    $this->fileInfo['ctime'] = $this->fileStat[10];	
+                    $this->fileInfo['mtime'] = $this->fileStat[9];
+                    $this->fileInfo['path'] = $path;
+                    $this->fileInfo['name'] = basename($path);	
+                    $this->fileInfo['is_writable'] = $this->isWritable();
+                    $this->fileInfo['is_readable'] = $this->isReadable();
+                    $imageSize = @getimagesize($path);
+                    if(is_array($imageSize) && !empty($imageSize))
+                    {
+                        $this->fileInfo['is_image'] = 1;
+                        $this->fileInfo['x'] = $imageSize[0];
+                        $this->fileInfo['y'] = $imageSize[1];
+                    }else 
+                    {
+                        $this->fileInfo['is_image'] = 0;
+                    }
 					
-				}elseif(is_dir($this->filePath))
-				{
-					$this->fileStat = @stat($path);
-					$this->fileInfo['name'] = basename($path);
-					$this->fileInfo['path'] = $path;
-					$this->fileInfo['atime'] = $this->fileStat[8];
-					$this->fileInfo['ctime'] = $this->fileStat[10];	
-					$this->fileInfo['mtime'] = $this->fileStat[9];
-					$this->fileInfo['is_writable'] = $this->isWritable();
-					$this->fileInfo['is_readable'] = $this->isReadable();					
-				}
-			}else 
-			{
-				trigger_error('File does not exist ', E_USER_NOTICE);	
-			}				
-			}
+                }elseif(is_dir($this->filePath))
+                {
+                    $this->fileStat = @stat($path);
+                    $this->fileInfo['name'] = basename($path);
+                    $this->fileInfo['path'] = $path;
+                    $this->fileInfo['atime'] = $this->fileStat[8];
+                    $this->fileInfo['ctime'] = $this->fileStat[10];	
+                    $this->fileInfo['mtime'] = $this->fileStat[9];
+                    $this->fileInfo['is_writable'] = $this->isWritable();
+                    $this->fileInfo['is_readable'] = $this->isReadable();					
+                }
+            }else 
+            {
+                trigger_error('File does not exist ', E_USER_NOTICE);	
+            }				
+            }
 
 
 			
-		}
-		/**
-		 * contructor
-		 *
-		 * @param string $path
-		 */
-		function file($path=null)
-		{
-			$this->__construct($path);
-		}
+        }
+        /**
+         * contructor
+         *
+         * @param string $path
+         */
+        function file($path=null)
+        {
+            $this->__construct($path);
+        }
 		
 		
-		/**
-		 * check if a file or folder writable
-		 *
-		 * @param file path $path
-		 * @return boolean
-		 */
-	function isWritable($path=null)
-	{
-		$path = (is_null($path)?$this->filePath:$path);		
-		if (DIRECTORY_SEPARATOR == "\\")
-		{
-			$path = slashToBackslash($path);
-			if(is_file($path))
-			{
-				$fp = @fopen($path,'ab');
-				if($fp)
-				{
-					@fclose($fp);
-					return true;
-				}
-			}elseif(is_dir($path))
-			{
-					$path = addTrailingSlash($path);
-					$tmp = uniqid(time());
-					if (@touch($path . $tmp)) 
-					{
-						@unlink($path . $tmp);
-						return true;
-					}			
-			}
-			return false;			
-		}else 
-		{
-			return @is_writable(slashToBackslash($path));
-		}
+        /**
+         * check if a file or folder writable
+         *
+         * @param file path $path
+         * @return boolean
+         */
+    function isWritable($path=null)
+    {
+        $path = (is_null($path)?$this->filePath:$path);		
+        if (DIRECTORY_SEPARATOR == "\\")
+        {
+            $path = slashToBackslash($path);
+            if(is_file($path))
+            {
+                $fp = @fopen($path,'ab');
+                if($fp)
+                {
+                    @fclose($fp);
+                    return true;
+                }
+            }elseif(is_dir($path))
+            {
+                    $path = addTrailingSlash($path);
+                    $tmp = uniqid(time());
+                    if (@touch($path . $tmp)) 
+                    {
+                        @unlink($path . $tmp);
+                        return true;
+                    }			
+            }
+            return false;			
+        }else 
+        {
+            return @is_writable(slashToBackslash($path));
+        }
 
-	}
-	/**
-	 * Returns true if the files is readable.
-	 *
-	 * @return boolean true if the files is readable.
-	 */
-	function isReadable($path =null) 
-	{
-		$path = is_null($path)?$this->filePath:$path;
-		return @is_readable(slashToBackslash($path));
-	}		
-	/**
-	 * change the modified time
-	 *
-	 * @param string $path
-	 * @param string $time
-	 * @return boolean
-	 */
-	function setLastModified($path=null, $time) 
-	{
-		$path = is_null($path)?$this->filePath:$path;
-		$time = is_null($time)?time():$time;
-		return @touch(slashToBackslash($path), $time);
-	}
+    }
+    /**
+     * Returns true if the files is readable.
+     *
+     * @return boolean true if the files is readable.
+     */
+    function isReadable($path =null) 
+    {
+        $path = is_null($path)?$this->filePath:$path;
+        return @is_readable(slashToBackslash($path));
+    }		
+    /**
+     * change the modified time
+     *
+     * @param string $path
+     * @param string $time
+     * @return boolean
+     */
+    function setLastModified($path=null, $time) 
+    {
+        $path = is_null($path)?$this->filePath:$path;
+        $time = is_null($time)?time():$time;
+        return @touch(slashToBackslash($path), $time);
+    }
 
-		/**
-		 * create a new folder
-		 *
-		 * @path the path for the new folder
-		 * @mask
-		 * @dirOwner
-		 * @return boolean
-		 */
-		function mkdir($path = null, $mask=null, $dirOwner='') 
-		{
-			$path = is_null($path)?$this->filePath:$path;
-			if(!file_exists($path))
-			{
-				$mask = is_null($mask)?$this->mask:$mask;				
-				$status = @mkdir(slashToBackslash($path));			
-				if ($mask)
-				{
-					@chmod(slashToBackslash($path), intval($mask, 8));
-				}					
-				if($dirOwner)
-				{
-					$this->chown(slashToBackslash($path), $dirOwner);
-				}
-				return $status;				
-			}
-			return true;
+        /**
+         * create a new folder
+         *
+         * @path the path for the new folder
+         * @mask
+         * @dirOwner
+         * @return boolean
+         */
+        function mkdir($path = null, $mask=null, $dirOwner='') 
+        {
+            $path = is_null($path)?$this->filePath:$path;
+            if(!file_exists($path))
+            {
+                $mask = is_null($mask)?$this->mask:$mask;				
+                $status = @mkdir(slashToBackslash($path));			
+                if ($mask)
+                {
+                    @chmod(slashToBackslash($path), intval($mask, 8));
+                }					
+                if($dirOwner)
+                {
+                    $this->chown(slashToBackslash($path), $dirOwner);
+                }
+                return $status;				
+            }
+            return true;
 
-		}	
-	/**
-	 * change the own of a file or folder
-	 *
-	 * @param the file path $path
-	 * @param  $owner
-	 */
-	function chown($path, $owner) 
-	{
-		if(!empty($owner))
-		{
-			$owners = explode(":", $owner);
-			if(!empty($owners[0]))
-				@chown($path, $owners[0]);
-			if(!empty($owners[1]))
-				@chgrp($path, $owner[1]);
-		}
-	}	
+        }	
+    /**
+     * change the own of a file or folder
+     *
+     * @param the file path $path
+     * @param  $owner
+     */
+    function chown($path, $owner) 
+    {
+        if(!empty($owner))
+        {
+            $owners = explode(":", $owner);
+            if(!empty($owners[0]))
+                @chown($path, $owners[0]);
+            if(!empty($owners[1]))
+                @chgrp($path, $owner[1]);
+        }
+    }	
 
     /**
-         * Copy a file, or recursively copy a folder and its contents
-         * @author      Aidan Lister <aidan@php.net>
-         * @author      Paul Scott
-         * @version     1.0.1
-         * @param       string   $source    Source path
-         * @param       string   $dest      Destination path
-         * @return      bool     Returns TRUE on success, FALSE on failure
-         */
+     * Copy a file, or recursively copy a folder and its contents
+     * @author      Aidan Lister <aidan@php.net>
+     * @author      Paul Scott
+     * @version     1.0.1
+     * @param       string   $source    Source path
+     * @param       string   $dest      Destination path
+     * @return      bool     Returns TRUE on success, FALSE on failure
+     */
     function copyTo($source, $dest)
     {
-    	$source = removeTrailingSlash(backslashToSlash($source));
-    	$dest = removeTrailingSlash(backslashToSlash($dest));
-	 		if(!file_exists($dest) || !is_dir($dest))
-			{
-				if(!$this->mkdir($dest))
-				{
-					$this->_debug('Unable to create folder (' . $dest . ")");
-					return false;
-				}					
-			}
-					// Copy in to your self?
-				if (getAbsPath($source) ==  getAbsPath($dest))
-				{
-					$this->_debug('Unable to copy itself. source: ' . getAbsPath($source) . "; dest: " . getAbsPath($dest));
-					return false;		
-				}
+        $source = removeTrailingSlash(backslashToSlash($source));
+        $dest = removeTrailingSlash(backslashToSlash($dest));
+                if(!file_exists($dest) || !is_dir($dest))
+            {
+                if(!$this->mkdir($dest))
+                {
+                    $this->_debug('Unable to create folder (' . $dest . ")");
+                    return false;
+                }					
+            }
+                    // Copy in to your self?
+                if (getAbsPath($source) ==  getAbsPath($dest))
+                {
+                    $this->_debug('Unable to copy itself. source: ' . getAbsPath($source) . "; dest: " . getAbsPath($dest));
+                    return false;		
+                }
         // Simple copy for a file
         if (is_file($source))
         {        	
-        		$dest = addTrailingSlash($dest) . (basename($source));
-        	if(file_exists($dest))
-        	{
-        		return false;
-        	}else {
+                $dest = addTrailingSlash($dest) . (basename($source));
+            if(file_exists($dest))
+            {
+                return false;
+            }else {
         		
-        		return copy($source, $dest);
-        	}
+                return copy($source, $dest);
+            }
             
             
         }elseif(is_dir($source))
         {
-	        // Loop through the folder
-	           if(file_exists(addTrailingSlash($dest) . basename($source)))
-	           {
-	           	return false;
-	           }else 
-	           {
-			 		if(!file_exists(addTrailingSlash($dest) . basename($source)) || !is_dir(addTrailingSlash($dest) . basename($source)))
-					{
-						if(!$this->mkdir(addTrailingSlash($dest) . basename($source)))
-						{
-							$this->_debug('Unable to create folder (' . addTrailingSlash($dest) . basename($source) . ")");
-							return false;
-						}					
-					}	        	
-		        $handle = opendir($source);
-		        while(false !== ($readdir = readdir($handle)))
-		        {
-		            if($readdir != '.' && $readdir != '..')
-		            {	  
-		            	$path = addTrailingSlash($source).'/'.$readdir;    
-		            	$this->copyTo($path, addTrailingSlash($dest) . basename($source));
-		            }
-		        }
-		         closedir($handle);
-		        return true;	           	
-	           }
+            // Loop through the folder
+                if(file_exists(addTrailingSlash($dest) . basename($source)))
+                {
+                    return false;
+                }else 
+                {
+                        if(!file_exists(addTrailingSlash($dest) . basename($source)) || !is_dir(addTrailingSlash($dest) . basename($source)))
+                    {
+                        if(!$this->mkdir(addTrailingSlash($dest) . basename($source)))
+                        {
+                            $this->_debug('Unable to create folder (' . addTrailingSlash($dest) . basename($source) . ")");
+                            return false;
+                        }					
+                    }	        	
+                $handle = opendir($source);
+                while(false !== ($readdir = readdir($handle)))
+                {
+                    if($readdir != '.' && $readdir != '..')
+                    {	  
+                        $path = addTrailingSlash($source).'/'.$readdir;    
+                        $this->copyTo($path, addTrailingSlash($dest) . basename($source));
+                    }
+                }
+                    closedir($handle);
+                return true;	           	
+                }
 	
         }		   
         return false;
@@ -273,34 +273,34 @@ 
     function getNextAvailableFileName($fileToMove, $destFolder)
     {
     	
-    	$folderPath = addslashes(backslashToSlash(getParentPath($fileToMove)));
-    	$destFolder = addslashes(backslashToSlash(getParentPath($destFolder)));
-    	$finalPath = $destFolder . basename($fileToMove);
-    	if(file_exists($fileToMove))
-    	{
-    		if(is_file())
-    		{
-    			$fileExt = getFileExt($fileToMove);
-    			$fileBaseName = basename($fileToMove, '.' . $fileExt);
-    			$count = 1;
-    			while(file_exists($destFolder . $fileBaseName . $count . "." . $fileExt))
-    			{
-    				$count++;
-    			}
-    			$filePath = $destFolder . $fileBaseName . $count . "." . $fileExt;
-    		}elseif(is_dir())
-    		{
-    			$folderName = basename($fileToMove);
-     			$count = 1;
-    			while(file_exists($destFolder . $folderName . $count))
-    			{
-    				$count++;
-    			}
-    			$filePath = $destFolder . $fileBaseName . $count;   			
-    		}
+        $folderPath = addslashes(backslashToSlash(getParentPath($fileToMove)));
+        $destFolder = addslashes(backslashToSlash(getParentPath($destFolder)));
+        $finalPath = $destFolder . basename($fileToMove);
+        if(file_exists($fileToMove))
+        {
+            if(is_file())
+            {
+                $fileExt = getFileExt($fileToMove);
+                $fileBaseName = basename($fileToMove, '.' . $fileExt);
+                $count = 1;
+                while(file_exists($destFolder . $fileBaseName . $count . "." . $fileExt))
+                {
+                    $count++;
+                }
+                $filePath = $destFolder . $fileBaseName . $count . "." . $fileExt;
+            }elseif(is_dir())
+            {
+                $folderName = basename($fileToMove);
+                    $count = 1;
+                while(file_exists($destFolder . $folderName . $count))
+                {
+                    $count++;
+                }
+                $filePath = $destFolder . $fileBaseName . $count;   			
+            }
     		
-    	}
-		return $finalPath;
+        }
+        return $finalPath;
     }
     /**
      * get file information
@@ -309,7 +309,7 @@ 
      */
     function getFileInfo()
     {
-    	return $this->fileInfo;
+        return $this->fileInfo;
     }
     /**
      * close 
@@ -317,136 +317,136 @@ 
      */
     function close()
     {
-    	$this->fileInfo = null;
-    	$this->fileStat = null;
+        $this->fileInfo = null;
+        $this->fileStat = null;
     }
- 	/**
-	 * delete a file or a folder and all contents within that folder
-	 *
-	 * @param string $path
-	 * @return boolean
-	 */
-	function delete($path = null)
-	{
-		$path = is_null($path)?$this->filePath:$path;
-		if(file_exists($path))
-		{
-			if(is_file($path))
-			{
-				return @unlink($path);
-			}elseif(is_dir($path))
-			{
-				return $this->__recursive_remove_directory($path);
-			}
+        /**
+         * delete a file or a folder and all contents within that folder
+         *
+         * @param string $path
+         * @return boolean
+         */
+    function delete($path = null)
+    {
+        $path = is_null($path)?$this->filePath:$path;
+        if(file_exists($path))
+        {
+            if(is_file($path))
+            {
+                return @unlink($path);
+            }elseif(is_dir($path))
+            {
+                return $this->__recursive_remove_directory($path);
+            }
 			
-		}
-		return false;
-	}
-	/**
-	 * empty a folder
-	 *
-	 * @param string $path
-	 * @return boolean
-	 */
-	function emptyFolder($path)
-	{
-		$path = is_null($path)?$this->filePath:"";
-		if(file_exists($path) && is_dir($path))
-		{
-			return $this->__recursive_remove_directory($path, true);
-		}
-		return false;
-	}
+        }
+        return false;
+    }
+    /**
+     * empty a folder
+     *
+     * @param string $path
+     * @return boolean
+     */
+    function emptyFolder($path)
+    {
+        $path = is_null($path)?$this->filePath:"";
+        if(file_exists($path) && is_dir($path))
+        {
+            return $this->__recursive_remove_directory($path, true);
+        }
+        return false;
+    }
 	
-	function _debug($info)
-	{
-		if($this->debug)
-		{
-			echo $info . "<br>\n";
-		}else 
-		{
-			$this->errors[] = $info;
-		}
-	}
+    function _debug($info)
+    {
+        if($this->debug)
+        {
+            echo $info . "<br>\n";
+        }else 
+        {
+            $this->errors[] = $info;
+        }
+    }
 /**
- * recursive_remove_directory( directory to delete, empty )
- * expects path to directory and optional TRUE / FALSE to empty
- * of course PHP has to have the rights to delete the directory
- * you specify and all files and folders inside the directory
- * 
- * to use this function to totally remove a directory, write:
- * recursive_remove_directory('path/to/directory/to/delete');
- * to use this function to empty a directory, write:
- *	recursive_remove_directory('path/to/full_directory',TRUE);
- * @param string $directory
- * @param boolean $empty
- * @return boolean
- */
- function __recursive_remove_directory($directory, $empty=FALSE)
- {
-     // if the path has a slash at the end we remove it here
-     if(substr($directory,-1) == '/')
-     {
-         $directory = substr($directory,0,-1);
-     }
+     * recursive_remove_directory( directory to delete, empty )
+     * expects path to directory and optional TRUE / FALSE to empty
+     * of course PHP has to have the rights to delete the directory
+     * you specify and all files and folders inside the directory
+     * 
+     * to use this function to totally remove a directory, write:
+     * recursive_remove_directory('path/to/directory/to/delete');
+     * to use this function to empty a directory, write:
+     *	recursive_remove_directory('path/to/full_directory',TRUE);
+     * @param string $directory
+     * @param boolean $empty
+     * @return boolean
+     */
+    function __recursive_remove_directory($directory, $empty=FALSE)
+    {
+        // if the path has a slash at the end we remove it here
+        if(substr($directory,-1) == '/')
+        {
+            $directory = substr($directory,0,-1);
+        }
   
-     // if the path is not valid or is not a directory ...
-     if(!file_exists($directory) || !is_dir($directory))
-     {
-         // ... we return false and exit the function
-         return FALSE;
+        // if the path is not valid or is not a directory ...
+        if(!file_exists($directory) || !is_dir($directory))
+        {
+            // ... we return false and exit the function
+            return FALSE;
   
-     // ... if the path is not readable
-     }elseif(!is_readable($directory))
-     {
-         // ... we return false and exit the function
-         return FALSE;
+        // ... if the path is not readable
+        }elseif(!is_readable($directory))
+        {
+            // ... we return false and exit the function
+            return FALSE;
   
-     // ... else if the path is readable
-     }else{
+        // ... else if the path is readable
+        }else{
   
-         // we open the directory
-         $handle = @opendir($directory);
+            // we open the directory
+            $handle = @opendir($directory);
   
-         // and scan through the items inside
-         while (FALSE !== ($item = @readdir($handle)))
-         {
-             // if the filepointer is not the current directory
-             // or the parent directory
-             if($item != '.' && $item != '..')
-             {
-                 // we build the new path to delete
-                 $path = $directory.'/'.$item;
+            // and scan through the items inside
+            while (FALSE !== ($item = @readdir($handle)))
+            {
+                // if the filepointer is not the current directory
+                // or the parent directory
+                if($item != '.' && $item != '..')
+                {
+                    // we build the new path to delete
+                    $path = $directory.'/'.$item;
   
-                 // if the new path is a directory
-                 if(is_dir($path))                  {
-                     // we call this function with the new path
-                     $this->__recursive_remove_directory($path);
+                    // if the new path is a directory
+                    if(is_dir($path))                  {
+                        // we call this function with the new path
+                        $this->__recursive_remove_directory($path);
   
-                 // if the new path is a file
-                 }else{
+                    // if the new path is a file
+                    }else{
                     // we remove the file
                     @unlink($path);
-                 }
-             }
-         }
-         // close the directory
-         @closedir($handle);
+                    }
+                }
+            }
+            // close the directory
+            @closedir($handle);
   
         // if the option to empty is not set to true
-         if($empty == FALSE)
-         {
-             // try to delete the now empty directory
-             if(!@rmdir($directory))
-             {
-                 // return false if not possible
-                 return FALSE;
-             }
-         }
-         // return success
-         return TRUE;
-     }
- }   		
-	}
+            if($empty == FALSE)
+            {
+                // try to delete the now empty directory
+                if(!@rmdir($directory))
+                {
+                    // return false if not possible
+                    return FALSE;
+                }
+            }
+            // return success
+            return TRUE;
+        }
+    }   		
+    }
 
 ?>
\ No newline at end of file

Spacing +77 added lines, -77 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
@@ -26,12 +26,12 @@ 
 		 */
 		function __construct($path = null)
 		{
-			if(!is_null($path))
+			if (!is_null($path))
 			{
-			if(file_exists($path))
+			if (file_exists($path))
 			{
 				$this->filePath = $path;
-				if(is_file($this->filePath))
+				if (is_file($this->filePath))
 				{
 					$this->fileStat = @stat($path);
 					$this->fileInfo['size'] = $this->fileStat[7];
@@ -43,17 +43,17 @@ 
 					$this->fileInfo['is_writable'] = $this->isWritable();
 					$this->fileInfo['is_readable'] = $this->isReadable();
 					$imageSize = @getimagesize($path);
-					if(is_array($imageSize) && !empty($imageSize))
+					if (is_array($imageSize) && !empty($imageSize))
 					{
 						$this->fileInfo['is_image'] = 1;
 						$this->fileInfo['x'] = $imageSize[0];
 						$this->fileInfo['y'] = $imageSize[1];
-					}else 
+					} else 
 					{
 						$this->fileInfo['is_image'] = 0;
 					}
 					
-				}elseif(is_dir($this->filePath))
+				}elseif (is_dir($this->filePath))
 				{
 					$this->fileStat = @stat($path);
 					$this->fileInfo['name'] = basename($path);
@@ -64,7 +64,7 @@ 
 					$this->fileInfo['is_writable'] = $this->isWritable();
 					$this->fileInfo['is_readable'] = $this->isReadable();					
 				}
-			}else 
+			} else 
 			{
 				trigger_error('File does not exist ', E_USER_NOTICE);	
 			}				
@@ -78,7 +78,7 @@ 
 		 *
 		 * @param string $path
 		 */
-		function file($path=null)
+		function file($path = null)
 		{
 			$this->__construct($path);
 		}
@@ -90,32 +90,32 @@ 
 		 * @param file path $path
 		 * @return boolean
 		 */
-	function isWritable($path=null)
+	function isWritable($path = null)
 	{
-		$path = (is_null($path)?$this->filePath:$path);		
+		$path = (is_null($path) ? $this->filePath : $path);		
 		if (DIRECTORY_SEPARATOR == "\\")
 		{
 			$path = slashToBackslash($path);
-			if(is_file($path))
+			if (is_file($path))
 			{
-				$fp = @fopen($path,'ab');
-				if($fp)
+				$fp = @fopen($path, 'ab');
+				if ($fp)
 				{
 					@fclose($fp);
 					return true;
 				}
-			}elseif(is_dir($path))
+			}elseif (is_dir($path))
 			{
 					$path = addTrailingSlash($path);
 					$tmp = uniqid(time());
-					if (@touch($path . $tmp)) 
+					if (@touch($path.$tmp)) 
 					{
-						@unlink($path . $tmp);
+						@unlink($path.$tmp);
 						return true;
 					}			
 			}
 			return false;			
-		}else 
+		} else 
 		{
 			return @is_writable(slashToBackslash($path));
 		}
@@ -126,9 +126,9 @@ 
 	 *
 	 * @return boolean true if the files is readable.
 	 */
-	function isReadable($path =null) 
+	function isReadable($path = null) 
 	{
-		$path = is_null($path)?$this->filePath:$path;
+		$path = is_null($path) ? $this->filePath : $path;
 		return @is_readable(slashToBackslash($path));
 	}		
 	/**
@@ -138,10 +138,10 @@ 
 	 * @param string $time
 	 * @return boolean
 	 */
-	function setLastModified($path=null, $time) 
+	function setLastModified($path = null, $time) 
 	{
-		$path = is_null($path)?$this->filePath:$path;
-		$time = is_null($time)?time():$time;
+		$path = is_null($path) ? $this->filePath : $path;
+		$time = is_null($time) ? time() : $time;
 		return @touch(slashToBackslash($path), $time);
 	}
 
@@ -153,18 +153,18 @@ 
 		 * @dirOwner
 		 * @return boolean
 		 */
-		function mkdir($path = null, $mask=null, $dirOwner='') 
+		function mkdir($path = null, $mask = null, $dirOwner = '') 
 		{
-			$path = is_null($path)?$this->filePath:$path;
-			if(!file_exists($path))
+			$path = is_null($path) ? $this->filePath : $path;
+			if (!file_exists($path))
 			{
-				$mask = is_null($mask)?$this->mask:$mask;				
+				$mask = is_null($mask) ? $this->mask : $mask;				
 				$status = @mkdir(slashToBackslash($path));			
 				if ($mask)
 				{
 					@chmod(slashToBackslash($path), intval($mask, 8));
 				}					
-				if($dirOwner)
+				if ($dirOwner)
 				{
 					$this->chown(slashToBackslash($path), $dirOwner);
 				}
@@ -181,12 +181,12 @@ 
 	 */
 	function chown($path, $owner) 
 	{
-		if(!empty($owner))
+		if (!empty($owner))
 		{
 			$owners = explode(":", $owner);
-			if(!empty($owners[0]))
+			if (!empty($owners[0]))
 				@chown($path, $owners[0]);
-			if(!empty($owners[1]))
+			if (!empty($owners[1]))
 				@chgrp($path, $owner[1]);
 		}
 	}	
@@ -204,56 +204,56 @@ 
     {
     	$source = removeTrailingSlash(backslashToSlash($source));
     	$dest = removeTrailingSlash(backslashToSlash($dest));
-	 		if(!file_exists($dest) || !is_dir($dest))
+	 		if (!file_exists($dest) || !is_dir($dest))
 			{
-				if(!$this->mkdir($dest))
+				if (!$this->mkdir($dest))
 				{
-					$this->_debug('Unable to create folder (' . $dest . ")");
+					$this->_debug('Unable to create folder ('.$dest.")");
 					return false;
 				}					
 			}
 					// Copy in to your self?
-				if (getAbsPath($source) ==  getAbsPath($dest))
+				if (getAbsPath($source) == getAbsPath($dest))
 				{
-					$this->_debug('Unable to copy itself. source: ' . getAbsPath($source) . "; dest: " . getAbsPath($dest));
+					$this->_debug('Unable to copy itself. source: '.getAbsPath($source)."; dest: ".getAbsPath($dest));
 					return false;		
 				}
         // Simple copy for a file
         if (is_file($source))
         {        	
-        		$dest = addTrailingSlash($dest) . (basename($source));
-        	if(file_exists($dest))
+        		$dest = addTrailingSlash($dest).(basename($source));
+        	if (file_exists($dest))
         	{
         		return false;
-        	}else {
+        	} else {
         		
         		return copy($source, $dest);
         	}
             
             
-        }elseif(is_dir($source))
+        }elseif (is_dir($source))
         {
 	        // Loop through the folder
-	           if(file_exists(addTrailingSlash($dest) . basename($source)))
+	           if (file_exists(addTrailingSlash($dest).basename($source)))
 	           {
 	           	return false;
-	           }else 
+	           } else 
 	           {
-			 		if(!file_exists(addTrailingSlash($dest) . basename($source)) || !is_dir(addTrailingSlash($dest) . basename($source)))
+			 		if (!file_exists(addTrailingSlash($dest).basename($source)) || !is_dir(addTrailingSlash($dest).basename($source)))
 					{
-						if(!$this->mkdir(addTrailingSlash($dest) . basename($source)))
+						if (!$this->mkdir(addTrailingSlash($dest).basename($source)))
 						{
-							$this->_debug('Unable to create folder (' . addTrailingSlash($dest) . basename($source) . ")");
+							$this->_debug('Unable to create folder ('.addTrailingSlash($dest).basename($source).")");
 							return false;
 						}					
 					}	        	
 		        $handle = opendir($source);
-		        while(false !== ($readdir = readdir($handle)))
+		        while (false !== ($readdir = readdir($handle)))
 		        {
-		            if($readdir != '.' && $readdir != '..')
+		            if ($readdir != '.' && $readdir != '..')
 		            {	  
 		            	$path = addTrailingSlash($source).'/'.$readdir;    
-		            	$this->copyTo($path, addTrailingSlash($dest) . basename($source));
+		            	$this->copyTo($path, addTrailingSlash($dest).basename($source));
 		            }
 		        }
 		         closedir($handle);
@@ -275,28 +275,28 @@ 
     	
     	$folderPath = addslashes(backslashToSlash(getParentPath($fileToMove)));
     	$destFolder = addslashes(backslashToSlash(getParentPath($destFolder)));
-    	$finalPath = $destFolder . basename($fileToMove);
-    	if(file_exists($fileToMove))
+    	$finalPath = $destFolder.basename($fileToMove);
+    	if (file_exists($fileToMove))
     	{
-    		if(is_file())
+    		if (is_file())
     		{
     			$fileExt = getFileExt($fileToMove);
-    			$fileBaseName = basename($fileToMove, '.' . $fileExt);
+    			$fileBaseName = basename($fileToMove, '.'.$fileExt);
     			$count = 1;
-    			while(file_exists($destFolder . $fileBaseName . $count . "." . $fileExt))
+    			while (file_exists($destFolder.$fileBaseName.$count.".".$fileExt))
     			{
     				$count++;
     			}
-    			$filePath = $destFolder . $fileBaseName . $count . "." . $fileExt;
-    		}elseif(is_dir())
+    			$filePath = $destFolder.$fileBaseName.$count.".".$fileExt;
+    		}elseif (is_dir())
     		{
     			$folderName = basename($fileToMove);
      			$count = 1;
-    			while(file_exists($destFolder . $folderName . $count))
+    			while (file_exists($destFolder.$folderName.$count))
     			{
     				$count++;
     			}
-    			$filePath = $destFolder . $fileBaseName . $count;   			
+    			$filePath = $destFolder.$fileBaseName.$count;   			
     		}
     		
     	}
@@ -328,13 +328,13 @@ 
 	 */
 	function delete($path = null)
 	{
-		$path = is_null($path)?$this->filePath:$path;
-		if(file_exists($path))
+		$path = is_null($path) ? $this->filePath : $path;
+		if (file_exists($path))
 		{
-			if(is_file($path))
+			if (is_file($path))
 			{
 				return @unlink($path);
-			}elseif(is_dir($path))
+			}elseif (is_dir($path))
 			{
 				return $this->__recursive_remove_directory($path);
 			}
@@ -350,8 +350,8 @@ 
 	 */
 	function emptyFolder($path)
 	{
-		$path = is_null($path)?$this->filePath:"";
-		if(file_exists($path) && is_dir($path))
+		$path = is_null($path) ? $this->filePath : "";
+		if (file_exists($path) && is_dir($path))
 		{
 			return $this->__recursive_remove_directory($path, true);
 		}
@@ -360,10 +360,10 @@ 
 	
 	function _debug($info)
 	{
-		if($this->debug)
+		if ($this->debug)
 		{
-			echo $info . "<br>\n";
-		}else 
+			echo $info."<br>\n";
+		} else 
 		{
 			$this->errors[] = $info;
 		}
@@ -382,28 +382,28 @@ 
  * @param boolean $empty
  * @return boolean
  */
- function __recursive_remove_directory($directory, $empty=FALSE)
+ function __recursive_remove_directory($directory, $empty = FALSE)
  {
      // if the path has a slash at the end we remove it here
-     if(substr($directory,-1) == '/')
+     if (substr($directory, -1) == '/')
      {
-         $directory = substr($directory,0,-1);
+         $directory = substr($directory, 0, -1);
      }
   
      // if the path is not valid or is not a directory ...
-     if(!file_exists($directory) || !is_dir($directory))
+     if (!file_exists($directory) || !is_dir($directory))
      {
          // ... we return false and exit the function
          return FALSE;
   
      // ... if the path is not readable
-     }elseif(!is_readable($directory))
+     }elseif (!is_readable($directory))
      {
          // ... we return false and exit the function
          return FALSE;
   
      // ... else if the path is readable
-     }else{
+     } else {
   
          // we open the directory
          $handle = @opendir($directory);
@@ -413,18 +413,18 @@ 
          {
              // if the filepointer is not the current directory
              // or the parent directory
-             if($item != '.' && $item != '..')
+             if ($item != '.' && $item != '..')
              {
                  // we build the new path to delete
                  $path = $directory.'/'.$item;
   
                  // if the new path is a directory
-                 if(is_dir($path))                  {
+                 if (is_dir($path)) {
                      // we call this function with the new path
                      $this->__recursive_remove_directory($path);
   
                  // if the new path is a file
-                 }else{
+                 } else {
                     // we remove the file
                     @unlink($path);
                  }
@@ -434,10 +434,10 @@ 
          @closedir($handle);
   
         // if the option to empty is not set to true
-         if($empty == FALSE)
+         if ($empty == FALSE)
          {
              // try to delete the now empty directory
-             if(!@rmdir($directory))
+             if (!@rmdir($directory))
              {
                  // return false if not possible
                  return FALSE;

Braces +20 added lines, -18 removed lines

@@ -48,12 +48,12 @@ 
 						$this->fileInfo['is_image'] = 1;
 						$this->fileInfo['x'] = $imageSize[0];
 						$this->fileInfo['y'] = $imageSize[1];
-					}else 
+					} else 
 					{
 						$this->fileInfo['is_image'] = 0;
 					}
 					
-				}elseif(is_dir($this->filePath))
+				} elseif(is_dir($this->filePath))
 				{
 					$this->fileStat = @stat($path);
 					$this->fileInfo['name'] = basename($path);
@@ -64,7 +64,7 @@ 
 					$this->fileInfo['is_writable'] = $this->isWritable();
 					$this->fileInfo['is_readable'] = $this->isReadable();					
 				}
-			}else 
+			} else 
 			{
 				trigger_error('File does not exist ', E_USER_NOTICE);	
 			}				
@@ -104,7 +104,7 @@ 
 					@fclose($fp);
 					return true;
 				}
-			}elseif(is_dir($path))
+			} elseif(is_dir($path))
 			{
 					$path = addTrailingSlash($path);
 					$tmp = uniqid(time());
@@ -115,7 +115,7 @@ 
 					}			
 			}
 			return false;			
-		}else 
+		} else 
 		{
 			return @is_writable(slashToBackslash($path));
 		}
@@ -184,10 +184,12 @@ 
 		if(!empty($owner))
 		{
 			$owners = explode(":", $owner);
-			if(!empty($owners[0]))
-				@chown($path, $owners[0]);
-			if(!empty($owners[1]))
-				@chgrp($path, $owner[1]);
+			if(!empty($owners[0])) {
+							@chown($path, $owners[0]);
+			}
+			if(!empty($owners[1])) {
+							@chgrp($path, $owner[1]);
+			}
 		}
 	}	
 
@@ -225,19 +227,19 @@ 
         	if(file_exists($dest))
         	{
         		return false;
-        	}else {
+        	} else {
         		
         		return copy($source, $dest);
         	}
             
             
-        }elseif(is_dir($source))
+        } elseif(is_dir($source))
         {
 	        // Loop through the folder
 	           if(file_exists(addTrailingSlash($dest) . basename($source)))
 	           {
 	           	return false;
-	           }else 
+	           } else 
 	           {
 			 		if(!file_exists(addTrailingSlash($dest) . basename($source)) || !is_dir(addTrailingSlash($dest) . basename($source)))
 					{
@@ -288,7 +290,7 @@ 
     				$count++;
     			}
     			$filePath = $destFolder . $fileBaseName . $count . "." . $fileExt;
-    		}elseif(is_dir())
+    		} elseif(is_dir())
     		{
     			$folderName = basename($fileToMove);
      			$count = 1;
@@ -334,7 +336,7 @@ 
 			if(is_file($path))
 			{
 				return @unlink($path);
-			}elseif(is_dir($path))
+			} elseif(is_dir($path))
 			{
 				return $this->__recursive_remove_directory($path);
 			}
@@ -363,7 +365,7 @@ 
 		if($this->debug)
 		{
 			echo $info . "<br>\n";
-		}else 
+		} else 
 		{
 			$this->errors[] = $info;
 		}
@@ -397,13 +399,13 @@ 
          return FALSE;
   
      // ... if the path is not readable
-     }elseif(!is_readable($directory))
+     } elseif(!is_readable($directory))
      {
          // ... we return false and exit the function
          return FALSE;
   
      // ... else if the path is readable
-     }else{
+     } else{
   
          // we open the directory
          $handle = @opendir($directory);
@@ -424,7 +426,7 @@ 
                      $this->__recursive_remove_directory($path);
   
                  // if the new path is a file
-                 }else{
+                 } else{
                     // we remove the file
                     @unlink($path);
                  }

phpmyfaq/admin/editor/plugins/ajaxfilemanager/inc/class.history.php

Doc Comments +1 added lines, -2 removed lines

@@ -47,7 +47,6 @@ 
 		/**
 		 * keep tracks of each changes made to an image
 		 *
-		 * @param string $key
 		 * @param string $info   array('name', 'restorable', 'is_original')
 		 */
 		function add($info)
@@ -57,7 +56,7 @@ 
 		/**
 		 * get the lastest changes for restore
 		 *
-		 * @return array array('name', 'restorable', 'is_original')
+		 * @return integer array('name', 'restorable', 'is_original')
 		 */
 		function getNumRestorable()
 		{

Indentation +145 added lines, -145 removed lines

@@ -1,160 +1,160 @@
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php
-	/**
-	 * class history
-	 * this class used to keep records of any changed to uploaded images under a session
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/May/2007
-	 *
-	 */
-	class History
-	{
-		var $history = array(); //keep all changes
-		var $path = ''; //path to the iamge
-		var $session = null;
-		/**
-		 * constructor
-		 *
-		 * @param string $path the path to the image 
-		 * @param object $session an instance of session class
-		 */
-		function __construct($path, &$session)
-		{
-			$this->path = $path;
-			$this->session = &$session;
-			if(!isset($_SESSION[$this->path]))
-			{
-				$_SESSION[$this->path] = array();
-			}
+    /**
+     * class history
+     * this class used to keep records of any changed to uploaded images under a session
+     * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @link www.phpletter.com
+     * @since 22/May/2007
+     *
+     */
+    class History
+    {
+        var $history = array(); //keep all changes
+        var $path = ''; //path to the iamge
+        var $session = null;
+        /**
+         * constructor
+         *
+         * @param string $path the path to the image 
+         * @param object $session an instance of session class
+         */
+        function __construct($path, &$session)
+        {
+            $this->path = $path;
+            $this->session = &$session;
+            if(!isset($_SESSION[$this->path]))
+            {
+                $_SESSION[$this->path] = array();
+            }
 			
-		}
-		/**
-		 * constructor
-		 *
-		 * @param string $path the path to the image 
-		 * @param object $session an instance of session class
-		 */		
-		function History($path, &$session)
-		{
-			$this->__construct($path, $session);
-		}
+        }
+        /**
+         * constructor
+         *
+         * @param string $path the path to the image 
+         * @param object $session an instance of session class
+         */		
+        function History($path, &$session)
+        {
+            $this->__construct($path, $session);
+        }
 
-		/**
-		 * keep tracks of each changes made to an image
-		 *
-		 * @param string $key
-		 * @param string $info   array('name', 'restorable', 'is_original')
-		 */
-		function add($info)
-		{
-			$_SESSION[$this->path][] = $info;
-		}
-		/**
-		 * get the lastest changes for restore
-		 *
-		 * @return array array('name', 'restorable', 'is_original')
-		 */
-		function getNumRestorable()
-		{
-			$output = 0;
-			if(isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]))
-			{
-				foreach($_SESSION[$this->path] as $k=>$v)
-				{
-					if(!empty($v['restorable']) && empty($v['is_original']))
-					{
-						if(file_exists($this->session->getSessionDir() . $v['name']))
-						{
-							$output++;
-						}else 
-						{
+        /**
+         * keep tracks of each changes made to an image
+         *
+         * @param string $key
+         * @param string $info   array('name', 'restorable', 'is_original')
+         */
+        function add($info)
+        {
+            $_SESSION[$this->path][] = $info;
+        }
+        /**
+         * get the lastest changes for restore
+         *
+         * @return array array('name', 'restorable', 'is_original')
+         */
+        function getNumRestorable()
+        {
+            $output = 0;
+            if(isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]))
+            {
+                foreach($_SESSION[$this->path] as $k=>$v)
+                {
+                    if(!empty($v['restorable']) && empty($v['is_original']))
+                    {
+                        if(file_exists($this->session->getSessionDir() . $v['name']))
+                        {
+                            $output++;
+                        }else 
+                        {
 							
-						}
+                        }
 						
-					}
-				}
-			}
-			return $output;
-		}
+                    }
+                }
+            }
+            return $output;
+        }
 
-		/**
-		 * get the path of image which keep the lastest changes
-		 *
-		 * @return  return empty array when failed
-		 */
-		function getLastestRestorable()
-		{
-			if(isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]) && sizeof($_SESSION[$this->path]))
-			{	
-				$sessionImages = array_reverse($_SESSION[$this->path], true);
-				$lastestKey = '';
-				foreach($sessionImages as $k=>$v)
-				{
-					if($v['restorable'] && empty($v['is_original']) && file_exists($this->session->getSessionDir() . $v['name']))
-					{
-						return $sessionImages[$k];
-					}
-				}							
+        /**
+         * get the path of image which keep the lastest changes
+         *
+         * @return  return empty array when failed
+         */
+        function getLastestRestorable()
+        {
+            if(isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]) && sizeof($_SESSION[$this->path]))
+            {	
+                $sessionImages = array_reverse($_SESSION[$this->path], true);
+                $lastestKey = '';
+                foreach($sessionImages as $k=>$v)
+                {
+                    if($v['restorable'] && empty($v['is_original']) && file_exists($this->session->getSessionDir() . $v['name']))
+                    {
+                        return $sessionImages[$k];
+                    }
+                }							
 				
-			}
-			return  array();
+            }
+            return  array();
 			
-		}
-		/**
-		 * get the original image which is kept in the session folder
-		 *
-		 * @return array
-		 */
-		function getOriginalImage()
-		{
-			$outputs = array();
-			if(isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]))
-			{
-				$sessionImages = array_reverse($_SESSION[$this->path], true);
-				foreach($sessionImages as $k=>$v)
-				{
-					if(!empty($v['is_original']))
-					{
-						if(file_exists($this->session->getSessionDir() . $v['name']))
-						{
-							return array('info'=>$_SESSION[$this->path][$k], 'key'=>$k);
-						}
+        }
+        /**
+         * get the original image which is kept in the session folder
+         *
+         * @return array
+         */
+        function getOriginalImage()
+        {
+            $outputs = array();
+            if(isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]))
+            {
+                $sessionImages = array_reverse($_SESSION[$this->path], true);
+                foreach($sessionImages as $k=>$v)
+                {
+                    if(!empty($v['is_original']))
+                    {
+                        if(file_exists($this->session->getSessionDir() . $v['name']))
+                        {
+                            return array('info'=>$_SESSION[$this->path][$k], 'key'=>$k);
+                        }
 						
-					}
-				}
-			}	
-			return $outputs;
+                    }
+                }
+            }	
+            return $outputs;
 				
-		}
-		/**
-		 * remove the lastest restorable state
-		 *
-		 * @return boolean
-		 */
-		function restore()
-		{
-			if(isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]) && sizeof($_SESSION[$this->path]))
-			{
-				$sessionImages = array_reverse($_SESSION[$this->path], true);
-				$lastestKey = '';
-				foreach($sessionImages as $k=>$v)
-				{
-					if($v['restorable'] && empty($v['is_original']))
-					{
-						unset($_SESSION[$k]);
-						return true;
-					}
-				}
-			}
-			return false;		
-		}
+        }
+        /**
+         * remove the lastest restorable state
+         *
+         * @return boolean
+         */
+        function restore()
+        {
+            if(isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]) && sizeof($_SESSION[$this->path]))
+            {
+                $sessionImages = array_reverse($_SESSION[$this->path], true);
+                $lastestKey = '';
+                foreach($sessionImages as $k=>$v)
+                {
+                    if($v['restorable'] && empty($v['is_original']))
+                    {
+                        unset($_SESSION[$k]);
+                        return true;
+                    }
+                }
+            }
+            return false;		
+        }
 
 		
 		
-	}
+    }
 ?>
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
@@ -27,7 +27,7 @@ 
 		{
 			$this->path = $path;
 			$this->session = &$session;
-			if(!isset($_SESSION[$this->path]))
+			if (!isset($_SESSION[$this->path]))
 			{
 				$_SESSION[$this->path] = array();
 			}
@@ -62,16 +62,16 @@ 
 		function getNumRestorable()
 		{
 			$output = 0;
-			if(isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]))
+			if (isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]))
 			{
-				foreach($_SESSION[$this->path] as $k=>$v)
+				foreach ($_SESSION[$this->path] as $k=>$v)
 				{
-					if(!empty($v['restorable']) && empty($v['is_original']))
+					if (!empty($v['restorable']) && empty($v['is_original']))
 					{
-						if(file_exists($this->session->getSessionDir() . $v['name']))
+						if (file_exists($this->session->getSessionDir().$v['name']))
 						{
 							$output++;
-						}else 
+						} else 
 						{
 							
 						}
@@ -89,13 +89,13 @@ 
 		 */
 		function getLastestRestorable()
 		{
-			if(isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]) && sizeof($_SESSION[$this->path]))
+			if (isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]) && sizeof($_SESSION[$this->path]))
 			{	
 				$sessionImages = array_reverse($_SESSION[$this->path], true);
 				$lastestKey = '';
-				foreach($sessionImages as $k=>$v)
+				foreach ($sessionImages as $k=>$v)
 				{
-					if($v['restorable'] && empty($v['is_original']) && file_exists($this->session->getSessionDir() . $v['name']))
+					if ($v['restorable'] && empty($v['is_original']) && file_exists($this->session->getSessionDir().$v['name']))
 					{
 						return $sessionImages[$k];
 					}
@@ -113,14 +113,14 @@ 
 		function getOriginalImage()
 		{
 			$outputs = array();
-			if(isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]))
+			if (isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]))
 			{
 				$sessionImages = array_reverse($_SESSION[$this->path], true);
-				foreach($sessionImages as $k=>$v)
+				foreach ($sessionImages as $k=>$v)
 				{
-					if(!empty($v['is_original']))
+					if (!empty($v['is_original']))
 					{
-						if(file_exists($this->session->getSessionDir() . $v['name']))
+						if (file_exists($this->session->getSessionDir().$v['name']))
 						{
 							return array('info'=>$_SESSION[$this->path][$k], 'key'=>$k);
 						}
@@ -138,13 +138,13 @@ 
 		 */
 		function restore()
 		{
-			if(isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]) && sizeof($_SESSION[$this->path]))
+			if (isset($_SESSION[$this->path]) && is_array($_SESSION[$this->path]) && sizeof($_SESSION[$this->path]))
 			{
 				$sessionImages = array_reverse($_SESSION[$this->path], true);
 				$lastestKey = '';
-				foreach($sessionImages as $k=>$v)
+				foreach ($sessionImages as $k=>$v)
 				{
-					if($v['restorable'] && empty($v['is_original']))
+					if ($v['restorable'] && empty($v['is_original']))
 					{
 						unset($_SESSION[$k]);
 						return true;

Braces +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 						if(file_exists($this->session->getSessionDir() . $v['name']))
 						{
 							$output++;
-						}else 
+						} else 
 						{
 							
 						}

phpmyfaq/admin/editor/plugins/ajaxfilemanager/inc/class.image.php

Doc Comments +4 added lines, -7 removed lines

@@ -85,7 +85,6 @@ 
 	    /**
 		 * append to errors array and shown the each error when the debug turned on  
 		 * 
-		 * @param  string $string
 		 * @return void
      * @access private
      * @copyright this function originally come from Andy's php 
@@ -349,7 +348,7 @@ 
      * @param boolean $unchangeIfsmaller keep the orignial size if the orignial smaller than the new size
      * 
      *
-     * @return mixed none or PEAR_error
+     * @return boolean none or PEAR_error
      */
 	function resize( $new_x, $new_y, $constraint= false, $unchangeIfsmaller=false)
 	{
@@ -414,11 +413,9 @@ 
  	/**
      * resize the image and return the thumbnail image  details array("width"=>, "height"=>, "name")
      *
-     * @param string $fileName 
      * @param int $new_x the thumbnail width
      * @param int $new_y the thumbnail height
-     * @param string $mode can be save, view and both
-     * @return unknown
+     * @return boolean
      */
 	function _resize( $new_x, $new_y) 
 	{
@@ -576,7 +573,7 @@ 
     /**
      * flip horizontal
      *
-     * @return string
+     * @return boolean
      */
     function flipHorizontal()
     {
@@ -791,7 +788,7 @@ 
      *  @access private
      *  @param $dst_w width
      * 	@param $dst_h height
-     * 	@return boolean
+     * 	@return boolean|null
      * 	@copyright original from noname at nivelzero dot ro
      */
     function _createFinalImageHandler($dst_w, $dst_h)

Indentation +379 added lines, -379 removed lines

@@ -1,98 +1,98 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php
-	/**
-	 * this class provide functions to edit an image, e.g. resize, rotate, flip, crop
-	 * @author Logan Cai cailongqun [at] yahoo [dot] com [dot] cn
-	 * @link  www.phpletter.com
-	 * @version 0.9
-	 * @since 14/May/2007
-	 * @name Image
-	 * 
-	 */
+    /**
+     * this class provide functions to edit an image, e.g. resize, rotate, flip, crop
+     * @author Logan Cai cailongqun [at] yahoo [dot] com [dot] cn
+     * @link  www.phpletter.com
+     * @version 0.9
+     * @since 14/May/2007
+     * @name Image
+     * 
+     */
 	
 	
 	
 	
-	class Image
-	{
-		var $_debug = false; 
-		var $_errors = array();
-		var $gdInfo = array(); //keep all information of GD extension
-		var $_imgOrig = null; //the hanlder of original image
-		var $_imgFinal = null; //the handler of final image
-		var $imageFile  = null;  
+    class Image
+    {
+        var $_debug = false; 
+        var $_errors = array();
+        var $gdInfo = array(); //keep all information of GD extension
+        var $_imgOrig = null; //the hanlder of original image
+        var $_imgFinal = null; //the handler of final image
+        var $imageFile  = null;  
     var $transparentColorRed = null;
     var $transparentColorGreen = null;
     var $transparentColorBlue = null;		 
     var $chmod = 0755;
     var $_imgInfoOrig = array(
-    	'name'=>'',
-    	'ext'=>'',
-    	'size'=>'',
-    	'width'=>'',
-    	'height'=>'',
-    	'type'=>'',
-    	'path'=>'',
+        'name'=>'',
+        'ext'=>'',
+        'size'=>'',
+        'width'=>'',
+        'height'=>'',
+        'type'=>'',
+        'path'=>'',
     );    
     var $_imgInfoFinal = array(
-    	'name'=>'',
-    	'ext'=>'',
-    	'size'=>'',
-    	'width'=>'',
-    	'height'=>'', 
-    	'type'=>'',   
-    	'path'=>'',
+        'name'=>'',
+        'ext'=>'',
+        'size'=>'',
+        'width'=>'',
+        'height'=>'', 
+        'type'=>'',   
+        'path'=>'',
     );		
-		var $_imgQuality = 90;
-		/**
-		 * constructor
-		 *
-		 * @param boolean $debug
-		 * @return Image
-		 */
+        var $_imgQuality = 90;
+        /**
+         * constructor
+         *
+         * @param boolean $debug
+         * @return Image
+         */
 		
-		function __construct($debug = false)
-		{
-			$this->enableDebug($debug);
-			$this->gdInfo = $this->getGDInfo();			
-		}
-		function Image($debug = false)
-		{
-			$this->__construct($debug);
-		}
-		/**
-		 * enable to debug
-		 *
-		 * @param boolean $value
-		 */
-		function enableDebug($value)
-		{
-			$this->_debug = ($value?true:false);
-		}
-		/**
-		 * check if debug enable
-		 * @return boolean
-		 */
-		function _isDebugEnable()
-		{
-			return $this->_debug;
-		}
+        function __construct($debug = false)
+        {
+            $this->enableDebug($debug);
+            $this->gdInfo = $this->getGDInfo();			
+        }
+        function Image($debug = false)
+        {
+            $this->__construct($debug);
+        }
+        /**
+         * enable to debug
+         *
+         * @param boolean $value
+         */
+        function enableDebug($value)
+        {
+            $this->_debug = ($value?true:false);
+        }
+        /**
+         * check if debug enable
+         * @return boolean
+         */
+        function _isDebugEnable()
+        {
+            return $this->_debug;
+        }
 
-	    /**
-		 * append to errors array and shown the each error when the debug turned on  
-		 * 
-		 * @param  string $string
-		 * @return void
-     * @access private
-     * @copyright this function originally come from Andy's php 
-	 */
+        /**
+         * append to errors array and shown the each error when the debug turned on  
+         * 
+         * @param  string $string
+         * @return void
+         * @access private
+         * @copyright this function originally come from Andy's php 
+         */
     function _debug($value)
     {
-    		$this->_errors[] = $value;
+            $this->_errors[] = $value;
         if ($this->_debug) 
         {
             echo $value . "<br />\n";
@@ -104,13 +104,13 @@ 
      */
     function showErrors()
     {
-    	if(sizeof($this->_errors))
-    	{
-    		foreach($this->_errors as $error)
-    		{
-    			echo $error . "<br />\n";
-    		}
-    	}
+        if(sizeof($this->_errors))
+        {
+            foreach($this->_errors as $error)
+            {
+                echo $error . "<br />\n";
+            }
+        }
     }
     /**
      * Load an image from the file system.
@@ -130,7 +130,7 @@ 
         }
         if($ext == "gif")
         {
-             // the following part gets the transparency color for a gif file
+                // the following part gets the transparency color for a gif file
             // this code is from the PHP manual and is written by
             // fred at webblake dot net and webmaster at webnetwizard dotco dotuk, thanks!
             $fp = @fopen($filename, "rb");
@@ -153,22 +153,22 @@ 
             return false;
         }else 
         {
-        	$this->imageFile = $filename;
-			    $this->_imgInfoOrig = array(
-			    	'name'=>basename($filename),
-			    	'ext'=>$ext,
-			    	'size'=>filesize($filename),
-			    	'path'=>$filename,
-			    );        	
-			    $imgInfo = $this->_getImageInfo($filename);
-			    if(sizeof($imgInfo))
-			    {
-			    	foreach($imgInfo as $k=>$v)
-			    	{
-			    		$this->_imgInfoOrig[$k] = $v;
-			    		$this->_imgInfoFinal[$k] = $v;
-			    	}
-			    }
+            $this->imageFile = $filename;
+                $this->_imgInfoOrig = array(
+                    'name'=>basename($filename),
+                    'ext'=>$ext,
+                    'size'=>filesize($filename),
+                    'path'=>$filename,
+                );        	
+                $imgInfo = $this->_getImageInfo($filename);
+                if(sizeof($imgInfo))
+                {
+                    foreach($imgInfo as $k=>$v)
+                    {
+                        $this->_imgInfoOrig[$k] = $v;
+                        $this->_imgInfoFinal[$k] = $v;
+                    }
+                }
 			    
         }
         return true;
@@ -184,7 +184,7 @@ 
      */
     function loadImageFromString($string)
     {
-    		$this->imageFile = $filename;
+            $this->imageFile = $filename;
         $this->_imgOrig = imagecreatefromstring($string);
         if (!$this->_imgOrig) {
             $this->_debug('The image (supplied as a string) could not be created.');
@@ -239,8 +239,8 @@ 
             return false;
         }else 
         {
-        	$this->_imgInfoFinal['size'] = @filesize($filename);
-        	@chmod($filename, intval($this->chmod, 8));
+            $this->_imgInfoFinal['size'] = @filesize($filename);
+            @chmod($filename, intval($this->chmod, 8));
         }
 
         return true;
@@ -290,16 +290,16 @@ 
     }    
     
     /**
-	 * Used for cropping image
-	 * 
-	 * @param  int $dst_x
-	 * @param  int $dst_y
-	 * @param  int $dst_w
-	 * @param  int $dst_h
-	 * @return bool
+     * Used for cropping image
+     * 
+     * @param  int $dst_x
+     * @param  int $dst_y
+     * @param  int $dst_w
+     * @param  int $dst_h
+     * @return bool
      * @access public
      * @copyright this function originally come from Andy's php 
-	 */  
+     */  
     function crop($dst_x, $dst_y, $dst_w, $dst_h)
     {
         if ($this->_imgOrig == null) {
@@ -317,18 +317,18 @@ 
         $this->_createFinalImageHandler($dst_w, $dst_h);
         if ($this->gdInfo['Truecolor Support']) 
         {
-            	if(!@imagecopyresampled($this->_imgFinal, $this->_imgOrig, 0, 0, $dst_x, $dst_y, $dst_w, $dst_h, $dst_w, $dst_h))
-            	{
-            		$this->_debug('Unable crop the image.');
-            		return false;
-            	}            
+                if(!@imagecopyresampled($this->_imgFinal, $this->_imgOrig, 0, 0, $dst_x, $dst_y, $dst_w, $dst_h, $dst_w, $dst_h))
+                {
+                    $this->_debug('Unable crop the image.');
+                    return false;
+                }            
         } else 
         {
-          	if(!@imagecopyresized($this->_imgFinal, $this->_imgOrig, 0, 0, $dst_x, $dst_y, $dst_w, $dst_h, $dst_w, $dst_h))
-          	{
-           		$this->_debug('Unable crop the image.');
-          		return false;           		
-          	}
+                if(!@imagecopyresized($this->_imgFinal, $this->_imgOrig, 0, 0, $dst_x, $dst_y, $dst_w, $dst_h, $dst_w, $dst_h))
+                {
+                    $this->_debug('Unable crop the image.');
+                    return false;           		
+                }
             
         }
         $this->_imgInfoFinal['width'] = $dst_w;
@@ -337,7 +337,7 @@ 
     }
   
     
-	/**
+    /**
      * Resize the Image in the X and/or Y direction
      * If either is 0 it will be scaled proportionally
      *
@@ -351,123 +351,123 @@ 
      *
      * @return mixed none or PEAR_error
      */
-	function resize( $new_x, $new_y, $constraint= false, $unchangeIfsmaller=false)
-	{
-		if(!$this->_imgOrig)
-		{
-			$this->_debug('No image fould.');
-			return false;
-		}		
+    function resize( $new_x, $new_y, $constraint= false, $unchangeIfsmaller=false)
+    {
+        if(!$this->_imgOrig)
+        {
+            $this->_debug('No image fould.');
+            return false;
+        }		
 		
-		$new_x = intval($new_x);
-		$new_y = intval($new_y);
-		if($new_x <=0 || $new_y <= 0)
-		{
-			$this->_debug('either of new width or height can be zeor or less.');
-		}else 
-		{
+        $new_x = intval($new_x);
+        $new_y = intval($new_y);
+        if($new_x <=0 || $new_y <= 0)
+        {
+            $this->_debug('either of new width or height can be zeor or less.');
+        }else 
+        {
 		
-			if($constraint)
-			{
-				if($new_x < 1 && $new_y < 1)
-				{
-					$new_x = $this->_imgInfoOrig['width'];
-					$new_y = $this->_imgInfoOrig['height'];
-				}elseif($new_x < 1)
-				{
-					$new_x = floor($new_y / $this->_imgInfoOrig['height'] * $this->_imgInfoOrig['width']);
+            if($constraint)
+            {
+                if($new_x < 1 && $new_y < 1)
+                {
+                    $new_x = $this->_imgInfoOrig['width'];
+                    $new_y = $this->_imgInfoOrig['height'];
+                }elseif($new_x < 1)
+                {
+                    $new_x = floor($new_y / $this->_imgInfoOrig['height'] * $this->_imgInfoOrig['width']);
 	
-				}elseif($new_y < 1)
-				{
-					$new_y = floor($new_x / $this->_imgInfoOrig['width'] * $this->_imgInfoOrig['height']);
-				}else
-				{
-					$scale = min($new_x/$this->_imgInfoOrig['width'], $new_y/$this->_imgInfoOrig['height']) ;
-					$new_x = floor($scale*$this->_imgInfoOrig['width']);
-					$new_y = floor($scale*$this->_imgInfoOrig['height']);
-				}						
-			}
-			if($unchangeIfsmaller)
-			{
-				if($this->_imgInfoOrig['width'] < $new_x && $this->_imgInfoOrig['height'] < $new_y )
-				{
-					$new_x = $this->_imgInfoOrig['width'];
-					$new_y = $this->_imgInfoOrig['height'];
-				}
-			}
+                }elseif($new_y < 1)
+                {
+                    $new_y = floor($new_x / $this->_imgInfoOrig['width'] * $this->_imgInfoOrig['height']);
+                }else
+                {
+                    $scale = min($new_x/$this->_imgInfoOrig['width'], $new_y/$this->_imgInfoOrig['height']) ;
+                    $new_x = floor($scale*$this->_imgInfoOrig['width']);
+                    $new_y = floor($scale*$this->_imgInfoOrig['height']);
+                }						
+            }
+            if($unchangeIfsmaller)
+            {
+                if($this->_imgInfoOrig['width'] < $new_x && $this->_imgInfoOrig['height'] < $new_y )
+                {
+                    $new_x = $this->_imgInfoOrig['width'];
+                    $new_y = $this->_imgInfoOrig['height'];
+                }
+            }
 		
 			
 			
-			if(is_null($this->_imgOrig))
-			{
-				$this->loadImage($filePath);
-			}
-			if(sizeof($this->_errors) == 0)
-			{
-				return $this->_resize($new_x, $new_y);
-			}			
-		}
+            if(is_null($this->_imgOrig))
+            {
+                $this->loadImage($filePath);
+            }
+            if(sizeof($this->_errors) == 0)
+            {
+                return $this->_resize($new_x, $new_y);
+            }			
+        }
 
-		return false;
+        return false;
 		
-	} // End resize    
- 	/**
-     * resize the image and return the thumbnail image  details array("width"=>, "height"=>, "name")
-     *
-     * @param string $fileName 
-     * @param int $new_x the thumbnail width
-     * @param int $new_y the thumbnail height
-     * @param string $mode can be save, view and both
-     * @return unknown
-     */
-	function _resize( $new_x, $new_y) 
-	{
-		$this->_createFinalImageHandler($new_x, $new_y);
+    } // End resize    
+        /**
+         * resize the image and return the thumbnail image  details array("width"=>, "height"=>, "name")
+         *
+         * @param string $fileName 
+         * @param int $new_x the thumbnail width
+         * @param int $new_y the thumbnail height
+         * @param string $mode can be save, view and both
+         * @return unknown
+         */
+    function _resize( $new_x, $new_y) 
+    {
+        $this->_createFinalImageHandler($new_x, $new_y);
     // hacks fot transparency of png24 files
     if ($this->_imgInfoOrig['type'] == 'png') 
     {    
         @imagealphablending($this->_imgFinal, false);
-				if(function_exists('ImageCopyResampled'))
-				{
-					@imagecopyresampled($this->_imgFinal, $this->_imgOrig, 0, 0, 0, 0, $new_x, $new_y, $this->_imgInfoOrig['width'], $this->_imgInfoOrig['height']);
-				} else {
-					@imagecopyresized($this->_imgFinal, $this->_imgOrig, 0, 0, 0, 0, $new_x, $new_y, $this->_imgInfoOrig['width'], $this->_imgInfoOrig['height']);
-				} 
+                if(function_exists('ImageCopyResampled'))
+                {
+                    @imagecopyresampled($this->_imgFinal, $this->_imgOrig, 0, 0, 0, 0, $new_x, $new_y, $this->_imgInfoOrig['width'], $this->_imgInfoOrig['height']);
+                } else {
+                    @imagecopyresized($this->_imgFinal, $this->_imgOrig, 0, 0, 0, 0, $new_x, $new_y, $this->_imgInfoOrig['width'], $this->_imgInfoOrig['height']);
+                } 
         @imagesavealpha($this->_imgFinal, true);
 
     }else 
     {//for the rest image
-			if(function_exists('ImageCopyResampled'))
-			{
-				@imagecopyresampled($this->_imgFinal, $this->_imgOrig, 0, 0, 0, 0, $new_x, $new_y, $this->_imgInfoOrig['width'], $this->_imgInfoOrig['height']);
-			} else {
-				@imagecopyresized($this->_imgFinal, $this->_imgOrig, 0, 0, 0, 0, $new_x, $new_y, $this->_imgInfoOrig['width'], $this->_imgInfoOrig['height']);
-			}    	
+            if(function_exists('ImageCopyResampled'))
+            {
+                @imagecopyresampled($this->_imgFinal, $this->_imgOrig, 0, 0, 0, 0, $new_x, $new_y, $this->_imgInfoOrig['width'], $this->_imgInfoOrig['height']);
+            } else {
+                @imagecopyresized($this->_imgFinal, $this->_imgOrig, 0, 0, 0, 0, $new_x, $new_y, $this->_imgInfoOrig['width'], $this->_imgInfoOrig['height']);
+            }    	
     }
 
 		
-		$this->_imgInfoFinal['width'] = $new_x;
-		$this->_imgInfoFinal['height'] = $new_y;
-		$this->_imgInfoFinal['name'] = basename($this->_imgInfoOrig['name']);
-		$this->_imgInfoFinal['path'] = $this->_imgInfoOrig['path'];		
-		if($this->_imgFinal)
-		{
-			return true;
-		}else 
-		{			
-			$this->_debug('Unable to resize the image on the fly.');
-			return false;
+        $this->_imgInfoFinal['width'] = $new_x;
+        $this->_imgInfoFinal['height'] = $new_y;
+        $this->_imgInfoFinal['name'] = basename($this->_imgInfoOrig['name']);
+        $this->_imgInfoFinal['path'] = $this->_imgInfoOrig['path'];		
+        if($this->_imgFinal)
+        {
+            return true;
+        }else 
+        {			
+            $this->_debug('Unable to resize the image on the fly.');
+            return false;
 							
-		}
+        }
 
-	}   
+    }   
     /**
-	 * Get the extension of a file name
-	 * 
-	 * @param  string $file
- 	 * @return string
+     * Get the extension of a file name
+     * 
+     * @param  string $file
+     * @return string
      * @copyright this function originally come from Andy's php 
-	 */
+     */
     function _getExtension($file)
     {
         $ext = '';
@@ -477,29 +477,29 @@ 
         return $ext;
     }
 
-	    /**
-		 * Validate whether image reading/writing routines are valid.
-		 * 
-		 * @param  string $filename
-		 * @param  string $extension
-		 * @param  string $function
-		 * @param  bool   $write
-		 * @return bool
-     * @access private
-     * @copyright this function originally come from Andy's php 
-	 */
+        /**
+         * Validate whether image reading/writing routines are valid.
+         * 
+         * @param  string $filename
+         * @param  string $extension
+         * @param  string $function
+         * @param  bool   $write
+         * @return bool
+         * @access private
+         * @copyright this function originally come from Andy's php 
+         */
     function _isSupported($filename, $extension, $function, $write = false)
     {
 
-       $giftype = ($write) ? ' Create Support' : ' Read Support';
+        $giftype = ($write) ? ' Create Support' : ' Read Support';
         $support = strtoupper($extension) . ($extension == 'gif' ? $giftype : ' Support');
 
         if (isset($this->gdInfo['JPG Support']) && ($extension=='jpg' || $extension=='jpeg')) 
         {
-        	$extension='jpg';
+            $extension='jpg';
         }else if (isset($this->gdInfo['JPEG Support']) && ($extension=='jpg' || $extension=='jpeg')) 
         {
-        	$extension='jpeg';
+            $extension='jpeg';
         }
         if (!isset($this->gdInfo[$support]) || $this->gdInfo[$support] == false) {
             $request = ($write) ? 'saving' : 'reading';
@@ -522,47 +522,47 @@ 
      */
     function flip($direction="horizontal")
     {
-				$this->_createFinalImageHandler($this->_imgInfoOrig['width'], $this->_imgInfoOrig['height']);
-			if($direction != "vertical")
-			{
-				$dst_x = 0;
-				$dst_y = 0;
-				$src_x = $this->_imgInfoOrig['width'] -1;
-				$src_y = 0;
-				$dst_w = $this->_imgInfoOrig['width'];
-				$dst_h = $this->_imgInfoOrig['height'];
-				$src_w = 0 - $this->_imgInfoOrig['width'];
-				$src_h = $this->_imgInfoOrig['height'];
+                $this->_createFinalImageHandler($this->_imgInfoOrig['width'], $this->_imgInfoOrig['height']);
+            if($direction != "vertical")
+            {
+                $dst_x = 0;
+                $dst_y = 0;
+                $src_x = $this->_imgInfoOrig['width'] -1;
+                $src_y = 0;
+                $dst_w = $this->_imgInfoOrig['width'];
+                $dst_h = $this->_imgInfoOrig['height'];
+                $src_w = 0 - $this->_imgInfoOrig['width'];
+                $src_h = $this->_imgInfoOrig['height'];
 				
-			}else 
-			{
-				$dst_x = 0;
-				$dst_y = 0;
-				$src_x = 0;
-				$src_y = $this->_imgInfoOrig['height'] - 1;
-				$dst_w = $this->_imgInfoOrig['width'];
-				$dst_h = $this->_imgInfoOrig['height'];
-				$src_w = $this->_imgInfoOrig['width'];
-				$src_h = 0 - $this->_imgInfoOrig['height'];				
-			}			
-				if(function_exists('ImageCopyResampled')){
-					imagecopyresampled($this->_imgFinal, $this->_imgOrig, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
-				} else {
-					imagecopyresized($this->_imgFinal, $this->_imgOrig, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
-				}
-				$this->_imgInfoFinal['width'] = $dst_w;
-				$this->_imgInfoFinal['height'] = $dst_h;
-				$this->_imgInfoFinal['name'] = basename($this->imageFile);
-				$this->_imgInfoFinal['path'] = $this->imageFile;		
-				if($this->_imgFinal)
-				{
-					return true;
-				}else 
-				{			
-					$this->_debug('Unable to resize the image on the fly.');	
-					return false;
+            }else 
+            {
+                $dst_x = 0;
+                $dst_y = 0;
+                $src_x = 0;
+                $src_y = $this->_imgInfoOrig['height'] - 1;
+                $dst_w = $this->_imgInfoOrig['width'];
+                $dst_h = $this->_imgInfoOrig['height'];
+                $src_w = $this->_imgInfoOrig['width'];
+                $src_h = 0 - $this->_imgInfoOrig['height'];				
+            }			
+                if(function_exists('ImageCopyResampled')){
+                    imagecopyresampled($this->_imgFinal, $this->_imgOrig, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
+                } else {
+                    imagecopyresized($this->_imgFinal, $this->_imgOrig, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
+                }
+                $this->_imgInfoFinal['width'] = $dst_w;
+                $this->_imgInfoFinal['height'] = $dst_h;
+                $this->_imgInfoFinal['name'] = basename($this->imageFile);
+                $this->_imgInfoFinal['path'] = $this->imageFile;		
+                if($this->_imgFinal)
+                {
+                    return true;
+                }else 
+                {			
+                    $this->_debug('Unable to resize the image on the fly.');	
+                    return false;
 								
-				}   	
+                }   	
     }
     /**
      * flip vertically
@@ -571,7 +571,7 @@ 
      */
     function flipVertical()
     {
-    	return $this->flip('vertical');
+        return $this->flip('vertical');
     }
     /**
      * flip horizontal
@@ -580,7 +580,7 @@ 
      */
     function flipHorizontal()
     {
-    	return $this->flip('horizontal');
+        return $this->flip('horizontal');
     }
 
 
@@ -600,13 +600,13 @@ 
             $outputs = gd_info();
             if(isset($outputs['JPEG Support']))
             {
-            	$outputs['JPG Support'] = $outputs['JPEG Support'];
+                $outputs['JPG Support'] = $outputs['JPEG Support'];
             }else 
             {
-	            if(isset($outputs['JPG Support']))
-	            {
-	            	$outputs['JPEG Support'] = $outputs['JPG Support'];
-	            }
+                if(isset($outputs['JPG Support']))
+                {
+                    $outputs['JPEG Support'] = $outputs['JPG Support'];
+                }
             }
             
             
@@ -663,24 +663,24 @@ 
                 $outputs['Version'] = array('major' => isset($foo[0])?$foo[0]:'', 'minor' => isset($foo[1])?$foo[1]:'', 'patch' => isset($foo[2])?$foo:"");
             }
         }
-		//print_r($outputs);
+        //print_r($outputs);
         return ($versionOnly) ? $outputs['Version'] : $outputs;
     }    
     
     /**
-	 * Destroy the resources used by the images.
-	 * 
-	 * @param  bool $original
-	 * @return void
+     * Destroy the resources used by the images.
+     * 
+     * @param  bool $original
+     * @return void
      * @access public
      * @copyright this function originally come from Andy's php 
-	 */
+     */
     function DestroyImages($original = true)
     {
-    		if(!is_null($this->_imgFinal))
-    		{
-    			@imagedestroy($this->_imgFinal);
-    		}        
+            if(!is_null($this->_imgFinal))
+            {
+                @imagedestroy($this->_imgFinal);
+            }        
         $this->_imgFinal = null;
         if ($original && !is_null($this->_imgOrig)) {
             @imagedestroy($this->_imgOrig);
@@ -688,102 +688,102 @@ 
         }
     } 
     
-	function getImageInfo($imagePath)
-	{
-		return $this->_getImageInfo($imagePath);
-	}
-	/**
+    function getImageInfo($imagePath)
+    {
+        return $this->_getImageInfo($imagePath);
+    }
+    /**
      * get image information, e.g. width, height, type
      * @access public
      * @return array
      */
-	function _getImageInfo($imagePath)
-	{
-		$outputs = array();
-		$imageInfo = @getimagesize($imagePath);
-		if ($imageInfo && is_array($imageInfo))
-		{
-			switch($imageInfo[2]){
-				case 1:
-					$type = 'gif';
-					break;
-				case 2:
-					$type = 'jpeg';
-					break;
-				case 3:
-					$type = 'png';
-					break;
-				case 4:
-					$type = 'swf';
-					break;
-				case 5:
-					$type = 'psd';
-				case 6:
-					$type = 'bmp';
-				case 7:
-				case 8:
-					$type = 'tiff';
-				default:
-					$type = '';
-			}
-			$outputs['width'] = $imageInfo[0];
-			$outputs['height'] = $imageInfo[1];
-			$outputs['type'] = $type;
-			$outputs['ext'] = $this->_getExtension($imagePath);
-		} else {
-			$this->_debug('Unable locate the image or read images information.');
-		}
-		return $outputs;
+    function _getImageInfo($imagePath)
+    {
+        $outputs = array();
+        $imageInfo = @getimagesize($imagePath);
+        if ($imageInfo && is_array($imageInfo))
+        {
+            switch($imageInfo[2]){
+                case 1:
+                    $type = 'gif';
+                    break;
+                case 2:
+                    $type = 'jpeg';
+                    break;
+                case 3:
+                    $type = 'png';
+                    break;
+                case 4:
+                    $type = 'swf';
+                    break;
+                case 5:
+                    $type = 'psd';
+                case 6:
+                    $type = 'bmp';
+                case 7:
+                case 8:
+                    $type = 'tiff';
+                default:
+                    $type = '';
+            }
+            $outputs['width'] = $imageInfo[0];
+            $outputs['height'] = $imageInfo[1];
+            $outputs['type'] = $type;
+            $outputs['ext'] = $this->_getExtension($imagePath);
+        } else {
+            $this->_debug('Unable locate the image or read images information.');
+        }
+        return $outputs;
 		
-	}
-	  function rotate($angle, $bgColor=0)
+    }
+        function rotate($angle, $bgColor=0)
     {
-    	$angle = intval($angle) -360;
-    		while($angle <0)
-    		{
-    			$angle += 360;
-    		}
+        $angle = intval($angle) -360;
+            while($angle <0)
+            {
+                $angle += 360;
+            }
  
 		
-         if($this->_imgFinal = imagerotate($this->_imgOrig, $angle, 0))
-         {
-         	return true;
-         }else 
-         {
-         	return false;
-         }
+            if($this->_imgFinal = imagerotate($this->_imgOrig, $angle, 0))
+            {
+                return true;
+            }else 
+            {
+                return false;
+            }
  
        
     }
-	/**
-	 * get the original image info
-	 *
-	 * @return array
-	 */
-	function getOriginalImageInfo()
-	{
-		return $this->_imgInfoOrig;
-	}
-	/**
-	 * return the final image info
-	 *
-	 * @return array
-	 */
-	function getFinalImageInfo()
-	{
-		if($this->_imgInfoFinal['width'] == '')
-		{
-			if(is_null($this->_imgFinal))
-			{
-				$this->_imgInfoFinal = $this->_imgInfoOrig;
-			}else 
-			{
-				$this->_imgInfoFinal['width'] = @imagesx($this->_imgFinal);
-				$this->_imgInfoFinal['height'] = @imagesy($this->_imgFinal);
-			}
-		}
-		return $this->_imgInfoFinal;
-	}
+    /**
+     * get the original image info
+     *
+     * @return array
+     */
+    function getOriginalImageInfo()
+    {
+        return $this->_imgInfoOrig;
+    }
+    /**
+     * return the final image info
+     *
+     * @return array
+     */
+    function getFinalImageInfo()
+    {
+        if($this->_imgInfoFinal['width'] == '')
+        {
+            if(is_null($this->_imgFinal))
+            {
+                $this->_imgInfoFinal = $this->_imgInfoOrig;
+            }else 
+            {
+                $this->_imgInfoFinal['width'] = @imagesx($this->_imgFinal);
+                $this->_imgInfoFinal['height'] = @imagesy($this->_imgFinal);
+            }
+        }
+        return $this->_imgInfoFinal;
+    }
 	
     /**
      *  create final image handler
@@ -796,12 +796,12 @@ 
      */
     function _createFinalImageHandler($dst_w, $dst_h)
     {
-		 		if(function_exists('ImageCreateTrueColor'))
-		 		{
-					$this->_imgFinal = @imagecreatetruecolor($dst_w,$dst_h);
-				} else {
-					$this->_imgFinal = @imagecreate($dst_w,$dst_h);
-				}   
+                    if(function_exists('ImageCreateTrueColor'))
+                    {
+                    $this->_imgFinal = @imagecreatetruecolor($dst_w,$dst_h);
+                } else {
+                    $this->_imgFinal = @imagecreate($dst_w,$dst_h);
+                }   
         if (!is_null($this->transparentColorRed) && !is_null($this->transparentColorGreen) && !is_null($this->transparentColorBlue)) {
         
             $transparent = @imagecolorallocate($targetImageIdentifier, $this->transparentColorRed, $this->transparentColorGreen, $this->transparentColorBlue);
@@ -810,6 +810,6 @@ 
         }
         
     }	
-	}
+    }
 	
 ?>
\ No newline at end of file

Spacing +79 added lines, -79 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
@@ -24,7 +24,7 @@ 
 		var $gdInfo = array(); //keep all information of GD extension
 		var $_imgOrig = null; //the hanlder of original image
 		var $_imgFinal = null; //the handler of final image
-		var $imageFile  = null;  
+		var $imageFile = null;  
     var $transparentColorRed = null;
     var $transparentColorGreen = null;
     var $transparentColorBlue = null;		 
@@ -71,7 +71,7 @@ 
 		 */
 		function enableDebug($value)
 		{
-			$this->_debug = ($value?true:false);
+			$this->_debug = ($value ? true : false);
 		}
 		/**
 		 * check if debug enable
@@ -95,7 +95,7 @@ 
     		$this->_errors[] = $value;
         if ($this->_debug) 
         {
-            echo $value . "<br />\n";
+            echo $value."<br />\n";
         }
     }		
     /**
@@ -104,11 +104,11 @@ 
      */
     function showErrors()
     {
-    	if(sizeof($this->_errors))
+    	if (sizeof($this->_errors))
     	{
-    		foreach($this->_errors as $error)
+    		foreach ($this->_errors as $error)
     		{
-    			echo $error . "<br />\n";
+    			echo $error."<br />\n";
     		}
     	}
     }
@@ -123,26 +123,26 @@ 
     function loadImage($filename)
     {
         $ext  = strtolower($this->_getExtension($filename));
-        $func = 'imagecreatefrom' . ($ext == 'jpg' ? 'jpeg' : $ext);
+        $func = 'imagecreatefrom'.($ext == 'jpg' ? 'jpeg' : $ext);
         if (!$this->_isSupported($filename, $ext, $func, false)) {
 
             return false;
         }
-        if($ext == "gif")
+        if ($ext == "gif")
         {
              // the following part gets the transparency color for a gif file
             // this code is from the PHP manual and is written by
             // fred at webblake dot net and webmaster at webnetwizard dotco dotuk, thanks!
             $fp = @fopen($filename, "rb");
             $result = @fread($fp, 13);
-            $colorFlag = ord(substr($result,10,1)) >> 7;
-            $background = ord(substr($result,11));
+            $colorFlag = ord(substr($result, 10, 1)) >> 7;
+            $background = ord(substr($result, 11));
             if ($colorFlag) {
-                $tableSizeNeeded = ($background + 1) * 3;
+                $tableSizeNeeded = ($background + 1)*3;
                 $result = @fread($fp, $tableSizeNeeded);
-                $this->transparentColorRed = ord(substr($result, $background * 3, 1));
-                $this->transparentColorGreen = ord(substr($result, $background * 3 + 1, 1));
-                $this->transparentColorBlue = ord(substr($result, $background * 3 + 2, 1));
+                $this->transparentColorRed = ord(substr($result, $background*3, 1));
+                $this->transparentColorGreen = ord(substr($result, $background*3 + 1, 1));
+                $this->transparentColorBlue = ord(substr($result, $background*3 + 2, 1));
             }
             fclose($fp);
             // -- here ends the code related to transparency handling   	
@@ -151,7 +151,7 @@ 
         if ($this->_imgOrig == null) {
             $this->_debug("The image could not be created from the '$filename' file using the '$func' function.");
             return false;
-        }else 
+        } else 
         {
         	$this->imageFile = $filename;
 			    $this->_imgInfoOrig = array(
@@ -161,9 +161,9 @@ 
 			    	'path'=>$filename,
 			    );        	
 			    $imgInfo = $this->_getImageInfo($filename);
-			    if(sizeof($imgInfo))
+			    if (sizeof($imgInfo))
 			    {
-			    	foreach($imgInfo as $k=>$v)
+			    	foreach ($imgInfo as $k=>$v)
 			    	{
 			    		$this->_imgInfoOrig[$k] = $v;
 			    		$this->_imgInfoFinal[$k] = $v;
@@ -212,13 +212,13 @@ 
         }
 
         $ext  = ($forcetype == '') ? $this->_getExtension($filename) : strtolower($forcetype);
-        $func = 'image' . ($ext == 'jpg' ? 'jpeg' : $ext);
+        $func = 'image'.($ext == 'jpg' ? 'jpeg' : $ext);
         if (!$this->_isSupported($filename, $ext, $func, true)) 
         {
             return false;
         }
         $saved = false;
-        switch($ext) 
+        switch ($ext) 
         {
             case 'gif':
                 if ($this->gdInfo['Truecolor Support'] && imageistruecolor($this->_imgFinal)) 
@@ -237,7 +237,7 @@ 
         {
             $this->_debug("The image could not be saved to the '$filename' file as the file type '$ext' using the '$func' function.");
             return false;
-        }else 
+        } else 
         {
         	$this->_imgInfoFinal['size'] = @filesize($filename);
         	@chmod($filename, intval($this->chmod, 8));
@@ -260,19 +260,19 @@ 
             $this->_debug('There is no cropped image to show.');
             return false;
         }
-        $type = (!empty($type)?$type:$this->_imgInfoOrig['ext']);
-        $quality = (!empty($quality)?$quality:$this->_imgQuality);
+        $type = (!empty($type) ? $type : $this->_imgInfoOrig['ext']);
+        $quality = (!empty($quality) ? $quality : $this->_imgQuality);
 				
         $type = strtolower($type);
-        $func = 'image' . ($type == 'jpg' ? 'jpeg' : $type);
-        $head = 'image/' . ($type == 'jpg' ? 'jpeg' : $type);
+        $func = 'image'.($type == 'jpg' ? 'jpeg' : $type);
+        $head = 'image/'.($type == 'jpg' ? 'jpeg' : $type);
         
         if (!$this->_isSupported('[showing file]', $type, $func, false)) {
             return false;
         }
 
         header("Content-type: $head");
-        switch($type) 
+        switch ($type) 
         {
             case 'gif':
                 if ($this->gdInfo['Truecolor Support'] && imageistruecolor($this->_imgFinal)) 
@@ -317,14 +317,14 @@ 
         $this->_createFinalImageHandler($dst_w, $dst_h);
         if ($this->gdInfo['Truecolor Support']) 
         {
-            	if(!@imagecopyresampled($this->_imgFinal, $this->_imgOrig, 0, 0, $dst_x, $dst_y, $dst_w, $dst_h, $dst_w, $dst_h))
+            	if (!@imagecopyresampled($this->_imgFinal, $this->_imgOrig, 0, 0, $dst_x, $dst_y, $dst_w, $dst_h, $dst_w, $dst_h))
             	{
             		$this->_debug('Unable crop the image.');
             		return false;
             	}            
         } else 
         {
-          	if(!@imagecopyresized($this->_imgFinal, $this->_imgOrig, 0, 0, $dst_x, $dst_y, $dst_w, $dst_h, $dst_w, $dst_h))
+          	if (!@imagecopyresized($this->_imgFinal, $this->_imgOrig, 0, 0, $dst_x, $dst_y, $dst_w, $dst_h, $dst_w, $dst_h))
           	{
            		$this->_debug('Unable crop the image.');
           		return false;           		
@@ -351,9 +351,9 @@ 
      *
      * @return mixed none or PEAR_error
      */
-	function resize( $new_x, $new_y, $constraint= false, $unchangeIfsmaller=false)
+	function resize($new_x, $new_y, $constraint = false, $unchangeIfsmaller = false)
 	{
-		if(!$this->_imgOrig)
+		if (!$this->_imgOrig)
 		{
 			$this->_debug('No image fould.');
 			return false;
@@ -361,35 +361,35 @@ 
 		
 		$new_x = intval($new_x);
 		$new_y = intval($new_y);
-		if($new_x <=0 || $new_y <= 0)
+		if ($new_x <= 0 || $new_y <= 0)
 		{
 			$this->_debug('either of new width or height can be zeor or less.');
-		}else 
+		} else 
 		{
 		
-			if($constraint)
+			if ($constraint)
 			{
-				if($new_x < 1 && $new_y < 1)
+				if ($new_x < 1 && $new_y < 1)
 				{
 					$new_x = $this->_imgInfoOrig['width'];
 					$new_y = $this->_imgInfoOrig['height'];
-				}elseif($new_x < 1)
+				}elseif ($new_x < 1)
 				{
-					$new_x = floor($new_y / $this->_imgInfoOrig['height'] * $this->_imgInfoOrig['width']);
+					$new_x = floor($new_y/$this->_imgInfoOrig['height']*$this->_imgInfoOrig['width']);
 	
-				}elseif($new_y < 1)
+				}elseif ($new_y < 1)
 				{
-					$new_y = floor($new_x / $this->_imgInfoOrig['width'] * $this->_imgInfoOrig['height']);
-				}else
+					$new_y = floor($new_x/$this->_imgInfoOrig['width']*$this->_imgInfoOrig['height']);
+				} else
 				{
-					$scale = min($new_x/$this->_imgInfoOrig['width'], $new_y/$this->_imgInfoOrig['height']) ;
+					$scale = min($new_x/$this->_imgInfoOrig['width'], $new_y/$this->_imgInfoOrig['height']);
 					$new_x = floor($scale*$this->_imgInfoOrig['width']);
 					$new_y = floor($scale*$this->_imgInfoOrig['height']);
 				}						
 			}
-			if($unchangeIfsmaller)
+			if ($unchangeIfsmaller)
 			{
-				if($this->_imgInfoOrig['width'] < $new_x && $this->_imgInfoOrig['height'] < $new_y )
+				if ($this->_imgInfoOrig['width'] < $new_x && $this->_imgInfoOrig['height'] < $new_y)
 				{
 					$new_x = $this->_imgInfoOrig['width'];
 					$new_y = $this->_imgInfoOrig['height'];
@@ -398,11 +398,11 @@ 
 		
 			
 			
-			if(is_null($this->_imgOrig))
+			if (is_null($this->_imgOrig))
 			{
 				$this->loadImage($filePath);
 			}
-			if(sizeof($this->_errors) == 0)
+			if (sizeof($this->_errors) == 0)
 			{
 				return $this->_resize($new_x, $new_y);
 			}			
@@ -420,14 +420,14 @@ 
      * @param string $mode can be save, view and both
      * @return unknown
      */
-	function _resize( $new_x, $new_y) 
+	function _resize($new_x, $new_y) 
 	{
 		$this->_createFinalImageHandler($new_x, $new_y);
     // hacks fot transparency of png24 files
     if ($this->_imgInfoOrig['type'] == 'png') 
     {    
         @imagealphablending($this->_imgFinal, false);
-				if(function_exists('ImageCopyResampled'))
+				if (function_exists('ImageCopyResampled'))
 				{
 					@imagecopyresampled($this->_imgFinal, $this->_imgOrig, 0, 0, 0, 0, $new_x, $new_y, $this->_imgInfoOrig['width'], $this->_imgInfoOrig['height']);
 				} else {
@@ -435,9 +435,9 @@ 
 				} 
         @imagesavealpha($this->_imgFinal, true);
 
-    }else 
+    } else 
     {//for the rest image
-			if(function_exists('ImageCopyResampled'))
+			if (function_exists('ImageCopyResampled'))
 			{
 				@imagecopyresampled($this->_imgFinal, $this->_imgOrig, 0, 0, 0, 0, $new_x, $new_y, $this->_imgInfoOrig['width'], $this->_imgInfoOrig['height']);
 			} else {
@@ -450,10 +450,10 @@ 
 		$this->_imgInfoFinal['height'] = $new_y;
 		$this->_imgInfoFinal['name'] = basename($this->_imgInfoOrig['name']);
 		$this->_imgInfoFinal['path'] = $this->_imgInfoOrig['path'];		
-		if($this->_imgFinal)
+		if ($this->_imgFinal)
 		{
 			return true;
-		}else 
+		} else 
 		{			
 			$this->_debug('Unable to resize the image on the fly.');
 			return false;
@@ -492,14 +492,14 @@ 
     {
 
        $giftype = ($write) ? ' Create Support' : ' Read Support';
-        $support = strtoupper($extension) . ($extension == 'gif' ? $giftype : ' Support');
+        $support = strtoupper($extension).($extension == 'gif' ? $giftype : ' Support');
 
-        if (isset($this->gdInfo['JPG Support']) && ($extension=='jpg' || $extension=='jpeg')) 
+        if (isset($this->gdInfo['JPG Support']) && ($extension == 'jpg' || $extension == 'jpeg')) 
         {
-        	$extension='jpg';
-        }else if (isset($this->gdInfo['JPEG Support']) && ($extension=='jpg' || $extension=='jpeg')) 
+        	$extension = 'jpg';
+        } else if (isset($this->gdInfo['JPEG Support']) && ($extension == 'jpg' || $extension == 'jpeg')) 
         {
-        	$extension='jpeg';
+        	$extension = 'jpeg';
         }
         if (!isset($this->gdInfo[$support]) || $this->gdInfo[$support] == false) {
             $request = ($write) ? 'saving' : 'reading';
@@ -520,21 +520,21 @@ 
      * @param string $direction
      * @return boolean
      */
-    function flip($direction="horizontal")
+    function flip($direction = "horizontal")
     {
 				$this->_createFinalImageHandler($this->_imgInfoOrig['width'], $this->_imgInfoOrig['height']);
-			if($direction != "vertical")
+			if ($direction != "vertical")
 			{
 				$dst_x = 0;
 				$dst_y = 0;
-				$src_x = $this->_imgInfoOrig['width'] -1;
+				$src_x = $this->_imgInfoOrig['width'] - 1;
 				$src_y = 0;
 				$dst_w = $this->_imgInfoOrig['width'];
 				$dst_h = $this->_imgInfoOrig['height'];
 				$src_w = 0 - $this->_imgInfoOrig['width'];
 				$src_h = $this->_imgInfoOrig['height'];
 				
-			}else 
+			} else 
 			{
 				$dst_x = 0;
 				$dst_y = 0;
@@ -545,7 +545,7 @@ 
 				$src_w = $this->_imgInfoOrig['width'];
 				$src_h = 0 - $this->_imgInfoOrig['height'];				
 			}			
-				if(function_exists('ImageCopyResampled')){
+				if (function_exists('ImageCopyResampled')) {
 					imagecopyresampled($this->_imgFinal, $this->_imgOrig, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
 				} else {
 					imagecopyresized($this->_imgFinal, $this->_imgOrig, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
@@ -554,10 +554,10 @@ 
 				$this->_imgInfoFinal['height'] = $dst_h;
 				$this->_imgInfoFinal['name'] = basename($this->imageFile);
 				$this->_imgInfoFinal['path'] = $this->imageFile;		
-				if($this->_imgFinal)
+				if ($this->_imgFinal)
 				{
 					return true;
-				}else 
+				} else 
 				{			
 					$this->_debug('Unable to resize the image on the fly.');	
 					return false;
@@ -598,12 +598,12 @@ 
         if (function_exists('gd_info')) 
         {
             $outputs = gd_info();
-            if(isset($outputs['JPEG Support']))
+            if (isset($outputs['JPEG Support']))
             {
             	$outputs['JPG Support'] = $outputs['JPEG Support'];
-            }else 
+            } else 
             {
-	            if(isset($outputs['JPG Support']))
+	            if (isset($outputs['JPG Support']))
 	            {
 	            	$outputs['JPEG Support'] = $outputs['JPG Support'];
 	            }
@@ -660,7 +660,7 @@ 
             $match = array();
             if (preg_match('/([0-9\.]+)/', $outputs['GD Version'], $match)) {
                 $foo = explode('.', $match[0]);
-                $outputs['Version'] = array('major' => isset($foo[0])?$foo[0]:'', 'minor' => isset($foo[1])?$foo[1]:'', 'patch' => isset($foo[2])?$foo:"");
+                $outputs['Version'] = array('major' => isset($foo[0]) ? $foo[0] : '', 'minor' => isset($foo[1]) ? $foo[1] : '', 'patch' => isset($foo[2]) ? $foo : "");
             }
         }
 		//print_r($outputs);
@@ -677,7 +677,7 @@ 
 	 */
     function DestroyImages($original = true)
     {
-    		if(!is_null($this->_imgFinal))
+    		if (!is_null($this->_imgFinal))
     		{
     			@imagedestroy($this->_imgFinal);
     		}        
@@ -703,7 +703,7 @@ 
 		$imageInfo = @getimagesize($imagePath);
 		if ($imageInfo && is_array($imageInfo))
 		{
-			switch($imageInfo[2]){
+			switch ($imageInfo[2]) {
 				case 1:
 					$type = 'gif';
 					break;
@@ -736,19 +736,19 @@ 
 		return $outputs;
 		
 	}
-	  function rotate($angle, $bgColor=0)
+	  function rotate($angle, $bgColor = 0)
     {
-    	$angle = intval($angle) -360;
-    		while($angle <0)
+    	$angle = intval($angle) - 360;
+    		while ($angle < 0)
     		{
     			$angle += 360;
     		}
  
 		
-         if($this->_imgFinal = imagerotate($this->_imgOrig, $angle, 0))
+         if ($this->_imgFinal = imagerotate($this->_imgOrig, $angle, 0))
          {
          	return true;
-         }else 
+         } else 
          {
          	return false;
          }
@@ -771,12 +771,12 @@ 
 	 */
 	function getFinalImageInfo()
 	{
-		if($this->_imgInfoFinal['width'] == '')
+		if ($this->_imgInfoFinal['width'] == '')
 		{
-			if(is_null($this->_imgFinal))
+			if (is_null($this->_imgFinal))
 			{
 				$this->_imgInfoFinal = $this->_imgInfoOrig;
-			}else 
+			} else 
 			{
 				$this->_imgInfoFinal['width'] = @imagesx($this->_imgFinal);
 				$this->_imgInfoFinal['height'] = @imagesy($this->_imgFinal);
@@ -796,11 +796,11 @@ 
      */
     function _createFinalImageHandler($dst_w, $dst_h)
     {
-		 		if(function_exists('ImageCreateTrueColor'))
+		 		if (function_exists('ImageCreateTrueColor'))
 		 		{
-					$this->_imgFinal = @imagecreatetruecolor($dst_w,$dst_h);
+					$this->_imgFinal = @imagecreatetruecolor($dst_w, $dst_h);
 				} else {
-					$this->_imgFinal = @imagecreate($dst_w,$dst_h);
+					$this->_imgFinal = @imagecreate($dst_w, $dst_h);
 				}   
         if (!is_null($this->transparentColorRed) && !is_null($this->transparentColorGreen) && !is_null($this->transparentColorBlue)) {
         

Braces +14 added lines, -14 removed lines

@@ -151,7 +151,7 @@ 
         if ($this->_imgOrig == null) {
             $this->_debug("The image could not be created from the '$filename' file using the '$func' function.");
             return false;
-        }else 
+        } else 
         {
         	$this->imageFile = $filename;
 			    $this->_imgInfoOrig = array(
@@ -237,7 +237,7 @@ 
         {
             $this->_debug("The image could not be saved to the '$filename' file as the file type '$ext' using the '$func' function.");
             return false;
-        }else 
+        } else 
         {
         	$this->_imgInfoFinal['size'] = @filesize($filename);
         	@chmod($filename, intval($this->chmod, 8));
@@ -364,7 +364,7 @@ 
 		if($new_x <=0 || $new_y <= 0)
 		{
 			$this->_debug('either of new width or height can be zeor or less.');
-		}else 
+		} else 
 		{
 		
 			if($constraint)
@@ -373,14 +373,14 @@ 
 				{
 					$new_x = $this->_imgInfoOrig['width'];
 					$new_y = $this->_imgInfoOrig['height'];
-				}elseif($new_x < 1)
+				} elseif($new_x < 1)
 				{
 					$new_x = floor($new_y / $this->_imgInfoOrig['height'] * $this->_imgInfoOrig['width']);
 	
-				}elseif($new_y < 1)
+				} elseif($new_y < 1)
 				{
 					$new_y = floor($new_x / $this->_imgInfoOrig['width'] * $this->_imgInfoOrig['height']);
-				}else
+				} else
 				{
 					$scale = min($new_x/$this->_imgInfoOrig['width'], $new_y/$this->_imgInfoOrig['height']) ;
 					$new_x = floor($scale*$this->_imgInfoOrig['width']);
@@ -435,7 +435,7 @@ 
 				} 
         @imagesavealpha($this->_imgFinal, true);
 
-    }else 
+    } else 
     {//for the rest image
 			if(function_exists('ImageCopyResampled'))
 			{
@@ -453,7 +453,7 @@ 
 		if($this->_imgFinal)
 		{
 			return true;
-		}else 
+		} else 
 		{			
 			$this->_debug('Unable to resize the image on the fly.');
 			return false;
@@ -497,7 +497,7 @@ 
         if (isset($this->gdInfo['JPG Support']) && ($extension=='jpg' || $extension=='jpeg')) 
         {
         	$extension='jpg';
-        }else if (isset($this->gdInfo['JPEG Support']) && ($extension=='jpg' || $extension=='jpeg')) 
+        } else if (isset($this->gdInfo['JPEG Support']) && ($extension=='jpg' || $extension=='jpeg')) 
         {
         	$extension='jpeg';
         }
@@ -534,7 +534,7 @@ 
 				$src_w = 0 - $this->_imgInfoOrig['width'];
 				$src_h = $this->_imgInfoOrig['height'];
 				
-			}else 
+			} else 
 			{
 				$dst_x = 0;
 				$dst_y = 0;
@@ -557,7 +557,7 @@ 
 				if($this->_imgFinal)
 				{
 					return true;
-				}else 
+				} else 
 				{			
 					$this->_debug('Unable to resize the image on the fly.');	
 					return false;
@@ -601,7 +601,7 @@ 
             if(isset($outputs['JPEG Support']))
             {
             	$outputs['JPG Support'] = $outputs['JPEG Support'];
-            }else 
+            } else 
             {
 	            if(isset($outputs['JPG Support']))
 	            {
@@ -748,7 +748,7 @@ 
          if($this->_imgFinal = imagerotate($this->_imgOrig, $angle, 0))
          {
          	return true;
-         }else 
+         } else 
          {
          	return false;
          }
@@ -776,7 +776,7 @@ 
 			if(is_null($this->_imgFinal))
 			{
 				$this->_imgInfoFinal = $this->_imgInfoOrig;
-			}else 
+			} else 
 			{
 				$this->_imgInfoFinal['width'] = @imagesx($this->_imgFinal);
 				$this->_imgInfoFinal['height'] = @imagesy($this->_imgFinal);

phpmyfaq/admin/editor/plugins/ajaxfilemanager/inc/class.manager.php

Doc Comments +1 added lines

@@ -268,6 +268,7 @@
 		 * return the file type of a file.
 		 *
 		 * @param string file name
+		 * @param string $fileName
 		 * @return array
 		 */
 		function getFileType($fileName, $checkIfDir = false) 

Indentation +326 added lines, -326 removed lines

@@ -1,378 +1,378 @@
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php
 /**
-	 * file listing
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/April/2007
-	 *
-	 */
+     * file listing
+     * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @link www.phpletter.com
+     * @since 22/April/2007
+     *
+     */
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "class.file.php");
 class manager
 {
-	var $currentFolderPath;
-	var $sessionAction = null; //object to session action
-	var $flags = array('no'=>'noFlag', 'cut'=>'cutFlag', 'copy'=>'copyFlag');
-	var $forceFolderOnTop = false; //forced to have folder shown on the top of the list
-	var $currentFolderInfo = array(
-	'name'=>'',
-	'subdir'=>0,
-	'file'=>0,
-	'ctime'=>'',
-	'mtime'=>'',
-	'is_readable'=>'',
-	'is_writable'=>'',
-	'size'=>0,
-	'path'=>'',
-	'type'=>'folder',
-	'flag'=>'noFlag',
-	'friendly_path'=>'',
-	);
+    var $currentFolderPath;
+    var $sessionAction = null; //object to session action
+    var $flags = array('no'=>'noFlag', 'cut'=>'cutFlag', 'copy'=>'copyFlag');
+    var $forceFolderOnTop = false; //forced to have folder shown on the top of the list
+    var $currentFolderInfo = array(
+    'name'=>'',
+    'subdir'=>0,
+    'file'=>0,
+    'ctime'=>'',
+    'mtime'=>'',
+    'is_readable'=>'',
+    'is_writable'=>'',
+    'size'=>0,
+    'path'=>'',
+    'type'=>'folder',
+    'flag'=>'noFlag',
+    'friendly_path'=>'',
+    );
 	
-	var $lastVisitedFolderPathIndex = 'ajax_last_visited_folder';
-	var $folderPathIndex = "path";
-	var $calculateSubdir = true;
-	var $fileTypes = array(
-			array(array("exe", "com"), "fileExe", SEARCH_TYPE_EXE, 0),
-			array(array("gif", "jpg", "png", "bmp", "tif"), "filePicture", SEARCH_TYPE_IMG, 1),
-			array(array("zip", "sit", "rar", "gz", "tar"), "fileZip", SEARCH_TYPE_ARCHIVE, 0),
-			array(array("htm", "html", "php", "jsp", "asp", 'js', 'css'), "fileCode", SEARCH_TYPE_HTML, 1),
-			array(array("mov", "ram", "rm", "asx", "dcr", "wmv"), "fileVideo", SEARCH_TYPE_VIDEO, 1),
-			array(array("mpg", "avi", "asf", "mpeg"), "fileVideo", SEARCH_TYPE_MOVIE, 1),
-			array(array("aif", "aiff", "wav", "mp3", "wma"), "fileMusic", SEARCH_TYPE_MUSIC, 1),
-			array(array("swf", 'flv'), "fileFlash", SEARCH_TYPE_FLASH, 1),
-			array(array("ppt"), "filePPT", SEARCH_TYPE_PPT, 0),
-			array(array("rtf"), "fileRTF", SEARCH_TYPE_DOC, 0),
-			array(array("doc"), "fileWord", SEARCH_TYPE_WORD, 0),
-			array(array("pdf"), "fileAcrobat", SEARCH_TYPE_PDF, 0),
-			array(array("xls", "csv"), "fileExcel", SEARCH_TYPE_EXCEL, 0),
-			array(array("txt"), "fileText", SEARCH_TYPE_TEXT, 1),
-			array(array("xml", "xsl", "dtd"), "fileXml", SEARCH_TYPE_XML, 1)
-	);
+    var $lastVisitedFolderPathIndex = 'ajax_last_visited_folder';
+    var $folderPathIndex = "path";
+    var $calculateSubdir = true;
+    var $fileTypes = array(
+            array(array("exe", "com"), "fileExe", SEARCH_TYPE_EXE, 0),
+            array(array("gif", "jpg", "png", "bmp", "tif"), "filePicture", SEARCH_TYPE_IMG, 1),
+            array(array("zip", "sit", "rar", "gz", "tar"), "fileZip", SEARCH_TYPE_ARCHIVE, 0),
+            array(array("htm", "html", "php", "jsp", "asp", 'js', 'css'), "fileCode", SEARCH_TYPE_HTML, 1),
+            array(array("mov", "ram", "rm", "asx", "dcr", "wmv"), "fileVideo", SEARCH_TYPE_VIDEO, 1),
+            array(array("mpg", "avi", "asf", "mpeg"), "fileVideo", SEARCH_TYPE_MOVIE, 1),
+            array(array("aif", "aiff", "wav", "mp3", "wma"), "fileMusic", SEARCH_TYPE_MUSIC, 1),
+            array(array("swf", 'flv'), "fileFlash", SEARCH_TYPE_FLASH, 1),
+            array(array("ppt"), "filePPT", SEARCH_TYPE_PPT, 0),
+            array(array("rtf"), "fileRTF", SEARCH_TYPE_DOC, 0),
+            array(array("doc"), "fileWord", SEARCH_TYPE_WORD, 0),
+            array(array("pdf"), "fileAcrobat", SEARCH_TYPE_PDF, 0),
+            array(array("xls", "csv"), "fileExcel", SEARCH_TYPE_EXCEL, 0),
+            array(array("txt"), "fileText", SEARCH_TYPE_TEXT, 1),
+            array(array("xml", "xsl", "dtd"), "fileXml", SEARCH_TYPE_XML, 1)
+    );
 	
-	/**
-		 * constructor
-		 * @path the path to a folder
-		 * @calculateSubdir force to get the subdirectories information
-		 */		
-	function __construct($path = null, $calculateSubdir=true)
-	{
+    /**
+     * constructor
+     * @path the path to a folder
+     * @calculateSubdir force to get the subdirectories information
+     */		
+    function __construct($path = null, $calculateSubdir=true)
+    {
 
-		$this->calculateSubdir = $calculateSubdir;
-		if(defined('CONFIG_SYS_FOLDER_SHOWN_ON_TOP'))
-		{
-			$this->forceFolderOnTop = CONFIG_SYS_FOLDER_SHOWN_ON_TOP;
-		}
-		if(!is_null($path))
-		{
-			$this->currentFolderPath = $path;
+        $this->calculateSubdir = $calculateSubdir;
+        if(defined('CONFIG_SYS_FOLDER_SHOWN_ON_TOP'))
+        {
+            $this->forceFolderOnTop = CONFIG_SYS_FOLDER_SHOWN_ON_TOP;
+        }
+        if(!is_null($path))
+        {
+            $this->currentFolderPath = $path;
 
-		}elseif(isset($_GET[$this->folderPathIndex]) && file_exists($_GET[$this->folderPathIndex]) && !is_file($_GET[$this->folderPathIndex]) )
-		{
-			$this->currentFolderPath = $_GET[$this->folderPathIndex];
-		}
-		elseif(isset($_SESSION[$this->lastVisitedFolderPathIndex]) && file_exists($_SESSION[$this->lastVisitedFolderPathIndex]) && !is_file($_SESSION[$this->lastVisitedFolderPathIndex]))
-		{
-			$this->currentFolderPath = $_SESSION[$this->lastVisitedFolderPathIndex];
-		}else
-		{
-			$this->currentFolderPath = CONFIG_SYS_DEFAULT_PATH;
-		}
+        }elseif(isset($_GET[$this->folderPathIndex]) && file_exists($_GET[$this->folderPathIndex]) && !is_file($_GET[$this->folderPathIndex]) )
+        {
+            $this->currentFolderPath = $_GET[$this->folderPathIndex];
+        }
+        elseif(isset($_SESSION[$this->lastVisitedFolderPathIndex]) && file_exists($_SESSION[$this->lastVisitedFolderPathIndex]) && !is_file($_SESSION[$this->lastVisitedFolderPathIndex]))
+        {
+            $this->currentFolderPath = $_SESSION[$this->lastVisitedFolderPathIndex];
+        }else
+        {
+            $this->currentFolderPath = CONFIG_SYS_DEFAULT_PATH;
+        }
 		
-		$this->currentFolderPath = (isUnderRoot($this->currentFolderPath)?backslashToSlash((addTrailingSlash($this->currentFolderPath))):CONFIG_SYS_DEFAULT_PATH);
+        $this->currentFolderPath = (isUnderRoot($this->currentFolderPath)?backslashToSlash((addTrailingSlash($this->currentFolderPath))):CONFIG_SYS_DEFAULT_PATH);
 		
-		if($this->calculateSubdir)
-		{// keep track of this folder path in session 
-			$_SESSION[$this->lastVisitedFolderPathIndex] = $this->currentFolderPath;
-		}
-		if(is_dir($this->currentFolderPath))
-		{
-			$file = new file($this->currentFolderPath);
-			$folderInfo = $file->getFileInfo();
-			if(sizeof($folderInfo))
-			{
-				$this->currentFolderInfo['name']=basename($this->currentFolderPath);
-				$this->currentFolderInfo['subdir']=0;
-				$this->currentFolderInfo['file']=0;
-				$this->currentFolderInfo['ctime']=$folderInfo['ctime'];
-				$this->currentFolderInfo['mtime']=$folderInfo['mtime'];
-				$this->currentFolderInfo['is_readable']=$folderInfo['is_readable'];
-				$this->currentFolderInfo['is_writable']=$folderInfo['is_writable'];	
-				$this->currentFolderInfo['path']  = $this->currentFolderPath;
-				$this->currentFolderInfo['friendly_path'] = transformFilePath($this->currentFolderPath);
-				$this->currentFolderInfo['type'] = "folder";
-				$this->currentFolderInfo['cssClass']='folder';
+        if($this->calculateSubdir)
+        {// keep track of this folder path in session 
+            $_SESSION[$this->lastVisitedFolderPathIndex] = $this->currentFolderPath;
+        }
+        if(is_dir($this->currentFolderPath))
+        {
+            $file = new file($this->currentFolderPath);
+            $folderInfo = $file->getFileInfo();
+            if(sizeof($folderInfo))
+            {
+                $this->currentFolderInfo['name']=basename($this->currentFolderPath);
+                $this->currentFolderInfo['subdir']=0;
+                $this->currentFolderInfo['file']=0;
+                $this->currentFolderInfo['ctime']=$folderInfo['ctime'];
+                $this->currentFolderInfo['mtime']=$folderInfo['mtime'];
+                $this->currentFolderInfo['is_readable']=$folderInfo['is_readable'];
+                $this->currentFolderInfo['is_writable']=$folderInfo['is_writable'];	
+                $this->currentFolderInfo['path']  = $this->currentFolderPath;
+                $this->currentFolderInfo['friendly_path'] = transformFilePath($this->currentFolderPath);
+                $this->currentFolderInfo['type'] = "folder";
+                $this->currentFolderInfo['cssClass']='folder';
 				
-				//$this->currentFolderInfo['flag'] = $folderInfo['flag'];
-			}			
-		}
-		if($calculateSubdir && !file_exists($this->currentFolderPath))
-		{
-			die(ERR_FOLDER_NOT_FOUND . $this->currentFolderPath);
-		}
+                //$this->currentFolderInfo['flag'] = $folderInfo['flag'];
+            }			
+        }
+        if($calculateSubdir && !file_exists($this->currentFolderPath))
+        {
+            die(ERR_FOLDER_NOT_FOUND . $this->currentFolderPath);
+        }
 
 
 	
-	}
+    }
 	
-	function setSessionAction(&$session)
-	{
-		$this->sessionAction = $session;	
-	}
-	/**
-		 * constructor
-		 */
-	function manager($path = null, $calculateSubdir=true)
-	{
-		$this->__construct($path, $calculateSubdir);
-	}
-	/**
-		 * get current folder path
-		 * @return  string
-		 */
-	function getCurrentFolderPath()
-	{
-		return $this->currentFolderPath;
-	}
-	/**
-		 * get the list of files and folders under this current fold
-		 *	@return array
-		 */
-	function getFileList()
-	{
-		$outputs = array();
-		$files = array();
-		$folders = array();
-		$tem = array();
-		$dirHandler = @opendir($this->currentFolderPath);
-		if($dirHandler)
-		{
-			while(false !== ($file = readdir($dirHandler)))
-			{
-				if($file != '.' && $file != '..')
-				{
-					$flag = $this->flags['no'];
+    function setSessionAction(&$session)
+    {
+        $this->sessionAction = $session;	
+    }
+    /**
+     * constructor
+     */
+    function manager($path = null, $calculateSubdir=true)
+    {
+        $this->__construct($path, $calculateSubdir);
+    }
+    /**
+     * get current folder path
+     * @return  string
+     */
+    function getCurrentFolderPath()
+    {
+        return $this->currentFolderPath;
+    }
+    /**
+     * get the list of files and folders under this current fold
+     *	@return array
+     */
+    function getFileList()
+    {
+        $outputs = array();
+        $files = array();
+        $folders = array();
+        $tem = array();
+        $dirHandler = @opendir($this->currentFolderPath);
+        if($dirHandler)
+        {
+            while(false !== ($file = readdir($dirHandler)))
+            {
+                if($file != '.' && $file != '..')
+                {
+                    $flag = $this->flags['no'];
 				
-					if($this->sessionAction->getFolder() == $this->currentFolderPath)
-					{//check if any flag associated with this folder or file
-						$folder = addTrailingSlash(backslashToSlash($this->currentFolderPath));
-						if(in_array($folder . $file, $this->sessionAction->get()))
-						{
-							if($this->sessionAction->getAction() == "copy")
-							{
-								$flag = $this->flags['copy'];
-							}else 
-							{
-								$flag = $this->flags['cut'];
-							}
-						}
-					}					
-					$path=$this->currentFolderPath.$file;
-					if(is_dir($path) && isListingDocument($path) )
-					{
-						$this->currentFolderInfo['subdir']++;
-						if(!$this->calculateSubdir)
-						{			
-						}else 
-						{
+                    if($this->sessionAction->getFolder() == $this->currentFolderPath)
+                    {//check if any flag associated with this folder or file
+                        $folder = addTrailingSlash(backslashToSlash($this->currentFolderPath));
+                        if(in_array($folder . $file, $this->sessionAction->get()))
+                        {
+                            if($this->sessionAction->getAction() == "copy")
+                            {
+                                $flag = $this->flags['copy'];
+                            }else 
+                            {
+                                $flag = $this->flags['cut'];
+                            }
+                        }
+                    }					
+                    $path=$this->currentFolderPath.$file;
+                    if(is_dir($path) && isListingDocument($path) )
+                    {
+                        $this->currentFolderInfo['subdir']++;
+                        if(!$this->calculateSubdir)
+                        {			
+                        }else 
+                        {
 							
-								$folder = $this->getFolderInfo($path);
-								$folder['flag'] = $flag;
-								$folders[$file] = $folder;
-								$outputs[$file] = $folders[$file];							
-						}
+                                $folder = $this->getFolderInfo($path);
+                                $folder['flag'] = $flag;
+                                $folders[$file] = $folder;
+                                $outputs[$file] = $folders[$file];							
+                        }
 
 						
-					}elseif(is_file($path) && isListingDocument($path))
-					{
+                    }elseif(is_file($path) && isListingDocument($path))
+                    {
 
-							$obj = new file($path);
-							$tem = $obj->getFileInfo();
-							if(sizeof($tem))
-							{
-								$fileType = $this->getFileType($file);
-								foreach($fileType as $k=>$v)
-								{
-									$tem[$k] = $v;
-								}
-								$this->currentFolderInfo['size'] += $tem['size'];
-								$this->currentFolderInfo['file']++;		
-								$tem['path'] = backslashToSlash($path);		
-								$tem['type'] = "file";
-								$tem['flag'] = $flag;
-								$files[$file] = $tem;
-								$outputs[$file] = $tem;
-								$tem = array();
-								$obj->close();
+                            $obj = new file($path);
+                            $tem = $obj->getFileInfo();
+                            if(sizeof($tem))
+                            {
+                                $fileType = $this->getFileType($file);
+                                foreach($fileType as $k=>$v)
+                                {
+                                    $tem[$k] = $v;
+                                }
+                                $this->currentFolderInfo['size'] += $tem['size'];
+                                $this->currentFolderInfo['file']++;		
+                                $tem['path'] = backslashToSlash($path);		
+                                $tem['type'] = "file";
+                                $tem['flag'] = $flag;
+                                $files[$file] = $tem;
+                                $outputs[$file] = $tem;
+                                $tem = array();
+                                $obj->close();
 								
-							}							
+                            }							
 
 				
-					}
+                    }
 					
-				}
-			}
-			if($this->forceFolderOnTop)
-			{
-				uksort($folders, "strnatcasecmp");
-				uksort($files, "strnatcasecmp");
-				$outputs = array();
-				foreach($folders as $v)
-				{
-					$outputs[] = $v;
-				}
-				foreach ($files as $v)
-				{
-					$outputs[] = $v;
-				}
-			}else 
-			{
-				uksort($outputs, "strnatcasecmp");
-			}
+                }
+            }
+            if($this->forceFolderOnTop)
+            {
+                uksort($folders, "strnatcasecmp");
+                uksort($files, "strnatcasecmp");
+                $outputs = array();
+                foreach($folders as $v)
+                {
+                    $outputs[] = $v;
+                }
+                foreach ($files as $v)
+                {
+                    $outputs[] = $v;
+                }
+            }else 
+            {
+                uksort($outputs, "strnatcasecmp");
+            }
 			
-			@closedir($dirHandler);
-		}else
-		{
-			trigger_error('Unable to locate the folder ' . $this->currentFolderPath, E_NOTICE);
-		}
-		return $outputs;
-	}
+            @closedir($dirHandler);
+        }else
+        {
+            trigger_error('Unable to locate the folder ' . $this->currentFolderPath, E_NOTICE);
+        }
+        return $outputs;
+    }
 
 
-	/**
-	 * get current or the specified dir information
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	function getFolderInfo($path=null)
-	{
-		if(is_null($path))
-		{
-			return $this->currentFolderInfo;
-		}else 
-		{
-			$obj = new manager($path, false);
-			$obj->setSessionAction($this->sessionAction);
-			$obj->getFileList();
-			return $obj->getFolderInfo();			
-		}
+    /**
+     * get current or the specified dir information
+     *
+     * @param string $path
+     * @return array
+     */
+    function getFolderInfo($path=null)
+    {
+        if(is_null($path))
+        {
+            return $this->currentFolderInfo;
+        }else 
+        {
+            $obj = new manager($path, false);
+            $obj->setSessionAction($this->sessionAction);
+            $obj->getFileList();
+            return $obj->getFolderInfo();			
+        }
 
-	}
+    }
 
-		/**
-		 * return the file type of a file.
-		 *
-		 * @param string file name
-		 * @return array
-		 */
-		function getFileType($fileName, $checkIfDir = false) 
-		{
+        /**
+         * return the file type of a file.
+         *
+         * @param string file name
+         * @return array
+         */
+        function getFileType($fileName, $checkIfDir = false) 
+        {
 			
-			$ext = strtolower($this->_getExtension($fileName, $checkIfDir));
+            $ext = strtolower($this->_getExtension($fileName, $checkIfDir));
 			
-			foreach ($this->fileTypes as $fileType) 
-			{
-				if(in_array($ext, $fileType[0]))
-				{
-					return array("cssClass" => $fileType[1], "fileType" => $fileType[2], "preview" => $fileType[3], 'test'=>5);
-				}
-			}
-			if(!empty($fileName))
-			{//this is folder
-				if(empty($ext))
-				{
-					if(is_dir($fileName))
-					{
+            foreach ($this->fileTypes as $fileType) 
+            {
+                if(in_array($ext, $fileType[0]))
+                {
+                    return array("cssClass" => $fileType[1], "fileType" => $fileType[2], "preview" => $fileType[3], 'test'=>5);
+                }
+            }
+            if(!empty($fileName))
+            {//this is folder
+                if(empty($ext))
+                {
+                    if(is_dir($fileName))
+                    {
 
-						return array("cssClass" => ($checkIfDir && $this->isDirEmpty($fileName)?'folderEmpty':"folder") , "fileType" => "Folder", "preview" => 0, 'test'=>1);
-					}else 
-					{
-						return array("cssClass" => "fileUnknown", "fileType" => SEARCH_TYPE_UNKNOWN, "preview" => 0, 'test'=>2);
-					}
-				}else 
-				{
-					return array("cssClass" => "fileUnknown", "fileType" => SEARCH_TYPE_UNKNOWN, "preview" => 0, 'test'=>3, 'ext'=>$ext , 'filename'=>$fileName);
-				}
+                        return array("cssClass" => ($checkIfDir && $this->isDirEmpty($fileName)?'folderEmpty':"folder") , "fileType" => "Folder", "preview" => 0, 'test'=>1);
+                    }else 
+                    {
+                        return array("cssClass" => "fileUnknown", "fileType" => SEARCH_TYPE_UNKNOWN, "preview" => 0, 'test'=>2);
+                    }
+                }else 
+                {
+                    return array("cssClass" => "fileUnknown", "fileType" => SEARCH_TYPE_UNKNOWN, "preview" => 0, 'test'=>3, 'ext'=>$ext , 'filename'=>$fileName);
+                }
 				
-			}else
-			{//this is unknown file
-				return array("cssClass" => "fileUnknown", "fileType" => SEARCH_TYPE_UNKNOWN, "preview" => 0, 'test'=>4);
-			}
+            }else
+            {//this is unknown file
+                return array("cssClass" => "fileUnknown", "fileType" => SEARCH_TYPE_UNKNOWN, "preview" => 0, 'test'=>4);
+            }
 		
 		
-		}
+        }
 
-	/**
-		 * return the predefined file types
-		 *
-		 * @return arrray
-		 */
-	function getFileTypes()
-	{
-		return $this->fileTypes;
-	}
-	/**
-		 * print out the file types
-		 *
-		 */
-	function printFileTypes()
-	{
-		foreach($fileTypes as $fileType)
-		{
-			if(isset($fileType[0]) && is_array($fileType[0]))
-			{
-				foreach($fileType[0] as $type)
-				{
-					echo $type. ",";
-				}
-			}
-		}
-	}
+    /**
+     * return the predefined file types
+     *
+     * @return arrray
+     */
+    function getFileTypes()
+    {
+        return $this->fileTypes;
+    }
+    /**
+     * print out the file types
+     *
+     */
+    function printFileTypes()
+    {
+        foreach($fileTypes as $fileType)
+        {
+            if(isset($fileType[0]) && is_array($fileType[0]))
+            {
+                foreach($fileType[0] as $type)
+                {
+                    echo $type. ",";
+                }
+            }
+        }
+    }
 
     /**
-	 * Get the extension of a file name
-	 * 
-	 * @param  string $file
- 	 * @return string
+     * Get the extension of a file name
+     * 
+     * @param  string $file
+     * @return string
      * @copyright this function originally come from Andy's php 
-	 */
+     */
     function _getExtension($file, $checkIfDir = false)
     {
-    	if($checkIfDir && file_exists($file) && is_dir($file))
-    	{
-    		return '';
-    	}else 
-    	{
-    		return @substr(@strrchr($file, "."), 1);
-    	}
+        if($checkIfDir && file_exists($file) && is_dir($file))
+        {
+            return '';
+        }else 
+        {
+            return @substr(@strrchr($file, "."), 1);
+        }
     	
     	
     }	
 
-	function isDirEmpty($path)
-	{
-		$dirHandler = @opendir($path);
-		if($dirHandler)
-		{
-			while(false !== ($file = readdir($dirHandler)))
-			{
-				if($file != '.' && $file != '..')
-				{
-					@closedir($dirHandler);
-					return false;
+    function isDirEmpty($path)
+    {
+        $dirHandler = @opendir($path);
+        if($dirHandler)
+        {
+            while(false !== ($file = readdir($dirHandler)))
+            {
+                if($file != '.' && $file != '..')
+                {
+                    @closedir($dirHandler);
+                    return false;
 					
-				}
-			}
+                }
+            }
 			
-			@closedir($dirHandler);
+            @closedir($dirHandler);
 				
-		}	
-		return true;	
-	}
+        }	
+        return true;	
+    }
 }
 ?>
\ No newline at end of file

Spacing +64 added lines, -64 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
@@ -11,7 +11,7 @@ 
 	 * @since 22/April/2007
 	 *
 	 */
-require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "class.file.php");
+require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."class.file.php");
 class manager
 {
 	var $currentFolderPath;
@@ -59,60 +59,60 @@ 
 		 * @path the path to a folder
 		 * @calculateSubdir force to get the subdirectories information
 		 */		
-	function __construct($path = null, $calculateSubdir=true)
+	function __construct($path = null, $calculateSubdir = true)
 	{
 
 		$this->calculateSubdir = $calculateSubdir;
-		if(defined('CONFIG_SYS_FOLDER_SHOWN_ON_TOP'))
+		if (defined('CONFIG_SYS_FOLDER_SHOWN_ON_TOP'))
 		{
 			$this->forceFolderOnTop = CONFIG_SYS_FOLDER_SHOWN_ON_TOP;
 		}
-		if(!is_null($path))
+		if (!is_null($path))
 		{
 			$this->currentFolderPath = $path;
 
-		}elseif(isset($_GET[$this->folderPathIndex]) && file_exists($_GET[$this->folderPathIndex]) && !is_file($_GET[$this->folderPathIndex]) )
+		}elseif (isset($_GET[$this->folderPathIndex]) && file_exists($_GET[$this->folderPathIndex]) && !is_file($_GET[$this->folderPathIndex]))
 		{
 			$this->currentFolderPath = $_GET[$this->folderPathIndex];
 		}
-		elseif(isset($_SESSION[$this->lastVisitedFolderPathIndex]) && file_exists($_SESSION[$this->lastVisitedFolderPathIndex]) && !is_file($_SESSION[$this->lastVisitedFolderPathIndex]))
+		elseif (isset($_SESSION[$this->lastVisitedFolderPathIndex]) && file_exists($_SESSION[$this->lastVisitedFolderPathIndex]) && !is_file($_SESSION[$this->lastVisitedFolderPathIndex]))
 		{
 			$this->currentFolderPath = $_SESSION[$this->lastVisitedFolderPathIndex];
-		}else
+		} else
 		{
 			$this->currentFolderPath = CONFIG_SYS_DEFAULT_PATH;
 		}
 		
-		$this->currentFolderPath = (isUnderRoot($this->currentFolderPath)?backslashToSlash((addTrailingSlash($this->currentFolderPath))):CONFIG_SYS_DEFAULT_PATH);
+		$this->currentFolderPath = (isUnderRoot($this->currentFolderPath) ? backslashToSlash((addTrailingSlash($this->currentFolderPath))) : CONFIG_SYS_DEFAULT_PATH);
 		
-		if($this->calculateSubdir)
+		if ($this->calculateSubdir)
 		{// keep track of this folder path in session 
 			$_SESSION[$this->lastVisitedFolderPathIndex] = $this->currentFolderPath;
 		}
-		if(is_dir($this->currentFolderPath))
+		if (is_dir($this->currentFolderPath))
 		{
 			$file = new file($this->currentFolderPath);
 			$folderInfo = $file->getFileInfo();
-			if(sizeof($folderInfo))
+			if (sizeof($folderInfo))
 			{
-				$this->currentFolderInfo['name']=basename($this->currentFolderPath);
-				$this->currentFolderInfo['subdir']=0;
-				$this->currentFolderInfo['file']=0;
-				$this->currentFolderInfo['ctime']=$folderInfo['ctime'];
-				$this->currentFolderInfo['mtime']=$folderInfo['mtime'];
-				$this->currentFolderInfo['is_readable']=$folderInfo['is_readable'];
-				$this->currentFolderInfo['is_writable']=$folderInfo['is_writable'];	
-				$this->currentFolderInfo['path']  = $this->currentFolderPath;
+				$this->currentFolderInfo['name'] = basename($this->currentFolderPath);
+				$this->currentFolderInfo['subdir'] = 0;
+				$this->currentFolderInfo['file'] = 0;
+				$this->currentFolderInfo['ctime'] = $folderInfo['ctime'];
+				$this->currentFolderInfo['mtime'] = $folderInfo['mtime'];
+				$this->currentFolderInfo['is_readable'] = $folderInfo['is_readable'];
+				$this->currentFolderInfo['is_writable'] = $folderInfo['is_writable'];	
+				$this->currentFolderInfo['path'] = $this->currentFolderPath;
 				$this->currentFolderInfo['friendly_path'] = transformFilePath($this->currentFolderPath);
 				$this->currentFolderInfo['type'] = "folder";
-				$this->currentFolderInfo['cssClass']='folder';
+				$this->currentFolderInfo['cssClass'] = 'folder';
 				
 				//$this->currentFolderInfo['flag'] = $folderInfo['flag'];
 			}			
 		}
-		if($calculateSubdir && !file_exists($this->currentFolderPath))
+		if ($calculateSubdir && !file_exists($this->currentFolderPath))
 		{
-			die(ERR_FOLDER_NOT_FOUND . $this->currentFolderPath);
+			die(ERR_FOLDER_NOT_FOUND.$this->currentFolderPath);
 		}
 
 
@@ -126,7 +126,7 @@ 
 	/**
 		 * constructor
 		 */
-	function manager($path = null, $calculateSubdir=true)
+	function manager($path = null, $calculateSubdir = true)
 	{
 		$this->__construct($path, $calculateSubdir);
 	}
@@ -149,35 +149,35 @@ 
 		$folders = array();
 		$tem = array();
 		$dirHandler = @opendir($this->currentFolderPath);
-		if($dirHandler)
+		if ($dirHandler)
 		{
-			while(false !== ($file = readdir($dirHandler)))
+			while (false !== ($file = readdir($dirHandler)))
 			{
-				if($file != '.' && $file != '..')
+				if ($file != '.' && $file != '..')
 				{
 					$flag = $this->flags['no'];
 				
-					if($this->sessionAction->getFolder() == $this->currentFolderPath)
+					if ($this->sessionAction->getFolder() == $this->currentFolderPath)
 					{//check if any flag associated with this folder or file
 						$folder = addTrailingSlash(backslashToSlash($this->currentFolderPath));
-						if(in_array($folder . $file, $this->sessionAction->get()))
+						if (in_array($folder.$file, $this->sessionAction->get()))
 						{
-							if($this->sessionAction->getAction() == "copy")
+							if ($this->sessionAction->getAction() == "copy")
 							{
 								$flag = $this->flags['copy'];
-							}else 
+							} else 
 							{
 								$flag = $this->flags['cut'];
 							}
 						}
 					}					
-					$path=$this->currentFolderPath.$file;
-					if(is_dir($path) && isListingDocument($path) )
+					$path = $this->currentFolderPath.$file;
+					if (is_dir($path) && isListingDocument($path))
 					{
 						$this->currentFolderInfo['subdir']++;
-						if(!$this->calculateSubdir)
+						if (!$this->calculateSubdir)
 						{			
-						}else 
+						} else 
 						{
 							
 								$folder = $this->getFolderInfo($path);
@@ -187,15 +187,15 @@ 
 						}
 
 						
-					}elseif(is_file($path) && isListingDocument($path))
+					}elseif (is_file($path) && isListingDocument($path))
 					{
 
 							$obj = new file($path);
 							$tem = $obj->getFileInfo();
-							if(sizeof($tem))
+							if (sizeof($tem))
 							{
 								$fileType = $this->getFileType($file);
-								foreach($fileType as $k=>$v)
+								foreach ($fileType as $k=>$v)
 								{
 									$tem[$k] = $v;
 								}
@@ -216,12 +216,12 @@ 
 					
 				}
 			}
-			if($this->forceFolderOnTop)
+			if ($this->forceFolderOnTop)
 			{
 				uksort($folders, "strnatcasecmp");
 				uksort($files, "strnatcasecmp");
 				$outputs = array();
-				foreach($folders as $v)
+				foreach ($folders as $v)
 				{
 					$outputs[] = $v;
 				}
@@ -229,15 +229,15 @@ 
 				{
 					$outputs[] = $v;
 				}
-			}else 
+			} else 
 			{
 				uksort($outputs, "strnatcasecmp");
 			}
 			
 			@closedir($dirHandler);
-		}else
+		} else
 		{
-			trigger_error('Unable to locate the folder ' . $this->currentFolderPath, E_NOTICE);
+			trigger_error('Unable to locate the folder '.$this->currentFolderPath, E_NOTICE);
 		}
 		return $outputs;
 	}
@@ -249,12 +249,12 @@ 
 	 * @param string $path
 	 * @return array
 	 */
-	function getFolderInfo($path=null)
+	function getFolderInfo($path = null)
 	{
-		if(is_null($path))
+		if (is_null($path))
 		{
 			return $this->currentFolderInfo;
-		}else 
+		} else 
 		{
 			$obj = new manager($path, false);
 			$obj->setSessionAction($this->sessionAction);
@@ -277,29 +277,29 @@ 
 			
 			foreach ($this->fileTypes as $fileType) 
 			{
-				if(in_array($ext, $fileType[0]))
+				if (in_array($ext, $fileType[0]))
 				{
 					return array("cssClass" => $fileType[1], "fileType" => $fileType[2], "preview" => $fileType[3], 'test'=>5);
 				}
 			}
-			if(!empty($fileName))
+			if (!empty($fileName))
 			{//this is folder
-				if(empty($ext))
+				if (empty($ext))
 				{
-					if(is_dir($fileName))
+					if (is_dir($fileName))
 					{
 
-						return array("cssClass" => ($checkIfDir && $this->isDirEmpty($fileName)?'folderEmpty':"folder") , "fileType" => "Folder", "preview" => 0, 'test'=>1);
-					}else 
+						return array("cssClass" => ($checkIfDir && $this->isDirEmpty($fileName) ? 'folderEmpty' : "folder"), "fileType" => "Folder", "preview" => 0, 'test'=>1);
+					} else 
 					{
 						return array("cssClass" => "fileUnknown", "fileType" => SEARCH_TYPE_UNKNOWN, "preview" => 0, 'test'=>2);
 					}
-				}else 
+				} else 
 				{
-					return array("cssClass" => "fileUnknown", "fileType" => SEARCH_TYPE_UNKNOWN, "preview" => 0, 'test'=>3, 'ext'=>$ext , 'filename'=>$fileName);
+					return array("cssClass" => "fileUnknown", "fileType" => SEARCH_TYPE_UNKNOWN, "preview" => 0, 'test'=>3, 'ext'=>$ext, 'filename'=>$fileName);
 				}
 				
-			}else
+			} else
 			{//this is unknown file
 				return array("cssClass" => "fileUnknown", "fileType" => SEARCH_TYPE_UNKNOWN, "preview" => 0, 'test'=>4);
 			}
@@ -322,13 +322,13 @@ 
 		 */
 	function printFileTypes()
 	{
-		foreach($fileTypes as $fileType)
+		foreach ($fileTypes as $fileType)
 		{
-			if(isset($fileType[0]) && is_array($fileType[0]))
+			if (isset($fileType[0]) && is_array($fileType[0]))
 			{
-				foreach($fileType[0] as $type)
+				foreach ($fileType[0] as $type)
 				{
-					echo $type. ",";
+					echo $type.",";
 				}
 			}
 		}
@@ -343,10 +343,10 @@ 
 	 */
     function _getExtension($file, $checkIfDir = false)
     {
-    	if($checkIfDir && file_exists($file) && is_dir($file))
+    	if ($checkIfDir && file_exists($file) && is_dir($file))
     	{
     		return '';
-    	}else 
+    	} else 
     	{
     		return @substr(@strrchr($file, "."), 1);
     	}
@@ -357,11 +357,11 @@ 
 	function isDirEmpty($path)
 	{
 		$dirHandler = @opendir($path);
-		if($dirHandler)
+		if ($dirHandler)
 		{
-			while(false !== ($file = readdir($dirHandler)))
+			while (false !== ($file = readdir($dirHandler)))
 			{
-				if($file != '.' && $file != '..')
+				if ($file != '.' && $file != '..')
 				{
 					@closedir($dirHandler);
 					return false;

Braces +13 added lines, -14 removed lines

@@ -71,14 +71,13 @@ 
 		{
 			$this->currentFolderPath = $path;
 
-		}elseif(isset($_GET[$this->folderPathIndex]) && file_exists($_GET[$this->folderPathIndex]) && !is_file($_GET[$this->folderPathIndex]) )
+		} elseif(isset($_GET[$this->folderPathIndex]) && file_exists($_GET[$this->folderPathIndex]) && !is_file($_GET[$this->folderPathIndex]) )
 		{
 			$this->currentFolderPath = $_GET[$this->folderPathIndex];
-		}
-		elseif(isset($_SESSION[$this->lastVisitedFolderPathIndex]) && file_exists($_SESSION[$this->lastVisitedFolderPathIndex]) && !is_file($_SESSION[$this->lastVisitedFolderPathIndex]))
+		} elseif(isset($_SESSION[$this->lastVisitedFolderPathIndex]) && file_exists($_SESSION[$this->lastVisitedFolderPathIndex]) && !is_file($_SESSION[$this->lastVisitedFolderPathIndex]))
 		{
 			$this->currentFolderPath = $_SESSION[$this->lastVisitedFolderPathIndex];
-		}else
+		} else
 		{
 			$this->currentFolderPath = CONFIG_SYS_DEFAULT_PATH;
 		}
@@ -165,7 +164,7 @@ 
 							if($this->sessionAction->getAction() == "copy")
 							{
 								$flag = $this->flags['copy'];
-							}else 
+							} else 
 							{
 								$flag = $this->flags['cut'];
 							}
@@ -177,7 +176,7 @@ 
 						$this->currentFolderInfo['subdir']++;
 						if(!$this->calculateSubdir)
 						{			
-						}else 
+						} else 
 						{
 							
 								$folder = $this->getFolderInfo($path);
@@ -187,7 +186,7 @@ 
 						}
 
 						
-					}elseif(is_file($path) && isListingDocument($path))
+					} elseif(is_file($path) && isListingDocument($path))
 					{
 
 							$obj = new file($path);
@@ -229,13 +228,13 @@ 
 				{
 					$outputs[] = $v;
 				}
-			}else 
+			} else 
 			{
 				uksort($outputs, "strnatcasecmp");
 			}
 			
 			@closedir($dirHandler);
-		}else
+		} else
 		{
 			trigger_error('Unable to locate the folder ' . $this->currentFolderPath, E_NOTICE);
 		}
@@ -254,7 +253,7 @@ 
 		if(is_null($path))
 		{
 			return $this->currentFolderInfo;
-		}else 
+		} else 
 		{
 			$obj = new manager($path, false);
 			$obj->setSessionAction($this->sessionAction);
@@ -290,16 +289,16 @@ 
 					{
 
 						return array("cssClass" => ($checkIfDir && $this->isDirEmpty($fileName)?'folderEmpty':"folder") , "fileType" => "Folder", "preview" => 0, 'test'=>1);
-					}else 
+					} else 
 					{
 						return array("cssClass" => "fileUnknown", "fileType" => SEARCH_TYPE_UNKNOWN, "preview" => 0, 'test'=>2);
 					}
-				}else 
+				} else 
 				{
 					return array("cssClass" => "fileUnknown", "fileType" => SEARCH_TYPE_UNKNOWN, "preview" => 0, 'test'=>3, 'ext'=>$ext , 'filename'=>$fileName);
 				}
 				
-			}else
+			} else
 			{//this is unknown file
 				return array("cssClass" => "fileUnknown", "fileType" => SEARCH_TYPE_UNKNOWN, "preview" => 0, 'test'=>4);
 			}
@@ -346,7 +345,7 @@ 
     	if($checkIfDir && file_exists($file) && is_dir($file))
     	{
     		return '';
-    	}else 
+    	} else 
     	{
     		return @substr(@strrchr($file, "."), 1);
     	}

phpmyfaq/admin/editor/plugins/ajaxfilemanager/inc/class.pagination.php

Doc Comments +3 added lines, -5 removed lines

@@ -217,7 +217,7 @@ 
 	/**
 	 * get the first item number
 	 *
-	 * @return interger the first item number displayed within current page
+	 * @return integer the first item number displayed within current page
 	 */
 	function getFirstItem()
 	{
@@ -233,7 +233,7 @@ 
 	/**
 	 * get the last item number displayed within current page
 	 *
-	 * @return interger the last item number
+	 * @return integer the last item number
 	 */
 	function getLastItem()
 	{
@@ -276,7 +276,7 @@ 
 	 * used for Query . e.g SELECT SQL_CALC_FOUND_ROWS *
 	 * 						FROM mytable LIMIT getPageOffset(), getItemsPerPage()
 	 *
-	 * @return iner
+	 * @return integer
 	 */
 	function getPageOffset()
 	{
@@ -341,7 +341,6 @@ 
 	/**
 	 * get the previous page url if anywhere
 	 *
-	 * @param array $excludedQueryStrings excluded the value from $_GET
 	 * @return string the previous page url
 	 */
 	function getPreviousUrl()
@@ -368,7 +367,6 @@ 
 	/**
 	 * get the next page url if anywhere
 	 *
-	 * @param array $excludedQueryStrings excluded the value from $_GET
 	 * @return string the next page url
 	 */
 	function getNextUrl()

Indentation +581 added lines, -581 removed lines

@@ -1,589 +1,589 @@
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php
 /**
- * Pagination Class
- * @author Logan Cai  (cailongqun [at] yahoo [dot] com [dot] cn)
- * @since 27/Nov/20006
- *
- */
+     * Pagination Class
+     * @author Logan Cai  (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @since 27/Nov/20006
+     *
+     */
 class pagination
 {
-	var $totalItems = 0;
-	var $itemsPerPage = 30;
-	var $currentPage = 1;
-	var $friendlyUrl = false;
-	var $baseUrl = "";
-	var $pageIndex = "page";
-	var $groupLimit = 5;
-	var $excludedQueryStrings = array();
-	var $totalPages = 0;
-	var $url = "";
-	var $previousText = "Previous";
-	var $nextText = "Next";
-	var $lastText = "Last";
-	var $firstText = "First";
-	var $limitIndex ='limit';
-	var $limits = array(5, 10, 20, 30, 50, 80, 150, 999);
-
-
-	/**
-	 * Contructor
-	 *
-	 * @param boolean $friendlyUrl set the returned url
-	 * as search engine friendly or Normal Url
-	 */
-	function pagination($friendlyUrl=false)
-	{
-		$this->friendlyUrl = $friendlyUrl;
-		$this->__resetCurrentPage();
-	}
-
-	/**
-	 * set maximum number of items per page
-	 *
-	 * @param integer $value maximum number of items per page
-	 */
-	function setLimit($value)
-	{
-		$this->itemsPerPage = intval($value);
-	}
-	/**
-	 * get maximum number of items per page
-	 *
-	 * @return integer
-	 */
-	function getLimit()
-	{
-		return $this->itemsPerPage;
-	}
-
-	/**
-	 * set the total number of items
-	 *
-	 * @param integer $value the total number of items
-	 */
-	function setTotal($value)
-	{
-		$this->totalItems = intval($value);
-	}
-	/**
-	 * get the total number of items
-	 *
-	 * @return integer total number of items
-	 */
-	function getTotal()
-	{
-		return $this->totalItems;
-	}
-	/**
-	 * get total pages will be used to display all records
-	 *
-	 */
-	function getTotalPages()
-	{
-
-		$output = floor(($this->totalItems / $this->itemsPerPage ));
-		if($this->totalItems % $this->itemsPerPage)
-		{
-			$output++;
-		}
-		return $output;
-	}
-
-	/**
-	 * Set the index of URL Query String
-	 *
-	 * @param string $value e.g. page
-	 */
-	function setPageIndex($value)
-	{
-		$this->pageIndex = $value;
-		$this->__resetCurrentPage();
-	}
-
-
-	function getPageIndex()
-	{
-		return $this->pageIndex;
-	}
-	/**
-	 * initiate or reset the current page number
-	 *
-	 */
-	function __resetCurrentPage()
-	{
-		$this->currentPage = ((isset($_GET[$this->pageIndex]) && intval($_GET[$this->pageIndex]) > 0)?intval($_GET[$this->pageIndex]):1);
-	}
-
-	/**
-	 * set the base url used in the links, default is $PHP_SELF
-	 *
-	 * @param string $value the base url
-	 */
-	function setUrl($value="")
-	{
-		if(empty($value))
-		{
-			if($this->friendlyUrl)
-			{
-				$this->url = "http://" . $_SERVER['HTTP_HOST'] . "/";
-			}else
-			{
-				$this->url = $_SERVER['PHP_SELF'];
-			}
-		}else
-		{
-			$this->url = $value;
-		}
-
-	}
-
-	/**
-	 * get the base url variable
-	 *
-	 * @return string the base url
-	 */
-	function getUrl()
-	{
-
-		if(empty($this->url))
-		{
-			$this->setUrl();
-
-		}
-		return $this->url;
-	}
-
-	/**
-	 * set base url for pagination links after exculed those keys
-	 * identified on excluded query strings
-	 */
-	function __setBaseUrl()
-	{
-
-		if(empty($this->url))
-		{
-			$this->getUrl();
-		}
-
-		if($this->friendlyUrl)
-		{
-			$this->baseUrl = $this->getUrl();
-		}else
-		{
-
-			$appendingQueryStrings = array();
-			$this->excludedQueryStrings[$this->pageIndex] =$this->pageIndex;
-			foreach($_GET as $k=>$v)
-			{
-				if((array_search($k, $this->excludedQueryStrings) === false ))
-				{
-					$appendingQueryStrings[$k] = $k . "=" . $v;
-				}
-			}
-			if(sizeof($appendingQueryStrings))
-			{
-				$this->baseUrl = $this->__appendQueryString($this->url, implode("&", $appendingQueryStrings));
-			}else
-			{
-				$this->baseUrl = $this->getUrl();
-			}
-
-		}
-
-
-	}
-	/**
-	 * get base url for pagination links aftr excluded those key
-	 * identified on excluded query strings
-	 *
-	 */
-	function __getBaseUrl()
-	{
-
-		if(empty($this->baseUrl))
-		{
-
-			$this->__setBaseUrl();
-		}
-		return $this->baseUrl;
-	}
-
-
-	/**
-	 * get the first item number
-	 *
-	 * @return interger the first item number displayed within current page
-	 */
-	function getFirstItem()
-	{
-		$output = 0;
-		$temStartItemNumber = (($this->currentPage - 1) * $this->itemsPerPage + 1);
-		if($this->totalItems && $temStartItemNumber <= $this->totalItems )
-		{
-
-			$output = $temStartItemNumber;
-		}
-		return $output;
-	}
-	/**
-	 * get the last item number displayed within current page
-	 *
-	 * @return interger the last item number
-	 */
-	function getLastItem()
-	{
-		$output = 0;
-		$temEndItemNumber = (($this->currentPage) * $this->itemsPerPage);
-		if($this->totalItems)
-		{
-			if($temEndItemNumber <= $this->totalItems)
-			{
-				$output = $temEndItemNumber;
-			}else
-			{
-				$output = $this->totalItems;
-			}
-
-		}
-		return $output;
-	}
-	/**
-	 * set  page groupings limit
-	 * used for previous 1 2 3 4 5 next
-	 *
-	 * @param unknown_type $value
-	 */
-	function setGroupLimit($value)
-	{
-		$this->groupLimit = intval($value);
-	}
-	/**
-	 * get page grouping limit
-	 *
-	 * @return integer the page grouping limit
-	 */
-	function getGroupLimit()
-	{
-		return $this->groupLimit;
-	}
-	/**
-	 * get the page offset number
-	 * used for Query . e.g SELECT SQL_CALC_FOUND_ROWS *
-	 * 						FROM mytable LIMIT getPageOffset(), getItemsPerPage()
-	 *
-	 * @return iner
-	 */
-	function getPageOffset()
-	{
-		return (($this->currentPage - 1)  * $this->itemsPerPage);
-	}
-	/**
-	 * get the last url if any
-	 * @return  string the last url
-	 */
-	function getLastUrl()
-	{
-
-		$url = "";
-		$totalPages = $this->getTotalPages();
-		if($this->currentPage < $totalPages)
-		{
-			$url = $this->__getBaseUrl();
-
-			if($this->friendlyUrl)
-			{
-				$url .= $this->pageIndex . $totalPages . "/";
-			}else
-			{
-				$url = $this->__appendQueryString($url, $this->pageIndex . "=" . $totalPages);
-			}
-			$url = sprintf('<a href="%s" class="pagination_last"><span>%s</span></a>',
-			$url,
-			$this->lastText);
-		}
-		return $url;
-	}
-
-
-
-
-	/**
-	 * get the first url if any
-	 * @return string the first url
-	 */
-
-	function getFirstUrl()
-	{
-		$url = "";
-		if($this->currentPage > 1)
-		{
-			$url = $this->__getBaseUrl();
-			if($this->friendlyUrl)
-			{
-				$url .= $this->pageIndex .  "1/";
-			}else
-			{
-				$url = $this->__appendQueryString($url, $this->pageIndex . "=1");
-			}
-			$url = sprintf('<a href="%s" class="pagination_first"><span>%s</span></a>',
-			$url,
-			$this->firstText);
-
-		}
-		return $url;
-	}
-
-	/**
-	 * get the previous page url if anywhere
-	 *
-	 * @param array $excludedQueryStrings excluded the value from $_GET
-	 * @return string the previous page url
-	 */
-	function getPreviousUrl()
-	{
-		$url = "";
-		if($this->currentPage > 1 && $this->totalItems > 0 )
-		{
-			$url = $this->__getBaseUrl();
-			if($this->friendlyUrl)
-			{
-				$url .= $this->pageIndex . ($this->currentPage - 1) . "/";
-			}else
-			{
-				$url = $this->__appendQueryString($url, $this->pageIndex . "=" . ($this->currentPage -1));
-			}
-			$url = sprintf('<a href="%s" class="pagination_previous"><span>%s</span></a>',
-			$url,
-			$this->previousText);
-
-		}
-
-		return $url;
-	}
-	/**
-	 * get the next page url if anywhere
-	 *
-	 * @param array $excludedQueryStrings excluded the value from $_GET
-	 * @return string the next page url
-	 */
-	function getNextUrl()
-	{
-		$url = "";
-		if($this->totalItems > ($this->currentPage * $this->itemsPerPage))
-		{
-			$url = $this->__getBaseUrl();
-			if($this->friendlyUrl)
-			{
-				$url .= $this->pageIndex . ($this->currentPage + 1) . "/";
-			}else
-			{
-				$url = $this->__appendQueryString($url, $this->pageIndex . "=" . ($this->currentPage + 1));
-			}
-			$url = sprintf('<a href="%s" class="pagination_next"><span>%s</span></a>',
-			$url,
-			$this->nextText);
-		}
-		return $url;
-
-	}
-
-	/**
-	 * get the group page links  e.g. 1,2,3,4,5
-	 * return format
-	 * <a class="pagination_group" href='yoururl'>1</a>
-	 * <a class="pagination_group active" href='#'>2</a>
-	 * <a class="pagination_group" href='yoururl'>3</a>
-	 */
-	function getGroupUrls()
-	{
-		$output = "";
-		if($this->totalItems > 0)
-		{
-			$displayedPages = 0;
-			$url = $this->__getBaseUrl();
-			$totalPages = $this->getTotalPages();
-			// find halfway point
-			$groupLimitHalf = floor($this->groupLimit / 2);
-			// determine what item/page we start with
-			$itemStart = $this->currentPage - $groupLimitHalf;
-			$itemStart = ($itemStart > 0 && $itemStart <= $totalPages)?$itemStart:1;
-			$itemEnd = $itemStart;
-
-			while($itemEnd < ($itemStart + $this->groupLimit - 1) && $itemEnd < $totalPages)
-			{
-				$itemEnd++;
-			}
-
-
-			if($totalPages > ($itemEnd - $itemStart))
-			{
-				for($i = $itemStart; $i > 1 && ($itemEnd - $itemStart + 1) < $this->groupLimit; $i--)
-				{
-					$itemStart--;
-				}
-			}
-
-			for($item = $itemStart; $item <= $itemEnd; $item++)
-			{
-				if($item != $this->currentPage)
-				{//it is not the active link
-					if($this->friendlyUrl)
-					{
-						$temUrl = $url . $this->pageIndex . $item .   "/";
-					}else
-					{
-						$temUrl  = $this->__appendQueryString($url, $this->pageIndex . "=" . $item);
-					}
-					$output .= sprintf(' <a class="pagination_group" href="%s"><span>%d</span></a> ', $temUrl, $item);
-				}else
-				{//active link
-					$output .= sprintf(' <a class="pagination_group pagination_active" href="#"><span>%d</span></a> ', $item);
-				}
-			}
-		}
-		return $output;
-	}
-	/**
-	 * set the text of previous page link
-	 *
-	 * @param string $value
-	 */
-	function setPreviousText($value)
-	{
-		$this->previousText = $value;
-	}
-	/**
-	 * set the text of first page link
-	 *
-	 * @param string $value
-	 */
-	function setFirstText($value)
-	{
-		$this->firstText = $value;
-	}
-	/**
-	 * set the text of next page link
-	 *
-	 * @param string $value
-	 */
-
-	function setNextText($value)
-	{
-		$this->nextText = $value;
-	}
-	/**
-	 * set the text of last page link
-	 *
-	 * @param string $value
-	 */
-	function setLastText($value)
-	{
-		$this->lastText = $value;
-	}
-
-	/**
-	 * set the excluded query string from $_GET;
-	 *
-	 * @param array the lists of the query string keys
-	 */
-
-	function setExcludedQueryString($values = array())
-	{
-		$this->excludedQueryStrings = $values;
-	}
-
-	function getExcludedQueryString()
-	{
-		return $this->excludedQueryStrings;
-	}
-
-
-	/**
-	 * add extra query stiring to a url
-	 * @param string $baseUrl
-	 * @param string $extra the query string added to the base url
-	 */
-	function __appendQueryString($baseUrl, $extra)
-	{
-		$output = trim($baseUrl);
-		if(strpos($baseUrl, "?") !== false)
-		{
-			$output .= "&" . $extra;
-		}else
-		{
-			$output .= "?" . $extra;
-		}
-		return $output;
-	}
-	/**
-	 * return the html
-	 *
-	 * @param integer $type
-	 */
-	function getPaginationHTML($type=1, $cssClass="pagination")
-	{
-		$output = '';
-		$output .= "<div class=\"pagination_content\"><p class=\"$cssClass\">\n";
-		switch($type)
-		{
-			case "2":
-				$output .= "<span class=\"pagination_summany\">" . $this->getFirstItem() . " to " . $this->getLastItem() . " of " . $this->getTotal() . " results.</span> ";	
-			if($previousUrl = $this->getPreviousUrl())
-			{
-				$output .= " " . $previousUrl;
-			}
-
-			if($nextUrl = $this->getNextUrl())
-			{
-				$output .= " " . $nextUrl;
-			}							
-				break;
-			case 1:
-				//get full summary pagination
-			default:
-				$output .= "<span class=\"pagination_summany\">" . $this->getFirstItem() . "/" . $this->getLastItem() . " (" . $this->getTotal() . ")</span> ";
-			if($firstUrl = $this->getFirstUrl())
-			{
-				$output .= " " . $firstUrl;
-			}
-			if($previousUrl = $this->getPreviousUrl())
-			{
-				$output .= " " . $previousUrl;
-			}
-
-			if($groupUrls = $this->getGroupUrls())
-			{
-				$output .= " " . $groupUrls;
-			}
-			if($nextUrl = $this->getNextUrl())
-			{
-				$output .= " " . $nextUrl;
-			}
-			if($lastUrl = $this->getLastUrl())
-			{
-				$output .= " " . $lastUrl;
-			}
-			$itemPerPage = '';
-			$itemPerPage .= "<select name=\"" . $this->limitIndex . "\" id=\"limit\" class=\"input inputLimit\" onchange=\"changePaginationLimit();\">\n";
-			foreach ($this->limits as $v)
-			{
-				$itemPerPage .= "<option value=\"" . $v . "\" " . ($v==$this->itemsPerPage?'selected="selected"':'') . ">" . $v . "</option>\n";
-			}
-			$itemPerPage .= "</select>\n"; 
-			$output .= "<span class=\"pagination_items_per_page\">";
-			$output .= sprintf(PAGINATION_ITEMS_PER_PAGE, $itemPerPage);
-			$output .= "</span>";
-			$output .= "<span class=\"pagination_parent\"><a href=\"#\" onclick=\"goParentFolder();\" id=\"pagination_parent_link\" title=\"" . PAGINATION_GO_PARENT . "\">&nbsp;</a></span>";
-		}
-
-		$output .= "</p></div>";
-		return $output;
-	}
+    var $totalItems = 0;
+    var $itemsPerPage = 30;
+    var $currentPage = 1;
+    var $friendlyUrl = false;
+    var $baseUrl = "";
+    var $pageIndex = "page";
+    var $groupLimit = 5;
+    var $excludedQueryStrings = array();
+    var $totalPages = 0;
+    var $url = "";
+    var $previousText = "Previous";
+    var $nextText = "Next";
+    var $lastText = "Last";
+    var $firstText = "First";
+    var $limitIndex ='limit';
+    var $limits = array(5, 10, 20, 30, 50, 80, 150, 999);
+
+
+    /**
+     * Contructor
+     *
+     * @param boolean $friendlyUrl set the returned url
+     * as search engine friendly or Normal Url
+     */
+    function pagination($friendlyUrl=false)
+    {
+        $this->friendlyUrl = $friendlyUrl;
+        $this->__resetCurrentPage();
+    }
+
+    /**
+     * set maximum number of items per page
+     *
+     * @param integer $value maximum number of items per page
+     */
+    function setLimit($value)
+    {
+        $this->itemsPerPage = intval($value);
+    }
+    /**
+     * get maximum number of items per page
+     *
+     * @return integer
+     */
+    function getLimit()
+    {
+        return $this->itemsPerPage;
+    }
+
+    /**
+     * set the total number of items
+     *
+     * @param integer $value the total number of items
+     */
+    function setTotal($value)
+    {
+        $this->totalItems = intval($value);
+    }
+    /**
+     * get the total number of items
+     *
+     * @return integer total number of items
+     */
+    function getTotal()
+    {
+        return $this->totalItems;
+    }
+    /**
+     * get total pages will be used to display all records
+     *
+     */
+    function getTotalPages()
+    {
+
+        $output = floor(($this->totalItems / $this->itemsPerPage ));
+        if($this->totalItems % $this->itemsPerPage)
+        {
+            $output++;
+        }
+        return $output;
+    }
+
+    /**
+     * Set the index of URL Query String
+     *
+     * @param string $value e.g. page
+     */
+    function setPageIndex($value)
+    {
+        $this->pageIndex = $value;
+        $this->__resetCurrentPage();
+    }
+
+
+    function getPageIndex()
+    {
+        return $this->pageIndex;
+    }
+    /**
+     * initiate or reset the current page number
+     *
+     */
+    function __resetCurrentPage()
+    {
+        $this->currentPage = ((isset($_GET[$this->pageIndex]) && intval($_GET[$this->pageIndex]) > 0)?intval($_GET[$this->pageIndex]):1);
+    }
+
+    /**
+     * set the base url used in the links, default is $PHP_SELF
+     *
+     * @param string $value the base url
+     */
+    function setUrl($value="")
+    {
+        if(empty($value))
+        {
+            if($this->friendlyUrl)
+            {
+                $this->url = "http://" . $_SERVER['HTTP_HOST'] . "/";
+            }else
+            {
+                $this->url = $_SERVER['PHP_SELF'];
+            }
+        }else
+        {
+            $this->url = $value;
+        }
+
+    }
+
+    /**
+     * get the base url variable
+     *
+     * @return string the base url
+     */
+    function getUrl()
+    {
+
+        if(empty($this->url))
+        {
+            $this->setUrl();
+
+        }
+        return $this->url;
+    }
+
+    /**
+     * set base url for pagination links after exculed those keys
+     * identified on excluded query strings
+     */
+    function __setBaseUrl()
+    {
+
+        if(empty($this->url))
+        {
+            $this->getUrl();
+        }
+
+        if($this->friendlyUrl)
+        {
+            $this->baseUrl = $this->getUrl();
+        }else
+        {
+
+            $appendingQueryStrings = array();
+            $this->excludedQueryStrings[$this->pageIndex] =$this->pageIndex;
+            foreach($_GET as $k=>$v)
+            {
+                if((array_search($k, $this->excludedQueryStrings) === false ))
+                {
+                    $appendingQueryStrings[$k] = $k . "=" . $v;
+                }
+            }
+            if(sizeof($appendingQueryStrings))
+            {
+                $this->baseUrl = $this->__appendQueryString($this->url, implode("&", $appendingQueryStrings));
+            }else
+            {
+                $this->baseUrl = $this->getUrl();
+            }
+
+        }
+
+
+    }
+    /**
+     * get base url for pagination links aftr excluded those key
+     * identified on excluded query strings
+     *
+     */
+    function __getBaseUrl()
+    {
+
+        if(empty($this->baseUrl))
+        {
+
+            $this->__setBaseUrl();
+        }
+        return $this->baseUrl;
+    }
+
+
+    /**
+     * get the first item number
+     *
+     * @return interger the first item number displayed within current page
+     */
+    function getFirstItem()
+    {
+        $output = 0;
+        $temStartItemNumber = (($this->currentPage - 1) * $this->itemsPerPage + 1);
+        if($this->totalItems && $temStartItemNumber <= $this->totalItems )
+        {
+
+            $output = $temStartItemNumber;
+        }
+        return $output;
+    }
+    /**
+     * get the last item number displayed within current page
+     *
+     * @return interger the last item number
+     */
+    function getLastItem()
+    {
+        $output = 0;
+        $temEndItemNumber = (($this->currentPage) * $this->itemsPerPage);
+        if($this->totalItems)
+        {
+            if($temEndItemNumber <= $this->totalItems)
+            {
+                $output = $temEndItemNumber;
+            }else
+            {
+                $output = $this->totalItems;
+            }
+
+        }
+        return $output;
+    }
+    /**
+     * set  page groupings limit
+     * used for previous 1 2 3 4 5 next
+     *
+     * @param unknown_type $value
+     */
+    function setGroupLimit($value)
+    {
+        $this->groupLimit = intval($value);
+    }
+    /**
+     * get page grouping limit
+     *
+     * @return integer the page grouping limit
+     */
+    function getGroupLimit()
+    {
+        return $this->groupLimit;
+    }
+    /**
+     * get the page offset number
+     * used for Query . e.g SELECT SQL_CALC_FOUND_ROWS *
+     * 						FROM mytable LIMIT getPageOffset(), getItemsPerPage()
+     *
+     * @return iner
+     */
+    function getPageOffset()
+    {
+        return (($this->currentPage - 1)  * $this->itemsPerPage);
+    }
+    /**
+     * get the last url if any
+     * @return  string the last url
+     */
+    function getLastUrl()
+    {
+
+        $url = "";
+        $totalPages = $this->getTotalPages();
+        if($this->currentPage < $totalPages)
+        {
+            $url = $this->__getBaseUrl();
+
+            if($this->friendlyUrl)
+            {
+                $url .= $this->pageIndex . $totalPages . "/";
+            }else
+            {
+                $url = $this->__appendQueryString($url, $this->pageIndex . "=" . $totalPages);
+            }
+            $url = sprintf('<a href="%s" class="pagination_last"><span>%s</span></a>',
+            $url,
+            $this->lastText);
+        }
+        return $url;
+    }
+
+
+
+
+    /**
+     * get the first url if any
+     * @return string the first url
+     */
+
+    function getFirstUrl()
+    {
+        $url = "";
+        if($this->currentPage > 1)
+        {
+            $url = $this->__getBaseUrl();
+            if($this->friendlyUrl)
+            {
+                $url .= $this->pageIndex .  "1/";
+            }else
+            {
+                $url = $this->__appendQueryString($url, $this->pageIndex . "=1");
+            }
+            $url = sprintf('<a href="%s" class="pagination_first"><span>%s</span></a>',
+            $url,
+            $this->firstText);
+
+        }
+        return $url;
+    }
+
+    /**
+     * get the previous page url if anywhere
+     *
+     * @param array $excludedQueryStrings excluded the value from $_GET
+     * @return string the previous page url
+     */
+    function getPreviousUrl()
+    {
+        $url = "";
+        if($this->currentPage > 1 && $this->totalItems > 0 )
+        {
+            $url = $this->__getBaseUrl();
+            if($this->friendlyUrl)
+            {
+                $url .= $this->pageIndex . ($this->currentPage - 1) . "/";
+            }else
+            {
+                $url = $this->__appendQueryString($url, $this->pageIndex . "=" . ($this->currentPage -1));
+            }
+            $url = sprintf('<a href="%s" class="pagination_previous"><span>%s</span></a>',
+            $url,
+            $this->previousText);
+
+        }
+
+        return $url;
+    }
+    /**
+     * get the next page url if anywhere
+     *
+     * @param array $excludedQueryStrings excluded the value from $_GET
+     * @return string the next page url
+     */
+    function getNextUrl()
+    {
+        $url = "";
+        if($this->totalItems > ($this->currentPage * $this->itemsPerPage))
+        {
+            $url = $this->__getBaseUrl();
+            if($this->friendlyUrl)
+            {
+                $url .= $this->pageIndex . ($this->currentPage + 1) . "/";
+            }else
+            {
+                $url = $this->__appendQueryString($url, $this->pageIndex . "=" . ($this->currentPage + 1));
+            }
+            $url = sprintf('<a href="%s" class="pagination_next"><span>%s</span></a>',
+            $url,
+            $this->nextText);
+        }
+        return $url;
+
+    }
+
+    /**
+     * get the group page links  e.g. 1,2,3,4,5
+     * return format
+     * <a class="pagination_group" href='yoururl'>1</a>
+     * <a class="pagination_group active" href='#'>2</a>
+     * <a class="pagination_group" href='yoururl'>3</a>
+     */
+    function getGroupUrls()
+    {
+        $output = "";
+        if($this->totalItems > 0)
+        {
+            $displayedPages = 0;
+            $url = $this->__getBaseUrl();
+            $totalPages = $this->getTotalPages();
+            // find halfway point
+            $groupLimitHalf = floor($this->groupLimit / 2);
+            // determine what item/page we start with
+            $itemStart = $this->currentPage - $groupLimitHalf;
+            $itemStart = ($itemStart > 0 && $itemStart <= $totalPages)?$itemStart:1;
+            $itemEnd = $itemStart;
+
+            while($itemEnd < ($itemStart + $this->groupLimit - 1) && $itemEnd < $totalPages)
+            {
+                $itemEnd++;
+            }
+
+
+            if($totalPages > ($itemEnd - $itemStart))
+            {
+                for($i = $itemStart; $i > 1 && ($itemEnd - $itemStart + 1) < $this->groupLimit; $i--)
+                {
+                    $itemStart--;
+                }
+            }
+
+            for($item = $itemStart; $item <= $itemEnd; $item++)
+            {
+                if($item != $this->currentPage)
+                {//it is not the active link
+                    if($this->friendlyUrl)
+                    {
+                        $temUrl = $url . $this->pageIndex . $item .   "/";
+                    }else
+                    {
+                        $temUrl  = $this->__appendQueryString($url, $this->pageIndex . "=" . $item);
+                    }
+                    $output .= sprintf(' <a class="pagination_group" href="%s"><span>%d</span></a> ', $temUrl, $item);
+                }else
+                {//active link
+                    $output .= sprintf(' <a class="pagination_group pagination_active" href="#"><span>%d</span></a> ', $item);
+                }
+            }
+        }
+        return $output;
+    }
+    /**
+     * set the text of previous page link
+     *
+     * @param string $value
+     */
+    function setPreviousText($value)
+    {
+        $this->previousText = $value;
+    }
+    /**
+     * set the text of first page link
+     *
+     * @param string $value
+     */
+    function setFirstText($value)
+    {
+        $this->firstText = $value;
+    }
+    /**
+     * set the text of next page link
+     *
+     * @param string $value
+     */
+
+    function setNextText($value)
+    {
+        $this->nextText = $value;
+    }
+    /**
+     * set the text of last page link
+     *
+     * @param string $value
+     */
+    function setLastText($value)
+    {
+        $this->lastText = $value;
+    }
+
+    /**
+     * set the excluded query string from $_GET;
+     *
+     * @param array the lists of the query string keys
+     */
+
+    function setExcludedQueryString($values = array())
+    {
+        $this->excludedQueryStrings = $values;
+    }
+
+    function getExcludedQueryString()
+    {
+        return $this->excludedQueryStrings;
+    }
+
+
+    /**
+     * add extra query stiring to a url
+     * @param string $baseUrl
+     * @param string $extra the query string added to the base url
+     */
+    function __appendQueryString($baseUrl, $extra)
+    {
+        $output = trim($baseUrl);
+        if(strpos($baseUrl, "?") !== false)
+        {
+            $output .= "&" . $extra;
+        }else
+        {
+            $output .= "?" . $extra;
+        }
+        return $output;
+    }
+    /**
+     * return the html
+     *
+     * @param integer $type
+     */
+    function getPaginationHTML($type=1, $cssClass="pagination")
+    {
+        $output = '';
+        $output .= "<div class=\"pagination_content\"><p class=\"$cssClass\">\n";
+        switch($type)
+        {
+            case "2":
+                $output .= "<span class=\"pagination_summany\">" . $this->getFirstItem() . " to " . $this->getLastItem() . " of " . $this->getTotal() . " results.</span> ";	
+            if($previousUrl = $this->getPreviousUrl())
+            {
+                $output .= " " . $previousUrl;
+            }
+
+            if($nextUrl = $this->getNextUrl())
+            {
+                $output .= " " . $nextUrl;
+            }							
+                break;
+            case 1:
+                //get full summary pagination
+            default:
+                $output .= "<span class=\"pagination_summany\">" . $this->getFirstItem() . "/" . $this->getLastItem() . " (" . $this->getTotal() . ")</span> ";
+            if($firstUrl = $this->getFirstUrl())
+            {
+                $output .= " " . $firstUrl;
+            }
+            if($previousUrl = $this->getPreviousUrl())
+            {
+                $output .= " " . $previousUrl;
+            }
+
+            if($groupUrls = $this->getGroupUrls())
+            {
+                $output .= " " . $groupUrls;
+            }
+            if($nextUrl = $this->getNextUrl())
+            {
+                $output .= " " . $nextUrl;
+            }
+            if($lastUrl = $this->getLastUrl())
+            {
+                $output .= " " . $lastUrl;
+            }
+            $itemPerPage = '';
+            $itemPerPage .= "<select name=\"" . $this->limitIndex . "\" id=\"limit\" class=\"input inputLimit\" onchange=\"changePaginationLimit();\">\n";
+            foreach ($this->limits as $v)
+            {
+                $itemPerPage .= "<option value=\"" . $v . "\" " . ($v==$this->itemsPerPage?'selected="selected"':'') . ">" . $v . "</option>\n";
+            }
+            $itemPerPage .= "</select>\n"; 
+            $output .= "<span class=\"pagination_items_per_page\">";
+            $output .= sprintf(PAGINATION_ITEMS_PER_PAGE, $itemPerPage);
+            $output .= "</span>";
+            $output .= "<span class=\"pagination_parent\"><a href=\"#\" onclick=\"goParentFolder();\" id=\"pagination_parent_link\" title=\"" . PAGINATION_GO_PARENT . "\">&nbsp;</a></span>";
+        }
+
+        $output .= "</p></div>";
+        return $output;
+    }
 
 }
 ?>
\ No newline at end of file

Spacing +88 added lines, -88 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
@@ -26,7 +26,7 @@ 
 	var $nextText = "Next";
 	var $lastText = "Last";
 	var $firstText = "First";
-	var $limitIndex ='limit';
+	var $limitIndex = 'limit';
 	var $limits = array(5, 10, 20, 30, 50, 80, 150, 999);
 
 
@@ -36,7 +36,7 @@ 
 	 * @param boolean $friendlyUrl set the returned url
 	 * as search engine friendly or Normal Url
 	 */
-	function pagination($friendlyUrl=false)
+	function pagination($friendlyUrl = false)
 	{
 		$this->friendlyUrl = $friendlyUrl;
 		$this->__resetCurrentPage();
@@ -86,8 +86,8 @@ 
 	function getTotalPages()
 	{
 
-		$output = floor(($this->totalItems / $this->itemsPerPage ));
-		if($this->totalItems % $this->itemsPerPage)
+		$output = floor(($this->totalItems/$this->itemsPerPage));
+		if ($this->totalItems%$this->itemsPerPage)
 		{
 			$output++;
 		}
@@ -116,7 +116,7 @@ 
 	 */
 	function __resetCurrentPage()
 	{
-		$this->currentPage = ((isset($_GET[$this->pageIndex]) && intval($_GET[$this->pageIndex]) > 0)?intval($_GET[$this->pageIndex]):1);
+		$this->currentPage = ((isset($_GET[$this->pageIndex]) && intval($_GET[$this->pageIndex]) > 0) ? intval($_GET[$this->pageIndex]) : 1);
 	}
 
 	/**
@@ -124,18 +124,18 @@ 
 	 *
 	 * @param string $value the base url
 	 */
-	function setUrl($value="")
+	function setUrl($value = "")
 	{
-		if(empty($value))
+		if (empty($value))
 		{
-			if($this->friendlyUrl)
+			if ($this->friendlyUrl)
 			{
-				$this->url = "http://" . $_SERVER['HTTP_HOST'] . "/";
-			}else
+				$this->url = "http://".$_SERVER['HTTP_HOST']."/";
+			} else
 			{
 				$this->url = $_SERVER['PHP_SELF'];
 			}
-		}else
+		} else
 		{
 			$this->url = $value;
 		}
@@ -150,7 +150,7 @@ 
 	function getUrl()
 	{
 
-		if(empty($this->url))
+		if (empty($this->url))
 		{
 			$this->setUrl();
 
@@ -165,30 +165,30 @@ 
 	function __setBaseUrl()
 	{
 
-		if(empty($this->url))
+		if (empty($this->url))
 		{
 			$this->getUrl();
 		}
 
-		if($this->friendlyUrl)
+		if ($this->friendlyUrl)
 		{
 			$this->baseUrl = $this->getUrl();
-		}else
+		} else
 		{
 
 			$appendingQueryStrings = array();
-			$this->excludedQueryStrings[$this->pageIndex] =$this->pageIndex;
-			foreach($_GET as $k=>$v)
+			$this->excludedQueryStrings[$this->pageIndex] = $this->pageIndex;
+			foreach ($_GET as $k=>$v)
 			{
-				if((array_search($k, $this->excludedQueryStrings) === false ))
+				if ((array_search($k, $this->excludedQueryStrings) === false))
 				{
-					$appendingQueryStrings[$k] = $k . "=" . $v;
+					$appendingQueryStrings[$k] = $k."=".$v;
 				}
 			}
-			if(sizeof($appendingQueryStrings))
+			if (sizeof($appendingQueryStrings))
 			{
 				$this->baseUrl = $this->__appendQueryString($this->url, implode("&", $appendingQueryStrings));
-			}else
+			} else
 			{
 				$this->baseUrl = $this->getUrl();
 			}
@@ -205,7 +205,7 @@ 
 	function __getBaseUrl()
 	{
 
-		if(empty($this->baseUrl))
+		if (empty($this->baseUrl))
 		{
 
 			$this->__setBaseUrl();
@@ -222,8 +222,8 @@ 
 	function getFirstItem()
 	{
 		$output = 0;
-		$temStartItemNumber = (($this->currentPage - 1) * $this->itemsPerPage + 1);
-		if($this->totalItems && $temStartItemNumber <= $this->totalItems )
+		$temStartItemNumber = (($this->currentPage - 1)*$this->itemsPerPage + 1);
+		if ($this->totalItems && $temStartItemNumber <= $this->totalItems)
 		{
 
 			$output = $temStartItemNumber;
@@ -238,13 +238,13 @@ 
 	function getLastItem()
 	{
 		$output = 0;
-		$temEndItemNumber = (($this->currentPage) * $this->itemsPerPage);
-		if($this->totalItems)
+		$temEndItemNumber = (($this->currentPage)*$this->itemsPerPage);
+		if ($this->totalItems)
 		{
-			if($temEndItemNumber <= $this->totalItems)
+			if ($temEndItemNumber <= $this->totalItems)
 			{
 				$output = $temEndItemNumber;
-			}else
+			} else
 			{
 				$output = $this->totalItems;
 			}
@@ -280,7 +280,7 @@ 
 	 */
 	function getPageOffset()
 	{
-		return (($this->currentPage - 1)  * $this->itemsPerPage);
+		return (($this->currentPage - 1)*$this->itemsPerPage);
 	}
 	/**
 	 * get the last url if any
@@ -291,16 +291,16 @@ 
 
 		$url = "";
 		$totalPages = $this->getTotalPages();
-		if($this->currentPage < $totalPages)
+		if ($this->currentPage < $totalPages)
 		{
 			$url = $this->__getBaseUrl();
 
-			if($this->friendlyUrl)
+			if ($this->friendlyUrl)
 			{
-				$url .= $this->pageIndex . $totalPages . "/";
-			}else
+				$url .= $this->pageIndex.$totalPages."/";
+			} else
 			{
-				$url = $this->__appendQueryString($url, $this->pageIndex . "=" . $totalPages);
+				$url = $this->__appendQueryString($url, $this->pageIndex."=".$totalPages);
 			}
 			$url = sprintf('<a href="%s" class="pagination_last"><span>%s</span></a>',
 			$url,
@@ -320,15 +320,15 @@ 
 	function getFirstUrl()
 	{
 		$url = "";
-		if($this->currentPage > 1)
+		if ($this->currentPage > 1)
 		{
 			$url = $this->__getBaseUrl();
-			if($this->friendlyUrl)
+			if ($this->friendlyUrl)
 			{
-				$url .= $this->pageIndex .  "1/";
-			}else
+				$url .= $this->pageIndex."1/";
+			} else
 			{
-				$url = $this->__appendQueryString($url, $this->pageIndex . "=1");
+				$url = $this->__appendQueryString($url, $this->pageIndex."=1");
 			}
 			$url = sprintf('<a href="%s" class="pagination_first"><span>%s</span></a>',
 			$url,
@@ -347,15 +347,15 @@ 
 	function getPreviousUrl()
 	{
 		$url = "";
-		if($this->currentPage > 1 && $this->totalItems > 0 )
+		if ($this->currentPage > 1 && $this->totalItems > 0)
 		{
 			$url = $this->__getBaseUrl();
-			if($this->friendlyUrl)
+			if ($this->friendlyUrl)
 			{
-				$url .= $this->pageIndex . ($this->currentPage - 1) . "/";
-			}else
+				$url .= $this->pageIndex.($this->currentPage - 1)."/";
+			} else
 			{
-				$url = $this->__appendQueryString($url, $this->pageIndex . "=" . ($this->currentPage -1));
+				$url = $this->__appendQueryString($url, $this->pageIndex."=".($this->currentPage - 1));
 			}
 			$url = sprintf('<a href="%s" class="pagination_previous"><span>%s</span></a>',
 			$url,
@@ -374,15 +374,15 @@ 
 	function getNextUrl()
 	{
 		$url = "";
-		if($this->totalItems > ($this->currentPage * $this->itemsPerPage))
+		if ($this->totalItems > ($this->currentPage*$this->itemsPerPage))
 		{
 			$url = $this->__getBaseUrl();
-			if($this->friendlyUrl)
+			if ($this->friendlyUrl)
 			{
-				$url .= $this->pageIndex . ($this->currentPage + 1) . "/";
-			}else
+				$url .= $this->pageIndex.($this->currentPage + 1)."/";
+			} else
 			{
-				$url = $this->__appendQueryString($url, $this->pageIndex . "=" . ($this->currentPage + 1));
+				$url = $this->__appendQueryString($url, $this->pageIndex."=".($this->currentPage + 1));
 			}
 			$url = sprintf('<a href="%s" class="pagination_next"><span>%s</span></a>',
 			$url,
@@ -402,45 +402,45 @@ 
 	function getGroupUrls()
 	{
 		$output = "";
-		if($this->totalItems > 0)
+		if ($this->totalItems > 0)
 		{
 			$displayedPages = 0;
 			$url = $this->__getBaseUrl();
 			$totalPages = $this->getTotalPages();
 			// find halfway point
-			$groupLimitHalf = floor($this->groupLimit / 2);
+			$groupLimitHalf = floor($this->groupLimit/2);
 			// determine what item/page we start with
 			$itemStart = $this->currentPage - $groupLimitHalf;
-			$itemStart = ($itemStart > 0 && $itemStart <= $totalPages)?$itemStart:1;
+			$itemStart = ($itemStart > 0 && $itemStart <= $totalPages) ? $itemStart : 1;
 			$itemEnd = $itemStart;
 
-			while($itemEnd < ($itemStart + $this->groupLimit - 1) && $itemEnd < $totalPages)
+			while ($itemEnd < ($itemStart + $this->groupLimit - 1) && $itemEnd < $totalPages)
 			{
 				$itemEnd++;
 			}
 
 
-			if($totalPages > ($itemEnd - $itemStart))
+			if ($totalPages > ($itemEnd - $itemStart))
 			{
-				for($i = $itemStart; $i > 1 && ($itemEnd - $itemStart + 1) < $this->groupLimit; $i--)
+				for ($i = $itemStart; $i > 1 && ($itemEnd - $itemStart + 1) < $this->groupLimit; $i--)
 				{
 					$itemStart--;
 				}
 			}
 
-			for($item = $itemStart; $item <= $itemEnd; $item++)
+			for ($item = $itemStart; $item <= $itemEnd; $item++)
 			{
-				if($item != $this->currentPage)
+				if ($item != $this->currentPage)
 				{//it is not the active link
-					if($this->friendlyUrl)
+					if ($this->friendlyUrl)
 					{
-						$temUrl = $url . $this->pageIndex . $item .   "/";
-					}else
+						$temUrl = $url.$this->pageIndex.$item."/";
+					} else
 					{
-						$temUrl  = $this->__appendQueryString($url, $this->pageIndex . "=" . $item);
+						$temUrl = $this->__appendQueryString($url, $this->pageIndex."=".$item);
 					}
 					$output .= sprintf(' <a class="pagination_group" href="%s"><span>%d</span></a> ', $temUrl, $item);
-				}else
+				} else
 				{//active link
 					$output .= sprintf(' <a class="pagination_group pagination_active" href="#"><span>%d</span></a> ', $item);
 				}
@@ -511,12 +511,12 @@ 
 	function __appendQueryString($baseUrl, $extra)
 	{
 		$output = trim($baseUrl);
-		if(strpos($baseUrl, "?") !== false)
+		if (strpos($baseUrl, "?") !== false)
 		{
-			$output .= "&" . $extra;
-		}else
+			$output .= "&".$extra;
+		} else
 		{
-			$output .= "?" . $extra;
+			$output .= "?".$extra;
 		}
 		return $output;
 	}
@@ -525,60 +525,60 @@ 
 	 *
 	 * @param integer $type
 	 */
-	function getPaginationHTML($type=1, $cssClass="pagination")
+	function getPaginationHTML($type = 1, $cssClass = "pagination")
 	{
 		$output = '';
 		$output .= "<div class=\"pagination_content\"><p class=\"$cssClass\">\n";
-		switch($type)
+		switch ($type)
 		{
 			case "2":
-				$output .= "<span class=\"pagination_summany\">" . $this->getFirstItem() . " to " . $this->getLastItem() . " of " . $this->getTotal() . " results.</span> ";	
-			if($previousUrl = $this->getPreviousUrl())
+				$output .= "<span class=\"pagination_summany\">".$this->getFirstItem()." to ".$this->getLastItem()." of ".$this->getTotal()." results.</span> ";	
+			if ($previousUrl = $this->getPreviousUrl())
 			{
-				$output .= " " . $previousUrl;
+				$output .= " ".$previousUrl;
 			}
 
-			if($nextUrl = $this->getNextUrl())
+			if ($nextUrl = $this->getNextUrl())
 			{
-				$output .= " " . $nextUrl;
+				$output .= " ".$nextUrl;
 			}							
 				break;
 			case 1:
 				//get full summary pagination
 			default:
-				$output .= "<span class=\"pagination_summany\">" . $this->getFirstItem() . "/" . $this->getLastItem() . " (" . $this->getTotal() . ")</span> ";
-			if($firstUrl = $this->getFirstUrl())
+				$output .= "<span class=\"pagination_summany\">".$this->getFirstItem()."/".$this->getLastItem()." (".$this->getTotal().")</span> ";
+			if ($firstUrl = $this->getFirstUrl())
 			{
-				$output .= " " . $firstUrl;
+				$output .= " ".$firstUrl;
 			}
-			if($previousUrl = $this->getPreviousUrl())
+			if ($previousUrl = $this->getPreviousUrl())
 			{
-				$output .= " " . $previousUrl;
+				$output .= " ".$previousUrl;
 			}
 
-			if($groupUrls = $this->getGroupUrls())
+			if ($groupUrls = $this->getGroupUrls())
 			{
-				$output .= " " . $groupUrls;
+				$output .= " ".$groupUrls;
 			}
-			if($nextUrl = $this->getNextUrl())
+			if ($nextUrl = $this->getNextUrl())
 			{
-				$output .= " " . $nextUrl;
+				$output .= " ".$nextUrl;
 			}
-			if($lastUrl = $this->getLastUrl())
+			if ($lastUrl = $this->getLastUrl())
 			{
-				$output .= " " . $lastUrl;
+				$output .= " ".$lastUrl;
 			}
 			$itemPerPage = '';
-			$itemPerPage .= "<select name=\"" . $this->limitIndex . "\" id=\"limit\" class=\"input inputLimit\" onchange=\"changePaginationLimit();\">\n";
+			$itemPerPage .= "<select name=\"".$this->limitIndex."\" id=\"limit\" class=\"input inputLimit\" onchange=\"changePaginationLimit();\">\n";
 			foreach ($this->limits as $v)
 			{
-				$itemPerPage .= "<option value=\"" . $v . "\" " . ($v==$this->itemsPerPage?'selected="selected"':'') . ">" . $v . "</option>\n";
+				$itemPerPage .= "<option value=\"".$v."\" ".($v == $this->itemsPerPage ? 'selected="selected"' : '').">".$v."</option>\n";
 			}
 			$itemPerPage .= "</select>\n"; 
 			$output .= "<span class=\"pagination_items_per_page\">";
 			$output .= sprintf(PAGINATION_ITEMS_PER_PAGE, $itemPerPage);
 			$output .= "</span>";
-			$output .= "<span class=\"pagination_parent\"><a href=\"#\" onclick=\"goParentFolder();\" id=\"pagination_parent_link\" title=\"" . PAGINATION_GO_PARENT . "\">&nbsp;</a></span>";
+			$output .= "<span class=\"pagination_parent\"><a href=\"#\" onclick=\"goParentFolder();\" id=\"pagination_parent_link\" title=\"".PAGINATION_GO_PARENT."\">&nbsp;</a></span>";
 		}
 
 		$output .= "</p></div>";

Braces +12 added lines, -12 removed lines

@@ -131,11 +131,11 @@ 
 			if($this->friendlyUrl)
 			{
 				$this->url = "http://" . $_SERVER['HTTP_HOST'] . "/";
-			}else
+			} else
 			{
 				$this->url = $_SERVER['PHP_SELF'];
 			}
-		}else
+		} else
 		{
 			$this->url = $value;
 		}
@@ -173,7 +173,7 @@ 
 		if($this->friendlyUrl)
 		{
 			$this->baseUrl = $this->getUrl();
-		}else
+		} else
 		{
 
 			$appendingQueryStrings = array();
@@ -188,7 +188,7 @@ 
 			if(sizeof($appendingQueryStrings))
 			{
 				$this->baseUrl = $this->__appendQueryString($this->url, implode("&", $appendingQueryStrings));
-			}else
+			} else
 			{
 				$this->baseUrl = $this->getUrl();
 			}
@@ -244,7 +244,7 @@ 
 			if($temEndItemNumber <= $this->totalItems)
 			{
 				$output = $temEndItemNumber;
-			}else
+			} else
 			{
 				$output = $this->totalItems;
 			}
@@ -298,7 +298,7 @@ 
 			if($this->friendlyUrl)
 			{
 				$url .= $this->pageIndex . $totalPages . "/";
-			}else
+			} else
 			{
 				$url = $this->__appendQueryString($url, $this->pageIndex . "=" . $totalPages);
 			}
@@ -326,7 +326,7 @@ 
 			if($this->friendlyUrl)
 			{
 				$url .= $this->pageIndex .  "1/";
-			}else
+			} else
 			{
 				$url = $this->__appendQueryString($url, $this->pageIndex . "=1");
 			}
@@ -353,7 +353,7 @@ 
 			if($this->friendlyUrl)
 			{
 				$url .= $this->pageIndex . ($this->currentPage - 1) . "/";
-			}else
+			} else
 			{
 				$url = $this->__appendQueryString($url, $this->pageIndex . "=" . ($this->currentPage -1));
 			}
@@ -380,7 +380,7 @@ 
 			if($this->friendlyUrl)
 			{
 				$url .= $this->pageIndex . ($this->currentPage + 1) . "/";
-			}else
+			} else
 			{
 				$url = $this->__appendQueryString($url, $this->pageIndex . "=" . ($this->currentPage + 1));
 			}
@@ -435,12 +435,12 @@ 
 					if($this->friendlyUrl)
 					{
 						$temUrl = $url . $this->pageIndex . $item .   "/";
-					}else
+					} else
 					{
 						$temUrl  = $this->__appendQueryString($url, $this->pageIndex . "=" . $item);
 					}
 					$output .= sprintf(' <a class="pagination_group" href="%s"><span>%d</span></a> ', $temUrl, $item);
-				}else
+				} else
 				{//active link
 					$output .= sprintf(' <a class="pagination_group pagination_active" href="#"><span>%d</span></a> ', $item);
 				}
@@ -514,7 +514,7 @@ 
 		if(strpos($baseUrl, "?") !== false)
 		{
 			$output .= "&" . $extra;
-		}else
+		} else
 		{
 			$output .= "?" . $extra;
 		}

phpmyfaq/admin/editor/plugins/ajaxfilemanager/inc/class.session.php

Doc Comments +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
     }
     /**
      * session init
-     * @return boolean
+     * @return boolean|null
      */
     function init() 
     {
@@ -190,7 +190,7 @@ 
     /**
      * log action taken by the gc
      *
-     * @param unknown_type $msg
+     * @param string $msg
      */
     function _log($msg)
     {

Indentation +146 added lines, -146 removed lines

@@ -1,17 +1,17 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php
 
-	/**
-	 * this class provide a function like session handling engine
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/May/2007
-	 *
-	 */
+    /**
+     * this class provide a function like session handling engine
+     * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @link www.phpletter.com
+     * @since 22/May/2007
+     *
+     */
 
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "class.file.php");
 class Session 
@@ -24,11 +24,11 @@ 
     var $sessionFile = null;
     var $ext = '.txt';
     var $gcCounter = 5; //call gc to delete expired session each ten request
-		var $gcCounterFileName = 'gc_counter.ajax.php';
-		var $gcCounterFile = null;
-		var $gcLogFileName = 'gc_log.ajax.php';
-		var $gcLogFile = null;
-		var $debug = true; //turn it on when you want to see gc log
+        var $gcCounterFileName = 'gc_counter.ajax.php';
+        var $gcCounterFile = null;
+        var $gcLogFileName = 'gc_log.ajax.php';
+        var $gcLogFile = null;
+        var $debug = true; //turn it on when you want to see gc log
 		
 		
     /**
@@ -37,37 +37,37 @@ 
      */
     function __construct()
     {
-    	//check if the session folder read and writable
-    		$dir = new file();
-	        if(!file_exists(CONFIG_SYS_DIR_SESSION_PATH))
-	        {
-	           if(!$dir->mkdir(CONFIG_SYS_DIR_SESSION_PATH))
-	           {
-	              die('Unable to create session folder.');
-	           }
-	        }
-    		if(!$dir->isReadable(CONFIG_SYS_DIR_SESSION_PATH))
-    		{
-    			die('Permission denied: ' . CONFIG_SYS_DIR_SESSION_PATH . " is not readable.");
-    		}    		
-    		if(!$dir->isWritable(CONFIG_SYS_DIR_SESSION_PATH))
-    		{
-    			die('Permission denied: ' . CONFIG_SYS_DIR_SESSION_PATH . " is not writable.");
-    		}
-    	$this->dir = backslashToSlash(addTrailingSlash(CONFIG_SYS_DIR_SESSION_PATH));
+        //check if the session folder read and writable
+            $dir = new file();
+            if(!file_exists(CONFIG_SYS_DIR_SESSION_PATH))
+            {
+                if(!$dir->mkdir(CONFIG_SYS_DIR_SESSION_PATH))
+                {
+                    die('Unable to create session folder.');
+                }
+            }
+            if(!$dir->isReadable(CONFIG_SYS_DIR_SESSION_PATH))
+            {
+                die('Permission denied: ' . CONFIG_SYS_DIR_SESSION_PATH . " is not readable.");
+            }    		
+            if(!$dir->isWritable(CONFIG_SYS_DIR_SESSION_PATH))
+            {
+                die('Permission denied: ' . CONFIG_SYS_DIR_SESSION_PATH . " is not writable.");
+            }
+        $this->dir = backslashToSlash(addTrailingSlash(CONFIG_SYS_DIR_SESSION_PATH));
         $this->lifeTime = get_cfg_var("session.gc_maxlifetime");  
         $this->gcCounterFile = $this->dir . $this->gcCounterFileName; 
         $this->gcLogFile = $this->dir  . $this->gcLogFileName;
-       	$this->sessionDir = backslashToSlash($this->dir.session_id().DIRECTORY_SEPARATOR);
+            $this->sessionDir = backslashToSlash($this->dir.session_id().DIRECTORY_SEPARATOR);
         $this->init();    	
     }
-     /**
-     * constructor
-     *
-     */   
+        /**
+         * constructor
+         *
+         */   
     function Session() 
     {
-    		$this->__construct();        
+            $this->__construct();        
     }
     /**
      * session init
@@ -82,25 +82,25 @@ 
     
     function gc()
     {
-     		//init the counter file
+                //init the counter file
         $fp = @fopen($this->gcCounterFile, 'a+');
         if($fp)
         {
-        	$count = intval(fgets($fp, 999999)) + 1;
-        	if($count > $this->gcCounter || rand(0, 23) == date('h'))
-        	{
-        		$this->_gc();
-        		$count = 0;
-        	}
-        	@ftruncate($fp, 0);
-        	if(!@fputs($fp, $count))
-        	{
-        		die(SESSION_COUNTER_FILE_WRITE_FAILED);
-        	}
-        	@fclose($fp);
+            $count = intval(fgets($fp, 999999)) + 1;
+            if($count > $this->gcCounter || rand(0, 23) == date('h'))
+            {
+                $this->_gc();
+                $count = 0;
+            }
+            @ftruncate($fp, 0);
+            if(!@fputs($fp, $count))
+            {
+                die(SESSION_COUNTER_FILE_WRITE_FAILED);
+            }
+            @fclose($fp);
         }else 
         {
-        	die(SESSION_COUNTER_FILE_CREATE_FAILED);
+            die(SESSION_COUNTER_FILE_CREATE_FAILED);
         }   	
     }
 
@@ -110,81 +110,81 @@ 
      */
     function _gc() 
     {
-			//remove expired file from session folder
-	 		$dirHandler = @opendir($this->dir);
-	 		$output = '';
-	 		$output .= "gc start at " . date('d/M/Y H:i:s') . "\n";
-	 		$fo = new file();
-			if($dirHandler)
-			{
-				while(false !== ($file = readdir($dirHandler)))
-				{
-					if($file != '.' && $file != '..' && $file != $this->gcCounterFileName && $file != $this->gcLogFileName && $file != session_id() )
-					{						
-						$path=$this->dir.$file;
-						$output .= $path ;
-						//check if this is a expired session file
-						if(filemtime($path) + $this->lifeTime < time())
-						{							
-							if($fo->delete($path))
-							{
-								$output .= ' Deleted at ' . date('d/M/Y H:i:s');
-							}else 
-							{
-								$output .= " Failed at " . date('d/M/Y H:i:s');
-							}																			
-						}
-						$output .= "\n";
+            //remove expired file from session folder
+                $dirHandler = @opendir($this->dir);
+                $output = '';
+                $output .= "gc start at " . date('d/M/Y H:i:s') . "\n";
+                $fo = new file();
+            if($dirHandler)
+            {
+                while(false !== ($file = readdir($dirHandler)))
+                {
+                    if($file != '.' && $file != '..' && $file != $this->gcCounterFileName && $file != $this->gcLogFileName && $file != session_id() )
+                    {						
+                        $path=$this->dir.$file;
+                        $output .= $path ;
+                        //check if this is a expired session file
+                        if(filemtime($path) + $this->lifeTime < time())
+                        {							
+                            if($fo->delete($path))
+                            {
+                                $output .= ' Deleted at ' . date('d/M/Y H:i:s');
+                            }else 
+                            {
+                                $output .= " Failed at " . date('d/M/Y H:i:s');
+                            }																			
+                        }
+                        $output .= "\n";
 											
-					}
-				}
-				if($this->debug)
-				{
-					$this->_log($output);
-				}
+                    }
+                }
+                if($this->debug)
+                {
+                    $this->_log($output);
+                }
 				
-				@closedir($dirHandler);
+                @closedir($dirHandler);
 
-			} 
-			if(CONFIG_SYS_DEMO_ENABLE)
-			{
-				//remove expired files from uploaded folder
-		 		$dirHandler = @opendir(CONFIG_SYS_ROOT_PATH);
-		 		$output = '';
-		 		$output .= "gc start at " . date('d/M/Y H:i:s') . "\n";
-		 		$fo = new file();
-				if($dirHandler)
-				{
-					while(false !== ($file = readdir($dirHandler)))
-					{
-						if($file != '.' && $file != '..')
-						{						
-							$path=CONFIG_SYS_ROOT_PATH.$file;
-							$output .= $path ;
-							//check if this is a expired session file
-							if(filemtime($path) + $this->lifeTime < time())
-							{							
-								if($fo->delete($path))
-								{
-									$output .= ' Deleted at ' . date('d/M/Y H:i:s');
-								}else 
-								{
-									$output .= " Failed at " . date('d/M/Y H:i:s');
-								}																			
-							}
-							$output .= "\n";
+            } 
+            if(CONFIG_SYS_DEMO_ENABLE)
+            {
+                //remove expired files from uploaded folder
+                    $dirHandler = @opendir(CONFIG_SYS_ROOT_PATH);
+                    $output = '';
+                    $output .= "gc start at " . date('d/M/Y H:i:s') . "\n";
+                    $fo = new file();
+                if($dirHandler)
+                {
+                    while(false !== ($file = readdir($dirHandler)))
+                    {
+                        if($file != '.' && $file != '..')
+                        {						
+                            $path=CONFIG_SYS_ROOT_PATH.$file;
+                            $output .= $path ;
+                            //check if this is a expired session file
+                            if(filemtime($path) + $this->lifeTime < time())
+                            {							
+                                if($fo->delete($path))
+                                {
+                                    $output .= ' Deleted at ' . date('d/M/Y H:i:s');
+                                }else 
+                                {
+                                    $output .= " Failed at " . date('d/M/Y H:i:s');
+                                }																			
+                            }
+                            $output .= "\n";
 												
-						}
-					}
-					if($this->debug)
-					{
-						$this->_log($output);
-					}
+                        }
+                    }
+                    if($this->debug)
+                    {
+                        $this->_log($output);
+                    }
 					
-					@closedir($dirHandler);
+                    @closedir($dirHandler);
 	
-				}					
-			}
+                }					
+            }
 		    
     }
     /**
@@ -194,14 +194,14 @@ 
      */
     function _log($msg)
     {
-    	$msg = "<?php die(); ?>\n" . $msg;
-    	$fp = @fopen($this->gcLogFile, 'w+');
-    	if($fp)
-    	{
-    		@ftruncate($fp, 0);
-    		!@fputs($fp, $msg);
-    		@fclose($fp);
-    	}
+        $msg = "<?php die(); ?>\n" . $msg;
+        $fp = @fopen($this->gcLogFile, 'w+');
+        if($fp)
+        {
+            @ftruncate($fp, 0);
+            !@fputs($fp, $msg);
+            @fclose($fp);
+        }
     }
     
     /**
@@ -211,21 +211,21 @@ 
      */
     function getSessionDir()
     {
-    	if(!file_exists($this->sessionDir) && !is_dir($this->sessionDir))
-    	{
-    		$dir = new file();
-    		if(!$dir->mkdir($this->sessionDir))
-    		{
-    			return '';
-    		}
-    	}else 
-    	{
-	     	if(!@is_dir($this->sessionDir))
-	    	{
-	    		return '';
-	    	}   		
-    	}
-    	return $this->sessionDir;
+        if(!file_exists($this->sessionDir) && !is_dir($this->sessionDir))
+        {
+            $dir = new file();
+            if(!$dir->mkdir($this->sessionDir))
+            {
+                return '';
+            }
+        }else 
+        {
+                if(!@is_dir($this->sessionDir))
+            {
+                return '';
+            }   		
+        }
+        return $this->sessionDir;
     }
     
 

Spacing +45 added lines, -45 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
@@ -13,7 +13,7 @@ 
 	 *
 	 */
 
-require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "class.file.php");
+require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."class.file.php");
 class Session 
 {
     var $lifeTime;
@@ -39,25 +39,25 @@ 
     {
     	//check if the session folder read and writable
     		$dir = new file();
-	        if(!file_exists(CONFIG_SYS_DIR_SESSION_PATH))
+	        if (!file_exists(CONFIG_SYS_DIR_SESSION_PATH))
 	        {
-	           if(!$dir->mkdir(CONFIG_SYS_DIR_SESSION_PATH))
+	           if (!$dir->mkdir(CONFIG_SYS_DIR_SESSION_PATH))
 	           {
 	              die('Unable to create session folder.');
 	           }
 	        }
-    		if(!$dir->isReadable(CONFIG_SYS_DIR_SESSION_PATH))
+    		if (!$dir->isReadable(CONFIG_SYS_DIR_SESSION_PATH))
     		{
-    			die('Permission denied: ' . CONFIG_SYS_DIR_SESSION_PATH . " is not readable.");
+    			die('Permission denied: '.CONFIG_SYS_DIR_SESSION_PATH." is not readable.");
     		}    		
-    		if(!$dir->isWritable(CONFIG_SYS_DIR_SESSION_PATH))
+    		if (!$dir->isWritable(CONFIG_SYS_DIR_SESSION_PATH))
     		{
-    			die('Permission denied: ' . CONFIG_SYS_DIR_SESSION_PATH . " is not writable.");
+    			die('Permission denied: '.CONFIG_SYS_DIR_SESSION_PATH." is not writable.");
     		}
     	$this->dir = backslashToSlash(addTrailingSlash(CONFIG_SYS_DIR_SESSION_PATH));
         $this->lifeTime = get_cfg_var("session.gc_maxlifetime");  
-        $this->gcCounterFile = $this->dir . $this->gcCounterFileName; 
-        $this->gcLogFile = $this->dir  . $this->gcLogFileName;
+        $this->gcCounterFile = $this->dir.$this->gcCounterFileName; 
+        $this->gcLogFile = $this->dir.$this->gcLogFileName;
        	$this->sessionDir = backslashToSlash($this->dir.session_id().DIRECTORY_SEPARATOR);
         $this->init();    	
     }
@@ -84,21 +84,21 @@ 
     {
      		//init the counter file
         $fp = @fopen($this->gcCounterFile, 'a+');
-        if($fp)
+        if ($fp)
         {
         	$count = intval(fgets($fp, 999999)) + 1;
-        	if($count > $this->gcCounter || rand(0, 23) == date('h'))
+        	if ($count > $this->gcCounter || rand(0, 23) == date('h'))
         	{
         		$this->_gc();
         		$count = 0;
         	}
         	@ftruncate($fp, 0);
-        	if(!@fputs($fp, $count))
+        	if (!@fputs($fp, $count))
         	{
         		die(SESSION_COUNTER_FILE_WRITE_FAILED);
         	}
         	@fclose($fp);
-        }else 
+        } else 
         {
         	die(SESSION_COUNTER_FILE_CREATE_FAILED);
         }   	
@@ -113,32 +113,32 @@ 
 			//remove expired file from session folder
 	 		$dirHandler = @opendir($this->dir);
 	 		$output = '';
-	 		$output .= "gc start at " . date('d/M/Y H:i:s') . "\n";
+	 		$output .= "gc start at ".date('d/M/Y H:i:s')."\n";
 	 		$fo = new file();
-			if($dirHandler)
+			if ($dirHandler)
 			{
-				while(false !== ($file = readdir($dirHandler)))
+				while (false !== ($file = readdir($dirHandler)))
 				{
-					if($file != '.' && $file != '..' && $file != $this->gcCounterFileName && $file != $this->gcLogFileName && $file != session_id() )
+					if ($file != '.' && $file != '..' && $file != $this->gcCounterFileName && $file != $this->gcLogFileName && $file != session_id())
 					{						
-						$path=$this->dir.$file;
-						$output .= $path ;
+						$path = $this->dir.$file;
+						$output .= $path;
 						//check if this is a expired session file
-						if(filemtime($path) + $this->lifeTime < time())
+						if (filemtime($path) + $this->lifeTime < time())
 						{							
-							if($fo->delete($path))
+							if ($fo->delete($path))
 							{
-								$output .= ' Deleted at ' . date('d/M/Y H:i:s');
-							}else 
+								$output .= ' Deleted at '.date('d/M/Y H:i:s');
+							} else 
 							{
-								$output .= " Failed at " . date('d/M/Y H:i:s');
+								$output .= " Failed at ".date('d/M/Y H:i:s');
 							}																			
 						}
 						$output .= "\n";
 											
 					}
 				}
-				if($this->debug)
+				if ($this->debug)
 				{
 					$this->_log($output);
 				}
@@ -146,37 +146,37 @@ 
 				@closedir($dirHandler);
 
 			} 
-			if(CONFIG_SYS_DEMO_ENABLE)
+			if (CONFIG_SYS_DEMO_ENABLE)
 			{
 				//remove expired files from uploaded folder
 		 		$dirHandler = @opendir(CONFIG_SYS_ROOT_PATH);
 		 		$output = '';
-		 		$output .= "gc start at " . date('d/M/Y H:i:s') . "\n";
+		 		$output .= "gc start at ".date('d/M/Y H:i:s')."\n";
 		 		$fo = new file();
-				if($dirHandler)
+				if ($dirHandler)
 				{
-					while(false !== ($file = readdir($dirHandler)))
+					while (false !== ($file = readdir($dirHandler)))
 					{
-						if($file != '.' && $file != '..')
+						if ($file != '.' && $file != '..')
 						{						
-							$path=CONFIG_SYS_ROOT_PATH.$file;
-							$output .= $path ;
+							$path = CONFIG_SYS_ROOT_PATH.$file;
+							$output .= $path;
 							//check if this is a expired session file
-							if(filemtime($path) + $this->lifeTime < time())
+							if (filemtime($path) + $this->lifeTime < time())
 							{							
-								if($fo->delete($path))
+								if ($fo->delete($path))
 								{
-									$output .= ' Deleted at ' . date('d/M/Y H:i:s');
-								}else 
+									$output .= ' Deleted at '.date('d/M/Y H:i:s');
+								} else 
 								{
-									$output .= " Failed at " . date('d/M/Y H:i:s');
+									$output .= " Failed at ".date('d/M/Y H:i:s');
 								}																			
 							}
 							$output .= "\n";
 												
 						}
 					}
-					if($this->debug)
+					if ($this->debug)
 					{
 						$this->_log($output);
 					}
@@ -194,9 +194,9 @@ 
      */
     function _log($msg)
     {
-    	$msg = "<?php die(); ?>\n" . $msg;
+    	$msg = "<?php die(); ?>\n".$msg;
     	$fp = @fopen($this->gcLogFile, 'w+');
-    	if($fp)
+    	if ($fp)
     	{
     		@ftruncate($fp, 0);
     		!@fputs($fp, $msg);
@@ -211,16 +211,16 @@ 
      */
     function getSessionDir()
     {
-    	if(!file_exists($this->sessionDir) && !is_dir($this->sessionDir))
+    	if (!file_exists($this->sessionDir) && !is_dir($this->sessionDir))
     	{
     		$dir = new file();
-    		if(!$dir->mkdir($this->sessionDir))
+    		if (!$dir->mkdir($this->sessionDir))
     		{
     			return '';
     		}
-    	}else 
+    	} else 
     	{
-	     	if(!@is_dir($this->sessionDir))
+	     	if (!@is_dir($this->sessionDir))
 	    	{
 	    		return '';
 	    	}   		

Braces +4 added lines, -4 removed lines

@@ -98,7 +98,7 @@ 
         		die(SESSION_COUNTER_FILE_WRITE_FAILED);
         	}
         	@fclose($fp);
-        }else 
+        } else 
         {
         	die(SESSION_COUNTER_FILE_CREATE_FAILED);
         }   	
@@ -129,7 +129,7 @@ 
 							if($fo->delete($path))
 							{
 								$output .= ' Deleted at ' . date('d/M/Y H:i:s');
-							}else 
+							} else 
 							{
 								$output .= " Failed at " . date('d/M/Y H:i:s');
 							}																			
@@ -167,7 +167,7 @@ 
 								if($fo->delete($path))
 								{
 									$output .= ' Deleted at ' . date('d/M/Y H:i:s');
-								}else 
+								} else 
 								{
 									$output .= " Failed at " . date('d/M/Y H:i:s');
 								}																			
@@ -218,7 +218,7 @@ 
     		{
     			return '';
     		}
-    	}else 
+    	} else 
     	{
 	     	if(!@is_dir($this->sessionDir))
 	    	{

phpmyfaq/admin/editor/plugins/ajaxfilemanager/inc/class.upload.php

Doc Comments +7 added lines, -7 removed lines

@@ -173,7 +173,6 @@ 
 	/**
 	 * get a file extension
 	 *
-	 * @param string $fileName the path to a file or just the file name
 	 */	
 	function getFileExt()
 	{
@@ -186,7 +185,7 @@ 
 		 * @param string $dest  the path to the directory which the uploaded file will be moved to
 		 * @param string $fileBaseName the base name which the uploaded file will be renamed to
 		 * @param unknown_type $overwrite
-		 * @return unknown
+		 * @return boolean
 		 */
 	function moveUploadedFile($dest, $fileBaseName = '', $overwrite=false)
 	{
@@ -320,8 +319,8 @@ 
      *
      * @access public
      *
-     * @param mixed $new_x 
-     * @param mixed $new_y 
+     * @param integer $new_x 
+     * @param integer $new_y 
      * @param string $thumb_suffix
      *
      * @return mixed none or PEAR_error
@@ -410,7 +409,8 @@ 
 	/**
      *
      * @access public
-     * @return void
+     * @param string $image
+     * @return boolean|null
      */
 	function _get_image_details($image)
 	{
@@ -544,7 +544,7 @@ 
 	/**
 	 * return the directory path witch the file uploaded to
 	 *
-	 * @return unknown
+	 * @return string
 	 */
 	function getDirPath()
 	{
@@ -581,7 +581,7 @@ 
 	/**
 	 * get uploaded file size
 	 *
-	 * @return string
+	 * @return integer
 	 */
 	function getFileSize()
 	{

Indentation +540 added lines, -540 removed lines

@@ -1,228 +1,228 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php
-	/**
-	 * This class provide all file upload functionalities
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/April/2007
-	 *
-	 */
+    /**
+     * This class provide all file upload functionalities
+     * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @link www.phpletter.com
+     * @since 22/April/2007
+     *
+     */
 class Upload
 {
-	var $fileType = ""; //the file type
-	var $originalFileName = "";
-	var $fileName = ""; //the file final name
-	var $fileExtension = "";
-	var $img_x = 0;
-	var $img_y = 0;
-	var $img_new_x = 0;
-	var $img_new_y = 0;
-	var $imgHandler = null;
-	var $fileBaseName = ""; //file name without the file extension and .
-	var $filePath = ""; //the file path which the file uploaded to
-	var $fileSize = 0;
-	var $validImageExts = array("gif", "jpg", "png");
-	var $errors = array();
-	var $_value  = null;  //an array holding the uploaded file details
-	var $dirPath = "";
-	var $invalidFileExt = array(); //var $invalidFileExt = array('php,inc,asp,aspx');
-	var $errCode = "";
-	var $safeMode;
-	var $uploadFileMode = 0755;
-	var $errorCodes = array(
-		0=>'the file uploaded with success',
-		1=>'The uploaded file exceeds the upload_max_filesize directive in php.ini',
-		2=>'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form',
-		3=>'The uploaded file was only partially uploaded',
-		4=>'No file was uploaded.',
-		6=>'Missing a temporary folder',
-		7=>'Failed to write file to disk',
-		8=>'File upload stopped by extension',
-		999=>'No error code avaiable',
-	);
+    var $fileType = ""; //the file type
+    var $originalFileName = "";
+    var $fileName = ""; //the file final name
+    var $fileExtension = "";
+    var $img_x = 0;
+    var $img_y = 0;
+    var $img_new_x = 0;
+    var $img_new_y = 0;
+    var $imgHandler = null;
+    var $fileBaseName = ""; //file name without the file extension and .
+    var $filePath = ""; //the file path which the file uploaded to
+    var $fileSize = 0;
+    var $validImageExts = array("gif", "jpg", "png");
+    var $errors = array();
+    var $_value  = null;  //an array holding the uploaded file details
+    var $dirPath = "";
+    var $invalidFileExt = array(); //var $invalidFileExt = array('php,inc,asp,aspx');
+    var $errCode = "";
+    var $safeMode;
+    var $uploadFileMode = 0755;
+    var $errorCodes = array(
+        0=>'the file uploaded with success',
+        1=>'The uploaded file exceeds the upload_max_filesize directive in php.ini',
+        2=>'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form',
+        3=>'The uploaded file was only partially uploaded',
+        4=>'No file was uploaded.',
+        6=>'Missing a temporary folder',
+        7=>'Failed to write file to disk',
+        8=>'File upload stopped by extension',
+        999=>'No error code avaiable',
+    );
 	
 
-	function Upload()
-	{
-		//doing nothing
-	}
+    function Upload()
+    {
+        //doing nothing
+    }
 	
-	function isFileUploaded($indexInPost="file")
-	{
+    function isFileUploaded($indexInPost="file")
+    {
 		
-		$this->errCode = isset($_FILES[$indexInPost]['error'])?$_FILES[$indexInPost]['error']:999;
-		if((isset($_FILES[$indexInPost]['error']) && $_FILES[$indexInPost] == 0) ||
-		(!empty($_FILES[$indexInPost]['tmp_name']) && $_FILES[$indexInPost]['tmp_name'] != 'none')
-		)
-		{
-			$this->_value = $_FILES[$indexInPost];
-			$this->fileSize = @filesize($this->_value['tmp_name']);
-			$this->originalFileName = $this->_value['name'];
-			$this->fileType = $this->_value['type'];
+        $this->errCode = isset($_FILES[$indexInPost]['error'])?$_FILES[$indexInPost]['error']:999;
+        if((isset($_FILES[$indexInPost]['error']) && $_FILES[$indexInPost] == 0) ||
+        (!empty($_FILES[$indexInPost]['tmp_name']) && $_FILES[$indexInPost]['tmp_name'] != 'none')
+        )
+        {
+            $this->_value = $_FILES[$indexInPost];
+            $this->fileSize = @filesize($this->_value['tmp_name']);
+            $this->originalFileName = $this->_value['name'];
+            $this->fileType = $this->_value['type'];
 			
-			return true;
-		}else 
-		{
+            return true;
+        }else 
+        {
 			
-			array_push($this->errors, 'Unable to upload file');
-			return false;
-		}		
-	}
+            array_push($this->errors, 'Unable to upload file');
+            return false;
+        }		
+    }
 	
-	function getErrorCodeMsg()
-	{
-		return (isset($this->errorCodes[$this->errCode])?$this->errorCodes[$this->errCode]:"");
-	}
-	/**
-	 * check if the uploaded file extension is allowed against the validFile Extension
-	 * or against the invalid extension list when the list of valid file extension is not set
-	 *
-	 * @param array $validFileExt
-	 * @return boolean
-	 */
-	function isPermittedFileExt($validFileExt = array())
-	{
-		$tem = array();
-
-		if(sizeof($validFileExt))
-		{
-			foreach($validFileExt as $k=>$v)
-			{
-				$tem[$k] = strtolower(trim($v));
-			}
-		}
-		$validFileExt = $tem;
-
-		if(sizeof($validFileExt) && sizeof($this->invalidFileExt))
-		{
-			foreach($validFileExt as  $k=>$ext)
-			{
-				if(array_search(strtolower($ext), $this->invalidFileExt) !== false)
-				{
-					unset($validFileExt[$k]);
-				}
-			}
-		}
+    function getErrorCodeMsg()
+    {
+        return (isset($this->errorCodes[$this->errCode])?$this->errorCodes[$this->errCode]:"");
+    }
+    /**
+     * check if the uploaded file extension is allowed against the validFile Extension
+     * or against the invalid extension list when the list of valid file extension is not set
+     *
+     * @param array $validFileExt
+     * @return boolean
+     */
+    function isPermittedFileExt($validFileExt = array())
+    {
+        $tem = array();
+
+        if(sizeof($validFileExt))
+        {
+            foreach($validFileExt as $k=>$v)
+            {
+                $tem[$k] = strtolower(trim($v));
+            }
+        }
+        $validFileExt = $tem;
+
+        if(sizeof($validFileExt) && sizeof($this->invalidFileExt))
+        {
+            foreach($validFileExt as  $k=>$ext)
+            {
+                if(array_search(strtolower($ext), $this->invalidFileExt) !== false)
+                {
+                    unset($validFileExt[$k]);
+                }
+            }
+        }
 		
 	
 
 		
-		if(sizeof($validFileExt))
-		{
-			if(array_search(strtolower($this->getFileExt()), $validFileExt) !== false)
-			{
-				return true;
-			}
-		}elseif(array_search(strtolower($this->getFileExt()), $this->invalidFileExt) === false)
-		{
-			return true;
-		}
+        if(sizeof($validFileExt))
+        {
+            if(array_search(strtolower($this->getFileExt()), $validFileExt) !== false)
+            {
+                return true;
+            }
+        }elseif(array_search(strtolower($this->getFileExt()), $this->invalidFileExt) === false)
+        {
+            return true;
+        }
 
 		
-		$this->deleteUploadedFile();
-		return false;
+        $this->deleteUploadedFile();
+        return false;
 		
-	}
-	/**
-	 * check if the uploaded file size is too big
-	 *
-	 * @param integer $maxSize
-	 */
-	function isSizeTooBig($maxSize="")
-	{
-		if($this->fileSize > $maxSize)
-		{
-			$this->deleteUploadedFile();
-			return true;
-		}else 
-		{
-			return false;
-		}
-	}
-	/**
-	 * set the invali file extensions
-	 *
-	 * @param array $invalidFileExt
-	 */
-	function setInvalidFileExt($invalidFileExt=array())
-	{
-		$tem = array();
-		if(sizeof($invalidFileExt))
-		{
-			foreach($invalidFileExt as $k=>$v)
-			{
-				$tem[$k]= strtolower(trim($v));
-			}
-		}
+    }
+    /**
+     * check if the uploaded file size is too big
+     *
+     * @param integer $maxSize
+     */
+    function isSizeTooBig($maxSize="")
+    {
+        if($this->fileSize > $maxSize)
+        {
+            $this->deleteUploadedFile();
+            return true;
+        }else 
+        {
+            return false;
+        }
+    }
+    /**
+     * set the invali file extensions
+     *
+     * @param array $invalidFileExt
+     */
+    function setInvalidFileExt($invalidFileExt=array())
+    {
+        $tem = array();
+        if(sizeof($invalidFileExt))
+        {
+            foreach($invalidFileExt as $k=>$v)
+            {
+                $tem[$k]= strtolower(trim($v));
+            }
+        }
 		
-		$this->invalidFileExt = $tem;
-	}
-	/**
-	 * get file type
-	 *
-	 * @return string
-	 */
-	function getFileType()
-	{
-		return $this->fileType;
-	}
-	/**
-	 * get a file extension
-	 *
-	 * @param string $fileName the path to a file or just the file name
-	 */	
-	function getFileExt()
-	{
-		//return strtolower(substr(strrchr($this->fileName, "."), 1));
-		return substr(strrchr($this->originalFileName, "."), 1);
-	}
-	/**
-		 * move the uploaded file to a specific location
-		 *
-		 * @param string $dest  the path to the directory which the uploaded file will be moved to
-		 * @param string $fileBaseName the base name which the uploaded file will be renamed to
-		 * @param unknown_type $overwrite
-		 * @return unknown
-		 */
-	function moveUploadedFile($dest, $fileBaseName = '', $overwrite=false)
-	{
-		//ensure the directory path ending with /
-		if ($dest != ''  && substr($dest, -1) != '/') {
-			$dest .= '/';
-		}
-		$this->dirPath = $dest;
-		$fileName =  basename($this->_value['name']);
-
-		$dotIndex = strrpos($fileName, '.');
-		$this->fileExtension = '';
-		if(is_int($dotIndex))
-		{
-			$this->fileExtension = substr($fileName, $dotIndex);
-			$this->fileBaseName = substr($fileName, 0, $dotIndex);
-		}
-		if(!empty($fileBaseName))
-		{
-			$this->fileBaseName = $fileBaseName;
-		}
-		$fileName = $this->fileBaseName . $this->fileExtension;
-		$filePath = $dest . $fileName;
-
-		if(!$overwrite && file_exists($filePath) && is_file($filePath))
-		{//rename
-
-			$counter = 0;
-			while(file_exists($dest.$fileName) && is_file($dest .$fileName))
-			{
-				$counter++;
-				$fileName = $this->fileBaseName.'_'.$counter.$this->fileExtension;
-			}
-			$this->fileBaseName .= "_" . $counter;
-
-		}
+        $this->invalidFileExt = $tem;
+    }
+    /**
+     * get file type
+     *
+     * @return string
+     */
+    function getFileType()
+    {
+        return $this->fileType;
+    }
+    /**
+     * get a file extension
+     *
+     * @param string $fileName the path to a file or just the file name
+     */	
+    function getFileExt()
+    {
+        //return strtolower(substr(strrchr($this->fileName, "."), 1));
+        return substr(strrchr($this->originalFileName, "."), 1);
+    }
+    /**
+     * move the uploaded file to a specific location
+     *
+     * @param string $dest  the path to the directory which the uploaded file will be moved to
+     * @param string $fileBaseName the base name which the uploaded file will be renamed to
+     * @param unknown_type $overwrite
+     * @return unknown
+     */
+    function moveUploadedFile($dest, $fileBaseName = '', $overwrite=false)
+    {
+        //ensure the directory path ending with /
+        if ($dest != ''  && substr($dest, -1) != '/') {
+            $dest .= '/';
+        }
+        $this->dirPath = $dest;
+        $fileName =  basename($this->_value['name']);
+
+        $dotIndex = strrpos($fileName, '.');
+        $this->fileExtension = '';
+        if(is_int($dotIndex))
+        {
+            $this->fileExtension = substr($fileName, $dotIndex);
+            $this->fileBaseName = substr($fileName, 0, $dotIndex);
+        }
+        if(!empty($fileBaseName))
+        {
+            $this->fileBaseName = $fileBaseName;
+        }
+        $fileName = $this->fileBaseName . $this->fileExtension;
+        $filePath = $dest . $fileName;
+
+        if(!$overwrite && file_exists($filePath) && is_file($filePath))
+        {//rename
+
+            $counter = 0;
+            while(file_exists($dest.$fileName) && is_file($dest .$fileName))
+            {
+                $counter++;
+                $fileName = $this->fileBaseName.'_'.$counter.$this->fileExtension;
+            }
+            $this->fileBaseName .= "_" . $counter;
+
+        }
 
         // Don't allow .htaccess to be uploaded
         if (strpos($this->_value['tmp_name'], '.htaccess')) {
@@ -254,67 +254,67 @@ 
             return false;
         }
 
-		if (@move_uploaded_file($this->_value['tmp_name'], $dest . $fileName)) {
-			@chmod($dest . $fileName, $this->uploadFileMode);
-			$this->fileName = $fileName;
-			$this->filePath = $dest . $fileName;
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-
-	/**
-		 * check if the uploaded is permitted to upload
-		 *
-		 * @param mixed $invalidImageExts invalid image extension
-		 * @param bool $delete force to delete the uploaded file
-		 */	
-	function isImage($invalidImageExts = array(), $delete = true)
-	{
-		if(!is_array($invalidImageExts) && !empty($invalidImageExts))
-		{
-			$invalidImageExts = explode(",", $invalidImageExts);
-		}
-		foreach ($invalidImageExts as $k=>$v)
-		{
-			$invalidImageExts[$k] = strtolower(trim($v));
-		}
-		foreach ($this->validImageExts as $k=>$v)
-		{
-			$ValidImageExts[$k] = strtolower(trim($v));
-		}
-		if(sizeof($invalidImageExts))
-		{
-			foreach ($ValidImageExts as $k=>$v)
-			{
-				if(array_search(strtolower($v), $invalidImageExts) !== false)
-				{
-					unset($ValidImageExts[$k]);
-				}
-			}
-		}
-		if(array_search(strtolower($this->getFileExt()), $ValidImageExts)!==false)
-		{
-			$this->_get_image_details($this->filePath);
-			if(!empty($this->fileType))
-			{
-				return true;
-			}
-		}else
-		{
-			if($delete)
-			{
-				$this->deleteUploadedFile();
-			}
-		}
-
-		array($this->errors, "This file is not a image type file.");
-		return false;
-	}
-
-	/**
+        if (@move_uploaded_file($this->_value['tmp_name'], $dest . $fileName)) {
+            @chmod($dest . $fileName, $this->uploadFileMode);
+            $this->fileName = $fileName;
+            $this->filePath = $dest . $fileName;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+
+    /**
+     * check if the uploaded is permitted to upload
+     *
+     * @param mixed $invalidImageExts invalid image extension
+     * @param bool $delete force to delete the uploaded file
+     */	
+    function isImage($invalidImageExts = array(), $delete = true)
+    {
+        if(!is_array($invalidImageExts) && !empty($invalidImageExts))
+        {
+            $invalidImageExts = explode(",", $invalidImageExts);
+        }
+        foreach ($invalidImageExts as $k=>$v)
+        {
+            $invalidImageExts[$k] = strtolower(trim($v));
+        }
+        foreach ($this->validImageExts as $k=>$v)
+        {
+            $ValidImageExts[$k] = strtolower(trim($v));
+        }
+        if(sizeof($invalidImageExts))
+        {
+            foreach ($ValidImageExts as $k=>$v)
+            {
+                if(array_search(strtolower($v), $invalidImageExts) !== false)
+                {
+                    unset($ValidImageExts[$k]);
+                }
+            }
+        }
+        if(array_search(strtolower($this->getFileExt()), $ValidImageExts)!==false)
+        {
+            $this->_get_image_details($this->filePath);
+            if(!empty($this->fileType))
+            {
+                return true;
+            }
+        }else
+        {
+            if($delete)
+            {
+                $this->deleteUploadedFile();
+            }
+        }
+
+        array($this->errors, "This file is not a image type file.");
+        return false;
+    }
+
+    /**
      * Resize the Image in the X and/or Y direction
      * If either is 0 it will be scaled proportionally
      *
@@ -326,23 +326,23 @@ 
      *
      * @return mixed none or PEAR_error
      */
-	function resize($filePath, $thumb_suffix="", $new_x = 0, $new_y = 0)
-	{
+    function resize($filePath, $thumb_suffix="", $new_x = 0, $new_y = 0)
+    {
 		
-		if(empty($filePath))
-		{
-			$filePath = $this->dirPath . $this->fileBaseName . $thumb_suffix  . $this->fileExtension;
-		}
-		// 0 means keep original size
-		if ($this->img_x > $this->img_y)
-		$new_y = intval($new_x/$this->img_x*$this->img_y);
-		else if ($this->img_y > $this->img_x)
-		$new_x = intval($new_y/$this->img_y*$this->img_x);
-		// Now do the library specific resizing.
-		return $this->_resize($filePath,$new_x, $new_y);
-	} // End resize
-
-	/**
+        if(empty($filePath))
+        {
+            $filePath = $this->dirPath . $this->fileBaseName . $thumb_suffix  . $this->fileExtension;
+        }
+        // 0 means keep original size
+        if ($this->img_x > $this->img_y)
+        $new_y = intval($new_x/$this->img_x*$this->img_y);
+        else if ($this->img_y > $this->img_x)
+        $new_x = intval($new_y/$this->img_y*$this->img_x);
+        // Now do the library specific resizing.
+        return $this->_resize($filePath,$new_x, $new_y);
+    } // End resize
+
+    /**
      * resize the image and return the thumbnail image  details array("width"=>, "height"=>, "name")
      *
      * @param string $fileName 
@@ -350,275 +350,275 @@ 
      * @param int $new_y the thumbnail height
      * @return unknown
      */
-	function _resize($fileName, $new_x, $new_y) {
-		$functionName = 'ImageCreateFrom' . $this->fileType;
-
-
-		if(function_exists($functionName))
-		{
-			$this->imgHandler = $functionName($this->filePath);
-		}else
-		{
-			array_push($this->errors, $functionName . " function is unavailable");
-			return false;
-		}
-
-		if(function_exists('ImageCreateTrueColor')){
-			$new_img =ImageCreateTrueColor($new_x,$new_y);
-		} else {
-			$new_img =ImageCreate($new_x,$new_y);
-		}
-		if(function_exists('ImageCopyResampled')){
-			ImageCopyResampled($new_img, $this->imgHandler, 0, 0, 0, 0, $new_x, $new_y, $this->img_x, $this->img_y);
-		} else {
-			ImageCopyResized($new_img, $this->imgHandler, 0, 0, 0, 0, $new_x, $new_y, $this->img_x, $this->img_y);
-		}
-		if($this->_imageSave($new_img, $fileName, 80))
-		{
-			return array("width"=>$new_x, "height"=>$new_y, "name"=>basename($fileName));
-		}else
-		{
-
-			array_push($this->errors, "Unable to resize the image");
-			return false;
-		}
-
-	}
-	/**
-		 * save the thumbnail file and destroy the opened image
-		 *
-		 * @param resource $newImageHandler
-		 * @param string $fileName
-		 * @param int $quality
-		 * @return boolean
-		 */
-	function _imageSave($newImageHandler, $fileName, $quality = 90)
-	{
-		$functionName = 'image' . $this->fileType;
-		if($functionName($newImageHandler, $fileName, $quality))
-		{
-			imagedestroy($newImageHandler);
-			return true;
-		}else
-		{
-			imagedestroy($newImageHandler);
-			array_push($this->errors, "Unable to save the thumbnail file.");
-			return false;
-		}
-
-	}
-	/**
+    function _resize($fileName, $new_x, $new_y) {
+        $functionName = 'ImageCreateFrom' . $this->fileType;
+
+
+        if(function_exists($functionName))
+        {
+            $this->imgHandler = $functionName($this->filePath);
+        }else
+        {
+            array_push($this->errors, $functionName . " function is unavailable");
+            return false;
+        }
+
+        if(function_exists('ImageCreateTrueColor')){
+            $new_img =ImageCreateTrueColor($new_x,$new_y);
+        } else {
+            $new_img =ImageCreate($new_x,$new_y);
+        }
+        if(function_exists('ImageCopyResampled')){
+            ImageCopyResampled($new_img, $this->imgHandler, 0, 0, 0, 0, $new_x, $new_y, $this->img_x, $this->img_y);
+        } else {
+            ImageCopyResized($new_img, $this->imgHandler, 0, 0, 0, 0, $new_x, $new_y, $this->img_x, $this->img_y);
+        }
+        if($this->_imageSave($new_img, $fileName, 80))
+        {
+            return array("width"=>$new_x, "height"=>$new_y, "name"=>basename($fileName));
+        }else
+        {
+
+            array_push($this->errors, "Unable to resize the image");
+            return false;
+        }
+
+    }
+    /**
+     * save the thumbnail file and destroy the opened image
+     *
+     * @param resource $newImageHandler
+     * @param string $fileName
+     * @param int $quality
+     * @return boolean
+     */
+    function _imageSave($newImageHandler, $fileName, $quality = 90)
+    {
+        $functionName = 'image' . $this->fileType;
+        if($functionName($newImageHandler, $fileName, $quality))
+        {
+            imagedestroy($newImageHandler);
+            return true;
+        }else
+        {
+            imagedestroy($newImageHandler);
+            array_push($this->errors, "Unable to save the thumbnail file.");
+            return false;
+        }
+
+    }
+    /**
      *
      * @access public
      * @return void
      */
-	function _get_image_details($image)
-	{
-
-		//echo $image;
-		$data = @GetImageSize($image);
-		#1 = GIF, 2 = JPG, 3 = PNG, 4 = SWF, 5 = PSD, 6 = BMP, 7 = TIFF(intel byte order), 8 = TIFF(motorola byte order,
-		# 9 = JPC, 10 = JP2, 11 = JPX, 12 = JB2, 13 = SWC
-		if (is_array($data)){
-			switch($data[2]){
-				case 1:
-					$type = 'gif';
-					break;
-				case 2:
-					$type = 'jpeg';
-					break;
-				case 3:
-					$type = 'png';
-					break;
-				case 4:
-					$type = 'swf';
-					break;
-				case 5:
-					$type = 'psd';
-				case 6:
-					$type = 'bmp';
-				case 7:
-				case 8:
-					$type = 'tiff';
-				default:
-					array_push($this->errors, "We do not recognize this image format");
-
-			}
-			$this->img_x = $data[0];
-			$this->img_y = $data[1];
-			$this->fileType = $type;
-
-			return true;
-		} else {
-			array_push($this->errors, "Cannot fetch image or images details.");
-			return null;
-		}
-	}
-	/**
-	 * caculate the thumbnail details from the original image file 
-	 *
-	 * @param string $originalImageName  
-	 * @param int $originaleImageWidth
-	 * @param int $originalImageHeight
-	 * @param string $thumbnailSuffix
-	 * @param int $thumbnailWidth
-	 * @param int $thumbnailHeight
-	 * @return array array("name"=>"image name", "width"=>"image width", "height"=>"image height")
-	 */
-	function getThumbInfo($originalImageName, $originaleImageWidth, $originalImageHeight, $thumbnailSuffix, $thumbnailWidth, $thumbnailHeight)
-	{
-		$outputs = array("name"=>"", "width"=>0, "height"=>0);
-		$thumbnailWidth	= intval($thumbnailWidth);
-		$thumbnailHeight = intval($thumbnailHeight);
-		if(!empty($originalImageName) && !empty($originaleImageWidth) && !empty($originalImageHeight))
-		{
-			$dotIndex = strrpos($originalImageName, '.');
-			//begin to get the thumbnail image name
-			$fileExtension = '';
-			$fileBaseName = '';
-			if(is_int($dotIndex))
-			{
-				$fileExtension = substr($originalImageName, $dotIndex);
-				$fileBaseName = substr($originalImageName, 0, $dotIndex);
-			}
-			$outputs['name'] = $fileBaseName . $thumbnailSuffix . $fileExtension;
-			//start to get the thumbnail width & height
-			if($thumbnailWidth < 1 && $thumbnailHeight < 1)
-			{
-				$thumbnailWidth =$originaleImageWidth;
-				$thumbnailHeight = $originalImageHeight;
-			}elseif($thumbnailWidth < 1)
-			{
-				$thumbnailWidth = floor($thumbnailHeight / $originalImageHeight * $originaleImageWidth);
-
-			}elseif($thumbnailHeight < 1)
-			{
-				$thumbnailHeight = floor($thumbnailWidth / $originaleImageWidth * $originalImageHeight);
-			}else
-			{
-				$scale = min($thumbnailWidth/$originaleImageWidth, $thumbnailHeight/$originalImageHeight);
-				$thumbnailWidth = floor($scale*$originaleImageWidth);
-				$thumbnailHeight = floor($scale*$originalImageHeight);
-			}
-			$outputs['width'] = $thumbnailWidth;
-			$outputs['height'] = $thumbnailHeight;
-		}
-		return $outputs;
-
-	}
+    function _get_image_details($image)
+    {
+
+        //echo $image;
+        $data = @GetImageSize($image);
+        #1 = GIF, 2 = JPG, 3 = PNG, 4 = SWF, 5 = PSD, 6 = BMP, 7 = TIFF(intel byte order), 8 = TIFF(motorola byte order,
+        # 9 = JPC, 10 = JP2, 11 = JPX, 12 = JB2, 13 = SWC
+        if (is_array($data)){
+            switch($data[2]){
+                case 1:
+                    $type = 'gif';
+                    break;
+                case 2:
+                    $type = 'jpeg';
+                    break;
+                case 3:
+                    $type = 'png';
+                    break;
+                case 4:
+                    $type = 'swf';
+                    break;
+                case 5:
+                    $type = 'psd';
+                case 6:
+                    $type = 'bmp';
+                case 7:
+                case 8:
+                    $type = 'tiff';
+                default:
+                    array_push($this->errors, "We do not recognize this image format");
+
+            }
+            $this->img_x = $data[0];
+            $this->img_y = $data[1];
+            $this->fileType = $type;
+
+            return true;
+        } else {
+            array_push($this->errors, "Cannot fetch image or images details.");
+            return null;
+        }
+    }
+    /**
+     * caculate the thumbnail details from the original image file 
+     *
+     * @param string $originalImageName  
+     * @param int $originaleImageWidth
+     * @param int $originalImageHeight
+     * @param string $thumbnailSuffix
+     * @param int $thumbnailWidth
+     * @param int $thumbnailHeight
+     * @return array array("name"=>"image name", "width"=>"image width", "height"=>"image height")
+     */
+    function getThumbInfo($originalImageName, $originaleImageWidth, $originalImageHeight, $thumbnailSuffix, $thumbnailWidth, $thumbnailHeight)
+    {
+        $outputs = array("name"=>"", "width"=>0, "height"=>0);
+        $thumbnailWidth	= intval($thumbnailWidth);
+        $thumbnailHeight = intval($thumbnailHeight);
+        if(!empty($originalImageName) && !empty($originaleImageWidth) && !empty($originalImageHeight))
+        {
+            $dotIndex = strrpos($originalImageName, '.');
+            //begin to get the thumbnail image name
+            $fileExtension = '';
+            $fileBaseName = '';
+            if(is_int($dotIndex))
+            {
+                $fileExtension = substr($originalImageName, $dotIndex);
+                $fileBaseName = substr($originalImageName, 0, $dotIndex);
+            }
+            $outputs['name'] = $fileBaseName . $thumbnailSuffix . $fileExtension;
+            //start to get the thumbnail width & height
+            if($thumbnailWidth < 1 && $thumbnailHeight < 1)
+            {
+                $thumbnailWidth =$originaleImageWidth;
+                $thumbnailHeight = $originalImageHeight;
+            }elseif($thumbnailWidth < 1)
+            {
+                $thumbnailWidth = floor($thumbnailHeight / $originalImageHeight * $originaleImageWidth);
+
+            }elseif($thumbnailHeight < 1)
+            {
+                $thumbnailHeight = floor($thumbnailWidth / $originaleImageWidth * $originalImageHeight);
+            }else
+            {
+                $scale = min($thumbnailWidth/$originaleImageWidth, $thumbnailHeight/$originalImageHeight);
+                $thumbnailWidth = floor($scale*$originaleImageWidth);
+                $thumbnailHeight = floor($scale*$originalImageHeight);
+            }
+            $outputs['width'] = $thumbnailWidth;
+            $outputs['height'] = $thumbnailHeight;
+        }
+        return $outputs;
+
+    }
 	
 
-	/**
+    /**
      * get the uploaded file
      */
-	function deleteUploadedFile()
-	{
-		@unlink($this->filePath);
-	}
-	/**
-	 * destroy the tmp file
-	 *
-	 */
-	function finish()
-	{
-		@unlink($this->_value['tmp_name']);
-	}
+    function deleteUploadedFile()
+    {
+        @unlink($this->filePath);
+    }
+    /**
+     * destroy the tmp file
+     *
+     */
+    function finish()
+    {
+        @unlink($this->_value['tmp_name']);
+    }
 	
-	function displayError()
-	{
-		if(sizeof($this->errors))
-		{
-			echo "<pre>";
-			print_r($this->errors);
-			echo "</pre>";
-		}
-	}
-	/**
-	 * get the path which the file uploaded to
-	 *
-	 */
-	function getFilePath()
-	{
-		return $this->filePath;
-	}
-	/**
-	 * return the directory path witch the file uploaded to
-	 *
-	 * @return unknown
-	 */
-	function getDirPath()
-	{
-		return $this->dirPath;
-	}
+    function displayError()
+    {
+        if(sizeof($this->errors))
+        {
+            echo "<pre>";
+            print_r($this->errors);
+            echo "</pre>";
+        }
+    }
+    /**
+     * get the path which the file uploaded to
+     *
+     */
+    function getFilePath()
+    {
+        return $this->filePath;
+    }
+    /**
+     * return the directory path witch the file uploaded to
+     *
+     * @return unknown
+     */
+    function getDirPath()
+    {
+        return $this->dirPath;
+    }
 	
-	function getFileBaseName()
-	{
-		return $this->fileBaseName;
-	}
+    function getFileBaseName()
+    {
+        return $this->fileBaseName;
+    }
 	
-	function getFileName()
-	{
-		return $this->fileName;
-	}
-	/**
-	 * get image width
-	 *
-	 * @return integer
-	 */
-	function getImageWidth()
-	{
-		return $this->img_x;
-	}
-	/**
-	 * get image height
-	 *
-	 * @return integer
-	 */
-	function getImageHeight()
-	{
-		return $this->img_y;
-	}
-	/**
-	 * get uploaded file size
-	 *
-	 * @return string
-	 */
-	function getFileSize()
-	{
-		return $this->fileSize;
-	}
-	/**
-	 * delete the uploaded image file & associated thumnails
-	 *
-	 * @param string $dirPath
-	 * @param string $originalImageName
-	 * @param string $arrayThumbnailSuffix
-	 */
-	function deleteFileAndThumbs($dirPath, $originalImageName, $arrayThumbnailSuffix)
-	{
-		//ensure the directory path ending with /
-		if ($dirPath != ''  && substr($dirPath, -1) != '/') {
-			$dirPath .= '/';
-		}			
-		if(!empty($originalImageName) && file_exists($dirPath . $originalImageName) && is_file($dirPath . $originalImageName))
-		{
-			@unlink($dirPath . $originalImageName);
-			foreach($arrayThumbnailSuffix as $v)
-			{
-				$dotIndex = strrpos($originalImageName, '.');
-				//begin to get the thumbnail image name
-				$fileExtension = '';
-				$fileBaseName = '';
-				if(is_int($dotIndex))
-				{
-					$fileExtension = substr($originalImageName, $dotIndex);
-					$fileBaseName = substr($originalImageName, 0, $dotIndex);
-				}
-				@unlink($dirPath . $fileBaseName . $v . $fileExtension);			
-			}			
-		}
+    function getFileName()
+    {
+        return $this->fileName;
+    }
+    /**
+     * get image width
+     *
+     * @return integer
+     */
+    function getImageWidth()
+    {
+        return $this->img_x;
+    }
+    /**
+     * get image height
+     *
+     * @return integer
+     */
+    function getImageHeight()
+    {
+        return $this->img_y;
+    }
+    /**
+     * get uploaded file size
+     *
+     * @return string
+     */
+    function getFileSize()
+    {
+        return $this->fileSize;
+    }
+    /**
+     * delete the uploaded image file & associated thumnails
+     *
+     * @param string $dirPath
+     * @param string $originalImageName
+     * @param string $arrayThumbnailSuffix
+     */
+    function deleteFileAndThumbs($dirPath, $originalImageName, $arrayThumbnailSuffix)
+    {
+        //ensure the directory path ending with /
+        if ($dirPath != ''  && substr($dirPath, -1) != '/') {
+            $dirPath .= '/';
+        }			
+        if(!empty($originalImageName) && file_exists($dirPath . $originalImageName) && is_file($dirPath . $originalImageName))
+        {
+            @unlink($dirPath . $originalImageName);
+            foreach($arrayThumbnailSuffix as $v)
+            {
+                $dotIndex = strrpos($originalImageName, '.');
+                //begin to get the thumbnail image name
+                $fileExtension = '';
+                $fileBaseName = '';
+                if(is_int($dotIndex))
+                {
+                    $fileExtension = substr($originalImageName, $dotIndex);
+                    $fileBaseName = substr($originalImageName, 0, $dotIndex);
+                }
+                @unlink($dirPath . $fileBaseName . $v . $fileExtension);			
+            }			
+        }
 	
 
-	}
+    }
 }
 ?>
\ No newline at end of file

Spacing +79 added lines, -79 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
@@ -27,7 +27,7 @@ 
 	var $fileSize = 0;
 	var $validImageExts = array("gif", "jpg", "png");
 	var $errors = array();
-	var $_value  = null;  //an array holding the uploaded file details
+	var $_value  = null; //an array holding the uploaded file details
 	var $dirPath = "";
 	var $invalidFileExt = array(); //var $invalidFileExt = array('php,inc,asp,aspx');
 	var $errCode = "";
@@ -51,11 +51,11 @@ 
 		//doing nothing
 	}
 	
-	function isFileUploaded($indexInPost="file")
+	function isFileUploaded($indexInPost = "file")
 	{
 		
-		$this->errCode = isset($_FILES[$indexInPost]['error'])?$_FILES[$indexInPost]['error']:999;
-		if((isset($_FILES[$indexInPost]['error']) && $_FILES[$indexInPost] == 0) ||
+		$this->errCode = isset($_FILES[$indexInPost]['error']) ? $_FILES[$indexInPost]['error'] : 999;
+		if ((isset($_FILES[$indexInPost]['error']) && $_FILES[$indexInPost] == 0) ||
 		(!empty($_FILES[$indexInPost]['tmp_name']) && $_FILES[$indexInPost]['tmp_name'] != 'none')
 		)
 		{
@@ -65,7 +65,7 @@ 
 			$this->fileType = $this->_value['type'];
 			
 			return true;
-		}else 
+		} else 
 		{
 			
 			array_push($this->errors, 'Unable to upload file');
@@ -75,7 +75,7 @@ 
 	
 	function getErrorCodeMsg()
 	{
-		return (isset($this->errorCodes[$this->errCode])?$this->errorCodes[$this->errCode]:"");
+		return (isset($this->errorCodes[$this->errCode]) ? $this->errorCodes[$this->errCode] : "");
 	}
 	/**
 	 * check if the uploaded file extension is allowed against the validFile Extension
@@ -88,20 +88,20 @@ 
 	{
 		$tem = array();
 
-		if(sizeof($validFileExt))
+		if (sizeof($validFileExt))
 		{
-			foreach($validFileExt as $k=>$v)
+			foreach ($validFileExt as $k=>$v)
 			{
 				$tem[$k] = strtolower(trim($v));
 			}
 		}
 		$validFileExt = $tem;
 
-		if(sizeof($validFileExt) && sizeof($this->invalidFileExt))
+		if (sizeof($validFileExt) && sizeof($this->invalidFileExt))
 		{
-			foreach($validFileExt as  $k=>$ext)
+			foreach ($validFileExt as  $k=>$ext)
 			{
-				if(array_search(strtolower($ext), $this->invalidFileExt) !== false)
+				if (array_search(strtolower($ext), $this->invalidFileExt) !== false)
 				{
 					unset($validFileExt[$k]);
 				}
@@ -111,13 +111,13 @@ 
 	
 
 		
-		if(sizeof($validFileExt))
+		if (sizeof($validFileExt))
 		{
-			if(array_search(strtolower($this->getFileExt()), $validFileExt) !== false)
+			if (array_search(strtolower($this->getFileExt()), $validFileExt) !== false)
 			{
 				return true;
 			}
-		}elseif(array_search(strtolower($this->getFileExt()), $this->invalidFileExt) === false)
+		}elseif (array_search(strtolower($this->getFileExt()), $this->invalidFileExt) === false)
 		{
 			return true;
 		}
@@ -132,13 +132,13 @@ 
 	 *
 	 * @param integer $maxSize
 	 */
-	function isSizeTooBig($maxSize="")
+	function isSizeTooBig($maxSize = "")
 	{
-		if($this->fileSize > $maxSize)
+		if ($this->fileSize > $maxSize)
 		{
 			$this->deleteUploadedFile();
 			return true;
-		}else 
+		} else 
 		{
 			return false;
 		}
@@ -148,14 +148,14 @@ 
 	 *
 	 * @param array $invalidFileExt
 	 */
-	function setInvalidFileExt($invalidFileExt=array())
+	function setInvalidFileExt($invalidFileExt = array())
 	{
 		$tem = array();
-		if(sizeof($invalidFileExt))
+		if (sizeof($invalidFileExt))
 		{
-			foreach($invalidFileExt as $k=>$v)
+			foreach ($invalidFileExt as $k=>$v)
 			{
-				$tem[$k]= strtolower(trim($v));
+				$tem[$k] = strtolower(trim($v));
 			}
 		}
 		
@@ -188,39 +188,39 @@ 
 		 * @param unknown_type $overwrite
 		 * @return unknown
 		 */
-	function moveUploadedFile($dest, $fileBaseName = '', $overwrite=false)
+	function moveUploadedFile($dest, $fileBaseName = '', $overwrite = false)
 	{
 		//ensure the directory path ending with /
-		if ($dest != ''  && substr($dest, -1) != '/') {
+		if ($dest != '' && substr($dest, -1) != '/') {
 			$dest .= '/';
 		}
 		$this->dirPath = $dest;
-		$fileName =  basename($this->_value['name']);
+		$fileName = basename($this->_value['name']);
 
 		$dotIndex = strrpos($fileName, '.');
 		$this->fileExtension = '';
-		if(is_int($dotIndex))
+		if (is_int($dotIndex))
 		{
 			$this->fileExtension = substr($fileName, $dotIndex);
 			$this->fileBaseName = substr($fileName, 0, $dotIndex);
 		}
-		if(!empty($fileBaseName))
+		if (!empty($fileBaseName))
 		{
 			$this->fileBaseName = $fileBaseName;
 		}
-		$fileName = $this->fileBaseName . $this->fileExtension;
-		$filePath = $dest . $fileName;
+		$fileName = $this->fileBaseName.$this->fileExtension;
+		$filePath = $dest.$fileName;
 
-		if(!$overwrite && file_exists($filePath) && is_file($filePath))
+		if (!$overwrite && file_exists($filePath) && is_file($filePath))
 		{//rename
 
 			$counter = 0;
-			while(file_exists($dest.$fileName) && is_file($dest .$fileName))
+			while (file_exists($dest.$fileName) && is_file($dest.$fileName))
 			{
 				$counter++;
 				$fileName = $this->fileBaseName.'_'.$counter.$this->fileExtension;
 			}
-			$this->fileBaseName .= "_" . $counter;
+			$this->fileBaseName .= "_".$counter;
 
 		}
 
@@ -254,10 +254,10 @@ 
             return false;
         }
 
-		if (@move_uploaded_file($this->_value['tmp_name'], $dest . $fileName)) {
-			@chmod($dest . $fileName, $this->uploadFileMode);
+		if (@move_uploaded_file($this->_value['tmp_name'], $dest.$fileName)) {
+			@chmod($dest.$fileName, $this->uploadFileMode);
 			$this->fileName = $fileName;
-			$this->filePath = $dest . $fileName;
+			$this->filePath = $dest.$fileName;
 			return true;
 		} else {
 			return false;
@@ -273,7 +273,7 @@ 
 		 */	
 	function isImage($invalidImageExts = array(), $delete = true)
 	{
-		if(!is_array($invalidImageExts) && !empty($invalidImageExts))
+		if (!is_array($invalidImageExts) && !empty($invalidImageExts))
 		{
 			$invalidImageExts = explode(",", $invalidImageExts);
 		}
@@ -285,26 +285,26 @@ 
 		{
 			$ValidImageExts[$k] = strtolower(trim($v));
 		}
-		if(sizeof($invalidImageExts))
+		if (sizeof($invalidImageExts))
 		{
 			foreach ($ValidImageExts as $k=>$v)
 			{
-				if(array_search(strtolower($v), $invalidImageExts) !== false)
+				if (array_search(strtolower($v), $invalidImageExts) !== false)
 				{
 					unset($ValidImageExts[$k]);
 				}
 			}
 		}
-		if(array_search(strtolower($this->getFileExt()), $ValidImageExts)!==false)
+		if (array_search(strtolower($this->getFileExt()), $ValidImageExts) !== false)
 		{
 			$this->_get_image_details($this->filePath);
-			if(!empty($this->fileType))
+			if (!empty($this->fileType))
 			{
 				return true;
 			}
-		}else
+		} else
 		{
-			if($delete)
+			if ($delete)
 			{
 				$this->deleteUploadedFile();
 			}
@@ -326,12 +326,12 @@ 
      *
      * @return mixed none or PEAR_error
      */
-	function resize($filePath, $thumb_suffix="", $new_x = 0, $new_y = 0)
+	function resize($filePath, $thumb_suffix = "", $new_x = 0, $new_y = 0)
 	{
 		
-		if(empty($filePath))
+		if (empty($filePath))
 		{
-			$filePath = $this->dirPath . $this->fileBaseName . $thumb_suffix  . $this->fileExtension;
+			$filePath = $this->dirPath.$this->fileBaseName.$thumb_suffix.$this->fileExtension;
 		}
 		// 0 means keep original size
 		if ($this->img_x > $this->img_y)
@@ -339,7 +339,7 @@ 
 		else if ($this->img_y > $this->img_x)
 		$new_x = intval($new_y/$this->img_y*$this->img_x);
 		// Now do the library specific resizing.
-		return $this->_resize($filePath,$new_x, $new_y);
+		return $this->_resize($filePath, $new_x, $new_y);
 	} // End resize
 
 	/**
@@ -351,32 +351,32 @@ 
      * @return unknown
      */
 	function _resize($fileName, $new_x, $new_y) {
-		$functionName = 'ImageCreateFrom' . $this->fileType;
+		$functionName = 'ImageCreateFrom'.$this->fileType;
 
 
-		if(function_exists($functionName))
+		if (function_exists($functionName))
 		{
 			$this->imgHandler = $functionName($this->filePath);
-		}else
+		} else
 		{
-			array_push($this->errors, $functionName . " function is unavailable");
+			array_push($this->errors, $functionName." function is unavailable");
 			return false;
 		}
 
-		if(function_exists('ImageCreateTrueColor')){
-			$new_img =ImageCreateTrueColor($new_x,$new_y);
+		if (function_exists('ImageCreateTrueColor')) {
+			$new_img = ImageCreateTrueColor($new_x, $new_y);
 		} else {
-			$new_img =ImageCreate($new_x,$new_y);
+			$new_img = ImageCreate($new_x, $new_y);
 		}
-		if(function_exists('ImageCopyResampled')){
+		if (function_exists('ImageCopyResampled')) {
 			ImageCopyResampled($new_img, $this->imgHandler, 0, 0, 0, 0, $new_x, $new_y, $this->img_x, $this->img_y);
 		} else {
 			ImageCopyResized($new_img, $this->imgHandler, 0, 0, 0, 0, $new_x, $new_y, $this->img_x, $this->img_y);
 		}
-		if($this->_imageSave($new_img, $fileName, 80))
+		if ($this->_imageSave($new_img, $fileName, 80))
 		{
 			return array("width"=>$new_x, "height"=>$new_y, "name"=>basename($fileName));
-		}else
+		} else
 		{
 
 			array_push($this->errors, "Unable to resize the image");
@@ -394,12 +394,12 @@ 
 		 */
 	function _imageSave($newImageHandler, $fileName, $quality = 90)
 	{
-		$functionName = 'image' . $this->fileType;
-		if($functionName($newImageHandler, $fileName, $quality))
+		$functionName = 'image'.$this->fileType;
+		if ($functionName($newImageHandler, $fileName, $quality))
 		{
 			imagedestroy($newImageHandler);
 			return true;
-		}else
+		} else
 		{
 			imagedestroy($newImageHandler);
 			array_push($this->errors, "Unable to save the thumbnail file.");
@@ -419,8 +419,8 @@ 
 		$data = @GetImageSize($image);
 		#1 = GIF, 2 = JPG, 3 = PNG, 4 = SWF, 5 = PSD, 6 = BMP, 7 = TIFF(intel byte order), 8 = TIFF(motorola byte order,
 		# 9 = JPC, 10 = JP2, 11 = JPX, 12 = JB2, 13 = SWC
-		if (is_array($data)){
-			switch($data[2]){
+		if (is_array($data)) {
+			switch ($data[2]) {
 				case 1:
 					$type = 'gif';
 					break;
@@ -468,33 +468,33 @@ 
 	function getThumbInfo($originalImageName, $originaleImageWidth, $originalImageHeight, $thumbnailSuffix, $thumbnailWidth, $thumbnailHeight)
 	{
 		$outputs = array("name"=>"", "width"=>0, "height"=>0);
-		$thumbnailWidth	= intval($thumbnailWidth);
+		$thumbnailWidth = intval($thumbnailWidth);
 		$thumbnailHeight = intval($thumbnailHeight);
-		if(!empty($originalImageName) && !empty($originaleImageWidth) && !empty($originalImageHeight))
+		if (!empty($originalImageName) && !empty($originaleImageWidth) && !empty($originalImageHeight))
 		{
 			$dotIndex = strrpos($originalImageName, '.');
 			//begin to get the thumbnail image name
 			$fileExtension = '';
 			$fileBaseName = '';
-			if(is_int($dotIndex))
+			if (is_int($dotIndex))
 			{
 				$fileExtension = substr($originalImageName, $dotIndex);
 				$fileBaseName = substr($originalImageName, 0, $dotIndex);
 			}
-			$outputs['name'] = $fileBaseName . $thumbnailSuffix . $fileExtension;
+			$outputs['name'] = $fileBaseName.$thumbnailSuffix.$fileExtension;
 			//start to get the thumbnail width & height
-			if($thumbnailWidth < 1 && $thumbnailHeight < 1)
+			if ($thumbnailWidth < 1 && $thumbnailHeight < 1)
 			{
-				$thumbnailWidth =$originaleImageWidth;
+				$thumbnailWidth = $originaleImageWidth;
 				$thumbnailHeight = $originalImageHeight;
-			}elseif($thumbnailWidth < 1)
+			}elseif ($thumbnailWidth < 1)
 			{
-				$thumbnailWidth = floor($thumbnailHeight / $originalImageHeight * $originaleImageWidth);
+				$thumbnailWidth = floor($thumbnailHeight/$originalImageHeight*$originaleImageWidth);
 
-			}elseif($thumbnailHeight < 1)
+			}elseif ($thumbnailHeight < 1)
 			{
-				$thumbnailHeight = floor($thumbnailWidth / $originaleImageWidth * $originalImageHeight);
-			}else
+				$thumbnailHeight = floor($thumbnailWidth/$originaleImageWidth*$originalImageHeight);
+			} else
 			{
 				$scale = min($thumbnailWidth/$originaleImageWidth, $thumbnailHeight/$originalImageHeight);
 				$thumbnailWidth = floor($scale*$originaleImageWidth);
@@ -526,7 +526,7 @@ 
 	
 	function displayError()
 	{
-		if(sizeof($this->errors))
+		if (sizeof($this->errors))
 		{
 			echo "<pre>";
 			print_r($this->errors);
@@ -597,24 +597,24 @@ 
 	function deleteFileAndThumbs($dirPath, $originalImageName, $arrayThumbnailSuffix)
 	{
 		//ensure the directory path ending with /
-		if ($dirPath != ''  && substr($dirPath, -1) != '/') {
+		if ($dirPath != '' && substr($dirPath, -1) != '/') {
 			$dirPath .= '/';
 		}			
-		if(!empty($originalImageName) && file_exists($dirPath . $originalImageName) && is_file($dirPath . $originalImageName))
+		if (!empty($originalImageName) && file_exists($dirPath.$originalImageName) && is_file($dirPath.$originalImageName))
 		{
-			@unlink($dirPath . $originalImageName);
-			foreach($arrayThumbnailSuffix as $v)
+			@unlink($dirPath.$originalImageName);
+			foreach ($arrayThumbnailSuffix as $v)
 			{
 				$dotIndex = strrpos($originalImageName, '.');
 				//begin to get the thumbnail image name
 				$fileExtension = '';
 				$fileBaseName = '';
-				if(is_int($dotIndex))
+				if (is_int($dotIndex))
 				{
 					$fileExtension = substr($originalImageName, $dotIndex);
 					$fileBaseName = substr($originalImageName, 0, $dotIndex);
 				}
-				@unlink($dirPath . $fileBaseName . $v . $fileExtension);			
+				@unlink($dirPath.$fileBaseName.$v.$fileExtension);			
 			}			
 		}
 	

Braces +15 added lines, -14 removed lines

@@ -65,7 +65,7 @@ 
 			$this->fileType = $this->_value['type'];
 			
 			return true;
-		}else 
+		} else 
 		{
 			
 			array_push($this->errors, 'Unable to upload file');
@@ -117,7 +117,7 @@ 
 			{
 				return true;
 			}
-		}elseif(array_search(strtolower($this->getFileExt()), $this->invalidFileExt) === false)
+		} elseif(array_search(strtolower($this->getFileExt()), $this->invalidFileExt) === false)
 		{
 			return true;
 		}
@@ -138,7 +138,7 @@ 
 		{
 			$this->deleteUploadedFile();
 			return true;
-		}else 
+		} else 
 		{
 			return false;
 		}
@@ -302,7 +302,7 @@ 
 			{
 				return true;
 			}
-		}else
+		} else
 		{
 			if($delete)
 			{
@@ -334,10 +334,11 @@ 
 			$filePath = $this->dirPath . $this->fileBaseName . $thumb_suffix  . $this->fileExtension;
 		}
 		// 0 means keep original size
-		if ($this->img_x > $this->img_y)
-		$new_y = intval($new_x/$this->img_x*$this->img_y);
-		else if ($this->img_y > $this->img_x)
-		$new_x = intval($new_y/$this->img_y*$this->img_x);
+		if ($this->img_x > $this->img_y) {
+				$new_y = intval($new_x/$this->img_x*$this->img_y);
+		} else if ($this->img_y > $this->img_x) {
+				$new_x = intval($new_y/$this->img_y*$this->img_x);
+		}
 		// Now do the library specific resizing.
 		return $this->_resize($filePath,$new_x, $new_y);
 	} // End resize
@@ -357,7 +358,7 @@ 
 		if(function_exists($functionName))
 		{
 			$this->imgHandler = $functionName($this->filePath);
-		}else
+		} else
 		{
 			array_push($this->errors, $functionName . " function is unavailable");
 			return false;
@@ -376,7 +377,7 @@ 
 		if($this->_imageSave($new_img, $fileName, 80))
 		{
 			return array("width"=>$new_x, "height"=>$new_y, "name"=>basename($fileName));
-		}else
+		} else
 		{
 
 			array_push($this->errors, "Unable to resize the image");
@@ -399,7 +400,7 @@ 
 		{
 			imagedestroy($newImageHandler);
 			return true;
-		}else
+		} else
 		{
 			imagedestroy($newImageHandler);
 			array_push($this->errors, "Unable to save the thumbnail file.");
@@ -487,14 +488,14 @@ 
 			{
 				$thumbnailWidth =$originaleImageWidth;
 				$thumbnailHeight = $originalImageHeight;
-			}elseif($thumbnailWidth < 1)
+			} elseif($thumbnailWidth < 1)
 			{
 				$thumbnailWidth = floor($thumbnailHeight / $originalImageHeight * $originaleImageWidth);
 
-			}elseif($thumbnailHeight < 1)
+			} elseif($thumbnailHeight < 1)
 			{
 				$thumbnailHeight = floor($thumbnailWidth / $originaleImageWidth * $originalImageHeight);
-			}else
+			} else
 			{
 				$scale = min($thumbnailWidth/$originaleImageWidth, $thumbnailHeight/$originalImageHeight);
 				$thumbnailWidth = floor($scale*$originaleImageWidth);

phpmyfaq/admin/editor/plugins/ajaxfilemanager/inc/function.base.php

Doc Comments +23 added lines, -4 removed lines

@@ -17,6 +17,12 @@ 
  */
 if (!function_exists("stripos")) 
 {
+  /**
+   * @param string $str
+   * @param string $needle
+   *
+   * @return string
+   */
   function stripos($str,$needle,$offset=0)
   {
       return @strpos(strtolower($str),strtolower($needle),$offset);
@@ -420,6 +426,9 @@ 
 		}
 	}
 
+/**
+ * @param string $path
+ */
 function myRealPath($path) {
 
 		if(strpos($path, ':/') !== false)
@@ -567,7 +576,7 @@ 
 /**
  * get site root path
  *
- * @return String.
+ * @return string
  */
 function getRootPath() {
 		$output = '';
@@ -620,7 +629,8 @@ 
 	/**
 	 * get a file extension
 	 *
-	 * @param string $fileName the path to a file or just the file name
+	 * @param string $filePath
+	 * @return string
 	 */	
 	function getFileExt($filePath)
 	{
@@ -789,7 +799,7 @@ 
      *
      * @param string $pattern regular expression, separated by , if multiple
      * @param string $string
-     * @return booolean
+     * @return boolean
      */
         function isValidPattern( $pattern, $string)
         {
@@ -822,7 +832,7 @@ 
      *
      * @param string $pattern regular expression, separated by , if multiple
      * @param string $string
-     * @return booolean
+     * @return boolean
      */
         function isInvalidPattern( $pattern, $string)
         {
@@ -866,6 +876,10 @@ 
 		}
 		if (!function_exists('mime_content_type')) 
 		{
+
+		   /**
+		    * @param string $f
+		    */
 		   function mime_content_type ( $f )
 		   {
 		       return trim ( @exec ('file -bi ' . escapeshellarg ( $f ) ) ) ;
@@ -1139,6 +1153,11 @@ 
   
        if(!function_exists("imagerotate"))
         {
+
+            /**
+             * @param resource|null $src_img
+             * @param integer $angle
+             */
             function imagerotate($src_img, $angle, $bicubic=false)
             {
     // convert degrees to radians

Indentation +815 added lines, -815 removed lines

@@ -1,52 +1,52 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php
-	/**
-	 * function avaialble to the file manager
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/April/2007
-	 *
-	 */
+    /**
+     * function avaialble to the file manager
+     * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @link www.phpletter.com
+     * @since 22/April/2007
+     *
+     */
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "config.php");
 /**
- * force to ensure existence of stripos
- */
+     * force to ensure existence of stripos
+     */
 if (!function_exists("stripos")) 
 {
-  function stripos($str,$needle,$offset=0)
-  {
-      return @strpos(strtolower($str),strtolower($needle),$offset);
-  }
+    function stripos($str,$needle,$offset=0)
+    {
+        return @strpos(strtolower($str),strtolower($needle),$offset);
+    }
 }
-	/**
-	 * get the current Url but not the query string specified in $excls
-	 *
-	 * @param array $excls specify those unwanted query string
-	 * @return string
-	 */
-	function getCurrentUrl($excls=array())
-	{
-		$output = $_SERVER['PHP_SELF'];
-		$count = 1;
-		foreach($_GET as $k=>$v)
-		{
-			if(array_search($k, $excls) ===false)
-			{
-				$strAppend = "&";
-				if($count == 1)
-				{
-					$strAppend = "?";
-					$count++;
-				}
-				$output .= $strAppend . urlencode($k) . "=" . urlencode($v);
-			}
-		}
-		return $output;
-	}
+    /**
+     * get the current Url but not the query string specified in $excls
+     *
+     * @param array $excls specify those unwanted query string
+     * @return string
+     */
+    function getCurrentUrl($excls=array())
+    {
+        $output = $_SERVER['PHP_SELF'];
+        $count = 1;
+        foreach($_GET as $k=>$v)
+        {
+            if(array_search($k, $excls) ===false)
+            {
+                $strAppend = "&";
+                if($count == 1)
+                {
+                    $strAppend = "?";
+                    $count++;
+                }
+                $output .= $strAppend . urlencode($k) . "=" . urlencode($v);
+            }
+        }
+        return $output;
+    }
 
 /**
  * print out an array
@@ -55,71 +55,71 @@ 
  */
 function displayArray($array, $comments='')
 {
-	echo "<pre>";
-	echo $comments;
-	print_r($array);
-	echo $comments;
-	echo "</pre>";
+    echo "<pre>";
+    echo $comments;
+    print_r($array);
+    echo $comments;
+    echo "</pre>";
 }
 
 
 
-	/**
-	 * check if a file extension is permitted
-	 *
-	 * @param string $filePath
-	 * @param array $validExts
-	 * @param array $invalidExts
-	 * @return boolean
-	 */
-	function isValidExt($filePath, $validExts, $invalidExts=array())
-	{
-		$tem = array();
+    /**
+     * check if a file extension is permitted
+     *
+     * @param string $filePath
+     * @param array $validExts
+     * @param array $invalidExts
+     * @return boolean
+     */
+    function isValidExt($filePath, $validExts, $invalidExts=array())
+    {
+        $tem = array();
 
-		if(sizeof($validExts))
-		{
-			foreach($validExts as $k=>$v)
-			{
-				$tem[$k] = strtolower(trim($v));
-			}
-		}
-		$validExts = $tem;
-		$tem = array();
-		if(sizeof($invalidExts))
-		{
-			foreach($invalidExts as $k=>$v)
-			{
-				$tem[$k] = strtolower(trim($v));
-			}
-		}
-		$invalidExts = $tem;
-		if(sizeof($validExts) && sizeof($invalidExts))
-		{
-			foreach($validExts as  $k=>$ext)
-			{
-				if(array_search($ext, $invalidExts) !== false)
-				{
-					unset($validExts[$k]);
-				}
-			}
-		}
-		if(sizeof($validExts))
-		{
-			if(array_search(strtolower(getFileExt($filePath)), $validExts) !== false)
-			{
-				return true;
-			}else 
-			{
-				return false;
-			}
-		}elseif(array_search(strtolower(getFileExt($filePath)), $invalidExts) === false)
-		{
-			return true;
-		}else 
-		{
-			return false;
-		}
-	}
+        if(sizeof($validExts))
+        {
+            foreach($validExts as $k=>$v)
+            {
+                $tem[$k] = strtolower(trim($v));
+            }
+        }
+        $validExts = $tem;
+        $tem = array();
+        if(sizeof($invalidExts))
+        {
+            foreach($invalidExts as $k=>$v)
+            {
+                $tem[$k] = strtolower(trim($v));
+            }
+        }
+        $invalidExts = $tem;
+        if(sizeof($validExts) && sizeof($invalidExts))
+        {
+            foreach($validExts as  $k=>$ext)
+            {
+                if(array_search($ext, $invalidExts) !== false)
+                {
+                    unset($validExts[$k]);
+                }
+            }
+        }
+        if(sizeof($validExts))
+        {
+            if(array_search(strtolower(getFileExt($filePath)), $validExts) !== false)
+            {
+                return true;
+            }else 
+            {
+                return false;
+            }
+        }elseif(array_search(strtolower(getFileExt($filePath)), $invalidExts) === false)
+        {
+            return true;
+        }else 
+        {
+            return false;
+        }
+    }
 
 
 
@@ -132,31 +132,31 @@ 
  */
 function relToAbs($value) 
 {
-	return backslashToSlash(preg_replace("/(\\\\)/","\\", getRealPath($value)));
+    return backslashToSlash(preg_replace("/(\\\\)/","\\", getRealPath($value)));
 
 }
 
-	function getRelativeFileUrl($value, $relativeTo)
-	{
-		$output = '';
-		$wwwroot = removeTrailingSlash(backslashToSlash(getRootPath()));
-		$urlprefix = '';
-		$urlsuffix = '';
-		$value = backslashToSlash(getRealPath($value));
-		$pos = strpos($value, $wwwroot);
-		if ($pos !== false && $pos == 0)
-		{
-			$output  = $urlprefix . substr($value, strlen($wwwroot)) . $urlsuffix;
-		}
-	}
+    function getRelativeFileUrl($value, $relativeTo)
+    {
+        $output = '';
+        $wwwroot = removeTrailingSlash(backslashToSlash(getRootPath()));
+        $urlprefix = '';
+        $urlsuffix = '';
+        $value = backslashToSlash(getRealPath($value));
+        $pos = strpos($value, $wwwroot);
+        if ($pos !== false && $pos == 0)
+        {
+            $output  = $urlprefix . substr($value, strlen($wwwroot)) . $urlsuffix;
+        }
+    }
 /**
- * replace slash with backslash
- *
- * @param string $value the path to the file
- * @return string
- */
+     * replace slash with backslash
+     *
+     * @param string $value the path to the file
+     * @return string
+     */
 function slashToBackslash($value) {
-	return str_replace("/", DIRECTORY_SEPARATOR, $value);
+    return str_replace("/", DIRECTORY_SEPARATOR, $value);
 }
 
 /**
@@ -166,7 +166,7 @@ 
  * @return string
  */
 function backslashToSlash($value) {
-	return str_replace(DIRECTORY_SEPARATOR, "/", $value);
+    return str_replace(DIRECTORY_SEPARATOR, "/", $value);
 }
 
 /**
@@ -176,11 +176,11 @@ 
  * @return string
  */
 function removeTrailingSlash($value) {
-	if(preg_match('@^.+/$@i', $value))
-	{
-		$value = substr($value, 0, strlen($value)-1);
-	}
-	return $value;
+    if(preg_match('@^.+/$@i', $value))
+    {
+        $value = substr($value, 0, strlen($value)-1);
+    }
+    return $value;
 }
 
 /**
@@ -191,11 +191,11 @@ 
  */
 function addTrailingSlash($value) 
 {
-	if(preg_match('@^.*[^/]{1}$@i', $value))
-	{
-		$value .= '/';
-	}
-	return $value;
+    if(preg_match('@^.*[^/]{1}$@i', $value))
+    {
+        $value .= '/';
+    }
+    return $value;
 }
 
 /**
@@ -205,33 +205,33 @@ 
  * @return string
  */
 function transformFilePath($value) {
-	$rootPath = addTrailingSlash(backslashToSlash(getRealPath(CONFIG_SYS_ROOT_PATH)));
-	$value = addTrailingSlash(backslashToSlash(getRealPath($value)));
-	if(!empty($rootPath) && ($i = strpos($value, $rootPath)) !== false)
-	{
-		$value = ($i == 0?substr($value, strlen($rootPath)):"/");		
-	}
-	$value = prependSlash($value);
-	return $value;
+    $rootPath = addTrailingSlash(backslashToSlash(getRealPath(CONFIG_SYS_ROOT_PATH)));
+    $value = addTrailingSlash(backslashToSlash(getRealPath($value)));
+    if(!empty($rootPath) && ($i = strpos($value, $rootPath)) !== false)
+    {
+        $value = ($i == 0?substr($value, strlen($rootPath)):"/");		
+    }
+    $value = prependSlash($value);
+    return $value;
 }
 /**
- * prepend slash 
- *
- * @param string $value
- * @return string
- */
+     * prepend slash 
+     *
+     * @param string $value
+     * @return string
+     */
 function prependSlash($value)
 {
-		if (($value && $value[0] != '/') || !$value )
-		{
-			$value = "/" . $value;
-		}			
-		return $value;	
+        if (($value && $value[0] != '/') || !$value )
+        {
+            $value = "/" . $value;
+        }			
+        return $value;	
 }
 
 
-	function writeInfo($data, $die = false)
-	{
+    function writeInfo($data, $die = false)
+    {
 		
 /*		$fp = @fopen(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'data.php', 'w+');
 		$data  = '<?php
@@ -245,187 +245,187 @@ 
 			die();
 		}*/
 		
-	}
+    }
 
 /**
  * no cachable header
  */
 function addNoCacheHeaders() {
-	header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-	header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-	header("Cache-Control: no-store, no-cache, must-revalidate");
-	header("Cache-Control: post-check=0, pre-check=0", false);
-	header("Pragma: no-cache");
+    header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+    header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+    header("Cache-Control: no-store, no-cache, must-revalidate");
+    header("Cache-Control: post-check=0, pre-check=0", false);
+    header("Pragma: no-cache");
 }
-	/**
-	 * add extra query stiring to a url
-	 * @param string $baseUrl
-	 * @param string $extra the query string added to the base url
-	 */
-	function appendQueryString($baseUrl, $extra)
-	{
-		$output = $baseUrl;
-		if(!empty($extra))
-		{
-			if(strpos($baseUrl, "?") !== false)
-			{
-				$output .= "&" . $extra;
-			}else
-			{
-				$output .= "?" . $extra;
-			}			
-		}
+    /**
+     * add extra query stiring to a url
+     * @param string $baseUrl
+     * @param string $extra the query string added to the base url
+     */
+    function appendQueryString($baseUrl, $extra)
+    {
+        $output = $baseUrl;
+        if(!empty($extra))
+        {
+            if(strpos($baseUrl, "?") !== false)
+            {
+                $output .= "&" . $extra;
+            }else
+            {
+                $output .= "?" . $extra;
+            }			
+        }
 
-		return $output;
-	}
-	/**
-	 * make the query strin from $_GET, but excluding those specified by $excluded
-	 *
-	 * @param array $excluded
-	 * @return string
-	 */
-	function makeQueryString($excluded=array())
-	{
-		$output = '';
-		$count = 1;
-		foreach($_GET as $k=>$v)
-		{
-			if(array_search($k, $excluded) === false)
-			{
-				$output .= ($count>1?'&':'') . (urlencode($k) . "=" . urlencode($v));
-				$count++;
-			}
-		}
-		return $output;
-	}
-	/**
-	 * get parent path from specific path
-	 *
-	 * @param string $value
-	 * @return string
-	 */
-	function getParentPath($value)
-	{
-		$value = removeTrailingSlash(backslashToSlash($value));
-		if(false !== ($index = strrpos($value, "/")) )
-		{
-			return substr($value, 0, $index);
-		}
+        return $output;
+    }
+    /**
+     * make the query strin from $_GET, but excluding those specified by $excluded
+     *
+     * @param array $excluded
+     * @return string
+     */
+    function makeQueryString($excluded=array())
+    {
+        $output = '';
+        $count = 1;
+        foreach($_GET as $k=>$v)
+        {
+            if(array_search($k, $excluded) === false)
+            {
+                $output .= ($count>1?'&':'') . (urlencode($k) . "=" . urlencode($v));
+                $count++;
+            }
+        }
+        return $output;
+    }
+    /**
+     * get parent path from specific path
+     *
+     * @param string $value
+     * @return string
+     */
+    function getParentPath($value)
+    {
+        $value = removeTrailingSlash(backslashToSlash($value));
+        if(false !== ($index = strrpos($value, "/")) )
+        {
+            return substr($value, 0, $index);
+        }
 
-	}
+    }
 
 
-	/**
-	 * check if the file/folder is sit under the root
-	 *
-	 * @param string $value
-	 * @return  boolean
-	 */
-	function isUnderRoot($value)
-	{
-		$roorPath = strtolower(addTrailingSlash(backslashToSlash(getRealPath(CONFIG_SYS_ROOT_PATH))));
-		if(file_exists($value) && @strpos(strtolower(addTrailingSlash(backslashToSlash(getRealPath($value)))), $roorPath) === 0 )
-		{
-			return true;
-		}
-		return false;
-	}
-	/**
-	 * check if a file under the session folder
-	 *
-	 * @param string $value
-	 * @return boolean
-	 */
-	function isUnderSession($value)
-	{
-		global $session;
-		$sessionPath = strtolower(addTrailingSlash(backslashToSlash(getRealPath($session->getSessionDir()))));
-		if(file_exists($value) && @strpos(strtolower(addTrailingSlash(backslashToSlash(getRealPath($value)))), $sessionPath) === 0 )
-		{
-			return true;
-		}
-		return false;		
-	}
+    /**
+     * check if the file/folder is sit under the root
+     *
+     * @param string $value
+     * @return  boolean
+     */
+    function isUnderRoot($value)
+    {
+        $roorPath = strtolower(addTrailingSlash(backslashToSlash(getRealPath(CONFIG_SYS_ROOT_PATH))));
+        if(file_exists($value) && @strpos(strtolower(addTrailingSlash(backslashToSlash(getRealPath($value)))), $roorPath) === 0 )
+        {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * check if a file under the session folder
+     *
+     * @param string $value
+     * @return boolean
+     */
+    function isUnderSession($value)
+    {
+        global $session;
+        $sessionPath = strtolower(addTrailingSlash(backslashToSlash(getRealPath($session->getSessionDir()))));
+        if(file_exists($value) && @strpos(strtolower(addTrailingSlash(backslashToSlash(getRealPath($value)))), $sessionPath) === 0 )
+        {
+            return true;
+        }
+        return false;		
+    }
 	
 	
-	/**
-	 * get thumbnail width and height
-	 *
-	 * @param integer $originaleImageWidth
-	 * @param integer $originalImageHeight
-	 * @param integer $thumbnailWidth
-	 * @param integer $thumbnailHeight
-	 * @return array()
-	 */
-	function getThumbWidthHeight( $originaleImageWidth, $originalImageHeight, $thumbnailWidth, $thumbnailHeight)
-	{
-		$outputs = array( "width"=>0, "height"=>0);
-		$thumbnailWidth	= intval($thumbnailWidth);
-		$thumbnailHeight = intval($thumbnailHeight);
-		if(!empty($originaleImageWidth) && !empty($originalImageHeight))
-		{
-			//start to get the thumbnail width & height
-        	if(($thumbnailWidth < 1 && $thumbnailHeight < 1) || ($thumbnailWidth > $originaleImageWidth && $thumbnailHeight > $originalImageHeight ))
-        	{
-        		$thumbnailWidth =$originaleImageWidth;
-        		$thumbnailHeight = $originalImageHeight;
-        	}elseif($thumbnailWidth < 1)
-        	{
-        		$thumbnailWidth = floor($thumbnailHeight / $originalImageHeight * $originaleImageWidth);
+    /**
+     * get thumbnail width and height
+     *
+     * @param integer $originaleImageWidth
+     * @param integer $originalImageHeight
+     * @param integer $thumbnailWidth
+     * @param integer $thumbnailHeight
+     * @return array()
+     */
+    function getThumbWidthHeight( $originaleImageWidth, $originalImageHeight, $thumbnailWidth, $thumbnailHeight)
+    {
+        $outputs = array( "width"=>0, "height"=>0);
+        $thumbnailWidth	= intval($thumbnailWidth);
+        $thumbnailHeight = intval($thumbnailHeight);
+        if(!empty($originaleImageWidth) && !empty($originalImageHeight))
+        {
+            //start to get the thumbnail width & height
+            if(($thumbnailWidth < 1 && $thumbnailHeight < 1) || ($thumbnailWidth > $originaleImageWidth && $thumbnailHeight > $originalImageHeight ))
+            {
+                $thumbnailWidth =$originaleImageWidth;
+                $thumbnailHeight = $originalImageHeight;
+            }elseif($thumbnailWidth < 1)
+            {
+                $thumbnailWidth = floor($thumbnailHeight / $originalImageHeight * $originaleImageWidth);
 
-        	}elseif($thumbnailHeight < 1)
-        	{
-        		$thumbnailHeight = floor($thumbnailWidth / $originaleImageWidth * $originalImageHeight);
-        	}else
-        	{
-        		$scale = min($thumbnailWidth/$originaleImageWidth, $thumbnailHeight/$originalImageHeight);
-				$thumbnailWidth = floor($scale*$originaleImageWidth);
-				$thumbnailHeight = floor($scale*$originalImageHeight);
-        	}
-			$outputs['width'] = $thumbnailWidth;
-			$outputs['height'] = $thumbnailHeight;
-		}
-		return $outputs;
+            }elseif($thumbnailHeight < 1)
+            {
+                $thumbnailHeight = floor($thumbnailWidth / $originaleImageWidth * $originalImageHeight);
+            }else
+            {
+                $scale = min($thumbnailWidth/$originaleImageWidth, $thumbnailHeight/$originalImageHeight);
+                $thumbnailWidth = floor($scale*$originaleImageWidth);
+                $thumbnailHeight = floor($scale*$originalImageHeight);
+            }
+            $outputs['width'] = $thumbnailWidth;
+            $outputs['height'] = $thumbnailHeight;
+        }
+        return $outputs;
 
-	}
+    }
 /**
- * turn to absolute path from relative path
- *
- * @param string $value
- * @return string
- */
+     * turn to absolute path from relative path
+     *
+     * @param string $value
+     * @return string
+     */
 function getAbsPath($value) {
-	if (substr($value, 0, 1) == "/")
-		return slashToBackslash(DIR_AJAX_ROOT . $value);
+    if (substr($value, 0, 1) == "/")
+        return slashToBackslash(DIR_AJAX_ROOT . $value);
 
-	return slashToBackslash(dirname(__FILE__) . "/" . $value);
+    return slashToBackslash(dirname(__FILE__) . "/" . $value);
 }
 
-	/**
-	 * get file/folder base name
-	 *
-	 * @param string $value
-	 * @return string
-	 */
-	function getBaseName($value)
-	{
-		$value = removeTrailingSlash(backslashToSlash($value));
+    /**
+     * get file/folder base name
+     *
+     * @param string $value
+     * @return string
+     */
+    function getBaseName($value)
+    {
+        $value = removeTrailingSlash(backslashToSlash($value));
 
-		if(false !== ($index = strrpos($value, "/")) )
-		{
-			return substr($value, $index + 1);
-		}else
-		{
-			return $value;
-		}
-	}
+        if(false !== ($index = strrpos($value, "/")) )
+        {
+            return substr($value, $index + 1);
+        }else
+        {
+            return $value;
+        }
+    }
 
 function myRealPath($path) {
 
-		if(strpos($path, ':/') !== false)
-		{
-			return $path;
-		}
+        if(strpos($path, ':/') !== false)
+        {
+            return $path;
+        }
     // check if path begins with "/" ie. is absolute
     // if it isnt concat with script path
     
@@ -439,9 +439,9 @@ 
     $newpath=array();
     for ($i=0; $i<sizeof($path); $i++) {
         if ($path[$i]==='' || $path[$i]==='.') continue;
-           if ($path[$i]==='..') {
-              array_pop($newpath);
-              continue;
+            if ($path[$i]==='..') {
+                array_pop($newpath);
+                continue;
         }
         array_push($newpath, $path[$i]);
     }
@@ -454,49 +454,49 @@ 
     }
     else return FALSE;
 }
-	/**
-	 * calcuate realpath for a relative path
-	 *
-	 * @param string $value a relative path
-	 * @return string absolute path of the input
-	 */
- function getRealPath($value)
- {
- 		$output = '';
- 	 if(($path = realpath($value)) && $path != $value)
- 	 {
- 	 	$output = $path;
- 	 }else 
- 	 {
- 	 	$output = myRealPath($value);
- 	 }
- 	 return $output;
+    /**
+     * calcuate realpath for a relative path
+     *
+     * @param string $value a relative path
+     * @return string absolute path of the input
+     */
+    function getRealPath($value)
+    {
+            $output = '';
+        if(($path = realpath($value)) && $path != $value)
+        {
+            $output = $path;
+        }else 
+        {
+            $output = myRealPath($value);
+        }
+        return $output;
  	
- }
-	/**
-	 * get file url
-	 *
-	 * @param string $value
-	 * @return string
-	 */
-	function getFileUrl($value)
-	{
-		$wwwroot = removeTrailingSlash(backslashToSlash(getRootPath()));
+    }
+    /**
+     * get file url
+     *
+     * @param string $value
+     * @return string
+     */
+    function getFileUrl($value)
+    {
+        $wwwroot = removeTrailingSlash(backslashToSlash(getRootPath()));
 
-		$urlprefix = '';
-		$urlsuffix = '';
+        $urlprefix = '';
+        $urlsuffix = '';
 
-		$value = backslashToSlash(getRealPath($value));
+        $value = backslashToSlash(getRealPath($value));
 
-		$pos = stripos($value, $wwwroot);
-		if ($pos !== false )
-		{
-			$output  = $urlprefix . substr($value, $pos + strlen($wwwroot)) . $urlsuffix;
-		}else 
-		{
-			$output = $value;
-		}
-		$protocol = (isset($_SERVER["HTTPS"]) &&  $_SERVER["HTTPS"] == 'on' ? 'https' : 'http');
+        $pos = stripos($value, $wwwroot);
+        if ($pos !== false )
+        {
+            $output  = $urlprefix . substr($value, $pos + strlen($wwwroot)) . $urlsuffix;
+        }else 
+        {
+            $output = $value;
+        }
+        $protocol = (isset($_SERVER["HTTPS"]) &&  $_SERVER["HTTPS"] == 'on' ? 'https' : 'http');
 
         // Pick up URL up to /admin and exclude /admin  . This is the phpMyFAQ directory
         $pmfBase = strrev(
@@ -523,7 +523,7 @@ 
 
         return $pmfBase . $pmfRest ;
 
-	}
+    }
 	
 /**
  * 
@@ -533,36 +533,36 @@ 
  */
 function transformFileSize($size) {
 
-	if ($size > 1048576)
-	{
-		return round($size / 1048576, 1) . " MB";
-	}elseif ($size > 1024)
-	{
-		return round($size / 1024, 1) . " KB";
-	}elseif($size == '')
-	{
-		return $size;
-	}else
-	{
-		return $size . " b";
-	}	
+    if ($size > 1048576)
+    {
+        return round($size / 1048576, 1) . " MB";
+    }elseif ($size > 1024)
+    {
+        return round($size / 1024, 1) . " KB";
+    }elseif($size == '')
+    {
+        return $size;
+    }else
+    {
+        return $size . " b";
+    }	
 }
 	
-	/**
-	 * remove beginging slash
-	 *
-	 * @param string $value
-	 * @return string
-	 */
-	function removeBeginingSlash($value)
-	{
-		$value = backslashToSlash($value);
-		if(strpos($value, "/") === 0)
-		{
-			$value = substr($value, 1);
-		}
-		return $value;
-	}
+    /**
+     * remove beginging slash
+     *
+     * @param string $value
+     * @return string
+     */
+    function removeBeginingSlash($value)
+    {
+        $value = backslashToSlash($value);
+        if(strpos($value, "/") === 0)
+        {
+            $value = substr($value, 1);
+        }
+        return $value;
+    }
 	
 /**
  * get site root path
@@ -570,220 +570,220 @@ 
  * @return String.
  */
 function getRootPath() {
-		$output = '';
+        $output = '';
 
-		if (defined('CONFIG_WEBSITE_DOCUMENT_ROOT') && CONFIG_WEBSITE_DOCUMENT_ROOT)
-		{
+        if (defined('CONFIG_WEBSITE_DOCUMENT_ROOT') && CONFIG_WEBSITE_DOCUMENT_ROOT)
+        {
 
-			return slashToBackslash(CONFIG_WEBSITE_DOCUMENT_ROOT);
-		}
-		if(isset($_SERVER['DOCUMENT_ROOT']) && ($output = relToAbs($_SERVER['DOCUMENT_ROOT'])) != '' )
-		{
+            return slashToBackslash(CONFIG_WEBSITE_DOCUMENT_ROOT);
+        }
+        if(isset($_SERVER['DOCUMENT_ROOT']) && ($output = relToAbs($_SERVER['DOCUMENT_ROOT'])) != '' )
+        {
 
-			return $output;
-		}elseif(isset($_SERVER["SCRIPT_NAME"]) && isset($_SERVER["SCRIPT_FILENAME"]) && ($output = str_replace(backslashToSlash($_SERVER["SCRIPT_NAME"]), '', backslashToSlash($_SERVER["SCRIPT_FILENAME"]))) && is_dir($output))
-		{
+            return $output;
+        }elseif(isset($_SERVER["SCRIPT_NAME"]) && isset($_SERVER["SCRIPT_FILENAME"]) && ($output = str_replace(backslashToSlash($_SERVER["SCRIPT_NAME"]), '', backslashToSlash($_SERVER["SCRIPT_FILENAME"]))) && is_dir($output))
+        {
 
-			return slashToBackslash($output);
-		}elseif(isset($_SERVER["SCRIPT_NAME"]) && isset($_SERVER["PATH_TRANSLATED"]) && ($output = str_replace(backslashToSlash($_SERVER["SCRIPT_NAME"]), '', str_replace("//", "/", backslashToSlash($_SERVER["PATH_TRANSLATED"])))) && is_dir($output))
-		{
+            return slashToBackslash($output);
+        }elseif(isset($_SERVER["SCRIPT_NAME"]) && isset($_SERVER["PATH_TRANSLATED"]) && ($output = str_replace(backslashToSlash($_SERVER["SCRIPT_NAME"]), '', str_replace("//", "/", backslashToSlash($_SERVER["PATH_TRANSLATED"])))) && is_dir($output))
+        {
 
-			return $output;
-		}else 
-		{
-			return '';
-		}	
+            return $output;
+        }else 
+        {
+            return '';
+        }	
 
-	return null;
+    return null;
 }
 
 	
-	/**
-	 * add beginging slash
-	 *
-	 * @param string $value
-	 * @return string
-	 */	
-	function addBeginingSlash($value)
-	{
-		if(strpos($value, "/") !== 0 && !empty($value))
-		{
-			$value .= "/" . $value;
-		}
-		return $value;		
-	}
+    /**
+     * add beginging slash
+     *
+     * @param string $value
+     * @return string
+     */	
+    function addBeginingSlash($value)
+    {
+        if(strpos($value, "/") !== 0 && !empty($value))
+        {
+            $value .= "/" . $value;
+        }
+        return $value;		
+    }
 
 
 	
 
 	
-	/**
-	 * get a file extension
-	 *
-	 * @param string $fileName the path to a file or just the file name
-	 */	
-	function getFileExt($filePath)
-	{
-		return @substr(@strrchr($filePath, "."), 1);
-	}
+    /**
+     * get a file extension
+     *
+     * @param string $fileName the path to a file or just the file name
+     */	
+    function getFileExt($filePath)
+    {
+        return @substr(@strrchr($filePath, "."), 1);
+    }
 	
-		/**
-		 * reuturn the relative path between two url
-		 *
-		 * @param string $start_dir
-		 * @param string $final_dir
-		 * @return string
-		 */
+        /**
+         * reuturn the relative path between two url
+         *
+         * @param string $start_dir
+         * @param string $final_dir
+         * @return string
+         */
     function getRelativePath($start_dir, $final_dir){
-      //
-      $firstPathParts = explode(DIRECTORY_SEPARATOR, $start_dir);
-      $secondPathParts = explode(DIRECTORY_SEPARATOR, $final_dir);
-      //
-      $sameCounter = 0;
-      for($i = 0; $i < min( count($firstPathParts), count($secondPathParts) ); $i++) {
-          if( strtolower($firstPathParts[$i]) !== strtolower($secondPathParts[$i]) ) {
-              break;
-          }
-          $sameCounter++;
-      }
-      if( $sameCounter == 0 ) {
-          return $final_dir;
-      }
-      //
-      $newPath = '';
-      for($i = $sameCounter; $i < count($firstPathParts); $i++) {
-          if( $i > $sameCounter ) {
-              $newPath .= DIRECTORY_SEPARATOR;
-          }
-          $newPath .= "..";
-      }
-      if( count($newPath) == 0 ) {
-          $newPath = ".";
-      }
-      for($i = $sameCounter; $i < count($secondPathParts); $i++) {
-          $newPath .= DIRECTORY_SEPARATOR;
-          $newPath .= $secondPathParts[$i];
-      }
-      //
-      return $newPath;
-  }
-  /**
-   * get the php server memory limit
-   * @return integer
-   *
-   */
-  function getMemoryLimit()
-  {
+        //
+        $firstPathParts = explode(DIRECTORY_SEPARATOR, $start_dir);
+        $secondPathParts = explode(DIRECTORY_SEPARATOR, $final_dir);
+        //
+        $sameCounter = 0;
+        for($i = 0; $i < min( count($firstPathParts), count($secondPathParts) ); $i++) {
+            if( strtolower($firstPathParts[$i]) !== strtolower($secondPathParts[$i]) ) {
+                break;
+            }
+            $sameCounter++;
+        }
+        if( $sameCounter == 0 ) {
+            return $final_dir;
+        }
+        //
+        $newPath = '';
+        for($i = $sameCounter; $i < count($firstPathParts); $i++) {
+            if( $i > $sameCounter ) {
+                $newPath .= DIRECTORY_SEPARATOR;
+            }
+            $newPath .= "..";
+        }
+        if( count($newPath) == 0 ) {
+            $newPath = ".";
+        }
+        for($i = $sameCounter; $i < count($secondPathParts); $i++) {
+            $newPath .= DIRECTORY_SEPARATOR;
+            $newPath .= $secondPathParts[$i];
+        }
+        //
+        return $newPath;
+    }
+    /**
+     * get the php server memory limit
+     * @return integer
+     *
+     */
+    function getMemoryLimit()
+    {
     $output = @ini_get('memory_limit') or $output = -1 ;
     if(intval($output) < 0)
     {//unlimited
-    	$output = 999999999999999999;
+        $output = 999999999999999999;
     }
     elseif(strpos('g', strtolower($output)) !== false)
     {
-    	$output = intval($output) * 1024 * 1024 * 1024;
+        $output = intval($output) * 1024 * 1024 * 1024;
     }elseif(strpos('k', strtolower($output)) !== false)
     {
-    	$output = intval($output) * 1024 ;
+        $output = intval($output) * 1024 ;
     }else
     {
-    	$output = intval($output) * 1024 * 1024;
+        $output = intval($output) * 1024 * 1024;
     }
     
     return $output;  	
-  }
-	/**
-	 * get file content
-	 *
-	 * @param string $path
-	 */
-  function getFileContent($path)
-  {
-  	return @file_get_contents($path);
-  	//return str_replace(array("\r", "\n", '"', "\t"), array('', "\\n", '\"', "\\t"), @file_get_contents($path));
-  }
-         /**
-          * get the list of folder under a specified folder
-          * which will be used for drop-down menu
-          * @param string $path the path of the specified folder
-          * @param array $outputs
-          * @param string $indexNumber
-          * @param string $prefixNumber the prefix before the index number
-          * @param string $prefixName the prefix before the folder name
-          * @return array
-          */
-         function getFolderListing($path,$indexNumber=null, $prefixNumber =' ', $prefixName =' - ',  $outputs=array())
-         {
-                   $path = removeTrailingSlash(backslashToSlash($path));
-                   if(is_null($indexNumber))
-                   {
-                   	$outputs[IMG_LBL_ROOT_FOLDER] = removeTrailingSlash(backslashToSlash($path));
-                   }
-                   $fh = @opendir($path);
-                   if($fh)
-                   {
+    }
+    /**
+     * get file content
+     *
+     * @param string $path
+     */
+    function getFileContent($path)
+    {
+        return @file_get_contents($path);
+        //return str_replace(array("\r", "\n", '"', "\t"), array('', "\\n", '\"', "\\t"), @file_get_contents($path));
+    }
+            /**
+             * get the list of folder under a specified folder
+             * which will be used for drop-down menu
+             * @param string $path the path of the specified folder
+             * @param array $outputs
+             * @param string $indexNumber
+             * @param string $prefixNumber the prefix before the index number
+             * @param string $prefixName the prefix before the folder name
+             * @return array
+             */
+            function getFolderListing($path,$indexNumber=null, $prefixNumber =' ', $prefixName =' - ',  $outputs=array())
+            {
+                    $path = removeTrailingSlash(backslashToSlash($path));
+                    if(is_null($indexNumber))
+                    {
+                        $outputs[IMG_LBL_ROOT_FOLDER] = removeTrailingSlash(backslashToSlash($path));
+                    }
+                    $fh = @opendir($path);
+                    if($fh)
+                    {
                             $count = 1;                          
                             while($file = @readdir($fh))
                             {
-                                     $newPath = removeTrailingSlash(backslashToSlash($path . "/" . $file));
-                                     if(isListingDocument($newPath) && $file != '.' && $file != '..' && is_dir($newPath))
-                                     {                                          
-                                               if(!empty($indexNumber))
-                                               {//this is not root folder
+                                        $newPath = removeTrailingSlash(backslashToSlash($path . "/" . $file));
+                                        if(isListingDocument($newPath) && $file != '.' && $file != '..' && is_dir($newPath))
+                                        {                                          
+                                                if(!empty($indexNumber))
+                                                {//this is not root folder
                                                					
                                                         $outputs[$prefixNumber . $indexNumber . "." . $count . $prefixName . $file] = $newPath;
                                                         getFolderListing($newPath,  $prefixNumber . $indexNumber . "." . $count , $prefixNumber, $prefixName, $outputs);                                                 
-                                               }else 
-                                               {//this is root folder
+                                                }else 
+                                                {//this is root folder
 
                                                         $outputs[$count . $prefixName . $file] = $newPath;
                                                         getFolderListing($newPath, $count, $prefixNumber, $prefixName, $outputs);
-                                               }
-                                               $count++;
-                                     }                                    
+                                                }
+                                                $count++;
+                                        }                                    
                             }
                             @closedir($fh);
-                   }
-                   return $outputs;
-         }
+                    }
+                    return $outputs;
+            }
 
          
-         /**
-          * get the valid text editor extension 
-          * which is calcualte from the CONFIG_EDITABALE_VALID_EXTS 
-          * exclude those specified in CONFIG_UPLOAD_INVALID_EXTS
-          * and those are not specified in CONFIG_UPLOAD_VALID_EXTS
-          *
-          * @return array
-          */
-         function getValidTextEditorExts()
-         {
-         	$validEditorExts = explode(',', CONFIG_EDITABLE_VALID_EXTS);
-         	if(CONFIG_UPLOAD_VALID_EXTS)
-         	{//exclude those exts not shown on CONFIG_UPLOAD_VALID_EXTS
-         		$validUploadExts = explode(',', CONFIG_UPLOAD_VALID_EXTS);
-         		foreach($validEditorExts as $k=>$v)
-         		{
-         			if(array_search($v, $validUploadExts) === false)
-         			{
-         				unset($validEditorExts[$k]);
-         			}
-         		}        		
-         	}
-         	if(CONFIG_UPLOAD_INVALID_EXTS)
-         	{//exlcude those exists in CONFIG_UPLOAD_INVALID_EXTS
-         		$invalidUploadExts = explode(',', CONFIG_UPLOAD_INVALID_EXTS);
-         		foreach($validEditorExts as $k=>$v)
-         		{
-         			if(array_search($v, $invalidUploadExts) !== false)
-         			{
-         				unset($validEditorExts[$k]);
-         			}
-         		}
-         	}
-         	return $validEditorExts;        	
+            /**
+             * get the valid text editor extension 
+             * which is calcualte from the CONFIG_EDITABALE_VALID_EXTS 
+             * exclude those specified in CONFIG_UPLOAD_INVALID_EXTS
+             * and those are not specified in CONFIG_UPLOAD_VALID_EXTS
+             *
+             * @return array
+             */
+            function getValidTextEditorExts()
+            {
+                $validEditorExts = explode(',', CONFIG_EDITABLE_VALID_EXTS);
+                if(CONFIG_UPLOAD_VALID_EXTS)
+                {//exclude those exts not shown on CONFIG_UPLOAD_VALID_EXTS
+                    $validUploadExts = explode(',', CONFIG_UPLOAD_VALID_EXTS);
+                    foreach($validEditorExts as $k=>$v)
+                    {
+                        if(array_search($v, $validUploadExts) === false)
+                        {
+                            unset($validEditorExts[$k]);
+                        }
+                    }        		
+                }
+                if(CONFIG_UPLOAD_INVALID_EXTS)
+                {//exlcude those exists in CONFIG_UPLOAD_INVALID_EXTS
+                    $invalidUploadExts = explode(',', CONFIG_UPLOAD_INVALID_EXTS);
+                    foreach($validEditorExts as $k=>$v)
+                    {
+                        if(array_search($v, $invalidUploadExts) !== false)
+                        {
+                            unset($validEditorExts[$k]);
+                        }
+                    }
+                }
+                return $validEditorExts;        	
          	
-         }
+            }
     /**
      * check if file name or folder name is valid against a regular expression 
      *
@@ -850,294 +850,294 @@ 
         }  
    			
 
-		/**
-		 * cut the file down to fit the list page
-		 *
-		 * @param string $fileName
-		 */
-		function shortenFileName($fileName, $maxLeng=17, $indicate = '...')
-		{
-			if(strlen($fileName) > $maxLeng)
-			{
-				$fileName = substr($fileName, 0, $maxLeng - strlen($indicate)) . $indicate;
-			}
-			return $fileName;
+        /**
+         * cut the file down to fit the list page
+         *
+         * @param string $fileName
+         */
+        function shortenFileName($fileName, $maxLeng=17, $indicate = '...')
+        {
+            if(strlen($fileName) > $maxLeng)
+            {
+                $fileName = substr($fileName, 0, $maxLeng - strlen($indicate)) . $indicate;
+            }
+            return $fileName;
 			
-		}
-		if (!function_exists('mime_content_type')) 
-		{
-		   function mime_content_type ( $f )
-		   {
-		       return trim ( @exec ('file -bi ' . escapeshellarg ( $f ) ) ) ;
-		   }
-		}		
+        }
+        if (!function_exists('mime_content_type')) 
+        {
+            function mime_content_type ( $f )
+            {
+                return trim ( @exec ('file -bi ' . escapeshellarg ( $f ) ) ) ;
+            }
+        }		
 		
-         /**
-          * check if such document is allowed to shown on the list
-          *
-          * @param string $path the path to the document
-          * @return boolean
-          */
-         function isListingDocument($path)
-         {
-         	$file = basename($path);
-         	if(CONFIG_SYS_PATTERN_FORMAT == 'list')
-         	{// comma delimited vague file/folder name
+            /**
+             * check if such document is allowed to shown on the list
+             *
+             * @param string $path the path to the document
+             * @return boolean
+             */
+            function isListingDocument($path)
+            {
+                $file = basename($path);
+                if(CONFIG_SYS_PATTERN_FORMAT == 'list')
+                {// comma delimited vague file/folder name
 
 
 
 			    		
-      			if(is_dir($path))
-      			{
- 				$includeDir = trimlrm(CONFIG_SYS_INC_DIR_PATTERN);
-				$excludeDir = trimlrm(CONFIG_SYS_EXC_DIR_PATTERN);     				
-				$found_includeDir = strpos($includeDir, $file);
-				$found_excludeDir = strpos($excludeDir, $file);      				
-      				if((!CONFIG_SYS_INC_DIR_PATTERN || (!($found_includeDir === FALSE))) && (!CONFIG_SYS_EXC_DIR_PATTERN || (($found_excludeDir === FALSE))))
-      				{
-      					return true;
-      				}else 
-      				{
-      					return false;
-      				}
-      			}elseif(is_file($path))
-      			{
-				$includeFile = trimlrm(CONFIG_SYS_INC_FILE_PATTERN);
-				$excludeFile = trimlrm(CONFIG_SYS_EXC_FILE_PATTERN);            				
-				$found_includeFile = strpos($includeFile, $file);
-				$found_excludeFile = strpos($excludeFile, $file);	      				
-      				if((!CONFIG_SYS_INC_FILE_PATTERN || (!($found_includeFile === FALSE))) && (!CONFIG_SYS_EXC_FILE_PATTERN ||   (($found_excludeFile === FALSE))))
-      				{
-      					return true;
-      				}else 
-      				{
-      					return false;
-      				}
-      			}
-         	}elseif(CONFIG_SYS_PATTERN_FORMAT == 'csv')
-         	{//comma delimited file/folder name
+                    if(is_dir($path))
+                    {
+                    $includeDir = trimlrm(CONFIG_SYS_INC_DIR_PATTERN);
+                $excludeDir = trimlrm(CONFIG_SYS_EXC_DIR_PATTERN);     				
+                $found_includeDir = strpos($includeDir, $file);
+                $found_excludeDir = strpos($excludeDir, $file);      				
+                        if((!CONFIG_SYS_INC_DIR_PATTERN || (!($found_includeDir === FALSE))) && (!CONFIG_SYS_EXC_DIR_PATTERN || (($found_excludeDir === FALSE))))
+                        {
+                            return true;
+                        }else 
+                        {
+                            return false;
+                        }
+                    }elseif(is_file($path))
+                    {
+                $includeFile = trimlrm(CONFIG_SYS_INC_FILE_PATTERN);
+                $excludeFile = trimlrm(CONFIG_SYS_EXC_FILE_PATTERN);            				
+                $found_includeFile = strpos($includeFile, $file);
+                $found_excludeFile = strpos($excludeFile, $file);	      				
+                        if((!CONFIG_SYS_INC_FILE_PATTERN || (!($found_includeFile === FALSE))) && (!CONFIG_SYS_EXC_FILE_PATTERN ||   (($found_excludeFile === FALSE))))
+                        {
+                            return true;
+                        }else 
+                        {
+                            return false;
+                        }
+                    }
+                }elseif(CONFIG_SYS_PATTERN_FORMAT == 'csv')
+                {//comma delimited file/folder name
          		
-         		if(is_dir($path))
-         		{
+                    if(is_dir($path))
+                    {
          		
-	 				$includeDir = trimlrm(CONFIG_SYS_INC_DIR_PATTERN);
-					$excludeDir = trimlrm(CONFIG_SYS_EXC_DIR_PATTERN);
+                        $includeDir = trimlrm(CONFIG_SYS_INC_DIR_PATTERN);
+                    $excludeDir = trimlrm(CONFIG_SYS_EXC_DIR_PATTERN);
 					        
-					if(!empty($includeDir) && !empty($excludeDir))
-					{
+                    if(!empty($includeDir) && !empty($excludeDir))
+                    {
 						
-						$validDir = explode(',', $includeDir);
+                        $validDir = explode(',', $includeDir);
 						
-						$invalidDir = explode(",", $excludeDir);
+                        $invalidDir = explode(",", $excludeDir);
 
-						if(array_search(basename($path), $validDir) !== false && array_search(basename($path), $invalidDir) === false)
-						{
-							return true;
-						}else 
-						{
-							return false;
-						}
-					}elseif(!empty($includeDir))
-					{
-						$validDir = explode(',', $includeDir);
-						if(array_search(basename($path), $validDir) !== false)
-						{
-							return true;
-						}else 
-						{
-							return false;
-						}
+                        if(array_search(basename($path), $validDir) !== false && array_search(basename($path), $invalidDir) === false)
+                        {
+                            return true;
+                        }else 
+                        {
+                            return false;
+                        }
+                    }elseif(!empty($includeDir))
+                    {
+                        $validDir = explode(',', $includeDir);
+                        if(array_search(basename($path), $validDir) !== false)
+                        {
+                            return true;
+                        }else 
+                        {
+                            return false;
+                        }
 						
-					}elseif(!empty($excludeFile))
-					{
-						$invalidDir = explode(",", $excludeDir);
-						if(array_search(basename($path), $invalidDir) === false)
-						{
-							return true;
-						}else 
-						{
-							return false;
-						}
-					}
-					return true;
+                    }elseif(!empty($excludeFile))
+                    {
+                        $invalidDir = explode(",", $excludeDir);
+                        if(array_search(basename($path), $invalidDir) === false)
+                        {
+                            return true;
+                        }else 
+                        {
+                            return false;
+                        }
+                    }
+                    return true;
 					
-         		}elseif(is_file($path))
-         		{
-				$includeFile = trimlrm(CONFIG_SYS_INC_FILE_PATTERN);
-				$excludeFile = trimlrm(CONFIG_SYS_EXC_FILE_PATTERN);   
-				if(!empty($includeFile) && !empty($excludeFile))
-				{
-					$validFile = explode(',', $includeFile);
-					$invalidFile = explode(',', $excludeFile);
-					if(array_search(basename($path), $validFile) !== false && array_search(basename($path), $invalidFile) === false)
-					{
-						return true;
-					}else 
-					{
-						return false;
-					}
-				}elseif(!empty($includeFile))
-				{
-					$validFile = explode(',', $includeFile);
-					if(array_search(basename($path), $validFile) !== false)
-					{
-						return true;
-					}else 
-					{
-						return false;
-					}
-				}elseif(!empty($excludeFile))
-				{
-					$invalidFile = explode(',', $excludeFile);
-					if(array_search(basename($path), $invalidFile) === false)
-					{
-						return true;
-					}else 
-					{
-						return false;
-					}
-				}
-				return true;
-         		}
-         	}
-         	else 
-         	{//regular expression
-	          	if(is_dir($path) )
-	         	{
-	         		if(isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, $path) && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, $path))
-	         		{
-	         			 return true;	
-	         		}else 
-	         		{
-	         			return false;
-	         		}
+                    }elseif(is_file($path))
+                    {
+                $includeFile = trimlrm(CONFIG_SYS_INC_FILE_PATTERN);
+                $excludeFile = trimlrm(CONFIG_SYS_EXC_FILE_PATTERN);   
+                if(!empty($includeFile) && !empty($excludeFile))
+                {
+                    $validFile = explode(',', $includeFile);
+                    $invalidFile = explode(',', $excludeFile);
+                    if(array_search(basename($path), $validFile) !== false && array_search(basename($path), $invalidFile) === false)
+                    {
+                        return true;
+                    }else 
+                    {
+                        return false;
+                    }
+                }elseif(!empty($includeFile))
+                {
+                    $validFile = explode(',', $includeFile);
+                    if(array_search(basename($path), $validFile) !== false)
+                    {
+                        return true;
+                    }else 
+                    {
+                        return false;
+                    }
+                }elseif(!empty($excludeFile))
+                {
+                    $invalidFile = explode(',', $excludeFile);
+                    if(array_search(basename($path), $invalidFile) === false)
+                    {
+                        return true;
+                    }else 
+                    {
+                        return false;
+                    }
+                }
+                return true;
+                    }
+                }
+                else 
+                {//regular expression
+                    if(is_dir($path) )
+                    {
+                        if(isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, $path) && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, $path))
+                        {
+                            return true;	
+                        }else 
+                        {
+                            return false;
+                        }
 	         	
-	         	}elseif(is_file($path))
-	         	{
-	         		if(isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, $path) && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, $path)  )
-	         		{
-	         			return true;
-	         		}else 
-	         		{
-	         			return false;
-	         		}
-	         	}
-         	}
-         	return false;
+                    }elseif(is_file($path))
+                    {
+                        if(isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, $path) && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, $path)  )
+                        {
+                            return true;
+                        }else 
+                        {
+                            return false;
+                        }
+                    }
+                }
+                return false;
 
-         }		
+            }		
 		
-		/**
-		 * force to down the specified file
-		 *
-		 * @param string $path
-		 * 
-		 */
-		function downloadFile($path, $newFileName=null)
-		{
-				if(file_exists($path) && is_file($path))
-				{	
-					$mimeContentType = 'application/octet-stream';
-					if(function_exists('finfo_open'))
-					{
-						if(($fp = @finfo_open($path)))
-						{
-							$mimeContentType = @finfo_file($fp, basename($path));
-							@finfo_close($fp);
-						}
+        /**
+         * force to down the specified file
+         *
+         * @param string $path
+         * 
+         */
+        function downloadFile($path, $newFileName=null)
+        {
+                if(file_exists($path) && is_file($path))
+                {	
+                    $mimeContentType = 'application/octet-stream';
+                    if(function_exists('finfo_open'))
+                    {
+                        if(($fp = @finfo_open($path)))
+                        {
+                            $mimeContentType = @finfo_file($fp, basename($path));
+                            @finfo_close($fp);
+                        }
 						
-					}elseif(($temMimeContentType = @mime_content_type($path)) && !empty($temMimeContentType))
-					{
-						$mimeContentType = $temMimeContentType;
-					}
+                    }elseif(($temMimeContentType = @mime_content_type($path)) && !empty($temMimeContentType))
+                    {
+                        $mimeContentType = $temMimeContentType;
+                    }
 					
  					
 					
 						
 
-			// START ANDR� SILVA DOWNLOAD CODE
-			// required for IE, otherwise Content-disposition is ignored
-			if(ini_get('zlib.output_compression'))
-			  ini_set('zlib.output_compression', 'Off');
-			header("Pragma: public"); // required
-			header("Expires: 0");
-			header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-			header("Cache-Control: private",false); // required for certain browsers 
-			header("Content-Type: " . $mimeContentType );
-			// change, added quotes to allow spaces in filenames, by Rajkumar Singh
-			header("Content-Disposition: attachment; filename=\"".(is_null($newFileName)?basename($path):$newFileName)."\";" );
-			header("Content-Transfer-Encoding: binary");
-			header("Content-Length: ".filesize($path));
+            // START ANDR� SILVA DOWNLOAD CODE
+            // required for IE, otherwise Content-disposition is ignored
+            if(ini_get('zlib.output_compression'))
+                ini_set('zlib.output_compression', 'Off');
+            header("Pragma: public"); // required
+            header("Expires: 0");
+            header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+            header("Cache-Control: private",false); // required for certain browsers 
+            header("Content-Type: " . $mimeContentType );
+            // change, added quotes to allow spaces in filenames, by Rajkumar Singh
+            header("Content-Disposition: attachment; filename=\"".(is_null($newFileName)?basename($path):$newFileName)."\";" );
+            header("Content-Transfer-Encoding: binary");
+            header("Content-Length: ".filesize($path));
 		
-			readfile($path);
-			exit();
-			// END ANDR� SILVA DOWNLOAD CODE												
-				}
+            readfile($path);
+            exit();
+            // END ANDR� SILVA DOWNLOAD CODE												
+                }
 		
-		}
+        }
 
-  /**
-   * remove all white spaces
-   *
-   * @param string $hayStack 
-   * @param string $whiteSpaceChars
-   * @return string
-   */
-  function trimlrm ($hayStack, $whiteSpaceChars="\t\n\r\0\x0B")
-  {
-  	return str_replace($whiteSpaceChars, '', trim($hayStack));
-  }		
+    /**
+     * remove all white spaces
+     *
+     * @param string $hayStack 
+     * @param string $whiteSpaceChars
+     * @return string
+     */
+    function trimlrm ($hayStack, $whiteSpaceChars="\t\n\r\0\x0B")
+    {
+        return str_replace($whiteSpaceChars, '', trim($hayStack));
+    }		
   
-  /**
-   * get the parent path of the specified path
-   *
-   * @param string $path
-   * @return string 
-   */
-  function getParentFolderPath($path)
-  {
-  	$realPath = addTrailingSlash(backslashToSlash(getRealPath($path)));
-  	$parentRealPath =  addTrailingSlash(backslashToSlash(dirname($realPath)));
-  	$differentPath = addTrailingSlash(substr($realPath, strlen($parentRealPath)));
-  	$parentPath = substr($path, 0, strlen(addTrailingSlash(backslashToSlash($path))) - strlen($differentPath));
-  	if(isUnderRoot($parentPath))
-  	{
-  		return $parentPath;
-  	}else 
-  	{
-  		return CONFIG_SYS_DEFAULT_PATH;
-  	}
-  }
+    /**
+     * get the parent path of the specified path
+     *
+     * @param string $path
+     * @return string 
+     */
+    function getParentFolderPath($path)
+    {
+        $realPath = addTrailingSlash(backslashToSlash(getRealPath($path)));
+        $parentRealPath =  addTrailingSlash(backslashToSlash(dirname($realPath)));
+        $differentPath = addTrailingSlash(substr($realPath, strlen($parentRealPath)));
+        $parentPath = substr($path, 0, strlen(addTrailingSlash(backslashToSlash($path))) - strlen($differentPath));
+        if(isUnderRoot($parentPath))
+        {
+            return $parentPath;
+        }else 
+        {
+            return CONFIG_SYS_DEFAULT_PATH;
+        }
+    }
   
-  function getCurrentFolderPath()
-  {
-  		$folderPathIndex = 'path';
-  		$lastVisitedFolderPathIndex = 'ajax_last_visited_folder';
-		if(isset($_GET[$folderPathIndex]) && file_exists($_GET[$folderPathIndex]) && !is_file($_GET[$folderPathIndex]) )
-		{
-			$currentFolderPath = $_GET[$folderPathIndex];
-		}
-		elseif(isset($_SESSION[$lastVisitedFolderPathIndex]) && file_exists($_SESSION[$lastVisitedFolderPathIndex]) && !is_file($_SESSION[$lastVisitedFolderPathIndex]))
-		{
-			$currentFolderPath = $_SESSION[$lastVisitedFolderPathIndex];
-		}else
-		{
-			$currentFolderPath = CONFIG_SYS_DEFAULT_PATH;
-		}
+    function getCurrentFolderPath()
+    {
+            $folderPathIndex = 'path';
+            $lastVisitedFolderPathIndex = 'ajax_last_visited_folder';
+        if(isset($_GET[$folderPathIndex]) && file_exists($_GET[$folderPathIndex]) && !is_file($_GET[$folderPathIndex]) )
+        {
+            $currentFolderPath = $_GET[$folderPathIndex];
+        }
+        elseif(isset($_SESSION[$lastVisitedFolderPathIndex]) && file_exists($_SESSION[$lastVisitedFolderPathIndex]) && !is_file($_SESSION[$lastVisitedFolderPathIndex]))
+        {
+            $currentFolderPath = $_SESSION[$lastVisitedFolderPathIndex];
+        }else
+        {
+            $currentFolderPath = CONFIG_SYS_DEFAULT_PATH;
+        }
 		
-		$currentFolderPath = (isUnderRoot($currentFolderPath)?backslashToSlash((addTrailingSlash($currentFolderPath))):CONFIG_SYS_DEFAULT_PATH);
+        $currentFolderPath = (isUnderRoot($currentFolderPath)?backslashToSlash((addTrailingSlash($currentFolderPath))):CONFIG_SYS_DEFAULT_PATH);
 		
-		//keep track of this folder path in session 
-		$_SESSION[$lastVisitedFolderPathIndex] = $currentFolderPath;
+        //keep track of this folder path in session 
+        $_SESSION[$lastVisitedFolderPathIndex] = $currentFolderPath;
 		
 
-		if(!file_exists($currentFolderPath))
-		{
-			die(ERR_FOLDER_NOT_FOUND . $currentFolderPath);
-		}  	
-  }
+        if(!file_exists($currentFolderPath))
+        {
+            die(ERR_FOLDER_NOT_FOUND . $currentFolderPath);
+        }  	
+    }
   
-       if(!function_exists("imagerotate"))
+        if(!function_exists("imagerotate"))
         {
             function imagerotate($src_img, $angle, $bicubic=false)
             {
@@ -1160,7 +1160,7 @@ 
     $sinangle = sin($angle);
    
     for ($y = 0; $y < $src_y; $y++) {
-      for ($x = 0; $x < $src_x; $x++) {
+        for ($x = 0; $x < $src_x; $x++) {
     // rotate...
     $old_x = (($center_x-$x) * $cosangle + ($center_y-$y) * $sinangle)
       + $center_x;
@@ -1169,7 +1169,7 @@ 
    
     if ( $old_x >= 0 && $old_x < $src_x
          && $old_y >= 0 && $old_y < $src_y ) {
-      if ($bicubic == true) {
+        if ($bicubic == true) {
         $sY  = $old_y + 1;
         $siY  = $old_y;
         $siY2 = $old_y - 1;
@@ -1187,15 +1187,15 @@ 
         $b = ($c1['blue']  + $c2['blue']  + $c3['blue']  + $c4['blue'] ) >> 2;
         $a = ($c1['alpha']  + $c2['alpha']  + $c3['alpha']  + $c4['alpha'] ) >> 2;
         $color = imagecolorallocatealpha($src_img, $r,$g,$b,$a);
-      } else {
+        } else {
         $color = imagecolorat($src_img, $old_x, $old_y);
-      }
+        }
     } else {
-          // this line sets the background colour
-      $color = imagecolorallocatealpha($src_img, 255, 255, 255, 127);
+            // this line sets the background colour
+        $color = imagecolorallocatealpha($src_img, 255, 255, 255, 127);
     }
     imagesetpixel($rotate, $x, $y, $color);
-      }
+        }
     }
     return $rotate;          	
 /*                $src_x = @imagesx($src_img);

Spacing +202 added lines, -202 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
@@ -11,15 +11,15 @@ 
 	 * @since 22/April/2007
 	 *
 	 */
-require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "config.php");
+require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."config.php");
 /**
  * force to ensure existence of stripos
  */
 if (!function_exists("stripos")) 
 {
-  function stripos($str,$needle,$offset=0)
+  function stripos($str, $needle, $offset = 0)
   {
-      return @strpos(strtolower($str),strtolower($needle),$offset);
+      return @strpos(strtolower($str), strtolower($needle), $offset);
   }
 }
 	/**
@@ -28,21 +28,21 @@ 
 	 * @param array $excls specify those unwanted query string
 	 * @return string
 	 */
-	function getCurrentUrl($excls=array())
+	function getCurrentUrl($excls = array())
 	{
 		$output = $_SERVER['PHP_SELF'];
 		$count = 1;
-		foreach($_GET as $k=>$v)
+		foreach ($_GET as $k=>$v)
 		{
-			if(array_search($k, $excls) ===false)
+			if (array_search($k, $excls) === false)
 			{
 				$strAppend = "&";
-				if($count == 1)
+				if ($count == 1)
 				{
 					$strAppend = "?";
 					$count++;
 				}
-				$output .= $strAppend . urlencode($k) . "=" . urlencode($v);
+				$output .= $strAppend.urlencode($k)."=".urlencode($v);
 			}
 		}
 		return $output;
@@ -53,7 +53,7 @@ 
  *
  * @param array $array
  */
-function displayArray($array, $comments='')
+function displayArray($array, $comments = '')
 {
 	echo "<pre>";
 	echo $comments;
@@ -72,50 +72,50 @@ 
 	 * @param array $invalidExts
 	 * @return boolean
 	 */
-	function isValidExt($filePath, $validExts, $invalidExts=array())
+	function isValidExt($filePath, $validExts, $invalidExts = array())
 	{
 		$tem = array();
 
-		if(sizeof($validExts))
+		if (sizeof($validExts))
 		{
-			foreach($validExts as $k=>$v)
+			foreach ($validExts as $k=>$v)
 			{
 				$tem[$k] = strtolower(trim($v));
 			}
 		}
 		$validExts = $tem;
 		$tem = array();
-		if(sizeof($invalidExts))
+		if (sizeof($invalidExts))
 		{
-			foreach($invalidExts as $k=>$v)
+			foreach ($invalidExts as $k=>$v)
 			{
 				$tem[$k] = strtolower(trim($v));
 			}
 		}
 		$invalidExts = $tem;
-		if(sizeof($validExts) && sizeof($invalidExts))
+		if (sizeof($validExts) && sizeof($invalidExts))
 		{
-			foreach($validExts as  $k=>$ext)
+			foreach ($validExts as  $k=>$ext)
 			{
-				if(array_search($ext, $invalidExts) !== false)
+				if (array_search($ext, $invalidExts) !== false)
 				{
 					unset($validExts[$k]);
 				}
 			}
 		}
-		if(sizeof($validExts))
+		if (sizeof($validExts))
 		{
-			if(array_search(strtolower(getFileExt($filePath)), $validExts) !== false)
+			if (array_search(strtolower(getFileExt($filePath)), $validExts) !== false)
 			{
 				return true;
-			}else 
+			} else 
 			{
 				return false;
 			}
-		}elseif(array_search(strtolower(getFileExt($filePath)), $invalidExts) === false)
+		}elseif (array_search(strtolower(getFileExt($filePath)), $invalidExts) === false)
 		{
 			return true;
-		}else 
+		} else 
 		{
 			return false;
 		}
@@ -132,7 +132,7 @@ 
  */
 function relToAbs($value) 
 {
-	return backslashToSlash(preg_replace("/(\\\\)/","\\", getRealPath($value)));
+	return backslashToSlash(preg_replace("/(\\\\)/", "\\", getRealPath($value)));
 
 }
 
@@ -146,7 +146,7 @@ 
 		$pos = strpos($value, $wwwroot);
 		if ($pos !== false && $pos == 0)
 		{
-			$output  = $urlprefix . substr($value, strlen($wwwroot)) . $urlsuffix;
+			$output = $urlprefix.substr($value, strlen($wwwroot)).$urlsuffix;
 		}
 	}
 /**
@@ -176,9 +176,9 @@ 
  * @return string
  */
 function removeTrailingSlash($value) {
-	if(preg_match('@^.+/$@i', $value))
+	if (preg_match('@^.+/$@i', $value))
 	{
-		$value = substr($value, 0, strlen($value)-1);
+		$value = substr($value, 0, strlen($value) - 1);
 	}
 	return $value;
 }
@@ -191,7 +191,7 @@ 
  */
 function addTrailingSlash($value) 
 {
-	if(preg_match('@^.*[^/]{1}$@i', $value))
+	if (preg_match('@^.*[^/]{1}$@i', $value))
 	{
 		$value .= '/';
 	}
@@ -207,9 +207,9 @@ 
 function transformFilePath($value) {
 	$rootPath = addTrailingSlash(backslashToSlash(getRealPath(CONFIG_SYS_ROOT_PATH)));
 	$value = addTrailingSlash(backslashToSlash(getRealPath($value)));
-	if(!empty($rootPath) && ($i = strpos($value, $rootPath)) !== false)
+	if (!empty($rootPath) && ($i = strpos($value, $rootPath)) !== false)
 	{
-		$value = ($i == 0?substr($value, strlen($rootPath)):"/");		
+		$value = ($i == 0 ? substr($value, strlen($rootPath)) : "/");		
 	}
 	$value = prependSlash($value);
 	return $value;
@@ -222,9 +222,9 @@ 
  */
 function prependSlash($value)
 {
-		if (($value && $value[0] != '/') || !$value )
+		if (($value && $value[0] != '/') || !$value)
 		{
-			$value = "/" . $value;
+			$value = "/".$value;
 		}			
 		return $value;	
 }
@@ -252,7 +252,7 @@ 
  */
 function addNoCacheHeaders() {
 	header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-	header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+	header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 	header("Cache-Control: no-store, no-cache, must-revalidate");
 	header("Cache-Control: post-check=0, pre-check=0", false);
 	header("Pragma: no-cache");
@@ -265,14 +265,14 @@ 
 	function appendQueryString($baseUrl, $extra)
 	{
 		$output = $baseUrl;
-		if(!empty($extra))
+		if (!empty($extra))
 		{
-			if(strpos($baseUrl, "?") !== false)
+			if (strpos($baseUrl, "?") !== false)
 			{
-				$output .= "&" . $extra;
-			}else
+				$output .= "&".$extra;
+			} else
 			{
-				$output .= "?" . $extra;
+				$output .= "?".$extra;
 			}			
 		}
 
@@ -284,15 +284,15 @@ 
 	 * @param array $excluded
 	 * @return string
 	 */
-	function makeQueryString($excluded=array())
+	function makeQueryString($excluded = array())
 	{
 		$output = '';
 		$count = 1;
-		foreach($_GET as $k=>$v)
+		foreach ($_GET as $k=>$v)
 		{
-			if(array_search($k, $excluded) === false)
+			if (array_search($k, $excluded) === false)
 			{
-				$output .= ($count>1?'&':'') . (urlencode($k) . "=" . urlencode($v));
+				$output .= ($count > 1 ? '&' : '').(urlencode($k)."=".urlencode($v));
 				$count++;
 			}
 		}
@@ -307,7 +307,7 @@ 
 	function getParentPath($value)
 	{
 		$value = removeTrailingSlash(backslashToSlash($value));
-		if(false !== ($index = strrpos($value, "/")) )
+		if (false !== ($index = strrpos($value, "/")))
 		{
 			return substr($value, 0, $index);
 		}
@@ -324,7 +324,7 @@ 
 	function isUnderRoot($value)
 	{
 		$roorPath = strtolower(addTrailingSlash(backslashToSlash(getRealPath(CONFIG_SYS_ROOT_PATH))));
-		if(file_exists($value) && @strpos(strtolower(addTrailingSlash(backslashToSlash(getRealPath($value)))), $roorPath) === 0 )
+		if (file_exists($value) && @strpos(strtolower(addTrailingSlash(backslashToSlash(getRealPath($value)))), $roorPath) === 0)
 		{
 			return true;
 		}
@@ -340,7 +340,7 @@ 
 	{
 		global $session;
 		$sessionPath = strtolower(addTrailingSlash(backslashToSlash(getRealPath($session->getSessionDir()))));
-		if(file_exists($value) && @strpos(strtolower(addTrailingSlash(backslashToSlash(getRealPath($value)))), $sessionPath) === 0 )
+		if (file_exists($value) && @strpos(strtolower(addTrailingSlash(backslashToSlash(getRealPath($value)))), $sessionPath) === 0)
 		{
 			return true;
 		}
@@ -357,26 +357,26 @@ 
 	 * @param integer $thumbnailHeight
 	 * @return array()
 	 */
-	function getThumbWidthHeight( $originaleImageWidth, $originalImageHeight, $thumbnailWidth, $thumbnailHeight)
+	function getThumbWidthHeight($originaleImageWidth, $originalImageHeight, $thumbnailWidth, $thumbnailHeight)
 	{
-		$outputs = array( "width"=>0, "height"=>0);
-		$thumbnailWidth	= intval($thumbnailWidth);
+		$outputs = array("width"=>0, "height"=>0);
+		$thumbnailWidth = intval($thumbnailWidth);
 		$thumbnailHeight = intval($thumbnailHeight);
-		if(!empty($originaleImageWidth) && !empty($originalImageHeight))
+		if (!empty($originaleImageWidth) && !empty($originalImageHeight))
 		{
 			//start to get the thumbnail width & height
-        	if(($thumbnailWidth < 1 && $thumbnailHeight < 1) || ($thumbnailWidth > $originaleImageWidth && $thumbnailHeight > $originalImageHeight ))
+        	if (($thumbnailWidth < 1 && $thumbnailHeight < 1) || ($thumbnailWidth > $originaleImageWidth && $thumbnailHeight > $originalImageHeight))
         	{
-        		$thumbnailWidth =$originaleImageWidth;
+        		$thumbnailWidth = $originaleImageWidth;
         		$thumbnailHeight = $originalImageHeight;
-        	}elseif($thumbnailWidth < 1)
+        	}elseif ($thumbnailWidth < 1)
         	{
-        		$thumbnailWidth = floor($thumbnailHeight / $originalImageHeight * $originaleImageWidth);
+        		$thumbnailWidth = floor($thumbnailHeight/$originalImageHeight*$originaleImageWidth);
 
-        	}elseif($thumbnailHeight < 1)
+        	}elseif ($thumbnailHeight < 1)
         	{
-        		$thumbnailHeight = floor($thumbnailWidth / $originaleImageWidth * $originalImageHeight);
-        	}else
+        		$thumbnailHeight = floor($thumbnailWidth/$originaleImageWidth*$originalImageHeight);
+        	} else
         	{
         		$scale = min($thumbnailWidth/$originaleImageWidth, $thumbnailHeight/$originalImageHeight);
 				$thumbnailWidth = floor($scale*$originaleImageWidth);
@@ -396,9 +396,9 @@ 
  */
 function getAbsPath($value) {
 	if (substr($value, 0, 1) == "/")
-		return slashToBackslash(DIR_AJAX_ROOT . $value);
+		return slashToBackslash(DIR_AJAX_ROOT.$value);
 
-	return slashToBackslash(dirname(__FILE__) . "/" . $value);
+	return slashToBackslash(dirname(__FILE__)."/".$value);
 }
 
 	/**
@@ -411,10 +411,10 @@ 
 	{
 		$value = removeTrailingSlash(backslashToSlash($value));
 
-		if(false !== ($index = strrpos($value, "/")) )
+		if (false !== ($index = strrpos($value, "/")))
 		{
 			return substr($value, $index + 1);
-		}else
+		} else
 		{
 			return $value;
 		}
@@ -422,30 +422,30 @@ 
 
 function myRealPath($path) {
 
-		if(strpos($path, ':/') !== false)
+		if (strpos($path, ':/') !== false)
 		{
 			return $path;
 		}
     // check if path begins with "/" ie. is absolute
     // if it isnt concat with script path
     
-    if (strpos($path,"/") !== 0 ) {
-        $base=dirname($_SERVER['SCRIPT_FILENAME']);
-        $path=$base."/".$path;
+    if (strpos($path, "/") !== 0) {
+        $base = dirname($_SERVER['SCRIPT_FILENAME']);
+        $path = $base."/".$path;
     }
  
     // canonicalize
-    $path=explode('/', $path);
-    $newpath=array();
-    for ($i=0; $i<sizeof($path); $i++) {
-        if ($path[$i]==='' || $path[$i]==='.') continue;
-           if ($path[$i]==='..') {
+    $path = explode('/', $path);
+    $newpath = array();
+    for ($i = 0; $i < sizeof($path); $i++) {
+        if ($path[$i] === '' || $path[$i] === '.') continue;
+           if ($path[$i] === '..') {
               array_pop($newpath);
               continue;
         }
         array_push($newpath, $path[$i]);
     }
-    $finalpath="/".implode('/', $newpath);
+    $finalpath = "/".implode('/', $newpath);
 
     clearstatcache();
     // check then return valid path or filename
@@ -463,10 +463,10 @@ 
  function getRealPath($value)
  {
  		$output = '';
- 	 if(($path = realpath($value)) && $path != $value)
+ 	 if (($path = realpath($value)) && $path != $value)
  	 {
  	 	$output = $path;
- 	 }else 
+ 	 } else 
  	 {
  	 	$output = myRealPath($value);
  	 }
@@ -489,14 +489,14 @@ 
 		$value = backslashToSlash(getRealPath($value));
 
 		$pos = stripos($value, $wwwroot);
-		if ($pos !== false )
+		if ($pos !== false)
 		{
-			$output  = $urlprefix . substr($value, $pos + strlen($wwwroot)) . $urlsuffix;
-		}else 
+			$output = $urlprefix.substr($value, $pos + strlen($wwwroot)).$urlsuffix;
+		} else 
 		{
 			$output = $value;
 		}
-		$protocol = (isset($_SERVER["HTTPS"]) &&  $_SERVER["HTTPS"] == 'on' ? 'https' : 'http');
+		$protocol = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on' ? 'https' : 'http');
 
         // Pick up URL up to /admin and exclude /admin  . This is the phpMyFAQ directory
         $pmfBase = strrev(
@@ -506,7 +506,7 @@ 
                 stristr(strrev(backslashToSlash($_SERVER['HTTP_REFERER'])), 'nimda/')
             )
         );
-        if ($pmfBase == $_SERVER['HTTP_HOST'])    {
+        if ($pmfBase == $_SERVER['HTTP_HOST']) {
             // phpMyFAQ is not in a subdirectory of a domain
             $pmfRest = str_replace($_SERVER['DOCUMENT_ROOT'], '', stristr($output, $_SERVER['DOCUMENT_ROOT']));
         } else {
@@ -521,7 +521,7 @@ 
             );
         }
 
-        return $pmfBase . $pmfRest ;
+        return $pmfBase.$pmfRest;
 
 	}
 	
@@ -535,16 +535,16 @@ 
 
 	if ($size > 1048576)
 	{
-		return round($size / 1048576, 1) . " MB";
+		return round($size/1048576, 1)." MB";
 	}elseif ($size > 1024)
 	{
-		return round($size / 1024, 1) . " KB";
-	}elseif($size == '')
+		return round($size/1024, 1)." KB";
+	}elseif ($size == '')
 	{
 		return $size;
-	}else
+	} else
 	{
-		return $size . " b";
+		return $size." b";
 	}	
 }
 	
@@ -557,7 +557,7 @@ 
 	function removeBeginingSlash($value)
 	{
 		$value = backslashToSlash($value);
-		if(strpos($value, "/") === 0)
+		if (strpos($value, "/") === 0)
 		{
 			$value = substr($value, 1);
 		}
@@ -577,19 +577,19 @@ 
 
 			return slashToBackslash(CONFIG_WEBSITE_DOCUMENT_ROOT);
 		}
-		if(isset($_SERVER['DOCUMENT_ROOT']) && ($output = relToAbs($_SERVER['DOCUMENT_ROOT'])) != '' )
+		if (isset($_SERVER['DOCUMENT_ROOT']) && ($output = relToAbs($_SERVER['DOCUMENT_ROOT'])) != '')
 		{
 
 			return $output;
-		}elseif(isset($_SERVER["SCRIPT_NAME"]) && isset($_SERVER["SCRIPT_FILENAME"]) && ($output = str_replace(backslashToSlash($_SERVER["SCRIPT_NAME"]), '', backslashToSlash($_SERVER["SCRIPT_FILENAME"]))) && is_dir($output))
+		}elseif (isset($_SERVER["SCRIPT_NAME"]) && isset($_SERVER["SCRIPT_FILENAME"]) && ($output = str_replace(backslashToSlash($_SERVER["SCRIPT_NAME"]), '', backslashToSlash($_SERVER["SCRIPT_FILENAME"]))) && is_dir($output))
 		{
 
 			return slashToBackslash($output);
-		}elseif(isset($_SERVER["SCRIPT_NAME"]) && isset($_SERVER["PATH_TRANSLATED"]) && ($output = str_replace(backslashToSlash($_SERVER["SCRIPT_NAME"]), '', str_replace("//", "/", backslashToSlash($_SERVER["PATH_TRANSLATED"])))) && is_dir($output))
+		}elseif (isset($_SERVER["SCRIPT_NAME"]) && isset($_SERVER["PATH_TRANSLATED"]) && ($output = str_replace(backslashToSlash($_SERVER["SCRIPT_NAME"]), '', str_replace("//", "/", backslashToSlash($_SERVER["PATH_TRANSLATED"])))) && is_dir($output))
 		{
 
 			return $output;
-		}else 
+		} else 
 		{
 			return '';
 		}	
@@ -606,9 +606,9 @@ 
 	 */	
 	function addBeginingSlash($value)
 	{
-		if(strpos($value, "/") !== 0 && !empty($value))
+		if (strpos($value, "/") !== 0 && !empty($value))
 		{
-			$value .= "/" . $value;
+			$value .= "/".$value;
 		}
 		return $value;		
 	}
@@ -634,33 +634,33 @@ 
 		 * @param string $final_dir
 		 * @return string
 		 */
-    function getRelativePath($start_dir, $final_dir){
+    function getRelativePath($start_dir, $final_dir) {
       //
       $firstPathParts = explode(DIRECTORY_SEPARATOR, $start_dir);
       $secondPathParts = explode(DIRECTORY_SEPARATOR, $final_dir);
       //
       $sameCounter = 0;
-      for($i = 0; $i < min( count($firstPathParts), count($secondPathParts) ); $i++) {
-          if( strtolower($firstPathParts[$i]) !== strtolower($secondPathParts[$i]) ) {
+      for ($i = 0; $i < min(count($firstPathParts), count($secondPathParts)); $i++) {
+          if (strtolower($firstPathParts[$i]) !== strtolower($secondPathParts[$i])) {
               break;
           }
           $sameCounter++;
       }
-      if( $sameCounter == 0 ) {
+      if ($sameCounter == 0) {
           return $final_dir;
       }
       //
       $newPath = '';
-      for($i = $sameCounter; $i < count($firstPathParts); $i++) {
-          if( $i > $sameCounter ) {
+      for ($i = $sameCounter; $i < count($firstPathParts); $i++) {
+          if ($i > $sameCounter) {
               $newPath .= DIRECTORY_SEPARATOR;
           }
           $newPath .= "..";
       }
-      if( count($newPath) == 0 ) {
+      if (count($newPath) == 0) {
           $newPath = ".";
       }
-      for($i = $sameCounter; $i < count($secondPathParts); $i++) {
+      for ($i = $sameCounter; $i < count($secondPathParts); $i++) {
           $newPath .= DIRECTORY_SEPARATOR;
           $newPath .= $secondPathParts[$i];
       }
@@ -674,20 +674,20 @@ 
    */
   function getMemoryLimit()
   {
-    $output = @ini_get('memory_limit') or $output = -1 ;
-    if(intval($output) < 0)
+    $output = @ini_get('memory_limit') or $output = -1;
+    if (intval($output) < 0)
     {//unlimited
     	$output = 999999999999999999;
     }
-    elseif(strpos('g', strtolower($output)) !== false)
+    elseif (strpos('g', strtolower($output)) !== false)
     {
-    	$output = intval($output) * 1024 * 1024 * 1024;
-    }elseif(strpos('k', strtolower($output)) !== false)
+    	$output = intval($output)*1024*1024*1024;
+    }elseif (strpos('k', strtolower($output)) !== false)
     {
-    	$output = intval($output) * 1024 ;
-    }else
+    	$output = intval($output)*1024;
+    } else
     {
-    	$output = intval($output) * 1024 * 1024;
+    	$output = intval($output)*1024*1024;
     }
     
     return $output;  	
@@ -712,31 +712,31 @@ 
           * @param string $prefixName the prefix before the folder name
           * @return array
           */
-         function getFolderListing($path,$indexNumber=null, $prefixNumber =' ', $prefixName =' - ',  $outputs=array())
+         function getFolderListing($path, $indexNumber = null, $prefixNumber = ' ', $prefixName = ' - ', $outputs = array())
          {
                    $path = removeTrailingSlash(backslashToSlash($path));
-                   if(is_null($indexNumber))
+                   if (is_null($indexNumber))
                    {
                    	$outputs[IMG_LBL_ROOT_FOLDER] = removeTrailingSlash(backslashToSlash($path));
                    }
                    $fh = @opendir($path);
-                   if($fh)
+                   if ($fh)
                    {
                             $count = 1;                          
-                            while($file = @readdir($fh))
+                            while ($file = @readdir($fh))
                             {
-                                     $newPath = removeTrailingSlash(backslashToSlash($path . "/" . $file));
-                                     if(isListingDocument($newPath) && $file != '.' && $file != '..' && is_dir($newPath))
+                                     $newPath = removeTrailingSlash(backslashToSlash($path."/".$file));
+                                     if (isListingDocument($newPath) && $file != '.' && $file != '..' && is_dir($newPath))
                                      {                                          
-                                               if(!empty($indexNumber))
+                                               if (!empty($indexNumber))
                                                {//this is not root folder
                                                					
-                                                        $outputs[$prefixNumber . $indexNumber . "." . $count . $prefixName . $file] = $newPath;
-                                                        getFolderListing($newPath,  $prefixNumber . $indexNumber . "." . $count , $prefixNumber, $prefixName, $outputs);                                                 
-                                               }else 
+                                                        $outputs[$prefixNumber.$indexNumber.".".$count.$prefixName.$file] = $newPath;
+                                                        getFolderListing($newPath, $prefixNumber.$indexNumber.".".$count, $prefixNumber, $prefixName, $outputs);                                                 
+                                               } else 
                                                {//this is root folder
 
-                                                        $outputs[$count . $prefixName . $file] = $newPath;
+                                                        $outputs[$count.$prefixName.$file] = $newPath;
                                                         getFolderListing($newPath, $count, $prefixNumber, $prefixName, $outputs);
                                                }
                                                $count++;
@@ -759,23 +759,23 @@ 
          function getValidTextEditorExts()
          {
          	$validEditorExts = explode(',', CONFIG_EDITABLE_VALID_EXTS);
-         	if(CONFIG_UPLOAD_VALID_EXTS)
+         	if (CONFIG_UPLOAD_VALID_EXTS)
          	{//exclude those exts not shown on CONFIG_UPLOAD_VALID_EXTS
          		$validUploadExts = explode(',', CONFIG_UPLOAD_VALID_EXTS);
-         		foreach($validEditorExts as $k=>$v)
+         		foreach ($validEditorExts as $k=>$v)
          		{
-         			if(array_search($v, $validUploadExts) === false)
+         			if (array_search($v, $validUploadExts) === false)
          			{
          				unset($validEditorExts[$k]);
          			}
          		}        		
          	}
-         	if(CONFIG_UPLOAD_INVALID_EXTS)
+         	if (CONFIG_UPLOAD_INVALID_EXTS)
          	{//exlcude those exists in CONFIG_UPLOAD_INVALID_EXTS
          		$invalidUploadExts = explode(',', CONFIG_UPLOAD_INVALID_EXTS);
-         		foreach($validEditorExts as $k=>$v)
+         		foreach ($validEditorExts as $k=>$v)
          		{
-         			if(array_search($v, $invalidUploadExts) !== false)
+         			if (array_search($v, $invalidUploadExts) !== false)
          			{
          				unset($validEditorExts[$k]);
          			}
@@ -791,24 +791,24 @@ 
      * @param string $string
      * @return booolean
      */
-        function isValidPattern( $pattern, $string)
+        function isValidPattern($pattern, $string)
         {
-            if(($pattern)=== '')
+            if (($pattern) === '')
             {
                 return true;
             }
-            else if (strpos($pattern,",")!==false)
+            else if (strpos($pattern, ",") !== false)
             {
                 $regExps = explode(',', $pattern);
                 foreach ($regExps as $regExp => $value)
                 {
-                    if(eregi($value, $string))
+                    if (eregi($value, $string))
                     {
                         return true;
                     }
                 }               
             }
-            else if(eregi($pattern, $string))
+            else if (eregi($pattern, $string))
             {
                 return true;
             }
@@ -824,24 +824,24 @@ 
      * @param string $string
      * @return booolean
      */
-        function isInvalidPattern( $pattern, $string)
+        function isInvalidPattern($pattern, $string)
         {
-            if(($pattern)=== '')
+            if (($pattern) === '')
             {
                 return false;
             }
-            else if (strpos($pattern,",")!==false)
+            else if (strpos($pattern, ",") !== false)
             {
                 $regExps = explode(',', $pattern);
                 foreach ($regExps as $regExp => $value)
                 {
-                    if(eregi($value, $string))
+                    if (eregi($value, $string))
                     {
                         return true;
                     }
                 }               
             }
-            else if(eregi($pattern, $string))
+            else if (eregi($pattern, $string))
             {
                 return true;
             }
@@ -855,20 +855,20 @@ 
 		 *
 		 * @param string $fileName
 		 */
-		function shortenFileName($fileName, $maxLeng=17, $indicate = '...')
+		function shortenFileName($fileName, $maxLeng = 17, $indicate = '...')
 		{
-			if(strlen($fileName) > $maxLeng)
+			if (strlen($fileName) > $maxLeng)
 			{
-				$fileName = substr($fileName, 0, $maxLeng - strlen($indicate)) . $indicate;
+				$fileName = substr($fileName, 0, $maxLeng - strlen($indicate)).$indicate;
 			}
 			return $fileName;
 			
 		}
 		if (!function_exists('mime_content_type')) 
 		{
-		   function mime_content_type ( $f )
+		   function mime_content_type($f)
 		   {
-		       return trim ( @exec ('file -bi ' . escapeshellarg ( $f ) ) ) ;
+		       return trim(@exec('file -bi '.escapeshellarg($f)));
 		   }
 		}		
 		
@@ -881,118 +881,118 @@ 
          function isListingDocument($path)
          {
          	$file = basename($path);
-         	if(CONFIG_SYS_PATTERN_FORMAT == 'list')
+         	if (CONFIG_SYS_PATTERN_FORMAT == 'list')
          	{// comma delimited vague file/folder name
 
 
 
 			    		
-      			if(is_dir($path))
+      			if (is_dir($path))
       			{
  				$includeDir = trimlrm(CONFIG_SYS_INC_DIR_PATTERN);
 				$excludeDir = trimlrm(CONFIG_SYS_EXC_DIR_PATTERN);     				
 				$found_includeDir = strpos($includeDir, $file);
 				$found_excludeDir = strpos($excludeDir, $file);      				
-      				if((!CONFIG_SYS_INC_DIR_PATTERN || (!($found_includeDir === FALSE))) && (!CONFIG_SYS_EXC_DIR_PATTERN || (($found_excludeDir === FALSE))))
+      				if ((!CONFIG_SYS_INC_DIR_PATTERN || (!($found_includeDir === FALSE))) && (!CONFIG_SYS_EXC_DIR_PATTERN || (($found_excludeDir === FALSE))))
       				{
       					return true;
-      				}else 
+      				} else 
       				{
       					return false;
       				}
-      			}elseif(is_file($path))
+      			}elseif (is_file($path))
       			{
 				$includeFile = trimlrm(CONFIG_SYS_INC_FILE_PATTERN);
 				$excludeFile = trimlrm(CONFIG_SYS_EXC_FILE_PATTERN);            				
 				$found_includeFile = strpos($includeFile, $file);
 				$found_excludeFile = strpos($excludeFile, $file);	      				
-      				if((!CONFIG_SYS_INC_FILE_PATTERN || (!($found_includeFile === FALSE))) && (!CONFIG_SYS_EXC_FILE_PATTERN ||   (($found_excludeFile === FALSE))))
+      				if ((!CONFIG_SYS_INC_FILE_PATTERN || (!($found_includeFile === FALSE))) && (!CONFIG_SYS_EXC_FILE_PATTERN || (($found_excludeFile === FALSE))))
       				{
       					return true;
-      				}else 
+      				} else 
       				{
       					return false;
       				}
       			}
-         	}elseif(CONFIG_SYS_PATTERN_FORMAT == 'csv')
+         	}elseif (CONFIG_SYS_PATTERN_FORMAT == 'csv')
          	{//comma delimited file/folder name
          		
-         		if(is_dir($path))
+         		if (is_dir($path))
          		{
          		
 	 				$includeDir = trimlrm(CONFIG_SYS_INC_DIR_PATTERN);
 					$excludeDir = trimlrm(CONFIG_SYS_EXC_DIR_PATTERN);
 					        
-					if(!empty($includeDir) && !empty($excludeDir))
+					if (!empty($includeDir) && !empty($excludeDir))
 					{
 						
 						$validDir = explode(',', $includeDir);
 						
 						$invalidDir = explode(",", $excludeDir);
 
-						if(array_search(basename($path), $validDir) !== false && array_search(basename($path), $invalidDir) === false)
+						if (array_search(basename($path), $validDir) !== false && array_search(basename($path), $invalidDir) === false)
 						{
 							return true;
-						}else 
+						} else 
 						{
 							return false;
 						}
-					}elseif(!empty($includeDir))
+					}elseif (!empty($includeDir))
 					{
 						$validDir = explode(',', $includeDir);
-						if(array_search(basename($path), $validDir) !== false)
+						if (array_search(basename($path), $validDir) !== false)
 						{
 							return true;
-						}else 
+						} else 
 						{
 							return false;
 						}
 						
-					}elseif(!empty($excludeFile))
+					}elseif (!empty($excludeFile))
 					{
 						$invalidDir = explode(",", $excludeDir);
-						if(array_search(basename($path), $invalidDir) === false)
+						if (array_search(basename($path), $invalidDir) === false)
 						{
 							return true;
-						}else 
+						} else 
 						{
 							return false;
 						}
 					}
 					return true;
 					
-         		}elseif(is_file($path))
+         		}elseif (is_file($path))
          		{
 				$includeFile = trimlrm(CONFIG_SYS_INC_FILE_PATTERN);
 				$excludeFile = trimlrm(CONFIG_SYS_EXC_FILE_PATTERN);   
-				if(!empty($includeFile) && !empty($excludeFile))
+				if (!empty($includeFile) && !empty($excludeFile))
 				{
 					$validFile = explode(',', $includeFile);
 					$invalidFile = explode(',', $excludeFile);
-					if(array_search(basename($path), $validFile) !== false && array_search(basename($path), $invalidFile) === false)
+					if (array_search(basename($path), $validFile) !== false && array_search(basename($path), $invalidFile) === false)
 					{
 						return true;
-					}else 
+					} else 
 					{
 						return false;
 					}
-				}elseif(!empty($includeFile))
+				}elseif (!empty($includeFile))
 				{
 					$validFile = explode(',', $includeFile);
-					if(array_search(basename($path), $validFile) !== false)
+					if (array_search(basename($path), $validFile) !== false)
 					{
 						return true;
-					}else 
+					} else 
 					{
 						return false;
 					}
-				}elseif(!empty($excludeFile))
+				}elseif (!empty($excludeFile))
 				{
 					$invalidFile = explode(',', $excludeFile);
-					if(array_search(basename($path), $invalidFile) === false)
+					if (array_search(basename($path), $invalidFile) === false)
 					{
 						return true;
-					}else 
+					} else 
 					{
 						return false;
 					}
@@ -1002,22 +1002,22 @@ 
          	}
          	else 
          	{//regular expression
-	          	if(is_dir($path) )
+	          	if (is_dir($path))
 	         	{
-	         		if(isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, $path) && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, $path))
+	         		if (isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, $path) && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, $path))
 	         		{
 	         			 return true;	
-	         		}else 
+	         		} else 
 	         		{
 	         			return false;
 	         		}
 	         	
-	         	}elseif(is_file($path))
+	         	}elseif (is_file($path))
 	         	{
-	         		if(isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, $path) && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, $path)  )
+	         		if (isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, $path) && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, $path))
 	         		{
 	         			return true;
-	         		}else 
+	         		} else 
 	         		{
 	         			return false;
 	         		}
@@ -1033,20 +1033,20 @@ 
 		 * @param string $path
 		 * 
 		 */
-		function downloadFile($path, $newFileName=null)
+		function downloadFile($path, $newFileName = null)
 		{
-				if(file_exists($path) && is_file($path))
+				if (file_exists($path) && is_file($path))
 				{	
 					$mimeContentType = 'application/octet-stream';
-					if(function_exists('finfo_open'))
+					if (function_exists('finfo_open'))
 					{
-						if(($fp = @finfo_open($path)))
+						if (($fp = @finfo_open($path)))
 						{
 							$mimeContentType = @finfo_file($fp, basename($path));
 							@finfo_close($fp);
 						}
 						
-					}elseif(($temMimeContentType = @mime_content_type($path)) && !empty($temMimeContentType))
+					}elseif (($temMimeContentType = @mime_content_type($path)) && !empty($temMimeContentType))
 					{
 						$mimeContentType = $temMimeContentType;
 					}
@@ -1057,15 +1057,15 @@ 
 
 			// START ANDR� SILVA DOWNLOAD CODE
 			// required for IE, otherwise Content-disposition is ignored
-			if(ini_get('zlib.output_compression'))
+			if (ini_get('zlib.output_compression'))
 			  ini_set('zlib.output_compression', 'Off');
 			header("Pragma: public"); // required
 			header("Expires: 0");
 			header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-			header("Cache-Control: private",false); // required for certain browsers 
-			header("Content-Type: " . $mimeContentType );
+			header("Cache-Control: private", false); // required for certain browsers 
+			header("Content-Type: ".$mimeContentType);
 			// change, added quotes to allow spaces in filenames, by Rajkumar Singh
-			header("Content-Disposition: attachment; filename=\"".(is_null($newFileName)?basename($path):$newFileName)."\";" );
+			header("Content-Disposition: attachment; filename=\"".(is_null($newFileName) ? basename($path) : $newFileName)."\";");
 			header("Content-Transfer-Encoding: binary");
 			header("Content-Length: ".filesize($path));
 		
@@ -1083,7 +1083,7 @@ 
    * @param string $whiteSpaceChars
    * @return string
    */
-  function trimlrm ($hayStack, $whiteSpaceChars="\t\n\r\0\x0B")
+  function trimlrm($hayStack, $whiteSpaceChars = "\t\n\r\0\x0B")
   {
   	return str_replace($whiteSpaceChars, '', trim($hayStack));
   }		
@@ -1097,13 +1097,13 @@ 
   function getParentFolderPath($path)
   {
   	$realPath = addTrailingSlash(backslashToSlash(getRealPath($path)));
-  	$parentRealPath =  addTrailingSlash(backslashToSlash(dirname($realPath)));
+  	$parentRealPath = addTrailingSlash(backslashToSlash(dirname($realPath)));
   	$differentPath = addTrailingSlash(substr($realPath, strlen($parentRealPath)));
   	$parentPath = substr($path, 0, strlen(addTrailingSlash(backslashToSlash($path))) - strlen($differentPath));
-  	if(isUnderRoot($parentPath))
+  	if (isUnderRoot($parentPath))
   	{
   		return $parentPath;
-  	}else 
+  	} else 
   	{
   		return CONFIG_SYS_DEFAULT_PATH;
   	}
@@ -1113,37 +1113,37 @@ 
   {
   		$folderPathIndex = 'path';
   		$lastVisitedFolderPathIndex = 'ajax_last_visited_folder';
-		if(isset($_GET[$folderPathIndex]) && file_exists($_GET[$folderPathIndex]) && !is_file($_GET[$folderPathIndex]) )
+		if (isset($_GET[$folderPathIndex]) && file_exists($_GET[$folderPathIndex]) && !is_file($_GET[$folderPathIndex]))
 		{
 			$currentFolderPath = $_GET[$folderPathIndex];
 		}
-		elseif(isset($_SESSION[$lastVisitedFolderPathIndex]) && file_exists($_SESSION[$lastVisitedFolderPathIndex]) && !is_file($_SESSION[$lastVisitedFolderPathIndex]))
+		elseif (isset($_SESSION[$lastVisitedFolderPathIndex]) && file_exists($_SESSION[$lastVisitedFolderPathIndex]) && !is_file($_SESSION[$lastVisitedFolderPathIndex]))
 		{
 			$currentFolderPath = $_SESSION[$lastVisitedFolderPathIndex];
-		}else
+		} else
 		{
 			$currentFolderPath = CONFIG_SYS_DEFAULT_PATH;
 		}
 		
-		$currentFolderPath = (isUnderRoot($currentFolderPath)?backslashToSlash((addTrailingSlash($currentFolderPath))):CONFIG_SYS_DEFAULT_PATH);
+		$currentFolderPath = (isUnderRoot($currentFolderPath) ? backslashToSlash((addTrailingSlash($currentFolderPath))) : CONFIG_SYS_DEFAULT_PATH);
 		
 		//keep track of this folder path in session 
 		$_SESSION[$lastVisitedFolderPathIndex] = $currentFolderPath;
 		
 
-		if(!file_exists($currentFolderPath))
+		if (!file_exists($currentFolderPath))
 		{
-			die(ERR_FOLDER_NOT_FOUND . $currentFolderPath);
+			die(ERR_FOLDER_NOT_FOUND.$currentFolderPath);
 		}  	
   }
   
-       if(!function_exists("imagerotate"))
+       if (!function_exists("imagerotate"))
         {
-            function imagerotate($src_img, $angle, $bicubic=false)
+            function imagerotate($src_img, $angle, $bicubic = false)
             {
     // convert degrees to radians
     
-    $angle =  (360 - $angle) + 180;
+    $angle = (360 - $angle) + 180;
     $angle = deg2rad($angle);
    
     $src_x = imagesx($src_img);
@@ -1162,13 +1162,13 @@ 
     for ($y = 0; $y < $src_y; $y++) {
       for ($x = 0; $x < $src_x; $x++) {
     // rotate...
-    $old_x = (($center_x-$x) * $cosangle + ($center_y-$y) * $sinangle)
+    $old_x = (($center_x - $x)*$cosangle + ($center_y - $y)*$sinangle)
       + $center_x;
-    $old_y = (($center_y-$y) * $cosangle - ($center_x-$x) * $sinangle)
+    $old_y = (($center_y - $y)*$cosangle - ($center_x - $x)*$sinangle)
       + $center_y;
    
-    if ( $old_x >= 0 && $old_x < $src_x
-         && $old_y >= 0 && $old_y < $src_y ) {
+    if ($old_x >= 0 && $old_x < $src_x
+         && $old_y >= 0 && $old_y < $src_y) {
       if ($bicubic == true) {
         $sY  = $old_y + 1;
         $siY  = $old_y;
@@ -1182,11 +1182,11 @@ 
         $c3 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX2, $siY2));
         $c4 = imagecolorsforindex($src_img, imagecolorat($src_img, $siX2, $siY));
        
-        $r = ($c1['red']  + $c2['red']  + $c3['red']  + $c4['red']  ) << 14;
+        $r = ($c1['red'] + $c2['red'] + $c3['red'] + $c4['red']) << 14;
         $g = ($c1['green'] + $c2['green'] + $c3['green'] + $c4['green']) << 6;
-        $b = ($c1['blue']  + $c2['blue']  + $c3['blue']  + $c4['blue'] ) >> 2;
-        $a = ($c1['alpha']  + $c2['alpha']  + $c3['alpha']  + $c4['alpha'] ) >> 2;
-        $color = imagecolorallocatealpha($src_img, $r,$g,$b,$a);
+        $b = ($c1['blue'] + $c2['blue'] + $c3['blue'] + $c4['blue']) >> 2;
+        $a = ($c1['alpha'] + $c2['alpha'] + $c3['alpha'] + $c4['alpha']) >> 2;
+        $color = imagecolorallocatealpha($src_img, $r, $g, $b, $a);
       } else {
         $color = imagecolorat($src_img, $old_x, $old_y);
       }

Braces +59 added lines, -61 removed lines

@@ -108,14 +108,14 @@ 
 			if(array_search(strtolower(getFileExt($filePath)), $validExts) !== false)
 			{
 				return true;
-			}else 
+			} else 
 			{
 				return false;
 			}
-		}elseif(array_search(strtolower(getFileExt($filePath)), $invalidExts) === false)
+		} elseif(array_search(strtolower(getFileExt($filePath)), $invalidExts) === false)
 		{
 			return true;
-		}else 
+		} else 
 		{
 			return false;
 		}
@@ -270,7 +270,7 @@ 
 			if(strpos($baseUrl, "?") !== false)
 			{
 				$output .= "&" . $extra;
-			}else
+			} else
 			{
 				$output .= "?" . $extra;
 			}			
@@ -369,14 +369,14 @@ 
         	{
         		$thumbnailWidth =$originaleImageWidth;
         		$thumbnailHeight = $originalImageHeight;
-        	}elseif($thumbnailWidth < 1)
+        	} elseif($thumbnailWidth < 1)
         	{
         		$thumbnailWidth = floor($thumbnailHeight / $originalImageHeight * $originaleImageWidth);
 
-        	}elseif($thumbnailHeight < 1)
+        	} elseif($thumbnailHeight < 1)
         	{
         		$thumbnailHeight = floor($thumbnailWidth / $originaleImageWidth * $originalImageHeight);
-        	}else
+        	} else
         	{
         		$scale = min($thumbnailWidth/$originaleImageWidth, $thumbnailHeight/$originalImageHeight);
 				$thumbnailWidth = floor($scale*$originaleImageWidth);
@@ -395,8 +395,9 @@ 
  * @return string
  */
 function getAbsPath($value) {
-	if (substr($value, 0, 1) == "/")
-		return slashToBackslash(DIR_AJAX_ROOT . $value);
+	if (substr($value, 0, 1) == "/") {
+			return slashToBackslash(DIR_AJAX_ROOT . $value);
+	}
 
 	return slashToBackslash(dirname(__FILE__) . "/" . $value);
 }
@@ -414,7 +415,7 @@ 
 		if(false !== ($index = strrpos($value, "/")) )
 		{
 			return substr($value, $index + 1);
-		}else
+		} else
 		{
 			return $value;
 		}
@@ -438,7 +439,9 @@ 
     $path=explode('/', $path);
     $newpath=array();
     for ($i=0; $i<sizeof($path); $i++) {
-        if ($path[$i]==='' || $path[$i]==='.') continue;
+        if ($path[$i]==='' || $path[$i]==='.') {
+            continue;
+        }
            if ($path[$i]==='..') {
               array_pop($newpath);
               continue;
@@ -451,9 +454,10 @@ 
     // check then return valid path or filename
     if (file_exists($finalpath)) {
         return ($finalpath);
+    } else {
+        return FALSE;
+    }
     }
-    else return FALSE;
-}
 	/**
 	 * calcuate realpath for a relative path
 	 *
@@ -466,7 +470,7 @@ 
  	 if(($path = realpath($value)) && $path != $value)
  	 {
  	 	$output = $path;
- 	 }else 
+ 	 } else 
  	 {
  	 	$output = myRealPath($value);
  	 }
@@ -492,7 +496,7 @@ 
 		if ($pos !== false )
 		{
 			$output  = $urlprefix . substr($value, $pos + strlen($wwwroot)) . $urlsuffix;
-		}else 
+		} else 
 		{
 			$output = $value;
 		}
@@ -536,13 +540,13 @@ 
 	if ($size > 1048576)
 	{
 		return round($size / 1048576, 1) . " MB";
-	}elseif ($size > 1024)
+	} elseif ($size > 1024)
 	{
 		return round($size / 1024, 1) . " KB";
-	}elseif($size == '')
+	} elseif($size == '')
 	{
 		return $size;
-	}else
+	} else
 	{
 		return $size . " b";
 	}	
@@ -581,15 +585,15 @@ 
 		{
 
 			return $output;
-		}elseif(isset($_SERVER["SCRIPT_NAME"]) && isset($_SERVER["SCRIPT_FILENAME"]) && ($output = str_replace(backslashToSlash($_SERVER["SCRIPT_NAME"]), '', backslashToSlash($_SERVER["SCRIPT_FILENAME"]))) && is_dir($output))
+		} elseif(isset($_SERVER["SCRIPT_NAME"]) && isset($_SERVER["SCRIPT_FILENAME"]) && ($output = str_replace(backslashToSlash($_SERVER["SCRIPT_NAME"]), '', backslashToSlash($_SERVER["SCRIPT_FILENAME"]))) && is_dir($output))
 		{
 
 			return slashToBackslash($output);
-		}elseif(isset($_SERVER["SCRIPT_NAME"]) && isset($_SERVER["PATH_TRANSLATED"]) && ($output = str_replace(backslashToSlash($_SERVER["SCRIPT_NAME"]), '', str_replace("//", "/", backslashToSlash($_SERVER["PATH_TRANSLATED"])))) && is_dir($output))
+		} elseif(isset($_SERVER["SCRIPT_NAME"]) && isset($_SERVER["PATH_TRANSLATED"]) && ($output = str_replace(backslashToSlash($_SERVER["SCRIPT_NAME"]), '', str_replace("//", "/", backslashToSlash($_SERVER["PATH_TRANSLATED"])))) && is_dir($output))
 		{
 
 			return $output;
-		}else 
+		} else 
 		{
 			return '';
 		}	
@@ -678,14 +682,13 @@ 
     if(intval($output) < 0)
     {//unlimited
     	$output = 999999999999999999;
-    }
-    elseif(strpos('g', strtolower($output)) !== false)
+    } elseif(strpos('g', strtolower($output)) !== false)
     {
     	$output = intval($output) * 1024 * 1024 * 1024;
-    }elseif(strpos('k', strtolower($output)) !== false)
+    } elseif(strpos('k', strtolower($output)) !== false)
     {
     	$output = intval($output) * 1024 ;
-    }else
+    } else
     {
     	$output = intval($output) * 1024 * 1024;
     }
@@ -733,7 +736,7 @@ 
                                                					
                                                         $outputs[$prefixNumber . $indexNumber . "." . $count . $prefixName . $file] = $newPath;
                                                         getFolderListing($newPath,  $prefixNumber . $indexNumber . "." . $count , $prefixNumber, $prefixName, $outputs);                                                 
-                                               }else 
+                                               } else 
                                                {//this is root folder
 
                                                         $outputs[$count . $prefixName . $file] = $newPath;
@@ -796,8 +799,7 @@ 
             if(($pattern)=== '')
             {
                 return true;
-            }
-            else if (strpos($pattern,",")!==false)
+            } else if (strpos($pattern,",")!==false)
             {
                 $regExps = explode(',', $pattern);
                 foreach ($regExps as $regExp => $value)
@@ -807,8 +809,7 @@ 
                         return true;
                     }
                 }               
-            }
-            else if(eregi($pattern, $string))
+            } else if(eregi($pattern, $string))
             {
                 return true;
             }
@@ -829,8 +830,7 @@ 
             if(($pattern)=== '')
             {
                 return false;
-            }
-            else if (strpos($pattern,",")!==false)
+            } else if (strpos($pattern,",")!==false)
             {
                 $regExps = explode(',', $pattern);
                 foreach ($regExps as $regExp => $value)
@@ -840,8 +840,7 @@ 
                         return true;
                     }
                 }               
-            }
-            else if(eregi($pattern, $string))
+            } else if(eregi($pattern, $string))
             {
                 return true;
             }
@@ -896,11 +895,11 @@ 
       				if((!CONFIG_SYS_INC_DIR_PATTERN || (!($found_includeDir === FALSE))) && (!CONFIG_SYS_EXC_DIR_PATTERN || (($found_excludeDir === FALSE))))
       				{
       					return true;
-      				}else 
+      				} else 
       				{
       					return false;
       				}
-      			}elseif(is_file($path))
+      			} elseif(is_file($path))
       			{
 				$includeFile = trimlrm(CONFIG_SYS_INC_FILE_PATTERN);
 				$excludeFile = trimlrm(CONFIG_SYS_EXC_FILE_PATTERN);            				
@@ -909,12 +908,12 @@ 
       				if((!CONFIG_SYS_INC_FILE_PATTERN || (!($found_includeFile === FALSE))) && (!CONFIG_SYS_EXC_FILE_PATTERN ||   (($found_excludeFile === FALSE))))
       				{
       					return true;
-      				}else 
+      				} else 
       				{
       					return false;
       				}
       			}
-         	}elseif(CONFIG_SYS_PATTERN_FORMAT == 'csv')
+         	} elseif(CONFIG_SYS_PATTERN_FORMAT == 'csv')
          	{//comma delimited file/folder name
          		
          		if(is_dir($path))
@@ -933,35 +932,35 @@ 
 						if(array_search(basename($path), $validDir) !== false && array_search(basename($path), $invalidDir) === false)
 						{
 							return true;
-						}else 
+						} else 
 						{
 							return false;
 						}
-					}elseif(!empty($includeDir))
+					} elseif(!empty($includeDir))
 					{
 						$validDir = explode(',', $includeDir);
 						if(array_search(basename($path), $validDir) !== false)
 						{
 							return true;
-						}else 
+						} else 
 						{
 							return false;
 						}
 						
-					}elseif(!empty($excludeFile))
+					} elseif(!empty($excludeFile))
 					{
 						$invalidDir = explode(",", $excludeDir);
 						if(array_search(basename($path), $invalidDir) === false)
 						{
 							return true;
-						}else 
+						} else 
 						{
 							return false;
 						}
 					}
 					return true;
 					
-         		}elseif(is_file($path))
+         		} elseif(is_file($path))
          		{
 				$includeFile = trimlrm(CONFIG_SYS_INC_FILE_PATTERN);
 				$excludeFile = trimlrm(CONFIG_SYS_EXC_FILE_PATTERN);   
@@ -972,52 +971,51 @@ 
 					if(array_search(basename($path), $validFile) !== false && array_search(basename($path), $invalidFile) === false)
 					{
 						return true;
-					}else 
+					} else 
 					{
 						return false;
 					}
-				}elseif(!empty($includeFile))
+				} elseif(!empty($includeFile))
 				{
 					$validFile = explode(',', $includeFile);
 					if(array_search(basename($path), $validFile) !== false)
 					{
 						return true;
-					}else 
+					} else 
 					{
 						return false;
 					}
-				}elseif(!empty($excludeFile))
+				} elseif(!empty($excludeFile))
 				{
 					$invalidFile = explode(',', $excludeFile);
 					if(array_search(basename($path), $invalidFile) === false)
 					{
 						return true;
-					}else 
+					} else 
 					{
 						return false;
 					}
 				}
 				return true;
          		}
-         	}
-         	else 
+         	} else 
          	{//regular expression
 	          	if(is_dir($path) )
 	         	{
 	         		if(isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, $path) && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, $path))
 	         		{
 	         			 return true;	
-	         		}else 
+	         		} else 
 	         		{
 	         			return false;
 	         		}
 	         	
-	         	}elseif(is_file($path))
+	         	} elseif(is_file($path))
 	         	{
 	         		if(isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, $path) && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, $path)  )
 	         		{
 	         			return true;
-	         		}else 
+	         		} else 
 	         		{
 	         			return false;
 	         		}
@@ -1046,7 +1044,7 @@ 
 							@finfo_close($fp);
 						}
 						
-					}elseif(($temMimeContentType = @mime_content_type($path)) && !empty($temMimeContentType))
+					} elseif(($temMimeContentType = @mime_content_type($path)) && !empty($temMimeContentType))
 					{
 						$mimeContentType = $temMimeContentType;
 					}
@@ -1057,8 +1055,9 @@ 
 
 			// START ANDR� SILVA DOWNLOAD CODE
 			// required for IE, otherwise Content-disposition is ignored
-			if(ini_get('zlib.output_compression'))
-			  ini_set('zlib.output_compression', 'Off');
+			if(ini_get('zlib.output_compression')) {
+						  ini_set('zlib.output_compression', 'Off');
+			}
 			header("Pragma: public"); // required
 			header("Expires: 0");
 			header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
@@ -1103,7 +1102,7 @@ 
   	if(isUnderRoot($parentPath))
   	{
   		return $parentPath;
-  	}else 
+  	} else 
   	{
   		return CONFIG_SYS_DEFAULT_PATH;
   	}
@@ -1116,11 +1115,10 @@ 
 		if(isset($_GET[$folderPathIndex]) && file_exists($_GET[$folderPathIndex]) && !is_file($_GET[$folderPathIndex]) )
 		{
 			$currentFolderPath = $_GET[$folderPathIndex];
-		}
-		elseif(isset($_SESSION[$lastVisitedFolderPathIndex]) && file_exists($_SESSION[$lastVisitedFolderPathIndex]) && !is_file($_SESSION[$lastVisitedFolderPathIndex]))
+		} elseif(isset($_SESSION[$lastVisitedFolderPathIndex]) && file_exists($_SESSION[$lastVisitedFolderPathIndex]) && !is_file($_SESSION[$lastVisitedFolderPathIndex]))
 		{
 			$currentFolderPath = $_SESSION[$lastVisitedFolderPathIndex];
-		}else
+		} else
 		{
 			$currentFolderPath = CONFIG_SYS_DEFAULT_PATH;
 		}

phpmyfaq/inc/Bootstrap.php

Doc Comments +1 added lines, -1 removed lines

@@ -220,7 +220,7 @@
  * @param  mixed  $context  It optionally contains an array of every variable
  *                          that existed in the scope the error was triggered in.
  *
- * @return bool
+ * @return boolean|null
  */
 function pmf_error_handler($level, $message, $filename, $line, $context)
 {

Spacing +25 added lines, -25 removed lines

@@ -50,7 +50,7 @@ 
     $i++;
 }
 if (!$foundCurrPath) {
-    ini_set('include_path', '.' . PATH_SEPARATOR . ini_get('include_path'));
+    ini_set('include_path', '.'.PATH_SEPARATOR.ini_get('include_path'));
 }
 
 //
@@ -63,23 +63,23 @@ 
 //
 // Check if multisite/multisite.php exist for Multisite support
 //
-if (file_exists(__DIR__ . '/../multisite/multisite.php') && 'cli' !== PHP_SAPI) {
-    require __DIR__ . '/../multisite/multisite.php';
+if (file_exists(__DIR__.'/../multisite/multisite.php') && 'cli' !== PHP_SAPI) {
+    require __DIR__.'/../multisite/multisite.php';
 }
 
 //
 // The root directory
 //
-if (! defined('PMF_ROOT_DIR')) {
+if (!defined('PMF_ROOT_DIR')) {
     define('PMF_ROOT_DIR', dirname(__DIR__));
 }
 
 //
 // Read configuration and constants
 //
-if (! defined('PMF_MULTI_INSTANCE_CONFIG_DIR')) {
+if (!defined('PMF_MULTI_INSTANCE_CONFIG_DIR')) {
     // Single instance configuration
-    define('PMF_CONFIG_DIR', dirname(__DIR__) . '/config');
+    define('PMF_CONFIG_DIR', dirname(__DIR__).'/config');
 } else {
     // Multi instance configuration
     define('PMF_CONFIG_DIR', PMF_MULTI_INSTANCE_CONFIG_DIR);
@@ -88,17 +88,17 @@ 
 //
 // Check if config/database.php exist -> if not, redirect to installer
 //
-if (!file_exists(PMF_CONFIG_DIR . '/database.php') && !file_exists(PMF_ROOT_DIR . '/inc/data.php')) {
+if (!file_exists(PMF_CONFIG_DIR.'/database.php') && !file_exists(PMF_ROOT_DIR.'/inc/data.php')) {
     header("Location: install/setup.php");
     exit();
 }
 
-if (file_exists(PMF_ROOT_DIR . '/inc/data.php')) {
-    require PMF_ROOT_DIR . '/inc/data.php';
+if (file_exists(PMF_ROOT_DIR.'/inc/data.php')) {
+    require PMF_ROOT_DIR.'/inc/data.php';
 } else {
-    require PMF_CONFIG_DIR . '/database.php';
+    require PMF_CONFIG_DIR.'/database.php';
 }
-require PMF_CONFIG_DIR . '/constants.php';
+require PMF_CONFIG_DIR.'/constants.php';
 
 /**
  * The include directory
@@ -108,15 +108,15 @@ 
 /**
  * The directory where the translations reside
  */
-define('PMF_LANGUAGE_DIR', dirname(__DIR__) . '/lang');
+define('PMF_LANGUAGE_DIR', dirname(__DIR__).'/lang');
 
 //
 // Setting up PSR-0 autoloader for Symfony Components
 //
-require PMF_INCLUDE_DIR . '/libs/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+require PMF_INCLUDE_DIR.'/libs/Symfony/Component/ClassLoader/UniversalClassLoader.php';
 
 $loader = new UniversalClassLoader();
-$loader->registerNamespace('Symfony', PMF_INCLUDE_DIR . '/libs');
+$loader->registerNamespace('Symfony', PMF_INCLUDE_DIR.'/libs');
 $loader->registerPrefix('PMF_', PMF_INCLUDE_DIR);
 $loader->register();
 
@@ -142,7 +142,7 @@ 
 // We always need a valid session!
 //
 ini_set('session.use_only_cookies', 1); // Avoid any PHP version to move sessions on URLs
-ini_set('session.auto_start', 0);       // Prevent error to use session_start() if it's active in php.ini
+ini_set('session.auto_start', 0); // Prevent error to use session_start() if it's active in php.ini
 ini_set('session.use_trans_sid', 0);
 ini_set('url_rewriter.tags', '');
 
@@ -155,9 +155,9 @@ 
 //
 // Connect to LDAP server, when LDAP support is enabled
 //
-if ($faqConfig->get('security.ldapSupport') && file_exists(PMF_CONFIG_DIR . '/ldap.php') && extension_loaded('ldap')) {
-    require PMF_CONFIG_DIR . '/constants_ldap.php';
-    require PMF_CONFIG_DIR . '/ldap.php';
+if ($faqConfig->get('security.ldapSupport') && file_exists(PMF_CONFIG_DIR.'/ldap.php') && extension_loaded('ldap')) {
+    require PMF_CONFIG_DIR.'/constants_ldap.php';
+    require PMF_CONFIG_DIR.'/ldap.php';
     $faqConfig->setLdapConfig($PMF_LDAP);
 } else {
     $ldap = null;
@@ -172,7 +172,7 @@ 
     define('PMF_ATTACHMENTS_DIR', $confAttachmentsPath);
 } else {
     // otherwise build the absolute path
-    $tmp = dirname(__DIR__) . DIRECTORY_SEPARATOR . $confAttachmentsPath;
+    $tmp = dirname(__DIR__).DIRECTORY_SEPARATOR.$confAttachmentsPath;
 
     // Check that nobody is traversing
     if (0 === strpos((string)$tmp, dirname(__DIR__))) {
@@ -185,7 +185,7 @@ 
 //
 // Fix if phpMyFAQ is running behind a proxy server
 //
-if (! isset($_SERVER['HTTP_HOST'])) {
+if (!isset($_SERVER['HTTP_HOST'])) {
     if (isset($_SERVER['HTTP_X_FORWARDED_SERVER'])) {
         $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_X_FORWARDED_SERVER'];
     } else {
@@ -196,14 +196,14 @@ 
 //
 // Fix undefined server variables in Windows IIS & CGI mode
 //
-if (! isset($_SERVER['SCRIPT_NAME'])) {
-    if(isset($_SERVER['SCRIPT_FILENAME'])) {
+if (!isset($_SERVER['SCRIPT_NAME'])) {
+    if (isset($_SERVER['SCRIPT_FILENAME'])) {
         $_SERVER['SCRIPT_NAME'] = $_SERVER['SCRIPT_FILENAME'];
-    } elseif(isset($_SERVER['PATH_TRANSLATED'])) {
+    } elseif (isset($_SERVER['PATH_TRANSLATED'])) {
         $_SERVER['SCRIPT_NAME'] = $_SERVER['PATH_TRANSLATED'];
-    } elseif(isset($_SERVER['PATH_INFO'])) {
+    } elseif (isset($_SERVER['PATH_INFO'])) {
         $_SERVER['SCRIPT_NAME'] = $_SERVER['PATH_INFO'];
-    } elseif(isset($_SERVER['SCRIPT_URL'])) {
+    } elseif (isset($_SERVER['SCRIPT_URL'])) {
         $_SERVER['SCRIPT_NAME'] = $_SERVER['SCRIPT_URL'];
     }
 }