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);
+        }
+    }	
 ?>

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/views/default/type_components/radio/component_detail.blade.php

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,9 @@
                 break;
             }
         }
-        if (! $value) $value = [];
+        if (! $value) {
+            $value = [];
+        }
     }
 } else {
     $value = explode(";", $value);

src/views/default/type_components/radio/component.blade.php

Braces +3 added lines, -1 removed lines

@@ -68,7 +68,9 @@
 
             foreach ($selects_data as $d) {
                 $val = $d->{$select_field_alias};
-                if ($val == '' || ! $d->id) continue;
+                if ($val == '' || ! $d->id) {
+                    continue;
+                }
 
                 $checked = ($value == $d->id) ? "checked" : "";
 

Indentation +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
                 } else {
                     $val = $label = $d;
                 }
-				$checked = ( ($value && in_array($val, $value)) || (CRUDBooster::isCreate() && ($k==0 && $form['validation'])) ) ? "checked" : "";
+                $checked = ( ($value && in_array($val, $value)) || (CRUDBooster::isCreate() && ($k==0 && $form['validation'])) ) ? "checked" : "";
                 ?>
                 <div class=" {{$disabled}}">
                     <label class='radio-inline'>

src/fonts/Fontawesome.php

Indentation +3 added lines, -3 removed lines

@@ -2,8 +2,8 @@ 
 namespace crocodicstudio\crudbooster\fonts;
 
 class Fontawesome {
-	public static function getIcons() {
-		return [
+    public static function getIcons() {
+        return [
             "glass",
             "music",
             "search",
@@ -699,5 +699,5 @@ 
             "bluetooth-b",
             "percent",
         ];
-	}
+    }
 }
\ No newline at end of file

src/helpers/CRUDBooster.php

Indentation +44 added lines, -44 removed lines

@@ -15,8 +15,8 @@ 
 class CRUDBooster
 {
     /**
-    *	Comma-delimited data output from the child table
-    */
+     *	Comma-delimited data output from the child table
+     */
     public static function echoSelect2Mult($values, $table, $id, $name) {
         $values = explode(",", $values);
         return implode(", ", DB::table($table)->whereIn($id, $values)->pluck($name)->toArray());
@@ -43,13 +43,13 @@ 
         @$mime_type = $mime_type[1];
         if ($mime_type) {
             $filePath = 'uploads/'.$userID.'/'.date('Y-m');
-		Storage::makeDirectory($filePath);
-		$filename = md5(str_random(5)).'.'.$mime_type;
-		if (Storage::put($filePath.'/'.$filename, $filedata)) {
-		    self::resizeImage($filePath.'/'.$filename);
+        Storage::makeDirectory($filePath);
+        $filename = md5(str_random(5)).'.'.$mime_type;
+        if (Storage::put($filePath.'/'.$filename, $filedata)) {
+            self::resizeImage($filePath.'/'.$filename);
 
-		    return $filePath.'/'.$filename;
-		}
+            return $filePath.'/'.$filename;
+        }
         }
     }
 
@@ -374,17 +374,17 @@ 
 
     public static function getCurrentModule()
     {
-	$modulepath = self::getModulePath();
+    $modulepath = self::getModulePath();
 
-	if (Cache::has('moduls_'.$modulepath)) {
-	    return Cache::get('moduls_'.$modulepath);
-	} else {
+    if (Cache::has('moduls_'.$modulepath)) {
+        return Cache::get('moduls_'.$modulepath);
+    } else {
 
-	    $module = DB::table('cms_moduls')->where('path', self::getModulePath())->first();
+        $module = DB::table('cms_moduls')->where('path', self::getModulePath())->first();
 	    
-	    //supply modulpath instead of $module incase where user decides to create form and custom url that does not exist in cms_moduls table.
-	    return ($module)?:$modulepath; 
-	}
+        //supply modulpath instead of $module incase where user decides to create form and custom url that does not exist in cms_moduls table.
+        return ($module)?:$modulepath; 
+    }
     }
 
     public static function getCurrentDashboardId()
@@ -526,22 +526,22 @@ 
 
     public static function getModulePath()
     {
-          // Check to position of admin_path
-          if(config("crudbooster.ADMIN_PATH")) {
-              $adminPathSegments = explode('/', Request::path());
-              $no = 1;
-              foreach($adminPathSegments as $path) {
-                  if($path == config("crudbooster.ADMIN_PATH")) {
-                      $segment = $no+1;
-                      break;
-                  }
-                  $no++;
-              }
-          } else {
-              $segment = 1;
-          }
-
-          return Request::segment($segment);
+            // Check to position of admin_path
+            if(config("crudbooster.ADMIN_PATH")) {
+                $adminPathSegments = explode('/', Request::path());
+                $no = 1;
+                foreach($adminPathSegments as $path) {
+                    if($path == config("crudbooster.ADMIN_PATH")) {
+                        $segment = $no+1;
+                        break;
+                    }
+                    $no++;
+                }
+            } else {
+                $segment = 1;
+            }
+
+            return Request::segment($segment);
     }	
 
     public static function mainpath($path = null)
@@ -937,19 +937,19 @@ 
 //         }
 //     }
 
-	public static function findPrimaryKey($table)
-	{
-		if(!$table)
-		{
-			return 'id';
-		}
+    public static function findPrimaryKey($table)
+    {
+        if(!$table)
+        {
+            return 'id';
+        }
 		
-		$pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
-		if(!$pk) {
-		    return null;
-		}
-		return $pk->getColumns()[0];	
-	}
+        $pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
+        if(!$pk) {
+            return null;
+        }
+        return $pk->getColumns()[0];	
+    }
 
     public static function newId($table)
     {

src/controllers/CBController.php

Braces +7 added lines, -4 removed lines

@@ -363,7 +363,7 @@ 
                     $columns_table[$index]['type_data'] = CRUDBooster::getFieldType($table, $field);
                     $columns_table[$index]['field'] = $table.'_'.$field;
                     $columns_table[$index]['field_raw'] = $table.'.'.$field;
-                }else{
+                } else{
                     $result->addselect($table.'.'.$field);
                     $columns_table[$index]['type_data'] = CRUDBooster::getFieldType($table, $field);
                     $columns_table[$index]['field'] = $field;
@@ -1154,8 +1154,9 @@ 
         $lastInsertId = $id = DB::table($this->table)->insertGetId($this->arr);
         
         //fix bug if primary key is uuid
-        if($this->arr[$this->primary_key]!=$id)
-            $id = $this->arr[$this->primary_key];
+        if($this->arr[$this->primary_key]!=$id) {
+                    $id = $this->arr[$this->primary_key];
+        }
         
         //Looping Data Input Again After Insert
         foreach ($this->data_inputan as $ro) {
@@ -1350,7 +1351,9 @@ 
                 }
                 if ($ro['relationship_table'] && $ro["datatable_orig"] != "") {
                     $params = explode("|", $ro['datatable_orig']);
-                    if(!isset($params[2])) $params[2] = "id";
+                    if(!isset($params[2])) {
+                        $params[2] = "id";
+                    }
                     DB::table($params[0])->where($params[2], $id)->update([$params[1] => implode(",",$inputdata)]);
                 }
             }

src/views/module_generator/step3.blade.php

Braces +10 added lines, -4 removed lines

@@ -502,22 +502,28 @@
 
                                     </div>
 
-                                    <?php else:?>
+                                    <?php else {
+    :?>
 
                                     <div class="form-group">
                                         <label>{{$key}}</label>
                                         <input type="text" name="option[{{$index}}][{{$key}}]" placeholder="{{$val->placeholder}}" value="{{$value}}"
                                                class="form-control">
                                     </div>
-                                    <?php endif;?>
-                                    <?php else:?>
+                                    <?php endif;
+}
+?>
+                                    <?php else {
+    :?>
 
                                     <div class="form-group">
                                         <label>{{$key}}</label>
                                         <input type="text" name="option[{{$index}}][{{$key}}]" placeholder="{{$val}}" value="{{$value}}" class="form-control">
                                     </div>
 
-                                    <?php endif;?>
+                                    <?php endif;
+}
+?>
                                     <?php endforeach; endif;?>
 
 

src/localization/ru/crudbooster.php

Indentation +1 added lines, -1 removed lines

@@ -268,5 +268,5 @@
     'please_complete_the_form' =>'Пожалуйста заполните форму !',
     'this_field_is_required'   =>'Это поле обязательное',
     'text_form'                => 'Форма',
-     "your_file_extension_is_not_allowed "=>"Тип фашего файла не поддерживается !",
+        "your_file_extension_is_not_allowed "=>"Тип фашего файла не поддерживается !",
 ];

src/controllers/ApiController.php

Braces +5 added lines, -3 removed lines

@@ -591,7 +591,7 @@ 
                 try{
                     $id = DB::table($table)->insertGetId($row_assign);
                     DB::commit();
-                }catch (\Exception $e)
+                } catch (\Exception $e)
                 {
                     DB::rollBack();
                     throw new \Exception($e->getMessage());
@@ -658,11 +658,13 @@ 
         }
 
         $this->hook_after($posts, $result);
-        if($this->output) return response()->json($this->output);
+        if($this->output) {
+            return response()->json($this->output);
+        }
 
         if($output == 'JSON') {
             return response()->json($result, 200);    
-        }else{
+        } else{
             return $result;
         }        
     }