xpressengine / xe-core

classes/frontendfile/FrontEndFileHandler.class.php

Spacing +52 added lines, -52 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	function isSsl()
 	{
-		if(!is_null(self::$isSSL))
+		if (!is_null(self::$isSSL))
 		{
 			return self::$isSSL;
 		}
@@ -88,30 +88,30 @@ 
 	 * */
 	function loadFile($args)
 	{
-		if(!is_array($args))
+		if (!is_array($args))
 		{
 			$args = array($args);
 		}
 		$file = $this->getFileInfo($args[0], $args[2], $args[1]);
 
 		$availableExtension = array('css' => 1, 'js' => 1);
-		if(!isset($availableExtension[$file->fileExtension]))
+		if (!isset($availableExtension[$file->fileExtension]))
 		{
 			return;
 		}
 
 		$file->index = (int) $args[3];
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
 			$map = &$this->cssMap;
 			$mapIndex = &$this->cssMapIndex;
 
 			$this->_arrangeCssIndex($pathInfo['dirname'], $file);
 		}
-		else if($file->fileExtension == 'js')
+		else if ($file->fileExtension == 'js')
 		{
-			if($args[1] == 'body')
+			if ($args[1] == 'body')
 			{
 				$map = &$this->jsBodyMap;
 				$mapIndex = &$this->jsBodyMapIndex;
@@ -124,7 +124,7 @@ 
 		}
 
 		(is_null($file->index)) ? $file->index = 0 : $file->index = $file->index;
-		if(!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)
+		if (!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)
 		{
 			$this->unloadFile($args[0], $args[2], $args[1]);
 			$map[$file->index][$file->key] = $file;
@@ -144,14 +144,14 @@ 
 	{
 		static $existsInfo = array();
 
-		if(isset($existsInfo[$existsKey]))
+		if (isset($existsInfo[$existsKey]))
 		{
 			return $existsInfo[$existsKey];
 		}
 
 		$fileName = preg_replace('/(?:[\/]{3,})(.*)/', '//$1', $fileName);
 		$url_info = parse_url($fileName);
-		$pathInfo = pathinfo(str_replace('?' . $url_info['query'], '', $fileName));
+		$pathInfo = pathinfo(str_replace('?'.$url_info['query'], '', $fileName));
 
 		$file = new stdClass();
 		$file->fileName = basename($url_info['path']);
@@ -164,14 +164,14 @@ 
 		$file->keyName = implode('.', array($file->fileNameNoExt, $file->fileExtension));
 		$file->cdnPath = $this->_normalizeFilePath($pathInfo['dirname']);
 
-		if(!$file->external)
+		if (!$file->external)
 		{
-			if(!__DEBUG__ && __XE_VERSION_STABLE__)
+			if (!__DEBUG__ && __XE_VERSION_STABLE__)
 			{
 				// if no debug mode, load minifed file
 				$minifiedFileName = implode('.', array($file->fileNameNoExt, 'min', $file->fileExtension));
 				$minifiedRealPath = implode('/', array($file->fileRealPath, $minifiedFileName));
-				if(file_exists($minifiedRealPath))
+				if (file_exists($minifiedRealPath))
 				{
 					$file->fileName = $minifiedFileName;
 				}
@@ -179,7 +179,7 @@ 
 			else
 			{
 				// Remove .min
-				if(file_exists(implode('/', array($file->fileRealPath, $file->keyName))))
+				if (file_exists(implode('/', array($file->fileRealPath, $file->keyName))))
 				{
 					$file->fileName = $file->keyName;
 				}
@@ -188,18 +188,18 @@ 
 
 		$file->targetIe = $targetIe;
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
 			$file->media = $media;
-			if(!$file->media)
+			if (!$file->media)
 			{
 				$file->media = 'all';
 			}
-			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe . "\t" . $file->media;
+			$file->key = $file->filePath.$file->keyName."\t".$file->targetIe."\t".$file->media;
 		}
-		else if($file->fileExtension == 'js')
+		else if ($file->fileExtension == 'js')
 		{
-			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe;
+			$file->key = $file->filePath.$file->keyName."\t".$file->targetIe;
 		}
 
 		return $file;
@@ -217,9 +217,9 @@ 
 	{
 		$file = $this->getFileInfo($fileName, $targetIe, $media);
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
-			if(isset($this->cssMapIndex[$file->key]))
+			if (isset($this->cssMapIndex[$file->key]))
 			{
 				$index = $this->cssMapIndex[$file->key];
 				unset($this->cssMap[$index][$file->key], $this->cssMapIndex[$file->key]);
@@ -227,12 +227,12 @@ 
 		}
 		else
 		{
-			if(isset($this->jsHeadMapIndex[$file->key]))
+			if (isset($this->jsHeadMapIndex[$file->key]))
 			{
 				$index = $this->jsHeadMapIndex[$file->key];
 				unset($this->jsHeadMap[$index][$file->key], $this->jsHeadMapIndex[$file->key]);
 			}
-			if(isset($this->jsBodyMapIndex[$file->key]))
+			if (isset($this->jsBodyMapIndex[$file->key]))
 			{
 				$index = $this->jsBodyMapIndex[$file->key];
 				unset($this->jsBodyMap[$index][$file->key], $this->jsBodyMapIndex[$file->key]);
@@ -248,13 +248,13 @@ 
 	 */
 	function unloadAllFiles($type = 'all')
 	{
-		if($type == 'css' || $type == 'all')
+		if ($type == 'css' || $type == 'all')
 		{
 			$this->cssMap = array();
 			$this->cssMapIndex = array();
 		}
 
-		if($type == 'js' || $type == 'all')
+		if ($type == 'js' || $type == 'all')
 		{
 			$this->jsHeadMap = array();
 			$this->jsBodyMap = array();
@@ -276,23 +276,23 @@ 
 		$this->_sortMap($map, $mapIndex);
 
 		$result = array();
-		foreach($map as $indexedMap)
+		foreach ($map as $indexedMap)
 		{
-			foreach($indexedMap as $file)
+			foreach ($indexedMap as $file)
 			{
 				$query = '';
-				if(!$file->external && is_readable($file->cdnPath . '/' . $file->fileName))
+				if (!$file->external && is_readable($file->cdnPath.'/'.$file->fileName))
 				{
-					$query = date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName));
+					$query = date('YmdHis', filemtime($file->cdnPath.'/'.$file->fileName));
 				}
-				if($file->query)
+				if ($file->query)
 				{
-					if($query) $query .= '&';
+					if ($query) $query .= '&';
 					$query .= $file->query;
 				}
-				$query = ($query) ? '?' . $query : '';
+				$query = ($query) ? '?'.$query : '';
 
-				$fullFilePath = $file->filePath . '/' . $file->fileName . $query;
+				$fullFilePath = $file->filePath.'/'.$file->fileName.$query;
 				$result[] = array(
 					'file' => $fullFilePath,
 					'media' => $file->media,
@@ -312,7 +312,7 @@ 
 	 */
 	function getJsFileList($type = 'head')
 	{
-		if($type == 'head')
+		if ($type == 'head')
 		{
 			$map = &$this->jsHeadMap;
 			$mapIndex = &$this->jsHeadMapIndex;
@@ -326,23 +326,23 @@ 
 		$this->_sortMap($map, $mapIndex);
 
 		$result = array();
-		foreach($map as $indexedMap)
+		foreach ($map as $indexedMap)
 		{
-			foreach($indexedMap as $file)
+			foreach ($indexedMap as $file)
 			{
 				$query = '';
-				if(!$file->external && is_readable($file->cdnPath . '/' . $file->fileName))
+				if (!$file->external && is_readable($file->cdnPath.'/'.$file->fileName))
 				{
-					$query = date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName));
+					$query = date('YmdHis', filemtime($file->cdnPath.'/'.$file->fileName));
 				}
-				if($file->query)
+				if ($file->query)
 				{
-					if($query) $query .= '&';
+					if ($query) $query .= '&';
 					$query .= $file->query;
 				}
-				$query = ($query) ? '?' . $query : '';
+				$query = ($query) ? '?'.$query : '';
 
-				$fullFilePath = $file->filePath . '/' . $file->fileName . $query;
+				$fullFilePath = $file->filePath.'/'.$file->fileName.$query;
 				$result[] = array(
 					'file' => $fullFilePath,
 					'targetie' => $file->targetIe
@@ -373,18 +373,18 @@ 
 	 */
 	function _normalizeFilePath($path)
 	{
-		if(strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')
+		if (strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')
 		{
-			$path = './' . $path;
+			$path = './'.$path;
 		}
-		elseif(!strncmp($path, '//', 2))
+		elseif (!strncmp($path, '//', 2))
 		{
 			return preg_replace('#^//+#', '//', $path);
 		}
 
 		$path = preg_replace('@/\./|(?<!:)\/\/@', '/', $path);
 
-		while(strpos($path, '/../'))
+		while (strpos($path, '/../'))
 		{
 			$path = preg_replace('/\/([^\/]+)\/\.\.\//s', '/', $path, 1);
 		}
@@ -403,20 +403,20 @@ 
 		$path = $this->_normalizeFilePath($path);
 		$script_path = getScriptPath();
 
-		if(strpos($path, './') === 0)
+		if (strpos($path, './') === 0)
 		{
-			if($script_path == '/' || $script_path == '\\')
+			if ($script_path == '/' || $script_path == '\\')
 			{
-				$path = '/' . substr($path, 2);
+				$path = '/'.substr($path, 2);
 			}
 			else
 			{
-				$path = $script_path . substr($path, 2);
+				$path = $script_path.substr($path, 2);
 			}
 		}
-		else if(strpos($file, '../') === 0)
+		else if (strpos($file, '../') === 0)
 		{
-			$path = $this->_normalizeFilePath($script_path . $path);
+			$path = $this->_normalizeFilePath($script_path.$path);
 		}
 
 		return $path;
@@ -431,7 +431,7 @@ 
 	 */
 	function _arrangeCssIndex($dirName, &$file)
 	{
-		if($file->index !== 0)
+		if ($file->index !== 0)
 		{
 			return;
 		}