crocodic-studio / crudbooster

src/assets/assets/edit_area/edit_area_compressor.php

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

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

Spacing +1 added lines, -1 removed lines

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

src/validations/validation.php

Spacing +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <?php 
 
-\Validator::extend('alpha_spaces', function ($attribute, $value) {
+\Validator::extend('alpha_spaces', function($attribute, $value) {
     // This will only accept alpha and spaces. 
     // If you want to accept hyphens use: /^[\pL\s-]+$/u.
     return preg_match('/^[\pL\s]+$/u', $value); 
 },'The :attribute should be letters and spaces only');
 
-\Validator::extend('alpha_num_spaces', function ($attribute, $value) {
+\Validator::extend('alpha_num_spaces', function($attribute, $value) {
     // This will only accept alphanumeric and spaces. 
     return preg_match('/^[a-zA-Z0-9\s]+$/', $value); 
 },'The :attribute should be alphanumeric characters and spaces only');
\ No newline at end of file

src/helpers/CRUDBooster.php

Spacing +27 added lines, -27 removed lines

@@ -26,7 +26,7 @@ 
     
     public static function uploadBase64($value, $id = null)
     {
-        if (! self::myId()) {
+        if (!self::myId()) {
             $userID = 0;
         } else {
             $userID = self::myId();
@@ -56,7 +56,7 @@ 
     public static function uploadFile($name, $encrypt = false, $resize_width = null, $resize_height = null, $id = null)
     {
         if (Request::hasFile($name)) {
-            if (! self::myId()) {
+            if (!self::myId()) {
                 $userID = 0;
             } else {
                 $userID = self::myId();
@@ -110,22 +110,22 @@ 
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
                 $img->fit($resize_width, $resize_height);
                 $img->save(storage_path('app/'.$file_path.'/'.$filename), $qty);
-            } elseif ($resize_width && ! $resize_height) {
+            } elseif ($resize_width && !$resize_height) {
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
-                $img->resize($resize_width, null, function ($constraint) {
+                $img->resize($resize_width, null, function($constraint) {
                     $constraint->aspectRatio();
                 });
                 $img->save(storage_path('app/'.$file_path.'/'.$filename), $qty);
-            } elseif (! $resize_width && $resize_height) {
+            } elseif (!$resize_width && $resize_height) {
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
-                $img->resize(null, $resize_height, function ($constraint) {
+                $img->resize(null, $resize_height, function($constraint) {
                     $constraint->aspectRatio();
                 });
                 $img->save(storage_path('app/'.$file_path.'/'.$filename), $qty);
             } else {
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
                 if ($img->width() > 1300) {
-                    $img->resize(1300, null, function ($constraint) {
+                    $img->resize(1300, null, function($constraint) {
                         $constraint->aspectRatio();
                     });
                 }
@@ -153,7 +153,7 @@ 
     public static function insert($table, $data = [])
     {
         $data['id'] = DB::table($table)->max('id') + 1;
-        if (! $data['created_at']) {
+        if (!$data['created_at']) {
             if (Schema::hasColumn($table, 'created_at')) {
                 $data['created_at'] = date('Y-m-d H:i:s');
             }
@@ -383,7 +383,7 @@ 
 	    $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; 
+	    return ($module) ?: $modulepath; 
 	}
     }
 
@@ -527,12 +527,12 @@ 
     public static function getModulePath()
     {
           // Check to position of admin_path
-          if(config("crudbooster.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;
+              foreach ($adminPathSegments as $path) {
+                  if ($path == config("crudbooster.ADMIN_PATH")) {
+                      $segment = $no + 1;
                       break;
                   }
                   $no++;
@@ -570,7 +570,7 @@ 
     {
         $id = Session::get('current_row_id');
         $id = intval($id);
-        $id = (! $id) ? Request::segment(4) : $id;
+        $id = (!$id) ? Request::segment(4) : $id;
         $id = intval($id);
 
         return $id;
@@ -619,7 +619,7 @@ 
             return Cache::get('field_type_'.$table.'_'.$field);
         }
 
-        $typedata = Cache::rememberForever('field_type_'.$table.'_'.$field, function () use ($table, $field) {
+        $typedata = Cache::rememberForever('field_type_'.$table.'_'.$field, function() use ($table, $field) {
 
             try {
                 //MySQL & SQL Server
@@ -628,7 +628,7 @@ 
 
             }
 
-            if (! $typedata) {
+            if (!$typedata) {
                 $typedata = 'varchar';
             }
 
@@ -705,7 +705,7 @@ 
             }
         }
 
-        if (! $full) {
+        if (!$full) {
             $string = array_slice($string, 0, 1);
         }
 
@@ -728,7 +728,7 @@ 
         $cc_email = $queue->email_cc_email;
         $attachments = unserialize($queue->email_attachments);
 
-        \Mail::send("crudbooster::emails.blank", ['content' => $html], function ($message) use (
+        \Mail::send("crudbooster::emails.blank", ['content' => $html], function($message) use (
             $html,
             $to,
             $subject,
@@ -790,7 +790,7 @@ 
             return true;
         }
 
-        \Mail::send("crudbooster::emails.blank", ['content' => $html], function ($message) use ($to, $subject, $template, $attachments) {
+        \Mail::send("crudbooster::emails.blank", ['content' => $html], function($message) use ($to, $subject, $template, $attachments) {
             $message->priority(1);
             $message->to($to);
 
@@ -939,13 +939,13 @@ 
 
 	public static function findPrimaryKey($table)
 	{
-		if(!$table)
+		if (!$table)
 		{
 			return 'id';
 		}
 		
 		$pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
-		if(!$pk) {
+		if (!$pk) {
 		    return null;
 		}
 		return $pk->getColumns()[0];	
@@ -962,10 +962,10 @@ 
     public static function isColumnExists($table, $field)
     {
 
-        if (! $table) {
+        if (!$table) {
             throw new Exception("\$table is empty !", 1);
         }
-        if (! $field) {
+        if (!$field) {
             throw new Exception("\$field is empty !", 1);
         }
 
@@ -1191,8 +1191,8 @@ 
 
             $sender_token = Request::header('X-Authorization-Token');
 
-            if (! Cache::has($sender_token)) {
-                if (! in_array($sender_token, $server_token)) {
+            if (!Cache::has($sender_token)) {
+                if (!in_array($sender_token, $server_token)) {
                     $result['api_status'] = false;
                     $result['api_message'] = "THE TOKEN IS NOT MATCH WITH SERVER TOKEN";
                     $res = response()->json($result, 200);
@@ -1239,7 +1239,7 @@ 
 
     public static function sendFCM($regID = [], $data)
     {
-        if (! $data['title'] || ! $data['content']) {
+        if (!$data['title'] || !$data['content']) {
             return 'title , content null !';
         }
 
@@ -1282,7 +1282,7 @@ 
         $cols = collect(DB::select('SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = :database AND TABLE_NAME = :table', [
             'database' => $table['database'],
             'table' => $table['table'],
-        ]))->map(function ($x) {
+        ]))->map(function($x) {
             return (array) $x;
         })->toArray();
 

src/middlewares/CBBackend.php

Spacing +3 added lines, -3 removed lines

@@ -29,14 +29,14 @@
 
             return redirect($url);
         }
-        if($request->url()==CRUDBooster::adminPath('')){
-            $menus=DB::table('cms_menus')->whereRaw("cms_menus.id IN (select id_cms_menus from cms_menus_privileges where id_cms_privileges = '".CRUDBooster::myPrivilegeId()."')")->where('is_dashboard', 1)->where('is_active', 1)->first();
+        if ($request->url() == CRUDBooster::adminPath('')) {
+            $menus = DB::table('cms_menus')->whereRaw("cms_menus.id IN (select id_cms_menus from cms_menus_privileges where id_cms_privileges = '".CRUDBooster::myPrivilegeId()."')")->where('is_dashboard', 1)->where('is_active', 1)->first();
             if ($menus) {
                 if ($menus->type == 'Statistic') {
                     return redirect()->action('\crocodicstudio\crudbooster\controllers\StatisticBuilderController@getDashboard');
                 } elseif ($menus->type == 'Module') {
                     $module = CRUDBooster::first('cms_moduls', ['path' => $menus->path]);
-                    return redirect()->action( $module->controller.'@getIndex');
+                    return redirect()->action($module->controller.'@getIndex');
                 } elseif ($menus->type == 'Route') {
                     $action = str_replace("Controller", "Controller@", $menus->path);
                     $action = str_replace(['Get', 'Post'], ['get', 'post'], $action);

src/routes.php

Spacing +7 added lines, -7 removed lines

@@ -3,7 +3,7 @@ 
 /* ROUTER FOR API GENERATOR */
 $namespace = '\crocodicstudio\crudbooster\controllers';
 
-Route::group(['middleware' => ['api', '\crocodicstudio\crudbooster\middlewares\CBAuthAPI'], 'namespace' => 'App\Http\Controllers'], function () {
+Route::group(['middleware' => ['api', '\crocodicstudio\crudbooster\middlewares\CBAuthAPI'], 'namespace' => 'App\Http\Controllers'], function() {
     //Router for custom api defeault
 
     $dir = scandir(base_path("app/Http/Controllers"));
@@ -20,14 +20,14 @@ 
 });
 
 /* ROUTER FOR UPLOADS */
-Route::group(['middleware' => ['web'], 'namespace' => $namespace], function () {
+Route::group(['middleware' => ['web'], 'namespace' => $namespace], function() {
     Route::get('api-documentation', ['uses' => 'ApiCustomController@apiDocumentation', 'as' => 'apiDocumentation']);
     Route::get('download-documentation-postman', ['uses' => 'ApiCustomController@getDownloadPostman', 'as' => 'downloadDocumentationPostman']);
     Route::get('uploads/{one?}/{two?}/{three?}/{four?}/{five?}', ['uses' => 'FileController@getPreview', 'as' => 'fileControllerPreview']);
 });
 
 /* ROUTER FOR WEB */
-Route::group(['middleware' => ['web'], 'prefix' => config('crudbooster.ADMIN_PATH'), 'namespace' => $namespace], function () {
+Route::group(['middleware' => ['web'], 'prefix' => config('crudbooster.ADMIN_PATH'), 'namespace' => $namespace], function() {
 
     Route::post('unlock-screen', ['uses' => 'AdminController@postUnlockScreen', 'as' => 'postUnlockScreen']);
     Route::get('lock-screen', ['uses' => 'AdminController@getLockscreen', 'as' => 'getLockScreen']);
@@ -45,9 +45,9 @@ 
     'middleware' => ['web', '\crocodicstudio\crudbooster\middlewares\CBBackend'],
     'prefix' => config('crudbooster.ADMIN_PATH'),
     'namespace' => 'App\Http\Controllers',
-], function () use ($namespace) {
+], function() use ($namespace) {
  
-    Route::get('/',function () {
+    Route::get('/', function() {
     });
     try {
         $moduls = DB::table('cms_moduls')->where('path', '!=', '')->where('controller', '!=', '')
@@ -65,12 +65,12 @@ 
     'middleware' => ['web', '\crocodicstudio\crudbooster\middlewares\CBBackend'],
     'prefix' => config('crudbooster.ADMIN_PATH'),
     'namespace' => $namespace,
-], function () {
+], function() {
 
     /* DO NOT EDIT THESE BELLOW LINES */
     if (Request::is(config('crudbooster.ADMIN_PATH'))) {
         $menus = DB::table('cms_menus')->where('is_dashboard', 1)->first();
-        if (! $menus) {
+        if (!$menus) {
             CRUDBooster::routeController('/', 'AdminController', $namespace = '\crocodicstudio\crudbooster\controllers');
         }
     }

src/controllers/MenusController.php

Spacing +2 added lines, -2 removed lines

@@ -240,7 +240,7 @@ 
         $this->cbLoader();
 
         $module = CRUDBooster::getCurrentModule();
-        if (! CRUDBooster::isView() && $this->global_privilege == false) {
+        if (!CRUDBooster::isView() && $this->global_privilege == false) {
             CRUDBooster::insertLog(trans('crudbooster.log_try_view', ['module' => $module->name]));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
         }
@@ -277,7 +277,7 @@ 
 
     public function hook_before_add(&$postdata)
     {
-        if (! $postdata['id_cms_privileges']) {
+        if (!$postdata['id_cms_privileges']) {
             $postdata['id_cms_privileges'] = CRUDBooster::myPrivilegeId();
         }
         $postdata['parent_id'] = 0;

src/controllers/CBController.php

Spacing +47 added lines, -47 removed lines

@@ -213,7 +213,7 @@ 
 
         $module = CRUDBooster::getCurrentModule();
 
-        if (! CRUDBooster::isView() && $this->global_privilege == false) {
+        if (!CRUDBooster::isView() && $this->global_privilege == false) {
             CRUDBooster::insertLog(trans('crudbooster.log_try_view', ['module' => $module->name]));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
         }
@@ -272,7 +272,7 @@ 
             $field = @$coltab['name'];
             $join_table_temp[] = $table;
 
-            if (! $field) {
+            if (!$field) {
                 continue;
             }
 
@@ -358,12 +358,12 @@ 
                 }
             } else {
 
-                if(isset($field_array[1])) {                    
+                if (isset($field_array[1])) {                    
                     $result->addselect($table.'.'.$field.' as '.$table.'_'.$field);
                     $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;
@@ -375,9 +375,9 @@ 
         }
 
         if (Request::get('q')) {
-            $result->where(function ($w) use ($columns_table, $request) {
+            $result->where(function($w) use ($columns_table, $request) {
                 foreach ($columns_table as $col) {
-                    if (! $col['field_with']) {
+                    if (!$col['field_with']) {
                         continue;
                     }
                     if ($col['is_subquery']) {
@@ -398,7 +398,7 @@ 
         if (Request::get('filter_column')) {
 
             $filter_column = Request::get('filter_column');
-            $result->where(function ($w) use ($filter_column, $fc) {
+            $result->where(function($w) use ($filter_column, $fc) {
                 foreach ($filter_column as $key => $fc) {
 
                     $value = @$fc['value'];
@@ -514,7 +514,7 @@ 
                 $addaction[] = [
                     'label' => $s['label'],
                     'icon' => $s['button_icon'],
-                    'url' => CRUDBooster::adminPath($s['path']).'?return_url='.urlencode(Request::fullUrl()).'&parent_table='.$table_parent.'&parent_columns='.$s['parent_columns'].'&parent_columns_alias='.$s['parent_columns_alias'].'&parent_id=['.(! isset($s['custom_parent_id']) ? "id" : $s['custom_parent_id']).']&foreign_key='.$s['foreign_key'].'&label='.urlencode($s['label']),
+                    'url' => CRUDBooster::adminPath($s['path']).'?return_url='.urlencode(Request::fullUrl()).'&parent_table='.$table_parent.'&parent_columns='.$s['parent_columns'].'&parent_columns_alias='.$s['parent_columns_alias'].'&parent_id=['.(!isset($s['custom_parent_id']) ? "id" : $s['custom_parent_id']).']&foreign_key='.$s['foreign_key'].'&label='.urlencode($s['label']),
                     'color' => $s['button_color'],
                     'showIf' => $s['showIf'],
                 ];
@@ -611,7 +611,7 @@ 
                 $button_action_style = $this->button_action_style;
                 $html_content[] = "<div class='button_action' style='text-align:right'>".view('crudbooster::components.action', compact('addaction', 'row', 'button_action_style', 'parent_field'))->render()."</div>";
 
-            endif;//button_table_action
+            endif; //button_table_action
 
             foreach ($html_content as $i => $v) {
                 $this->hook_row_index($i, $v);
@@ -661,18 +661,18 @@ 
                 return $pdf->stream($filename.'.pdf');
                 break;
             case 'xls':
-                Excel::create($filename, function ($excel) use ($response) {
+                Excel::create($filename, function($excel) use ($response) {
                     $excel->setTitle($filename)->setCreator("crudbooster.com")->setCompany(CRUDBooster::getSetting('appname'));
-                    $excel->sheet($filename, function ($sheet) use ($response) {
+                    $excel->sheet($filename, function($sheet) use ($response) {
                         $sheet->setOrientation($paperorientation);
                         $sheet->loadview('crudbooster::export', $response);
                     });
                 })->export('xls');
                 break;
             case 'csv':
-                Excel::create($filename, function ($excel) use ($response) {
+                Excel::create($filename, function($excel) use ($response) {
                     $excel->setTitle($filename)->setCreator("crudbooster.com")->setCompany(CRUDBooster::getSetting('appname'));
-                    $excel->sheet($filename, function ($sheet) use ($response) {
+                    $excel->sheet($filename, function($sheet) use ($response) {
                         $sheet->setOrientation($paperorientation);
                         $sheet->loadview('crudbooster::export', $response);
                     });
@@ -724,7 +724,7 @@ 
         $result = DB::table($table);
 
         if (Request::get('q')) {
-            $result->where(function ($where) use ($columns) {
+            $result->where(function($where) use ($columns) {
                 foreach ($columns as $c => $col) {
                     if ($c == 0) {
                         $where->where($col, 'like', '%'.Request::get('q').'%');
@@ -863,7 +863,7 @@ 
             $ai = [];
             $name = $di['name'];
 
-            if (! isset($request_all[$name])) {
+            if (!isset($request_all[$name])) {
                 continue;
             }
 
@@ -895,7 +895,7 @@ 
                 $ai[] = 'mimes:'.$di['mimes'];
             }
             $name = $di['name'];
-            if (! $name) {
+            if (!$name) {
                 continue;
             }
 
@@ -997,7 +997,7 @@ 
         foreach ($this->data_inputan as $ro) {
             $name = $ro['name'];
 
-            if (! $name) {
+            if (!$name) {
                 continue;
             }
 
@@ -1047,7 +1047,7 @@ 
 
             $password_candidate = explode(',', config('crudbooster.PASSWORD_FIELDS_CANDIDATE'));
             if (in_array($name, $password_candidate)) {
-                if (! empty($this->arr[$name])) {
+                if (!empty($this->arr[$name])) {
                     $this->arr[$name] = Hash::make($this->arr[$name]);
                 } else {
                     unset($this->arr[$name]);
@@ -1073,7 +1073,7 @@ 
             if ($ro['type'] == 'multitext') {
                 $name = $ro['name'];
                 $multitext = "";
-                $maxI = ($this->arr[$name])?count($this->arr[$name]):0;
+                $maxI = ($this->arr[$name]) ?count($this->arr[$name]) : 0;
                 for ($i = 0; $i <= $maxI - 1; $i++) {
                     $multitext .= $this->arr[$name][$i]."|";
                 }
@@ -1102,7 +1102,7 @@ 
 
                 $this->arr[$name] = CRUDBooster::uploadFile($name, $ro['encrypt'] || $ro['upload_encrypt'], $ro['resize_width'], $ro['resize_height'], CB::myId());
 
-                if (! $this->arr[$name]) {
+                if (!$this->arr[$name]) {
                     $this->arr[$name] = Request::get('_'.$name);
                 }
             }
@@ -1118,7 +1118,7 @@ 
     public function getAdd()
     {
         $this->cbLoader();
-        if (! CRUDBooster::isCreate() && $this->global_privilege == false || $this->button_add == false) {
+        if (!CRUDBooster::isCreate() && $this->global_privilege == false || $this->button_add == false) {
             CRUDBooster::insertLog(trans('crudbooster.log_try_add', ['module' => CRUDBooster::getCurrentModule()->name]));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans("crudbooster.denied_access"));
         }
@@ -1133,7 +1133,7 @@ 
     public function postAddSave()
     {
         $this->cbLoader();
-        if (! CRUDBooster::isCreate() && $this->global_privilege == false) {
+        if (!CRUDBooster::isCreate() && $this->global_privilege == false) {
             CRUDBooster::insertLog(trans('crudbooster.log_try_add_save', [
                 'name' => Request::input($this->title_field),
                 'module' => CRUDBooster::getCurrentModule()->name,
@@ -1154,13 +1154,13 @@ 
         $lastInsertId = $id = DB::table($this->table)->insertGetId($this->arr);
         
         //fix bug if primary key is uuid
-        if($this->arr[$this->primary_key]!=$id)
+        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) {
             $name = $ro['name'];
-            if (! $name) {
+            if (!$name) {
                 continue;
             }
 
@@ -1211,7 +1211,7 @@ 
                 $name = str_slug($ro['label'], '');
                 $columns = $ro['columns'];
                 $getColName = Request::get($name.'-'.$columns[0]['name']);
-                $count_input_data = ($getColName)?(count($getColName) - 1):0;
+                $count_input_data = ($getColName) ? (count($getColName) - 1) : 0;
                 $child_array = [];
                 $fk = $ro['foreign_key'];
 
@@ -1220,11 +1220,11 @@ 
                     foreach ($columns as $col) {
                         $colname = $col['name'];
                         $colvalue = Request::get($name.'-'.$colname)[$i];
-                        if(isset($colvalue) === TRUE) {
+                        if (isset($colvalue) === TRUE) {
                             $column_data[$colname] = $colvalue;
                         }
                     }
-                    if(isset($column_data) === TRUE) {
+                    if (isset($column_data) === TRUE) {
                         $column_data[$fk] = (!empty($id) ? $id : $lastInsertId);
                         $child_array[] = $column_data;
                     }
@@ -1262,7 +1262,7 @@ 
         $this->cbLoader();
         $row = DB::table($this->table)->where($this->primary_key, $id)->first();
 
-        if (! CRUDBooster::isRead() && $this->global_privilege == false || $this->button_edit == false) {
+        if (!CRUDBooster::isRead() && $this->global_privilege == false || $this->button_edit == false) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_edit", [
                 'name' => $row->{$this->title_field},
                 'module' => CRUDBooster::getCurrentModule()->name,
@@ -1283,7 +1283,7 @@ 
         $this->cbLoader();
         $row = DB::table($this->table)->where($this->primary_key, $id)->first();
 
-        if (! CRUDBooster::isUpdate() && $this->global_privilege == false) {
+        if (!CRUDBooster::isUpdate() && $this->global_privilege == false) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_add", ['name' => $row->{$this->title_field}, 'module' => CRUDBooster::getCurrentModule()->name]));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
         }
@@ -1301,7 +1301,7 @@ 
         //Looping Data Input Again After Insert
         foreach ($this->data_inputan as $ro) {
             $name = $ro['name'];
-            if (! $name) {
+            if (!$name) {
                 continue;
             }
 
@@ -1350,8 +1350,8 @@ 
                 }
                 if ($ro['relationship_table'] && $ro["datatable_orig"] != "") {
                     $params = explode("|", $ro['datatable_orig']);
-                    if(!isset($params[2])) $params[2] = "id";
-                    DB::table($params[0])->where($params[2], $id)->update([$params[1] => implode(",",$inputdata)]);
+                    if (!isset($params[2])) $params[2] = "id";
+                    DB::table($params[0])->where($params[2], $id)->update([$params[1] => implode(",", $inputdata)]);
                 }
             }
 
@@ -1359,7 +1359,7 @@ 
                 $name = str_slug($ro['label'], '');
                 $columns = $ro['columns'];
                 $getColName = Request::get($name.'-'.$columns[0]['name']);
-                $count_input_data = ($getColName)?(count($getColName) - 1):0;
+                $count_input_data = ($getColName) ? (count($getColName) - 1) : 0;
                 $child_array = [];
                 $childtable = CRUDBooster::parseSqlTable($ro['table'])['table'];
                 $fk = $ro['foreign_key'];
@@ -1373,11 +1373,11 @@ 
                     foreach ($columns as $col) {
                         $colname = $col['name'];
                         $colvalue = Request::get($name.'-'.$colname)[$i];
-                        if(isset($colvalue) === TRUE) {
+                        if (isset($colvalue) === TRUE) {
                             $column_data[$colname] = $colvalue;
                         }
                     }
-                    if(isset($column_data) === TRUE){
+                    if (isset($column_data) === TRUE) {
                         $column_data[$childtablePK] = $lastId;
                         $column_data[$fk] = $id;
                         $child_array[] = $column_data;
@@ -1416,7 +1416,7 @@ 
         $this->cbLoader();
         $row = DB::table($this->table)->where($this->primary_key, $id)->first();
 
-        if (! CRUDBooster::isDelete() && $this->global_privilege == false || $this->button_delete == false) {
+        if (!CRUDBooster::isDelete() && $this->global_privilege == false || $this->button_delete == false) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_delete", [
                 'name' => $row->{$this->title_field},
                 'module' => CRUDBooster::getCurrentModule()->name,
@@ -1447,7 +1447,7 @@ 
         $this->cbLoader();
         $row = DB::table($this->table)->where($this->primary_key, $id)->first();
 
-        if (! CRUDBooster::isRead() && $this->global_privilege == false || $this->button_detail == false) {
+        if (!CRUDBooster::isRead() && $this->global_privilege == false || $this->button_detail == false) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_view", [
                 'name' => $row->{$this->title_field},
                 'module' => CRUDBooster::getCurrentModule()->name,
@@ -1472,13 +1472,13 @@ 
         $data['page_menu'] = Route::getCurrentRoute()->getActionName();
         $data['page_title'] = 'Import Data '.$module->name;
 
-        if (Request::get('file') && ! Request::get('import')) {
+        if (Request::get('file') && !Request::get('import')) {
             $file = base64_decode(Request::get('file'));
             $file = storage_path('app/'.$file);
-            $rows = Excel::load($file, function ($reader) {
+            $rows = Excel::load($file, function($reader) {
             })->get();
             
-            $countRows = ($rows)?count($rows):0;
+            $countRows = ($rows) ?count($rows) : 0;
             
             Session::put('total_data_import', $countRows);
 
@@ -1536,7 +1536,7 @@ 
         $file = base64_decode(Request::get('file'));
         $file = storage_path('app/'.$file);
 
-        $rows = Excel::load($file, function ($reader) {
+        $rows = Excel::load($file, function($reader) {
         })->get();
 
         $has_created_at = false;
@@ -1564,7 +1564,7 @@ 
                         $relation_moduls = DB::table('cms_moduls')->where('table_name', $relation_table)->first();
 
                         $relation_class = __NAMESPACE__.'\\'.$relation_moduls->controller;
-                        if (! class_exists($relation_class)) {
+                        if (!class_exists($relation_class)) {
                             $relation_class = '\App\Http\Controllers\\'.$relation_moduls->controller;
                         }
                         $relation_class = new $relation_class;
@@ -1671,12 +1671,12 @@ 
         $id_selected = Request::input('checkbox');
         $button_name = Request::input('button_name');
 
-        if (! $id_selected) {
+        if (!$id_selected) {
             CRUDBooster::redirect($_SERVER['HTTP_REFERER'], trans("crudbooster.alert_select_a_data"), 'warning');
         }
 
         if ($button_name == 'delete') {
-            if (! CRUDBooster::isDelete()) {
+            if (!CRUDBooster::isDelete()) {
                 CRUDBooster::insertLog(trans("crudbooster.log_try_delete_selected", ['module' => CRUDBooster::getCurrentModule()->name]));
                 CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
             }
@@ -1704,8 +1704,8 @@ 
         $message = trans("crudbooster.alert_action", ['action' => $action]);
 
         if ($this->actionButtonSelected($id_selected, $button_name) === false) {
-            $message = ! empty($this->alert['message']) ? $this->alert['message'] : 'Error';
-            $type = ! empty($this->alert['type']) ? $this->alert['type'] : 'danger';
+            $message = !empty($this->alert['message']) ? $this->alert['message'] : 'Error';
+            $type = !empty($this->alert['type']) ? $this->alert['type'] : 'danger';
         }
 
         return redirect()->back()->with(['message_type' => $type, 'message' => $message]);
@@ -1719,7 +1719,7 @@ 
 
         $row = DB::table($this->table)->where($this->primary_key, $id)->first();
 
-        if (! CRUDBooster::isDelete() && $this->global_privilege == false) {
+        if (!CRUDBooster::isDelete() && $this->global_privilege == false) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_delete_image", [
                 'name' => $row->{$this->title_field},
                 'module' => CRUDBooster::getCurrentModule()->name,

src/controllers/StatisticBuilderController.php

Spacing +4 added lines, -4 removed lines

@@ -65,7 +65,7 @@ 
     {
         $this->cbLoader();
 
-        $menus= DB::table('cms_menus')->whereRaw("cms_menus.id IN (select id_cms_menus from cms_menus_privileges where id_cms_privileges = '".CRUDBooster::myPrivilegeId()."')")->where('is_dashboard', 1)->where('is_active', 1)->first();
+        $menus = DB::table('cms_menus')->whereRaw("cms_menus.id IN (select id_cms_menus from cms_menus_privileges where id_cms_privileges = '".CRUDBooster::myPrivilegeId()."')")->where('is_dashboard', 1)->where('is_active', 1)->first();
 
         $slug = str_replace("statistic_builder/show/", "", $menus->path);
 
@@ -90,7 +90,7 @@ 
     {
         $this->cbLoader();
 
-        if (! CRUDBooster::isSuperadmin()) {
+        if (!CRUDBooster::isSuperadmin()) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_view", ['name' => 'Builder', 'module' => 'Statistic']));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
         }
@@ -170,7 +170,7 @@ 
     {
         $this->cbLoader();
 
-        if (! CRUDBooster::isSuperadmin()) {
+        if (!CRUDBooster::isSuperadmin()) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_view", ['name' => 'Edit Component', 'module' => 'Statistic']));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
         }
@@ -196,7 +196,7 @@ 
 
     public function getDeleteComponent($id)
     {
-        if (! CRUDBooster::isSuperadmin()) {
+        if (!CRUDBooster::isSuperadmin()) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_view", ['name' => 'Delete Component', 'module' => 'Statistic']));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
         }