tnhfw / tnh-fw

config/routes.php

Indentation +57 added lines, -57 removed lines

@@ -22,65 +22,65 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	
 	/**
-	* This file contains the configuration of your routes that is to say that links to your URLs.
-	* The index of the $route array contains the url address to capture and the value contains 
-	* the name of the module, controller and the method to call.
-	* For example :
-	*
-	* $route['/users/login'] = 'moduleUsers#UsersController@login_action';
-	*
-	* it means, if the user type in the address bar an URL like http://yoursite.com/users/login, 
-	* that will call the module "moduleUsers", the controller "UsersController" and the method "login_action".
-	* Note 1: it is recommended that each index in the $route array start with a slash "/" 
-	* otherwise on some system this will not work.
-	* Note 2: to define the default controller route (homepage) of your application you use only the index "/" 
-	* for example the following route represents the homepage:
-	* 
-	* $route['/'] = 'Home'; //only the controller or module name
-	*
-	* $route['/'] = 'Home@index'; //only the controller or module name with the method
-	*
-	* $route['/'] = 'module#Home@index'; //with module name, controller and method
-	*
-	* Note 3: If the method is not specified then the "index" method will be used as 
-	* default method. For example in the case of our homepage, this will be able to make:
-	* 
-	* $route['/'] = 'Home';
-	*
-	* Note 4: All methods called must have "public" visibility if you know the principle of 
-	* Object Oriented Programming, you know what visibility means (public, protected, private).
-	*
-	* In the index of your route, you can use the markers (:num), (:alpha), (:alnum) and (:any) which correspond 
-	* respectively to the regular expression [0-9], [a-zA-Z], [a-zA-Z0-9] and. *.
-	* For example :
-	*
-	* - $route['/profile/(:num)'] = 'UsersController@profile'; => http://yoursite.com/profile/4 will be captured but 
-	* http://yoursite.com/profile/a will not captured.
-	*
-	* - $route['/profile/(:alpha)'] = 'UsersController@profile'; => http://yoursite.com/profile/a will be captured 
-	* but http://yoursite.com/profile/1457 will not captured.
-	*
-	* - $route['/profile/(:alnum)'] = 'UsersController@profile'; => http://yoursite.com/profile/4a, 
-	* http://yoursite.com/profile/7 will be captured but http://yoursite.com/profile/7-dangerous will not captured.
-	*
-	* - $route['/(:any)'] = 'ArticleController@read'; => http://yoursite.com/1-my-super-article, 
-	* http://yoursite.com/7, will be captured.
-	* 
-	* Note 5: The order of definition of each route is important. 
-	* For example, the following definitions work:
-	*
-	* $route['/article/add'] = 'Article@add';
-	* $route['article/(:any)'] = 'Article@read';
-	*
-	* however, the following definitions does not work as intended
-	*
-	* $route['article/(:any)'] = 'Article@read';
-	* $route['/article/add'] = 'Article@add';
-	*
-	*/
+	 * This file contains the configuration of your routes that is to say that links to your URLs.
+	 * The index of the $route array contains the url address to capture and the value contains 
+	 * the name of the module, controller and the method to call.
+	 * For example :
+	 *
+	 * $route['/users/login'] = 'moduleUsers#UsersController@login_action';
+	 *
+	 * it means, if the user type in the address bar an URL like http://yoursite.com/users/login, 
+	 * that will call the module "moduleUsers", the controller "UsersController" and the method "login_action".
+	 * Note 1: it is recommended that each index in the $route array start with a slash "/" 
+	 * otherwise on some system this will not work.
+	 * Note 2: to define the default controller route (homepage) of your application you use only the index "/" 
+	 * for example the following route represents the homepage:
+	 * 
+	 * $route['/'] = 'Home'; //only the controller or module name
+	 *
+	 * $route['/'] = 'Home@index'; //only the controller or module name with the method
+	 *
+	 * $route['/'] = 'module#Home@index'; //with module name, controller and method
+	 *
+	 * Note 3: If the method is not specified then the "index" method will be used as 
+	 * default method. For example in the case of our homepage, this will be able to make:
+	 * 
+	 * $route['/'] = 'Home';
+	 *
+	 * Note 4: All methods called must have "public" visibility if you know the principle of 
+	 * Object Oriented Programming, you know what visibility means (public, protected, private).
+	 *
+	 * In the index of your route, you can use the markers (:num), (:alpha), (:alnum) and (:any) which correspond 
+	 * respectively to the regular expression [0-9], [a-zA-Z], [a-zA-Z0-9] and. *.
+	 * For example :
+	 *
+	 * - $route['/profile/(:num)'] = 'UsersController@profile'; => http://yoursite.com/profile/4 will be captured but 
+	 * http://yoursite.com/profile/a will not captured.
+	 *
+	 * - $route['/profile/(:alpha)'] = 'UsersController@profile'; => http://yoursite.com/profile/a will be captured 
+	 * but http://yoursite.com/profile/1457 will not captured.
+	 *
+	 * - $route['/profile/(:alnum)'] = 'UsersController@profile'; => http://yoursite.com/profile/4a, 
+	 * http://yoursite.com/profile/7 will be captured but http://yoursite.com/profile/7-dangerous will not captured.
+	 *
+	 * - $route['/(:any)'] = 'ArticleController@read'; => http://yoursite.com/1-my-super-article, 
+	 * http://yoursite.com/7, will be captured.
+	 * 
+	 * Note 5: The order of definition of each route is important. 
+	 * For example, the following definitions work:
+	 *
+	 * $route['/article/add'] = 'Article@add';
+	 * $route['article/(:any)'] = 'Article@read';
+	 *
+	 * however, the following definitions does not work as intended
+	 *
+	 * $route['article/(:any)'] = 'Article@read';
+	 * $route['/article/add'] = 'Article@add';
+	 *
+	 */
 	
 	/**
 	 *  The default route like your home page

config/config_pagination.php

Indentation +8 added lines, -8 removed lines

@@ -22,11 +22,11 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	
 	/**
-	* This file contains the pagination library configuration of your application
-	*/
+	 * This file contains the pagination library configuration of your application
+	 */
 
 	/**
 	 * Number of pagination digit
@@ -34,11 +34,11 @@ 
 	$config['nb_link'] = 10;
 
 	/**
-	* The pagination.
-	*
-	* Represents the number of data to display per page.
-	* Note: this value must be strictly greater than zero (0)
-	*/
+	 * The pagination.
+	 *
+	 * Represents the number of data to display per page.
+	 * Note: this value must be strictly greater than zero (0)
+	 */
 	$config['pagination_per_page'] = 10;
 	
 

config/config.php

Indentation +142 added lines, -142 removed lines

@@ -22,13 +22,13 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	
 	/**
-	* This file contains the main configuration of your application
-	* web address, front controller, error logging, session parameters, CSRF, Cache, 
-	* Whitelist IP access, etc.
-	*/
+	 * This file contains the main configuration of your application
+	 * web address, front controller, error logging, session parameters, CSRF, Cache, 
+	 * Whitelist IP access, etc.
+	 */
 	
 	/*+---------------------------------------------------------------+
 	* Basic configuration section
@@ -36,39 +36,39 @@ 
 	*/
 	
 	/**
-	* The web address of your application.
-	*
-	* The address of your application or website terminated by a slash.
-	* You can use a domain name or IP address, for example:
-	*
-	* $config['base_url'] = 'http://www.mysite.com';
-	* or
-	* $config['base_url'] = 'http://198.15.25.12';
-	*
-	* If this value is empty, we try to determine it automatically by using 
-	* the server variables "SERVER_ADDR" or "SCRIPT_NAME",
-	* we recommend that you specify this value for a server in production this may reduce the performance of your application.
-	*/
+	 * The web address of your application.
+	 *
+	 * The address of your application or website terminated by a slash.
+	 * You can use a domain name or IP address, for example:
+	 *
+	 * $config['base_url'] = 'http://www.mysite.com';
+	 * or
+	 * $config['base_url'] = 'http://198.15.25.12';
+	 *
+	 * If this value is empty, we try to determine it automatically by using 
+	 * the server variables "SERVER_ADDR" or "SCRIPT_NAME",
+	 * we recommend that you specify this value for a server in production this may reduce the performance of your application.
+	 */
 	$config['base_url'] = '';
 	
 	/**
-	* The front controller
-	*
-	* This represents the name of the file called by the application during the loading 
-	* process generally the file "index.php". 
-	* If your webserver supports the url rewrite module, then you can leave this value empty. 
-	* You will find a sample file to hide this file in the url inside the root folder of your 
-	* application "htaccess.txt" for the apache web server just rename it to ".htaccess"
-	* 
-	* Without the rewrite module url enabled, leave this value to "index.php", in this case your urls look like:
-	*
-	* http://www.yoursite.com/index.php/controller/method
-	* 
-	* otherwise if the module is available and activated you can put this value empty and your urls look like:
-	*
-	* http://www.yoursite.com/controller/method
-	*
-	*/
+	 * The front controller
+	 *
+	 * This represents the name of the file called by the application during the loading 
+	 * process generally the file "index.php". 
+	 * If your webserver supports the url rewrite module, then you can leave this value empty. 
+	 * You will find a sample file to hide this file in the url inside the root folder of your 
+	 * application "htaccess.txt" for the apache web server just rename it to ".htaccess"
+	 * 
+	 * Without the rewrite module url enabled, leave this value to "index.php", in this case your urls look like:
+	 *
+	 * http://www.yoursite.com/index.php/controller/method
+	 * 
+	 * otherwise if the module is available and activated you can put this value empty and your urls look like:
+	 *
+	 * http://www.yoursite.com/controller/method
+	 *
+	 */
 	$config['front_controller'] = 'index.php';
 	
 	/**
@@ -82,22 +82,22 @@ 
 	$config['charset'] = 'UTF-8';
 	
 	/**
-	* Compress the output before send to browser
-	*
-	* Enables Gzip output compression for faster page loads.  When enabled,
-	* the Response class will test whether your server supports Gzip.
-	* Even if it does, however, not all browsers support compression
-	* so enable only if you are reasonably sure your visitors can handle it.
-	*
-	* This is only used if "zlib.output_compression" is turned off in your php configuration.
-	* Please do not use it together with httpd-level output compression.
-	*
-	* IMPORTANT NOTE:  If you are getting a blank page when compression is enabled it
-	* means you are prematurely outputting something to your browser. It could
-	* even be a line of whitespace at the end of one of your scripts. For
-	* compression to work, nothing can be sent before the output buffer is called
-	* by the Response class.  Do not 'echo' any values with compression enabled.
-	*/
+	 * Compress the output before send to browser
+	 *
+	 * Enables Gzip output compression for faster page loads.  When enabled,
+	 * the Response class will test whether your server supports Gzip.
+	 * Even if it does, however, not all browsers support compression
+	 * so enable only if you are reasonably sure your visitors can handle it.
+	 *
+	 * This is only used if "zlib.output_compression" is turned off in your php configuration.
+	 * Please do not use it together with httpd-level output compression.
+	 *
+	 * IMPORTANT NOTE:  If you are getting a blank page when compression is enabled it
+	 * means you are prematurely outputting something to your browser. It could
+	 * even be a line of whitespace at the end of one of your scripts. For
+	 * compression to work, nothing can be sent before the output buffer is called
+	 * by the Response class.  Do not 'echo' any values with compression enabled.
+	 */
 	$config['compress_output'] = false;
 
 	/*+---------------------------------------------------------------+
@@ -130,51 +130,51 @@ 
 	*/
 	
 	/** 
-	* The log level
-	*
-	* The valid level are: OFF, NONE, FATAL, ERROR, WARNING, WARN, INFO, DEBUG, ALL
-	*
-	* 'OFF' or 'NONE' = do not save log
-	* 'FATAL' = enable log for fatal level and above (FATAL)
-	* 'ERROR' = enable log for error level and above (ERROR, FATAL)
-	* 'WARNING' or WARN = enable log for warning level and above (WARNING, ERROR, FATAL)
-	* 'INFO' = enable log for info level and above (INFO, WARNING, ERROR, FATAL)
-	* 'DEBUG' = enable log for debug level and above (DEBUG, INFO, WARNING, ERROR, FATAL)
-	* 'ALL' = enable log for all level
-	*
-	* The default value is NONE if the config value is: null, '', 0, false
-	* 
-	* Note: in production environment it's recommand to set the log level to 'WARNING' if not in small
-	* of time the log file size will increase very fast and will cost the application performance
-	* and also the filesystem usage of your server.
-	*/
+	 * The log level
+	 *
+	 * The valid level are: OFF, NONE, FATAL, ERROR, WARNING, WARN, INFO, DEBUG, ALL
+	 *
+	 * 'OFF' or 'NONE' = do not save log
+	 * 'FATAL' = enable log for fatal level and above (FATAL)
+	 * 'ERROR' = enable log for error level and above (ERROR, FATAL)
+	 * 'WARNING' or WARN = enable log for warning level and above (WARNING, ERROR, FATAL)
+	 * 'INFO' = enable log for info level and above (INFO, WARNING, ERROR, FATAL)
+	 * 'DEBUG' = enable log for debug level and above (DEBUG, INFO, WARNING, ERROR, FATAL)
+	 * 'ALL' = enable log for all level
+	 *
+	 * The default value is NONE if the config value is: null, '', 0, false
+	 * 
+	 * Note: in production environment it's recommand to set the log level to 'WARNING' if not in small
+	 * of time the log file size will increase very fast and will cost the application performance
+	 * and also the filesystem usage of your server.
+	 */
 	$config['log_level'] = 'NONE';
 
 
 	/**
-	* The path to log directory
-	* 
-	* The path that the log data will be saved ending with de "/" or "\", leave empty if you
-	* want use the default configuration
-	* warning : if set, this directory must exist and will be writable and owned by the web server
-	* else the default value will be used i.e the constant LOG_PATH
-	* for security raison this directory must be outside of the document root of your
-	* website.
-	*/	
+	 * The path to log directory
+	 * 
+	 * The path that the log data will be saved ending with de "/" or "\", leave empty if you
+	 * want use the default configuration
+	 * warning : if set, this directory must exist and will be writable and owned by the web server
+	 * else the default value will be used i.e the constant LOG_PATH
+	 * for security raison this directory must be outside of the document root of your
+	 * website.
+	 */	
 	$config['log_save_path'] = '';
 	
 	/**
-	* The logger name to use for the log
-	* 
-	* You can use an string or array of logger. If this config is set so means only log message with this or these logger(s) will be accepted
-	*
-	* Example:
-	*	//using string for only one logger name 
-	*	$config['log_logger_name'] = 'MY_LOGGER'; //only log message with MY_LOGGER will be saved in file.
-	*
-	*	//using array for muliple logger names
-	*	$config['log_logger_name'] = array('MY_LOGGER1', 'MY_LOGGER2'); //only log message with MY_LOGGER1 or MY_LOGGER2 will be saved in file.
-	*/	
+	 * The logger name to use for the log
+	 * 
+	 * You can use an string or array of logger. If this config is set so means only log message with this or these logger(s) will be accepted
+	 *
+	 * Example:
+	 *	//using string for only one logger name 
+	 *	$config['log_logger_name'] = 'MY_LOGGER'; //only log message with MY_LOGGER will be saved in file.
+	 *
+	 *	//using array for muliple logger names
+	 *	$config['log_logger_name'] = array('MY_LOGGER1', 'MY_LOGGER2'); //only log message with MY_LOGGER1 or MY_LOGGER2 will be saved in file.
+	 */	
 	$config['log_logger_name'] = '';
 	
 	
@@ -184,41 +184,41 @@ 
 	*/
 	
 	/**
-	* The session name 
-	*
-	* By default is PHPSESSID. this must be alpha-numerical characters
-	*/
+	 * The session name 
+	 *
+	 * By default is PHPSESSID. this must be alpha-numerical characters
+	 */
 	$config['session_name'] = 'PHPSESSID';
 	
 	/**
-	* Session save path
-	*
-	* The path that the session data will be saved, leave empty if you
-	* want use the default configuration in the php.ini
-	* warning : if set, this directory must exist and will be writable and owned by the web server
-	* for security raison this directory must be outside of the document root of your
-	* website.
-	* Note: if the session handler is "database" the session_save_path is the model name to use
-	*/
+	 * Session save path
+	 *
+	 * The path that the session data will be saved, leave empty if you
+	 * want use the default configuration in the php.ini
+	 * warning : if set, this directory must exist and will be writable and owned by the web server
+	 * for security raison this directory must be outside of the document root of your
+	 * website.
+	 * Note: if the session handler is "database" the session_save_path is the model name to use
+	 */
 	$config['session_save_path'] = '';
 
 	/**
-	* Session handler
-	*
-	* The session handler that we will use to manage the session.
-	* currently the possible values are "files", "database".
-	*/
+	 * Session handler
+	 *
+	 * The session handler that we will use to manage the session.
+	 * currently the possible values are "files", "database".
+	 */
 	$config['session_handler'] = 'files';
 	
 	/**
-	* Session secret
-	*
-	* This is used to hash the session data if the config "session_handler" is set to "database"
-	* warning : do not change this value until you already set
-	* for security raison use the very complicated value include $%)@^&^\''\'\'
-	* NOTE: this value is an base64 so you need use the tool that generate it, like
-	*  PHP function base64_encode()
-	*/
+	 * Session secret
+	 *
+	 * This is used to hash the session data if the config "session_handler" is set to "database"
+	 * warning : do not change this value until you already set
+	 * for security raison use the very complicated value include $%)@^&^\''\'\'
+	 * NOTE: this value is an base64 so you need use the tool that generate it, like
+	 *  PHP function base64_encode()
+	 */
 	$config['session_secret'] = '';
 
 	/**
@@ -227,36 +227,36 @@ 
 	$config['session_inactivity_time'] = 600; //in second
 
 	/**
-	* Session cookie lifetime
-	*
-	* The cookie lifetime that the session will be dropped in seconds, leave 0 if you want
-	* the cookie expire after the browser is closed
-	*/
+	 * Session cookie lifetime
+	 *
+	 * The cookie lifetime that the session will be dropped in seconds, leave 0 if you want
+	 * the cookie expire after the browser is closed
+	 */
 	$config['session_cookie_lifetime'] = 0;
 	
 	/**
-	* Session cookie path
-	*
-	* The path to your website that the cookie is available "/" means all path is available
-	* example : /mysubdirectory => available in http://www.mysite.com/mysubdirectory
-	*/
+	 * Session cookie path
+	 *
+	 * The path to your website that the cookie is available "/" means all path is available
+	 * example : /mysubdirectory => available in http://www.mysite.com/mysubdirectory
+	 */
 	$config['session_cookie_path'] = '/';
 	
 	/** 
-	* Session cookie domain
-	*
-	* The domain of your website that the cookie is available if you want the cookie is available
-	* in all your subdomain use this dot before the domain name for example ".mysite.com".
-	* leave empty if you want use the default configuration
-	*/
+	 * Session cookie domain
+	 *
+	 * The domain of your website that the cookie is available if you want the cookie is available
+	 * in all your subdomain use this dot before the domain name for example ".mysite.com".
+	 * leave empty if you want use the default configuration
+	 */
 	$config['session_cookie_domain'] = '';
 	
 	/**
-	* Session cookie secure
-	* 
-	* If your website use SSL i.e https, you set "true" for this configuration, so the cookie
-	* is available only if the website use the secure connection else set this value to "false"
-	*/
+	 * Session cookie secure
+	 * 
+	 * If your website use SSL i.e https, you set "true" for this configuration, so the cookie
+	 * is available only if the website use the secure connection else set this value to "false"
+	 */
 	$config['session_cookie_secure'] = false;
 	
 
@@ -307,12 +307,12 @@ 
 	$config['cache_ttl'] = 120; //in second
 
 	/**
-	* Cache handler class
-	*
-	* The cache handler class inside (CORE_CLASSES_CACHE_PATH, LIBRARY_PATH) directories that implements 
-	* the interface "CacheInterface" that we will use to manage the cache.
-	* currently the possible values are "FileCache", "ApcCache".
-	*/
+	 * Cache handler class
+	 *
+	 * The cache handler class inside (CORE_CLASSES_CACHE_PATH, LIBRARY_PATH) directories that implements 
+	 * the interface "CacheInterface" that we will use to manage the cache.
+	 * currently the possible values are "FileCache", "ApcCache".
+	 */
 	$config['cache_handler'] = 'FileCache';
 	
 	

config/database.php

Indentation +63 added lines, -63 removed lines

@@ -22,29 +22,29 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	
 	/**
-	* This file contains the connection information to your database, this file is read when you load the "Database" library.
-	* You will find all its configuration parameters at your web hosting.
-	*/
+	 * This file contains the connection information to your database, this file is read when you load the "Database" library.
+	 * You will find all its configuration parameters at your web hosting.
+	 */
 	
 	/**
-	* The type or driver of your database.
-	*
-	* Note: the "Database" library uses the PHP PDO extension to interact with your database, 
-	* so most of the PDO supported drivers namely: mysql, pgsql, sqlite, oracle are accepted.
-	* For example :
-	*
-	* 	$db['driver'] = 'mysql'; // for MySQL Database
-	* or
-	* 	$db['driver'] = 'pgsql'; // for PostgreSQL Database
-	* or
-	* 	$db['driver'] = 'sqlite'; // for SQLite Database
-	* or
-	* 	$db['driver'] = 'oracle'; // for Oracle Database
-	*
-	*/
+	 * The type or driver of your database.
+	 *
+	 * Note: the "Database" library uses the PHP PDO extension to interact with your database, 
+	 * so most of the PDO supported drivers namely: mysql, pgsql, sqlite, oracle are accepted.
+	 * For example :
+	 *
+	 * 	$db['driver'] = 'mysql'; // for MySQL Database
+	 * or
+	 * 	$db['driver'] = 'pgsql'; // for PostgreSQL Database
+	 * or
+	 * 	$db['driver'] = 'sqlite'; // for SQLite Database
+	 * or
+	 * 	$db['driver'] = 'oracle'; // for Oracle Database
+	 *
+	 */
 	$db['driver'] = 'mysql';
 	
 	/**
@@ -62,66 +62,66 @@ 
 	$db['hostname'] = 'localhost';
 	
 	/**
-	* The username of your database server
-	* for example :
-	*
-	*	$db['username'] = 'root';
-	* or
-	*	$db['username'] = 'myusername';
-	*/
+	 * The username of your database server
+	 * for example :
+	 *
+	 *	$db['username'] = 'root';
+	 * or
+	 *	$db['username'] = 'myusername';
+	 */
 	$db['username'] = 'root';
 	
 	
 	/**
-	* The password of your database server.
-	*
-	* Note: Some configuration settings on some database management systems do not allow 
-	* connection with a user without password, so it is recommended to set a password for this user for a security measure.
-	* for example :
-	*
-	*	$db['password'] = ''; //for an empty password, this is the case most often, if you are in local, ie for the user "root".
-	* or
-	* 	$db['password'] = 'M@5CUR3P@$$W0rd';
-	*/
+	 * The password of your database server.
+	 *
+	 * Note: Some configuration settings on some database management systems do not allow 
+	 * connection with a user without password, so it is recommended to set a password for this user for a security measure.
+	 * for example :
+	 *
+	 *	$db['password'] = ''; //for an empty password, this is the case most often, if you are in local, ie for the user "root".
+	 * or
+	 * 	$db['password'] = 'M@5CUR3P@$$W0rd';
+	 */
 	$db['password'] = '';
 	
 	/**
-	* The name of your database
-	*
-	* for example :
-	*
-	*	$db['database'] = 'database_name';
-	*/
+	 * The name of your database
+	 *
+	 * for example :
+	 *
+	 *	$db['database'] = 'database_name';
+	 */
 	$db['database'] = '';
 	
 	
 	/**
-	* The character set that will be used by the database server.
-	* for example :
-	*
-	* $db['charset'] = 'utf8';
-	*/
+	 * The character set that will be used by the database server.
+	 * for example :
+	 *
+	 * $db['charset'] = 'utf8';
+	 */
 	$db['charset'] = 'utf8';
 	
 	/**
-	* In addition to the character set, a certain database management system allows you to 
-	* choose how the data will be classified (ORDER BY) by what is called a "COLLATE". 
-	* This makes it possible, for example, to answer the classic problem of case sensitivity.
-	* for example :
-	*	$db['collation'] = 'utf8_general_ci';
-	*/
+	 * In addition to the character set, a certain database management system allows you to 
+	 * choose how the data will be classified (ORDER BY) by what is called a "COLLATE". 
+	 * This makes it possible, for example, to answer the classic problem of case sensitivity.
+	 * for example :
+	 *	$db['collation'] = 'utf8_general_ci';
+	 */
 	$db['collation'] = 'utf8_general_ci';
 	
 	
 	/**
-	* If your tables in your database contain prefixes, this is the case most on some application, 
-	* to avoid the conflict of name of the tables between different database, 
-	* it is possible to define prefixes for the tables.
-	* for example :
-	*
-	* $db['prefix'] = 'pf_';
-	* or
-	*
-	* $db['prefix'] = 'my_db_';
-	*/
+	 * If your tables in your database contain prefixes, this is the case most on some application, 
+	 * to avoid the conflict of name of the tables between different database, 
+	 * it is possible to define prefixes for the tables.
+	 * for example :
+	 *
+	 * $db['prefix'] = 'pf_';
+	 * or
+	 *
+	 * $db['prefix'] = 'my_db_';
+	 */
 	$db['prefix'] = '';
\ No newline at end of file

config/autoload.php

Indentation +52 added lines, -52 removed lines

@@ -22,73 +22,73 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	/**
-	* This file contains the configuration of resources that you want to load automatically: 
-	* personal or system libraries, configuration files, models, 
-	* personal functions or systems that are used most often in your application 
-	* instead of loading them every time you want to use it.
-	* Note: loading a lot of resources can decrease the performance of your application.
-	*/
+	 * This file contains the configuration of resources that you want to load automatically: 
+	 * personal or system libraries, configuration files, models, 
+	 * personal functions or systems that are used most often in your application 
+	 * instead of loading them every time you want to use it.
+	 * Note: loading a lot of resources can decrease the performance of your application.
+	 */
 
 
 	/**
-	* If you have personal libraries or systems to load automatically, then list them in the following array.
-	* For example :
-	*
-	*	$autoload['libraries'] = array('library1', 'library1');
-	*
-	* Note: Personal libraries have priority over system libraries, 
-	* ie the loading order is as follows: it looks in the folder of the personal libraries, 
-	* if it is found, it is loaded, if not , we search in the system libraries folder, 
-	* before returning an error in case it does not find it.
-	*/
+	 * If you have personal libraries or systems to load automatically, then list them in the following array.
+	 * For example :
+	 *
+	 *	$autoload['libraries'] = array('library1', 'library1');
+	 *
+	 * Note: Personal libraries have priority over system libraries, 
+	 * ie the loading order is as follows: it looks in the folder of the personal libraries, 
+	 * if it is found, it is loaded, if not , we search in the system libraries folder, 
+	 * before returning an error in case it does not find it.
+	 */
 	$autoload['libraries'] = array();
 
 	/**
-	* If you have configuration files to load automatically, then list them in the following array.
-	* For example :
-	*
-	*	$autoload['config'] = array('config1', 'config2');
-	*
-	* Note 1: the file name must have as prefix "config_" 
-	* for example "config_name_of_the_file_config.php" and contains as configuration variable the array $config,
-	* otherwise the system can not find this configuration file.
-	* For example :
-	*
-	*	$config['key1'] = value1;
-	* 	$config['key2'] = value2;
-	*
-	* Note 2: the files to be loaded must be in the folder defined by the constant "CONFIG_PATH" in "index.php".
-	*/
+	 * If you have configuration files to load automatically, then list them in the following array.
+	 * For example :
+	 *
+	 *	$autoload['config'] = array('config1', 'config2');
+	 *
+	 * Note 1: the file name must have as prefix "config_" 
+	 * for example "config_name_of_the_file_config.php" and contains as configuration variable the array $config,
+	 * otherwise the system can not find this configuration file.
+	 * For example :
+	 *
+	 *	$config['key1'] = value1;
+	 * 	$config['key2'] = value2;
+	 *
+	 * Note 2: the files to be loaded must be in the folder defined by the constant "CONFIG_PATH" in "index.php".
+	 */
 	$autoload['config'] = array();
 
 	/**
-	* If you have models to load automatically, then list them in the following table.
-	* For example :
-	*
-	*	$autoload['models'] = array('model1', 'model2');
-	*/
+	 * If you have models to load automatically, then list them in the following table.
+	 * For example :
+	 *
+	 *	$autoload['models'] = array('model1', 'model2');
+	 */
 	$autoload['models'] = array();
 
 	/**
-	* If you have system or personal functions to load automatically, specify them in the following array.
-	* For example :
-	*
-	* 	$autoload['functions'] = array('function1', 'function2');
-	*
-	* Note: Personal functions have priority over system functions,
-	* that is to say that the order of loading is the following : it looks in the directory of the personal functions,
-	* if it is found, it is loaded, otherwise, it looks in the directory of the system functions,
-	* before returning an error in case he does not find it.
-	*/
+	 * If you have system or personal functions to load automatically, specify them in the following array.
+	 * For example :
+	 *
+	 * 	$autoload['functions'] = array('function1', 'function2');
+	 *
+	 * Note: Personal functions have priority over system functions,
+	 * that is to say that the order of loading is the following : it looks in the directory of the personal functions,
+	 * if it is found, it is loaded, otherwise, it looks in the directory of the system functions,
+	 * before returning an error in case he does not find it.
+	 */
 	$autoload['functions'] = array();
 	
 	/**
-	* If you have system or personal language to load automatically, specify them in the following array.
-	* For example :
-	*
-	* 	$autoload['languages'] = array('lang1', 'lang2');
-	*/
+	 * If you have system or personal language to load automatically, specify them in the following array.
+	 * For example :
+	 *
+	 * 	$autoload['languages'] = array('lang1', 'lang2');
+	 */
 	$autoload['languages'] = array();

index.php

Indentation +128 added lines, -128 removed lines

@@ -21,194 +21,194 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	/**
-	* the directory separator, under windows it is \ and unix, linux /
-	*/
+	 * the directory separator, under windows it is \ and unix, linux /
+	 */
 	define('DS', DIRECTORY_SEPARATOR);
 
 	/**
-	* The root directory of the application.
-	*
-	* you can place this directory outside of your web directory, for example "/home/your_app", etc.
-	*/
+	 * The root directory of the application.
+	 *
+	 * you can place this directory outside of your web directory, for example "/home/your_app", etc.
+	 */
 	define('ROOT_PATH', dirname(realpath(__FILE__)) . DS);
 
 	/**
-	* The path to the directory.
-	*
-	* That contains your static files (javascript, css, images, etc.)
-	* Note: the path must be relative to the file index.php (the front-end controller).
-	*/
+	 * The path to the directory.
+	 *
+	 * That contains your static files (javascript, css, images, etc.)
+	 * Note: the path must be relative to the file index.php (the front-end controller).
+	 */
 	define('ASSETS_PATH', 'assets/');
 
 	/**
-	* The path to the directory of your cache files.
-	*
-	* This feature is available currently for database and views.
-	*/
+	 * The path to the directory of your cache files.
+	 *
+	 * This feature is available currently for database and views.
+	 */
 	define('CACHE_PATH', ROOT_PATH . 'cache' . DS);
 
 	/**
-	* The path to the application directory. 
-	*
-	* It contains your most often used files that is to say which contains your files of the application, 
-	* in MVC architecture (controllers, models, views).
-	*/
+	 * The path to the application directory. 
+	 *
+	 * It contains your most often used files that is to say which contains your files of the application, 
+	 * in MVC architecture (controllers, models, views).
+	 */
 	define('APPS_PATH', ROOT_PATH . 'classes' . DS);
 
 	/**
-	* The path to the controller directory of your application.
-	*
-	* If you already know the MVC architecture you know what a controller means; 
-	* it is he who makes the business logic of your application in general.
-	*/
+	 * The path to the controller directory of your application.
+	 *
+	 * If you already know the MVC architecture you know what a controller means; 
+	 * it is he who makes the business logic of your application in general.
+	 */
 	define('APPS_CONTROLLER_PATH', APPS_PATH . 'controllers' . DS);
 
 	/**
-	* The path to the directory of your model classes of your application. 
-	*
-	* If you already know the MVC architecture you know what a model means; 
-	* it's the one who interacts with the database, in one word persistent data from your application.
-	*/
+	 * The path to the directory of your model classes of your application. 
+	 *
+	 * If you already know the MVC architecture you know what a model means; 
+	 * it's the one who interacts with the database, in one word persistent data from your application.
+	 */
 	define('APPS_MODEL_PATH', APPS_PATH . 'models' . DS);
 
 	/**
-	* The path to the directory of your views.
-	*
-	* If you already know the MVC architecture you know what a view means, 
-	* a view is just a user interface (html page, form, etc.) that is to say 
-	* everything displayed in the browser interface, etc.
-	*/
+	 * The path to the directory of your views.
+	 *
+	 * If you already know the MVC architecture you know what a view means, 
+	 * a view is just a user interface (html page, form, etc.) that is to say 
+	 * everything displayed in the browser interface, etc.
+	 */
 	define('APPS_VIEWS_PATH', APPS_PATH . 'views' . DS);
 
 	/**
-	* The path to the configuration directory.
-	*
-	* That contains most of the configuration files for your 
-	* application (database, class loading file, functions, etc.)
-	*/
+	 * The path to the configuration directory.
+	 *
+	 * That contains most of the configuration files for your 
+	 * application (database, class loading file, functions, etc.)
+	 */
 	define('CONFIG_PATH', ROOT_PATH . 'config' . DS);
 
 	/** 
-	* The core directory
-	*
-	* It is recommended to put this folder out of the web directory of your server and 
-	* you should not change its content because in case of update you could lose the modified files.
-	*/
+	 * The core directory
+	 *
+	 * It is recommended to put this folder out of the web directory of your server and 
+	 * you should not change its content because in case of update you could lose the modified files.
+	 */
 	define('CORE_PATH', ROOT_PATH . 'core' . DS);
 	
 	/**
-	* The path to the directory of core classes that used by the system.
-	*
-	* It contains PHP classes that are used by the framework internally.
-	*/
+	 * The path to the directory of core classes that used by the system.
+	 *
+	 * It contains PHP classes that are used by the framework internally.
+	 */
 	define('CORE_CLASSES_PATH', CORE_PATH . 'classes' . DS);
 	
 	/**
-	* The path to the directory of core classes for the cache used by the system.
-	*
-	* It contains PHP classes for the cache drivers.
-	*/
+	 * The path to the directory of core classes for the cache used by the system.
+	 *
+	 * It contains PHP classes for the cache drivers.
+	 */
 	define('CORE_CLASSES_CACHE_PATH', CORE_CLASSES_PATH . 'cache' . DS);
 	
 	/**
-	* The path to the directory of core classes for the model used by the system.
-	*
-	* It contains PHP classes for the models.
-	*/
+	 * The path to the directory of core classes for the model used by the system.
+	 *
+	 * It contains PHP classes for the models.
+	 */
 	define('CORE_CLASSES_MODEL_PATH', CORE_CLASSES_PATH . 'model' . DS);
 
 	/**
-	* The path to the directory of functions or helper systems.
-	*
-	* It contains PHP functions that perform a particular task: character string processing, URL, etc.
-	*/
+	 * The path to the directory of functions or helper systems.
+	 *
+	 * It contains PHP functions that perform a particular task: character string processing, URL, etc.
+	 */
 	define('CORE_FUNCTIONS_PATH', CORE_PATH . 'functions' . DS);
 
 	/**
-	* The path to the core directory of languages files. 
-	*
-	*/
+	 * The path to the core directory of languages files. 
+	 *
+	 */
 	define('CORE_LANG_PATH', CORE_PATH . 'lang' . DS);
 
 	/**
-	* The path to the system library directory.
-	*
-	* Which contains the libraries most often used in your web application, as for the 
-	* core directory it is advisable to put it out of the root directory of your application.
-	*/
+	 * The path to the system library directory.
+	 *
+	 * Which contains the libraries most often used in your web application, as for the 
+	 * core directory it is advisable to put it out of the root directory of your application.
+	 */
 	define('CORE_LIBRARY_PATH', CORE_PATH . 'libraries' . DS);
 
 	/**
-	* The path to the system view directory.
-	*
-	* That contains the views used for the system, such as error messages, and so on.
-	*/
+	 * The path to the system view directory.
+	 *
+	 * That contains the views used for the system, such as error messages, and so on.
+	 */
 	define('CORE_VIEWS_PATH', CORE_PATH . 'views' . DS);
 	
 	/**
-	* The path to the directory of your PHP personal functions or helper.
-	*
-	* It contains your PHP functions that perform a particular task: utilities, etc.
-	* Note: Do not put your personal functions or helpers in the system functions directory, 
-	* because if you update the system you may lose them.
-	*/
+	 * The path to the directory of your PHP personal functions or helper.
+	 *
+	 * It contains your PHP functions that perform a particular task: utilities, etc.
+	 * Note: Do not put your personal functions or helpers in the system functions directory, 
+	 * because if you update the system you may lose them.
+	 */
 	define('FUNCTIONS_PATH', ROOT_PATH . 'functions' . DS);
 
 	/**
-	* The path to the app directory of personal language. 
-	*
-	* This feature is not yet available. 
-	* You can help us do this if you are nice or wish to see the developed framework.
-	*/
+	 * The path to the app directory of personal language. 
+	 *
+	 * This feature is not yet available. 
+	 * You can help us do this if you are nice or wish to see the developed framework.
+	 */
 	define('APP_LANG_PATH', ROOT_PATH . 'lang' . DS);
 
 	/**
-	* The path to the directory of your personal libraries
-	*
-	* It contains your PHP classes, package, etc.
-	* Note: you should not put your personal libraries in the system library directory, 
-	* because it is recalled in case of updating the system you might have surprises.
-	*/
+	 * The path to the directory of your personal libraries
+	 *
+	 * It contains your PHP classes, package, etc.
+	 * Note: you should not put your personal libraries in the system library directory, 
+	 * because it is recalled in case of updating the system you might have surprises.
+	 */
 	define('LIBRARY_PATH', ROOT_PATH . 'libraries' . DS);
 
 	/**
-	* The path to the directory that contains the log files.
-	*
-	* Note: This directory must be available in writing and if possible must have as owner the user who launches your web server, 
-	* under unix or linux most often with the apache web server it is "www-data" or "httpd" even "nobody" for more
-	* details see the documentation of your web server.
-	* Example for Unix or linux with apache web server:
-	* # chmod -R 700 /path/to/your/logs/directory/
-	* # chown -R www-data:www-data /path/to/your/logs/directory/
-	*/
+	 * The path to the directory that contains the log files.
+	 *
+	 * Note: This directory must be available in writing and if possible must have as owner the user who launches your web server, 
+	 * under unix or linux most often with the apache web server it is "www-data" or "httpd" even "nobody" for more
+	 * details see the documentation of your web server.
+	 * Example for Unix or linux with apache web server:
+	 * # chmod -R 700 /path/to/your/logs/directory/
+	 * # chown -R www-data:www-data /path/to/your/logs/directory/
+	 */
 	define('LOGS_PATH', ROOT_PATH . 'logs' . DS);
 
 	/**
-	* The path to the modules directory. 
-	*
-	* It contains your modules used files (config, controllers, libraries, etc.) that is to say which contains your files of the modules, 
-	* in HMVC architecture (hierichical, controllers, models, views).
-	*/
+	 * The path to the modules directory. 
+	 *
+	 * It contains your modules used files (config, controllers, libraries, etc.) that is to say which contains your files of the modules, 
+	 * in HMVC architecture (hierichical, controllers, models, views).
+	 */
 	define('MODULE_PATH', ROOT_PATH . 'modules' . DS);
 
 	/**
-	* The path to the directory of sources external to your application.
-	*
-	* If you have already used "composer" you know what that means.
-	*/
+	 * The path to the directory of sources external to your application.
+	 *
+	 * If you have already used "composer" you know what that means.
+	 */
 	define('VENDOR_PATH', ROOT_PATH . 'vendor' . DS);
 
 	/**
-	* The front controller of your application.
-	*
-	* "index.php" it is through this file that all the requests come, there is a possibility to hidden it in the url of 
-	* your application by using the rewrite module URL of your web server .
-	* For example, under apache web server, there is a configuration example file that is located at the root 
-	* of your framework folder : "htaccess.txt" rename it to ".htaccess".
-	*/
+	 * The front controller of your application.
+	 *
+	 * "index.php" it is through this file that all the requests come, there is a possibility to hidden it in the url of 
+	 * your application by using the rewrite module URL of your web server .
+	 * For example, under apache web server, there is a configuration example file that is located at the root 
+	 * of your framework folder : "htaccess.txt" rename it to ".htaccess".
+	 */
 	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
 	
 	/**
@@ -217,14 +217,14 @@ 
 	define('IS_CLI', stripos('cli', php_sapi_name()) !== false);
 
 	/**
-	* The environment of your application (production, test, development). 
-	*
-	* if your application is still in development you use the value "development" 
-	* so you will have the display of the error messages, etc. 
-	* Once you finish the development of your application that is to put it online 
-	* you change this value to "production" or "testing", in this case there will be deactivation of error messages, 
-	* the loading of the system, will be fast.
-	*/
+	 * The environment of your application (production, test, development). 
+	 *
+	 * if your application is still in development you use the value "development" 
+	 * so you will have the display of the error messages, etc. 
+	 * Once you finish the development of your application that is to put it online 
+	 * you change this value to "production" or "testing", in this case there will be deactivation of error messages, 
+	 * the loading of the system, will be fast.
+	 */
 	define('ENVIRONMENT', 'development');
 
 	/* ---------------------------------------------------------------------------------- */
@@ -254,7 +254,7 @@ 
 	}
 	
 	/**
-	* let's go.
-	* Everything is OK now we launch our application.
-	*/
+	 * let's go.
+	 * Everything is OK now we launch our application.
+	 */
 	require_once CORE_PATH . 'bootstrap.php';
\ No newline at end of file

core/bootstrap.php

Indentation +30 added lines, -30 removed lines

@@ -22,7 +22,7 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	/**
 	 *  @file bootstrap.php
@@ -46,9 +46,9 @@ 
 	}
 		
 	/**
-	*  inclusion of global constants of the environment that contain : name of the framework,
-	*  version, release date, version of PHP required, etc.
-	*/
+	 *  inclusion of global constants of the environment that contain : name of the framework,
+	 *  version, release date, version of PHP required, etc.
+	 */
 	require_once CORE_PATH . 'constants.php';	
 	
 	/**
@@ -65,17 +65,17 @@ 
 	$BENCHMARK->mark('APP_EXECUTION_START');
 	
 	/**
-    * instance of the Log class
-    */
-    $LOGGER =& class_loader('Log', 'classes');
+	 * instance of the Log class
+	 */
+	$LOGGER =& class_loader('Log', 'classes');
 
-    $LOGGER->setLogger('ApplicationBootstrap');
+	$LOGGER->setLogger('ApplicationBootstrap');
 
-    $LOGGER->debug('Checking PHP version ...');	
+	$LOGGER->debug('Checking PHP version ...');	
 	
 	/**
-	* Verification of the PHP environment: minimum and maximum version
-	*/
+	 * Verification of the PHP environment: minimum and maximum version
+	 */
 	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')){
 		show_error('Your PHP Version [' . phpversion() . '] is less than [' . TNH_REQUIRED_PHP_MIN_VERSION . '], please install a new version or update your PHP to the latest.', 'PHP Error environment');	
 	}
@@ -85,13 +85,13 @@ 
 	$LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_REQUIRED_PHP_MIN_VERSION . ', REQUIRED MAXIMUM: ' . TNH_REQUIRED_PHP_MAX_VERSION . '], application can work without any issue');
 
 	/**
-	* Setting of the PHP error message handling function
-	*/
+	 * Setting of the PHP error message handling function
+	 */
 	set_error_handler('php_error_handler');
 
 	/**
-	* Setting of the PHP error exception handling function
-	*/
+	 * Setting of the PHP error exception handling function
+	 */
 	set_exception_handler('php_exception_handler');
 
 	/**
@@ -124,18 +124,18 @@ 
 
 	$BENCHMARK->mark('CONFIG_INIT_START');
 	/**
-	* Load configurations and using the 
-	* static method "init()" to initialize the Config class .
-	*/
+	 * Load configurations and using the 
+	 * static method "init()" to initialize the Config class .
+	 */
 	$CONFIG =& class_loader('Config', 'classes');	
 	$CONFIG->init();
 	$BENCHMARK->mark('CONFIG_INIT_END');
 
 	$BENCHMARK->mark('MODULE_INIT_START');
 	/**
-	* Load modules and using the 
-	* static method "init()" to initialize the Module class.
-	*/
+	 * Load modules and using the 
+	 * static method "init()" to initialize the Module class.
+	 */
 	$MODULE =& class_loader('Module', 'classes');
 	$MODULE->init();
 	$BENCHMARK->mark('MODULE_INIT_END');
@@ -148,19 +148,19 @@ 
 	$LOGGER->info('Base Controller loaded successfully');
 
 	/**
-	* Register controllers autoload function
-	*/
+	 * Register controllers autoload function
+	 */
 	 spl_autoload_register('autoload_controller');
 
 	/**
-	* Loading Security class
-	*/
+	 * Loading Security class
+	 */
 	$SECURITY =& class_loader('Security', 'classes');
 	$SECURITY->checkWhiteListIpAccess();
 	
 	/**
-	* Loading Url class
-	*/
+	 * Loading Url class
+	 */
 	$URL =& class_loader('Url', 'classes');
 	
 	if(get_config('cache_enable', false)){
@@ -190,8 +190,8 @@ 
 	
 	$LOGGER->info('Everything is OK load Router library and dispatch the request to the corresponding controller');
 	/**
-	* Routing
-	* instantiation of the "Router" class and user request routing processing.
-	*/
+	 * Routing
+	 * instantiation of the "Router" class and user request routing processing.
+	 */
 	$ROUTER = & class_loader('Router', 'classes');
 	$ROUTER->run();

core/classes/Config.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	class Config{
 		

core/classes/cache/FileCache.php

Indentation +63 added lines, -63 removed lines

@@ -22,7 +22,7 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	class FileCache implements CacheInterface{
 		
@@ -83,26 +83,26 @@ 
 				return false;
 			}
 			// Getting a shared lock 
-		    flock($handle, LOCK_SH);
-		    $data = file_get_contents($filePath);
-      		fclose($handle);
-      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-      		if (! $data) {
-      			$logger->error('Can not unserialize the cache data for the key ['. $key .'], return false');
-		         // If unserializing somehow didn't work out, we'll delete the file
-		         unlink($filePath);
-		         return false;
-	      	}
-	      	if (time() > $data['expire']) {
-	      		$logger->info('The cache data for the key ['. $key .'] already expired delete the cache file [' .$filePath. ']');
-		        // Unlinking when the file was expired
-		        unlink($filePath);
-		        return false;
-		     }
-		     else{
-		     	$logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
-		     	return $data['data'];
-		     }
+			flock($handle, LOCK_SH);
+			$data = file_get_contents($filePath);
+	  		fclose($handle);
+	  		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
+	  		if (! $data) {
+	  			$logger->error('Can not unserialize the cache data for the key ['. $key .'], return false');
+				 // If unserializing somehow didn't work out, we'll delete the file
+				 unlink($filePath);
+				 return false;
+		  	}
+		  	if (time() > $data['expire']) {
+		  		$logger->info('The cache data for the key ['. $key .'] already expired delete the cache file [' .$filePath. ']');
+				// Unlinking when the file was expired
+				unlink($filePath);
+				return false;
+			 }
+			 else{
+			 	$logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $data['expire']) . ']');
+			 	return $data['data'];
+			 }
 			return false;
 		}
 
@@ -126,25 +126,25 @@ 
 			}
 			flock($handle, LOCK_EX); // exclusive lock, will get released when the file is closed
 			//Serializing along with the TTL
-		    $cacheData = serialize(array(
+			$cacheData = serialize(array(
 									'mtime' => time(),
 									'expire' => $expire,
 									'data' => $data,
 									'ttl' => $ttl
 									)
 								);		   
-		    $result = fwrite($handle, $this->compressCacheData ? gzdeflate($cacheData, 9) : $cacheData);
-		    if(! $result){
-		    	$logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
-		    	fclose($handle);
-		    	return false;
-		    }
-		    else{
-		    	$logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
-		    	fclose($handle);
+			$result = fwrite($handle, $this->compressCacheData ? gzdeflate($cacheData, 9) : $cacheData);
+			if(! $result){
+				$logger->error('Can not write cache data into file [' .$filePath. '] for the key ['. $key .'], return false');
+				fclose($handle);
+				return false;
+			}
+			else{
+				$logger->info('Cache data saved into file [' .$filePath. '] for the key ['. $key .']');
+				fclose($handle);
 				chmod($filePath, 0640);
 				return true;
-		    }
+			}
 		}	
 
 
@@ -165,7 +165,7 @@ 
 			}
 			else{
 				$logger->info('Found cache file [' .$filePath. '] remove it');
-	      		@unlink($filePath);
+		  		@unlink($filePath);
 				return true;
 			}
 		}
@@ -189,7 +189,7 @@ 
 			}
 			else{
 				$logger->info('Found cache file [' .$filePath. '] check the validity');
-	      		$data = file_get_contents($filePath);
+		  		$data = file_get_contents($filePath);
 				$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
 				if(! $data){
 					$logger->warning('Can not unserialize the cache data for file [' . $filePath . ']');
@@ -230,17 +230,17 @@ 
 				foreach ($list as $file) {
 					$logger->debug('Processing the cache file [' . $file . ']');
 					$data = file_get_contents($file);
-		      		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
-		      		if(! $data){
-		      			$logger->warning('Can not unserialize the cache data for file [' . $file . ']');
-		      		}
-		      		else if(time() > $data['expire']){
-		      			$logger->info('The cache data for file [' . $file . '] already expired remove it');
-		      			@unlink($file);
-		      		}
-		      		else{
-		      			$logger->info('The cache data for file [' . $file . '] not yet expired skip it');
-		      		}
+			  		$data = @unserialize($this->compressCacheData ? gzinflate($data) : $data);
+			  		if(! $data){
+			  			$logger->warning('Can not unserialize the cache data for file [' . $file . ']');
+			  		}
+			  		else if(time() > $data['expire']){
+			  			$logger->info('The cache data for file [' . $file . '] already expired remove it');
+			  			@unlink($file);
+			  		}
+			  		else{
+			  			$logger->info('The cache data for file [' . $file . '] not yet expired skip it');
+			  		}
 				}
 			}
 		}	
@@ -264,19 +264,19 @@ 
 			}
 		}
 	
-	    /**
-	     * @return boolean
-	     */
-	    public function isCompressCacheData(){
-	        return $this->compressCacheData;
-	    }
+		/**
+		 * @return boolean
+		 */
+		public function isCompressCacheData(){
+			return $this->compressCacheData;
+		}
 
-	    /**
-	     * @param boolean $compressCacheData
-	     *
-	     * @return self
-	     */
-	    public function setCompressCacheData($status = true){
+		/**
+		 * @param boolean $compressCacheData
+		 *
+		 * @return self
+		 */
+		public function setCompressCacheData($status = true){
 			//if Zlib extension is not loaded set compressCacheData to false
 			if($status === true && ! extension_loaded('zlib')){
 				$logger = static::getLogger();
@@ -287,7 +287,7 @@ 
 				$this->compressCacheData = $status;
 			}
 			return $this;
-	    }
+		}
 		
 		/**
 		 * Check whether the cache feature for the handle is supported
@@ -299,11 +299,11 @@ 
 		}
 		
 		/**
-		* Get the cache file full path for the given key
-		*
-		* @param $key the cache item key
-		* @return string the full cache file path for this key
-		*/
+		 * Get the cache file full path for the given key
+		 *
+		 * @param $key the cache item key
+		 * @return string the full cache file path for this key
+		 */
 		private function getFilePath($key){
 			return CACHE_PATH . md5($key) . '.cache';
 		}