jenskooij / cloudcontrol

src/cc/Application.php

Doc Comments +8 added lines, -2 removed lines

@@ -83,6 +83,9 @@ 
             $this->storage = new Storage($this->getStorageDir(), $this->config->imagesDir, $this->config->filesDir);
         }
 
+        /**
+         * @param Request $request
+         */
         private function redirectMatching($request)
         {
             $redirects = $this->storage->getRedirects()->getRedirects();
@@ -112,7 +115,7 @@ 
          * Loop through sitemap items and see if one matches the requestUri.
          * If it does, add it tot the matchedSitemapItems array
          *
-         * @param $request
+         * @param Request $request
          */
         private function sitemapMatching($request)
         {
@@ -177,7 +180,7 @@ 
          * @param array $parameters
          * @param \stdClass|null $matchedSitemapItem
          *
-         * @return mixed
+         * @return Component
          * @throws \Exception
          */
         private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
@@ -268,6 +271,9 @@ 
             return $this->config->templateDir;
         }
 
+        /**
+         * @return string
+         */
         public function getStorageDir()
         {
             return $this->config->storageDir;

src/components/BaseComponent.php

Doc Comments +2 added lines, -2 removed lines

@@ -141,8 +141,8 @@
 		}
 
         /**
-         * @param $template
-         * @param null $application
+         * @param string $template
+         * @param null|Application $application
          * @return string
          */
         protected function getTemplatePath($template, $application=null)

Indentation +124 added lines, -124 removed lines

@@ -6,139 +6,139 @@
     use CloudControl\Cms\storage\Storage;
 
     class BaseComponent implements Component
-	{
-		/**
-		 * @var string
-		 */
-		protected $template;
-		/**
-		 * @var \CloudControl\Cms\cc\Request
-		 */
-		protected $request;
-		/**
-		 * @var Storage
-		 */
-		protected $storage;
-		/**
-		 * @var mixed
-		 */
-		protected $renderedContent;
-		/**
-		 * @var array
-		 */
-		protected $parameters = array();
-		/***
+    {
+        /**
+         * @var string
+         */
+        protected $template;
+        /**
+         * @var \CloudControl\Cms\cc\Request
+         */
+        protected $request;
+        /**
+         * @var Storage
+         */
+        protected $storage;
+        /**
+         * @var mixed
+         */
+        protected $renderedContent;
+        /**
+         * @var array
+         */
+        protected $parameters = array();
+        /***
 		 * @var \stdClass
 		 */
-		protected $matchedSitemapItem;
+        protected $matchedSitemapItem;
 
-		/**
-		 * BaseComponent constructor.
-		 *
-		 * @param string  $template
-		 * @param Request $request
-		 * @param array   $parameters
-		 * @param         $matchedSitemapItem
-		 */
-		public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem)
-		{
-			$this->template = $template;
-			$this->request = $request;
-			$this->parameters = (array) $parameters;
-			$this->matchedSitemapItem = $matchedSitemapItem;
-		}
+        /**
+         * BaseComponent constructor.
+         *
+         * @param string  $template
+         * @param Request $request
+         * @param array   $parameters
+         * @param         $matchedSitemapItem
+         */
+        public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem)
+        {
+            $this->template = $template;
+            $this->request = $request;
+            $this->parameters = (array) $parameters;
+            $this->matchedSitemapItem = $matchedSitemapItem;
+        }
 
-		/**
-		 * Hook for implementation in derived classes
-		 *
-		 * @param Storage $storage
-		 */
-		public function run(Storage $storage)
-		{
-			$this->storage = $storage;
-		}
+        /**
+         * Hook for implementation in derived classes
+         *
+         * @param Storage $storage
+         */
+        public function run(Storage $storage)
+        {
+            $this->storage = $storage;
+        }
 
-		/**
-		 * Renders the template
-		 *
-		 * @param null|Application $application
-		 *
-		 * @throws \Exception
-		 */
-		public function render($application=null)
-		{
-			$this->renderedContent = $this->renderTemplate($this->template, true, $application);
-		}
+        /**
+         * Renders the template
+         *
+         * @param null|Application $application
+         *
+         * @throws \Exception
+         */
+        public function render($application=null)
+        {
+            $this->renderedContent = $this->renderTemplate($this->template, true, $application);
+        }
 
-		/**
-		 * Returns the rendered content
-		 *
-		 * @return mixed
-		 */
-		public function get()
-		{
-			return $this->renderedContent;
-		}
+        /**
+         * Returns the rendered content
+         *
+         * @return mixed
+         */
+        public function get()
+        {
+            return $this->renderedContent;
+        }
 
-		/**
-		 * Decoupled render method, for usage in derived classes
-		 *
-		 * @param string $template
-		 *
-		 * @param bool   $obClean
-		 * @param null|Application   $application
-		 *
-		 * @return string
-		 * @throws \Exception
-		 */
-		public function renderTemplate($template='', $obClean = true, $application=null)
-		{
-		    $templatePath = $this->getTemplatePath($template, $application);
-			if (realpath($templatePath) !== false) {
-				if ($obClean) {
-					ob_clean();
-				}
-				$this->parameters['request'] = $this->request;
-				if ($application !== null) {
-					$acParameters = $application->getAllApplicationComponentParameters();
-					foreach ($acParameters as $parameters) {
-						extract($parameters);
-					}
-				}
-				extract($this->parameters);
-				include($templatePath);
-				return ob_get_contents();
-			} else {
-				if ($template !== null) { // If template is null, its a application component, which doesnt have a template
-					throw new \Exception('Couldnt find template ' . $templatePath);
-				}
-			}
-		}
+        /**
+         * Decoupled render method, for usage in derived classes
+         *
+         * @param string $template
+         *
+         * @param bool   $obClean
+         * @param null|Application   $application
+         *
+         * @return string
+         * @throws \Exception
+         */
+        public function renderTemplate($template='', $obClean = true, $application=null)
+        {
+            $templatePath = $this->getTemplatePath($template, $application);
+            if (realpath($templatePath) !== false) {
+                if ($obClean) {
+                    ob_clean();
+                }
+                $this->parameters['request'] = $this->request;
+                if ($application !== null) {
+                    $acParameters = $application->getAllApplicationComponentParameters();
+                    foreach ($acParameters as $parameters) {
+                        extract($parameters);
+                    }
+                }
+                extract($this->parameters);
+                include($templatePath);
+                return ob_get_contents();
+            } else {
+                if ($template !== null) { // If template is null, its a application component, which doesnt have a template
+                    throw new \Exception('Couldnt find template ' . $templatePath);
+                }
+            }
+        }
 
-		/**
-		 * Alias for renderTemplate for usage to include templates in other templates
-		 *
-		 * @param string $template
-		 *
-		 * @param array  $parameters
-		 *
-		 * @return string
-		 * @throws \Exception
-		 */
-		public function includeTemplate($template='', $parameters = array())
-		{
-			if (is_array($parameters)) {
-				foreach ($parameters as $name => $value) {
-					$this->parameters[$name] = $value;
-				}
-			}
-			return $this->renderTemplate($template, false);
-		}
+        /**
+         * Alias for renderTemplate for usage to include templates in other templates
+         *
+         * @param string $template
+         *
+         * @param array  $parameters
+         *
+         * @return string
+         * @throws \Exception
+         */
+        public function includeTemplate($template='', $parameters = array())
+        {
+            if (is_array($parameters)) {
+                foreach ($parameters as $name => $value) {
+                    $this->parameters[$name] = $value;
+                }
+            }
+            return $this->renderTemplate($template, false);
+        }
 
-		public function getParameters()
-		{
-			return $this->parameters;
-		}
+        public function getParameters()
+        {
+            return $this->parameters;
+        }
 
         /**
          * @param $template

Spacing +5 added lines, -5 removed lines

@@ -40,7 +40,7 @@ 
 		 * @param array   $parameters
 		 * @param         $matchedSitemapItem
 		 */
-		public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem)
+		public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem)
 		{
 			$this->template = $template;
 			$this->request = $request;
@@ -65,7 +65,7 @@ 
 		 *
 		 * @throws \Exception
 		 */
-		public function render($application=null)
+		public function render($application = null)
 		{
 			$this->renderedContent = $this->renderTemplate($this->template, true, $application);
 		}
@@ -91,7 +91,7 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='', $obClean = true, $application=null)
+		public function renderTemplate($template = '', $obClean = true, $application = null)
 		{
 		    $templatePath = $this->getTemplatePath($template, $application);
 			if (realpath($templatePath) !== false) {
@@ -125,7 +125,7 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function includeTemplate($template='', $parameters = array())
+		public function includeTemplate($template = '', $parameters = array())
 		{
 			if (is_array($parameters)) {
 				foreach ($parameters as $name => $value) {
@@ -145,7 +145,7 @@ 
          * @param null $application
          * @return string
          */
-        protected function getTemplatePath($template, $application=null)
+        protected function getTemplatePath($template, $application = null)
         {
             $templatePath = $application->getTemplatePath();
             $templatePath = $templatePath . DIRECTORY_SEPARATOR . $template . '.php';

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)

Indentation +75 added lines, -75 removed lines

@@ -12,86 +12,86 @@
 
 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);
-		// TODO FIX THIS PATH
-		$path = realpath(__DIR__ . '/../www/files/');
-		$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);
+        // TODO FIX THIS PATH
+        $path = realpath(__DIR__ . '/../www/files/');
+        $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)
 	{

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

Spacing +1 added lines, -1 removed lines

@@ -161,7 +161,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];
 		}

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)
 		{

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

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/cc/StringUtil.php

Braces +9 added lines, -6 removed lines

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

Indentation +119 added lines, -119 removed lines

@@ -8,123 +8,123 @@
 
 class StringUtil
 {
-	/**
-	 * Convert a string to url friendly slug
-	 *
-	 * @param string $str
-	 * @param array  $replace
-	 * @param string $delimiter
-	 *
-	 * @return mixed|string
-	 */
-	public static function slugify($str, $replace = array(), $delimiter = '-')
-	{
-		if (!empty($replace)) {
-			$str = str_replace((array)$replace, ' ', $str);
-		}
-
-		$clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
-		$clean = preg_replace("/[^a-zA-Z0-9\/_|+ -]/", '', $clean);
-		$clean = strtolower(trim($clean, '-'));
-		$clean = preg_replace("/[\/_|+ -]+/", $delimiter, $clean);
-
-		return $clean;
-	}
-
-	/**
-	 * Selects the right font-awesome icon for each filetype
-	 *
-	 * @param $fileType
-	 *
-	 * @return string
-	 */
-	public static function iconByFileType($fileType)
-	{
-		$fileTypeIcons = array(
-			'image'                                                                   => 'file-image-o',
-			'pdf'                                                                     => 'file-pdf-o',
-			'audio'                                                                   => 'file-audio-o',
-			'x-msdownload'                                                            => 'windows',
-			'application/vnd.ms-excel'                                                => 'file-excel-o',
-			'application/msexcel'                                                     => 'file-excel-o',
-			'application/xls'                                                         => 'file-excel-o',
-			'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'       => 'file-excel-o',
-			'application/vnd.google-apps.spreadsheet'                                 => 'file-excel-o',
-			'application/msword'                                                      => 'file-word-o',
-			'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'file-word-o',
-			'application/x-rar-compressed'                                            => 'file-archive-o',
-			'application/x-zip-compressed'                                            => 'file-archive-o',
-			'application/zip'                                                         => 'file-archive-o',
-			'text'                                                                    => 'file-text-o',
-		);
-
-		foreach ($fileTypeIcons as $needle => $icon) {
-			if (strpos($fileType, $needle) !== false) {
-				return $icon;
-			}
-		}
-
-		return 'file-o';
-	}
-
-	/**
-	 * Converts an amount of bytes to a human readable
-	 * format
-	 *
-	 * @param        $size
-	 * @param string $unit
-	 *
-	 * @return string
-	 */
-	public static function humanFileSize($size, $unit = "")
-	{
-		if ((!$unit && $size >= 1 << 30) || $unit == "GB")
-			return number_format($size / (1 << 30), 2) . "GB";
-		if ((!$unit && $size >= 1 << 20) || $unit == "MB")
-			return number_format($size / (1 << 20), 2) . "MB";
-		if ((!$unit && $size >= 1 << 10) || $unit == "KB")
-			return number_format($size / (1 << 10), 2) . "KB";
-
-		return number_format($size) . " bytes";
-	}
-
-	/**
-	 * @param $ptime
-	 *
-	 * @return string
-	 */
-	public static function timeElapsedString($ptime)
-	{
-		$etime = time() - $ptime;
-
-		if ($etime < 1) {
-			return '0 seconds';
-		}
-
-		$a = array(365 * 24 * 60 * 60 => 'year',
-				   30 * 24 * 60 * 60  => 'month',
-				   24 * 60 * 60       => 'day',
-				   60 * 60            => 'hour',
-				   60                 => 'minute',
-				   1                  => 'second'
-		);
-		$a_plural = array('year'   => 'years',
-						  'month'  => 'months',
-						  'day'    => 'days',
-						  'hour'   => 'hours',
-						  'minute' => 'minutes',
-						  'second' => 'seconds'
-		);
-
-		foreach ($a as $secs => $str) {
-			$d = $etime / $secs;
-			if ($d >= 1) {
-				$r = round($d);
-
-				return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago';
-			}
-		}
-
-		return 0;
-	}
+    /**
+     * Convert a string to url friendly slug
+     *
+     * @param string $str
+     * @param array  $replace
+     * @param string $delimiter
+     *
+     * @return mixed|string
+     */
+    public static function slugify($str, $replace = array(), $delimiter = '-')
+    {
+        if (!empty($replace)) {
+            $str = str_replace((array)$replace, ' ', $str);
+        }
+
+        $clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
+        $clean = preg_replace("/[^a-zA-Z0-9\/_|+ -]/", '', $clean);
+        $clean = strtolower(trim($clean, '-'));
+        $clean = preg_replace("/[\/_|+ -]+/", $delimiter, $clean);
+
+        return $clean;
+    }
+
+    /**
+     * Selects the right font-awesome icon for each filetype
+     *
+     * @param $fileType
+     *
+     * @return string
+     */
+    public static function iconByFileType($fileType)
+    {
+        $fileTypeIcons = array(
+            'image'                                                                   => 'file-image-o',
+            'pdf'                                                                     => 'file-pdf-o',
+            'audio'                                                                   => 'file-audio-o',
+            'x-msdownload'                                                            => 'windows',
+            'application/vnd.ms-excel'                                                => 'file-excel-o',
+            'application/msexcel'                                                     => 'file-excel-o',
+            'application/xls'                                                         => 'file-excel-o',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'       => 'file-excel-o',
+            'application/vnd.google-apps.spreadsheet'                                 => 'file-excel-o',
+            'application/msword'                                                      => 'file-word-o',
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'file-word-o',
+            'application/x-rar-compressed'                                            => 'file-archive-o',
+            'application/x-zip-compressed'                                            => 'file-archive-o',
+            'application/zip'                                                         => 'file-archive-o',
+            'text'                                                                    => 'file-text-o',
+        );
+
+        foreach ($fileTypeIcons as $needle => $icon) {
+            if (strpos($fileType, $needle) !== false) {
+                return $icon;
+            }
+        }
+
+        return 'file-o';
+    }
+
+    /**
+     * Converts an amount of bytes to a human readable
+     * format
+     *
+     * @param        $size
+     * @param string $unit
+     *
+     * @return string
+     */
+    public static function humanFileSize($size, $unit = "")
+    {
+        if ((!$unit && $size >= 1 << 30) || $unit == "GB")
+            return number_format($size / (1 << 30), 2) . "GB";
+        if ((!$unit && $size >= 1 << 20) || $unit == "MB")
+            return number_format($size / (1 << 20), 2) . "MB";
+        if ((!$unit && $size >= 1 << 10) || $unit == "KB")
+            return number_format($size / (1 << 10), 2) . "KB";
+
+        return number_format($size) . " bytes";
+    }
+
+    /**
+     * @param $ptime
+     *
+     * @return string
+     */
+    public static function timeElapsedString($ptime)
+    {
+        $etime = time() - $ptime;
+
+        if ($etime < 1) {
+            return '0 seconds';
+        }
+
+        $a = array(365 * 24 * 60 * 60 => 'year',
+                    30 * 24 * 60 * 60  => 'month',
+                    24 * 60 * 60       => 'day',
+                    60 * 60            => 'hour',
+                    60                 => 'minute',
+                    1                  => 'second'
+        );
+        $a_plural = array('year'   => 'years',
+                            'month'  => 'months',
+                            'day'    => 'days',
+                            'hour'   => 'hours',
+                            'minute' => 'minutes',
+                            'second' => 'seconds'
+        );
+
+        foreach ($a as $secs => $str) {
+            $d = $etime / $secs;
+            if ($d >= 1) {
+                $r = round($d);
+
+                return $r . ' ' . ($r > 1 ? $a_plural[$str] : $str) . ' ago';
+            }
+        }
+
+        return 0;
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	public static function slugify($str, $replace = array(), $delimiter = '-')
 	{
 		if (!empty($replace)) {
-			$str = str_replace((array)$replace, ' ', $str);
+			$str = str_replace((array) $replace, ' ', $str);
 		}
 
 		$clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);