silverstripe / deploynaut

code/backends/DeploymentStrategy.php

Doc Comments +2 added lines

@@ -79,6 +79,7 @@ 
     }
 
     /**
+     * @param string $code
      */
     public function setActionCode($code)
     {
@@ -95,6 +96,7 @@ 
 
     /**
      * @param int
+     * @param string $seconds
      */
     public function setEstimatedTime($seconds)
     {

Indentation +336 added lines, -336 removed lines

@@ -3,340 +3,340 @@
 class DeploymentStrategy extends ViewableData
 {
 
-    const SUCCESS_CODE = 'success';
-
-    const WARNING_CODE = 'warning';
-
-    const ERROR_CODE = 'error';
-
-    /**
-     * @var DNEnvironment
-     */
-    protected $environment;
-
-    /**
-     * @var string
-     */
-    protected $actionTitle = 'Deploy';
-
-    /**
-     * @var string
-     */
-    protected $actionCode = 'default';
-
-    /**
-     * @var int
-     */
-    protected $estimatedTime = 0;
-
-    /**
-     * @var array
-     */
-    protected $changes = [];
-
-    /**
-     * @var array
-     */
-    protected $options;
-
-    /**
-     * Validation code
-     *
-     * @var string
-     */
-    protected $validationCode = DeploymentStrategy::SUCCESS_CODE;
-
-    /**
-     * @var array
-     */
-    protected $messages = [];
-
-
-    /**
-     * @param DNEnvironment $environment
-     * @param array $options
-     */
-    public function __construct(DNEnvironment $environment, $options = array())
-    {
-        $this->environment = $environment;
-        $this->options = $options;
-    }
-
-    /**
-     * @param string $title
-     */
-    public function setActionTitle($title)
-    {
-        $this->actionTitle = $title;
-    }
-
-    /**
-     * @return string
-     */
-    public function getActionTitle()
-    {
-        return $this->actionTitle;
-    }
-
-    /**
-     */
-    public function setActionCode($code)
-    {
-        $this->actionCode = $code;
-    }
-
-    /**
-     * @return string
-     */
-    public function getActionCode()
-    {
-        return $this->actionCode;
-    }
-
-    /**
-     * @param int
-     */
-    public function setEstimatedTime($seconds)
-    {
-        $this->estimatedTime = $seconds;
-    }
-
-    /**
-     * @return int Time in minutes
-     */
-    public function getEstimatedTime()
-    {
-        return $this->estimatedTime;
-    }
-
-    /**
-     * @param string $title
-     * @param string $from
-     * @param string $to
-     */
-    public function setChange($title, $from, $to)
-    {
-        return $this->changes[$title] = array(
-            'from' => $from,
-            'to' => $to
-        );
-    }
-
-    /**
-     * @param string $title
-     * @param string $desc
-     */
-    public function setChangeDescriptionOnly($title, $desc)
-    {
-        return $this->changes[$title] = array(
-            'description' => $desc
-        );
-    }
-
-    /**
-     * Filter the changeset where modification was not required.
-     *
-     * @return array
-     */
-    public function getChangesModificationNeeded()
-    {
-        $filtered = [];
-        foreach ($this->changes as $change => $details) {
-            if (array_key_exists('description', $details)) {
-                $filtered[$change] = $details;
-            } elseif (
-                (array_key_exists('from', $details) || array_key_exists('to', $details))
-                && $details['from'] !== $details['to']
-            ) {
-                $filtered[$change] = $details;
-            }
-        }
-
-        return $filtered;
-    }
-
-    /**
-     * @return array Associative array of changes, e.g.
-     *	array(
-     *		'SHA' => array(
-     *			'from' => 'abc',
-     *			'to' => 'def'
-     *		)
-     *	)
-     */
-    public function getChanges()
-    {
-        return $this->changes;
-    }
-
-    /**
-     * Returns a change or a given key.
-     *
-     * @return ArrayData|null
-     */
-    public function getChange($key)
-    {
-        $changes = $this->getChanges();
-        if (array_key_exists($key, $changes)) {
-            return new ArrayData($changes[$key]);
-        }
-        return null;
-    }
-
-    /**
-     * @param string $option
-     * @param string $value
-     */
-    public function setOption($option, $value)
-    {
-        $this->options[$option] = $value;
-    }
-
-    /**
-     * @param string $option
-     * @return string|null
-     */
-    public function getOption($option)
-    {
-        if (!empty($this->options[$option])) {
-            return $this->options[$option];
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    /**
-     * @param string $code
-     */
-    public function setValidationCode($code)
-    {
-        $this->validationCode = $code;
-    }
-
-    /**
-     * @return string
-     */
-    public function getValidationCode()
-    {
-        return $this->validationCode;
-    }
-
-    /**
-     * @param string $msg
-     */
-    public function setMessage($msg, $code = self::ERROR_CODE)
-    {
-        $this->messages[] = [
-            'text' => $msg,
-            'code' => $code
-        ];
-
-        $current = $this->getValidationCode();
-        $map = [
-            DeploymentStrategy::SUCCESS_CODE => 0,
-            DeploymentStrategy::WARNING_CODE => 1,
-            DeploymentStrategy::ERROR_CODE => 2
-        ];
-        if ($map[$current] < $map[$code]) {
-            $this->setValidationCode($code);
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getMessages()
-    {
-        return $this->messages;
-    }
-
-    /**
-     * Transform the deployment strategy to an array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $fields = array(
-            'actionTitle',
-            'actionCode',
-            'estimatedTime',
-            'changes',
-            'options',
-            'validationCode',
-            'messages'
-        );
-
-        $output = array();
-        foreach ($fields as $field) {
-            $output[$field] = $this->$field;
-        }
-        return $output;
-    }
-
-    /**
-     * @return string
-     */
-    public function toJSON()
-    {
-        return json_encode($this->toArray(), JSON_PRETTY_PRINT);
-    }
-
-    /**
-     * Load from JSON associative array.
-     * Environment must be set by the callee when creating this object.
-     *
-     * @param string $json
-     */
-    public function fromJSON($json)
-    {
-        $decoded = json_decode($json, true);
-        return $this->fromArray($decoded);
-    }
-
-    /**
-     * Load from array.
-     * Environment must be set by the callee when creating this object.
-     *
-     * @param string $data
-     */
-    public function fromArray($data)
-    {
-        $fields = array(
-            'actionTitle',
-            'actionCode',
-            'estimatedTime',
-            'changes',
-            'options',
-            'validationCode',
-            'messages'
-        );
-
-        foreach ($fields as $field) {
-            if (!empty($data[$field])) {
-                $this->$field = $data[$field];
-            }
-        }
-    }
-
-    /**
-     * @return DNDeployment
-     */
-    public function createDeployment()
-    {
-        $deployment = DNDeployment::create();
-        $deployment->EnvironmentID = $this->environment->ID;
-        // Pull out the SHA from the options so we can make it queryable.
-        $deployment->SHA = $this->getOption('sha');
-        $deployment->Strategy = $this->toJSON();
-        $deployment->write();
-
-        return $deployment;
-    }
+	const SUCCESS_CODE = 'success';
+
+	const WARNING_CODE = 'warning';
+
+	const ERROR_CODE = 'error';
+
+	/**
+	 * @var DNEnvironment
+	 */
+	protected $environment;
+
+	/**
+	 * @var string
+	 */
+	protected $actionTitle = 'Deploy';
+
+	/**
+	 * @var string
+	 */
+	protected $actionCode = 'default';
+
+	/**
+	 * @var int
+	 */
+	protected $estimatedTime = 0;
+
+	/**
+	 * @var array
+	 */
+	protected $changes = [];
+
+	/**
+	 * @var array
+	 */
+	protected $options;
+
+	/**
+	 * Validation code
+	 *
+	 * @var string
+	 */
+	protected $validationCode = DeploymentStrategy::SUCCESS_CODE;
+
+	/**
+	 * @var array
+	 */
+	protected $messages = [];
+
+
+	/**
+	 * @param DNEnvironment $environment
+	 * @param array $options
+	 */
+	public function __construct(DNEnvironment $environment, $options = array())
+	{
+		$this->environment = $environment;
+		$this->options = $options;
+	}
+
+	/**
+	 * @param string $title
+	 */
+	public function setActionTitle($title)
+	{
+		$this->actionTitle = $title;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getActionTitle()
+	{
+		return $this->actionTitle;
+	}
+
+	/**
+	 */
+	public function setActionCode($code)
+	{
+		$this->actionCode = $code;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getActionCode()
+	{
+		return $this->actionCode;
+	}
+
+	/**
+	 * @param int
+	 */
+	public function setEstimatedTime($seconds)
+	{
+		$this->estimatedTime = $seconds;
+	}
+
+	/**
+	 * @return int Time in minutes
+	 */
+	public function getEstimatedTime()
+	{
+		return $this->estimatedTime;
+	}
+
+	/**
+	 * @param string $title
+	 * @param string $from
+	 * @param string $to
+	 */
+	public function setChange($title, $from, $to)
+	{
+		return $this->changes[$title] = array(
+			'from' => $from,
+			'to' => $to
+		);
+	}
+
+	/**
+	 * @param string $title
+	 * @param string $desc
+	 */
+	public function setChangeDescriptionOnly($title, $desc)
+	{
+		return $this->changes[$title] = array(
+			'description' => $desc
+		);
+	}
+
+	/**
+	 * Filter the changeset where modification was not required.
+	 *
+	 * @return array
+	 */
+	public function getChangesModificationNeeded()
+	{
+		$filtered = [];
+		foreach ($this->changes as $change => $details) {
+			if (array_key_exists('description', $details)) {
+				$filtered[$change] = $details;
+			} elseif (
+				(array_key_exists('from', $details) || array_key_exists('to', $details))
+				&& $details['from'] !== $details['to']
+			) {
+				$filtered[$change] = $details;
+			}
+		}
+
+		return $filtered;
+	}
+
+	/**
+	 * @return array Associative array of changes, e.g.
+	 *	array(
+	 *		'SHA' => array(
+	 *			'from' => 'abc',
+	 *			'to' => 'def'
+	 *		)
+	 *	)
+	 */
+	public function getChanges()
+	{
+		return $this->changes;
+	}
+
+	/**
+	 * Returns a change or a given key.
+	 *
+	 * @return ArrayData|null
+	 */
+	public function getChange($key)
+	{
+		$changes = $this->getChanges();
+		if (array_key_exists($key, $changes)) {
+			return new ArrayData($changes[$key]);
+		}
+		return null;
+	}
+
+	/**
+	 * @param string $option
+	 * @param string $value
+	 */
+	public function setOption($option, $value)
+	{
+		$this->options[$option] = $value;
+	}
+
+	/**
+	 * @param string $option
+	 * @return string|null
+	 */
+	public function getOption($option)
+	{
+		if (!empty($this->options[$option])) {
+			return $this->options[$option];
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getOptions()
+	{
+		return $this->options;
+	}
+
+	/**
+	 * @param string $code
+	 */
+	public function setValidationCode($code)
+	{
+		$this->validationCode = $code;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getValidationCode()
+	{
+		return $this->validationCode;
+	}
+
+	/**
+	 * @param string $msg
+	 */
+	public function setMessage($msg, $code = self::ERROR_CODE)
+	{
+		$this->messages[] = [
+			'text' => $msg,
+			'code' => $code
+		];
+
+		$current = $this->getValidationCode();
+		$map = [
+			DeploymentStrategy::SUCCESS_CODE => 0,
+			DeploymentStrategy::WARNING_CODE => 1,
+			DeploymentStrategy::ERROR_CODE => 2
+		];
+		if ($map[$current] < $map[$code]) {
+			$this->setValidationCode($code);
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getMessages()
+	{
+		return $this->messages;
+	}
+
+	/**
+	 * Transform the deployment strategy to an array.
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		$fields = array(
+			'actionTitle',
+			'actionCode',
+			'estimatedTime',
+			'changes',
+			'options',
+			'validationCode',
+			'messages'
+		);
+
+		$output = array();
+		foreach ($fields as $field) {
+			$output[$field] = $this->$field;
+		}
+		return $output;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function toJSON()
+	{
+		return json_encode($this->toArray(), JSON_PRETTY_PRINT);
+	}
+
+	/**
+	 * Load from JSON associative array.
+	 * Environment must be set by the callee when creating this object.
+	 *
+	 * @param string $json
+	 */
+	public function fromJSON($json)
+	{
+		$decoded = json_decode($json, true);
+		return $this->fromArray($decoded);
+	}
+
+	/**
+	 * Load from array.
+	 * Environment must be set by the callee when creating this object.
+	 *
+	 * @param string $data
+	 */
+	public function fromArray($data)
+	{
+		$fields = array(
+			'actionTitle',
+			'actionCode',
+			'estimatedTime',
+			'changes',
+			'options',
+			'validationCode',
+			'messages'
+		);
+
+		foreach ($fields as $field) {
+			if (!empty($data[$field])) {
+				$this->$field = $data[$field];
+			}
+		}
+	}
+
+	/**
+	 * @return DNDeployment
+	 */
+	public function createDeployment()
+	{
+		$deployment = DNDeployment::create();
+		$deployment->EnvironmentID = $this->environment->ID;
+		// Pull out the SHA from the options so we can make it queryable.
+		$deployment->SHA = $this->getOption('sha');
+		$deployment->Strategy = $this->toJSON();
+		$deployment->write();
+
+		return $deployment;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -141,10 +141,10 @@ 
     public function getChangesModificationNeeded()
     {
         $filtered = [];
-        foreach ($this->changes as $change => $details) {
-            if (array_key_exists('description', $details)) {
+        foreach($this->changes as $change => $details) {
+            if(array_key_exists('description', $details)) {
                 $filtered[$change] = $details;
-            } elseif (
+            } elseif(
                 (array_key_exists('from', $details) || array_key_exists('to', $details))
                 && $details['from'] !== $details['to']
             ) {
@@ -177,7 +177,7 @@ 
     public function getChange($key)
     {
         $changes = $this->getChanges();
-        if (array_key_exists($key, $changes)) {
+        if(array_key_exists($key, $changes)) {
             return new ArrayData($changes[$key]);
         }
         return null;
@@ -198,7 +198,7 @@ 
      */
     public function getOption($option)
     {
-        if (!empty($this->options[$option])) {
+        if(!empty($this->options[$option])) {
             return $this->options[$option];
         }
     }
@@ -243,7 +243,7 @@ 
             DeploymentStrategy::WARNING_CODE => 1,
             DeploymentStrategy::ERROR_CODE => 2
         ];
-        if ($map[$current] < $map[$code]) {
+        if($map[$current] < $map[$code]) {
             $this->setValidationCode($code);
         }
     }
@@ -274,7 +274,7 @@ 
         );
 
         $output = array();
-        foreach ($fields as $field) {
+        foreach($fields as $field) {
             $output[$field] = $this->$field;
         }
         return $output;
@@ -318,8 +318,8 @@ 
             'messages'
         );
 
-        foreach ($fields as $field) {
-            if (!empty($data[$field])) {
+        foreach($fields as $field) {
+            if(!empty($data[$field])) {
                 $this->$field = $data[$field];
             }
         }

Braces +25 added lines, -50 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-class DeploymentStrategy extends ViewableData
-{
+class DeploymentStrategy extends ViewableData {
 
     const SUCCESS_CODE = 'success';
 
@@ -56,8 +55,7 @@ 
      * @param DNEnvironment $environment
      * @param array $options
      */
-    public function __construct(DNEnvironment $environment, $options = array())
-    {
+    public function __construct(DNEnvironment $environment, $options = array()) {
         $this->environment = $environment;
         $this->options = $options;
     }
@@ -65,47 +63,41 @@ 
     /**
      * @param string $title
      */
-    public function setActionTitle($title)
-    {
+    public function setActionTitle($title) {
         $this->actionTitle = $title;
     }
 
     /**
      * @return string
      */
-    public function getActionTitle()
-    {
+    public function getActionTitle() {
         return $this->actionTitle;
     }
 
     /**
      */
-    public function setActionCode($code)
-    {
+    public function setActionCode($code) {
         $this->actionCode = $code;
     }
 
     /**
      * @return string
      */
-    public function getActionCode()
-    {
+    public function getActionCode() {
         return $this->actionCode;
     }
 
     /**
      * @param int
      */
-    public function setEstimatedTime($seconds)
-    {
+    public function setEstimatedTime($seconds) {
         $this->estimatedTime = $seconds;
     }
 
     /**
      * @return int Time in minutes
      */
-    public function getEstimatedTime()
-    {
+    public function getEstimatedTime() {
         return $this->estimatedTime;
     }
 
@@ -114,8 +106,7 @@ 
      * @param string $from
      * @param string $to
      */
-    public function setChange($title, $from, $to)
-    {
+    public function setChange($title, $from, $to) {
         return $this->changes[$title] = array(
             'from' => $from,
             'to' => $to
@@ -126,8 +117,7 @@ 
      * @param string $title
      * @param string $desc
      */
-    public function setChangeDescriptionOnly($title, $desc)
-    {
+    public function setChangeDescriptionOnly($title, $desc) {
         return $this->changes[$title] = array(
             'description' => $desc
         );
@@ -138,8 +128,7 @@ 
      *
      * @return array
      */
-    public function getChangesModificationNeeded()
-    {
+    public function getChangesModificationNeeded() {
         $filtered = [];
         foreach ($this->changes as $change => $details) {
             if (array_key_exists('description', $details)) {
@@ -164,8 +153,7 @@ 
      *		)
      *	)
      */
-    public function getChanges()
-    {
+    public function getChanges() {
         return $this->changes;
     }
 
@@ -174,8 +162,7 @@ 
      *
      * @return ArrayData|null
      */
-    public function getChange($key)
-    {
+    public function getChange($key) {
         $changes = $this->getChanges();
         if (array_key_exists($key, $changes)) {
             return new ArrayData($changes[$key]);
@@ -187,8 +174,7 @@ 
      * @param string $option
      * @param string $value
      */
-    public function setOption($option, $value)
-    {
+    public function setOption($option, $value) {
         $this->options[$option] = $value;
     }
 
@@ -196,8 +182,7 @@ 
      * @param string $option
      * @return string|null
      */
-    public function getOption($option)
-    {
+    public function getOption($option) {
         if (!empty($this->options[$option])) {
             return $this->options[$option];
         }
@@ -206,32 +191,28 @@ 
     /**
      * @return string
      */
-    public function getOptions()
-    {
+    public function getOptions() {
         return $this->options;
     }
 
     /**
      * @param string $code
      */
-    public function setValidationCode($code)
-    {
+    public function setValidationCode($code) {
         $this->validationCode = $code;
     }
 
     /**
      * @return string
      */
-    public function getValidationCode()
-    {
+    public function getValidationCode() {
         return $this->validationCode;
     }
 
     /**
      * @param string $msg
      */
-    public function setMessage($msg, $code = self::ERROR_CODE)
-    {
+    public function setMessage($msg, $code = self::ERROR_CODE) {
         $this->messages[] = [
             'text' => $msg,
             'code' => $code
@@ -251,8 +232,7 @@ 
     /**
      * @return array
      */
-    public function getMessages()
-    {
+    public function getMessages() {
         return $this->messages;
     }
 
@@ -261,8 +241,7 @@ 
      *
      * @return array
      */
-    public function toArray()
-    {
+    public function toArray() {
         $fields = array(
             'actionTitle',
             'actionCode',
@@ -283,8 +262,7 @@ 
     /**
      * @return string
      */
-    public function toJSON()
-    {
+    public function toJSON() {
         return json_encode($this->toArray(), JSON_PRETTY_PRINT);
     }
 
@@ -294,8 +272,7 @@ 
      *
      * @param string $json
      */
-    public function fromJSON($json)
-    {
+    public function fromJSON($json) {
         $decoded = json_decode($json, true);
         return $this->fromArray($decoded);
     }
@@ -306,8 +283,7 @@ 
      *
      * @param string $data
      */
-    public function fromArray($data)
-    {
+    public function fromArray($data) {
         $fields = array(
             'actionTitle',
             'actionCode',
@@ -328,8 +304,7 @@ 
     /**
      * @return DNDeployment
      */
-    public function createDeployment()
-    {
+    public function createDeployment() {
         $deployment = DNDeployment::create();
         $deployment->EnvironmentID = $this->environment->ID;
         // Pull out the SHA from the options so we can make it queryable.

code/control/DNRoot.php

Doc Comments +2 added lines, -2 removed lines

@@ -997,7 +997,7 @@ 
      * @param array $data
      * @param Form $form
      *
-     * @return bool|HTMLText|SS_HTTPResponse
+     * @return SS_HTTPResponse|null
      */
     public function doCreateEnvironment($data, Form $form)
     {
@@ -2430,7 +2430,7 @@ 
     /**
      * Create project action.
      *
-     * @return SS_HTTPResponse
+     * @return HTMLText
      */
     public function createproject(SS_HTTPRequest $request)
     {

Indentation +2607 added lines, -2607 removed lines

@@ -10,2611 +10,2611 @@
 class DNRoot extends Controller implements PermissionProvider, TemplateGlobalProvider
 {
 
-    /**
-     * @const string - action type for actions that perform deployments
-     */
-    const ACTION_DEPLOY = 'deploy';
-
-    /**
-     * @const string - action type for actions that manipulate snapshots
-     */
-    const ACTION_SNAPSHOT = 'snapshot';
-
-    const ACTION_ENVIRONMENTS = 'createenv';
-
-    /**
-     * @var string
-     */
-    private $actionType = self::ACTION_DEPLOY;
-
-    /**
-     * Bypass pipeline permission code
-     */
-    const DEPLOYNAUT_BYPASS_PIPELINE = 'DEPLOYNAUT_BYPASS_PIPELINE';
-
-    /**
-     * Allow dryrun of pipelines
-     */
-    const DEPLOYNAUT_DRYRUN_PIPELINE = 'DEPLOYNAUT_DRYRUN_PIPELINE';
-
-    /**
-     * Allow advanced options on deployments
-     */
-    const DEPLOYNAUT_ADVANCED_DEPLOY_OPTIONS = 'DEPLOYNAUT_ADVANCED_DEPLOY_OPTIONS';
-
-    const ALLOW_PROD_DEPLOYMENT = 'ALLOW_PROD_DEPLOYMENT';
-    const ALLOW_NON_PROD_DEPLOYMENT = 'ALLOW_NON_PROD_DEPLOYMENT';
-    const ALLOW_PROD_SNAPSHOT = 'ALLOW_PROD_SNAPSHOT';
-    const ALLOW_NON_PROD_SNAPSHOT = 'ALLOW_NON_PROD_SNAPSHOT';
-    const ALLOW_CREATE_ENVIRONMENT = 'ALLOW_CREATE_ENVIRONMENT';
-
-    /**
-     * @var array
-     */
-    private static $allowed_actions = array(
-        'projects',
-        'nav',
-        'update',
-        'project',
-        'toggleprojectstar',
-        'branch',
-        'environment',
-        'abortpipeline',
-        'pipeline',
-        'pipelinelog',
-        'metrics',
-        'createenvlog',
-        'createenv',
-        'getDeployForm',
-        'doDeploy',
-        'deploy',
-        'deploylog',
-        'getDataTransferForm',
-        'transfer',
-        'transferlog',
-        'snapshots',
-        'createsnapshot',
-        'snapshotslog',
-        'uploadsnapshot',
-        'getCreateEnvironmentForm',
-        'getUploadSnapshotForm',
-        'getPostSnapshotForm',
-        'getDataTransferRestoreForm',
-        'getDeleteForm',
-        'getMoveForm',
-        'restoresnapshot',
-        'deletesnapshot',
-        'movesnapshot',
-        'postsnapshotsuccess',
-        'gitRevisions',
-        'deploySummary',
-        'startDeploy',
-        'createproject',
-        'CreateProjectForm',
-        'createprojectprogress',
-        'checkrepoaccess',
-    );
-
-    /**
-     * URL handlers pretending that we have a deep URL structure.
-     */
-    private static $url_handlers = array(
-        'project/$Project/environment/$Environment/DeployForm' => 'getDeployForm',
-        'project/$Project/createsnapshot/DataTransferForm' => 'getDataTransferForm',
-        'project/$Project/DataTransferForm' => 'getDataTransferForm',
-        'project/$Project/DataTransferRestoreForm' => 'getDataTransferRestoreForm',
-        'project/$Project/DeleteForm' => 'getDeleteForm',
-        'project/$Project/MoveForm' => 'getMoveForm',
-        'project/$Project/UploadSnapshotForm' => 'getUploadSnapshotForm',
-        'project/$Project/PostSnapshotForm' => 'getPostSnapshotForm',
-        'project/$Project/environment/$Environment/metrics' => 'metrics',
-        'project/$Project/environment/$Environment/pipeline/$Identifier//$Action/$ID/$OtherID' => 'pipeline',
-        'project/$Project/environment/$Environment/deploy_summary' => 'deploySummary',
-        'project/$Project/environment/$Environment/git_revisions' => 'gitRevisions',
-        'project/$Project/environment/$Environment/start-deploy' => 'startDeploy',
-        'project/$Project/environment/$Environment/deploy/$Identifier/log' => 'deploylog',
-        'project/$Project/environment/$Environment/deploy/$Identifier' => 'deploy',
-        'project/$Project/transfer/$Identifier/log' => 'transferlog',
-        'project/$Project/transfer/$Identifier' => 'transfer',
-        'project/$Project/environment/$Environment' => 'environment',
-        'project/$Project/createenv/$Identifier/log' => 'createenvlog',
-        'project/$Project/createenv/$Identifier' => 'createenv',
-        'project/$Project/CreateEnvironmentForm' => 'getCreateEnvironmentForm',
-        'project/$Project/branch' => 'branch',
-        'project/$Project/build/$Build' => 'build',
-        'project/$Project/restoresnapshot/$DataArchiveID' => 'restoresnapshot',
-        'project/$Project/deletesnapshot/$DataArchiveID' => 'deletesnapshot',
-        'project/$Project/movesnapshot/$DataArchiveID' => 'movesnapshot',
-        'project/$Project/update' => 'update',
-        'project/$Project/snapshots' => 'snapshots',
-        'project/$Project/createsnapshot' => 'createsnapshot',
-        'project/$Project/uploadsnapshot' => 'uploadsnapshot',
-        'project/$Project/snapshotslog' => 'snapshotslog',
-        'project/$Project/postsnapshotsuccess/$DataArchiveID' => 'postsnapshotsuccess',
-        'project/$Project/star' => 'toggleprojectstar',
-        'project/$Project/createprojectprogress' => 'createprojectprogress',
-        'project/$Project/checkrepoaccess' => 'checkrepoaccess',
-        'project/$Project' => 'project',
-        'nav/$Project' => 'nav',
-        'projects' => 'projects',
-    );
-
-    /**
-     * @var array
-     */
-    protected static $_project_cache = array();
-
-    /**
-     * @var array
-     */
-    private static $support_links = array();
-
-    /**
-     * @var array
-     */
-    private static $platform_specific_strings = array();
-
-    /**
-     * @var array
-     */
-    private static $action_types = array(
-        self::ACTION_DEPLOY,
-        self::ACTION_SNAPSHOT
-    );
-
-    /**
-     * @var DNData
-     */
-    protected $data;
-
-    /**
-     * Include requirements that deploynaut needs, such as javascript.
-     */
-    public static function include_requirements()
-    {
-
-        // JS should always go to the bottom, otherwise there's the risk that Requirements
-        // puts them halfway through the page to the nearest <script> tag. We don't want that.
-        Requirements::set_force_js_to_bottom(true);
-
-        // todo these should be bundled into the same JS as the others in "static" below.
-        // We've deliberately not used combined_files as it can mess with some of the JS used
-        // here and cause sporadic errors.
-        Requirements::javascript('deploynaut/javascript/jquery.js');
-        Requirements::javascript('deploynaut/javascript/bootstrap.js');
-        Requirements::javascript('deploynaut/javascript/q.js');
-        Requirements::javascript('deploynaut/javascript/tablefilter.js');
-        Requirements::javascript('deploynaut/javascript/deploynaut.js');
-        Requirements::javascript('deploynaut/javascript/react-with-addons.js');
-        Requirements::javascript('deploynaut/javascript/bootstrap.file-input.js');
-        Requirements::javascript('deploynaut/thirdparty/select2/dist/js/select2.min.js');
-        Requirements::javascript('deploynaut/javascript/material.js');
-
-        // Load the buildable dependencies only if not loaded centrally.
-        if (!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
-            if (\Director::isDev()) {
-                \Requirements::javascript('deploynaut/static/bundle-debug.js');
-            } else {
-                \Requirements::javascript('deploynaut/static/bundle.js');
-            }
-        }
-
-        Requirements::css('deploynaut/static/style.css');
-    }
-
-    /**
-     * Check for feature flags:
-     * - FLAG_SNAPSHOTS_ENABLED: set to true to enable globally
-     * - FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS: set to semicolon-separated list of email addresses of allowed users.
-     *
-     * @return boolean
-     */
-    public static function FlagSnapshotsEnabled()
-    {
-        if (defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) {
-            return true;
-        }
-        if (defined('FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS') && FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS) {
-            $allowedMembers = explode(';', FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS);
-            $member = Member::currentUser();
-            if ($allowedMembers && $member && in_array($member->Email, $allowedMembers)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @return ArrayList
-     */
-    public static function get_support_links()
-    {
-        $supportLinks = self::config()->support_links;
-        if ($supportLinks) {
-            return new ArrayList($supportLinks);
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public static function get_template_global_variables()
-    {
-        return array(
-            'RedisUnavailable' => 'RedisUnavailable',
-            'RedisWorkersCount' => 'RedisWorkersCount',
-            'SidebarLinks' => 'SidebarLinks',
-            "SupportLinks" => 'get_support_links'
-        );
-    }
-
-    /**
-     */
-    public function init()
-    {
-        parent::init();
-
-        if (!Member::currentUser() && !Session::get('AutoLoginHash')) {
-            return Security::permissionFailure();
-        }
-
-        // Block framework jquery
-        Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
-
-        self::include_requirements();
-    }
-
-    /**
-     * @return string
-     */
-    public function Link()
-    {
-        return "naut/";
-    }
-
-    /**
-     * Actions
-     *
-     * @param SS_HTTPRequest $request
-     * @return \SS_HTTPResponse
-     */
-    public function index(SS_HTTPRequest $request)
-    {
-        return $this->redirect($this->Link() . 'projects/');
-    }
-
-    /**
-     * Action
-     *
-     * @param SS_HTTPRequest $request
-     * @return string - HTML
-     */
-    public function projects(SS_HTTPRequest $request)
-    {
-        // Performs canView permission check by limiting visible projects in DNProjectsList() call.
-        return $this->customise(array(
-            'Title' => 'Projects',
-        ))->render();
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     * @return HTMLText
-     */
-    public function nav(SS_HTTPRequest $request)
-    {
-        return $this->renderWith('Nav');
-    }
-
-    /**
-     * Return a link to the navigation template used for AJAX requests.
-     * @return string
-     */
-    public function NavLink()
-    {
-        $currentProject = $this->getCurrentProject();
-        $projectName = $currentProject ? $currentProject->Name : null;
-        return Controller::join_links(Director::absoluteBaseURL(), 'naut', 'nav', $projectName);
-    }
-
-    /**
-     * Action
-     *
-     * @param SS_HTTPRequest $request
-     * @return SS_HTTPResponse - HTML
-     */
-    public function snapshots(SS_HTTPRequest $request)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-        return $this->getCustomisedViewSection('SnapshotsSection', 'Data Snapshots');
-    }
-
-    /**
-     * Action
-     *
-     * @param SS_HTTPRequest $request
-     * @return string - HTML
-     */
-    public function createsnapshot(SS_HTTPRequest $request)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        if (!$project->canBackup()) {
-            return new SS_HTTPResponse("Not allowed to create snapshots on any environments", 401);
-        }
-
-        return $this->customise(array(
-            'Title' => 'Create Data Snapshot',
-            'SnapshotsSection' => 1,
-            'DataTransferForm' => $this->getDataTransferForm($request)
-        ))->render();
-    }
-
-    /**
-     * Action
-     *
-     * @param SS_HTTPRequest $request
-     * @return string - HTML
-     */
-    public function uploadsnapshot(SS_HTTPRequest $request)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        if (!$project->canUploadArchive()) {
-            return new SS_HTTPResponse("Not allowed to upload", 401);
-        }
-
-        return $this->customise(array(
-            'SnapshotsSection' => 1,
-            'UploadSnapshotForm' => $this->getUploadSnapshotForm($request),
-            'PostSnapshotForm' => $this->getPostSnapshotForm($request)
-        ))->render();
-    }
-
-    /**
-     * Return the upload limit for snapshot uploads
-     * @return string
-     */
-    public function UploadLimit()
-    {
-        return File::format_size(min(
-            File::ini2bytes(ini_get('upload_max_filesize')),
-            File::ini2bytes(ini_get('post_max_size'))
-        ));
-    }
-
-    /**
-     * Construct the upload form.
-     *
-     * @param SS_HTTPRequest $request
-     * @return Form
-     */
-    public function getUploadSnapshotForm(SS_HTTPRequest $request)
-    {
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        if (!$project->canUploadArchive()) {
-            return new SS_HTTPResponse("Not allowed to upload", 401);
-        }
-
-        // Framing an environment as a "group of people with download access"
-        // makes more sense to the user here, while still allowing us to enforce
-        // environment specific restrictions on downloading the file later on.
-        $envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
-            return $item->canUploadArchive();
-        });
-        $envsMap = array();
-        foreach ($envs as $env) {
-            $envsMap[$env->ID] = $env->Name;
-        }
-
-        $maxSize = min(File::ini2bytes(ini_get('upload_max_filesize')), File::ini2bytes(ini_get('post_max_size')));
-        $fileField = DataArchiveFileField::create('ArchiveFile', 'File');
-        $fileField->getValidator()->setAllowedExtensions(array('sspak'));
-        $fileField->getValidator()->setAllowedMaxFileSize(array('*' => $maxSize));
-
-        $form = Form::create(
-            $this,
-            'UploadSnapshotForm',
-            FieldList::create(
-                $fileField,
-                DropdownField::create('Mode', 'What does this file contain?', DNDataArchive::get_mode_map()),
-                DropdownField::create('EnvironmentID', 'Initial ownership of the file', $envsMap)
-                    ->setEmptyString('Select an environment')
-            ),
-            FieldList::create(
-                FormAction::create('doUploadSnapshot', 'Upload File')
-                    ->addExtraClass('btn')
-            ),
-            RequiredFields::create('ArchiveFile')
-        );
-
-        $form->disableSecurityToken();
-        $form->addExtraClass('fields-wide');
-        // Tweak the action so it plays well with our fake URL structure.
-        $form->setFormAction($project->Link() . '/UploadSnapshotForm');
-
-        return $form;
-    }
-
-    /**
-     * @param array $data
-     * @param Form $form
-     *
-     * @return bool|HTMLText|SS_HTTPResponse
-     */
-    public function doUploadSnapshot($data, Form $form)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        $validEnvs = $project->DNEnvironmentList()
-            ->filterByCallback(function ($item) {
-                return $item->canUploadArchive();
-            });
-
-        // Validate $data['EnvironmentID'] by checking against $validEnvs.
-        $environment = $validEnvs->find('ID', $data['EnvironmentID']);
-        if (!$environment) {
-            throw new LogicException('Invalid environment');
-        }
-
-        $this->validateSnapshotMode($data['Mode']);
-
-        $dataArchive = DNDataArchive::create(array(
-            'AuthorID' => Member::currentUserID(),
-            'EnvironmentID' => $data['EnvironmentID'],
-            'IsManualUpload' => true,
-        ));
-        // needs an ID and transfer to determine upload path
-        $dataArchive->write();
-        $dataTransfer = DNDataTransfer::create(array(
-            'AuthorID' => Member::currentUserID(),
-            'Mode' => $data['Mode'],
-            'Origin' => 'ManualUpload',
-            'EnvironmentID' => $data['EnvironmentID']
-        ));
-        $dataTransfer->write();
-        $dataArchive->DataTransfers()->add($dataTransfer);
-        $form->saveInto($dataArchive);
-        $dataArchive->write();
-        $workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
-
-        $cleanupFn = function () use ($workingDir, $dataTransfer, $dataArchive) {
-            $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
-            $process->run();
-            $dataTransfer->delete();
-            $dataArchive->delete();
-        };
-
-        // extract the sspak contents so we can inspect them
-        try {
-            $dataArchive->extractArchive($workingDir);
-        } catch (Exception $e) {
-            $cleanupFn();
-            $form->sessionMessage(
-                'There was a problem trying to open your snapshot for processing. Please try uploading again',
-                'bad'
-            );
-            return $this->redirectBack();
-        }
-
-        // validate that the sspak contents match the declared contents
-        $result = $dataArchive->validateArchiveContents();
-        if (!$result->valid()) {
-            $cleanupFn();
-            $form->sessionMessage($result->message(), 'bad');
-            return $this->redirectBack();
-        }
-
-        // fix file permissions of extracted sspak files then re-build the sspak
-        try {
-            $dataArchive->fixArchivePermissions($workingDir);
-            $dataArchive->setArchiveFromFiles($workingDir);
-        } catch (Exception $e) {
-            $cleanupFn();
-            $form->sessionMessage(
-                'There was a problem processing your snapshot. Please try uploading again',
-                'bad'
-            );
-            return $this->redirectBack();
-        }
-
-        // cleanup any extracted sspak contents lying around
-        $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
-        $process->run();
-
-        return $this->customise(array(
-            'Project' => $project,
-            'CurrentProject' => $project,
-            'SnapshotsSection' => 1,
-            'DataArchive' => $dataArchive,
-            'DataTransferRestoreForm' => $this->getDataTransferRestoreForm($this->request, $dataArchive),
-            'BackURL' => $project->Link('snapshots')
-        ))->renderWith(array('DNRoot_uploadsnapshot', 'DNRoot'));
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     * @return Form
-     */
-    public function getPostSnapshotForm(SS_HTTPRequest $request)
-    {
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        if (!$project->canUploadArchive()) {
-            return new SS_HTTPResponse("Not allowed to upload", 401);
-        }
-
-        // Framing an environment as a "group of people with download access"
-        // makes more sense to the user here, while still allowing us to enforce
-        // environment specific restrictions on downloading the file later on.
-        $envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
-            return $item->canUploadArchive();
-        });
-        $envsMap = array();
-        foreach ($envs as $env) {
-            $envsMap[$env->ID] = $env->Name;
-        }
-
-        $form = Form::create(
-            $this,
-            'PostSnapshotForm',
-            FieldList::create(
-                DropdownField::create('Mode', 'What does this file contain?', DNDataArchive::get_mode_map()),
-                DropdownField::create('EnvironmentID', 'Initial ownership of the file', $envsMap)
-                    ->setEmptyString('Select an environment')
-            ),
-            FieldList::create(
-                FormAction::create('doPostSnapshot', 'Submit request')
-                    ->addExtraClass('btn')
-            ),
-            RequiredFields::create('File')
-        );
-
-        $form->disableSecurityToken();
-        $form->addExtraClass('fields-wide');
-        // Tweak the action so it plays well with our fake URL structure.
-        $form->setFormAction($project->Link() . '/PostSnapshotForm');
-
-        return $form;
-    }
-
-    /**
-     * @param array $data
-     * @param Form $form
-     *
-     * @return SS_HTTPResponse
-     */
-    public function doPostSnapshot($data, $form)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        $validEnvs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
-                return $item->canUploadArchive();
-        });
-
-        // Validate $data['EnvironmentID'] by checking against $validEnvs.
-        $environment = $validEnvs->find('ID', $data['EnvironmentID']);
-        if (!$environment) {
-            throw new LogicException('Invalid environment');
-        }
-
-        $dataArchive = DNDataArchive::create(array(
-            'UploadToken' => DNDataArchive::generate_upload_token(),
-        ));
-        $form->saveInto($dataArchive);
-        $dataArchive->write();
-
-        return $this->redirect(Controller::join_links(
-            $project->Link(),
-            'postsnapshotsuccess',
-            $dataArchive->ID
-        ));
-    }
-
-    /**
-     * Action
-     *
-     * @param SS_HTTPRequest $request
-     * @return SS_HTTPResponse - HTML
-     */
-    public function snapshotslog(SS_HTTPRequest $request)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-        return $this->getCustomisedViewSection('SnapshotsSection', 'Data Snapshots Log');
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     * @return SS_HTTPResponse|string
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function postsnapshotsuccess(SS_HTTPRequest $request)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        if (!$project->canUploadArchive()) {
-            return new SS_HTTPResponse("Not allowed to upload", 401);
-        }
-
-        $dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
-        if (!$dataArchive) {
-            return new SS_HTTPResponse("Archive not found.", 404);
-        }
-
-        if (!$dataArchive->canRestore()) {
-            throw new SS_HTTPResponse_Exception('Not allowed to restore archive', 403);
-        }
-
-        return $this->render(array(
-                'Title' => 'How to send us your Data Snapshot by post',
-                'DataArchive' => $dataArchive,
-                'Address' => Config::inst()->get('Deploynaut', 'snapshot_post_address'),
-                'BackURL' => $project->Link(),
-            ));
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     * @return \SS_HTTPResponse
-     */
-    public function project(SS_HTTPRequest $request)
-    {
-        return $this->getCustomisedViewSection('ProjectOverview', '', array('IsAdmin' => Permission::check('ADMIN')));
-    }
-
-    /**
-     * This action will star / unstar a project for the current member
-     *
-     * @param SS_HTTPRequest $request
-     *
-     * @return SS_HTTPResponse
-     */
-    public function toggleprojectstar(SS_HTTPRequest $request)
-    {
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        $member = Member::currentUser();
-        if ($member === null) {
-            return $this->project404Response();
-        }
-        $favProject = $member->StarredProjects()
-            ->filter('DNProjectID', $project->ID)
-            ->first();
-
-        if ($favProject) {
-            $member->StarredProjects()->remove($favProject);
-        } else {
-            $member->StarredProjects()->add($project);
-        }
-        return $this->redirectBack();
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     * @return \SS_HTTPResponse
-     */
-    public function branch(SS_HTTPRequest $request)
-    {
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        $branchName = $request->getVar('name');
-        $branch = $project->DNBranchList()->byName($branchName);
-        if (!$branch) {
-            return new SS_HTTPResponse("Branch '" . Convert::raw2xml($branchName) . "' not found.", 404);
-        }
-
-        return $this->render(array(
-            'CurrentBranch' => $branch,
-        ));
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     * @return \SS_HTTPResponse
-     */
-    public function environment(SS_HTTPRequest $request)
-    {
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        // Performs canView permission check by limiting visible projects
-        $env = $this->getCurrentEnvironment($project);
-        if (!$env) {
-            return $this->environment404Response();
-        }
-
-        return $this->render(array(
-            'DNEnvironmentList' => $this->getCurrentProject()->DNEnvironmentList(),
-            'FlagSnapshotsEnabled' => $this->FlagSnapshotsEnabled(),
-        ));
-    }
-
-
-    /**
-     * Initiate a pipeline dry run
-     *
-     * @param array $data
-     * @param DeployForm $form
-     *
-     * @return SS_HTTPResponse
-     */
-    public function doDryRun($data, DeployForm $form)
-    {
-        return $this->beginPipeline($data, $form, true);
-    }
-
-    /**
-     * Initiate a pipeline
-     *
-     * @param array $data
-     * @param DeployForm $form
-     * @return \SS_HTTPResponse
-     */
-    public function startPipeline($data, $form)
-    {
-        return $this->beginPipeline($data, $form);
-    }
-
-    /**
-     * Start a pipeline
-     *
-     * @param array $data
-     * @param DeployForm $form
-     * @param bool $isDryRun
-     * @return \SS_HTTPResponse
-     */
-    protected function beginPipeline($data, DeployForm $form, $isDryRun = false)
-    {
-        $buildName = $form->getSelectedBuild($data);
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        // Performs canView permission check by limiting visible projects
-        $environment = $this->getCurrentEnvironment($project);
-        if (!$environment) {
-            return $this->environment404Response();
-        }
-
-        if (!$environment->DryRunEnabled && $isDryRun) {
-            return new SS_HTTPResponse("Dry-run for pipelines is not enabled for this environment", 404);
-        }
-
-        // Initiate the pipeline
-        $sha = $project->DNBuildList()->byName($buildName);
-        $pipeline = Pipeline::create();
-        $pipeline->DryRun = $isDryRun;
-        $pipeline->EnvironmentID = $environment->ID;
-        $pipeline->AuthorID = Member::currentUserID();
-        $pipeline->SHA = $sha->FullName();
-        // Record build at time of execution
-        if ($currentBuild = $environment->CurrentBuild()) {
-            $pipeline->PreviousDeploymentID = $currentBuild->ID;
-        }
-        $pipeline->start(); // start() will call write(), so no need to do it here as well.
-        return $this->redirect($environment->Link());
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     *
-     * @return SS_HTTPResponse
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function pipeline(SS_HTTPRequest $request)
-    {
-        $params = $request->params();
-        $pipeline = Pipeline::get()->byID($params['Identifier']);
-
-        if (!$pipeline || !$pipeline->ID || !$pipeline->Environment()) {
-            throw new SS_HTTPResponse_Exception('Pipeline not found', 404);
-        }
-        if (!$pipeline->Environment()->canView()) {
-            return Security::permissionFailure();
-        }
-
-        $environment = $pipeline->Environment();
-        $project = $pipeline->Environment()->Project();
-
-        if ($environment->Name != $params['Environment']) {
-            throw new LogicException("Environment in URL doesn't match this pipeline");
-        }
-        if ($project->Name != $params['Project']) {
-            throw new LogicException("Project in URL doesn't match this pipeline");
-        }
-
-        // Delegate to sub-requesthandler
-        return PipelineController::create($this, $pipeline);
-    }
-
-    /**
-     * Shows the creation log.
-     *
-     * @param SS_HTTPRequest $request
-     * @return string
-     */
-    public function createenv(SS_HTTPRequest $request)
-    {
-        $params = $request->params();
-        if ($params['Identifier']) {
-            $record = DNCreateEnvironment::get()->byId($params['Identifier']);
-
-            if (!$record || !$record->ID) {
-                throw new SS_HTTPResponse_Exception('Create environment not found', 404);
-            }
-            if (!$record->canView()) {
-                return Security::permissionFailure();
-            }
-
-            $project = $this->getCurrentProject();
-            if (!$project) {
-                return $this->project404Response();
-            }
-
-            if ($project->Name != $params['Project']) {
-                throw new LogicException("Project in URL doesn't match this creation");
-            }
-
-            return $this->render(array(
-                'CreateEnvironment' => $record,
-            ));
-        }
-        return $this->render(array('CurrentTitle' => 'Create an environment'));
-    }
-
-
-    public function createenvlog(SS_HTTPRequest $request)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        $params = $request->params();
-        $env = DNCreateEnvironment::get()->byId($params['Identifier']);
-
-        if (!$env || !$env->ID) {
-            throw new SS_HTTPResponse_Exception('Log not found', 404);
-        }
-        if (!$env->canView()) {
-            return Security::permissionFailure();
-        }
-
-        $project = $env->Project();
-
-        if ($project->Name != $params['Project']) {
-            throw new LogicException("Project in URL doesn't match this deploy");
-        }
-
-        $log = $env->log();
-        if ($log->exists()) {
-            $content = $log->content();
-        } else {
-            $content = 'Waiting for action to start';
-        }
-
-        return $this->sendResponse($env->ResqueStatus(), $content);
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     * @return Form
-     */
-    public function getCreateEnvironmentForm(SS_HTTPRequest $request)
-    {
-        $this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
-
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        $envType = $project->AllowedEnvironmentType;
-        if (!$envType || !class_exists($envType)) {
-            return null;
-        }
-
-        $backend = Injector::inst()->get($envType);
-        if (!($backend instanceof EnvironmentCreateBackend)) {
-            // Only allow this for supported backends.
-            return null;
-        }
-
-        $fields = $backend->getCreateEnvironmentFields($project);
-        if (!$fields) {
-            return null;
-        }
-
-        if (!$project->canCreateEnvironments()) {
-            return new SS_HTTPResponse('Not allowed to create environments for this project', 401);
-        }
-
-        $form = Form::create(
-            $this,
-            'CreateEnvironmentForm',
-            $fields,
-            FieldList::create(
-                FormAction::create('doCreateEnvironment', 'Create')
-                    ->addExtraClass('btn')
-            ),
-            $backend->getCreateEnvironmentValidator()
-        );
-
-        // Tweak the action so it plays well with our fake URL structure.
-        $form->setFormAction($project->Link() . '/CreateEnvironmentForm');
-
-        return $form;
-    }
-
-    /**
-     * @param array $data
-     * @param Form $form
-     *
-     * @return bool|HTMLText|SS_HTTPResponse
-     */
-    public function doCreateEnvironment($data, Form $form)
-    {
-        $this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
-
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        if (!$project->canCreateEnvironments()) {
-            return new SS_HTTPResponse('Not allowed to create environments for this project', 401);
-        }
-
-        // Set the environment type so we know what we're creating.
-        $data['EnvironmentType'] = $project->AllowedEnvironmentType;
-
-        $job = DNCreateEnvironment::create();
-
-        $job->Data = serialize($data);
-        $job->ProjectID = $project->ID;
-        $job->write();
-        $job->start();
-
-        return $this->redirect($project->Link('createenv') . '/' . $job->ID);
-    }
-
-    /**
-     *
-     * @param SS_HTTPRequest $request
-     * @return \SS_HTTPResponse
-     */
-    public function metrics(SS_HTTPRequest $request)
-    {
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        // Performs canView permission check by limiting visible projects
-        $env = $this->getCurrentEnvironment($project);
-        if (!$env) {
-            return $this->environment404Response();
-        }
-
-        return $this->render();
-    }
-
-    /**
-     * Get the DNData object.
-     *
-     * @return DNData
-     */
-    public function DNData()
-    {
-        return DNData::inst();
-    }
-
-    /**
-     * Provide a list of all projects.
-     *
-     * @return SS_List
-     */
-    public function DNProjectList()
-    {
-        $memberId = Member::currentUserID();
-        if (!$memberId) {
-            return new ArrayList();
-        }
-
-        if (Permission::check('ADMIN')) {
-            return DNProject::get();
-        }
-
-        return Member::get()->filter('ID', $memberId)
-            ->relation('Groups')
-            ->relation('Projects');
-    }
-
-    /**
-     * @return ArrayList
-     */
-    public function getPlatformSpecificStrings()
-    {
-        $strings = $this->config()->platform_specific_strings;
-        if ($strings) {
-            return new ArrayList($strings);
-        }
-    }
-
-    /**
-     * Provide a list of all starred projects for the currently logged in member
-     *
-     * @return SS_List
-     */
-    public function getStarredProjects()
-    {
-        $member = Member::currentUser();
-        if ($member === null) {
-            return new ArrayList();
-        }
-
-        $favProjects = $member->StarredProjects();
-
-        $list = new ArrayList();
-        foreach ($favProjects as $project) {
-            if ($project->canView($member)) {
-                $list->add($project);
-            }
-        }
-        return $list;
-    }
-
-    /**
-     * Returns top level navigation of projects.
-     *
-     * @param int $limit
-     *
-     * @return ArrayList
-     */
-    public function Navigation($limit = 5)
-    {
-        $navigation = new ArrayList();
-
-        $currentProject = $this->getCurrentProject();
-
-        $projects = $this->getStarredProjects();
-        if ($projects->count() < 1) {
-            $projects = $this->DNProjectList();
-        } else {
-            $limit = -1;
-        }
-
-        if ($projects->count() > 0) {
-            $activeProject = false;
-
-            if ($limit > 0) {
-                $limitedProjects = $projects->limit($limit);
-            } else {
-                $limitedProjects = $projects;
-            }
-
-            foreach ($limitedProjects as $project) {
-                $isActive = $currentProject && $currentProject->ID == $project->ID;
-                if ($isActive) {
-                    $activeProject = true;
-                }
-
-                $navigation->push(array(
-                    'Project' => $project,
-                    'IsActive' => $currentProject && $currentProject->ID == $project->ID,
-                ));
-            }
-
-            // Ensure the current project is in the list
-            if (!$activeProject && $currentProject) {
-                $navigation->unshift(array(
-                    'Project' => $currentProject,
-                    'IsActive' => true,
-                ));
-                if ($limit > 0 && $navigation->count() > $limit) {
-                    $navigation->pop();
-                }
-            }
-        }
-
-        return $navigation;
-    }
-
-    /**
-     * Construct the deployment form
-     *
-     * @return Form
-     */
-    public function getDeployForm($request = null)
-    {
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        // Performs canView permission check by limiting visible projects
-        $environment = $this->getCurrentEnvironment($project);
-        if (!$environment) {
-            return $this->environment404Response();
-        }
-
-        if (!$environment->canDeploy()) {
-            return new SS_HTTPResponse("Not allowed to deploy", 401);
-        }
-
-        // Generate the form
-        $form = new DeployForm($this, 'DeployForm', $environment, $project);
-
-        // If this is an ajax request we don't want to submit the form - we just want to retrieve the markup.
-        if (
-            $request &&
-            !$request->requestVar('action_showDeploySummary') &&
-            $this->getRequest()->isAjax() &&
-            $this->getRequest()->isGET()
-        ) {
-            // We can just use the URL we're accessing
-            $form->setFormAction($this->getRequest()->getURL());
-
-            $body = json_encode(array('Content' => $form->forAjaxTemplate()->forTemplate()));
-            $this->getResponse()->addHeader('Content-Type', 'application/json');
-            $this->getResponse()->setBody($body);
-            return $body;
-        }
-
-        $form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
-        return $form;
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     *
-     * @return SS_HTTPResponse|string
-     */
-    public function gitRevisions(SS_HTTPRequest $request)
-    {
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        // Performs canView permission check by limiting visible projects
-        $env = $this->getCurrentEnvironment($project);
-        if (!$env) {
-            return $this->environment404Response();
-        }
-
-        // For now only permit advanced options on one environment type, because we hacked the "full-deploy"
-        // checkbox in. Other environments such as the fast or capistrano one wouldn't know what to do with it.
-        if (get_class($env) === 'RainforestEnvironment') {
-            $advanced = Permission::check('DEPLOYNAUT_ADVANCED_DEPLOY_OPTIONS') ? 'true' : 'false';
-        } else {
-            $advanced = 'false';
-        }
-
-        $tabs = array();
-        $id = 0;
-        $data = array(
-            'id' => ++$id,
-            'name' => 'Deploy the latest version of a branch',
-            'field_type' => 'dropdown',
-            'field_label' => 'Choose a branch',
-            'field_id' => 'branch',
-            'field_data' => array(),
-            'advanced_opts' => $advanced
-        );
-        foreach ($project->DNBranchList() as $branch) {
-            $sha = $branch->SHA();
-            $name = $branch->Name();
-            $branchValue = sprintf("%s (%s, %s old)",
-                $name,
-                substr($sha, 0, 8),
-                $branch->LastUpdated()->TimeDiff()
-            );
-            $data['field_data'][] = array(
-                'id' => $sha,
-                'text' => $branchValue
-            );
-        }
-        $tabs[] = $data;
-
-        $data = array(
-            'id' => ++$id,
-            'name' => 'Deploy a tagged release',
-            'field_type' => 'dropdown',
-            'field_label' => 'Choose a tag',
-            'field_id' => 'tag',
-            'field_data' => array(),
-            'advanced_opts' => $advanced
-        );
-
-        foreach ($project->DNTagList()->setLimit(null) as $tag) {
-            $name = $tag->Name();
-            $data['field_data'][] = array(
-                'id' => $tag->SHA(),
-                'text' => sprintf("%s", $name)
-            );
-        }
-
-        // show newest tags first.
-        $data['field_data'] = array_reverse($data['field_data']);
-
-        $tabs[] = $data;
-
-        // Past deployments
-        $data = array(
-            'id' => ++$id,
-            'name' => 'Redeploy a release that was previously deployed (to any environment)',
-            'field_type' => 'dropdown',
-            'field_label' => 'Choose a previously deployed release',
-            'field_id' => 'release',
-            'field_data' => array(),
-            'advanced_opts' => $advanced
-        );
-        // We are aiming at the format:
-        // [{text: 'optgroup text', children: [{id: '<sha>', text: '<inner text>'}]}]
-        $redeploy = array();
-        foreach ($project->DNEnvironmentList() as $dnEnvironment) {
-            $envName = $dnEnvironment->Name;
-            $perEnvDeploys = array();
-
-            foreach ($dnEnvironment->DeployHistory() as $deploy) {
-                $sha = $deploy->SHA;
-
-                // Check if exists to make sure the newest deployment date is used.
-                if (!isset($perEnvDeploys[$sha])) {
-                    $pastValue = sprintf("%s (deployed %s)",
-                        substr($sha, 0, 8),
-                        $deploy->obj('LastEdited')->Ago()
-                    );
-                    $perEnvDeploys[$sha] = array(
-                        'id' => $sha,
-                        'text' => $pastValue
-                    );
-                }
-            }
-
-            if (!empty($perEnvDeploys)) {
-                $redeploy[$envName] = array_values($perEnvDeploys);
-            }
-        }
-        // Convert the array to the frontend format (i.e. keyed to regular array)
-        foreach ($redeploy as $env => $descr) {
-            $data['field_data'][] = array('text'=>$env, 'children'=>$descr);
-        }
-        $tabs[] = $data;
-
-        $data = array(
-            'id' => ++$id,
-            'name' => 'Deploy a specific SHA',
-            'field_type' => 'textfield',
-            'field_label' => 'Choose a SHA',
-            'field_id' => 'SHA',
-            'field_data' => array(),
-            'advanced_opts' => $advanced
-        );
-        $tabs[] = $data;
-
-        // get the last time git fetch was run
-        $lastFetched = 'never';
-        $fetch = DNGitFetch::get()
-            ->filter('ProjectID', $project->ID)
-            ->sort('LastEdited', 'DESC')
-            ->first();
-        if ($fetch) {
-            $lastFetched = $fetch->dbObject('LastEdited')->Ago();
-        }
-
-        $data = array(
-            'Tabs' => $tabs,
-            'last_fetched' => $lastFetched
-        );
-
-        return json_encode($data, JSON_PRETTY_PRINT);
-    }
-
-    /**
-     * Check and regenerate a global CSRF token
-     *
-     * @param SS_HTTPRequest $request
-     * @param bool $resetToken
-     *
-     * @return bool
-     */
-    protected function checkCsrfToken(SS_HTTPRequest $request, $resetToken = true)
-    {
-        $token = SecurityToken::inst();
-
-        // Ensure the submitted token has a value
-        $submittedToken = $request->postVar('SecurityID');
-        if (!$submittedToken) {
-            return false;
-        }
-
-        // Do the actual check.
-        $check = $token->check($submittedToken);
-
-        // Reset the token after we've checked the existing token
-        if ($resetToken) {
-            $token->reset();
-        }
-
-        // Return whether the token was correct or not
-        return $check;
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     *
-     * @return string
-     */
-    public function deploySummary(SS_HTTPRequest $request)
-    {
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        // Performs canView permission check by limiting visible projects
-        $environment = $this->getCurrentEnvironment($project);
-        if (!$environment) {
-            return $this->environment404Response();
-        }
-
-        // Plan the deployment.
-        $strategy = $environment->Backend()->planDeploy(
-            $environment,
-            $request->requestVars()
-        );
-        $data = $strategy->toArray();
-
-        // Add in a URL for comparing from->to code changes. Ensure that we have
-        // two proper 40 character SHAs, otherwise we can't show the compare link.
-        $interface = $project->getRepositoryInterface();
-        if (
-            !empty($interface) && !empty($interface->URL)
-            && !empty($data['changes']['Code version']['from'])
-            && strlen($data['changes']['Code version']['from']) == '40'
-            && !empty($data['changes']['Code version']['to'])
-            && strlen($data['changes']['Code version']['to']) == '40'
-        ) {
-            $compareurl = sprintf(
-                '%s/compare/%s...%s',
-                $interface->URL,
-                $data['changes']['Code version']['from'],
-                $data['changes']['Code version']['to']
-            );
-            $data['changes']['Code version']['compareUrl'] = $compareurl;
-        }
-
-        // Append json to response
-        $token = SecurityToken::inst();
-        $data['SecurityID'] = $token->getValue();
-
-        return json_encode($data);
-    }
-
-    /**
-     * Deployment form submission handler.
-     *
-     * Initiate a DNDeployment record and redirect to it for status polling
-     *
-     * @param SS_HTTPRequest $request
-     *
-     * @return SS_HTTPResponse
-     * @throws ValidationException
-     * @throws null
-     */
-    public function startDeploy(SS_HTTPRequest $request)
-    {
-
-        // Ensure the CSRF Token is correct
-        if (!$this->checkCsrfToken($request)) {
-            // CSRF token didn't match
-            return $this->httpError(400, 'Bad Request');
-        }
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        // Performs canView permission check by limiting visible projects
-        $environment = $this->getCurrentEnvironment($project);
-        if (!$environment) {
-            return $this->environment404Response();
-        }
-
-        // Initiate the deployment
-        // The extension point should pass in: Project, Environment, SelectRelease, buildName
-        $this->extend('doDeploy', $project, $environment, $buildName, $data);
-
-        // Start the deployment based on the approved strategy.
-        $strategy = new DeploymentStrategy($environment);
-        $strategy->fromArray($request->requestVar('strategy'));
-        $deployment = $strategy->createDeployment();
-        $deployment->start();
-
-        return json_encode(array(
-            'url' => Director::absoluteBaseURL() . $deployment->Link()
-        ), JSON_PRETTY_PRINT);
-    }
-
-    /**
-     * Action - Do the actual deploy
-     *
-     * @param SS_HTTPRequest $request
-     *
-     * @return SS_HTTPResponse|string
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function deploy(SS_HTTPRequest $request)
-    {
-        $params = $request->params();
-        $deployment = DNDeployment::get()->byId($params['Identifier']);
-
-        if (!$deployment || !$deployment->ID) {
-            throw new SS_HTTPResponse_Exception('Deployment not found', 404);
-        }
-        if (!$deployment->canView()) {
-            return Security::permissionFailure();
-        }
-
-        $environment = $deployment->Environment();
-        $project = $environment->Project();
-
-        if ($environment->Name != $params['Environment']) {
-            throw new LogicException("Environment in URL doesn't match this deploy");
-        }
-        if ($project->Name != $params['Project']) {
-            throw new LogicException("Project in URL doesn't match this deploy");
-        }
-
-        return $this->render(array(
-            'Deployment' => $deployment,
-        ));
-    }
-
-
-    /**
-     * Action - Get the latest deploy log
-     *
-     * @param SS_HTTPRequest $request
-     *
-     * @return string
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function deploylog(SS_HTTPRequest $request)
-    {
-        $params = $request->params();
-        $deployment = DNDeployment::get()->byId($params['Identifier']);
-
-        if (!$deployment || !$deployment->ID) {
-            throw new SS_HTTPResponse_Exception('Deployment not found', 404);
-        }
-        if (!$deployment->canView()) {
-            return Security::permissionFailure();
-        }
-
-        $environment = $deployment->Environment();
-        $project = $environment->Project();
-
-        if ($environment->Name != $params['Environment']) {
-            throw new LogicException("Environment in URL doesn't match this deploy");
-        }
-        if ($project->Name != $params['Project']) {
-            throw new LogicException("Project in URL doesn't match this deploy");
-        }
-
-        $log = $deployment->log();
-        if ($log->exists()) {
-            $content = $log->content();
-        } else {
-            $content = 'Waiting for action to start';
-        }
-
-        return $this->sendResponse($deployment->ResqueStatus(), $content);
-    }
-
-    /**
-     * @param SS_HTTPRequest|null $request
-     *
-     * @return Form
-     */
-    public function getDataTransferForm(SS_HTTPRequest $request = null)
-    {
-        // Performs canView permission check by limiting visible projects
-        $envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function ($item) {
-            return $item->canBackup();
-        });
-
-        if (!$envs) {
-            return $this->environment404Response();
-        }
-
-        $form = Form::create(
-            $this,
-            'DataTransferForm',
-            FieldList::create(
-                HiddenField::create('Direction', null, 'get'),
-                DropdownField::create('EnvironmentID', 'Environment', $envs->map())
-                    ->setEmptyString('Select an environment'),
-                DropdownField::create('Mode', 'Transfer', DNDataArchive::get_mode_map())
-            ),
-            FieldList::create(
-                FormAction::create('doDataTransfer', 'Create')
-                    ->addExtraClass('btn')
-            )
-        );
-        $form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
-
-        return $form;
-    }
-
-    /**
-     * @param array $data
-     * @param Form $form
-     *
-     * @return SS_HTTPResponse
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function doDataTransfer($data, Form $form)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        $dataArchive = null;
-
-        // Validate direction.
-        if ($data['Direction'] == 'get') {
-            $validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-                ->filterByCallback(function ($item) {
-                    return $item->canBackup();
-                });
-        } elseif ($data['Direction'] == 'push') {
-            $validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-                ->filterByCallback(function ($item) {
-                    return $item->canRestore();
-                });
-        } else {
-            throw new LogicException('Invalid direction');
-        }
-
-        // Validate $data['EnvironmentID'] by checking against $validEnvs.
-        $environment = $validEnvs->find('ID', $data['EnvironmentID']);
-        if (!$environment) {
-            throw new LogicException('Invalid environment');
-        }
-
-        $this->validateSnapshotMode($data['Mode']);
-
-
-        // Only 'push' direction is allowed an association with an existing archive.
-        if (
-            $data['Direction'] == 'push'
-            && isset($data['DataArchiveID'])
-            && is_numeric($data['DataArchiveID'])
-        ) {
-            $dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
-            if (!$dataArchive) {
-                throw new LogicException('Invalid data archive');
-            }
-
-            if (!$dataArchive->canDownload()) {
-                throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
-            }
-        }
-
-        $transfer = DNDataTransfer::create();
-        $transfer->EnvironmentID = $environment->ID;
-        $transfer->Direction = $data['Direction'];
-        $transfer->Mode = $data['Mode'];
-        $transfer->DataArchiveID = $dataArchive ? $dataArchive->ID : null;
-        if ($data['Direction'] == 'push') {
-            $transfer->setBackupBeforePush(!empty($data['BackupBeforePush']));
-        }
-        $transfer->write();
-        $transfer->start();
-
-        return $this->redirect($transfer->Link());
-    }
-
-    /**
-     * View into the log for a {@link DNDataTransfer}.
-     *
-     * @param SS_HTTPRequest $request
-     *
-     * @return SS_HTTPResponse|string
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function transfer(SS_HTTPRequest $request)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        $params = $request->params();
-        $transfer = DNDataTransfer::get()->byId($params['Identifier']);
-
-        if (!$transfer || !$transfer->ID) {
-            throw new SS_HTTPResponse_Exception('Transfer not found', 404);
-        }
-        if (!$transfer->canView()) {
-            return Security::permissionFailure();
-        }
-
-        $environment = $transfer->Environment();
-        $project = $environment->Project();
-
-        if ($project->Name != $params['Project']) {
-            throw new LogicException("Project in URL doesn't match this deploy");
-        }
-
-        return $this->render(array(
-            'CurrentTransfer' => $transfer,
-            'SnapshotsSection' => 1,
-        ));
-    }
-
-    /**
-     * Action - Get the latest deploy log
-     *
-     * @param SS_HTTPRequest $request
-     *
-     * @return string
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function transferlog(SS_HTTPRequest $request)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        $params = $request->params();
-        $transfer = DNDataTransfer::get()->byId($params['Identifier']);
-
-        if (!$transfer || !$transfer->ID) {
-            throw new SS_HTTPResponse_Exception('Transfer not found', 404);
-        }
-        if (!$transfer->canView()) {
-            return Security::permissionFailure();
-        }
-
-        $environment = $transfer->Environment();
-        $project = $environment->Project();
-
-        if ($project->Name != $params['Project']) {
-            throw new LogicException("Project in URL doesn't match this deploy");
-        }
-
-        $log = $transfer->log();
-        if ($log->exists()) {
-            $content = $log->content();
-        } else {
-            $content = 'Waiting for action to start';
-        }
-
-        return $this->sendResponse($transfer->ResqueStatus(), $content);
-    }
-
-    /**
-     * Note: Submits to the same action as {@link getDataTransferForm()},
-     * but with a Direction=push and an archive reference.
-     *
-     * @param SS_HTTPRequest $request
-     * @param DNDataArchive|null $dataArchive Only set when method is called manually in {@link restore()},
-     *                            otherwise the state is inferred from the request data.
-     * @return Form
-     */
-    public function getDataTransferRestoreForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null)
-    {
-        $dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        $envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
-            return $item->canRestore();
-        });
-
-        if (!$envs) {
-            return $this->environment404Response();
-        }
-
-        $modesMap = array();
-        if (in_array($dataArchive->Mode, array('all'))) {
-            $modesMap['all'] = 'Database and Assets';
-        };
-        if (in_array($dataArchive->Mode, array('all', 'db'))) {
-            $modesMap['db'] = 'Database only';
-        };
-        if (in_array($dataArchive->Mode, array('all', 'assets'))) {
-            $modesMap['assets'] = 'Assets only';
-        };
-
-        $alertMessage = '<div class="alert alert-warning"><strong>Warning:</strong> '
-            . 'This restore will overwrite the data on the chosen environment below</div>';
-
-        $form = Form::create(
-            $this,
-            'DataTransferRestoreForm',
-            FieldList::create(
-                HiddenField::create('DataArchiveID', null, $dataArchive->ID),
-                HiddenField::create('Direction', null, 'push'),
-                LiteralField::create('Warning', $alertMessage),
-                DropdownField::create('EnvironmentID', 'Environment', $envs->map())
-                    ->setEmptyString('Select an environment'),
-                DropdownField::create('Mode', 'Transfer', $modesMap),
-                CheckboxField::create('BackupBeforePush', 'Backup existing data', '1')
-            ),
-            FieldList::create(
-                FormAction::create('doDataTransfer', 'Restore Data')
-                    ->addExtraClass('btn')
-            )
-        );
-        $form->setFormAction($project->Link() . '/DataTransferRestoreForm');
-
-        return $form;
-    }
-
-    /**
-     * View a form to restore a specific {@link DataArchive}.
-     * Permission checks are handled in {@link DataArchives()}.
-     * Submissions are handled through {@link doDataTransfer()}, same as backup operations.
-     *
-     * @param SS_HTTPRequest $request
-     *
-     * @return HTMLText
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function restoresnapshot(SS_HTTPRequest $request)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        /** @var DNDataArchive $dataArchive */
-        $dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
-
-        if (!$dataArchive) {
-            throw new SS_HTTPResponse_Exception('Archive not found', 404);
-        }
-
-        // We check for canDownload because that implies access to the data.
-        // canRestore is later checked on the actual restore action per environment.
-        if (!$dataArchive->canDownload()) {
-            throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
-        }
-
-        $form = $this->getDataTransferRestoreForm($this->request, $dataArchive);
-
-        // View currently only available via ajax
-        return $form->forTemplate();
-    }
-
-    /**
-     * View a form to delete a specific {@link DataArchive}.
-     * Permission checks are handled in {@link DataArchives()}.
-     * Submissions are handled through {@link doDelete()}.
-     *
-     * @param SS_HTTPRequest $request
-     *
-     * @return HTMLText
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function deletesnapshot(SS_HTTPRequest $request)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        /** @var DNDataArchive $dataArchive */
-        $dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
-
-        if (!$dataArchive) {
-            throw new SS_HTTPResponse_Exception('Archive not found', 404);
-        }
-
-        if (!$dataArchive->canDelete()) {
-            throw new SS_HTTPResponse_Exception('Not allowed to delete archive', 403);
-        }
-
-        $form = $this->getDeleteForm($this->request, $dataArchive);
-
-        // View currently only available via ajax
-        return $form->forTemplate();
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     * @param DNDataArchive|null $dataArchive Only set when method is called manually, otherwise the state is inferred
-     *        from the request data.
-     * @return Form
-     */
-    public function getDeleteForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null)
-    {
-        $dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        $snapshotDeleteWarning = '<div class="alert alert-warning">'
-            . 'Are you sure you want to permanently delete this snapshot from this archive area?'
-            . '</div>';
-
-        $form = Form::create(
-            $this,
-            'DeleteForm',
-            FieldList::create(
-                HiddenField::create('DataArchiveID', null, $dataArchive->ID),
-                LiteralField::create('Warning', $snapshotDeleteWarning)
-            ),
-            FieldList::create(
-                FormAction::create('doDelete', 'Delete')
-                    ->addExtraClass('btn')
-            )
-        );
-        $form->setFormAction($project->Link() . '/DeleteForm');
-
-        return $form;
-    }
-
-    /**
-     * @param array $data
-     * @param Form $form
-     *
-     * @return bool|SS_HTTPResponse
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function doDelete($data, Form $form)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        $dataArchive = null;
-
-        if (
-            isset($data['DataArchiveID'])
-            && is_numeric($data['DataArchiveID'])
-        ) {
-            $dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
-        }
-
-        if (!$dataArchive) {
-            throw new LogicException('Invalid data archive');
-        }
-
-        if (!$dataArchive->canDelete()) {
-            throw new SS_HTTPResponse_Exception('Not allowed to delete archive', 403);
-        }
-
-        $dataArchive->delete();
-
-        return $this->redirectBack();
-    }
-
-    /**
-     * View a form to move a specific {@link DataArchive}.
-     *
-     * @param SS_HTTPRequest $request
-     *
-     * @return HTMLText
-     * @throws SS_HTTPResponse_Exception
-     */
-    public function movesnapshot(SS_HTTPRequest $request)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        /** @var DNDataArchive $dataArchive */
-        $dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
-
-        if (!$dataArchive) {
-            throw new SS_HTTPResponse_Exception('Archive not found', 404);
-        }
-
-        // We check for canDownload because that implies access to the data.
-        if (!$dataArchive->canDownload()) {
-            throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
-        }
-
-        $form = $this->getMoveForm($this->request, $dataArchive);
-
-        // View currently only available via ajax
-        return $form->forTemplate();
-    }
-
-    /**
-     * Build snapshot move form.
-     *
-     * @param SS_HTTPRequest $request
-     * @param DNDataArchive|null $dataArchive
-     *
-     * @return Form|SS_HTTPResponse
-     */
-    public function getMoveForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null)
-    {
-        $dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
-
-        $envs = $dataArchive->validTargetEnvironments();
-        if (!$envs) {
-            return $this->environment404Response();
-        }
-
-        $warningMessage = '<div class="alert alert-warning"><strong>Warning:</strong> This will make the snapshot '
-            . 'available to people with access to the target environment.<br>By pressing "Change ownership" you '
-            . 'confirm that you have considered data confidentiality regulations.</div>';
-
-        $form = Form::create(
-            $this,
-            'MoveForm',
-            FieldList::create(
-                HiddenField::create('DataArchiveID', null, $dataArchive->ID),
-                LiteralField::create('Warning', $warningMessage),
-                DropdownField::create('EnvironmentID', 'Environment', $envs->map())
-                    ->setEmptyString('Select an environment')
-            ),
-            FieldList::create(
-                FormAction::create('doMove', 'Change ownership')
-                    ->addExtraClass('btn')
-            )
-        );
-        $form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
-
-        return $form;
-    }
-
-    /**
-     * @param array $data
-     * @param Form $form
-     *
-     * @return bool|SS_HTTPResponse
-     * @throws SS_HTTPResponse_Exception
-     * @throws ValidationException
-     * @throws null
-     */
-    public function doMove($data, Form $form)
-    {
-        $this->setCurrentActionType(self::ACTION_SNAPSHOT);
-
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        /** @var DNDataArchive $dataArchive */
-        $dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
-        if (!$dataArchive) {
-            throw new LogicException('Invalid data archive');
-        }
-
-        // We check for canDownload because that implies access to the data.
-        if (!$dataArchive->canDownload()) {
-            throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
-        }
-
-        // Validate $data['EnvironmentID'] by checking against $validEnvs.
-        $validEnvs = $dataArchive->validTargetEnvironments();
-        $environment = $validEnvs->find('ID', $data['EnvironmentID']);
-        if (!$environment) {
-            throw new LogicException('Invalid environment');
-        }
-
-        $dataArchive->EnvironmentID = $environment->ID;
-        $dataArchive->write();
-
-        return $this->redirectBack();
-    }
-
-    /**
-     * Returns an error message if redis is unavailable
-     *
-     * @return string
-     */
-    public static function RedisUnavailable()
-    {
-        try {
-            Resque::queues();
-        } catch (Exception $e) {
-            return $e->getMessage();
-        }
-        return '';
-    }
-
-    /**
-     * Returns the number of connected Redis workers
-     *
-     * @return int
-     */
-    public static function RedisWorkersCount()
-    {
-        return count(Resque_Worker::all());
-    }
-
-    /**
-     * @return array
-     */
-    public function providePermissions()
-    {
-        return array(
-            self::DEPLOYNAUT_BYPASS_PIPELINE => array(
-                'name' => "Bypass Pipeline",
-                'category' => "Deploynaut",
-                'help' => "Enables users to directly initiate deployments, bypassing any pipeline",
-            ),
-            self::DEPLOYNAUT_DRYRUN_PIPELINE => array(
-                'name' => 'Dry-run Pipeline',
-                'category' => 'Deploynaut',
-                'help' => 'Enable dry-run execution of pipelines for testing'
-            ),
-            self::DEPLOYNAUT_ADVANCED_DEPLOY_OPTIONS => array(
-                'name' => "Access to advanced deploy options",
-                'category' => "Deploynaut",
-            ),
-
-            // Permissions that are intended to be added to the roles.
-            self::ALLOW_PROD_DEPLOYMENT => array(
-                'name' => "Ability to deploy to production environments",
-                'category' => "Deploynaut",
-            ),
-            self::ALLOW_NON_PROD_DEPLOYMENT => array(
-                'name' => "Ability to deploy to non-production environments",
-                'category' => "Deploynaut",
-            ),
-            self::ALLOW_PROD_SNAPSHOT => array(
-                'name' => "Ability to make production snapshots",
-                'category' => "Deploynaut",
-            ),
-            self::ALLOW_NON_PROD_SNAPSHOT => array(
-                'name' => "Ability to make non-production snapshots",
-                'category' => "Deploynaut",
-            ),
-            self::ALLOW_CREATE_ENVIRONMENT => array(
-                'name' => "Ability to create environments",
-                'category' => "Deploynaut",
-            ),
-        );
-    }
-
-    /**
-     * @return DNProject|null
-     */
-    public function getCurrentProject()
-    {
-        $projectName = trim($this->getRequest()->param('Project'));
-        if (!$projectName) {
-            return null;
-        }
-        if (empty(self::$_project_cache[$projectName])) {
-            self::$_project_cache[$projectName] = $this->DNProjectList()->filter('Name', $projectName)->First();
-        }
-        return self::$_project_cache[$projectName];
-    }
-
-    /**
-     * @param DNProject|null $project
-     * @return DNEnvironment|null
-     */
-    public function getCurrentEnvironment(DNProject $project = null)
-    {
-        if ($this->getRequest()->param('Environment') === null) {
-            return null;
-        }
-        if ($project === null) {
-            $project = $this->getCurrentProject();
-        }
-        // project can still be null
-        if ($project === null) {
-            return null;
-        }
-        return $project->DNEnvironmentList()->filter('Name', $this->getRequest()->param('Environment'))->First();
-    }
-
-    /**
-     * This will return a const that indicates the class of action currently being performed
-     *
-     * Until DNRoot is de-godded, it does a bunch of different actions all in the same class.
-     * So we just have each action handler calll setCurrentActionType to define what sort of
-     * action it is.
-     *
-     * @return string - one of the consts from self::$action_types
-     */
-    public function getCurrentActionType()
-    {
-        return $this->actionType;
-    }
-
-    /**
-     * Sets the current action type
-     *
-     * @param string $actionType string - one of the consts from self::$action_types
-     */
-    public function setCurrentActionType($actionType)
-    {
-        $this->actionType = $actionType;
-    }
-
-    /**
-     * Helper method to allow templates to know whether they should show the 'Archive List' include or not.
-     * The actual permissions are set on a per-environment level, so we need to find out if this $member can upload to
-     * or download from *any* {@link DNEnvironment} that (s)he has access to.
-     *
-     * TODO To be replaced with a method that just returns the list of archives this {@link Member} has access to.
-     *
-     * @param Member|null $member The {@link Member} to check (or null to check the currently logged in Member)
-     * @return boolean|null true if $member has access to upload or download to at least one {@link DNEnvironment}.
-     */
-    public function CanViewArchives(Member $member = null)
-    {
-        if ($member === null) {
-            $member = Member::currentUser();
-        }
-
-        if (Permission::checkMember($member, 'ADMIN')) {
-            return true;
-        }
-
-        $allProjects = $this->DNProjectList();
-        if (!$allProjects) {
-            return false;
-        }
-
-        foreach ($allProjects as $project) {
-            if ($project->Environments()) {
-                foreach ($project->Environments() as $environment) {
-                    if (
-                        $environment->canRestore($member) ||
-                        $environment->canBackup($member) ||
-                        $environment->canUploadArchive($member) ||
-                        $environment->canDownloadArchive($member)
-                    ) {
-                        // We can return early as we only need to know that we can access one environment
-                        return true;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a list of attempted environment creations.
-     *
-     * @return PaginatedList
-     */
-    public function CreateEnvironmentList()
-    {
-        $project = $this->getCurrentProject();
-        if ($project) {
-            return new PaginatedList($project->CreateEnvironments()->sort("Created DESC"), $this->request);
-        }
-        return new PaginatedList(new ArrayList(), $this->request);
-    }
-
-    /**
-     * Returns a list of all archive files that can be accessed by the currently logged-in {@link Member}
-     *
-     * @return PaginatedList
-     */
-    public function CompleteDataArchives()
-    {
-        $project = $this->getCurrentProject();
-        $archives = new ArrayList();
-
-        $archiveList = $project->Environments()->relation("DataArchives");
-        if ($archiveList->count() > 0) {
-            foreach ($archiveList as $archive) {
-                if ($archive->canView() && !$archive->isPending()) {
-                    $archives->push($archive);
-                }
-            }
-        }
-        return new PaginatedList($archives->sort("Created", "DESC"), $this->request);
-    }
-
-    /**
-     * @return PaginatedList The list of "pending" data archives which are waiting for a file
-     * to be delivered offline by post, and manually uploaded into the system.
-     */
-    public function PendingDataArchives()
-    {
-        $project = $this->getCurrentProject();
-        $archives = new ArrayList();
-        foreach ($project->DNEnvironmentList() as $env) {
-            foreach ($env->DataArchives() as $archive) {
-                if ($archive->canView() && $archive->isPending()) {
-                    $archives->push($archive);
-                }
-            }
-        }
-        return new PaginatedList($archives->sort("Created", "DESC"), $this->request);
-    }
-
-    /**
-     * @return PaginatedList
-     */
-    public function DataTransferLogs()
-    {
-        $project = $this->getCurrentProject();
-
-        $transfers = DNDataTransfer::get()->filterByCallback(function ($record) use ($project) {
-            return
-                $record->Environment()->Project()->ID == $project->ID && // Ensure only the current Project is shown
-                (
-                    $record->Environment()->canRestore() || // Ensure member can perform an action on the transfers env
-                    $record->Environment()->canBackup() ||
-                    $record->Environment()->canUploadArchive() ||
-                    $record->Environment()->canDownloadArchive()
-                );
-        });
-
-        return new PaginatedList($transfers->sort("Created", "DESC"), $this->request);
-    }
-
-    /**
-     * @return null|PaginatedList
-     */
-    public function DeployHistory()
-    {
-        if ($env = $this->getCurrentEnvironment()) {
-            $history = $env->DeployHistory();
-            if ($history->count() > 0) {
-                $pagination = new PaginatedList($history, $this->getRequest());
-                $pagination->setPageLength(8);
-                return $pagination;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @return SS_HTTPResponse
-     */
-    protected function project404Response()
-    {
-        return new SS_HTTPResponse(
-            "Project '" . Convert::raw2xml($this->getRequest()->param('Project')) . "' not found.",
-            404
-        );
-    }
-
-    /**
-     * @return SS_HTTPResponse
-     */
-    protected function environment404Response()
-    {
-        $envName = Convert::raw2xml($this->getRequest()->param('Environment'));
-        return new SS_HTTPResponse("Environment '" . $envName . "' not found.", 404);
-    }
-
-    /**
-     * @param string $status
-     * @param string $content
-     *
-     * @return string
-     */
-    protected function sendResponse($status, $content)
-    {
-        // strip excessive newlines
-        $content = preg_replace('/(?:(?:\r\n|\r|\n)\s*){2}/s', "\n", $content);
-
-        $sendJSON = (strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false)
-            || $this->getRequest()->getExtension() == 'json';
-
-        if (!$sendJSON) {
-            $this->response->addHeader("Content-type", "text/plain");
-            return $content;
-        }
-        $this->response->addHeader("Content-type", "application/json");
-        return json_encode(array(
-            'status' => $status,
-            'content' => $content,
-        ));
-    }
-
-    /**
-     * Validate the snapshot mode
-     *
-     * @param string $mode
-     */
-    protected function validateSnapshotMode($mode)
-    {
-        if (!in_array($mode, array('all', 'assets', 'db'))) {
-            throw new LogicException('Invalid mode');
-        }
-    }
-
-    /**
-     * @param string $sectionName
-     * @param string $title
-     *
-     * @return SS_HTTPResponse
-     */
-    protected function getCustomisedViewSection($sectionName, $title = '', $data = array())
-    {
-        // Performs canView permission check by limiting visible projects
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-        $data[$sectionName] = 1;
-
-        if ($this !== '') {
-            $data['Title'] = $title;
-        }
-
-        return $this->render($data);
-    }
-
-    /**
-     * Get items for the ambient menu that should be accessible from all pages.
-     *
-     * @return ArrayList
-     */
-    public function AmbientMenu()
-    {
-        $list = new ArrayList();
-
-        if (Member::currentUserID()) {
-            $list->push(new ArrayData(array(
-                'Classes' => 'logout',
-                'FaIcon' => 'sign-out',
-                'Link' => 'Security/logout',
-                'Title' => 'Log out',
-                'IsCurrent' => false,
-                'IsSection' => false
-            )));
-        }
-
-        $this->extend('updateAmbientMenu', $list);
-        return $list;
-    }
-
-    /**
-     * Create project action.
-     *
-     * @return SS_HTTPResponse
-     */
-    public function createproject(SS_HTTPRequest $request)
-    {
-        if ($this->canCreateProjects()) {
-            return $this->render(['CurrentTitle' => 'Create Stack']);
-        }
-        return $this->httpError(403);
-    }
-
-    /**
-     * Checks whether the user can create a project.
-     *
-     * @return bool
-     */
-    public function canCreateProjects($member = null)
-    {
-        if (!$member) {
-            $member = Member::currentUser();
-        }
-        if (!$member) {
-            return false;
-        }
-
-        return singleton('DNProject')->canCreate($member);
-    }
-
-    /**
-     * @return Form
-     */
-    public function CreateProjectForm()
-    {
-        $form = Form::create(
-            $this,
-            __FUNCTION__,
-            $this->getCreateProjectFormFields(),
-            $this->getCreateProjectFormActions(),
-            new RequiredFields('Name', 'CVSPath')
-        );
-        $this->extend('updateCreateProjectForm', $form);
-        return $form;
-    }
-
-    /**
-     * @return FieldList
-     */
-    protected function getCreateProjectFormFields()
-    {
-        $fields = FieldList::create();
-        $fields->merge([
-            TextField::create('Name', 'Title')->setDescription('Limited to alphanumeric characters, underscores and hyphens.'),
-            TextField::create('CVSPath', 'Git URL')->setDescription('Your repository URL so we can clone your code (eg. git@github.com:silverstripe/silverstripe-installer.git)')
-        ]);
-        $this->extend('updateCreateProjectFormFields', $fields);
-        return $fields;
-    }
-
-    /**
-     * @return FieldList
-     */
-    protected function getCreateProjectFormActions()
-    {
-        $fields = FieldList::create(
-            FormAction::create('doCreateProject', 'Create Stack')
-        );
-        $this->extend('updateCreateProjectFormActions', $fields);
-        return $fields;
-    }
-
-    /**
-     * Does the actual project creation.
-     *
-     * @param $data array
-     * @param $form Form
-     *
-     * @return SS_HTTPResponse
-     */
-    public function doCreateProject($data, $form)
-    {
-        $form->loadDataFrom($data);
-        $project = DNProject::create();
-
-        $form->saveInto($project);
-        $this->extend('onBeforeCreateProject', $project, $data, $form);
-        try {
-            if ($project->write() > 0) {
-                $this->extend('onAfterCreateProject', $project, $data, $form);
-
-                // If an extension hasn't redirected us, we'll redirect to the project.
-                if (!$this->redirectedTo()) {
-                    return $this->redirect($project->Link());
-                } else {
-                    return $this->response;
-                }
-            } else {
-                $form->sessionMessage('Unable to write the stack to the database.', 'bad');
-            }
-        } catch (ValidationException $e) {
-            $form->sessionMessage($e->getMessage(), 'bad');
-        }
-        return $this->redirectBack();
-    }
-
-    /**
-     * Returns the state of a current project build.
-     *
-     * @param SS_HTTPRequest $request
-     *
-     * @return SS_HTTPResponse
-     */
-    public function createprojectprogress(SS_HTTPRequest $request)
-    {
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->httpError(404);
-        }
-
-        $envCreations = $project->getInitialEnvironmentCreations();
-        $complete = array();
-        $inProgress = array();
-        $failed = array();
-        if ($envCreations->count() > 0) {
-            foreach ($envCreations as $env) {
-                $data = unserialize($env->Data);
-                if (!isset($data['Name'])) {
-                    $data['Name'] = 'Unknown';
-                }
-                switch ($env->ResqueStatus()) {
-                    case "Queued":
-                    case "Running":
-                        $inProgress[$env->ID] = Convert::raw2xml($env->ResqueStatus());
-                        break;
-                    case "Complete":
-                        $complete[$env->ID] = Convert::raw2xml($data['Name']);
-                        break;
-                    case "Failed":
-                    case "Invalid":
-                    default:
-                        $failed[$env->ID] = Convert::raw2xml($data['Name']);
-                }
-            }
-        }
-
-        $data = [
-            'complete' => $project->isProjectReady(),
-            'progress' => [
-                'environments' => [
-                    'complete' => $complete,
-                    'inProgress' => $inProgress,
-                    'failed' => $failed,
-                ]
-            ]
-        ];
-        $this->extend('updateCreateProjectProgressData', $data);
-
-        $response = $this->getResponse();
-        $response->addHeader('Content-Type', 'application/json');
-        $response->setBody(json_encode($data));
-        return $response;
-    }
-
-    public function checkrepoaccess(SS_HTTPRequest $request)
-    {
-        $project = $this->getCurrentProject();
-        if (!$project) {
-            return $this->httpError(404);
-        }
-
-        if ($project->CVSPath) {
-            $fetch = new FetchJob();
-            $fetch->args = array('projectID' => $project->ID);
-            try {
-                $fetch->perform();
-                $canAccessRepo = true;
-            } catch (RuntimeException $e) {
-                $canAccessRepo = false;
-            }
-            $data = ['canAccessRepo' => $canAccessRepo];
-        } else {
-            $data = ['canAccessRepo' => false];
-        }
-
-        $response = $this->getResponse();
-        $response->addHeader("Content-Type", "application/json");
-        $response->setBody(json_encode($data));
-        return $response;
-    }
+	/**
+	 * @const string - action type for actions that perform deployments
+	 */
+	const ACTION_DEPLOY = 'deploy';
+
+	/**
+	 * @const string - action type for actions that manipulate snapshots
+	 */
+	const ACTION_SNAPSHOT = 'snapshot';
+
+	const ACTION_ENVIRONMENTS = 'createenv';
+
+	/**
+	 * @var string
+	 */
+	private $actionType = self::ACTION_DEPLOY;
+
+	/**
+	 * Bypass pipeline permission code
+	 */
+	const DEPLOYNAUT_BYPASS_PIPELINE = 'DEPLOYNAUT_BYPASS_PIPELINE';
+
+	/**
+	 * Allow dryrun of pipelines
+	 */
+	const DEPLOYNAUT_DRYRUN_PIPELINE = 'DEPLOYNAUT_DRYRUN_PIPELINE';
+
+	/**
+	 * Allow advanced options on deployments
+	 */
+	const DEPLOYNAUT_ADVANCED_DEPLOY_OPTIONS = 'DEPLOYNAUT_ADVANCED_DEPLOY_OPTIONS';
+
+	const ALLOW_PROD_DEPLOYMENT = 'ALLOW_PROD_DEPLOYMENT';
+	const ALLOW_NON_PROD_DEPLOYMENT = 'ALLOW_NON_PROD_DEPLOYMENT';
+	const ALLOW_PROD_SNAPSHOT = 'ALLOW_PROD_SNAPSHOT';
+	const ALLOW_NON_PROD_SNAPSHOT = 'ALLOW_NON_PROD_SNAPSHOT';
+	const ALLOW_CREATE_ENVIRONMENT = 'ALLOW_CREATE_ENVIRONMENT';
+
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = array(
+		'projects',
+		'nav',
+		'update',
+		'project',
+		'toggleprojectstar',
+		'branch',
+		'environment',
+		'abortpipeline',
+		'pipeline',
+		'pipelinelog',
+		'metrics',
+		'createenvlog',
+		'createenv',
+		'getDeployForm',
+		'doDeploy',
+		'deploy',
+		'deploylog',
+		'getDataTransferForm',
+		'transfer',
+		'transferlog',
+		'snapshots',
+		'createsnapshot',
+		'snapshotslog',
+		'uploadsnapshot',
+		'getCreateEnvironmentForm',
+		'getUploadSnapshotForm',
+		'getPostSnapshotForm',
+		'getDataTransferRestoreForm',
+		'getDeleteForm',
+		'getMoveForm',
+		'restoresnapshot',
+		'deletesnapshot',
+		'movesnapshot',
+		'postsnapshotsuccess',
+		'gitRevisions',
+		'deploySummary',
+		'startDeploy',
+		'createproject',
+		'CreateProjectForm',
+		'createprojectprogress',
+		'checkrepoaccess',
+	);
+
+	/**
+	 * URL handlers pretending that we have a deep URL structure.
+	 */
+	private static $url_handlers = array(
+		'project/$Project/environment/$Environment/DeployForm' => 'getDeployForm',
+		'project/$Project/createsnapshot/DataTransferForm' => 'getDataTransferForm',
+		'project/$Project/DataTransferForm' => 'getDataTransferForm',
+		'project/$Project/DataTransferRestoreForm' => 'getDataTransferRestoreForm',
+		'project/$Project/DeleteForm' => 'getDeleteForm',
+		'project/$Project/MoveForm' => 'getMoveForm',
+		'project/$Project/UploadSnapshotForm' => 'getUploadSnapshotForm',
+		'project/$Project/PostSnapshotForm' => 'getPostSnapshotForm',
+		'project/$Project/environment/$Environment/metrics' => 'metrics',
+		'project/$Project/environment/$Environment/pipeline/$Identifier//$Action/$ID/$OtherID' => 'pipeline',
+		'project/$Project/environment/$Environment/deploy_summary' => 'deploySummary',
+		'project/$Project/environment/$Environment/git_revisions' => 'gitRevisions',
+		'project/$Project/environment/$Environment/start-deploy' => 'startDeploy',
+		'project/$Project/environment/$Environment/deploy/$Identifier/log' => 'deploylog',
+		'project/$Project/environment/$Environment/deploy/$Identifier' => 'deploy',
+		'project/$Project/transfer/$Identifier/log' => 'transferlog',
+		'project/$Project/transfer/$Identifier' => 'transfer',
+		'project/$Project/environment/$Environment' => 'environment',
+		'project/$Project/createenv/$Identifier/log' => 'createenvlog',
+		'project/$Project/createenv/$Identifier' => 'createenv',
+		'project/$Project/CreateEnvironmentForm' => 'getCreateEnvironmentForm',
+		'project/$Project/branch' => 'branch',
+		'project/$Project/build/$Build' => 'build',
+		'project/$Project/restoresnapshot/$DataArchiveID' => 'restoresnapshot',
+		'project/$Project/deletesnapshot/$DataArchiveID' => 'deletesnapshot',
+		'project/$Project/movesnapshot/$DataArchiveID' => 'movesnapshot',
+		'project/$Project/update' => 'update',
+		'project/$Project/snapshots' => 'snapshots',
+		'project/$Project/createsnapshot' => 'createsnapshot',
+		'project/$Project/uploadsnapshot' => 'uploadsnapshot',
+		'project/$Project/snapshotslog' => 'snapshotslog',
+		'project/$Project/postsnapshotsuccess/$DataArchiveID' => 'postsnapshotsuccess',
+		'project/$Project/star' => 'toggleprojectstar',
+		'project/$Project/createprojectprogress' => 'createprojectprogress',
+		'project/$Project/checkrepoaccess' => 'checkrepoaccess',
+		'project/$Project' => 'project',
+		'nav/$Project' => 'nav',
+		'projects' => 'projects',
+	);
+
+	/**
+	 * @var array
+	 */
+	protected static $_project_cache = array();
+
+	/**
+	 * @var array
+	 */
+	private static $support_links = array();
+
+	/**
+	 * @var array
+	 */
+	private static $platform_specific_strings = array();
+
+	/**
+	 * @var array
+	 */
+	private static $action_types = array(
+		self::ACTION_DEPLOY,
+		self::ACTION_SNAPSHOT
+	);
+
+	/**
+	 * @var DNData
+	 */
+	protected $data;
+
+	/**
+	 * Include requirements that deploynaut needs, such as javascript.
+	 */
+	public static function include_requirements()
+	{
+
+		// JS should always go to the bottom, otherwise there's the risk that Requirements
+		// puts them halfway through the page to the nearest <script> tag. We don't want that.
+		Requirements::set_force_js_to_bottom(true);
+
+		// todo these should be bundled into the same JS as the others in "static" below.
+		// We've deliberately not used combined_files as it can mess with some of the JS used
+		// here and cause sporadic errors.
+		Requirements::javascript('deploynaut/javascript/jquery.js');
+		Requirements::javascript('deploynaut/javascript/bootstrap.js');
+		Requirements::javascript('deploynaut/javascript/q.js');
+		Requirements::javascript('deploynaut/javascript/tablefilter.js');
+		Requirements::javascript('deploynaut/javascript/deploynaut.js');
+		Requirements::javascript('deploynaut/javascript/react-with-addons.js');
+		Requirements::javascript('deploynaut/javascript/bootstrap.file-input.js');
+		Requirements::javascript('deploynaut/thirdparty/select2/dist/js/select2.min.js');
+		Requirements::javascript('deploynaut/javascript/material.js');
+
+		// Load the buildable dependencies only if not loaded centrally.
+		if (!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
+			if (\Director::isDev()) {
+				\Requirements::javascript('deploynaut/static/bundle-debug.js');
+			} else {
+				\Requirements::javascript('deploynaut/static/bundle.js');
+			}
+		}
+
+		Requirements::css('deploynaut/static/style.css');
+	}
+
+	/**
+	 * Check for feature flags:
+	 * - FLAG_SNAPSHOTS_ENABLED: set to true to enable globally
+	 * - FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS: set to semicolon-separated list of email addresses of allowed users.
+	 *
+	 * @return boolean
+	 */
+	public static function FlagSnapshotsEnabled()
+	{
+		if (defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) {
+			return true;
+		}
+		if (defined('FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS') && FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS) {
+			$allowedMembers = explode(';', FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS);
+			$member = Member::currentUser();
+			if ($allowedMembers && $member && in_array($member->Email, $allowedMembers)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @return ArrayList
+	 */
+	public static function get_support_links()
+	{
+		$supportLinks = self::config()->support_links;
+		if ($supportLinks) {
+			return new ArrayList($supportLinks);
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public static function get_template_global_variables()
+	{
+		return array(
+			'RedisUnavailable' => 'RedisUnavailable',
+			'RedisWorkersCount' => 'RedisWorkersCount',
+			'SidebarLinks' => 'SidebarLinks',
+			"SupportLinks" => 'get_support_links'
+		);
+	}
+
+	/**
+	 */
+	public function init()
+	{
+		parent::init();
+
+		if (!Member::currentUser() && !Session::get('AutoLoginHash')) {
+			return Security::permissionFailure();
+		}
+
+		// Block framework jquery
+		Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
+
+		self::include_requirements();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function Link()
+	{
+		return "naut/";
+	}
+
+	/**
+	 * Actions
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @return \SS_HTTPResponse
+	 */
+	public function index(SS_HTTPRequest $request)
+	{
+		return $this->redirect($this->Link() . 'projects/');
+	}
+
+	/**
+	 * Action
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @return string - HTML
+	 */
+	public function projects(SS_HTTPRequest $request)
+	{
+		// Performs canView permission check by limiting visible projects in DNProjectsList() call.
+		return $this->customise(array(
+			'Title' => 'Projects',
+		))->render();
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return HTMLText
+	 */
+	public function nav(SS_HTTPRequest $request)
+	{
+		return $this->renderWith('Nav');
+	}
+
+	/**
+	 * Return a link to the navigation template used for AJAX requests.
+	 * @return string
+	 */
+	public function NavLink()
+	{
+		$currentProject = $this->getCurrentProject();
+		$projectName = $currentProject ? $currentProject->Name : null;
+		return Controller::join_links(Director::absoluteBaseURL(), 'naut', 'nav', $projectName);
+	}
+
+	/**
+	 * Action
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @return SS_HTTPResponse - HTML
+	 */
+	public function snapshots(SS_HTTPRequest $request)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+		return $this->getCustomisedViewSection('SnapshotsSection', 'Data Snapshots');
+	}
+
+	/**
+	 * Action
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @return string - HTML
+	 */
+	public function createsnapshot(SS_HTTPRequest $request)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		if (!$project->canBackup()) {
+			return new SS_HTTPResponse("Not allowed to create snapshots on any environments", 401);
+		}
+
+		return $this->customise(array(
+			'Title' => 'Create Data Snapshot',
+			'SnapshotsSection' => 1,
+			'DataTransferForm' => $this->getDataTransferForm($request)
+		))->render();
+	}
+
+	/**
+	 * Action
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @return string - HTML
+	 */
+	public function uploadsnapshot(SS_HTTPRequest $request)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		if (!$project->canUploadArchive()) {
+			return new SS_HTTPResponse("Not allowed to upload", 401);
+		}
+
+		return $this->customise(array(
+			'SnapshotsSection' => 1,
+			'UploadSnapshotForm' => $this->getUploadSnapshotForm($request),
+			'PostSnapshotForm' => $this->getPostSnapshotForm($request)
+		))->render();
+	}
+
+	/**
+	 * Return the upload limit for snapshot uploads
+	 * @return string
+	 */
+	public function UploadLimit()
+	{
+		return File::format_size(min(
+			File::ini2bytes(ini_get('upload_max_filesize')),
+			File::ini2bytes(ini_get('post_max_size'))
+		));
+	}
+
+	/**
+	 * Construct the upload form.
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @return Form
+	 */
+	public function getUploadSnapshotForm(SS_HTTPRequest $request)
+	{
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		if (!$project->canUploadArchive()) {
+			return new SS_HTTPResponse("Not allowed to upload", 401);
+		}
+
+		// Framing an environment as a "group of people with download access"
+		// makes more sense to the user here, while still allowing us to enforce
+		// environment specific restrictions on downloading the file later on.
+		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+			return $item->canUploadArchive();
+		});
+		$envsMap = array();
+		foreach ($envs as $env) {
+			$envsMap[$env->ID] = $env->Name;
+		}
+
+		$maxSize = min(File::ini2bytes(ini_get('upload_max_filesize')), File::ini2bytes(ini_get('post_max_size')));
+		$fileField = DataArchiveFileField::create('ArchiveFile', 'File');
+		$fileField->getValidator()->setAllowedExtensions(array('sspak'));
+		$fileField->getValidator()->setAllowedMaxFileSize(array('*' => $maxSize));
+
+		$form = Form::create(
+			$this,
+			'UploadSnapshotForm',
+			FieldList::create(
+				$fileField,
+				DropdownField::create('Mode', 'What does this file contain?', DNDataArchive::get_mode_map()),
+				DropdownField::create('EnvironmentID', 'Initial ownership of the file', $envsMap)
+					->setEmptyString('Select an environment')
+			),
+			FieldList::create(
+				FormAction::create('doUploadSnapshot', 'Upload File')
+					->addExtraClass('btn')
+			),
+			RequiredFields::create('ArchiveFile')
+		);
+
+		$form->disableSecurityToken();
+		$form->addExtraClass('fields-wide');
+		// Tweak the action so it plays well with our fake URL structure.
+		$form->setFormAction($project->Link() . '/UploadSnapshotForm');
+
+		return $form;
+	}
+
+	/**
+	 * @param array $data
+	 * @param Form $form
+	 *
+	 * @return bool|HTMLText|SS_HTTPResponse
+	 */
+	public function doUploadSnapshot($data, Form $form)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		$validEnvs = $project->DNEnvironmentList()
+			->filterByCallback(function ($item) {
+				return $item->canUploadArchive();
+			});
+
+		// Validate $data['EnvironmentID'] by checking against $validEnvs.
+		$environment = $validEnvs->find('ID', $data['EnvironmentID']);
+		if (!$environment) {
+			throw new LogicException('Invalid environment');
+		}
+
+		$this->validateSnapshotMode($data['Mode']);
+
+		$dataArchive = DNDataArchive::create(array(
+			'AuthorID' => Member::currentUserID(),
+			'EnvironmentID' => $data['EnvironmentID'],
+			'IsManualUpload' => true,
+		));
+		// needs an ID and transfer to determine upload path
+		$dataArchive->write();
+		$dataTransfer = DNDataTransfer::create(array(
+			'AuthorID' => Member::currentUserID(),
+			'Mode' => $data['Mode'],
+			'Origin' => 'ManualUpload',
+			'EnvironmentID' => $data['EnvironmentID']
+		));
+		$dataTransfer->write();
+		$dataArchive->DataTransfers()->add($dataTransfer);
+		$form->saveInto($dataArchive);
+		$dataArchive->write();
+		$workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
+
+		$cleanupFn = function () use ($workingDir, $dataTransfer, $dataArchive) {
+			$process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
+			$process->run();
+			$dataTransfer->delete();
+			$dataArchive->delete();
+		};
+
+		// extract the sspak contents so we can inspect them
+		try {
+			$dataArchive->extractArchive($workingDir);
+		} catch (Exception $e) {
+			$cleanupFn();
+			$form->sessionMessage(
+				'There was a problem trying to open your snapshot for processing. Please try uploading again',
+				'bad'
+			);
+			return $this->redirectBack();
+		}
+
+		// validate that the sspak contents match the declared contents
+		$result = $dataArchive->validateArchiveContents();
+		if (!$result->valid()) {
+			$cleanupFn();
+			$form->sessionMessage($result->message(), 'bad');
+			return $this->redirectBack();
+		}
+
+		// fix file permissions of extracted sspak files then re-build the sspak
+		try {
+			$dataArchive->fixArchivePermissions($workingDir);
+			$dataArchive->setArchiveFromFiles($workingDir);
+		} catch (Exception $e) {
+			$cleanupFn();
+			$form->sessionMessage(
+				'There was a problem processing your snapshot. Please try uploading again',
+				'bad'
+			);
+			return $this->redirectBack();
+		}
+
+		// cleanup any extracted sspak contents lying around
+		$process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
+		$process->run();
+
+		return $this->customise(array(
+			'Project' => $project,
+			'CurrentProject' => $project,
+			'SnapshotsSection' => 1,
+			'DataArchive' => $dataArchive,
+			'DataTransferRestoreForm' => $this->getDataTransferRestoreForm($this->request, $dataArchive),
+			'BackURL' => $project->Link('snapshots')
+		))->renderWith(array('DNRoot_uploadsnapshot', 'DNRoot'));
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return Form
+	 */
+	public function getPostSnapshotForm(SS_HTTPRequest $request)
+	{
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		if (!$project->canUploadArchive()) {
+			return new SS_HTTPResponse("Not allowed to upload", 401);
+		}
+
+		// Framing an environment as a "group of people with download access"
+		// makes more sense to the user here, while still allowing us to enforce
+		// environment specific restrictions on downloading the file later on.
+		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+			return $item->canUploadArchive();
+		});
+		$envsMap = array();
+		foreach ($envs as $env) {
+			$envsMap[$env->ID] = $env->Name;
+		}
+
+		$form = Form::create(
+			$this,
+			'PostSnapshotForm',
+			FieldList::create(
+				DropdownField::create('Mode', 'What does this file contain?', DNDataArchive::get_mode_map()),
+				DropdownField::create('EnvironmentID', 'Initial ownership of the file', $envsMap)
+					->setEmptyString('Select an environment')
+			),
+			FieldList::create(
+				FormAction::create('doPostSnapshot', 'Submit request')
+					->addExtraClass('btn')
+			),
+			RequiredFields::create('File')
+		);
+
+		$form->disableSecurityToken();
+		$form->addExtraClass('fields-wide');
+		// Tweak the action so it plays well with our fake URL structure.
+		$form->setFormAction($project->Link() . '/PostSnapshotForm');
+
+		return $form;
+	}
+
+	/**
+	 * @param array $data
+	 * @param Form $form
+	 *
+	 * @return SS_HTTPResponse
+	 */
+	public function doPostSnapshot($data, $form)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+				return $item->canUploadArchive();
+		});
+
+		// Validate $data['EnvironmentID'] by checking against $validEnvs.
+		$environment = $validEnvs->find('ID', $data['EnvironmentID']);
+		if (!$environment) {
+			throw new LogicException('Invalid environment');
+		}
+
+		$dataArchive = DNDataArchive::create(array(
+			'UploadToken' => DNDataArchive::generate_upload_token(),
+		));
+		$form->saveInto($dataArchive);
+		$dataArchive->write();
+
+		return $this->redirect(Controller::join_links(
+			$project->Link(),
+			'postsnapshotsuccess',
+			$dataArchive->ID
+		));
+	}
+
+	/**
+	 * Action
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @return SS_HTTPResponse - HTML
+	 */
+	public function snapshotslog(SS_HTTPRequest $request)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+		return $this->getCustomisedViewSection('SnapshotsSection', 'Data Snapshots Log');
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return SS_HTTPResponse|string
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function postsnapshotsuccess(SS_HTTPRequest $request)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		if (!$project->canUploadArchive()) {
+			return new SS_HTTPResponse("Not allowed to upload", 401);
+		}
+
+		$dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
+		if (!$dataArchive) {
+			return new SS_HTTPResponse("Archive not found.", 404);
+		}
+
+		if (!$dataArchive->canRestore()) {
+			throw new SS_HTTPResponse_Exception('Not allowed to restore archive', 403);
+		}
+
+		return $this->render(array(
+				'Title' => 'How to send us your Data Snapshot by post',
+				'DataArchive' => $dataArchive,
+				'Address' => Config::inst()->get('Deploynaut', 'snapshot_post_address'),
+				'BackURL' => $project->Link(),
+			));
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return \SS_HTTPResponse
+	 */
+	public function project(SS_HTTPRequest $request)
+	{
+		return $this->getCustomisedViewSection('ProjectOverview', '', array('IsAdmin' => Permission::check('ADMIN')));
+	}
+
+	/**
+	 * This action will star / unstar a project for the current member
+	 *
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return SS_HTTPResponse
+	 */
+	public function toggleprojectstar(SS_HTTPRequest $request)
+	{
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		$member = Member::currentUser();
+		if ($member === null) {
+			return $this->project404Response();
+		}
+		$favProject = $member->StarredProjects()
+			->filter('DNProjectID', $project->ID)
+			->first();
+
+		if ($favProject) {
+			$member->StarredProjects()->remove($favProject);
+		} else {
+			$member->StarredProjects()->add($project);
+		}
+		return $this->redirectBack();
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return \SS_HTTPResponse
+	 */
+	public function branch(SS_HTTPRequest $request)
+	{
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		$branchName = $request->getVar('name');
+		$branch = $project->DNBranchList()->byName($branchName);
+		if (!$branch) {
+			return new SS_HTTPResponse("Branch '" . Convert::raw2xml($branchName) . "' not found.", 404);
+		}
+
+		return $this->render(array(
+			'CurrentBranch' => $branch,
+		));
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return \SS_HTTPResponse
+	 */
+	public function environment(SS_HTTPRequest $request)
+	{
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		// Performs canView permission check by limiting visible projects
+		$env = $this->getCurrentEnvironment($project);
+		if (!$env) {
+			return $this->environment404Response();
+		}
+
+		return $this->render(array(
+			'DNEnvironmentList' => $this->getCurrentProject()->DNEnvironmentList(),
+			'FlagSnapshotsEnabled' => $this->FlagSnapshotsEnabled(),
+		));
+	}
+
+
+	/**
+	 * Initiate a pipeline dry run
+	 *
+	 * @param array $data
+	 * @param DeployForm $form
+	 *
+	 * @return SS_HTTPResponse
+	 */
+	public function doDryRun($data, DeployForm $form)
+	{
+		return $this->beginPipeline($data, $form, true);
+	}
+
+	/**
+	 * Initiate a pipeline
+	 *
+	 * @param array $data
+	 * @param DeployForm $form
+	 * @return \SS_HTTPResponse
+	 */
+	public function startPipeline($data, $form)
+	{
+		return $this->beginPipeline($data, $form);
+	}
+
+	/**
+	 * Start a pipeline
+	 *
+	 * @param array $data
+	 * @param DeployForm $form
+	 * @param bool $isDryRun
+	 * @return \SS_HTTPResponse
+	 */
+	protected function beginPipeline($data, DeployForm $form, $isDryRun = false)
+	{
+		$buildName = $form->getSelectedBuild($data);
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		// Performs canView permission check by limiting visible projects
+		$environment = $this->getCurrentEnvironment($project);
+		if (!$environment) {
+			return $this->environment404Response();
+		}
+
+		if (!$environment->DryRunEnabled && $isDryRun) {
+			return new SS_HTTPResponse("Dry-run for pipelines is not enabled for this environment", 404);
+		}
+
+		// Initiate the pipeline
+		$sha = $project->DNBuildList()->byName($buildName);
+		$pipeline = Pipeline::create();
+		$pipeline->DryRun = $isDryRun;
+		$pipeline->EnvironmentID = $environment->ID;
+		$pipeline->AuthorID = Member::currentUserID();
+		$pipeline->SHA = $sha->FullName();
+		// Record build at time of execution
+		if ($currentBuild = $environment->CurrentBuild()) {
+			$pipeline->PreviousDeploymentID = $currentBuild->ID;
+		}
+		$pipeline->start(); // start() will call write(), so no need to do it here as well.
+		return $this->redirect($environment->Link());
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return SS_HTTPResponse
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function pipeline(SS_HTTPRequest $request)
+	{
+		$params = $request->params();
+		$pipeline = Pipeline::get()->byID($params['Identifier']);
+
+		if (!$pipeline || !$pipeline->ID || !$pipeline->Environment()) {
+			throw new SS_HTTPResponse_Exception('Pipeline not found', 404);
+		}
+		if (!$pipeline->Environment()->canView()) {
+			return Security::permissionFailure();
+		}
+
+		$environment = $pipeline->Environment();
+		$project = $pipeline->Environment()->Project();
+
+		if ($environment->Name != $params['Environment']) {
+			throw new LogicException("Environment in URL doesn't match this pipeline");
+		}
+		if ($project->Name != $params['Project']) {
+			throw new LogicException("Project in URL doesn't match this pipeline");
+		}
+
+		// Delegate to sub-requesthandler
+		return PipelineController::create($this, $pipeline);
+	}
+
+	/**
+	 * Shows the creation log.
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @return string
+	 */
+	public function createenv(SS_HTTPRequest $request)
+	{
+		$params = $request->params();
+		if ($params['Identifier']) {
+			$record = DNCreateEnvironment::get()->byId($params['Identifier']);
+
+			if (!$record || !$record->ID) {
+				throw new SS_HTTPResponse_Exception('Create environment not found', 404);
+			}
+			if (!$record->canView()) {
+				return Security::permissionFailure();
+			}
+
+			$project = $this->getCurrentProject();
+			if (!$project) {
+				return $this->project404Response();
+			}
+
+			if ($project->Name != $params['Project']) {
+				throw new LogicException("Project in URL doesn't match this creation");
+			}
+
+			return $this->render(array(
+				'CreateEnvironment' => $record,
+			));
+		}
+		return $this->render(array('CurrentTitle' => 'Create an environment'));
+	}
+
+
+	public function createenvlog(SS_HTTPRequest $request)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		$params = $request->params();
+		$env = DNCreateEnvironment::get()->byId($params['Identifier']);
+
+		if (!$env || !$env->ID) {
+			throw new SS_HTTPResponse_Exception('Log not found', 404);
+		}
+		if (!$env->canView()) {
+			return Security::permissionFailure();
+		}
+
+		$project = $env->Project();
+
+		if ($project->Name != $params['Project']) {
+			throw new LogicException("Project in URL doesn't match this deploy");
+		}
+
+		$log = $env->log();
+		if ($log->exists()) {
+			$content = $log->content();
+		} else {
+			$content = 'Waiting for action to start';
+		}
+
+		return $this->sendResponse($env->ResqueStatus(), $content);
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return Form
+	 */
+	public function getCreateEnvironmentForm(SS_HTTPRequest $request)
+	{
+		$this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
+
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		$envType = $project->AllowedEnvironmentType;
+		if (!$envType || !class_exists($envType)) {
+			return null;
+		}
+
+		$backend = Injector::inst()->get($envType);
+		if (!($backend instanceof EnvironmentCreateBackend)) {
+			// Only allow this for supported backends.
+			return null;
+		}
+
+		$fields = $backend->getCreateEnvironmentFields($project);
+		if (!$fields) {
+			return null;
+		}
+
+		if (!$project->canCreateEnvironments()) {
+			return new SS_HTTPResponse('Not allowed to create environments for this project', 401);
+		}
+
+		$form = Form::create(
+			$this,
+			'CreateEnvironmentForm',
+			$fields,
+			FieldList::create(
+				FormAction::create('doCreateEnvironment', 'Create')
+					->addExtraClass('btn')
+			),
+			$backend->getCreateEnvironmentValidator()
+		);
+
+		// Tweak the action so it plays well with our fake URL structure.
+		$form->setFormAction($project->Link() . '/CreateEnvironmentForm');
+
+		return $form;
+	}
+
+	/**
+	 * @param array $data
+	 * @param Form $form
+	 *
+	 * @return bool|HTMLText|SS_HTTPResponse
+	 */
+	public function doCreateEnvironment($data, Form $form)
+	{
+		$this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
+
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		if (!$project->canCreateEnvironments()) {
+			return new SS_HTTPResponse('Not allowed to create environments for this project', 401);
+		}
+
+		// Set the environment type so we know what we're creating.
+		$data['EnvironmentType'] = $project->AllowedEnvironmentType;
+
+		$job = DNCreateEnvironment::create();
+
+		$job->Data = serialize($data);
+		$job->ProjectID = $project->ID;
+		$job->write();
+		$job->start();
+
+		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
+	}
+
+	/**
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @return \SS_HTTPResponse
+	 */
+	public function metrics(SS_HTTPRequest $request)
+	{
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		// Performs canView permission check by limiting visible projects
+		$env = $this->getCurrentEnvironment($project);
+		if (!$env) {
+			return $this->environment404Response();
+		}
+
+		return $this->render();
+	}
+
+	/**
+	 * Get the DNData object.
+	 *
+	 * @return DNData
+	 */
+	public function DNData()
+	{
+		return DNData::inst();
+	}
+
+	/**
+	 * Provide a list of all projects.
+	 *
+	 * @return SS_List
+	 */
+	public function DNProjectList()
+	{
+		$memberId = Member::currentUserID();
+		if (!$memberId) {
+			return new ArrayList();
+		}
+
+		if (Permission::check('ADMIN')) {
+			return DNProject::get();
+		}
+
+		return Member::get()->filter('ID', $memberId)
+			->relation('Groups')
+			->relation('Projects');
+	}
+
+	/**
+	 * @return ArrayList
+	 */
+	public function getPlatformSpecificStrings()
+	{
+		$strings = $this->config()->platform_specific_strings;
+		if ($strings) {
+			return new ArrayList($strings);
+		}
+	}
+
+	/**
+	 * Provide a list of all starred projects for the currently logged in member
+	 *
+	 * @return SS_List
+	 */
+	public function getStarredProjects()
+	{
+		$member = Member::currentUser();
+		if ($member === null) {
+			return new ArrayList();
+		}
+
+		$favProjects = $member->StarredProjects();
+
+		$list = new ArrayList();
+		foreach ($favProjects as $project) {
+			if ($project->canView($member)) {
+				$list->add($project);
+			}
+		}
+		return $list;
+	}
+
+	/**
+	 * Returns top level navigation of projects.
+	 *
+	 * @param int $limit
+	 *
+	 * @return ArrayList
+	 */
+	public function Navigation($limit = 5)
+	{
+		$navigation = new ArrayList();
+
+		$currentProject = $this->getCurrentProject();
+
+		$projects = $this->getStarredProjects();
+		if ($projects->count() < 1) {
+			$projects = $this->DNProjectList();
+		} else {
+			$limit = -1;
+		}
+
+		if ($projects->count() > 0) {
+			$activeProject = false;
+
+			if ($limit > 0) {
+				$limitedProjects = $projects->limit($limit);
+			} else {
+				$limitedProjects = $projects;
+			}
+
+			foreach ($limitedProjects as $project) {
+				$isActive = $currentProject && $currentProject->ID == $project->ID;
+				if ($isActive) {
+					$activeProject = true;
+				}
+
+				$navigation->push(array(
+					'Project' => $project,
+					'IsActive' => $currentProject && $currentProject->ID == $project->ID,
+				));
+			}
+
+			// Ensure the current project is in the list
+			if (!$activeProject && $currentProject) {
+				$navigation->unshift(array(
+					'Project' => $currentProject,
+					'IsActive' => true,
+				));
+				if ($limit > 0 && $navigation->count() > $limit) {
+					$navigation->pop();
+				}
+			}
+		}
+
+		return $navigation;
+	}
+
+	/**
+	 * Construct the deployment form
+	 *
+	 * @return Form
+	 */
+	public function getDeployForm($request = null)
+	{
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		// Performs canView permission check by limiting visible projects
+		$environment = $this->getCurrentEnvironment($project);
+		if (!$environment) {
+			return $this->environment404Response();
+		}
+
+		if (!$environment->canDeploy()) {
+			return new SS_HTTPResponse("Not allowed to deploy", 401);
+		}
+
+		// Generate the form
+		$form = new DeployForm($this, 'DeployForm', $environment, $project);
+
+		// If this is an ajax request we don't want to submit the form - we just want to retrieve the markup.
+		if (
+			$request &&
+			!$request->requestVar('action_showDeploySummary') &&
+			$this->getRequest()->isAjax() &&
+			$this->getRequest()->isGET()
+		) {
+			// We can just use the URL we're accessing
+			$form->setFormAction($this->getRequest()->getURL());
+
+			$body = json_encode(array('Content' => $form->forAjaxTemplate()->forTemplate()));
+			$this->getResponse()->addHeader('Content-Type', 'application/json');
+			$this->getResponse()->setBody($body);
+			return $body;
+		}
+
+		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
+		return $form;
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return SS_HTTPResponse|string
+	 */
+	public function gitRevisions(SS_HTTPRequest $request)
+	{
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		// Performs canView permission check by limiting visible projects
+		$env = $this->getCurrentEnvironment($project);
+		if (!$env) {
+			return $this->environment404Response();
+		}
+
+		// For now only permit advanced options on one environment type, because we hacked the "full-deploy"
+		// checkbox in. Other environments such as the fast or capistrano one wouldn't know what to do with it.
+		if (get_class($env) === 'RainforestEnvironment') {
+			$advanced = Permission::check('DEPLOYNAUT_ADVANCED_DEPLOY_OPTIONS') ? 'true' : 'false';
+		} else {
+			$advanced = 'false';
+		}
+
+		$tabs = array();
+		$id = 0;
+		$data = array(
+			'id' => ++$id,
+			'name' => 'Deploy the latest version of a branch',
+			'field_type' => 'dropdown',
+			'field_label' => 'Choose a branch',
+			'field_id' => 'branch',
+			'field_data' => array(),
+			'advanced_opts' => $advanced
+		);
+		foreach ($project->DNBranchList() as $branch) {
+			$sha = $branch->SHA();
+			$name = $branch->Name();
+			$branchValue = sprintf("%s (%s, %s old)",
+				$name,
+				substr($sha, 0, 8),
+				$branch->LastUpdated()->TimeDiff()
+			);
+			$data['field_data'][] = array(
+				'id' => $sha,
+				'text' => $branchValue
+			);
+		}
+		$tabs[] = $data;
+
+		$data = array(
+			'id' => ++$id,
+			'name' => 'Deploy a tagged release',
+			'field_type' => 'dropdown',
+			'field_label' => 'Choose a tag',
+			'field_id' => 'tag',
+			'field_data' => array(),
+			'advanced_opts' => $advanced
+		);
+
+		foreach ($project->DNTagList()->setLimit(null) as $tag) {
+			$name = $tag->Name();
+			$data['field_data'][] = array(
+				'id' => $tag->SHA(),
+				'text' => sprintf("%s", $name)
+			);
+		}
+
+		// show newest tags first.
+		$data['field_data'] = array_reverse($data['field_data']);
+
+		$tabs[] = $data;
+
+		// Past deployments
+		$data = array(
+			'id' => ++$id,
+			'name' => 'Redeploy a release that was previously deployed (to any environment)',
+			'field_type' => 'dropdown',
+			'field_label' => 'Choose a previously deployed release',
+			'field_id' => 'release',
+			'field_data' => array(),
+			'advanced_opts' => $advanced
+		);
+		// We are aiming at the format:
+		// [{text: 'optgroup text', children: [{id: '<sha>', text: '<inner text>'}]}]
+		$redeploy = array();
+		foreach ($project->DNEnvironmentList() as $dnEnvironment) {
+			$envName = $dnEnvironment->Name;
+			$perEnvDeploys = array();
+
+			foreach ($dnEnvironment->DeployHistory() as $deploy) {
+				$sha = $deploy->SHA;
+
+				// Check if exists to make sure the newest deployment date is used.
+				if (!isset($perEnvDeploys[$sha])) {
+					$pastValue = sprintf("%s (deployed %s)",
+						substr($sha, 0, 8),
+						$deploy->obj('LastEdited')->Ago()
+					);
+					$perEnvDeploys[$sha] = array(
+						'id' => $sha,
+						'text' => $pastValue
+					);
+				}
+			}
+
+			if (!empty($perEnvDeploys)) {
+				$redeploy[$envName] = array_values($perEnvDeploys);
+			}
+		}
+		// Convert the array to the frontend format (i.e. keyed to regular array)
+		foreach ($redeploy as $env => $descr) {
+			$data['field_data'][] = array('text'=>$env, 'children'=>$descr);
+		}
+		$tabs[] = $data;
+
+		$data = array(
+			'id' => ++$id,
+			'name' => 'Deploy a specific SHA',
+			'field_type' => 'textfield',
+			'field_label' => 'Choose a SHA',
+			'field_id' => 'SHA',
+			'field_data' => array(),
+			'advanced_opts' => $advanced
+		);
+		$tabs[] = $data;
+
+		// get the last time git fetch was run
+		$lastFetched = 'never';
+		$fetch = DNGitFetch::get()
+			->filter('ProjectID', $project->ID)
+			->sort('LastEdited', 'DESC')
+			->first();
+		if ($fetch) {
+			$lastFetched = $fetch->dbObject('LastEdited')->Ago();
+		}
+
+		$data = array(
+			'Tabs' => $tabs,
+			'last_fetched' => $lastFetched
+		);
+
+		return json_encode($data, JSON_PRETTY_PRINT);
+	}
+
+	/**
+	 * Check and regenerate a global CSRF token
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @param bool $resetToken
+	 *
+	 * @return bool
+	 */
+	protected function checkCsrfToken(SS_HTTPRequest $request, $resetToken = true)
+	{
+		$token = SecurityToken::inst();
+
+		// Ensure the submitted token has a value
+		$submittedToken = $request->postVar('SecurityID');
+		if (!$submittedToken) {
+			return false;
+		}
+
+		// Do the actual check.
+		$check = $token->check($submittedToken);
+
+		// Reset the token after we've checked the existing token
+		if ($resetToken) {
+			$token->reset();
+		}
+
+		// Return whether the token was correct or not
+		return $check;
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return string
+	 */
+	public function deploySummary(SS_HTTPRequest $request)
+	{
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		// Performs canView permission check by limiting visible projects
+		$environment = $this->getCurrentEnvironment($project);
+		if (!$environment) {
+			return $this->environment404Response();
+		}
+
+		// Plan the deployment.
+		$strategy = $environment->Backend()->planDeploy(
+			$environment,
+			$request->requestVars()
+		);
+		$data = $strategy->toArray();
+
+		// Add in a URL for comparing from->to code changes. Ensure that we have
+		// two proper 40 character SHAs, otherwise we can't show the compare link.
+		$interface = $project->getRepositoryInterface();
+		if (
+			!empty($interface) && !empty($interface->URL)
+			&& !empty($data['changes']['Code version']['from'])
+			&& strlen($data['changes']['Code version']['from']) == '40'
+			&& !empty($data['changes']['Code version']['to'])
+			&& strlen($data['changes']['Code version']['to']) == '40'
+		) {
+			$compareurl = sprintf(
+				'%s/compare/%s...%s',
+				$interface->URL,
+				$data['changes']['Code version']['from'],
+				$data['changes']['Code version']['to']
+			);
+			$data['changes']['Code version']['compareUrl'] = $compareurl;
+		}
+
+		// Append json to response
+		$token = SecurityToken::inst();
+		$data['SecurityID'] = $token->getValue();
+
+		return json_encode($data);
+	}
+
+	/**
+	 * Deployment form submission handler.
+	 *
+	 * Initiate a DNDeployment record and redirect to it for status polling
+	 *
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return SS_HTTPResponse
+	 * @throws ValidationException
+	 * @throws null
+	 */
+	public function startDeploy(SS_HTTPRequest $request)
+	{
+
+		// Ensure the CSRF Token is correct
+		if (!$this->checkCsrfToken($request)) {
+			// CSRF token didn't match
+			return $this->httpError(400, 'Bad Request');
+		}
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		// Performs canView permission check by limiting visible projects
+		$environment = $this->getCurrentEnvironment($project);
+		if (!$environment) {
+			return $this->environment404Response();
+		}
+
+		// Initiate the deployment
+		// The extension point should pass in: Project, Environment, SelectRelease, buildName
+		$this->extend('doDeploy', $project, $environment, $buildName, $data);
+
+		// Start the deployment based on the approved strategy.
+		$strategy = new DeploymentStrategy($environment);
+		$strategy->fromArray($request->requestVar('strategy'));
+		$deployment = $strategy->createDeployment();
+		$deployment->start();
+
+		return json_encode(array(
+			'url' => Director::absoluteBaseURL() . $deployment->Link()
+		), JSON_PRETTY_PRINT);
+	}
+
+	/**
+	 * Action - Do the actual deploy
+	 *
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return SS_HTTPResponse|string
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function deploy(SS_HTTPRequest $request)
+	{
+		$params = $request->params();
+		$deployment = DNDeployment::get()->byId($params['Identifier']);
+
+		if (!$deployment || !$deployment->ID) {
+			throw new SS_HTTPResponse_Exception('Deployment not found', 404);
+		}
+		if (!$deployment->canView()) {
+			return Security::permissionFailure();
+		}
+
+		$environment = $deployment->Environment();
+		$project = $environment->Project();
+
+		if ($environment->Name != $params['Environment']) {
+			throw new LogicException("Environment in URL doesn't match this deploy");
+		}
+		if ($project->Name != $params['Project']) {
+			throw new LogicException("Project in URL doesn't match this deploy");
+		}
+
+		return $this->render(array(
+			'Deployment' => $deployment,
+		));
+	}
+
+
+	/**
+	 * Action - Get the latest deploy log
+	 *
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return string
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function deploylog(SS_HTTPRequest $request)
+	{
+		$params = $request->params();
+		$deployment = DNDeployment::get()->byId($params['Identifier']);
+
+		if (!$deployment || !$deployment->ID) {
+			throw new SS_HTTPResponse_Exception('Deployment not found', 404);
+		}
+		if (!$deployment->canView()) {
+			return Security::permissionFailure();
+		}
+
+		$environment = $deployment->Environment();
+		$project = $environment->Project();
+
+		if ($environment->Name != $params['Environment']) {
+			throw new LogicException("Environment in URL doesn't match this deploy");
+		}
+		if ($project->Name != $params['Project']) {
+			throw new LogicException("Project in URL doesn't match this deploy");
+		}
+
+		$log = $deployment->log();
+		if ($log->exists()) {
+			$content = $log->content();
+		} else {
+			$content = 'Waiting for action to start';
+		}
+
+		return $this->sendResponse($deployment->ResqueStatus(), $content);
+	}
+
+	/**
+	 * @param SS_HTTPRequest|null $request
+	 *
+	 * @return Form
+	 */
+	public function getDataTransferForm(SS_HTTPRequest $request = null)
+	{
+		// Performs canView permission check by limiting visible projects
+		$envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function ($item) {
+			return $item->canBackup();
+		});
+
+		if (!$envs) {
+			return $this->environment404Response();
+		}
+
+		$form = Form::create(
+			$this,
+			'DataTransferForm',
+			FieldList::create(
+				HiddenField::create('Direction', null, 'get'),
+				DropdownField::create('EnvironmentID', 'Environment', $envs->map())
+					->setEmptyString('Select an environment'),
+				DropdownField::create('Mode', 'Transfer', DNDataArchive::get_mode_map())
+			),
+			FieldList::create(
+				FormAction::create('doDataTransfer', 'Create')
+					->addExtraClass('btn')
+			)
+		);
+		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
+
+		return $form;
+	}
+
+	/**
+	 * @param array $data
+	 * @param Form $form
+	 *
+	 * @return SS_HTTPResponse
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function doDataTransfer($data, Form $form)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		$dataArchive = null;
+
+		// Validate direction.
+		if ($data['Direction'] == 'get') {
+			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
+				->filterByCallback(function ($item) {
+					return $item->canBackup();
+				});
+		} elseif ($data['Direction'] == 'push') {
+			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
+				->filterByCallback(function ($item) {
+					return $item->canRestore();
+				});
+		} else {
+			throw new LogicException('Invalid direction');
+		}
+
+		// Validate $data['EnvironmentID'] by checking against $validEnvs.
+		$environment = $validEnvs->find('ID', $data['EnvironmentID']);
+		if (!$environment) {
+			throw new LogicException('Invalid environment');
+		}
+
+		$this->validateSnapshotMode($data['Mode']);
+
+
+		// Only 'push' direction is allowed an association with an existing archive.
+		if (
+			$data['Direction'] == 'push'
+			&& isset($data['DataArchiveID'])
+			&& is_numeric($data['DataArchiveID'])
+		) {
+			$dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
+			if (!$dataArchive) {
+				throw new LogicException('Invalid data archive');
+			}
+
+			if (!$dataArchive->canDownload()) {
+				throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
+			}
+		}
+
+		$transfer = DNDataTransfer::create();
+		$transfer->EnvironmentID = $environment->ID;
+		$transfer->Direction = $data['Direction'];
+		$transfer->Mode = $data['Mode'];
+		$transfer->DataArchiveID = $dataArchive ? $dataArchive->ID : null;
+		if ($data['Direction'] == 'push') {
+			$transfer->setBackupBeforePush(!empty($data['BackupBeforePush']));
+		}
+		$transfer->write();
+		$transfer->start();
+
+		return $this->redirect($transfer->Link());
+	}
+
+	/**
+	 * View into the log for a {@link DNDataTransfer}.
+	 *
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return SS_HTTPResponse|string
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function transfer(SS_HTTPRequest $request)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		$params = $request->params();
+		$transfer = DNDataTransfer::get()->byId($params['Identifier']);
+
+		if (!$transfer || !$transfer->ID) {
+			throw new SS_HTTPResponse_Exception('Transfer not found', 404);
+		}
+		if (!$transfer->canView()) {
+			return Security::permissionFailure();
+		}
+
+		$environment = $transfer->Environment();
+		$project = $environment->Project();
+
+		if ($project->Name != $params['Project']) {
+			throw new LogicException("Project in URL doesn't match this deploy");
+		}
+
+		return $this->render(array(
+			'CurrentTransfer' => $transfer,
+			'SnapshotsSection' => 1,
+		));
+	}
+
+	/**
+	 * Action - Get the latest deploy log
+	 *
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return string
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function transferlog(SS_HTTPRequest $request)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		$params = $request->params();
+		$transfer = DNDataTransfer::get()->byId($params['Identifier']);
+
+		if (!$transfer || !$transfer->ID) {
+			throw new SS_HTTPResponse_Exception('Transfer not found', 404);
+		}
+		if (!$transfer->canView()) {
+			return Security::permissionFailure();
+		}
+
+		$environment = $transfer->Environment();
+		$project = $environment->Project();
+
+		if ($project->Name != $params['Project']) {
+			throw new LogicException("Project in URL doesn't match this deploy");
+		}
+
+		$log = $transfer->log();
+		if ($log->exists()) {
+			$content = $log->content();
+		} else {
+			$content = 'Waiting for action to start';
+		}
+
+		return $this->sendResponse($transfer->ResqueStatus(), $content);
+	}
+
+	/**
+	 * Note: Submits to the same action as {@link getDataTransferForm()},
+	 * but with a Direction=push and an archive reference.
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @param DNDataArchive|null $dataArchive Only set when method is called manually in {@link restore()},
+	 *                            otherwise the state is inferred from the request data.
+	 * @return Form
+	 */
+	public function getDataTransferRestoreForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null)
+	{
+		$dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+			return $item->canRestore();
+		});
+
+		if (!$envs) {
+			return $this->environment404Response();
+		}
+
+		$modesMap = array();
+		if (in_array($dataArchive->Mode, array('all'))) {
+			$modesMap['all'] = 'Database and Assets';
+		};
+		if (in_array($dataArchive->Mode, array('all', 'db'))) {
+			$modesMap['db'] = 'Database only';
+		};
+		if (in_array($dataArchive->Mode, array('all', 'assets'))) {
+			$modesMap['assets'] = 'Assets only';
+		};
+
+		$alertMessage = '<div class="alert alert-warning"><strong>Warning:</strong> '
+			. 'This restore will overwrite the data on the chosen environment below</div>';
+
+		$form = Form::create(
+			$this,
+			'DataTransferRestoreForm',
+			FieldList::create(
+				HiddenField::create('DataArchiveID', null, $dataArchive->ID),
+				HiddenField::create('Direction', null, 'push'),
+				LiteralField::create('Warning', $alertMessage),
+				DropdownField::create('EnvironmentID', 'Environment', $envs->map())
+					->setEmptyString('Select an environment'),
+				DropdownField::create('Mode', 'Transfer', $modesMap),
+				CheckboxField::create('BackupBeforePush', 'Backup existing data', '1')
+			),
+			FieldList::create(
+				FormAction::create('doDataTransfer', 'Restore Data')
+					->addExtraClass('btn')
+			)
+		);
+		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
+
+		return $form;
+	}
+
+	/**
+	 * View a form to restore a specific {@link DataArchive}.
+	 * Permission checks are handled in {@link DataArchives()}.
+	 * Submissions are handled through {@link doDataTransfer()}, same as backup operations.
+	 *
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return HTMLText
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function restoresnapshot(SS_HTTPRequest $request)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		/** @var DNDataArchive $dataArchive */
+		$dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
+
+		if (!$dataArchive) {
+			throw new SS_HTTPResponse_Exception('Archive not found', 404);
+		}
+
+		// We check for canDownload because that implies access to the data.
+		// canRestore is later checked on the actual restore action per environment.
+		if (!$dataArchive->canDownload()) {
+			throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
+		}
+
+		$form = $this->getDataTransferRestoreForm($this->request, $dataArchive);
+
+		// View currently only available via ajax
+		return $form->forTemplate();
+	}
+
+	/**
+	 * View a form to delete a specific {@link DataArchive}.
+	 * Permission checks are handled in {@link DataArchives()}.
+	 * Submissions are handled through {@link doDelete()}.
+	 *
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return HTMLText
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function deletesnapshot(SS_HTTPRequest $request)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		/** @var DNDataArchive $dataArchive */
+		$dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
+
+		if (!$dataArchive) {
+			throw new SS_HTTPResponse_Exception('Archive not found', 404);
+		}
+
+		if (!$dataArchive->canDelete()) {
+			throw new SS_HTTPResponse_Exception('Not allowed to delete archive', 403);
+		}
+
+		$form = $this->getDeleteForm($this->request, $dataArchive);
+
+		// View currently only available via ajax
+		return $form->forTemplate();
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @param DNDataArchive|null $dataArchive Only set when method is called manually, otherwise the state is inferred
+	 *        from the request data.
+	 * @return Form
+	 */
+	public function getDeleteForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null)
+	{
+		$dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		$snapshotDeleteWarning = '<div class="alert alert-warning">'
+			. 'Are you sure you want to permanently delete this snapshot from this archive area?'
+			. '</div>';
+
+		$form = Form::create(
+			$this,
+			'DeleteForm',
+			FieldList::create(
+				HiddenField::create('DataArchiveID', null, $dataArchive->ID),
+				LiteralField::create('Warning', $snapshotDeleteWarning)
+			),
+			FieldList::create(
+				FormAction::create('doDelete', 'Delete')
+					->addExtraClass('btn')
+			)
+		);
+		$form->setFormAction($project->Link() . '/DeleteForm');
+
+		return $form;
+	}
+
+	/**
+	 * @param array $data
+	 * @param Form $form
+	 *
+	 * @return bool|SS_HTTPResponse
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function doDelete($data, Form $form)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		$dataArchive = null;
+
+		if (
+			isset($data['DataArchiveID'])
+			&& is_numeric($data['DataArchiveID'])
+		) {
+			$dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
+		}
+
+		if (!$dataArchive) {
+			throw new LogicException('Invalid data archive');
+		}
+
+		if (!$dataArchive->canDelete()) {
+			throw new SS_HTTPResponse_Exception('Not allowed to delete archive', 403);
+		}
+
+		$dataArchive->delete();
+
+		return $this->redirectBack();
+	}
+
+	/**
+	 * View a form to move a specific {@link DataArchive}.
+	 *
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return HTMLText
+	 * @throws SS_HTTPResponse_Exception
+	 */
+	public function movesnapshot(SS_HTTPRequest $request)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		/** @var DNDataArchive $dataArchive */
+		$dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
+
+		if (!$dataArchive) {
+			throw new SS_HTTPResponse_Exception('Archive not found', 404);
+		}
+
+		// We check for canDownload because that implies access to the data.
+		if (!$dataArchive->canDownload()) {
+			throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
+		}
+
+		$form = $this->getMoveForm($this->request, $dataArchive);
+
+		// View currently only available via ajax
+		return $form->forTemplate();
+	}
+
+	/**
+	 * Build snapshot move form.
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @param DNDataArchive|null $dataArchive
+	 *
+	 * @return Form|SS_HTTPResponse
+	 */
+	public function getMoveForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null)
+	{
+		$dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
+
+		$envs = $dataArchive->validTargetEnvironments();
+		if (!$envs) {
+			return $this->environment404Response();
+		}
+
+		$warningMessage = '<div class="alert alert-warning"><strong>Warning:</strong> This will make the snapshot '
+			. 'available to people with access to the target environment.<br>By pressing "Change ownership" you '
+			. 'confirm that you have considered data confidentiality regulations.</div>';
+
+		$form = Form::create(
+			$this,
+			'MoveForm',
+			FieldList::create(
+				HiddenField::create('DataArchiveID', null, $dataArchive->ID),
+				LiteralField::create('Warning', $warningMessage),
+				DropdownField::create('EnvironmentID', 'Environment', $envs->map())
+					->setEmptyString('Select an environment')
+			),
+			FieldList::create(
+				FormAction::create('doMove', 'Change ownership')
+					->addExtraClass('btn')
+			)
+		);
+		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
+
+		return $form;
+	}
+
+	/**
+	 * @param array $data
+	 * @param Form $form
+	 *
+	 * @return bool|SS_HTTPResponse
+	 * @throws SS_HTTPResponse_Exception
+	 * @throws ValidationException
+	 * @throws null
+	 */
+	public function doMove($data, Form $form)
+	{
+		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
+
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		/** @var DNDataArchive $dataArchive */
+		$dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
+		if (!$dataArchive) {
+			throw new LogicException('Invalid data archive');
+		}
+
+		// We check for canDownload because that implies access to the data.
+		if (!$dataArchive->canDownload()) {
+			throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
+		}
+
+		// Validate $data['EnvironmentID'] by checking against $validEnvs.
+		$validEnvs = $dataArchive->validTargetEnvironments();
+		$environment = $validEnvs->find('ID', $data['EnvironmentID']);
+		if (!$environment) {
+			throw new LogicException('Invalid environment');
+		}
+
+		$dataArchive->EnvironmentID = $environment->ID;
+		$dataArchive->write();
+
+		return $this->redirectBack();
+	}
+
+	/**
+	 * Returns an error message if redis is unavailable
+	 *
+	 * @return string
+	 */
+	public static function RedisUnavailable()
+	{
+		try {
+			Resque::queues();
+		} catch (Exception $e) {
+			return $e->getMessage();
+		}
+		return '';
+	}
+
+	/**
+	 * Returns the number of connected Redis workers
+	 *
+	 * @return int
+	 */
+	public static function RedisWorkersCount()
+	{
+		return count(Resque_Worker::all());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePermissions()
+	{
+		return array(
+			self::DEPLOYNAUT_BYPASS_PIPELINE => array(
+				'name' => "Bypass Pipeline",
+				'category' => "Deploynaut",
+				'help' => "Enables users to directly initiate deployments, bypassing any pipeline",
+			),
+			self::DEPLOYNAUT_DRYRUN_PIPELINE => array(
+				'name' => 'Dry-run Pipeline',
+				'category' => 'Deploynaut',
+				'help' => 'Enable dry-run execution of pipelines for testing'
+			),
+			self::DEPLOYNAUT_ADVANCED_DEPLOY_OPTIONS => array(
+				'name' => "Access to advanced deploy options",
+				'category' => "Deploynaut",
+			),
+
+			// Permissions that are intended to be added to the roles.
+			self::ALLOW_PROD_DEPLOYMENT => array(
+				'name' => "Ability to deploy to production environments",
+				'category' => "Deploynaut",
+			),
+			self::ALLOW_NON_PROD_DEPLOYMENT => array(
+				'name' => "Ability to deploy to non-production environments",
+				'category' => "Deploynaut",
+			),
+			self::ALLOW_PROD_SNAPSHOT => array(
+				'name' => "Ability to make production snapshots",
+				'category' => "Deploynaut",
+			),
+			self::ALLOW_NON_PROD_SNAPSHOT => array(
+				'name' => "Ability to make non-production snapshots",
+				'category' => "Deploynaut",
+			),
+			self::ALLOW_CREATE_ENVIRONMENT => array(
+				'name' => "Ability to create environments",
+				'category' => "Deploynaut",
+			),
+		);
+	}
+
+	/**
+	 * @return DNProject|null
+	 */
+	public function getCurrentProject()
+	{
+		$projectName = trim($this->getRequest()->param('Project'));
+		if (!$projectName) {
+			return null;
+		}
+		if (empty(self::$_project_cache[$projectName])) {
+			self::$_project_cache[$projectName] = $this->DNProjectList()->filter('Name', $projectName)->First();
+		}
+		return self::$_project_cache[$projectName];
+	}
+
+	/**
+	 * @param DNProject|null $project
+	 * @return DNEnvironment|null
+	 */
+	public function getCurrentEnvironment(DNProject $project = null)
+	{
+		if ($this->getRequest()->param('Environment') === null) {
+			return null;
+		}
+		if ($project === null) {
+			$project = $this->getCurrentProject();
+		}
+		// project can still be null
+		if ($project === null) {
+			return null;
+		}
+		return $project->DNEnvironmentList()->filter('Name', $this->getRequest()->param('Environment'))->First();
+	}
+
+	/**
+	 * This will return a const that indicates the class of action currently being performed
+	 *
+	 * Until DNRoot is de-godded, it does a bunch of different actions all in the same class.
+	 * So we just have each action handler calll setCurrentActionType to define what sort of
+	 * action it is.
+	 *
+	 * @return string - one of the consts from self::$action_types
+	 */
+	public function getCurrentActionType()
+	{
+		return $this->actionType;
+	}
+
+	/**
+	 * Sets the current action type
+	 *
+	 * @param string $actionType string - one of the consts from self::$action_types
+	 */
+	public function setCurrentActionType($actionType)
+	{
+		$this->actionType = $actionType;
+	}
+
+	/**
+	 * Helper method to allow templates to know whether they should show the 'Archive List' include or not.
+	 * The actual permissions are set on a per-environment level, so we need to find out if this $member can upload to
+	 * or download from *any* {@link DNEnvironment} that (s)he has access to.
+	 *
+	 * TODO To be replaced with a method that just returns the list of archives this {@link Member} has access to.
+	 *
+	 * @param Member|null $member The {@link Member} to check (or null to check the currently logged in Member)
+	 * @return boolean|null true if $member has access to upload or download to at least one {@link DNEnvironment}.
+	 */
+	public function CanViewArchives(Member $member = null)
+	{
+		if ($member === null) {
+			$member = Member::currentUser();
+		}
+
+		if (Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
+
+		$allProjects = $this->DNProjectList();
+		if (!$allProjects) {
+			return false;
+		}
+
+		foreach ($allProjects as $project) {
+			if ($project->Environments()) {
+				foreach ($project->Environments() as $environment) {
+					if (
+						$environment->canRestore($member) ||
+						$environment->canBackup($member) ||
+						$environment->canUploadArchive($member) ||
+						$environment->canDownloadArchive($member)
+					) {
+						// We can return early as we only need to know that we can access one environment
+						return true;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns a list of attempted environment creations.
+	 *
+	 * @return PaginatedList
+	 */
+	public function CreateEnvironmentList()
+	{
+		$project = $this->getCurrentProject();
+		if ($project) {
+			return new PaginatedList($project->CreateEnvironments()->sort("Created DESC"), $this->request);
+		}
+		return new PaginatedList(new ArrayList(), $this->request);
+	}
+
+	/**
+	 * Returns a list of all archive files that can be accessed by the currently logged-in {@link Member}
+	 *
+	 * @return PaginatedList
+	 */
+	public function CompleteDataArchives()
+	{
+		$project = $this->getCurrentProject();
+		$archives = new ArrayList();
+
+		$archiveList = $project->Environments()->relation("DataArchives");
+		if ($archiveList->count() > 0) {
+			foreach ($archiveList as $archive) {
+				if ($archive->canView() && !$archive->isPending()) {
+					$archives->push($archive);
+				}
+			}
+		}
+		return new PaginatedList($archives->sort("Created", "DESC"), $this->request);
+	}
+
+	/**
+	 * @return PaginatedList The list of "pending" data archives which are waiting for a file
+	 * to be delivered offline by post, and manually uploaded into the system.
+	 */
+	public function PendingDataArchives()
+	{
+		$project = $this->getCurrentProject();
+		$archives = new ArrayList();
+		foreach ($project->DNEnvironmentList() as $env) {
+			foreach ($env->DataArchives() as $archive) {
+				if ($archive->canView() && $archive->isPending()) {
+					$archives->push($archive);
+				}
+			}
+		}
+		return new PaginatedList($archives->sort("Created", "DESC"), $this->request);
+	}
+
+	/**
+	 * @return PaginatedList
+	 */
+	public function DataTransferLogs()
+	{
+		$project = $this->getCurrentProject();
+
+		$transfers = DNDataTransfer::get()->filterByCallback(function ($record) use ($project) {
+			return
+				$record->Environment()->Project()->ID == $project->ID && // Ensure only the current Project is shown
+				(
+					$record->Environment()->canRestore() || // Ensure member can perform an action on the transfers env
+					$record->Environment()->canBackup() ||
+					$record->Environment()->canUploadArchive() ||
+					$record->Environment()->canDownloadArchive()
+				);
+		});
+
+		return new PaginatedList($transfers->sort("Created", "DESC"), $this->request);
+	}
+
+	/**
+	 * @return null|PaginatedList
+	 */
+	public function DeployHistory()
+	{
+		if ($env = $this->getCurrentEnvironment()) {
+			$history = $env->DeployHistory();
+			if ($history->count() > 0) {
+				$pagination = new PaginatedList($history, $this->getRequest());
+				$pagination->setPageLength(8);
+				return $pagination;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * @return SS_HTTPResponse
+	 */
+	protected function project404Response()
+	{
+		return new SS_HTTPResponse(
+			"Project '" . Convert::raw2xml($this->getRequest()->param('Project')) . "' not found.",
+			404
+		);
+	}
+
+	/**
+	 * @return SS_HTTPResponse
+	 */
+	protected function environment404Response()
+	{
+		$envName = Convert::raw2xml($this->getRequest()->param('Environment'));
+		return new SS_HTTPResponse("Environment '" . $envName . "' not found.", 404);
+	}
+
+	/**
+	 * @param string $status
+	 * @param string $content
+	 *
+	 * @return string
+	 */
+	protected function sendResponse($status, $content)
+	{
+		// strip excessive newlines
+		$content = preg_replace('/(?:(?:\r\n|\r|\n)\s*){2}/s', "\n", $content);
+
+		$sendJSON = (strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false)
+			|| $this->getRequest()->getExtension() == 'json';
+
+		if (!$sendJSON) {
+			$this->response->addHeader("Content-type", "text/plain");
+			return $content;
+		}
+		$this->response->addHeader("Content-type", "application/json");
+		return json_encode(array(
+			'status' => $status,
+			'content' => $content,
+		));
+	}
+
+	/**
+	 * Validate the snapshot mode
+	 *
+	 * @param string $mode
+	 */
+	protected function validateSnapshotMode($mode)
+	{
+		if (!in_array($mode, array('all', 'assets', 'db'))) {
+			throw new LogicException('Invalid mode');
+		}
+	}
+
+	/**
+	 * @param string $sectionName
+	 * @param string $title
+	 *
+	 * @return SS_HTTPResponse
+	 */
+	protected function getCustomisedViewSection($sectionName, $title = '', $data = array())
+	{
+		// Performs canView permission check by limiting visible projects
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+		$data[$sectionName] = 1;
+
+		if ($this !== '') {
+			$data['Title'] = $title;
+		}
+
+		return $this->render($data);
+	}
+
+	/**
+	 * Get items for the ambient menu that should be accessible from all pages.
+	 *
+	 * @return ArrayList
+	 */
+	public function AmbientMenu()
+	{
+		$list = new ArrayList();
+
+		if (Member::currentUserID()) {
+			$list->push(new ArrayData(array(
+				'Classes' => 'logout',
+				'FaIcon' => 'sign-out',
+				'Link' => 'Security/logout',
+				'Title' => 'Log out',
+				'IsCurrent' => false,
+				'IsSection' => false
+			)));
+		}
+
+		$this->extend('updateAmbientMenu', $list);
+		return $list;
+	}
+
+	/**
+	 * Create project action.
+	 *
+	 * @return SS_HTTPResponse
+	 */
+	public function createproject(SS_HTTPRequest $request)
+	{
+		if ($this->canCreateProjects()) {
+			return $this->render(['CurrentTitle' => 'Create Stack']);
+		}
+		return $this->httpError(403);
+	}
+
+	/**
+	 * Checks whether the user can create a project.
+	 *
+	 * @return bool
+	 */
+	public function canCreateProjects($member = null)
+	{
+		if (!$member) {
+			$member = Member::currentUser();
+		}
+		if (!$member) {
+			return false;
+		}
+
+		return singleton('DNProject')->canCreate($member);
+	}
+
+	/**
+	 * @return Form
+	 */
+	public function CreateProjectForm()
+	{
+		$form = Form::create(
+			$this,
+			__FUNCTION__,
+			$this->getCreateProjectFormFields(),
+			$this->getCreateProjectFormActions(),
+			new RequiredFields('Name', 'CVSPath')
+		);
+		$this->extend('updateCreateProjectForm', $form);
+		return $form;
+	}
+
+	/**
+	 * @return FieldList
+	 */
+	protected function getCreateProjectFormFields()
+	{
+		$fields = FieldList::create();
+		$fields->merge([
+			TextField::create('Name', 'Title')->setDescription('Limited to alphanumeric characters, underscores and hyphens.'),
+			TextField::create('CVSPath', 'Git URL')->setDescription('Your repository URL so we can clone your code (eg. git@github.com:silverstripe/silverstripe-installer.git)')
+		]);
+		$this->extend('updateCreateProjectFormFields', $fields);
+		return $fields;
+	}
+
+	/**
+	 * @return FieldList
+	 */
+	protected function getCreateProjectFormActions()
+	{
+		$fields = FieldList::create(
+			FormAction::create('doCreateProject', 'Create Stack')
+		);
+		$this->extend('updateCreateProjectFormActions', $fields);
+		return $fields;
+	}
+
+	/**
+	 * Does the actual project creation.
+	 *
+	 * @param $data array
+	 * @param $form Form
+	 *
+	 * @return SS_HTTPResponse
+	 */
+	public function doCreateProject($data, $form)
+	{
+		$form->loadDataFrom($data);
+		$project = DNProject::create();
+
+		$form->saveInto($project);
+		$this->extend('onBeforeCreateProject', $project, $data, $form);
+		try {
+			if ($project->write() > 0) {
+				$this->extend('onAfterCreateProject', $project, $data, $form);
+
+				// If an extension hasn't redirected us, we'll redirect to the project.
+				if (!$this->redirectedTo()) {
+					return $this->redirect($project->Link());
+				} else {
+					return $this->response;
+				}
+			} else {
+				$form->sessionMessage('Unable to write the stack to the database.', 'bad');
+			}
+		} catch (ValidationException $e) {
+			$form->sessionMessage($e->getMessage(), 'bad');
+		}
+		return $this->redirectBack();
+	}
+
+	/**
+	 * Returns the state of a current project build.
+	 *
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return SS_HTTPResponse
+	 */
+	public function createprojectprogress(SS_HTTPRequest $request)
+	{
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->httpError(404);
+		}
+
+		$envCreations = $project->getInitialEnvironmentCreations();
+		$complete = array();
+		$inProgress = array();
+		$failed = array();
+		if ($envCreations->count() > 0) {
+			foreach ($envCreations as $env) {
+				$data = unserialize($env->Data);
+				if (!isset($data['Name'])) {
+					$data['Name'] = 'Unknown';
+				}
+				switch ($env->ResqueStatus()) {
+					case "Queued":
+					case "Running":
+						$inProgress[$env->ID] = Convert::raw2xml($env->ResqueStatus());
+						break;
+					case "Complete":
+						$complete[$env->ID] = Convert::raw2xml($data['Name']);
+						break;
+					case "Failed":
+					case "Invalid":
+					default:
+						$failed[$env->ID] = Convert::raw2xml($data['Name']);
+				}
+			}
+		}
+
+		$data = [
+			'complete' => $project->isProjectReady(),
+			'progress' => [
+				'environments' => [
+					'complete' => $complete,
+					'inProgress' => $inProgress,
+					'failed' => $failed,
+				]
+			]
+		];
+		$this->extend('updateCreateProjectProgressData', $data);
+
+		$response = $this->getResponse();
+		$response->addHeader('Content-Type', 'application/json');
+		$response->setBody(json_encode($data));
+		return $response;
+	}
+
+	public function checkrepoaccess(SS_HTTPRequest $request)
+	{
+		$project = $this->getCurrentProject();
+		if (!$project) {
+			return $this->httpError(404);
+		}
+
+		if ($project->CVSPath) {
+			$fetch = new FetchJob();
+			$fetch->args = array('projectID' => $project->ID);
+			try {
+				$fetch->perform();
+				$canAccessRepo = true;
+			} catch (RuntimeException $e) {
+				$canAccessRepo = false;
+			}
+			$data = ['canAccessRepo' => $canAccessRepo];
+		} else {
+			$data = ['canAccessRepo' => false];
+		}
+
+		$response = $this->getResponse();
+		$response->addHeader("Content-Type", "application/json");
+		$response->setBody(json_encode($data));
+		return $response;
+	}
 }

Spacing +193 added lines, -193 removed lines

@@ -191,8 +191,8 @@ 
         Requirements::javascript('deploynaut/javascript/material.js');
 
         // Load the buildable dependencies only if not loaded centrally.
-        if (!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
-            if (\Director::isDev()) {
+        if(!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
+            if(\Director::isDev()) {
                 \Requirements::javascript('deploynaut/static/bundle-debug.js');
             } else {
                 \Requirements::javascript('deploynaut/static/bundle.js');
@@ -211,13 +211,13 @@ 
      */
     public static function FlagSnapshotsEnabled()
     {
-        if (defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) {
+        if(defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) {
             return true;
         }
-        if (defined('FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS') && FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS) {
+        if(defined('FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS') && FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS) {
             $allowedMembers = explode(';', FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS);
             $member = Member::currentUser();
-            if ($allowedMembers && $member && in_array($member->Email, $allowedMembers)) {
+            if($allowedMembers && $member && in_array($member->Email, $allowedMembers)) {
                 return true;
             }
         }
@@ -230,7 +230,7 @@ 
     public static function get_support_links()
     {
         $supportLinks = self::config()->support_links;
-        if ($supportLinks) {
+        if($supportLinks) {
             return new ArrayList($supportLinks);
         }
     }
@@ -254,7 +254,7 @@ 
     {
         parent::init();
 
-        if (!Member::currentUser() && !Session::get('AutoLoginHash')) {
+        if(!Member::currentUser() && !Session::get('AutoLoginHash')) {
             return Security::permissionFailure();
         }
 
@@ -341,11 +341,11 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        if (!$project->canBackup()) {
+        if(!$project->canBackup()) {
             return new SS_HTTPResponse("Not allowed to create snapshots on any environments", 401);
         }
 
@@ -368,11 +368,11 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        if (!$project->canUploadArchive()) {
+        if(!$project->canUploadArchive()) {
             return new SS_HTTPResponse("Not allowed to upload", 401);
         }
 
@@ -405,22 +405,22 @@ 
     {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        if (!$project->canUploadArchive()) {
+        if(!$project->canUploadArchive()) {
             return new SS_HTTPResponse("Not allowed to upload", 401);
         }
 
         // Framing an environment as a "group of people with download access"
         // makes more sense to the user here, while still allowing us to enforce
         // environment specific restrictions on downloading the file later on.
-        $envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+        $envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
             return $item->canUploadArchive();
         });
         $envsMap = array();
-        foreach ($envs as $env) {
+        foreach($envs as $env) {
             $envsMap[$env->ID] = $env->Name;
         }
 
@@ -465,18 +465,18 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $validEnvs = $project->DNEnvironmentList()
-            ->filterByCallback(function ($item) {
+            ->filterByCallback(function($item) {
                 return $item->canUploadArchive();
             });
 
         // Validate $data['EnvironmentID'] by checking against $validEnvs.
         $environment = $validEnvs->find('ID', $data['EnvironmentID']);
-        if (!$environment) {
+        if(!$environment) {
             throw new LogicException('Invalid environment');
         }
 
@@ -501,7 +501,7 @@ 
         $dataArchive->write();
         $workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
 
-        $cleanupFn = function () use ($workingDir, $dataTransfer, $dataArchive) {
+        $cleanupFn = function() use ($workingDir, $dataTransfer, $dataArchive) {
             $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
             $process->run();
             $dataTransfer->delete();
@@ -511,7 +511,7 @@ 
         // extract the sspak contents so we can inspect them
         try {
             $dataArchive->extractArchive($workingDir);
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             $cleanupFn();
             $form->sessionMessage(
                 'There was a problem trying to open your snapshot for processing. Please try uploading again',
@@ -522,7 +522,7 @@ 
 
         // validate that the sspak contents match the declared contents
         $result = $dataArchive->validateArchiveContents();
-        if (!$result->valid()) {
+        if(!$result->valid()) {
             $cleanupFn();
             $form->sessionMessage($result->message(), 'bad');
             return $this->redirectBack();
@@ -532,7 +532,7 @@ 
         try {
             $dataArchive->fixArchivePermissions($workingDir);
             $dataArchive->setArchiveFromFiles($workingDir);
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             $cleanupFn();
             $form->sessionMessage(
                 'There was a problem processing your snapshot. Please try uploading again',
@@ -563,22 +563,22 @@ 
     {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        if (!$project->canUploadArchive()) {
+        if(!$project->canUploadArchive()) {
             return new SS_HTTPResponse("Not allowed to upload", 401);
         }
 
         // Framing an environment as a "group of people with download access"
         // makes more sense to the user here, while still allowing us to enforce
         // environment specific restrictions on downloading the file later on.
-        $envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+        $envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
             return $item->canUploadArchive();
         });
         $envsMap = array();
-        foreach ($envs as $env) {
+        foreach($envs as $env) {
             $envsMap[$env->ID] = $env->Name;
         }
 
@@ -616,17 +616,17 @@ 
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        $validEnvs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+        $validEnvs = $project->DNEnvironmentList()->filterByCallback(function($item) {
                 return $item->canUploadArchive();
         });
 
         // Validate $data['EnvironmentID'] by checking against $validEnvs.
         $environment = $validEnvs->find('ID', $data['EnvironmentID']);
-        if (!$environment) {
+        if(!$environment) {
             throw new LogicException('Invalid environment');
         }
 
@@ -666,20 +666,20 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        if (!$project->canUploadArchive()) {
+        if(!$project->canUploadArchive()) {
             return new SS_HTTPResponse("Not allowed to upload", 401);
         }
 
         $dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
-        if (!$dataArchive) {
+        if(!$dataArchive) {
             return new SS_HTTPResponse("Archive not found.", 404);
         }
 
-        if (!$dataArchive->canRestore()) {
+        if(!$dataArchive->canRestore()) {
             throw new SS_HTTPResponse_Exception('Not allowed to restore archive', 403);
         }
 
@@ -710,19 +710,19 @@ 
     public function toggleprojectstar(SS_HTTPRequest $request)
     {
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $member = Member::currentUser();
-        if ($member === null) {
+        if($member === null) {
             return $this->project404Response();
         }
         $favProject = $member->StarredProjects()
             ->filter('DNProjectID', $project->ID)
             ->first();
 
-        if ($favProject) {
+        if($favProject) {
             $member->StarredProjects()->remove($favProject);
         } else {
             $member->StarredProjects()->add($project);
@@ -737,13 +737,13 @@ 
     public function branch(SS_HTTPRequest $request)
     {
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $branchName = $request->getVar('name');
         $branch = $project->DNBranchList()->byName($branchName);
-        if (!$branch) {
+        if(!$branch) {
             return new SS_HTTPResponse("Branch '" . Convert::raw2xml($branchName) . "' not found.", 404);
         }
 
@@ -760,13 +760,13 @@ 
     {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $env = $this->getCurrentEnvironment($project);
-        if (!$env) {
+        if(!$env) {
             return $this->environment404Response();
         }
 
@@ -816,17 +816,17 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $environment = $this->getCurrentEnvironment($project);
-        if (!$environment) {
+        if(!$environment) {
             return $this->environment404Response();
         }
 
-        if (!$environment->DryRunEnabled && $isDryRun) {
+        if(!$environment->DryRunEnabled && $isDryRun) {
             return new SS_HTTPResponse("Dry-run for pipelines is not enabled for this environment", 404);
         }
 
@@ -838,7 +838,7 @@ 
         $pipeline->AuthorID = Member::currentUserID();
         $pipeline->SHA = $sha->FullName();
         // Record build at time of execution
-        if ($currentBuild = $environment->CurrentBuild()) {
+        if($currentBuild = $environment->CurrentBuild()) {
             $pipeline->PreviousDeploymentID = $currentBuild->ID;
         }
         $pipeline->start(); // start() will call write(), so no need to do it here as well.
@@ -856,20 +856,20 @@ 
         $params = $request->params();
         $pipeline = Pipeline::get()->byID($params['Identifier']);
 
-        if (!$pipeline || !$pipeline->ID || !$pipeline->Environment()) {
+        if(!$pipeline || !$pipeline->ID || !$pipeline->Environment()) {
             throw new SS_HTTPResponse_Exception('Pipeline not found', 404);
         }
-        if (!$pipeline->Environment()->canView()) {
+        if(!$pipeline->Environment()->canView()) {
             return Security::permissionFailure();
         }
 
         $environment = $pipeline->Environment();
         $project = $pipeline->Environment()->Project();
 
-        if ($environment->Name != $params['Environment']) {
+        if($environment->Name != $params['Environment']) {
             throw new LogicException("Environment in URL doesn't match this pipeline");
         }
-        if ($project->Name != $params['Project']) {
+        if($project->Name != $params['Project']) {
             throw new LogicException("Project in URL doesn't match this pipeline");
         }
 
@@ -886,22 +886,22 @@ 
     public function createenv(SS_HTTPRequest $request)
     {
         $params = $request->params();
-        if ($params['Identifier']) {
+        if($params['Identifier']) {
             $record = DNCreateEnvironment::get()->byId($params['Identifier']);
 
-            if (!$record || !$record->ID) {
+            if(!$record || !$record->ID) {
                 throw new SS_HTTPResponse_Exception('Create environment not found', 404);
             }
-            if (!$record->canView()) {
+            if(!$record->canView()) {
                 return Security::permissionFailure();
             }
 
             $project = $this->getCurrentProject();
-            if (!$project) {
+            if(!$project) {
                 return $this->project404Response();
             }
 
-            if ($project->Name != $params['Project']) {
+            if($project->Name != $params['Project']) {
                 throw new LogicException("Project in URL doesn't match this creation");
             }
 
@@ -920,21 +920,21 @@ 
         $params = $request->params();
         $env = DNCreateEnvironment::get()->byId($params['Identifier']);
 
-        if (!$env || !$env->ID) {
+        if(!$env || !$env->ID) {
             throw new SS_HTTPResponse_Exception('Log not found', 404);
         }
-        if (!$env->canView()) {
+        if(!$env->canView()) {
             return Security::permissionFailure();
         }
 
         $project = $env->Project();
 
-        if ($project->Name != $params['Project']) {
+        if($project->Name != $params['Project']) {
             throw new LogicException("Project in URL doesn't match this deploy");
         }
 
         $log = $env->log();
-        if ($log->exists()) {
+        if($log->exists()) {
             $content = $log->content();
         } else {
             $content = 'Waiting for action to start';
@@ -952,27 +952,27 @@ 
         $this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
 
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $envType = $project->AllowedEnvironmentType;
-        if (!$envType || !class_exists($envType)) {
+        if(!$envType || !class_exists($envType)) {
             return null;
         }
 
         $backend = Injector::inst()->get($envType);
-        if (!($backend instanceof EnvironmentCreateBackend)) {
+        if(!($backend instanceof EnvironmentCreateBackend)) {
             // Only allow this for supported backends.
             return null;
         }
 
         $fields = $backend->getCreateEnvironmentFields($project);
-        if (!$fields) {
+        if(!$fields) {
             return null;
         }
 
-        if (!$project->canCreateEnvironments()) {
+        if(!$project->canCreateEnvironments()) {
             return new SS_HTTPResponse('Not allowed to create environments for this project', 401);
         }
 
@@ -1004,11 +1004,11 @@ 
         $this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
 
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
-        if (!$project->canCreateEnvironments()) {
+        if(!$project->canCreateEnvironments()) {
             return new SS_HTTPResponse('Not allowed to create environments for this project', 401);
         }
 
@@ -1034,13 +1034,13 @@ 
     {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $env = $this->getCurrentEnvironment($project);
-        if (!$env) {
+        if(!$env) {
             return $this->environment404Response();
         }
 
@@ -1065,11 +1065,11 @@ 
     public function DNProjectList()
     {
         $memberId = Member::currentUserID();
-        if (!$memberId) {
+        if(!$memberId) {
             return new ArrayList();
         }
 
-        if (Permission::check('ADMIN')) {
+        if(Permission::check('ADMIN')) {
             return DNProject::get();
         }
 
@@ -1084,7 +1084,7 @@ 
     public function getPlatformSpecificStrings()
     {
         $strings = $this->config()->platform_specific_strings;
-        if ($strings) {
+        if($strings) {
             return new ArrayList($strings);
         }
     }
@@ -1097,15 +1097,15 @@ 
     public function getStarredProjects()
     {
         $member = Member::currentUser();
-        if ($member === null) {
+        if($member === null) {
             return new ArrayList();
         }
 
         $favProjects = $member->StarredProjects();
 
         $list = new ArrayList();
-        foreach ($favProjects as $project) {
-            if ($project->canView($member)) {
+        foreach($favProjects as $project) {
+            if($project->canView($member)) {
                 $list->add($project);
             }
         }
@@ -1126,24 +1126,24 @@ 
         $currentProject = $this->getCurrentProject();
 
         $projects = $this->getStarredProjects();
-        if ($projects->count() < 1) {
+        if($projects->count() < 1) {
             $projects = $this->DNProjectList();
         } else {
             $limit = -1;
         }
 
-        if ($projects->count() > 0) {
+        if($projects->count() > 0) {
             $activeProject = false;
 
-            if ($limit > 0) {
+            if($limit > 0) {
                 $limitedProjects = $projects->limit($limit);
             } else {
                 $limitedProjects = $projects;
             }
 
-            foreach ($limitedProjects as $project) {
+            foreach($limitedProjects as $project) {
                 $isActive = $currentProject && $currentProject->ID == $project->ID;
-                if ($isActive) {
+                if($isActive) {
                     $activeProject = true;
                 }
 
@@ -1154,12 +1154,12 @@ 
             }
 
             // Ensure the current project is in the list
-            if (!$activeProject && $currentProject) {
+            if(!$activeProject && $currentProject) {
                 $navigation->unshift(array(
                     'Project' => $currentProject,
                     'IsActive' => true,
                 ));
-                if ($limit > 0 && $navigation->count() > $limit) {
+                if($limit > 0 && $navigation->count() > $limit) {
                     $navigation->pop();
                 }
             }
@@ -1178,17 +1178,17 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $environment = $this->getCurrentEnvironment($project);
-        if (!$environment) {
+        if(!$environment) {
             return $this->environment404Response();
         }
 
-        if (!$environment->canDeploy()) {
+        if(!$environment->canDeploy()) {
             return new SS_HTTPResponse("Not allowed to deploy", 401);
         }
 
@@ -1196,7 +1196,7 @@ 
         $form = new DeployForm($this, 'DeployForm', $environment, $project);
 
         // If this is an ajax request we don't want to submit the form - we just want to retrieve the markup.
-        if (
+        if(
             $request &&
             !$request->requestVar('action_showDeploySummary') &&
             $this->getRequest()->isAjax() &&
@@ -1225,19 +1225,19 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $env = $this->getCurrentEnvironment($project);
-        if (!$env) {
+        if(!$env) {
             return $this->environment404Response();
         }
 
         // For now only permit advanced options on one environment type, because we hacked the "full-deploy"
         // checkbox in. Other environments such as the fast or capistrano one wouldn't know what to do with it.
-        if (get_class($env) === 'RainforestEnvironment') {
+        if(get_class($env) === 'RainforestEnvironment') {
             $advanced = Permission::check('DEPLOYNAUT_ADVANCED_DEPLOY_OPTIONS') ? 'true' : 'false';
         } else {
             $advanced = 'false';
@@ -1254,7 +1254,7 @@ 
             'field_data' => array(),
             'advanced_opts' => $advanced
         );
-        foreach ($project->DNBranchList() as $branch) {
+        foreach($project->DNBranchList() as $branch) {
             $sha = $branch->SHA();
             $name = $branch->Name();
             $branchValue = sprintf("%s (%s, %s old)",
@@ -1279,7 +1279,7 @@ 
             'advanced_opts' => $advanced
         );
 
-        foreach ($project->DNTagList()->setLimit(null) as $tag) {
+        foreach($project->DNTagList()->setLimit(null) as $tag) {
             $name = $tag->Name();
             $data['field_data'][] = array(
                 'id' => $tag->SHA(),
@@ -1305,15 +1305,15 @@ 
         // We are aiming at the format:
         // [{text: 'optgroup text', children: [{id: '<sha>', text: '<inner text>'}]}]
         $redeploy = array();
-        foreach ($project->DNEnvironmentList() as $dnEnvironment) {
+        foreach($project->DNEnvironmentList() as $dnEnvironment) {
             $envName = $dnEnvironment->Name;
             $perEnvDeploys = array();
 
-            foreach ($dnEnvironment->DeployHistory() as $deploy) {
+            foreach($dnEnvironment->DeployHistory() as $deploy) {
                 $sha = $deploy->SHA;
 
                 // Check if exists to make sure the newest deployment date is used.
-                if (!isset($perEnvDeploys[$sha])) {
+                if(!isset($perEnvDeploys[$sha])) {
                     $pastValue = sprintf("%s (deployed %s)",
                         substr($sha, 0, 8),
                         $deploy->obj('LastEdited')->Ago()
@@ -1325,12 +1325,12 @@ 
                 }
             }
 
-            if (!empty($perEnvDeploys)) {
+            if(!empty($perEnvDeploys)) {
                 $redeploy[$envName] = array_values($perEnvDeploys);
             }
         }
         // Convert the array to the frontend format (i.e. keyed to regular array)
-        foreach ($redeploy as $env => $descr) {
+        foreach($redeploy as $env => $descr) {
             $data['field_data'][] = array('text'=>$env, 'children'=>$descr);
         }
         $tabs[] = $data;
@@ -1352,7 +1352,7 @@ 
             ->filter('ProjectID', $project->ID)
             ->sort('LastEdited', 'DESC')
             ->first();
-        if ($fetch) {
+        if($fetch) {
             $lastFetched = $fetch->dbObject('LastEdited')->Ago();
         }
 
@@ -1378,7 +1378,7 @@ 
 
         // Ensure the submitted token has a value
         $submittedToken = $request->postVar('SecurityID');
-        if (!$submittedToken) {
+        if(!$submittedToken) {
             return false;
         }
 
@@ -1386,7 +1386,7 @@ 
         $check = $token->check($submittedToken);
 
         // Reset the token after we've checked the existing token
-        if ($resetToken) {
+        if($resetToken) {
             $token->reset();
         }
 
@@ -1404,13 +1404,13 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $environment = $this->getCurrentEnvironment($project);
-        if (!$environment) {
+        if(!$environment) {
             return $this->environment404Response();
         }
 
@@ -1424,7 +1424,7 @@ 
         // Add in a URL for comparing from->to code changes. Ensure that we have
         // two proper 40 character SHAs, otherwise we can't show the compare link.
         $interface = $project->getRepositoryInterface();
-        if (
+        if(
             !empty($interface) && !empty($interface->URL)
             && !empty($data['changes']['Code version']['from'])
             && strlen($data['changes']['Code version']['from']) == '40'
@@ -1462,20 +1462,20 @@ 
     {
 
         // Ensure the CSRF Token is correct
-        if (!$this->checkCsrfToken($request)) {
+        if(!$this->checkCsrfToken($request)) {
             // CSRF token didn't match
             return $this->httpError(400, 'Bad Request');
         }
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         // Performs canView permission check by limiting visible projects
         $environment = $this->getCurrentEnvironment($project);
-        if (!$environment) {
+        if(!$environment) {
             return $this->environment404Response();
         }
 
@@ -1507,20 +1507,20 @@ 
         $params = $request->params();
         $deployment = DNDeployment::get()->byId($params['Identifier']);
 
-        if (!$deployment || !$deployment->ID) {
+        if(!$deployment || !$deployment->ID) {
             throw new SS_HTTPResponse_Exception('Deployment not found', 404);
         }
-        if (!$deployment->canView()) {
+        if(!$deployment->canView()) {
             return Security::permissionFailure();
         }
 
         $environment = $deployment->Environment();
         $project = $environment->Project();
 
-        if ($environment->Name != $params['Environment']) {
+        if($environment->Name != $params['Environment']) {
             throw new LogicException("Environment in URL doesn't match this deploy");
         }
-        if ($project->Name != $params['Project']) {
+        if($project->Name != $params['Project']) {
             throw new LogicException("Project in URL doesn't match this deploy");
         }
 
@@ -1543,25 +1543,25 @@ 
         $params = $request->params();
         $deployment = DNDeployment::get()->byId($params['Identifier']);
 
-        if (!$deployment || !$deployment->ID) {
+        if(!$deployment || !$deployment->ID) {
             throw new SS_HTTPResponse_Exception('Deployment not found', 404);
         }
-        if (!$deployment->canView()) {
+        if(!$deployment->canView()) {
             return Security::permissionFailure();
         }
 
         $environment = $deployment->Environment();
         $project = $environment->Project();
 
-        if ($environment->Name != $params['Environment']) {
+        if($environment->Name != $params['Environment']) {
             throw new LogicException("Environment in URL doesn't match this deploy");
         }
-        if ($project->Name != $params['Project']) {
+        if($project->Name != $params['Project']) {
             throw new LogicException("Project in URL doesn't match this deploy");
         }
 
         $log = $deployment->log();
-        if ($log->exists()) {
+        if($log->exists()) {
             $content = $log->content();
         } else {
             $content = 'Waiting for action to start';
@@ -1578,11 +1578,11 @@ 
     public function getDataTransferForm(SS_HTTPRequest $request = null)
     {
         // Performs canView permission check by limiting visible projects
-        $envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function ($item) {
+        $envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function($item) {
             return $item->canBackup();
         });
 
-        if (!$envs) {
+        if(!$envs) {
             return $this->environment404Response();
         }
 
@@ -1618,21 +1618,21 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $dataArchive = null;
 
         // Validate direction.
-        if ($data['Direction'] == 'get') {
+        if($data['Direction'] == 'get') {
             $validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-                ->filterByCallback(function ($item) {
+                ->filterByCallback(function($item) {
                     return $item->canBackup();
                 });
-        } elseif ($data['Direction'] == 'push') {
+        } elseif($data['Direction'] == 'push') {
             $validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-                ->filterByCallback(function ($item) {
+                ->filterByCallback(function($item) {
                     return $item->canRestore();
                 });
         } else {
@@ -1641,7 +1641,7 @@ 
 
         // Validate $data['EnvironmentID'] by checking against $validEnvs.
         $environment = $validEnvs->find('ID', $data['EnvironmentID']);
-        if (!$environment) {
+        if(!$environment) {
             throw new LogicException('Invalid environment');
         }
 
@@ -1649,17 +1649,17 @@ 
 
 
         // Only 'push' direction is allowed an association with an existing archive.
-        if (
+        if(
             $data['Direction'] == 'push'
             && isset($data['DataArchiveID'])
             && is_numeric($data['DataArchiveID'])
         ) {
             $dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
-            if (!$dataArchive) {
+            if(!$dataArchive) {
                 throw new LogicException('Invalid data archive');
             }
 
-            if (!$dataArchive->canDownload()) {
+            if(!$dataArchive->canDownload()) {
                 throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
             }
         }
@@ -1669,7 +1669,7 @@ 
         $transfer->Direction = $data['Direction'];
         $transfer->Mode = $data['Mode'];
         $transfer->DataArchiveID = $dataArchive ? $dataArchive->ID : null;
-        if ($data['Direction'] == 'push') {
+        if($data['Direction'] == 'push') {
             $transfer->setBackupBeforePush(!empty($data['BackupBeforePush']));
         }
         $transfer->write();
@@ -1693,17 +1693,17 @@ 
         $params = $request->params();
         $transfer = DNDataTransfer::get()->byId($params['Identifier']);
 
-        if (!$transfer || !$transfer->ID) {
+        if(!$transfer || !$transfer->ID) {
             throw new SS_HTTPResponse_Exception('Transfer not found', 404);
         }
-        if (!$transfer->canView()) {
+        if(!$transfer->canView()) {
             return Security::permissionFailure();
         }
 
         $environment = $transfer->Environment();
         $project = $environment->Project();
 
-        if ($project->Name != $params['Project']) {
+        if($project->Name != $params['Project']) {
             throw new LogicException("Project in URL doesn't match this deploy");
         }
 
@@ -1728,22 +1728,22 @@ 
         $params = $request->params();
         $transfer = DNDataTransfer::get()->byId($params['Identifier']);
 
-        if (!$transfer || !$transfer->ID) {
+        if(!$transfer || !$transfer->ID) {
             throw new SS_HTTPResponse_Exception('Transfer not found', 404);
         }
-        if (!$transfer->canView()) {
+        if(!$transfer->canView()) {
             return Security::permissionFailure();
         }
 
         $environment = $transfer->Environment();
         $project = $environment->Project();
 
-        if ($project->Name != $params['Project']) {
+        if($project->Name != $params['Project']) {
             throw new LogicException("Project in URL doesn't match this deploy");
         }
 
         $log = $transfer->log();
-        if ($log->exists()) {
+        if($log->exists()) {
             $content = $log->content();
         } else {
             $content = 'Waiting for action to start';
@@ -1767,22 +1767,22 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        $envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+        $envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
             return $item->canRestore();
         });
 
-        if (!$envs) {
+        if(!$envs) {
             return $this->environment404Response();
         }
 
         $modesMap = array();
-        if (in_array($dataArchive->Mode, array('all'))) {
+        if(in_array($dataArchive->Mode, array('all'))) {
             $modesMap['all'] = 'Database and Assets';
         };
-        if (in_array($dataArchive->Mode, array('all', 'db'))) {
+        if(in_array($dataArchive->Mode, array('all', 'db'))) {
             $modesMap['db'] = 'Database only';
         };
-        if (in_array($dataArchive->Mode, array('all', 'assets'))) {
+        if(in_array($dataArchive->Mode, array('all', 'assets'))) {
             $modesMap['assets'] = 'Assets only';
         };
 
@@ -1828,13 +1828,13 @@ 
         /** @var DNDataArchive $dataArchive */
         $dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
 
-        if (!$dataArchive) {
+        if(!$dataArchive) {
             throw new SS_HTTPResponse_Exception('Archive not found', 404);
         }
 
         // We check for canDownload because that implies access to the data.
         // canRestore is later checked on the actual restore action per environment.
-        if (!$dataArchive->canDownload()) {
+        if(!$dataArchive->canDownload()) {
             throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
         }
 
@@ -1861,11 +1861,11 @@ 
         /** @var DNDataArchive $dataArchive */
         $dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
 
-        if (!$dataArchive) {
+        if(!$dataArchive) {
             throw new SS_HTTPResponse_Exception('Archive not found', 404);
         }
 
-        if (!$dataArchive->canDelete()) {
+        if(!$dataArchive->canDelete()) {
             throw new SS_HTTPResponse_Exception('Not allowed to delete archive', 403);
         }
 
@@ -1887,7 +1887,7 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
@@ -1925,24 +1925,24 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $dataArchive = null;
 
-        if (
+        if(
             isset($data['DataArchiveID'])
             && is_numeric($data['DataArchiveID'])
         ) {
             $dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
         }
 
-        if (!$dataArchive) {
+        if(!$dataArchive) {
             throw new LogicException('Invalid data archive');
         }
 
-        if (!$dataArchive->canDelete()) {
+        if(!$dataArchive->canDelete()) {
             throw new SS_HTTPResponse_Exception('Not allowed to delete archive', 403);
         }
 
@@ -1966,12 +1966,12 @@ 
         /** @var DNDataArchive $dataArchive */
         $dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
 
-        if (!$dataArchive) {
+        if(!$dataArchive) {
             throw new SS_HTTPResponse_Exception('Archive not found', 404);
         }
 
         // We check for canDownload because that implies access to the data.
-        if (!$dataArchive->canDownload()) {
+        if(!$dataArchive->canDownload()) {
             throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
         }
 
@@ -1994,7 +1994,7 @@ 
         $dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
 
         $envs = $dataArchive->validTargetEnvironments();
-        if (!$envs) {
+        if(!$envs) {
             return $this->environment404Response();
         }
 
@@ -2036,25 +2036,25 @@ 
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         /** @var DNDataArchive $dataArchive */
         $dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
-        if (!$dataArchive) {
+        if(!$dataArchive) {
             throw new LogicException('Invalid data archive');
         }
 
         // We check for canDownload because that implies access to the data.
-        if (!$dataArchive->canDownload()) {
+        if(!$dataArchive->canDownload()) {
             throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
         }
 
         // Validate $data['EnvironmentID'] by checking against $validEnvs.
         $validEnvs = $dataArchive->validTargetEnvironments();
         $environment = $validEnvs->find('ID', $data['EnvironmentID']);
-        if (!$environment) {
+        if(!$environment) {
             throw new LogicException('Invalid environment');
         }
 
@@ -2073,7 +2073,7 @@ 
     {
         try {
             Resque::queues();
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             return $e->getMessage();
         }
         return '';
@@ -2140,10 +2140,10 @@ 
     public function getCurrentProject()
     {
         $projectName = trim($this->getRequest()->param('Project'));
-        if (!$projectName) {
+        if(!$projectName) {
             return null;
         }
-        if (empty(self::$_project_cache[$projectName])) {
+        if(empty(self::$_project_cache[$projectName])) {
             self::$_project_cache[$projectName] = $this->DNProjectList()->filter('Name', $projectName)->First();
         }
         return self::$_project_cache[$projectName];
@@ -2155,14 +2155,14 @@ 
      */
     public function getCurrentEnvironment(DNProject $project = null)
     {
-        if ($this->getRequest()->param('Environment') === null) {
+        if($this->getRequest()->param('Environment') === null) {
             return null;
         }
-        if ($project === null) {
+        if($project === null) {
             $project = $this->getCurrentProject();
         }
         // project can still be null
-        if ($project === null) {
+        if($project === null) {
             return null;
         }
         return $project->DNEnvironmentList()->filter('Name', $this->getRequest()->param('Environment'))->First();
@@ -2204,23 +2204,23 @@ 
      */
     public function CanViewArchives(Member $member = null)
     {
-        if ($member === null) {
+        if($member === null) {
             $member = Member::currentUser();
         }
 
-        if (Permission::checkMember($member, 'ADMIN')) {
+        if(Permission::checkMember($member, 'ADMIN')) {
             return true;
         }
 
         $allProjects = $this->DNProjectList();
-        if (!$allProjects) {
+        if(!$allProjects) {
             return false;
         }
 
-        foreach ($allProjects as $project) {
-            if ($project->Environments()) {
-                foreach ($project->Environments() as $environment) {
-                    if (
+        foreach($allProjects as $project) {
+            if($project->Environments()) {
+                foreach($project->Environments() as $environment) {
+                    if(
                         $environment->canRestore($member) ||
                         $environment->canBackup($member) ||
                         $environment->canUploadArchive($member) ||
@@ -2242,7 +2242,7 @@ 
     public function CreateEnvironmentList()
     {
         $project = $this->getCurrentProject();
-        if ($project) {
+        if($project) {
             return new PaginatedList($project->CreateEnvironments()->sort("Created DESC"), $this->request);
         }
         return new PaginatedList(new ArrayList(), $this->request);
@@ -2259,9 +2259,9 @@ 
         $archives = new ArrayList();
 
         $archiveList = $project->Environments()->relation("DataArchives");
-        if ($archiveList->count() > 0) {
-            foreach ($archiveList as $archive) {
-                if ($archive->canView() && !$archive->isPending()) {
+        if($archiveList->count() > 0) {
+            foreach($archiveList as $archive) {
+                if($archive->canView() && !$archive->isPending()) {
                     $archives->push($archive);
                 }
             }
@@ -2277,9 +2277,9 @@ 
     {
         $project = $this->getCurrentProject();
         $archives = new ArrayList();
-        foreach ($project->DNEnvironmentList() as $env) {
-            foreach ($env->DataArchives() as $archive) {
-                if ($archive->canView() && $archive->isPending()) {
+        foreach($project->DNEnvironmentList() as $env) {
+            foreach($env->DataArchives() as $archive) {
+                if($archive->canView() && $archive->isPending()) {
                     $archives->push($archive);
                 }
             }
@@ -2294,7 +2294,7 @@ 
     {
         $project = $this->getCurrentProject();
 
-        $transfers = DNDataTransfer::get()->filterByCallback(function ($record) use ($project) {
+        $transfers = DNDataTransfer::get()->filterByCallback(function($record) use ($project) {
             return
                 $record->Environment()->Project()->ID == $project->ID && // Ensure only the current Project is shown
                 (
@@ -2313,9 +2313,9 @@ 
      */
     public function DeployHistory()
     {
-        if ($env = $this->getCurrentEnvironment()) {
+        if($env = $this->getCurrentEnvironment()) {
             $history = $env->DeployHistory();
-            if ($history->count() > 0) {
+            if($history->count() > 0) {
                 $pagination = new PaginatedList($history, $this->getRequest());
                 $pagination->setPageLength(8);
                 return $pagination;
@@ -2358,7 +2358,7 @@ 
         $sendJSON = (strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false)
             || $this->getRequest()->getExtension() == 'json';
 
-        if (!$sendJSON) {
+        if(!$sendJSON) {
             $this->response->addHeader("Content-type", "text/plain");
             return $content;
         }
@@ -2376,7 +2376,7 @@ 
      */
     protected function validateSnapshotMode($mode)
     {
-        if (!in_array($mode, array('all', 'assets', 'db'))) {
+        if(!in_array($mode, array('all', 'assets', 'db'))) {
             throw new LogicException('Invalid mode');
         }
     }
@@ -2391,12 +2391,12 @@ 
     {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
         $data[$sectionName] = 1;
 
-        if ($this !== '') {
+        if($this !== '') {
             $data['Title'] = $title;
         }
 
@@ -2412,7 +2412,7 @@ 
     {
         $list = new ArrayList();
 
-        if (Member::currentUserID()) {
+        if(Member::currentUserID()) {
             $list->push(new ArrayData(array(
                 'Classes' => 'logout',
                 'FaIcon' => 'sign-out',
@@ -2434,7 +2434,7 @@ 
      */
     public function createproject(SS_HTTPRequest $request)
     {
-        if ($this->canCreateProjects()) {
+        if($this->canCreateProjects()) {
             return $this->render(['CurrentTitle' => 'Create Stack']);
         }
         return $this->httpError(403);
@@ -2447,10 +2447,10 @@ 
      */
     public function canCreateProjects($member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
-        if (!$member) {
+        if(!$member) {
             return false;
         }
 
@@ -2515,11 +2515,11 @@ 
         $form->saveInto($project);
         $this->extend('onBeforeCreateProject', $project, $data, $form);
         try {
-            if ($project->write() > 0) {
+            if($project->write() > 0) {
                 $this->extend('onAfterCreateProject', $project, $data, $form);
 
                 // If an extension hasn't redirected us, we'll redirect to the project.
-                if (!$this->redirectedTo()) {
+                if(!$this->redirectedTo()) {
                     return $this->redirect($project->Link());
                 } else {
                     return $this->response;
@@ -2527,7 +2527,7 @@ 
             } else {
                 $form->sessionMessage('Unable to write the stack to the database.', 'bad');
             }
-        } catch (ValidationException $e) {
+        } catch(ValidationException $e) {
             $form->sessionMessage($e->getMessage(), 'bad');
         }
         return $this->redirectBack();
@@ -2543,7 +2543,7 @@ 
     public function createprojectprogress(SS_HTTPRequest $request)
     {
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->httpError(404);
         }
 
@@ -2551,13 +2551,13 @@ 
         $complete = array();
         $inProgress = array();
         $failed = array();
-        if ($envCreations->count() > 0) {
-            foreach ($envCreations as $env) {
+        if($envCreations->count() > 0) {
+            foreach($envCreations as $env) {
                 $data = unserialize($env->Data);
-                if (!isset($data['Name'])) {
+                if(!isset($data['Name'])) {
                     $data['Name'] = 'Unknown';
                 }
-                switch ($env->ResqueStatus()) {
+                switch($env->ResqueStatus()) {
                     case "Queued":
                     case "Running":
                         $inProgress[$env->ID] = Convert::raw2xml($env->ResqueStatus());
@@ -2594,17 +2594,17 @@ 
     public function checkrepoaccess(SS_HTTPRequest $request)
     {
         $project = $this->getCurrentProject();
-        if (!$project) {
+        if(!$project) {
             return $this->httpError(404);
         }
 
-        if ($project->CVSPath) {
+        if($project->CVSPath) {
             $fetch = new FetchJob();
             $fetch->args = array('projectID' => $project->ID);
             try {
                 $fetch->perform();
                 $canAccessRepo = true;
-            } catch (RuntimeException $e) {
+            } catch(RuntimeException $e) {
                 $canAccessRepo = false;
             }
             $data = ['canAccessRepo' => $canAccessRepo];

Braces +84 added lines, -168 removed lines

@@ -170,8 +170,7 @@ 
     /**
      * Include requirements that deploynaut needs, such as javascript.
      */
-    public static function include_requirements()
-    {
+    public static function include_requirements() {
 
         // JS should always go to the bottom, otherwise there's the risk that Requirements
         // puts them halfway through the page to the nearest <script> tag. We don't want that.
@@ -209,8 +208,7 @@ 
      *
      * @return boolean
      */
-    public static function FlagSnapshotsEnabled()
-    {
+    public static function FlagSnapshotsEnabled() {
         if (defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) {
             return true;
         }
@@ -227,8 +225,7 @@ 
     /**
      * @return ArrayList
      */
-    public static function get_support_links()
-    {
+    public static function get_support_links() {
         $supportLinks = self::config()->support_links;
         if ($supportLinks) {
             return new ArrayList($supportLinks);
@@ -238,8 +235,7 @@ 
     /**
      * @return array
      */
-    public static function get_template_global_variables()
-    {
+    public static function get_template_global_variables() {
         return array(
             'RedisUnavailable' => 'RedisUnavailable',
             'RedisWorkersCount' => 'RedisWorkersCount',
@@ -250,8 +246,7 @@ 
 
     /**
      */
-    public function init()
-    {
+    public function init() {
         parent::init();
 
         if (!Member::currentUser() && !Session::get('AutoLoginHash')) {
@@ -267,8 +262,7 @@ 
     /**
      * @return string
      */
-    public function Link()
-    {
+    public function Link() {
         return "naut/";
     }
 
@@ -278,8 +272,7 @@ 
      * @param SS_HTTPRequest $request
      * @return \SS_HTTPResponse
      */
-    public function index(SS_HTTPRequest $request)
-    {
+    public function index(SS_HTTPRequest $request) {
         return $this->redirect($this->Link() . 'projects/');
     }
 
@@ -289,8 +282,7 @@ 
      * @param SS_HTTPRequest $request
      * @return string - HTML
      */
-    public function projects(SS_HTTPRequest $request)
-    {
+    public function projects(SS_HTTPRequest $request) {
         // Performs canView permission check by limiting visible projects in DNProjectsList() call.
         return $this->customise(array(
             'Title' => 'Projects',
@@ -301,8 +293,7 @@ 
      * @param SS_HTTPRequest $request
      * @return HTMLText
      */
-    public function nav(SS_HTTPRequest $request)
-    {
+    public function nav(SS_HTTPRequest $request) {
         return $this->renderWith('Nav');
     }
 
@@ -310,8 +301,7 @@ 
      * Return a link to the navigation template used for AJAX requests.
      * @return string
      */
-    public function NavLink()
-    {
+    public function NavLink() {
         $currentProject = $this->getCurrentProject();
         $projectName = $currentProject ? $currentProject->Name : null;
         return Controller::join_links(Director::absoluteBaseURL(), 'naut', 'nav', $projectName);
@@ -323,8 +313,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse - HTML
      */
-    public function snapshots(SS_HTTPRequest $request)
-    {
+    public function snapshots(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
         return $this->getCustomisedViewSection('SnapshotsSection', 'Data Snapshots');
     }
@@ -335,8 +324,7 @@ 
      * @param SS_HTTPRequest $request
      * @return string - HTML
      */
-    public function createsnapshot(SS_HTTPRequest $request)
-    {
+    public function createsnapshot(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -362,8 +350,7 @@ 
      * @param SS_HTTPRequest $request
      * @return string - HTML
      */
-    public function uploadsnapshot(SS_HTTPRequest $request)
-    {
+    public function uploadsnapshot(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -387,8 +374,7 @@ 
      * Return the upload limit for snapshot uploads
      * @return string
      */
-    public function UploadLimit()
-    {
+    public function UploadLimit() {
         return File::format_size(min(
             File::ini2bytes(ini_get('upload_max_filesize')),
             File::ini2bytes(ini_get('post_max_size'))
@@ -401,8 +387,7 @@ 
      * @param SS_HTTPRequest $request
      * @return Form
      */
-    public function getUploadSnapshotForm(SS_HTTPRequest $request)
-    {
+    public function getUploadSnapshotForm(SS_HTTPRequest $request) {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
         if (!$project) {
@@ -459,8 +444,7 @@ 
      *
      * @return bool|HTMLText|SS_HTTPResponse
      */
-    public function doUploadSnapshot($data, Form $form)
-    {
+    public function doUploadSnapshot($data, Form $form) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -559,8 +543,7 @@ 
      * @param SS_HTTPRequest $request
      * @return Form
      */
-    public function getPostSnapshotForm(SS_HTTPRequest $request)
-    {
+    public function getPostSnapshotForm(SS_HTTPRequest $request) {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
         if (!$project) {
@@ -611,8 +594,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    public function doPostSnapshot($data, $form)
-    {
+    public function doPostSnapshot($data, $form) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         $project = $this->getCurrentProject();
@@ -649,8 +631,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse - HTML
      */
-    public function snapshotslog(SS_HTTPRequest $request)
-    {
+    public function snapshotslog(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
         return $this->getCustomisedViewSection('SnapshotsSection', 'Data Snapshots Log');
     }
@@ -660,8 +641,7 @@ 
      * @return SS_HTTPResponse|string
      * @throws SS_HTTPResponse_Exception
      */
-    public function postsnapshotsuccess(SS_HTTPRequest $request)
-    {
+    public function postsnapshotsuccess(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -695,8 +675,7 @@ 
      * @param SS_HTTPRequest $request
      * @return \SS_HTTPResponse
      */
-    public function project(SS_HTTPRequest $request)
-    {
+    public function project(SS_HTTPRequest $request) {
         return $this->getCustomisedViewSection('ProjectOverview', '', array('IsAdmin' => Permission::check('ADMIN')));
     }
 
@@ -707,8 +686,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    public function toggleprojectstar(SS_HTTPRequest $request)
-    {
+    public function toggleprojectstar(SS_HTTPRequest $request) {
         $project = $this->getCurrentProject();
         if (!$project) {
             return $this->project404Response();
@@ -734,8 +712,7 @@ 
      * @param SS_HTTPRequest $request
      * @return \SS_HTTPResponse
      */
-    public function branch(SS_HTTPRequest $request)
-    {
+    public function branch(SS_HTTPRequest $request) {
         $project = $this->getCurrentProject();
         if (!$project) {
             return $this->project404Response();
@@ -756,8 +733,7 @@ 
      * @param SS_HTTPRequest $request
      * @return \SS_HTTPResponse
      */
-    public function environment(SS_HTTPRequest $request)
-    {
+    public function environment(SS_HTTPRequest $request) {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
         if (!$project) {
@@ -785,8 +761,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    public function doDryRun($data, DeployForm $form)
-    {
+    public function doDryRun($data, DeployForm $form) {
         return $this->beginPipeline($data, $form, true);
     }
 
@@ -797,8 +772,7 @@ 
      * @param DeployForm $form
      * @return \SS_HTTPResponse
      */
-    public function startPipeline($data, $form)
-    {
+    public function startPipeline($data, $form) {
         return $this->beginPipeline($data, $form);
     }
 
@@ -810,8 +784,7 @@ 
      * @param bool $isDryRun
      * @return \SS_HTTPResponse
      */
-    protected function beginPipeline($data, DeployForm $form, $isDryRun = false)
-    {
+    protected function beginPipeline($data, DeployForm $form, $isDryRun = false) {
         $buildName = $form->getSelectedBuild($data);
 
         // Performs canView permission check by limiting visible projects
@@ -851,8 +824,7 @@ 
      * @return SS_HTTPResponse
      * @throws SS_HTTPResponse_Exception
      */
-    public function pipeline(SS_HTTPRequest $request)
-    {
+    public function pipeline(SS_HTTPRequest $request) {
         $params = $request->params();
         $pipeline = Pipeline::get()->byID($params['Identifier']);
 
@@ -883,8 +855,7 @@ 
      * @param SS_HTTPRequest $request
      * @return string
      */
-    public function createenv(SS_HTTPRequest $request)
-    {
+    public function createenv(SS_HTTPRequest $request) {
         $params = $request->params();
         if ($params['Identifier']) {
             $record = DNCreateEnvironment::get()->byId($params['Identifier']);
@@ -913,8 +884,7 @@ 
     }
 
 
-    public function createenvlog(SS_HTTPRequest $request)
-    {
+    public function createenvlog(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         $params = $request->params();
@@ -947,8 +917,7 @@ 
      * @param SS_HTTPRequest $request
      * @return Form
      */
-    public function getCreateEnvironmentForm(SS_HTTPRequest $request)
-    {
+    public function getCreateEnvironmentForm(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
 
         $project = $this->getCurrentProject();
@@ -999,8 +968,7 @@ 
      *
      * @return bool|HTMLText|SS_HTTPResponse
      */
-    public function doCreateEnvironment($data, Form $form)
-    {
+    public function doCreateEnvironment($data, Form $form) {
         $this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
 
         $project = $this->getCurrentProject();
@@ -1030,8 +998,7 @@ 
      * @param SS_HTTPRequest $request
      * @return \SS_HTTPResponse
      */
-    public function metrics(SS_HTTPRequest $request)
-    {
+    public function metrics(SS_HTTPRequest $request) {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
         if (!$project) {
@@ -1052,8 +1019,7 @@ 
      *
      * @return DNData
      */
-    public function DNData()
-    {
+    public function DNData() {
         return DNData::inst();
     }
 
@@ -1062,8 +1028,7 @@ 
      *
      * @return SS_List
      */
-    public function DNProjectList()
-    {
+    public function DNProjectList() {
         $memberId = Member::currentUserID();
         if (!$memberId) {
             return new ArrayList();
@@ -1081,8 +1046,7 @@ 
     /**
      * @return ArrayList
      */
-    public function getPlatformSpecificStrings()
-    {
+    public function getPlatformSpecificStrings() {
         $strings = $this->config()->platform_specific_strings;
         if ($strings) {
             return new ArrayList($strings);
@@ -1094,8 +1058,7 @@ 
      *
      * @return SS_List
      */
-    public function getStarredProjects()
-    {
+    public function getStarredProjects() {
         $member = Member::currentUser();
         if ($member === null) {
             return new ArrayList();
@@ -1119,8 +1082,7 @@ 
      *
      * @return ArrayList
      */
-    public function Navigation($limit = 5)
-    {
+    public function Navigation($limit = 5) {
         $navigation = new ArrayList();
 
         $currentProject = $this->getCurrentProject();
@@ -1173,8 +1135,7 @@ 
      *
      * @return Form
      */
-    public function getDeployForm($request = null)
-    {
+    public function getDeployForm($request = null) {
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
@@ -1220,8 +1181,7 @@ 
      *
      * @return SS_HTTPResponse|string
      */
-    public function gitRevisions(SS_HTTPRequest $request)
-    {
+    public function gitRevisions(SS_HTTPRequest $request) {
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
@@ -1372,8 +1332,7 @@ 
      *
      * @return bool
      */
-    protected function checkCsrfToken(SS_HTTPRequest $request, $resetToken = true)
-    {
+    protected function checkCsrfToken(SS_HTTPRequest $request, $resetToken = true) {
         $token = SecurityToken::inst();
 
         // Ensure the submitted token has a value
@@ -1399,8 +1358,7 @@ 
      *
      * @return string
      */
-    public function deploySummary(SS_HTTPRequest $request)
-    {
+    public function deploySummary(SS_HTTPRequest $request) {
 
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
@@ -1458,8 +1416,7 @@ 
      * @throws ValidationException
      * @throws null
      */
-    public function startDeploy(SS_HTTPRequest $request)
-    {
+    public function startDeploy(SS_HTTPRequest $request) {
 
         // Ensure the CSRF Token is correct
         if (!$this->checkCsrfToken($request)) {
@@ -1502,8 +1459,7 @@ 
      * @return SS_HTTPResponse|string
      * @throws SS_HTTPResponse_Exception
      */
-    public function deploy(SS_HTTPRequest $request)
-    {
+    public function deploy(SS_HTTPRequest $request) {
         $params = $request->params();
         $deployment = DNDeployment::get()->byId($params['Identifier']);
 
@@ -1538,8 +1494,7 @@ 
      * @return string
      * @throws SS_HTTPResponse_Exception
      */
-    public function deploylog(SS_HTTPRequest $request)
-    {
+    public function deploylog(SS_HTTPRequest $request) {
         $params = $request->params();
         $deployment = DNDeployment::get()->byId($params['Identifier']);
 
@@ -1575,8 +1530,7 @@ 
      *
      * @return Form
      */
-    public function getDataTransferForm(SS_HTTPRequest $request = null)
-    {
+    public function getDataTransferForm(SS_HTTPRequest $request = null) {
         // Performs canView permission check by limiting visible projects
         $envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function ($item) {
             return $item->canBackup();
@@ -1612,8 +1566,7 @@ 
      * @return SS_HTTPResponse
      * @throws SS_HTTPResponse_Exception
      */
-    public function doDataTransfer($data, Form $form)
-    {
+    public function doDataTransfer($data, Form $form) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -1686,8 +1639,7 @@ 
      * @return SS_HTTPResponse|string
      * @throws SS_HTTPResponse_Exception
      */
-    public function transfer(SS_HTTPRequest $request)
-    {
+    public function transfer(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         $params = $request->params();
@@ -1721,8 +1673,7 @@ 
      * @return string
      * @throws SS_HTTPResponse_Exception
      */
-    public function transferlog(SS_HTTPRequest $request)
-    {
+    public function transferlog(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         $params = $request->params();
@@ -1761,8 +1712,7 @@ 
      *                            otherwise the state is inferred from the request data.
      * @return Form
      */
-    public function getDataTransferRestoreForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null)
-    {
+    public function getDataTransferRestoreForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null) {
         $dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
 
         // Performs canView permission check by limiting visible projects
@@ -1821,8 +1771,7 @@ 
      * @return HTMLText
      * @throws SS_HTTPResponse_Exception
      */
-    public function restoresnapshot(SS_HTTPRequest $request)
-    {
+    public function restoresnapshot(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         /** @var DNDataArchive $dataArchive */
@@ -1854,8 +1803,7 @@ 
      * @return HTMLText
      * @throws SS_HTTPResponse_Exception
      */
-    public function deletesnapshot(SS_HTTPRequest $request)
-    {
+    public function deletesnapshot(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         /** @var DNDataArchive $dataArchive */
@@ -1881,8 +1829,7 @@ 
      *        from the request data.
      * @return Form
      */
-    public function getDeleteForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null)
-    {
+    public function getDeleteForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null) {
         $dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
 
         // Performs canView permission check by limiting visible projects
@@ -1919,8 +1866,7 @@ 
      * @return bool|SS_HTTPResponse
      * @throws SS_HTTPResponse_Exception
      */
-    public function doDelete($data, Form $form)
-    {
+    public function doDelete($data, Form $form) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -1959,8 +1905,7 @@ 
      * @return HTMLText
      * @throws SS_HTTPResponse_Exception
      */
-    public function movesnapshot(SS_HTTPRequest $request)
-    {
+    public function movesnapshot(SS_HTTPRequest $request) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         /** @var DNDataArchive $dataArchive */
@@ -1989,8 +1934,7 @@ 
      *
      * @return Form|SS_HTTPResponse
      */
-    public function getMoveForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null)
-    {
+    public function getMoveForm(SS_HTTPRequest $request, DNDataArchive $dataArchive = null) {
         $dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
 
         $envs = $dataArchive->validTargetEnvironments();
@@ -2030,8 +1974,7 @@ 
      * @throws ValidationException
      * @throws null
      */
-    public function doMove($data, Form $form)
-    {
+    public function doMove($data, Form $form) {
         $this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
         // Performs canView permission check by limiting visible projects
@@ -2069,8 +2012,7 @@ 
      *
      * @return string
      */
-    public static function RedisUnavailable()
-    {
+    public static function RedisUnavailable() {
         try {
             Resque::queues();
         } catch (Exception $e) {
@@ -2084,16 +2026,14 @@ 
      *
      * @return int
      */
-    public static function RedisWorkersCount()
-    {
+    public static function RedisWorkersCount() {
         return count(Resque_Worker::all());
     }
 
     /**
      * @return array
      */
-    public function providePermissions()
-    {
+    public function providePermissions() {
         return array(
             self::DEPLOYNAUT_BYPASS_PIPELINE => array(
                 'name' => "Bypass Pipeline",
@@ -2137,8 +2077,7 @@ 
     /**
      * @return DNProject|null
      */
-    public function getCurrentProject()
-    {
+    public function getCurrentProject() {
         $projectName = trim($this->getRequest()->param('Project'));
         if (!$projectName) {
             return null;
@@ -2153,8 +2092,7 @@ 
      * @param DNProject|null $project
      * @return DNEnvironment|null
      */
-    public function getCurrentEnvironment(DNProject $project = null)
-    {
+    public function getCurrentEnvironment(DNProject $project = null) {
         if ($this->getRequest()->param('Environment') === null) {
             return null;
         }
@@ -2177,8 +2115,7 @@ 
      *
      * @return string - one of the consts from self::$action_types
      */
-    public function getCurrentActionType()
-    {
+    public function getCurrentActionType() {
         return $this->actionType;
     }
 
@@ -2187,8 +2124,7 @@ 
      *
      * @param string $actionType string - one of the consts from self::$action_types
      */
-    public function setCurrentActionType($actionType)
-    {
+    public function setCurrentActionType($actionType) {
         $this->actionType = $actionType;
     }
 
@@ -2202,8 +2138,7 @@ 
      * @param Member|null $member The {@link Member} to check (or null to check the currently logged in Member)
      * @return boolean|null true if $member has access to upload or download to at least one {@link DNEnvironment}.
      */
-    public function CanViewArchives(Member $member = null)
-    {
+    public function CanViewArchives(Member $member = null) {
         if ($member === null) {
             $member = Member::currentUser();
         }
@@ -2239,8 +2174,7 @@ 
      *
      * @return PaginatedList
      */
-    public function CreateEnvironmentList()
-    {
+    public function CreateEnvironmentList() {
         $project = $this->getCurrentProject();
         if ($project) {
             return new PaginatedList($project->CreateEnvironments()->sort("Created DESC"), $this->request);
@@ -2253,8 +2187,7 @@ 
      *
      * @return PaginatedList
      */
-    public function CompleteDataArchives()
-    {
+    public function CompleteDataArchives() {
         $project = $this->getCurrentProject();
         $archives = new ArrayList();
 
@@ -2273,8 +2206,7 @@ 
      * @return PaginatedList The list of "pending" data archives which are waiting for a file
      * to be delivered offline by post, and manually uploaded into the system.
      */
-    public function PendingDataArchives()
-    {
+    public function PendingDataArchives() {
         $project = $this->getCurrentProject();
         $archives = new ArrayList();
         foreach ($project->DNEnvironmentList() as $env) {
@@ -2290,8 +2222,7 @@ 
     /**
      * @return PaginatedList
      */
-    public function DataTransferLogs()
-    {
+    public function DataTransferLogs() {
         $project = $this->getCurrentProject();
 
         $transfers = DNDataTransfer::get()->filterByCallback(function ($record) use ($project) {
@@ -2311,8 +2242,7 @@ 
     /**
      * @return null|PaginatedList
      */
-    public function DeployHistory()
-    {
+    public function DeployHistory() {
         if ($env = $this->getCurrentEnvironment()) {
             $history = $env->DeployHistory();
             if ($history->count() > 0) {
@@ -2327,8 +2257,7 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function project404Response()
-    {
+    protected function project404Response() {
         return new SS_HTTPResponse(
             "Project '" . Convert::raw2xml($this->getRequest()->param('Project')) . "' not found.",
             404
@@ -2338,8 +2267,7 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function environment404Response()
-    {
+    protected function environment404Response() {
         $envName = Convert::raw2xml($this->getRequest()->param('Environment'));
         return new SS_HTTPResponse("Environment '" . $envName . "' not found.", 404);
     }
@@ -2350,8 +2278,7 @@ 
      *
      * @return string
      */
-    protected function sendResponse($status, $content)
-    {
+    protected function sendResponse($status, $content) {
         // strip excessive newlines
         $content = preg_replace('/(?:(?:\r\n|\r|\n)\s*){2}/s', "\n", $content);
 
@@ -2374,8 +2301,7 @@ 
      *
      * @param string $mode
      */
-    protected function validateSnapshotMode($mode)
-    {
+    protected function validateSnapshotMode($mode) {
         if (!in_array($mode, array('all', 'assets', 'db'))) {
             throw new LogicException('Invalid mode');
         }
@@ -2387,8 +2313,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    protected function getCustomisedViewSection($sectionName, $title = '', $data = array())
-    {
+    protected function getCustomisedViewSection($sectionName, $title = '', $data = array()) {
         // Performs canView permission check by limiting visible projects
         $project = $this->getCurrentProject();
         if (!$project) {
@@ -2408,8 +2333,7 @@ 
      *
      * @return ArrayList
      */
-    public function AmbientMenu()
-    {
+    public function AmbientMenu() {
         $list = new ArrayList();
 
         if (Member::currentUserID()) {
@@ -2432,8 +2356,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    public function createproject(SS_HTTPRequest $request)
-    {
+    public function createproject(SS_HTTPRequest $request) {
         if ($this->canCreateProjects()) {
             return $this->render(['CurrentTitle' => 'Create Stack']);
         }
@@ -2445,8 +2368,7 @@ 
      *
      * @return bool
      */
-    public function canCreateProjects($member = null)
-    {
+    public function canCreateProjects($member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }
@@ -2460,8 +2382,7 @@ 
     /**
      * @return Form
      */
-    public function CreateProjectForm()
-    {
+    public function CreateProjectForm() {
         $form = Form::create(
             $this,
             __FUNCTION__,
@@ -2476,8 +2397,7 @@ 
     /**
      * @return FieldList
      */
-    protected function getCreateProjectFormFields()
-    {
+    protected function getCreateProjectFormFields() {
         $fields = FieldList::create();
         $fields->merge([
             TextField::create('Name', 'Title')->setDescription('Limited to alphanumeric characters, underscores and hyphens.'),
@@ -2490,8 +2410,7 @@ 
     /**
      * @return FieldList
      */
-    protected function getCreateProjectFormActions()
-    {
+    protected function getCreateProjectFormActions() {
         $fields = FieldList::create(
             FormAction::create('doCreateProject', 'Create Stack')
         );
@@ -2507,8 +2426,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    public function doCreateProject($data, $form)
-    {
+    public function doCreateProject($data, $form) {
         $form->loadDataFrom($data);
         $project = DNProject::create();
 
@@ -2540,8 +2458,7 @@ 
      *
      * @return SS_HTTPResponse
      */
-    public function createprojectprogress(SS_HTTPRequest $request)
-    {
+    public function createprojectprogress(SS_HTTPRequest $request) {
         $project = $this->getCurrentProject();
         if (!$project) {
             return $this->httpError(404);
@@ -2591,8 +2508,7 @@ 
         return $response;
     }
 
-    public function checkrepoaccess(SS_HTTPRequest $request)
-    {
+    public function checkrepoaccess(SS_HTTPRequest $request) {
         $project = $this->getCurrentProject();
         if (!$project) {
             return $this->httpError(404);

code/api/DeploynautAPI.php

Indentation +137 added lines, -137 removed lines

@@ -16,141 +16,141 @@
 class DeploynautAPI extends APINoun
 {
 
-    /**
-     * Default URL handlers - (Action)/(ID)//(OtherID)
-     *
-     * @var array
-     */
-    private static $url_handlers = array(
-        '' => 'listProjects',
-        '$Project//fetch' => 'project',
-        '$Project/$Environment!' => 'environment',
-        '$Project/' => 'project',
-    );
-
-    /**
-     * @var array
-     */
-    public static $allowed_actions = array(
-        'project',
-        'environment',
-        'listProjects'
-    );
-
-    /**
-     * @var string
-     */
-    protected $link = 'deploynaut/api';
-
-    /**
-     * @param SS_HTTPRequest $request
-     * @return SS_HTTPResponse
-     */
-    public function listProjects(SS_HTTPRequest $request)
-    {
-        $response = array(
-            'href' => Director::absoluteURL($this->Link()),
-            'projects' => array(),
-        );
-
-        if ($request->httpMethod() != 'GET') {
-            return $this->message('API not found', 404);
-        }
-
-        foreach (DNProject::get() as $item) {
-            if ($item->canView($this->getMember())) {
-                $response['projects'][] = array(
-                    "name" => $item->Name,
-                    "href" => Director::absoluteURL($item->APILink("")),
-                );
-            }
-        }
-
-        return $this->getAPIResponse($response);
-    }
-
-    /**
-     * Controller Action
-     *
-     * @param SS_HTTPRequest $request
-     * @return APIProject
-     */
-    public function project(SS_HTTPRequest $request)
-    {
-        $project = $this->getProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-        return new APIProject($this, $project);
-    }
-
-    /**
-     * Controller Action
-     *
-     * @param SS_HTTPRequest $request
-     * @return APIEnvironment
-     */
-    public function environment(SS_HTTPRequest $request)
-    {
-        $project = $this->getProject();
-        if (!$project) {
-            return $this->project404Response();
-        }
-
-        $environment = $this->getEnvironment();
-        if (!$environment) {
-            return $this->environment404Response();
-        }
-        return new APIEnvironment($this, $environment);
-    }
-
-    /**
-     * @return SS_HTTPResponse
-     */
-    protected function project404Response()
-    {
-        $projectName = Convert::raw2xml($this->getRequest()->latestParam('Project'));
-        return new SS_HTTPResponse('Project "' . $projectName . '" not found.', 404);
-    }
-
-    /**
-     * @return SS_HTTPResponse
-     */
-    protected function environment404Response()
-    {
-        $envName = Convert::raw2xml($this->getRequest()->latestParam('Environment'));
-        return new SS_HTTPResponse('Environment "' . $envName . '" not found.', 404);
-    }
-
-    /**
-     * Get project from URL
-     *
-     * @return DNProject
-     */
-    protected function getProject()
-    {
-        $projectName = $this->getRequest()->param('Project');
-        return DNProject::get()->filter('Name', $projectName)->first();
-    }
-
-    /**
-     * Get environment from URL
-     *
-     * @return DNEnvironment
-     */
-    protected function getEnvironment()
-    {
-        $projectName = $this->getRequest()->param('Project');
-        $project = DNProject::get()->filter('Name', $projectName)->first();
-        $environmentName = $this->getRequest()->param('Environment');
-        return $project->Environments()->filter('Name', $environmentName)->first();
-    }
-
-    /**
-     * @return string
-     */
-    public function Link()
-    {
-        return 'naut/api';
-    }
+	/**
+	 * Default URL handlers - (Action)/(ID)//(OtherID)
+	 *
+	 * @var array
+	 */
+	private static $url_handlers = array(
+		'' => 'listProjects',
+		'$Project//fetch' => 'project',
+		'$Project/$Environment!' => 'environment',
+		'$Project/' => 'project',
+	);
+
+	/**
+	 * @var array
+	 */
+	public static $allowed_actions = array(
+		'project',
+		'environment',
+		'listProjects'
+	);
+
+	/**
+	 * @var string
+	 */
+	protected $link = 'deploynaut/api';
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return SS_HTTPResponse
+	 */
+	public function listProjects(SS_HTTPRequest $request)
+	{
+		$response = array(
+			'href' => Director::absoluteURL($this->Link()),
+			'projects' => array(),
+		);
+
+		if ($request->httpMethod() != 'GET') {
+			return $this->message('API not found', 404);
+		}
+
+		foreach (DNProject::get() as $item) {
+			if ($item->canView($this->getMember())) {
+				$response['projects'][] = array(
+					"name" => $item->Name,
+					"href" => Director::absoluteURL($item->APILink("")),
+				);
+			}
+		}
+
+		return $this->getAPIResponse($response);
+	}
+
+	/**
+	 * Controller Action
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @return APIProject
+	 */
+	public function project(SS_HTTPRequest $request)
+	{
+		$project = $this->getProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+		return new APIProject($this, $project);
+	}
+
+	/**
+	 * Controller Action
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @return APIEnvironment
+	 */
+	public function environment(SS_HTTPRequest $request)
+	{
+		$project = $this->getProject();
+		if (!$project) {
+			return $this->project404Response();
+		}
+
+		$environment = $this->getEnvironment();
+		if (!$environment) {
+			return $this->environment404Response();
+		}
+		return new APIEnvironment($this, $environment);
+	}
+
+	/**
+	 * @return SS_HTTPResponse
+	 */
+	protected function project404Response()
+	{
+		$projectName = Convert::raw2xml($this->getRequest()->latestParam('Project'));
+		return new SS_HTTPResponse('Project "' . $projectName . '" not found.', 404);
+	}
+
+	/**
+	 * @return SS_HTTPResponse
+	 */
+	protected function environment404Response()
+	{
+		$envName = Convert::raw2xml($this->getRequest()->latestParam('Environment'));
+		return new SS_HTTPResponse('Environment "' . $envName . '" not found.', 404);
+	}
+
+	/**
+	 * Get project from URL
+	 *
+	 * @return DNProject
+	 */
+	protected function getProject()
+	{
+		$projectName = $this->getRequest()->param('Project');
+		return DNProject::get()->filter('Name', $projectName)->first();
+	}
+
+	/**
+	 * Get environment from URL
+	 *
+	 * @return DNEnvironment
+	 */
+	protected function getEnvironment()
+	{
+		$projectName = $this->getRequest()->param('Project');
+		$project = DNProject::get()->filter('Name', $projectName)->first();
+		$environmentName = $this->getRequest()->param('Environment');
+		return $project->Environments()->filter('Name', $environmentName)->first();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function Link()
+	{
+		return 'naut/api';
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -53,12 +53,12 @@ 
             'projects' => array(),
         );
 
-        if ($request->httpMethod() != 'GET') {
+        if($request->httpMethod() != 'GET') {
             return $this->message('API not found', 404);
         }
 
-        foreach (DNProject::get() as $item) {
-            if ($item->canView($this->getMember())) {
+        foreach(DNProject::get() as $item) {
+            if($item->canView($this->getMember())) {
                 $response['projects'][] = array(
                     "name" => $item->Name,
                     "href" => Director::absoluteURL($item->APILink("")),
@@ -78,7 +78,7 @@ 
     public function project(SS_HTTPRequest $request)
     {
         $project = $this->getProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
         return new APIProject($this, $project);
@@ -93,12 +93,12 @@ 
     public function environment(SS_HTTPRequest $request)
     {
         $project = $this->getProject();
-        if (!$project) {
+        if(!$project) {
             return $this->project404Response();
         }
 
         $environment = $this->getEnvironment();
-        if (!$environment) {
+        if(!$environment) {
             return $this->environment404Response();
         }
         return new APIEnvironment($this, $environment);

Braces +9 added lines, -18 removed lines

@@ -13,8 +13,7 @@ 
  * DeploynautAPI > APIProject > APIEnvironment
  *
  */
-class DeploynautAPI extends APINoun
-{
+class DeploynautAPI extends APINoun {
 
     /**
      * Default URL handlers - (Action)/(ID)//(OtherID)
@@ -46,8 +45,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse
      */
-    public function listProjects(SS_HTTPRequest $request)
-    {
+    public function listProjects(SS_HTTPRequest $request) {
         $response = array(
             'href' => Director::absoluteURL($this->Link()),
             'projects' => array(),
@@ -75,8 +73,7 @@ 
      * @param SS_HTTPRequest $request
      * @return APIProject
      */
-    public function project(SS_HTTPRequest $request)
-    {
+    public function project(SS_HTTPRequest $request) {
         $project = $this->getProject();
         if (!$project) {
             return $this->project404Response();
@@ -90,8 +87,7 @@ 
      * @param SS_HTTPRequest $request
      * @return APIEnvironment
      */
-    public function environment(SS_HTTPRequest $request)
-    {
+    public function environment(SS_HTTPRequest $request) {
         $project = $this->getProject();
         if (!$project) {
             return $this->project404Response();
@@ -107,8 +103,7 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function project404Response()
-    {
+    protected function project404Response() {
         $projectName = Convert::raw2xml($this->getRequest()->latestParam('Project'));
         return new SS_HTTPResponse('Project "' . $projectName . '" not found.', 404);
     }
@@ -116,8 +111,7 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function environment404Response()
-    {
+    protected function environment404Response() {
         $envName = Convert::raw2xml($this->getRequest()->latestParam('Environment'));
         return new SS_HTTPResponse('Environment "' . $envName . '" not found.', 404);
     }
@@ -127,8 +121,7 @@ 
      *
      * @return DNProject
      */
-    protected function getProject()
-    {
+    protected function getProject() {
         $projectName = $this->getRequest()->param('Project');
         return DNProject::get()->filter('Name', $projectName)->first();
     }
@@ -138,8 +131,7 @@ 
      *
      * @return DNEnvironment
      */
-    protected function getEnvironment()
-    {
+    protected function getEnvironment() {
         $projectName = $this->getRequest()->param('Project');
         $project = DNProject::get()->filter('Name', $projectName)->first();
         $environmentName = $this->getRequest()->param('Environment');
@@ -149,8 +141,7 @@ 
     /**
      * @return string
      */
-    public function Link()
-    {
+    public function Link() {
         return 'naut/api';
     }
 }

code/api/nouns/APIEnvironment.php

Indentation +198 added lines, -198 removed lines

@@ -3,202 +3,202 @@
 class APIEnvironment extends APINoun
 {
 
-    /**
-     * @var array
-     */
-    private static $allowed_actions = array(
-        'ping',
-        'deploy'
-    );
-
-    /**
-     * @param SS_HTTPRequest $request
-     * @return SS_HTTPResponse
-     */
-    public function index(SS_HTTPRequest $request)
-    {
-        if (!$this->record->canView($this->getMember())) {
-            return $this->message('You are not authorized to view this environment', 403);
-        }
-        switch ($request->httpMethod()) {
-            case 'GET':
-                $href = Director::absoluteURL($this->record->Project()->APILink($this->record->Name));
-                return $this->getAPIResponse(array(
-                    "name" => $this->record->Name,
-                    "project" => $this->record->Project()->Name,
-                    "href" => $href,
-                    "created" => $this->record->Created,
-                    "last-edited" => $this->record->LastEdited,
-
-                    // Stolen from https://github.com/kevinswiber/siren spec
-                    "actions" => array(
-                        array(
-                            "name" => "deploy",
-                            "method" =>  "POST",
-                            "href" => "$href/deploy",
-                            "type" => "application/json",
-                            "fields" => array(
-                                array("name" => "release", "type" => "text"),
-                            ),
-                        )
-                    )
-                ));
-            default:
-                return $this->message('API not found', 404);
-        }
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     * @return SS_HTTPResponse
-     */
-    public function ping(SS_HTTPRequest $request)
-    {
-        if (!$this->record->canView($this->getMember())) {
-            return $this->message('You are not authorized to do that on this environment', 403);
-        }
-        switch ($request->httpMethod()) {
-            case 'GET':
-                return $this->getPing($this->getRequest()->param('ID'));
-            case 'POST':
-                return $this->createPing();
-            default:
-                return $this->message('API not found', 404);
-        }
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     * @return SS_HTTPResponse
-     */
-    public function deploy(SS_HTTPRequest $request)
-    {
-        if (!$this->record->canView($this->getMember())) {
-            return $this->message('You are not authorized to do that on this environment', 403);
-        }
-        switch ($request->httpMethod()) {
-            case 'GET':
-                return $this->getDeploy($this->getRequest()->param('ID'));
-            case 'POST':
-                return $this->createDeploy();
-            default:
-                return $this->message('API not found', 404);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function Link()
-    {
-        return Controller::join_links(
-            $this->parent->Link(),
-            $this->record->Project()->Name,
-            $this->record->Name
-        );
-    }
-
-    /**
-     * @return SS_HTTPResponse
-     */
-    protected function showRecord()
-    {
-        return $this->getAPIResponse($this->record->toMap());
-    }
-
-    /**
-     * @return SS_HTTPResponse
-     */
-    protected function createPing()
-    {
-        if (!$this->record->canDeploy($this->getMember())) {
-            return $this->message('You are not authorized to do that on this environment', 403);
-        }
-        $ping = DNPing::create();
-        $ping->EnvironmentID = $this->record->ID;
-        $ping->write();
-        $ping->start();
-
-        $location = Director::absoluteBaseURL() . $this->Link() . '/ping/' . $ping->ID;
-        $output = array(
-            'message' => 'Ping queued as job ' . $ping->ResqueToken,
-            'href' => $location,
-        );
-
-        $response = $this->getAPIResponse($output);
-        $response->setStatusCode(201);
-        $response->addHeader('Location', $location);
-        return $response;
-    }
-
-    /**
-     * @param int $ID
-     * @return SS_HTTPResponse
-     */
-    protected function getPing($ID)
-    {
-        $ping = DNPing::get()->byID($ID);
-        if (!$ping) {
-            return $this->message('Ping not found', 404);
-        }
-        $output = array(
-            'status' => $ping->ResqueStatus(),
-            'message' => $ping->LogContent()
-        );
-
-        return $this->getAPIResponse($output);
-    }
-
-    /**
-     * @return SS_HTTPResponse
-     */
-    protected function createDeploy()
-    {
-        if (!$this->record->canDeploy($this->getMember())) {
-            return $this->message('You are not authorized to do that on this environment', 403);
-        }
-
-        $reqBody = $this->getRequestBody();
-
-        if ($reqBody === null) {
-            return $this->message('the request body did not contain a valid JSON object.', 400);
-        }
-
-        if (empty($reqBody['release'])) {
-            return $this->message('deploy requires a {"release": "sha1"} in the body of the request.', 400);
-        }
-
-        $strategy = new DeploymentStrategy($this->record, array(
-            'sha' => $reqBody['release']
-        ));
-        $deploy = $strategy->createDeployment();
-        $deploy->start();
-        $location = Director::absoluteBaseURL() . $this->Link() . '/deploy/' . $deploy->ID;
-        $output = array(
-            'message' => 'Deploy queued as job ' . $deploy->ResqueToken,
-            'href' => $location,
-        );
-        $response = $this->getAPIResponse($output);
-        $response->setStatusCode(201);
-        $response->addHeader('Location', $location);
-        return $response;
-    }
-
-    /**
-     * @param int $id
-     * @return SS_HTTPResponse
-     */
-    protected function getDeploy($id)
-    {
-        $deploy = DNDeployment::get()->byID($id);
-        if (!$deploy) {
-            return $this->message('Deploy not found', 404);
-        }
-        $output = array(
-            'status' => $deploy->ResqueStatus(),
-            'message' => $deploy->LogContent()
-        );
-
-        return $this->getAPIResponse($output);
-    }
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = array(
+		'ping',
+		'deploy'
+	);
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return SS_HTTPResponse
+	 */
+	public function index(SS_HTTPRequest $request)
+	{
+		if (!$this->record->canView($this->getMember())) {
+			return $this->message('You are not authorized to view this environment', 403);
+		}
+		switch ($request->httpMethod()) {
+			case 'GET':
+				$href = Director::absoluteURL($this->record->Project()->APILink($this->record->Name));
+				return $this->getAPIResponse(array(
+					"name" => $this->record->Name,
+					"project" => $this->record->Project()->Name,
+					"href" => $href,
+					"created" => $this->record->Created,
+					"last-edited" => $this->record->LastEdited,
+
+					// Stolen from https://github.com/kevinswiber/siren spec
+					"actions" => array(
+						array(
+							"name" => "deploy",
+							"method" =>  "POST",
+							"href" => "$href/deploy",
+							"type" => "application/json",
+							"fields" => array(
+								array("name" => "release", "type" => "text"),
+							),
+						)
+					)
+				));
+			default:
+				return $this->message('API not found', 404);
+		}
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return SS_HTTPResponse
+	 */
+	public function ping(SS_HTTPRequest $request)
+	{
+		if (!$this->record->canView($this->getMember())) {
+			return $this->message('You are not authorized to do that on this environment', 403);
+		}
+		switch ($request->httpMethod()) {
+			case 'GET':
+				return $this->getPing($this->getRequest()->param('ID'));
+			case 'POST':
+				return $this->createPing();
+			default:
+				return $this->message('API not found', 404);
+		}
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return SS_HTTPResponse
+	 */
+	public function deploy(SS_HTTPRequest $request)
+	{
+		if (!$this->record->canView($this->getMember())) {
+			return $this->message('You are not authorized to do that on this environment', 403);
+		}
+		switch ($request->httpMethod()) {
+			case 'GET':
+				return $this->getDeploy($this->getRequest()->param('ID'));
+			case 'POST':
+				return $this->createDeploy();
+			default:
+				return $this->message('API not found', 404);
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function Link()
+	{
+		return Controller::join_links(
+			$this->parent->Link(),
+			$this->record->Project()->Name,
+			$this->record->Name
+		);
+	}
+
+	/**
+	 * @return SS_HTTPResponse
+	 */
+	protected function showRecord()
+	{
+		return $this->getAPIResponse($this->record->toMap());
+	}
+
+	/**
+	 * @return SS_HTTPResponse
+	 */
+	protected function createPing()
+	{
+		if (!$this->record->canDeploy($this->getMember())) {
+			return $this->message('You are not authorized to do that on this environment', 403);
+		}
+		$ping = DNPing::create();
+		$ping->EnvironmentID = $this->record->ID;
+		$ping->write();
+		$ping->start();
+
+		$location = Director::absoluteBaseURL() . $this->Link() . '/ping/' . $ping->ID;
+		$output = array(
+			'message' => 'Ping queued as job ' . $ping->ResqueToken,
+			'href' => $location,
+		);
+
+		$response = $this->getAPIResponse($output);
+		$response->setStatusCode(201);
+		$response->addHeader('Location', $location);
+		return $response;
+	}
+
+	/**
+	 * @param int $ID
+	 * @return SS_HTTPResponse
+	 */
+	protected function getPing($ID)
+	{
+		$ping = DNPing::get()->byID($ID);
+		if (!$ping) {
+			return $this->message('Ping not found', 404);
+		}
+		$output = array(
+			'status' => $ping->ResqueStatus(),
+			'message' => $ping->LogContent()
+		);
+
+		return $this->getAPIResponse($output);
+	}
+
+	/**
+	 * @return SS_HTTPResponse
+	 */
+	protected function createDeploy()
+	{
+		if (!$this->record->canDeploy($this->getMember())) {
+			return $this->message('You are not authorized to do that on this environment', 403);
+		}
+
+		$reqBody = $this->getRequestBody();
+
+		if ($reqBody === null) {
+			return $this->message('the request body did not contain a valid JSON object.', 400);
+		}
+
+		if (empty($reqBody['release'])) {
+			return $this->message('deploy requires a {"release": "sha1"} in the body of the request.', 400);
+		}
+
+		$strategy = new DeploymentStrategy($this->record, array(
+			'sha' => $reqBody['release']
+		));
+		$deploy = $strategy->createDeployment();
+		$deploy->start();
+		$location = Director::absoluteBaseURL() . $this->Link() . '/deploy/' . $deploy->ID;
+		$output = array(
+			'message' => 'Deploy queued as job ' . $deploy->ResqueToken,
+			'href' => $location,
+		);
+		$response = $this->getAPIResponse($output);
+		$response->setStatusCode(201);
+		$response->addHeader('Location', $location);
+		return $response;
+	}
+
+	/**
+	 * @param int $id
+	 * @return SS_HTTPResponse
+	 */
+	protected function getDeploy($id)
+	{
+		$deploy = DNDeployment::get()->byID($id);
+		if (!$deploy) {
+			return $this->message('Deploy not found', 404);
+		}
+		$output = array(
+			'status' => $deploy->ResqueStatus(),
+			'message' => $deploy->LogContent()
+		);
+
+		return $this->getAPIResponse($output);
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -17,10 +17,10 @@ 
      */
     public function index(SS_HTTPRequest $request)
     {
-        if (!$this->record->canView($this->getMember())) {
+        if(!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to view this environment', 403);
         }
-        switch ($request->httpMethod()) {
+        switch($request->httpMethod()) {
             case 'GET':
                 $href = Director::absoluteURL($this->record->Project()->APILink($this->record->Name));
                 return $this->getAPIResponse(array(
@@ -54,10 +54,10 @@ 
      */
     public function ping(SS_HTTPRequest $request)
     {
-        if (!$this->record->canView($this->getMember())) {
+        if(!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
-        switch ($request->httpMethod()) {
+        switch($request->httpMethod()) {
             case 'GET':
                 return $this->getPing($this->getRequest()->param('ID'));
             case 'POST':
@@ -73,10 +73,10 @@ 
      */
     public function deploy(SS_HTTPRequest $request)
     {
-        if (!$this->record->canView($this->getMember())) {
+        if(!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
-        switch ($request->httpMethod()) {
+        switch($request->httpMethod()) {
             case 'GET':
                 return $this->getDeploy($this->getRequest()->param('ID'));
             case 'POST':
@@ -111,7 +111,7 @@ 
      */
     protected function createPing()
     {
-        if (!$this->record->canDeploy($this->getMember())) {
+        if(!$this->record->canDeploy($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
         $ping = DNPing::create();
@@ -138,7 +138,7 @@ 
     protected function getPing($ID)
     {
         $ping = DNPing::get()->byID($ID);
-        if (!$ping) {
+        if(!$ping) {
             return $this->message('Ping not found', 404);
         }
         $output = array(
@@ -154,17 +154,17 @@ 
      */
     protected function createDeploy()
     {
-        if (!$this->record->canDeploy($this->getMember())) {
+        if(!$this->record->canDeploy($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
 
         $reqBody = $this->getRequestBody();
 
-        if ($reqBody === null) {
+        if($reqBody === null) {
             return $this->message('the request body did not contain a valid JSON object.', 400);
         }
 
-        if (empty($reqBody['release'])) {
+        if(empty($reqBody['release'])) {
             return $this->message('deploy requires a {"release": "sha1"} in the body of the request.', 400);
         }
 
@@ -191,7 +191,7 @@ 
     protected function getDeploy($id)
     {
         $deploy = DNDeployment::get()->byID($id);
-        if (!$deploy) {
+        if(!$deploy) {
             return $this->message('Deploy not found', 404);
         }
         $output = array(

Braces +10 added lines, -20 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-class APIEnvironment extends APINoun
-{
+class APIEnvironment extends APINoun {
 
     /**
      * @var array
@@ -15,8 +14,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse
      */
-    public function index(SS_HTTPRequest $request)
-    {
+    public function index(SS_HTTPRequest $request) {
         if (!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to view this environment', 403);
         }
@@ -52,8 +50,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse
      */
-    public function ping(SS_HTTPRequest $request)
-    {
+    public function ping(SS_HTTPRequest $request) {
         if (!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
@@ -71,8 +68,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse
      */
-    public function deploy(SS_HTTPRequest $request)
-    {
+    public function deploy(SS_HTTPRequest $request) {
         if (!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
@@ -89,8 +85,7 @@ 
     /**
      * @return string
      */
-    public function Link()
-    {
+    public function Link() {
         return Controller::join_links(
             $this->parent->Link(),
             $this->record->Project()->Name,
@@ -101,16 +96,14 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function showRecord()
-    {
+    protected function showRecord() {
         return $this->getAPIResponse($this->record->toMap());
     }
 
     /**
      * @return SS_HTTPResponse
      */
-    protected function createPing()
-    {
+    protected function createPing() {
         if (!$this->record->canDeploy($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
@@ -135,8 +128,7 @@ 
      * @param int $ID
      * @return SS_HTTPResponse
      */
-    protected function getPing($ID)
-    {
+    protected function getPing($ID) {
         $ping = DNPing::get()->byID($ID);
         if (!$ping) {
             return $this->message('Ping not found', 404);
@@ -152,8 +144,7 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function createDeploy()
-    {
+    protected function createDeploy() {
         if (!$this->record->canDeploy($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
@@ -188,8 +179,7 @@ 
      * @param int $id
      * @return SS_HTTPResponse
      */
-    protected function getDeploy($id)
-    {
+    protected function getDeploy($id) {
         $deploy = DNDeployment::get()->byID($id);
         if (!$deploy) {
             return $this->message('Deploy not found', 404);

code/api/nouns/APINoun.php

Indentation +114 added lines, -114 removed lines

@@ -1,131 +1,131 @@
 <?php
 /**
- * Base class for the APINouns
- */
+	 * Base class for the APINouns
+	 */
 class APINoun extends Controller
 {
 
-    /**
-     * @var controller
-     */
-    protected $parent = null;
+	/**
+	 * @var controller
+	 */
+	protected $parent = null;
 
-    /**
-     * @var DataObject
-     */
-    protected $record = null;
+	/**
+	 * @var DataObject
+	 */
+	protected $record = null;
 
-    /**
-     * @var Member
-     */
-    protected $member = null;
+	/**
+	 * @var Member
+	 */
+	protected $member = null;
 
-    /**
-     * Holds the url segment for this admin
-     *
-     * @param Controller|null $parent
-     * @param DataObject|null $record
-     */
-    public function __construct(\Controller $parent = null, DataObject $record = null)
-    {
-        $this->record = $record;
-        $this->parent = $parent;
-        parent::__construct();
-    }
+	/**
+	 * Holds the url segment for this admin
+	 *
+	 * @param Controller|null $parent
+	 * @param DataObject|null $record
+	 */
+	public function __construct(\Controller $parent = null, DataObject $record = null)
+	{
+		$this->record = $record;
+		$this->parent = $parent;
+		parent::__construct();
+	}
 
-    /**
-     * Enable basic auth on the API
-     */
-    public function init()
-    {
-        $this->member = BasicAuth::requireLogin('Deploynaut API');
-        parent::init();
-    }
+	/**
+	 * Enable basic auth on the API
+	 */
+	public function init()
+	{
+		$this->member = BasicAuth::requireLogin('Deploynaut API');
+		parent::init();
+	}
 
-    /**
-     * @return DataObject
-     */
-    public function getRecord()
-    {
-        return $this->record;
-    }
+	/**
+	 * @return DataObject
+	 */
+	public function getRecord()
+	{
+		return $this->record;
+	}
 
-    /**
-     * @return Member
-     */
-    public function getMember()
-    {
-        return $this->member;
-    }
+	/**
+	 * @return Member
+	 */
+	public function getMember()
+	{
+		return $this->member;
+	}
 
-    /**
-     * @param array $output
-     * @return SS_HTTPResponse
-     */
-    protected function getAPIResponse($output)
-    {
-        $response = $this->getResponse();
-        if ($this->respondWithText()) {
-            $body = print_r($output, true);
-            $response->addHeader('Content-Type', 'text/plain');
-        } else {
-            $body = Convert::raw2json($output);
-            $response->addHeader('Content-Type', 'application/json');
-        }
-        $response->setBody($body);
-        return $response;
-    }
+	/**
+	 * @param array $output
+	 * @return SS_HTTPResponse
+	 */
+	protected function getAPIResponse($output)
+	{
+		$response = $this->getResponse();
+		if ($this->respondWithText()) {
+			$body = print_r($output, true);
+			$response->addHeader('Content-Type', 'text/plain');
+		} else {
+			$body = Convert::raw2json($output);
+			$response->addHeader('Content-Type', 'application/json');
+		}
+		$response->setBody($body);
+		return $response;
+	}
 
-    /**
-     * @return boolean
-     */
-    protected function respondWithJSON()
-    {
-        if ($this->getRequest()->getExtension() == 'json') {
-            return true;
-        }
-        if (strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false) {
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * @return boolean
+	 */
+	protected function respondWithJSON()
+	{
+		if ($this->getRequest()->getExtension() == 'json') {
+			return true;
+		}
+		if (strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false) {
+			return true;
+		}
+		return false;
+	}
 
-    /**
-     * @return boolean
-     */
-    protected function respondWithText()
-    {
-        if ($this->getRequest()->getExtension() == 'txt') {
-            return true;
-        }
-        if (strpos($this->getRequest()->getHeader('Accept'), 'text/plain') !== false) {
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * @return boolean
+	 */
+	protected function respondWithText()
+	{
+		if ($this->getRequest()->getExtension() == 'txt') {
+			return true;
+		}
+		if (strpos($this->getRequest()->getHeader('Accept'), 'text/plain') !== false) {
+			return true;
+		}
+		return false;
+	}
 
-    /**
-     * @return array|null
-     */
-    protected function getRequestBody()
-    {
-        return Convert::json2array($this->getRequest()->getBody());
-    }
+	/**
+	 * @return array|null
+	 */
+	protected function getRequestBody()
+	{
+		return Convert::json2array($this->getRequest()->getBody());
+	}
 
-    /**
-     * Return a simple response with a message
-     *
-     * @param string $message
-     * @param int $statusCode
-     * @return SS_HTTPResponse
-     */
-    protected function message($message, $statusCode)
-    {
-        $response = $this->getAPIResponse(array(
-            'message' => $message,
-            'statusCode' => $statusCode
-        ));
-        $response->setStatusCode($statusCode);
-        return $response;
-    }
+	/**
+	 * Return a simple response with a message
+	 *
+	 * @param string $message
+	 * @param int $statusCode
+	 * @return SS_HTTPResponse
+	 */
+	protected function message($message, $statusCode)
+	{
+		$response = $this->getAPIResponse(array(
+			'message' => $message,
+			'statusCode' => $statusCode
+		));
+		$response->setStatusCode($statusCode);
+		return $response;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
     protected function getAPIResponse($output)
     {
         $response = $this->getResponse();
-        if ($this->respondWithText()) {
+        if($this->respondWithText()) {
             $body = print_r($output, true);
             $response->addHeader('Content-Type', 'text/plain');
         } else {
@@ -81,10 +81,10 @@ 
      */
     protected function respondWithJSON()
     {
-        if ($this->getRequest()->getExtension() == 'json') {
+        if($this->getRequest()->getExtension() == 'json') {
             return true;
         }
-        if (strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false) {
+        if(strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false) {
             return true;
         }
         return false;
@@ -95,10 +95,10 @@ 
      */
     protected function respondWithText()
     {
-        if ($this->getRequest()->getExtension() == 'txt') {
+        if($this->getRequest()->getExtension() == 'txt') {
             return true;
         }
-        if (strpos($this->getRequest()->getHeader('Accept'), 'text/plain') !== false) {
+        if(strpos($this->getRequest()->getHeader('Accept'), 'text/plain') !== false) {
             return true;
         }
         return false;

Braces +10 added lines, -20 removed lines

@@ -2,8 +2,7 @@ 
 /**
  * Base class for the APINouns
  */
-class APINoun extends Controller
-{
+class APINoun extends Controller {
 
     /**
      * @var controller
@@ -26,8 +25,7 @@ 
      * @param Controller|null $parent
      * @param DataObject|null $record
      */
-    public function __construct(\Controller $parent = null, DataObject $record = null)
-    {
+    public function __construct(\Controller $parent = null, DataObject $record = null) {
         $this->record = $record;
         $this->parent = $parent;
         parent::__construct();
@@ -36,8 +34,7 @@ 
     /**
      * Enable basic auth on the API
      */
-    public function init()
-    {
+    public function init() {
         $this->member = BasicAuth::requireLogin('Deploynaut API');
         parent::init();
     }
@@ -45,16 +42,14 @@ 
     /**
      * @return DataObject
      */
-    public function getRecord()
-    {
+    public function getRecord() {
         return $this->record;
     }
 
     /**
      * @return Member
      */
-    public function getMember()
-    {
+    public function getMember() {
         return $this->member;
     }
 
@@ -62,8 +57,7 @@ 
      * @param array $output
      * @return SS_HTTPResponse
      */
-    protected function getAPIResponse($output)
-    {
+    protected function getAPIResponse($output) {
         $response = $this->getResponse();
         if ($this->respondWithText()) {
             $body = print_r($output, true);
@@ -79,8 +73,7 @@ 
     /**
      * @return boolean
      */
-    protected function respondWithJSON()
-    {
+    protected function respondWithJSON() {
         if ($this->getRequest()->getExtension() == 'json') {
             return true;
         }
@@ -93,8 +86,7 @@ 
     /**
      * @return boolean
      */
-    protected function respondWithText()
-    {
+    protected function respondWithText() {
         if ($this->getRequest()->getExtension() == 'txt') {
             return true;
         }
@@ -107,8 +99,7 @@ 
     /**
      * @return array|null
      */
-    protected function getRequestBody()
-    {
+    protected function getRequestBody() {
         return Convert::json2array($this->getRequest()->getBody());
     }
 
@@ -119,8 +110,7 @@ 
      * @param int $statusCode
      * @return SS_HTTPResponse
      */
-    protected function message($message, $statusCode)
-    {
+    protected function message($message, $statusCode) {
         $response = $this->getAPIResponse(array(
             'message' => $message,
             'statusCode' => $statusCode

code/api/nouns/APIProject.php

Indentation +101 added lines, -101 removed lines

@@ -3,115 +3,115 @@
 class APIProject extends APINoun
 {
 
-    /**
-     * @var array
-     */
-    private static $allowed_actions = array(
-        'index',
-        'fetch'
-    );
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = array(
+		'index',
+		'fetch'
+	);
 
-    /**
-     * @param SS_HTTPRequest $request
-     * @return SS_HTTPResponse
-     */
-    public function index(SS_HTTPRequest $request)
-    {
-        if (!$this->record->canView($this->getMember())) {
-            return $this->message('You are not authorized to this environment', 403);
-        }
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return SS_HTTPResponse
+	 */
+	public function index(SS_HTTPRequest $request)
+	{
+		if (!$this->record->canView($this->getMember())) {
+			return $this->message('You are not authorized to this environment', 403);
+		}
 
-        switch ($request->httpMethod()) {
-            case 'GET':
-                $response = array(
-                    "name" => $this->record->Name,
-                    "href" => Director::absoluteURL($this->record->APILink("")),
-                    "created" => $this->record->Created,
-                    "last-edited" => $this->record->LastEdited,
-                    "disk-quota-mb" => $this->record->DiskQuotaMB,
-                    "environments" => array(),
-                );
-                foreach ($this->record->DNEnvironmentList() as $environment) {
-                    $response['environments'][] = array(
-                        'name' => $environment->Name,
-                        'href' => Director::absoluteURL($this->record->APILink($environment->Name)),
-                    );
-                }
+		switch ($request->httpMethod()) {
+			case 'GET':
+				$response = array(
+					"name" => $this->record->Name,
+					"href" => Director::absoluteURL($this->record->APILink("")),
+					"created" => $this->record->Created,
+					"last-edited" => $this->record->LastEdited,
+					"disk-quota-mb" => $this->record->DiskQuotaMB,
+					"environments" => array(),
+				);
+				foreach ($this->record->DNEnvironmentList() as $environment) {
+					$response['environments'][] = array(
+						'name' => $environment->Name,
+						'href' => Director::absoluteURL($this->record->APILink($environment->Name)),
+					);
+				}
 
-                return $this->getAPIResponse($response);
-            default:
-                return $this->message('API not found', 404);
-        }
-    }
+				return $this->getAPIResponse($response);
+			default:
+				return $this->message('API not found', 404);
+		}
+	}
 
-    /**
-     * @param SS_HTTPRequest $request
-     * @return SS_HTTPResponse
-     */
-    public function fetch(SS_HTTPRequest $request)
-    {
-        if (!$this->record->canView($this->getMember())) {
-            return $this->message('You are not authorized to do that on this environment', 403);
-        }
-        switch ($request->httpMethod()) {
-            case 'GET':
-                return $this->getFetch($this->getRequest()->param('ID'));
-            case 'POST':
-                return $this->createFetch();
-            default:
-                return $this->message('API not found', 404);
-        }
-    }
+	/**
+	 * @param SS_HTTPRequest $request
+	 * @return SS_HTTPResponse
+	 */
+	public function fetch(SS_HTTPRequest $request)
+	{
+		if (!$this->record->canView($this->getMember())) {
+			return $this->message('You are not authorized to do that on this environment', 403);
+		}
+		switch ($request->httpMethod()) {
+			case 'GET':
+				return $this->getFetch($this->getRequest()->param('ID'));
+			case 'POST':
+				return $this->createFetch();
+			default:
+				return $this->message('API not found', 404);
+		}
+	}
 
-    /**
-     * @param int $ID
-     * @return SS_HTTPResponse
-     */
-    protected function getFetch($ID)
-    {
-        $ping = DNGitFetch::get()->byID($ID);
-        if (!$ping) {
-            return $this->message('Fetch not found', 404);
-        }
-        $output = array(
-            'status' => $ping->ResqueStatus(),
-            'message' => $ping->LogContent()
-        );
+	/**
+	 * @param int $ID
+	 * @return SS_HTTPResponse
+	 */
+	protected function getFetch($ID)
+	{
+		$ping = DNGitFetch::get()->byID($ID);
+		if (!$ping) {
+			return $this->message('Fetch not found', 404);
+		}
+		$output = array(
+			'status' => $ping->ResqueStatus(),
+			'message' => $ping->LogContent()
+		);
 
-        return $this->getAPIResponse($output);
-    }
+		return $this->getAPIResponse($output);
+	}
 
-    /**
-     * @return SS_HTTPResponse
-     */
-    protected function createFetch()
-    {
-        /** @var DNGitFetch $fetch */
-        $fetch = DNGitFetch::create();
-        $fetch->ProjectID = $this->record->ID;
-        $fetch->write();
-        $fetch->start();
+	/**
+	 * @return SS_HTTPResponse
+	 */
+	protected function createFetch()
+	{
+		/** @var DNGitFetch $fetch */
+		$fetch = DNGitFetch::create();
+		$fetch->ProjectID = $this->record->ID;
+		$fetch->write();
+		$fetch->start();
 
-        $location = Director::absoluteBaseURL() . $this->Link() . '/fetch/' . $fetch->ID;
-        $output = array(
-            'message' => 'Fetch queued as job ' . $fetch->ResqueToken,
-            'href' => $location,
-        );
+		$location = Director::absoluteBaseURL() . $this->Link() . '/fetch/' . $fetch->ID;
+		$output = array(
+			'message' => 'Fetch queued as job ' . $fetch->ResqueToken,
+			'href' => $location,
+		);
 
-        $response = $this->getAPIResponse($output);
-        $response->setStatusCode(201);
-        $response->addHeader('Location', $location);
-        return $response;
-    }
+		$response = $this->getAPIResponse($output);
+		$response->setStatusCode(201);
+		$response->addHeader('Location', $location);
+		return $response;
+	}
 
-    /**
-     * @return string
-     */
-    public function Link()
-    {
-        return Controller::join_links(
-            $this->parent->Link(),
-            $this->record->Name
-        );
-    }
+	/**
+	 * @return string
+	 */
+	public function Link()
+	{
+		return Controller::join_links(
+			$this->parent->Link(),
+			$this->record->Name
+		);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -17,11 +17,11 @@ 
      */
     public function index(SS_HTTPRequest $request)
     {
-        if (!$this->record->canView($this->getMember())) {
+        if(!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to this environment', 403);
         }
 
-        switch ($request->httpMethod()) {
+        switch($request->httpMethod()) {
             case 'GET':
                 $response = array(
                     "name" => $this->record->Name,
@@ -31,7 +31,7 @@ 
                     "disk-quota-mb" => $this->record->DiskQuotaMB,
                     "environments" => array(),
                 );
-                foreach ($this->record->DNEnvironmentList() as $environment) {
+                foreach($this->record->DNEnvironmentList() as $environment) {
                     $response['environments'][] = array(
                         'name' => $environment->Name,
                         'href' => Director::absoluteURL($this->record->APILink($environment->Name)),
@@ -50,10 +50,10 @@ 
      */
     public function fetch(SS_HTTPRequest $request)
     {
-        if (!$this->record->canView($this->getMember())) {
+        if(!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
-        switch ($request->httpMethod()) {
+        switch($request->httpMethod()) {
             case 'GET':
                 return $this->getFetch($this->getRequest()->param('ID'));
             case 'POST':
@@ -70,7 +70,7 @@ 
     protected function getFetch($ID)
     {
         $ping = DNGitFetch::get()->byID($ID);
-        if (!$ping) {
+        if(!$ping) {
             return $this->message('Fetch not found', 404);
         }
         $output = array(

Braces +6 added lines, -12 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-class APIProject extends APINoun
-{
+class APIProject extends APINoun {
 
     /**
      * @var array
@@ -15,8 +14,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse
      */
-    public function index(SS_HTTPRequest $request)
-    {
+    public function index(SS_HTTPRequest $request) {
         if (!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to this environment', 403);
         }
@@ -48,8 +46,7 @@ 
      * @param SS_HTTPRequest $request
      * @return SS_HTTPResponse
      */
-    public function fetch(SS_HTTPRequest $request)
-    {
+    public function fetch(SS_HTTPRequest $request) {
         if (!$this->record->canView($this->getMember())) {
             return $this->message('You are not authorized to do that on this environment', 403);
         }
@@ -67,8 +64,7 @@ 
      * @param int $ID
      * @return SS_HTTPResponse
      */
-    protected function getFetch($ID)
-    {
+    protected function getFetch($ID) {
         $ping = DNGitFetch::get()->byID($ID);
         if (!$ping) {
             return $this->message('Fetch not found', 404);
@@ -84,8 +80,7 @@ 
     /**
      * @return SS_HTTPResponse
      */
-    protected function createFetch()
-    {
+    protected function createFetch() {
         /** @var DNGitFetch $fetch */
         $fetch = DNGitFetch::create();
         $fetch->ProjectID = $this->record->ID;
@@ -107,8 +102,7 @@ 
     /**
      * @return string
      */
-    public function Link()
-    {
+    public function Link() {
         return Controller::join_links(
             $this->parent->Link(),
             $this->record->Name

code/backends/CapistranoDeploymentBackend.php

Indentation +423 added lines, -423 removed lines

@@ -4,427 +4,427 @@
 class CapistranoDeploymentBackend extends Object implements DeploymentBackend
 {
 
-    protected $packageGenerator;
-
-    public function getPackageGenerator()
-    {
-        return $this->packageGenerator;
-    }
-
-    public function setPackageGenerator(PackageGenerator $packageGenerator)
-    {
-        $this->packageGenerator = $packageGenerator;
-    }
-
-    /**
-     * Create a deployment strategy.
-     *
-     * @param DNEnvironment $environment
-     * @param array $options
-     *
-     * @return DeploymentStrategy
-     */
-    public function planDeploy(DNEnvironment $environment, $options)
-    {
-        $strategy = new DeploymentStrategy($environment, $options);
-
-        $currentBuild = $environment->CurrentBuild();
-        $currentSha = $currentBuild ? $currentBuild->SHA : '-';
-        if ($currentSha !== $options['sha']) {
-            $strategy->setChange('Code version', $currentSha, $options['sha']);
-        }
-        $strategy->setActionTitle('Confirm deployment');
-        $strategy->setActionCode('fast');
-        $strategy->setEstimatedTime('2');
-
-        return $strategy;
-    }
-
-    /**
-     * Deploy the given build to the given environment.
-     *
-     * @param DNEnvironment $environment
-     * @param DeploynautLogFile $log
-     * @param DNProject $project
-     * @param array $options
-     */
-    public function deploy(
-        DNEnvironment $environment,
-        DeploynautLogFile $log,
-        DNProject $project,
-        $options
-    ) {
-        $name = $environment->getFullName();
-        $repository = $project->getLocalCVSPath();
-        $sha = $options['sha'];
-
-        $args = array(
-            'branch' => $sha,
-            'repository' => $repository,
-        );
-
-        $this->extend('deployStart', $environment, $sha, $log, $project);
-
-        $log->write(sprintf('Deploying "%s" to "%s"', $sha, $name));
-
-        $this->enableMaintenance($environment, $log, $project);
-
-        // Use a package generator if specified, otherwise run a direct deploy, which is the default behaviour
-        // if build_filename isn't specified
-        if ($this->packageGenerator) {
-            $log->write(sprintf('Using package generator "%s"', get_class($this->packageGenerator)));
-
-            try {
-                $args['build_filename'] = $this->packageGenerator->getPackageFilename($project->Name, $sha, $repository, $log);
-            } catch (Exception $e) {
-                $log->write($e->getMessage());
-                throw $e;
-            }
-
-            if (empty($args['build_filename'])) {
-                throw new RuntimeException('Failed to generate package.');
-            }
-        }
-
-        $command = $this->getCommand('deploy', 'web', $environment, $args, $log);
-        $command->run(function ($type, $buffer) use ($log) {
-            $log->write($buffer);
-        });
-
-        // Deployment cleanup. We assume it is always safe to run this at the end, regardless of the outcome.
-        $self = $this;
-        $cleanupFn = function () use ($self, $environment, $args, $log) {
-            $command = $self->getCommand('deploy:cleanup', 'web', $environment, $args, $log);
-            $command->run(function ($type, $buffer) use ($log) {
-                $log->write($buffer);
-            });
-
-            if (!$command->isSuccessful()) {
-                $this->extend('cleanupFailure', $environment, $sha, $log, $project);
-                $log->write('Warning: Cleanup failed, but fine to continue. Needs manual cleanup sometime.');
-            }
-        };
-
-        // Once the deployment has run it's necessary to update the maintenance page status
-        if (!empty($options['leaveMaintenancePage'])) {
-            $this->enableMaintenance($environment, $log, $project);
-        }
-
-        if (!$command->isSuccessful()) {
-            $cleanupFn();
-            $this->extend('deployFailure', $environment, $sha, $log, $project);
-            throw new RuntimeException($command->getErrorOutput());
-        }
-
-        // Check if maintenance page should be removed
-        if (empty($options['leaveMaintenancePage'])) {
-            $this->disableMaintenance($environment, $log, $project);
-        }
-
-        $cleanupFn();
-
-        $log->write(sprintf('Deploy of "%s" to "%s" finished', $sha, $name));
-
-        $this->extend('deployEnd', $environment, $sha, $log, $project);
-    }
-
-    /**
-     * Enable a maintenance page for the given environment using the maintenance:enable Capistrano task.
-     */
-    public function enableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
-        $name = $environment->getFullName();
-        $command = $this->getCommand('maintenance:enable', 'web', $environment, null, $log);
-        $command->run(function ($type, $buffer) use ($log) {
-            $log->write($buffer);
-        });
-        if (!$command->isSuccessful()) {
-            $this->extend('maintenanceEnableFailure', $environment, $log);
-            throw new RuntimeException($command->getErrorOutput());
-        }
-        $log->write(sprintf('Maintenance page enabled on "%s"', $name));
-    }
-
-    /**
-     * Disable the maintenance page for the given environment using the maintenance:disable Capistrano task.
-     */
-    public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
-        $name = $environment->getFullName();
-        $command = $this->getCommand('maintenance:disable', 'web', $environment, null, $log);
-        $command->run(function ($type, $buffer) use ($log) {
-            $log->write($buffer);
-        });
-        if (!$command->isSuccessful()) {
-            $this->extend('maintenanceDisableFailure', $environment, $log);
-            throw new RuntimeException($command->getErrorOutput());
-        }
-        $log->write(sprintf('Maintenance page disabled on "%s"', $name));
-    }
-
-    /**
-     * Check the status using the deploy:check capistrano method
-     */
-    public function ping(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
-        $command = $this->getCommand('deploy:check', 'web', $environment, null, $log);
-        $command->run(function ($type, $buffer) use ($log) {
-            $log->write($buffer);
-            echo $buffer;
-        });
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
-    {
-        if ($dataTransfer->Direction == 'get') {
-            $this->dataTransferBackup($dataTransfer, $log);
-        } else {
-            $environment = $dataTransfer->Environment();
-            $project = $environment->Project();
-            $workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
-            $archive = $dataTransfer->DataArchive();
-
-            // extract the sspak contents, we'll need these so capistrano can restore that content
-            try {
-                $archive->extractArchive($workingDir);
-            } catch (Exception $e) {
-                $log->write($e->getMessage());
-                throw new RuntimeException($e->getMessage());
-            }
-
-            // validate the contents match the requested transfer mode
-            $result = $archive->validateArchiveContents($dataTransfer->Mode);
-            if (!$result->valid()) {
-                // do some cleaning, get rid of the extracted archive lying around
-                $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
-                $process->run();
-
-                // log the reason why we can't restore the snapshot and halt the process
-                $log->write($result->message());
-                throw new RuntimeException($result->message());
-            }
-
-            // Put up a maintenance page during a restore of db or assets.
-            $this->enableMaintenance($environment, $log, $project);
-            $this->dataTransferRestore($workingDir, $dataTransfer, $log);
-            $this->disableMaintenance($environment, $log, $project);
-        }
-    }
-
-    /**
-     * @param string $action Capistrano action to be executed
-     * @param string $roles Defining a server role is required to target only the required servers.
-     * @param DNEnvironment $environment
-     * @param array<string>|null $args Additional arguments for process
-     * @param DeploynautLogFile $log
-     * @return \Symfony\Component\Process\Process
-     */
-    public function getCommand($action, $roles, DNEnvironment $environment, $args = null, DeploynautLogFile $log)
-    {
-        $name = $environment->getFullName();
-        $env = $environment->Project()->getProcessEnv();
-
-        if (!$args) {
-            $args = array();
-        }
-        $args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH . '/');
-
-        // Inject env string directly into the command.
-        // Capistrano doesn't like the $process->setEnv($env) we'd normally do below.
-        $envString = '';
-        if (!empty($env)) {
-            $envString .= 'env ';
-            foreach ($env as $key => $value) {
-                $envString .= "$key=\"$value\" ";
-            }
-        }
-
-        $data = DNData::inst();
-        // Generate a capfile from a template
-        $capTemplate = file_get_contents(BASE_PATH . '/deploynaut/Capfile.template');
-        $cap = str_replace(
-            array('<config root>', '<ssh key>', '<base path>'),
-            array($data->getEnvironmentDir(), DEPLOYNAUT_SSH_KEY, BASE_PATH),
-            $capTemplate
-        );
-
-        if (defined('DEPLOYNAUT_CAPFILE')) {
-            $capFile = DEPLOYNAUT_CAPFILE;
-        } else {
-            $capFile = ASSETS_PATH . '/Capfile';
-        }
-        file_put_contents($capFile, $cap);
-
-        $command = "{$envString}cap -f " . escapeshellarg($capFile) . " -vv $name $action ROLES=$roles";
-        foreach ($args as $argName => $argVal) {
-            $command .= ' -s ' . escapeshellarg($argName) . '=' . escapeshellarg($argVal);
-        }
-
-        $log->write(sprintf('Running command: %s', $command));
-
-        $process = new Process($command);
-        $process->setTimeout(3600);
-        return $process;
-    }
-
-    /**
-     * Backs up database and/or assets to a designated folder,
-     * and packs up the files into a single sspak.
-     *
-     * @param DNDataTransfer    $dataTransfer
-     * @param DeploynautLogFile $log
-     */
-    protected function dataTransferBackup(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
-    {
-        $environment = $dataTransfer->Environment();
-        $name = $environment->getFullName();
-
-        // Associate a new archive with the transfer.
-        // Doesn't retrieve a filepath just yet, need to generate the files first.
-        $dataArchive = DNDataArchive::create();
-        $dataArchive->Mode = $dataTransfer->Mode;
-        $dataArchive->AuthorID = $dataTransfer->AuthorID;
-        $dataArchive->OriginalEnvironmentID = $environment->ID;
-        $dataArchive->EnvironmentID = $environment->ID;
-        $dataArchive->IsBackup = $dataTransfer->IsBackupDataTransfer();
-
-        // Generate directory structure with strict permissions (contains very sensitive data)
-        $filepathBase = $dataArchive->generateFilepath($dataTransfer);
-        mkdir($filepathBase, 0700, true);
-
-        $databasePath = $filepathBase . DIRECTORY_SEPARATOR . 'database.sql';
-
-        // Backup database
-        if (in_array($dataTransfer->Mode, array('all', 'db'))) {
-            $log->write(sprintf('Backup of database from "%s" started', $name));
-            $command = $this->getCommand('data:getdb', 'db', $environment, array('data_path' => $databasePath), $log);
-            $command->run(function ($type, $buffer) use ($log) {
-                $log->write($buffer);
-            });
-            if (!$command->isSuccessful()) {
-                $this->extend('dataTransferFailure', $environment, $log);
-                throw new RuntimeException($command->getErrorOutput());
-            }
-            $log->write(sprintf('Backup of database from "%s" done', $name));
-        }
-
-        // Backup assets
-        if (in_array($dataTransfer->Mode, array('all', 'assets'))) {
-            $log->write(sprintf('Backup of assets from "%s" started', $name));
-            $command = $this->getCommand('data:getassets', 'web', $environment, array('data_path' => $filepathBase), $log);
-            $command->run(function ($type, $buffer) use ($log) {
-                $log->write($buffer);
-            });
-            if (!$command->isSuccessful()) {
-                $this->extend('dataTransferFailure', $environment, $log);
-                throw new RuntimeException($command->getErrorOutput());
-            }
-            $log->write(sprintf('Backup of assets from "%s" done', $name));
-        }
-
-        $sspakFilename = sprintf('%s.sspak', $dataArchive->generateFilename($dataTransfer));
-        $sspakFilepath = $filepathBase . DIRECTORY_SEPARATOR . $sspakFilename;
-
-        try {
-            $dataArchive->attachFile($sspakFilepath, $dataTransfer);
-            $dataArchive->setArchiveFromFiles($filepathBase);
-        } catch (Exception $e) {
-            $log->write($e->getMessage());
-            throw new RuntimeException($e->getMessage());
-        }
-
-        // Remove any assets and db files lying around, they're not longer needed as they're now part
-        // of the sspak file we just generated. Use --force to avoid errors when files don't exist,
-        // e.g. when just an assets backup has been requested and no database.sql exists.
-        $process = new Process(sprintf('rm -rf %s/assets && rm -f %s', $filepathBase, $databasePath));
-        $process->run();
-        if (!$process->isSuccessful()) {
-            $log->write('Could not delete temporary files');
-            throw new RuntimeException($process->getErrorOutput());
-        }
-
-        $log->write(sprintf('Creating sspak file done: %s', $dataArchive->ArchiveFile()->getAbsoluteURL()));
-    }
-
-    /**
-     * Utility function for triggering the db rebuild and flush.
-     * Also cleans up and generates new error pages.
-     * @param DeploynautLogFile $log
-     */
-    public function rebuild(DNEnvironment $environment, $log)
-    {
-        $name = $environment->getFullName();
-        $command = $this->getCommand('deploy:migrate', 'web', $environment, null, $log);
-        $command->run(function ($type, $buffer) use ($log) {
-            $log->write($buffer);
-        });
-        if (!$command->isSuccessful()) {
-            $log->write(sprintf('Rebuild of "%s" failed: %s', $name, $command->getErrorOutput()));
-            throw new RuntimeException($command->getErrorOutput());
-        }
-        $log->write(sprintf('Rebuild of "%s" done', $name));
-    }
-
-    /**
-     * Extracts a *.sspak file referenced through the passed in $dataTransfer
-     * and pushes it to the environment referenced in $dataTransfer.
-     *
-     * @param string $workingDir Directory for the unpacked files.
-     * @param DNDataTransfer $dataTransfer
-     * @param DeploynautLogFile $log
-     */
-    protected function dataTransferRestore($workingDir, DNDataTransfer $dataTransfer, DeploynautLogFile $log)
-    {
-        $environment = $dataTransfer->Environment();
-        $name = $environment->getFullName();
-
-        // Rollback cleanup.
-        $self = $this;
-        $cleanupFn = function () use ($self, $workingDir, $environment, $log) {
-            // Rebuild makes sense even if failed - maybe we can at least partly recover.
-            $self->rebuild($environment, $log);
-            $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
-            $process->run();
-        };
-
-        // Restore database into target environment
-        if (in_array($dataTransfer->Mode, array('all', 'db'))) {
-            $log->write(sprintf('Restore of database to "%s" started', $name));
-            $args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'database.sql');
-            $command = $this->getCommand('data:pushdb', 'db', $environment, $args, $log);
-            $command->run(function ($type, $buffer) use ($log) {
-                $log->write($buffer);
-            });
-            if (!$command->isSuccessful()) {
-                $cleanupFn();
-                $log->write(sprintf('Restore of database to "%s" failed: %s', $name, $command->getErrorOutput()));
-                $this->extend('dataTransferFailure', $environment, $log);
-                throw new RuntimeException($command->getErrorOutput());
-            }
-            $log->write(sprintf('Restore of database to "%s" done', $name));
-        }
-
-        // Restore assets into target environment
-        if (in_array($dataTransfer->Mode, array('all', 'assets'))) {
-            $log->write(sprintf('Restore of assets to "%s" started', $name));
-            $args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'assets');
-            $command = $this->getCommand('data:pushassets', 'web', $environment, $args, $log);
-            $command->run(function ($type, $buffer) use ($log) {
-                $log->write($buffer);
-            });
-            if (!$command->isSuccessful()) {
-                $cleanupFn();
-                $log->write(sprintf('Restore of assets to "%s" failed: %s', $name, $command->getErrorOutput()));
-                $this->extend('dataTransferFailure', $environment, $log);
-                throw new RuntimeException($command->getErrorOutput());
-            }
-            $log->write(sprintf('Restore of assets to "%s" done', $name));
-        }
-
-        $log->write('Rebuilding and cleaning up');
-        $cleanupFn();
-    }
+	protected $packageGenerator;
+
+	public function getPackageGenerator()
+	{
+		return $this->packageGenerator;
+	}
+
+	public function setPackageGenerator(PackageGenerator $packageGenerator)
+	{
+		$this->packageGenerator = $packageGenerator;
+	}
+
+	/**
+	 * Create a deployment strategy.
+	 *
+	 * @param DNEnvironment $environment
+	 * @param array $options
+	 *
+	 * @return DeploymentStrategy
+	 */
+	public function planDeploy(DNEnvironment $environment, $options)
+	{
+		$strategy = new DeploymentStrategy($environment, $options);
+
+		$currentBuild = $environment->CurrentBuild();
+		$currentSha = $currentBuild ? $currentBuild->SHA : '-';
+		if ($currentSha !== $options['sha']) {
+			$strategy->setChange('Code version', $currentSha, $options['sha']);
+		}
+		$strategy->setActionTitle('Confirm deployment');
+		$strategy->setActionCode('fast');
+		$strategy->setEstimatedTime('2');
+
+		return $strategy;
+	}
+
+	/**
+	 * Deploy the given build to the given environment.
+	 *
+	 * @param DNEnvironment $environment
+	 * @param DeploynautLogFile $log
+	 * @param DNProject $project
+	 * @param array $options
+	 */
+	public function deploy(
+		DNEnvironment $environment,
+		DeploynautLogFile $log,
+		DNProject $project,
+		$options
+	) {
+		$name = $environment->getFullName();
+		$repository = $project->getLocalCVSPath();
+		$sha = $options['sha'];
+
+		$args = array(
+			'branch' => $sha,
+			'repository' => $repository,
+		);
+
+		$this->extend('deployStart', $environment, $sha, $log, $project);
+
+		$log->write(sprintf('Deploying "%s" to "%s"', $sha, $name));
+
+		$this->enableMaintenance($environment, $log, $project);
+
+		// Use a package generator if specified, otherwise run a direct deploy, which is the default behaviour
+		// if build_filename isn't specified
+		if ($this->packageGenerator) {
+			$log->write(sprintf('Using package generator "%s"', get_class($this->packageGenerator)));
+
+			try {
+				$args['build_filename'] = $this->packageGenerator->getPackageFilename($project->Name, $sha, $repository, $log);
+			} catch (Exception $e) {
+				$log->write($e->getMessage());
+				throw $e;
+			}
+
+			if (empty($args['build_filename'])) {
+				throw new RuntimeException('Failed to generate package.');
+			}
+		}
+
+		$command = $this->getCommand('deploy', 'web', $environment, $args, $log);
+		$command->run(function ($type, $buffer) use ($log) {
+			$log->write($buffer);
+		});
+
+		// Deployment cleanup. We assume it is always safe to run this at the end, regardless of the outcome.
+		$self = $this;
+		$cleanupFn = function () use ($self, $environment, $args, $log) {
+			$command = $self->getCommand('deploy:cleanup', 'web', $environment, $args, $log);
+			$command->run(function ($type, $buffer) use ($log) {
+				$log->write($buffer);
+			});
+
+			if (!$command->isSuccessful()) {
+				$this->extend('cleanupFailure', $environment, $sha, $log, $project);
+				$log->write('Warning: Cleanup failed, but fine to continue. Needs manual cleanup sometime.');
+			}
+		};
+
+		// Once the deployment has run it's necessary to update the maintenance page status
+		if (!empty($options['leaveMaintenancePage'])) {
+			$this->enableMaintenance($environment, $log, $project);
+		}
+
+		if (!$command->isSuccessful()) {
+			$cleanupFn();
+			$this->extend('deployFailure', $environment, $sha, $log, $project);
+			throw new RuntimeException($command->getErrorOutput());
+		}
+
+		// Check if maintenance page should be removed
+		if (empty($options['leaveMaintenancePage'])) {
+			$this->disableMaintenance($environment, $log, $project);
+		}
+
+		$cleanupFn();
+
+		$log->write(sprintf('Deploy of "%s" to "%s" finished', $sha, $name));
+
+		$this->extend('deployEnd', $environment, $sha, $log, $project);
+	}
+
+	/**
+	 * Enable a maintenance page for the given environment using the maintenance:enable Capistrano task.
+	 */
+	public function enableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
+	{
+		$name = $environment->getFullName();
+		$command = $this->getCommand('maintenance:enable', 'web', $environment, null, $log);
+		$command->run(function ($type, $buffer) use ($log) {
+			$log->write($buffer);
+		});
+		if (!$command->isSuccessful()) {
+			$this->extend('maintenanceEnableFailure', $environment, $log);
+			throw new RuntimeException($command->getErrorOutput());
+		}
+		$log->write(sprintf('Maintenance page enabled on "%s"', $name));
+	}
+
+	/**
+	 * Disable the maintenance page for the given environment using the maintenance:disable Capistrano task.
+	 */
+	public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
+	{
+		$name = $environment->getFullName();
+		$command = $this->getCommand('maintenance:disable', 'web', $environment, null, $log);
+		$command->run(function ($type, $buffer) use ($log) {
+			$log->write($buffer);
+		});
+		if (!$command->isSuccessful()) {
+			$this->extend('maintenanceDisableFailure', $environment, $log);
+			throw new RuntimeException($command->getErrorOutput());
+		}
+		$log->write(sprintf('Maintenance page disabled on "%s"', $name));
+	}
+
+	/**
+	 * Check the status using the deploy:check capistrano method
+	 */
+	public function ping(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
+	{
+		$command = $this->getCommand('deploy:check', 'web', $environment, null, $log);
+		$command->run(function ($type, $buffer) use ($log) {
+			$log->write($buffer);
+			echo $buffer;
+		});
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
+	{
+		if ($dataTransfer->Direction == 'get') {
+			$this->dataTransferBackup($dataTransfer, $log);
+		} else {
+			$environment = $dataTransfer->Environment();
+			$project = $environment->Project();
+			$workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
+			$archive = $dataTransfer->DataArchive();
+
+			// extract the sspak contents, we'll need these so capistrano can restore that content
+			try {
+				$archive->extractArchive($workingDir);
+			} catch (Exception $e) {
+				$log->write($e->getMessage());
+				throw new RuntimeException($e->getMessage());
+			}
+
+			// validate the contents match the requested transfer mode
+			$result = $archive->validateArchiveContents($dataTransfer->Mode);
+			if (!$result->valid()) {
+				// do some cleaning, get rid of the extracted archive lying around
+				$process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
+				$process->run();
+
+				// log the reason why we can't restore the snapshot and halt the process
+				$log->write($result->message());
+				throw new RuntimeException($result->message());
+			}
+
+			// Put up a maintenance page during a restore of db or assets.
+			$this->enableMaintenance($environment, $log, $project);
+			$this->dataTransferRestore($workingDir, $dataTransfer, $log);
+			$this->disableMaintenance($environment, $log, $project);
+		}
+	}
+
+	/**
+	 * @param string $action Capistrano action to be executed
+	 * @param string $roles Defining a server role is required to target only the required servers.
+	 * @param DNEnvironment $environment
+	 * @param array<string>|null $args Additional arguments for process
+	 * @param DeploynautLogFile $log
+	 * @return \Symfony\Component\Process\Process
+	 */
+	public function getCommand($action, $roles, DNEnvironment $environment, $args = null, DeploynautLogFile $log)
+	{
+		$name = $environment->getFullName();
+		$env = $environment->Project()->getProcessEnv();
+
+		if (!$args) {
+			$args = array();
+		}
+		$args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH . '/');
+
+		// Inject env string directly into the command.
+		// Capistrano doesn't like the $process->setEnv($env) we'd normally do below.
+		$envString = '';
+		if (!empty($env)) {
+			$envString .= 'env ';
+			foreach ($env as $key => $value) {
+				$envString .= "$key=\"$value\" ";
+			}
+		}
+
+		$data = DNData::inst();
+		// Generate a capfile from a template
+		$capTemplate = file_get_contents(BASE_PATH . '/deploynaut/Capfile.template');
+		$cap = str_replace(
+			array('<config root>', '<ssh key>', '<base path>'),
+			array($data->getEnvironmentDir(), DEPLOYNAUT_SSH_KEY, BASE_PATH),
+			$capTemplate
+		);
+
+		if (defined('DEPLOYNAUT_CAPFILE')) {
+			$capFile = DEPLOYNAUT_CAPFILE;
+		} else {
+			$capFile = ASSETS_PATH . '/Capfile';
+		}
+		file_put_contents($capFile, $cap);
+
+		$command = "{$envString}cap -f " . escapeshellarg($capFile) . " -vv $name $action ROLES=$roles";
+		foreach ($args as $argName => $argVal) {
+			$command .= ' -s ' . escapeshellarg($argName) . '=' . escapeshellarg($argVal);
+		}
+
+		$log->write(sprintf('Running command: %s', $command));
+
+		$process = new Process($command);
+		$process->setTimeout(3600);
+		return $process;
+	}
+
+	/**
+	 * Backs up database and/or assets to a designated folder,
+	 * and packs up the files into a single sspak.
+	 *
+	 * @param DNDataTransfer    $dataTransfer
+	 * @param DeploynautLogFile $log
+	 */
+	protected function dataTransferBackup(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
+	{
+		$environment = $dataTransfer->Environment();
+		$name = $environment->getFullName();
+
+		// Associate a new archive with the transfer.
+		// Doesn't retrieve a filepath just yet, need to generate the files first.
+		$dataArchive = DNDataArchive::create();
+		$dataArchive->Mode = $dataTransfer->Mode;
+		$dataArchive->AuthorID = $dataTransfer->AuthorID;
+		$dataArchive->OriginalEnvironmentID = $environment->ID;
+		$dataArchive->EnvironmentID = $environment->ID;
+		$dataArchive->IsBackup = $dataTransfer->IsBackupDataTransfer();
+
+		// Generate directory structure with strict permissions (contains very sensitive data)
+		$filepathBase = $dataArchive->generateFilepath($dataTransfer);
+		mkdir($filepathBase, 0700, true);
+
+		$databasePath = $filepathBase . DIRECTORY_SEPARATOR . 'database.sql';
+
+		// Backup database
+		if (in_array($dataTransfer->Mode, array('all', 'db'))) {
+			$log->write(sprintf('Backup of database from "%s" started', $name));
+			$command = $this->getCommand('data:getdb', 'db', $environment, array('data_path' => $databasePath), $log);
+			$command->run(function ($type, $buffer) use ($log) {
+				$log->write($buffer);
+			});
+			if (!$command->isSuccessful()) {
+				$this->extend('dataTransferFailure', $environment, $log);
+				throw new RuntimeException($command->getErrorOutput());
+			}
+			$log->write(sprintf('Backup of database from "%s" done', $name));
+		}
+
+		// Backup assets
+		if (in_array($dataTransfer->Mode, array('all', 'assets'))) {
+			$log->write(sprintf('Backup of assets from "%s" started', $name));
+			$command = $this->getCommand('data:getassets', 'web', $environment, array('data_path' => $filepathBase), $log);
+			$command->run(function ($type, $buffer) use ($log) {
+				$log->write($buffer);
+			});
+			if (!$command->isSuccessful()) {
+				$this->extend('dataTransferFailure', $environment, $log);
+				throw new RuntimeException($command->getErrorOutput());
+			}
+			$log->write(sprintf('Backup of assets from "%s" done', $name));
+		}
+
+		$sspakFilename = sprintf('%s.sspak', $dataArchive->generateFilename($dataTransfer));
+		$sspakFilepath = $filepathBase . DIRECTORY_SEPARATOR . $sspakFilename;
+
+		try {
+			$dataArchive->attachFile($sspakFilepath, $dataTransfer);
+			$dataArchive->setArchiveFromFiles($filepathBase);
+		} catch (Exception $e) {
+			$log->write($e->getMessage());
+			throw new RuntimeException($e->getMessage());
+		}
+
+		// Remove any assets and db files lying around, they're not longer needed as they're now part
+		// of the sspak file we just generated. Use --force to avoid errors when files don't exist,
+		// e.g. when just an assets backup has been requested and no database.sql exists.
+		$process = new Process(sprintf('rm -rf %s/assets && rm -f %s', $filepathBase, $databasePath));
+		$process->run();
+		if (!$process->isSuccessful()) {
+			$log->write('Could not delete temporary files');
+			throw new RuntimeException($process->getErrorOutput());
+		}
+
+		$log->write(sprintf('Creating sspak file done: %s', $dataArchive->ArchiveFile()->getAbsoluteURL()));
+	}
+
+	/**
+	 * Utility function for triggering the db rebuild and flush.
+	 * Also cleans up and generates new error pages.
+	 * @param DeploynautLogFile $log
+	 */
+	public function rebuild(DNEnvironment $environment, $log)
+	{
+		$name = $environment->getFullName();
+		$command = $this->getCommand('deploy:migrate', 'web', $environment, null, $log);
+		$command->run(function ($type, $buffer) use ($log) {
+			$log->write($buffer);
+		});
+		if (!$command->isSuccessful()) {
+			$log->write(sprintf('Rebuild of "%s" failed: %s', $name, $command->getErrorOutput()));
+			throw new RuntimeException($command->getErrorOutput());
+		}
+		$log->write(sprintf('Rebuild of "%s" done', $name));
+	}
+
+	/**
+	 * Extracts a *.sspak file referenced through the passed in $dataTransfer
+	 * and pushes it to the environment referenced in $dataTransfer.
+	 *
+	 * @param string $workingDir Directory for the unpacked files.
+	 * @param DNDataTransfer $dataTransfer
+	 * @param DeploynautLogFile $log
+	 */
+	protected function dataTransferRestore($workingDir, DNDataTransfer $dataTransfer, DeploynautLogFile $log)
+	{
+		$environment = $dataTransfer->Environment();
+		$name = $environment->getFullName();
+
+		// Rollback cleanup.
+		$self = $this;
+		$cleanupFn = function () use ($self, $workingDir, $environment, $log) {
+			// Rebuild makes sense even if failed - maybe we can at least partly recover.
+			$self->rebuild($environment, $log);
+			$process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
+			$process->run();
+		};
+
+		// Restore database into target environment
+		if (in_array($dataTransfer->Mode, array('all', 'db'))) {
+			$log->write(sprintf('Restore of database to "%s" started', $name));
+			$args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'database.sql');
+			$command = $this->getCommand('data:pushdb', 'db', $environment, $args, $log);
+			$command->run(function ($type, $buffer) use ($log) {
+				$log->write($buffer);
+			});
+			if (!$command->isSuccessful()) {
+				$cleanupFn();
+				$log->write(sprintf('Restore of database to "%s" failed: %s', $name, $command->getErrorOutput()));
+				$this->extend('dataTransferFailure', $environment, $log);
+				throw new RuntimeException($command->getErrorOutput());
+			}
+			$log->write(sprintf('Restore of database to "%s" done', $name));
+		}
+
+		// Restore assets into target environment
+		if (in_array($dataTransfer->Mode, array('all', 'assets'))) {
+			$log->write(sprintf('Restore of assets to "%s" started', $name));
+			$args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'assets');
+			$command = $this->getCommand('data:pushassets', 'web', $environment, $args, $log);
+			$command->run(function ($type, $buffer) use ($log) {
+				$log->write($buffer);
+			});
+			if (!$command->isSuccessful()) {
+				$cleanupFn();
+				$log->write(sprintf('Restore of assets to "%s" failed: %s', $name, $command->getErrorOutput()));
+				$this->extend('dataTransferFailure', $environment, $log);
+				throw new RuntimeException($command->getErrorOutput());
+			}
+			$log->write(sprintf('Restore of assets to "%s" done', $name));
+		}
+
+		$log->write('Rebuilding and cleaning up');
+		$cleanupFn();
+	}
 }

Spacing +41 added lines, -41 removed lines

@@ -30,7 +30,7 @@ 
 
         $currentBuild = $environment->CurrentBuild();
         $currentSha = $currentBuild ? $currentBuild->SHA : '-';
-        if ($currentSha !== $options['sha']) {
+        if($currentSha !== $options['sha']) {
             $strategy->setChange('Code version', $currentSha, $options['sha']);
         }
         $strategy->setActionTitle('Confirm deployment');
@@ -71,53 +71,53 @@ 
 
         // Use a package generator if specified, otherwise run a direct deploy, which is the default behaviour
         // if build_filename isn't specified
-        if ($this->packageGenerator) {
+        if($this->packageGenerator) {
             $log->write(sprintf('Using package generator "%s"', get_class($this->packageGenerator)));
 
             try {
                 $args['build_filename'] = $this->packageGenerator->getPackageFilename($project->Name, $sha, $repository, $log);
-            } catch (Exception $e) {
+            } catch(Exception $e) {
                 $log->write($e->getMessage());
                 throw $e;
             }
 
-            if (empty($args['build_filename'])) {
+            if(empty($args['build_filename'])) {
                 throw new RuntimeException('Failed to generate package.');
             }
         }
 
         $command = $this->getCommand('deploy', 'web', $environment, $args, $log);
-        $command->run(function ($type, $buffer) use ($log) {
+        $command->run(function($type, $buffer) use ($log) {
             $log->write($buffer);
         });
 
         // Deployment cleanup. We assume it is always safe to run this at the end, regardless of the outcome.
         $self = $this;
-        $cleanupFn = function () use ($self, $environment, $args, $log) {
+        $cleanupFn = function() use ($self, $environment, $args, $log) {
             $command = $self->getCommand('deploy:cleanup', 'web', $environment, $args, $log);
-            $command->run(function ($type, $buffer) use ($log) {
+            $command->run(function($type, $buffer) use ($log) {
                 $log->write($buffer);
             });
 
-            if (!$command->isSuccessful()) {
+            if(!$command->isSuccessful()) {
                 $this->extend('cleanupFailure', $environment, $sha, $log, $project);
                 $log->write('Warning: Cleanup failed, but fine to continue. Needs manual cleanup sometime.');
             }
         };
 
         // Once the deployment has run it's necessary to update the maintenance page status
-        if (!empty($options['leaveMaintenancePage'])) {
+        if(!empty($options['leaveMaintenancePage'])) {
             $this->enableMaintenance($environment, $log, $project);
         }
 
-        if (!$command->isSuccessful()) {
+        if(!$command->isSuccessful()) {
             $cleanupFn();
             $this->extend('deployFailure', $environment, $sha, $log, $project);
             throw new RuntimeException($command->getErrorOutput());
         }
 
         // Check if maintenance page should be removed
-        if (empty($options['leaveMaintenancePage'])) {
+        if(empty($options['leaveMaintenancePage'])) {
             $this->disableMaintenance($environment, $log, $project);
         }
 
@@ -135,10 +135,10 @@ 
     {
         $name = $environment->getFullName();
         $command = $this->getCommand('maintenance:enable', 'web', $environment, null, $log);
-        $command->run(function ($type, $buffer) use ($log) {
+        $command->run(function($type, $buffer) use ($log) {
             $log->write($buffer);
         });
-        if (!$command->isSuccessful()) {
+        if(!$command->isSuccessful()) {
             $this->extend('maintenanceEnableFailure', $environment, $log);
             throw new RuntimeException($command->getErrorOutput());
         }
@@ -152,10 +152,10 @@ 
     {
         $name = $environment->getFullName();
         $command = $this->getCommand('maintenance:disable', 'web', $environment, null, $log);
-        $command->run(function ($type, $buffer) use ($log) {
+        $command->run(function($type, $buffer) use ($log) {
             $log->write($buffer);
         });
-        if (!$command->isSuccessful()) {
+        if(!$command->isSuccessful()) {
             $this->extend('maintenanceDisableFailure', $environment, $log);
             throw new RuntimeException($command->getErrorOutput());
         }
@@ -168,7 +168,7 @@ 
     public function ping(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
     {
         $command = $this->getCommand('deploy:check', 'web', $environment, null, $log);
-        $command->run(function ($type, $buffer) use ($log) {
+        $command->run(function($type, $buffer) use ($log) {
             $log->write($buffer);
             echo $buffer;
         });
@@ -179,7 +179,7 @@ 
      */
     public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
     {
-        if ($dataTransfer->Direction == 'get') {
+        if($dataTransfer->Direction == 'get') {
             $this->dataTransferBackup($dataTransfer, $log);
         } else {
             $environment = $dataTransfer->Environment();
@@ -190,14 +190,14 @@ 
             // extract the sspak contents, we'll need these so capistrano can restore that content
             try {
                 $archive->extractArchive($workingDir);
-            } catch (Exception $e) {
+            } catch(Exception $e) {
                 $log->write($e->getMessage());
                 throw new RuntimeException($e->getMessage());
             }
 
             // validate the contents match the requested transfer mode
             $result = $archive->validateArchiveContents($dataTransfer->Mode);
-            if (!$result->valid()) {
+            if(!$result->valid()) {
                 // do some cleaning, get rid of the extracted archive lying around
                 $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
                 $process->run();
@@ -227,7 +227,7 @@ 
         $name = $environment->getFullName();
         $env = $environment->Project()->getProcessEnv();
 
-        if (!$args) {
+        if(!$args) {
             $args = array();
         }
         $args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH . '/');
@@ -235,9 +235,9 @@ 
         // Inject env string directly into the command.
         // Capistrano doesn't like the $process->setEnv($env) we'd normally do below.
         $envString = '';
-        if (!empty($env)) {
+        if(!empty($env)) {
             $envString .= 'env ';
-            foreach ($env as $key => $value) {
+            foreach($env as $key => $value) {
                 $envString .= "$key=\"$value\" ";
             }
         }
@@ -251,7 +251,7 @@ 
             $capTemplate
         );
 
-        if (defined('DEPLOYNAUT_CAPFILE')) {
+        if(defined('DEPLOYNAUT_CAPFILE')) {
             $capFile = DEPLOYNAUT_CAPFILE;
         } else {
             $capFile = ASSETS_PATH . '/Capfile';
@@ -259,7 +259,7 @@ 
         file_put_contents($capFile, $cap);
 
         $command = "{$envString}cap -f " . escapeshellarg($capFile) . " -vv $name $action ROLES=$roles";
-        foreach ($args as $argName => $argVal) {
+        foreach($args as $argName => $argVal) {
             $command .= ' -s ' . escapeshellarg($argName) . '=' . escapeshellarg($argVal);
         }
 
@@ -298,13 +298,13 @@ 
         $databasePath = $filepathBase . DIRECTORY_SEPARATOR . 'database.sql';
 
         // Backup database
-        if (in_array($dataTransfer->Mode, array('all', 'db'))) {
+        if(in_array($dataTransfer->Mode, array('all', 'db'))) {
             $log->write(sprintf('Backup of database from "%s" started', $name));
             $command = $this->getCommand('data:getdb', 'db', $environment, array('data_path' => $databasePath), $log);
-            $command->run(function ($type, $buffer) use ($log) {
+            $command->run(function($type, $buffer) use ($log) {
                 $log->write($buffer);
             });
-            if (!$command->isSuccessful()) {
+            if(!$command->isSuccessful()) {
                 $this->extend('dataTransferFailure', $environment, $log);
                 throw new RuntimeException($command->getErrorOutput());
             }
@@ -312,13 +312,13 @@ 
         }
 
         // Backup assets
-        if (in_array($dataTransfer->Mode, array('all', 'assets'))) {
+        if(in_array($dataTransfer->Mode, array('all', 'assets'))) {
             $log->write(sprintf('Backup of assets from "%s" started', $name));
             $command = $this->getCommand('data:getassets', 'web', $environment, array('data_path' => $filepathBase), $log);
-            $command->run(function ($type, $buffer) use ($log) {
+            $command->run(function($type, $buffer) use ($log) {
                 $log->write($buffer);
             });
-            if (!$command->isSuccessful()) {
+            if(!$command->isSuccessful()) {
                 $this->extend('dataTransferFailure', $environment, $log);
                 throw new RuntimeException($command->getErrorOutput());
             }
@@ -331,7 +331,7 @@ 
         try {
             $dataArchive->attachFile($sspakFilepath, $dataTransfer);
             $dataArchive->setArchiveFromFiles($filepathBase);
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             $log->write($e->getMessage());
             throw new RuntimeException($e->getMessage());
         }
@@ -341,7 +341,7 @@ 
         // e.g. when just an assets backup has been requested and no database.sql exists.
         $process = new Process(sprintf('rm -rf %s/assets && rm -f %s', $filepathBase, $databasePath));
         $process->run();
-        if (!$process->isSuccessful()) {
+        if(!$process->isSuccessful()) {
             $log->write('Could not delete temporary files');
             throw new RuntimeException($process->getErrorOutput());
         }
@@ -358,10 +358,10 @@ 
     {
         $name = $environment->getFullName();
         $command = $this->getCommand('deploy:migrate', 'web', $environment, null, $log);
-        $command->run(function ($type, $buffer) use ($log) {
+        $command->run(function($type, $buffer) use ($log) {
             $log->write($buffer);
         });
-        if (!$command->isSuccessful()) {
+        if(!$command->isSuccessful()) {
             $log->write(sprintf('Rebuild of "%s" failed: %s', $name, $command->getErrorOutput()));
             throw new RuntimeException($command->getErrorOutput());
         }
@@ -383,7 +383,7 @@ 
 
         // Rollback cleanup.
         $self = $this;
-        $cleanupFn = function () use ($self, $workingDir, $environment, $log) {
+        $cleanupFn = function() use ($self, $workingDir, $environment, $log) {
             // Rebuild makes sense even if failed - maybe we can at least partly recover.
             $self->rebuild($environment, $log);
             $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
@@ -391,14 +391,14 @@ 
         };
 
         // Restore database into target environment
-        if (in_array($dataTransfer->Mode, array('all', 'db'))) {
+        if(in_array($dataTransfer->Mode, array('all', 'db'))) {
             $log->write(sprintf('Restore of database to "%s" started', $name));
             $args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'database.sql');
             $command = $this->getCommand('data:pushdb', 'db', $environment, $args, $log);
-            $command->run(function ($type, $buffer) use ($log) {
+            $command->run(function($type, $buffer) use ($log) {
                 $log->write($buffer);
             });
-            if (!$command->isSuccessful()) {
+            if(!$command->isSuccessful()) {
                 $cleanupFn();
                 $log->write(sprintf('Restore of database to "%s" failed: %s', $name, $command->getErrorOutput()));
                 $this->extend('dataTransferFailure', $environment, $log);
@@ -408,14 +408,14 @@ 
         }
 
         // Restore assets into target environment
-        if (in_array($dataTransfer->Mode, array('all', 'assets'))) {
+        if(in_array($dataTransfer->Mode, array('all', 'assets'))) {
             $log->write(sprintf('Restore of assets to "%s" started', $name));
             $args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'assets');
             $command = $this->getCommand('data:pushassets', 'web', $environment, $args, $log);
-            $command->run(function ($type, $buffer) use ($log) {
+            $command->run(function($type, $buffer) use ($log) {
                 $log->write($buffer);
             });
-            if (!$command->isSuccessful()) {
+            if(!$command->isSuccessful()) {
                 $cleanupFn();
                 $log->write(sprintf('Restore of assets to "%s" failed: %s', $name, $command->getErrorOutput()));
                 $this->extend('dataTransferFailure', $environment, $log);

Braces +12 added lines, -24 removed lines

@@ -1,18 +1,15 @@ 
 <?php
 use \Symfony\Component\Process\Process;
 
-class CapistranoDeploymentBackend extends Object implements DeploymentBackend
-{
+class CapistranoDeploymentBackend extends Object implements DeploymentBackend {
 
     protected $packageGenerator;
 
-    public function getPackageGenerator()
-    {
+    public function getPackageGenerator() {
         return $this->packageGenerator;
     }
 
-    public function setPackageGenerator(PackageGenerator $packageGenerator)
-    {
+    public function setPackageGenerator(PackageGenerator $packageGenerator) {
         $this->packageGenerator = $packageGenerator;
     }
 
@@ -24,8 +21,7 @@ 
      *
      * @return DeploymentStrategy
      */
-    public function planDeploy(DNEnvironment $environment, $options)
-    {
+    public function planDeploy(DNEnvironment $environment, $options) {
         $strategy = new DeploymentStrategy($environment, $options);
 
         $currentBuild = $environment->CurrentBuild();
@@ -131,8 +127,7 @@ 
     /**
      * Enable a maintenance page for the given environment using the maintenance:enable Capistrano task.
      */
-    public function enableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
+    public function enableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project) {
         $name = $environment->getFullName();
         $command = $this->getCommand('maintenance:enable', 'web', $environment, null, $log);
         $command->run(function ($type, $buffer) use ($log) {
@@ -148,8 +143,7 @@ 
     /**
      * Disable the maintenance page for the given environment using the maintenance:disable Capistrano task.
      */
-    public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
+    public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project) {
         $name = $environment->getFullName();
         $command = $this->getCommand('maintenance:disable', 'web', $environment, null, $log);
         $command->run(function ($type, $buffer) use ($log) {
@@ -165,8 +159,7 @@ 
     /**
      * Check the status using the deploy:check capistrano method
      */
-    public function ping(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
+    public function ping(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project) {
         $command = $this->getCommand('deploy:check', 'web', $environment, null, $log);
         $command->run(function ($type, $buffer) use ($log) {
             $log->write($buffer);
@@ -177,8 +170,7 @@ 
     /**
      * @inheritdoc
      */
-    public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
-    {
+    public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log) {
         if ($dataTransfer->Direction == 'get') {
             $this->dataTransferBackup($dataTransfer, $log);
         } else {
@@ -222,8 +214,7 @@ 
      * @param DeploynautLogFile $log
      * @return \Symfony\Component\Process\Process
      */
-    public function getCommand($action, $roles, DNEnvironment $environment, $args = null, DeploynautLogFile $log)
-    {
+    public function getCommand($action, $roles, DNEnvironment $environment, $args = null, DeploynautLogFile $log) {
         $name = $environment->getFullName();
         $env = $environment->Project()->getProcessEnv();
 
@@ -277,8 +268,7 @@ 
      * @param DNDataTransfer    $dataTransfer
      * @param DeploynautLogFile $log
      */
-    protected function dataTransferBackup(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
-    {
+    protected function dataTransferBackup(DNDataTransfer $dataTransfer, DeploynautLogFile $log) {
         $environment = $dataTransfer->Environment();
         $name = $environment->getFullName();
 
@@ -354,8 +344,7 @@ 
      * Also cleans up and generates new error pages.
      * @param DeploynautLogFile $log
      */
-    public function rebuild(DNEnvironment $environment, $log)
-    {
+    public function rebuild(DNEnvironment $environment, $log) {
         $name = $environment->getFullName();
         $command = $this->getCommand('deploy:migrate', 'web', $environment, null, $log);
         $command->run(function ($type, $buffer) use ($log) {
@@ -376,8 +365,7 @@ 
      * @param DNDataTransfer $dataTransfer
      * @param DeploynautLogFile $log
      */
-    protected function dataTransferRestore($workingDir, DNDataTransfer $dataTransfer, DeploynautLogFile $log)
-    {
+    protected function dataTransferRestore($workingDir, DNDataTransfer $dataTransfer, DeploynautLogFile $log) {
         $environment = $dataTransfer->Environment();
         $name = $environment->getFullName();
 

code/backends/DemoDeploymentBackend.php

Indentation +67 added lines, -67 removed lines

@@ -10,82 +10,82 @@
 class DemoDeploymentBackend extends Object implements DeploymentBackend
 {
 
-    /**
-     * Create a deployment strategy.
-     *
-     * @param DNEnvironment $environment
-     * @param array $options
-     *
-     * @return DeploymentStrategy
-     */
-    public function planDeploy(DNEnvironment $environment, $options = array())
-    {
-        return new DeploymentStrategy($environment, $options);
-    }
+	/**
+	 * Create a deployment strategy.
+	 *
+	 * @param DNEnvironment $environment
+	 * @param array $options
+	 *
+	 * @return DeploymentStrategy
+	 */
+	public function planDeploy(DNEnvironment $environment, $options = array())
+	{
+		return new DeploymentStrategy($environment, $options);
+	}
 
-    /**
-     * Deploy the given build to the given environment
-     *
-     * @param DNEnvironment $environment
-     * @param DeploynautLogFile $log
-     * @param DNProject $project
-     * @param array $options
-     */
-    public function deploy(
-        DNEnvironment $environment,
-        DeploynautLogFile $log,
-        DNProject $project,
-        $options
-    ) {
-        $sha = $options['sha'];
+	/**
+	 * Deploy the given build to the given environment
+	 *
+	 * @param DNEnvironment $environment
+	 * @param DeploynautLogFile $log
+	 * @param DNProject $project
+	 * @param array $options
+	 */
+	public function deploy(
+		DNEnvironment $environment,
+		DeploynautLogFile $log,
+		DNProject $project,
+		$options
+	) {
+		$sha = $options['sha'];
 
-        $this->extend('deployStart', $environment, $sha, $log, $project);
+		$this->extend('deployStart', $environment, $sha, $log, $project);
 
-        $file = sprintf('%s/%s.deploy-history.txt', DEPLOYNAUT_LOG_PATH, $environment->getFullName());
-        $CLI_file = escapeshellarg($file);
-        $CLI_line = escapeshellarg(date('Y-m-d H:i:s') . " => $sha");
+		$file = sprintf('%s/%s.deploy-history.txt', DEPLOYNAUT_LOG_PATH, $environment->getFullName());
+		$CLI_file = escapeshellarg($file);
+		$CLI_line = escapeshellarg(date('Y-m-d H:i:s') . " => $sha");
 
-        // Put maintenance page up
-        $this->enableMaintenance($environment, $log, $project);
+		// Put maintenance page up
+		$this->enableMaintenance($environment, $log, $project);
 
-        // Do the deployment
-        $log->write("Demo deployment: echo $CLI_line >> $CLI_file");
-        `echo $CLI_line >> $CLI_file`;
-        $log->write("Arbitrary pause for 10s");
-        sleep(10);
-        $log->write("Well, that was a waste of time");
+		// Do the deployment
+		$log->write("Demo deployment: echo $CLI_line >> $CLI_file");
+		`echo $CLI_line >> $CLI_file`;
+		$log->write("Arbitrary pause for 10s");
+		sleep(10);
+		$log->write("Well, that was a waste of time");
 
-        // Once the deployment has run it's necessary to update the maintenance page status
-        if (!empty($options['leaveMaintenancePage'])) {
-            $this->enableMaintenance($environment, $log, $project);
-        } else {
-            // Remove maintenance page if we want it to
-            $this->disableMaintenance($environment, $log, $project);
-        }
+		// Once the deployment has run it's necessary to update the maintenance page status
+		if (!empty($options['leaveMaintenancePage'])) {
+			$this->enableMaintenance($environment, $log, $project);
+		} else {
+			// Remove maintenance page if we want it to
+			$this->disableMaintenance($environment, $log, $project);
+		}
 
-        $this->extend('deployEnd', $environment, $sha, $log, $project);
-    }
+		$this->extend('deployEnd', $environment, $sha, $log, $project);
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
-    {
-        die('Not implemented');
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
+	{
+		die('Not implemented');
+	}
 
-    public function enableMaintenance(DNEnvironment $environment, \DeploynautLogFile $log, DNProject $project)
-    {
-        $log->write(sprintf('Maintenance page enabled on "%s"', $environment->getFullName()));
-    }
+	public function enableMaintenance(DNEnvironment $environment, \DeploynautLogFile $log, DNProject $project)
+	{
+		$log->write(sprintf('Maintenance page enabled on "%s"', $environment->getFullName()));
+	}
 
-    public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
-        $log->write(sprintf('Maintenance page disabled on "%s"', $environment->getFullName()));
-    }
+	public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
+	{
+		$log->write(sprintf('Maintenance page disabled on "%s"', $environment->getFullName()));
+	}
 
-    public function ping(\DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
-        $log->write(sprintf('Ping "%s"', $environment->getFullName()));
-    }
+	public function ping(\DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
+	{
+		$log->write(sprintf('Ping "%s"', $environment->getFullName()));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         $log->write("Well, that was a waste of time");
 
         // Once the deployment has run it's necessary to update the maintenance page status
-        if (!empty($options['leaveMaintenancePage'])) {
+        if(!empty($options['leaveMaintenancePage'])) {
             $this->enableMaintenance($environment, $log, $project);
         } else {
             // Remove maintenance page if we want it to

Braces +6 added lines, -12 removed lines

@@ -7,8 +7,7 @@ 
  *
  * It's useful for demonstrating how the system works, and how you can write deployment back-ends
  */
-class DemoDeploymentBackend extends Object implements DeploymentBackend
-{
+class DemoDeploymentBackend extends Object implements DeploymentBackend {
 
     /**
      * Create a deployment strategy.
@@ -18,8 +17,7 @@ 
      *
      * @return DeploymentStrategy
      */
-    public function planDeploy(DNEnvironment $environment, $options = array())
-    {
+    public function planDeploy(DNEnvironment $environment, $options = array()) {
         return new DeploymentStrategy($environment, $options);
     }
 
@@ -69,23 +67,19 @@ 
     /**
      * @inheritdoc
      */
-    public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log)
-    {
+    public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log) {
         die('Not implemented');
     }
 
-    public function enableMaintenance(DNEnvironment $environment, \DeploynautLogFile $log, DNProject $project)
-    {
+    public function enableMaintenance(DNEnvironment $environment, \DeploynautLogFile $log, DNProject $project) {
         $log->write(sprintf('Maintenance page enabled on "%s"', $environment->getFullName()));
     }
 
-    public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
+    public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project) {
         $log->write(sprintf('Maintenance page disabled on "%s"', $environment->getFullName()));
     }
 
-    public function ping(\DNEnvironment $environment, DeploynautLogFile $log, DNProject $project)
-    {
+    public function ping(\DNEnvironment $environment, DeploynautLogFile $log, DNProject $project) {
         $log->write(sprintf('Ping "%s"', $environment->getFullName()));
     }
 }

code/backends/DeploymentBackend.php

Indentation +55 added lines, -55 removed lines

@@ -3,64 +3,64 @@
 interface DeploymentBackend
 {
 
-    /**
-     * Creates a deployment strategy that can be used to do some pre-flight checks.
-     *
-     * @param DNEnvironment $environment
-     * @param array $options An unsanitised array of request parameters from $request->requestVars.
-     *
-     * @return DeploymentStrategy
-     */
-    public function planDeploy(DNEnvironment $environment, $options);
+	/**
+	 * Creates a deployment strategy that can be used to do some pre-flight checks.
+	 *
+	 * @param DNEnvironment $environment
+	 * @param array $options An unsanitised array of request parameters from $request->requestVars.
+	 *
+	 * @return DeploymentStrategy
+	 */
+	public function planDeploy(DNEnvironment $environment, $options);
 
-    /**
-     * Deploy the given build to the given environment.
-     *
-     * @param DNEnvironment $environment
-     * @param DeploynautLogFile $log
-     * @param DNProject $project
-     * @param array $options
-     */
-    public function deploy(
-        DNEnvironment $environment,
-        DeploynautLogFile $log,
-        DNProject $project,
-        $options
-    );
+	/**
+	 * Deploy the given build to the given environment.
+	 *
+	 * @param DNEnvironment $environment
+	 * @param DeploynautLogFile $log
+	 * @param DNProject $project
+	 * @param array $options
+	 */
+	public function deploy(
+		DNEnvironment $environment,
+		DeploynautLogFile $log,
+		DNProject $project,
+		$options
+	);
 
-    /**
-     * Transfer data from an environment to a local file, or from a local file
-     * back into an environment. See {@link DNDataTransfer} for details.
-     *
-     * @param DNDataTransfer $dataTransfer
-     * @param DeploynautLogFile $log
-     */
-    public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log);
+	/**
+	 * Transfer data from an environment to a local file, or from a local file
+	 * back into an environment. See {@link DNDataTransfer} for details.
+	 *
+	 * @param DNDataTransfer $dataTransfer
+	 * @param DeploynautLogFile $log
+	 */
+	public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log);
 
-    /**
-     * Put put the maintenance page
-     *
-     * @param DNEnvironment $environment
-     * @param DeploynautLogFile $log
-     * @param DNProject $project
-     */
-    public function enableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project);
+	/**
+	 * Put put the maintenance page
+	 *
+	 * @param DNEnvironment $environment
+	 * @param DeploynautLogFile $log
+	 * @param DNProject $project
+	 */
+	public function enableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project);
 
-    /**
-     * Disable the maintenance page
-     *
-     * @param DNEnvironment $environment
-     * @param DeploynautLogFile $log
-     * @param DNProject $project
-     */
-    public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project);
+	/**
+	 * Disable the maintenance page
+	 *
+	 * @param DNEnvironment $environment
+	 * @param DeploynautLogFile $log
+	 * @param DNProject $project
+	 */
+	public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project);
 
-    /**
-     * Checks the status of the environment
-     *
-     * @param DNEnvironment $environment
-     * @param DeploynautLogFile $log
-     * @param DNProject $project
-     */
-    public function ping(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project);
+	/**
+	 * Checks the status of the environment
+	 *
+	 * @param DNEnvironment $environment
+	 * @param DeploynautLogFile $log
+	 * @param DNProject $project
+	 */
+	public function ping(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project);
 }

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 
-interface DeploymentBackend
-{
+interface DeploymentBackend {
 
     /**
      * Creates a deployment strategy that can be used to do some pre-flight checks.