jenskooij / cloudcontrol

cloudcontrol/library/cc/cc.php

Doc Comments +1 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
  * @param array  $replace
  * @param string $delimiter
  *
- * @return mixed|string
+ * @return string
  */
 function slugify($str, $replace=array(), $delimiter='-') {
 	if( !empty($replace) ) {
@@ -130,7 +130,6 @@ 
  * Dumps a var_dump of the passed arguments with <pre> tags surrounding it.
  * Dies afterwards
  *
- * @param mixed $data    The data to be displayed
  */
 function dump()
 {

Spacing +15 added lines, -15 removed lines

@@ -34,14 +34,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',
@@ -55,18 +55,18 @@ 
 		if ($d >= 1)
 		{
 			$r = round($d);
-			return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago';
+			return $r.' '.($r > 1 ? $a_plural[$str] : $str).' ago';
 		}
 	}
 }
 
-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";
 }
 
@@ -113,9 +113,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);
@@ -136,13 +136,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>";

cloudcontrol/library/storage/JsonStorage.php

Doc Comments +4 added lines, -1 removed lines

@@ -17,7 +17,7 @@ 
 		/**
 		 * JsonStorage constructor.
 		 *
-		 * @param $storagePath
+		 * @param string $storagePath
 		 */
 		public function __construct($storagePath)
 		{
@@ -837,6 +837,9 @@ 
 			}
 		}
 
+		/**
+		 * @param string $path
+		 */
 		private function validateFilename($filename, $path)
 		{
 			$fileParts = explode('.', $filename);

Spacing +31 added lines, -31 removed lines

@@ -33,7 +33,7 @@ 
 		 */
 		private function config()
 		{
-			$storagePath = __DIR__ . $this->storagePath;
+			$storagePath = __DIR__.$this->storagePath;
 			if (realpath($storagePath) !== false) {
 				$jsonString = file_get_contents($storagePath);
 				$this->repository = json_decode($jsonString);
@@ -189,7 +189,7 @@ 
 		 */
 		public function getDocumentBySlug($slug)
 		{
-			$documentContainer = $this->getDocumentContainerByPath('/' . $slug);
+			$documentContainer = $this->getDocumentContainerByPath('/'.$slug);
 			$indices = $documentContainer['indices'];
 
 			if ($indices === null) {
@@ -234,7 +234,7 @@ 
 				// Check for duplicates
 				foreach ($this->repository->documents as $index => $document) {
 					if (end($indices) !== $index && $document->slug == $documentFolderObject->slug && $document->type == 'document') {
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$this->repository->documents[end($indices)] = $documentFolderObject;
@@ -242,10 +242,10 @@ 
 				// Check for duplicates
 				foreach ($previousFolder->content as $index => $document) {
 					if (end($indices) !== $index && $document->slug == $documentFolderObject->slug && $document->type == 'document') {
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
-				$previousFolder->content[end($indices)] = $documentFolderObject ;
+				$previousFolder->content[end($indices)] = $documentFolderObject;
 			}
 
 			$this->save();
@@ -259,7 +259,7 @@ 
 				foreach ($this->repository->documents as $document) {
 					if ($document->slug == $documentFolderObject->slug && $document->type == 'document') {
 						// TODO make it so it doesnt throw an exception, but instead shows a warning
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$this->repository->documents[] = $documentFolderObject;
@@ -270,7 +270,7 @@ 
 					foreach ($containerFolder->content as $document) {
 						if ($document->slug == $documentFolderObject->slug && $document->type == 'document') {
 							// TODO make it so it doesnt throw an exception, but instead shows a warning
-							throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+							throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 						}
 					}
 				}
@@ -385,7 +385,7 @@ 
 				foreach ($this->repository->documents as $document) {
 					if ($document->slug == $documentFolderObject->slug && $document->type == 'folder') {
 						// TODO make it so it doesnt throw an exception, but instead shows a warning
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$this->repository->documents[] = $documentFolderObject;
@@ -406,7 +406,7 @@ 
 				foreach ($containerFolder->content as $document) {
 					if ($document->slug == $documentFolderObject->slug && $document->type == 'folder') {
 						// TODO make it so it doesnt throw an exception, but instead shows a warning
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$folder->content[] = $documentFolderObject;
@@ -458,7 +458,7 @@ 
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-			$documentContainer = $this->getDocumentContainerByPath('/' . $slug);
+			$documentContainer = $this->getDocumentContainerByPath('/'.$slug);
 			$indices = $documentContainer['indices'];
 
 			$folder = $this->repository->documents;
@@ -502,7 +502,7 @@ 
 				// Check for duplicates
 				foreach ($this->repository->documents as $index => $document) {
 					if (end($indices) !== $index && $document->slug == $documentFolderObject->slug && $document->type == 'folder') {
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$this->repository->documents[end($indices)] = $documentFolderObject;
@@ -510,10 +510,10 @@ 
 				// Check for duplicates
 				foreach ($previousFolder->content as $index => $document) {
 					if (end($indices) !== $index && $document->slug == $documentFolderObject->slug && $document->type == 'folder') {
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
-				$previousFolder->content[end($indices)] = $documentFolderObject ;
+				$previousFolder->content[end($indices)] = $documentFolderObject;
 			}
 
 			$this->save();
@@ -583,7 +583,7 @@ 
 					'previousDocument' => $previousDocument
 				);
 			} else {
-				throw new \Exception('Invalid path: ' . $path);
+				throw new \Exception('Invalid path: '.$path);
 			}
 		}
 
@@ -768,13 +768,13 @@ 
 
 		public function addImage($postValues)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/images/');
+			$destinationPath = realpath(__DIR__.'/../../www/images/');
 
 			$filename = $this->validateFilename($postValues['name'], $destinationPath);
-			$destination = $destinationPath . '/' . $filename;
+			$destination = $destinationPath.'/'.$filename;
 
 			if ($postValues['error'] != '0') {
-				throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+				throw new \Exception('Error uploading file. Error code: '.$postValues['error']);
 			}
 
 			if (move_uploaded_file($postValues['tmp_name'], $destination)) {
@@ -796,14 +796,14 @@ 
 
 		public function deleteImageByName($filename)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/images/');
+			$destinationPath = realpath(__DIR__.'/../../www/images/');
 
 			$images = $this->getImages();
 
 			foreach ($images as $key => $image) {
 				if ($image->file == $filename) {
 					foreach ($image->set as $imageSetFilename) {
-						$destination = $destinationPath . '/' . $imageSetFilename;
+						$destination = $destinationPath.'/'.$imageSetFilename;
 						if (file_exists($destination)) {
 							unlink($destination);
 						} else {
@@ -845,7 +845,7 @@ 
 		 */
 		public function getFiles()
 		{
-			$files =  $this->repository->files;
+			$files = $this->repository->files;
 			usort($files, array($this, 'compareFiles'));
 			return $files;
 		}
@@ -857,13 +857,13 @@ 
 
 		public function addFile($postValues)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/files/');
+			$destinationPath = realpath(__DIR__.'/../../www/files/');
 
 			$filename = $this->validateFilename($postValues['name'], $destinationPath);
-			$destination = $destinationPath . '/' . $filename;
+			$destination = $destinationPath.'/'.$filename;
 
 			if ($postValues['error'] != '0') {
-				throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+				throw new \Exception('Error uploading file. Error code: '.$postValues['error']);
 			}
 
 			if (move_uploaded_file($postValues['tmp_name'], $destination)) {
@@ -887,23 +887,23 @@ 
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension = slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . '.' . $extension;
+				$filename = $fileNameWithoutExtension.'.'.$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->validateFilename($filename,$path);
+				return $this->validateFilename($filename, $path);
 			}
 			return $filename;
 		}
@@ -929,8 +929,8 @@ 
          */
 		public function deleteFileByName($filename)
 		{
-			$destinationPath = realpath(__DIR__ . '/../../www/files/');
-			$destination = $destinationPath . '/' . $filename;
+			$destinationPath = realpath(__DIR__.'/../../www/files/');
+			$destination = $destinationPath.'/'.$filename;
 
 			if (file_exists($destination)) {
 				$files = $this->getFiles();
@@ -1226,11 +1226,11 @@ 
 		 * @throws \Exception
 		 */
 		private function save() {
-			$storagePath = __DIR__ . $this->storagePath;
+			$storagePath = __DIR__.$this->storagePath;
 			if (realpath($storagePath) !== false) {
 				file_put_contents($storagePath, json_encode($this->repository));
 			} else {
-				throw new \Exception('Couldnt find storagePath ' . $storagePath);
+				throw new \Exception('Couldnt find storagePath '.$storagePath);
 			}
 		}
 

cloudcontrol/templates/cms/documents/fieldTypes/Image.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 	<div class="grid-container">
 		<div class="grid-box-2">
 			<div class="grid-inner">
-				<div<?=isset($value) ? ' style="background-image:url(\'' . $request::$subfolders . 'images/' . $value . '\');"' : '' ?> class="selected-image" id="<?=$field->slug?>_selectedImage"></div>
+				<div<?=isset($value) ? ' style="background-image:url(\''.$request::$subfolders.'images/'.$value.'\');"' : '' ?> class="selected-image" id="<?=$field->slug?>_selectedImage"></div>
 			</div>
 		</div>
 		<div class="grid-box-10">

cloudcontrol/templates/cms/images/show.php

Spacing +4 added lines, -4 removed lines

@@ -10,22 +10,22 @@
 	<div class="show-image">
 		<label>File</label>
 		<div class="value">
-			<?=isset($image)? $image->file : '' ?>
+			<?=isset($image) ? $image->file : '' ?>
 		</div>
 		<label>Type</label>
 		<div class="value">
-			<?=isset($image)? $image->type : '' ?>
+			<?=isset($image) ? $image->type : '' ?>
 		</div>
 		<label>Size</label>
 		<div class="value">
-			<?=isset($image)? humanFileSize($image->size) : '' ?>
+			<?=isset($image) ? humanFileSize($image->size) : '' ?>
 		</div>
 		<label>Set</label>
 		<? if (isset($image)) : ?>
 			<? foreach ($image->set as $key => $set) : ?>
 				<div class="sets">
 					<label><?=$key?></label>
-					<img src="<?=\library\cc\Request::$subfolders . 'images/' . $set?>" />
+					<img src="<?=\library\cc\Request::$subfolders.'images/'.$set?>" />
 				</div>
 			<? endforeach ?>
 		<? endif ?>

cloudcontrol/templates/cms/documents.php

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<script>window.onload=function(){History.init();History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders . $cmsPrefix?>/documents?path=/');};</script>
+<script>window.onload=function(){History.init();History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders.$cmsPrefix?>/documents?path=/');};</script>
 <section class="documents">
 	<h2><i class="fa fa-file-text-o"></i> Documents</h2>
 	<nav class="actions">
@@ -24,9 +24,9 @@ 
 			<? foreach ($documents as $document) : ?>
 				<li class="grid-container">
 					<? if ($document->type == 'document') : ?>
-						<?renderDocument($document, $cmsPrefix);?>
+						<?renderDocument($document, $cmsPrefix); ?>
 					<? elseif ($document->type == 'folder') : ?>
-						<?renderFolder($document, $cmsPrefix, '', true);?>
+						<?renderFolder($document, $cmsPrefix, '', true); ?>
 					<? endif ?>
 				</li>
 
@@ -37,7 +37,7 @@ 
 <? function renderDocument($document, $cmsPrefix, $slugPrefix = '') {?>
 <div class="grid-box-10">
 	<h3>
-		<a class="btn documentTitle" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix . $document->slug?>" title="Edit">
+		<a class="btn documentTitle" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix.$document->slug?>" title="Edit">
 			<i class="fa fa-file-text-o"></i> <?=$document->title?>
 		</a>
 		<small class="small state <?=strtolower($document->state)?>"><?=ucfirst($document->state)?></small>
@@ -53,29 +53,29 @@ 
 	</h3>
 </div>
 <div class="documentActions grid-box-2">
-	<a class="btn" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix . $document->slug?>" title="Edit"><i class="fa fa-pencil"></i></a>
-	<a onclick="return confirm('Are you sure you want to delete this item?');" class="btn error" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/delete-document?slug=<?=$slugPrefix . $document->slug?>" title="Delete"><i class="fa fa-times"></i></a>
+	<a class="btn" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix.$document->slug?>" title="Edit"><i class="fa fa-pencil"></i></a>
+	<a onclick="return confirm('Are you sure you want to delete this item?');" class="btn error" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/delete-document?slug=<?=$slugPrefix.$document->slug?>" title="Delete"><i class="fa fa-times"></i></a>
 </div>
 <?}?>
-<? function renderFolder($document, $cmsPrefix, $slugPrefix ='', $root = false) {?>
+<? function renderFolder($document, $cmsPrefix, $slugPrefix = '', $root = false) {?>
 <div class="grid-box-8">
 	<h3>
-		<a class="btn documentTitle openFolder" data-slug="<?=$slugPrefix . $document->slug?>" title="Open">
+		<a class="btn documentTitle openFolder" data-slug="<?=$slugPrefix.$document->slug?>" title="Open">
 			<i class="fa fa-folder-o "></i> <?=$document->title?>
 		</a>
 	</h3>
 </div>
 <div class="documentActions grid-box-4">
-	<a class="btn" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-folder?slug=<?=$slugPrefix . $document->slug?>" title="Edit"><i class="fa fa-pencil"></i></a>
-	<a onclick="return confirm('Are you sure you want to delete this item?');" class="btn error" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/delete-folder?slug=<?=$slugPrefix . $document->slug?>" title="Delete"><i class="fa fa-times"></i></a>
+	<a class="btn" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-folder?slug=<?=$slugPrefix.$document->slug?>" title="Edit"><i class="fa fa-pencil"></i></a>
+	<a onclick="return confirm('Are you sure you want to delete this item?');" class="btn error" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/delete-folder?slug=<?=$slugPrefix.$document->slug?>" title="Delete"><i class="fa fa-times"></i></a>
 </div>
 <ul class="documents grid-wrapper nested<?=$root ? ' root' : '' ?>">
 	<? foreach ($document->content as $subDocument) : ?>
 		<li class="grid-container">
 			<? if ($subDocument->type == 'document') : ?>
-				<?renderDocument($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/');?>
+				<?renderDocument($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/'); ?>
 			<? elseif ($subDocument->type == 'folder') : ?>
-				<?renderFolder($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/');?>
+				<?renderFolder($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/'); ?>
 			<? endif ?>
 		</li>
 	<? endforeach ?>

cloudcontrol/templates/cms.php

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 				</li>
 				<? $nrOfMenuItems += 1 ?>
 				<? endif ?>
-				<li class="grid-box-<?=6 + (5-$nrOfMenuItems)?> log-off-box">
+				<li class="grid-box-<?=6 + (5 - $nrOfMenuItems)?> log-off-box">
 					<a class="btn log-off grid-inner" href="<?=$request::$subfolders?><?=$cmsPrefix?>/log-off">
 						<i class="fa fa-power-off"></i>
 						<span>Log off</span>
@@ -86,7 +86,7 @@ 
 	</main>
 <script>
 var subfolders = '<?=$request::$subfolders?>',
-	cmsSubfolders = '<?=$request::$subfolders . $cmsPrefix?>';
+	cmsSubfolders = '<?=$request::$subfolders.$cmsPrefix?>';
 </script>
 <script src="<?=$request::$subfolders?>js/cms.js"></script>
 </body>

cloudcontrol/library/images/methods/Resize.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 			
 			// Define the ratio and adjust the width and height
 			if ($this->_preserveAspectRatio) {
-				$ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight);
+				$ratio = min($this->_width / $originalWidth, $this->_height / $originalHeight);
 				$this->_width = $originalWidth * $ratio;
 				$this->_height = $originalHeight * $ratio;
 			}

cloudcontrol/library/images/methods/BoxCrop.php

Spacing +2 added lines, -2 removed lines

@@ -26,14 +26,14 @@
 			
 			// Define which ratio will be used, depending on which is the smallest side
 			$ratio = min($hRatio, $wRatio);
-			if($ratio > 1) $ratio = 1;
+			if ($ratio > 1) $ratio = 1;
 			
 			// Define sizes
 			$this->_destWidth = floor($originalWidth * $ratio);
 			$this->_destHeight = floor($originalHeight * $ratio);
 			
 			// Define margins
-			$this->_destX = floor(($this->_width  - $this->_destWidth) / 2);
+			$this->_destX = floor(($this->_width - $this->_destWidth) / 2);
 			$this->_destY = floor(($this->_height - $this->_destHeight) / 2);
 			
 			// Execute the Crop method with the given parameters

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