tnhfw / tnh-fw

core/lang/en/lang_form_validation.php

Indentation +16 added lines, -16 removed lines

@@ -1,24 +1,24 @@
 <?php 
-    defined('ROOT_PATH') || exit('Access denied');
+	defined('ROOT_PATH') || exit('Access denied');
  	/**
  	 * Form validation language message (English) 
  	 */
  	$lang['fv_required']     		= 'Field %1 is required.';
-    $lang['fv_min_length']   		= 'Field %1 must contain at least %2 characters.';
-    $lang['fv_max_length']   		= 'Field %1 must contain at most %2 characters.';
-    $lang['fv_exact_length'] 		= 'Field %1 must contain exactly %2 characters.';
-    $lang['fv_less_than'] 		    = 'Field %1 must less than %2.';
-    $lang['fv_greater_than'] 		= 'Field %1 must greater than %2.';
-    $lang['fv_matches']      		= 'Field %1 must be identical to field %2.';
-    $lang['fv_valid_email']  		= 'Field %1 must contain a valid E-mail address.';
-    $lang['fv_not_equal_post_key']  = 'Field %1 must not be the same as field %2.';
-    $lang['fv_not_equal_string']    = 'Field %1 must not contain the value %2.';
-    $lang['fv_depends']      		= 'Field %1 depends on field %2 which is not valid.';
+	$lang['fv_min_length']   		= 'Field %1 must contain at least %2 characters.';
+	$lang['fv_max_length']   		= 'Field %1 must contain at most %2 characters.';
+	$lang['fv_exact_length'] 		= 'Field %1 must contain exactly %2 characters.';
+	$lang['fv_less_than'] 		    = 'Field %1 must less than %2.';
+	$lang['fv_greater_than'] 		= 'Field %1 must greater than %2.';
+	$lang['fv_matches']      		= 'Field %1 must be identical to field %2.';
+	$lang['fv_valid_email']  		= 'Field %1 must contain a valid E-mail address.';
+	$lang['fv_not_equal_post_key']  = 'Field %1 must not be the same as field %2.';
+	$lang['fv_not_equal_string']    = 'Field %1 must not contain the value %2.';
+	$lang['fv_depends']      		= 'Field %1 depends on field %2 which is not valid.';
 	$lang['fv_is_unique']	   		= 'The value of field %1 already exists.';
 	$lang['fv_is_unique_update']	= 'The value of field %1 already exists for another record.';
-    $lang['fv_exists']	   			= 'The value of the field %1 does not exist.';
-    $lang['fv_regex']	   			= 'The value of the field %1 does not use the correct format.';
-    $lang['fv_in_list']	   			= 'The value of field %1 must be one of the list (%2).';
-    $lang['fv_numeric']	   			= 'The value of field %1 must be a number.';
-    $lang['fv_callback']	   		= 'The value of field %1 is not valid.';
+	$lang['fv_exists']	   			= 'The value of the field %1 does not exist.';
+	$lang['fv_regex']	   			= 'The value of the field %1 does not use the correct format.';
+	$lang['fv_in_list']	   			= 'The value of field %1 must be one of the list (%2).';
+	$lang['fv_numeric']	   			= 'The value of field %1 must be a number.';
+	$lang['fv_callback']	   		= 'The value of field %1 is not valid.';
  	

core/lang/en/lang_file_upload.php

Indentation +11 added lines, -11 removed lines

@@ -1,17 +1,17 @@
 <?php 
-    defined('ROOT_PATH') || exit('Access denied');
+	defined('ROOT_PATH') || exit('Access denied');
  	/**
  	 * File upload language messages (English) 
  	 */
  	$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_tmp_dir']   = 'Missing a temporary folder.';
-    $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_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';
+	$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_tmp_dir']   = 'Missing a temporary folder.';
+	$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_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';
 	

core/constants.php

Indentation +1 added lines, -1 removed lines

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

tests/include/common.php

Indentation +11 added lines, -11 removed lines

@@ -22,7 +22,7 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 
 	function & class_loader($class, $dir = 'libraries', $params = null){
@@ -92,8 +92,8 @@ 
 	}
 
 	/**
-	*  @test
-	*/
+	 *  @test
+	 */
 	function get_config($key, $default = null){
 		static $cfg;
 		if(empty($cfg)){
@@ -121,8 +121,8 @@ 
 	}
 	
 	/**
-	*  @test
-	*/
+	 *  @test
+	 */
 	function is_url($url){
 		return preg_match('/^(http|https|ftp):\/\/(.*)/', $url);
 	}
@@ -142,8 +142,8 @@ 
 
 
 	/**
-	*  @test
-	*/
+	 *  @test
+	 */
 	function attributes_to_string(array $attributes){
 		$str = ' ';
 		//we check that the array passed as an argument is not empty.
@@ -173,8 +173,8 @@ 
 	}
 
 	/**
-	*  @test
-	*/
+	 *  @test
+	 */
 	function clean_input($str){
 		if(is_array($str)){
 			$str = array_map('clean_input', $str);
@@ -193,8 +193,8 @@ 
 	}
 	
 	/**
-	*  @test
-	*/
+	 *  @test
+	 */
 	function string_hidden($str, $startCount = 0, $endCount = 0, $hiddenChar = '*'){
 		//get the string length
 		$len = strlen($str);

tests/include/testsUtil.php

Indentation +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 
 	/**
-	* Function to test private & protected method
-	*/
+	 * Function to test private & protected method
+	 */
 	function runPrivateOrProtectedMethod($object, $method, array $args = array()){
 		$r = new ReflectionClass(get_class($object));
 		$m = $r->getMethod($method);

tests/tnhfw/libraries/FormValidationTest.php

Indentation +30 added lines, -30 removed lines

@@ -3,66 +3,66 @@ 
 class FormValidationTest extends TestCase
 {   
 	public static function setUpBeforeClass()
-    {
+	{
     
-    }
+	}
 	
 	public static function tearDownAfterClass()
-    {
+	{
         
-    }
+	}
 	
-    protected function setUp()
-    {
+	protected function setUp()
+	{
 		
-    }
+	}
 
-    protected function tearDown()
-    {
+	protected function tearDown()
+	{
 		
-    }
+	}
 	
 	
 
-    // tests
-    public function testValidationDataIsEmpty()
-    {
+	// tests
+	public function testValidationDataIsEmpty()
+	{
 		$fv = new FormValidation();
 		$this->assertEmpty($fv->getData());
-    }
+	}
 	
 	public function testValidationDataIsNotEmpty()
-    {
+	{
 		$fv = new FormValidation();
 		$fv->setData(array('name' => 'mike'));
 		$this->assertNotEmpty($fv->getData());
 		$this->assertArrayHasKey('name', $fv->getData());
-    }
+	}
 	
 	public function testCannotDoValidation()
-    {
+	{
 		$fv = new FormValidation();
 		$this->assertFalse($fv->canDoValidation());
-    }
+	}
 
 	public function testSettingErrorDelimiter()
-    {
+	{
 		$fv = new FormValidation();
 		$fv->setErrorDelimiter('<a>', '</b>');
 		$this->assertContains('<a>', $fv->getErrorDelimiter());
 		$this->assertContains('</b>', $fv->getErrorDelimiter());
-    }
+	}
 	
 	public function testSettingErrorsDelimiter()
-    {
+	{
 		$fv = new FormValidation();
 		$fv->setErrorsDelimiter('<foo>', '</bar>');
 		$this->assertContains('<foo>', $fv->getErrorsDelimiter());
 		$this->assertContains('</bar>', $fv->getErrorsDelimiter());
-    }
+	}
 	
 	public function testSettingErrorMessageOverride()
-    {
+	{
 		
 		//field specific message for the rule
 		$fv = new FormValidation();
@@ -82,10 +82,10 @@ 
 
 		$this->assertFalse($fv->run());
 		$this->assertContains('global required message error', $fv->returnErrors());
-    }
+	}
 	
 	public function testSettingCustomErrorMessage()
-    {
+	{
 		
 		$fv = new FormValidation();
 		$fv->setData(array('foo' => ''));
@@ -103,20 +103,20 @@ 
 		
 		$this->assertFalse($fv->run());
 		$this->assertContains('custom "bar" message error', $fv->returnErrors());	
-    }
+	}
 	
 	public function testReturnErrorsArray()
-    {
+	{
 		$fv = new FormValidation();
 		$fv->setRule('name', 'name', 'required');
 		$fv->setData(array('name' => ''));
 		$this->assertFalse($fv->run());
 		$this->assertNotEmpty($fv->returnErrors());
-    }
+	}
 	
 	
 	public function testRequiredRule()
-    {
+	{
 		$fv = new FormValidation();
 		$fv->setRule('name', 'name', 'required');
 		$fv->setData(array('name' => ''));
@@ -131,5 +131,5 @@ 
 		$fv->setRule('name', 'name', 'required');
 		$fv->setData(array('name' => 'tony'));
 		$this->assertTrue($fv->run());
-    }
+	}
 }
\ No newline at end of file

core/common.php

Indentation +17 added lines, -17 removed lines

@@ -22,7 +22,7 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	/**
 	 *  @file common.php
@@ -438,13 +438,13 @@ 
 
 
 	/**
-	* Function to stringfy PHP variable, useful in debug situation
-	*
-	* @param mixed $var the variable to stringfy
-	* @codeCoverageIgnore
-	*
-	* @return string the stringfy value
-	*/
+	 * Function to stringfy PHP variable, useful in debug situation
+	 *
+	 * @param mixed $var the variable to stringfy
+	 * @codeCoverageIgnore
+	 *
+	 * @return string the stringfy value
+	 */
 	function stringfy_vars($var){
 		return print_r($var, true);
 	}
@@ -586,15 +586,15 @@ 
 	}
 	
 	/**
-	* This function is very useful, it allows to recover the instance of the global controller.
-	* Note this function always returns the address of the super instance.
-	* For example :
-	* $obj = & get_instance();
-	* 
-	* @codeCoverageIgnore
-	*  
-	* @return object the instance of the "Controller" class
-	*/
+	 * This function is very useful, it allows to recover the instance of the global controller.
+	 * Note this function always returns the address of the super instance.
+	 * For example :
+	 * $obj = & get_instance();
+	 * 
+	 * @codeCoverageIgnore
+	 *  
+	 * @return object the instance of the "Controller" class
+	 */
 	function & get_instance(){
 		return Controller::get_instance();
 	}

core/classes/Lang.php

Indentation +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 
 	/**
 	 * For application languages management
@@ -68,8 +68,8 @@ 
 		 * Construct new Lang instance
 		 */
 		public function __construct(){
-	        $this->logger =& class_loader('Log', 'classes');
-	        $this->logger->setLogger('Library::Lang');
+			$this->logger =& class_loader('Log', 'classes');
+			$this->logger->setLogger('Library::Lang');
 
 			$this->default = get_config('default_language', 'en');
 			$this->logger->debug('Setting the supported languages');

core/classes/DBSessionHandler.php

Indentation +84 added lines, -84 removed lines

@@ -22,7 +22,7 @@ 
 	 * You should have received a copy of the GNU General Public License
 	 * along with this program; if not, write to the Free Software
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-	*/
+	 */
 	
 	/**
 	 * check if the interface "SessionHandlerInterface" exists (normally in PHP 5.4 this already exists)
@@ -76,27 +76,27 @@ 
 		private $logger;
 
 		/**
-         * Instance of the Loader class
-         * @var Loader
-         */
-        protected $loader = null;
+		 * 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();
+			 * 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)){
@@ -199,9 +199,9 @@ 
 				$this->getLoader()->library('Browser'); 
 			}
 			else{
-            	Loader::functions('user_agent');
-            	Loader::library('Browser');
-            }
+				Loader::functions('user_agent');
+				Loader::library('Browser');
+			}
 			
 			$ip = get_ip();
 			$host = @gethostbyaddr($ip) or null;
@@ -238,9 +238,9 @@ 
 				$this->getLoader()->library('Browser'); 
 			}
 			else{
-            	Loader::functions('user_agent');
-            	Loader::library('Browser');
-            }
+				Loader::functions('user_agent');
+				Loader::library('Browser');
+			}
 
 			$ip = get_ip();
 			$keyValue = $instance->getKeyValue();
@@ -324,75 +324,75 @@ 
 
 		
 		/**
-         * Return the loader instance
-         * @return object Loader the loader instance
-         */
-        public function getLoader(){
-            return $this->loader;
-        }
-
-        /**
-         * set the loader instance for future use
-         * @param object Loader $loader the loader object
-         */
-         public function setLoader($loader){
-            $this->loader = $loader;
-            return $this;
-        }
-
-        /**
-         * Return the model instance
-         * @return object DBSessionHandlerModel the model instance
-         */
-        public function getModelInstance(){
-            return $this->modelInstanceName;
-        }
-
-        /**
-         * set the model instance for future use
-         * @param DBSessionHandlerModel $modelInstance the model object
-         */
-         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');
+		 * Return the loader instance
+		 * @return object Loader the loader instance
+		 */
+		public function getLoader(){
+			return $this->loader;
+		}
+
+		/**
+		 * set the loader instance for future use
+		 * @param object Loader $loader the loader object
+		 */
+		 public function setLoader($loader){
+			$this->loader = $loader;
+			return $this;
+		}
+
+		/**
+		 * Return the model instance
+		 * @return object DBSessionHandlerModel the model instance
+		 */
+		public function getModelInstance(){
+			return $this->modelInstanceName;
+		}
+
+		/**
+		 * set the model instance for future use
+		 * @param DBSessionHandlerModel $modelInstance the model object
+		 */
+		 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'); 
-            }
-            if(isset($this->OBJ->dbsessionhandlerinstance) && ! $this->OBJ->dbsessionhandlerinstance instanceof DBSessionHandlerModel){
+				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
 			
 			//set model instance
 			$this->setModelInstance($this->OBJ->dbsessionhandlerinstance);
-	    }
+		}
 	}