tnhfw / tnh-fw

core/lang/en/lang_file_upload.php

Spacing +3 added lines, -3 removed lines

@@ -6,11 +6,11 @@
  	$lang['fu_upload_err_ini_size']     = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.';
     $lang['fu_upload_err_form_size']   	= 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.';
     $lang['fu_upload_err_partial']   	= 'The uploaded file was only partially uploaded.';
-    $lang['fu_upload_err_no_file'] 		= 'No file was choosed. Please select one.';
+    $lang['fu_upload_err_no_file'] = 'No file was choosed. Please select one.';
     $lang['fu_upload_err_no_tmp_dir']   = 'Missing a temporary folder.';
-    $lang['fu_upload_err_cant_write'] 	= 'Failed to write file to disk.';
+    $lang['fu_upload_err_cant_write'] = 'Failed to write file to disk.';
     $lang['fu_upload_err_extension']    = 'A PHP extension stopped the file upload.';
-    $lang['fu_accept_file_types']  		= 'Filetype not allowed';
+    $lang['fu_accept_file_types'] = 'Filetype not allowed';
     $lang['fu_file_uploads_disabled']   = 'File uploading option is disabled in php.ini';
     $lang['fu_max_file_size']           = 'The uploaded file size is too big max size is %s';
     $lang['fu_overwritten_not_allowed'] = 'You don\'t allow overwriting existing file';

tests/include/testsUtil.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 	/**
 	* Function to test private & protected method
 	*/
-	function runPrivateOrProtectedMethod($object, $method, array $args = array()){
+	function runPrivateOrProtectedMethod($object, $method, array $args = array()) {
 		$r = new ReflectionClass(get_class($object));
 		$m = $r->getMethod($method);
 		$m->setAccessible(true);

core/classes/model/DBSessionHandlerModel.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 		 */
 		protected $sessionTableColumns = array();
 
-		public function __construct(Database $db = null){
+		public function __construct(Database $db = null) {
 			parent::__construct($db);
 		}
 
@@ -53,7 +53,7 @@ 
 		 * Return the session database table columns
 		 * @return array 
 		 */
-		public function getSessionTableColumns(){
+		public function getSessionTableColumns() {
 			return $this->sessionTableColumns;
 		}
 
@@ -61,7 +61,7 @@ 
 		 * Set the session database table columns
 		 * @param array $columns the columns definition
 		 */
-		public function setSessionTableColumns(array $columns){
+		public function setSessionTableColumns(array $columns) {
 			$this->sessionTableColumns = $columns;
 			return $this;
 		}

core/bootstrap.php

Spacing +18 added lines, -18 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	
 	//if the application is running in CLI mode $_SESSION global variable is not available
-	if(IS_CLI){
+	if (IS_CLI) {
 		$_SESSION = array();
 	}
 		
@@ -60,14 +60,14 @@ 
 	/**
 	 * The Benchmark class
 	 */
-	$BENCHMARK =& class_loader('Benchmark');
+	$BENCHMARK = & class_loader('Benchmark');
 	
 	$BENCHMARK->mark('APP_EXECUTION_START');
 	
 	/**
     * instance of the Log class
     */
-    $LOGGER =& class_loader('Log', 'classes');
+    $LOGGER = & class_loader('Log', 'classes');
 
     $LOGGER->setLogger('ApplicationBootstrap');
 
@@ -76,10 +76,10 @@ 
 	/**
 	* Verification of the PHP environment: minimum and maximum version
 	*/
-	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')){
+	if (version_compare(phpversion(), TNH_REQUIRED_PHP_MIN_VERSION, '<')) {
 		show_error('Your PHP Version [' . phpversion() . '] is less than [' . TNH_REQUIRED_PHP_MIN_VERSION . '], please install a new version or update your PHP to the latest.', 'PHP Error environment');	
 	}
-	else if(version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')){
+	else if (version_compare(phpversion(), TNH_REQUIRED_PHP_MAX_VERSION, '>')) {
 		show_error('Your PHP Version [' . phpversion() . '] is greather than [' . TNH_REQUIRED_PHP_MAX_VERSION . '] please install a PHP version that is compatible.', 'PHP Error environment');	
 	}
 	$LOGGER->info('PHP version [' . phpversion() . '] is OK [REQUIRED MINIMUM: ' . TNH_REQUIRED_PHP_MIN_VERSION . ', REQUIRED MAXIMUM: ' . TNH_REQUIRED_PHP_MAX_VERSION . '], application can work without any issue');
@@ -101,11 +101,11 @@ 
 	
 	//if user have some composer packages
 	$LOGGER->debug('Check for composer autoload');
-	if(file_exists(VENDOR_PATH . 'autoload.php')){
+	if (file_exists(VENDOR_PATH . 'autoload.php')) {
 		$LOGGER->info('The composer autoload file exists include it');
 		require_once VENDOR_PATH . 'autoload.php';
 	}
-	else{
+	else {
 		$LOGGER->info('The composer autoload file does not exist skipping');
 	}
 	
@@ -121,7 +121,7 @@ 
 	* Load configurations and using the 
 	* static method "init()" to initialize the Config class .
 	*/
-	$CONFIG =& class_loader('Config', 'classes');	
+	$CONFIG = & class_loader('Config', 'classes');	
 	$CONFIG->init();
 	$BENCHMARK->mark('CONFIG_INIT_END');
 
@@ -130,7 +130,7 @@ 
 	* Load modules and using the 
 	* static method "init()" to initialize the Module class.
 	*/
-	$MODULE =& class_loader('Module', 'classes');
+	$MODULE = & class_loader('Module', 'classes');
 	$MODULE->init();
 	$BENCHMARK->mark('MODULE_INIT_END');
 
@@ -149,34 +149,34 @@ 
 	/**
 	* Loading Security class
 	*/
-	$SECURITY =& class_loader('Security', 'classes');
+	$SECURITY = & class_loader('Security', 'classes');
 	$SECURITY->checkWhiteListIpAccess();
 	
 	/**
 	* Loading Url class
 	*/
-	$URL =& class_loader('Url', 'classes');
+	$URL = & class_loader('Url', 'classes');
 	
-	if(get_config('cache_enable', false)){
+	if (get_config('cache_enable', false)) {
 		/**
 		 * Load Cache interface file
 		 */
 		require_once CORE_CLASSES_CACHE_PATH . 'CacheInterface.php';
 		$cacheHandler = get_config('cache_handler');
-		if(! $cacheHandler){
+		if (!$cacheHandler) {
 			show_error('The cache feature is enabled in the configuration but the cache handler class is not set.');
 		}
 		$CACHE = null;
 		//first check if the cache handler is the system driver
-		if(file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')){
-			$CACHE =& class_loader($cacheHandler, 'classes/cache');
+		if (file_exists(CORE_CLASSES_CACHE_PATH . $cacheHandler . '.php')) {
+			$CACHE = & class_loader($cacheHandler, 'classes/cache');
 		}
-		else{
+		else {
 			//it's not a system driver use user library
-			$CACHE =& class_loader($cacheHandler);
+			$CACHE = & class_loader($cacheHandler);
 		}
 		//check if the page already cached
-		if(! empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get'){
+		if (!empty($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'get') {
 			$RESPONSE = & class_loader('Response', 'classes');
 			$RESPONSE->renderFinalPageFromCache($CACHE);
 		}

tests/tnhfw/CommonTest.php

Spacing +3 added lines, -3 removed lines

@@ -24,20 +24,20 @@
 		}
 
 		
-		public function testFunctionGetConfigKeyNotExist(){
+		public function testFunctionGetConfigKeyNotExist() {
 			$key = 'foo';
 			$cfg = get_config($key);
 			$this->assertNull($cfg);
 		}
 		
-		public function testFunctionGetConfigKeyNotExistUsingDefaultValue(){
+		public function testFunctionGetConfigKeyNotExistUsingDefaultValue() {
 			$key = 'foo';
 			$expected = 'bar';
 			$cfg = get_config($key, $expected);
 			$this->assertEquals($cfg, $expected);
 		}
 		
-		public function testFunctionGetConfigAfterSet(){
+		public function testFunctionGetConfigAfterSet() {
 			$key = 'foo';
 			$expected = 'bar';
 			$c = new Config();

core/classes/cache/ApcCache.php

Spacing +39 added lines, -39 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 	
-	class ApcCache implements CacheInterface{
+	class ApcCache implements CacheInterface {
 
 		/**
 		 * The logger instance
@@ -33,19 +33,19 @@ 
 		private $logger;
 		
 		
-		public function __construct(Log $logger = null){
-			if(! $this->isSupported()){
+		public function __construct(Log $logger = null) {
+			if (!$this->isSupported()) {
 				show_error('The cache for APC[u] driver is not available. Check if APC[u] extension is loaded and enabled.');
 			}
 
 			/**
 	         * instance of the Log class
 	         */
-	        if(is_object($logger)){
+	        if (is_object($logger)) {
 	          $this->logger = $logger;
 	        }
-	        else{
-	            $this->logger =& class_loader('Log', 'classes');
+	        else {
+	            $this->logger = & class_loader('Log', 'classes');
 	            $this->logger->setLogger('Library::ApcCache');
 	        }
 		}
@@ -55,21 +55,21 @@ 
 		 * @param  string $key the key to identify the cache data
 		 * @return mixed      the cache data if exists else return false
 		 */
-		public function get($key){
-			$this->logger->debug('Getting cache data for key ['. $key .']');
+		public function get($key) {
+			$this->logger->debug('Getting cache data for key [' . $key . ']');
 			$success = false;
 			$data = apc_fetch($key, $success);
-			if($success === false){
-				$this->logger->info('No cache found for the key ['. $key .'], return false');
+			if ($success === false) {
+				$this->logger->info('No cache found for the key [' . $key . '], return false');
 				return false;
 			}
-			else{
+			else {
 				$cacheInfo = $this->_getCacheInfo($key);
 				$expire = time();
-				if($cacheInfo){
+				if ($cacheInfo) {
 					$expire = $cacheInfo['creation_time'] + $cacheInfo['ttl'];
 				}
-				$this->logger->info('The cache not yet expire, now return the cache data for key ['. $key .'], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+				$this->logger->info('The cache not yet expire, now return the cache data for key [' . $key . '], the cache will expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 				return $data;
 			}
 		}
@@ -82,16 +82,16 @@ 
 		 * @param integer $ttl  the cache life time
 		 * @return boolean true if success otherwise will return false
 		 */
-		public function set($key, $data, $ttl = 0){
+		public function set($key, $data, $ttl = 0) {
 			$expire = time() + $ttl;
-			$this->logger->debug('Setting cache data for key ['. $key .'], time to live [' .$ttl. '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
+			$this->logger->debug('Setting cache data for key [' . $key . '], time to live [' . $ttl . '], expire at [' . date('Y-m-d H:i:s', $expire) . ']');
 			$result = apc_store($key, $data, $ttl);
-			if($result === false){
-		    	$this->logger->error('Can not write cache data for the key ['. $key .'], return false');
+			if ($result === false) {
+		    	$this->logger->error('Can not write cache data for the key [' . $key . '], return false');
 		    	return false;
 		    }
-		    else{
-		    	$this->logger->info('Cache data saved for the key ['. $key .']');
+		    else {
+		    	$this->logger->info('Cache data saved for the key [' . $key . ']');
 		    	return true;
 		    }
 		}
@@ -103,15 +103,15 @@ 
 		 * @return boolean      true if the cache is deleted, false if can't delete 
 		 * the cache or the cache with the given key not exist
 		 */
-		public function delete($key){
-			$this->logger->debug('Deleting of cache data for key [' .$key. ']');
+		public function delete($key) {
+			$this->logger->debug('Deleting of cache data for key [' . $key . ']');
 			$cacheInfo = $this->_getCacheInfo($key);
-			if($cacheInfo === false){
+			if ($cacheInfo === false) {
 				$this->logger->info('This cache data does not exists skipping');
 				return false;
 			}
-			else{
-				$this->logger->info('Found cache data for the key [' .$key. '] remove it');
+			else {
+				$this->logger->info('Found cache data for the key [' . $key . '] remove it');
 	      		return apc_delete($key) === true;
 			}
 		}
@@ -124,10 +124,10 @@ 
 		 * 'expire' => expiration time of the cache (Unix timestamp),
 		 * 'ttl' => the time to live of the cache in second
 		 */
-		public function getInfo($key){
-			$this->logger->debug('Getting of cache info for key [' .$key. ']');
+		public function getInfo($key) {
+			$this->logger->debug('Getting of cache info for key [' . $key . ']');
 			$cacheInfos = $this->_getCacheInfo($key);
-			if($cacheInfos){
+			if ($cacheInfos) {
 				$data = array(
 							'mtime' => $cacheInfos['creation_time'],
 							'expire' => $cacheInfos['creation_time'] + $cacheInfos['ttl'],
@@ -135,7 +135,7 @@ 
 							);
 				return $data;
 			}
-			else{
+			else {
 				$this->logger->info('This cache does not exists skipping');
 				return false;
 			}
@@ -145,7 +145,7 @@ 
 		/**
 		 * Used to delete expired cache data
 		 */
-		public function deleteExpiredCache(){
+		public function deleteExpiredCache() {
 			//for APC[u] is done automatically
 			return true;
 		}
@@ -153,14 +153,14 @@ 
 		/**
 		 * Remove all cache data
 		 */
-		public function clean(){
+		public function clean() {
 			$this->logger->debug('Deleting of all cache data');
 			$cacheInfos = apc_cache_info('user');
-			if(empty($cacheInfos['cache_list'])){
+			if (empty($cacheInfos['cache_list'])) {
 				$this->logger->info('No cache data were found skipping');
 				return false;
 			}
-			else{
+			else {
 				$this->logger->info('Found [' . count($cacheInfos) . '] cache data to remove');
 				return apc_clear_cache('user');
 			}
@@ -172,7 +172,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public function isSupported(){
+		public function isSupported() {
 			return (extension_loaded('apc') || extension_loaded('apcu')) && ini_get('apc.enabled');
 		}
 
@@ -180,7 +180,7 @@ 
 	     * Return the Log instance
 	     * @return Log
 	     */
-	    public function getLogger(){
+	    public function getLogger() {
 	      return $this->logger;
 	    }
 
@@ -188,7 +188,7 @@ 
 	     * Set the log instance
 	     * @param Log $logger the log object
 	     */
-	    public function setLogger(Log $logger){
+	    public function setLogger(Log $logger) {
 	      $this->logger = $logger;
 	      return $this;
 	    }
@@ -199,12 +199,12 @@ 
 		* @param string $key the cache key to get the cache information 
 		* @return boolean|array
 		*/
-		private function _getCacheInfo($key){
+		private function _getCacheInfo($key) {
 			$caches = apc_cache_info('user');
-			if(! empty($caches['cache_list'])){
+			if (!empty($caches['cache_list'])) {
 				$cacheLists = $caches['cache_list'];
-				foreach ($cacheLists as $c){
-					if(isset($c['info']) && $c['info'] === $key){
+				foreach ($cacheLists as $c) {
+					if (isset($c['info']) && $c['info'] === $key) {
 						return $c;
 					}
 				}

core/libraries/Cookie.php

Spacing +15 added lines, -15 removed lines

@@ -24,7 +24,7 @@ 
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	*/
 
-	class Cookie{
+	class Cookie {
 		
 		/**
 		 * The logger instance
@@ -36,9 +36,9 @@ 
 		 * 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');
+		private static function getLogger() {
+			if (self::$logger == null) {
+				self::$logger[0] = & class_loader('Log', 'classes');
 				self::$logger[0]->setLogger('Library::Cookie');
 			}
 			return self::$logger[0];
@@ -50,9 +50,9 @@ 
 		 * @param  mixed $default the default value to use if can not find the cokkie item in the list
 		 * @return mixed          the cookie value if exist or the default value
 		 */
-		public static function get($item, $default = null){
+		public static function get($item, $default = null) {
 			$logger = self::getLogger();
-			if(array_key_exists($item, $_COOKIE)){
+			if (array_key_exists($item, $_COOKIE)) {
 				return $_COOKIE[$item];
 			}
 			$logger->warning('Cannot find cookie item [' . $item . '], using the default value [' . $default . ']');
@@ -69,14 +69,14 @@ 
 		 * @param boolean $secure   if this cookie will be available on secure connection or not
 		 * @param boolean $httponly if this cookie will be available under HTTP protocol.
 		 */
-		public static function set($name, $value = '', $expire = 0, $path = '/', $domain = '', $secure = false, $httponly = false){
-			if(headers_sent()){
+		public static function set($name, $value = '', $expire = 0, $path = '/', $domain = '', $secure = false, $httponly = false) {
+			if (headers_sent()) {
 				show_error('There exists a cookie that we wanted to create that we couldn\'t 
 						    because headers was already sent. Make sure to do this first 
 							before outputing anything.');
 			}
 			$timestamp = $expire;
-			if($expire){
+			if ($expire) {
 				$timestamp = time() + $expire;
 			}
 			setcookie($name, $value, $timestamp, $path, $domain, $secure, $httponly);
@@ -87,15 +87,15 @@ 
 		 * @param  string $item the cookie item name to be cleared
 		 * @return boolean true if the item exists and is deleted successfully otherwise will return false.
 		 */
-		public static function delete($item){
+		public static function delete($item) {
 			$logger = self::getLogger();
-			if(array_key_exists($item, $_COOKIE)){
-				$logger->info('Delete cookie item ['.$item.']');
+			if (array_key_exists($item, $_COOKIE)) {
+				$logger->info('Delete cookie item [' . $item . ']');
 				unset($_COOKIE[$item]);
 				return true;
 			}
-			else{
-				$logger->warning('Cookie item ['.$item.'] to be deleted does not exists');
+			else {
+				$logger->warning('Cookie item [' . $item . '] to be deleted does not exists');
 				return false;
 			}
 		}
@@ -105,7 +105,7 @@ 
 		 * @param  string $item the cookie item name
 		 * @return boolean       true if the cookie item is set, false or not
 		 */
-		public static function exists($item){
+		public static function exists($item) {
 			return array_key_exists($item, $_COOKIE);
 		}
 

core/libraries/Benchmark.php

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * Class for Benchmark
 	 */
-	class Benchmark{
+	class Benchmark {
 		/**
 		 * The markers for excution time
 		 * @var array
@@ -44,7 +44,7 @@ 
 		 * This method is used to mark one point for benchmark (execution time and memory usage)
 		 * @param  string $name the marker name
 		 */
-		public function mark($name){
+		public function mark($name) {
 			//Marker for execution time
 			$this->markersTime[$name] = microtime(true);
 			//Marker for memory usage
@@ -58,12 +58,12 @@ 
 		 * @param  integer $decimalCount   the number of decimal
 		 * @return string         the total execution time
 		 */
-		public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersTime[$startMarkerName])){
+		public function elapsedTime($startMarkerName = null, $endMarkerName = null, $decimalCount = 6) {
+			if (!$startMarkerName || !isset($this->markersTime[$startMarkerName])) {
 				return 0;
 			}
 			
-			if(! isset($this->markersTime[$endMarkerName])){
+			if (!isset($this->markersTime[$endMarkerName])) {
 				$this->markersTime[$endMarkerName] = microtime(true);
 			}
 			return number_format($this->markersTime[$endMarkerName] - $this->markersTime[$startMarkerName], $decimalCount);
@@ -76,12 +76,12 @@ 
 		 * @param  integer $decimalCount   the number of decimal
 		 * @return string         the total memory usage
 		 */
-		public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6){
-			if(! $startMarkerName || !isset($this->markersMemory[$startMarkerName])){
+		public function memoryUsage($startMarkerName = null, $endMarkerName = null, $decimalCount = 6) {
+			if (!$startMarkerName || !isset($this->markersMemory[$startMarkerName])) {
 				return 0;
 			}
 			
-			if(! isset($this->markersMemory[$endMarkerName])){
+			if (!isset($this->markersMemory[$endMarkerName])) {
 				$this->markersMemory[$endMarkerName] = microtime(true);
 			}
 			return number_format($this->markersMemory[$endMarkerName] - $this->markersMemory[$startMarkerName], $decimalCount);

core/libraries/Email.php

Spacing +8 added lines, -8 removed lines

@@ -86,7 +86,7 @@ 
 		 */
 		public function __construct()
 		{
-			$this->logger =& class_loader('Log', 'classes');
+			$this->logger = & class_loader('Log', 'classes');
             $this->logger->setLogger('Library::Email');
 			$this->reset();
 		}
@@ -148,10 +148,10 @@ 
 		public function setTos(array $emails)
 		{
 			foreach ($emails as $name => $email) {
-				if(is_numeric($name)){
+				if (is_numeric($name)) {
 					$this->setTo($email);
 				}
-				else{
+				else {
 					$this->setTo($email, $name);
 				}
 			}
@@ -281,8 +281,8 @@ 
 		 */
 		public function addAttachment($path, $filename = null, $data = null)
 		{
-			if(! file_exists($path)){
-				show_error('The file [' .$path. '] does not exists.');
+			if (!file_exists($path)) {
+				show_error('The file [' . $path . '] does not exists.');
 			}
 			$filename = empty($filename) ? basename($path) : $filename;
 			$filename = $this->encodeUtf8($this->filterOther((string) $filename));
@@ -304,13 +304,13 @@ 
 		 */
 		public function getAttachmentData($path)
 		{
-			if(! file_exists($path)){
-				show_error('The file [' .$path. '] does not exists.');
+			if (!file_exists($path)) {
+				show_error('The file [' . $path . '] does not exists.');
 			}
 			$filesize = filesize($path);
 			$handle = fopen($path, "r");
 			$attachment = null;
-			if(is_resource($handle)){
+			if (is_resource($handle)) {
 				$attachment = fread($handle, $filesize);
 				fclose($handle);
 			}