crocodic-studio / crudbooster

src/assets/assets/edit_area/edit_area_compressor.php

Indentation +359 added lines, -359 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	/******
+    /******
 	 *
 	 *	EditArea PHP compressor
 	 * 	Developped by Christophe Dolivet
@@ -8,421 +8,421 @@ 
 	 *
 	******/
 	
-	// CONFIG
-	$param['cache_duration']= 3600 * 24 * 10;		// 10 days util client cache expires
-	$param['compress'] = true;						// enable the code compression, should be activated but it can be usefull to desactivate it for easier error retrieving (true or false)
-	$param['debug'] = false;						// Enable this option if you need debuging info
-	$param['use_disk_cache']= true;					// If you enable this option gzip files will be cached on disk.
-	$param['use_gzip']= true;						// Enable gzip compression
-	// END CONFIG
+    // CONFIG
+    $param['cache_duration']= 3600 * 24 * 10;		// 10 days util client cache expires
+    $param['compress'] = true;						// enable the code compression, should be activated but it can be usefull to desactivate it for easier error retrieving (true or false)
+    $param['debug'] = false;						// Enable this option if you need debuging info
+    $param['use_disk_cache']= true;					// If you enable this option gzip files will be cached on disk.
+    $param['use_gzip']= true;						// Enable gzip compression
+    // END CONFIG
 	
-	$compressor= new Compressor($param);
+    $compressor= new Compressor($param);
 	
-	class Compressor{
+    class Compressor{
 	
 		
-		function compressor($param)
-		{
-			$this->__construct($param);
-		}
+        function compressor($param)
+        {
+            $this->__construct($param);
+        }
 		
-		function __construct($param)
-		{
-			$this->start_time= $this->get_microtime();
-			$this->file_loaded_size=0;
-			$this->param= $param;
-			$this->script_list="";
-			$this->path= dirname(__FILE__)."/";
-			if(isset($_GET['plugins'])){
-				$this->load_all_plugins= true;
-				$this->full_cache_file= $this->path."edit_area_full_with_plugins.js";
-				$this->gzip_cache_file= $this->path."edit_area_full_with_plugins.gz";
-			}else{
-				$this->load_all_plugins= false;
-				$this->full_cache_file= $this->path."edit_area_full.js";
-				$this->gzip_cache_file= $this->path."edit_area_full.gz";
-			}
+        function __construct($param)
+        {
+            $this->start_time= $this->get_microtime();
+            $this->file_loaded_size=0;
+            $this->param= $param;
+            $this->script_list="";
+            $this->path= dirname(__FILE__)."/";
+            if(isset($_GET['plugins'])){
+                $this->load_all_plugins= true;
+                $this->full_cache_file= $this->path."edit_area_full_with_plugins.js";
+                $this->gzip_cache_file= $this->path."edit_area_full_with_plugins.gz";
+            }else{
+                $this->load_all_plugins= false;
+                $this->full_cache_file= $this->path."edit_area_full.js";
+                $this->gzip_cache_file= $this->path."edit_area_full.gz";
+            }
 			
-			$this->check_gzip_use();
-			$this->send_headers();
-			$this->check_cache();
-			$this->load_files();
-			$this->send_datas();
-		}
+            $this->check_gzip_use();
+            $this->send_headers();
+            $this->check_cache();
+            $this->load_files();
+            $this->send_datas();
+        }
 		
-		function send_headers()
-		{
-			header("Content-type: text/javascript; charset: UTF-8");
-			header("Vary: Accept-Encoding"); // Handle proxies
-			header(sprintf("Expires: %s GMT", gmdate("D, d M Y H:i:s", time() + $this->param['cache_duration'])) );
-			if($this->use_gzip)
-				header("Content-Encoding: ".$this->gzip_enc_header);
-		}
+        function send_headers()
+        {
+            header("Content-type: text/javascript; charset: UTF-8");
+            header("Vary: Accept-Encoding"); // Handle proxies
+            header(sprintf("Expires: %s GMT", gmdate("D, d M Y H:i:s", time() + $this->param['cache_duration'])) );
+            if($this->use_gzip)
+                header("Content-Encoding: ".$this->gzip_enc_header);
+        }
 		
-		function check_gzip_use()
-		{
-			$encodings = array();
-			$desactivate_gzip=false;
+        function check_gzip_use()
+        {
+            $encodings = array();
+            $desactivate_gzip=false;
 					
-			if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
-				$encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
+            if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+                $encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
 			
-			// desactivate gzip for IE version < 7
-			if(preg_match("/(?:msie )([0-9.]+)/i", $_SERVER['HTTP_USER_AGENT'], $ie))
-			{
-				if($ie[1]<7)
-					$desactivate_gzip=true;	
-			}
+            // desactivate gzip for IE version < 7
+            if(preg_match("/(?:msie )([0-9.]+)/i", $_SERVER['HTTP_USER_AGENT'], $ie))
+            {
+                if($ie[1]<7)
+                    $desactivate_gzip=true;	
+            }
 			
-			// Check for gzip header or northon internet securities
-			if (!$desactivate_gzip && $this->param['use_gzip'] && (in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------'])) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression')) {
-				$this->gzip_enc_header= in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
-				$this->use_gzip=true;
-				$this->cache_file=$this->gzip_cache_file;
-			}else{
-				$this->use_gzip=false;
-				$this->cache_file=$this->full_cache_file;
-			}
-		}
+            // Check for gzip header or northon internet securities
+            if (!$desactivate_gzip && $this->param['use_gzip'] && (in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------'])) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression')) {
+                $this->gzip_enc_header= in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
+                $this->use_gzip=true;
+                $this->cache_file=$this->gzip_cache_file;
+            }else{
+                $this->use_gzip=false;
+                $this->cache_file=$this->full_cache_file;
+            }
+        }
 		
-		function check_cache()
-		{
-			// Only gzip the contents if clients and server support it
-			if (file_exists($this->cache_file)) {
-				// check if cache file must be updated
-				$cache_date=0;				
-				if ($dir = opendir($this->path)) {
-					while (($file = readdir($dir)) !== false) {
-						if(is_file($this->path.$file) && $file!="." && $file!="..")
-							$cache_date= max($cache_date, filemtime($this->path.$file));
-					}
-					closedir($dir);
-				}
-				if($this->load_all_plugins){
-					$plug_path= $this->path."plugins/";
-					if (($dir = @opendir($plug_path)) !== false)
-					{
-						while (($file = readdir($dir)) !== false)
-						{
-							if ($file !== "." && $file !== "..")
-							{
-								if(is_dir($plug_path.$file) && file_exists($plug_path.$file."/".$file.".js"))
-									$cache_date= max($cache_date, filemtime("plugins/".$file."/".$file.".js"));
-							}
-						}
-						closedir($dir);
-					}
-				}
+        function check_cache()
+        {
+            // Only gzip the contents if clients and server support it
+            if (file_exists($this->cache_file)) {
+                // check if cache file must be updated
+                $cache_date=0;				
+                if ($dir = opendir($this->path)) {
+                    while (($file = readdir($dir)) !== false) {
+                        if(is_file($this->path.$file) && $file!="." && $file!="..")
+                            $cache_date= max($cache_date, filemtime($this->path.$file));
+                    }
+                    closedir($dir);
+                }
+                if($this->load_all_plugins){
+                    $plug_path= $this->path."plugins/";
+                    if (($dir = @opendir($plug_path)) !== false)
+                    {
+                        while (($file = readdir($dir)) !== false)
+                        {
+                            if ($file !== "." && $file !== "..")
+                            {
+                                if(is_dir($plug_path.$file) && file_exists($plug_path.$file."/".$file.".js"))
+                                    $cache_date= max($cache_date, filemtime("plugins/".$file."/".$file.".js"));
+                            }
+                        }
+                        closedir($dir);
+                    }
+                }
 
-				if(filemtime($this->cache_file) >= $cache_date){
-					// if cache file is up to date
-					$last_modified = gmdate("D, d M Y H:i:s",filemtime($this->cache_file))." GMT";
-					if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"]) && strcasecmp($_SERVER["HTTP_IF_MODIFIED_SINCE"], $last_modified) === 0)
-					{
-						header("HTTP/1.1 304 Not Modified");
-						header("Last-modified: ".$last_modified);
-						header("Cache-Control: Public"); // Tells HTTP 1.1 clients to cache
-						header("Pragma:"); // Tells HTTP 1.0 clients to cache
-					}
-					else
-					{
-						header("Last-modified: ".$last_modified);
-						header("Cache-Control: Public"); // Tells HTTP 1.1 clients to cache
-						header("Pragma:"); // Tells HTTP 1.0 clients to cache
-						header('Content-Length: '.filesize($this->cache_file));
-						echo file_get_contents($this->cache_file);
-					}				
-					die;
-				}
-			}
-			return false;
-		}
+                if(filemtime($this->cache_file) >= $cache_date){
+                    // if cache file is up to date
+                    $last_modified = gmdate("D, d M Y H:i:s",filemtime($this->cache_file))." GMT";
+                    if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"]) && strcasecmp($_SERVER["HTTP_IF_MODIFIED_SINCE"], $last_modified) === 0)
+                    {
+                        header("HTTP/1.1 304 Not Modified");
+                        header("Last-modified: ".$last_modified);
+                        header("Cache-Control: Public"); // Tells HTTP 1.1 clients to cache
+                        header("Pragma:"); // Tells HTTP 1.0 clients to cache
+                    }
+                    else
+                    {
+                        header("Last-modified: ".$last_modified);
+                        header("Cache-Control: Public"); // Tells HTTP 1.1 clients to cache
+                        header("Pragma:"); // Tells HTTP 1.0 clients to cache
+                        header('Content-Length: '.filesize($this->cache_file));
+                        echo file_get_contents($this->cache_file);
+                    }				
+                    die;
+                }
+            }
+            return false;
+        }
 		
-		function load_files()
-		{
-			$loader= $this->get_content("edit_area_loader.js")."\n";
+        function load_files()
+        {
+            $loader= $this->get_content("edit_area_loader.js")."\n";
 			
-			// get the list of other files to load
-	    	$loader= preg_replace("/(t\.scripts_to_load=\s*)\[([^\]]*)\];/e"
-						, "\$this->replace_scripts('script_list', '\\1', '\\2')"
-						, $loader);
+            // get the list of other files to load
+            $loader= preg_replace("/(t\.scripts_to_load=\s*)\[([^\]]*)\];/e"
+                        , "\$this->replace_scripts('script_list', '\\1', '\\2')"
+                        , $loader);
 		
-			$loader= preg_replace("/(t\.sub_scripts_to_load=\s*)\[([^\]]*)\];/e"
-						, "\$this->replace_scripts('sub_script_list', '\\1', '\\2')"
-						, $loader);
+            $loader= preg_replace("/(t\.sub_scripts_to_load=\s*)\[([^\]]*)\];/e"
+                        , "\$this->replace_scripts('sub_script_list', '\\1', '\\2')"
+                        , $loader);
 
-			// replace languages names
-			$reg_path= $this->path."reg_syntax/";
-			$a_displayName	= array();
-			if (($dir = @opendir($reg_path)) !== false)
-			{
-				while (($file = readdir($dir)) !== false)
-				{
-					if( $file !== "." && $file !== ".." && ( $pos = strpos( $file, '.js' ) ) !== false )
-					{
-						$jsContent	= $this->file_get_contents( $reg_path.$file );
-						if( preg_match( '@(\'|")DISPLAY_NAME\1\s*:\s*(\'|")(.*)\2@', $jsContent, $match ) )
-						{
-							$a_displayName[] = "'". substr( $file, 0, $pos ) ."':'". htmlspecialchars( $match[3], ENT_QUOTES ) ."'";
-						}
-					}
-				}
-				closedir($dir);
-			}
-			$loader	= str_replace( '/*syntax_display_name_AUTO-FILL-BY-COMPRESSOR*/', implode( ",", $a_displayName ), $loader );
+            // replace languages names
+            $reg_path= $this->path."reg_syntax/";
+            $a_displayName	= array();
+            if (($dir = @opendir($reg_path)) !== false)
+            {
+                while (($file = readdir($dir)) !== false)
+                {
+                    if( $file !== "." && $file !== ".." && ( $pos = strpos( $file, '.js' ) ) !== false )
+                    {
+                        $jsContent	= $this->file_get_contents( $reg_path.$file );
+                        if( preg_match( '@(\'|")DISPLAY_NAME\1\s*:\s*(\'|")(.*)\2@', $jsContent, $match ) )
+                        {
+                            $a_displayName[] = "'". substr( $file, 0, $pos ) ."':'". htmlspecialchars( $match[3], ENT_QUOTES ) ."'";
+                        }
+                    }
+                }
+                closedir($dir);
+            }
+            $loader	= str_replace( '/*syntax_display_name_AUTO-FILL-BY-COMPRESSOR*/', implode( ",", $a_displayName ), $loader );
 						
-			$this->datas= $loader;
-			$this->compress_javascript($this->datas);
+            $this->datas= $loader;
+            $this->compress_javascript($this->datas);
 			
-			// load other scripts needed for the loader
-			preg_match_all('/"([^"]*)"/', $this->script_list, $match);
-			foreach($match[1] as $key => $value)
-			{
-				$content= $this->get_content(preg_replace("/\\|\//i", "", $value).".js");
-				$this->compress_javascript($content);
-				$this->datas.= $content."\n";
-			}
-			//$this->datas);
-			//$this->datas= preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', "", $this->datas);
+            // load other scripts needed for the loader
+            preg_match_all('/"([^"]*)"/', $this->script_list, $match);
+            foreach($match[1] as $key => $value)
+            {
+                $content= $this->get_content(preg_replace("/\\|\//i", "", $value).".js");
+                $this->compress_javascript($content);
+                $this->datas.= $content."\n";
+            }
+            //$this->datas);
+            //$this->datas= preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', "", $this->datas);
 			
-			// improved compression step 1/2	
-			$this->datas= preg_replace(array("/(\b)EditAreaLoader(\b)/", "/(\b)editAreaLoader(\b)/", "/(\b)editAreas(\b)/"), array("EAL", "eAL", "eAs"), $this->datas);
-			//$this->datas= str_replace(array("EditAreaLoader", "editAreaLoader", "editAreas"), array("EAL", "eAL", "eAs"), $this->datas);
-			$this->datas.= "var editAreaLoader= eAL;var editAreas=eAs;EditAreaLoader=EAL;";
+            // improved compression step 1/2	
+            $this->datas= preg_replace(array("/(\b)EditAreaLoader(\b)/", "/(\b)editAreaLoader(\b)/", "/(\b)editAreas(\b)/"), array("EAL", "eAL", "eAs"), $this->datas);
+            //$this->datas= str_replace(array("EditAreaLoader", "editAreaLoader", "editAreas"), array("EAL", "eAL", "eAs"), $this->datas);
+            $this->datas.= "var editAreaLoader= eAL;var editAreas=eAs;EditAreaLoader=EAL;";
 		
-			// load sub scripts
-			$sub_scripts="";
-			$sub_scripts_list= array();
-			preg_match_all('/"([^"]*)"/', $this->sub_script_list, $match);
-			foreach($match[1] as $value){
-				$sub_scripts_list[]= preg_replace("/\\|\//i", "", $value).".js";
-			}
+            // load sub scripts
+            $sub_scripts="";
+            $sub_scripts_list= array();
+            preg_match_all('/"([^"]*)"/', $this->sub_script_list, $match);
+            foreach($match[1] as $value){
+                $sub_scripts_list[]= preg_replace("/\\|\//i", "", $value).".js";
+            }
 		
-			if($this->load_all_plugins){
-				// load plugins scripts
-				$plug_path= $this->path."plugins/";
-				if (($dir = @opendir($plug_path)) !== false)
-				{
-					while (($file = readdir($dir)) !== false)
-					{
-						if ($file !== "." && $file !== "..")
-						{
-							if(is_dir($plug_path.$file) && file_exists($plug_path.$file."/".$file.".js"))
-								$sub_scripts_list[]= "plugins/".$file."/".$file.".js";
-						}
-					}
-					closedir($dir);
-				}
-			}
+            if($this->load_all_plugins){
+                // load plugins scripts
+                $plug_path= $this->path."plugins/";
+                if (($dir = @opendir($plug_path)) !== false)
+                {
+                    while (($file = readdir($dir)) !== false)
+                    {
+                        if ($file !== "." && $file !== "..")
+                        {
+                            if(is_dir($plug_path.$file) && file_exists($plug_path.$file."/".$file.".js"))
+                                $sub_scripts_list[]= "plugins/".$file."/".$file.".js";
+                        }
+                    }
+                    closedir($dir);
+                }
+            }
 							
-			foreach($sub_scripts_list as $value){
-				$sub_scripts.= $this->get_javascript_content($value);
-			}
-			// improved compression step 2/2	
-			$sub_scripts= preg_replace(array("/(\b)editAreaLoader(\b)/", "/(\b)editAreas(\b)/", "/(\b)editArea(\b)/", "/(\b)EditArea(\b)/"), array("eAL", "eAs", "eA", "EA"), $sub_scripts);
-		//	$sub_scripts= str_replace(array("editAreaLoader", "editAreas", "editArea", "EditArea"), array("eAL", "eAs", "eA", "EA"), $sub_scripts);
-			$sub_scripts.= "var editArea= eA;EditArea=EA;";
+            foreach($sub_scripts_list as $value){
+                $sub_scripts.= $this->get_javascript_content($value);
+            }
+            // improved compression step 2/2	
+            $sub_scripts= preg_replace(array("/(\b)editAreaLoader(\b)/", "/(\b)editAreas(\b)/", "/(\b)editArea(\b)/", "/(\b)EditArea(\b)/"), array("eAL", "eAs", "eA", "EA"), $sub_scripts);
+        //	$sub_scripts= str_replace(array("editAreaLoader", "editAreas", "editArea", "EditArea"), array("eAL", "eAs", "eA", "EA"), $sub_scripts);
+            $sub_scripts.= "var editArea= eA;EditArea=EA;";
 			
 			
-			// add the scripts
-		//	$this->datas.= sprintf("editAreaLoader.iframe_script= \"<script type='text/javascript'>%s</script>\";\n", $sub_scripts);
+            // add the scripts
+        //	$this->datas.= sprintf("editAreaLoader.iframe_script= \"<script type='text/javascript'>%s</script>\";\n", $sub_scripts);
 		
 		
-			// add the script and use a last compression 
-			if( $this->param['compress'] )
-			{
-				$last_comp	= array( 'Á' => 'this',
-								 'Â' => 'textarea',
-								 'Ã' => 'function',
-								 'Ä' => 'prototype',
-								 'Å' => 'settings',
-								 'Æ' => 'length',
-								 'Ç' => 'style',
-								 'È' => 'parent',
-								 'É' => 'last_selection',
-								 'Ê' => 'value',
-								 'Ë' => 'true',
-								 'Ì' => 'false'
-								 /*,
+            // add the script and use a last compression 
+            if( $this->param['compress'] )
+            {
+                $last_comp	= array( 'Á' => 'this',
+                                    'Â' => 'textarea',
+                                    'Ã' => 'function',
+                                    'Ä' => 'prototype',
+                                    'Å' => 'settings',
+                                    'Æ' => 'length',
+                                    'Ç' => 'style',
+                                    'È' => 'parent',
+                                    'É' => 'last_selection',
+                                    'Ê' => 'value',
+                                    'Ë' => 'true',
+                                    'Ì' => 'false'
+                                    /*,
 									'Î' => '"',
 								 'Ï' => "\n",
 								 'À' => "\r"*/);
-			}
-			else
-			{
-				$last_comp	= array();
-			}
+            }
+            else
+            {
+                $last_comp	= array();
+            }
 			
-			$js_replace= '';
-			foreach( $last_comp as $key => $val )
-				$js_replace .= ".replace(/". $key ."/g,'". str_replace( array("\n", "\r"), array('\n','\r'), $val ) ."')";
+            $js_replace= '';
+            foreach( $last_comp as $key => $val )
+                $js_replace .= ".replace(/". $key ."/g,'". str_replace( array("\n", "\r"), array('\n','\r'), $val ) ."')";
 			
-			$this->datas.= sprintf("editAreaLoader.iframe_script= \"<script type='text/javascript'>%s</script>\"%s;\n",
-								str_replace( array_values($last_comp), array_keys($last_comp), $sub_scripts ), 
-								$js_replace);
+            $this->datas.= sprintf("editAreaLoader.iframe_script= \"<script type='text/javascript'>%s</script>\"%s;\n",
+                                str_replace( array_values($last_comp), array_keys($last_comp), $sub_scripts ), 
+                                $js_replace);
 			
-			if($this->load_all_plugins)
-				$this->datas.="editAreaLoader.all_plugins_loaded=true;\n";
+            if($this->load_all_plugins)
+                $this->datas.="editAreaLoader.all_plugins_loaded=true;\n";
 		
 			
-			// load the template
-			$this->datas.= sprintf("editAreaLoader.template= \"%s\";\n", $this->get_html_content("template.html"));
-			// load the css
-			$this->datas.= sprintf("editAreaLoader.iframe_css= \"<style>%s</style>\";\n", $this->get_css_content("edit_area.css"));
+            // load the template
+            $this->datas.= sprintf("editAreaLoader.template= \"%s\";\n", $this->get_html_content("template.html"));
+            // load the css
+            $this->datas.= sprintf("editAreaLoader.iframe_css= \"<style>%s</style>\";\n", $this->get_css_content("edit_area.css"));
 					
-		//	$this->datas= "function editArea(){};editArea.prototype.loader= function(){alert('bouhbouh');} var a= new editArea();a.loader();";
+        //	$this->datas= "function editArea(){};editArea.prototype.loader= function(){alert('bouhbouh');} var a= new editArea();a.loader();";
 					
-		}
+        }
 		
-		function send_datas()
-		{
-			if($this->param['debug']){
-				$header=sprintf("/* USE PHP COMPRESSION\n");
-				$header.=sprintf("javascript size: based files: %s => PHP COMPRESSION => %s ", $this->file_loaded_size, strlen($this->datas));
-				if($this->use_gzip){
-					$gzip_datas=  gzencode($this->datas, 9, FORCE_GZIP);				
-					$header.=sprintf("=> GZIP COMPRESSION => %s", strlen($gzip_datas));
-					$ratio = round(100 - strlen($gzip_datas) / $this->file_loaded_size * 100.0);			
-				}else{
-					$ratio = round(100 - strlen($this->datas) / $this->file_loaded_size * 100.0);
-				}
-				$header.=sprintf(", reduced by %s%%\n", $ratio);
-				$header.=sprintf("compression time: %s\n", $this->get_microtime()-$this->start_time); 
-				$header.=sprintf("%s\n", implode("\n", $this->infos));
-				$header.=sprintf("*/\n");
-				$this->datas= $header.$this->datas;	
-			}
-			$mtime= time(); // ensure that the 2 disk files will have the same update time
-			// generate gzip file and cahce it if using disk cache
-			if($this->use_gzip){
-				$this->gzip_datas= gzencode($this->datas, 9, FORCE_GZIP);
-				if($this->param['use_disk_cache'])
-					$this->file_put_contents($this->gzip_cache_file, $this->gzip_datas, $mtime);
-			}
+        function send_datas()
+        {
+            if($this->param['debug']){
+                $header=sprintf("/* USE PHP COMPRESSION\n");
+                $header.=sprintf("javascript size: based files: %s => PHP COMPRESSION => %s ", $this->file_loaded_size, strlen($this->datas));
+                if($this->use_gzip){
+                    $gzip_datas=  gzencode($this->datas, 9, FORCE_GZIP);				
+                    $header.=sprintf("=> GZIP COMPRESSION => %s", strlen($gzip_datas));
+                    $ratio = round(100 - strlen($gzip_datas) / $this->file_loaded_size * 100.0);			
+                }else{
+                    $ratio = round(100 - strlen($this->datas) / $this->file_loaded_size * 100.0);
+                }
+                $header.=sprintf(", reduced by %s%%\n", $ratio);
+                $header.=sprintf("compression time: %s\n", $this->get_microtime()-$this->start_time); 
+                $header.=sprintf("%s\n", implode("\n", $this->infos));
+                $header.=sprintf("*/\n");
+                $this->datas= $header.$this->datas;	
+            }
+            $mtime= time(); // ensure that the 2 disk files will have the same update time
+            // generate gzip file and cahce it if using disk cache
+            if($this->use_gzip){
+                $this->gzip_datas= gzencode($this->datas, 9, FORCE_GZIP);
+                if($this->param['use_disk_cache'])
+                    $this->file_put_contents($this->gzip_cache_file, $this->gzip_datas, $mtime);
+            }
 			
-			// generate full js file and cache it if using disk cache			
-			if($this->param['use_disk_cache'])
-				$this->file_put_contents($this->full_cache_file, $this->datas, $mtime);
+            // generate full js file and cache it if using disk cache			
+            if($this->param['use_disk_cache'])
+                $this->file_put_contents($this->full_cache_file, $this->datas, $mtime);
 			
-			// generate output
-			if($this->use_gzip)
-				echo $this->gzip_datas;
-			else
-				echo $this->datas;
+            // generate output
+            if($this->use_gzip)
+                echo $this->gzip_datas;
+            else
+                echo $this->datas;
 				
 //			die;
-		}
+        }
 				
 		
-		function get_content($end_uri)
-		{
-			$end_uri=preg_replace("/\.\./", "", $end_uri); // Remove any .. (security)
-			$file= $this->path.$end_uri;
-			if(file_exists($file)){
-				$this->infos[]=sprintf("'%s' loaded", $end_uri);
-				/*$fd = fopen($file, 'rb');
+        function get_content($end_uri)
+        {
+            $end_uri=preg_replace("/\.\./", "", $end_uri); // Remove any .. (security)
+            $file= $this->path.$end_uri;
+            if(file_exists($file)){
+                $this->infos[]=sprintf("'%s' loaded", $end_uri);
+                /*$fd = fopen($file, 'rb');
 				$content = fread($fd, filesize($file));
 				fclose($fd);
 				return $content;*/
-				return $this->file_get_contents($file);
-			}else{
-				$this->infos[]=sprintf("'%s' not loaded", $end_uri);
-				return "";
-			}
-		}
+                return $this->file_get_contents($file);
+            }else{
+                $this->infos[]=sprintf("'%s' not loaded", $end_uri);
+                return "";
+            }
+        }
 		
-		function get_javascript_content($end_uri)
-		{
-			$val=$this->get_content($end_uri);
+        function get_javascript_content($end_uri)
+        {
+            $val=$this->get_content($end_uri);
 	
-			$this->compress_javascript($val);
-			$this->prepare_string_for_quotes($val);
-			return $val;
-		}
+            $this->compress_javascript($val);
+            $this->prepare_string_for_quotes($val);
+            return $val;
+        }
 		
-		function compress_javascript(&$code)
-		{
-			if($this->param['compress'])
-			{
-				// remove all comments
-				//	(\"(?:[^\"\\]*(?:\\\\)*(?:\\\"?)?)*(?:\"|$))|(\'(?:[^\'\\]*(?:\\\\)*(?:\\'?)?)*(?:\'|$))|(?:\/\/(?:.|\r|\t)*?(\n|$))|(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))
-				$code= preg_replace("/(\"(?:[^\"\\\\]*(?:\\\\\\\\)*(?:\\\\\"?)?)*(?:\"|$))|(\'(?:[^\'\\\\]*(?:\\\\\\\\)*(?:\\\\\'?)?)*(?:\'|$))|(?:\/\/(?:.|\r|\t)*?(\n|$))|(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))/s", "$1$2$3", $code);
-				// remove line return, empty line and tabulation
-				$code= preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', " ", $code);
-				// add line break before "else" otherwise navigators can't manage to parse the file
-				$code= preg_replace('/(\b(else)\b)/', "\n$1", $code);
-				// remove unnecessary spaces
-				$code= preg_replace('/( |\t|\r)*(;|\{|\}|=|==|\-|\+|,|\(|\)|\|\||&\&|\:)( |\t|\r)*/', "$2", $code);
-			}
-		}
+        function compress_javascript(&$code)
+        {
+            if($this->param['compress'])
+            {
+                // remove all comments
+                //	(\"(?:[^\"\\]*(?:\\\\)*(?:\\\"?)?)*(?:\"|$))|(\'(?:[^\'\\]*(?:\\\\)*(?:\\'?)?)*(?:\'|$))|(?:\/\/(?:.|\r|\t)*?(\n|$))|(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))
+                $code= preg_replace("/(\"(?:[^\"\\\\]*(?:\\\\\\\\)*(?:\\\\\"?)?)*(?:\"|$))|(\'(?:[^\'\\\\]*(?:\\\\\\\\)*(?:\\\\\'?)?)*(?:\'|$))|(?:\/\/(?:.|\r|\t)*?(\n|$))|(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))/s", "$1$2$3", $code);
+                // remove line return, empty line and tabulation
+                $code= preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', " ", $code);
+                // add line break before "else" otherwise navigators can't manage to parse the file
+                $code= preg_replace('/(\b(else)\b)/', "\n$1", $code);
+                // remove unnecessary spaces
+                $code= preg_replace('/( |\t|\r)*(;|\{|\}|=|==|\-|\+|,|\(|\)|\|\||&\&|\:)( |\t|\r)*/', "$2", $code);
+            }
+        }
 		
-		function get_css_content($end_uri){
-			$code=$this->get_content($end_uri);
-			// remove comments
-			$code= preg_replace("/(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))/s", "", $code);
-			// remove spaces
-			$code= preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', "", $code);
-			// remove spaces
-			$code= preg_replace('/( |\t|\r)?(\:|,|\{|\})( |\t|\r)+/', "$2", $code);
+        function get_css_content($end_uri){
+            $code=$this->get_content($end_uri);
+            // remove comments
+            $code= preg_replace("/(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))/s", "", $code);
+            // remove spaces
+            $code= preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', "", $code);
+            // remove spaces
+            $code= preg_replace('/( |\t|\r)?(\:|,|\{|\})( |\t|\r)+/', "$2", $code);
 		
-			$this->prepare_string_for_quotes($code);
-			return $code;
-		}
+            $this->prepare_string_for_quotes($code);
+            return $code;
+        }
 		
-		function get_html_content($end_uri){
-			$code=$this->get_content($end_uri);
-			//$code= preg_replace('/(\"(?:\\\"|[^\"])*(?:\"|$))|' . "(\'(?:\\\'|[^\'])*(?:\'|$))|(?:\/\/(?:.|\r|\t)*?(\n|$))|(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))/s", "$1$2$3", $code);
-			$code= preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', " ", $code);
-			$this->prepare_string_for_quotes($code);
-			return $code;
-		}
+        function get_html_content($end_uri){
+            $code=$this->get_content($end_uri);
+            //$code= preg_replace('/(\"(?:\\\"|[^\"])*(?:\"|$))|' . "(\'(?:\\\'|[^\'])*(?:\'|$))|(?:\/\/(?:.|\r|\t)*?(\n|$))|(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))/s", "$1$2$3", $code);
+            $code= preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', " ", $code);
+            $this->prepare_string_for_quotes($code);
+            return $code;
+        }
 		
-		function prepare_string_for_quotes(&$str){
-			// prepare the code to be putted into quotes 
-			/*$pattern= array("/(\\\\)?\"/", '/\\\n/'	, '/\\\r/'	, "/(\r?\n)/");
+        function prepare_string_for_quotes(&$str){
+            // prepare the code to be putted into quotes 
+            /*$pattern= array("/(\\\\)?\"/", '/\\\n/'	, '/\\\r/'	, "/(\r?\n)/");
 			$replace= array('$1$1\\"', '\\\\\\n', '\\\\\\r'	, '\\\n"$1+"');*/
-			$pattern= array("/(\\\\)?\"/", '/\\\n/'	, '/\\\r/'	, "/(\r?\n)/");
-			if($this->param['compress'])
-				$replace= array('$1$1\\"', '\\\\\\n', '\\\\\\r'	, '\n');
-			else
-				$replace= array('$1$1\\"', '\\\\\\n', '\\\\\\r'	, "\\n\"\n+\"");
-			$str= preg_replace($pattern, $replace, $str);
-		}
+            $pattern= array("/(\\\\)?\"/", '/\\\n/'	, '/\\\r/'	, "/(\r?\n)/");
+            if($this->param['compress'])
+                $replace= array('$1$1\\"', '\\\\\\n', '\\\\\\r'	, '\n');
+            else
+                $replace= array('$1$1\\"', '\\\\\\n', '\\\\\\r'	, "\\n\"\n+\"");
+            $str= preg_replace($pattern, $replace, $str);
+        }
 		
-		function replace_scripts($var, $param1, $param2)
-		{
-			$this->$var=stripslashes($param2);
-	        return $param1."[];";
-		}
+        function replace_scripts($var, $param1, $param2)
+        {
+            $this->$var=stripslashes($param2);
+            return $param1."[];";
+        }
 
-		/* for php version that have not thoses functions */
-		function file_get_contents($file)
-		{
-			$fd = fopen($file, 'rb');
-			$content = fread($fd, filesize($file));
-			fclose($fd);
-			$this->file_loaded_size+= strlen($content);
-			return $content;				
-		}
+        /* for php version that have not thoses functions */
+        function file_get_contents($file)
+        {
+            $fd = fopen($file, 'rb');
+            $content = fread($fd, filesize($file));
+            fclose($fd);
+            $this->file_loaded_size+= strlen($content);
+            return $content;				
+        }
 		
-		function file_put_contents($file, &$content, $mtime=-1)
-		{
-			if($mtime==-1)
-				$mtime=time();
-			$fp = @fopen($file, "wb");
-			if ($fp) {
-				fwrite($fp, $content);
-				fclose($fp);
-				touch($file, $mtime);
-				return true;
-			}
-			return false;
-		}
+        function file_put_contents($file, &$content, $mtime=-1)
+        {
+            if($mtime==-1)
+                $mtime=time();
+            $fp = @fopen($file, "wb");
+            if ($fp) {
+                fwrite($fp, $content);
+                fclose($fp);
+                touch($file, $mtime);
+                return true;
+            }
+            return false;
+        }
 		
-		function get_microtime()
-		{
-		   list($usec, $sec) = explode(" ", microtime());
-		   return ((float)$usec + (float)$sec);
-		}
-	}	
+        function get_microtime()
+        {
+            list($usec, $sec) = explode(" ", microtime());
+            return ((float)$usec + (float)$sec);
+        }
+    }	
 ?>

Spacing +130 added lines, -130 removed lines

@@ -9,16 +9,16 @@ 
 	******/
 	
 	// CONFIG
-	$param['cache_duration']= 3600 * 24 * 10;		// 10 days util client cache expires
-	$param['compress'] = true;						// enable the code compression, should be activated but it can be usefull to desactivate it for easier error retrieving (true or false)
-	$param['debug'] = false;						// Enable this option if you need debuging info
-	$param['use_disk_cache']= true;					// If you enable this option gzip files will be cached on disk.
-	$param['use_gzip']= true;						// Enable gzip compression
+	$param['cache_duration'] = 3600 * 24 * 10; // 10 days util client cache expires
+	$param['compress'] = true; // enable the code compression, should be activated but it can be usefull to desactivate it for easier error retrieving (true or false)
+	$param['debug'] = false; // Enable this option if you need debuging info
+	$param['use_disk_cache'] = true; // If you enable this option gzip files will be cached on disk.
+	$param['use_gzip'] = true; // Enable gzip compression
 	// END CONFIG
 	
-	$compressor= new Compressor($param);
+	$compressor = new Compressor($param);
 	
-	class Compressor{
+	class Compressor {
 	
 		
 		function compressor($param)
@@ -28,19 +28,19 @@ 
 		
 		function __construct($param)
 		{
-			$this->start_time= $this->get_microtime();
-			$this->file_loaded_size=0;
-			$this->param= $param;
-			$this->script_list="";
-			$this->path= dirname(__FILE__)."/";
-			if(isset($_GET['plugins'])){
-				$this->load_all_plugins= true;
-				$this->full_cache_file= $this->path."edit_area_full_with_plugins.js";
-				$this->gzip_cache_file= $this->path."edit_area_full_with_plugins.gz";
-			}else{
-				$this->load_all_plugins= false;
-				$this->full_cache_file= $this->path."edit_area_full.js";
-				$this->gzip_cache_file= $this->path."edit_area_full.gz";
+			$this->start_time = $this->get_microtime();
+			$this->file_loaded_size = 0;
+			$this->param = $param;
+			$this->script_list = "";
+			$this->path = dirname(__FILE__)."/";
+			if (isset($_GET['plugins'])) {
+				$this->load_all_plugins = true;
+				$this->full_cache_file = $this->path."edit_area_full_with_plugins.js";
+				$this->gzip_cache_file = $this->path."edit_area_full_with_plugins.gz";
+			} else {
+				$this->load_all_plugins = false;
+				$this->full_cache_file = $this->path."edit_area_full.js";
+				$this->gzip_cache_file = $this->path."edit_area_full.gz";
 			}
 			
 			$this->check_gzip_use();
@@ -54,34 +54,34 @@ 
 		{
 			header("Content-type: text/javascript; charset: UTF-8");
 			header("Vary: Accept-Encoding"); // Handle proxies
-			header(sprintf("Expires: %s GMT", gmdate("D, d M Y H:i:s", time() + $this->param['cache_duration'])) );
-			if($this->use_gzip)
+			header(sprintf("Expires: %s GMT", gmdate("D, d M Y H:i:s", time() + $this->param['cache_duration'])));
+			if ($this->use_gzip)
 				header("Content-Encoding: ".$this->gzip_enc_header);
 		}
 		
 		function check_gzip_use()
 		{
 			$encodings = array();
-			$desactivate_gzip=false;
+			$desactivate_gzip = false;
 					
 			if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
 				$encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
 			
 			// desactivate gzip for IE version < 7
-			if(preg_match("/(?:msie )([0-9.]+)/i", $_SERVER['HTTP_USER_AGENT'], $ie))
+			if (preg_match("/(?:msie )([0-9.]+)/i", $_SERVER['HTTP_USER_AGENT'], $ie))
 			{
-				if($ie[1]<7)
-					$desactivate_gzip=true;	
+				if ($ie[1] < 7)
+					$desactivate_gzip = true;	
 			}
 			
 			// Check for gzip header or northon internet securities
 			if (!$desactivate_gzip && $this->param['use_gzip'] && (in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------'])) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression')) {
-				$this->gzip_enc_header= in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
-				$this->use_gzip=true;
-				$this->cache_file=$this->gzip_cache_file;
-			}else{
-				$this->use_gzip=false;
-				$this->cache_file=$this->full_cache_file;
+				$this->gzip_enc_header = in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
+				$this->use_gzip = true;
+				$this->cache_file = $this->gzip_cache_file;
+			} else {
+				$this->use_gzip = false;
+				$this->cache_file = $this->full_cache_file;
 			}
 		}
 		
@@ -90,33 +90,33 @@ 
 			// Only gzip the contents if clients and server support it
 			if (file_exists($this->cache_file)) {
 				// check if cache file must be updated
-				$cache_date=0;				
+				$cache_date = 0;				
 				if ($dir = opendir($this->path)) {
 					while (($file = readdir($dir)) !== false) {
-						if(is_file($this->path.$file) && $file!="." && $file!="..")
-							$cache_date= max($cache_date, filemtime($this->path.$file));
+						if (is_file($this->path.$file) && $file != "." && $file != "..")
+							$cache_date = max($cache_date, filemtime($this->path.$file));
 					}
 					closedir($dir);
 				}
-				if($this->load_all_plugins){
-					$plug_path= $this->path."plugins/";
+				if ($this->load_all_plugins) {
+					$plug_path = $this->path."plugins/";
 					if (($dir = @opendir($plug_path)) !== false)
 					{
 						while (($file = readdir($dir)) !== false)
 						{
 							if ($file !== "." && $file !== "..")
 							{
-								if(is_dir($plug_path.$file) && file_exists($plug_path.$file."/".$file.".js"))
-									$cache_date= max($cache_date, filemtime("plugins/".$file."/".$file.".js"));
+								if (is_dir($plug_path.$file) && file_exists($plug_path.$file."/".$file.".js"))
+									$cache_date = max($cache_date, filemtime("plugins/".$file."/".$file.".js"));
 							}
 						}
 						closedir($dir);
 					}
 				}
 
-				if(filemtime($this->cache_file) >= $cache_date){
+				if (filemtime($this->cache_file) >= $cache_date) {
 					// if cache file is up to date
-					$last_modified = gmdate("D, d M Y H:i:s",filemtime($this->cache_file))." GMT";
+					$last_modified = gmdate("D, d M Y H:i:s", filemtime($this->cache_file))." GMT";
 					if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"]) && strcasecmp($_SERVER["HTTP_IF_MODIFIED_SINCE"], $last_modified) === 0)
 					{
 						header("HTTP/1.1 304 Not Modified");
@@ -140,88 +140,88 @@ 
 		
 		function load_files()
 		{
-			$loader= $this->get_content("edit_area_loader.js")."\n";
+			$loader = $this->get_content("edit_area_loader.js")."\n";
 			
 			// get the list of other files to load
-	    	$loader= preg_replace("/(t\.scripts_to_load=\s*)\[([^\]]*)\];/e"
+	    	$loader = preg_replace("/(t\.scripts_to_load=\s*)\[([^\]]*)\];/e"
 						, "\$this->replace_scripts('script_list', '\\1', '\\2')"
 						, $loader);
 		
-			$loader= preg_replace("/(t\.sub_scripts_to_load=\s*)\[([^\]]*)\];/e"
+			$loader = preg_replace("/(t\.sub_scripts_to_load=\s*)\[([^\]]*)\];/e"
 						, "\$this->replace_scripts('sub_script_list', '\\1', '\\2')"
 						, $loader);
 
 			// replace languages names
-			$reg_path= $this->path."reg_syntax/";
+			$reg_path = $this->path."reg_syntax/";
 			$a_displayName	= array();
 			if (($dir = @opendir($reg_path)) !== false)
 			{
 				while (($file = readdir($dir)) !== false)
 				{
-					if( $file !== "." && $file !== ".." && ( $pos = strpos( $file, '.js' ) ) !== false )
+					if ($file !== "." && $file !== ".." && ($pos = strpos($file, '.js')) !== false)
 					{
-						$jsContent	= $this->file_get_contents( $reg_path.$file );
-						if( preg_match( '@(\'|")DISPLAY_NAME\1\s*:\s*(\'|")(.*)\2@', $jsContent, $match ) )
+						$jsContent = $this->file_get_contents($reg_path.$file);
+						if (preg_match('@(\'|")DISPLAY_NAME\1\s*:\s*(\'|")(.*)\2@', $jsContent, $match))
 						{
-							$a_displayName[] = "'". substr( $file, 0, $pos ) ."':'". htmlspecialchars( $match[3], ENT_QUOTES ) ."'";
+							$a_displayName[] = "'".substr($file, 0, $pos)."':'".htmlspecialchars($match[3], ENT_QUOTES)."'";
 						}
 					}
 				}
 				closedir($dir);
 			}
-			$loader	= str_replace( '/*syntax_display_name_AUTO-FILL-BY-COMPRESSOR*/', implode( ",", $a_displayName ), $loader );
+			$loader = str_replace('/*syntax_display_name_AUTO-FILL-BY-COMPRESSOR*/', implode(",", $a_displayName), $loader);
 						
-			$this->datas= $loader;
+			$this->datas = $loader;
 			$this->compress_javascript($this->datas);
 			
 			// load other scripts needed for the loader
 			preg_match_all('/"([^"]*)"/', $this->script_list, $match);
-			foreach($match[1] as $key => $value)
+			foreach ($match[1] as $key => $value)
 			{
-				$content= $this->get_content(preg_replace("/\\|\//i", "", $value).".js");
+				$content = $this->get_content(preg_replace("/\\|\//i", "", $value).".js");
 				$this->compress_javascript($content);
-				$this->datas.= $content."\n";
+				$this->datas .= $content."\n";
 			}
 			//$this->datas);
 			//$this->datas= preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', "", $this->datas);
 			
 			// improved compression step 1/2	
-			$this->datas= preg_replace(array("/(\b)EditAreaLoader(\b)/", "/(\b)editAreaLoader(\b)/", "/(\b)editAreas(\b)/"), array("EAL", "eAL", "eAs"), $this->datas);
+			$this->datas = preg_replace(array("/(\b)EditAreaLoader(\b)/", "/(\b)editAreaLoader(\b)/", "/(\b)editAreas(\b)/"), array("EAL", "eAL", "eAs"), $this->datas);
 			//$this->datas= str_replace(array("EditAreaLoader", "editAreaLoader", "editAreas"), array("EAL", "eAL", "eAs"), $this->datas);
-			$this->datas.= "var editAreaLoader= eAL;var editAreas=eAs;EditAreaLoader=EAL;";
+			$this->datas .= "var editAreaLoader= eAL;var editAreas=eAs;EditAreaLoader=EAL;";
 		
 			// load sub scripts
-			$sub_scripts="";
-			$sub_scripts_list= array();
+			$sub_scripts = "";
+			$sub_scripts_list = array();
 			preg_match_all('/"([^"]*)"/', $this->sub_script_list, $match);
-			foreach($match[1] as $value){
-				$sub_scripts_list[]= preg_replace("/\\|\//i", "", $value).".js";
+			foreach ($match[1] as $value) {
+				$sub_scripts_list[] = preg_replace("/\\|\//i", "", $value).".js";
 			}
 		
-			if($this->load_all_plugins){
+			if ($this->load_all_plugins) {
 				// load plugins scripts
-				$plug_path= $this->path."plugins/";
+				$plug_path = $this->path."plugins/";
 				if (($dir = @opendir($plug_path)) !== false)
 				{
 					while (($file = readdir($dir)) !== false)
 					{
 						if ($file !== "." && $file !== "..")
 						{
-							if(is_dir($plug_path.$file) && file_exists($plug_path.$file."/".$file.".js"))
-								$sub_scripts_list[]= "plugins/".$file."/".$file.".js";
+							if (is_dir($plug_path.$file) && file_exists($plug_path.$file."/".$file.".js"))
+								$sub_scripts_list[] = "plugins/".$file."/".$file.".js";
 						}
 					}
 					closedir($dir);
 				}
 			}
 							
-			foreach($sub_scripts_list as $value){
-				$sub_scripts.= $this->get_javascript_content($value);
+			foreach ($sub_scripts_list as $value) {
+				$sub_scripts .= $this->get_javascript_content($value);
 			}
 			// improved compression step 2/2	
-			$sub_scripts= preg_replace(array("/(\b)editAreaLoader(\b)/", "/(\b)editAreas(\b)/", "/(\b)editArea(\b)/", "/(\b)EditArea(\b)/"), array("eAL", "eAs", "eA", "EA"), $sub_scripts);
+			$sub_scripts = preg_replace(array("/(\b)editAreaLoader(\b)/", "/(\b)editAreas(\b)/", "/(\b)editArea(\b)/", "/(\b)EditArea(\b)/"), array("eAL", "eAs", "eA", "EA"), $sub_scripts);
 		//	$sub_scripts= str_replace(array("editAreaLoader", "editAreas", "editArea", "EditArea"), array("eAL", "eAs", "eA", "EA"), $sub_scripts);
-			$sub_scripts.= "var editArea= eA;EditArea=EA;";
+			$sub_scripts .= "var editArea= eA;EditArea=EA;";
 			
 			
 			// add the scripts
@@ -229,9 +229,9 @@ 
 		
 		
 			// add the script and use a last compression 
-			if( $this->param['compress'] )
+			if ($this->param['compress'])
 			{
-				$last_comp	= array( 'Á' => 'this',
+				$last_comp = array('Á' => 'this',
 								 'Â' => 'textarea',
 								 'Ã' => 'function',
 								 'Ä' => 'prototype',
@@ -250,25 +250,25 @@ 
 			}
 			else
 			{
-				$last_comp	= array();
+				$last_comp = array();
 			}
 			
-			$js_replace= '';
-			foreach( $last_comp as $key => $val )
-				$js_replace .= ".replace(/". $key ."/g,'". str_replace( array("\n", "\r"), array('\n','\r'), $val ) ."')";
+			$js_replace = '';
+			foreach ($last_comp as $key => $val)
+				$js_replace .= ".replace(/".$key."/g,'".str_replace(array("\n", "\r"), array('\n', '\r'), $val)."')";
 			
-			$this->datas.= sprintf("editAreaLoader.iframe_script= \"<script type='text/javascript'>%s</script>\"%s;\n",
-								str_replace( array_values($last_comp), array_keys($last_comp), $sub_scripts ), 
+			$this->datas .= sprintf("editAreaLoader.iframe_script= \"<script type='text/javascript'>%s</script>\"%s;\n",
+								str_replace(array_values($last_comp), array_keys($last_comp), $sub_scripts), 
 								$js_replace);
 			
-			if($this->load_all_plugins)
-				$this->datas.="editAreaLoader.all_plugins_loaded=true;\n";
+			if ($this->load_all_plugins)
+				$this->datas .= "editAreaLoader.all_plugins_loaded=true;\n";
 		
 			
 			// load the template
-			$this->datas.= sprintf("editAreaLoader.template= \"%s\";\n", $this->get_html_content("template.html"));
+			$this->datas .= sprintf("editAreaLoader.template= \"%s\";\n", $this->get_html_content("template.html"));
 			// load the css
-			$this->datas.= sprintf("editAreaLoader.iframe_css= \"<style>%s</style>\";\n", $this->get_css_content("edit_area.css"));
+			$this->datas .= sprintf("editAreaLoader.iframe_css= \"<style>%s</style>\";\n", $this->get_css_content("edit_area.css"));
 					
 		//	$this->datas= "function editArea(){};editArea.prototype.loader= function(){alert('bouhbouh');} var a= new editArea();a.loader();";
 					
@@ -276,36 +276,36 @@ 
 		
 		function send_datas()
 		{
-			if($this->param['debug']){
-				$header=sprintf("/* USE PHP COMPRESSION\n");
-				$header.=sprintf("javascript size: based files: %s => PHP COMPRESSION => %s ", $this->file_loaded_size, strlen($this->datas));
-				if($this->use_gzip){
-					$gzip_datas=  gzencode($this->datas, 9, FORCE_GZIP);				
-					$header.=sprintf("=> GZIP COMPRESSION => %s", strlen($gzip_datas));
+			if ($this->param['debug']) {
+				$header = sprintf("/* USE PHP COMPRESSION\n");
+				$header .= sprintf("javascript size: based files: %s => PHP COMPRESSION => %s ", $this->file_loaded_size, strlen($this->datas));
+				if ($this->use_gzip) {
+					$gzip_datas = gzencode($this->datas, 9, FORCE_GZIP);				
+					$header .= sprintf("=> GZIP COMPRESSION => %s", strlen($gzip_datas));
 					$ratio = round(100 - strlen($gzip_datas) / $this->file_loaded_size * 100.0);			
-				}else{
+				} else {
 					$ratio = round(100 - strlen($this->datas) / $this->file_loaded_size * 100.0);
 				}
-				$header.=sprintf(", reduced by %s%%\n", $ratio);
-				$header.=sprintf("compression time: %s\n", $this->get_microtime()-$this->start_time); 
-				$header.=sprintf("%s\n", implode("\n", $this->infos));
-				$header.=sprintf("*/\n");
-				$this->datas= $header.$this->datas;	
+				$header .= sprintf(", reduced by %s%%\n", $ratio);
+				$header .= sprintf("compression time: %s\n", $this->get_microtime() - $this->start_time); 
+				$header .= sprintf("%s\n", implode("\n", $this->infos));
+				$header .= sprintf("*/\n");
+				$this->datas = $header.$this->datas;	
 			}
-			$mtime= time(); // ensure that the 2 disk files will have the same update time
+			$mtime = time(); // ensure that the 2 disk files will have the same update time
 			// generate gzip file and cahce it if using disk cache
-			if($this->use_gzip){
-				$this->gzip_datas= gzencode($this->datas, 9, FORCE_GZIP);
-				if($this->param['use_disk_cache'])
+			if ($this->use_gzip) {
+				$this->gzip_datas = gzencode($this->datas, 9, FORCE_GZIP);
+				if ($this->param['use_disk_cache'])
 					$this->file_put_contents($this->gzip_cache_file, $this->gzip_datas, $mtime);
 			}
 			
 			// generate full js file and cache it if using disk cache			
-			if($this->param['use_disk_cache'])
+			if ($this->param['use_disk_cache'])
 				$this->file_put_contents($this->full_cache_file, $this->datas, $mtime);
 			
 			// generate output
-			if($this->use_gzip)
+			if ($this->use_gzip)
 				echo $this->gzip_datas;
 			else
 				echo $this->datas;
@@ -316,24 +316,24 @@ 
 		
 		function get_content($end_uri)
 		{
-			$end_uri=preg_replace("/\.\./", "", $end_uri); // Remove any .. (security)
-			$file= $this->path.$end_uri;
-			if(file_exists($file)){
-				$this->infos[]=sprintf("'%s' loaded", $end_uri);
+			$end_uri = preg_replace("/\.\./", "", $end_uri); // Remove any .. (security)
+			$file = $this->path.$end_uri;
+			if (file_exists($file)) {
+				$this->infos[] = sprintf("'%s' loaded", $end_uri);
 				/*$fd = fopen($file, 'rb');
 				$content = fread($fd, filesize($file));
 				fclose($fd);
 				return $content;*/
 				return $this->file_get_contents($file);
-			}else{
-				$this->infos[]=sprintf("'%s' not loaded", $end_uri);
+			} else {
+				$this->infos[] = sprintf("'%s' not loaded", $end_uri);
 				return "";
 			}
 		}
 		
 		function get_javascript_content($end_uri)
 		{
-			$val=$this->get_content($end_uri);
+			$val = $this->get_content($end_uri);
 	
 			$this->compress_javascript($val);
 			$this->prepare_string_for_quotes($val);
@@ -342,56 +342,56 @@ 
 		
 		function compress_javascript(&$code)
 		{
-			if($this->param['compress'])
+			if ($this->param['compress'])
 			{
 				// remove all comments
 				//	(\"(?:[^\"\\]*(?:\\\\)*(?:\\\"?)?)*(?:\"|$))|(\'(?:[^\'\\]*(?:\\\\)*(?:\\'?)?)*(?:\'|$))|(?:\/\/(?:.|\r|\t)*?(\n|$))|(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))
-				$code= preg_replace("/(\"(?:[^\"\\\\]*(?:\\\\\\\\)*(?:\\\\\"?)?)*(?:\"|$))|(\'(?:[^\'\\\\]*(?:\\\\\\\\)*(?:\\\\\'?)?)*(?:\'|$))|(?:\/\/(?:.|\r|\t)*?(\n|$))|(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))/s", "$1$2$3", $code);
+				$code = preg_replace("/(\"(?:[^\"\\\\]*(?:\\\\\\\\)*(?:\\\\\"?)?)*(?:\"|$))|(\'(?:[^\'\\\\]*(?:\\\\\\\\)*(?:\\\\\'?)?)*(?:\'|$))|(?:\/\/(?:.|\r|\t)*?(\n|$))|(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))/s", "$1$2$3", $code);
 				// remove line return, empty line and tabulation
-				$code= preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', " ", $code);
+				$code = preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', " ", $code);
 				// add line break before "else" otherwise navigators can't manage to parse the file
-				$code= preg_replace('/(\b(else)\b)/', "\n$1", $code);
+				$code = preg_replace('/(\b(else)\b)/', "\n$1", $code);
 				// remove unnecessary spaces
-				$code= preg_replace('/( |\t|\r)*(;|\{|\}|=|==|\-|\+|,|\(|\)|\|\||&\&|\:)( |\t|\r)*/', "$2", $code);
+				$code = preg_replace('/( |\t|\r)*(;|\{|\}|=|==|\-|\+|,|\(|\)|\|\||&\&|\:)( |\t|\r)*/', "$2", $code);
 			}
 		}
 		
-		function get_css_content($end_uri){
-			$code=$this->get_content($end_uri);
+		function get_css_content($end_uri) {
+			$code = $this->get_content($end_uri);
 			// remove comments
-			$code= preg_replace("/(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))/s", "", $code);
+			$code = preg_replace("/(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))/s", "", $code);
 			// remove spaces
-			$code= preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', "", $code);
+			$code = preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', "", $code);
 			// remove spaces
-			$code= preg_replace('/( |\t|\r)?(\:|,|\{|\})( |\t|\r)+/', "$2", $code);
+			$code = preg_replace('/( |\t|\r)?(\:|,|\{|\})( |\t|\r)+/', "$2", $code);
 		
 			$this->prepare_string_for_quotes($code);
 			return $code;
 		}
 		
-		function get_html_content($end_uri){
-			$code=$this->get_content($end_uri);
+		function get_html_content($end_uri) {
+			$code = $this->get_content($end_uri);
 			//$code= preg_replace('/(\"(?:\\\"|[^\"])*(?:\"|$))|' . "(\'(?:\\\'|[^\'])*(?:\'|$))|(?:\/\/(?:.|\r|\t)*?(\n|$))|(?:\/\*(?:.|\n|\r|\t)*?(?:\*\/|$))/s", "$1$2$3", $code);
-			$code= preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', " ", $code);
+			$code = preg_replace('/(( |\t|\r)*\n( |\t)*)+/s', " ", $code);
 			$this->prepare_string_for_quotes($code);
 			return $code;
 		}
 		
-		function prepare_string_for_quotes(&$str){
+		function prepare_string_for_quotes(&$str) {
 			// prepare the code to be putted into quotes 
 			/*$pattern= array("/(\\\\)?\"/", '/\\\n/'	, '/\\\r/'	, "/(\r?\n)/");
 			$replace= array('$1$1\\"', '\\\\\\n', '\\\\\\r'	, '\\\n"$1+"');*/
-			$pattern= array("/(\\\\)?\"/", '/\\\n/'	, '/\\\r/'	, "/(\r?\n)/");
-			if($this->param['compress'])
-				$replace= array('$1$1\\"', '\\\\\\n', '\\\\\\r'	, '\n');
+			$pattern = array("/(\\\\)?\"/", '/\\\n/', '/\\\r/', "/(\r?\n)/");
+			if ($this->param['compress'])
+				$replace = array('$1$1\\"', '\\\\\\n', '\\\\\\r', '\n');
 			else
-				$replace= array('$1$1\\"', '\\\\\\n', '\\\\\\r'	, "\\n\"\n+\"");
-			$str= preg_replace($pattern, $replace, $str);
+				$replace = array('$1$1\\"', '\\\\\\n', '\\\\\\r', "\\n\"\n+\"");
+			$str = preg_replace($pattern, $replace, $str);
 		}
 		
 		function replace_scripts($var, $param1, $param2)
 		{
-			$this->$var=stripslashes($param2);
+			$this->$var = stripslashes($param2);
 	        return $param1."[];";
 		}
 
@@ -401,14 +401,14 @@ 
 			$fd = fopen($file, 'rb');
 			$content = fread($fd, filesize($file));
 			fclose($fd);
-			$this->file_loaded_size+= strlen($content);
+			$this->file_loaded_size += strlen($content);
 			return $content;				
 		}
 		
-		function file_put_contents($file, &$content, $mtime=-1)
+		function file_put_contents($file, &$content, $mtime = -1)
 		{
-			if($mtime==-1)
-				$mtime=time();
+			if ($mtime == -1)
+				$mtime = time();
 			$fp = @fopen($file, "wb");
 			if ($fp) {
 				fwrite($fp, $content);
@@ -422,7 +422,7 @@ 
 		function get_microtime()
 		{
 		   list($usec, $sec) = explode(" ", microtime());
-		   return ((float)$usec + (float)$sec);
+		   return ((float) $usec + (float) $sec);
 		}
 	}	
 ?>

Braces +49 added lines, -38 removed lines

@@ -37,7 +37,7 @@ 
 				$this->load_all_plugins= true;
 				$this->full_cache_file= $this->path."edit_area_full_with_plugins.js";
 				$this->gzip_cache_file= $this->path."edit_area_full_with_plugins.gz";
-			}else{
+			} else{
 				$this->load_all_plugins= false;
 				$this->full_cache_file= $this->path."edit_area_full.js";
 				$this->gzip_cache_file= $this->path."edit_area_full.gz";
@@ -55,8 +55,9 @@ 
 			header("Content-type: text/javascript; charset: UTF-8");
 			header("Vary: Accept-Encoding"); // Handle proxies
 			header(sprintf("Expires: %s GMT", gmdate("D, d M Y H:i:s", time() + $this->param['cache_duration'])) );
-			if($this->use_gzip)
-				header("Content-Encoding: ".$this->gzip_enc_header);
+			if($this->use_gzip) {
+							header("Content-Encoding: ".$this->gzip_enc_header);
+			}
 		}
 		
 		function check_gzip_use()
@@ -64,14 +65,16 @@ 
 			$encodings = array();
 			$desactivate_gzip=false;
 					
-			if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
-				$encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
+			if (isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
+							$encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
+			}
 			
 			// desactivate gzip for IE version < 7
 			if(preg_match("/(?:msie )([0-9.]+)/i", $_SERVER['HTTP_USER_AGENT'], $ie))
 			{
-				if($ie[1]<7)
-					$desactivate_gzip=true;	
+				if($ie[1]<7) {
+									$desactivate_gzip=true;
+				}
 			}
 			
 			// Check for gzip header or northon internet securities
@@ -79,7 +82,7 @@ 
 				$this->gzip_enc_header= in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
 				$this->use_gzip=true;
 				$this->cache_file=$this->gzip_cache_file;
-			}else{
+			} else{
 				$this->use_gzip=false;
 				$this->cache_file=$this->full_cache_file;
 			}
@@ -93,8 +96,9 @@ 
 				$cache_date=0;				
 				if ($dir = opendir($this->path)) {
 					while (($file = readdir($dir)) !== false) {
-						if(is_file($this->path.$file) && $file!="." && $file!="..")
-							$cache_date= max($cache_date, filemtime($this->path.$file));
+						if(is_file($this->path.$file) && $file!="." && $file!="..") {
+													$cache_date= max($cache_date, filemtime($this->path.$file));
+						}
 					}
 					closedir($dir);
 				}
@@ -106,8 +110,9 @@ 
 						{
 							if ($file !== "." && $file !== "..")
 							{
-								if(is_dir($plug_path.$file) && file_exists($plug_path.$file."/".$file.".js"))
-									$cache_date= max($cache_date, filemtime("plugins/".$file."/".$file.".js"));
+								if(is_dir($plug_path.$file) && file_exists($plug_path.$file."/".$file.".js")) {
+																	$cache_date= max($cache_date, filemtime("plugins/".$file."/".$file.".js"));
+								}
 							}
 						}
 						closedir($dir);
@@ -123,8 +128,7 @@ 
 						header("Last-modified: ".$last_modified);
 						header("Cache-Control: Public"); // Tells HTTP 1.1 clients to cache
 						header("Pragma:"); // Tells HTTP 1.0 clients to cache
-					}
-					else
+					} else
 					{
 						header("Last-modified: ".$last_modified);
 						header("Cache-Control: Public"); // Tells HTTP 1.1 clients to cache
@@ -207,8 +211,9 @@ 
 					{
 						if ($file !== "." && $file !== "..")
 						{
-							if(is_dir($plug_path.$file) && file_exists($plug_path.$file."/".$file.".js"))
-								$sub_scripts_list[]= "plugins/".$file."/".$file.".js";
+							if(is_dir($plug_path.$file) && file_exists($plug_path.$file."/".$file.".js")) {
+															$sub_scripts_list[]= "plugins/".$file."/".$file.".js";
+							}
 						}
 					}
 					closedir($dir);
@@ -247,22 +252,23 @@ 
 									'Î' => '"',
 								 'Ï' => "\n",
 								 'À' => "\r"*/);
-			}
-			else
+			} else
 			{
 				$last_comp	= array();
 			}
 			
 			$js_replace= '';
-			foreach( $last_comp as $key => $val )
-				$js_replace .= ".replace(/". $key ."/g,'". str_replace( array("\n", "\r"), array('\n','\r'), $val ) ."')";
+			foreach( $last_comp as $key => $val ) {
+							$js_replace .= ".replace(/". $key ."/g,'". str_replace( array("\n", "\r"), array('\n','\r'), $val ) ."')";
+			}
 			
 			$this->datas.= sprintf("editAreaLoader.iframe_script= \"<script type='text/javascript'>%s</script>\"%s;\n",
 								str_replace( array_values($last_comp), array_keys($last_comp), $sub_scripts ), 
 								$js_replace);
 			
-			if($this->load_all_plugins)
-				$this->datas.="editAreaLoader.all_plugins_loaded=true;\n";
+			if($this->load_all_plugins) {
+							$this->datas.="editAreaLoader.all_plugins_loaded=true;\n";
+			}
 		
 			
 			// load the template
@@ -283,7 +289,7 @@ 
 					$gzip_datas=  gzencode($this->datas, 9, FORCE_GZIP);				
 					$header.=sprintf("=> GZIP COMPRESSION => %s", strlen($gzip_datas));
 					$ratio = round(100 - strlen($gzip_datas) / $this->file_loaded_size * 100.0);			
-				}else{
+				} else{
 					$ratio = round(100 - strlen($this->datas) / $this->file_loaded_size * 100.0);
 				}
 				$header.=sprintf(", reduced by %s%%\n", $ratio);
@@ -296,19 +302,22 @@ 
 			// generate gzip file and cahce it if using disk cache
 			if($this->use_gzip){
 				$this->gzip_datas= gzencode($this->datas, 9, FORCE_GZIP);
-				if($this->param['use_disk_cache'])
-					$this->file_put_contents($this->gzip_cache_file, $this->gzip_datas, $mtime);
+				if($this->param['use_disk_cache']) {
+									$this->file_put_contents($this->gzip_cache_file, $this->gzip_datas, $mtime);
+				}
 			}
 			
 			// generate full js file and cache it if using disk cache			
-			if($this->param['use_disk_cache'])
-				$this->file_put_contents($this->full_cache_file, $this->datas, $mtime);
+			if($this->param['use_disk_cache']) {
+							$this->file_put_contents($this->full_cache_file, $this->datas, $mtime);
+			}
 			
 			// generate output
-			if($this->use_gzip)
-				echo $this->gzip_datas;
-			else
-				echo $this->datas;
+			if($this->use_gzip) {
+							echo $this->gzip_datas;
+			} else {
+							echo $this->datas;
+			}
 				
 //			die;
 		}
@@ -325,7 +334,7 @@ 
 				fclose($fd);
 				return $content;*/
 				return $this->file_get_contents($file);
-			}else{
+			} else{
 				$this->infos[]=sprintf("'%s' not loaded", $end_uri);
 				return "";
 			}
@@ -382,10 +391,11 @@ 
 			/*$pattern= array("/(\\\\)?\"/", '/\\\n/'	, '/\\\r/'	, "/(\r?\n)/");
 			$replace= array('$1$1\\"', '\\\\\\n', '\\\\\\r'	, '\\\n"$1+"');*/
 			$pattern= array("/(\\\\)?\"/", '/\\\n/'	, '/\\\r/'	, "/(\r?\n)/");
-			if($this->param['compress'])
-				$replace= array('$1$1\\"', '\\\\\\n', '\\\\\\r'	, '\n');
-			else
-				$replace= array('$1$1\\"', '\\\\\\n', '\\\\\\r'	, "\\n\"\n+\"");
+			if($this->param['compress']) {
+							$replace= array('$1$1\\"', '\\\\\\n', '\\\\\\r'	, '\n');
+			} else {
+							$replace= array('$1$1\\"', '\\\\\\n', '\\\\\\r'	, "\\n\"\n+\"");
+			}
 			$str= preg_replace($pattern, $replace, $str);
 		}
 		
@@ -407,8 +417,9 @@ 
 		
 		function file_put_contents($file, &$content, $mtime=-1)
 		{
-			if($mtime==-1)
-				$mtime=time();
+			if($mtime==-1) {
+							$mtime=time();
+			}
 			$fp = @fopen($file, "wb");
 			if ($fp) {
 				fwrite($fp, $content);

src/localization/it/crudbooster.php

Indentation +1 added lines, -1 removed lines

@@ -235,5 +235,5 @@
     'please_complete_the_form' =>'Completa il form !',
     'this_field_is_required'   =>'Questo campo è obbligatorio',
     'text_form'                => 'Form',
-     "your_file_extension_is_not_allowed "=>"Estensione file non permessa!",
+        "your_file_extension_is_not_allowed "=>"Estensione file non permessa!",
 ];

Spacing +2 added lines, -2 removed lines

@@ -224,8 +224,8 @@
     'datamodal_select'=>'Select',
     'datamodal_search_and_enter'=>'Cerca e premi invio...',
     'datamodal_enter_to_search'=>'premi invio per cercare',
-    'datamodal_browse_data'=>'Esplora dati' ,
-    'datamodal_browse_file'=>'Esplora file' ,
+    'datamodal_browse_data'=>'Esplora dati',
+    'datamodal_browse_file'=>'Esplora file',
     
 
     //child 

src/localization/pt_br/crudbooster.php

Indentation +3 added lines, -3 removed lines

@@ -161,7 +161,7 @@ 
     'email_setting'        => 'Configurações de E-mail',
     'application_setting'  => 'Configurações do Aplicativo',
 
-     // table filter & sort 
+        // table filter & sort 
     'filter_select_operator_type'  => 'Selecione o operador',
     'filter_ascending'             => 'ASCENDENTE',
     'filter_descending'            => 'DESCENDENTE',
@@ -198,7 +198,7 @@ 
     'confirmation_text'             => 'Tem certeza de que quer fazer isso?',
     'confirmButtonText'             => 'Sim',
 
-     //datamodal 
+        //datamodal 
     'datamodal_select'=>'Select',
     'datamodal_search_and_enter'=>'Search and enter...',
     'datamodal_enter_to_search'=>'Enter to search',
@@ -213,5 +213,5 @@ 
     'please_complete_the_form' =>'Please complete the form !',
     'this_field_is_required'   =>'This field is required',
     'text_form'                => 'Form',
-     "your_file_extension_is_not_allowed "=>"Your file extension is not allowed !",
+        "your_file_extension_is_not_allowed "=>"Your file extension is not allowed !",
 ];

Spacing +2 added lines, -2 removed lines

@@ -202,8 +202,8 @@
     'datamodal_select'=>'Select',
     'datamodal_search_and_enter'=>'Search and enter...',
     'datamodal_enter_to_search'=>'Enter to search',
-    'datamodal_browse_data'=>'Browse Data' ,
-    'datamodal_browse_file'=>'Browse File' ,
+    'datamodal_browse_data'=>'Browse Data',
+    'datamodal_browse_file'=>'Browse File',
     
 
     //child 

src/localization/el/crudbooster.php

Indentation +1 added lines, -1 removed lines

@@ -233,5 +233,5 @@
     'please_complete_the_form' =>'Παρακαλώ συμπληρώστε την φόρμα!',
     'this_field_is_required'   =>'Αυτό το πεδίο απαιτείται',
     'text_form'                => 'Φόρμα',
-     "your_file_extension_is_not_allowed "=>"Αυτό το είδος αρχείου δεν επιτρέπεται!",
+        "your_file_extension_is_not_allowed "=>"Αυτό το είδος αρχείου δεν επιτρέπεται!",
 ];

Spacing +2 added lines, -2 removed lines

@@ -222,8 +222,8 @@
     'datamodal_select'=>'Επιλογή',
     'datamodal_search_and_enter'=>'Αναζήτηση και enter...',
     'datamodal_enter_to_search'=>'Εισαγωγή προς αναζήτηση',
-    'datamodal_browse_data'=>'Εξερεύνηση δεδομένων' ,
-    'datamodal_browse_file'=>'Εξερεύνηση αρχείων' ,
+    'datamodal_browse_data'=>'Εξερεύνηση δεδομένων',
+    'datamodal_browse_file'=>'Εξερεύνηση αρχείων',
     
 
     //child 

src/localization/zh-CN/crudbooster.php

Spacing +1 added lines, -1 removed lines

@@ -219,6 +219,6 @@
     'datamodal_select'=>'选择',
     'datamodal_search_and_enter'=>'查询并进入...',
     'datamodal_enter_to_search'=>'进入查询',
-    'datamodal_browse_data'=>'浏览数据' ,
+    'datamodal_browse_data'=>'浏览数据',
     
 ];

src/localization/he/crudbooster.php

Indentation +1 added lines, -1 removed lines

@@ -233,5 +233,5 @@
     'please_complete_the_form' =>'Please complete the form !',
     'this_field_is_required'   =>'This field is required',
     'text_form'                => 'Form',
-     "your_file_extension_is_not_allowed "=>"Your file extension is not allowed !",
+        "your_file_extension_is_not_allowed "=>"Your file extension is not allowed !",
 ];

Spacing +2 added lines, -2 removed lines

@@ -222,8 +222,8 @@
     'datamodal_select'=>'Select',
     'datamodal_search_and_enter'=>'Search and enter...',
     'datamodal_enter_to_search'=>'Enter to search',
-    'datamodal_browse_data'=>'Browse Data' ,
-    'datamodal_browse_file'=>'Browse File' ,
+    'datamodal_browse_data'=>'Browse Data',
+    'datamodal_browse_file'=>'Browse File',
 
 
     //child

src/localization/tr/crudbooster.php

Indentation +1 added lines, -1 removed lines

@@ -215,7 +215,7 @@
     'confirmation_text'             => 'Bu işlemi yapmak istediğinizden emin misiniz?',
     'confirmButtonText'             => 'Evet',
 
-     //datamodal 
+        //datamodal 
     'datamodal_select'              =>'Seç',
     'datamodal_search_and_enter'    =>'Aramak için yazın ve enter tuşuna basın..',
     'datamodal_enter_to_search'     =>'Aramak için Enter tuşuna basınız',

Spacing +2 added lines, -2 removed lines

@@ -219,8 +219,8 @@
     'datamodal_select'              =>'Seç',
     'datamodal_search_and_enter'    =>'Aramak için yazın ve enter tuşuna basın..',
     'datamodal_enter_to_search'     =>'Aramak için Enter tuşuna basınız',
-    'datamodal_browse_data'         =>'Gözat' ,
-    'datamodal_browse_file'         =>'Dosyaya Gözat' ,
+    'datamodal_browse_data'         =>'Gözat',
+    'datamodal_browse_file'         =>'Dosyaya Gözat',
 
     //child 
     'table_detail'             =>'Tablo ',

src/localization/es/crudbooster.php

Indentation +105 added lines, -105 removed lines

@@ -1,123 +1,123 @@ 
 <?php 
 return [
-	'emaill_footer'               =>'No respondas a este mensaje, es un mensaje generado automáticamente.',
-	'login_message'              =>'Por favor, inicia sesión para comenzar',
-	'text_forgot_password'       =>'¿Olvidaste tu contraseña?',
-	'page_title_login'           =>'Inicio de sesión',
-	'page_title_forgot'          =>'Recuperar contraseña',
-	'forgot_message'             =>'Introduce tu dirección de correo electrónico para enviarte tu nueva contraseña',
-	"forgot_text_try_again"      =>"¿Volver a iniciar sesión?",
-	'text_no_notification'       =>"No tienes notificaciones",
-	'text_view_all_notification' =>'Ver todas',
-	'label_button_profile'       =>"Perfil",
-	'filter_dialog_title'        =>'Filtros y búsquedas avanzadas',
-	'text_enter_the_password'     =>'Introduce la contraseña para volver a la sesión',
-	'text_or_sign_in'             =>'O inicia sesión con otro usuario',
-	'text_default_add_new_module' =>'Añadir nuevo :module',
-	'text_default_list_module'    =>'Ver :module',
-	'text_default_help_password'  =>'Mínimo 5 caracteres. Deja este campo vacio si no solicitaste un cambio de contraseña.',
-	'text_default_help_upload'    =>'Tipo de imágenes soportados: JPG, JPEG, PNG, GIF, BMP',
-	'text_default_help_number'    =>'Puedes introducir solo un número',
-	'text_default_help_email'     =>'Introduce una dirección de correo electrónico válida',
-	'text_default_help_text'      =>'Puedes introducir solo una letra',
-	'text_default_help_url'       =>'Introduce una dirección web (URL) válida',
-	'text_dashboard'              =>'Escritorio',
-	'text_prefix_option' 		  =>'** Selecciona un',
-	'text_loading'		 		  =>'Espera un segundo, por favor. Cargando...',
-	'message_after_logout'    =>'¡Gracias por la visita, nos vemos pronto!',
-	'message_forgot_password' =>'Te hemos enviado una nueva contraseña. Revisa tu correo electrónico. ¡Puede estar en la carpeta de spam!',
-	'page_not_found'=>'Vaya, esta página no existe o no tienes acceso.',
-	'page_not_found_text'=>'No encontramos la página que nos pides.',
+    'emaill_footer'               =>'No respondas a este mensaje, es un mensaje generado automáticamente.',
+    'login_message'              =>'Por favor, inicia sesión para comenzar',
+    'text_forgot_password'       =>'¿Olvidaste tu contraseña?',
+    'page_title_login'           =>'Inicio de sesión',
+    'page_title_forgot'          =>'Recuperar contraseña',
+    'forgot_message'             =>'Introduce tu dirección de correo electrónico para enviarte tu nueva contraseña',
+    "forgot_text_try_again"      =>"¿Volver a iniciar sesión?",
+    'text_no_notification'       =>"No tienes notificaciones",
+    'text_view_all_notification' =>'Ver todas',
+    'label_button_profile'       =>"Perfil",
+    'filter_dialog_title'        =>'Filtros y búsquedas avanzadas',
+    'text_enter_the_password'     =>'Introduce la contraseña para volver a la sesión',
+    'text_or_sign_in'             =>'O inicia sesión con otro usuario',
+    'text_default_add_new_module' =>'Añadir nuevo :module',
+    'text_default_list_module'    =>'Ver :module',
+    'text_default_help_password'  =>'Mínimo 5 caracteres. Deja este campo vacio si no solicitaste un cambio de contraseña.',
+    'text_default_help_upload'    =>'Tipo de imágenes soportados: JPG, JPEG, PNG, GIF, BMP',
+    'text_default_help_number'    =>'Puedes introducir solo un número',
+    'text_default_help_email'     =>'Introduce una dirección de correo electrónico válida',
+    'text_default_help_text'      =>'Puedes introducir solo una letra',
+    'text_default_help_url'       =>'Introduce una dirección web (URL) válida',
+    'text_dashboard'              =>'Escritorio',
+    'text_prefix_option' 		  =>'** Selecciona un',
+    'text_loading'		 		  =>'Espera un segundo, por favor. Cargando...',
+    'message_after_logout'    =>'¡Gracias por la visita, nos vemos pronto!',
+    'message_forgot_password' =>'Te hemos enviado una nueva contraseña. Revisa tu correo electrónico. ¡Puede estar en la carpeta de spam!',
+    'page_not_found'=>'Vaya, esta página no existe o no tienes acceso.',
+    'page_not_found_text'=>'No encontramos la página que nos pides.',
 	
-	'page_not_found_tips'=>'* Asegúrate que la dirección es la correcta<br/>
+    'page_not_found_tips'=>'* Asegúrate que la dirección es la correcta<br/>
                 * Recuerda que el sistema distingue entre mayúsculas y minúsculas<br/>
                 * Consulta con el administrador, puede que haya eliminado esta página<br/>
                 * Puedes regresar a la página anterior haciendo click en la flecha hacia atras del navegador<br/>',
 
-	'alert_delete_selected'         =>'¿Seguro que quieres eliminar todos los elementos seleccionados?',
-	'alert_delete_selected_success' =>'¡El borrado de los elementos seleccionados se ha completado con éxito!',
-	'alert_action' 					=>'¡Has :action con éxito!',
-	'alert_add_data_success'        =>'¡Los datos han sido añadidos!',
-	'alert_add_data_failed'         =>'¡Algo ha fallado al grabar los datos!',
-	'alert_update_data_success'     =>'¡Los datos han sido actualizados con éxito!',
-	'alert_update_data_failed'      =>'Algo ha fallado al actualizar los datos',
-	'alert_delete_data_success'     =>'¡Borrado de datos con éxito!',
-	'alert_want_to_logout'          =>'¿Quieres finalizar la sesión?',
-	'alert_warning'                 =>"¡Upss!",
-	'alert_danger'                  =>'Parece que algo no funciona...',
-	'alert_success'                 =>'Hecho, buen trabajo...',
-	'alert_info'                    =>'Información',
-	'alert_primary'                 =>'Información',
-	'alert_session_expired'         =>'Has superado el tiempo máximo de sesión, Inicia sesión de nuevo. Gracias !',
-	'alert_password_wrong'			=>'Lo sentimos, la contraseña esta mal escrita !',
-	'alert_required' 				=>'Asegurate que has rellenado todos los campos obligatorios',
-	'alert_error_ajax'				=>'Parece que tenemos problemas en el sistema, vamos a intentar corregirlo lo antes posible !',
-	'alert_validation_error'		=>'Rellena el formulario correctamente : :error',
+    'alert_delete_selected'         =>'¿Seguro que quieres eliminar todos los elementos seleccionados?',
+    'alert_delete_selected_success' =>'¡El borrado de los elementos seleccionados se ha completado con éxito!',
+    'alert_action' 					=>'¡Has :action con éxito!',
+    'alert_add_data_success'        =>'¡Los datos han sido añadidos!',
+    'alert_add_data_failed'         =>'¡Algo ha fallado al grabar los datos!',
+    'alert_update_data_success'     =>'¡Los datos han sido actualizados con éxito!',
+    'alert_update_data_failed'      =>'Algo ha fallado al actualizar los datos',
+    'alert_delete_data_success'     =>'¡Borrado de datos con éxito!',
+    'alert_want_to_logout'          =>'¿Quieres finalizar la sesión?',
+    'alert_warning'                 =>"¡Upss!",
+    'alert_danger'                  =>'Parece que algo no funciona...',
+    'alert_success'                 =>'Hecho, buen trabajo...',
+    'alert_info'                    =>'Información',
+    'alert_primary'                 =>'Información',
+    'alert_session_expired'         =>'Has superado el tiempo máximo de sesión, Inicia sesión de nuevo. Gracias !',
+    'alert_password_wrong'			=>'Lo sentimos, la contraseña esta mal escrita !',
+    'alert_required' 				=>'Asegurate que has rellenado todos los campos obligatorios',
+    'alert_error_ajax'				=>'Parece que tenemos problemas en el sistema, vamos a intentar corregirlo lo antes posible !',
+    'alert_validation_error'		=>'Rellena el formulario correctamente : :error',
 
-	'add_data_page_title'    => 'Añadir :module',
-	'edit_data_page_title'   => 'Editar :module',    'button_add_to_table'    =>'Agregar a la Tabla',
+    'add_data_page_title'    => 'Añadir :module',
+    'edit_data_page_title'   => 'Editar :module',    'button_add_to_table'    =>'Agregar a la Tabla',
 
-	'detail_data_page_title' => 'Detalles :module',
+    'detail_data_page_title' => 'Detalles :module',
 
-	'default_module_description'=>'Listado',
+    'default_module_description'=>'Listado',
 
-	'delete_description_confirm' =>"No podrás recuperar estos datos!",
-	'delete_title_confirm'       =>"Estás Seguro?",
+    'delete_description_confirm' =>"No podrás recuperar estos datos!",
+    'delete_title_confirm'       =>"Estás Seguro?",
 
 
-	'action_show_data'       =>'Mostrar',
-	'action_add_data'        =>'Añadir',
-	'action_delete_selected' =>'Elimina los seleccionados',	
+    'action_show_data'       =>'Mostrar',
+    'action_add_data'        =>'Añadir',
+    'action_delete_selected' =>'Elimina los seleccionados',	
 
-	'action_label'       =>'Acción',
-	'action_detail_data' =>'Detalles',
-	'action_edit_data'   =>'Editar',
-	'action_delete_data' =>'Eliminar',
+    'action_label'       =>'Acción',
+    'action_detail_data' =>'Detalles',
+    'action_edit_data'   =>'Editar',
+    'action_delete_data' =>'Eliminar',
 	
-	'button_cancel'          =>'Cancelar',
-	'button_add'			 =>'Añadir',
-	'button_edit'			 =>'Editar',
-	'button_back'            =>'Volver',
-	'button_save'            =>'Guardar',
-	'button_save_more'       =>'Guardar y Añadir otro',
-	'button_import'          =>'Importar',
-	'button_export'          =>'Exportar',
-	'button_filter'          =>'Filtros y Orden',
-	'button_close'           =>'Cerrar',
-	'button_submit'          =>'Enviar',
-	'button_logout'          =>'Salir',	
-	'button_sign_in'         =>'Iniciar',
-	'button_selected_action' =>'Acciones Masivas',
-	'button_download_file'   =>'Descargar Fichero',
-	'button_reset'           =>'Resetear',
-	'button_add_to_table'    =>'Agregar a la Tabla',
+    'button_cancel'          =>'Cancelar',
+    'button_add'			 =>'Añadir',
+    'button_edit'			 =>'Editar',
+    'button_back'            =>'Volver',
+    'button_save'            =>'Guardar',
+    'button_save_more'       =>'Guardar y Añadir otro',
+    'button_import'          =>'Importar',
+    'button_export'          =>'Exportar',
+    'button_filter'          =>'Filtros y Orden',
+    'button_close'           =>'Cerrar',
+    'button_submit'          =>'Enviar',
+    'button_logout'          =>'Salir',	
+    'button_sign_in'         =>'Iniciar',
+    'button_selected_action' =>'Acciones Masivas',
+    'button_download_file'   =>'Descargar Fichero',
+    'button_reset'           =>'Resetear',
+    'button_add_to_table'    =>'Agregar a la Tabla',
 	
 
-	'export_dialog_title'            =>"Exportar Datos",
-	'export_dialog_filename'         =>'Nombre Fichero',
-	'export_dialog_help_filename'    =>'Puedes renombrar el fichero como desees',
-	'export_dialog_maxdata'          =>"Max Data",
-	'export_dialog_help_maxdata'     =>'Mínimo 1 y máximo 100,000 registros por sesión',
-	'export_dialog_columns'          =>'Columnas',
-	'export_dialog_format_export'    =>'Formato Exportación',
-	'export_dialog_show_advanced'    =>'Muestra Exportaciones avanzadas',
-	'export_dialog_page_size'        =>'Tamaño de Página',
-	'export_dialog_set_default'      =>'Utilizar como tamaño por defecto',
-	'export_dialog_page_orientation' =>'Orientación',	
+    'export_dialog_title'            =>"Exportar Datos",
+    'export_dialog_filename'         =>'Nombre Fichero',
+    'export_dialog_help_filename'    =>'Puedes renombrar el fichero como desees',
+    'export_dialog_maxdata'          =>"Max Data",
+    'export_dialog_help_maxdata'     =>'Mínimo 1 y máximo 100,000 registros por sesión',
+    'export_dialog_columns'          =>'Columnas',
+    'export_dialog_format_export'    =>'Formato Exportación',
+    'export_dialog_show_advanced'    =>'Muestra Exportaciones avanzadas',
+    'export_dialog_page_size'        =>'Tamaño de Página',
+    'export_dialog_set_default'      =>'Utilizar como tamaño por defecto',
+    'export_dialog_page_orientation' =>'Orientación',	
 
-	'import_page_title'         =>'Importar :module',	
-	'dashboard_default_text'    =>'Bienvenido a  :appname',	
-	'form_back_to_list'         =>'Volver al listado :module',	
-	'not_logged_in'             =>'No has iniciado sesión !',	
-	'menu_navigation'           =>"Navegación",
-	'table_data_not_found'      =>"No tenemos datos disponibles",
-	"notice_delete_file_upload" =>"* Si quieres subir otro fichero, antes elimina el fichero origen.",
-	"file_broken"               =>"Parece que no se ha subido bien el fichero. Elimínalo y vuelve a intentarlo.",
-	'denied_access'=>'¡Vaya, no tienes permisos para acceder a este area!',
-	'denied_update'=>'¡Vaya, no tienes permisos para actualizar datos!',
-	'denied_create'=>'¡Vaya, no tienes permisos para añadir datos!',
-	'denied_delete'=>'¡Vaya, no tienes permisos para eliminar datos!',
-	'user_image'           => 'Imagen de usuario',
+    'import_page_title'         =>'Importar :module',	
+    'dashboard_default_text'    =>'Bienvenido a  :appname',	
+    'form_back_to_list'         =>'Volver al listado :module',	
+    'not_logged_in'             =>'No has iniciado sesión !',	
+    'menu_navigation'           =>"Navegación",
+    'table_data_not_found'      =>"No tenemos datos disponibles",
+    "notice_delete_file_upload" =>"* Si quieres subir otro fichero, antes elimina el fichero origen.",
+    "file_broken"               =>"Parece que no se ha subido bien el fichero. Elimínalo y vuelve a intentarlo.",
+    'denied_access'=>'¡Vaya, no tienes permisos para acceder a este area!',
+    'denied_update'=>'¡Vaya, no tienes permisos para actualizar datos!',
+    'denied_create'=>'¡Vaya, no tienes permisos para añadir datos!',
+    'denied_delete'=>'¡Vaya, no tienes permisos para eliminar datos!',
+    'user_image'           => 'Imagen de usuario',
     'online'               => 'En línea',
     'controller_route_404' => 'Controlador o Ruta no encontrado(a).',
     'home'                 => 'Principal',
@@ -196,7 +196,7 @@ 
     'chose_an_image'               => 'Elige una imagen ',
     'chose_an_file'                => 'Elige un fichero ',
 	
-	 //datamodal 
+        //datamodal 
 
     'datamodal_select'=>'Seleccionar',
     'datamodal_search_and_enter'=>'Buscar y enter...',
@@ -208,7 +208,7 @@ 
     'datamodal_enter_to_search'=>'Enter to search',
     'datamodal_browse_data'=>'Browse Data' ,
 
-	//action confirmation
+    //action confirmation
     'confirmation_title' => 'Confirmación',
     'confirmation_text' => '¿Está seguro que desea realizar esta acción?',
 
@@ -222,5 +222,5 @@ 
     'please_complete_the_form' =>'Please complete the form !',
     'this_field_is_required'   =>'This field is required',
     'text_form'                => 'Form',
-     "your_file_extension_is_not_allowed "=>"Your file extension is not allowed !",
+        "your_file_extension_is_not_allowed "=>"Your file extension is not allowed !",
 ];

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
 	'alert_validation_error'		=>'Rellena el formulario correctamente : :error',
 
 	'add_data_page_title'    => 'Añadir :module',
-	'edit_data_page_title'   => 'Editar :module',    'button_add_to_table'    =>'Agregar a la Tabla',
+	'edit_data_page_title'   => 'Editar :module', 'button_add_to_table'    =>'Agregar a la Tabla',
 
 	'detail_data_page_title' => 'Detalles :module',
 
@@ -201,18 +201,18 @@ 
     'datamodal_select'=>'Seleccionar',
     'datamodal_search_and_enter'=>'Buscar y enter...',
     'datamodal_enter_to_search'=>'Enter para buscar',
-    'datamodal_browse_data'=>'Escojer Dato' ,
+    'datamodal_browse_data'=>'Escojer Dato',
 
     'datamodal_select'=>'Select',
     'datamodal_search_and_enter'=>'Search and enter...',
     'datamodal_enter_to_search'=>'Enter to search',
-    'datamodal_browse_data'=>'Browse Data' ,
+    'datamodal_browse_data'=>'Browse Data',
 
 	//action confirmation
     'confirmation_title' => 'Confirmación',
     'confirmation_text' => '¿Está seguro que desea realizar esta acción?',
 
-    'datamodal_browse_file'=>'Browse File' ,
+    'datamodal_browse_file'=>'Browse File',
     
 
     //child 

src/localization/ar/crudbooster.php

Indentation +2 added lines, -2 removed lines

@@ -207,7 +207,7 @@ 
     'chose_an_image'               => 'اختر صورة ',
     'chose_an_file'                => 'اختر ملف ',
 
-     //datamodal 
+        //datamodal 
     'datamodal_select'=>'Select',
     'datamodal_search_and_enter'=>'Search and enter...',
     'datamodal_enter_to_search'=>'Enter to search',
@@ -222,5 +222,5 @@ 
     'please_complete_the_form' =>'Please complete the form !',
     'this_field_is_required'   =>'This field is required',
     'text_form'                => 'Form',
-     "your_file_extension_is_not_allowed "=>"Your file extension is not allowed !",
+        "your_file_extension_is_not_allowed "=>"Your file extension is not allowed !",
 ];

Spacing +2 added lines, -2 removed lines

@@ -202,8 +202,8 @@
     'datamodal_select'=>'Select',
     'datamodal_search_and_enter'=>'Search and enter...',
     'datamodal_enter_to_search'=>'Enter to search',
-    'datamodal_browse_data'=>'Browse Data' ,
-    'datamodal_browse_file'=>'Browse File' ,
+    'datamodal_browse_data'=>'Browse Data',
+    'datamodal_browse_file'=>'Browse File',
     
 
     //child