Inspection of "Added the search.db to gitignore for cloudcontrol..." - jenskooij/cloudcontrol - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — develop ( 02ffeb...d59462 )

by Jens

created 2017-06-22 22:05 UTC

Status

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -5,10 +5,10 @@  discard block
 block discarded – undo
  * @param string                    $slugPrefix
  * @param bool                      $root
  */
-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>
@@ -16,21 +16,21 @@  discard block
 block discarded – undo
 	<div class="documentActions grid-box-4">
 		<?renderAction('Edit',
 			'',
-			\library\cc\Request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug,
-			'pencil');?>
+			\library\cc\Request::$subfolders.$cmsPrefix.'/documents/edit-folder?slug='.$slugPrefix.$document->slug,
+			'pencil'); ?>
 		<?renderAction('Delete',
 			'error',
-			\library\cc\Request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug,
+			\library\cc\Request::$subfolders.$cmsPrefix.'/documents/delete-folder?slug='.$slugPrefix.$document->slug,
 			'trash',
-			'return confirm(\'Are you sure you want to delete this document?\');');?>
+			'return confirm(\'Are you sure you want to delete this document?\');'); ?>
 	</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 ?>

Please login to merge, or discard this patch.

cloudcontrol/templates/cms/documents/function.renderDocument.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@  discard block
 block discarded – undo
 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>
 				<small class="state <?=strtolower($document->state)?>"><i class="fa <?=$document->state == 'published' ? 'fa-check-circle-o' : 'fa-times-circle-o' ?>"></i></small>
 				<?=$document->title?>
@@ -28,25 +28,25 @@  discard block
 block discarded – undo
 		<? if ($document->state == 'unpublished' || $document->unpublishedChanges) : ?>
             <?renderAction('Publish',
                 'publish',
-                \library\cc\Request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
-                'check');?>
+                \library\cc\Request::$subfolders.$cmsPrefix.'/documents/publish-document?slug='.$slugPrefix.$document->slug,
+                'check'); ?>
 		<? endif ?>
 		<? if ($document->state == 'published') : ?>
 			<?renderAction('Unpublish',
 				'unpublish',
-				\library\cc\Request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug,
-				'times');?>
+				\library\cc\Request::$subfolders.$cmsPrefix.'/documents/unpublish-document?slug='.$slugPrefix.$document->slug,
+				'times'); ?>
 		<? endif ?>
 		<?renderAction('Edit',
 			'',
-			\library\cc\Request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug,
-			'pencil');?>
+			\library\cc\Request::$subfolders.$cmsPrefix.'/documents/edit-document?slug='.$slugPrefix.$document->slug,
+			'pencil'); ?>
 		<? if ($document->state == 'unpublished') : ?>
 			<?renderAction('Delete',
 				'error',
-				\library\cc\Request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug,
+				\library\cc\Request::$subfolders.$cmsPrefix.'/documents/delete-document?slug='.$slugPrefix.$document->slug,
 				'trash',
-                'return confirm(\'Are you sure you want to delete this document?\');');?>
+                'return confirm(\'Are you sure you want to delete this document?\');'); ?>
 		<? endif ?>
 	</div>
 <?}?>

Please login to merge, or discard this patch.

cloudcontrol/library/components/cms/DocumentRouting.php 1 patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -41,7 +41,7 @@  discard block
 block discarded – undo
     {
 		if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
 			$this->documentNewRoute($request, $cmsComponent);
-		} elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])){
+		} elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			switch ($relativeCmsUri) {
 				case '/documents/edit-document': $this->editDocumentRoute($request, $cmsComponent); break;
 				case '/documents/get-brick': $this->getBrickRoute($request, $cmsComponent); break;
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
 		if (isset($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE])) {
 			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], $request::$get[CmsComponent::GET_PARAMETER_PATH])) {
 				$cmsComponent->storage->getDocuments()->addDocument($request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 				exit;
 			}
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypes()->getDocumentTypeBySlug($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], true));
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
 		} else {
 			$documentTypes = $cmsComponent->storage->getDocumentTypes()->getDocumentTypes();
 			if (count($documentTypes) < 1) {
-				throw new \Exception('No Document Types defined yet. <a href="' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types/new">Please do so first.</a>');
+				throw new \Exception('No Document Types defined yet. <a href="'.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types/new">Please do so first.</a>');
 			}
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPES, $documentTypes);
 		}
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getImageSet()->getSmallestImageSet()->slug);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$cmsComponent->storage->getDocuments()->saveDocument($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT, $cmsComponent->storage->getDocuments()->getDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG], 'unpublished'));
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
 	private function deleteDocumentRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getDocuments()->deleteDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 		exit;
 	}
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::GET_PARAMETER_PATH])) {
 			$cmsComponent->storage->addDocumentFolder($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 			exit;
 		}
 	}
@@ -190,11 +190,11 @@  discard block
 block discarded – undo
 		array_pop($path);
 		$path = implode('/', $path);
 
-		$request::$get[CmsComponent::GET_PARAMETER_PATH] = '/' . $path;
+		$request::$get[CmsComponent::GET_PARAMETER_PATH] = '/'.$path;
 
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post['content'])) {
 			$cmsComponent->storage->saveDocumentFolder($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 			exit;
 		}
 
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
 	private function deleteFolderRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->deleteDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 		exit;
 	}
 
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
 	private function publishDocumentRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->publishDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 		exit;
 	}
 
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
 	private function unpublishDocumentRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->unpublishDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 		exit;
 	}
 
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getValuelists()->addValuelist($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents/valuelists');
 			exit;
 		}
 	}
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
 
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$cmsComponent->storage->getValuelists()->saveValuelist($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents/valuelists');
 			exit;
 		}
 
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
 	private function deleteValuelistRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getValuelists()->deleteValuelistBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents/valuelists');
 		exit;
 	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

cloudcontrol/library/components/cms/SitemapRouting.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -59,7 +59,7 @@  discard block
 block discarded – undo
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) {
 			$cmsComponent->storage->getSitemap()->addSitemapItem($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
 			exit;
 		}
 	}
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
 		$sitemapItem = $cmsComponent->storage->getSitemap()->getSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) {
 			$cmsComponent->storage->getSitemap()->saveSitemapItem($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_SITEMAP_ITEM, $sitemapItem);
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getSitemap()->deleteSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
 		exit;
 	}
 
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
         $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
         if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_FROM_URL], $request::$post[CmsComponent::POST_PARAMETER_TO_URL])) {
             $cmsComponent->storage->getRedirects()->addRedirect($request::$post);
-            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
+            header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap/redirects');
             exit;
         }
     }
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
         $redirect = $cmsComponent->storage->getRedirects()->getRedirectBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
         if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_FROM_URL], $request::$post[CmsComponent::POST_PARAMETER_TO_URL])) {
             $cmsComponent->storage->getRedirects()->saveRedirect($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
+            header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap/redirects');
             exit;
         }
         $cmsComponent->setParameter(CmsComponent::PARAMETER_REDIRECT, $redirect);
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
     private function redirectDeleteRoute($request, $cmsComponent)
     {
         $cmsComponent->storage->getRedirects()->deleteRedirectBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-        header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
+        header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap/redirects');
         exit;
     }
 }
\ No newline at end of file

Please login to merge, or discard this patch.

cloudcontrol/library/cc/Application.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -64,7 +64,7 @@  discard block
 block discarded – undo
          */
         private function config()
         {
-            $configPath = __DIR__ . '/../../config.json';
+            $configPath = __DIR__.'/../../config.json';
             if (realpath($configPath) !== false) {
                 $json = file_get_contents($configPath);
                 $this->config = json_decode($json);
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
         private function redirectMatching($request)
         {
             $redirects = $this->storage->getRedirects()->getRedirects();
-            $relativeUri = '/' . $request::$relativeUri;
+            $relativeUri = '/'.$request::$relativeUri;
 
             foreach ($redirects as $redirect) {
                 if (preg_match_all($redirect->fromUrl, $relativeUri, $matches)) {
@@ -95,10 +95,10 @@  discard block
 block discarded – undo
                     }
                     if ($redirect->type == '301') {
                         header('HTTP/1.1 301 Moved Permanently');
-                        header('Location: ' . $request::$subfolders . $toUrl);
+                        header('Location: '.$request::$subfolders.$toUrl);
                         exit;
                     } elseif ($redirect->type == '302') {
-                        header('Location: ' . $request::$subfolders . $toUrl, true, 302);
+                        header('Location: '.$request::$subfolders.$toUrl, true, 302);
                         exit;
                     } else {
                         throw new \Exception('Invalid redirect type.');
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
         private function sitemapMatching($request)
         {
             $sitemap = $this->storage->getSitemap()->getSitemap();
-            $relativeUri = '/' . $request::$relativeUri;
+            $relativeUri = '/'.$request::$relativeUri;
 
             foreach ($sitemap as $sitemapItem) {
                 if ($sitemapItem->regex) {
@@ -181,15 +181,15 @@  discard block
 block discarded – undo
          */
         private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
         {
-            $libraryComponentName = '\\library\\components\\' . $class;
-            $userComponentName = '\\components\\' . $class;
+            $libraryComponentName = '\\library\\components\\'.$class;
+            $userComponentName = '\\components\\'.$class;
 
             if (AutoloadUtil::autoLoad($libraryComponentName, false)) {
                 $component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
             } elseif (AutoloadUtil::autoLoad($userComponentName, false)) {
                 $component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem);
             } else {
-                throw new \Exception('Could not load component ' . $class);
+                throw new \Exception('Could not load component '.$class);
             }
 
             if (!$component instanceof Component) {
@@ -247,8 +247,8 @@  discard block
 block discarded – undo
          */
         public function setCachingHeaders()
         {
-            header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
-            header("Cache-Control: max-age=" . (60 * 60 * 24 * 2));
+            header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
+            header("Cache-Control: max-age=".(60 * 60 * 24 * 2));
         }
 
         /**

Please login to merge, or discard this patch.

cloudcontrol/library/storage/Document.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -52,7 +52,7 @@  discard block
 block discarded – undo
             }
         } elseif ($name === 'content') {
             if ($this->dbHandle === null) {
-                throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
+                throw new \Exception('Document doesnt have a dbHandle handle. (path: '.$this->path.')');
             } else {
                 if ($this->content === null) {
                     return $this->getContent();
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
 	 */
 	public function __toString()
 	{
-		return 'Document:' . $this->title;
+		return 'Document:'.$this->title;
 	}
 
 

Please login to merge, or discard this patch.

		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	{
42	42	if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
43	43	$this->documentNewRoute($request, $cmsComponent);
44		- } elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])){
	44	+ } elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
45	45	switch ($relativeCmsUri) {
46	46	case '/documents/edit-document': $this->editDocumentRoute($request, $cmsComponent); break;
47	47	case '/documents/get-brick': $this->getBrickRoute($request, $cmsComponent); break;
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	if (isset($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE])) {
96	96	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], $request::$get[CmsComponent::GET_PARAMETER_PATH])) {
97	97	$cmsComponent->storage->getDocuments()->addDocument($request::$post);
98		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
	98	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
99	99	exit;
100	100	}
101	101	$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypes()->getDocumentTypeBySlug($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], true));
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	} else {
104	104	$documentTypes = $cmsComponent->storage->getDocumentTypes()->getDocumentTypes();
105	105	if (count($documentTypes) < 1) {
106		- throw new \Exception('No Document Types defined yet. <a href="' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types/new">Please do so first.</a>');
	106	+ throw new \Exception('No Document Types defined yet. <a href="'.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types/new">Please do so first.</a>');
107	107	}
108	108	$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPES, $documentTypes);
109	109	}
		@@ -120,7 +120,7 @@ discard block
		block discarded – undo
120	120	$cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getImageSet()->getSmallestImageSet()->slug);
121	121	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
122	122	$cmsComponent->storage->getDocuments()->saveDocument($request::$post);
123		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
	123	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
124	124	exit;
125	125	}
126	126	$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT, $cmsComponent->storage->getDocuments()->getDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG], 'unpublished'));
		@@ -157,7 +157,7 @@ discard block
		block discarded – undo
157	157	private function deleteDocumentRoute($request, $cmsComponent)
158	158	{
159	159	$cmsComponent->storage->getDocuments()->deleteDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
160		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
	160	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
161	161	exit;
162	162	}
163	163
		@@ -171,7 +171,7 @@ discard block
		block discarded – undo
171	171	$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
172	172	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::GET_PARAMETER_PATH])) {
173	173	$cmsComponent->storage->addDocumentFolder($request::$post);
174		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
	174	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
175	175	exit;
176	176	}
177	177	}
		@@ -190,11 +190,11 @@ discard block
		block discarded – undo
190	190	array_pop($path);
191	191	$path = implode('/', $path);
192	192
193		- $request::$get[CmsComponent::GET_PARAMETER_PATH] = '/' . $path;
	193	+ $request::$get[CmsComponent::GET_PARAMETER_PATH] = '/'.$path;
194	194
195	195	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post['content'])) {
196	196	$cmsComponent->storage->saveDocumentFolder($request::$post);
197		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
	197	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
198	198	exit;
199	199	}
200	200
		@@ -209,7 +209,7 @@ discard block
		block discarded – undo
209	209	private function deleteFolderRoute($request, $cmsComponent)
210	210	{
211	211	$cmsComponent->storage->deleteDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
212		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
	212	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
213	213	exit;
214	214	}
215	215
		@@ -220,7 +220,7 @@ discard block
		block discarded – undo
220	220	private function publishDocumentRoute($request, $cmsComponent)
221	221	{
222	222	$cmsComponent->storage->publishDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
223		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
	223	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
224	224	exit;
225	225	}
226	226
		@@ -231,7 +231,7 @@ discard block
		block discarded – undo
231	231	private function unpublishDocumentRoute($request, $cmsComponent)
232	232	{
233	233	$cmsComponent->storage->unpublishDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
234		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
	234	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
235	235	exit;
236	236	}
237	237
		@@ -248,7 +248,7 @@ discard block
		block discarded – undo
248	248	$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
249	249	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
250	250	$cmsComponent->storage->getValuelists()->addValuelist($request::$post);
251		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
	251	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents/valuelists');
252	252	exit;
253	253	}
254	254	}
		@@ -260,7 +260,7 @@ discard block
		block discarded – undo
260	260
261	261	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
262	262	$cmsComponent->storage->getValuelists()->saveValuelist($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
263		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
	263	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents/valuelists');
264	264	exit;
265	265	}
266	266
		@@ -271,7 +271,7 @@ discard block
		block discarded – undo
271	271	private function deleteValuelistRoute($request, $cmsComponent)
272	272	{
273	273	$cmsComponent->storage->getValuelists()->deleteValuelistBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
274		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
	274	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents/valuelists');
275	275	exit;
276	276	}
277	277	}
278	278	\ No newline at end of file

		@@ -5,10 +5,10 @@ discard block
		block discarded – undo
5	5	* @param string $slugPrefix
6	6	* @param bool $root
7	7	*/
8		-function renderFolder($document, $cmsPrefix, $slugPrefix ='', $root = false) {?>
	8	+function renderFolder($document, $cmsPrefix, $slugPrefix = '', $root = false) {?>
9	9	<div class="grid-box-8">
10	10	<h3>
11		- <a class="btn documentTitle openFolder" data-slug="<?=$slugPrefix . $document->slug?>" title="Open">
	11	+ <a class="btn documentTitle openFolder" data-slug="<?=$slugPrefix.$document->slug?>" title="Open">
12	12	<i class="fa fa-folder-o "></i> <?=$document->title?>
13	13	</a>
14	14	</h3>
		@@ -16,21 +16,21 @@ discard block
		block discarded – undo
16	16	<div class="documentActions grid-box-4">
17	17	<?renderAction('Edit',
18	18	'',
19		- \library\cc\Request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug,
20		- 'pencil');?>
	19	+ \library\cc\Request::$subfolders.$cmsPrefix.'/documents/edit-folder?slug='.$slugPrefix.$document->slug,
	20	+ 'pencil'); ?>
21	21	<?renderAction('Delete',
22	22	'error',
23		- \library\cc\Request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug,
	23	+ \library\cc\Request::$subfolders.$cmsPrefix.'/documents/delete-folder?slug='.$slugPrefix.$document->slug,
24	24	'trash',
25		- 'return confirm(\'Are you sure you want to delete this document?\');');?>
	25	+ 'return confirm(\'Are you sure you want to delete this document?\');'); ?>
26	26	</div>
27	27	<ul class="documents grid-wrapper nested<?=$root ? ' root' : '' ?>">
28	28	<? foreach ($document->content as $subDocument) : ?>
29	29	<li class="grid-container">
30	30	<? if ($subDocument->type == 'document') : ?>
31		- <?renderDocument($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/');?>
	31	+ <?renderDocument($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/'); ?>
32	32	<? elseif ($subDocument->type == 'folder') : ?>
33		- <?renderFolder($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/');?>
	33	+ <?renderFolder($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/'); ?>
34	34	<? endif ?>
35	35	</li>
36	36	<? endforeach ?>

		@@ -7,7 +7,7 @@ discard block
		block discarded – undo
7	7	function renderDocument($document, $cmsPrefix, $slugPrefix = '') {?>
8	8	<div class="grid-box-10">
9	9	<h3>
10		- <a class="btn documentTitle" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix . $document->slug?>" title="Edit">
	10	+ <a class="btn documentTitle" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix.$document->slug?>" title="Edit">
11	11	<i class="fa fa-file-text-o"></i>
12	12	<small class="state <?=strtolower($document->state)?>"><i class="fa <?=$document->state == 'published' ? 'fa-check-circle-o' : 'fa-times-circle-o' ?>"></i></small>
13	13	<?=$document->title?>
		@@ -28,25 +28,25 @@ discard block
		block discarded – undo
28	28	<? if ($document->state == 'unpublished' \|\| $document->unpublishedChanges) : ?>
29	29	<?renderAction('Publish',
30	30	'publish',
31		- \library\cc\Request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug,
32		- 'check');?>
	31	+ \library\cc\Request::$subfolders.$cmsPrefix.'/documents/publish-document?slug='.$slugPrefix.$document->slug,
	32	+ 'check'); ?>
33	33	<? endif ?>
34	34	<? if ($document->state == 'published') : ?>
35	35	<?renderAction('Unpublish',
36	36	'unpublish',
37		- \library\cc\Request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug,
38		- 'times');?>
	37	+ \library\cc\Request::$subfolders.$cmsPrefix.'/documents/unpublish-document?slug='.$slugPrefix.$document->slug,
	38	+ 'times'); ?>
39	39	<? endif ?>
40	40	<?renderAction('Edit',
41	41	'',
42		- \library\cc\Request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug,
43		- 'pencil');?>
	42	+ \library\cc\Request::$subfolders.$cmsPrefix.'/documents/edit-document?slug='.$slugPrefix.$document->slug,
	43	+ 'pencil'); ?>
44	44	<? if ($document->state == 'unpublished') : ?>
45	45	<?renderAction('Delete',
46	46	'error',
47		- \library\cc\Request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug,
	47	+ \library\cc\Request::$subfolders.$cmsPrefix.'/documents/delete-document?slug='.$slugPrefix.$document->slug,
48	48	'trash',
49		- 'return confirm(\'Are you sure you want to delete this document?\');');?>
	49	+ 'return confirm(\'Are you sure you want to delete this document?\');'); ?>
50	50	<? endif ?>
51	51	</div>
52	52	<?}?>

		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
60	60	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) {
61	61	$cmsComponent->storage->getSitemap()->addSitemapItem($request::$post);
62		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
	62	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
63	63	exit;
64	64	}
65	65	}
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	$sitemapItem = $cmsComponent->storage->getSitemap()->getSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
76	76	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_TEMPLATE], $request::$post[CmsComponent::POST_PARAMETER_COMPONENT])) {
77	77	$cmsComponent->storage->getSitemap()->saveSitemapItem($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
78		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
	78	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
79	79	exit;
80	80	}
81	81	$cmsComponent->setParameter(CmsComponent::PARAMETER_SITEMAP_ITEM, $sitemapItem);
		@@ -88,7 +88,7 @@ discard block
		block discarded – undo
88	88	private function deleteRoute($request, $cmsComponent)
89	89	{
90	90	$cmsComponent->storage->getSitemap()->deleteSitemapItemBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
91		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap');
	91	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap');
92	92	exit;
93	93	}
94	94
		@@ -118,7 +118,7 @@ discard block
		block discarded – undo
118	118	$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SITEMAP);
119	119	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_FROM_URL], $request::$post[CmsComponent::POST_PARAMETER_TO_URL])) {
120	120	$cmsComponent->storage->getRedirects()->addRedirect($request::$post);
121		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
	121	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap/redirects');
122	122	exit;
123	123	}
124	124	}
		@@ -130,7 +130,7 @@ discard block
		block discarded – undo
130	130	$redirect = $cmsComponent->storage->getRedirects()->getRedirectBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
131	131	if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::POST_PARAMETER_FROM_URL], $request::$post[CmsComponent::POST_PARAMETER_TO_URL])) {
132	132	$cmsComponent->storage->getRedirects()->saveRedirect($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
133		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
	133	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap/redirects');
134	134	exit;
135	135	}
136	136	$cmsComponent->setParameter(CmsComponent::PARAMETER_REDIRECT, $redirect);
		@@ -139,7 +139,7 @@ discard block
		block discarded – undo
139	139	private function redirectDeleteRoute($request, $cmsComponent)
140	140	{
141	141	$cmsComponent->storage->getRedirects()->deleteRedirectBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
142		- header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/sitemap/redirects');
	142	+ header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/sitemap/redirects');
143	143	exit;
144	144	}
145	145	}
146	146	\ No newline at end of file

		@@ -64,7 +64,7 @@ discard block
		block discarded – undo
64	64	*/
65	65	private function config()
66	66	{
67		- $configPath = __DIR__ . '/../../config.json';
	67	+ $configPath = __DIR__.'/../../config.json';
68	68	if (realpath($configPath) !== false) {
69	69	$json = file_get_contents($configPath);
70	70	$this->config = json_decode($json);
		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85	private function redirectMatching($request)
86	86	{
87	87	$redirects = $this->storage->getRedirects()->getRedirects();
88		- $relativeUri = '/' . $request::$relativeUri;
	88	+ $relativeUri = '/'.$request::$relativeUri;
89	89
90	90	foreach ($redirects as $redirect) {
91	91	if (preg_match_all($redirect->fromUrl, $relativeUri, $matches)) {
		@@ -95,10 +95,10 @@ discard block
		block discarded – undo
95	95	}
96	96	if ($redirect->type == '301') {
97	97	header('HTTP/1.1 301 Moved Permanently');
98		- header('Location: ' . $request::$subfolders . $toUrl);
	98	+ header('Location: '.$request::$subfolders.$toUrl);
99	99	exit;
100	100	} elseif ($redirect->type == '302') {
101		- header('Location: ' . $request::$subfolders . $toUrl, true, 302);
	101	+ header('Location: '.$request::$subfolders.$toUrl, true, 302);
102	102	exit;
103	103	} else {
104	104	throw new \Exception('Invalid redirect type.');
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116	private function sitemapMatching($request)
117	117	{
118	118	$sitemap = $this->storage->getSitemap()->getSitemap();
119		- $relativeUri = '/' . $request::$relativeUri;
	119	+ $relativeUri = '/'.$request::$relativeUri;
120	120
121	121	foreach ($sitemap as $sitemapItem) {
122	122	if ($sitemapItem->regex) {
		@@ -181,15 +181,15 @@ discard block
		block discarded – undo
181	181	*/
182	182	private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
183	183	{
184		- $libraryComponentName = '\\library\\components\\' . $class;
185		- $userComponentName = '\\components\\' . $class;
	184	+ $libraryComponentName = '\\library\\components\\'.$class;
	185	+ $userComponentName = '\\components\\'.$class;
186	186
187	187	if (AutoloadUtil::autoLoad($libraryComponentName, false)) {
188	188	$component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
189	189	} elseif (AutoloadUtil::autoLoad($userComponentName, false)) {
190	190	$component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem);
191	191	} else {
192		- throw new \Exception('Could not load component ' . $class);
	192	+ throw new \Exception('Could not load component '.$class);
193	193	}
194	194
195	195	if (!$component instanceof Component) {
		@@ -247,8 +247,8 @@ discard block
		block discarded – undo
247	247	*/
248	248	public function setCachingHeaders()
249	249	{
250		- header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
251		- header("Cache-Control: max-age=" . (60 * 60 * 24 * 2));
	250	+ header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
	251	+ header("Cache-Control: max-age=".(60 * 60 * 24 * 2));
252	252	}
253	253
254	254	/**

		@@ -52,7 +52,7 @@ discard block
		block discarded – undo
52	52	}
53	53	} elseif ($name === 'content') {
54	54	if ($this->dbHandle === null) {
55		- throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
	55	+ throw new \Exception('Document doesnt have a dbHandle handle. (path: '.$this->path.')');
56	56	} else {
57	57	if ($this->content === null) {
58	58	return $this->getContent();
		@@ -97,7 +97,7 @@ discard block
		block discarded – undo
97	97	*/
98	98	public function __toString()
99	99	{
100		- return 'Document:' . $this->title;
	100	+ return 'Document:'.$this->title;
101	101	}
102	102
103	103

jenskooij / cloudcontrol

Push — develop ( 02ffeb...d59462 )

Status

Category

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch