silverstripe / deploynaut

code/model/DNData.php

Indentation +220 added lines, -220 removed lines

@@ -6,224 +6,224 @@
 class DNData extends ViewableData
 {
 
-    /**
-     * Path where the environment configurations can be found.
-     *
-     * @var string
-     */
-    protected $environmentDir = '';
-
-    /**
-     * Path where the keys are stored.
-     *
-     * @var string
-     */
-    protected $keyDir = '';
-
-    /**
-     * Path where data transfers are stored.
-     * Needs to be relative to webroot, and start with assets/
-     * since all files are also referenced in the SilverStripe database
-     * through {@link File}.
-     *
-     * @var string
-     */
-    protected $dataTransferDir = '';
-
-    /**
-     * If set, this provides an alternate user to the current one
-     * executing the Git shell commands. e.g. if this is set to
-     * a user called "composer", any Git commands that Deploynaut
-     * will perform will be run as "sudo -u composer git ..."
-     *
-     * @var string|null
-     */
-    protected $gitUser = null;
-
-    /**
-     * Gets the DNData singleton
-     *
-     * @return DNData
-     */
-    public static function inst()
-    {
-        return Injector::inst()->get('DNData');
-    }
-
-    public function __construct($environmentDir = null, $keyDir = null, $dataTransferDir = null, $gitUser = null)
-    {
-        parent::__construct();
-
-        // Better to use injector to set these
-        if (func_num_args() == 0) {
-            return;
-        }
-        Deprecation::notice(
-            '1.2.0',
-            "Don't construct DNData with parameters. Assign settings via properties instead"
-        );
-        $this->setEnvironmentDir($environmentDir);
-        $this->setKeyDir($keyDir);
-        $this->setDataTransferDir($dataTransferDir);
-        $this->setGitUser($gitUser);
-    }
-
-    /**
-     * Get the directory environment code is saved
-     *
-     * @return string
-     */
-    public function getEnvironmentDir()
-    {
-        return $this->environmentDir;
-    }
-
-    /**
-     * Set the directory environment code is saved
-     *
-     * @param string $environmentDir
-     */
-    public function setEnvironmentDir($environmentDir)
-    {
-        if ($environmentDir[0] != "/") {
-            $environmentDir = BASE_PATH . '/' . $environmentDir;
-        }
-        $this->environmentDir = realpath($environmentDir) ?: $environmentDir;
-    }
-
-    /**
-     * Get the directory where ssh are stored
-     *
-     * @return string
-     */
-    public function getKeyDir()
-    {
-        return $this->keyDir;
-    }
-
-    /**
-     * Set the directory where ssh are stored
-     *
-     * @param string $keyDir
-     */
-    public function setKeyDir($keyDir)
-    {
-        if ($keyDir[0] != "/") {
-            $keyDir = BASE_PATH . '/' . $keyDir;
-        }
-        $this->keyDir = realpath($keyDir) ?: $keyDir;
-    }
-
-    /**
-     * Get the username that git commands should be run as
-     *
-     * @return string
-     */
-    public function getGitUser()
-    {
-        return $this->gitUser;
-    }
-
-    /**
-     * Get the username that git commands should be run as
-     *
-     * @param string $user
-     */
-    public function setGitUser($user)
-    {
-        $this->gitUser = $user;
-    }
-
-    /**
-     * Get the directory where data transfers should be saved
-     *
-     * @return string
-     */
-    public function getDataTransferDir()
-    {
-        return $this->dataTransferDir;
-    }
-
-    /**
-     * Set the directory where data transfers should be saved
-     *
-     * This should either be an absolute path (beginning with /) or a path that can
-     * be appended to the web root safely
-     *
-     * @param string $transferDir
-     */
-    public function setDataTransferDir($transferDir)
-    {
-        if ($transferDir[0] != "/") {
-            $transferDir = BASE_PATH . '/' . $transferDir;
-        }
-        if (strpos($transferDir, ASSETS_PATH) === false) {
-            throw new LogicException(sprintf(
-                'DNData::dataTransferDir needs to be located within <webroot>assets/ (location: %s)',
-                $transferDir
-            ));
-        }
-        $this->dataTransferDir = realpath($transferDir) ?: $transferDir;
-    }
-
-    /**
-     * Provide a list of all projects.
-     * @return DataList
-     */
-    public function DNProjectList()
-    {
-        return DNProject::get();
-    }
-
-    /**
-     * Grabs a list of projects from the env directory. The projects
-     * in the builds directory alone will not be picked up.
-     * Returns an array of paths
-     *
-     * @return array
-     * @throws Exception
-     */
-    public function getProjectPaths()
-    {
-        $paths = array();
-        if (!file_exists($this->getEnvironmentDir())) {
-            $eMessage = 'The environment directory ' . $this->getEnvironmentDir() . ' doesn\'t exist. Create it '
-            . 'first and add some projects to it.';
-            throw new Exception($eMessage);
-        }
-        foreach (scandir($this->getEnvironmentDir()) as $project) {
-            // Exlcude dot-prefixed directories (.git was getting in the way)
-            if (preg_match('/^[^\.]/', $project)) {
-                $path = $this->getEnvironmentDir() . '/' . $project;
-                if (is_dir($path) && $project != '.' && $project != '..') {
-                    $paths[] = $project;
-                }
-            }
-        }
-        sort($paths);
-        return array_values($paths);
-    }
-
-    /**
-     * Scan the directory and enumerate all envs founds within.
-     * Returns an array of paths
-     */
-    public function getEnvironmentPaths($project)
-    {
-        $baseDir = $this->getEnvironmentDir() . '/' . $project;
-
-        $paths = array();
-        if (!file_exists($baseDir)) {
-            throw new Exception('Environment directory ' . $baseDir . ' doesn\'t exist. Create it first.');
-        }
-        // Search the directory for config files.
-        foreach (scandir($baseDir) as $environmentFile) {
-            if (preg_match('/\.rb$/', $environmentFile)) {
-                // Config found, wrap it into an object.
-                $paths[] = "$baseDir/$environmentFile";
-            }
-        }
-        sort($paths);
-        return array_values($paths);
-    }
+	/**
+	 * Path where the environment configurations can be found.
+	 *
+	 * @var string
+	 */
+	protected $environmentDir = '';
+
+	/**
+	 * Path where the keys are stored.
+	 *
+	 * @var string
+	 */
+	protected $keyDir = '';
+
+	/**
+	 * Path where data transfers are stored.
+	 * Needs to be relative to webroot, and start with assets/
+	 * since all files are also referenced in the SilverStripe database
+	 * through {@link File}.
+	 *
+	 * @var string
+	 */
+	protected $dataTransferDir = '';
+
+	/**
+	 * If set, this provides an alternate user to the current one
+	 * executing the Git shell commands. e.g. if this is set to
+	 * a user called "composer", any Git commands that Deploynaut
+	 * will perform will be run as "sudo -u composer git ..."
+	 *
+	 * @var string|null
+	 */
+	protected $gitUser = null;
+
+	/**
+	 * Gets the DNData singleton
+	 *
+	 * @return DNData
+	 */
+	public static function inst()
+	{
+		return Injector::inst()->get('DNData');
+	}
+
+	public function __construct($environmentDir = null, $keyDir = null, $dataTransferDir = null, $gitUser = null)
+	{
+		parent::__construct();
+
+		// Better to use injector to set these
+		if (func_num_args() == 0) {
+			return;
+		}
+		Deprecation::notice(
+			'1.2.0',
+			"Don't construct DNData with parameters. Assign settings via properties instead"
+		);
+		$this->setEnvironmentDir($environmentDir);
+		$this->setKeyDir($keyDir);
+		$this->setDataTransferDir($dataTransferDir);
+		$this->setGitUser($gitUser);
+	}
+
+	/**
+	 * Get the directory environment code is saved
+	 *
+	 * @return string
+	 */
+	public function getEnvironmentDir()
+	{
+		return $this->environmentDir;
+	}
+
+	/**
+	 * Set the directory environment code is saved
+	 *
+	 * @param string $environmentDir
+	 */
+	public function setEnvironmentDir($environmentDir)
+	{
+		if ($environmentDir[0] != "/") {
+			$environmentDir = BASE_PATH . '/' . $environmentDir;
+		}
+		$this->environmentDir = realpath($environmentDir) ?: $environmentDir;
+	}
+
+	/**
+	 * Get the directory where ssh are stored
+	 *
+	 * @return string
+	 */
+	public function getKeyDir()
+	{
+		return $this->keyDir;
+	}
+
+	/**
+	 * Set the directory where ssh are stored
+	 *
+	 * @param string $keyDir
+	 */
+	public function setKeyDir($keyDir)
+	{
+		if ($keyDir[0] != "/") {
+			$keyDir = BASE_PATH . '/' . $keyDir;
+		}
+		$this->keyDir = realpath($keyDir) ?: $keyDir;
+	}
+
+	/**
+	 * Get the username that git commands should be run as
+	 *
+	 * @return string
+	 */
+	public function getGitUser()
+	{
+		return $this->gitUser;
+	}
+
+	/**
+	 * Get the username that git commands should be run as
+	 *
+	 * @param string $user
+	 */
+	public function setGitUser($user)
+	{
+		$this->gitUser = $user;
+	}
+
+	/**
+	 * Get the directory where data transfers should be saved
+	 *
+	 * @return string
+	 */
+	public function getDataTransferDir()
+	{
+		return $this->dataTransferDir;
+	}
+
+	/**
+	 * Set the directory where data transfers should be saved
+	 *
+	 * This should either be an absolute path (beginning with /) or a path that can
+	 * be appended to the web root safely
+	 *
+	 * @param string $transferDir
+	 */
+	public function setDataTransferDir($transferDir)
+	{
+		if ($transferDir[0] != "/") {
+			$transferDir = BASE_PATH . '/' . $transferDir;
+		}
+		if (strpos($transferDir, ASSETS_PATH) === false) {
+			throw new LogicException(sprintf(
+				'DNData::dataTransferDir needs to be located within <webroot>assets/ (location: %s)',
+				$transferDir
+			));
+		}
+		$this->dataTransferDir = realpath($transferDir) ?: $transferDir;
+	}
+
+	/**
+	 * Provide a list of all projects.
+	 * @return DataList
+	 */
+	public function DNProjectList()
+	{
+		return DNProject::get();
+	}
+
+	/**
+	 * Grabs a list of projects from the env directory. The projects
+	 * in the builds directory alone will not be picked up.
+	 * Returns an array of paths
+	 *
+	 * @return array
+	 * @throws Exception
+	 */
+	public function getProjectPaths()
+	{
+		$paths = array();
+		if (!file_exists($this->getEnvironmentDir())) {
+			$eMessage = 'The environment directory ' . $this->getEnvironmentDir() . ' doesn\'t exist. Create it '
+			. 'first and add some projects to it.';
+			throw new Exception($eMessage);
+		}
+		foreach (scandir($this->getEnvironmentDir()) as $project) {
+			// Exlcude dot-prefixed directories (.git was getting in the way)
+			if (preg_match('/^[^\.]/', $project)) {
+				$path = $this->getEnvironmentDir() . '/' . $project;
+				if (is_dir($path) && $project != '.' && $project != '..') {
+					$paths[] = $project;
+				}
+			}
+		}
+		sort($paths);
+		return array_values($paths);
+	}
+
+	/**
+	 * Scan the directory and enumerate all envs founds within.
+	 * Returns an array of paths
+	 */
+	public function getEnvironmentPaths($project)
+	{
+		$baseDir = $this->getEnvironmentDir() . '/' . $project;
+
+		$paths = array();
+		if (!file_exists($baseDir)) {
+			throw new Exception('Environment directory ' . $baseDir . ' doesn\'t exist. Create it first.');
+		}
+		// Search the directory for config files.
+		foreach (scandir($baseDir) as $environmentFile) {
+			if (preg_match('/\.rb$/', $environmentFile)) {
+				// Config found, wrap it into an object.
+				$paths[] = "$baseDir/$environmentFile";
+			}
+		}
+		sort($paths);
+		return array_values($paths);
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -55,7 +55,7 @@ 
         parent::__construct();
 
         // Better to use injector to set these
-        if (func_num_args() == 0) {
+        if(func_num_args() == 0) {
             return;
         }
         Deprecation::notice(
@@ -85,7 +85,7 @@ 
      */
     public function setEnvironmentDir($environmentDir)
     {
-        if ($environmentDir[0] != "/") {
+        if($environmentDir[0] != "/") {
             $environmentDir = BASE_PATH . '/' . $environmentDir;
         }
         $this->environmentDir = realpath($environmentDir) ?: $environmentDir;
@@ -108,7 +108,7 @@ 
      */
     public function setKeyDir($keyDir)
     {
-        if ($keyDir[0] != "/") {
+        if($keyDir[0] != "/") {
             $keyDir = BASE_PATH . '/' . $keyDir;
         }
         $this->keyDir = realpath($keyDir) ?: $keyDir;
@@ -154,10 +154,10 @@ 
      */
     public function setDataTransferDir($transferDir)
     {
-        if ($transferDir[0] != "/") {
+        if($transferDir[0] != "/") {
             $transferDir = BASE_PATH . '/' . $transferDir;
         }
-        if (strpos($transferDir, ASSETS_PATH) === false) {
+        if(strpos($transferDir, ASSETS_PATH) === false) {
             throw new LogicException(sprintf(
                 'DNData::dataTransferDir needs to be located within <webroot>assets/ (location: %s)',
                 $transferDir
@@ -186,16 +186,16 @@ 
     public function getProjectPaths()
     {
         $paths = array();
-        if (!file_exists($this->getEnvironmentDir())) {
+        if(!file_exists($this->getEnvironmentDir())) {
             $eMessage = 'The environment directory ' . $this->getEnvironmentDir() . ' doesn\'t exist. Create it '
             . 'first and add some projects to it.';
             throw new Exception($eMessage);
         }
-        foreach (scandir($this->getEnvironmentDir()) as $project) {
+        foreach(scandir($this->getEnvironmentDir()) as $project) {
             // Exlcude dot-prefixed directories (.git was getting in the way)
-            if (preg_match('/^[^\.]/', $project)) {
+            if(preg_match('/^[^\.]/', $project)) {
                 $path = $this->getEnvironmentDir() . '/' . $project;
-                if (is_dir($path) && $project != '.' && $project != '..') {
+                if(is_dir($path) && $project != '.' && $project != '..') {
                     $paths[] = $project;
                 }
             }
@@ -213,12 +213,12 @@ 
         $baseDir = $this->getEnvironmentDir() . '/' . $project;
 
         $paths = array();
-        if (!file_exists($baseDir)) {
+        if(!file_exists($baseDir)) {
             throw new Exception('Environment directory ' . $baseDir . ' doesn\'t exist. Create it first.');
         }
         // Search the directory for config files.
-        foreach (scandir($baseDir) as $environmentFile) {
-            if (preg_match('/\.rb$/', $environmentFile)) {
+        foreach(scandir($baseDir) as $environmentFile) {
+            if(preg_match('/\.rb$/', $environmentFile)) {
                 // Config found, wrap it into an object.
                 $paths[] = "$baseDir/$environmentFile";
             }

Braces +14 added lines, -28 removed lines

@@ -3,8 +3,7 @@ 
 /**
  * Parent class for managing a set of Deploynaut data
  */
-class DNData extends ViewableData
-{
+class DNData extends ViewableData {
 
     /**
      * Path where the environment configurations can be found.
@@ -45,13 +44,11 @@ 
      *
      * @return DNData
      */
-    public static function inst()
-    {
+    public static function inst() {
         return Injector::inst()->get('DNData');
     }
 
-    public function __construct($environmentDir = null, $keyDir = null, $dataTransferDir = null, $gitUser = null)
-    {
+    public function __construct($environmentDir = null, $keyDir = null, $dataTransferDir = null, $gitUser = null) {
         parent::__construct();
 
         // Better to use injector to set these
@@ -73,8 +70,7 @@ 
      *
      * @return string
      */
-    public function getEnvironmentDir()
-    {
+    public function getEnvironmentDir() {
         return $this->environmentDir;
     }
 
@@ -83,8 +79,7 @@ 
      *
      * @param string $environmentDir
      */
-    public function setEnvironmentDir($environmentDir)
-    {
+    public function setEnvironmentDir($environmentDir) {
         if ($environmentDir[0] != "/") {
             $environmentDir = BASE_PATH . '/' . $environmentDir;
         }
@@ -96,8 +91,7 @@ 
      *
      * @return string
      */
-    public function getKeyDir()
-    {
+    public function getKeyDir() {
         return $this->keyDir;
     }
 
@@ -106,8 +100,7 @@ 
      *
      * @param string $keyDir
      */
-    public function setKeyDir($keyDir)
-    {
+    public function setKeyDir($keyDir) {
         if ($keyDir[0] != "/") {
             $keyDir = BASE_PATH . '/' . $keyDir;
         }
@@ -119,8 +112,7 @@ 
      *
      * @return string
      */
-    public function getGitUser()
-    {
+    public function getGitUser() {
         return $this->gitUser;
     }
 
@@ -129,8 +121,7 @@ 
      *
      * @param string $user
      */
-    public function setGitUser($user)
-    {
+    public function setGitUser($user) {
         $this->gitUser = $user;
     }
 
@@ -139,8 +130,7 @@ 
      *
      * @return string
      */
-    public function getDataTransferDir()
-    {
+    public function getDataTransferDir() {
         return $this->dataTransferDir;
     }
 
@@ -152,8 +142,7 @@ 
      *
      * @param string $transferDir
      */
-    public function setDataTransferDir($transferDir)
-    {
+    public function setDataTransferDir($transferDir) {
         if ($transferDir[0] != "/") {
             $transferDir = BASE_PATH . '/' . $transferDir;
         }
@@ -170,8 +159,7 @@ 
      * Provide a list of all projects.
      * @return DataList
      */
-    public function DNProjectList()
-    {
+    public function DNProjectList() {
         return DNProject::get();
     }
 
@@ -183,8 +171,7 @@ 
      * @return array
      * @throws Exception
      */
-    public function getProjectPaths()
-    {
+    public function getProjectPaths() {
         $paths = array();
         if (!file_exists($this->getEnvironmentDir())) {
             $eMessage = 'The environment directory ' . $this->getEnvironmentDir() . ' doesn\'t exist. Create it '
@@ -208,8 +195,7 @@ 
      * Scan the directory and enumerate all envs founds within.
      * Returns an array of paths
      */
-    public function getEnvironmentPaths($project)
-    {
+    public function getEnvironmentPaths($project) {
         $baseDir = $this->getEnvironmentDir() . '/' . $project;
 
         $paths = array();

code/model/DNDataArchive.php

Indentation +540 added lines, -540 removed lines

@@ -50,544 +50,544 @@
 class DNDataArchive extends DataObject
 {
 
-    private static $db = array(
-        'UploadToken' => 'Varchar(8)',
-        'ArchiveFileHash' => 'Varchar(32)',
-        "Mode" => "Enum('all, assets, db', '')",
-        "IsBackup" => "Boolean",
-        "IsManualUpload" => "Boolean",
-    );
-
-    private static $has_one = array(
-        'Author' => 'Member',
-        'OriginalEnvironment' => 'DNEnvironment',
-        'Environment' => 'DNEnvironment',
-        'ArchiveFile' => 'File'
-    );
-
-    private static $has_many = array(
-        'DataTransfers' => 'DNDataTransfer',
-    );
-
-    private static $singular_name = 'Data Archive';
-
-    private static $plural_name = 'Data Archives';
-
-    private static $summary_fields = array(
-        'Created' => 'Created',
-        'Author.Title' => 'Author',
-        'Environment.Project.Name' => 'Project',
-        'OriginalEnvironment.Name' => 'Origin',
-        'Environment.Name' => 'Environment',
-        'ArchiveFile.Name' => 'File',
-    );
-
-    private static $searchable_fields = array(
-        'Environment.Project.Name' => array(
-            'title' => 'Project',
-        ),
-        'OriginalEnvironment.Name' => array(
-            'title' => 'Origin',
-        ),
-        'Environment.Name' => array(
-            'title' => 'Environment',
-        ),
-        'UploadToken' => array(
-            'title' => 'Upload Token',
-        ),
-        'Mode' => array(
-            'title' => 'Mode',
-        ),
-    );
-
-    private static $_cache_can_restore = array();
-
-    private static $_cache_can_download = array();
-
-    public static function get_mode_map()
-    {
-        return array(
-            'all' => 'Database and Assets',
-            'db' => 'Database only',
-            'assets' => 'Assets only',
-        );
-    }
-
-    /**
-     * Returns a unique token to correlate an offline item (posted DVD)
-     * with a specific archive placeholder.
-     *
-     * @return string
-     */
-    public static function generate_upload_token($chars = 8)
-    {
-        $generator = new RandomGenerator();
-        return strtoupper(substr($generator->randomToken(), 0, $chars));
-    }
-
-    public function onBeforeWrite()
-    {
-        if (!$this->AuthorID) {
-            $this->AuthorID = Member::currentUserID();
-        }
-
-        parent::onBeforeWrite();
-    }
-
-    public function onAfterDelete()
-    {
-        $this->ArchiveFile()->delete();
-    }
-
-    public function getCMSFields()
-    {
-        $fields = parent::getCMSFields();
-        $fields->removeByName('OriginalEnvironmentID');
-        $fields->removeByName('EnvironmentID');
-        $fields->removeByName('ArchiveFile');
-        $fields->addFieldsToTab(
-            'Root.Main',
-            array(
-                new ReadonlyField('ProjectName', 'Project', $this->Environment()->Project()->Name),
-                new ReadonlyField('OriginalEnvironmentName', 'OriginalEnvironment', $this->OriginalEnvironment()->Name),
-                new ReadonlyField('EnvironmentName', 'Environment', $this->Environment()->Name),
-                $linkField = new ReadonlyField(
-                    'DataArchive',
-                    'Archive File',
-                    sprintf(
-                        '<a href="%s">%s</a>',
-                        $this->ArchiveFile()->AbsoluteURL,
-                        $this->ArchiveFile()->Filename
-                    )
-                ),
-                new GridField(
-                    'DataTransfers',
-                    'Transfers',
-                    $this->DataTransfers()
-                ),
-            )
-        );
-        $linkField->dontEscape = true;
-        $fields = $fields->makeReadonly();
-
-        return $fields;
-    }
-
-    public function getDefaultSearchContext()
-    {
-        $context = parent::getDefaultSearchContext();
-        $context->getFields()->dataFieldByName('Mode')->setHasEmptyDefault(true);
-
-        return $context;
-    }
-
-    /**
-     * Calculates and returns a human-readable size of this archive file. If the file exists, it will determine
-     * whether to display the output in bytes, kilobytes, megabytes, or gigabytes.
-     *
-     * @return string The human-readable size of this archive file
-     */
-    public function FileSize()
-    {
-        if ($this->ArchiveFile()->exists()) {
-            return $this->ArchiveFile()->getSize();
-        } else {
-            return "N/A";
-        }
-    }
-
-    public function getModeNice()
-    {
-        if ($this->Mode == 'all') {
-            return 'database and assets';
-        } else {
-            return $this->Mode;
-        }
-    }
-
-    /**
-     * Some archives don't have files attached to them yet,
-     * because a file has been posted offline and is waiting to be uploaded
-     * against this "archive placeholder".
-     *
-     * @return boolean
-     */
-    public function isPending()
-    {
-        return !($this->ArchiveFileID);
-    }
-
-    /**
-     * Inferred from both restore and backup permissions.
-     *
-     * @param Member|null $member The {@link Member} object to test against.
-     */
-    public function canView($member = null)
-    {
-        return ($this->canRestore($member) || $this->canDownload($member));
-    }
-
-    /**
-     * Whether a {@link Member} can restore this archive to an environment.
-     * This only needs to be checked *once* per member and environment.
-     *
-     * @param Member|null $member The {@link Member} object to test against.
-     * @return true if $member (or the currently logged in member if null) can upload this archive
-     */
-    public function canRestore($member = null)
-    {
-        $memberID = $member ? $member->ID : Member::currentUserID();
-        if (!$memberID) {
-            return false;
-        }
-
-        $key = $memberID . '-' . $this->EnvironmentID;
-        if (!isset(self::$_cache_can_restore[$key])) {
-            self::$_cache_can_restore[$key] = $this->Environment()->canUploadArchive($member);
-        }
-
-        return self::$_cache_can_restore[$key];
-    }
-
-    /**
-     * Whether a {@link Member} can download this archive to their PC.
-     * This only needs to be checked *once* per member and environment.
-     *
-     * @param Member|null $member The {@link Member} object to test against.
-     * @return true if $member (or the currently logged in member if null) can download this archive
-     */
-    public function canDownload($member = null)
-    {
-        $memberID = $member ? $member->ID : Member::currentUserID();
-        if (!$memberID) {
-            return false;
-        }
-
-        $key = $memberID . '-' . $this->EnvironmentID;
-        if (!isset(self::$_cache_can_download[$key])) {
-            self::$_cache_can_download[$key] = $this->Environment()->canDownloadArchive($member);
-        }
-        return self::$_cache_can_download[$key];
-    }
-
-    /**
-     * Whether a {@link Member} can delete this archive from staging area.
-     *
-     * @param Member|null $member The {@link Member} object to test against.
-     * @return boolean if $member (or the currently logged in member if null) can delete this archive
-     */
-    public function canDelete($member = null)
-    {
-        return $this->Environment()->canDeleteArchive($member);
-    }
-
-    /**
-     * Check if this member can move archive into the environment.
-     *
-     * @param DNEnvironment $targetEnv Environment to check.
-     * @param Member|null $member The {@link Member} object to test against. If null, uses Member::currentMember();
-     *
-     * @return boolean true if $member can upload archives linked to this environment, false if they can't.
-     */
-    public function canMoveTo($targetEnv, $member = null)
-    {
-        if ($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
-            // We don't permit moving snapshots between projects at this stage.
-            return false;
-        }
-
-        if (!$member) {
-            $member = Member::currentUser();
-        }
-
-        // Must be logged in to check permissions
-        if (!$member) {
-            return false;
-        }
-
-        // Admin can always move.
-        if (Permission::checkMember($member, 'ADMIN')) {
-            return true;
-        }
-
-        // Checks if the user can actually access the archive.
-        if (!$this->canDownload($member)) {
-            return false;
-        }
-
-        // Hooks into ArchiveUploaders permission to prevent proliferation of permission checkboxes.
-        // Bypasses the quota check - we don't need to check for it as long as we move the snapshot within the project.
-        return $targetEnv->ArchiveUploaders()->byID($member->ID)
-            || $member->inGroups($targetEnv->ArchiveUploaderGroups());
-    }
-
-    /**
-     * Finds all environments within this project where the archive can be moved to.
-     * Excludes current environment automatically.
-     *
-     * @return ArrayList List of valid environments.
-     */
-    public function validTargetEnvironments()
-    {
-        $archive = $this;
-        $envs = $this->Environment()->Project()->DNEnvironmentList()
-            ->filterByCallback(function ($item) use ($archive) {
-                return $archive->EnvironmentID != $item->ID && $archive->canMoveTo($item);
-            });
-
-        return $envs;
-    }
-
-    /**
-     * Returns a unique filename, including project/environment/timestamp details.
-     * @return string
-     */
-    public function generateFilename(DNDataTransfer $dataTransfer)
-    {
-        $generator = new RandomGenerator();
-        $filter = FileNameFilter::create();
-
-        return sprintf(
-            '%s-%s-%s-%s-%s',
-            $filter->filter(strtolower($this->OriginalEnvironment()->Project()->Name)),
-            $filter->filter(strtolower($this->OriginalEnvironment()->Name)),
-            $dataTransfer->Mode,
-            date('Ymd'),
-            sha1($generator->generateEntropy())
-        );
-    }
-
-    /**
-     * Returns a path unique to a specific transfer, including project/environment details.
-     * Does not create the path on the filesystem. Can be used to store files related to this transfer.
-     *
-     * @param DNDataTransfer
-     * @return string Absolute file path
-     */
-    public function generateFilepath(DNDataTransfer $dataTransfer)
-    {
-        $data = DNData::inst();
-        $transferDir = $data->getDataTransferDir();
-        $filter = FileNameFilter::create();
-
-        return sprintf('%s/%s/%s/transfer-%s/',
-            $transferDir,
-            $filter->filter(strtolower($this->OriginalEnvironment()->Project()->Name)),
-            $filter->filter(strtolower($this->OriginalEnvironment()->Name)),
-            $dataTransfer->ID
-        );
-    }
-
-    /**
-     * Attach an sspak file path to this archive and associate the transfer.
-     * Does the job of creating a {@link File} record, and setting correct paths into the assets directory.
-     *
-     * @param string $sspakFilepath
-     * @param DNDataTransfer $dataTransfer
-     * @return bool
-     */
-    public function attachFile($sspakFilepath, DNDataTransfer $dataTransfer)
-    {
-        $sspakFilepath = ltrim(
-            str_replace(
-                array(ASSETS_PATH, realpath(ASSETS_PATH)),
-                '',
-                $sspakFilepath
-            ),
-            DIRECTORY_SEPARATOR
-        );
-
-        $folder = Folder::find_or_make(dirname($sspakFilepath));
-        $file = new File();
-        $file->Name = basename($sspakFilepath);
-        $file->Filename = $sspakFilepath;
-        $file->ParentID = $folder->ID;
-        $file->write();
-
-        // "Status" will be updated by the job execution
-        $dataTransfer->write();
-
-        // Get file hash to ensure consistency.
-        // Only do this when first associating the file since hashing large files is expensive.
-        // Note that with CapistranoDeploymentBackend the file won't be available yet, as it
-        // gets put in place immediately after this method gets called. In which case, it will
-        // be hashed in setArchiveFromFiles()
-        if (file_exists($file->FullPath)) {
-            $this->ArchiveFileHash = md5_file($file->FullPath);
-        }
-        $this->ArchiveFileID = $file->ID;
-        $this->DataTransfers()->add($dataTransfer);
-        $this->write();
-
-        return true;
-    }
-
-    /**
-     * Extract the current sspak contents into the given working directory.
-     * This also extracts the assets and database and puts them into
-     * <workingdir>/database.sql and <workingdir>/assets, respectively.
-     *
-     * @param string|null $workingDir The path to extract to
-     * @throws RuntimeException
-     * @return bool
-     */
-    public function extractArchive($workingDir = null)
-    {
-        if (!is_dir($workingDir)) {
-            mkdir($workingDir, 0700, true);
-        }
-
-        $cleanupFn = function () use ($workingDir) {
-            $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
-            $process->run();
-        };
-
-        // Extract *.sspak to a temporary location
-        $sspakFilename = $this->ArchiveFile()->FullPath;
-        $process = new Process(sprintf(
-            'sspak extract %s %s',
-            escapeshellarg($sspakFilename),
-            escapeshellarg($workingDir)
-        ));
-        $process->setTimeout(3600);
-        $process->run();
-        if (!$process->isSuccessful()) {
-            $cleanupFn();
-            throw new RuntimeException(sprintf('Could not extract the sspak file: %s', $process->getErrorOutput()));
-        }
-
-        // Extract database.sql.gz to <workingdir>/database.sql
-        if (file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
-            $process = new Process('gunzip database.sql.gz', $workingDir);
-            $process->setTimeout(3600);
-            $process->run();
-            if (!$process->isSuccessful()) {
-                $cleanupFn();
-                throw new RuntimeException(sprintf('Could not extract the db archive: %s', $process->getErrorOutput()));
-            }
-        }
-
-        // Extract assets.tar.gz to <workingdir>/assets/
-        if (file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
-            $process = new Process('tar xzf assets.tar.gz', $workingDir);
-            $process->setTimeout(3600);
-            $process->run();
-            if (!$process->isSuccessful()) {
-                $cleanupFn();
-                throw new RuntimeException(sprintf('Could not extract the assets archive: %s', $process->getErrorOutput()));
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Validate that an sspak contains the correct content.
-     *
-     * For example, if the user uploaded an sspak containing just the db, but declared in the form
-     * that it contained db+assets, then the archive is not valid.
-     *
-     * @param string|null $mode "db", "assets", or "all". This is the content we're checking for. Default to the archive setting
-     * @return ValidationResult
-     */
-    public function validateArchiveContents($mode = null)
-    {
-        $mode = $mode ?: $this->Mode;
-        $result = new ValidationResult();
-
-        $file = $this->ArchiveFile()->FullPath;
-
-        if (!is_readable($file)) {
-            $result->error(sprintf('SSPak file "%s" cannot be read.', $file));
-            return $result;
-        }
-
-        $process = new Process(sprintf('tar -tf %s', escapeshellarg($file)));
-        $process->setTimeout(120);
-        $process->run();
-        if (!$process->isSuccessful()) {
-            throw new RuntimeException(sprintf('Could not list files in archive: %s', $process->getErrorOutput()));
-        }
-
-        $output = explode(PHP_EOL, $process->getOutput());
-        $files = array_filter($output);
-
-        if (in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
-            $result->error('The snapshot is missing the database.');
-            return $result;
-        }
-
-        if (in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
-            $result->error('The snapshot is missing assets.');
-            return $result;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Given a path that already exists and contains an extracted sspak, including
-     * the assets, fix all of the file permissions so they're in a state ready to
-     * be pushed to remote servers.
-     *
-     * Normally, command line tar will use permissions found in the archive, but will
-     * substract the user's umask from them. This has a potential to create unreadable
-     * files, e.g. cygwin on Windows will pack files with mode 000, hence why this fix
-     * is necessary.
-     *
-     * @param string|null $workingDir The path of where the sspak has been extracted to
-     * @throws RuntimeException
-     * @return bool
-     */
-    public function fixArchivePermissions($workingDir)
-    {
-        $fixCmds = array(
-            // The directories need to have permissions changed one by one (hence the ; instead of +),
-            // otherwise we might end up having no +x access to a directory deeper down.
-            sprintf('find %s -type d -exec chmod 755 {} \;', escapeshellarg($workingDir)),
-            sprintf('find %s -type f -exec chmod 644 {} +', escapeshellarg($workingDir))
-        );
-
-        foreach ($fixCmds as $cmd) {
-            $process = new Process($cmd);
-            $process->setTimeout(3600);
-            $process->run();
-            if (!$process->isSuccessful()) {
-                throw new RuntimeException($process->getErrorOutput());
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Given extracted sspak contents, create an sspak from it
-     * and overwrite the current ArchiveFile with it's contents.
-     *
-     * @param string|null $workingDir The path of where the sspak has been extracted to
-     * @return bool
-     */
-    public function setArchiveFromFiles($workingDir)
-    {
-        $command = sprintf('sspak saveexisting %s 2>&1', $this->ArchiveFile()->FullPath);
-        if ($this->Mode == 'db') {
-            $command .= sprintf(' --db=%s/database.sql', $workingDir);
-        } elseif ($this->Mode == 'assets') {
-            $command .= sprintf(' --assets=%s/assets', $workingDir);
-        } else {
-            $command .= sprintf(' --db=%s/database.sql --assets=%s/assets', $workingDir, $workingDir);
-        }
-
-        $process = new Process($command, $workingDir);
-        $process->setTimeout(3600);
-        $process->run();
-        if (!$process->isSuccessful()) {
-            throw new RuntimeException($process->getErrorOutput());
-        }
-
-        $this->ArchiveFileHash = md5_file($this->ArchiveFile()->FullPath);
-        $this->write();
-
-        return true;
-    }
+	private static $db = array(
+		'UploadToken' => 'Varchar(8)',
+		'ArchiveFileHash' => 'Varchar(32)',
+		"Mode" => "Enum('all, assets, db', '')",
+		"IsBackup" => "Boolean",
+		"IsManualUpload" => "Boolean",
+	);
+
+	private static $has_one = array(
+		'Author' => 'Member',
+		'OriginalEnvironment' => 'DNEnvironment',
+		'Environment' => 'DNEnvironment',
+		'ArchiveFile' => 'File'
+	);
+
+	private static $has_many = array(
+		'DataTransfers' => 'DNDataTransfer',
+	);
+
+	private static $singular_name = 'Data Archive';
+
+	private static $plural_name = 'Data Archives';
+
+	private static $summary_fields = array(
+		'Created' => 'Created',
+		'Author.Title' => 'Author',
+		'Environment.Project.Name' => 'Project',
+		'OriginalEnvironment.Name' => 'Origin',
+		'Environment.Name' => 'Environment',
+		'ArchiveFile.Name' => 'File',
+	);
+
+	private static $searchable_fields = array(
+		'Environment.Project.Name' => array(
+			'title' => 'Project',
+		),
+		'OriginalEnvironment.Name' => array(
+			'title' => 'Origin',
+		),
+		'Environment.Name' => array(
+			'title' => 'Environment',
+		),
+		'UploadToken' => array(
+			'title' => 'Upload Token',
+		),
+		'Mode' => array(
+			'title' => 'Mode',
+		),
+	);
+
+	private static $_cache_can_restore = array();
+
+	private static $_cache_can_download = array();
+
+	public static function get_mode_map()
+	{
+		return array(
+			'all' => 'Database and Assets',
+			'db' => 'Database only',
+			'assets' => 'Assets only',
+		);
+	}
+
+	/**
+	 * Returns a unique token to correlate an offline item (posted DVD)
+	 * with a specific archive placeholder.
+	 *
+	 * @return string
+	 */
+	public static function generate_upload_token($chars = 8)
+	{
+		$generator = new RandomGenerator();
+		return strtoupper(substr($generator->randomToken(), 0, $chars));
+	}
+
+	public function onBeforeWrite()
+	{
+		if (!$this->AuthorID) {
+			$this->AuthorID = Member::currentUserID();
+		}
+
+		parent::onBeforeWrite();
+	}
+
+	public function onAfterDelete()
+	{
+		$this->ArchiveFile()->delete();
+	}
+
+	public function getCMSFields()
+	{
+		$fields = parent::getCMSFields();
+		$fields->removeByName('OriginalEnvironmentID');
+		$fields->removeByName('EnvironmentID');
+		$fields->removeByName('ArchiveFile');
+		$fields->addFieldsToTab(
+			'Root.Main',
+			array(
+				new ReadonlyField('ProjectName', 'Project', $this->Environment()->Project()->Name),
+				new ReadonlyField('OriginalEnvironmentName', 'OriginalEnvironment', $this->OriginalEnvironment()->Name),
+				new ReadonlyField('EnvironmentName', 'Environment', $this->Environment()->Name),
+				$linkField = new ReadonlyField(
+					'DataArchive',
+					'Archive File',
+					sprintf(
+						'<a href="%s">%s</a>',
+						$this->ArchiveFile()->AbsoluteURL,
+						$this->ArchiveFile()->Filename
+					)
+				),
+				new GridField(
+					'DataTransfers',
+					'Transfers',
+					$this->DataTransfers()
+				),
+			)
+		);
+		$linkField->dontEscape = true;
+		$fields = $fields->makeReadonly();
+
+		return $fields;
+	}
+
+	public function getDefaultSearchContext()
+	{
+		$context = parent::getDefaultSearchContext();
+		$context->getFields()->dataFieldByName('Mode')->setHasEmptyDefault(true);
+
+		return $context;
+	}
+
+	/**
+	 * Calculates and returns a human-readable size of this archive file. If the file exists, it will determine
+	 * whether to display the output in bytes, kilobytes, megabytes, or gigabytes.
+	 *
+	 * @return string The human-readable size of this archive file
+	 */
+	public function FileSize()
+	{
+		if ($this->ArchiveFile()->exists()) {
+			return $this->ArchiveFile()->getSize();
+		} else {
+			return "N/A";
+		}
+	}
+
+	public function getModeNice()
+	{
+		if ($this->Mode == 'all') {
+			return 'database and assets';
+		} else {
+			return $this->Mode;
+		}
+	}
+
+	/**
+	 * Some archives don't have files attached to them yet,
+	 * because a file has been posted offline and is waiting to be uploaded
+	 * against this "archive placeholder".
+	 *
+	 * @return boolean
+	 */
+	public function isPending()
+	{
+		return !($this->ArchiveFileID);
+	}
+
+	/**
+	 * Inferred from both restore and backup permissions.
+	 *
+	 * @param Member|null $member The {@link Member} object to test against.
+	 */
+	public function canView($member = null)
+	{
+		return ($this->canRestore($member) || $this->canDownload($member));
+	}
+
+	/**
+	 * Whether a {@link Member} can restore this archive to an environment.
+	 * This only needs to be checked *once* per member and environment.
+	 *
+	 * @param Member|null $member The {@link Member} object to test against.
+	 * @return true if $member (or the currently logged in member if null) can upload this archive
+	 */
+	public function canRestore($member = null)
+	{
+		$memberID = $member ? $member->ID : Member::currentUserID();
+		if (!$memberID) {
+			return false;
+		}
+
+		$key = $memberID . '-' . $this->EnvironmentID;
+		if (!isset(self::$_cache_can_restore[$key])) {
+			self::$_cache_can_restore[$key] = $this->Environment()->canUploadArchive($member);
+		}
+
+		return self::$_cache_can_restore[$key];
+	}
+
+	/**
+	 * Whether a {@link Member} can download this archive to their PC.
+	 * This only needs to be checked *once* per member and environment.
+	 *
+	 * @param Member|null $member The {@link Member} object to test against.
+	 * @return true if $member (or the currently logged in member if null) can download this archive
+	 */
+	public function canDownload($member = null)
+	{
+		$memberID = $member ? $member->ID : Member::currentUserID();
+		if (!$memberID) {
+			return false;
+		}
+
+		$key = $memberID . '-' . $this->EnvironmentID;
+		if (!isset(self::$_cache_can_download[$key])) {
+			self::$_cache_can_download[$key] = $this->Environment()->canDownloadArchive($member);
+		}
+		return self::$_cache_can_download[$key];
+	}
+
+	/**
+	 * Whether a {@link Member} can delete this archive from staging area.
+	 *
+	 * @param Member|null $member The {@link Member} object to test against.
+	 * @return boolean if $member (or the currently logged in member if null) can delete this archive
+	 */
+	public function canDelete($member = null)
+	{
+		return $this->Environment()->canDeleteArchive($member);
+	}
+
+	/**
+	 * Check if this member can move archive into the environment.
+	 *
+	 * @param DNEnvironment $targetEnv Environment to check.
+	 * @param Member|null $member The {@link Member} object to test against. If null, uses Member::currentMember();
+	 *
+	 * @return boolean true if $member can upload archives linked to this environment, false if they can't.
+	 */
+	public function canMoveTo($targetEnv, $member = null)
+	{
+		if ($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
+			// We don't permit moving snapshots between projects at this stage.
+			return false;
+		}
+
+		if (!$member) {
+			$member = Member::currentUser();
+		}
+
+		// Must be logged in to check permissions
+		if (!$member) {
+			return false;
+		}
+
+		// Admin can always move.
+		if (Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
+
+		// Checks if the user can actually access the archive.
+		if (!$this->canDownload($member)) {
+			return false;
+		}
+
+		// Hooks into ArchiveUploaders permission to prevent proliferation of permission checkboxes.
+		// Bypasses the quota check - we don't need to check for it as long as we move the snapshot within the project.
+		return $targetEnv->ArchiveUploaders()->byID($member->ID)
+			|| $member->inGroups($targetEnv->ArchiveUploaderGroups());
+	}
+
+	/**
+	 * Finds all environments within this project where the archive can be moved to.
+	 * Excludes current environment automatically.
+	 *
+	 * @return ArrayList List of valid environments.
+	 */
+	public function validTargetEnvironments()
+	{
+		$archive = $this;
+		$envs = $this->Environment()->Project()->DNEnvironmentList()
+			->filterByCallback(function ($item) use ($archive) {
+				return $archive->EnvironmentID != $item->ID && $archive->canMoveTo($item);
+			});
+
+		return $envs;
+	}
+
+	/**
+	 * Returns a unique filename, including project/environment/timestamp details.
+	 * @return string
+	 */
+	public function generateFilename(DNDataTransfer $dataTransfer)
+	{
+		$generator = new RandomGenerator();
+		$filter = FileNameFilter::create();
+
+		return sprintf(
+			'%s-%s-%s-%s-%s',
+			$filter->filter(strtolower($this->OriginalEnvironment()->Project()->Name)),
+			$filter->filter(strtolower($this->OriginalEnvironment()->Name)),
+			$dataTransfer->Mode,
+			date('Ymd'),
+			sha1($generator->generateEntropy())
+		);
+	}
+
+	/**
+	 * Returns a path unique to a specific transfer, including project/environment details.
+	 * Does not create the path on the filesystem. Can be used to store files related to this transfer.
+	 *
+	 * @param DNDataTransfer
+	 * @return string Absolute file path
+	 */
+	public function generateFilepath(DNDataTransfer $dataTransfer)
+	{
+		$data = DNData::inst();
+		$transferDir = $data->getDataTransferDir();
+		$filter = FileNameFilter::create();
+
+		return sprintf('%s/%s/%s/transfer-%s/',
+			$transferDir,
+			$filter->filter(strtolower($this->OriginalEnvironment()->Project()->Name)),
+			$filter->filter(strtolower($this->OriginalEnvironment()->Name)),
+			$dataTransfer->ID
+		);
+	}
+
+	/**
+	 * Attach an sspak file path to this archive and associate the transfer.
+	 * Does the job of creating a {@link File} record, and setting correct paths into the assets directory.
+	 *
+	 * @param string $sspakFilepath
+	 * @param DNDataTransfer $dataTransfer
+	 * @return bool
+	 */
+	public function attachFile($sspakFilepath, DNDataTransfer $dataTransfer)
+	{
+		$sspakFilepath = ltrim(
+			str_replace(
+				array(ASSETS_PATH, realpath(ASSETS_PATH)),
+				'',
+				$sspakFilepath
+			),
+			DIRECTORY_SEPARATOR
+		);
+
+		$folder = Folder::find_or_make(dirname($sspakFilepath));
+		$file = new File();
+		$file->Name = basename($sspakFilepath);
+		$file->Filename = $sspakFilepath;
+		$file->ParentID = $folder->ID;
+		$file->write();
+
+		// "Status" will be updated by the job execution
+		$dataTransfer->write();
+
+		// Get file hash to ensure consistency.
+		// Only do this when first associating the file since hashing large files is expensive.
+		// Note that with CapistranoDeploymentBackend the file won't be available yet, as it
+		// gets put in place immediately after this method gets called. In which case, it will
+		// be hashed in setArchiveFromFiles()
+		if (file_exists($file->FullPath)) {
+			$this->ArchiveFileHash = md5_file($file->FullPath);
+		}
+		$this->ArchiveFileID = $file->ID;
+		$this->DataTransfers()->add($dataTransfer);
+		$this->write();
+
+		return true;
+	}
+
+	/**
+	 * Extract the current sspak contents into the given working directory.
+	 * This also extracts the assets and database and puts them into
+	 * <workingdir>/database.sql and <workingdir>/assets, respectively.
+	 *
+	 * @param string|null $workingDir The path to extract to
+	 * @throws RuntimeException
+	 * @return bool
+	 */
+	public function extractArchive($workingDir = null)
+	{
+		if (!is_dir($workingDir)) {
+			mkdir($workingDir, 0700, true);
+		}
+
+		$cleanupFn = function () use ($workingDir) {
+			$process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
+			$process->run();
+		};
+
+		// Extract *.sspak to a temporary location
+		$sspakFilename = $this->ArchiveFile()->FullPath;
+		$process = new Process(sprintf(
+			'sspak extract %s %s',
+			escapeshellarg($sspakFilename),
+			escapeshellarg($workingDir)
+		));
+		$process->setTimeout(3600);
+		$process->run();
+		if (!$process->isSuccessful()) {
+			$cleanupFn();
+			throw new RuntimeException(sprintf('Could not extract the sspak file: %s', $process->getErrorOutput()));
+		}
+
+		// Extract database.sql.gz to <workingdir>/database.sql
+		if (file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
+			$process = new Process('gunzip database.sql.gz', $workingDir);
+			$process->setTimeout(3600);
+			$process->run();
+			if (!$process->isSuccessful()) {
+				$cleanupFn();
+				throw new RuntimeException(sprintf('Could not extract the db archive: %s', $process->getErrorOutput()));
+			}
+		}
+
+		// Extract assets.tar.gz to <workingdir>/assets/
+		if (file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
+			$process = new Process('tar xzf assets.tar.gz', $workingDir);
+			$process->setTimeout(3600);
+			$process->run();
+			if (!$process->isSuccessful()) {
+				$cleanupFn();
+				throw new RuntimeException(sprintf('Could not extract the assets archive: %s', $process->getErrorOutput()));
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Validate that an sspak contains the correct content.
+	 *
+	 * For example, if the user uploaded an sspak containing just the db, but declared in the form
+	 * that it contained db+assets, then the archive is not valid.
+	 *
+	 * @param string|null $mode "db", "assets", or "all". This is the content we're checking for. Default to the archive setting
+	 * @return ValidationResult
+	 */
+	public function validateArchiveContents($mode = null)
+	{
+		$mode = $mode ?: $this->Mode;
+		$result = new ValidationResult();
+
+		$file = $this->ArchiveFile()->FullPath;
+
+		if (!is_readable($file)) {
+			$result->error(sprintf('SSPak file "%s" cannot be read.', $file));
+			return $result;
+		}
+
+		$process = new Process(sprintf('tar -tf %s', escapeshellarg($file)));
+		$process->setTimeout(120);
+		$process->run();
+		if (!$process->isSuccessful()) {
+			throw new RuntimeException(sprintf('Could not list files in archive: %s', $process->getErrorOutput()));
+		}
+
+		$output = explode(PHP_EOL, $process->getOutput());
+		$files = array_filter($output);
+
+		if (in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
+			$result->error('The snapshot is missing the database.');
+			return $result;
+		}
+
+		if (in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
+			$result->error('The snapshot is missing assets.');
+			return $result;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Given a path that already exists and contains an extracted sspak, including
+	 * the assets, fix all of the file permissions so they're in a state ready to
+	 * be pushed to remote servers.
+	 *
+	 * Normally, command line tar will use permissions found in the archive, but will
+	 * substract the user's umask from them. This has a potential to create unreadable
+	 * files, e.g. cygwin on Windows will pack files with mode 000, hence why this fix
+	 * is necessary.
+	 *
+	 * @param string|null $workingDir The path of where the sspak has been extracted to
+	 * @throws RuntimeException
+	 * @return bool
+	 */
+	public function fixArchivePermissions($workingDir)
+	{
+		$fixCmds = array(
+			// The directories need to have permissions changed one by one (hence the ; instead of +),
+			// otherwise we might end up having no +x access to a directory deeper down.
+			sprintf('find %s -type d -exec chmod 755 {} \;', escapeshellarg($workingDir)),
+			sprintf('find %s -type f -exec chmod 644 {} +', escapeshellarg($workingDir))
+		);
+
+		foreach ($fixCmds as $cmd) {
+			$process = new Process($cmd);
+			$process->setTimeout(3600);
+			$process->run();
+			if (!$process->isSuccessful()) {
+				throw new RuntimeException($process->getErrorOutput());
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Given extracted sspak contents, create an sspak from it
+	 * and overwrite the current ArchiveFile with it's contents.
+	 *
+	 * @param string|null $workingDir The path of where the sspak has been extracted to
+	 * @return bool
+	 */
+	public function setArchiveFromFiles($workingDir)
+	{
+		$command = sprintf('sspak saveexisting %s 2>&1', $this->ArchiveFile()->FullPath);
+		if ($this->Mode == 'db') {
+			$command .= sprintf(' --db=%s/database.sql', $workingDir);
+		} elseif ($this->Mode == 'assets') {
+			$command .= sprintf(' --assets=%s/assets', $workingDir);
+		} else {
+			$command .= sprintf(' --db=%s/database.sql --assets=%s/assets', $workingDir, $workingDir);
+		}
+
+		$process = new Process($command, $workingDir);
+		$process->setTimeout(3600);
+		$process->run();
+		if (!$process->isSuccessful()) {
+			throw new RuntimeException($process->getErrorOutput());
+		}
+
+		$this->ArchiveFileHash = md5_file($this->ArchiveFile()->FullPath);
+		$this->write();
+
+		return true;
+	}
 }

Spacing +30 added lines, -30 removed lines

@@ -127,7 +127,7 @@ 
 
     public function onBeforeWrite()
     {
-        if (!$this->AuthorID) {
+        if(!$this->AuthorID) {
             $this->AuthorID = Member::currentUserID();
         }
 
@@ -189,7 +189,7 @@ 
      */
     public function FileSize()
     {
-        if ($this->ArchiveFile()->exists()) {
+        if($this->ArchiveFile()->exists()) {
             return $this->ArchiveFile()->getSize();
         } else {
             return "N/A";
@@ -198,7 +198,7 @@ 
 
     public function getModeNice()
     {
-        if ($this->Mode == 'all') {
+        if($this->Mode == 'all') {
             return 'database and assets';
         } else {
             return $this->Mode;
@@ -237,12 +237,12 @@ 
     public function canRestore($member = null)
     {
         $memberID = $member ? $member->ID : Member::currentUserID();
-        if (!$memberID) {
+        if(!$memberID) {
             return false;
         }
 
         $key = $memberID . '-' . $this->EnvironmentID;
-        if (!isset(self::$_cache_can_restore[$key])) {
+        if(!isset(self::$_cache_can_restore[$key])) {
             self::$_cache_can_restore[$key] = $this->Environment()->canUploadArchive($member);
         }
 
@@ -259,12 +259,12 @@ 
     public function canDownload($member = null)
     {
         $memberID = $member ? $member->ID : Member::currentUserID();
-        if (!$memberID) {
+        if(!$memberID) {
             return false;
         }
 
         $key = $memberID . '-' . $this->EnvironmentID;
-        if (!isset(self::$_cache_can_download[$key])) {
+        if(!isset(self::$_cache_can_download[$key])) {
             self::$_cache_can_download[$key] = $this->Environment()->canDownloadArchive($member);
         }
         return self::$_cache_can_download[$key];
@@ -291,27 +291,27 @@ 
      */
     public function canMoveTo($targetEnv, $member = null)
     {
-        if ($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
+        if($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
             // We don't permit moving snapshots between projects at this stage.
             return false;
         }
 
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
 
         // Must be logged in to check permissions
-        if (!$member) {
+        if(!$member) {
             return false;
         }
 
         // Admin can always move.
-        if (Permission::checkMember($member, 'ADMIN')) {
+        if(Permission::checkMember($member, 'ADMIN')) {
             return true;
         }
 
         // Checks if the user can actually access the archive.
-        if (!$this->canDownload($member)) {
+        if(!$this->canDownload($member)) {
             return false;
         }
 
@@ -331,7 +331,7 @@ 
     {
         $archive = $this;
         $envs = $this->Environment()->Project()->DNEnvironmentList()
-            ->filterByCallback(function ($item) use ($archive) {
+            ->filterByCallback(function($item) use ($archive) {
                 return $archive->EnvironmentID != $item->ID && $archive->canMoveTo($item);
             });
 
@@ -412,7 +412,7 @@ 
         // Note that with CapistranoDeploymentBackend the file won't be available yet, as it
         // gets put in place immediately after this method gets called. In which case, it will
         // be hashed in setArchiveFromFiles()
-        if (file_exists($file->FullPath)) {
+        if(file_exists($file->FullPath)) {
             $this->ArchiveFileHash = md5_file($file->FullPath);
         }
         $this->ArchiveFileID = $file->ID;
@@ -433,11 +433,11 @@ 
      */
     public function extractArchive($workingDir = null)
     {
-        if (!is_dir($workingDir)) {
+        if(!is_dir($workingDir)) {
             mkdir($workingDir, 0700, true);
         }
 
-        $cleanupFn = function () use ($workingDir) {
+        $cleanupFn = function() use ($workingDir) {
             $process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
             $process->run();
         };
@@ -451,28 +451,28 @@ 
         ));
         $process->setTimeout(3600);
         $process->run();
-        if (!$process->isSuccessful()) {
+        if(!$process->isSuccessful()) {
             $cleanupFn();
             throw new RuntimeException(sprintf('Could not extract the sspak file: %s', $process->getErrorOutput()));
         }
 
         // Extract database.sql.gz to <workingdir>/database.sql
-        if (file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
+        if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
             $process = new Process('gunzip database.sql.gz', $workingDir);
             $process->setTimeout(3600);
             $process->run();
-            if (!$process->isSuccessful()) {
+            if(!$process->isSuccessful()) {
                 $cleanupFn();
                 throw new RuntimeException(sprintf('Could not extract the db archive: %s', $process->getErrorOutput()));
             }
         }
 
         // Extract assets.tar.gz to <workingdir>/assets/
-        if (file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
+        if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
             $process = new Process('tar xzf assets.tar.gz', $workingDir);
             $process->setTimeout(3600);
             $process->run();
-            if (!$process->isSuccessful()) {
+            if(!$process->isSuccessful()) {
                 $cleanupFn();
                 throw new RuntimeException(sprintf('Could not extract the assets archive: %s', $process->getErrorOutput()));
             }
@@ -497,7 +497,7 @@ 
 
         $file = $this->ArchiveFile()->FullPath;
 
-        if (!is_readable($file)) {
+        if(!is_readable($file)) {
             $result->error(sprintf('SSPak file "%s" cannot be read.', $file));
             return $result;
         }
@@ -505,19 +505,19 @@ 
         $process = new Process(sprintf('tar -tf %s', escapeshellarg($file)));
         $process->setTimeout(120);
         $process->run();
-        if (!$process->isSuccessful()) {
+        if(!$process->isSuccessful()) {
             throw new RuntimeException(sprintf('Could not list files in archive: %s', $process->getErrorOutput()));
         }
 
         $output = explode(PHP_EOL, $process->getOutput());
         $files = array_filter($output);
 
-        if (in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
+        if(in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
             $result->error('The snapshot is missing the database.');
             return $result;
         }
 
-        if (in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
+        if(in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
             $result->error('The snapshot is missing assets.');
             return $result;
         }
@@ -548,11 +548,11 @@ 
             sprintf('find %s -type f -exec chmod 644 {} +', escapeshellarg($workingDir))
         );
 
-        foreach ($fixCmds as $cmd) {
+        foreach($fixCmds as $cmd) {
             $process = new Process($cmd);
             $process->setTimeout(3600);
             $process->run();
-            if (!$process->isSuccessful()) {
+            if(!$process->isSuccessful()) {
                 throw new RuntimeException($process->getErrorOutput());
             }
         }
@@ -570,9 +570,9 @@ 
     public function setArchiveFromFiles($workingDir)
     {
         $command = sprintf('sspak saveexisting %s 2>&1', $this->ArchiveFile()->FullPath);
-        if ($this->Mode == 'db') {
+        if($this->Mode == 'db') {
             $command .= sprintf(' --db=%s/database.sql', $workingDir);
-        } elseif ($this->Mode == 'assets') {
+        } elseif($this->Mode == 'assets') {
             $command .= sprintf(' --assets=%s/assets', $workingDir);
         } else {
             $command .= sprintf(' --db=%s/database.sql --assets=%s/assets', $workingDir, $workingDir);
@@ -581,7 +581,7 @@ 
         $process = new Process($command, $workingDir);
         $process->setTimeout(3600);
         $process->run();
-        if (!$process->isSuccessful()) {
+        if(!$process->isSuccessful()) {
             throw new RuntimeException($process->getErrorOutput());
         }
 

Braces +23 added lines, -46 removed lines

@@ -47,8 +47,7 @@ 
  * @method ManyManyList DataTransfers()
  *
  */
-class DNDataArchive extends DataObject
-{
+class DNDataArchive extends DataObject {
 
     private static $db = array(
         'UploadToken' => 'Varchar(8)',
@@ -104,8 +103,7 @@ 
 
     private static $_cache_can_download = array();
 
-    public static function get_mode_map()
-    {
+    public static function get_mode_map() {
         return array(
             'all' => 'Database and Assets',
             'db' => 'Database only',
@@ -119,14 +117,12 @@ 
      *
      * @return string
      */
-    public static function generate_upload_token($chars = 8)
-    {
+    public static function generate_upload_token($chars = 8) {
         $generator = new RandomGenerator();
         return strtoupper(substr($generator->randomToken(), 0, $chars));
     }
 
-    public function onBeforeWrite()
-    {
+    public function onBeforeWrite() {
         if (!$this->AuthorID) {
             $this->AuthorID = Member::currentUserID();
         }
@@ -134,13 +130,11 @@ 
         parent::onBeforeWrite();
     }
 
-    public function onAfterDelete()
-    {
+    public function onAfterDelete() {
         $this->ArchiveFile()->delete();
     }
 
-    public function getCMSFields()
-    {
+    public function getCMSFields() {
         $fields = parent::getCMSFields();
         $fields->removeByName('OriginalEnvironmentID');
         $fields->removeByName('EnvironmentID');
@@ -173,8 +167,7 @@ 
         return $fields;
     }
 
-    public function getDefaultSearchContext()
-    {
+    public function getDefaultSearchContext() {
         $context = parent::getDefaultSearchContext();
         $context->getFields()->dataFieldByName('Mode')->setHasEmptyDefault(true);
 
@@ -187,8 +180,7 @@ 
      *
      * @return string The human-readable size of this archive file
      */
-    public function FileSize()
-    {
+    public function FileSize() {
         if ($this->ArchiveFile()->exists()) {
             return $this->ArchiveFile()->getSize();
         } else {
@@ -196,8 +188,7 @@ 
         }
     }
 
-    public function getModeNice()
-    {
+    public function getModeNice() {
         if ($this->Mode == 'all') {
             return 'database and assets';
         } else {
@@ -212,8 +203,7 @@ 
      *
      * @return boolean
      */
-    public function isPending()
-    {
+    public function isPending() {
         return !($this->ArchiveFileID);
     }
 
@@ -222,8 +212,7 @@ 
      *
      * @param Member|null $member The {@link Member} object to test against.
      */
-    public function canView($member = null)
-    {
+    public function canView($member = null) {
         return ($this->canRestore($member) || $this->canDownload($member));
     }
 
@@ -234,8 +223,7 @@ 
      * @param Member|null $member The {@link Member} object to test against.
      * @return true if $member (or the currently logged in member if null) can upload this archive
      */
-    public function canRestore($member = null)
-    {
+    public function canRestore($member = null) {
         $memberID = $member ? $member->ID : Member::currentUserID();
         if (!$memberID) {
             return false;
@@ -256,8 +244,7 @@ 
      * @param Member|null $member The {@link Member} object to test against.
      * @return true if $member (or the currently logged in member if null) can download this archive
      */
-    public function canDownload($member = null)
-    {
+    public function canDownload($member = null) {
         $memberID = $member ? $member->ID : Member::currentUserID();
         if (!$memberID) {
             return false;
@@ -276,8 +263,7 @@ 
      * @param Member|null $member The {@link Member} object to test against.
      * @return boolean if $member (or the currently logged in member if null) can delete this archive
      */
-    public function canDelete($member = null)
-    {
+    public function canDelete($member = null) {
         return $this->Environment()->canDeleteArchive($member);
     }
 
@@ -289,8 +275,7 @@ 
      *
      * @return boolean true if $member can upload archives linked to this environment, false if they can't.
      */
-    public function canMoveTo($targetEnv, $member = null)
-    {
+    public function canMoveTo($targetEnv, $member = null) {
         if ($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
             // We don't permit moving snapshots between projects at this stage.
             return false;
@@ -327,8 +312,7 @@ 
      *
      * @return ArrayList List of valid environments.
      */
-    public function validTargetEnvironments()
-    {
+    public function validTargetEnvironments() {
         $archive = $this;
         $envs = $this->Environment()->Project()->DNEnvironmentList()
             ->filterByCallback(function ($item) use ($archive) {
@@ -342,8 +326,7 @@ 
      * Returns a unique filename, including project/environment/timestamp details.
      * @return string
      */
-    public function generateFilename(DNDataTransfer $dataTransfer)
-    {
+    public function generateFilename(DNDataTransfer $dataTransfer) {
         $generator = new RandomGenerator();
         $filter = FileNameFilter::create();
 
@@ -364,8 +347,7 @@ 
      * @param DNDataTransfer
      * @return string Absolute file path
      */
-    public function generateFilepath(DNDataTransfer $dataTransfer)
-    {
+    public function generateFilepath(DNDataTransfer $dataTransfer) {
         $data = DNData::inst();
         $transferDir = $data->getDataTransferDir();
         $filter = FileNameFilter::create();
@@ -386,8 +368,7 @@ 
      * @param DNDataTransfer $dataTransfer
      * @return bool
      */
-    public function attachFile($sspakFilepath, DNDataTransfer $dataTransfer)
-    {
+    public function attachFile($sspakFilepath, DNDataTransfer $dataTransfer) {
         $sspakFilepath = ltrim(
             str_replace(
                 array(ASSETS_PATH, realpath(ASSETS_PATH)),
@@ -431,8 +412,7 @@ 
      * @throws RuntimeException
      * @return bool
      */
-    public function extractArchive($workingDir = null)
-    {
+    public function extractArchive($workingDir = null) {
         if (!is_dir($workingDir)) {
             mkdir($workingDir, 0700, true);
         }
@@ -490,8 +470,7 @@ 
      * @param string|null $mode "db", "assets", or "all". This is the content we're checking for. Default to the archive setting
      * @return ValidationResult
      */
-    public function validateArchiveContents($mode = null)
-    {
+    public function validateArchiveContents($mode = null) {
         $mode = $mode ?: $this->Mode;
         $result = new ValidationResult();
 
@@ -539,8 +518,7 @@ 
      * @throws RuntimeException
      * @return bool
      */
-    public function fixArchivePermissions($workingDir)
-    {
+    public function fixArchivePermissions($workingDir) {
         $fixCmds = array(
             // The directories need to have permissions changed one by one (hence the ; instead of +),
             // otherwise we might end up having no +x access to a directory deeper down.
@@ -567,8 +545,7 @@ 
      * @param string|null $workingDir The path of where the sspak has been extracted to
      * @return bool
      */
-    public function setArchiveFromFiles($workingDir)
-    {
+    public function setArchiveFromFiles($workingDir) {
         $command = sprintf('sspak saveexisting %s 2>&1', $this->ArchiveFile()->FullPath);
         if ($this->Mode == 'db') {
             $command .= sprintf(' --db=%s/database.sql', $workingDir);

code/model/DNFailedCommits.php

Indentation +6 added lines, -6 removed lines

@@ -9,11 +9,11 @@
 class DNFailedCommits extends DNFilteredCommits
 {
 
-    private $description = 'Commits that have failed in the past';
+	private $description = 'Commits that have failed in the past';
 
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setFilter('Failed');
-    }
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setFilter('Failed');
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -6,13 +6,11 @@
  *  Class to represent failed commits
  *
  */
-class DNFailedCommits extends DNFilteredCommits
-{
+class DNFailedCommits extends DNFilteredCommits {
 
     private $description = 'Commits that have failed in the past';
 
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
         $this->setFilter('Failed');
     }

code/model/DNFilteredCommits.php

Indentation +32 added lines, -32 removed lines

@@ -30,43 +30,43 @@
 class DNFilteredCommits extends Object
 {
 
-    public $env;
+	public $env;
 
-    private $filter;
+	private $filter;
 
-    private $environmentExceptionError = 'Environment has not been set';
+	private $environmentExceptionError = 'Environment has not been set';
 
-    // default sort to be by the latest commit
-    protected $sort = 'DESC';
+	// default sort to be by the latest commit
+	protected $sort = 'DESC';
 
-    public function setFilter($filter = 'Finished')
-    {
-        $this->filter = $filter;
-    }
+	public function setFilter($filter = 'Finished')
+	{
+		$this->filter = $filter;
+	}
 
-    public function getCommits()
-    {
-        if (!isset($this->env)) {
-            $this->environmentNotSetException();
-        }
-        $successfulCommits =
-            $this->env->DeployHistory()->filter(
-                array('Status' => $this->filter, 'EnvironmentID' => $this->env->ID)
-            )->sort('Created', $this->sort);
-        return $successfulCommits;
-    }
+	public function getCommits()
+	{
+		if (!isset($this->env)) {
+			$this->environmentNotSetException();
+		}
+		$successfulCommits =
+			$this->env->DeployHistory()->filter(
+				array('Status' => $this->filter, 'EnvironmentID' => $this->env->ID)
+			)->sort('Created', $this->sort);
+		return $successfulCommits;
+	}
 
-    public function getLatestCommit()
-    {
-        if (!isset($this->env)) {
-            $this->environmentNotSetException();
-        }
-        $commits = $this->getCommits();
-        return $commits->first();
-    }
+	public function getLatestCommit()
+	{
+		if (!isset($this->env)) {
+			$this->environmentNotSetException();
+		}
+		$commits = $this->getCommits();
+		return $commits->first();
+	}
 
-    private function environmentNotSetException()
-    {
-        throw new Exception($this->environmentExceptionError);
-    }
+	private function environmentNotSetException()
+	{
+		throw new Exception($this->environmentExceptionError);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
 
     public function getCommits()
     {
-        if (!isset($this->env)) {
+        if(!isset($this->env)) {
             $this->environmentNotSetException();
         }
         $successfulCommits =
@@ -58,7 +58,7 @@ 
 
     public function getLatestCommit()
     {
-        if (!isset($this->env)) {
+        if(!isset($this->env)) {
             $this->environmentNotSetException();
         }
         $commits = $this->getCommits();

Braces +5 added lines, -10 removed lines

@@ -27,8 +27,7 @@ 
  *    PerformTestOn: 'ThisEnvironment'
  *
  */
-class DNFilteredCommits extends Object
-{
+class DNFilteredCommits extends Object {
 
     public $env;
 
@@ -39,13 +38,11 @@ 
     // default sort to be by the latest commit
     protected $sort = 'DESC';
 
-    public function setFilter($filter = 'Finished')
-    {
+    public function setFilter($filter = 'Finished') {
         $this->filter = $filter;
     }
 
-    public function getCommits()
-    {
+    public function getCommits() {
         if (!isset($this->env)) {
             $this->environmentNotSetException();
         }
@@ -56,8 +53,7 @@ 
         return $successfulCommits;
     }
 
-    public function getLatestCommit()
-    {
+    public function getLatestCommit() {
         if (!isset($this->env)) {
             $this->environmentNotSetException();
         }
@@ -65,8 +61,7 @@ 
         return $commits->first();
     }
 
-    private function environmentNotSetException()
-    {
+    private function environmentNotSetException() {
         throw new Exception($this->environmentExceptionError);
     }
 }

code/model/DNFinishedCommits.php

Indentation +9 added lines, -9 removed lines

@@ -8,14 +8,14 @@
  */
 class DNFinishedCommits extends DNFilteredCommits
 {
-    /**
-     * @var string
-     */
-    private $description = 'Commits successfully deployed in the past';
+	/**
+	 * @var string
+	 */
+	private $description = 'Commits successfully deployed in the past';
 
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setFilter('Finished');
-    }
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setFilter('Finished');
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -6,15 +6,13 @@
  *  Class to represent finished commits
  *
  */
-class DNFinishedCommits extends DNFilteredCommits
-{
+class DNFinishedCommits extends DNFilteredCommits {
     /**
      * @var string
      */
     private $description = 'Commits successfully deployed in the past';
 
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
         $this->setFilter('Finished');
     }

code/model/DNProject.php

Indentation +1157 added lines, -1157 removed lines

@@ -15,887 +15,887 @@ 
 class DNProject extends DataObject
 {
 
-    /**
-     * @var array
-     */
-    public static $db = array(
-        "Name" => "Varchar",
-        "CVSPath" => "Varchar(255)",
-        "DiskQuotaMB" => "Int",
-        "AllowedEnvironmentType" => "Varchar(255)",
-    );
-
-    /**
-     * @var array
-     */
-    public static $has_many = array(
-        "Environments" => "DNEnvironment",
-        "CreateEnvironments" => "DNCreateEnvironment"
-    );
-
-    /**
-     * @var array
-     */
-    public static $many_many = array(
-        "Viewers" => "Group",
-        'StarredBy' => "Member"
-    );
-
-    /**
-     * @var array
-     */
-    public static $summary_fields = array(
-        "Name",
-        "ViewersList",
-    );
-
-    /**
-     * @var array
-     */
-    public static $searchable_fields = array(
-        "Name",
-    );
-
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Project';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Projects';
-
-    /**
-     * @var string
-     */
-    private static $default_sort = 'Name';
-
-    /**
-     * Display the repository URL on the project page.
-     *
-     * @var bool
-     */
-    private static $show_repository_url = false;
-
-    /**
-     * In-memory cache for currentBuilds per environment since fetching them from
-     * disk is pretty resource hungry.
-     *
-     * @var array
-     */
-    protected static $relation_cache = array();
-
-    /**
-     * In-memory cache to determine whether clone repo was called.
-     * @var array
-     */
-    private static $has_cloned_cache = array();
-
-    /**
-     * @var bool|Member
-     */
-    protected static $_current_member_cache = null;
-
-    /**
-     * Used by the sync task
-     *
-     * @param string $path
-     * @return \DNProject
-     */
-    public static function create_from_path($path)
-    {
-        $project = DNProject::create();
-        $project->Name = $path;
-        $project->write();
-
-        // add the administrators group as the viewers of the new project
-        $adminGroup = Group::get()->filter('Code', 'administrators')->first();
-        if ($adminGroup && $adminGroup->exists()) {
-            $project->Viewers()->add($adminGroup);
-        }
-        return $project;
-    }
-
-    /**
-     * Return the used quota in MB.
-     *
-     * @param int $round Number of decimal places to round to
-     * @return double The used quota size in MB
-     */
-    public function getUsedQuotaMB($round = 2)
-    {
-        $size = 0;
-
-        foreach ($this->Environments() as $environment) {
-            foreach ($environment->DataArchives()->filter('IsBackup', 0) as $archive) {
-                $size += $archive->ArchiveFile()->getAbsoluteSize();
-            }
-        }
-
-        // convert bytes to megabytes and round
-        return round(($size / 1024) / 1024, $round);
-    }
-
-    /**
-     * Getter for DiskQuotaMB field to provide a default for existing
-     * records that have no quota field set, as it will need to default
-     * to a globally set size.
-     *
-     * @return string|int The quota size in MB
-     */
-    public function getDiskQuotaMB()
-    {
-        $size = $this->getField('DiskQuotaMB');
-
-        if (empty($size)) {
-            $defaults = $this->config()->get('defaults');
-            $size = (isset($defaults['DiskQuotaMB'])) ? $defaults['DiskQuotaMB'] : 0;
-        }
-
-        return $size;
-    }
-
-    /**
-     * Has the disk quota been exceeded?
-     *
-     * @return boolean
-     */
-    public function HasExceededDiskQuota()
-    {
-        return $this->getUsedQuotaMB(0) >= $this->getDiskQuotaMB();
-    }
-
-    /**
-     * Is there a disk quota set for this project?
-     *
-     * @return boolean
-     */
-    public function HasDiskQuota()
-    {
-        return $this->getDiskQuotaMB() > 0;
-    }
-
-    /**
-     * Returns the current disk quota usage as a percentage
-     *
-     * @return int
-     */
-    public function DiskQuotaUsagePercent()
-    {
-        $quota = $this->getDiskQuotaMB();
-        if ($quota > 0) {
-            return $this->getUsedQuotaMB() * 100 / $quota;
-        }
-        return 100;
-    }
-
-    /**
-     * Get the menu to be shown on projects
-     *
-     * @return ArrayList
-     */
-    public function Menu()
-    {
-        $list = new ArrayList();
-
-        $controller = Controller::curr();
-        $actionType = $controller->getField('CurrentActionType');
-
-        if (DNRoot::FlagSnapshotsEnabled() && $this->isProjectReady()) {
-            $list->push(new ArrayData(array(
-                'Link' => sprintf('naut/project/%s/snapshots', $this->Name),
-                'Title' => 'Snapshots',
-                'IsCurrent' => $this->isSection() && $controller->getAction() == 'snapshots',
-                'IsSection' => $this->isSection() && $actionType == DNRoot::ACTION_SNAPSHOT
-            )));
-        }
-
-        $this->extend('updateMenu', $list);
-
-        return $list;
-    }
-
-    /**
-     * Is this project currently at the root level of the controller that handles it?
-     *
-     * @return bool
-     */
-    public function isCurrent()
-    {
-        return $this->isSection() && Controller::curr()->getAction() == 'project';
-    }
-
-    /**
-     * Return the current object from $this->Menu()
-     * Good for making titles and things
-     *
-     * @return DataObject
-     */
-    public function CurrentMenu()
-    {
-        return $this->Menu()->filter('IsSection', true)->First();
-    }
-
-    /**
-     * Is this project currently in a controller that is handling it or performing a sub-task?
-     *
-     * @return bool
-     */
-    public function isSection()
-    {
-        $controller = Controller::curr();
-        $project = $controller->getField('CurrentProject');
-        return $project && $this->ID == $project->ID;
-    }
-
-    /**
-     * Restrict access to viewing this project
-     *
-     * @param Member|null $member
-     * @return boolean
-     */
-    public function canView($member = null)
-    {
-        if (!$member) {
-            $member = Member::currentUser();
-        }
-
-        if (Permission::checkMember($member, 'ADMIN')) {
-            return true;
-        }
-
-        return $member->inGroups($this->Viewers());
-    }
-
-    /**
-     * @param Member|null $member
-     *
-     * @return bool
-     */
-    public function canRestore($member = null)
-    {
-        if ($this->allowedAny(
-            array(
-                DNRoot::ALLOW_PROD_SNAPSHOT,
-                DNRoot::ALLOW_NON_PROD_SNAPSHOT
-            ),
-            $member
-        )) {
-            return true;
-        }
-
-        return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
-            return $env->canRestore($member);
-        })->Count();
-    }
-
-    /**
-     * @param Member|null $member
-     * @return bool
-     */
-    public function canBackup($member = null)
-    {
-        if ($this->allowedAny(
-            array(
-                DNRoot::ALLOW_PROD_SNAPSHOT,
-                DNRoot::ALLOW_NON_PROD_SNAPSHOT
-            ),
-            $member
-        )) {
-            return true;
-        }
-
-        return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
-            return $env->canBackup($member);
-        })->Count();
-    }
-
-    /**
-     * @param Member|null $member
-     * @return bool
-     */
-    public function canUploadArchive($member = null)
-    {
-        if ($this->allowedAny(
-            array(
-                DNRoot::ALLOW_PROD_SNAPSHOT,
-                DNRoot::ALLOW_NON_PROD_SNAPSHOT
-            ),
-            $member
-        )) {
-            return true;
-        }
-
-        return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
-            return $env->canUploadArchive($member);
-        })->Count();
-    }
-
-    /**
-     * @param Member|null $member
-     * @return bool
-     */
-    public function canDownloadArchive($member = null)
-    {
-        if ($this->allowedAny(
-            array(
-                DNRoot::ALLOW_PROD_SNAPSHOT,
-                DNRoot::ALLOW_NON_PROD_SNAPSHOT
-            ),
-            $member
-        )) {
-            return true;
-        }
-
-        return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
-            return $env->canDownloadArchive($member);
-        })->Count();
-    }
-
-    /**
-     * This is a permission check for the front-end only.
-     *
-     * Only admins can create environments for now. Also, we need to check the value
-     * of AllowedEnvironmentType which dictates which backend to use to render the form.
-     *
-     * @param Member|null $member
-     *
-     * @return bool
-     */
-    public function canCreateEnvironments($member = null)
-    {
-        $envType = $this->AllowedEnvironmentType;
-        if ($envType) {
-            $env = Injector::inst()->get($envType);
-            if ($env instanceof EnvironmentCreateBackend) {
-                return $this->allowed(DNRoot::ALLOW_CREATE_ENVIRONMENT, $member);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @return DataList
-     */
-    public function DataArchives()
-    {
-        $envIds = $this->Environments()->column('ID');
-        return DNDataArchive::get()->filter('EnvironmentID', $envIds);
-    }
-
-    /**
-     * Return all archives which are "manual upload requests",
-     * meaning they don't have a file attached to them (yet).
-     *
-     * @return DataList
-     */
-    public function PendingManualUploadDataArchives()
-    {
-        return $this->DataArchives()->filter('ArchiveFileID', null);
-    }
-
-    /**
-     * Build an environment variable array to be used with this project.
-     *
-     * This is relevant if every project needs to use an individual SSH pubkey.
-     *
-     * Include this with all Gitonomy\Git\Repository, and
-     * \Symfony\Component\Process\Processes.
-     *
-     * @return array
-     */
-    public function getProcessEnv()
-    {
-        if (file_exists($this->getPrivateKeyPath())) {
-            // Key-pair is available, use it.
-            $processEnv = array(
-                'IDENT_KEY' => $this->getPrivateKeyPath(),
-                'GIT_SSH' => BASE_PATH . "/deploynaut/git-deploy.sh"
-            );
-        } else {
-            $processEnv = array();
-        }
-        $this->extend('updateProcessEnv', $processEnv);
-
-        return $processEnv;
-    }
-
-    /**
-     * Get a string of people allowed to view this project
-     *
-     * @return string
-     */
-    public function getViewersList()
-    {
-        return implode(", ", $this->Viewers()->column("Title"));
-    }
-
-    /**
-     * @return DNData
-     */
-    public function DNData()
-    {
-        return DNData::inst();
-    }
-
-    /**
-     * Provides a DNBuildList of builds found in this project.
-     *
-     * @return DNReferenceList
-     */
-    public function DNBuildList()
-    {
-        return DNReferenceList::create($this, $this->DNData());
-    }
-
-    /**
-     * Provides a list of the branches in this project.
-     *
-     * @return DNBranchList
-     */
-    public function DNBranchList()
-    {
-        if ($this->CVSPath && !$this->repoExists()) {
-            $this->cloneRepo();
-        }
-        return DNBranchList::create($this, $this->DNData());
-    }
-
-    /**
-     * Provides a list of the tags in this project.
-     *
-     * @return DNReferenceList
-     */
-    public function DNTagList()
-    {
-        if ($this->CVSPath && !$this->repoExists()) {
-            $this->cloneRepo();
-        }
-        return DNReferenceList::create($this, $this->DNData(), null, null, true);
-    }
-
-    /**
-     * @return false|Gitonomy\Git\Repository
-     */
-    public function getRepository()
-    {
-        if (!$this->repoExists()) {
-            return false;
-        }
-
-        return new Gitonomy\Git\Repository($this->getLocalCVSPath());
-    }
-
-    /**
-     * Provides a list of environments found in this project.
-     * CAUTION: filterByCallback will change this into an ArrayList!
-     *
-     * @return ArrayList
-     */
-    public function DNEnvironmentList()
-    {
-        if (!self::$_current_member_cache) {
-            self::$_current_member_cache = Member::currentUser();
-        }
-
-        if (self::$_current_member_cache === false) {
-            return new ArrayList();
-        }
-
-        $currentMember = self::$_current_member_cache;
-        return $this->Environments()
-            ->filterByCallBack(function ($item) use ($currentMember) {
-                return $item->canView($currentMember);
-            });
-    }
-
-    /**
-     * @param string $usage
-     * @return ArrayList
-     */
-    public function EnvironmentsByUsage($usage)
-    {
-        return $this->DNEnvironmentList()->filter('Usage', $usage);
-    }
-
-    /**
-     * Returns a map of envrionment name to build name
-     *
-     * @return false|DNDeployment
-     */
-    public function currentBuilds()
-    {
-        if (!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
-            $currentBuilds = array();
-            foreach ($this->Environments() as $env) {
-                $currentBuilds[$env->Name] = $env->CurrentBuild();
-            }
-            self::$relation_cache['currentBuilds.'.$this->ID] = $currentBuilds;
-        }
-        return self::$relation_cache['currentBuilds.'.$this->ID];
-    }
-
-    /**
-     * @param string
-     * @return string
-     */
-    public function Link($action = '')
-    {
-        return Controller::join_links("naut", "project", $this->Name, $action);
-    }
-
-    /**
-     * @return string|null
-     */
-    public function CreateEnvironmentLink()
-    {
-        if ($this->canCreateEnvironments()) {
-            return $this->Link('createenv');
-        }
-        return null;
-    }
-
-    /**
-     * @return string
-     */
-    public function ToggleStarLink()
-    {
-        return $this->Link('/star');
-    }
-
-    /**
-     * @return bool
-     */
-    public function IsStarred()
-    {
-        $member = Member::currentUser();
-        if ($member === null) {
-            return false;
-        }
-        $favourited = $this->StarredBy()->filter('MemberID', $member->ID);
-        if ($favourited->count() == 0) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @param string $action
-     * @return string
-     */
-    public function APILink($action)
-    {
-        return Controller::join_links("naut", "api", $this->Name, $action);
-    }
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $fields = parent::getCMSFields();
-
-        /** @var GridField $environments */
-        $environments = $fields->dataFieldByName("Environments");
-
-        $fields->fieldByName("Root")->removeByName("Viewers");
-        $fields->fieldByName("Root")->removeByName("Environments");
-        $fields->fieldByName("Root")->removeByName("LocalCVSPath");
-
-        $diskQuotaDesc = 'This is the maximum amount of disk space (in megabytes) that all environments within this '
-            . 'project can use for stored snapshots';
-        $fields->dataFieldByName('DiskQuotaMB')->setDescription($diskQuotaDesc);
-
-        $projectNameDesc = 'Changing the name will <strong>reset</strong> the deploy configuration and avoid using non'
-            . 'alphanumeric characters';
-        $fields->fieldByName('Root.Main.Name')
-            ->setTitle('Project name')
-            ->setDescription($projectNameDesc);
-
-        $fields->fieldByName('Root.Main.CVSPath')
-            ->setTitle('Git repository')
-            ->setDescription('E.g. git@github.com:silverstripe/silverstripe-installer.git');
-
-        $workspaceField = new ReadonlyField('LocalWorkspace', 'Git workspace', $this->getLocalCVSPath());
-        $workspaceField->setDescription('This is where the GIT repository are located on this server');
-        $fields->insertAfter($workspaceField, 'CVSPath');
-
-        $readAccessGroups = ListboxField::create('Viewers', 'Project viewers', Group::get()->map()->toArray())
-            ->setMultiple(true)
-            ->setDescription('These groups can view the project in the front-end.');
-        $fields->addFieldToTab("Root.Main", $readAccessGroups);
-
-        $this->setCreateProjectFolderField($fields);
-        $this->setEnvironmentFields($fields, $environments);
-
-        $environmentTypes = ClassInfo::implementorsOf('EnvironmentCreateBackend');
-        $types = array();
-        foreach ($environmentTypes as $type) {
-            $types[$type] = $type;
-        }
-
-        $fields->addFieldsToTab('Root.Main', array(
-            DropdownField::create(
-                'AllowedEnvironmentType',
-                'Allowed Environment Type',
-                $types
-            )->setDescription('This defined which form to show on the front end for '
-                . 'environment creation. This will not affect backend functionality.')
-            ->setEmptyString(' - None - '),
-        ));
-
-        return $fields;
-    }
-
-    /**
-     * If there isn't a capistrano env project folder, show options to create one
-     *
-     * @param FieldList $fields
-     */
-    public function setCreateProjectFolderField(&$fields)
-    {
-        // Check if the capistrano project folder exists
-        if (!$this->Name) {
-            return;
-        }
-
-        if ($this->projectFolderExists()) {
-            return;
-        }
-
-        $createFolderNotice = new LabelField('CreateEnvFolderNotice', 'Warning: No Capistrano project folder exists');
-        $createFolderNotice->addExtraClass('message warning');
-        $fields->insertBefore($createFolderNotice, 'Name');
-        $createFolderField = new CheckboxField('CreateEnvFolder', 'Create folder');
-        $createFolderField->setDescription('Would you like to create the capistrano project folder?');
-        $fields->insertAfter($createFolderField, 'CreateEnvFolderNotice');
-    }
-
-    /**
-     * @return boolean
-     */
-    public function projectFolderExists()
-    {
-        return file_exists($this->getProjectFolderPath());
-    }
-
-    /**
-     * @return bool
-     */
-    public function repoExists()
-    {
-        return file_exists(sprintf('%s/HEAD', $this->getLocalCVSPath()));
-    }
-
-    /**
-     * Setup a job to clone a git repository.
-     * @return string resque token
-     */
-    public function cloneRepo()
-    {
-        // Avoid this being called multiple times in the same request
-        if (!isset(self::$has_cloned_cache[$this->ID])) {
-            $fetch = DNGitFetch::create();
-            $fetch->ProjectID = $this->ID;
-            $fetch->write();
-
-            // passing true here tells DNGitFetch to force a git clone, otherwise
-            // it will just update the repo if it already exists. We want to ensure
-            // we're always cloning a new repo in this case, as the git URL may have changed.
-            $fetch->start(true);
-
-            self::$has_cloned_cache[$this->ID] = true;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getLocalCVSPath()
-    {
-        return sprintf('%s/%s', DEPLOYNAUT_LOCAL_VCS_PATH, $this->Name);
-    }
-
-    public function onBeforeWrite()
-    {
-        parent::onBeforeWrite();
-
-        if ($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
-            mkdir($this->getProjectFolderPath());
-        }
-    }
-
-    public function onAfterWrite()
-    {
-        parent::onAfterWrite();
-
-        if (!$this->CVSPath) {
-            return;
-        }
-
-        $changedFields = $this->getChangedFields(true, 2);
-        if (isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
-            $this->cloneRepo();
-        }
-    }
-
-    /**
-     * Delete related environments and folders
-     */
-    public function onAfterDelete()
-    {
-        parent::onAfterDelete();
-
-        // Delete related environments
-        foreach ($this->Environments() as $env) {
-            $env->delete();
-        }
-
-        // Delete local repository
-        if (file_exists($this->getLocalCVSPath())) {
-            Filesystem::removeFolder($this->getLocalCVSPath());
-        }
-
-        // Delete project template
-        if (file_exists($this->getProjectFolderPath()) && Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
-            Filesystem::removeFolder($this->getProjectFolderPath());
-        }
-
-        // Delete the deploy key
-        if (file_exists($this->getKeyDir())) {
-            Filesystem::removeFolder($this->getKeyDir());
-        }
-    }
-
-    /**
-     * Fetch the public key for this project.
-     *
-     * @return string|void
-     */
-    public function getPublicKey()
-    {
-        $key = $this->getPublicKeyPath();
-
-        if (file_exists($key)) {
-            return trim(file_get_contents($key));
-        }
-    }
-
-    /**
-     * This returns that path of the public key if a key directory is set. It doesn't check whether the file exists.
-     *
-     * @return string|null
-     */
-    public function getPublicKeyPath()
-    {
-        if ($privateKey = $this->getPrivateKeyPath()) {
-            return $privateKey . '.pub';
-        }
-        return null;
-    }
-
-    /**
-     * This returns that path of the private key if a key directory is set. It doesn't check whether the file exists.
-     *
-     * @return string|null
-     */
-    public function getPrivateKeyPath()
-    {
-        $keyDir = $this->getKeyDir();
-        if (!empty($keyDir)) {
-            $filter = FileNameFilter::create();
-            $name = $filter->filter($this->Name);
-            return $keyDir . '/' . $name;
-        }
-        return null;
-    }
-
-    /**
-     * Returns the location of the projects key dir if one exists.
-     *
-     * @return string|null
-     */
-    public function getKeyDir()
-    {
-        $keyDir = $this->DNData()->getKeyDir();
-        if (!$keyDir) {
-            return null;
-        }
-
-        $filter = FileNameFilter::create();
-        $name = $filter->filter($this->Name);
-
-        return $this->DNData()->getKeyDir() . '/' . $name;
-    }
-
-    /**
-     * Setup a gridfield for the environment configs
-     *
-     * @param FieldList $fields
-     * @param GridField $environments
-     */
-    protected function setEnvironmentFields(&$fields, $environments)
-    {
-        if (!$environments) {
-            return;
-        }
-
-        $environments->getConfig()->addComponent(new GridFieldAddNewMultiClass());
-        $environments->getConfig()->removeComponentsByType('GridFieldAddNewButton');
-        $environments->getConfig()->removeComponentsByType('GridFieldAddExistingAutocompleter');
-        $environments->getConfig()->removeComponentsByType('GridFieldDeleteAction');
-        $environments->getConfig()->removeComponentsByType('GridFieldPageCount');
-        if (Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
-            $addNewRelease = new GridFieldAddNewButton('toolbar-header-right');
-            $addNewRelease->setButtonName('Add');
-            $environments->getConfig()->addComponent($addNewRelease);
-        }
-
-        $fields->addFieldToTab("Root.Main", $environments);
-    }
-
-    /**
-     * Provide current repository URL to the users.
-     *
-     * @return void|string
-     */
-    public function getRepositoryURL()
-    {
-        $showUrl = Config::inst()->get($this->class, 'show_repository_url');
-        if ($showUrl) {
-            return $this->CVSPath;
-        }
-    }
-
-    /**
-     * Whitelist configuration that describes how to convert a repository URL into a link
-     * to a web user interface for that URL
-     *
-     * Consists of a hash of "full.lower.case.domain" => {configuration} key/value pairs
-     *
-     * {configuration} can either be boolean true to auto-detect both the host and the
-     * name of the UI provider, or a nested array that overrides either one or both
-     * of the auto-detected valyes
-     *
-     * @var array
-     */
-    private static $repository_interfaces = array(
-        'github.com' => array(
-            'icon' => 'deploynaut/img/github.png',
-            'name' => 'Github.com',
-        ),
-        'bitbucket.org' => array(
-            'commit' => 'commits',
-            'name' => 'Bitbucket.org',
-        ),
-        'repo.or.cz' => array(
-            'scheme' => 'http',
-            'name' => 'repo.or.cz',
-            'regex' => array('^(.*)$' => '/w$1'),
-        ),
-
-        /* Example for adding your own gitlab repository and override all auto-detected values (with their defaults)
+	/**
+	 * @var array
+	 */
+	public static $db = array(
+		"Name" => "Varchar",
+		"CVSPath" => "Varchar(255)",
+		"DiskQuotaMB" => "Int",
+		"AllowedEnvironmentType" => "Varchar(255)",
+	);
+
+	/**
+	 * @var array
+	 */
+	public static $has_many = array(
+		"Environments" => "DNEnvironment",
+		"CreateEnvironments" => "DNCreateEnvironment"
+	);
+
+	/**
+	 * @var array
+	 */
+	public static $many_many = array(
+		"Viewers" => "Group",
+		'StarredBy' => "Member"
+	);
+
+	/**
+	 * @var array
+	 */
+	public static $summary_fields = array(
+		"Name",
+		"ViewersList",
+	);
+
+	/**
+	 * @var array
+	 */
+	public static $searchable_fields = array(
+		"Name",
+	);
+
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Project';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Projects';
+
+	/**
+	 * @var string
+	 */
+	private static $default_sort = 'Name';
+
+	/**
+	 * Display the repository URL on the project page.
+	 *
+	 * @var bool
+	 */
+	private static $show_repository_url = false;
+
+	/**
+	 * In-memory cache for currentBuilds per environment since fetching them from
+	 * disk is pretty resource hungry.
+	 *
+	 * @var array
+	 */
+	protected static $relation_cache = array();
+
+	/**
+	 * In-memory cache to determine whether clone repo was called.
+	 * @var array
+	 */
+	private static $has_cloned_cache = array();
+
+	/**
+	 * @var bool|Member
+	 */
+	protected static $_current_member_cache = null;
+
+	/**
+	 * Used by the sync task
+	 *
+	 * @param string $path
+	 * @return \DNProject
+	 */
+	public static function create_from_path($path)
+	{
+		$project = DNProject::create();
+		$project->Name = $path;
+		$project->write();
+
+		// add the administrators group as the viewers of the new project
+		$adminGroup = Group::get()->filter('Code', 'administrators')->first();
+		if ($adminGroup && $adminGroup->exists()) {
+			$project->Viewers()->add($adminGroup);
+		}
+		return $project;
+	}
+
+	/**
+	 * Return the used quota in MB.
+	 *
+	 * @param int $round Number of decimal places to round to
+	 * @return double The used quota size in MB
+	 */
+	public function getUsedQuotaMB($round = 2)
+	{
+		$size = 0;
+
+		foreach ($this->Environments() as $environment) {
+			foreach ($environment->DataArchives()->filter('IsBackup', 0) as $archive) {
+				$size += $archive->ArchiveFile()->getAbsoluteSize();
+			}
+		}
+
+		// convert bytes to megabytes and round
+		return round(($size / 1024) / 1024, $round);
+	}
+
+	/**
+	 * Getter for DiskQuotaMB field to provide a default for existing
+	 * records that have no quota field set, as it will need to default
+	 * to a globally set size.
+	 *
+	 * @return string|int The quota size in MB
+	 */
+	public function getDiskQuotaMB()
+	{
+		$size = $this->getField('DiskQuotaMB');
+
+		if (empty($size)) {
+			$defaults = $this->config()->get('defaults');
+			$size = (isset($defaults['DiskQuotaMB'])) ? $defaults['DiskQuotaMB'] : 0;
+		}
+
+		return $size;
+	}
+
+	/**
+	 * Has the disk quota been exceeded?
+	 *
+	 * @return boolean
+	 */
+	public function HasExceededDiskQuota()
+	{
+		return $this->getUsedQuotaMB(0) >= $this->getDiskQuotaMB();
+	}
+
+	/**
+	 * Is there a disk quota set for this project?
+	 *
+	 * @return boolean
+	 */
+	public function HasDiskQuota()
+	{
+		return $this->getDiskQuotaMB() > 0;
+	}
+
+	/**
+	 * Returns the current disk quota usage as a percentage
+	 *
+	 * @return int
+	 */
+	public function DiskQuotaUsagePercent()
+	{
+		$quota = $this->getDiskQuotaMB();
+		if ($quota > 0) {
+			return $this->getUsedQuotaMB() * 100 / $quota;
+		}
+		return 100;
+	}
+
+	/**
+	 * Get the menu to be shown on projects
+	 *
+	 * @return ArrayList
+	 */
+	public function Menu()
+	{
+		$list = new ArrayList();
+
+		$controller = Controller::curr();
+		$actionType = $controller->getField('CurrentActionType');
+
+		if (DNRoot::FlagSnapshotsEnabled() && $this->isProjectReady()) {
+			$list->push(new ArrayData(array(
+				'Link' => sprintf('naut/project/%s/snapshots', $this->Name),
+				'Title' => 'Snapshots',
+				'IsCurrent' => $this->isSection() && $controller->getAction() == 'snapshots',
+				'IsSection' => $this->isSection() && $actionType == DNRoot::ACTION_SNAPSHOT
+			)));
+		}
+
+		$this->extend('updateMenu', $list);
+
+		return $list;
+	}
+
+	/**
+	 * Is this project currently at the root level of the controller that handles it?
+	 *
+	 * @return bool
+	 */
+	public function isCurrent()
+	{
+		return $this->isSection() && Controller::curr()->getAction() == 'project';
+	}
+
+	/**
+	 * Return the current object from $this->Menu()
+	 * Good for making titles and things
+	 *
+	 * @return DataObject
+	 */
+	public function CurrentMenu()
+	{
+		return $this->Menu()->filter('IsSection', true)->First();
+	}
+
+	/**
+	 * Is this project currently in a controller that is handling it or performing a sub-task?
+	 *
+	 * @return bool
+	 */
+	public function isSection()
+	{
+		$controller = Controller::curr();
+		$project = $controller->getField('CurrentProject');
+		return $project && $this->ID == $project->ID;
+	}
+
+	/**
+	 * Restrict access to viewing this project
+	 *
+	 * @param Member|null $member
+	 * @return boolean
+	 */
+	public function canView($member = null)
+	{
+		if (!$member) {
+			$member = Member::currentUser();
+		}
+
+		if (Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
+
+		return $member->inGroups($this->Viewers());
+	}
+
+	/**
+	 * @param Member|null $member
+	 *
+	 * @return bool
+	 */
+	public function canRestore($member = null)
+	{
+		if ($this->allowedAny(
+			array(
+				DNRoot::ALLOW_PROD_SNAPSHOT,
+				DNRoot::ALLOW_NON_PROD_SNAPSHOT
+			),
+			$member
+		)) {
+			return true;
+		}
+
+		return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
+			return $env->canRestore($member);
+		})->Count();
+	}
+
+	/**
+	 * @param Member|null $member
+	 * @return bool
+	 */
+	public function canBackup($member = null)
+	{
+		if ($this->allowedAny(
+			array(
+				DNRoot::ALLOW_PROD_SNAPSHOT,
+				DNRoot::ALLOW_NON_PROD_SNAPSHOT
+			),
+			$member
+		)) {
+			return true;
+		}
+
+		return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
+			return $env->canBackup($member);
+		})->Count();
+	}
+
+	/**
+	 * @param Member|null $member
+	 * @return bool
+	 */
+	public function canUploadArchive($member = null)
+	{
+		if ($this->allowedAny(
+			array(
+				DNRoot::ALLOW_PROD_SNAPSHOT,
+				DNRoot::ALLOW_NON_PROD_SNAPSHOT
+			),
+			$member
+		)) {
+			return true;
+		}
+
+		return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
+			return $env->canUploadArchive($member);
+		})->Count();
+	}
+
+	/**
+	 * @param Member|null $member
+	 * @return bool
+	 */
+	public function canDownloadArchive($member = null)
+	{
+		if ($this->allowedAny(
+			array(
+				DNRoot::ALLOW_PROD_SNAPSHOT,
+				DNRoot::ALLOW_NON_PROD_SNAPSHOT
+			),
+			$member
+		)) {
+			return true;
+		}
+
+		return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
+			return $env->canDownloadArchive($member);
+		})->Count();
+	}
+
+	/**
+	 * This is a permission check for the front-end only.
+	 *
+	 * Only admins can create environments for now. Also, we need to check the value
+	 * of AllowedEnvironmentType which dictates which backend to use to render the form.
+	 *
+	 * @param Member|null $member
+	 *
+	 * @return bool
+	 */
+	public function canCreateEnvironments($member = null)
+	{
+		$envType = $this->AllowedEnvironmentType;
+		if ($envType) {
+			$env = Injector::inst()->get($envType);
+			if ($env instanceof EnvironmentCreateBackend) {
+				return $this->allowed(DNRoot::ALLOW_CREATE_ENVIRONMENT, $member);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @return DataList
+	 */
+	public function DataArchives()
+	{
+		$envIds = $this->Environments()->column('ID');
+		return DNDataArchive::get()->filter('EnvironmentID', $envIds);
+	}
+
+	/**
+	 * Return all archives which are "manual upload requests",
+	 * meaning they don't have a file attached to them (yet).
+	 *
+	 * @return DataList
+	 */
+	public function PendingManualUploadDataArchives()
+	{
+		return $this->DataArchives()->filter('ArchiveFileID', null);
+	}
+
+	/**
+	 * Build an environment variable array to be used with this project.
+	 *
+	 * This is relevant if every project needs to use an individual SSH pubkey.
+	 *
+	 * Include this with all Gitonomy\Git\Repository, and
+	 * \Symfony\Component\Process\Processes.
+	 *
+	 * @return array
+	 */
+	public function getProcessEnv()
+	{
+		if (file_exists($this->getPrivateKeyPath())) {
+			// Key-pair is available, use it.
+			$processEnv = array(
+				'IDENT_KEY' => $this->getPrivateKeyPath(),
+				'GIT_SSH' => BASE_PATH . "/deploynaut/git-deploy.sh"
+			);
+		} else {
+			$processEnv = array();
+		}
+		$this->extend('updateProcessEnv', $processEnv);
+
+		return $processEnv;
+	}
+
+	/**
+	 * Get a string of people allowed to view this project
+	 *
+	 * @return string
+	 */
+	public function getViewersList()
+	{
+		return implode(", ", $this->Viewers()->column("Title"));
+	}
+
+	/**
+	 * @return DNData
+	 */
+	public function DNData()
+	{
+		return DNData::inst();
+	}
+
+	/**
+	 * Provides a DNBuildList of builds found in this project.
+	 *
+	 * @return DNReferenceList
+	 */
+	public function DNBuildList()
+	{
+		return DNReferenceList::create($this, $this->DNData());
+	}
+
+	/**
+	 * Provides a list of the branches in this project.
+	 *
+	 * @return DNBranchList
+	 */
+	public function DNBranchList()
+	{
+		if ($this->CVSPath && !$this->repoExists()) {
+			$this->cloneRepo();
+		}
+		return DNBranchList::create($this, $this->DNData());
+	}
+
+	/**
+	 * Provides a list of the tags in this project.
+	 *
+	 * @return DNReferenceList
+	 */
+	public function DNTagList()
+	{
+		if ($this->CVSPath && !$this->repoExists()) {
+			$this->cloneRepo();
+		}
+		return DNReferenceList::create($this, $this->DNData(), null, null, true);
+	}
+
+	/**
+	 * @return false|Gitonomy\Git\Repository
+	 */
+	public function getRepository()
+	{
+		if (!$this->repoExists()) {
+			return false;
+		}
+
+		return new Gitonomy\Git\Repository($this->getLocalCVSPath());
+	}
+
+	/**
+	 * Provides a list of environments found in this project.
+	 * CAUTION: filterByCallback will change this into an ArrayList!
+	 *
+	 * @return ArrayList
+	 */
+	public function DNEnvironmentList()
+	{
+		if (!self::$_current_member_cache) {
+			self::$_current_member_cache = Member::currentUser();
+		}
+
+		if (self::$_current_member_cache === false) {
+			return new ArrayList();
+		}
+
+		$currentMember = self::$_current_member_cache;
+		return $this->Environments()
+			->filterByCallBack(function ($item) use ($currentMember) {
+				return $item->canView($currentMember);
+			});
+	}
+
+	/**
+	 * @param string $usage
+	 * @return ArrayList
+	 */
+	public function EnvironmentsByUsage($usage)
+	{
+		return $this->DNEnvironmentList()->filter('Usage', $usage);
+	}
+
+	/**
+	 * Returns a map of envrionment name to build name
+	 *
+	 * @return false|DNDeployment
+	 */
+	public function currentBuilds()
+	{
+		if (!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
+			$currentBuilds = array();
+			foreach ($this->Environments() as $env) {
+				$currentBuilds[$env->Name] = $env->CurrentBuild();
+			}
+			self::$relation_cache['currentBuilds.'.$this->ID] = $currentBuilds;
+		}
+		return self::$relation_cache['currentBuilds.'.$this->ID];
+	}
+
+	/**
+	 * @param string
+	 * @return string
+	 */
+	public function Link($action = '')
+	{
+		return Controller::join_links("naut", "project", $this->Name, $action);
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function CreateEnvironmentLink()
+	{
+		if ($this->canCreateEnvironments()) {
+			return $this->Link('createenv');
+		}
+		return null;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function ToggleStarLink()
+	{
+		return $this->Link('/star');
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function IsStarred()
+	{
+		$member = Member::currentUser();
+		if ($member === null) {
+			return false;
+		}
+		$favourited = $this->StarredBy()->filter('MemberID', $member->ID);
+		if ($favourited->count() == 0) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * @param string $action
+	 * @return string
+	 */
+	public function APILink($action)
+	{
+		return Controller::join_links("naut", "api", $this->Name, $action);
+	}
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$fields = parent::getCMSFields();
+
+		/** @var GridField $environments */
+		$environments = $fields->dataFieldByName("Environments");
+
+		$fields->fieldByName("Root")->removeByName("Viewers");
+		$fields->fieldByName("Root")->removeByName("Environments");
+		$fields->fieldByName("Root")->removeByName("LocalCVSPath");
+
+		$diskQuotaDesc = 'This is the maximum amount of disk space (in megabytes) that all environments within this '
+			. 'project can use for stored snapshots';
+		$fields->dataFieldByName('DiskQuotaMB')->setDescription($diskQuotaDesc);
+
+		$projectNameDesc = 'Changing the name will <strong>reset</strong> the deploy configuration and avoid using non'
+			. 'alphanumeric characters';
+		$fields->fieldByName('Root.Main.Name')
+			->setTitle('Project name')
+			->setDescription($projectNameDesc);
+
+		$fields->fieldByName('Root.Main.CVSPath')
+			->setTitle('Git repository')
+			->setDescription('E.g. git@github.com:silverstripe/silverstripe-installer.git');
+
+		$workspaceField = new ReadonlyField('LocalWorkspace', 'Git workspace', $this->getLocalCVSPath());
+		$workspaceField->setDescription('This is where the GIT repository are located on this server');
+		$fields->insertAfter($workspaceField, 'CVSPath');
+
+		$readAccessGroups = ListboxField::create('Viewers', 'Project viewers', Group::get()->map()->toArray())
+			->setMultiple(true)
+			->setDescription('These groups can view the project in the front-end.');
+		$fields->addFieldToTab("Root.Main", $readAccessGroups);
+
+		$this->setCreateProjectFolderField($fields);
+		$this->setEnvironmentFields($fields, $environments);
+
+		$environmentTypes = ClassInfo::implementorsOf('EnvironmentCreateBackend');
+		$types = array();
+		foreach ($environmentTypes as $type) {
+			$types[$type] = $type;
+		}
+
+		$fields->addFieldsToTab('Root.Main', array(
+			DropdownField::create(
+				'AllowedEnvironmentType',
+				'Allowed Environment Type',
+				$types
+			)->setDescription('This defined which form to show on the front end for '
+				. 'environment creation. This will not affect backend functionality.')
+			->setEmptyString(' - None - '),
+		));
+
+		return $fields;
+	}
+
+	/**
+	 * If there isn't a capistrano env project folder, show options to create one
+	 *
+	 * @param FieldList $fields
+	 */
+	public function setCreateProjectFolderField(&$fields)
+	{
+		// Check if the capistrano project folder exists
+		if (!$this->Name) {
+			return;
+		}
+
+		if ($this->projectFolderExists()) {
+			return;
+		}
+
+		$createFolderNotice = new LabelField('CreateEnvFolderNotice', 'Warning: No Capistrano project folder exists');
+		$createFolderNotice->addExtraClass('message warning');
+		$fields->insertBefore($createFolderNotice, 'Name');
+		$createFolderField = new CheckboxField('CreateEnvFolder', 'Create folder');
+		$createFolderField->setDescription('Would you like to create the capistrano project folder?');
+		$fields->insertAfter($createFolderField, 'CreateEnvFolderNotice');
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function projectFolderExists()
+	{
+		return file_exists($this->getProjectFolderPath());
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function repoExists()
+	{
+		return file_exists(sprintf('%s/HEAD', $this->getLocalCVSPath()));
+	}
+
+	/**
+	 * Setup a job to clone a git repository.
+	 * @return string resque token
+	 */
+	public function cloneRepo()
+	{
+		// Avoid this being called multiple times in the same request
+		if (!isset(self::$has_cloned_cache[$this->ID])) {
+			$fetch = DNGitFetch::create();
+			$fetch->ProjectID = $this->ID;
+			$fetch->write();
+
+			// passing true here tells DNGitFetch to force a git clone, otherwise
+			// it will just update the repo if it already exists. We want to ensure
+			// we're always cloning a new repo in this case, as the git URL may have changed.
+			$fetch->start(true);
+
+			self::$has_cloned_cache[$this->ID] = true;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLocalCVSPath()
+	{
+		return sprintf('%s/%s', DEPLOYNAUT_LOCAL_VCS_PATH, $this->Name);
+	}
+
+	public function onBeforeWrite()
+	{
+		parent::onBeforeWrite();
+
+		if ($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
+			mkdir($this->getProjectFolderPath());
+		}
+	}
+
+	public function onAfterWrite()
+	{
+		parent::onAfterWrite();
+
+		if (!$this->CVSPath) {
+			return;
+		}
+
+		$changedFields = $this->getChangedFields(true, 2);
+		if (isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
+			$this->cloneRepo();
+		}
+	}
+
+	/**
+	 * Delete related environments and folders
+	 */
+	public function onAfterDelete()
+	{
+		parent::onAfterDelete();
+
+		// Delete related environments
+		foreach ($this->Environments() as $env) {
+			$env->delete();
+		}
+
+		// Delete local repository
+		if (file_exists($this->getLocalCVSPath())) {
+			Filesystem::removeFolder($this->getLocalCVSPath());
+		}
+
+		// Delete project template
+		if (file_exists($this->getProjectFolderPath()) && Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
+			Filesystem::removeFolder($this->getProjectFolderPath());
+		}
+
+		// Delete the deploy key
+		if (file_exists($this->getKeyDir())) {
+			Filesystem::removeFolder($this->getKeyDir());
+		}
+	}
+
+	/**
+	 * Fetch the public key for this project.
+	 *
+	 * @return string|void
+	 */
+	public function getPublicKey()
+	{
+		$key = $this->getPublicKeyPath();
+
+		if (file_exists($key)) {
+			return trim(file_get_contents($key));
+		}
+	}
+
+	/**
+	 * This returns that path of the public key if a key directory is set. It doesn't check whether the file exists.
+	 *
+	 * @return string|null
+	 */
+	public function getPublicKeyPath()
+	{
+		if ($privateKey = $this->getPrivateKeyPath()) {
+			return $privateKey . '.pub';
+		}
+		return null;
+	}
+
+	/**
+	 * This returns that path of the private key if a key directory is set. It doesn't check whether the file exists.
+	 *
+	 * @return string|null
+	 */
+	public function getPrivateKeyPath()
+	{
+		$keyDir = $this->getKeyDir();
+		if (!empty($keyDir)) {
+			$filter = FileNameFilter::create();
+			$name = $filter->filter($this->Name);
+			return $keyDir . '/' . $name;
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the location of the projects key dir if one exists.
+	 *
+	 * @return string|null
+	 */
+	public function getKeyDir()
+	{
+		$keyDir = $this->DNData()->getKeyDir();
+		if (!$keyDir) {
+			return null;
+		}
+
+		$filter = FileNameFilter::create();
+		$name = $filter->filter($this->Name);
+
+		return $this->DNData()->getKeyDir() . '/' . $name;
+	}
+
+	/**
+	 * Setup a gridfield for the environment configs
+	 *
+	 * @param FieldList $fields
+	 * @param GridField $environments
+	 */
+	protected function setEnvironmentFields(&$fields, $environments)
+	{
+		if (!$environments) {
+			return;
+		}
+
+		$environments->getConfig()->addComponent(new GridFieldAddNewMultiClass());
+		$environments->getConfig()->removeComponentsByType('GridFieldAddNewButton');
+		$environments->getConfig()->removeComponentsByType('GridFieldAddExistingAutocompleter');
+		$environments->getConfig()->removeComponentsByType('GridFieldDeleteAction');
+		$environments->getConfig()->removeComponentsByType('GridFieldPageCount');
+		if (Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
+			$addNewRelease = new GridFieldAddNewButton('toolbar-header-right');
+			$addNewRelease->setButtonName('Add');
+			$environments->getConfig()->addComponent($addNewRelease);
+		}
+
+		$fields->addFieldToTab("Root.Main", $environments);
+	}
+
+	/**
+	 * Provide current repository URL to the users.
+	 *
+	 * @return void|string
+	 */
+	public function getRepositoryURL()
+	{
+		$showUrl = Config::inst()->get($this->class, 'show_repository_url');
+		if ($showUrl) {
+			return $this->CVSPath;
+		}
+	}
+
+	/**
+	 * Whitelist configuration that describes how to convert a repository URL into a link
+	 * to a web user interface for that URL
+	 *
+	 * Consists of a hash of "full.lower.case.domain" => {configuration} key/value pairs
+	 *
+	 * {configuration} can either be boolean true to auto-detect both the host and the
+	 * name of the UI provider, or a nested array that overrides either one or both
+	 * of the auto-detected valyes
+	 *
+	 * @var array
+	 */
+	private static $repository_interfaces = array(
+		'github.com' => array(
+			'icon' => 'deploynaut/img/github.png',
+			'name' => 'Github.com',
+		),
+		'bitbucket.org' => array(
+			'commit' => 'commits',
+			'name' => 'Bitbucket.org',
+		),
+		'repo.or.cz' => array(
+			'scheme' => 'http',
+			'name' => 'repo.or.cz',
+			'regex' => array('^(.*)$' => '/w$1'),
+		),
+
+		/* Example for adding your own gitlab repository and override all auto-detected values (with their defaults)
         'gitlab.mysite.com' => array(
             'icon' => 'deploynaut/img/git.png',
             'host' => 'gitlab.mysite.com',
@@ -904,280 +904,280 @@ 
             'commit' => "commit"
         ),
         */
-    );
-
-    /**
-     * Get a ViewableData structure describing the UI tool that lets the user view the repository code
-     *
-     * @return ArrayData
-     */
-    public function getRepositoryInterface()
-    {
-        $interfaces = $this->config()->repository_interfaces;
-
-        /* Look for each whitelisted hostname */
-        foreach ($interfaces as $host => $interface) {
-            /* See if the CVS Path is for this hostname, followed by some junk (maybe a port), then the path */
-            if (preg_match('{^[^.]*' . $host . '(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
-                $path = $match[2];
-
-                $scheme = isset($interface['scheme']) ? $interface['scheme'] : 'https';
-                $host = isset($interface['host']) ? $interface['host'] : $host;
-                $regex = isset($interface['regex']) ? $interface['regex'] : array('\.git$' => '');
-
-                $components = explode('.', $host);
-
-                foreach ($regex as $pattern => $replacement) {
-                    $path = preg_replace('/' . $pattern . '/', $replacement, $path);
-                }
-
-                $uxurl = Controller::join_links($scheme . '://', $host, $path);
-
-                if (array_key_exists('commit', $interface) && $interface['commit'] == false) {
-                    $commiturl = false;
-                } else {
-                    $commiturl = Controller::join_links(
-                        $uxurl,
-                        isset($interface['commit']) ? $interface['commit'] : 'commit'
-                    );
-                }
-
-                return new ArrayData(array(
-                    'Name'      => isset($interface['name']) ? $interface['name'] : ucfirst($components[0]),
-                    'Icon'      => isset($interface['icon']) ? $interface['icon'] : 'deploynaut/img/git.png',
-                    'URL'       => $uxurl,
-                    'CommitURL' => $commiturl
-                ));
-            }
-        }
-    }
-
-    /**
-     * @return string
-     */
-    protected function getProjectFolderPath()
-    {
-        return sprintf('%s/%s', $this->DNData()->getEnvironmentDir(), $this->Name);
-    }
-
-    /**
-     * Convenience wrapper for a single permission code.
-     *
-     * @param string $code
-     * @return SS_List
-     */
-    public function whoIsAllowed($code)
-    {
-        return $this->whoIsAllowedAny(array($code));
-    }
-
-    /**
-     * List members who have $codes on this project.
-     * Does not support Permission::DENY_PERMISSION malarky, same as Permission::get_groups_by_permission anyway...
-     *
-     * @param array|string $codes
-     * @return SS_List
-     */
-    public function whoIsAllowedAny($codes)
-    {
-        if (!is_array($codes)) {
-            $codes = array($codes);
-        }
-
-        $SQLa_codes = Convert::raw2sql($codes);
-        $SQL_codes = join("','", $SQLa_codes);
-
-        return DataObject::get('Member')
-            ->where("\"PermissionRoleCode\".\"Code\" IN ('$SQL_codes') OR \"Permission\".\"Code\" IN ('$SQL_codes')")
-            ->filter("DNProject_Viewers.DNProjectID", $this->ID)
-            ->leftJoin('Group_Members', "\"Group_Members\".\"MemberID\" = \"Member\".\"ID\"")
-            ->leftJoin('Group', "\"Group_Members\".\"GroupID\" = \"Group\".\"ID\"")
-            ->leftJoin('DNProject_Viewers', "\"DNProject_Viewers\".\"GroupID\" = \"Group\".\"ID\"")
-            ->leftJoin('Permission', "\"Permission\".\"GroupID\" = \"Group\".\"ID\"")
-            ->leftJoin('Group_Roles', "\"Group_Roles\".\"GroupID\" = \"Group\".\"ID\"")
-            ->leftJoin('PermissionRole', "\"Group_Roles\".\"PermissionRoleID\" = \"PermissionRole\".\"ID\"")
-            ->leftJoin('PermissionRoleCode', "\"PermissionRoleCode\".\"RoleID\" = \"PermissionRole\".\"ID\"");
-    }
-
-    /**
-     * Convenience wrapper for a single permission code.
-     *
-     * @param string $code
-     * @param Member|null $member
-     *
-     * @return bool
-     */
-    public function allowed($code, $member = null)
-    {
-        return $this->allowedAny(array($code), $member);
-    }
-
-    /**
-     * Checks if a group is allowed to the project and the permission code
-     *
-     * @param string $permissionCode
-     * @param Group $group
-     *
-     * @return bool
-     */
-    public function groupAllowed($permissionCode, Group $group)
-    {
-        $viewers = $this->Viewers();
-        if (!$viewers->find('ID', $group->ID)) {
-            return false;
-        }
-        $groups = Permission::get_groups_by_permission($permissionCode);
-        if (!$groups->find('ID', $group->ID)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Check if member has a permission code in this project.
-     *
-     * @param array|string $codes
-     * @param Member|null $member
-     *
-     * @return bool
-     */
-    public function allowedAny($codes, $member = null)
-    {
-        if (!$member) {
-            $member = Member::currentUser();
-        }
-
-        if (Permission::checkMember($member, 'ADMIN')) {
-            return true;
-        }
-
-        $hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count();
-        return ($hits>0 ? true : false);
-    }
-
-    /**
-     * Checks if the environment has been fully built.
-     *
-     * @return bool
-     */
-    public function isProjectReady()
-    {
-        if ($this->getRunningInitialEnvironmentCreations()->count() > 0) {
-            // We're still creating the initial environments for this project so we're
-            // not quite done
-            return false;
-        }
-
-        // Provide a hook for further checks. Logic stolen from
-        // {@see DataObject::extendedCan()}
-        $isDone = $this->extend('isProjectReady');
-        if ($isDone && is_array($isDone)) {
-            $isDone = array_filter($isDone, function ($val) {
-                return !is_null($val);
-            });
-
-            // If anything returns false then we're not ready.
-            if ($isDone) {
-                return min($isDone);
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns a list of environments still being created.
-     *
-     * @return SS_List
-     */
-    public function getRunningEnvironmentCreations()
-    {
-        return $this->CreateEnvironments()
-            ->filter('Status', ['Queued', 'Started']);
-    }
-
-    /**
-     * Returns a list of initial environments created for this project.
-     *
-     * @return DataList
-     */
-    public function getInitialEnvironmentCreations()
-    {
-        return $this->CreateEnvironments()->filter('IsInitialEnvironment', true);
-    }
-
-    /**
-     * Only returns initial environments that are being created.
-     *
-     * @return DataList
-     */
-    public function getRunningInitialEnvironmentCreations()
-    {
-        return $this->getInitialEnvironmentCreations()
-            ->filter('Status', ['Queued', 'Started']);
-    }
-
-    /**
-     * Returns a list of completed initial environment creations. This includes failed tasks.
-     *
-     * @return DataList
-     */
-    public function getCompleteInitialEnvironmentCreations()
-    {
-        return $this->getInitialEnvironmentCreations()
-            ->exclude('Status', ['Queued', 'Started']);
-    }
-
-    /**
-     * @return ValidationResult
-     */
-    protected function validate()
-    {
-        $validation = parent::validate();
-        if ($validation->valid()) {
-            if (empty($this->Name)) {
-                return $validation->error('The stack must have a name.');
-            }
-
-            // The name is used to build filepaths so should be restricted
-            if (!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9\-\_]+$/', $this->Name)) {
-                return $validation->error('Project name can only contain alphanumeric, hyphens and underscores.');
-            }
-
-            if (empty($this->CVSPath)) {
-                return $validation->error('You must provide a repository URL.');
-            }
-
-            $existing = DNProject::get()->filter('Name', $this->Name);
-            if ($this->ID) {
-                $existing = $existing->exclude('ID', $this->ID);
-            }
-            if ($existing->count() > 0) {
-                return $validation->error('A stack already exists with that name.');
-            }
-        }
-        return $validation;
-    }
-
-    /**
-     * @param Member $member
-     *
-     * @return bool
-     */
-    public function canCreate($member = null)
-    {
-        if (!$member) {
-            $member = Member::currentUser();
-        }
-        if (!$member) {
-            return false;
-        }
-
-        if (Permission::checkMember($member, 'ADMIN')) {
-            return true;
-        }
-
-        // This calls canCreate on extensions.
-        return parent::canCreate($member);
-    }
+	);
+
+	/**
+	 * Get a ViewableData structure describing the UI tool that lets the user view the repository code
+	 *
+	 * @return ArrayData
+	 */
+	public function getRepositoryInterface()
+	{
+		$interfaces = $this->config()->repository_interfaces;
+
+		/* Look for each whitelisted hostname */
+		foreach ($interfaces as $host => $interface) {
+			/* See if the CVS Path is for this hostname, followed by some junk (maybe a port), then the path */
+			if (preg_match('{^[^.]*' . $host . '(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
+				$path = $match[2];
+
+				$scheme = isset($interface['scheme']) ? $interface['scheme'] : 'https';
+				$host = isset($interface['host']) ? $interface['host'] : $host;
+				$regex = isset($interface['regex']) ? $interface['regex'] : array('\.git$' => '');
+
+				$components = explode('.', $host);
+
+				foreach ($regex as $pattern => $replacement) {
+					$path = preg_replace('/' . $pattern . '/', $replacement, $path);
+				}
+
+				$uxurl = Controller::join_links($scheme . '://', $host, $path);
+
+				if (array_key_exists('commit', $interface) && $interface['commit'] == false) {
+					$commiturl = false;
+				} else {
+					$commiturl = Controller::join_links(
+						$uxurl,
+						isset($interface['commit']) ? $interface['commit'] : 'commit'
+					);
+				}
+
+				return new ArrayData(array(
+					'Name'      => isset($interface['name']) ? $interface['name'] : ucfirst($components[0]),
+					'Icon'      => isset($interface['icon']) ? $interface['icon'] : 'deploynaut/img/git.png',
+					'URL'       => $uxurl,
+					'CommitURL' => $commiturl
+				));
+			}
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getProjectFolderPath()
+	{
+		return sprintf('%s/%s', $this->DNData()->getEnvironmentDir(), $this->Name);
+	}
+
+	/**
+	 * Convenience wrapper for a single permission code.
+	 *
+	 * @param string $code
+	 * @return SS_List
+	 */
+	public function whoIsAllowed($code)
+	{
+		return $this->whoIsAllowedAny(array($code));
+	}
+
+	/**
+	 * List members who have $codes on this project.
+	 * Does not support Permission::DENY_PERMISSION malarky, same as Permission::get_groups_by_permission anyway...
+	 *
+	 * @param array|string $codes
+	 * @return SS_List
+	 */
+	public function whoIsAllowedAny($codes)
+	{
+		if (!is_array($codes)) {
+			$codes = array($codes);
+		}
+
+		$SQLa_codes = Convert::raw2sql($codes);
+		$SQL_codes = join("','", $SQLa_codes);
+
+		return DataObject::get('Member')
+			->where("\"PermissionRoleCode\".\"Code\" IN ('$SQL_codes') OR \"Permission\".\"Code\" IN ('$SQL_codes')")
+			->filter("DNProject_Viewers.DNProjectID", $this->ID)
+			->leftJoin('Group_Members', "\"Group_Members\".\"MemberID\" = \"Member\".\"ID\"")
+			->leftJoin('Group', "\"Group_Members\".\"GroupID\" = \"Group\".\"ID\"")
+			->leftJoin('DNProject_Viewers', "\"DNProject_Viewers\".\"GroupID\" = \"Group\".\"ID\"")
+			->leftJoin('Permission', "\"Permission\".\"GroupID\" = \"Group\".\"ID\"")
+			->leftJoin('Group_Roles', "\"Group_Roles\".\"GroupID\" = \"Group\".\"ID\"")
+			->leftJoin('PermissionRole', "\"Group_Roles\".\"PermissionRoleID\" = \"PermissionRole\".\"ID\"")
+			->leftJoin('PermissionRoleCode', "\"PermissionRoleCode\".\"RoleID\" = \"PermissionRole\".\"ID\"");
+	}
+
+	/**
+	 * Convenience wrapper for a single permission code.
+	 *
+	 * @param string $code
+	 * @param Member|null $member
+	 *
+	 * @return bool
+	 */
+	public function allowed($code, $member = null)
+	{
+		return $this->allowedAny(array($code), $member);
+	}
+
+	/**
+	 * Checks if a group is allowed to the project and the permission code
+	 *
+	 * @param string $permissionCode
+	 * @param Group $group
+	 *
+	 * @return bool
+	 */
+	public function groupAllowed($permissionCode, Group $group)
+	{
+		$viewers = $this->Viewers();
+		if (!$viewers->find('ID', $group->ID)) {
+			return false;
+		}
+		$groups = Permission::get_groups_by_permission($permissionCode);
+		if (!$groups->find('ID', $group->ID)) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Check if member has a permission code in this project.
+	 *
+	 * @param array|string $codes
+	 * @param Member|null $member
+	 *
+	 * @return bool
+	 */
+	public function allowedAny($codes, $member = null)
+	{
+		if (!$member) {
+			$member = Member::currentUser();
+		}
+
+		if (Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
+
+		$hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count();
+		return ($hits>0 ? true : false);
+	}
+
+	/**
+	 * Checks if the environment has been fully built.
+	 *
+	 * @return bool
+	 */
+	public function isProjectReady()
+	{
+		if ($this->getRunningInitialEnvironmentCreations()->count() > 0) {
+			// We're still creating the initial environments for this project so we're
+			// not quite done
+			return false;
+		}
+
+		// Provide a hook for further checks. Logic stolen from
+		// {@see DataObject::extendedCan()}
+		$isDone = $this->extend('isProjectReady');
+		if ($isDone && is_array($isDone)) {
+			$isDone = array_filter($isDone, function ($val) {
+				return !is_null($val);
+			});
+
+			// If anything returns false then we're not ready.
+			if ($isDone) {
+				return min($isDone);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns a list of environments still being created.
+	 *
+	 * @return SS_List
+	 */
+	public function getRunningEnvironmentCreations()
+	{
+		return $this->CreateEnvironments()
+			->filter('Status', ['Queued', 'Started']);
+	}
+
+	/**
+	 * Returns a list of initial environments created for this project.
+	 *
+	 * @return DataList
+	 */
+	public function getInitialEnvironmentCreations()
+	{
+		return $this->CreateEnvironments()->filter('IsInitialEnvironment', true);
+	}
+
+	/**
+	 * Only returns initial environments that are being created.
+	 *
+	 * @return DataList
+	 */
+	public function getRunningInitialEnvironmentCreations()
+	{
+		return $this->getInitialEnvironmentCreations()
+			->filter('Status', ['Queued', 'Started']);
+	}
+
+	/**
+	 * Returns a list of completed initial environment creations. This includes failed tasks.
+	 *
+	 * @return DataList
+	 */
+	public function getCompleteInitialEnvironmentCreations()
+	{
+		return $this->getInitialEnvironmentCreations()
+			->exclude('Status', ['Queued', 'Started']);
+	}
+
+	/**
+	 * @return ValidationResult
+	 */
+	protected function validate()
+	{
+		$validation = parent::validate();
+		if ($validation->valid()) {
+			if (empty($this->Name)) {
+				return $validation->error('The stack must have a name.');
+			}
+
+			// The name is used to build filepaths so should be restricted
+			if (!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9\-\_]+$/', $this->Name)) {
+				return $validation->error('Project name can only contain alphanumeric, hyphens and underscores.');
+			}
+
+			if (empty($this->CVSPath)) {
+				return $validation->error('You must provide a repository URL.');
+			}
+
+			$existing = DNProject::get()->filter('Name', $this->Name);
+			if ($this->ID) {
+				$existing = $existing->exclude('ID', $this->ID);
+			}
+			if ($existing->count() > 0) {
+				return $validation->error('A stack already exists with that name.');
+			}
+		}
+		return $validation;
+	}
+
+	/**
+	 * @param Member $member
+	 *
+	 * @return bool
+	 */
+	public function canCreate($member = null)
+	{
+		if (!$member) {
+			$member = Member::currentUser();
+		}
+		if (!$member) {
+			return false;
+		}
+
+		if (Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
+
+		// This calls canCreate on extensions.
+		return parent::canCreate($member);
+	}
 }

Spacing +73 added lines, -73 removed lines

@@ -111,7 +111,7 @@ 
 
         // add the administrators group as the viewers of the new project
         $adminGroup = Group::get()->filter('Code', 'administrators')->first();
-        if ($adminGroup && $adminGroup->exists()) {
+        if($adminGroup && $adminGroup->exists()) {
             $project->Viewers()->add($adminGroup);
         }
         return $project;
@@ -127,8 +127,8 @@ 
     {
         $size = 0;
 
-        foreach ($this->Environments() as $environment) {
-            foreach ($environment->DataArchives()->filter('IsBackup', 0) as $archive) {
+        foreach($this->Environments() as $environment) {
+            foreach($environment->DataArchives()->filter('IsBackup', 0) as $archive) {
                 $size += $archive->ArchiveFile()->getAbsoluteSize();
             }
         }
@@ -148,7 +148,7 @@ 
     {
         $size = $this->getField('DiskQuotaMB');
 
-        if (empty($size)) {
+        if(empty($size)) {
             $defaults = $this->config()->get('defaults');
             $size = (isset($defaults['DiskQuotaMB'])) ? $defaults['DiskQuotaMB'] : 0;
         }
@@ -184,7 +184,7 @@ 
     public function DiskQuotaUsagePercent()
     {
         $quota = $this->getDiskQuotaMB();
-        if ($quota > 0) {
+        if($quota > 0) {
             return $this->getUsedQuotaMB() * 100 / $quota;
         }
         return 100;
@@ -202,7 +202,7 @@ 
         $controller = Controller::curr();
         $actionType = $controller->getField('CurrentActionType');
 
-        if (DNRoot::FlagSnapshotsEnabled() && $this->isProjectReady()) {
+        if(DNRoot::FlagSnapshotsEnabled() && $this->isProjectReady()) {
             $list->push(new ArrayData(array(
                 'Link' => sprintf('naut/project/%s/snapshots', $this->Name),
                 'Title' => 'Snapshots',
@@ -257,11 +257,11 @@ 
      */
     public function canView($member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
 
-        if (Permission::checkMember($member, 'ADMIN')) {
+        if(Permission::checkMember($member, 'ADMIN')) {
             return true;
         }
 
@@ -275,7 +275,7 @@ 
      */
     public function canRestore($member = null)
     {
-        if ($this->allowedAny(
+        if($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
                 DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -285,7 +285,7 @@ 
             return true;
         }
 
-        return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
+        return (bool)$this->Environments()->filterByCallback(function($env) use ($member) {
             return $env->canRestore($member);
         })->Count();
     }
@@ -296,7 +296,7 @@ 
      */
     public function canBackup($member = null)
     {
-        if ($this->allowedAny(
+        if($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
                 DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -306,7 +306,7 @@ 
             return true;
         }
 
-        return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
+        return (bool)$this->Environments()->filterByCallback(function($env) use ($member) {
             return $env->canBackup($member);
         })->Count();
     }
@@ -317,7 +317,7 @@ 
      */
     public function canUploadArchive($member = null)
     {
-        if ($this->allowedAny(
+        if($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
                 DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -327,7 +327,7 @@ 
             return true;
         }
 
-        return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
+        return (bool)$this->Environments()->filterByCallback(function($env) use ($member) {
             return $env->canUploadArchive($member);
         })->Count();
     }
@@ -338,7 +338,7 @@ 
      */
     public function canDownloadArchive($member = null)
     {
-        if ($this->allowedAny(
+        if($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
                 DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -348,7 +348,7 @@ 
             return true;
         }
 
-        return (bool)$this->Environments()->filterByCallback(function ($env) use ($member) {
+        return (bool)$this->Environments()->filterByCallback(function($env) use ($member) {
             return $env->canDownloadArchive($member);
         })->Count();
     }
@@ -366,9 +366,9 @@ 
     public function canCreateEnvironments($member = null)
     {
         $envType = $this->AllowedEnvironmentType;
-        if ($envType) {
+        if($envType) {
             $env = Injector::inst()->get($envType);
-            if ($env instanceof EnvironmentCreateBackend) {
+            if($env instanceof EnvironmentCreateBackend) {
                 return $this->allowed(DNRoot::ALLOW_CREATE_ENVIRONMENT, $member);
             }
         }
@@ -407,7 +407,7 @@ 
      */
     public function getProcessEnv()
     {
-        if (file_exists($this->getPrivateKeyPath())) {
+        if(file_exists($this->getPrivateKeyPath())) {
             // Key-pair is available, use it.
             $processEnv = array(
                 'IDENT_KEY' => $this->getPrivateKeyPath(),
@@ -456,7 +456,7 @@ 
      */
     public function DNBranchList()
     {
-        if ($this->CVSPath && !$this->repoExists()) {
+        if($this->CVSPath && !$this->repoExists()) {
             $this->cloneRepo();
         }
         return DNBranchList::create($this, $this->DNData());
@@ -469,7 +469,7 @@ 
      */
     public function DNTagList()
     {
-        if ($this->CVSPath && !$this->repoExists()) {
+        if($this->CVSPath && !$this->repoExists()) {
             $this->cloneRepo();
         }
         return DNReferenceList::create($this, $this->DNData(), null, null, true);
@@ -480,7 +480,7 @@ 
      */
     public function getRepository()
     {
-        if (!$this->repoExists()) {
+        if(!$this->repoExists()) {
             return false;
         }
 
@@ -495,17 +495,17 @@ 
      */
     public function DNEnvironmentList()
     {
-        if (!self::$_current_member_cache) {
+        if(!self::$_current_member_cache) {
             self::$_current_member_cache = Member::currentUser();
         }
 
-        if (self::$_current_member_cache === false) {
+        if(self::$_current_member_cache === false) {
             return new ArrayList();
         }
 
         $currentMember = self::$_current_member_cache;
         return $this->Environments()
-            ->filterByCallBack(function ($item) use ($currentMember) {
+            ->filterByCallBack(function($item) use ($currentMember) {
                 return $item->canView($currentMember);
             });
     }
@@ -526,14 +526,14 @@ 
      */
     public function currentBuilds()
     {
-        if (!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
+        if(!isset(self::$relation_cache['currentBuilds.' . $this->ID])) {
             $currentBuilds = array();
-            foreach ($this->Environments() as $env) {
+            foreach($this->Environments() as $env) {
                 $currentBuilds[$env->Name] = $env->CurrentBuild();
             }
-            self::$relation_cache['currentBuilds.'.$this->ID] = $currentBuilds;
+            self::$relation_cache['currentBuilds.' . $this->ID] = $currentBuilds;
         }
-        return self::$relation_cache['currentBuilds.'.$this->ID];
+        return self::$relation_cache['currentBuilds.' . $this->ID];
     }
 
     /**
@@ -550,7 +550,7 @@ 
      */
     public function CreateEnvironmentLink()
     {
-        if ($this->canCreateEnvironments()) {
+        if($this->canCreateEnvironments()) {
             return $this->Link('createenv');
         }
         return null;
@@ -570,11 +570,11 @@ 
     public function IsStarred()
     {
         $member = Member::currentUser();
-        if ($member === null) {
+        if($member === null) {
             return false;
         }
         $favourited = $this->StarredBy()->filter('MemberID', $member->ID);
-        if ($favourited->count() == 0) {
+        if($favourited->count() == 0) {
             return false;
         }
         return true;
@@ -631,7 +631,7 @@ 
 
         $environmentTypes = ClassInfo::implementorsOf('EnvironmentCreateBackend');
         $types = array();
-        foreach ($environmentTypes as $type) {
+        foreach($environmentTypes as $type) {
             $types[$type] = $type;
         }
 
@@ -656,11 +656,11 @@ 
     public function setCreateProjectFolderField(&$fields)
     {
         // Check if the capistrano project folder exists
-        if (!$this->Name) {
+        if(!$this->Name) {
             return;
         }
 
-        if ($this->projectFolderExists()) {
+        if($this->projectFolderExists()) {
             return;
         }
 
@@ -695,7 +695,7 @@ 
     public function cloneRepo()
     {
         // Avoid this being called multiple times in the same request
-        if (!isset(self::$has_cloned_cache[$this->ID])) {
+        if(!isset(self::$has_cloned_cache[$this->ID])) {
             $fetch = DNGitFetch::create();
             $fetch->ProjectID = $this->ID;
             $fetch->write();
@@ -721,7 +721,7 @@ 
     {
         parent::onBeforeWrite();
 
-        if ($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
+        if($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
             mkdir($this->getProjectFolderPath());
         }
     }
@@ -730,12 +730,12 @@ 
     {
         parent::onAfterWrite();
 
-        if (!$this->CVSPath) {
+        if(!$this->CVSPath) {
             return;
         }
 
         $changedFields = $this->getChangedFields(true, 2);
-        if (isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
+        if(isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
             $this->cloneRepo();
         }
     }
@@ -748,22 +748,22 @@ 
         parent::onAfterDelete();
 
         // Delete related environments
-        foreach ($this->Environments() as $env) {
+        foreach($this->Environments() as $env) {
             $env->delete();
         }
 
         // Delete local repository
-        if (file_exists($this->getLocalCVSPath())) {
+        if(file_exists($this->getLocalCVSPath())) {
             Filesystem::removeFolder($this->getLocalCVSPath());
         }
 
         // Delete project template
-        if (file_exists($this->getProjectFolderPath()) && Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
+        if(file_exists($this->getProjectFolderPath()) && Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
             Filesystem::removeFolder($this->getProjectFolderPath());
         }
 
         // Delete the deploy key
-        if (file_exists($this->getKeyDir())) {
+        if(file_exists($this->getKeyDir())) {
             Filesystem::removeFolder($this->getKeyDir());
         }
     }
@@ -777,7 +777,7 @@ 
     {
         $key = $this->getPublicKeyPath();
 
-        if (file_exists($key)) {
+        if(file_exists($key)) {
             return trim(file_get_contents($key));
         }
     }
@@ -789,7 +789,7 @@ 
      */
     public function getPublicKeyPath()
     {
-        if ($privateKey = $this->getPrivateKeyPath()) {
+        if($privateKey = $this->getPrivateKeyPath()) {
             return $privateKey . '.pub';
         }
         return null;
@@ -803,7 +803,7 @@ 
     public function getPrivateKeyPath()
     {
         $keyDir = $this->getKeyDir();
-        if (!empty($keyDir)) {
+        if(!empty($keyDir)) {
             $filter = FileNameFilter::create();
             $name = $filter->filter($this->Name);
             return $keyDir . '/' . $name;
@@ -819,7 +819,7 @@ 
     public function getKeyDir()
     {
         $keyDir = $this->DNData()->getKeyDir();
-        if (!$keyDir) {
+        if(!$keyDir) {
             return null;
         }
 
@@ -837,7 +837,7 @@ 
      */
     protected function setEnvironmentFields(&$fields, $environments)
     {
-        if (!$environments) {
+        if(!$environments) {
             return;
         }
 
@@ -846,7 +846,7 @@ 
         $environments->getConfig()->removeComponentsByType('GridFieldAddExistingAutocompleter');
         $environments->getConfig()->removeComponentsByType('GridFieldDeleteAction');
         $environments->getConfig()->removeComponentsByType('GridFieldPageCount');
-        if (Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
+        if(Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
             $addNewRelease = new GridFieldAddNewButton('toolbar-header-right');
             $addNewRelease->setButtonName('Add');
             $environments->getConfig()->addComponent($addNewRelease);
@@ -863,7 +863,7 @@ 
     public function getRepositoryURL()
     {
         $showUrl = Config::inst()->get($this->class, 'show_repository_url');
-        if ($showUrl) {
+        if($showUrl) {
             return $this->CVSPath;
         }
     }
@@ -916,9 +916,9 @@ 
         $interfaces = $this->config()->repository_interfaces;
 
         /* Look for each whitelisted hostname */
-        foreach ($interfaces as $host => $interface) {
+        foreach($interfaces as $host => $interface) {
             /* See if the CVS Path is for this hostname, followed by some junk (maybe a port), then the path */
-            if (preg_match('{^[^.]*' . $host . '(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
+            if(preg_match('{^[^.]*' . $host . '(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
                 $path = $match[2];
 
                 $scheme = isset($interface['scheme']) ? $interface['scheme'] : 'https';
@@ -927,13 +927,13 @@ 
 
                 $components = explode('.', $host);
 
-                foreach ($regex as $pattern => $replacement) {
+                foreach($regex as $pattern => $replacement) {
                     $path = preg_replace('/' . $pattern . '/', $replacement, $path);
                 }
 
                 $uxurl = Controller::join_links($scheme . '://', $host, $path);
 
-                if (array_key_exists('commit', $interface) && $interface['commit'] == false) {
+                if(array_key_exists('commit', $interface) && $interface['commit'] == false) {
                     $commiturl = false;
                 } else {
                     $commiturl = Controller::join_links(
@@ -980,7 +980,7 @@ 
      */
     public function whoIsAllowedAny($codes)
     {
-        if (!is_array($codes)) {
+        if(!is_array($codes)) {
             $codes = array($codes);
         }
 
@@ -1023,11 +1023,11 @@ 
     public function groupAllowed($permissionCode, Group $group)
     {
         $viewers = $this->Viewers();
-        if (!$viewers->find('ID', $group->ID)) {
+        if(!$viewers->find('ID', $group->ID)) {
             return false;
         }
         $groups = Permission::get_groups_by_permission($permissionCode);
-        if (!$groups->find('ID', $group->ID)) {
+        if(!$groups->find('ID', $group->ID)) {
             return false;
         }
         return true;
@@ -1043,16 +1043,16 @@ 
      */
     public function allowedAny($codes, $member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
 
-        if (Permission::checkMember($member, 'ADMIN')) {
+        if(Permission::checkMember($member, 'ADMIN')) {
             return true;
         }
 
         $hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count();
-        return ($hits>0 ? true : false);
+        return ($hits > 0 ? true : false);
     }
 
     /**
@@ -1062,7 +1062,7 @@ 
      */
     public function isProjectReady()
     {
-        if ($this->getRunningInitialEnvironmentCreations()->count() > 0) {
+        if($this->getRunningInitialEnvironmentCreations()->count() > 0) {
             // We're still creating the initial environments for this project so we're
             // not quite done
             return false;
@@ -1071,13 +1071,13 @@ 
         // Provide a hook for further checks. Logic stolen from
         // {@see DataObject::extendedCan()}
         $isDone = $this->extend('isProjectReady');
-        if ($isDone && is_array($isDone)) {
-            $isDone = array_filter($isDone, function ($val) {
+        if($isDone && is_array($isDone)) {
+            $isDone = array_filter($isDone, function($val) {
                 return !is_null($val);
             });
 
             // If anything returns false then we're not ready.
-            if ($isDone) {
+            if($isDone) {
                 return min($isDone);
             }
         }
@@ -1134,25 +1134,25 @@ 
     protected function validate()
     {
         $validation = parent::validate();
-        if ($validation->valid()) {
-            if (empty($this->Name)) {
+        if($validation->valid()) {
+            if(empty($this->Name)) {
                 return $validation->error('The stack must have a name.');
             }
 
             // The name is used to build filepaths so should be restricted
-            if (!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9\-\_]+$/', $this->Name)) {
+            if(!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9\-\_]+$/', $this->Name)) {
                 return $validation->error('Project name can only contain alphanumeric, hyphens and underscores.');
             }
 
-            if (empty($this->CVSPath)) {
+            if(empty($this->CVSPath)) {
                 return $validation->error('You must provide a repository URL.');
             }
 
             $existing = DNProject::get()->filter('Name', $this->Name);
-            if ($this->ID) {
+            if($this->ID) {
                 $existing = $existing->exclude('ID', $this->ID);
             }
-            if ($existing->count() > 0) {
+            if($existing->count() > 0) {
                 return $validation->error('A stack already exists with that name.');
             }
         }
@@ -1166,14 +1166,14 @@ 
      */
     public function canCreate($member = null)
     {
-        if (!$member) {
+        if(!$member) {
             $member = Member::currentUser();
         }
-        if (!$member) {
+        if(!$member) {
             return false;
         }
 
-        if (Permission::checkMember($member, 'ADMIN')) {
+        if(Permission::checkMember($member, 'ADMIN')) {
             return true;
         }
 

Braces +63 added lines, -126 removed lines

@@ -12,8 +12,7 @@ 
  * @method ManyManyList Viewers()
  * @method ManyManyList StarredBy()
  */
-class DNProject extends DataObject
-{
+class DNProject extends DataObject {
 
     /**
      * @var array
@@ -103,8 +102,7 @@ 
      * @param string $path
      * @return \DNProject
      */
-    public static function create_from_path($path)
-    {
+    public static function create_from_path($path) {
         $project = DNProject::create();
         $project->Name = $path;
         $project->write();
@@ -123,8 +121,7 @@ 
      * @param int $round Number of decimal places to round to
      * @return double The used quota size in MB
      */
-    public function getUsedQuotaMB($round = 2)
-    {
+    public function getUsedQuotaMB($round = 2) {
         $size = 0;
 
         foreach ($this->Environments() as $environment) {
@@ -144,8 +141,7 @@ 
      *
      * @return string|int The quota size in MB
      */
-    public function getDiskQuotaMB()
-    {
+    public function getDiskQuotaMB() {
         $size = $this->getField('DiskQuotaMB');
 
         if (empty($size)) {
@@ -161,8 +157,7 @@ 
      *
      * @return boolean
      */
-    public function HasExceededDiskQuota()
-    {
+    public function HasExceededDiskQuota() {
         return $this->getUsedQuotaMB(0) >= $this->getDiskQuotaMB();
     }
 
@@ -171,8 +166,7 @@ 
      *
      * @return boolean
      */
-    public function HasDiskQuota()
-    {
+    public function HasDiskQuota() {
         return $this->getDiskQuotaMB() > 0;
     }
 
@@ -181,8 +175,7 @@ 
      *
      * @return int
      */
-    public function DiskQuotaUsagePercent()
-    {
+    public function DiskQuotaUsagePercent() {
         $quota = $this->getDiskQuotaMB();
         if ($quota > 0) {
             return $this->getUsedQuotaMB() * 100 / $quota;
@@ -195,8 +188,7 @@ 
      *
      * @return ArrayList
      */
-    public function Menu()
-    {
+    public function Menu() {
         $list = new ArrayList();
 
         $controller = Controller::curr();
@@ -221,8 +213,7 @@ 
      *
      * @return bool
      */
-    public function isCurrent()
-    {
+    public function isCurrent() {
         return $this->isSection() && Controller::curr()->getAction() == 'project';
     }
 
@@ -232,8 +223,7 @@ 
      *
      * @return DataObject
      */
-    public function CurrentMenu()
-    {
+    public function CurrentMenu() {
         return $this->Menu()->filter('IsSection', true)->First();
     }
 
@@ -242,8 +232,7 @@ 
      *
      * @return bool
      */
-    public function isSection()
-    {
+    public function isSection() {
         $controller = Controller::curr();
         $project = $controller->getField('CurrentProject');
         return $project && $this->ID == $project->ID;
@@ -255,8 +244,7 @@ 
      * @param Member|null $member
      * @return boolean
      */
-    public function canView($member = null)
-    {
+    public function canView($member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }
@@ -273,8 +261,7 @@ 
      *
      * @return bool
      */
-    public function canRestore($member = null)
-    {
+    public function canRestore($member = null) {
         if ($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
@@ -294,8 +281,7 @@ 
      * @param Member|null $member
      * @return bool
      */
-    public function canBackup($member = null)
-    {
+    public function canBackup($member = null) {
         if ($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
@@ -315,8 +301,7 @@ 
      * @param Member|null $member
      * @return bool
      */
-    public function canUploadArchive($member = null)
-    {
+    public function canUploadArchive($member = null) {
         if ($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
@@ -336,8 +321,7 @@ 
      * @param Member|null $member
      * @return bool
      */
-    public function canDownloadArchive($member = null)
-    {
+    public function canDownloadArchive($member = null) {
         if ($this->allowedAny(
             array(
                 DNRoot::ALLOW_PROD_SNAPSHOT,
@@ -363,8 +347,7 @@ 
      *
      * @return bool
      */
-    public function canCreateEnvironments($member = null)
-    {
+    public function canCreateEnvironments($member = null) {
         $envType = $this->AllowedEnvironmentType;
         if ($envType) {
             $env = Injector::inst()->get($envType);
@@ -378,8 +361,7 @@ 
     /**
      * @return DataList
      */
-    public function DataArchives()
-    {
+    public function DataArchives() {
         $envIds = $this->Environments()->column('ID');
         return DNDataArchive::get()->filter('EnvironmentID', $envIds);
     }
@@ -390,8 +372,7 @@ 
      *
      * @return DataList
      */
-    public function PendingManualUploadDataArchives()
-    {
+    public function PendingManualUploadDataArchives() {
         return $this->DataArchives()->filter('ArchiveFileID', null);
     }
 
@@ -405,8 +386,7 @@ 
      *
      * @return array
      */
-    public function getProcessEnv()
-    {
+    public function getProcessEnv() {
         if (file_exists($this->getPrivateKeyPath())) {
             // Key-pair is available, use it.
             $processEnv = array(
@@ -426,16 +406,14 @@ 
      *
      * @return string
      */
-    public function getViewersList()
-    {
+    public function getViewersList() {
         return implode(", ", $this->Viewers()->column("Title"));
     }
 
     /**
      * @return DNData
      */
-    public function DNData()
-    {
+    public function DNData() {
         return DNData::inst();
     }
 
@@ -444,8 +422,7 @@ 
      *
      * @return DNReferenceList
      */
-    public function DNBuildList()
-    {
+    public function DNBuildList() {
         return DNReferenceList::create($this, $this->DNData());
     }
 
@@ -454,8 +431,7 @@ 
      *
      * @return DNBranchList
      */
-    public function DNBranchList()
-    {
+    public function DNBranchList() {
         if ($this->CVSPath && !$this->repoExists()) {
             $this->cloneRepo();
         }
@@ -467,8 +443,7 @@ 
      *
      * @return DNReferenceList
      */
-    public function DNTagList()
-    {
+    public function DNTagList() {
         if ($this->CVSPath && !$this->repoExists()) {
             $this->cloneRepo();
         }
@@ -478,8 +453,7 @@ 
     /**
      * @return false|Gitonomy\Git\Repository
      */
-    public function getRepository()
-    {
+    public function getRepository() {
         if (!$this->repoExists()) {
             return false;
         }
@@ -493,8 +467,7 @@ 
      *
      * @return ArrayList
      */
-    public function DNEnvironmentList()
-    {
+    public function DNEnvironmentList() {
         if (!self::$_current_member_cache) {
             self::$_current_member_cache = Member::currentUser();
         }
@@ -514,8 +487,7 @@ 
      * @param string $usage
      * @return ArrayList
      */
-    public function EnvironmentsByUsage($usage)
-    {
+    public function EnvironmentsByUsage($usage) {
         return $this->DNEnvironmentList()->filter('Usage', $usage);
     }
 
@@ -524,8 +496,7 @@ 
      *
      * @return false|DNDeployment
      */
-    public function currentBuilds()
-    {
+    public function currentBuilds() {
         if (!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
             $currentBuilds = array();
             foreach ($this->Environments() as $env) {
@@ -540,16 +511,14 @@ 
      * @param string
      * @return string
      */
-    public function Link($action = '')
-    {
+    public function Link($action = '') {
         return Controller::join_links("naut", "project", $this->Name, $action);
     }
 
     /**
      * @return string|null
      */
-    public function CreateEnvironmentLink()
-    {
+    public function CreateEnvironmentLink() {
         if ($this->canCreateEnvironments()) {
             return $this->Link('createenv');
         }
@@ -559,16 +528,14 @@ 
     /**
      * @return string
      */
-    public function ToggleStarLink()
-    {
+    public function ToggleStarLink() {
         return $this->Link('/star');
     }
 
     /**
      * @return bool
      */
-    public function IsStarred()
-    {
+    public function IsStarred() {
         $member = Member::currentUser();
         if ($member === null) {
             return false;
@@ -584,16 +551,14 @@ 
      * @param string $action
      * @return string
      */
-    public function APILink($action)
-    {
+    public function APILink($action) {
         return Controller::join_links("naut", "api", $this->Name, $action);
     }
 
     /**
      * @return FieldList
      */
-    public function getCMSFields()
-    {
+    public function getCMSFields() {
         $fields = parent::getCMSFields();
 
         /** @var GridField $environments */
@@ -653,8 +618,7 @@ 
      *
      * @param FieldList $fields
      */
-    public function setCreateProjectFolderField(&$fields)
-    {
+    public function setCreateProjectFolderField(&$fields) {
         // Check if the capistrano project folder exists
         if (!$this->Name) {
             return;
@@ -675,16 +639,14 @@ 
     /**
      * @return boolean
      */
-    public function projectFolderExists()
-    {
+    public function projectFolderExists() {
         return file_exists($this->getProjectFolderPath());
     }
 
     /**
      * @return bool
      */
-    public function repoExists()
-    {
+    public function repoExists() {
         return file_exists(sprintf('%s/HEAD', $this->getLocalCVSPath()));
     }
 
@@ -692,8 +654,7 @@ 
      * Setup a job to clone a git repository.
      * @return string resque token
      */
-    public function cloneRepo()
-    {
+    public function cloneRepo() {
         // Avoid this being called multiple times in the same request
         if (!isset(self::$has_cloned_cache[$this->ID])) {
             $fetch = DNGitFetch::create();
@@ -712,13 +673,11 @@ 
     /**
      * @return string
      */
-    public function getLocalCVSPath()
-    {
+    public function getLocalCVSPath() {
         return sprintf('%s/%s', DEPLOYNAUT_LOCAL_VCS_PATH, $this->Name);
     }
 
-    public function onBeforeWrite()
-    {
+    public function onBeforeWrite() {
         parent::onBeforeWrite();
 
         if ($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
@@ -726,8 +685,7 @@ 
         }
     }
 
-    public function onAfterWrite()
-    {
+    public function onAfterWrite() {
         parent::onAfterWrite();
 
         if (!$this->CVSPath) {
@@ -743,8 +701,7 @@ 
     /**
      * Delete related environments and folders
      */
-    public function onAfterDelete()
-    {
+    public function onAfterDelete() {
         parent::onAfterDelete();
 
         // Delete related environments
@@ -773,8 +730,7 @@ 
      *
      * @return string|void
      */
-    public function getPublicKey()
-    {
+    public function getPublicKey() {
         $key = $this->getPublicKeyPath();
 
         if (file_exists($key)) {
@@ -787,8 +743,7 @@ 
      *
      * @return string|null
      */
-    public function getPublicKeyPath()
-    {
+    public function getPublicKeyPath() {
         if ($privateKey = $this->getPrivateKeyPath()) {
             return $privateKey . '.pub';
         }
@@ -800,8 +755,7 @@ 
      *
      * @return string|null
      */
-    public function getPrivateKeyPath()
-    {
+    public function getPrivateKeyPath() {
         $keyDir = $this->getKeyDir();
         if (!empty($keyDir)) {
             $filter = FileNameFilter::create();
@@ -816,8 +770,7 @@ 
      *
      * @return string|null
      */
-    public function getKeyDir()
-    {
+    public function getKeyDir() {
         $keyDir = $this->DNData()->getKeyDir();
         if (!$keyDir) {
             return null;
@@ -835,8 +788,7 @@ 
      * @param FieldList $fields
      * @param GridField $environments
      */
-    protected function setEnvironmentFields(&$fields, $environments)
-    {
+    protected function setEnvironmentFields(&$fields, $environments) {
         if (!$environments) {
             return;
         }
@@ -860,8 +812,7 @@ 
      *
      * @return void|string
      */
-    public function getRepositoryURL()
-    {
+    public function getRepositoryURL() {
         $showUrl = Config::inst()->get($this->class, 'show_repository_url');
         if ($showUrl) {
             return $this->CVSPath;
@@ -911,8 +862,7 @@ 
      *
      * @return ArrayData
      */
-    public function getRepositoryInterface()
-    {
+    public function getRepositoryInterface() {
         $interfaces = $this->config()->repository_interfaces;
 
         /* Look for each whitelisted hostname */
@@ -955,8 +905,7 @@ 
     /**
      * @return string
      */
-    protected function getProjectFolderPath()
-    {
+    protected function getProjectFolderPath() {
         return sprintf('%s/%s', $this->DNData()->getEnvironmentDir(), $this->Name);
     }
 
@@ -966,8 +915,7 @@ 
      * @param string $code
      * @return SS_List
      */
-    public function whoIsAllowed($code)
-    {
+    public function whoIsAllowed($code) {
         return $this->whoIsAllowedAny(array($code));
     }
 
@@ -978,8 +926,7 @@ 
      * @param array|string $codes
      * @return SS_List
      */
-    public function whoIsAllowedAny($codes)
-    {
+    public function whoIsAllowedAny($codes) {
         if (!is_array($codes)) {
             $codes = array($codes);
         }
@@ -1007,8 +954,7 @@ 
      *
      * @return bool
      */
-    public function allowed($code, $member = null)
-    {
+    public function allowed($code, $member = null) {
         return $this->allowedAny(array($code), $member);
     }
 
@@ -1020,8 +966,7 @@ 
      *
      * @return bool
      */
-    public function groupAllowed($permissionCode, Group $group)
-    {
+    public function groupAllowed($permissionCode, Group $group) {
         $viewers = $this->Viewers();
         if (!$viewers->find('ID', $group->ID)) {
             return false;
@@ -1041,8 +986,7 @@ 
      *
      * @return bool
      */
-    public function allowedAny($codes, $member = null)
-    {
+    public function allowedAny($codes, $member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }
@@ -1060,8 +1004,7 @@ 
      *
      * @return bool
      */
-    public function isProjectReady()
-    {
+    public function isProjectReady() {
         if ($this->getRunningInitialEnvironmentCreations()->count() > 0) {
             // We're still creating the initial environments for this project so we're
             // not quite done
@@ -1090,8 +1033,7 @@ 
      *
      * @return SS_List
      */
-    public function getRunningEnvironmentCreations()
-    {
+    public function getRunningEnvironmentCreations() {
         return $this->CreateEnvironments()
             ->filter('Status', ['Queued', 'Started']);
     }
@@ -1101,8 +1043,7 @@ 
      *
      * @return DataList
      */
-    public function getInitialEnvironmentCreations()
-    {
+    public function getInitialEnvironmentCreations() {
         return $this->CreateEnvironments()->filter('IsInitialEnvironment', true);
     }
 
@@ -1111,8 +1052,7 @@ 
      *
      * @return DataList
      */
-    public function getRunningInitialEnvironmentCreations()
-    {
+    public function getRunningInitialEnvironmentCreations() {
         return $this->getInitialEnvironmentCreations()
             ->filter('Status', ['Queued', 'Started']);
     }
@@ -1122,8 +1062,7 @@ 
      *
      * @return DataList
      */
-    public function getCompleteInitialEnvironmentCreations()
-    {
+    public function getCompleteInitialEnvironmentCreations() {
         return $this->getInitialEnvironmentCreations()
             ->exclude('Status', ['Queued', 'Started']);
     }
@@ -1131,8 +1070,7 @@ 
     /**
      * @return ValidationResult
      */
-    protected function validate()
-    {
+    protected function validate() {
         $validation = parent::validate();
         if ($validation->valid()) {
             if (empty($this->Name)) {
@@ -1164,8 +1102,7 @@ 
      *
      * @return bool
      */
-    public function canCreate($member = null)
-    {
+    public function canCreate($member = null) {
         if (!$member) {
             $member = Member::currentUser();
         }

code/model/DNQueuedCommits.php

Indentation +6 added lines, -6 removed lines

@@ -9,11 +9,11 @@
 class DNQueuedCommits extends DNFilteredCommits
 {
 
-    private $description = 'Commits that are currently queued';
+	private $description = 'Commits that are currently queued';
 
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setFilter('Queued');
-    }
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setFilter('Queued');
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -6,13 +6,11 @@
  *  Class to represent queued commits
  *
  */
-class DNQueuedCommits extends DNFilteredCommits
-{
+class DNQueuedCommits extends DNFilteredCommits {
 
     private $description = 'Commits that are currently queued';
 
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
         $this->setFilter('Queued');
     }

code/model/DNReference.php

Indentation +25 added lines, -25 removed lines

@@ -3,34 +3,34 @@
 class DNReference extends ViewableData
 {
 
-    /**
-     * @var Gitonomy\Git\Reference
-     */
-    protected $reference;
+	/**
+	 * @var Gitonomy\Git\Reference
+	 */
+	protected $reference;
 
-    private static $casting = array(
-        'Name' => 'Text',
-        'FullName' => 'Text',
-        'Filename' => 'Text'
-    );
+	private static $casting = array(
+		'Name' => 'Text',
+		'FullName' => 'Text',
+		'Filename' => 'Text'
+	);
 
-    public function __construct(Gitonomy\Git\Reference $reference)
-    {
-        $this->reference = $reference;
-    }
+	public function __construct(Gitonomy\Git\Reference $reference)
+	{
+		$this->reference = $reference;
+	}
 
-    public function Name()
-    {
-        return $this->reference->getName();
-    }
+	public function Name()
+	{
+		return $this->reference->getName();
+	}
 
-    public function FullName()
-    {
-        return $this->reference->getCommitHash();
-    }
+	public function FullName()
+	{
+		return $this->reference->getCommitHash();
+	}
 
-    public function Filename()
-    {
-        return $this->reference->getFullname();
-    }
+	public function Filename()
+	{
+		return $this->reference->getFullname();
+	}
 }

Braces +5 added lines, -10 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-class DNReference extends ViewableData
-{
+class DNReference extends ViewableData {
 
     /**
      * @var Gitonomy\Git\Reference
@@ -14,23 +13,19 @@ 
         'Filename' => 'Text'
     );
 
-    public function __construct(Gitonomy\Git\Reference $reference)
-    {
+    public function __construct(Gitonomy\Git\Reference $reference) {
         $this->reference = $reference;
     }
 
-    public function Name()
-    {
+    public function Name() {
         return $this->reference->getName();
     }
 
-    public function FullName()
-    {
+    public function FullName() {
         return $this->reference->getCommitHash();
     }
 
-    public function Filename()
-    {
+    public function Filename() {
         return $this->reference->getFullname();
     }
 }

code/model/DNReferenceList.php

Indentation +206 added lines, -206 removed lines

@@ -5,210 +5,210 @@
 class DNReferenceList extends ArrayList
 {
 
-    /**
-     * @var string
-     */
-    protected static $refs_dir = '';
-
-    /**
-     * @var bool
-     */
-    protected $loaded = false;
-
-    /**
-     * @var Reference|null
-     */
-    protected $reference = null;
-
-    /**
-     * @var null|string
-     */
-    protected $blockBranch;
-
-    /**
-     * @var array
-     */
-    protected $builds = array();
-
-    /**
-     * @var int
-     */
-    protected $limit = 10;
-
-    /**
-     * @var bool
-     */
-    protected $getTags = false;
-
-    /**
-     * @var DNProject
-     */
-    protected $project;
-
-    /**
-     * @var DNData
-     */
-    protected $data;
-
-    /**
-     * @param $refsDir
-     */
-    public static function set_refs_dir($refsDir)
-    {
-        self::$refs_dir = $refsDir;
-    }
-
-    /**
-     * @return string
-     */
-    public static function get_refs_dir()
-    {
-        return self::$refs_dir;
-    }
-
-    /**
-     * @param DNProject $project
-     * @param DNData $data
-     * @param Reference|null $reference
-     * @param string|null $blockBranch
-     * @param bool $getTags
-     */
-    public function __construct(
-        DNProject $project,
-        DNData $data,
-        Reference $reference = null,
-        $blockBranch = null,
-        $getTags = false
-    ) {
-        $this->project = $project;
-        $this->data = $data;
-        $this->reference = $reference;
-        $this->blockBranch = $blockBranch;
-        $this->getTags = $getTags;
-        parent::__construct(array());
-    }
-
-    /**
-     * @param int $limit
-     * @return DNReferenceList
-     */
-    public function setLimit($limit)
-    {
-        $this->limit = $limit;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getReferences()
-    {
-        try {
-            $repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
-        } catch (Exception $e) {
-            return array();
-        }
-
-        if ($this->getTags) {
-            if ($this->reference) {
-                throw new LogicException("Can't have \$reference and \$getTags both set");
-            }
-            $log = $repository->getReferences()->getTags();
-        } elseif ($this->reference) {
-            $log = $this->reference->getLog();
-        } else {
-            $log = $repository->getLog();
-        }
-
-        if ($this->limit) {
-            if (is_array($log)) {
-                $limitedLog = array_slice($log, 0, $this->limit);
-            } else {
-                $limitedLog = $log->setLimit($this->limit);
-            }
-        } else {
-            $limitedLog = $log;
-        }
-
-        // cache them for look up in byName
-        $builds = array();
-        foreach ($limitedLog as $reference) {
-            if (!empty($this->blockBranch)) {
-                $branchesIncluding = GitonomyCache::getIncludingBranches($reference);
-                foreach ($branchesIncluding as $candidate) {
-                    if ($candidate->getName() == $this->blockBranch) {
-                        // Break out of the function
-                        return $builds;
-                    }
-                }
-            }
-
-            if ($this->getTags) {
-                $builds[] = DNTag::create($reference, $this->project, $this->data);
-            } else {
-                $name = $this->reference ? $this->reference->getName() : '';
-                $builds[] = DNCommit::create($reference, $this->project, $this->data, $name);
-            }
-        }
-
-        return $builds;
-    }
-
-    /**
-     * Find a build in this set by hash.
-     *
-     * @param string $hash
-     * @return DNCommit
-     */
-    public function byName($hash)
-    {
-        if ($this->loaded === false) {
-            $this->items = $this->getReferences();
-            $this->loaded = true;
-        }
-
-        // The item might not be in the list because of the limit, try to find
-        // in an older version and add it to the list.
-        $found = null;
-        foreach ($this->items as $item) {
-            if ($item->SHA() == $hash) {
-                $found = $item;
-                break;
-            }
-        }
-
-        if ($found === null) {
-            $repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
-            $commit = new Gitonomy\Git\Commit($repository, $hash);
-            $found = DNCommit::create($commit, $this->project, $this->data);
-        }
-
-        return $found;
-    }
-
-    public function Count()
-    {
-        $this->getIterator();
-        return parent::Count();
-    }
-
-    /**
-     * Returns an Iterator for this ArrayList.
-     * This function allows you to use ArrayList in foreach loops
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        if ($this->loaded === false) {
-            $this->items = $this->getReferences();
-            $this->loaded = true;
-        }
-        foreach ($this->items as $item) {
-            if (is_array($item)) {
-                $this->items[] = new ArrayData($item);
-            }
-        }
-        return new ArrayIterator($this->items);
-    }
+	/**
+	 * @var string
+	 */
+	protected static $refs_dir = '';
+
+	/**
+	 * @var bool
+	 */
+	protected $loaded = false;
+
+	/**
+	 * @var Reference|null
+	 */
+	protected $reference = null;
+
+	/**
+	 * @var null|string
+	 */
+	protected $blockBranch;
+
+	/**
+	 * @var array
+	 */
+	protected $builds = array();
+
+	/**
+	 * @var int
+	 */
+	protected $limit = 10;
+
+	/**
+	 * @var bool
+	 */
+	protected $getTags = false;
+
+	/**
+	 * @var DNProject
+	 */
+	protected $project;
+
+	/**
+	 * @var DNData
+	 */
+	protected $data;
+
+	/**
+	 * @param $refsDir
+	 */
+	public static function set_refs_dir($refsDir)
+	{
+		self::$refs_dir = $refsDir;
+	}
+
+	/**
+	 * @return string
+	 */
+	public static function get_refs_dir()
+	{
+		return self::$refs_dir;
+	}
+
+	/**
+	 * @param DNProject $project
+	 * @param DNData $data
+	 * @param Reference|null $reference
+	 * @param string|null $blockBranch
+	 * @param bool $getTags
+	 */
+	public function __construct(
+		DNProject $project,
+		DNData $data,
+		Reference $reference = null,
+		$blockBranch = null,
+		$getTags = false
+	) {
+		$this->project = $project;
+		$this->data = $data;
+		$this->reference = $reference;
+		$this->blockBranch = $blockBranch;
+		$this->getTags = $getTags;
+		parent::__construct(array());
+	}
+
+	/**
+	 * @param int $limit
+	 * @return DNReferenceList
+	 */
+	public function setLimit($limit)
+	{
+		$this->limit = $limit;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getReferences()
+	{
+		try {
+			$repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
+		} catch (Exception $e) {
+			return array();
+		}
+
+		if ($this->getTags) {
+			if ($this->reference) {
+				throw new LogicException("Can't have \$reference and \$getTags both set");
+			}
+			$log = $repository->getReferences()->getTags();
+		} elseif ($this->reference) {
+			$log = $this->reference->getLog();
+		} else {
+			$log = $repository->getLog();
+		}
+
+		if ($this->limit) {
+			if (is_array($log)) {
+				$limitedLog = array_slice($log, 0, $this->limit);
+			} else {
+				$limitedLog = $log->setLimit($this->limit);
+			}
+		} else {
+			$limitedLog = $log;
+		}
+
+		// cache them for look up in byName
+		$builds = array();
+		foreach ($limitedLog as $reference) {
+			if (!empty($this->blockBranch)) {
+				$branchesIncluding = GitonomyCache::getIncludingBranches($reference);
+				foreach ($branchesIncluding as $candidate) {
+					if ($candidate->getName() == $this->blockBranch) {
+						// Break out of the function
+						return $builds;
+					}
+				}
+			}
+
+			if ($this->getTags) {
+				$builds[] = DNTag::create($reference, $this->project, $this->data);
+			} else {
+				$name = $this->reference ? $this->reference->getName() : '';
+				$builds[] = DNCommit::create($reference, $this->project, $this->data, $name);
+			}
+		}
+
+		return $builds;
+	}
+
+	/**
+	 * Find a build in this set by hash.
+	 *
+	 * @param string $hash
+	 * @return DNCommit
+	 */
+	public function byName($hash)
+	{
+		if ($this->loaded === false) {
+			$this->items = $this->getReferences();
+			$this->loaded = true;
+		}
+
+		// The item might not be in the list because of the limit, try to find
+		// in an older version and add it to the list.
+		$found = null;
+		foreach ($this->items as $item) {
+			if ($item->SHA() == $hash) {
+				$found = $item;
+				break;
+			}
+		}
+
+		if ($found === null) {
+			$repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
+			$commit = new Gitonomy\Git\Commit($repository, $hash);
+			$found = DNCommit::create($commit, $this->project, $this->data);
+		}
+
+		return $found;
+	}
+
+	public function Count()
+	{
+		$this->getIterator();
+		return parent::Count();
+	}
+
+	/**
+	 * Returns an Iterator for this ArrayList.
+	 * This function allows you to use ArrayList in foreach loops
+	 *
+	 * @return ArrayIterator
+	 */
+	public function getIterator()
+	{
+		if ($this->loaded === false) {
+			$this->items = $this->getReferences();
+			$this->loaded = true;
+		}
+		foreach ($this->items as $item) {
+			if (is_array($item)) {
+				$this->items[] = new ArrayData($item);
+			}
+		}
+		return new ArrayIterator($this->items);
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -105,23 +105,23 @@ 
     {
         try {
             $repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             return array();
         }
 
-        if ($this->getTags) {
-            if ($this->reference) {
+        if($this->getTags) {
+            if($this->reference) {
                 throw new LogicException("Can't have \$reference and \$getTags both set");
             }
             $log = $repository->getReferences()->getTags();
-        } elseif ($this->reference) {
+        } elseif($this->reference) {
             $log = $this->reference->getLog();
         } else {
             $log = $repository->getLog();
         }
 
-        if ($this->limit) {
-            if (is_array($log)) {
+        if($this->limit) {
+            if(is_array($log)) {
                 $limitedLog = array_slice($log, 0, $this->limit);
             } else {
                 $limitedLog = $log->setLimit($this->limit);
@@ -132,18 +132,18 @@ 
 
         // cache them for look up in byName
         $builds = array();
-        foreach ($limitedLog as $reference) {
-            if (!empty($this->blockBranch)) {
+        foreach($limitedLog as $reference) {
+            if(!empty($this->blockBranch)) {
                 $branchesIncluding = GitonomyCache::getIncludingBranches($reference);
-                foreach ($branchesIncluding as $candidate) {
-                    if ($candidate->getName() == $this->blockBranch) {
+                foreach($branchesIncluding as $candidate) {
+                    if($candidate->getName() == $this->blockBranch) {
                         // Break out of the function
                         return $builds;
                     }
                 }
             }
 
-            if ($this->getTags) {
+            if($this->getTags) {
                 $builds[] = DNTag::create($reference, $this->project, $this->data);
             } else {
                 $name = $this->reference ? $this->reference->getName() : '';
@@ -162,7 +162,7 @@ 
      */
     public function byName($hash)
     {
-        if ($this->loaded === false) {
+        if($this->loaded === false) {
             $this->items = $this->getReferences();
             $this->loaded = true;
         }
@@ -170,14 +170,14 @@ 
         // The item might not be in the list because of the limit, try to find
         // in an older version and add it to the list.
         $found = null;
-        foreach ($this->items as $item) {
-            if ($item->SHA() == $hash) {
+        foreach($this->items as $item) {
+            if($item->SHA() == $hash) {
                 $found = $item;
                 break;
             }
         }
 
-        if ($found === null) {
+        if($found === null) {
             $repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
             $commit = new Gitonomy\Git\Commit($repository, $hash);
             $found = DNCommit::create($commit, $this->project, $this->data);
@@ -200,12 +200,12 @@ 
      */
     public function getIterator()
     {
-        if ($this->loaded === false) {
+        if($this->loaded === false) {
             $this->items = $this->getReferences();
             $this->loaded = true;
         }
-        foreach ($this->items as $item) {
-            if (is_array($item)) {
+        foreach($this->items as $item) {
+            if(is_array($item)) {
                 $this->items[] = new ArrayData($item);
             }
         }

Braces +8 added lines, -16 removed lines

@@ -2,8 +2,7 @@ 
 
 use Gitonomy\Git\Reference;
 
-class DNReferenceList extends ArrayList
-{
+class DNReferenceList extends ArrayList {
 
     /**
      * @var string
@@ -53,16 +52,14 @@ 
     /**
      * @param $refsDir
      */
-    public static function set_refs_dir($refsDir)
-    {
+    public static function set_refs_dir($refsDir) {
         self::$refs_dir = $refsDir;
     }
 
     /**
      * @return string
      */
-    public static function get_refs_dir()
-    {
+    public static function get_refs_dir() {
         return self::$refs_dir;
     }
 
@@ -92,8 +89,7 @@ 
      * @param int $limit
      * @return DNReferenceList
      */
-    public function setLimit($limit)
-    {
+    public function setLimit($limit) {
         $this->limit = $limit;
         return $this;
     }
@@ -101,8 +97,7 @@ 
     /**
      * @return array
      */
-    protected function getReferences()
-    {
+    protected function getReferences() {
         try {
             $repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
         } catch (Exception $e) {
@@ -160,8 +155,7 @@ 
      * @param string $hash
      * @return DNCommit
      */
-    public function byName($hash)
-    {
+    public function byName($hash) {
         if ($this->loaded === false) {
             $this->items = $this->getReferences();
             $this->loaded = true;
@@ -186,8 +180,7 @@ 
         return $found;
     }
 
-    public function Count()
-    {
+    public function Count() {
         $this->getIterator();
         return parent::Count();
     }
@@ -198,8 +191,7 @@ 
      *
      * @return ArrayIterator
      */
-    public function getIterator()
-    {
+    public function getIterator() {
         if ($this->loaded === false) {
             $this->items = $this->getReferences();
             $this->loaded = true;