jenskooij / cloudcontrol

cloudcontrol/library/crypt/Crypt.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 				$output = '';
 				for ($i = 0; $i < $count; $i += 16) {
 					$random_state =
-						md5(microtime() . $random_state);
+						md5(microtime().$random_state);
 					$output .=
 						pack('H*', md5($random_state));
 				}

cloudcontrol/library/images/Image.php

Spacing +36 added lines, -36 removed lines

@@ -32,10 +32,10 @@ 
 					$imageContent = file_get_contents($imageContainer);
 					$this->_imageResource = imagecreatefromstring($imageContent);
 				}
-			} elseif(is_string($imageContainer)) {
+			} elseif (is_string($imageContainer)) {
 				$this->_imageResource = imagecreatefromstring($imageContainer);
 			} else {
-				throw new \Exception('Could not create image resource, accepted inputs are: "resource of type (gd)", path_to_image and "string". <br /><pre>' . var_export($imageContainer, true) . '</pre>');
+				throw new \Exception('Could not create image resource, accepted inputs are: "resource of type (gd)", path_to_image and "string". <br /><pre>'.var_export($imageContainer, true).'</pre>');
 			}
 		}
 		
@@ -55,10 +55,10 @@ 
 			
 			if ($mimeTypeConstantValue == IMAGETYPE_GIF) {
 				return imagegif($imageResource, $path);
-			} elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG)  {
+			} elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG) {
 				return imagejpeg($imageResource, $path, $quality);
 			} elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) {
-				return imagepng($imageResource, $path, (intval($quality / 10) -1));
+				return imagepng($imageResource, $path, (intval($quality / 10) - 1));
 			}
 			else {
 				throw new \Exception('Not a valid mimetypeconstant given see function documentation');
@@ -79,7 +79,7 @@ 
 			if (function_exists('exif_imagetype')) {
 				$exif = exif_imagetype($imagePath);
 			} else {
-				if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false ) {
+				if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false) {
 					$exif = $type;
 				} else {
 					$exif = false;
@@ -99,86 +99,86 @@ 
 		public function CreateImageFromBmp($p_sFile)
 		{
 			//    Load the image into a string 
-			$file    =    fopen($p_sFile,"rb"); 
-			$read    =    fread($file,10); 
-			while(!feof($file)&&($read<>"")) 
-				$read    .=    fread($file,1024); 
+			$file    = fopen($p_sFile, "rb"); 
+			$read    = fread($file, 10); 
+			while (!feof($file) && ($read <> "")) 
+				$read .= fread($file, 1024); 
 			
-			$temp    =    unpack("H*",$read); 
-			$hex    =    $temp[1]; 
-			$header    =    substr($hex,0,108);
-			$width=null;
-			$height=null;
+			$temp = unpack("H*", $read); 
+			$hex = $temp[1]; 
+			$header = substr($hex, 0, 108);
+			$width = null;
+			$height = null;
 			
 			//    Process the header 
 			//    Structure: http://www.fastgraph.com/help/bmp_header_format.html 
-			if (substr($header,0,4)=="424d") 
+			if (substr($header, 0, 4) == "424d") 
 			{ 
 				//    Cut it in parts of 2 bytes 
-				$header_parts    =    str_split($header,2); 
+				$header_parts = str_split($header, 2); 
 				
 				//    Get the width        4 bytes 
-				$width            =    hexdec($header_parts[19].$header_parts[18]); 
+				$width = hexdec($header_parts[19].$header_parts[18]); 
 				
 				//    Get the height        4 bytes 
-				$height            =    hexdec($header_parts[23].$header_parts[22]); 
+				$height = hexdec($header_parts[23].$header_parts[22]); 
 				
 				//    Unset the header params 
 				unset($header_parts); 
 			} 
 			
 			//    Define starting X and Y 
-			$x                =    0; 
-			$y                =    1; 
+			$x                = 0; 
+			$y                = 1; 
 			
 			//    Create newimage 
-			$image            =    imagecreatetruecolor($width,$height); 
+			$image            = imagecreatetruecolor($width, $height); 
 			
 			//    Grab the body from the image 
-			$body            =    substr($hex,108); 
+			$body = substr($hex, 108); 
 
 			//    Calculate if padding at the end-line is needed 
 			//    Divided by two to keep overview. 
 			//    1 byte = 2 HEX-chars 
-			$body_size        =    (strlen($body)/2); 
-			$header_size    =    ($width*$height); 
+			$body_size = (strlen($body) / 2); 
+			$header_size = ($width * $height); 
 
 			//    Use end-line padding? Only when needed 
-			$usePadding        =    ($body_size>($header_size*3)+4); 
+			$usePadding = ($body_size > ($header_size * 3) + 4); 
 			
 			//    Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption 
 			//    Calculate the next DWORD-position in the body 
-			for ($i=0;$i<$body_size;$i+=3) 
+			for ($i = 0; $i < $body_size; $i += 3) 
 			{ 
 				//    Calculate line-ending and padding 
-				if ($x>=$width) 
+				if ($x >= $width) 
 				{ 
 					//    If padding needed, ignore image-padding 
 					//    Shift i to the ending of the current 32-bit-block 
 					if ($usePadding) 
-						$i    +=    $width%4; 
+						$i += $width % 4; 
 					
 					//    Reset horizontal position 
-					$x    =    0; 
+					$x = 0; 
 					
 					//    Raise the height-position (bottom-up) 
 					$y++; 
 					
 					//    Reached the image-height? Break the for-loop 
-					if ($y>$height) 
+					if ($y > $height) 
 						break; 
 				} 
 				
 				//    Calculation of the RGB-pixel (defined as BGR in image-data) 
 				//    Define $i_pos as absolute position in the body 
-				$i_pos    =    $i*2; 
-				$r        =    hexdec($body[$i_pos+4].$body[$i_pos+5]); 
-				$g        =    hexdec($body[$i_pos+2].$body[$i_pos+3]); 
-				$b        =    hexdec($body[$i_pos].$body[$i_pos+1]); 
+				$i_pos    = $i * 2; 
+				$r        = hexdec($body[$i_pos + 4].$body[$i_pos + 5]); 
+				$g        = hexdec($body[$i_pos + 2].$body[$i_pos + 3]); 
+				$b        = hexdec($body[$i_pos].$body[$i_pos + 1]); 
 				
 				//    Calculate and draw the pixel 
-				$color    =    imagecolorallocate($image,$r,$g,$b); 
-				imagesetpixel($image,$x,$height-$y,$color); 
+				$color    = imagecolorallocate($image, $r, $g, $b); 
+				imagesetpixel($image, $x, $height - $y, $color); 
 				
 				//    Raise the horizontal position 
 				$x++; 

Braces +10 added lines, -8 removed lines

@@ -61,8 +61,7 @@ 
 				return imagejpeg($imageResource, $path, $quality);
 			} elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) {
 				return imagepng($imageResource, $path, (intval($quality / 10) -1));
-			}
-			else {
+			} else {
 				throw new \Exception('Not a valid mimetypeconstant given see function documentation');
 			}
 		}
@@ -103,8 +102,9 @@ 
 			//    Load the image into a string 
 			$file    =    fopen($p_sFile,"rb"); 
 			$read    =    fread($file,10); 
-			while(!feof($file)&&($read<>"")) 
-				$read    .=    fread($file,1024); 
+			while(!feof($file)&&($read<>"")) {
+							$read    .=    fread($file,1024);
+			}
 			
 			$temp    =    unpack("H*",$read); 
 			$hex    =    $temp[1]; 
@@ -157,8 +157,9 @@ 
 				{ 
 					//    If padding needed, ignore image-padding 
 					//    Shift i to the ending of the current 32-bit-block 
-					if ($usePadding) 
-						$i    +=    $width%4; 
+					if ($usePadding) {
+											$i    +=    $width%4;
+					}
 					
 					//    Reset horizontal position 
 					$x    =    0; 
@@ -167,8 +168,9 @@ 
 					$y++; 
 					
 					//    Reached the image-height? Break the for-loop 
-					if ($y>$height) 
-						break; 
+					if ($y>$height) {
+											break;
+					}
 				} 
 				
 				//    Calculation of the RGB-pixel (defined as BGR in image-data) 

cloudcontrol/templates/cms/documents/fieldTypes/Rich-Text.php

Spacing +3 added lines, -3 removed lines

@@ -6,12 +6,12 @@ 
 }
 ?>
 <div class="rte">
-	<div id="summernote_<?=str_replace(']', '-', str_replace('[','-', $fieldPrefix)) . $field->slug?>_rte_<?=$summernoteInstances?>" class="summernote"><?=isset($value) ? $value : '' ?></div>
+	<div id="summernote_<?=str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug?>_rte_<?=$summernoteInstances?>" class="summernote"><?=isset($value) ? $value : '' ?></div>
 </div>
 <textarea style="display:none;" id="summernote_<?=$field->slug?>_container_<?=$summernoteInstances?>" name="<?=$fieldPrefix?>[<?=$field->slug?>][]"></textarea>
 <script>
 	$(document).ready(function () {
-		$('#summernote_<?=str_replace(']', '-', str_replace('[','-', $fieldPrefix)) . $field->slug?>_rte_<?=$summernoteInstances?>').summernote({
+		$('#summernote_<?=str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug?>_rte_<?=$summernoteInstances?>').summernote({
 			height: 300,
 			toolbar: [
 				//[groupname, [button list]]
@@ -29,4 +29,4 @@ 
 if (!isset($GLOBALS['rteList'])) {
 	$GLOBALS['rteList'] = array();
 }
-$GLOBALS['rteList'][] = 'summernote_' . str_replace(']', '-', str_replace('[','-', $fieldPrefix)) . $field->slug . '_rte_' . $summernoteInstances ?>
+$GLOBALS['rteList'][] = 'summernote_'.str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug.'_rte_'.$summernoteInstances ?>

cloudcontrol/library/components/BaseComponent.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
 		 * @param array   $parameters
 		 * @param         $matchedSitemapItem
 		 */
-		public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem)
+		public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem)
 		{
 			$this->template = $template;
 			$this->request = $request;
@@ -67,7 +67,7 @@ 
 		 *
 		 * @throws \Exception
 		 */
-		public function render($application=null)
+		public function render($application = null)
 		{
 			$this->renderedContent = $this->renderTemplate($this->template, true, $application);
 		}
@@ -93,9 +93,9 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='', $obClean = true, $application=null)
+		public function renderTemplate($template = '', $obClean = true, $application = null)
 		{
-			$templatePath = __DIR__ . '/../../templates/' . $template . '.php';
+			$templatePath = __DIR__.'/../../templates/'.$template.'.php';
 			if (realpath($templatePath) !== false) {
 				if ($obClean) {
 					ob_clean();
@@ -112,7 +112,7 @@ 
 				return ob_get_contents();
 			} else {
 				if ($template !== null) { // If template is null, its a application component, which doesnt have a template
-					throw new \Exception('Couldnt find template ' . $templatePath);
+					throw new \Exception('Couldnt find template '.$templatePath);
 				}
 			}
 		}
@@ -127,7 +127,7 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function includeTemplate($template='', $parameters = array())
+		public function includeTemplate($template = '', $parameters = array())
 		{
 			if (is_array($parameters)) {
 				foreach ($parameters as $name => $value) {

cloudcontrol/library/components/LanguageComponent.php

Doc Comments +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
     /**
      * Detect if the language is switched manually
      *
-     * @param $request
+     * @param Request $request
      */
     private function checkLanguageSwitch($request)
     {

Indentation +118 added lines, -118 removed lines

@@ -7,124 +7,124 @@
 
 class LanguageComponent implements Component
 {
-    protected $request;
-    protected $parameters;
-
-    protected $defaultLanguage = 'en';
-    protected $acceptedLanguages = null;
-    protected $languageParameterName = 'language';
-    protected $forceRedirect = false;
-    protected $sessionValues;
-
-    /**
-     * Component constructor.
-     *
-     * @param                     $template
-     * @param Request $request
-     * @param                     $parameters
-     * @param                     $matchedSitemapItem
-     */
-    public function __construct($template, Request $request, $parameters, $matchedSitemapItem)
-    {
-        $this->parameters = (array) $parameters;
-        $this->checkParameters();
-
-        $lang = substr(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : $this->defaultLanguage, 0, 2);
-        $_SESSION['LanguageComponent']['detectedLanguage'] = $lang;
-
-        $this->checkLanguageSwitch($request);
-
-        if (!isset($_SESSION['LanguageComponent'][$this->languageParameterName])) {
-            $this->detectLanguage($lang, $request);
-        } else {
-            if ($this->forceRedirect === true) {
-                $this->detectLanguage($_SESSION['LanguageComponent'][$this->languageParameterName], $request);
-            }
-        }
-
-        $this->parameters[$this->languageParameterName] = $_SESSION['LanguageComponent'][$this->languageParameterName];
-    }
-
-    /**
-     * Checks to see if any parameters are given from the configuration in the CMS
-     */
-    private function checkParameters()
-    {
-        if (isset($this->parameters['defaultLanguage'])) {
-            $this->defaultLanguage = $this->parameters['defaultLanguage'];
-            unset($this->parameters['defaultLanguage']);
-        }
-        if (isset($this->parameters['acceptedLanguages'])) {
-            $this->acceptedLanguages = explode(',', $this->parameters['acceptedLanguages']);
-            unset($this->parameters['acceptedLanguages']);
-        }
-        if (isset($this->parameters['languageParameterName'])) {
-            $this->languageParameterName = $this->parameters['languageParameterName'];
-            unset($this->parameters['languageParameterName']);
-        }
-        if (isset($this->parameters['forceRedirect'])) {
-            $this->forceRedirect = (bool) $this->parameters['forceRedirect'];
-            unset($this->parameters['forceRedirect']);
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getParameters()
-    {
-        return $this->parameters;
-    }
-
-
-    /**
-     * Check if the found language is allowed and
-     * if an action is to be taken.
-     *
-     * @param $lang
-     * @param $request
-     */
-    private function detectLanguage($lang, $request)
-    {
-        $_SESSION['LanguageComponent'][$this->languageParameterName] = $this->defaultLanguage;
-
-        if ($this->acceptedLanguages === null) {
-            $_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
-        } else if (in_array($lang, $this->acceptedLanguages)) {
-            $_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
-        } else {
-            $lang = $this->defaultLanguage;
-        }
-
-        $this->sessionValues = $_SESSION['LanguageComponent'];
-
-        if ($this->forceRedirect === true) {
-            if (substr($request::$relativeUri, 0, 2) !== $lang ) {
-                if ($lang !== $this->defaultLanguage) {
-                    header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
-                    exit;
-                }
-            }
-        }
-    }
-
-    /**
-     * Detect if the language is switched manually
-     *
-     * @param $request
-     */
-    private function checkLanguageSwitch($request)
-    {
-        if (isset($request::$get['langSwitch'])) {
-            $this->forceRedirect = true;
-            $this->detectLanguage($request::$get['langSwitch'], $request);
-        }
-    }
-
-    /*
+	protected $request;
+	protected $parameters;
+
+	protected $defaultLanguage = 'en';
+	protected $acceptedLanguages = null;
+	protected $languageParameterName = 'language';
+	protected $forceRedirect = false;
+	protected $sessionValues;
+
+	/**
+	 * Component constructor.
+	 *
+	 * @param                     $template
+	 * @param Request $request
+	 * @param                     $parameters
+	 * @param                     $matchedSitemapItem
+	 */
+	public function __construct($template, Request $request, $parameters, $matchedSitemapItem)
+	{
+		$this->parameters = (array) $parameters;
+		$this->checkParameters();
+
+		$lang = substr(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : $this->defaultLanguage, 0, 2);
+		$_SESSION['LanguageComponent']['detectedLanguage'] = $lang;
+
+		$this->checkLanguageSwitch($request);
+
+		if (!isset($_SESSION['LanguageComponent'][$this->languageParameterName])) {
+			$this->detectLanguage($lang, $request);
+		} else {
+			if ($this->forceRedirect === true) {
+				$this->detectLanguage($_SESSION['LanguageComponent'][$this->languageParameterName], $request);
+			}
+		}
+
+		$this->parameters[$this->languageParameterName] = $_SESSION['LanguageComponent'][$this->languageParameterName];
+	}
+
+	/**
+	 * Checks to see if any parameters are given from the configuration in the CMS
+	 */
+	private function checkParameters()
+	{
+		if (isset($this->parameters['defaultLanguage'])) {
+			$this->defaultLanguage = $this->parameters['defaultLanguage'];
+			unset($this->parameters['defaultLanguage']);
+		}
+		if (isset($this->parameters['acceptedLanguages'])) {
+			$this->acceptedLanguages = explode(',', $this->parameters['acceptedLanguages']);
+			unset($this->parameters['acceptedLanguages']);
+		}
+		if (isset($this->parameters['languageParameterName'])) {
+			$this->languageParameterName = $this->parameters['languageParameterName'];
+			unset($this->parameters['languageParameterName']);
+		}
+		if (isset($this->parameters['forceRedirect'])) {
+			$this->forceRedirect = (bool) $this->parameters['forceRedirect'];
+			unset($this->parameters['forceRedirect']);
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getParameters()
+	{
+		return $this->parameters;
+	}
+
+
+	/**
+	 * Check if the found language is allowed and
+	 * if an action is to be taken.
+	 *
+	 * @param $lang
+	 * @param $request
+	 */
+	private function detectLanguage($lang, $request)
+	{
+		$_SESSION['LanguageComponent'][$this->languageParameterName] = $this->defaultLanguage;
+
+		if ($this->acceptedLanguages === null) {
+			$_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
+		} else if (in_array($lang, $this->acceptedLanguages)) {
+			$_SESSION['LanguageComponent'][$this->languageParameterName] = $lang;
+		} else {
+			$lang = $this->defaultLanguage;
+		}
+
+		$this->sessionValues = $_SESSION['LanguageComponent'];
+
+		if ($this->forceRedirect === true) {
+			if (substr($request::$relativeUri, 0, 2) !== $lang ) {
+				if ($lang !== $this->defaultLanguage) {
+					header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
+					exit;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Detect if the language is switched manually
+	 *
+	 * @param $request
+	 */
+	private function checkLanguageSwitch($request)
+	{
+		if (isset($request::$get['langSwitch'])) {
+			$this->forceRedirect = true;
+			$this->detectLanguage($request::$get['langSwitch'], $request);
+		}
+	}
+
+	/*
      * These functions are required by the interface, but not for the functionality
      */
-    public function run(Storage $storage) {}
-    public function render() {}
-    public function get() {}
+	public function run(Storage $storage) {}
+	public function render() {}
+	public function get() {}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -99,9 +99,9 @@
         $this->sessionValues = $_SESSION['LanguageComponent'];
 
         if ($this->forceRedirect === true) {
-            if (substr($request::$relativeUri, 0, 2) !== $lang ) {
+            if (substr($request::$relativeUri, 0, 2) !== $lang) {
                 if ($lang !== $this->defaultLanguage) {
-                    header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
+                    header('Location: '.$request::$subfolders.$lang.'/'.$request::$relativeUri);
                     exit;
                 }
             }

cloudcontrol/library/components/DocumentComponent.php

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
 			if (isset($this->parameters['document'])) {
 				$this->runByDocumentParameter();
 			} else {
-				throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: ' . $this->matchedSitemapItem->title);
+				throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: '.$this->matchedSitemapItem->title);
 			}
 		}
 
@@ -100,9 +100,9 @@ 
 				$relativeDocumentUri = current($this->matchedSitemapItem->matches[1]);
 				if (isset($this->parameters['folder'])) {
 					if (substr($this->parameters['folder'], -1) !== '/') {
-						$this->parameters['folder'] = $this->parameters['folder'] . '/';
+						$this->parameters['folder'] = $this->parameters['folder'].'/';
 					}
-					$relativeDocumentUri = $this->parameters['folder'] . $relativeDocumentUri;
+					$relativeDocumentUri = $this->parameters['folder'].$relativeDocumentUri;
 				}
 
 				$document = $this->storage->getDocumentBySlug($relativeDocumentUri);

cloudcontrol/templates/cms/documents/document-form.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.1/js/bootstrap.min.js"></script>
 <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" rel="stylesheet">
 <script>var smallestImage = '<?=$smallestImage?>';</script>
-<?$copyable=''?>
+<?$copyable = ''?>
 <section class="documents">
 	<h2><i class="fa fa-file-text-o"></i> Documents</h2>
 	<nav class="actions">
@@ -23,7 +23,7 @@ 
 			</div>
 		</li>
 	</ul>
-	<?include('document-form-form.php');?>
+	<?include('document-form-form.php'); ?>
 </section>
 
 <script>

cloudcontrol/library/images/ImageResizer.php

Spacing +18 added lines, -18 removed lines

@@ -43,7 +43,7 @@ 
 				}
 				return $returnFileNames;
 			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
+				throw new \Exception('Image doesnt exist: '.$imagePath);
 			}
 		}
 
@@ -54,10 +54,10 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function resize($imagePath='', $width='',$height='')
+		public function resize($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-r' . $width . 'x' . $height;
-			return $this->applyMethod('Resize', $imagePath, $width,$height, $modifier);
+			$modifier = '-r'.$width.'x'.$height;
+			return $this->applyMethod('Resize', $imagePath, $width, $height, $modifier);
 		}
 
 		/**
@@ -67,10 +67,10 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function smartcrop($imagePath='', $width='',$height='')
+		public function smartcrop($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-s' . $width . 'x' . $height;
-			return $this->applyMethod('SmartCrop', $imagePath, $width,$height, $modifier);
+			$modifier = '-s'.$width.'x'.$height;
+			return $this->applyMethod('SmartCrop', $imagePath, $width, $height, $modifier);
 		}
 
 		/**
@@ -80,10 +80,10 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function boxcrop($imagePath='', $width='',$height='')
+		public function boxcrop($imagePath = '', $width = '', $height = '')
 		{
-			$modifier = '-b' . $width . 'x' . $height;
-			return $this->applyMethod('BoxCrop', $imagePath, $width,$height, $modifier);
+			$modifier = '-b'.$width.'x'.$height;
+			return $this->applyMethod('BoxCrop', $imagePath, $width, $height, $modifier);
 		}
 
 		/**
@@ -92,7 +92,7 @@ 
 		 *
 		 * @return string
 		 */
-		private function modifyName($imagePath, $modifier='')
+		private function modifyName($imagePath, $modifier = '')
 		{
 			$filename = basename($imagePath);
 			$path = dirname($imagePath);
@@ -102,30 +102,30 @@ 
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension = slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . $modifier  . '.' . $extension;
+				$filename = $fileNameWithoutExtension.$modifier.'.'.$extension;
 			} else {
 				$filename = slugify($filename);
 			}
 
-			if (file_exists($path . '/' . $filename)) {
+			if (file_exists($path.'/'.$filename)) {
 				$fileParts = explode('.', $filename);
 				if (count($fileParts) > 1) {
 					$extension = end($fileParts);
 					array_pop($fileParts);
 					$fileNameWithoutExtension = implode('-', $fileParts);
 					$fileNameWithoutExtension .= '-copy';
-					$filename = $fileNameWithoutExtension . '.' . $extension;
+					$filename = $fileNameWithoutExtension.'.'.$extension;
 				} else {
 					$filename .= '-copy';
 				}
-				return $this->modifyName($path . '/' . $filename);
+				return $this->modifyName($path.'/'.$filename);
 			}
-			return $path . '/' . $filename;
+			return $path.'/'.$filename;
 		}
 
 		private function applyMethod($method, $imagePath, $width, $height, $modifier)
 		{
-			$method = 'library\\images\\methods\\' . $method;
+			$method = 'library\\images\\methods\\'.$method;
 			$destination = $this->modifyName($imagePath, $modifier);
 			if (file_exists($imagePath)) {
 				$image = new Image();
@@ -139,7 +139,7 @@ 
 				$resizedImage->SaveImage($destination, $resizedImage->GetImageMimeType($imagePath), 80);
 				return basename($destination);
 			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
+				throw new \Exception('Image doesnt exist: '.$imagePath);
 			}
 		}
 	}

cloudcontrol/library/cc/cc.php

Doc Comments +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
  * @param array  $replace
  * @param string $delimiter
  *
- * @return mixed|string
+ * @return string
  */
 function slugify($str, $replace=array(), $delimiter='-') {
 	if( !empty($replace) ) {

Spacing +17 added lines, -17 removed lines

@@ -38,14 +38,14 @@ 
 		return '0 seconds';
 	}
 
-	$a = array( 365 * 24 * 60 * 60  =>  'year',
+	$a = array(365 * 24 * 60 * 60  =>  'year',
 				30 * 24 * 60 * 60  =>  'month',
 				24 * 60 * 60  =>  'day',
 				60 * 60  =>  'hour',
 				60  =>  'minute',
 				1  =>  'second'
 	);
-	$a_plural = array( 'year'   => 'years',
+	$a_plural = array('year'   => 'years',
 					   'month'  => 'months',
 					   'day'    => 'days',
 					   'hour'   => 'hours',
@@ -59,7 +59,7 @@ 
 		if ($d >= 1)
 		{
 			$r = round($d);
-			return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago';
+			return $r.' '.($r > 1 ? $a_plural[$str] : $str).' ago';
 		}
 	}
 	return 0;
@@ -73,13 +73,13 @@ 
  * @param string $unit
  * @return string
  */
-function humanFileSize($size,$unit="") {
-	if( (!$unit && $size >= 1<<30) || $unit == "GB")
-		return number_format($size/(1<<30),2)."GB";
-	if( (!$unit && $size >= 1<<20) || $unit == "MB")
-		return number_format($size/(1<<20),2)."MB";
-	if( (!$unit && $size >= 1<<10) || $unit == "KB")
-		return number_format($size/(1<<10),2)."KB";
+function humanFileSize($size, $unit = "") {
+	if ((!$unit && $size >= 1 << 30) || $unit == "GB")
+		return number_format($size / (1 << 30), 2)."GB";
+	if ((!$unit && $size >= 1 << 20) || $unit == "MB")
+		return number_format($size / (1 << 20), 2)."MB";
+	if ((!$unit && $size >= 1 << 10) || $unit == "KB")
+		return number_format($size / (1 << 10), 2)."KB";
 	return number_format($size)." bytes";
 }
 
@@ -133,9 +133,9 @@ 
  *
  * @return mixed|string
  */
-function slugify($str, $replace=array(), $delimiter='-') {
-	if( !empty($replace) ) {
-		$str = str_replace((array)$replace, ' ', $str);
+function slugify($str, $replace = array(), $delimiter = '-') {
+	if (!empty($replace)) {
+		$str = str_replace((array) $replace, ' ', $str);
 	}
 
 	$clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
@@ -158,13 +158,13 @@ 
 {
 	$debug_backtrace = current(debug_backtrace());
 	if (PHP_SAPI == 'cli') {
-		echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
+		echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n";
 		foreach (func_get_args() as $data) {
 			var_dump($data);
 		}
 	} else {
 		ob_clean();
-		echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
+		echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>";
 		echo '<pre>';
 		foreach (func_get_args() as $data) {
 			echo "<code>";
@@ -214,8 +214,8 @@ 
  */
 function utf8Convert($array)
 {
-	array_walk_recursive($array, function(&$item, $key){
-		if(!mb_detect_encoding($item, 'utf-8', true)){
+	array_walk_recursive($array, function(&$item, $key) {
+		if (!mb_detect_encoding($item, 'utf-8', true)) {
 			$item = utf8_encode($item);
 		}
 	});

Braces +9 added lines, -6 removed lines

@@ -74,12 +74,15 @@
  * @return string
  */
 function humanFileSize($size,$unit="") {
-	if( (!$unit && $size >= 1<<30) || $unit == "GB")
-		return number_format($size/(1<<30),2)."GB";
-	if( (!$unit && $size >= 1<<20) || $unit == "MB")
-		return number_format($size/(1<<20),2)."MB";
-	if( (!$unit && $size >= 1<<10) || $unit == "KB")
-		return number_format($size/(1<<10),2)."KB";
+	if( (!$unit && $size >= 1<<30) || $unit == "GB") {
+			return number_format($size/(1<<30),2)."GB";
+	}
+	if( (!$unit && $size >= 1<<20) || $unit == "MB") {
+			return number_format($size/(1<<20),2)."MB";
+	}
+	if( (!$unit && $size >= 1<<10) || $unit == "KB") {
+			return number_format($size/(1<<10),2)."KB";
+	}
 	return number_format($size)." bytes";
 }