thorsten / phpMyFAQ

phpmyfaq/admin/editor/plugins/ajaxfilemanager/inc/config.php

Spacing +27 added lines, -27 removed lines

@@ -10,13 +10,13 @@ 
 
 //FILESYSTEM CONFIG	<br>
 define('AJAX_INIT_DONE', true);
-require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "class.auth.php");
+require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."class.auth.php");
 define('CONFIG_QUERY_STRING_ENABLE', true); //Enable passed query string to setting the system configuration
 
 // Added for phpMyFAQ
 define('PMF_ROOT_DIR', dirname(dirname(dirname(dirname(dirname(__DIR__))))));
 define('IS_VALID_PHPMYFAQ', null);
-require PMF_ROOT_DIR . '/inc/Bootstrap.php';
+require PMF_ROOT_DIR.'/inc/Bootstrap.php';
 
 if (!isset($_SESSION)) {
     session_start(PMF_Session::PMF_COOKIE_NAME_AUTH);
@@ -37,48 +37,48 @@ 
 }
 //Directories Declarations
 
-define('DIR_AJAX_ROOT', dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR) ; // the path to ajax file manager
-define('DIR_AJAX_INC', DIR_AJAX_ROOT . "inc" . DIRECTORY_SEPARATOR);
-define('DIR_AJAX_CLASSES', DIR_AJAX_ROOT .  "classes" . DIRECTORY_SEPARATOR);
-define("DIR_AJAX_LANGS", DIR_AJAX_ROOT . "langs" . DIRECTORY_SEPARATOR);
-define('DIR_AJAX_JS', DIR_AJAX_ROOT . 'jscripts' . DIRECTORY_SEPARATOR);
-define('DIR_AJAX_EDIT_AREA', DIR_AJAX_JS . 'edit_area' . DIRECTORY_SEPARATOR);
-define('DIR_LANG', DIR_AJAX_ROOT . 'langs' . DIRECTORY_SEPARATOR);
+define('DIR_AJAX_ROOT', dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR); // the path to ajax file manager
+define('DIR_AJAX_INC', DIR_AJAX_ROOT."inc".DIRECTORY_SEPARATOR);
+define('DIR_AJAX_CLASSES', DIR_AJAX_ROOT."classes".DIRECTORY_SEPARATOR);
+define("DIR_AJAX_LANGS", DIR_AJAX_ROOT."langs".DIRECTORY_SEPARATOR);
+define('DIR_AJAX_JS', DIR_AJAX_ROOT.'jscripts'.DIRECTORY_SEPARATOR);
+define('DIR_AJAX_EDIT_AREA', DIR_AJAX_JS.'edit_area'.DIRECTORY_SEPARATOR);
+define('DIR_LANG', DIR_AJAX_ROOT.'langs'.DIRECTORY_SEPARATOR);
 
 
 //Class Declarations
-define('CLASS_FILE', DIR_AJAX_INC .'class.file.php');
-define("CLASS_UPLOAD", DIR_AJAX_INC .  'class.upload.php');
-define('CLASS_MANAGER', DIR_AJAX_INC . 'class.manager.php');
-define('CLASS_IMAGE', DIR_AJAX_INC . "class.image.php");
-define('CLASS_HISTORY', DIR_AJAX_INC . "class.history.php");
-define('CLASS_SESSION_ACTION', DIR_AJAX_INC . "class.sessionaction.php");
-define('CLASS_PAGINATION', DIR_AJAX_INC . 'class.pagination.php');
-define('CLASS_SEARCH', DIR_AJAX_INC . "class.search.php");
+define('CLASS_FILE', DIR_AJAX_INC.'class.file.php');
+define("CLASS_UPLOAD", DIR_AJAX_INC.'class.upload.php');
+define('CLASS_MANAGER', DIR_AJAX_INC.'class.manager.php');
+define('CLASS_IMAGE', DIR_AJAX_INC."class.image.php");
+define('CLASS_HISTORY', DIR_AJAX_INC."class.history.php");
+define('CLASS_SESSION_ACTION', DIR_AJAX_INC."class.sessionaction.php");
+define('CLASS_PAGINATION', DIR_AJAX_INC.'class.pagination.php');
+define('CLASS_SEARCH', DIR_AJAX_INC."class.search.php");
 //SCRIPT FILES declarations
-define('SPT_FUNCTION_BASE', DIR_AJAX_INC . 'function.base.php');
+define('SPT_FUNCTION_BASE', DIR_AJAX_INC.'function.base.php');
 //include different config base file according to query string "config"
 $configBaseFileName = 'config.base.php';
 
-if(CONFIG_QUERY_STRING_ENABLE && !empty($_GET['config']) && file_exists(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'config.' . secureFileName($_GET['config']) . ".php")
+if (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['config']) && file_exists(dirname(__FILE__)).DIRECTORY_SEPARATOR.'config.'.secureFileName($_GET['config']).".php")
 {
-    $configBaseFileName = 'config.' . secureFileName($_GET['config']) . ".php";
+    $configBaseFileName = 'config.'.secureFileName($_GET['config']).".php";
 }
-require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . $configBaseFileName);
+require_once(dirname(__FILE__).DIRECTORY_SEPARATOR.$configBaseFileName);
 
 
-require_once(DIR_AJAX_LANGS . CONFIG_LANG_DEFAULT . ".php");
-require_once(DIR_AJAX_INC . "function.base.php");
+require_once(DIR_AJAX_LANGS.CONFIG_LANG_DEFAULT.".php");
+require_once(DIR_AJAX_INC."function.base.php");
 
-require_once(dirname(__FILE__) .  DIRECTORY_SEPARATOR . "class.session.php");
+require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."class.session.php");
 $session = new Session();
 $auth = new Auth();
 
-if(CONFIG_ACCESS_CONTROL_MODE == 1)
+if (CONFIG_ACCESS_CONTROL_MODE == 1)
 {//access control enabled
-    if(!$auth->isLoggedIn() && strtolower(basename($_SERVER['PHP_SELF']) != strtolower(basename(CONFIG_LOGIN_PAGE))))
+    if (!$auth->isLoggedIn() && strtolower(basename($_SERVER['PHP_SELF']) != strtolower(basename(CONFIG_LOGIN_PAGE))))
     {//
-        header('Location: ' . appendQueryString(CONFIG_LOGIN_PAGE, makeQueryString()));
+        header('Location: '.appendQueryString(CONFIG_LOGIN_PAGE, makeQueryString()));
         exit;
     }
 }

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

Indentation +47 added lines, -47 removed lines

@@ -1,53 +1,53 @@
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php 
 /**
- * the purpose I added this class is to make the file system much flexible 
- * for customization.
- * Actually,  this is a kind of interface and you should modify it to fit your system
- * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
- * @link www.phpletter.com
- * @since 4/August/2007
- */
-	class Auth
-	{
-		var $__loginIndexInSession = 'ajax_user';
-		function __construct()
-		{
+     * the purpose I added this class is to make the file system much flexible 
+     * for customization.
+     * Actually,  this is a kind of interface and you should modify it to fit your system
+     * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @link www.phpletter.com
+     * @since 4/August/2007
+     */
+    class Auth
+    {
+        var $__loginIndexInSession = 'ajax_user';
+        function __construct()
+        {
 			
-		}
+        }
 		
-		function Auth()
-		{
-			$this->__construct();
-		}
-		/**
-		 * check if the user has logged
-		 *
-		 * @return boolean
-		 */
-		function isLoggedIn()
-		{
-			return (!empty($_SESSION[$this->__loginIndexInSession])?true:false);
-		}
-		/**
-		 * validate the username & password
-		 * @return boolean
-		 *
-		 */
-		function login()
-		{
-			if($_POST['username'] == CONFIG_LOGIN_USERNAME && $_POST['password'] == CONFIG_LOGIN_PASSWORD)
-			{
-				$_SESSION[$this->__loginIndexInSession] = true;
-				return true;
-			}else 
-			{
-				return false;
-			}
-		}
-	}
+        function Auth()
+        {
+            $this->__construct();
+        }
+        /**
+         * check if the user has logged
+         *
+         * @return boolean
+         */
+        function isLoggedIn()
+        {
+            return (!empty($_SESSION[$this->__loginIndexInSession])?true:false);
+        }
+        /**
+         * validate the username & password
+         * @return boolean
+         *
+         */
+        function login()
+        {
+            if($_POST['username'] == CONFIG_LOGIN_USERNAME && $_POST['password'] == CONFIG_LOGIN_PASSWORD)
+            {
+                $_SESSION[$this->__loginIndexInSession] = true;
+                return true;
+            }else 
+            {
+                return false;
+            }
+        }
+    }
 ?>
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
@@ -31,7 +31,7 @@ 
 		 */
 		function isLoggedIn()
 		{
-			return (!empty($_SESSION[$this->__loginIndexInSession])?true:false);
+			return (!empty($_SESSION[$this->__loginIndexInSession]) ? true : false);
 		}
 		/**
 		 * validate the username & password
@@ -40,11 +40,11 @@ 
 		 */
 		function login()
 		{
-			if($_POST['username'] == CONFIG_LOGIN_USERNAME && $_POST['password'] == CONFIG_LOGIN_PASSWORD)
+			if ($_POST['username'] == CONFIG_LOGIN_USERNAME && $_POST['password'] == CONFIG_LOGIN_PASSWORD)
 			{
 				$_SESSION[$this->__loginIndexInSession] = true;
 				return true;
-			}else 
+			} else 
 			{
 				return false;
 			}

Braces +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 			{
 				$_SESSION[$this->__loginIndexInSession] = true;
 				return true;
-			}else 
+			} else 
 			{
 				return false;
 			}

phpmyfaq/admin/editor/plugins/ajaxfilemanager/inc/data.php

Indentation +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-	die();
+    die();
 ?><pre>Array
 (
     [currentFolderPath] => ../../../../uploaded/

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

Indentation +101 added lines, -103 removed lines

@@ -1,16 +1,16 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php
-	/**
-	 * sysem base config setting
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 1/August/2007
-	 *
-	 */
+    /**
+     * sysem base config setting
+     * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @link www.phpletter.com
+     * @since 1/August/2007
+     *
+     */
 	
 
 error_reporting(E_ALL);	
@@ -18,121 +18,119 @@ 
 	
 	
 
-	//Access Control Setting
-	/**
-	 * turn off => false
-	 * by session => true
-	 */
+    //Access Control Setting
+    /**
+     * turn off => false
+     * by session => true
+     */
     define('CONFIG_ACCESS_CONTROL_MODE', true);
     define("CONFIG_LOGIN_USERNAME", 'sdfgdfgdfgdgfdgsdfsdfg3454dsfb5e');
     define('CONFIG_LOGIN_PASSWORD', 'ASDF@#%JHGSDFGasdkjfh3812764ksdjfbhkjxcf');
-	define('CONFIG_LOGIN_PAGE', 'ajax_login.php'); //the url to the login page
+    define('CONFIG_LOGIN_PAGE', 'ajax_login.php'); //the url to the login page
 	
-	//SYSTEM MODE CONFIG
-		/**
-		 * turn it on when you have this system for demo purpose
-		*  that means changes made to each image is not physically applied to it 
-		*  and all uploaded files/created folders will be removed automatically
-		*/
-	define('CONFIG_SYS_DEMO_ENABLE', false); 
-	define('CONFIG_SYS_VIEW_ONLY', false); //diabled the system, view only
-	define('CONFIG_SYS_THUMBNAIL_VIEW_ENABLE', true);//REMOVE THE thumbnail view if false
+    //SYSTEM MODE CONFIG
+        /**
+         * turn it on when you have this system for demo purpose
+         *  that means changes made to each image is not physically applied to it 
+         *  and all uploaded files/created folders will be removed automatically
+         */
+    define('CONFIG_SYS_DEMO_ENABLE', false); 
+    define('CONFIG_SYS_VIEW_ONLY', false); //diabled the system, view only
+    define('CONFIG_SYS_THUMBNAIL_VIEW_ENABLE', true);//REMOVE THE thumbnail view if false
 	
-	//User Permissions
-	define('CONFIG_OPTIONS_DELETE', true); //disable to delete folder
-	define('CONFIG_OPTIONS_CUT', true);	//disalbe to cut a file/folder
-	define('CONFIG_OPTIONS_COPY', true);	//disable to copy a file/folder
-	define('CONFIG_OPTIONS_NEWFOLDER', true); //disable to create new folder 
-	define('CONFIG_OPTIONS_RENAME', true); //disable to rename the file/folder
-	define('CONFIG_OPTIONS_UPLOAD', true); //disable to upload the file
-	define('CONFIG_OPTIONS_EDITABLE', true); //disable image editor and text editor
-	define('CONFIG_OPTIONS_SEARCH', true); //disable to search documents
-	//FILESYSTEM CONFIG
-		/*
+    //User Permissions
+    define('CONFIG_OPTIONS_DELETE', true); //disable to delete folder
+    define('CONFIG_OPTIONS_CUT', true);	//disalbe to cut a file/folder
+    define('CONFIG_OPTIONS_COPY', true);	//disable to copy a file/folder
+    define('CONFIG_OPTIONS_NEWFOLDER', true); //disable to create new folder 
+    define('CONFIG_OPTIONS_RENAME', true); //disable to rename the file/folder
+    define('CONFIG_OPTIONS_UPLOAD', true); //disable to upload the file
+    define('CONFIG_OPTIONS_EDITABLE', true); //disable image editor and text editor
+    define('CONFIG_OPTIONS_SEARCH', true); //disable to search documents
+    //FILESYSTEM CONFIG
+        /*
 		* CONFIG_SYS_DEFAULT_PATH is the default folder where the files would be uploaded to
 			and it must be a folder under the CONFIG_SYS_ROOT_PATH or the same folder
 			these two paths accept relative path only, don't use absolute path
 		*/
 		
-	define('CONFIG_SYS_DEFAULT_PATH', '../../../../images/'); //accept relative path only
-	define('CONFIG_SYS_ROOT_PATH', '../../../../images/');	//accept relative path only
-	define('CONFIG_SYS_FOLDER_SHOWN_ON_TOP', true); //show your folders on the top of list if true or order by name 
-	define("CONFIG_SYS_DIR_SESSION_PATH", '/tmp');
-	define("CONFIG_SYS_PATTERN_FORMAT", 'list'); //three options: reg ,csv, list, this option define the parttern format for the following patterns
-		/**
-		 * reg => regulare expression
-		 * csv => a list of comma separated file/folder name, (exactly match the specified file/folders)
-		 * list => a list of comma spearated vague file/folder name (partially match the specified file/folders)
-		 *
-		 */
-	//more details about regular expression please visit http://nz.php.net/manual/en/function.eregi.php
-	define('CONFIG_SYS_INC_DIR_PATTERN', ''); //force listing of folders with such pattern(s). separated by , if multiple
-	define('CONFIG_SYS_EXC_DIR_PATTERN', ''); //will prevent listing of folders with such pattern(s). separated by , if multiple
-	define('CONFIG_SYS_INC_FILE_PATTERN', ''); //force listing of fiels with such pattern(s). separated by , if multiple
-	define('CONFIG_SYS_EXC_FILE_PATTERN', ''); //will prevent listing of files with such pattern(s). separated by , if multiple
-	define('CONFIG_SYS_DELETE_RECURSIVE', 1); //delete all contents within a specific folder if set to be 1
+    define('CONFIG_SYS_DEFAULT_PATH', '../../../../images/'); //accept relative path only
+    define('CONFIG_SYS_ROOT_PATH', '../../../../images/');	//accept relative path only
+    define('CONFIG_SYS_FOLDER_SHOWN_ON_TOP', true); //show your folders on the top of list if true or order by name 
+    define("CONFIG_SYS_DIR_SESSION_PATH", '/tmp');
+    define("CONFIG_SYS_PATTERN_FORMAT", 'list'); //three options: reg ,csv, list, this option define the parttern format for the following patterns
+        /**
+         * reg => regulare expression
+         * csv => a list of comma separated file/folder name, (exactly match the specified file/folders)
+         * list => a list of comma spearated vague file/folder name (partially match the specified file/folders)
+         *
+         */
+    //more details about regular expression please visit http://nz.php.net/manual/en/function.eregi.php
+    define('CONFIG_SYS_INC_DIR_PATTERN', ''); //force listing of folders with such pattern(s). separated by , if multiple
+    define('CONFIG_SYS_EXC_DIR_PATTERN', ''); //will prevent listing of folders with such pattern(s). separated by , if multiple
+    define('CONFIG_SYS_INC_FILE_PATTERN', ''); //force listing of fiels with such pattern(s). separated by , if multiple
+    define('CONFIG_SYS_EXC_FILE_PATTERN', ''); //will prevent listing of files with such pattern(s). separated by , if multiple
+    define('CONFIG_SYS_DELETE_RECURSIVE', 1); //delete all contents within a specific folder if set to be 1
 	
-	//UPLOAD OPTIONS CONFIG
-	define('CONFIG_UPLOAD_MAXSIZE', 50 * 1024 & 1024 ); //by bytes
-	//define('CONFIG_UPLOAD_MAXSIZE', 2048); //by bytes
-	//define('CONFIG_UPLOAD_VALID_EXTS', 'txt');//
+    //UPLOAD OPTIONS CONFIG
+    define('CONFIG_UPLOAD_MAXSIZE', 50 * 1024 & 1024 ); //by bytes
+    //define('CONFIG_UPLOAD_MAXSIZE', 2048); //by bytes
+    //define('CONFIG_UPLOAD_VALID_EXTS', 'txt');//
 
-	define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid
+    define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid
 	
-	define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste
-	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // 
-	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');//
-	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf');
-	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // 
-	define('CONFIG_UPLOAD_INVALID_EXTS', '');
+    define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste
+    define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // 
+    //define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');//
+    define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf');
+    //define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // 
+    define('CONFIG_UPLOAD_INVALID_EXTS', '');
 
-	//Preview
-	define('CONFIG_IMG_THUMBNAIL_MAX_X', 100);
-	define('CONFIG_IMG_THUMBNAIL_MAX_Y', 100);
-	define('CONFIG_THICKBOX_MAX_WIDTH', 700);
-	define('CONFIG_THICKBOX_MAX_HEIGHT', 430);
+    //Preview
+    define('CONFIG_IMG_THUMBNAIL_MAX_X', 100);
+    define('CONFIG_IMG_THUMBNAIL_MAX_Y', 100);
+    define('CONFIG_THICKBOX_MAX_WIDTH', 700);
+    define('CONFIG_THICKBOX_MAX_HEIGHT', 430);
 	
 	
-		/**
-		 * CONFIG_URL_PREVIEW_ROOT was replaced by CONFIG_WEBSITE_DOCUMENT_ROOT since v0.8
-		 * Normally, you don't need to bother with CONFIG_WEBSITE_DOCUMENT_ROOT
-		 * Howerver, some Web Hosts do not have standard php.ini setting 
-		 * which you will find the file manager can not locate your files correctly
-		 * if you do have such issue, please change it to fit your system.
-		 * so what should you to do get it
-		 *   1. create a php script file (let's call it document_root.php)
-		 *   2. add the following codes in in 
-		 * 			<?php
-		 * 				echo dirname(__FILE__);
-		 * 			?>
-		 *   3. upload document_root.php to you website root folder which will only be reached when you visit http://www.domain-name.com or http://localhost/ at localhost computer
-		 *   4. run it via http://www.domain-name.com/document_root.php or http://localhost/docuent_root.php if localhost computer, the url has to be exactly like that 
-		 *   5. the value shown on the screen is CONFIG_WEBSITE_DOCUMENT_ROOT should be
-		 *   6. enjoy it
-
-		        
-		 * 		
-		 */
+        /**
+         * CONFIG_URL_PREVIEW_ROOT was replaced by CONFIG_WEBSITE_DOCUMENT_ROOT since v0.8
+         * Normally, you don't need to bother with CONFIG_WEBSITE_DOCUMENT_ROOT
+         * Howerver, some Web Hosts do not have standard php.ini setting 
+         * which you will find the file manager can not locate your files correctly
+         * if you do have such issue, please change it to fit your system.
+         * so what should you to do get it
+         *   1. create a php script file (let's call it document_root.php)
+         *   2. add the following codes in in 
+         * 			<?php
+         * 				echo dirname(__FILE__);
+         * 			?>
+         *   3. upload document_root.php to you website root folder which will only be reached when you visit http://www.domain-name.com or http://localhost/ at localhost computer
+         *   4. run it via http://www.domain-name.com/document_root.php or http://localhost/docuent_root.php if localhost computer, the url has to be exactly like that 
+         *   5. the value shown on the screen is CONFIG_WEBSITE_DOCUMENT_ROOT should be
+         *   6. enjoy it
+         * 		
+         */
 		
 
-	define('CONFIG_WEBSITE_DOCUMENT_ROOT', $_SERVER['DOCUMENT_ROOT']);
-	//theme related setting
-			/*
+    define('CONFIG_WEBSITE_DOCUMENT_ROOT', $_SERVER['DOCUMENT_ROOT']);
+    //theme related setting
+            /*
 			*	options avaialbe for CONFIG_EDITOR_NAME are:
 					stand_alone
 					tinymce
 					fckeditor
 			*/
-	//CONFIG_EDITOR_NAME replaced CONFIG_THEME_MODE since @version 0.8			
-	define('CONFIG_EDITOR_NAME', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['editor'])?secureFileName($_GET['editor']):'tinymce')); 
-	define('CONFIG_THEME_NAME', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['theme'])?secureFileName($_GET['theme']):'default'));  //change the theme to your custom theme rather than default
-	define('CONFIG_DEFAULT_VIEW', (CONFIG_SYS_THUMBNAIL_VIEW_ENABLE?'detail':'detail')); //thumnail or detail
-	define('CONFIG_DEFAULT_PAGINATION_LIMIT', 10);
-	define('CONFIG_LOAD_DOC_LATTER', false); //all documents will be loaded up after the template has been loaded to the client 
+    //CONFIG_EDITOR_NAME replaced CONFIG_THEME_MODE since @version 0.8			
+    define('CONFIG_EDITOR_NAME', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['editor'])?secureFileName($_GET['editor']):'tinymce')); 
+    define('CONFIG_THEME_NAME', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['theme'])?secureFileName($_GET['theme']):'default'));  //change the theme to your custom theme rather than default
+    define('CONFIG_DEFAULT_VIEW', (CONFIG_SYS_THUMBNAIL_VIEW_ENABLE?'detail':'detail')); //thumnail or detail
+    define('CONFIG_DEFAULT_PAGINATION_LIMIT', 10);
+    define('CONFIG_LOAD_DOC_LATTER', false); //all documents will be loaded up after the template has been loaded to the client 
 	
-	//General Option Declarations
-	//LANGAUGAE DECLARATIONNS
+    //General Option Declarations
+    //LANGAUGAE DECLARATIONNS
 
-	define('CONFIG_LANG_INDEX', 'language'); //the index in the session
-	define('CONFIG_LANG_DEFAULT', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['language']) && file_exists(DIR_LANG . secureFileName($_GET['language']) . '.php')?secureFileName($_GET['language']):'en')); //change it to be your language file base name, such en
+    define('CONFIG_LANG_INDEX', 'language'); //the index in the session
+    define('CONFIG_LANG_DEFAULT', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['language']) && file_exists(DIR_LANG . secureFileName($_GET['language']) . '.php')?secureFileName($_GET['language']):'en')); //change it to be your language file base name, such en
 ?>
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
@@ -36,12 +36,12 @@ 
 		*/
 	define('CONFIG_SYS_DEMO_ENABLE', false); 
 	define('CONFIG_SYS_VIEW_ONLY', false); //diabled the system, view only
-	define('CONFIG_SYS_THUMBNAIL_VIEW_ENABLE', true);//REMOVE THE thumbnail view if false
+	define('CONFIG_SYS_THUMBNAIL_VIEW_ENABLE', true); //REMOVE THE thumbnail view if false
 	
 	//User Permissions
 	define('CONFIG_OPTIONS_DELETE', true); //disable to delete folder
-	define('CONFIG_OPTIONS_CUT', true);	//disalbe to cut a file/folder
-	define('CONFIG_OPTIONS_COPY', true);	//disable to copy a file/folder
+	define('CONFIG_OPTIONS_CUT', true); //disalbe to cut a file/folder
+	define('CONFIG_OPTIONS_COPY', true); //disable to copy a file/folder
 	define('CONFIG_OPTIONS_NEWFOLDER', true); //disable to create new folder 
 	define('CONFIG_OPTIONS_RENAME', true); //disable to rename the file/folder
 	define('CONFIG_OPTIONS_UPLOAD', true); //disable to upload the file
@@ -55,7 +55,7 @@ 
 		*/
 		
 	define('CONFIG_SYS_DEFAULT_PATH', '../../../../images/'); //accept relative path only
-	define('CONFIG_SYS_ROOT_PATH', '../../../../images/');	//accept relative path only
+	define('CONFIG_SYS_ROOT_PATH', '../../../../images/'); //accept relative path only
 	define('CONFIG_SYS_FOLDER_SHOWN_ON_TOP', true); //show your folders on the top of list if true or order by name 
 	define("CONFIG_SYS_DIR_SESSION_PATH", '/tmp');
 	define("CONFIG_SYS_PATTERN_FORMAT", 'list'); //three options: reg ,csv, list, this option define the parttern format for the following patterns
@@ -73,7 +73,7 @@ 
 	define('CONFIG_SYS_DELETE_RECURSIVE', 1); //delete all contents within a specific folder if set to be 1
 	
 	//UPLOAD OPTIONS CONFIG
-	define('CONFIG_UPLOAD_MAXSIZE', 50 * 1024 & 1024 ); //by bytes
+	define('CONFIG_UPLOAD_MAXSIZE', 50*1024 & 1024); //by bytes
 	//define('CONFIG_UPLOAD_MAXSIZE', 2048); //by bytes
 	//define('CONFIG_UPLOAD_VALID_EXTS', 'txt');//
 
@@ -124,9 +124,9 @@ 
 					fckeditor
 			*/
 	//CONFIG_EDITOR_NAME replaced CONFIG_THEME_MODE since @version 0.8			
-	define('CONFIG_EDITOR_NAME', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['editor'])?secureFileName($_GET['editor']):'tinymce')); 
-	define('CONFIG_THEME_NAME', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['theme'])?secureFileName($_GET['theme']):'default'));  //change the theme to your custom theme rather than default
-	define('CONFIG_DEFAULT_VIEW', (CONFIG_SYS_THUMBNAIL_VIEW_ENABLE?'detail':'detail')); //thumnail or detail
+	define('CONFIG_EDITOR_NAME', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['editor']) ? secureFileName($_GET['editor']) : 'tinymce')); 
+	define('CONFIG_THEME_NAME', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['theme']) ? secureFileName($_GET['theme']) : 'default')); //change the theme to your custom theme rather than default
+	define('CONFIG_DEFAULT_VIEW', (CONFIG_SYS_THUMBNAIL_VIEW_ENABLE ? 'detail' : 'detail')); //thumnail or detail
 	define('CONFIG_DEFAULT_PAGINATION_LIMIT', 10);
 	define('CONFIG_LOAD_DOC_LATTER', false); //all documents will be loaded up after the template has been loaded to the client 
 	
@@ -134,5 +134,5 @@ 
 	//LANGAUGAE DECLARATIONNS
 
 	define('CONFIG_LANG_INDEX', 'language'); //the index in the session
-	define('CONFIG_LANG_DEFAULT', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['language']) && file_exists(DIR_LANG . secureFileName($_GET['language']) . '.php')?secureFileName($_GET['language']):'en')); //change it to be your language file base name, such en
+	define('CONFIG_LANG_DEFAULT', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['language']) && file_exists(DIR_LANG.secureFileName($_GET['language']).'.php') ? secureFileName($_GET['language']) : 'en')); //change it to be your language file base name, such en
 ?>
\ No newline at end of file

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

Indentation +167 added lines, -167 removed lines

@@ -1,189 +1,189 @@
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php
-	include_once(CLASS_FILE);
-	require_once(CLASS_SESSION_ACTION);
-	require_once(CLASS_MANAGER);
-	class Search
-	{
-		var $rootFolder = '';
-		var $files = array();
-		var $rootFolderInfo = array();
-		var $searchkeywords = array(
-			'mtime_from'=>'',
-			'mtime_to'=>'',
-			'name'=>'',
-			'size_from'=>'',
-			'size_to'=>'',
-			'recursive'=>'0',
+    include_once(CLASS_FILE);
+    require_once(CLASS_SESSION_ACTION);
+    require_once(CLASS_MANAGER);
+    class Search
+    {
+        var $rootFolder = '';
+        var $files = array();
+        var $rootFolderInfo = array();
+        var $searchkeywords = array(
+            'mtime_from'=>'',
+            'mtime_to'=>'',
+            'name'=>'',
+            'size_from'=>'',
+            'size_to'=>'',
+            'recursive'=>'0',
 			
-		);
-		var $sessionAction = null;
-		/**
-		 * constructor
-		 *
-		 * @param string $rootFolder
-		 */
-		function __construct($rootFolder)
-		{
-			$this->rootFolder = $rootFolder;
-			$this->sessionAction = new SessionAction();
-			$objRootFolder = new file($this->rootFolder);
-			$tem = $objRootFolder->getFileInfo();
-			$obj = new manager($this->rootFolder, false);			
-			$obj->setSessionAction($this->sessionAction);
-			$selectedDocuments = $this->sessionAction->get();					
-			$fileType = $obj->getFolderInfo($this->rootFolder);
+        );
+        var $sessionAction = null;
+        /**
+         * constructor
+         *
+         * @param string $rootFolder
+         */
+        function __construct($rootFolder)
+        {
+            $this->rootFolder = $rootFolder;
+            $this->sessionAction = new SessionAction();
+            $objRootFolder = new file($this->rootFolder);
+            $tem = $objRootFolder->getFileInfo();
+            $obj = new manager($this->rootFolder, false);			
+            $obj->setSessionAction($this->sessionAction);
+            $selectedDocuments = $this->sessionAction->get();					
+            $fileType = $obj->getFolderInfo($this->rootFolder);
 			
-			foreach($fileType as $k=>$v)
-			{
-				$tem[$k] = $v;
-			}
+            foreach($fileType as $k=>$v)
+            {
+                $tem[$k] = $v;
+            }
 			
-			$tem['path'] = backslashToSlash($this->rootFolder);		
-			$tem['type'] = (is_dir($this->rootFolder)?'folder':'file');
-			$tem['size'] = (is_dir($this->rootFolder)?'':transformFileSize(@filesize($this->rootFolder)));
-			//$tem['ctime'] = date(DATE_TIME_FORMAT, $tem['ctime']);
-			//$tem['mtime'] = date(DATE_TIME_FORMAT, $tem['mtime']);
-			$tem['flag'] = (array_search($tem['path'], $selectedDocuments) !== false?($this->sessionAction->getAction() == "copy"?'copyFlag':'cutFlag'):'noFlag');
-			$tem['url'] = getFileUrl($this->rootFolder);
-			$tem['friendly_path'] = transformFilePath($this->rootFolder);
-			$tem['file'] = 0;
-			$tem['subdir'] = 0;
-			$manager = null;
-			$this->rootFolderInfo = $tem;
-			$tem = null;			
-		}
+            $tem['path'] = backslashToSlash($this->rootFolder);		
+            $tem['type'] = (is_dir($this->rootFolder)?'folder':'file');
+            $tem['size'] = (is_dir($this->rootFolder)?'':transformFileSize(@filesize($this->rootFolder)));
+            //$tem['ctime'] = date(DATE_TIME_FORMAT, $tem['ctime']);
+            //$tem['mtime'] = date(DATE_TIME_FORMAT, $tem['mtime']);
+            $tem['flag'] = (array_search($tem['path'], $selectedDocuments) !== false?($this->sessionAction->getAction() == "copy"?'copyFlag':'cutFlag'):'noFlag');
+            $tem['url'] = getFileUrl($this->rootFolder);
+            $tem['friendly_path'] = transformFilePath($this->rootFolder);
+            $tem['file'] = 0;
+            $tem['subdir'] = 0;
+            $manager = null;
+            $this->rootFolderInfo = $tem;
+            $tem = null;			
+        }
 		
 		
 		
-		/**
-		 * constructor
-		 *
-		 * @param string $rootFolder
-		 */
-		function Search($rootFolder)
-		{
-			$this->__construct($rootFolder);
-		}
+        /**
+         * constructor
+         *
+         * @param string $rootFolder
+         */
+        function Search($rootFolder)
+        {
+            $this->__construct($rootFolder);
+        }
 
-		/**
-		 * change the search keyword individually
-		 *
-		 * @param string $key
-		 * @param string $value
-		 */
-		function addSearchKeyword($key, $value)
-		{
-			$this->searchkeywords[$key] = $value;
-		}
-		/**
-		 * change the search keywords 
-		 *
-		 * @param array $keywords
-		 */
-		function addSearchKeywords($keywords)
-		{
-			foreach($this->searchkeywords as $k=>$v)
-			{
-				if(array_key_exists($k, $keywords) !== false)
-				{
-					$this->searchkeywords[$k] = $keywords[$k];
-				}
-			}
-		}
-		/**
-		 * get the file according to the search keywords
-		 *
-		 */
-		function doSearch($baseFolderPath = null)
-		{
+        /**
+         * change the search keyword individually
+         *
+         * @param string $key
+         * @param string $value
+         */
+        function addSearchKeyword($key, $value)
+        {
+            $this->searchkeywords[$key] = $value;
+        }
+        /**
+         * change the search keywords 
+         *
+         * @param array $keywords
+         */
+        function addSearchKeywords($keywords)
+        {
+            foreach($this->searchkeywords as $k=>$v)
+            {
+                if(array_key_exists($k, $keywords) !== false)
+                {
+                    $this->searchkeywords[$k] = $keywords[$k];
+                }
+            }
+        }
+        /**
+         * get the file according to the search keywords
+         *
+         */
+        function doSearch($baseFolderPath = null)
+        {
 			
-			$baseFolderPath = addTrailingSlash(backslashToSlash((is_null($baseFolderPath)?$this->rootFolder:$baseFolderPath)));
+            $baseFolderPath = addTrailingSlash(backslashToSlash((is_null($baseFolderPath)?$this->rootFolder:$baseFolderPath)));
 			
-			$dirHandler = @opendir($baseFolderPath);
-			if($dirHandler)
-			{
-				while(false !== ($file = readdir($dirHandler)))
-				{
-					if($file != '.' && $file != '..')
-					{
-						$path = $baseFolderPath . $file;
-						if(is_file($path))
-						{
-							$isValid = true;
+            $dirHandler = @opendir($baseFolderPath);
+            if($dirHandler)
+            {
+                while(false !== ($file = readdir($dirHandler)))
+                {
+                    if($file != '.' && $file != '..')
+                    {
+                        $path = $baseFolderPath . $file;
+                        if(is_file($path))
+                        {
+                            $isValid = true;
 
-							$fileTime = @filemtime($path);
-							$fileSize = @filesize($path);	
-							if($this->searchkeywords['name'] !== ''  && @eregi($this->searchkeywords['name'], $file) === false)
-							{
-								$isValid = false;
-							}
-							if($this->searchkeywords['mtime_from'] != '' && $fileTime < @strtotime($this->searchkeywords['mtime_from']))
-							{
-								$isValid = false;
-							}
-							if($this->searchkeywords['mtime_to'] != '' && $fileTime > @strtotime($this->searchkeywords['mtime_to']))
-							{
-								$isValid = false;
-							}							
-							if($this->searchkeywords['size_from'] != '' && $fileSize < @strtotime($this->searchkeywords['size_from']))
-							{
-								$isValid = false;
-							}
-							if($this->searchkeywords['size_to'] != '' && $fileSize > @strtotime($this->searchkeywords['size_to']))
-							{
-								$isValid = false;
-							}			
-							if($isValid && isListingDocument($path))
-							{
-								$finalPath = $path;
-								$objFile = new file($finalPath);
-								$tem = $objFile->getFileInfo();
-								$obj = new manager($finalPath, false);			
-								$obj->setSessionAction($this->sessionAction);
-								$selectedDocuments = $this->sessionAction->get();													
-								$fileType = $obj->getFileType($finalPath);
+                            $fileTime = @filemtime($path);
+                            $fileSize = @filesize($path);	
+                            if($this->searchkeywords['name'] !== ''  && @eregi($this->searchkeywords['name'], $file) === false)
+                            {
+                                $isValid = false;
+                            }
+                            if($this->searchkeywords['mtime_from'] != '' && $fileTime < @strtotime($this->searchkeywords['mtime_from']))
+                            {
+                                $isValid = false;
+                            }
+                            if($this->searchkeywords['mtime_to'] != '' && $fileTime > @strtotime($this->searchkeywords['mtime_to']))
+                            {
+                                $isValid = false;
+                            }							
+                            if($this->searchkeywords['size_from'] != '' && $fileSize < @strtotime($this->searchkeywords['size_from']))
+                            {
+                                $isValid = false;
+                            }
+                            if($this->searchkeywords['size_to'] != '' && $fileSize > @strtotime($this->searchkeywords['size_to']))
+                            {
+                                $isValid = false;
+                            }			
+                            if($isValid && isListingDocument($path))
+                            {
+                                $finalPath = $path;
+                                $objFile = new file($finalPath);
+                                $tem = $objFile->getFileInfo();
+                                $obj = new manager($finalPath, false);			
+                                $obj->setSessionAction($this->sessionAction);
+                                $selectedDocuments = $this->sessionAction->get();													
+                                $fileType = $obj->getFileType($finalPath);
 								
-								foreach($fileType as $k=>$v)
-								{
-									$tem[$k] = $v;
-								}
+                                foreach($fileType as $k=>$v)
+                                {
+                                    $tem[$k] = $v;
+                                }
 								
-								$tem['path'] = backslashToSlash($finalPath);		
-								$tem['type'] = (is_dir($finalPath)?'folder':'file');
+                                $tem['path'] = backslashToSlash($finalPath);		
+                                $tem['type'] = (is_dir($finalPath)?'folder':'file');
 /*								$tem['size'] = transformFileSize($tem['size']);
 								$tem['ctime'] = date(DATE_TIME_FORMAT, $tem['ctime']);
 								$tem['mtime'] = date(DATE_TIME_FORMAT, $tem['mtime']);*/
-								$tem['flag'] = (array_search($tem['path'], $selectedDocuments) !== false?($this->sessionAction->getAction() == "copy"?'copyFlag':'cutFlag'):'noFlag');
-								$tem['url'] = getFileUrl($tem['path']);
-								$this->rootFolderInfo['file']++;
-								$manager = null;
-								$this->files[] = $tem;
-								$tem = null;								
-							}
-						}elseif(is_dir($path) && $this->searchkeywords['recursive'])
-						{
-							$this->Search($baseFolderPath);
-						}
-					}
-				}
-			}
+                                $tem['flag'] = (array_search($tem['path'], $selectedDocuments) !== false?($this->sessionAction->getAction() == "copy"?'copyFlag':'cutFlag'):'noFlag');
+                                $tem['url'] = getFileUrl($tem['path']);
+                                $this->rootFolderInfo['file']++;
+                                $manager = null;
+                                $this->files[] = $tem;
+                                $tem = null;								
+                            }
+                        }elseif(is_dir($path) && $this->searchkeywords['recursive'])
+                        {
+                            $this->Search($baseFolderPath);
+                        }
+                    }
+                }
+            }
 			 
-		}
+        }
 		
-		function getFoundFiles()
-		{
-			return $this->files;
-		}
+        function getFoundFiles()
+        {
+            return $this->files;
+        }
 		
-		function getRootFolderInfo()
-		{
+        function getRootFolderInfo()
+        {
 
-			return $this->rootFolderInfo;
-		}
-	}
+            return $this->rootFolderInfo;
+        }
+    }
 ?>
\ No newline at end of file

Spacing +23 added lines, -23 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
@@ -38,17 +38,17 @@ 
 			$selectedDocuments = $this->sessionAction->get();					
 			$fileType = $obj->getFolderInfo($this->rootFolder);
 			
-			foreach($fileType as $k=>$v)
+			foreach ($fileType as $k=>$v)
 			{
 				$tem[$k] = $v;
 			}
 			
 			$tem['path'] = backslashToSlash($this->rootFolder);		
-			$tem['type'] = (is_dir($this->rootFolder)?'folder':'file');
-			$tem['size'] = (is_dir($this->rootFolder)?'':transformFileSize(@filesize($this->rootFolder)));
+			$tem['type'] = (is_dir($this->rootFolder) ? 'folder' : 'file');
+			$tem['size'] = (is_dir($this->rootFolder) ? '' : transformFileSize(@filesize($this->rootFolder)));
 			//$tem['ctime'] = date(DATE_TIME_FORMAT, $tem['ctime']);
 			//$tem['mtime'] = date(DATE_TIME_FORMAT, $tem['mtime']);
-			$tem['flag'] = (array_search($tem['path'], $selectedDocuments) !== false?($this->sessionAction->getAction() == "copy"?'copyFlag':'cutFlag'):'noFlag');
+			$tem['flag'] = (array_search($tem['path'], $selectedDocuments) !== false ? ($this->sessionAction->getAction() == "copy" ? 'copyFlag' : 'cutFlag') : 'noFlag');
 			$tem['url'] = getFileUrl($this->rootFolder);
 			$tem['friendly_path'] = transformFilePath($this->rootFolder);
 			$tem['file'] = 0;
@@ -87,9 +87,9 @@ 
 		 */
 		function addSearchKeywords($keywords)
 		{
-			foreach($this->searchkeywords as $k=>$v)
+			foreach ($this->searchkeywords as $k=>$v)
 			{
-				if(array_key_exists($k, $keywords) !== false)
+				if (array_key_exists($k, $keywords) !== false)
 				{
 					$this->searchkeywords[$k] = $keywords[$k];
 				}
@@ -102,43 +102,43 @@ 
 		function doSearch($baseFolderPath = null)
 		{
 			
-			$baseFolderPath = addTrailingSlash(backslashToSlash((is_null($baseFolderPath)?$this->rootFolder:$baseFolderPath)));
+			$baseFolderPath = addTrailingSlash(backslashToSlash((is_null($baseFolderPath) ? $this->rootFolder : $baseFolderPath)));
 			
 			$dirHandler = @opendir($baseFolderPath);
-			if($dirHandler)
+			if ($dirHandler)
 			{
-				while(false !== ($file = readdir($dirHandler)))
+				while (false !== ($file = readdir($dirHandler)))
 				{
-					if($file != '.' && $file != '..')
+					if ($file != '.' && $file != '..')
 					{
-						$path = $baseFolderPath . $file;
-						if(is_file($path))
+						$path = $baseFolderPath.$file;
+						if (is_file($path))
 						{
 							$isValid = true;
 
 							$fileTime = @filemtime($path);
 							$fileSize = @filesize($path);	
-							if($this->searchkeywords['name'] !== ''  && @eregi($this->searchkeywords['name'], $file) === false)
+							if ($this->searchkeywords['name'] !== '' && @eregi($this->searchkeywords['name'], $file) === false)
 							{
 								$isValid = false;
 							}
-							if($this->searchkeywords['mtime_from'] != '' && $fileTime < @strtotime($this->searchkeywords['mtime_from']))
+							if ($this->searchkeywords['mtime_from'] != '' && $fileTime < @strtotime($this->searchkeywords['mtime_from']))
 							{
 								$isValid = false;
 							}
-							if($this->searchkeywords['mtime_to'] != '' && $fileTime > @strtotime($this->searchkeywords['mtime_to']))
+							if ($this->searchkeywords['mtime_to'] != '' && $fileTime > @strtotime($this->searchkeywords['mtime_to']))
 							{
 								$isValid = false;
 							}							
-							if($this->searchkeywords['size_from'] != '' && $fileSize < @strtotime($this->searchkeywords['size_from']))
+							if ($this->searchkeywords['size_from'] != '' && $fileSize < @strtotime($this->searchkeywords['size_from']))
 							{
 								$isValid = false;
 							}
-							if($this->searchkeywords['size_to'] != '' && $fileSize > @strtotime($this->searchkeywords['size_to']))
+							if ($this->searchkeywords['size_to'] != '' && $fileSize > @strtotime($this->searchkeywords['size_to']))
 							{
 								$isValid = false;
 							}			
-							if($isValid && isListingDocument($path))
+							if ($isValid && isListingDocument($path))
 							{
 								$finalPath = $path;
 								$objFile = new file($finalPath);
@@ -148,24 +148,24 @@ 
 								$selectedDocuments = $this->sessionAction->get();													
 								$fileType = $obj->getFileType($finalPath);
 								
-								foreach($fileType as $k=>$v)
+								foreach ($fileType as $k=>$v)
 								{
 									$tem[$k] = $v;
 								}
 								
 								$tem['path'] = backslashToSlash($finalPath);		
-								$tem['type'] = (is_dir($finalPath)?'folder':'file');
+								$tem['type'] = (is_dir($finalPath) ? 'folder' : 'file');
 /*								$tem['size'] = transformFileSize($tem['size']);
 								$tem['ctime'] = date(DATE_TIME_FORMAT, $tem['ctime']);
 								$tem['mtime'] = date(DATE_TIME_FORMAT, $tem['mtime']);*/
-								$tem['flag'] = (array_search($tem['path'], $selectedDocuments) !== false?($this->sessionAction->getAction() == "copy"?'copyFlag':'cutFlag'):'noFlag');
+								$tem['flag'] = (array_search($tem['path'], $selectedDocuments) !== false ? ($this->sessionAction->getAction() == "copy" ? 'copyFlag' : 'cutFlag') : 'noFlag');
 								$tem['url'] = getFileUrl($tem['path']);
 								$this->rootFolderInfo['file']++;
 								$manager = null;
 								$this->files[] = $tem;
 								$tem = null;								
 							}
-						}elseif(is_dir($path) && $this->searchkeywords['recursive'])
+						}elseif (is_dir($path) && $this->searchkeywords['recursive'])
 						{
 							$this->Search($baseFolderPath);
 						}

Braces +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 								$this->files[] = $tem;
 								$tem = null;								
 							}
-						}elseif(is_dir($path) && $this->searchkeywords['recursive'])
+						} elseif(is_dir($path) && $this->searchkeywords['recursive'])
 						{
 							$this->Search($baseFolderPath);
 						}

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

Indentation +91 added lines, -91 removed lines

@@ -1,98 +1,98 @@
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php
 /**
-	 *Session Action Class 
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/May/2007
-	 *
-	 */
-	class SessionAction
-	{
-		var $actionIndex = 'ajax_file_action';
-		var $selectedDocIndex = 'ajax_selected_doc';
-		var $fromFolderIndex = 'ajax_from_folder';
-		function __construct()
-		{
-			if(!isset($_SESSION[$this->actionIndex]))
-			{
-				$_SESSION[$this->actionIndex] = '';
-			}
-			if(!isset($_SESSION[$this->selectedDocIndex]) || !is_array($_SESSION[$this->selectedDocIndex]))
-			{
-				$_SESSION[$this->selectedDocIndex] = array();
-			}
-			if(!isset($_SESSION[$this->fromFolderIndex]))
-			{
-				$_SESSION[$this->fromFolderIndex] = '';
-			}
-		}
+     *Session Action Class 
+     * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @link www.phpletter.com
+     * @since 22/May/2007
+     *
+     */
+    class SessionAction
+    {
+        var $actionIndex = 'ajax_file_action';
+        var $selectedDocIndex = 'ajax_selected_doc';
+        var $fromFolderIndex = 'ajax_from_folder';
+        function __construct()
+        {
+            if(!isset($_SESSION[$this->actionIndex]))
+            {
+                $_SESSION[$this->actionIndex] = '';
+            }
+            if(!isset($_SESSION[$this->selectedDocIndex]) || !is_array($_SESSION[$this->selectedDocIndex]))
+            {
+                $_SESSION[$this->selectedDocIndex] = array();
+            }
+            if(!isset($_SESSION[$this->fromFolderIndex]))
+            {
+                $_SESSION[$this->fromFolderIndex] = '';
+            }
+        }
 		
-		function SessionAction()
-		{
-			$this->__construct();
-		}
-		/**
-		 * count the  number of selected documents
-		 *
-		 */
-		function count()
-		{
-			return (isset($_SESSION[$this->selectedDocIndex])?sizeof($_SESSION[$this->selectedDocIndex]):0);
-		}
-		/**
-		 * assign the selected documents
-		 *
-		 * @param array $selectedDocuments
-		 */
-		function set($selectedDocuments)
-		{
-			$_SESSION[$this->selectedDocIndex] = $selectedDocuments;
+        function SessionAction()
+        {
+            $this->__construct();
+        }
+        /**
+         * count the  number of selected documents
+         *
+         */
+        function count()
+        {
+            return (isset($_SESSION[$this->selectedDocIndex])?sizeof($_SESSION[$this->selectedDocIndex]):0);
+        }
+        /**
+         * assign the selected documents
+         *
+         * @param array $selectedDocuments
+         */
+        function set($selectedDocuments)
+        {
+            $_SESSION[$this->selectedDocIndex] = $selectedDocuments;
 
-		}
-		/**
-		 * get the selected documents
-		 * @return array
-		 */
-		function get()
-		{
-			return (isset($_SESSION[$this->selectedDocIndex])?$_SESSION[$this->selectedDocIndex]:array());
-		}
+        }
+        /**
+         * get the selected documents
+         * @return array
+         */
+        function get()
+        {
+            return (isset($_SESSION[$this->selectedDocIndex])?$_SESSION[$this->selectedDocIndex]:array());
+        }
 		
-		function setAction($action)
-		{
-			$_SESSION[$this->actionIndex] = $action;			
-		}
-		/**
-		 * get the action
-		 *
-		 * @return unknown
-		 */
-		function getAction()
-		{
-			return (isset($_SESSION[$this->actionIndex])?$_SESSION[$this->actionIndex]:'');
-		}
-		/**
-		 * set the folder
-		 *
-		 * @param string $folder
-		 */
-		function setFolder($folder)
-		{
-			$_SESSION[$this->fromFolderIndex] = $folder;
-		}
-		/**
-		 * get the folder
-		 *
-		 * @return string
-		 */
-		function getFolder()
-		{
-			return (isset($_SESSION[$this->fromFolderIndex])?$_SESSION[$this->fromFolderIndex]:'');
-		}
-	}
+        function setAction($action)
+        {
+            $_SESSION[$this->actionIndex] = $action;			
+        }
+        /**
+         * get the action
+         *
+         * @return unknown
+         */
+        function getAction()
+        {
+            return (isset($_SESSION[$this->actionIndex])?$_SESSION[$this->actionIndex]:'');
+        }
+        /**
+         * set the folder
+         *
+         * @param string $folder
+         */
+        function setFolder($folder)
+        {
+            $_SESSION[$this->fromFolderIndex] = $folder;
+        }
+        /**
+         * get the folder
+         *
+         * @return string
+         */
+        function getFolder()
+        {
+            return (isset($_SESSION[$this->fromFolderIndex])?$_SESSION[$this->fromFolderIndex]:'');
+        }
+    }
 ?>
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
@@ -18,15 +18,15 @@ 
 		var $fromFolderIndex = 'ajax_from_folder';
 		function __construct()
 		{
-			if(!isset($_SESSION[$this->actionIndex]))
+			if (!isset($_SESSION[$this->actionIndex]))
 			{
 				$_SESSION[$this->actionIndex] = '';
 			}
-			if(!isset($_SESSION[$this->selectedDocIndex]) || !is_array($_SESSION[$this->selectedDocIndex]))
+			if (!isset($_SESSION[$this->selectedDocIndex]) || !is_array($_SESSION[$this->selectedDocIndex]))
 			{
 				$_SESSION[$this->selectedDocIndex] = array();
 			}
-			if(!isset($_SESSION[$this->fromFolderIndex]))
+			if (!isset($_SESSION[$this->fromFolderIndex]))
 			{
 				$_SESSION[$this->fromFolderIndex] = '';
 			}
@@ -42,7 +42,7 @@ 
 		 */
 		function count()
 		{
-			return (isset($_SESSION[$this->selectedDocIndex])?sizeof($_SESSION[$this->selectedDocIndex]):0);
+			return (isset($_SESSION[$this->selectedDocIndex]) ? sizeof($_SESSION[$this->selectedDocIndex]) : 0);
 		}
 		/**
 		 * assign the selected documents
@@ -60,7 +60,7 @@ 
 		 */
 		function get()
 		{
-			return (isset($_SESSION[$this->selectedDocIndex])?$_SESSION[$this->selectedDocIndex]:array());
+			return (isset($_SESSION[$this->selectedDocIndex]) ? $_SESSION[$this->selectedDocIndex] : array());
 		}
 		
 		function setAction($action)
@@ -74,7 +74,7 @@ 
 		 */
 		function getAction()
 		{
-			return (isset($_SESSION[$this->actionIndex])?$_SESSION[$this->actionIndex]:'');
+			return (isset($_SESSION[$this->actionIndex]) ? $_SESSION[$this->actionIndex] : '');
 		}
 		/**
 		 * set the folder
@@ -92,7 +92,7 @@ 
 		 */
 		function getFolder()
 		{
-			return (isset($_SESSION[$this->fromFolderIndex])?$_SESSION[$this->fromFolderIndex]:'');
+			return (isset($_SESSION[$this->fromFolderIndex]) ? $_SESSION[$this->fromFolderIndex] : '');
 		}
 	}
 ?>
\ No newline at end of file

phpmyfaq/admin/editor/plugins/ajaxfilemanager/ajax_image_save.php

Indentation +178 added lines, -178 removed lines

@@ -1,201 +1,201 @@
 <?php
-	/**
-	 * image save function
-	 * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
-	 * @link www.phpletter.com
-	 * @since 22/May/2007
-	 *
-	 */
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");	
+    /**
+     * image save function
+     * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+     * @link www.phpletter.com
+     * @since 22/May/2007
+     *
+     */
+    require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");	
 	
 
-	$error = "";
-	$info = "";
-	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
-	{
-		$error = SYS_DISABLED;
-	}
-	elseif(empty($_POST['path']))
-	{
-		$error  =  IMG_SAVE_EMPTY_PATH;
-	}elseif(!file_exists($_POST['path']))
-	{		
-		$error  =  IMG_SAVE_NOT_EXISTS;
-	}elseif(!isUnderRoot($_POST['path']))
-	{
-		$error = IMG_SAVE_PATH_DISALLOWED;
-	}elseif(($sessionDir = $session->getSessionDir()) == '')
-	{
-		$error = SESSION_PERSONAL_DIR_NOT_FOUND;
-	}
-	else
-	{	
-		require_once(CLASS_HISTORY);
-		$history = new History($_POST['path'], $session);
-		if(!empty($_POST['mode']))
-		{
-			//get the original image which is the lastest session image if any when the system is in demo
-			$lastestSessionImageInfo = $history->getLastestRestorable();
-			if(sizeof($lastestSessionImageInfo) && CONFIG_SYS_DEMO_ENABLE)
-			{				
-				$originalSessionImageInfo = $history->getOriginalImage();
-				if(sizeof($originalSessionImageInfo))
-				{					
-					$originalImage = $sessionDir . $originalSessionImageInfo['info']['name'];
-				}				
-			}
-			if(empty($originalImage))
-			{
-				$originalImage = $_POST['path'];
-			}
+    $error = "";
+    $info = "";
+    if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
+    {
+        $error = SYS_DISABLED;
+    }
+    elseif(empty($_POST['path']))
+    {
+        $error  =  IMG_SAVE_EMPTY_PATH;
+    }elseif(!file_exists($_POST['path']))
+    {		
+        $error  =  IMG_SAVE_NOT_EXISTS;
+    }elseif(!isUnderRoot($_POST['path']))
+    {
+        $error = IMG_SAVE_PATH_DISALLOWED;
+    }elseif(($sessionDir = $session->getSessionDir()) == '')
+    {
+        $error = SESSION_PERSONAL_DIR_NOT_FOUND;
+    }
+    else
+    {	
+        require_once(CLASS_HISTORY);
+        $history = new History($_POST['path'], $session);
+        if(!empty($_POST['mode']))
+        {
+            //get the original image which is the lastest session image if any when the system is in demo
+            $lastestSessionImageInfo = $history->getLastestRestorable();
+            if(sizeof($lastestSessionImageInfo) && CONFIG_SYS_DEMO_ENABLE)
+            {				
+                $originalSessionImageInfo = $history->getOriginalImage();
+                if(sizeof($originalSessionImageInfo))
+                {					
+                    $originalImage = $sessionDir . $originalSessionImageInfo['info']['name'];
+                }				
+            }
+            if(empty($originalImage))
+            {
+                $originalImage = $_POST['path'];
+            }
 			
-			include_once(CLASS_IMAGE);
-			$image = new Image();
-			if($image->loadImage($originalImage))
-			{				
+            include_once(CLASS_IMAGE);
+            $image = new Image();
+            if($image->loadImage($originalImage))
+            {				
 				
-				switch($_POST['mode'])
-				{
-					case "resize":					
-						if(!$image->resize($_POST['width'], $_POST['height'], (!empty($_POST['constraint'])?true:false)))
-						{
-							$error = IMG_SAVE_RESIZE_FAILED;
-						}					
-						break;
-					case "crop":	
-						if(!$image->crop($_POST['x'], $_POST['y'], $_POST['width'], $_POST['height']))
-						{
-							$error = IMG_SAVE_CROP_FAILED;
-						}
-						break;
-					case "flip":
-						if(!$image->flip($_POST['flip_angle']))
-						{
-							$error = IMG_SAVE_FLIP_FAILED;
-						}
-						break;
-					case "rotate":
+                switch($_POST['mode'])
+                {
+                    case "resize":					
+                        if(!$image->resize($_POST['width'], $_POST['height'], (!empty($_POST['constraint'])?true:false)))
+                        {
+                            $error = IMG_SAVE_RESIZE_FAILED;
+                        }					
+                        break;
+                    case "crop":	
+                        if(!$image->crop($_POST['x'], $_POST['y'], $_POST['width'], $_POST['height']))
+                        {
+                            $error = IMG_SAVE_CROP_FAILED;
+                        }
+                        break;
+                    case "flip":
+                        if(!$image->flip($_POST['flip_angle']))
+                        {
+                            $error = IMG_SAVE_FLIP_FAILED;
+                        }
+                        break;
+                    case "rotate":
 						
-						if(!$image->rotate(intval($_POST['angle'])))
-						{
-							$error = IMG_SAVE_ROTATE_FAILED;
-						}
+                        if(!$image->rotate(intval($_POST['angle'])))
+                        {
+                            $error = IMG_SAVE_ROTATE_FAILED;
+                        }
 						
-						break;
-					default:
-						$error = IMG_SAVE_UNKNOWN_MODE;
-				}
+                        break;
+                    default:
+                        $error = IMG_SAVE_UNKNOWN_MODE;
+                }
 				
 				
-				if(empty($error))
-				{					
-					$sessionNewPath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);					
-					if(!@copy($originalImage, $sessionNewPath))
-					{//keep a copy under the session folder
-						$error = IMG_SAVE_BACKUP_FAILED;						
-					}else 
-					{
+                if(empty($error))
+                {					
+                    $sessionNewPath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);					
+                    if(!@copy($originalImage, $sessionNewPath))
+                    {//keep a copy under the session folder
+                        $error = IMG_SAVE_BACKUP_FAILED;						
+                    }else 
+                    {
 						
-						$isSaveAsRequest = (!empty($_POST['new_name']) && !empty($_POST['save_to'])?true:false);
-						//save the modified image
-						$sessionImageInfo = array('name'=>basename($sessionNewPath), 'restorable'=>1);
-						$history->add($sessionImageInfo);
-						if(CONFIG_SYS_DEMO_ENABLE)
-						{//demo only
-							if(isset($originalSessionImageInfo) && sizeof($originalSessionImageInfo))
-							{
-								$imagePath = $sessionDir . $originalSessionImageInfo['info']['name'];
-							}else 
-							{	
-								$imagePath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);
-							}
-						}else 
-						{	
-							if($isSaveAsRequest)
-							{//save as request
-								//check save to folder if exists
-								if(isset($_POST['save_to']) && strlen($_POST['save_to']))
-								{
-									$imagePath = $originalImage;
-								}else 
-								{
-									$imagePath = addTrailingSlash(backslashToSlash($_POST['save_to'])) . $_POST['new_name'] . "." . getFileExt($_POST['path']); 
-								}
+                        $isSaveAsRequest = (!empty($_POST['new_name']) && !empty($_POST['save_to'])?true:false);
+                        //save the modified image
+                        $sessionImageInfo = array('name'=>basename($sessionNewPath), 'restorable'=>1);
+                        $history->add($sessionImageInfo);
+                        if(CONFIG_SYS_DEMO_ENABLE)
+                        {//demo only
+                            if(isset($originalSessionImageInfo) && sizeof($originalSessionImageInfo))
+                            {
+                                $imagePath = $sessionDir . $originalSessionImageInfo['info']['name'];
+                            }else 
+                            {	
+                                $imagePath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);
+                            }
+                        }else 
+                        {	
+                            if($isSaveAsRequest)
+                            {//save as request
+                                //check save to folder if exists
+                                if(isset($_POST['save_to']) && strlen($_POST['save_to']))
+                                {
+                                    $imagePath = $originalImage;
+                                }else 
+                                {
+                                    $imagePath = addTrailingSlash(backslashToSlash($_POST['save_to'])) . $_POST['new_name'] . "." . getFileExt($_POST['path']); 
+                                }
 								
-								if(!file_exists($_POST['save_to']) || !is_dir($_POST['save_to']))
-								{
-									$error = IMG_SAVE_AS_FOLDER_NOT_FOUND;
-								}elseif(file_exists($imagePath)) 
-								{
-									$error = IMG_SAVE_AS_NEW_IMAGE_EXISTS;
-								}elseif(!preg_match("/^[a-zA-Z0-9_\- ]+$/", $_POST['new_name']))
-								{
-									$error = IMG_SAVE_AS_ERR_NAME_INVALID;
-								}
+                                if(!file_exists($_POST['save_to']) || !is_dir($_POST['save_to']))
+                                {
+                                    $error = IMG_SAVE_AS_FOLDER_NOT_FOUND;
+                                }elseif(file_exists($imagePath)) 
+                                {
+                                    $error = IMG_SAVE_AS_NEW_IMAGE_EXISTS;
+                                }elseif(!preg_match("/^[a-zA-Z0-9_\- ]+$/", $_POST['new_name']))
+                                {
+                                    $error = IMG_SAVE_AS_ERR_NAME_INVALID;
+                                }
 								
-							}else 
-							{//save request
-								$imagePath = $originalImage;	
-							}
+                            }else 
+                            {//save request
+                                $imagePath = $originalImage;	
+                            }
 												
-						}
+                        }
 
-						if($image->saveImage($imagePath))
-						{		
+                        if($image->saveImage($imagePath))
+                        {		
 									
-							if(CONFIG_SYS_DEMO_ENABLE)
-							{
-								if(!isset($originalSessionImageInfo) || !sizeof($originalSessionImageInfo))
-								{//keep this original image information on session for future reference if demo only	
-									$originalSessionImageInfo = array('name'=>basename($imagePath), 'restorable'=>0, 'is_original'=>1);
-									$history->add($originalSessionImageInfo);
-								}
-							}
-							$imageInfo = $image->getFinalImageInfo();								
-						}else 
-						{
-							$error = IMG_SAVE_FAILED;
+                            if(CONFIG_SYS_DEMO_ENABLE)
+                            {
+                                if(!isset($originalSessionImageInfo) || !sizeof($originalSessionImageInfo))
+                                {//keep this original image information on session for future reference if demo only	
+                                    $originalSessionImageInfo = array('name'=>basename($imagePath), 'restorable'=>0, 'is_original'=>1);
+                                    $history->add($originalSessionImageInfo);
+                                }
+                            }
+                            $imageInfo = $image->getFinalImageInfo();								
+                        }else 
+                        {
+                            $error = IMG_SAVE_FAILED;
 							
-						}							
-						if(isset($imageInfo))
-						{
-								$info .= ",width:" . $imageInfo['width'] . "";
-								$info .= ",height:" . $imageInfo['height'] . "";
-								$info .= ",size:'" . transformFileSize($imageInfo['size']) . "'";
-								if($isSaveAsRequest)
-								{
-									$info .= ",save_as:'1'";
-								}else 
-								{
-									$info .= ",save_as:'0'";
-								}
-								$info .= ",folder_path:'" . dirname($imagePath) . "'";
-								$info .= ",path:'" . backslashToSlash($imagePath) . "'";	
+                        }							
+                        if(isset($imageInfo))
+                        {
+                                $info .= ",width:" . $imageInfo['width'] . "";
+                                $info .= ",height:" . $imageInfo['height'] . "";
+                                $info .= ",size:'" . transformFileSize($imageInfo['size']) . "'";
+                                if($isSaveAsRequest)
+                                {
+                                    $info .= ",save_as:'1'";
+                                }else 
+                                {
+                                    $info .= ",save_as:'0'";
+                                }
+                                $info .= ",folder_path:'" . dirname($imagePath) . "'";
+                                $info .= ",path:'" . backslashToSlash($imagePath) . "'";	
 													
-						}				
+                        }				
 			
-					}				
+                    }				
 								
-				}			
-			}else 
-			{
-				$error = IMG_SAVE_IMG_OPEN_FAILED . $originalImage;
-			}		
+                }			
+            }else 
+            {
+                $error = IMG_SAVE_IMG_OPEN_FAILED . $originalImage;
+            }		
 
-		}else 
-		{
-			$error = IMG_SAVE_UNKNOWN_MODE;
-		}
-	}
-	echo "{";	
-	echo "error:'" . $error . "'";
-	if(isset($image) && is_object($image))
-	{
-		$image->DestroyImages();
-	}
-	echo $info;
-	echo ",history:" . (isset($history) && is_object($history)?($history->getNumRestorable()):0)  . "";
-	echo "}";
+        }else 
+        {
+            $error = IMG_SAVE_UNKNOWN_MODE;
+        }
+    }
+    echo "{";	
+    echo "error:'" . $error . "'";
+    if(isset($image) && is_object($image))
+    {
+        $image->DestroyImages();
+    }
+    echo $info;
+    echo ",history:" . (isset($history) && is_object($history)?($history->getNumRestorable()):0)  . "";
+    echo "}";
 	
 	
 ?>
\ No newline at end of file

Spacing +56 added lines, -56 removed lines

@@ -6,25 +6,25 @@ 
 	 * @since 22/May/2007
 	 *
 	 */
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");	
+	require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."inc".DIRECTORY_SEPARATOR."config.php");	
 	
 
 	$error = "";
 	$info = "";
-	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
+	if (CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
 	{
 		$error = SYS_DISABLED;
 	}
-	elseif(empty($_POST['path']))
+	elseif (empty($_POST['path']))
 	{
-		$error  =  IMG_SAVE_EMPTY_PATH;
-	}elseif(!file_exists($_POST['path']))
+		$error  = IMG_SAVE_EMPTY_PATH;
+	}elseif (!file_exists($_POST['path']))
 	{		
-		$error  =  IMG_SAVE_NOT_EXISTS;
-	}elseif(!isUnderRoot($_POST['path']))
+		$error  = IMG_SAVE_NOT_EXISTS;
+	}elseif (!isUnderRoot($_POST['path']))
 	{
 		$error = IMG_SAVE_PATH_DISALLOWED;
-	}elseif(($sessionDir = $session->getSessionDir()) == '')
+	}elseif (($sessionDir = $session->getSessionDir()) == '')
 	{
 		$error = SESSION_PERSONAL_DIR_NOT_FOUND;
 	}
@@ -32,51 +32,51 @@ 
 	{	
 		require_once(CLASS_HISTORY);
 		$history = new History($_POST['path'], $session);
-		if(!empty($_POST['mode']))
+		if (!empty($_POST['mode']))
 		{
 			//get the original image which is the lastest session image if any when the system is in demo
 			$lastestSessionImageInfo = $history->getLastestRestorable();
-			if(sizeof($lastestSessionImageInfo) && CONFIG_SYS_DEMO_ENABLE)
+			if (sizeof($lastestSessionImageInfo) && CONFIG_SYS_DEMO_ENABLE)
 			{				
 				$originalSessionImageInfo = $history->getOriginalImage();
-				if(sizeof($originalSessionImageInfo))
+				if (sizeof($originalSessionImageInfo))
 				{					
-					$originalImage = $sessionDir . $originalSessionImageInfo['info']['name'];
+					$originalImage = $sessionDir.$originalSessionImageInfo['info']['name'];
 				}				
 			}
-			if(empty($originalImage))
+			if (empty($originalImage))
 			{
 				$originalImage = $_POST['path'];
 			}
 			
 			include_once(CLASS_IMAGE);
 			$image = new Image();
-			if($image->loadImage($originalImage))
+			if ($image->loadImage($originalImage))
 			{				
 				
-				switch($_POST['mode'])
+				switch ($_POST['mode'])
 				{
 					case "resize":					
-						if(!$image->resize($_POST['width'], $_POST['height'], (!empty($_POST['constraint'])?true:false)))
+						if (!$image->resize($_POST['width'], $_POST['height'], (!empty($_POST['constraint']) ? true : false)))
 						{
 							$error = IMG_SAVE_RESIZE_FAILED;
 						}					
 						break;
 					case "crop":	
-						if(!$image->crop($_POST['x'], $_POST['y'], $_POST['width'], $_POST['height']))
+						if (!$image->crop($_POST['x'], $_POST['y'], $_POST['width'], $_POST['height']))
 						{
 							$error = IMG_SAVE_CROP_FAILED;
 						}
 						break;
 					case "flip":
-						if(!$image->flip($_POST['flip_angle']))
+						if (!$image->flip($_POST['flip_angle']))
 						{
 							$error = IMG_SAVE_FLIP_FAILED;
 						}
 						break;
 					case "rotate":
 						
-						if(!$image->rotate(intval($_POST['angle'])))
+						if (!$image->rotate(intval($_POST['angle'])))
 						{
 							$error = IMG_SAVE_ROTATE_FAILED;
 						}
@@ -87,114 +87,114 @@ 
 				}
 				
 				
-				if(empty($error))
+				if (empty($error))
 				{					
-					$sessionNewPath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);					
-					if(!@copy($originalImage, $sessionNewPath))
+					$sessionNewPath = $sessionDir.uniqid(md5(time())).".".getFileExt($_POST['path']);					
+					if (!@copy($originalImage, $sessionNewPath))
 					{//keep a copy under the session folder
 						$error = IMG_SAVE_BACKUP_FAILED;						
-					}else 
+					} else 
 					{
 						
-						$isSaveAsRequest = (!empty($_POST['new_name']) && !empty($_POST['save_to'])?true:false);
+						$isSaveAsRequest = (!empty($_POST['new_name']) && !empty($_POST['save_to']) ? true : false);
 						//save the modified image
 						$sessionImageInfo = array('name'=>basename($sessionNewPath), 'restorable'=>1);
 						$history->add($sessionImageInfo);
-						if(CONFIG_SYS_DEMO_ENABLE)
+						if (CONFIG_SYS_DEMO_ENABLE)
 						{//demo only
-							if(isset($originalSessionImageInfo) && sizeof($originalSessionImageInfo))
+							if (isset($originalSessionImageInfo) && sizeof($originalSessionImageInfo))
 							{
-								$imagePath = $sessionDir . $originalSessionImageInfo['info']['name'];
-							}else 
+								$imagePath = $sessionDir.$originalSessionImageInfo['info']['name'];
+							} else 
 							{	
-								$imagePath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);
+								$imagePath = $sessionDir.uniqid(md5(time())).".".getFileExt($_POST['path']);
 							}
-						}else 
+						} else 
 						{	
-							if($isSaveAsRequest)
+							if ($isSaveAsRequest)
 							{//save as request
 								//check save to folder if exists
-								if(isset($_POST['save_to']) && strlen($_POST['save_to']))
+								if (isset($_POST['save_to']) && strlen($_POST['save_to']))
 								{
 									$imagePath = $originalImage;
-								}else 
+								} else 
 								{
-									$imagePath = addTrailingSlash(backslashToSlash($_POST['save_to'])) . $_POST['new_name'] . "." . getFileExt($_POST['path']); 
+									$imagePath = addTrailingSlash(backslashToSlash($_POST['save_to'])).$_POST['new_name'].".".getFileExt($_POST['path']); 
 								}
 								
-								if(!file_exists($_POST['save_to']) || !is_dir($_POST['save_to']))
+								if (!file_exists($_POST['save_to']) || !is_dir($_POST['save_to']))
 								{
 									$error = IMG_SAVE_AS_FOLDER_NOT_FOUND;
-								}elseif(file_exists($imagePath)) 
+								}elseif (file_exists($imagePath)) 
 								{
 									$error = IMG_SAVE_AS_NEW_IMAGE_EXISTS;
-								}elseif(!preg_match("/^[a-zA-Z0-9_\- ]+$/", $_POST['new_name']))
+								}elseif (!preg_match("/^[a-zA-Z0-9_\- ]+$/", $_POST['new_name']))
 								{
 									$error = IMG_SAVE_AS_ERR_NAME_INVALID;
 								}
 								
-							}else 
+							} else 
 							{//save request
 								$imagePath = $originalImage;	
 							}
 												
 						}
 
-						if($image->saveImage($imagePath))
+						if ($image->saveImage($imagePath))
 						{		
 									
-							if(CONFIG_SYS_DEMO_ENABLE)
+							if (CONFIG_SYS_DEMO_ENABLE)
 							{
-								if(!isset($originalSessionImageInfo) || !sizeof($originalSessionImageInfo))
+								if (!isset($originalSessionImageInfo) || !sizeof($originalSessionImageInfo))
 								{//keep this original image information on session for future reference if demo only	
 									$originalSessionImageInfo = array('name'=>basename($imagePath), 'restorable'=>0, 'is_original'=>1);
 									$history->add($originalSessionImageInfo);
 								}
 							}
 							$imageInfo = $image->getFinalImageInfo();								
-						}else 
+						} else 
 						{
 							$error = IMG_SAVE_FAILED;
 							
 						}							
-						if(isset($imageInfo))
+						if (isset($imageInfo))
 						{
-								$info .= ",width:" . $imageInfo['width'] . "";
-								$info .= ",height:" . $imageInfo['height'] . "";
-								$info .= ",size:'" . transformFileSize($imageInfo['size']) . "'";
-								if($isSaveAsRequest)
+								$info .= ",width:".$imageInfo['width']."";
+								$info .= ",height:".$imageInfo['height']."";
+								$info .= ",size:'".transformFileSize($imageInfo['size'])."'";
+								if ($isSaveAsRequest)
 								{
 									$info .= ",save_as:'1'";
-								}else 
+								} else 
 								{
 									$info .= ",save_as:'0'";
 								}
-								$info .= ",folder_path:'" . dirname($imagePath) . "'";
-								$info .= ",path:'" . backslashToSlash($imagePath) . "'";	
+								$info .= ",folder_path:'".dirname($imagePath)."'";
+								$info .= ",path:'".backslashToSlash($imagePath)."'";	
 													
 						}				
 			
 					}				
 								
 				}			
-			}else 
+			} else 
 			{
-				$error = IMG_SAVE_IMG_OPEN_FAILED . $originalImage;
+				$error = IMG_SAVE_IMG_OPEN_FAILED.$originalImage;
 			}		
 
-		}else 
+		} else 
 		{
 			$error = IMG_SAVE_UNKNOWN_MODE;
 		}
 	}
 	echo "{";	
-	echo "error:'" . $error . "'";
-	if(isset($image) && is_object($image))
+	echo "error:'".$error."'";
+	if (isset($image) && is_object($image))
 	{
 		$image->DestroyImages();
 	}
 	echo $info;
-	echo ",history:" . (isset($history) && is_object($history)?($history->getNumRestorable()):0)  . "";
+	echo ",history:".(isset($history) && is_object($history) ? ($history->getNumRestorable()) : 0)."";
 	echo "}";
 	
 	

Braces +16 added lines, -18 removed lines

@@ -14,21 +14,19 @@ 
 	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_EDITABLE)
 	{
 		$error = SYS_DISABLED;
-	}
-	elseif(empty($_POST['path']))
+	} elseif(empty($_POST['path']))
 	{
 		$error  =  IMG_SAVE_EMPTY_PATH;
-	}elseif(!file_exists($_POST['path']))
+	} elseif(!file_exists($_POST['path']))
 	{		
 		$error  =  IMG_SAVE_NOT_EXISTS;
-	}elseif(!isUnderRoot($_POST['path']))
+	} elseif(!isUnderRoot($_POST['path']))
 	{
 		$error = IMG_SAVE_PATH_DISALLOWED;
-	}elseif(($sessionDir = $session->getSessionDir()) == '')
+	} elseif(($sessionDir = $session->getSessionDir()) == '')
 	{
 		$error = SESSION_PERSONAL_DIR_NOT_FOUND;
-	}
-	else
+	} else
 	{	
 		require_once(CLASS_HISTORY);
 		$history = new History($_POST['path'], $session);
@@ -93,7 +91,7 @@ 
 					if(!@copy($originalImage, $sessionNewPath))
 					{//keep a copy under the session folder
 						$error = IMG_SAVE_BACKUP_FAILED;						
-					}else 
+					} else 
 					{
 						
 						$isSaveAsRequest = (!empty($_POST['new_name']) && !empty($_POST['save_to'])?true:false);
@@ -105,11 +103,11 @@ 
 							if(isset($originalSessionImageInfo) && sizeof($originalSessionImageInfo))
 							{
 								$imagePath = $sessionDir . $originalSessionImageInfo['info']['name'];
-							}else 
+							} else 
 							{	
 								$imagePath = $sessionDir  . uniqid(md5(time())) . "." . getFileExt($_POST['path']);
 							}
-						}else 
+						} else 
 						{	
 							if($isSaveAsRequest)
 							{//save as request
@@ -117,7 +115,7 @@ 
 								if(isset($_POST['save_to']) && strlen($_POST['save_to']))
 								{
 									$imagePath = $originalImage;
-								}else 
+								} else 
 								{
 									$imagePath = addTrailingSlash(backslashToSlash($_POST['save_to'])) . $_POST['new_name'] . "." . getFileExt($_POST['path']); 
 								}
@@ -125,15 +123,15 @@ 
 								if(!file_exists($_POST['save_to']) || !is_dir($_POST['save_to']))
 								{
 									$error = IMG_SAVE_AS_FOLDER_NOT_FOUND;
-								}elseif(file_exists($imagePath)) 
+								} elseif(file_exists($imagePath)) 
 								{
 									$error = IMG_SAVE_AS_NEW_IMAGE_EXISTS;
-								}elseif(!preg_match("/^[a-zA-Z0-9_\- ]+$/", $_POST['new_name']))
+								} elseif(!preg_match("/^[a-zA-Z0-9_\- ]+$/", $_POST['new_name']))
 								{
 									$error = IMG_SAVE_AS_ERR_NAME_INVALID;
 								}
 								
-							}else 
+							} else 
 							{//save request
 								$imagePath = $originalImage;	
 							}
@@ -152,7 +150,7 @@ 
 								}
 							}
 							$imageInfo = $image->getFinalImageInfo();								
-						}else 
+						} else 
 						{
 							$error = IMG_SAVE_FAILED;
 							
@@ -165,7 +163,7 @@ 
 								if($isSaveAsRequest)
 								{
 									$info .= ",save_as:'1'";
-								}else 
+								} else 
 								{
 									$info .= ",save_as:'0'";
 								}
@@ -177,12 +175,12 @@ 
 					}				
 								
 				}			
-			}else 
+			} else 
 			{
 				$error = IMG_SAVE_IMG_OPEN_FAILED . $originalImage;
 			}		
 
-		}else 
+		} else 
 		{
 			$error = IMG_SAVE_UNKNOWN_MODE;
 		}

phpmyfaq/admin/editor/plugins/ajaxfilemanager/ajax_get_folder_listing.php

Indentation +9 added lines, -9 removed lines

@@ -1,13 +1,13 @@
 <?php
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
-	echo '{';
-	$count = 1;
-	foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
-	{
+    require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+    echo '{';
+    $count = 1;
+    foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
+    {
 		
 
-		echo (($count > 1)?', ':''). "'" . $v . "':'" . $k . "'"; 
-		$count++;
-	}
-	echo "}";
+        echo (($count > 1)?', ':''). "'" . $v . "':'" . $k . "'"; 
+        $count++;
+    }
+    echo "}";
 ?>

Spacing +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@
 <?php
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+	require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."inc".DIRECTORY_SEPARATOR."config.php");
 	echo '{';
 	$count = 1;
-	foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
+	foreach (getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
 	{
 		
 
-		echo (($count > 1)?', ':''). "'" . $v . "':'" . $k . "'"; 
+		echo (($count > 1) ? ', ' : '')."'".$v."':'".$k."'"; 
 		$count++;
 	}
 	echo "}";

phpmyfaq/admin/editor/plugins/ajaxfilemanager/_ajax_load_folders.php

Indentation +10 added lines, -10 removed lines

@@ -1,20 +1,20 @@
 <?php
-	if(!defined('AJAX_INIT_DONE'))
-	{
-		die('Permission denied');
-	}
+    if(!defined('AJAX_INIT_DONE'))
+    {
+        die('Permission denied');
+    }
 ?><?php
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+    require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
 ?>
 <select class="input inputSearch" name="search_folder" id="search_folder">
 	<?php 
 	
-					foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
-					{
-						?>
+                    foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
+                    {
+                        ?>
       <option value="<?php echo $v; ?>" ><?php echo shortenFileName($k, 30); ?></option>
       <?php 
-					}
+                    }
 		
-				?>            	
+                ?>            	
 </select>
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -1,15 +1,15 @@
 <?php
-	if(!defined('AJAX_INIT_DONE'))
+	if (!defined('AJAX_INIT_DONE'))
 	{
 		die('Permission denied');
 	}
 ?><?php
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+	require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."inc".DIRECTORY_SEPARATOR."config.php");
 ?>
 <select class="input inputSearch" name="search_folder" id="search_folder">
 	<?php 
 	
-					foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
+					foreach (getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
 					{
 						?>
       <option value="<?php echo $v; ?>" ><?php echo shortenFileName($k, 30); ?></option>