jenskooij / cloudcontrol

src/components/cms/FilesRouting.php

Doc Comments +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	}
 
 	/**
-	 * @param $request
+	 * @param Request $request
 	 * @param CmsComponent $cmsComponent
 	 */
 	private function newRoute($request, $cmsComponent)
@@ -83,7 +83,7 @@ 
 	}
 
 	/**
-	 * @param $request
+	 * @param Request $request
 	 * @param CmsComponent $cmsComponent
 	 */
 	private function deleteRoute($request, $cmsComponent)

Spacing +8 added lines, -8 removed lines

@@ -40,20 +40,20 @@ 
 	{
 		$file = $cmsComponent->storage->getFiles()->getFileByName($slug);
 		$path = realpath($cmsComponent->storage->getFiles()->getFilesDir());
-		$quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
-		$size = filesize($path . '/' . $file->file);
+		$quoted = sprintf('"%s"', addcslashes(basename($path.'/'.$file->file), '"\\'));
+		$size = filesize($path.'/'.$file->file);
 
 		header('Content-Description: File Transfer');
-		header('Content-Type: ' . $file->type);
-		header('Content-Disposition: attachment; filename=' . $quoted);
+		header('Content-Type: '.$file->type);
+		header('Content-Disposition: attachment; filename='.$quoted);
 		header('Content-Transfer-Encoding: binary');
 		header('Connection: Keep-Alive');
 		header('Expires: 0');
 		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 		header('Pragma: public');
-		header('Content-Length: ' . $size);
+		header('Content-Length: '.$size);
 
-		readfile($path . '/' . $file->file);
+		readfile($path.'/'.$file->file);
 		exit;
 	}
 
@@ -77,7 +77,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_FILES);
 		if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) {
 			$cmsComponent->storage->getFiles()->addFile($_FILES[CmsComponent::FILES_PARAMETER_FILE]);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
 			exit;
 		}
 	}
@@ -89,7 +89,7 @@ 
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getFiles()->deleteFileByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
 		exit;
 	}
 

Indentation +74 added lines, -74 removed lines

@@ -12,85 +12,85 @@
 
 class FilesRouting implements CmsRouting
 {
-	/**
-	 * FilesRouting constructor.
-	 *
-	 * @param Request $request
-	 * @param $relativeCmsUri
-	 * @param CmsComponent $cmsComponent
-	 */
-	public function __construct($request, $relativeCmsUri, $cmsComponent)
-	{
-		if ($relativeCmsUri == '/files') {
-			$this->overviewRoute($cmsComponent);
-		} elseif ($relativeCmsUri == '/files/new') {
-			$this->newRoute($request, $cmsComponent);
-		} elseif ($relativeCmsUri == '/files/get' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
-			$this->downloadRoute($request::$get[CmsComponent::FILES_PARAMETER_FILE], $cmsComponent);
-		} elseif ($relativeCmsUri == '/files/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
-			$this->deleteRoute($request, $cmsComponent);
-		}
-	}
+    /**
+     * FilesRouting constructor.
+     *
+     * @param Request $request
+     * @param $relativeCmsUri
+     * @param CmsComponent $cmsComponent
+     */
+    public function __construct($request, $relativeCmsUri, $cmsComponent)
+    {
+        if ($relativeCmsUri == '/files') {
+            $this->overviewRoute($cmsComponent);
+        } elseif ($relativeCmsUri == '/files/new') {
+            $this->newRoute($request, $cmsComponent);
+        } elseif ($relativeCmsUri == '/files/get' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
+            $this->downloadRoute($request::$get[CmsComponent::FILES_PARAMETER_FILE], $cmsComponent);
+        } elseif ($relativeCmsUri == '/files/delete' && isset($request::$get[CmsComponent::FILES_PARAMETER_FILE])) {
+            $this->deleteRoute($request, $cmsComponent);
+        }
+    }
 
-	/**
-	 * @param $slug
-	 * @param CmsComponent $cmsComponent
-	 */
-	private function downloadRoute($slug, $cmsComponent)
-	{
-		$file = $cmsComponent->storage->getFiles()->getFileByName($slug);
-		$path = realpath($cmsComponent->storage->getFiles()->getFilesDir());
-		$quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
-		$size = filesize($path . '/' . $file->file);
+    /**
+     * @param $slug
+     * @param CmsComponent $cmsComponent
+     */
+    private function downloadRoute($slug, $cmsComponent)
+    {
+        $file = $cmsComponent->storage->getFiles()->getFileByName($slug);
+        $path = realpath($cmsComponent->storage->getFiles()->getFilesDir());
+        $quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
+        $size = filesize($path . '/' . $file->file);
 
-		header('Content-Description: File Transfer');
-		header('Content-Type: ' . $file->type);
-		header('Content-Disposition: attachment; filename=' . $quoted);
-		header('Content-Transfer-Encoding: binary');
-		header('Connection: Keep-Alive');
-		header('Expires: 0');
-		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-		header('Pragma: public');
-		header('Content-Length: ' . $size);
+        header('Content-Description: File Transfer');
+        header('Content-Type: ' . $file->type);
+        header('Content-Disposition: attachment; filename=' . $quoted);
+        header('Content-Transfer-Encoding: binary');
+        header('Connection: Keep-Alive');
+        header('Expires: 0');
+        header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+        header('Pragma: public');
+        header('Content-Length: ' . $size);
 
-		readfile($path . '/' . $file->file);
-		exit;
-	}
+        readfile($path . '/' . $file->file);
+        exit;
+    }
 
-	/**
-	 * @param CmsComponent $cmsComponent
-	 */
-	private function overviewRoute($cmsComponent)
-	{
-		$cmsComponent->subTemplate = 'files';
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_FILES);
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_FILES, $cmsComponent->storage->getFiles()->getFiles());
-	}
+    /**
+     * @param CmsComponent $cmsComponent
+     */
+    private function overviewRoute($cmsComponent)
+    {
+        $cmsComponent->subTemplate = 'files';
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_FILES);
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_FILES, $cmsComponent->storage->getFiles()->getFiles());
+    }
 
-	/**
-	 * @param $request
-	 * @param CmsComponent $cmsComponent
-	 */
-	private function newRoute($request, $cmsComponent)
-	{
-		$cmsComponent->subTemplate = 'files/form';
-		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_FILES);
-		if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) {
-			$cmsComponent->storage->getFiles()->addFile($_FILES[CmsComponent::FILES_PARAMETER_FILE]);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
-			exit;
-		}
-	}
+    /**
+     * @param $request
+     * @param CmsComponent $cmsComponent
+     */
+    private function newRoute($request, $cmsComponent)
+    {
+        $cmsComponent->subTemplate = 'files/form';
+        $cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_FILES);
+        if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) {
+            $cmsComponent->storage->getFiles()->addFile($_FILES[CmsComponent::FILES_PARAMETER_FILE]);
+            header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+            exit;
+        }
+    }
 
-	/**
-	 * @param $request
-	 * @param CmsComponent $cmsComponent
-	 */
-	private function deleteRoute($request, $cmsComponent)
-	{
-		$cmsComponent->storage->getFiles()->deleteFileByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
-		exit;
-	}
+    /**
+     * @param $request
+     * @param CmsComponent $cmsComponent
+     */
+    private function deleteRoute($request, $cmsComponent)
+    {
+        $cmsComponent->storage->getFiles()->deleteFileByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]);
+        header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+        exit;
+    }
 
 }
\ No newline at end of file

src/components/FormComponent.php

Doc Comments +4 added lines, -4 removed lines

@@ -180,7 +180,7 @@ 
 	}
 
 	/**
-	 * @param \cc\Request $request
+	 * @param \CloudControl\Cms\cc\Request $request
 	 * @return array
 	 */
 	private function getPostValues($request)
@@ -291,7 +291,7 @@ 
 	}
 
 	/**
-	 * @return \cc\Request
+	 * @return \CloudControl\Cms\cc\Request
 	 */
 	private function setPathBackup()
 	{
@@ -305,7 +305,7 @@ 
 	}
 
 	/**
-	 * @param \cc\Request $request
+	 * @param \CloudControl\Cms\cc\Request $request
 	 */
 	private function resetPathBackup($request)
 	{
@@ -317,7 +317,7 @@ 
 	}
 
 	/**
-	 * @param $form
+	 * @param string|null $form
 	 */
 	private function setFormParameter($form)
 	{

Spacing +3 added lines, -3 removed lines

@@ -162,7 +162,7 @@ 
 		if (isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID])) {
 			$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
 		} else {
-			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string)microtime(true);
+			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string) microtime(true);
 			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = false;
 			$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
 		}
@@ -190,7 +190,7 @@ 
 		$postValues = $request::$post;
 		$postValues[self::PARAMETER_DOCUMENT_TYPE] = $this->documentType;
 		$postValues[self::GET_PARAMETER_PATH] = $this->responseFolder;
-		$postValues['title'] = date('r') . ' - From: ' . $request::$requestUri;
+		$postValues['title'] = date('r').' - From: '.$request::$requestUri;
 
 		return $postValues;
 	}
@@ -325,7 +325,7 @@ 
 	private function setFormParameter($form)
 	{
 		if ($this->isFormSubmitted($this->request) || $this->isSubmitAllowed() === false) {
-			$this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage;
+			$this->parameters[$this->formParameterName] = '<a name="'.$this->formId.'"></a>'.$this->thankYouMessage;
 		} else {
 			$this->parameters[$this->formParameterName] = $form;
 		}

Indentation +320 added lines, -320 removed lines

@@ -7,324 +7,324 @@
 
 class FormComponent Extends BaseComponent
 {
-	const GET_PARAMETER_PATH = 'path';
-
-	const PARAMETER_CMS_PREFIX = 'cmsPrefix';
-	const PARAMETER_DOCUMENT_TYPE = 'documentType';
-	const PARAMETER_DOCUMENT_TYPES = 'documentTypes';
-	const PARAMETER_FORM_ID = 'formId';
-	const PARAMETER_FORM_PARAMETER_NAME = 'formParameterName';
-	const PARAMETER_HIDE_TITLE_AND_STATE = 'hideTitleAndState';
-	const PARAMETER_RESPONSE_FOLDER = 'responseFolder';
-	const PARAMETER_SMALLEST_IMAGE = 'smallestImage';
-	const PARAMETER_SUBMIT_ONCE_PER_SESSION = 'submitOncePerSession';
-	const PARAMETER_SUB_TEMPLATE = 'subTemplate';
-	const PARAMETER_THANK_YOU_MESSAGE = 'thankYouMessage';
-
-	const SESSION_PARAMETER_CLOUDCONTROL = 'cloudcontrol';
-	const SESSION_PARAMETER_FORM_COMPONENT = 'FormComponent';
-	/**
-	 * @var null|string
-	 */
-	protected $documentType = null;
-	/**
-	 * @var null|string
-	 */
-	protected $responseFolder = null;
-	/**
-	 * @var string
-	 */
-	protected $subTemplate = 'cms/documents/document-form-form';
-	/**
-	 * @var string
-	 */
-	protected $formParameterName = 'form';
-	/**
-	 * @var string
-	 */
-	protected $thankYouMessage = 'Thank you for sending us your response.';
-
-	/**
-	 * @var bool
-	 */
-	protected $submitOncePerSession = false;
-
-	/**
-	 * @var string
-	 */
-	private $formId;
-	/**
-	 * @var null|string
-	 */
-	private $getPathBackup = null;
-
-	/**
-	 * @var null|\stdClass
-	 */
-	private $userSessionBackup = null;
-
-	/**
-	 * @param Storage $storage
-	 *
-	 * @return void
-	 * @throws \Exception
-	 */
-	public function run(Storage $storage)
-	{
-		parent::run($storage);
-		$this->checkParameters();
-		$this->checkRequiredParameters();
-		$this->setFormId();
-		$this->initialize($storage);
-		$this->checkSubmit($storage);
-	}
-
-	/**
-	 * @param null|Application $application
-	 *
-	 * @throws \Exception
-	 */
-	public function render($application = null)
-	{
-		$request = $this->setPathBackup();
-		$form = $this->renderTemplate($this->subTemplate);
-		$this->resetPathBackup($request);
-		$this->setFormParameter($form);
-
-		parent::render($application);
-	}
-
-	/**
-	 * Checks if parameters were given in the CMS configuration and
-	 * sets them to their respective fields
-	 */
-	private function checkParameters()
-	{
-		$this->checkDocumentTypeParameter();
-		$this->checkResponseFolderParameter();
-		$this->checkSubTemplateParameter();
-		$this->checkFormParameterNameParameter();
-		$this->checkThankYouMessageParameter();
-		$this->checkSubmitOncePerSessionParameter();
-	}
-
-	/**
-	 * Sets variables needed for rendering the form template
-	 *
-	 * @param Storage $storage
-	 */
-	private function initialize($storage)
-	{
-		$this->parameters[self::PARAMETER_SMALLEST_IMAGE] = $storage->getImageSet()->getSmallestImageSet();
-		$this->parameters[self::PARAMETER_CMS_PREFIX] = '';
-
-		$this->parameters[self::PARAMETER_DOCUMENT_TYPE] = $this->storage->getDocumentTypes()->getDocumentTypeBySlug($this->documentType, true);
-		$this->parameters[self::PARAMETER_DOCUMENT_TYPES] = $this->storage->getDocumentTypes()->getDocumentTypes();
-		$this->parameters[self::PARAMETER_HIDE_TITLE_AND_STATE] = true;
-		$this->parameters[self::PARAMETER_FORM_ID] = $this->formId;
-	}
-
-	/**
-	 * If the form has been submitted, save the document
-	 * Calls $this->postSubmit() afterwards
-	 *
-	 * @param Storage $storage
-	 */
-	private function checkSubmit($storage)
-	{
-		if ($this->isFormSubmitted($this->request) && $this->isSubmitAllowed()) {
-			$postValues = $this->getPostValues($this->request);
-			$this->setUserSessionBackup();
-			$storage->getDocuments()->addDocument($postValues);
-			$this->restoreUserSessionBackup();
-			$this->setSubmitToSession();
-			$this->postSubmit($postValues, $storage);
-		}
-	}
-
-	/**
-	 * Hook for derived classes to take actions after
-	 * submitting the form
-	 *
-	 * @param $postValues
-	 * @param $storage
-	 */
-	protected function postSubmit($postValues, $storage)
-	{}
-
-	/**
-	 * Sets a unique id for this particular form, so it can recognize
-	 * it when a submit occurs
-	 */
-	private function setFormId()
-	{
-		if (isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID])) {
-			$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
-		} else {
-			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string)microtime(true);
-			$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = false;
-			$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
-		}
-	}
-
-	/**
-	 * Checks if this form has been submitted
-	 *
-	 * @param \CloudControl\Cms\cc\Request $request
-	 *
-	 * @return bool
-	 */
-	private function isFormSubmitted($request)
-	{
-		return !empty($request::$post) && isset($request::$post[self::PARAMETER_FORM_ID]) && $request::$post[self::PARAMETER_FORM_ID] === $this->formId && isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID]) && $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] === $this->formId;
-	}
-
-	/**
-	 * @param \cc\Request $request
-	 * @return array
-	 */
-	private function getPostValues($request)
-	{
-		$postValues = $request::$post;
-		$postValues[self::PARAMETER_DOCUMENT_TYPE] = $this->documentType;
-		$postValues[self::GET_PARAMETER_PATH] = $this->responseFolder;
-		$postValues['title'] = date('r') . ' - From: ' . $request::$requestUri;
-
-		return $postValues;
-	}
-
-	/**
-	 * Temporarily stores the current user session in a backup variable
-	 * and sets a fake user instead
-	 */
-	private function setUserSessionBackup()
-	{
-		$this->userSessionBackup = isset($_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL]) ? $_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL] : null;
-		$fakeUser = new \stdClass();
-		$fakeUser->username = self::SESSION_PARAMETER_FORM_COMPONENT;
-		$_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL] = $fakeUser;
-	}
-
-	/**
-	 * Removes the fake user and restores the existing user
-	 * session if it was there
-	 */
-	private function restoreUserSessionBackup()
-	{
-		if ($this->userSessionBackup === null) {
-			unset($_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL]);
-		} else {
-			$_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL] = $this->userSessionBackup;
-		}
-	}
-
-	private function setSubmitToSession()
-	{
-		$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = true;
-	}
-
-	private function isSubmitAllowed()
-	{
-		if ($this->submitOncePerSession === true && $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] === true) {
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	private function checkDocumentTypeParameter()
-	{
-		if (isset($this->parameters[self::PARAMETER_DOCUMENT_TYPE])) {
-			$this->documentType = $this->parameters[self::PARAMETER_DOCUMENT_TYPE];
-			unset($this->parameters[self::PARAMETER_DOCUMENT_TYPE]);
-		}
-	}
-
-	private function checkResponseFolderParameter()
-	{
-		if (isset($this->parameters[self::PARAMETER_RESPONSE_FOLDER])) {
-			$this->responseFolder = $this->parameters[self::PARAMETER_RESPONSE_FOLDER];
-			unset($this->parameters[self::PARAMETER_RESPONSE_FOLDER]);
-		}
-	}
-
-	private function checkSubTemplateParameter()
-	{
-		if (isset($this->parameters[self::PARAMETER_SUB_TEMPLATE])) {
-			$this->subTemplate = $this->parameters[self::PARAMETER_SUB_TEMPLATE];
-			unset($this->parameters[self::PARAMETER_SUB_TEMPLATE]);
-		}
-	}
-
-	private function checkFormParameterNameParameter()
-	{
-		if (isset($this->parameters[self::PARAMETER_FORM_PARAMETER_NAME])) {
-			$this->formParameterName = $this->parameters[self::PARAMETER_FORM_PARAMETER_NAME];
-			unset($this->parameters[self::PARAMETER_FORM_PARAMETER_NAME]);
-		}
-	}
-
-	private function checkThankYouMessageParameter()
-	{
-		if (isset($this->parameters[self::PARAMETER_THANK_YOU_MESSAGE])) {
-			$this->thankYouMessage = $this->parameters[self::PARAMETER_THANK_YOU_MESSAGE];
-			unset($this->parameters[self::PARAMETER_THANK_YOU_MESSAGE]);
-		}
-	}
-
-	private function checkSubmitOncePerSessionParameter()
-	{
-		if (isset($this->parameters[self::PARAMETER_SUBMIT_ONCE_PER_SESSION])) {
-			$this->submitOncePerSession = $this->parameters[self::PARAMETER_SUBMIT_ONCE_PER_SESSION] === 'true';
-			unset($this->parameters[self::PARAMETER_SUBMIT_ONCE_PER_SESSION]);
-		}
-	}
-
-	/**
-	 * @throws \Exception
-	 */
-	private function checkRequiredParameters()
-	{
-		if ($this->documentType === null || $this->responseFolder === null) {
-			throw new \Exception('Parameters `documentType` and `responseFolder` are required for usage with this form');
-		}
-	}
-
-	/**
-	 * @return \cc\Request
-	 */
-	private function setPathBackup()
-	{
-		$request = $this->request;
-		if (isset($request::$get[self::GET_PARAMETER_PATH])) {
-			$this->getPathBackup = $request::$get[self::GET_PARAMETER_PATH];
-		}
-		$request::$get[self::GET_PARAMETER_PATH] = $this->responseFolder;
-
-		return $request;
-	}
-
-	/**
-	 * @param \cc\Request $request
-	 */
-	private function resetPathBackup($request)
-	{
-		if ($this->getPathBackup !== null) {
-			$request::$get[self::GET_PARAMETER_PATH] = $this->getPathBackup;
-		} else {
-			unset($request::$get[self::GET_PARAMETER_PATH]);
-		}
-	}
-
-	/**
-	 * @param $form
-	 */
-	private function setFormParameter($form)
-	{
-		if ($this->isFormSubmitted($this->request) || $this->isSubmitAllowed() === false) {
-			$this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage;
-		} else {
-			$this->parameters[$this->formParameterName] = $form;
-		}
-	}
+    const GET_PARAMETER_PATH = 'path';
+
+    const PARAMETER_CMS_PREFIX = 'cmsPrefix';
+    const PARAMETER_DOCUMENT_TYPE = 'documentType';
+    const PARAMETER_DOCUMENT_TYPES = 'documentTypes';
+    const PARAMETER_FORM_ID = 'formId';
+    const PARAMETER_FORM_PARAMETER_NAME = 'formParameterName';
+    const PARAMETER_HIDE_TITLE_AND_STATE = 'hideTitleAndState';
+    const PARAMETER_RESPONSE_FOLDER = 'responseFolder';
+    const PARAMETER_SMALLEST_IMAGE = 'smallestImage';
+    const PARAMETER_SUBMIT_ONCE_PER_SESSION = 'submitOncePerSession';
+    const PARAMETER_SUB_TEMPLATE = 'subTemplate';
+    const PARAMETER_THANK_YOU_MESSAGE = 'thankYouMessage';
+
+    const SESSION_PARAMETER_CLOUDCONTROL = 'cloudcontrol';
+    const SESSION_PARAMETER_FORM_COMPONENT = 'FormComponent';
+    /**
+     * @var null|string
+     */
+    protected $documentType = null;
+    /**
+     * @var null|string
+     */
+    protected $responseFolder = null;
+    /**
+     * @var string
+     */
+    protected $subTemplate = 'cms/documents/document-form-form';
+    /**
+     * @var string
+     */
+    protected $formParameterName = 'form';
+    /**
+     * @var string
+     */
+    protected $thankYouMessage = 'Thank you for sending us your response.';
+
+    /**
+     * @var bool
+     */
+    protected $submitOncePerSession = false;
+
+    /**
+     * @var string
+     */
+    private $formId;
+    /**
+     * @var null|string
+     */
+    private $getPathBackup = null;
+
+    /**
+     * @var null|\stdClass
+     */
+    private $userSessionBackup = null;
+
+    /**
+     * @param Storage $storage
+     *
+     * @return void
+     * @throws \Exception
+     */
+    public function run(Storage $storage)
+    {
+        parent::run($storage);
+        $this->checkParameters();
+        $this->checkRequiredParameters();
+        $this->setFormId();
+        $this->initialize($storage);
+        $this->checkSubmit($storage);
+    }
+
+    /**
+     * @param null|Application $application
+     *
+     * @throws \Exception
+     */
+    public function render($application = null)
+    {
+        $request = $this->setPathBackup();
+        $form = $this->renderTemplate($this->subTemplate);
+        $this->resetPathBackup($request);
+        $this->setFormParameter($form);
+
+        parent::render($application);
+    }
+
+    /**
+     * Checks if parameters were given in the CMS configuration and
+     * sets them to their respective fields
+     */
+    private function checkParameters()
+    {
+        $this->checkDocumentTypeParameter();
+        $this->checkResponseFolderParameter();
+        $this->checkSubTemplateParameter();
+        $this->checkFormParameterNameParameter();
+        $this->checkThankYouMessageParameter();
+        $this->checkSubmitOncePerSessionParameter();
+    }
+
+    /**
+     * Sets variables needed for rendering the form template
+     *
+     * @param Storage $storage
+     */
+    private function initialize($storage)
+    {
+        $this->parameters[self::PARAMETER_SMALLEST_IMAGE] = $storage->getImageSet()->getSmallestImageSet();
+        $this->parameters[self::PARAMETER_CMS_PREFIX] = '';
+
+        $this->parameters[self::PARAMETER_DOCUMENT_TYPE] = $this->storage->getDocumentTypes()->getDocumentTypeBySlug($this->documentType, true);
+        $this->parameters[self::PARAMETER_DOCUMENT_TYPES] = $this->storage->getDocumentTypes()->getDocumentTypes();
+        $this->parameters[self::PARAMETER_HIDE_TITLE_AND_STATE] = true;
+        $this->parameters[self::PARAMETER_FORM_ID] = $this->formId;
+    }
+
+    /**
+     * If the form has been submitted, save the document
+     * Calls $this->postSubmit() afterwards
+     *
+     * @param Storage $storage
+     */
+    private function checkSubmit($storage)
+    {
+        if ($this->isFormSubmitted($this->request) && $this->isSubmitAllowed()) {
+            $postValues = $this->getPostValues($this->request);
+            $this->setUserSessionBackup();
+            $storage->getDocuments()->addDocument($postValues);
+            $this->restoreUserSessionBackup();
+            $this->setSubmitToSession();
+            $this->postSubmit($postValues, $storage);
+        }
+    }
+
+    /**
+     * Hook for derived classes to take actions after
+     * submitting the form
+     *
+     * @param $postValues
+     * @param $storage
+     */
+    protected function postSubmit($postValues, $storage)
+    {}
+
+    /**
+     * Sets a unique id for this particular form, so it can recognize
+     * it when a submit occurs
+     */
+    private function setFormId()
+    {
+        if (isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID])) {
+            $this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
+        } else {
+            $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string)microtime(true);
+            $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = false;
+            $this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
+        }
+    }
+
+    /**
+     * Checks if this form has been submitted
+     *
+     * @param \CloudControl\Cms\cc\Request $request
+     *
+     * @return bool
+     */
+    private function isFormSubmitted($request)
+    {
+        return !empty($request::$post) && isset($request::$post[self::PARAMETER_FORM_ID]) && $request::$post[self::PARAMETER_FORM_ID] === $this->formId && isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID]) && $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] === $this->formId;
+    }
+
+    /**
+     * @param \cc\Request $request
+     * @return array
+     */
+    private function getPostValues($request)
+    {
+        $postValues = $request::$post;
+        $postValues[self::PARAMETER_DOCUMENT_TYPE] = $this->documentType;
+        $postValues[self::GET_PARAMETER_PATH] = $this->responseFolder;
+        $postValues['title'] = date('r') . ' - From: ' . $request::$requestUri;
+
+        return $postValues;
+    }
+
+    /**
+     * Temporarily stores the current user session in a backup variable
+     * and sets a fake user instead
+     */
+    private function setUserSessionBackup()
+    {
+        $this->userSessionBackup = isset($_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL]) ? $_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL] : null;
+        $fakeUser = new \stdClass();
+        $fakeUser->username = self::SESSION_PARAMETER_FORM_COMPONENT;
+        $_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL] = $fakeUser;
+    }
+
+    /**
+     * Removes the fake user and restores the existing user
+     * session if it was there
+     */
+    private function restoreUserSessionBackup()
+    {
+        if ($this->userSessionBackup === null) {
+            unset($_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL]);
+        } else {
+            $_SESSION[self::SESSION_PARAMETER_CLOUDCONTROL] = $this->userSessionBackup;
+        }
+    }
+
+    private function setSubmitToSession()
+    {
+        $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = true;
+    }
+
+    private function isSubmitAllowed()
+    {
+        if ($this->submitOncePerSession === true && $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] === true) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    private function checkDocumentTypeParameter()
+    {
+        if (isset($this->parameters[self::PARAMETER_DOCUMENT_TYPE])) {
+            $this->documentType = $this->parameters[self::PARAMETER_DOCUMENT_TYPE];
+            unset($this->parameters[self::PARAMETER_DOCUMENT_TYPE]);
+        }
+    }
+
+    private function checkResponseFolderParameter()
+    {
+        if (isset($this->parameters[self::PARAMETER_RESPONSE_FOLDER])) {
+            $this->responseFolder = $this->parameters[self::PARAMETER_RESPONSE_FOLDER];
+            unset($this->parameters[self::PARAMETER_RESPONSE_FOLDER]);
+        }
+    }
+
+    private function checkSubTemplateParameter()
+    {
+        if (isset($this->parameters[self::PARAMETER_SUB_TEMPLATE])) {
+            $this->subTemplate = $this->parameters[self::PARAMETER_SUB_TEMPLATE];
+            unset($this->parameters[self::PARAMETER_SUB_TEMPLATE]);
+        }
+    }
+
+    private function checkFormParameterNameParameter()
+    {
+        if (isset($this->parameters[self::PARAMETER_FORM_PARAMETER_NAME])) {
+            $this->formParameterName = $this->parameters[self::PARAMETER_FORM_PARAMETER_NAME];
+            unset($this->parameters[self::PARAMETER_FORM_PARAMETER_NAME]);
+        }
+    }
+
+    private function checkThankYouMessageParameter()
+    {
+        if (isset($this->parameters[self::PARAMETER_THANK_YOU_MESSAGE])) {
+            $this->thankYouMessage = $this->parameters[self::PARAMETER_THANK_YOU_MESSAGE];
+            unset($this->parameters[self::PARAMETER_THANK_YOU_MESSAGE]);
+        }
+    }
+
+    private function checkSubmitOncePerSessionParameter()
+    {
+        if (isset($this->parameters[self::PARAMETER_SUBMIT_ONCE_PER_SESSION])) {
+            $this->submitOncePerSession = $this->parameters[self::PARAMETER_SUBMIT_ONCE_PER_SESSION] === 'true';
+            unset($this->parameters[self::PARAMETER_SUBMIT_ONCE_PER_SESSION]);
+        }
+    }
+
+    /**
+     * @throws \Exception
+     */
+    private function checkRequiredParameters()
+    {
+        if ($this->documentType === null || $this->responseFolder === null) {
+            throw new \Exception('Parameters `documentType` and `responseFolder` are required for usage with this form');
+        }
+    }
+
+    /**
+     * @return \cc\Request
+     */
+    private function setPathBackup()
+    {
+        $request = $this->request;
+        if (isset($request::$get[self::GET_PARAMETER_PATH])) {
+            $this->getPathBackup = $request::$get[self::GET_PARAMETER_PATH];
+        }
+        $request::$get[self::GET_PARAMETER_PATH] = $this->responseFolder;
+
+        return $request;
+    }
+
+    /**
+     * @param \cc\Request $request
+     */
+    private function resetPathBackup($request)
+    {
+        if ($this->getPathBackup !== null) {
+            $request::$get[self::GET_PARAMETER_PATH] = $this->getPathBackup;
+        } else {
+            unset($request::$get[self::GET_PARAMETER_PATH]);
+        }
+    }
+
+    /**
+     * @param $form
+     */
+    private function setFormParameter($form)
+    {
+        if ($this->isFormSubmitted($this->request) || $this->isSubmitAllowed() === false) {
+            $this->parameters[$this->formParameterName] = '<a name="' . $this->formId . '"></a>' . $this->thankYouMessage;
+        } else {
+            $this->parameters[$this->formParameterName] = $form;
+        }
+    }
 }
\ No newline at end of file

src/images/Image.php

Doc Comments +9 added lines, -9 removed lines

@@ -76,7 +76,7 @@ 
 		 * @param string $imagePath
 		 * @param bool   $getExtension
 		 *
-		 * @return bool|int|string
+		 * @return integer
 		 */
 		public function getImageMimeType($imagePath, $getExtension = false)
 		{
@@ -149,7 +149,7 @@ 
 		}
 
 		/**
-		 * @param $pathToBitmapFile
+		 * @param string $pathToBitmapFile
 		 *
 		 * @return string
 		 */
@@ -165,7 +165,7 @@ 
 		}
 
 		/**
-		 * @param $header
+		 * @param string $header
 		 *
 		 * @return array
 		 */
@@ -195,14 +195,14 @@ 
 		 * Loop through the data in the body of the bitmap
 		 * file and calculate each individual pixel based on the
 		 * bytes
-		 * @param $bodySize
-		 * @param $x
+		 * @param integer $bodySize
+		 * @param integer $x
 		 * @param $width
-		 * @param $usePadding
-		 * @param $y
+		 * @param boolean $usePadding
+		 * @param integer $y
 		 * @param $height
-		 * @param $body
-		 * @param $image
+		 * @param string $body
+		 * @param resource $image
 		 */
 		private function loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image)
 		{

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
 			} 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>');
 			}
 		}
 
@@ -179,9 +179,9 @@ 
 				//    Cut it in parts of 2 bytes
 				$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);
 
@@ -226,9 +226,9 @@ 
 				}
 				//    Calculation of the RGB-pixel (defined as BGR in image-data). Define $iPos as absolute position in the body
 				$iPos = $i * 2;
-				$r = hexdec($body[$iPos + 4] . $body[$iPos + 5]);
-				$g = hexdec($body[$iPos + 2] . $body[$iPos + 3]);
-				$b = hexdec($body[$iPos] . $body[$iPos + 1]);
+				$r = hexdec($body[$iPos + 4].$body[$iPos + 5]);
+				$g = hexdec($body[$iPos + 2].$body[$iPos + 3]);
+				$b = hexdec($body[$iPos].$body[$iPos + 1]);
 				//    Calculate and draw the pixel
 				$color = imagecolorallocate($image, $r, $g, $b);
 				imagesetpixel($image, $x, $height - $y, $color);

Indentation +227 added lines, -227 removed lines

@@ -9,232 +9,232 @@
  */
 
 namespace CloudControl\Cms\images {
-	class Image
-	{
-		private $_imageResource;
-
-		/**
-		 * Load the a image resource into $this->_imageResource
-		 * automagically :-)
-		 *
-		 * @param    resource | string | path
-		 *
-		 * @throws    \Exception
-		 */
-		public function loadImage($imageContainer)
-		{
-			if (is_resource($imageContainer) && get_resource_type($imageContainer) === 'gd') {
-				$this->_imageResource = $imageContainer;
-			} elseif (is_string($imageContainer) && file_exists($imageContainer)) {
-				if ($this->getImageMimeType($imageContainer) == IMAGETYPE_BMP) {
-					$this->_imageResource = $this->createImageFromBmp($imageContainer);
-				} else {
-					$imageContent = file_get_contents($imageContainer);
-					$this->_imageResource = imagecreatefromstring($imageContent);
-				}
-			} 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>');
-			}
-		}
-
-		/**
-		 * Saves the image to a file
-		 *
-		 * @param string $path
-		 * @param int    $mimeTypeConstantValue
-		 * @param int    $quality
-		 * @param null   $imageResource If no resource is given, uses $this->_imageResource
-		 *
-		 * @return bool
-		 * @throws \Exception
-		 */
-		public function saveImage($path, $mimeTypeConstantValue, $quality = 100, $imageResource = null)
-		{
-			if ($imageResource == null) {
-				$imageResource = $this->getImageResource();
-			}
-
-			if ($mimeTypeConstantValue == IMAGETYPE_GIF) {
-				return imagegif($imageResource, $path);
-			} elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG) {
-				return imagejpeg($imageResource, $path, $quality);
-			} elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) {
-				return imagepng($imageResource, $path, (intval($quality / 10) - 1));
-			} else {
-				throw new \Exception('Not a valid mimetypeconstant given see function documentation');
-			}
-		}
-
-		/**
-		 * Returns either the Mime-Type Constant value
-		 * or the default extension for the detected mime-type;
-		 *
-		 * @see http://www.php.net/manual/en/function.image-type-to-mime-type.php
-		 *
-		 * @param string $imagePath
-		 * @param bool   $getExtension
-		 *
-		 * @return bool|int|string
-		 */
-		public function getImageMimeType($imagePath, $getExtension = false)
-		{
-			if (function_exists('exif_imagetype')) {
-				$exif = exif_imagetype($imagePath);
-			} else {
-				if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false) {
-					$exif = $type;
-				} else {
-					$exif = false;
-				}
-			}
-
-			return $getExtension ? image_type_to_extension($exif) : $exif;
-		}
-
-		/**
-		 * Create Image resource from Bitmap
-		 *
-		 * @see       http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
-		 * @author    alexander at alexauto dot nl
-		 *
-		 * @param    string $pathToBitmapFile
-		 *
-		 * @return  resource
-		 */
-		public function createImageFromBmp($pathToBitmapFile)
-		{
-			$bitmapFileData = $this->getBitmapFileData($pathToBitmapFile);
-
-			$temp = unpack("H*", $bitmapFileData);
-			$hex = $temp[1];
-			$header = substr($hex, 0, 108);
-			list($width, $height) = $this->calculateWidthAndHeight($header);
-
-			//    Define starting X and Y 
-			$x = 0;
-			$y = 1;
-
-			$image = imagecreatetruecolor($width, $height);
-
-			//    Grab the body from the image 
-			$body = substr($hex, 108);
-
-			//    Calculate if padding at the end-line is needed. Divided by two to keep overview. 1 byte = 2 HEX-chars
-			$bodySize = (strlen($body) / 2);
-			$headerSize = ($width * $height);
-
-			//    Use end-line padding? Only when needed 
-			$usePadding = ($bodySize > ($headerSize * 3) + 4);
-			$this->loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image);
-
-			unset($body);
-
-			return $image;
-		}
-
-		/**
-		 * Returns the image resource
-		 * @return resource
-		 * @throws \Exception
-		 */
-		final public function getImageResource()
-		{
-			if (is_resource($this->_imageResource) && get_resource_type($this->_imageResource) === 'gd') {
-				return $this->_imageResource;
-			} else {
-				throw new \Exception('Image resource is not set. Use $this->LoadImage to load an image into the resource');
-			}
-		}
-
-		/**
-		 * @param $pathToBitmapFile
-		 *
-		 * @return string
-		 */
-		private function getBitmapFileData($pathToBitmapFile)
-		{
-			$fileHandle = fopen($pathToBitmapFile, "rb");
-			$bitmapFileData = fread($fileHandle, 10);
-			while (!feof($fileHandle) && ($bitmapFileData <> "")) {
-				$bitmapFileData .= fread($fileHandle, 1024);
-			}
-
-			return $bitmapFileData;
-		}
-
-		/**
-		 * @param $header
-		 *
-		 * @return array
-		 */
-		private function calculateWidthAndHeight($header)
-		{
-			$width = null;
-			$height = null;
-
-			//    Structure: http://www.fastgraph.com/help/bmp_header_format.html
-			if (substr($header, 0, 4) == "424d") {
-				//    Cut it in parts of 2 bytes
-				$header_parts = str_split($header, 2);
-				//    Get the width        4 bytes
-				$width = hexdec($header_parts[19] . $header_parts[18]);
-				//    Get the height        4 bytes
-				$height = hexdec($header_parts[23] . $header_parts[22]);
-				//    Unset the header params
-				unset($header_parts);
-
-				return array($width, $height);
-			}
-
-			return array($width, $height);
-		}
-
-		/**
-		 * Loop through the data in the body of the bitmap
-		 * file and calculate each individual pixel based on the
-		 * bytes
-		 * @param $bodySize
-		 * @param $x
-		 * @param $width
-		 * @param $usePadding
-		 * @param $y
-		 * @param $height
-		 * @param $body
-		 * @param $image
-		 */
-		private function loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image)
-		{
+    class Image
+    {
+        private $_imageResource;
+
+        /**
+         * Load the a image resource into $this->_imageResource
+         * automagically :-)
+         *
+         * @param    resource | string | path
+         *
+         * @throws    \Exception
+         */
+        public function loadImage($imageContainer)
+        {
+            if (is_resource($imageContainer) && get_resource_type($imageContainer) === 'gd') {
+                $this->_imageResource = $imageContainer;
+            } elseif (is_string($imageContainer) && file_exists($imageContainer)) {
+                if ($this->getImageMimeType($imageContainer) == IMAGETYPE_BMP) {
+                    $this->_imageResource = $this->createImageFromBmp($imageContainer);
+                } else {
+                    $imageContent = file_get_contents($imageContainer);
+                    $this->_imageResource = imagecreatefromstring($imageContent);
+                }
+            } 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>');
+            }
+        }
+
+        /**
+         * Saves the image to a file
+         *
+         * @param string $path
+         * @param int    $mimeTypeConstantValue
+         * @param int    $quality
+         * @param null   $imageResource If no resource is given, uses $this->_imageResource
+         *
+         * @return bool
+         * @throws \Exception
+         */
+        public function saveImage($path, $mimeTypeConstantValue, $quality = 100, $imageResource = null)
+        {
+            if ($imageResource == null) {
+                $imageResource = $this->getImageResource();
+            }
+
+            if ($mimeTypeConstantValue == IMAGETYPE_GIF) {
+                return imagegif($imageResource, $path);
+            } elseif ($mimeTypeConstantValue == IMAGETYPE_JPEG) {
+                return imagejpeg($imageResource, $path, $quality);
+            } elseif ($mimeTypeConstantValue == IMAGETYPE_PNG) {
+                return imagepng($imageResource, $path, (intval($quality / 10) - 1));
+            } else {
+                throw new \Exception('Not a valid mimetypeconstant given see function documentation');
+            }
+        }
+
+        /**
+         * Returns either the Mime-Type Constant value
+         * or the default extension for the detected mime-type;
+         *
+         * @see http://www.php.net/manual/en/function.image-type-to-mime-type.php
+         *
+         * @param string $imagePath
+         * @param bool   $getExtension
+         *
+         * @return bool|int|string
+         */
+        public function getImageMimeType($imagePath, $getExtension = false)
+        {
+            if (function_exists('exif_imagetype')) {
+                $exif = exif_imagetype($imagePath);
+            } else {
+                if ((list($width, $height, $type, $attr) = getimagesize($imagePath)) !== false) {
+                    $exif = $type;
+                } else {
+                    $exif = false;
+                }
+            }
+
+            return $getExtension ? image_type_to_extension($exif) : $exif;
+        }
+
+        /**
+         * Create Image resource from Bitmap
+         *
+         * @see       http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
+         * @author    alexander at alexauto dot nl
+         *
+         * @param    string $pathToBitmapFile
+         *
+         * @return  resource
+         */
+        public function createImageFromBmp($pathToBitmapFile)
+        {
+            $bitmapFileData = $this->getBitmapFileData($pathToBitmapFile);
+
+            $temp = unpack("H*", $bitmapFileData);
+            $hex = $temp[1];
+            $header = substr($hex, 0, 108);
+            list($width, $height) = $this->calculateWidthAndHeight($header);
+
+            //    Define starting X and Y 
+            $x = 0;
+            $y = 1;
+
+            $image = imagecreatetruecolor($width, $height);
+
+            //    Grab the body from the image 
+            $body = substr($hex, 108);
+
+            //    Calculate if padding at the end-line is needed. Divided by two to keep overview. 1 byte = 2 HEX-chars
+            $bodySize = (strlen($body) / 2);
+            $headerSize = ($width * $height);
+
+            //    Use end-line padding? Only when needed 
+            $usePadding = ($bodySize > ($headerSize * 3) + 4);
+            $this->loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image);
+
+            unset($body);
+
+            return $image;
+        }
+
+        /**
+         * Returns the image resource
+         * @return resource
+         * @throws \Exception
+         */
+        final public function getImageResource()
+        {
+            if (is_resource($this->_imageResource) && get_resource_type($this->_imageResource) === 'gd') {
+                return $this->_imageResource;
+            } else {
+                throw new \Exception('Image resource is not set. Use $this->LoadImage to load an image into the resource');
+            }
+        }
+
+        /**
+         * @param $pathToBitmapFile
+         *
+         * @return string
+         */
+        private function getBitmapFileData($pathToBitmapFile)
+        {
+            $fileHandle = fopen($pathToBitmapFile, "rb");
+            $bitmapFileData = fread($fileHandle, 10);
+            while (!feof($fileHandle) && ($bitmapFileData <> "")) {
+                $bitmapFileData .= fread($fileHandle, 1024);
+            }
+
+            return $bitmapFileData;
+        }
+
+        /**
+         * @param $header
+         *
+         * @return array
+         */
+        private function calculateWidthAndHeight($header)
+        {
+            $width = null;
+            $height = null;
+
+            //    Structure: http://www.fastgraph.com/help/bmp_header_format.html
+            if (substr($header, 0, 4) == "424d") {
+                //    Cut it in parts of 2 bytes
+                $header_parts = str_split($header, 2);
+                //    Get the width        4 bytes
+                $width = hexdec($header_parts[19] . $header_parts[18]);
+                //    Get the height        4 bytes
+                $height = hexdec($header_parts[23] . $header_parts[22]);
+                //    Unset the header params
+                unset($header_parts);
+
+                return array($width, $height);
+            }
+
+            return array($width, $height);
+        }
+
+        /**
+         * Loop through the data in the body of the bitmap
+         * file and calculate each individual pixel based on the
+         * bytes
+         * @param $bodySize
+         * @param $x
+         * @param $width
+         * @param $usePadding
+         * @param $y
+         * @param $height
+         * @param $body
+         * @param $image
+         */
+        private function loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image)
+        {
 //    Using a for-loop with index-calculation instead of str_split to avoid large memory consumption
-			//    Calculate the next DWORD-position in the body
-			for ($i = 0; $i < $bodySize; $i += 3) {
-				//    Calculate line-ending and padding
-				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;
-					}
-					//    Reset horizontal position
-					$x = 0;
-					//    Raise the height-position (bottom-up)
-					$y++;
-					//    Reached the image-height? Break the for-loop
-					if ($y > $height) {
-						break;
-					}
-				}
-				//    Calculation of the RGB-pixel (defined as BGR in image-data). Define $iPos as absolute position in the body
-				$iPos = $i * 2;
-				$r = hexdec($body[$iPos + 4] . $body[$iPos + 5]);
-				$g = hexdec($body[$iPos + 2] . $body[$iPos + 3]);
-				$b = hexdec($body[$iPos] . $body[$iPos + 1]);
-				//    Calculate and draw the pixel
-				$color = imagecolorallocate($image, $r, $g, $b);
-				imagesetpixel($image, $x, $height - $y, $color);
-				//    Raise the horizontal position
-				$x++;
-			}
-		}
-	}
+            //    Calculate the next DWORD-position in the body
+            for ($i = 0; $i < $bodySize; $i += 3) {
+                //    Calculate line-ending and padding
+                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;
+                    }
+                    //    Reset horizontal position
+                    $x = 0;
+                    //    Raise the height-position (bottom-up)
+                    $y++;
+                    //    Reached the image-height? Break the for-loop
+                    if ($y > $height) {
+                        break;
+                    }
+                }
+                //    Calculation of the RGB-pixel (defined as BGR in image-data). Define $iPos as absolute position in the body
+                $iPos = $i * 2;
+                $r = hexdec($body[$iPos + 4] . $body[$iPos + 5]);
+                $g = hexdec($body[$iPos + 2] . $body[$iPos + 3]);
+                $b = hexdec($body[$iPos] . $body[$iPos + 1]);
+                //    Calculate and draw the pixel
+                $color = imagecolorallocate($image, $r, $g, $b);
+                imagesetpixel($image, $x, $height - $y, $color);
+                //    Raise the horizontal position
+                $x++;
+            }
+        }
+    }
 }
\ No newline at end of file

src/storage/storage/ImagesStorage.php

Doc Comments +4 added lines

@@ -13,6 +13,10 @@
 {
     protected $imagesDir;
 
+    /**
+     * @param \CloudControl\Cms\storage\Repository $repository
+     * @param string $imagesDir
+     */
     public function __construct($repository, $imagesDir)
     {
         parent::__construct($repository);

Spacing +4 added lines, -4 removed lines

@@ -45,10 +45,10 @@ 
         $destinationPath = $this->getDestinationPath();
 
         $filename = $this->validateFilename($postValues['name'], $destinationPath);
-        $destination = $destinationPath . DIRECTORY_SEPARATOR . $filename;
+        $destination = $destinationPath.DIRECTORY_SEPARATOR.$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)) {
@@ -80,7 +80,7 @@ 
         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 {
@@ -128,7 +128,7 @@ 
      */
     private function getDestinationPath()
     {
-        $destinationPath = realpath($this->imagesDir . DIRECTORY_SEPARATOR);
+        $destinationPath = realpath($this->imagesDir.DIRECTORY_SEPARATOR);
         return $destinationPath;
     }
 }
\ No newline at end of file

src/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;
 			}

Indentation +60 added lines, -60 removed lines

@@ -14,73 +14,73 @@
     use CloudControl\Cms\images\IMethod;
 
     class Resize extends IMethod
-	{
-		protected $_width;
-		protected $_height;
-		protected $_preserveAspectRatio = true;
+    {
+        protected $_width;
+        protected $_height;
+        protected $_preserveAspectRatio = true;
 		
-		/**
-		 * Set the width
-		 *
-		 * @param  int $width
-		 * @return self
-		 */
-		public function SetWidth($width)
-		{
-			$this->_width = intval($width);
-			return $this;
-		}
+        /**
+         * Set the width
+         *
+         * @param  int $width
+         * @return self
+         */
+        public function SetWidth($width)
+        {
+            $this->_width = intval($width);
+            return $this;
+        }
 		
-		/**
-		 * Set the height
-		 *
-		 * @param  int $height
-		 * @return self
-		 */
-		public function SetHeight($height)
-		{
-			$this->_height = intval($height);
-			return $this;
-		}
+        /**
+         * Set the height
+         *
+         * @param  int $height
+         * @return self
+         */
+        public function SetHeight($height)
+        {
+            $this->_height = intval($height);
+            return $this;
+        }
 		
-		/**
-		 * Sets wheter or not the aspect ratio of the original
-		 * image needs to preserved
-		 *
-		 * @param  bool $bool
-		 * @return self
-		 */
-		public function SetPreserveAspectRatio($bool)
-		{
-			$this->_preserveAspectRatio = (bool) $bool;
-			return $this;
-		}
+        /**
+         * Sets wheter or not the aspect ratio of the original
+         * image needs to preserved
+         *
+         * @param  bool $bool
+         * @return self
+         */
+        public function SetPreserveAspectRatio($bool)
+        {
+            $this->_preserveAspectRatio = (bool) $bool;
+            return $this;
+        }
 		
-		public function Execute($imageResource)
-		{
-			// Define the origial width and height
-			$originalWidth = imagesx($imageResource);
-			$originalHeight = imagesy($imageResource);
+        public function Execute($imageResource)
+        {
+            // Define the origial width and height
+            $originalWidth = imagesx($imageResource);
+            $originalHeight = imagesy($imageResource);
 			
-			// Define the ratio and adjust the width and height
-			if ($this->_preserveAspectRatio) {
-				$ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight);
-				$this->_width = $originalWidth * $ratio;
-				$this->_height = $originalHeight * $ratio;
-			}
+            // Define the ratio and adjust the width and height
+            if ($this->_preserveAspectRatio) {
+                $ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight);
+                $this->_width = $originalWidth * $ratio;
+                $this->_height = $originalHeight * $ratio;
+            }
 			
-			// Create the new image
-			$new = imagecreatetruecolor($this->_width, $this->_height);
+            // Create the new image
+            $new = imagecreatetruecolor($this->_width, $this->_height);
 			
-			// Preserve transparency
-			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-			imagealphablending($new, false);
-			imagesavealpha($new, true);
+            // Preserve transparency
+            imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
+            imagealphablending($new, false);
+            imagesavealpha($new, true);
 			
-			// Do the actual resizing
-			imagecopyresampled($new, $imageResource, 0, 0, 0, 0, $this->_width, $this->_height, $originalWidth, $originalHeight);
+            // Do the actual resizing
+            imagecopyresampled($new, $imageResource, 0, 0, 0, 0, $this->_width, $this->_height, $originalWidth, $originalHeight);
 			
-			return $new;
-		}
-	}
+            return $new;
+        }
+    }
 }
\ No newline at end of file

src/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

Indentation +26 added lines, -26 removed lines

@@ -10,36 +10,36 @@
  
 namespace CloudControl\Cms\images\methods
 {
-	class BoxCrop extends Crop
-	{
-		/**
-		 * @param resource $imageResource
-		 * @return resource
+    class BoxCrop extends Crop
+    {
+        /**
+         * @param resource $imageResource
+         * @return resource
          */
-		public function Execute($imageResource)
-		{
-			// Define the origial width and height
-			$originalWidth = imagesx($imageResource);
-			$originalHeight = imagesy($imageResource);
+        public function Execute($imageResource)
+        {
+            // Define the origial width and height
+            $originalWidth = imagesx($imageResource);
+            $originalHeight = imagesy($imageResource);
 			
-			// Define the ratios
-			$wRatio = $this->_width / $originalWidth;
-			$hRatio = $this->_height / $originalHeight;
+            // Define the ratios
+            $wRatio = $this->_width / $originalWidth;
+            $hRatio = $this->_height / $originalHeight;
 			
-			// Define which ratio will be used, depending on which is the smallest side
-			$ratio = min($hRatio, $wRatio);
-			if($ratio > 1) $ratio = 1;
+            // Define which ratio will be used, depending on which is the smallest side
+            $ratio = min($hRatio, $wRatio);
+            if($ratio > 1) $ratio = 1;
 			
-			// Define sizes
-			$this->_destWidth = floor($originalWidth * $ratio);
-			$this->_destHeight = floor($originalHeight * $ratio);
+            // Define sizes
+            $this->_destWidth = floor($originalWidth * $ratio);
+            $this->_destHeight = floor($originalHeight * $ratio);
 			
-			// Define margins
-			$this->_destX = floor(($this->_width  - $this->_destWidth) / 2);
-			$this->_destY = floor(($this->_height - $this->_destHeight) / 2);
+            // Define margins
+            $this->_destX = floor(($this->_width  - $this->_destWidth) / 2);
+            $this->_destY = floor(($this->_height - $this->_destHeight) / 2);
 			
-			// Execute the Crop method with the given parameters
-			return parent::Execute($imageResource);
-		}
-	}
+            // Execute the Crop method with the given parameters
+            return parent::Execute($imageResource);
+        }
+    }
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -28,7 +28,9 @@
 			
 			// 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);

src/images/ImageResizer.php

Spacing +18 added lines, -18 removed lines

@@ -45,7 +45,7 @@ 
 				}
 				return $returnFileNames;
 			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
+				throw new \Exception('Image doesnt exist: '.$imagePath);
 			}
 		}
 
@@ -56,10 +56,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);
 		}
 
 		/**
@@ -69,10 +69,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);
 		}
 
 		/**
@@ -82,10 +82,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);
 		}
 
 		/**
@@ -94,7 +94,7 @@ 
 		 *
 		 * @return string
 		 */
-		private function modifyName($imagePath, $modifier='')
+		private function modifyName($imagePath, $modifier = '')
 		{
 			$filename = basename($imagePath);
 			$path = dirname($imagePath);
@@ -104,30 +104,30 @@ 
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . $modifier  . '.' . $extension;
+				$filename = $fileNameWithoutExtension.$modifier.'.'.$extension;
 			} else {
 				$filename = StringUtil::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 = 'CloudControl\Cms\\images\\methods\\' . $method;
+			$method = 'CloudControl\Cms\\images\\methods\\'.$method;
 			$destination = $this->modifyName($imagePath, $modifier);
 			if (file_exists($imagePath)) {
 				$image = new Image();
@@ -141,7 +141,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);
 			}
 		}
 	}

Indentation +132 added lines, -132 removed lines

@@ -5,144 +5,144 @@
     use CloudControl\Cms\cc\StringUtil;
 
     /**
-	 * Class ImageResizer
-	 * @package CloudControl\Cms\images
-	 */
-	class ImageResizer
-	{
-		protected $imageSet;
+     * Class ImageResizer
+     * @package CloudControl\Cms\images
+     */
+    class ImageResizer
+    {
+        protected $imageSet;
 
-		/**
-		 * ImageResizer constructor.
-		 *
-		 * @param $imageSet
-		 */
-		public function __construct($imageSet)
-		{
-			$this->imageSet = $imageSet;
-		}
+        /**
+         * ImageResizer constructor.
+         *
+         * @param $imageSet
+         */
+        public function __construct($imageSet)
+        {
+            $this->imageSet = $imageSet;
+        }
 
-		/**
-		 * @param $imagePath
-		 *
-		 * @return array
-		 * @throws \Exception
-		 */
-		public function applyImageSetToImage($imagePath)
-		{
-			$returnFileNames = array();
-			$filename = '';
-			if (file_exists($imagePath)) {
-				foreach ($this->imageSet as $set) {
-					if ($set->method == 'resize') {
-						$filename = $this->resize($imagePath, $set->width, $set->height);
-					} elseif ($set->method == 'smartcrop') {
-						$filename = $this->smartcrop($imagePath, $set->width, $set->height);
-					} elseif ($set->method == 'boxcrop') {
-						$filename = $this->boxcrop($imagePath, $set->width, $set->height);
-					}
-					$returnFileNames[$set->slug] = $filename;
-				}
-				return $returnFileNames;
-			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
-			}
-		}
+        /**
+         * @param $imagePath
+         *
+         * @return array
+         * @throws \Exception
+         */
+        public function applyImageSetToImage($imagePath)
+        {
+            $returnFileNames = array();
+            $filename = '';
+            if (file_exists($imagePath)) {
+                foreach ($this->imageSet as $set) {
+                    if ($set->method == 'resize') {
+                        $filename = $this->resize($imagePath, $set->width, $set->height);
+                    } elseif ($set->method == 'smartcrop') {
+                        $filename = $this->smartcrop($imagePath, $set->width, $set->height);
+                    } elseif ($set->method == 'boxcrop') {
+                        $filename = $this->boxcrop($imagePath, $set->width, $set->height);
+                    }
+                    $returnFileNames[$set->slug] = $filename;
+                }
+                return $returnFileNames;
+            } else {
+                throw new \Exception('Image doesnt exist: ' . $imagePath);
+            }
+        }
 
-		/**
-		 * @param string $imagePath
-		 * @param string $width
-		 * @param string $height
-		 * @return string
-		 * @throws \Exception
-		 */
-		public function resize($imagePath='', $width='',$height='')
-		{
-			$modifier = '-r' . $width . 'x' . $height;
-			return $this->applyMethod('Resize', $imagePath, $width,$height, $modifier);
-		}
+        /**
+         * @param string $imagePath
+         * @param string $width
+         * @param string $height
+         * @return string
+         * @throws \Exception
+         */
+        public function resize($imagePath='', $width='',$height='')
+        {
+            $modifier = '-r' . $width . 'x' . $height;
+            return $this->applyMethod('Resize', $imagePath, $width,$height, $modifier);
+        }
 
-		/**
-		 * @param string $imagePath
-		 * @param string $width
-		 * @param string $height
-		 * @return string
-		 * @throws \Exception
-		 */
-		public function smartcrop($imagePath='', $width='',$height='')
-		{
-			$modifier = '-s' . $width . 'x' . $height;
-			return $this->applyMethod('SmartCrop', $imagePath, $width,$height, $modifier);
-		}
+        /**
+         * @param string $imagePath
+         * @param string $width
+         * @param string $height
+         * @return string
+         * @throws \Exception
+         */
+        public function smartcrop($imagePath='', $width='',$height='')
+        {
+            $modifier = '-s' . $width . 'x' . $height;
+            return $this->applyMethod('SmartCrop', $imagePath, $width,$height, $modifier);
+        }
 
-		/**
-		 * @param string $imagePath
-		 * @param string $width
-		 * @param string $height
-		 * @return string
-		 * @throws \Exception
-		 */
-		public function boxcrop($imagePath='', $width='',$height='')
-		{
-			$modifier = '-b' . $width . 'x' . $height;
-			return $this->applyMethod('BoxCrop', $imagePath, $width,$height, $modifier);
-		}
+        /**
+         * @param string $imagePath
+         * @param string $width
+         * @param string $height
+         * @return string
+         * @throws \Exception
+         */
+        public function boxcrop($imagePath='', $width='',$height='')
+        {
+            $modifier = '-b' . $width . 'x' . $height;
+            return $this->applyMethod('BoxCrop', $imagePath, $width,$height, $modifier);
+        }
 
-		/**
-		 * @param        $imagePath
-		 * @param string $modifier
-		 *
-		 * @return string
-		 */
-		private function modifyName($imagePath, $modifier='')
-		{
-			$filename = basename($imagePath);
-			$path = dirname($imagePath);
-			$fileParts = explode('.', $filename);
-			if (count($fileParts) > 1) {
-				$extension = end($fileParts);
-				array_pop($fileParts);
-				$fileNameWithoutExtension = implode('-', $fileParts);
-				$fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
-				$filename = $fileNameWithoutExtension . $modifier  . '.' . $extension;
-			} else {
-				$filename = StringUtil::slugify($filename);
-			}
+        /**
+         * @param        $imagePath
+         * @param string $modifier
+         *
+         * @return string
+         */
+        private function modifyName($imagePath, $modifier='')
+        {
+            $filename = basename($imagePath);
+            $path = dirname($imagePath);
+            $fileParts = explode('.', $filename);
+            if (count($fileParts) > 1) {
+                $extension = end($fileParts);
+                array_pop($fileParts);
+                $fileNameWithoutExtension = implode('-', $fileParts);
+                $fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
+                $filename = $fileNameWithoutExtension . $modifier  . '.' . $extension;
+            } else {
+                $filename = StringUtil::slugify($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;
-				} else {
-					$filename .= '-copy';
-				}
-				return $this->modifyName($path . '/' . $filename);
-			}
-			return $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;
+                } else {
+                    $filename .= '-copy';
+                }
+                return $this->modifyName($path . '/' . $filename);
+            }
+            return $path . '/' . $filename;
+        }
 
-		private function applyMethod($method, $imagePath, $width, $height, $modifier)
-		{
-			$method = 'CloudControl\Cms\\images\\methods\\' . $method;
-			$destination = $this->modifyName($imagePath, $modifier);
-			if (file_exists($imagePath)) {
-				$image = new Image();
-				$image->loadImage($imagePath);
-				$resize = new $method();
-				$resize->SetWidth($width);
-				$resize->SetHeight($height);
-				$resizedImageResource = $resize->Execute($image->getImageResource());
-				$resizedImage = new Image();
-				$resizedImage->loadImage($resizedImageResource);
-				$resizedImage->saveImage($destination, $resizedImage->getImageMimeType($imagePath), 80);
-				return basename($destination);
-			} else {
-				throw new \Exception('Image doesnt exist: ' . $imagePath);
-			}
-		}
-	}
+        private function applyMethod($method, $imagePath, $width, $height, $modifier)
+        {
+            $method = 'CloudControl\Cms\\images\\methods\\' . $method;
+            $destination = $this->modifyName($imagePath, $modifier);
+            if (file_exists($imagePath)) {
+                $image = new Image();
+                $image->loadImage($imagePath);
+                $resize = new $method();
+                $resize->SetWidth($width);
+                $resize->SetHeight($height);
+                $resizedImageResource = $resize->Execute($image->getImageResource());
+                $resizedImage = new Image();
+                $resizedImage->loadImage($resizedImageResource);
+                $resizedImage->saveImage($destination, $resizedImage->getImageMimeType($imagePath), 80);
+                return basename($destination);
+            } else {
+                throw new \Exception('Image doesnt exist: ' . $imagePath);
+            }
+        }
+    }
 }
\ No newline at end of file

src/cc/Request.php

Spacing +5 added lines, -5 removed lines

@@ -45,23 +45,23 @@
 		 */
 		public function __construct() 
 		{
-            $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
+            $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/');
 			
-			self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
+			self::$subfolders = '/'.str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
 			self::$subfolders = str_replace('//', '/', self::$subfolders);
 			if (PHP_SAPI === 'cli') {
 				global $argv;
 				array_shift($argv);
 				self::$queryString = '';
-				self::$requestUri = self::$subfolders . implode('/', $argv);
+				self::$requestUri = self::$subfolders.implode('/', $argv);
 			} else {
 				self::$requestUri = $_SERVER['REQUEST_URI'];
 				self::$queryString = $_SERVER['QUERY_STRING'];
 			}
 			if (self::$subfolders === '/') {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
+				self::$relativeUri = str_replace('?'.self::$queryString, '', substr(self::$requestUri, 1));
 			} else {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
+				self::$relativeUri = str_replace('?'.self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
 			}
 
 			self::$requestParameters = explode('/', self::$relativeUri);

Indentation +68 added lines, -68 removed lines

@@ -5,79 +5,79 @@
      * Class Request
      * @package CloudControl\Cms\cc
      */
-	class Request {
+    class Request {
 
-		/**
-		 * @var string
-		 */
-		public static $subfolders;
-		/**
-		 * @var string
-		 */
-		public static $requestUri;
-		/**
-		 * @var string
-		 */
-		public static $relativeUri;
-		/**
-		 * @var string
-		 */
-		public static $queryString;
-		/**
-		 * @var array
-		 */
-		public static $requestParameters;
-		/**
-		 * @var array
-		 */
-		public static $post = array();
-		/**
-		 * @var array
-		 */
-		public static $get = array();
-		/**
-		 * @var array
-		 */
-		private $statics = array();
+        /**
+         * @var string
+         */
+        public static $subfolders;
+        /**
+         * @var string
+         */
+        public static $requestUri;
+        /**
+         * @var string
+         */
+        public static $relativeUri;
+        /**
+         * @var string
+         */
+        public static $queryString;
+        /**
+         * @var array
+         */
+        public static $requestParameters;
+        /**
+         * @var array
+         */
+        public static $post = array();
+        /**
+         * @var array
+         */
+        public static $get = array();
+        /**
+         * @var array
+         */
+        private $statics = array();
 
-		/**
-		 * Request constructor.
-		 */
-		public function __construct() 
-		{
+        /**
+         * Request constructor.
+         */
+        public function __construct() 
+        {
             $rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
 			
-			self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
-			self::$subfolders = str_replace('//', '/', self::$subfolders);
-			if (PHP_SAPI === 'cli') {
-				global $argv;
-				array_shift($argv);
-				self::$queryString = '';
-				self::$requestUri = self::$subfolders . implode('/', $argv);
-			} else {
-				self::$requestUri = $_SERVER['REQUEST_URI'];
-				self::$queryString = $_SERVER['QUERY_STRING'];
-			}
-			if (self::$subfolders === '/') {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
-			} else {
-				self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
-			}
+            self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
+            self::$subfolders = str_replace('//', '/', self::$subfolders);
+            if (PHP_SAPI === 'cli') {
+                global $argv;
+                array_shift($argv);
+                self::$queryString = '';
+                self::$requestUri = self::$subfolders . implode('/', $argv);
+            } else {
+                self::$requestUri = $_SERVER['REQUEST_URI'];
+                self::$queryString = $_SERVER['QUERY_STRING'];
+            }
+            if (self::$subfolders === '/') {
+                self::$relativeUri = str_replace('?' . self::$queryString, '', substr(self::$requestUri,1));
+            } else {
+                self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
+            }
 
-			self::$requestParameters = explode('/', self::$relativeUri);
+            self::$requestParameters = explode('/', self::$relativeUri);
 			
-			self::$get = $_GET;
-			self::$post = $_POST;
+            self::$get = $_GET;
+            self::$post = $_POST;
 			
-			$this->statics = array(
-				'subfolders' => self::$subfolders,
-				'requestUri' => self::$requestUri,
-				'relativeUri' => self::$relativeUri,
-				'queryString' => self::$queryString,
-				'requestParameters' => self::$requestParameters,
-				'post' => self::$post,
-				'get' => self::$get
-			);
-		}
-	}
+            $this->statics = array(
+                'subfolders' => self::$subfolders,
+                'requestUri' => self::$requestUri,
+                'relativeUri' => self::$relativeUri,
+                'queryString' => self::$queryString,
+                'requestParameters' => self::$requestParameters,
+                'post' => self::$post,
+                'get' => self::$get
+            );
+        }
+    }
 }
\ No newline at end of file

src/cc/errortemplates/errorviewcli.php

Spacing +10 added lines, -10 removed lines

@@ -2,21 +2,21 @@ 
 | THE FOLLOWING ERROR OCCURED                                                                                                                  |
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
- <?php echo $message . PHP_EOL; ?>
+ <?php echo $message.PHP_EOL; ?>
 
 ------------------------------------------------------------------------------------------------------------------------------------------------
 | IN FILE                                                                                                                                      |
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
- <?php echo $file . ':' . $line . PHP_EOL; ?>
+ <?php echo $file.':'.$line.PHP_EOL; ?>
 
 ------------------------------------------------------------------------------------------------------------------------------------------------
 | CONTENTS OF THE FILE                                                                                                                         |
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
 <?php
-foreach($lines as $nr => $currentLine) {
-	echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
+foreach ($lines as $nr => $currentLine) {
+	echo ($nr == $line ? '* ' : '  ').str_pad($nr, 3, "0", STR_PAD_LEFT).' '.$currentLine;
 }
 ?>
 
@@ -25,11 +25,11 @@ 
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
 <?php
-foreach($trace as $row) {
-	echo (isset($row['file']) ? basename($row['file']) : '') . ':'
-		. (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
-		. (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
-		. (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
-		. (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
+foreach ($trace as $row) {
+	echo (isset($row['file']) ? basename($row['file']) : '').':'
+		. (isset($row['line']) ? $row['line'] : '')."\t\t\t"
+		. (isset($row['class']) ? $row['class'] : ' ')."\t\t\t"
+		. (isset($row['type']) ? $row['type'] : ' ')."\t\t\t"
+		. (isset($row['function']) ? $row['function'] : ' ').PHP_EOL;
 }
 ?>
\ No newline at end of file

Indentation +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
 
 <?php
 foreach($lines as $nr => $currentLine) {
-	echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
+    echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
 }
 ?>
 
@@ -26,10 +26,10 @@ 
 
 <?php
 foreach($trace as $row) {
-	echo (isset($row['file']) ? basename($row['file']) : '') . ':'
-		. (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
-		. (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
-		. (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
-		. (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
+    echo (isset($row['file']) ? basename($row['file']) : '') . ':'
+        . (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
+        . (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
+        . (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
+        . (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
 }
 ?>
\ No newline at end of file