silverstripe / deploynaut

code/control/Dispatcher.php

Indentation +167 added lines, -167 removed lines

@@ -1,174 +1,174 @@
 <?php
 /**
- * Dispatcher provides functionality to make it easier to work with frontend React components.
- * See deploynaut/docs/dispatcher.md for more information.
- *
- * @todo: currently we can't have more than one component mounted in parallel on any given Dispatcher,
- * because the SecurityID will diverge as soon as one of these components submit.
- */
+	 * Dispatcher provides functionality to make it easier to work with frontend React components.
+	 * See deploynaut/docs/dispatcher.md for more information.
+	 *
+	 * @todo: currently we can't have more than one component mounted in parallel on any given Dispatcher,
+	 * because the SecurityID will diverge as soon as one of these components submit.
+	 */
 
 abstract class Dispatcher extends DNRoot
 {
 
-    /**
-     * Generate the data structure used by the frontend component.
-     *
-     * @param string $name of the component
-     * @return array
-     */
-    abstract public function getModel($name);
-
-    /**
-     * Renders the initial HTML needed to bootstrap the react component.
-     *
-     * Usage: $getReactComponent(YourComponent);
-     *
-     * @param string $name Used to name the DOM elements and obtain the initial model.
-     * @return string A snippet good for adding to a SS template.
-     */
-    public function getReactComponent($name)
-    {
-        $model = $this->getModel($name);
-        $model['InitialSecurityID'] = $this->getSecurityToken()->getValue();
-
-        return $this->customise([
-            'Name' => $name,
-            'Model' => htmlentities(json_encode($model))
-        ])->renderWith('ReactTemplate');
-    }
-
-    protected function getSecurityToken($name = null)
-    {
-        if (is_null($name)) {
-            $name = sprintf('%sSecurityID', get_class($this));
-        }
-        return new \SecurityToken($name);
-    }
-
-    protected function checkSecurityToken($name = null)
-    {
-        $postVar = is_null($name) ? 'SecurityID' : $name;
-        if (is_null($name)) {
-            $name = sprintf('%sSecurityID', get_class($this));
-        }
-        $securityToken = $this->getSecurityToken($name);
-
-        // By default the security token is always represented by a "SecurityID" post var,
-        // even if the backend uses different names for the token. This too means only one security token
-        // can be managed by one dispatcher if the default is used.
-        if (!$securityToken->check($this->request->postVar($postVar))) {
-            $this->httpError(400, 'Invalid security token, try reloading the page.');
-        }
-    }
-
-    /**
-     * Return the validator errors as AJAX response.
-     *
-     * @param int $code HTTP status code.
-     * @param array $validatorErrors Result of calling Validator::validate, e.g.
-     *	[{"fieldName":"Name","message":"Message.","messageType":"bad"}]
-     * @return \SS_HTTPResponse
-     */
-    public function asJSONValidatorErrors($code, $validatorErrors)
-    {
-        $fieldErrors = [];
-        foreach ($validatorErrors as $error) {
-            $fieldErrors[$error['fieldName']] = $error['message'];
-        }
-        return $this->asJSONFormFieldErrors($code, $fieldErrors);
-    }
-
-    /**
-     * Return field-specific errors as AJAX response.
-     *
-     * @param int $code HTTP status code.
-     * @param array $fieldErrors FieldName => message structure.
-     * @return \SS_HTTPResponse
-     */
-    public function asJSONFormFieldErrors($code, $fieldErrors)
-    {
-        $response = $this->getResponse();
-        $response->addHeader('Content-Type', 'application/json');
-        $response->setBody(json_encode([
-            'InputErrors' => $fieldErrors
-        ]));
-        $response->setStatusCode($code);
-        return $response;
-    }
-
-    /**
-     * Respond to an AJAX request.
-     * Automatically updates the security token and proxy pending redirects.
-     *
-     * @param array $data Data to be passed to the frontend.
-     */
-    public function asJSON($data = [])
-    {
-        $securityToken = $this->getSecurityToken();
-        $securityToken->reset();
-        $data['NewSecurityID'] = $securityToken->getValue();
-
-        $response = $this->getResponse();
-
-        // If we received an AJAX request, we can't redirect in an ordinary way: the browser will
-        // interpret the 302 responses internally and the response will never reach JS.
-        //
-        // To get around that, upon spotting an active redirect, we change the response code to 200,
-        // and move the redirect into the "RedirectTo" field in the JSON response. Frontend can
-        // then interpret this and trigger a redirect.
-        if ($this->redirectedTo()) {
-            $data['RedirectTo'] = $this->response->getHeader('Location');
-            // Pop off the header - we are no longer redirecting via the usual mechanism.
-            $this->response->removeHeader('Location');
-        }
-
-        $response->addHeader('Content-Type', 'application/json');
-        $response->setBody(json_encode($data));
-        $response->setStatusCode(200);
-        return $response;
-    }
-
-    /**
-     * Decode the data submitted by the form.jsx control.
-     *
-     * @return array
-     */
-    protected function getFormData()
-    {
-        return $this->stripNonPrintables(json_decode($this->request->postVar('Details'), true));
-    }
-
-    /**
-     * @param string|array
-     * @return string
-     */
-    protected function trimWhitespace($val)
-    {
-        if (is_array($val)) {
-            foreach ($val as $k => $v) {
-                $val[$k] = $this->trimWhitespace($v);
-            }
-            return $val;
-        } else {
-            return trim($val);
-        }
-    }
-
-    /**
-     * Remove control characters from the input.
-     *
-     * @param string|array
-     * @return string
-     */
-    protected function stripNonPrintables($val)
-    {
-        if (is_array($val)) {
-            foreach ($val as $k => $v) {
-                $val[$k] = $this->stripNonPrintables($v);
-            }
-            return $val;
-        } else {
-            return preg_replace('/[[:cntrl:]]/', '', $val);
-        }
-    }
+	/**
+	 * Generate the data structure used by the frontend component.
+	 *
+	 * @param string $name of the component
+	 * @return array
+	 */
+	abstract public function getModel($name);
+
+	/**
+	 * Renders the initial HTML needed to bootstrap the react component.
+	 *
+	 * Usage: $getReactComponent(YourComponent);
+	 *
+	 * @param string $name Used to name the DOM elements and obtain the initial model.
+	 * @return string A snippet good for adding to a SS template.
+	 */
+	public function getReactComponent($name)
+	{
+		$model = $this->getModel($name);
+		$model['InitialSecurityID'] = $this->getSecurityToken()->getValue();
+
+		return $this->customise([
+			'Name' => $name,
+			'Model' => htmlentities(json_encode($model))
+		])->renderWith('ReactTemplate');
+	}
+
+	protected function getSecurityToken($name = null)
+	{
+		if (is_null($name)) {
+			$name = sprintf('%sSecurityID', get_class($this));
+		}
+		return new \SecurityToken($name);
+	}
+
+	protected function checkSecurityToken($name = null)
+	{
+		$postVar = is_null($name) ? 'SecurityID' : $name;
+		if (is_null($name)) {
+			$name = sprintf('%sSecurityID', get_class($this));
+		}
+		$securityToken = $this->getSecurityToken($name);
+
+		// By default the security token is always represented by a "SecurityID" post var,
+		// even if the backend uses different names for the token. This too means only one security token
+		// can be managed by one dispatcher if the default is used.
+		if (!$securityToken->check($this->request->postVar($postVar))) {
+			$this->httpError(400, 'Invalid security token, try reloading the page.');
+		}
+	}
+
+	/**
+	 * Return the validator errors as AJAX response.
+	 *
+	 * @param int $code HTTP status code.
+	 * @param array $validatorErrors Result of calling Validator::validate, e.g.
+	 *	[{"fieldName":"Name","message":"Message.","messageType":"bad"}]
+	 * @return \SS_HTTPResponse
+	 */
+	public function asJSONValidatorErrors($code, $validatorErrors)
+	{
+		$fieldErrors = [];
+		foreach ($validatorErrors as $error) {
+			$fieldErrors[$error['fieldName']] = $error['message'];
+		}
+		return $this->asJSONFormFieldErrors($code, $fieldErrors);
+	}
+
+	/**
+	 * Return field-specific errors as AJAX response.
+	 *
+	 * @param int $code HTTP status code.
+	 * @param array $fieldErrors FieldName => message structure.
+	 * @return \SS_HTTPResponse
+	 */
+	public function asJSONFormFieldErrors($code, $fieldErrors)
+	{
+		$response = $this->getResponse();
+		$response->addHeader('Content-Type', 'application/json');
+		$response->setBody(json_encode([
+			'InputErrors' => $fieldErrors
+		]));
+		$response->setStatusCode($code);
+		return $response;
+	}
+
+	/**
+	 * Respond to an AJAX request.
+	 * Automatically updates the security token and proxy pending redirects.
+	 *
+	 * @param array $data Data to be passed to the frontend.
+	 */
+	public function asJSON($data = [])
+	{
+		$securityToken = $this->getSecurityToken();
+		$securityToken->reset();
+		$data['NewSecurityID'] = $securityToken->getValue();
+
+		$response = $this->getResponse();
+
+		// If we received an AJAX request, we can't redirect in an ordinary way: the browser will
+		// interpret the 302 responses internally and the response will never reach JS.
+		//
+		// To get around that, upon spotting an active redirect, we change the response code to 200,
+		// and move the redirect into the "RedirectTo" field in the JSON response. Frontend can
+		// then interpret this and trigger a redirect.
+		if ($this->redirectedTo()) {
+			$data['RedirectTo'] = $this->response->getHeader('Location');
+			// Pop off the header - we are no longer redirecting via the usual mechanism.
+			$this->response->removeHeader('Location');
+		}
+
+		$response->addHeader('Content-Type', 'application/json');
+		$response->setBody(json_encode($data));
+		$response->setStatusCode(200);
+		return $response;
+	}
+
+	/**
+	 * Decode the data submitted by the form.jsx control.
+	 *
+	 * @return array
+	 */
+	protected function getFormData()
+	{
+		return $this->stripNonPrintables(json_decode($this->request->postVar('Details'), true));
+	}
+
+	/**
+	 * @param string|array
+	 * @return string
+	 */
+	protected function trimWhitespace($val)
+	{
+		if (is_array($val)) {
+			foreach ($val as $k => $v) {
+				$val[$k] = $this->trimWhitespace($v);
+			}
+			return $val;
+		} else {
+			return trim($val);
+		}
+	}
+
+	/**
+	 * Remove control characters from the input.
+	 *
+	 * @param string|array
+	 * @return string
+	 */
+	protected function stripNonPrintables($val)
+	{
+		if (is_array($val)) {
+			foreach ($val as $k => $v) {
+				$val[$k] = $this->stripNonPrintables($v);
+			}
+			return $val;
+		} else {
+			return preg_replace('/[[:cntrl:]]/', '', $val);
+		}
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -39,7 +39,7 @@ 
 
     protected function getSecurityToken($name = null)
     {
-        if (is_null($name)) {
+        if(is_null($name)) {
             $name = sprintf('%sSecurityID', get_class($this));
         }
         return new \SecurityToken($name);
@@ -48,7 +48,7 @@ 
     protected function checkSecurityToken($name = null)
     {
         $postVar = is_null($name) ? 'SecurityID' : $name;
-        if (is_null($name)) {
+        if(is_null($name)) {
             $name = sprintf('%sSecurityID', get_class($this));
         }
         $securityToken = $this->getSecurityToken($name);
@@ -56,7 +56,7 @@ 
         // By default the security token is always represented by a "SecurityID" post var,
         // even if the backend uses different names for the token. This too means only one security token
         // can be managed by one dispatcher if the default is used.
-        if (!$securityToken->check($this->request->postVar($postVar))) {
+        if(!$securityToken->check($this->request->postVar($postVar))) {
             $this->httpError(400, 'Invalid security token, try reloading the page.');
         }
     }
@@ -72,7 +72,7 @@ 
     public function asJSONValidatorErrors($code, $validatorErrors)
     {
         $fieldErrors = [];
-        foreach ($validatorErrors as $error) {
+        foreach($validatorErrors as $error) {
             $fieldErrors[$error['fieldName']] = $error['message'];
         }
         return $this->asJSONFormFieldErrors($code, $fieldErrors);
@@ -116,7 +116,7 @@ 
         // To get around that, upon spotting an active redirect, we change the response code to 200,
         // and move the redirect into the "RedirectTo" field in the JSON response. Frontend can
         // then interpret this and trigger a redirect.
-        if ($this->redirectedTo()) {
+        if($this->redirectedTo()) {
             $data['RedirectTo'] = $this->response->getHeader('Location');
             // Pop off the header - we are no longer redirecting via the usual mechanism.
             $this->response->removeHeader('Location');
@@ -144,8 +144,8 @@ 
      */
     protected function trimWhitespace($val)
     {
-        if (is_array($val)) {
-            foreach ($val as $k => $v) {
+        if(is_array($val)) {
+            foreach($val as $k => $v) {
                 $val[$k] = $this->trimWhitespace($v);
             }
             return $val;
@@ -162,8 +162,8 @@ 
      */
     protected function stripNonPrintables($val)
     {
-        if (is_array($val)) {
-            foreach ($val as $k => $v) {
+        if(is_array($val)) {
+            foreach($val as $k => $v) {
                 $val[$k] = $this->stripNonPrintables($v);
             }
             return $val;

Braces +10 added lines, -20 removed lines

@@ -7,8 +7,7 @@ 
  * because the SecurityID will diverge as soon as one of these components submit.
  */
 
-abstract class Dispatcher extends DNRoot
-{
+abstract class Dispatcher extends DNRoot {
 
     /**
      * Generate the data structure used by the frontend component.
@@ -26,8 +25,7 @@ 
      * @param string $name Used to name the DOM elements and obtain the initial model.
      * @return string A snippet good for adding to a SS template.
      */
-    public function getReactComponent($name)
-    {
+    public function getReactComponent($name) {
         $model = $this->getModel($name);
         $model['InitialSecurityID'] = $this->getSecurityToken()->getValue();
 
@@ -37,16 +35,14 @@ 
         ])->renderWith('ReactTemplate');
     }
 
-    protected function getSecurityToken($name = null)
-    {
+    protected function getSecurityToken($name = null) {
         if (is_null($name)) {
             $name = sprintf('%sSecurityID', get_class($this));
         }
         return new \SecurityToken($name);
     }
 
-    protected function checkSecurityToken($name = null)
-    {
+    protected function checkSecurityToken($name = null) {
         $postVar = is_null($name) ? 'SecurityID' : $name;
         if (is_null($name)) {
             $name = sprintf('%sSecurityID', get_class($this));
@@ -69,8 +65,7 @@ 
      *	[{"fieldName":"Name","message":"Message.","messageType":"bad"}]
      * @return \SS_HTTPResponse
      */
-    public function asJSONValidatorErrors($code, $validatorErrors)
-    {
+    public function asJSONValidatorErrors($code, $validatorErrors) {
         $fieldErrors = [];
         foreach ($validatorErrors as $error) {
             $fieldErrors[$error['fieldName']] = $error['message'];
@@ -85,8 +80,7 @@ 
      * @param array $fieldErrors FieldName => message structure.
      * @return \SS_HTTPResponse
      */
-    public function asJSONFormFieldErrors($code, $fieldErrors)
-    {
+    public function asJSONFormFieldErrors($code, $fieldErrors) {
         $response = $this->getResponse();
         $response->addHeader('Content-Type', 'application/json');
         $response->setBody(json_encode([
@@ -102,8 +96,7 @@ 
      *
      * @param array $data Data to be passed to the frontend.
      */
-    public function asJSON($data = [])
-    {
+    public function asJSON($data = []) {
         $securityToken = $this->getSecurityToken();
         $securityToken->reset();
         $data['NewSecurityID'] = $securityToken->getValue();
@@ -133,8 +126,7 @@ 
      *
      * @return array
      */
-    protected function getFormData()
-    {
+    protected function getFormData() {
         return $this->stripNonPrintables(json_decode($this->request->postVar('Details'), true));
     }
 
@@ -142,8 +134,7 @@ 
      * @param string|array
      * @return string
      */
-    protected function trimWhitespace($val)
-    {
+    protected function trimWhitespace($val) {
         if (is_array($val)) {
             foreach ($val as $k => $v) {
                 $val[$k] = $this->trimWhitespace($v);
@@ -160,8 +151,7 @@ 
      * @param string|array
      * @return string
      */
-    protected function stripNonPrintables($val)
-    {
+    protected function stripNonPrintables($val) {
         if (is_array($val)) {
             foreach ($val as $k => $v) {
                 $val[$k] = $this->stripNonPrintables($v);

code/control/EmailMessagingService.php

Indentation +87 added lines, -87 removed lines

@@ -7,101 +7,101 @@
 class EmailMessagingService implements ConfirmationMessagingService
 {
 
-    /**
-     * @config
-     * @var string
-     */
-    private static $default_from = 'deploynaut@silverstripe.com';
+	/**
+	 * @config
+	 * @var string
+	 */
+	private static $default_from = 'deploynaut@silverstripe.com';
 
-    /**
-     * @config
-     * @var string
-     */
-    private static $default_subject = 'Deploynaut notification';
+	/**
+	 * @config
+	 * @var string
+	 */
+	private static $default_subject = 'Deploynaut notification';
 
-    public function sendMessage($source, $message, $recipients, $arguments = array())
-    {
-        $from = empty($arguments['from'])
-            ? Config::inst()->get(get_class($this), 'default_from')
-            : $arguments['from'];
-        $subject = empty($arguments['subject'])
-            ? Config::inst()->get(get_class($this), 'default_subject')
-            : $arguments['subject'];
+	public function sendMessage($source, $message, $recipients, $arguments = array())
+	{
+		$from = empty($arguments['from'])
+			? Config::inst()->get(get_class($this), 'default_from')
+			: $arguments['from'];
+		$subject = empty($arguments['subject'])
+			? Config::inst()->get(get_class($this), 'default_subject')
+			: $arguments['subject'];
 
-        // Split users and send individually
-        $this->sendIndividualMessages($source, $message, $recipients, $from, $subject);
-    }
+		// Split users and send individually
+		$this->sendIndividualMessages($source, $message, $recipients, $from, $subject);
+	}
 
-    /**
-     * Separates recipients into individual users
-     *
-     * @param PipelineStep $source Source client step
-     * @param string $message Plain text message
-     * @param mixed $recipients Either a Member object, string, or array of strings or Member objects
-     * @param string $from
-     * @param string $subject
-     * @return boolean True if success
-     */
-    protected function sendIndividualMessages($source, $message, $recipients, $from, $subject)
-    {
-        // Split recipients that are comma separated
-        if (is_string($recipients) && stripos($recipients, ',')) {
-            $recipients = explode(',', $recipients);
-            return $this->sendIndividualMessages($source, $message, $recipients, $from, $subject);
-        }
+	/**
+	 * Separates recipients into individual users
+	 *
+	 * @param PipelineStep $source Source client step
+	 * @param string $message Plain text message
+	 * @param mixed $recipients Either a Member object, string, or array of strings or Member objects
+	 * @param string $from
+	 * @param string $subject
+	 * @return boolean True if success
+	 */
+	protected function sendIndividualMessages($source, $message, $recipients, $from, $subject)
+	{
+		// Split recipients that are comma separated
+		if (is_string($recipients) && stripos($recipients, ',')) {
+			$recipients = explode(',', $recipients);
+			return $this->sendIndividualMessages($source, $message, $recipients, $from, $subject);
+		}
 
-        // Iterate through arrays
-        if (is_array($recipients) || $recipients instanceof SS_List) {
-            foreach ($recipients as $recipient) {
-                $this->sendIndividualMessages($source, $message, $recipient, $from, $subject);
-            }
-            return true;
-        }
+		// Iterate through arrays
+		if (is_array($recipients) || $recipients instanceof SS_List) {
+			foreach ($recipients as $recipient) {
+				$this->sendIndividualMessages($source, $message, $recipient, $from, $subject);
+			}
+			return true;
+		}
 
-        if ($recipients) {
-            $this->sendMessageTo($source, $from, $recipients, $subject, $message);
-            return true;
-        }
+		if ($recipients) {
+			$this->sendMessageTo($source, $from, $recipients, $subject, $message);
+			return true;
+		}
 
-        // Can't send to empty recipient
-        return false;
-    }
+		// Can't send to empty recipient
+		return false;
+	}
 
 
-    /**
-     * Send an message to a single recipient
-     *
-     * @param PipelineStep $source Client step
-     * @param string $from
-     * @param string|Member $to
-     * @param string $subject
-     * @param string $body
-     */
-    protected function sendMessageTo($source, $from, $to, $subject, $body)
-    {
-        if ($to instanceof Member) {
-            $to = $to->Email;
-        }
-        $this->sendViaEmail($source, $from, $to, $subject, $body);
-    }
+	/**
+	 * Send an message to a single recipient
+	 *
+	 * @param PipelineStep $source Client step
+	 * @param string $from
+	 * @param string|Member $to
+	 * @param string $subject
+	 * @param string $body
+	 */
+	protected function sendMessageTo($source, $from, $to, $subject, $body)
+	{
+		if ($to instanceof Member) {
+			$to = $to->Email;
+		}
+		$this->sendViaEmail($source, $from, $to, $subject, $body);
+	}
 
-    /**
-     * Send an email to a single recipient
-     *
-     * @param PipelineStep $source Client step
-     * @param string $from
-     * @param string $to
-     * @param string $subject
-     * @param string $body
-     */
-    protected function sendViaEmail($source, $from, $to, $subject, $body)
-    {
-        $email = new Email($from, $to, $subject, $body);
-        if ($source->getDryRun()) {
-            $source->log("[Skipped] Sent message to $to (subject: $subject)");
-        } else {
-            $email->sendPlain();
-            $source->log("Sent message to $to (subject: $subject)");
-        }
-    }
+	/**
+	 * Send an email to a single recipient
+	 *
+	 * @param PipelineStep $source Client step
+	 * @param string $from
+	 * @param string $to
+	 * @param string $subject
+	 * @param string $body
+	 */
+	protected function sendViaEmail($source, $from, $to, $subject, $body)
+	{
+		$email = new Email($from, $to, $subject, $body);
+		if ($source->getDryRun()) {
+			$source->log("[Skipped] Sent message to $to (subject: $subject)");
+		} else {
+			$email->sendPlain();
+			$source->log("Sent message to $to (subject: $subject)");
+		}
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -45,20 +45,20 @@ 
     protected function sendIndividualMessages($source, $message, $recipients, $from, $subject)
     {
         // Split recipients that are comma separated
-        if (is_string($recipients) && stripos($recipients, ',')) {
+        if(is_string($recipients) && stripos($recipients, ',')) {
             $recipients = explode(',', $recipients);
             return $this->sendIndividualMessages($source, $message, $recipients, $from, $subject);
         }
 
         // Iterate through arrays
-        if (is_array($recipients) || $recipients instanceof SS_List) {
-            foreach ($recipients as $recipient) {
+        if(is_array($recipients) || $recipients instanceof SS_List) {
+            foreach($recipients as $recipient) {
                 $this->sendIndividualMessages($source, $message, $recipient, $from, $subject);
             }
             return true;
         }
 
-        if ($recipients) {
+        if($recipients) {
             $this->sendMessageTo($source, $from, $recipients, $subject, $message);
             return true;
         }
@@ -79,7 +79,7 @@ 
      */
     protected function sendMessageTo($source, $from, $to, $subject, $body)
     {
-        if ($to instanceof Member) {
+        if($to instanceof Member) {
             $to = $to->Email;
         }
         $this->sendViaEmail($source, $from, $to, $subject, $body);
@@ -97,7 +97,7 @@ 
     protected function sendViaEmail($source, $from, $to, $subject, $body)
     {
         $email = new Email($from, $to, $subject, $body);
-        if ($source->getDryRun()) {
+        if($source->getDryRun()) {
             $source->log("[Skipped] Sent message to $to (subject: $subject)");
         } else {
             $email->sendPlain();

Braces +5 added lines, -10 removed lines

@@ -4,8 +4,7 @@ 
  * @package deploynaut
  * @subpackage control
  */
-class EmailMessagingService implements ConfirmationMessagingService
-{
+class EmailMessagingService implements ConfirmationMessagingService {
 
     /**
      * @config
@@ -19,8 +18,7 @@ 
      */
     private static $default_subject = 'Deploynaut notification';
 
-    public function sendMessage($source, $message, $recipients, $arguments = array())
-    {
+    public function sendMessage($source, $message, $recipients, $arguments = array()) {
         $from = empty($arguments['from'])
             ? Config::inst()->get(get_class($this), 'default_from')
             : $arguments['from'];
@@ -42,8 +40,7 @@ 
      * @param string $subject
      * @return boolean True if success
      */
-    protected function sendIndividualMessages($source, $message, $recipients, $from, $subject)
-    {
+    protected function sendIndividualMessages($source, $message, $recipients, $from, $subject) {
         // Split recipients that are comma separated
         if (is_string($recipients) && stripos($recipients, ',')) {
             $recipients = explode(',', $recipients);
@@ -77,8 +74,7 @@ 
      * @param string $subject
      * @param string $body
      */
-    protected function sendMessageTo($source, $from, $to, $subject, $body)
-    {
+    protected function sendMessageTo($source, $from, $to, $subject, $body) {
         if ($to instanceof Member) {
             $to = $to->Email;
         }
@@ -94,8 +90,7 @@ 
      * @param string $subject
      * @param string $body
      */
-    protected function sendViaEmail($source, $from, $to, $subject, $body)
-    {
+    protected function sendViaEmail($source, $from, $to, $subject, $body) {
         $email = new Email($from, $to, $subject, $body);
         if ($source->getDryRun()) {
             $source->log("[Skipped] Sent message to $to (subject: $subject)");

code/control/PipelineController.php

Indentation +71 added lines, -71 removed lines

@@ -3,85 +3,85 @@
 class PipelineController extends Controller
 {
 
-    private static $allowed_actions = array(
-        'abort',
-        'log',
-        'step'
-    );
+	private static $allowed_actions = array(
+		'abort',
+		'log',
+		'step'
+	);
 
-    protected $controller = null;
+	protected $controller = null;
 
-    protected $pipeline = null;
+	protected $pipeline = null;
 
-    public function __construct($controller, Pipeline $pipeline)
-    {
-        $this->controller = $controller;
-        parent::__construct();
-        $this->pipeline = $pipeline;
-    }
+	public function __construct($controller, Pipeline $pipeline)
+	{
+		$this->controller = $controller;
+		parent::__construct();
+		$this->pipeline = $pipeline;
+	}
 
-    /**
-     * Shows status of this pipeline
-     */
-    public function index()
-    {
-        return $this->controller->customise(new ArrayData(array(
-            'Pipeline' => $this->pipeline
-        )))->renderWith('DNRoot_pipeline');
-    }
+	/**
+	 * Shows status of this pipeline
+	 */
+	public function index()
+	{
+		return $this->controller->customise(new ArrayData(array(
+			'Pipeline' => $this->pipeline
+		)))->renderWith('DNRoot_pipeline');
+	}
 
-    /**
-     * Get log for this pipeline
-     */
-    public function log()
-    {
-        $log = $this->pipeline->getLogger();
-        if ($log->exists()) {
-            $content = $log->content();
-        } else {
-            $content = 'Waiting for action to start';
-        }
+	/**
+	 * Get log for this pipeline
+	 */
+	public function log()
+	{
+		$log = $this->pipeline->getLogger();
+		if ($log->exists()) {
+			$content = $log->content();
+		} else {
+			$content = 'Waiting for action to start';
+		}
 
-        $sendJSON = (strpos($this->request->getHeader('Accept'), 'application/json') !== false)
-            || $this->request->getExtension() == 'json';
+		$sendJSON = (strpos($this->request->getHeader('Accept'), 'application/json') !== false)
+			|| $this->request->getExtension() == 'json';
 
-        $content = preg_replace('/(?:(?:\r\n|\r|\n)\s*){2}/s', "\n", $content);
-        if ($sendJSON) {
-            $this->response->addHeader("Content-type", "application/json");
-            return json_encode(array(
-                'status' => $this->pipeline->Status,
-                'content' => $content,
-            ));
-        } else {
-            $this->response->addHeader("Content-type", "text/plain");
-            return $content;
-        }
-    }
+		$content = preg_replace('/(?:(?:\r\n|\r|\n)\s*){2}/s', "\n", $content);
+		if ($sendJSON) {
+			$this->response->addHeader("Content-type", "application/json");
+			return json_encode(array(
+				'status' => $this->pipeline->Status,
+				'content' => $content,
+			));
+		} else {
+			$this->response->addHeader("Content-type", "text/plain");
+			return $content;
+		}
+	}
 
-    /**
-     * Aborts the current pipeline
-     */
-    public function abort()
-    {
-        if ($this->pipeline->canAbort()) {
-            $this->pipeline->markAborted();
-        }
-        return $this->redirect($this->pipeline->Environment()->Link());
-    }
+	/**
+	 * Aborts the current pipeline
+	 */
+	public function abort()
+	{
+		if ($this->pipeline->canAbort()) {
+			$this->pipeline->markAborted();
+		}
+		return $this->redirect($this->pipeline->Environment()->Link());
+	}
 
-    /**
-     * Perform an action on the current pipeline step
-     */
-    public function step()
-    {
-        $action = $this->request->param('ID');
-        $step = $this->pipeline->CurrentStep();
+	/**
+	 * Perform an action on the current pipeline step
+	 */
+	public function step()
+	{
+		$action = $this->request->param('ID');
+		$step = $this->pipeline->CurrentStep();
 
-        // Check if the action is available on this step
-        if ($step && ($actions = $step->allowedActions()) && isset($actions[$action])) {
-            // Execute this action, allowing it to override the httpresponse given
-            $step->$action();
-        }
-        return $this->redirect($this->pipeline->Environment()->Link());
-    }
+		// Check if the action is available on this step
+		if ($step && ($actions = $step->allowedActions()) && isset($actions[$action])) {
+			// Execute this action, allowing it to override the httpresponse given
+			$step->$action();
+		}
+		return $this->redirect($this->pipeline->Environment()->Link());
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
     public function log()
     {
         $log = $this->pipeline->getLogger();
-        if ($log->exists()) {
+        if($log->exists()) {
             $content = $log->content();
         } else {
             $content = 'Waiting for action to start';
@@ -46,7 +46,7 @@ 
             || $this->request->getExtension() == 'json';
 
         $content = preg_replace('/(?:(?:\r\n|\r|\n)\s*){2}/s', "\n", $content);
-        if ($sendJSON) {
+        if($sendJSON) {
             $this->response->addHeader("Content-type", "application/json");
             return json_encode(array(
                 'status' => $this->pipeline->Status,
@@ -63,7 +63,7 @@ 
      */
     public function abort()
     {
-        if ($this->pipeline->canAbort()) {
+        if($this->pipeline->canAbort()) {
             $this->pipeline->markAborted();
         }
         return $this->redirect($this->pipeline->Environment()->Link());
@@ -78,7 +78,7 @@ 
         $step = $this->pipeline->CurrentStep();
 
         // Check if the action is available on this step
-        if ($step && ($actions = $step->allowedActions()) && isset($actions[$action])) {
+        if($step && ($actions = $step->allowedActions()) && isset($actions[$action])) {
             // Execute this action, allowing it to override the httpresponse given
             $step->$action();
         }

Braces +6 added lines, -12 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-class PipelineController extends Controller
-{
+class PipelineController extends Controller {
 
     private static $allowed_actions = array(
         'abort',
@@ -13,8 +12,7 @@ 
 
     protected $pipeline = null;
 
-    public function __construct($controller, Pipeline $pipeline)
-    {
+    public function __construct($controller, Pipeline $pipeline) {
         $this->controller = $controller;
         parent::__construct();
         $this->pipeline = $pipeline;
@@ -23,8 +21,7 @@ 
     /**
      * Shows status of this pipeline
      */
-    public function index()
-    {
+    public function index() {
         return $this->controller->customise(new ArrayData(array(
             'Pipeline' => $this->pipeline
         )))->renderWith('DNRoot_pipeline');
@@ -33,8 +30,7 @@ 
     /**
      * Get log for this pipeline
      */
-    public function log()
-    {
+    public function log() {
         $log = $this->pipeline->getLogger();
         if ($log->exists()) {
             $content = $log->content();
@@ -61,8 +57,7 @@ 
     /**
      * Aborts the current pipeline
      */
-    public function abort()
-    {
+    public function abort() {
         if ($this->pipeline->canAbort()) {
             $this->pipeline->markAborted();
         }
@@ -72,8 +67,7 @@ 
     /**
      * Perform an action on the current pipeline step
      */
-    public function step()
-    {
+    public function step() {
         $action = $this->request->param('ID');
         $step = $this->pipeline->CurrentStep();
 

code/dbtypes/GitSHA.php

Indentation +23 added lines, -23 removed lines

@@ -3,29 +3,29 @@
 class GitSHA extends Varchar
 {
 
-    /**
-     * @param string|null $name
-     * @param array $options
-     */
-    public function __construct($name = null, $options = array())
-    {
-        // Size should probably be 40, but to avoid schema change leave for now
-        parent::__construct($name, 255, $options);
-    }
+	/**
+	 * @param string|null $name
+	 * @param array $options
+	 */
+	public function __construct($name = null, $options = array())
+	{
+		// Size should probably be 40, but to avoid schema change leave for now
+		parent::__construct($name, 255, $options);
+	}
 
-    /**
-     * @return string
-     */
-    public function FullHash()
-    {
-        return $this->value;
-    }
+	/**
+	 * @return string
+	 */
+	public function FullHash()
+	{
+		return $this->value;
+	}
 
-    /**
-     * @return string
-     */
-    public function ShortHash()
-    {
-        return substr($this->value, 0, 7);
-    }
+	/**
+	 * @return string
+	 */
+	public function ShortHash()
+	{
+		return substr($this->value, 0, 7);
+	}
 }

Braces +4 added lines, -8 removed lines

@@ -1,14 +1,12 @@ 
 <?php
 
-class GitSHA extends Varchar
-{
+class GitSHA extends Varchar {
 
     /**
      * @param string|null $name
      * @param array $options
      */
-    public function __construct($name = null, $options = array())
-    {
+    public function __construct($name = null, $options = array()) {
         // Size should probably be 40, but to avoid schema change leave for now
         parent::__construct($name, 255, $options);
     }
@@ -16,16 +14,14 @@ 
     /**
      * @return string
      */
-    public function FullHash()
-    {
+    public function FullHash() {
         return $this->value;
     }
 
     /**
      * @return string
      */
-    public function ShortHash()
-    {
+    public function ShortHash() {
         return substr($this->value, 0, 7);
     }
 }

code/events/DeploynautEventInterface.php

Indentation +22 added lines, -22 removed lines

@@ -3,29 +3,29 @@
 interface DeploynautEventInterface extends \League\Event\EventInterface
 {
 
-    /**
-     * Should return the event name, e.g 'event.name'
-     *
-     * @return string
-     */
-    public function getName();
+	/**
+	 * Should return the event name, e.g 'event.name'
+	 *
+	 * @return string
+	 */
+	public function getName();
 
-    /**
-     * Get the value for the $keyname or empty string
-     *
-     * @param string $keyname
-     *
-     * @return string
-     */
-    public function get($keyname);
+	/**
+	 * Get the value for the $keyname or empty string
+	 *
+	 * @param string $keyname
+	 *
+	 * @return string
+	 */
+	public function get($keyname);
 
-    /**
-     * @return array
-     */
-    public function asArray();
+	/**
+	 * @return array
+	 */
+	public function asArray();
 
-    /**
-     * @return string - returns the data as json
-     */
-    public function asJSON();
+	/**
+	 * @return string - returns the data as json
+	 */
+	public function asJSON();
 }

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 
-interface DeploynautEventInterface extends \League\Event\EventInterface
-{
+interface DeploynautEventInterface extends \League\Event\EventInterface {
 
     /**
      * Should return the event name, e.g 'event.name'

code/events/GenericEvent.php

Indentation +72 added lines, -72 removed lines

@@ -23,83 +23,83 @@
 class GenericEvent extends AbstractEvent implements DeploynautEventInterface
 {
 
-    /**
-     * @var string
-     */
-    protected $name = '';
+	/**
+	 * @var string
+	 */
+	protected $name = '';
 
-    /**
-     * @var array
-     */
-    protected $data = [];
+	/**
+	 * @var array
+	 */
+	protected $data = [];
 
-    /**
-     * @param string $name - event name
-     * @param array $data
-     *
-     * @return GenericEvent
-     */
-    public static function create($name, array $data)
-    {
-        return Injector::inst()->createWithArgs(get_called_class(), [$name, $data]);
-    }
+	/**
+	 * @param string $name - event name
+	 * @param array $data
+	 *
+	 * @return GenericEvent
+	 */
+	public static function create($name, array $data)
+	{
+		return Injector::inst()->createWithArgs(get_called_class(), [$name, $data]);
+	}
 
-    /**
-     * Event constructor
-     *
-     * @param string $eventName - e.g. 'event.name'
-     * @param array $data
-     */
-    public function __construct($eventName, array $data)
-    {
-        $this->name = $eventName;
-        $this->data = $data;
-    }
+	/**
+	 * Event constructor
+	 *
+	 * @param string $eventName - e.g. 'event.name'
+	 * @param array $data
+	 */
+	public function __construct($eventName, array $data)
+	{
+		$this->name = $eventName;
+		$this->data = $data;
+	}
 
-    /**
-     * get the event name, e.g 'event.name'
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
+	/**
+	 * get the event name, e.g 'event.name'
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
 
-    /**
-     * Get the value for the $keyname or empty string
-     *
-     * @param string $keyname
-     *
-     * @return string
-     */
-    public function get($keyname)
-    {
-        if (array_key_exists($keyname, $this->data)) {
-            return $this->data[$keyname];
-        }
-        return '';
-    }
+	/**
+	 * Get the value for the $keyname or empty string
+	 *
+	 * @param string $keyname
+	 *
+	 * @return string
+	 */
+	public function get($keyname)
+	{
+		if (array_key_exists($keyname, $this->data)) {
+			return $this->data[$keyname];
+		}
+		return '';
+	}
 
-    /**
-     * return all the data as an array, including the event name as 'event';
-     *
-     * @return array
-     */
-    public function asArray()
-    {
-        $payload = $this->data;
-        $payload['event'] = $this->getName();
-        return $payload;
-    }
+	/**
+	 * return all the data as an array, including the event name as 'event';
+	 *
+	 * @return array
+	 */
+	public function asArray()
+	{
+		$payload = $this->data;
+		$payload['event'] = $this->getName();
+		return $payload;
+	}
 
-    /**
-     * return all the data as a JSON string, including the event name as 'event';
-     *
-     * @return string - returns the data as json
-     */
-    public function asJSON()
-    {
-        return json_encode($this->asArray());
-    }
+	/**
+	 * return all the data as a JSON string, including the event name as 'event';
+	 *
+	 * @return string - returns the data as json
+	 */
+	public function asJSON()
+	{
+		return json_encode($this->asArray());
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
      */
     public function get($keyname)
     {
-        if (array_key_exists($keyname, $this->data)) {
+        if(array_key_exists($keyname, $this->data)) {
             return $this->data[$keyname];
         }
         return '';

Braces +7 added lines, -14 removed lines

@@ -20,8 +20,7 @@ 
  *
  * See more on how to use the event system here: http://event.thephpleague.com/2.0/
  */
-class GenericEvent extends AbstractEvent implements DeploynautEventInterface
-{
+class GenericEvent extends AbstractEvent implements DeploynautEventInterface {
 
     /**
      * @var string
@@ -39,8 +38,7 @@ 
      *
      * @return GenericEvent
      */
-    public static function create($name, array $data)
-    {
+    public static function create($name, array $data) {
         return Injector::inst()->createWithArgs(get_called_class(), [$name, $data]);
     }
 
@@ -50,8 +48,7 @@ 
      * @param string $eventName - e.g. 'event.name'
      * @param array $data
      */
-    public function __construct($eventName, array $data)
-    {
+    public function __construct($eventName, array $data) {
         $this->name = $eventName;
         $this->data = $data;
     }
@@ -61,8 +58,7 @@ 
      *
      * @return string
      */
-    public function getName()
-    {
+    public function getName() {
         return $this->name;
     }
 
@@ -73,8 +69,7 @@ 
      *
      * @return string
      */
-    public function get($keyname)
-    {
+    public function get($keyname) {
         if (array_key_exists($keyname, $this->data)) {
             return $this->data[$keyname];
         }
@@ -86,8 +81,7 @@ 
      *
      * @return array
      */
-    public function asArray()
-    {
+    public function asArray() {
         $payload = $this->data;
         $payload['event'] = $this->getName();
         return $payload;
@@ -98,8 +92,7 @@ 
      *
      * @return string - returns the data as json
      */
-    public function asJSON()
-    {
+    public function asJSON() {
         return json_encode($this->asArray());
     }
 }

code/extensions/DeploynautFileExtension.php

Indentation +16 added lines, -16 removed lines

@@ -1,22 +1,22 @@
 <?php
 class DeploynautFileExtension extends DataExtension
 {
-    /**
-     * If this file is attached to a {@link DNDataArchive}, then we need to check security permissions, to ensure the
-     * currently logged in {@link Member} can download the file.
-     *
-     * This uses the secureassets module to provide the security of these assets.
-     */
-    public function canDownload()
-    {
-        $member = Member::currentUser();
-        $file = $this->owner;
-        $archive = DNDataArchive::get()->filter('ArchiveFileID', $file->ID)->First();
+	/**
+	 * If this file is attached to a {@link DNDataArchive}, then we need to check security permissions, to ensure the
+	 * currently logged in {@link Member} can download the file.
+	 *
+	 * This uses the secureassets module to provide the security of these assets.
+	 */
+	public function canDownload()
+	{
+		$member = Member::currentUser();
+		$file = $this->owner;
+		$archive = DNDataArchive::get()->filter('ArchiveFileID', $file->ID)->First();
 
-        if ($archive) {
-            return $archive->canDownload($member);
-        }
+		if ($archive) {
+			return $archive->canDownload($member);
+		}
 
-        return true; // By default, files can be downloaded from assets/ normally
-    }
+		return true; // By default, files can be downloaded from assets/ normally
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
         $file = $this->owner;
         $archive = DNDataArchive::get()->filter('ArchiveFileID', $file->ID)->First();
 
-        if ($archive) {
+        if($archive) {
             return $archive->canDownload($member);
         }
 

Braces +2 added lines, -4 removed lines

@@ -1,14 +1,12 @@
 <?php
-class DeploynautFileExtension extends DataExtension
-{
+class DeploynautFileExtension extends DataExtension {
     /**
      * If this file is attached to a {@link DNDataArchive}, then we need to check security permissions, to ensure the
      * currently logged in {@link Member} can download the file.
      *
      * This uses the secureassets module to provide the security of these assets.
      */
-    public function canDownload()
-    {
+    public function canDownload() {
         $member = Member::currentUser();
         $file = $this->owner;
         $archive = DNDataArchive::get()->filter('ArchiveFileID', $file->ID)->First();

code/extensions/DeploynautSecurityExtension.php

Indentation +9 added lines, -9 removed lines

@@ -3,13 +3,13 @@
 class DeploynautSecurityExtension extends Extension
 {
 
-    public function onAfterInit()
-    {
-        // the 'ping' action is called via AJAX from the /admin and will cause
-        // the admin section to 'grow' over time. We only need the css and js
-        // for login, reset, logout and so on.
-        if (!$this->owner->getRequest()->isAjax()) {
-            DNRoot::include_requirements();
-        }
-    }
+	public function onAfterInit()
+	{
+		// the 'ping' action is called via AJAX from the /admin and will cause
+		// the admin section to 'grow' over time. We only need the css and js
+		// for login, reset, logout and so on.
+		if (!$this->owner->getRequest()->isAjax()) {
+			DNRoot::include_requirements();
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
         // the 'ping' action is called via AJAX from the /admin and will cause
         // the admin section to 'grow' over time. We only need the css and js
         // for login, reset, logout and so on.
-        if (!$this->owner->getRequest()->isAjax()) {
+        if(!$this->owner->getRequest()->isAjax()) {
             DNRoot::include_requirements();
         }
     }

Braces +2 added lines, -4 removed lines

@@ -1,10 +1,8 @@
 <?php
 
-class DeploynautSecurityExtension extends Extension
-{
+class DeploynautSecurityExtension extends Extension {
 
-    public function onAfterInit()
-    {
+    public function onAfterInit() {
         // the 'ping' action is called via AJAX from the /admin and will cause
         // the admin section to 'grow' over time. We only need the css and js
         // for login, reset, logout and so on.

code/extensions/FrontendLink.php

Indentation +11 added lines, -11 removed lines

@@ -3,15 +3,15 @@
 class FrontendLink extends DataExtension
 {
 
-    public function updateItemEditForm($form)
-    {
-        if ($this->owner->record->hasMethod('Link')) {
-            $link = sprintf(
-                '<a style="margin: 0.5em" target="deploynaut-frontend" href="%s">Preview &raquo;</a>',
-                $this->owner->record->Link()
-            );
-            $actions = $form->Actions();
-            $actions->push(LiteralField::create('FrontendLink', $link));
-        }
-    }
+	public function updateItemEditForm($form)
+	{
+		if ($this->owner->record->hasMethod('Link')) {
+			$link = sprintf(
+				'<a style="margin: 0.5em" target="deploynaut-frontend" href="%s">Preview &raquo;</a>',
+				$this->owner->record->Link()
+			);
+			$actions = $form->Actions();
+			$actions->push(LiteralField::create('FrontendLink', $link));
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
     public function updateItemEditForm($form)
     {
-        if ($this->owner->record->hasMethod('Link')) {
+        if($this->owner->record->hasMethod('Link')) {
             $link = sprintf(
                 '<a style="margin: 0.5em" target="deploynaut-frontend" href="%s">Preview &raquo;</a>',
                 $this->owner->record->Link()

Braces +2 added lines, -4 removed lines

@@ -1,10 +1,8 @@
 <?php
 
-class FrontendLink extends DataExtension
-{
+class FrontendLink extends DataExtension {
 
-    public function updateItemEditForm($form)
-    {
+    public function updateItemEditForm($form) {
         if ($this->owner->record->hasMethod('Link')) {
             $link = sprintf(
                 '<a style="margin: 0.5em" target="deploynaut-frontend" href="%s">Preview &raquo;</a>',