tnhfw / tnh-fw

config/database.php

Indentation +114 added lines, -114 removed lines

@@ -1,127 +1,127 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework created using the concept of codeigniter with bootstrap twitter
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * 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.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework created using the concept of codeigniter with bootstrap twitter
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * 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
-	*
-	*/
-	$db['driver'] = 'mysql';
+    /**
+     * 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';
 	
-	/**
-	 *  The address of your database server
-	 *
-	 * It can be a domain name or IP address, for example:
-	 *	$db['hostname'] = 'localhost';
-	 * or
-	 *	$db['hostname'] = 'mysql.host.com';
-	 * or
-	 *	$db['hostname'] = '187.15.14.17';
-	 *	* or if port is not a standart port
-	 *	$db['hostname'] = 'mydb.server.com:6356';
-	 */
-	$db['hostname'] = 'localhost';
+    /**
+     *  The address of your database server
+     *
+     * It can be a domain name or IP address, for example:
+     *	$db['hostname'] = 'localhost';
+     * or
+     *	$db['hostname'] = 'mysql.host.com';
+     * or
+     *	$db['hostname'] = '187.15.14.17';
+     *	* or if port is not a standart port
+     *	$db['hostname'] = 'mydb.server.com:6356';
+     */
+    $db['hostname'] = 'localhost';
 	
-	/**
-	* The username of your database server
-	* for example :
-	*
-	*	$db['username'] = 'root';
-	* or
-	*	$db['username'] = 'myusername';
-	*/
-	$db['username'] = 'root';
+    /**
+     * 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';
-	*/
-	$db['password'] = '';
+    /**
+     * 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';
-	*/
-	$db['database'] = '';
+    /**
+     * 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';
-	*/
-	$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';
-	*/
-	$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_';
-	*/
-	$db['prefix'] = '';
\ No newline at end of file
+    /**
+     * 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/routes.php

Indentation +85 added lines, -85 removed lines

@@ -1,88 +1,88 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework created using the concept of codeigniter with bootstrap twitter
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * 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.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework created using the concept of codeigniter with bootstrap twitter
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * 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
-	 */
-	$route['/'] = 'Home';
\ No newline at end of file
+    /**
+     *  The default route like your home page
+     */
+    $route['/'] = 'Home';
\ No newline at end of file

config/config_pagination.php

Indentation +76 added lines, -76 removed lines

@@ -1,90 +1,90 @@
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework created using the concept of codeigniter with bootstrap twitter
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * 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.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework created using the concept of codeigniter with bootstrap twitter
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * 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
-	 */
-	$config['nb_link'] = 10;
+    /**
+     * Number of pagination digit
+     */
+    $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)
-	*/
-	$config['pagination_per_page'] = 10;
+    /**
+     * 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;
 	
 
-	/**
-	 * The query string name used to fetch the current page
-	 */
-	$config['page_query_string_name'] = 'page';
+    /**
+     * The query string name used to fetch the current page
+     */
+    $config['page_query_string_name'] = 'page';
 
-	/**
-	 * The opened and closed tag for active link
-	 */
-	$config['active_link_open'] = '<li class = "active"><a href = "#">';
-	$config['active_link_close'] = '</a></li>';
+    /**
+     * The opened and closed tag for active link
+     */
+    $config['active_link_open'] = '<li class = "active"><a href = "#">';
+    $config['active_link_close'] = '</a></li>';
 
-	/**
-	 * The opened and closed tag for previous link
-	 */
-	$config['previous_open'] = '<li>';
-	$config['previous_close'] = '</li>';
+    /**
+     * The opened and closed tag for previous link
+     */
+    $config['previous_open'] = '<li>';
+    $config['previous_close'] = '</li>';
 
-	/**
-	 * The opened and closed tag for next link
-	 */
-	$config['next_open'] = '<li>';
-	$config['next_close'] = '</li>';
+    /**
+     * The opened and closed tag for next link
+     */
+    $config['next_open'] = '<li>';
+    $config['next_close'] = '</li>';
 
 
-	/**
-	 * The displayed text for previous and next link
-	 */
-	$config['previous_text'] = '&laquo;&laquo;';	
-	$config['next_text'] = '&raquo;&raquo;';
+    /**
+     * The displayed text for previous and next link
+     */
+    $config['previous_text'] = '&laquo;&laquo;';	
+    $config['next_text'] = '&raquo;&raquo;';
 
-	/**
-	 * The opened and closed tag for the pagination bloc
-	 */
-	$config['pagination_open'] = '<ul class = "pagination">';
-	$config['pagination_close'] = '</ul>';
+    /**
+     * The opened and closed tag for the pagination bloc
+     */
+    $config['pagination_open'] = '<ul class = "pagination">';
+    $config['pagination_close'] = '</ul>';
 
-	/**
-	 * The opened and closed tag for each link digit
-	 */
-	$config['digit_open'] = '<li>';
-	$config['digit_close'] = '</li>';
+    /**
+     * The opened and closed tag for each link digit
+     */
+    $config['digit_open'] = '<li>';
+    $config['digit_close'] = '</li>';
 
-	/**
-	 * The HTML attributes to use in each link
-	 */
-	$config['attributes'] = array();
\ No newline at end of file
+    /**
+     * The HTML attributes to use in each link
+     */
+    $config['attributes'] = array();
\ No newline at end of file

index.php

Indentation +230 added lines, -230 removed lines

@@ -1,260 +1,260 @@
 <?php
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * 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.
-	*/
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * 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 /
-	*/
-	define('DS', DIRECTORY_SEPARATOR);
+    /**
+     * 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.
-	*/
-	define('ROOT_PATH', dirname(realpath(__FILE__)) . DS);
+    /**
+     * 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).
-	*/
-	define('ASSETS_PATH', 'assets/');
+    /**
+     * 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.
-	*/
-	define('CACHE_PATH', ROOT_PATH . 'cache' . DS);
+    /**
+     * 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).
-	*/
-	define('APPS_PATH', ROOT_PATH . 'classes' . 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).
+     */
+    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.
-	*/
-	define('APPS_CONTROLLER_PATH', APPS_PATH . 'controllers' . 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.
+     */
+    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.
-	*/
-	define('APPS_MODEL_PATH', APPS_PATH . 'models' . 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.
+     */
+    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.
-	*/
-	define('APPS_VIEWS_PATH', APPS_PATH . 'views' . 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.
+     */
+    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.)
-	*/
-	define('CONFIG_PATH', ROOT_PATH . 'config' . DS);
+    /**
+     * 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.
-	*/
-	define('CORE_PATH', ROOT_PATH . 'core' . 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.
+     */
+    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.
-	*/
-	define('CORE_CLASSES_PATH', CORE_PATH . 'classes' . 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.
+     */
+    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.
-	*/
-	define('CORE_CLASSES_CACHE_PATH', CORE_CLASSES_PATH . 'cache' . DS);
+    /**
+     * 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.
-	*/
-	define('CORE_CLASSES_MODEL_PATH', CORE_CLASSES_PATH . 'model' . DS);
+    /**
+     * 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.
-	*/
-	define('CORE_FUNCTIONS_PATH', CORE_PATH . 'functions' . 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.
+     */
+    define('CORE_FUNCTIONS_PATH', CORE_PATH . 'functions' . DS);
 
-	/**
-	* The path to the core directory of languages files. 
-	*
-	*/
-	define('CORE_LANG_PATH', CORE_PATH . 'lang' . DS);
+    /**
+     * 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.
-	*/
-	define('CORE_LIBRARY_PATH', CORE_PATH . 'libraries' . 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.
+     */
+    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.
-	*/
-	define('CORE_VIEWS_PATH', CORE_PATH . 'views' . DS);
+    /**
+     * 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.
-	*/
-	define('FUNCTIONS_PATH', ROOT_PATH . 'functions' . 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.
+     */
+    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.
-	*/
-	define('APP_LANG_PATH', ROOT_PATH . 'lang' . 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.
+     */
+    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.
-	*/
-	define('LIBRARY_PATH', ROOT_PATH . 'libraries' . 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.
+     */
+    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/
-	*/
-	define('LOGS_PATH', ROOT_PATH . 'logs' . 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/
+     */
+    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).
-	*/
-	define('MODULE_PATH', ROOT_PATH . 'modules' . 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).
+     */
+    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.
-	*/
-	define('VENDOR_PATH', ROOT_PATH . 'vendor' . DS);
+    /**
+     * 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".
-	*/
-	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
+    /**
+     * 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));
 	
-	/**
-	 * Check if user run the application under CLI
-	 */
-	define('IS_CLI', stripos('cli', php_sapi_name()) !== false);
+    /**
+     * Check if user run the application under CLI
+     */
+    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.
-	*/
-	define('ENVIRONMENT', 'development');
+    /**
+     * 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');
 
-	/* ---------------------------------------------------------------------------------- */
-	///////////////////////////////////////////////////////////////////////////////////////
-	/******************** DO NOT CHANGE THE LINES BELOW *********************************/
-	/////////////////////////////////////////////////////////////////////////////////////
+    /* ---------------------------------------------------------------------------------- */
+    ///////////////////////////////////////////////////////////////////////////////////////
+    /******************** DO NOT CHANGE THE LINES BELOW *********************************/
+    /////////////////////////////////////////////////////////////////////////////////////
 
-	switch (ENVIRONMENT) {
-		case 'development':
-			error_reporting(-1);
-			ini_set('display_errors', 1);
-		break;
-		case 'testing':
-		case 'production':
-			ini_set('display_errors', 0);
-			if (version_compare(PHP_VERSION, '5.3', '>=')) {
-				error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-			}
-			else{
-				error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
-			}
-		break;
-		default:
-			header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
-			echo 'The application environment is not set correctly.';
-			exit(1);
-	}
+    switch (ENVIRONMENT) {
+        case 'development':
+            error_reporting(-1);
+            ini_set('display_errors', 1);
+        break;
+        case 'testing':
+        case 'production':
+            ini_set('display_errors', 0);
+            if (version_compare(PHP_VERSION, '5.3', '>=')) {
+                error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+            }
+            else{
+                error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
+            }
+        break;
+        default:
+            header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+            echo 'The application environment is not set correctly.';
+            exit(1);
+    }
 	
-	/**
-	* let's go.
-	* Everything is OK now we launch our application.
-	*/
-	require_once CORE_PATH . 'bootstrap.php';
\ No newline at end of file
+    /**
+     * let's go.
+     * Everything is OK now we launch our application.
+     */
+    require_once CORE_PATH . 'bootstrap.php';
\ No newline at end of file

core/classes/Module.php

Indentation +298 added lines, -298 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
      * TNH Framework
      *
      * A simple PHP framework using HMVC architecture
@@ -22,321 +22,321 @@ 
      * 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 Module{
+    class Module{
 		
-		/**
-		 * list of loaded module
-		 * @var array
-		 */
-		private static $list = array();
+        /**
+         * list of loaded module
+         * @var array
+         */
+        private static $list = array();
 
-		/**
-		 * logger instance
-		 * @var Log
-		 */
-		private static $logger;
+        /**
+         * logger instance
+         * @var Log
+         */
+        private static $logger;
 
-		/**
-		 * The signleton of the logger
-		 * @return Object the Log instance
-		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
-				self::$logger[0]->setLogger('Library::Module');
-			}
-			return self::$logger[0];
-		}
+        /**
+         * The signleton of the logger
+         * @return Object the Log instance
+         */
+        private static function getLogger(){
+            if(self::$logger == null){
+                self::$logger[0] =& class_loader('Log', 'classes');
+                self::$logger[0]->setLogger('Library::Module');
+            }
+            return self::$logger[0];
+        }
 
-		/**
-		 * Initialise the module list by scanning the directory MODULE_PATH
-		 */
-		public function init(){
-			$logger = self::getLogger();
-			$logger->debug('Check if the application contains the modules ...');
-			$moduleDir = opendir(MODULE_PATH);
-			if(is_resource($moduleDir)){
-				while(($module = readdir($moduleDir)) !== false){
-					if(preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
-						self::$list[] = $module;
-					}
-					else{
-						$logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
-					}
-				}
-				closedir($moduleDir);
-			}
-			ksort(self::$list);
+        /**
+         * Initialise the module list by scanning the directory MODULE_PATH
+         */
+        public function init(){
+            $logger = self::getLogger();
+            $logger->debug('Check if the application contains the modules ...');
+            $moduleDir = opendir(MODULE_PATH);
+            if(is_resource($moduleDir)){
+                while(($module = readdir($moduleDir)) !== false){
+                    if(preg_match('/^([a-z0-9-_]+)$/i', $module) && is_dir(MODULE_PATH . $module)){
+                        self::$list[] = $module;
+                    }
+                    else{
+                        $logger->info('Skipping [' .$module. '], may be this is not a directory or does not exists or is invalid name');
+                    }
+                }
+                closedir($moduleDir);
+            }
+            ksort(self::$list);
 			
-			if(self::hasModule()){
-				$logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']');
-			}
-		}
+            if(self::hasModule()){
+                $logger->info('The application contains the module below [' . implode(', ', self::getModuleList()) . ']');
+            }
+        }
 		
-		/**
-		 * Get the list of the custom autoload configuration from module if exists
-		 * @return array|boolean the autoload configurations list or false if no module contains the autoload configuration values
-		 */
-		public static function getModulesAutoloadConfig(){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skipping.');
-				return false;
-			}
-			$autoloads = array();
-			$autoloads['libraries'] = array();
-			$autoloads['config']    = array();
-			$autoloads['models']    = array();
-			$autoloads['functions'] = array();
-			$autoloads['languages'] = array();
+        /**
+         * Get the list of the custom autoload configuration from module if exists
+         * @return array|boolean the autoload configurations list or false if no module contains the autoload configuration values
+         */
+        public static function getModulesAutoloadConfig(){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skipping.');
+                return false;
+            }
+            $autoloads = array();
+            $autoloads['libraries'] = array();
+            $autoloads['config']    = array();
+            $autoloads['models']    = array();
+            $autoloads['functions'] = array();
+            $autoloads['languages'] = array();
 			
-			foreach (self::$list as $module) {
-				$file = MODULE_PATH . $module . DS . 'config' . DS . 'autoload.php';
-				if(file_exists($file)){
-					$autoload = array();
-					require_once $file;
-					if(! empty($autoload) && is_array($autoload)){
-						$autoloads = array_merge_recursive($autoloads, $autoload);
-						unset($autoload);
-					}
-				}
-			}
-			return $autoloads;
-		}
+            foreach (self::$list as $module) {
+                $file = MODULE_PATH . $module . DS . 'config' . DS . 'autoload.php';
+                if(file_exists($file)){
+                    $autoload = array();
+                    require_once $file;
+                    if(! empty($autoload) && is_array($autoload)){
+                        $autoloads = array_merge_recursive($autoloads, $autoload);
+                        unset($autoload);
+                    }
+                }
+            }
+            return $autoloads;
+        }
 
-		/**
-		 * Get the list of the custom routes configuration from module if exists
-		 * @return array|boolean the routes list or false if no module contains the routes configuration
-		 */
-		public static function getModulesRoutes(){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skipping.');
-				return false;
-			}
-			$routes = array();
-			foreach (self::$list as $module) {
-				$file = MODULE_PATH . $module . DS . 'config' . DS . 'routes.php';
-				if(file_exists($file)){
-					$route = array();
-					require_once $file;
-					if(! empty($route) && is_array($route)){
-						$routes = array_merge($routes, $route);
-						unset($route);
-					}
-				}
-			}
-			return $routes;
-		}
+        /**
+         * Get the list of the custom routes configuration from module if exists
+         * @return array|boolean the routes list or false if no module contains the routes configuration
+         */
+        public static function getModulesRoutes(){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skipping.');
+                return false;
+            }
+            $routes = array();
+            foreach (self::$list as $module) {
+                $file = MODULE_PATH . $module . DS . 'config' . DS . 'routes.php';
+                if(file_exists($file)){
+                    $route = array();
+                    require_once $file;
+                    if(! empty($route) && is_array($route)){
+                        $routes = array_merge($routes, $route);
+                        unset($route);
+                    }
+                }
+            }
+            return $routes;
+        }
 
 
-		/**
-		 * Check if in module list can have this controller
-		 * @param  string $class the controller class
-		 * @param  string $module  the module name
-		 * @return boolean|string  false or null if no module have this controller, path the full path of the controller
-		 */
-		public static function findControllerFullPath($class, $module = null){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$class = str_ireplace('.php', '', $class);
-			$class = ucfirst($class);
-			$classFile = $class.'.php';
-			$logger->debug('Checking the controller [' . $class . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'controllers' . DS . $classFile;
-			if(file_exists($filePath)){
-				$logger->info('Found controller [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			else{
-				$logger->info('Controller [' . $class . '] does not exist in the module [' .$module. ']');
-				return false;
-			}
-		}
+        /**
+         * Check if in module list can have this controller
+         * @param  string $class the controller class
+         * @param  string $module  the module name
+         * @return boolean|string  false or null if no module have this controller, path the full path of the controller
+         */
+        public static function findControllerFullPath($class, $module = null){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $class = str_ireplace('.php', '', $class);
+            $class = ucfirst($class);
+            $classFile = $class.'.php';
+            $logger->debug('Checking the controller [' . $class . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'controllers' . DS . $classFile;
+            if(file_exists($filePath)){
+                $logger->info('Found controller [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            else{
+                $logger->info('Controller [' . $class . '] does not exist in the module [' .$module. ']');
+                return false;
+            }
+        }
 
-		/**
-		 * Check if in module list can have this model
-		 * @param  string $class the model class
-		 * @param string $module the module name
-		 * @return boolean|string  false or null if no module have this model, return the full path of this model
-		 */
-		public static function findModelFullPath($class, $module = null){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$class = str_ireplace('.php', '', $class);
-			$class = ucfirst($class);
-			$classFile = $class.'.php';
-			$logger->debug('Checking model [' . $class . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'models' . DS . $classFile;
-			if(file_exists($filePath)){
-				$logger->info('Found model [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			else{
-				$logger->info('Model [' . $class . '] does not exist in the module [' .$module. ']');
-				return false;
-			}
-		}
+        /**
+         * Check if in module list can have this model
+         * @param  string $class the model class
+         * @param string $module the module name
+         * @return boolean|string  false or null if no module have this model, return the full path of this model
+         */
+        public static function findModelFullPath($class, $module = null){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $class = str_ireplace('.php', '', $class);
+            $class = ucfirst($class);
+            $classFile = $class.'.php';
+            $logger->debug('Checking model [' . $class . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'models' . DS . $classFile;
+            if(file_exists($filePath)){
+                $logger->info('Found model [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            else{
+                $logger->info('Model [' . $class . '] does not exist in the module [' .$module. ']');
+                return false;
+            }
+        }
 		
-		/**
-		 * Check if in module list can have this config
-		 * @param  string $configuration the config name
-		 * @param string $module the module name
-		 * @return boolean|string  false or null if no module have this configuration,  return the full path of this configuration
-		 */
-		public static function findConfigFullPath($configuration, $module = null){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$configuration = str_ireplace('.php', '', $configuration);
-			$file = $configuration.'.php';
-			$logger->debug('Checking configuration [' . $configuration . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'config' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found configuration [' . $configuration . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			else{
-				$logger->info('Configuration [' . $configuration . '] does not exist in the module [' .$module. ']');
-				return false;
-			}
-		}
+        /**
+         * Check if in module list can have this config
+         * @param  string $configuration the config name
+         * @param string $module the module name
+         * @return boolean|string  false or null if no module have this configuration,  return the full path of this configuration
+         */
+        public static function findConfigFullPath($configuration, $module = null){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $configuration = str_ireplace('.php', '', $configuration);
+            $file = $configuration.'.php';
+            $logger->debug('Checking configuration [' . $configuration . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'config' . DS . $file;
+            if(file_exists($filePath)){
+                $logger->info('Found configuration [' . $configuration . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            else{
+                $logger->info('Configuration [' . $configuration . '] does not exist in the module [' .$module. ']');
+                return false;
+            }
+        }
 
-		/**
-		 * Check if in module list can have this helper
-		 * @param  string $helper the helper name
-		 * @param string $module the module name
-		 * @return boolean|string  false or null if no module have this helper,  return the full path of this helper
-		 */
-		public static function findFunctionFullPath($helper, $module = null){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$helper = str_ireplace('.php', '', $helper);
-			$helper = str_ireplace('function_', '', $helper);
-			$file = 'function_'.$helper.'.php';
-			$logger->debug('Checking helper [' . $helper . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'functions' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found helper [' . $helper . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			else{
-				$logger->info('Helper [' . $helper . '] does not exist in the module [' .$module. ']');
-				return false;
-			}
-		}
+        /**
+         * Check if in module list can have this helper
+         * @param  string $helper the helper name
+         * @param string $module the module name
+         * @return boolean|string  false or null if no module have this helper,  return the full path of this helper
+         */
+        public static function findFunctionFullPath($helper, $module = null){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $helper = str_ireplace('.php', '', $helper);
+            $helper = str_ireplace('function_', '', $helper);
+            $file = 'function_'.$helper.'.php';
+            $logger->debug('Checking helper [' . $helper . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'functions' . DS . $file;
+            if(file_exists($filePath)){
+                $logger->info('Found helper [' . $helper . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            else{
+                $logger->info('Helper [' . $helper . '] does not exist in the module [' .$module. ']');
+                return false;
+            }
+        }
 
 
-		/**
-		 * Check if in module list can have this library
-		 * @param  string $class the library name
-		 * @param string $module the module name
-		 * @return boolean|string  false or null if no module have this library,  return the full path of this library
-		 */
-		public static function findLibraryFullPath($class, $module = null){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$class = str_ireplace('.php', '', $class);
-			$file = $class.'.php';
-			$logger->debug('Checking library [' . $class . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'libraries' . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found library [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			else{
-				$logger->info('Library [' . $class . '] does not exist in the module [' .$module. ']');
-				return false;
-			}
-		}
+        /**
+         * Check if in module list can have this library
+         * @param  string $class the library name
+         * @param string $module the module name
+         * @return boolean|string  false or null if no module have this library,  return the full path of this library
+         */
+        public static function findLibraryFullPath($class, $module = null){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $class = str_ireplace('.php', '', $class);
+            $file = $class.'.php';
+            $logger->debug('Checking library [' . $class . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'libraries' . DS . $file;
+            if(file_exists($filePath)){
+                $logger->info('Found library [' . $class . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            else{
+                $logger->info('Library [' . $class . '] does not exist in the module [' .$module. ']');
+                return false;
+            }
+        }
 
 
-		/**
-		 * Check if in module list can have this view
-		 * @param  string $view the view path
-		 * @param string $module the module name to check
-		 * @return boolean|string  false or null if no module have this view, path the full path of the view
-		 */
-		public static function findViewFullPath($view, $module = null){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$view = str_ireplace('.php', '', $view);
-			$view = trim($view, '/\\');
-			$view = str_ireplace('/', DS, $view);
-			$viewFile = $view . '.php';
-			$logger->debug('Checking view [' . $view . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'views' . DS . $viewFile;
-			if(file_exists($filePath)){
-				$logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			else{
-				$logger->info('View [' . $view . '] does not exist in the module [' .$module. ']');
-				return false;
-			}
-		}
+        /**
+         * Check if in module list can have this view
+         * @param  string $view the view path
+         * @param string $module the module name to check
+         * @return boolean|string  false or null if no module have this view, path the full path of the view
+         */
+        public static function findViewFullPath($view, $module = null){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $view = str_ireplace('.php', '', $view);
+            $view = trim($view, '/\\');
+            $view = str_ireplace('/', DS, $view);
+            $viewFile = $view . '.php';
+            $logger->debug('Checking view [' . $view . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'views' . DS . $viewFile;
+            if(file_exists($filePath)){
+                $logger->info('Found view [' . $view . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            else{
+                $logger->info('View [' . $view . '] does not exist in the module [' .$module. ']');
+                return false;
+            }
+        }
 
-		/**
-		 * Check if in module list can have this language
-		 * @param  string $language the language name
-		 * @param string $module the module name
-		 * @param string $appLang the application language like 'en', 'fr'
-		 * @return boolean|string  false or null if no module have this language,  return the full path of this language
-		 */
-		public static function findLanguageFullPath($language, $module = null, $appLang){
-			$logger = self::getLogger();
-			if(! self::hasModule()){
-				$logger->info('No module was loaded skiping.');
-				return false;
-			}
-			$language = str_ireplace('.php', '', $language);
-			$language = str_ireplace('lang_', '', $language);
-			$file = 'lang_'.$language.'.php';
-			$logger->debug('Checking language [' . $language . '] in module [' .$module. '] ...');
-			$filePath = MODULE_PATH . $module . DS . 'lang' . DS . $appLang . DS . $file;
-			if(file_exists($filePath)){
-				$logger->info('Found language [' . $language . '] in module [' .$module. '], the file path is [' .$filePath. ']');
-				return $filePath;
-			}
-			else{
-				$logger->info('Language [' . $language . '] does not exist in the module [' .$module. ']');
-				return false;
-			}
-		}
+        /**
+         * Check if in module list can have this language
+         * @param  string $language the language name
+         * @param string $module the module name
+         * @param string $appLang the application language like 'en', 'fr'
+         * @return boolean|string  false or null if no module have this language,  return the full path of this language
+         */
+        public static function findLanguageFullPath($language, $module = null, $appLang){
+            $logger = self::getLogger();
+            if(! self::hasModule()){
+                $logger->info('No module was loaded skiping.');
+                return false;
+            }
+            $language = str_ireplace('.php', '', $language);
+            $language = str_ireplace('lang_', '', $language);
+            $file = 'lang_'.$language.'.php';
+            $logger->debug('Checking language [' . $language . '] in module [' .$module. '] ...');
+            $filePath = MODULE_PATH . $module . DS . 'lang' . DS . $appLang . DS . $file;
+            if(file_exists($filePath)){
+                $logger->info('Found language [' . $language . '] in module [' .$module. '], the file path is [' .$filePath. ']');
+                return $filePath;
+            }
+            else{
+                $logger->info('Language [' . $language . '] does not exist in the module [' .$module. ']');
+                return false;
+            }
+        }
 
-		/**
-		 * Get the list of module loaded
-		 * @return array the module list
-		 */
-		public static function getModuleList(){
-			return self::$list;
-		}
+        /**
+         * Get the list of module loaded
+         * @return array the module list
+         */
+        public static function getModuleList(){
+            return self::$list;
+        }
 
-		/**
-		 * Check if the application has an module
-		 * @return boolean
-		 */
-		public static function hasModule(){
-			return !empty(self::$list);
-		}
+        /**
+         * Check if the application has an module
+         * @return boolean
+         */
+        public static function hasModule(){
+            return !empty(self::$list);
+        }
 
-	}
+    }

core/classes/EventInfo.php

Indentation +56 added lines, -56 removed lines

@@ -1,63 +1,63 @@
 <?php
-	defined('ROOT_PATH') or exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * 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.
-	*/
+    defined('ROOT_PATH') or exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * 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 class represent the event detail to dispatch to correspond listener
-	 */
-	class EventInfo{
+    /**
+     * This class represent the event detail to dispatch to correspond listener
+     */
+    class EventInfo{
 		
-		/**
-		 * The event name
-		 * @var string
-		 */
-		public $name;
+        /**
+         * The event name
+         * @var string
+         */
+        public $name;
 
-		/**
-		 * The event data to send to the listeners
-		 * @var mixed
-		 */
-		public $payload;
+        /**
+         * The event data to send to the listeners
+         * @var mixed
+         */
+        public $payload;
 
-		/**
-		 * If the listeners need return the event after treatment or not, false means no need
-		 * return true need return the event. 
-		 * @var boolean
-		 */
-		public $returnBack;
+        /**
+         * If the listeners need return the event after treatment or not, false means no need
+         * return true need return the event. 
+         * @var boolean
+         */
+        public $returnBack;
 
-		/**
-		 * This variable indicates if need stop the event propagation
-		 * @var boolean
-		 */
-		public $stop;
+        /**
+         * This variable indicates if need stop the event propagation
+         * @var boolean
+         */
+        public $stop;
 		
-		public function __construct($name, $payload = array(), $returnBack = false, $stop = false){
-			$this->name = $name;
-			$this->payload = $payload;
-			$this->returnBack = $returnBack;
-			$this->stop = $stop;
-		}
-	}
+        public function __construct($name, $payload = array(), $returnBack = false, $stop = false){
+            $this->name = $name;
+            $this->payload = $payload;
+            $this->returnBack = $returnBack;
+            $this->stop = $stop;
+        }
+    }

core/classes/database/DatabaseQueryResult.php

Indentation +47 added lines, -47 removed lines

@@ -1,43 +1,43 @@ 
 <?php
     defined('ROOT_PATH') || exit('Access denied');
-  /**
-   * TNH Framework
-   *
-   * A simple PHP framework using HMVC architecture
-   *
-   * This content is released under the GNU GPL License (GPL)
-   *
-   * Copyright (C) 2017 Tony NGUEREZA
-   *
-   * This program is free software; you can redistribute it and/or
-   * modify it under the terms of the GNU General Public License
-   * as published by the Free Software Foundation; either version 3
-   * of the License, or (at your option) any later version.
-   *
-   * This program is distributed in the hope that it will be useful,
-   * but WITHOUT ANY WARRANTY; without even the implied warranty of
-   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   * GNU General Public License for more details.
-   *
-   * 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.
-  */
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * 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 DatabaseQueryResult{
+    class DatabaseQueryResult{
   	
-  	/**
-  	 * The database query result
-  	 * @var mixed
-  	 */
-     private $result  = null;
+        /**
+         * The database query result
+         * @var mixed
+         */
+        private $result  = null;
   	
     
-  	/**
-	 * The number of rows returned by the last query
-	 * @var int
-     */
-     private $numRows = 0;
+        /**
+         * The number of rows returned by the last query
+         * @var int
+         */
+        private $numRows = 0;
   	
 	
     /**
@@ -51,24 +51,24 @@ 
     }
 
     
-     /**
-     * Return the query result
-     *
-     * @return mixed
-     */
+        /**
+         * Return the query result
+         *
+         * @return mixed
+         */
     public function getResult(){
-      return $this->result;
+        return $this->result;
     }
 
     /**
      * Set the query result
      * @param mixed $result the query result
      *
-	 * @return object DatabaseQueryResult
+     * @return object DatabaseQueryResult
      */
     public function setResult($result){
-      $this->result = $result;
-      return $this;
+        $this->result = $result;
+        return $this;
     }
     
     /**
@@ -77,18 +77,18 @@ 
      * @return int
      */
     public function getNumRows(){
-      return $this->numRows;
+        return $this->numRows;
     }
 
     /**
      * Set the number of rows returned by the query
      * @param int $numRows the number of rows returned
      *
-	 * @return object DatabaseQueryResult
+     * @return object DatabaseQueryResult
      */
     public function setNumRows($numRows){
-      $this->numRows = $numRows;
-      return $this;
+        $this->numRows = $numRows;
+        return $this;
     }
    
 }

core/classes/Session.php

Indentation +154 added lines, -154 removed lines

@@ -1,168 +1,168 @@
 <?php
-	defined('ROOT_PATH') or exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * 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 Session{
+    defined('ROOT_PATH') or exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * 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 Session{
 		
-		/**
-		 * The session flash key to use
-		 * @const
-		 */
-		const SESSION_FLASH_KEY = 'session_flash';
+        /**
+         * The session flash key to use
+         * @const
+         */
+        const SESSION_FLASH_KEY = 'session_flash';
 
-		/**
-		 * The logger instance
-		 * @var Log
-		 */
-		private static $logger;
+        /**
+         * The logger instance
+         * @var Log
+         */
+        private static $logger;
 
-		/**
-		 * Get the logger singleton instance
-		 * @return Log the logger instance
-		 */
-		private static function getLogger(){
-			if(self::$logger == null){
-				self::$logger[0] =& class_loader('Log', 'classes');
-				self::$logger[0]->setLogger('Library::Session');
-			}
-			return self::$logger[0];
-		}
+        /**
+         * Get the logger singleton instance
+         * @return Log the logger instance
+         */
+        private static function getLogger(){
+            if(self::$logger == null){
+                self::$logger[0] =& class_loader('Log', 'classes');
+                self::$logger[0]->setLogger('Library::Session');
+            }
+            return self::$logger[0];
+        }
 
-		/**
-		 * Get the session item value
-		 * @param  string $item    the session item name to get
-		 * @param  mixed $default the default value to use if can not find the session item in the list
-		 * @return mixed          the session value if exist or the default value
-		 */
-		public static function get($item, $default = null){
-			$logger = self::getLogger();
-			$logger->debug('Getting session data for item [' .$item. '] ...');
-			if(array_key_exists($item, $_SESSION)){
-				$logger->info('Found session data for item [' . $item . '] the vaue is : [' . stringfy_vars($_SESSION[$item]) . ']');
-				return $_SESSION[$item];
-			}
-			$logger->warning('Cannot find session item [' . $item . '] using the default value ['. $default . ']');
-			return $default;
-		}
+        /**
+         * Get the session item value
+         * @param  string $item    the session item name to get
+         * @param  mixed $default the default value to use if can not find the session item in the list
+         * @return mixed          the session value if exist or the default value
+         */
+        public static function get($item, $default = null){
+            $logger = self::getLogger();
+            $logger->debug('Getting session data for item [' .$item. '] ...');
+            if(array_key_exists($item, $_SESSION)){
+                $logger->info('Found session data for item [' . $item . '] the vaue is : [' . stringfy_vars($_SESSION[$item]) . ']');
+                return $_SESSION[$item];
+            }
+            $logger->warning('Cannot find session item [' . $item . '] using the default value ['. $default . ']');
+            return $default;
+        }
 
-		/**
-		 * Set the session item value
-		 * @param string $item  the session item name to set
-		 * @param mixed $value the session item value
-		 */
-		public static function set($item, $value){
-			$logger = self::getLogger();
-			$logger->debug('Setting session data for item [' . $item . '], value [' . stringfy_vars($value) . ']');
-			$_SESSION[$item] = $value;
-		}
+        /**
+         * Set the session item value
+         * @param string $item  the session item name to set
+         * @param mixed $value the session item value
+         */
+        public static function set($item, $value){
+            $logger = self::getLogger();
+            $logger->debug('Setting session data for item [' . $item . '], value [' . stringfy_vars($value) . ']');
+            $_SESSION[$item] = $value;
+        }
 
-		/**
-		 * Get the session flash item value
-		 * @param  string $item    the session flash item name to get
-		 * @param  mixed $default the default value to use if can not find the session flash item in the list
-		 * @return mixed          the session flash value if exist or the default value
-		 */
-		public static function getFlash($item, $default = null){
-			$logger = self::getLogger();
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
-			$return = array_key_exists($key, $_SESSION) ?
-			($_SESSION[$key]) : $default;
-			if(array_key_exists($key, $_SESSION)){
-				unset($_SESSION[$key]);
-			}
-			else{
-				$logger->warning('Cannot find session flash item ['. $key .'] using the default value ['. $default .']');
-			}
-			return $return;
-		}
+        /**
+         * Get the session flash item value
+         * @param  string $item    the session flash item name to get
+         * @param  mixed $default the default value to use if can not find the session flash item in the list
+         * @return mixed          the session flash value if exist or the default value
+         */
+        public static function getFlash($item, $default = null){
+            $logger = self::getLogger();
+            $key = self::SESSION_FLASH_KEY.'_'.$item;
+            $return = array_key_exists($key, $_SESSION) ?
+            ($_SESSION[$key]) : $default;
+            if(array_key_exists($key, $_SESSION)){
+                unset($_SESSION[$key]);
+            }
+            else{
+                $logger->warning('Cannot find session flash item ['. $key .'] using the default value ['. $default .']');
+            }
+            return $return;
+        }
 
-		/**
-		 * Check whether the given session flash item exists
-		 * @param  string  $item the session flash item name
-		 * @return boolean 
-		 */
-		public static function hasFlash($item){
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
-			return array_key_exists($key, $_SESSION);
-		}
+        /**
+         * Check whether the given session flash item exists
+         * @param  string  $item the session flash item name
+         * @return boolean 
+         */
+        public static function hasFlash($item){
+            $key = self::SESSION_FLASH_KEY.'_'.$item;
+            return array_key_exists($key, $_SESSION);
+        }
 
-		/**
-		 * Set the session flash item value
-		 * @param string $item  the session flash item name to set
-		 * @param mixed $value the session flash item value
-		 */
-		public static function setFlash($item, $value){
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
-			$_SESSION[$key] = $value;
-		}
+        /**
+         * Set the session flash item value
+         * @param string $item  the session flash item name to set
+         * @param mixed $value the session flash item value
+         */
+        public static function setFlash($item, $value){
+            $key = self::SESSION_FLASH_KEY.'_'.$item;
+            $_SESSION[$key] = $value;
+        }
 
-		/**
-		 * Clear the session item in the list
-		 * @param  string $item the session item name to be deleted
-		 */
-		public static function clear($item){
-			$logger = self::getLogger();
-			if(array_key_exists($item, $_SESSION)){
-				$logger->info('Deleting of session for item ['.$item.' ]');
-				unset($_SESSION[$item]);
-			}
-			else{
-				$logger->warning('Session item ['.$item.'] to be deleted does not exists');
-			}
-		}
+        /**
+         * Clear the session item in the list
+         * @param  string $item the session item name to be deleted
+         */
+        public static function clear($item){
+            $logger = self::getLogger();
+            if(array_key_exists($item, $_SESSION)){
+                $logger->info('Deleting of session for item ['.$item.' ]');
+                unset($_SESSION[$item]);
+            }
+            else{
+                $logger->warning('Session item ['.$item.'] to be deleted does not exists');
+            }
+        }
 		
-		/**
-		 * Clear the session flash item in the list
-		 * @param  string $item the session flash item name to be deleted
-		 */
-		public static function clearFlash($item){
-			$logger = self::getLogger();
-			$key = self::SESSION_FLASH_KEY.'_'.$item;
-			if(array_key_exists($key, $_SESSION)){
-				$logger->info('Delete session flash for item ['.$item.']');
-				unset($_SESSION[$item]);
-			}
-			else{
-				$logger->warning('Dession flash item ['.$item.'] to be deleted does not exists');
-			}
-		}
+        /**
+         * Clear the session flash item in the list
+         * @param  string $item the session flash item name to be deleted
+         */
+        public static function clearFlash($item){
+            $logger = self::getLogger();
+            $key = self::SESSION_FLASH_KEY.'_'.$item;
+            if(array_key_exists($key, $_SESSION)){
+                $logger->info('Delete session flash for item ['.$item.']');
+                unset($_SESSION[$item]);
+            }
+            else{
+                $logger->warning('Dession flash item ['.$item.'] to be deleted does not exists');
+            }
+        }
 
-		/**
-		 * Check whether the given session item exists
-		 * @param  string  $item the session item name
-		 * @return boolean 
-		 */
-		public static function exists($item){
-			return array_key_exists($item, $_SESSION);
-		}
+        /**
+         * Check whether the given session item exists
+         * @param  string  $item the session item name
+         * @return boolean 
+         */
+        public static function exists($item){
+            return array_key_exists($item, $_SESSION);
+        }
 
-		/**
-		 * Destroy all session data values
-		 */
-		public static function clearAll(){
-			session_unset();
-			session_destroy();
-		}
+        /**
+         * Destroy all session data values
+         */
+        public static function clearAll(){
+            session_unset();
+            session_destroy();
+        }
 
-	}
+    }

core/classes/DBSessionHandler.php

Indentation +344 added lines, -344 removed lines

@@ -1,330 +1,330 @@ 
 <?php 
-	defined('ROOT_PATH') || exit('Access denied');
-	/**
-	 * TNH Framework
-	 *
-	 * A simple PHP framework using HMVC architecture
-	 *
-	 * This content is released under the GNU GPL License (GPL)
-	 *
-	 * Copyright (C) 2017 Tony NGUEREZA
-	 *
-	 * This program is free software; you can redistribute it and/or
-	 * modify it under the terms of the GNU General Public License
-	 * as published by the Free Software Foundation; either version 3
-	 * of the License, or (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * 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.
-	*/
+    defined('ROOT_PATH') || exit('Access denied');
+    /**
+     * TNH Framework
+     *
+     * A simple PHP framework using HMVC architecture
+     *
+     * This content is released under the GNU GPL License (GPL)
+     *
+     * Copyright (C) 2017 Tony NGUEREZA
+     *
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 3
+     * of the License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * 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.
+     */
 	
-	/**
-	 * check if the interface "SessionHandlerInterface" exists (normally in PHP 5.4 this already exists)
-	 */
-	if( !interface_exists('SessionHandlerInterface')){
-		show_error('"SessionHandlerInterface" interface does not exists or is disabled can not use it to handler database session.');
-	}
-
-	class DBSessionHandler implements SessionHandlerInterface{
+    /**
+     * check if the interface "SessionHandlerInterface" exists (normally in PHP 5.4 this already exists)
+     */
+    if( !interface_exists('SessionHandlerInterface')){
+        show_error('"SessionHandlerInterface" interface does not exists or is disabled can not use it to handler database session.');
+    }
+
+    class DBSessionHandler implements SessionHandlerInterface{
 		
-		/**
-		 * The encryption method to use to encrypt session data in database
-		 * @const string
-		 */
-		const DB_SESSION_HASH_METHOD = 'AES-256-CBC';
+        /**
+         * The encryption method to use to encrypt session data in database
+         * @const string
+         */
+        const DB_SESSION_HASH_METHOD = 'AES-256-CBC';
 		
-		/**
-		 * Super global instance
-		 * @var object
-		 */
-		protected $OBJ = null;
-
-		/**
-		 * Session secret to use 
-		 * @var string
-		 */
-		private $sessionSecret = null;
-
-		/**
-		 * The initialisation vector to use for openssl
-		 * @var string
-		 */
-		private $iv = null;
-
-		/**
-		 * The model instance name to use after load model
-		 * @var object
-		 */
-		private $modelInstanceName = null;
-
-		/**
-		 * The columns of the table to use to store session data
-		 * @var array
-		 */
-		private $sessionTableColumns = array();
-
-		/**
-		 * The instance of the Log 
-		 * @var Log
-		 */
-		private $logger;
-
-		/**
+        /**
+         * Super global instance
+         * @var object
+         */
+        protected $OBJ = null;
+
+        /**
+         * Session secret to use 
+         * @var string
+         */
+        private $sessionSecret = null;
+
+        /**
+         * The initialisation vector to use for openssl
+         * @var string
+         */
+        private $iv = null;
+
+        /**
+         * The model instance name to use after load model
+         * @var object
+         */
+        private $modelInstanceName = null;
+
+        /**
+         * The columns of the table to use to store session data
+         * @var array
+         */
+        private $sessionTableColumns = array();
+
+        /**
+         * The instance of the Log 
+         * @var Log
+         */
+        private $logger;
+
+        /**
          * Instance of the Loader class
          * @var Loader
          */
         protected $loader = null;
 
-		public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null){
-			/**
-	         * instance of the Log class
-	         */
-	        if(is_object($logger)){
-	          $this->setLogger($logger);
-	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
-	            $this->logger->setLogger('Library::DBSessionHandler');
-	        }
-
-	        if(is_object($loader)){
-	          $this->setLoader($loader);
-	        }
-		    $this->OBJ = & get_instance();
+        public function __construct(DBSessionHandlerModel $modelInstance = null, Log $logger = null, Loader $loader = null){
+            /**
+             * instance of the Log class
+             */
+            if(is_object($logger)){
+                $this->setLogger($logger);
+            }
+            else{
+                $this->logger =& class_loader('Log', 'classes');
+                $this->logger->setLogger('Library::DBSessionHandler');
+            }
+
+            if(is_object($loader)){
+                $this->setLoader($loader);
+            }
+            $this->OBJ = & get_instance();
 
 		    
-			if(is_object($modelInstance)){
-				$this->setModelInstance($modelInstance);
-			}
-		}
-
-		/**
-		 * Set the session secret used to encrypt the data in database 
-		 * @param string $secret the base64 string secret
-		 */
-		public function setSessionSecret($secret){
-			$this->sessionSecret = $secret;
-			return $this;
-		}
-
-		/**
-		 * Return the session secret
-		 * @return string 
-		 */
-		public function getSessionSecret(){
-			return $this->sessionSecret;
-		}
-
-
-		/**
-		 * Set the initializer vector for openssl 
-		 * @param string $key the session secret used
-		 */
-		public function setInitializerVector($key){
-			$iv_length = openssl_cipher_iv_length(self::DB_SESSION_HASH_METHOD);
-			$key = base64_decode($key);
-			$this->iv = substr(hash('sha256', $key), 0, $iv_length);
-			return $this;
-		}
-
-		/**
-		 * Return the initializer vector
-		 * @return string 
-		 */
-		public function getInitializerVector(){
-			return $this->iv;
-		}
-
-		/**
-		 * Open the database session handler, here nothing to do just return true
-		 * @param  string $savePath    the session save path
-		 * @param  string $sessionName the session name
-		 * @return boolean 
-		 */
-		public function open($savePath, $sessionName){
-			$this->logger->debug('Opening database session handler for [' . $sessionName . ']');
-			//try to check if session secret is set before
-			$secret = $this->getSessionSecret();
-			if(empty($secret)){
-				$secret = get_config('session_secret', null);
-				$this->setSessionSecret($secret);
-			}
-			$this->logger->info('Session secret: ' . $secret);
-
-			if(! $this->getModelInstance()){
-				$this->setModelInstanceFromConfig();
-			}
-			$this->setInitializerVector($secret);
-
-			//set session tables columns
-			$this->sessionTableColumns = $this->getModelInstance()->getSessionTableColumns();
-
-			if(empty($this->sessionTableColumns)){
-				show_error('The session handler is "database" but the table columns not set');
-			}
-			$this->logger->info('Database session, the model columns are listed below: ' . stringfy_vars($this->sessionTableColumns));
+            if(is_object($modelInstance)){
+                $this->setModelInstance($modelInstance);
+            }
+        }
+
+        /**
+         * Set the session secret used to encrypt the data in database 
+         * @param string $secret the base64 string secret
+         */
+        public function setSessionSecret($secret){
+            $this->sessionSecret = $secret;
+            return $this;
+        }
+
+        /**
+         * Return the session secret
+         * @return string 
+         */
+        public function getSessionSecret(){
+            return $this->sessionSecret;
+        }
+
+
+        /**
+         * Set the initializer vector for openssl 
+         * @param string $key the session secret used
+         */
+        public function setInitializerVector($key){
+            $iv_length = openssl_cipher_iv_length(self::DB_SESSION_HASH_METHOD);
+            $key = base64_decode($key);
+            $this->iv = substr(hash('sha256', $key), 0, $iv_length);
+            return $this;
+        }
+
+        /**
+         * Return the initializer vector
+         * @return string 
+         */
+        public function getInitializerVector(){
+            return $this->iv;
+        }
+
+        /**
+         * Open the database session handler, here nothing to do just return true
+         * @param  string $savePath    the session save path
+         * @param  string $sessionName the session name
+         * @return boolean 
+         */
+        public function open($savePath, $sessionName){
+            $this->logger->debug('Opening database session handler for [' . $sessionName . ']');
+            //try to check if session secret is set before
+            $secret = $this->getSessionSecret();
+            if(empty($secret)){
+                $secret = get_config('session_secret', null);
+                $this->setSessionSecret($secret);
+            }
+            $this->logger->info('Session secret: ' . $secret);
+
+            if(! $this->getModelInstance()){
+                $this->setModelInstanceFromConfig();
+            }
+            $this->setInitializerVector($secret);
+
+            //set session tables columns
+            $this->sessionTableColumns = $this->getModelInstance()->getSessionTableColumns();
+
+            if(empty($this->sessionTableColumns)){
+                show_error('The session handler is "database" but the table columns not set');
+            }
+            $this->logger->info('Database session, the model columns are listed below: ' . stringfy_vars($this->sessionTableColumns));
 			
-			//delete the expired session
-			$timeActivity = get_config('session_inactivity_time', 100);
-			$this->gc($timeActivity);
+            //delete the expired session
+            $timeActivity = get_config('session_inactivity_time', 100);
+            $this->gc($timeActivity);
 			
-			return true;
-		}
-
-		/**
-		 * Close the session
-		 * @return boolean
-		 */
-		public function close(){
-			$this->logger->debug('Closing database session handler');
-			return true;
-		}
-
-		/**
-		 * Get the session value for the given session id
-		 * @param  string $sid the session id to use
-		 * @return string      the session data in serialiaze format
-		 */
-		public function read($sid){
-			$this->logger->debug('Reading database session data for SID: ' . $sid);
-			$instance = $this->getModelInstance();
-			$columns = $this->sessionTableColumns;
-			if($this->getLoader()){
-				$this->getLoader()->functions('user_agent'); 
-				$this->getLoader()->library('Browser'); 
-			}
-			else{
-            	Loader::functions('user_agent');
-            	Loader::library('Browser');
+            return true;
+        }
+
+        /**
+         * Close the session
+         * @return boolean
+         */
+        public function close(){
+            $this->logger->debug('Closing database session handler');
+            return true;
+        }
+
+        /**
+         * Get the session value for the given session id
+         * @param  string $sid the session id to use
+         * @return string      the session data in serialiaze format
+         */
+        public function read($sid){
+            $this->logger->debug('Reading database session data for SID: ' . $sid);
+            $instance = $this->getModelInstance();
+            $columns = $this->sessionTableColumns;
+            if($this->getLoader()){
+                $this->getLoader()->functions('user_agent'); 
+                $this->getLoader()->library('Browser'); 
+            }
+            else{
+                Loader::functions('user_agent');
+                Loader::library('Browser');
             }
 			
-			$ip = get_ip();
-			$host = @gethostbyaddr($ip) or null;
-			$browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
+            $ip = get_ip();
+            $host = @gethostbyaddr($ip) or null;
+            $browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
 			
-			$data = $instance->get_by(array($columns['sid'] => $sid, $columns['shost'] => $host, $columns['sbrowser'] => $browser));
-			if($data && isset($data->{$columns['sdata']})){
-				//checking inactivity 
-				$timeInactivity = time() - get_config('session_inactivity_time', 100);
-				if($data->{$columns['stime']} < $timeInactivity){
-					$this->logger->info('Database session data for SID: ' . $sid . ' already expired, destroy it');
-					$this->destroy($sid);
-					return null;
-				}
-				return $this->decode($data->{$columns['sdata']});
-			}
-			$this->logger->info('Database session data for SID: ' . $sid . ' is not valid return false, may be the session ID is wrong');
-			return null;
-		}
-
-		/**
-		 * Save the session data
-		 * @param  string $sid  the session ID
-		 * @param  mixed $data the session data to save in serialize format
-		 * @return boolean 
-		 */
-		public function write($sid, $data){
-			$this->logger->debug('Saving database session data for SID: ' . $sid . ', data: ' . stringfy_vars($data));
-			$instance = $this->getModelInstance();
-			$columns = $this->sessionTableColumns;
-
-			if($this->getLoader()){
-				$this->getLoader()->functions('user_agent'); 
-				$this->getLoader()->library('Browser'); 
-			}
-			else{
-            	Loader::functions('user_agent');
-            	Loader::library('Browser');
+            $data = $instance->get_by(array($columns['sid'] => $sid, $columns['shost'] => $host, $columns['sbrowser'] => $browser));
+            if($data && isset($data->{$columns['sdata']})){
+                //checking inactivity 
+                $timeInactivity = time() - get_config('session_inactivity_time', 100);
+                if($data->{$columns['stime']} < $timeInactivity){
+                    $this->logger->info('Database session data for SID: ' . $sid . ' already expired, destroy it');
+                    $this->destroy($sid);
+                    return null;
+                }
+                return $this->decode($data->{$columns['sdata']});
+            }
+            $this->logger->info('Database session data for SID: ' . $sid . ' is not valid return false, may be the session ID is wrong');
+            return null;
+        }
+
+        /**
+         * Save the session data
+         * @param  string $sid  the session ID
+         * @param  mixed $data the session data to save in serialize format
+         * @return boolean 
+         */
+        public function write($sid, $data){
+            $this->logger->debug('Saving database session data for SID: ' . $sid . ', data: ' . stringfy_vars($data));
+            $instance = $this->getModelInstance();
+            $columns = $this->sessionTableColumns;
+
+            if($this->getLoader()){
+                $this->getLoader()->functions('user_agent'); 
+                $this->getLoader()->library('Browser'); 
+            }
+            else{
+                Loader::functions('user_agent');
+                Loader::library('Browser');
+            }
+
+            $ip = get_ip();
+            $keyValue = $instance->getKeyValue();
+            $host = @gethostbyaddr($ip) or null;
+            $browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
+            $data = $this->encode($data);
+            $params = array(
+                            $columns['sid'] => $sid,
+                            $columns['sdata'] => $data,
+                            $columns['stime'] => time(),
+                            $columns['shost'] => $host,
+                            $columns['sbrowser'] => $browser,
+                            $columns['sip'] => $ip,
+                            $columns['skey'] => $keyValue
+                        );
+            $this->logger->info('Database session data to save are listed below :' . stringfy_vars($params));
+            $exists = $instance->get($sid);
+            if($exists){
+                $this->logger->info('Session data for SID: ' . $sid . ' already exists, just update it');
+                //update
+                unset($params[$columns['sid']]);
+                $instance->update($sid, $params);
             }
+            else{
+                $this->logger->info('Session data for SID: ' . $sid . ' not yet exists, insert it now');
+                $instance->insert($params);
+            }
+            return true;
+        }
+
+
+        /**
+         * Destroy the session data for the given session id
+         * @param  string $sid the session id value
+         * @return boolean
+         */
+        public function destroy($sid){
+            $this->logger->debug('Destroy of session data for SID: ' . $sid);
+            $instance = $this->modelInstanceName;
+            $instance->delete($sid);
+            return true;
+        }
 
-			$ip = get_ip();
-			$keyValue = $instance->getKeyValue();
-			$host = @gethostbyaddr($ip) or null;
-			$browser = $this->OBJ->browser->getPlatform().', '.$this->OBJ->browser->getBrowser().' '.$this->OBJ->browser->getVersion();
-			$data = $this->encode($data);
-			$params = array(
-							$columns['sid'] => $sid,
-							$columns['sdata'] => $data,
-							$columns['stime'] => time(),
-							$columns['shost'] => $host,
-							$columns['sbrowser'] => $browser,
-							$columns['sip'] => $ip,
-							$columns['skey'] => $keyValue
-						);
-			$this->logger->info('Database session data to save are listed below :' . stringfy_vars($params));
-			$exists = $instance->get($sid);
-			if($exists){
-				$this->logger->info('Session data for SID: ' . $sid . ' already exists, just update it');
-				//update
-				unset($params[$columns['sid']]);
-				$instance->update($sid, $params);
-			}
-			else{
-				$this->logger->info('Session data for SID: ' . $sid . ' not yet exists, insert it now');
-				$instance->insert($params);
-			}
-			return true;
-		}
-
-
-		/**
-		 * Destroy the session data for the given session id
-		 * @param  string $sid the session id value
-		 * @return boolean
-		 */
-		public function destroy($sid){
-			$this->logger->debug('Destroy of session data for SID: ' . $sid);
-			$instance = $this->modelInstanceName;
-			$instance->delete($sid);
-			return true;
-		}
-
-		/**
-		 * Clean the expire session data to save espace
-		 * @param  integer $maxLifetime the max lifetime
-		 * @return boolean
-		 */
-		public function gc($maxLifetime){
-			$instance = $this->modelInstanceName;
-			$time = time() - $maxLifetime;
-			$this->logger->debug('Garbage collector of expired session. maxLifetime [' . $maxLifetime . '] sec, expired time [' . $time . ']');
-			$instance->deleteByTime($time);
-			return true;
-		}
-
-		/**
-		 * Encode the session data using the openssl
-		 * @param  mixed $data the session data to encode
-		 * @return mixed the encoded session data
-		 */
-		public function encode($data){
-			$key = base64_decode($this->sessionSecret);
-			$dataEncrypted = openssl_encrypt($data , self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
-			$output = base64_encode($dataEncrypted);
-			return $output;
-		}
-
-
-		/**
-		 * Decode the session data using the openssl
-		 * @param  mixed $data the data to decode
-		 * @return mixed       the decoded data
-		 */
-		public function decode($data){
-			$key = base64_decode($this->sessionSecret);
-			$data = base64_decode($data);
-			$data = openssl_decrypt($data, self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
-			return $data;
-		}
+        /**
+         * Clean the expire session data to save espace
+         * @param  integer $maxLifetime the max lifetime
+         * @return boolean
+         */
+        public function gc($maxLifetime){
+            $instance = $this->modelInstanceName;
+            $time = time() - $maxLifetime;
+            $this->logger->debug('Garbage collector of expired session. maxLifetime [' . $maxLifetime . '] sec, expired time [' . $time . ']');
+            $instance->deleteByTime($time);
+            return true;
+        }
+
+        /**
+         * Encode the session data using the openssl
+         * @param  mixed $data the session data to encode
+         * @return mixed the encoded session data
+         */
+        public function encode($data){
+            $key = base64_decode($this->sessionSecret);
+            $dataEncrypted = openssl_encrypt($data , self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
+            $output = base64_encode($dataEncrypted);
+            return $output;
+        }
+
+
+        /**
+         * Decode the session data using the openssl
+         * @param  mixed $data the data to decode
+         * @return mixed       the decoded data
+         */
+        public function decode($data){
+            $key = base64_decode($this->sessionSecret);
+            $data = base64_decode($data);
+            $data = openssl_decrypt($data, self::DB_SESSION_HASH_METHOD, $key, OPENSSL_RAW_DATA, $this->getInitializerVector());
+            return $data;
+        }
 
 		
-		/**
+        /**
          * Return the loader instance
          * @return object Loader the loader instance
          */
@@ -336,7 +336,7 @@ 
          * set the loader instance for future use
          * @param object Loader $loader the loader object
          */
-         public function setLoader($loader){
+            public function setLoader($loader){
             $this->loader = $loader;
             return $this;
         }
@@ -353,47 +353,47 @@ 
          * set the model instance for future use
          * @param DBSessionHandlerModel $modelInstance the model object
          */
-         public function setModelInstance(DBSessionHandlerModel $modelInstance){
+            public function setModelInstance(DBSessionHandlerModel $modelInstance){
             $this->modelInstanceName = $modelInstance;
             return $this;
         }
 
         /**
-	     * Return the Log instance
-	     * @return Log
-	     */
-	    public function getLogger(){
-	      return $this->logger;
-	    }
-
-	    /**
-	     * Set the log instance
-	     * @param Log $logger the log object
-	     */
-	    public function setLogger(Log $logger){
-	      $this->logger = $logger;
-	      return $this;
-	    }
-
-	    /**
-	     * Set the model instance using the configuration for session
-	     */
-	    private function setModelInstanceFromConfig(){
-	    	$modelName = get_config('session_save_path');
-			$this->logger->info('The database session model: ' . $modelName);
-			if($this->getLoader()){
-				$this->getLoader()->model($modelName, 'dbsessionhandlerinstance'); 
-			}
-			//@codeCoverageIgnoreStart
-			else{
-            	Loader::model($modelName, 'dbsessionhandlerinstance'); 
+         * Return the Log instance
+         * @return Log
+         */
+        public function getLogger(){
+            return $this->logger;
+        }
+
+        /**
+         * Set the log instance
+         * @param Log $logger the log object
+         */
+        public function setLogger(Log $logger){
+            $this->logger = $logger;
+            return $this;
+        }
+
+        /**
+         * Set the model instance using the configuration for session
+         */
+        private function setModelInstanceFromConfig(){
+            $modelName = get_config('session_save_path');
+            $this->logger->info('The database session model: ' . $modelName);
+            if($this->getLoader()){
+                $this->getLoader()->model($modelName, 'dbsessionhandlerinstance'); 
+            }
+            //@codeCoverageIgnoreStart
+            else{
+                Loader::model($modelName, 'dbsessionhandlerinstance'); 
             }
             if(isset($this->OBJ->dbsessionhandlerinstance) && ! $this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel){
-				show_error('To use database session handler, your class model "'.get_class($this->OBJ->dbsessionhandlerinstance).'" need extends "DBSessionHandlerModel"');
-			}  
-			//@codeCoverageIgnoreEnd
+                show_error('To use database session handler, your class model "'.get_class($this->OBJ->dbsessionhandlerinstance).'" need extends "DBSessionHandlerModel"');
+            }  
+            //@codeCoverageIgnoreEnd
 			
-			//set model instance
-			$this->setModelInstance($this->OBJ->dbsessionhandlerinstance);
-	    }
-	}
+            //set model instance
+            $this->setModelInstance($this->OBJ->dbsessionhandlerinstance);
+        }
+    }