Passed
Push — develop ( bbe31e...6a6eba )
by Jens
09:49
created
cloudcontrol/templates/cms/documents/fieldTypes/Image.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 	<div class="grid-container">
3 3
 		<div class="grid-box-2">
4 4
 			<div class="grid-inner">
5
-				<div<?=isset($value) ? ' style="background-image:url(\'' . $request::$subfolders . 'images/' . $value . '\');"' : '' ?> class="selected-image" id="<?=$field->slug?>_selectedImage"></div>
5
+				<div<?=isset($value) ? ' style="background-image:url(\''.$request::$subfolders.'images/'.$value.'\');"' : '' ?> class="selected-image" id="<?=$field->slug?>_selectedImage"></div>
6 6
 			</div>
7 7
 		</div>
8 8
 		<div class="grid-box-10">
Please login to merge, or discard this patch.
cloudcontrol/templates/cms/images/show.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -10,22 +10,22 @@
 block discarded – undo
10 10
 	<div class="show-image">
11 11
 		<label>File</label>
12 12
 		<div class="value">
13
-			<?=isset($image)? $image->file : '' ?>
13
+			<?=isset($image) ? $image->file : '' ?>
14 14
 		</div>
15 15
 		<label>Type</label>
16 16
 		<div class="value">
17
-			<?=isset($image)? $image->type : '' ?>
17
+			<?=isset($image) ? $image->type : '' ?>
18 18
 		</div>
19 19
 		<label>Size</label>
20 20
 		<div class="value">
21
-			<?=isset($image)? humanFileSize($image->size) : '' ?>
21
+			<?=isset($image) ? humanFileSize($image->size) : '' ?>
22 22
 		</div>
23 23
 		<label>Set</label>
24 24
 		<? if (isset($image)) : ?>
25 25
 			<? foreach ($image->set as $key => $set) : ?>
26 26
 				<div class="sets">
27 27
 					<label><?=$key?></label>
28
-					<img src="<?=\library\cc\Request::$subfolders . 'images/' . $set?>" />
28
+					<img src="<?=\library\cc\Request::$subfolders.'images/'.$set?>" />
29 29
 				</div>
30 30
 			<? endforeach ?>
31 31
 		<? endif ?>
Please login to merge, or discard this patch.
cloudcontrol/templates/cms/documents.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<script>window.onload=function(){History.init();History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders . $cmsPrefix?>/documents?path=/');};</script>
1
+<script>window.onload=function(){History.init();History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders.$cmsPrefix?>/documents?path=/');};</script>
2 2
 <section class="documents">
3 3
 	<h2><i class="fa fa-file-text-o"></i> Documents</h2>
4 4
 	<nav class="actions">
@@ -24,9 +24,9 @@  discard block
 block discarded – undo
24 24
 			<? foreach ($documents as $document) : ?>
25 25
 				<li class="grid-container">
26 26
 					<? if ($document->type == 'document') : ?>
27
-						<?renderDocument($document, $cmsPrefix);?>
27
+						<?renderDocument($document, $cmsPrefix); ?>
28 28
 					<? elseif ($document->type == 'folder') : ?>
29
-						<?renderFolder($document, $cmsPrefix, '', true);?>
29
+						<?renderFolder($document, $cmsPrefix, '', true); ?>
30 30
 					<? endif ?>
31 31
 				</li>
32 32
 
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 <? function renderDocument($document, $cmsPrefix, $slugPrefix = '') {?>
38 38
 <div class="grid-box-10">
39 39
 	<h3>
40
-		<a class="btn documentTitle" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix . $document->slug?>" title="Edit">
40
+		<a class="btn documentTitle" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix.$document->slug?>" title="Edit">
41 41
 			<i class="fa fa-file-text-o"></i> <?=$document->title?>
42 42
 		</a>
43 43
 		<small class="small state <?=strtolower($document->state)?>"><?=ucfirst($document->state)?></small>
@@ -53,29 +53,29 @@  discard block
 block discarded – undo
53 53
 	</h3>
54 54
 </div>
55 55
 <div class="documentActions grid-box-2">
56
-	<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>
57
-	<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>
56
+	<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>
57
+	<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>
58 58
 </div>
59 59
 <?}?>
60
-<? function renderFolder($document, $cmsPrefix, $slugPrefix ='', $root = false) {?>
60
+<? function renderFolder($document, $cmsPrefix, $slugPrefix = '', $root = false) {?>
61 61
 <div class="grid-box-8">
62 62
 	<h3>
63
-		<a class="btn documentTitle openFolder" data-slug="<?=$slugPrefix . $document->slug?>" title="Open">
63
+		<a class="btn documentTitle openFolder" data-slug="<?=$slugPrefix.$document->slug?>" title="Open">
64 64
 			<i class="fa fa-folder-o "></i> <?=$document->title?>
65 65
 		</a>
66 66
 	</h3>
67 67
 </div>
68 68
 <div class="documentActions grid-box-4">
69
-	<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>
70
-	<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>
69
+	<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>
70
+	<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>
71 71
 </div>
72 72
 <ul class="documents grid-wrapper nested<?=$root ? ' root' : '' ?>">
73 73
 	<? foreach ($document->content as $subDocument) : ?>
74 74
 		<li class="grid-container">
75 75
 			<? if ($subDocument->type == 'document') : ?>
76
-				<?renderDocument($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/');?>
76
+				<?renderDocument($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/'); ?>
77 77
 			<? elseif ($subDocument->type == 'folder') : ?>
78
-				<?renderFolder($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/');?>
78
+				<?renderFolder($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/'); ?>
79 79
 			<? endif ?>
80 80
 		</li>
81 81
 	<? endforeach ?>
Please login to merge, or discard this patch.
cloudcontrol/templates/cms.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 				</li>
63 63
 				<? $nrOfMenuItems += 1 ?>
64 64
 				<? endif ?>
65
-				<li class="grid-box-<?=6 + (5-$nrOfMenuItems)?> log-off-box">
65
+				<li class="grid-box-<?=6 + (5 - $nrOfMenuItems)?> log-off-box">
66 66
 					<a class="btn log-off grid-inner" href="<?=$request::$subfolders?><?=$cmsPrefix?>/log-off">
67 67
 						<i class="fa fa-power-off"></i>
68 68
 						<span>Log off</span>
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	</main>
87 87
 <script>
88 88
 var subfolders = '<?=$request::$subfolders?>',
89
-	cmsSubfolders = '<?=$request::$subfolders . $cmsPrefix?>';
89
+	cmsSubfolders = '<?=$request::$subfolders.$cmsPrefix?>';
90 90
 </script>
91 91
 <script src="<?=$request::$subfolders?>js/cms.js"></script>
92 92
 </body>
Please login to merge, or discard this patch.
cloudcontrol/library/images/methods/Resize.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
 			
64 64
 			// Define the ratio and adjust the width and height
65 65
 			if ($this->_preserveAspectRatio) {
66
-				$ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight);
66
+				$ratio = min($this->_width / $originalWidth, $this->_height / $originalHeight);
67 67
 				$this->_width = $originalWidth * $ratio;
68 68
 				$this->_height = $originalHeight * $ratio;
69 69
 			}
Please login to merge, or discard this patch.
cloudcontrol/library/images/methods/BoxCrop.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,14 +26,14 @@
 block discarded – undo
26 26
 			
27 27
 			// Define which ratio will be used, depending on which is the smallest side
28 28
 			$ratio = min($hRatio, $wRatio);
29
-			if($ratio > 1) $ratio = 1;
29
+			if ($ratio > 1) $ratio = 1;
30 30
 			
31 31
 			// Define sizes
32 32
 			$this->_destWidth = floor($originalWidth * $ratio);
33 33
 			$this->_destHeight = floor($originalHeight * $ratio);
34 34
 			
35 35
 			// Define margins
36
-			$this->_destX = floor(($this->_width  - $this->_destWidth) / 2);
36
+			$this->_destX = floor(($this->_width - $this->_destWidth) / 2);
37 37
 			$this->_destY = floor(($this->_height - $this->_destHeight) / 2);
38 38
 			
39 39
 			// Execute the Crop method with the given parameters
Please login to merge, or discard this patch.
cloudcontrol/library/crypt/Crypt.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 				$output = '';
50 50
 				for ($i = 0; $i < $count; $i += 16) {
51 51
 					$random_state =
52
-						md5(microtime() . $random_state);
52
+						md5(microtime().$random_state);
53 53
 					$output .=
54 54
 						pack('H*', md5($random_state));
55 55
 				}
Please login to merge, or discard this patch.
cloudcontrol/library/cc/autoloader.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 spl_autoload_extensions('.php');
3 3
 spl_autoload_register("autoloader");
4 4
 
5
-$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
5
+$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/');
6 6
 
7 7
 /**
8 8
  * The function to be registered as the default autoload functino
@@ -32,14 +32,14 @@  discard block
 block discarded – undo
32 32
 	}
33 33
 	
34 34
 	global $rootPath;
35
-	$file = $rootPath . str_replace('\\', '/', $class) . ".php";
35
+	$file = $rootPath.str_replace('\\', '/', $class).".php";
36 36
 	$debug_backtrace = debug_backtrace();
37 37
 	
38 38
 	if (file_exists($file)) {
39 39
 		require_once($file);
40 40
 		if ($throwException) {
41 41
 			if (class_exists($class, false) == false && interface_exists($class, false) == false) {
42
-				throw new \Exception('Could not load class "' . $class . '" in file ' . $file);
42
+				throw new \Exception('Could not load class "'.$class.'" in file '.$file);
43 43
 			} else {
44 44
 				return true;
45 45
 			}
@@ -48,13 +48,13 @@  discard block
 block discarded – undo
48 48
 	} else {
49 49
 		if (isset($debug_backtrace[2]) && isset($debug_backtrace[2]['file']) && isset($debug_backtrace[2]['line'])) {			
50 50
 			if ($throwException) {
51
-				errorHandler(0, 'Could not load class \'' . $class . '\' in file ' . $rootPath . $file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']);
51
+				errorHandler(0, 'Could not load class \''.$class.'\' in file '.$rootPath.$file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']);
52 52
 			} else {
53 53
 				return false;
54 54
 			}			
55 55
 		} else {
56 56
 			if ($throwException) {
57
-				throw new \Exception('Could not load class "' . $class . '" in file ' . $file . "\n" . 'Called from unknown origin.');
57
+				throw new \Exception('Could not load class "'.$class.'" in file '.$file."\n".'Called from unknown origin.');
58 58
 			} else {
59 59
 				return false;
60 60
 			}
Please login to merge, or discard this patch.
cloudcontrol/library/cc/cc.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -34,14 +34,14 @@  discard block
 block discarded – undo
34 34
 		return '0 seconds';
35 35
 	}
36 36
 
37
-	$a = array( 365 * 24 * 60 * 60  =>  'year',
37
+	$a = array(365 * 24 * 60 * 60  =>  'year',
38 38
 				30 * 24 * 60 * 60  =>  'month',
39 39
 				24 * 60 * 60  =>  'day',
40 40
 				60 * 60  =>  'hour',
41 41
 				60  =>  'minute',
42 42
 				1  =>  'second'
43 43
 	);
44
-	$a_plural = array( 'year'   => 'years',
44
+	$a_plural = array('year'   => 'years',
45 45
 					   'month'  => 'months',
46 46
 					   'day'    => 'days',
47 47
 					   'hour'   => 'hours',
@@ -55,18 +55,18 @@  discard block
 block discarded – undo
55 55
 		if ($d >= 1)
56 56
 		{
57 57
 			$r = round($d);
58
-			return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago';
58
+			return $r.' '.($r > 1 ? $a_plural[$str] : $str).' ago';
59 59
 		}
60 60
 	}
61 61
 }
62 62
 
63
-function humanFileSize($size,$unit="") {
64
-	if( (!$unit && $size >= 1<<30) || $unit == "GB")
65
-		return number_format($size/(1<<30),2)."GB";
66
-	if( (!$unit && $size >= 1<<20) || $unit == "MB")
67
-		return number_format($size/(1<<20),2)."MB";
68
-	if( (!$unit && $size >= 1<<10) || $unit == "KB")
69
-		return number_format($size/(1<<10),2)."KB";
63
+function humanFileSize($size, $unit = "") {
64
+	if ((!$unit && $size >= 1 << 30) || $unit == "GB")
65
+		return number_format($size / (1 << 30), 2)."GB";
66
+	if ((!$unit && $size >= 1 << 20) || $unit == "MB")
67
+		return number_format($size / (1 << 20), 2)."MB";
68
+	if ((!$unit && $size >= 1 << 10) || $unit == "KB")
69
+		return number_format($size / (1 << 10), 2)."KB";
70 70
 	return number_format($size)." bytes";
71 71
 }
72 72
 
@@ -113,9 +113,9 @@  discard block
 block discarded – undo
113 113
  *
114 114
  * @return mixed|string
115 115
  */
116
-function slugify($str, $replace=array(), $delimiter='-') {
117
-	if( !empty($replace) ) {
118
-		$str = str_replace((array)$replace, ' ', $str);
116
+function slugify($str, $replace = array(), $delimiter = '-') {
117
+	if (!empty($replace)) {
118
+		$str = str_replace((array) $replace, ' ', $str);
119 119
 	}
120 120
 
121 121
 	$clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
@@ -136,13 +136,13 @@  discard block
 block discarded – undo
136 136
 {
137 137
 	$debug_backtrace = current(debug_backtrace());
138 138
 	if (PHP_SAPI == 'cli') {
139
-		echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
139
+		echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n";
140 140
 		foreach (func_get_args() as $data) {
141 141
 			var_dump($data);
142 142
 		}
143 143
 	} else {
144 144
 		ob_clean();
145
-		echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
145
+		echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>";
146 146
 		echo '<pre>';
147 147
 		foreach (func_get_args() as $data) {
148 148
 			echo "<code>";
Please login to merge, or discard this patch.