From 9bfeffd06a9e6ebc599ac671401b7e255e863534 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 2 May 2014 11:52:47 +1200
Subject: [PATCH] Path resolution cleanup Backport of #3085 to 3.0

---
 dev/DevelopmentAdmin.php | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/dev/DevelopmentAdmin.php b/dev/DevelopmentAdmin.php
index fc2e7d614..1c745a20c 100644
--- a/dev/DevelopmentAdmin.php
+++ b/dev/DevelopmentAdmin.php
@@ -184,25 +184,16 @@ class DevelopmentAdmin extends Controller {
 	public function generatesecuretoken() {
 		$generator = Injector::inst()->create('RandomGenerator');
 		$token = $generator->randomToken('sha1');
+		$body = <<<TXT
+Generated new token. Please add the following code to your YAML configuration:
 
-		$path = $this->request->getVar('path');
-		if($path) {
-			if(file_exists(BASE_PATH . '/' . $path)) {
-				echo sprintf(
-					"Configuration file '%s' exists, can't merge. Please choose a new file.\n",
-					BASE_PATH . '/' . $path
-				);
-				exit(1);
-			}
-			$yml = "Security:\n  token: $token";
-			Filesystem::makeFolder(dirname(BASE_PATH . '/' . $path));
-			file_put_contents(BASE_PATH . '/' . $path, $yml);
-			echo "Configured token in $path\n";
-		} else {
-			echo "Generated new token. Please add the following code to your YAML configuration:\n\n";
-			echo "Security:\n";
-			echo "  token: $token\n";
-		}
+Security:
+  token: $token
+				
+TXT;
+		$response = new SS_HTTPResponse($body);
+		$response->addHeader('Content-Type', 'text/plain');
+		return $response;
 	}
 
 	public function reset() {