silverstripe / silverstripe-installer

index.php

Indentation +25 added lines, -25 removed lines

@@ -24,27 +24,27 @@ 
 
 // IIS will populate server variables using one of these two ways
 if ($isIIS) {
-    if ($_SERVER['REQUEST_URI'] == $_SERVER['SCRIPT_NAME']) {
-        $url = "";
-    } elseif ($ruLen > $snLen && substr($_SERVER['REQUEST_URI'], 0, $snLen + 1) == ($_SERVER['SCRIPT_NAME'] . '/')) {
-        $url = substr($_SERVER['REQUEST_URI'], $snLen + 1);
-        $url = strtok($url, '?');
-    } else {
-        $url = $_SERVER['REQUEST_URI'];
-        if ($url[0] == '/') {
-            $url = substr($url, 1);
-        }
-        $url = strtok($url, '?');
-    }
+	if ($_SERVER['REQUEST_URI'] == $_SERVER['SCRIPT_NAME']) {
+		$url = "";
+	} elseif ($ruLen > $snLen && substr($_SERVER['REQUEST_URI'], 0, $snLen + 1) == ($_SERVER['SCRIPT_NAME'] . '/')) {
+		$url = substr($_SERVER['REQUEST_URI'], $snLen + 1);
+		$url = strtok($url, '?');
+	} else {
+		$url = $_SERVER['REQUEST_URI'];
+		if ($url[0] == '/') {
+			$url = substr($url, 1);
+		}
+		$url = strtok($url, '?');
+	}
 
 // Apache will populate the server variables this way
 } else {
-    if ($ruLen > $snLen && substr($_SERVER['REQUEST_URI'], 0, $snLen + 1) == ($_SERVER['SCRIPT_NAME'] . '/')) {
-        $url = substr($_SERVER['REQUEST_URI'], $snLen + 1);
-        $url = strtok($url, '?');
-    } else {
-        $url = "";
-    }
+	if ($ruLen > $snLen && substr($_SERVER['REQUEST_URI'], 0, $snLen + 1) == ($_SERVER['SCRIPT_NAME'] . '/')) {
+		$url = substr($_SERVER['REQUEST_URI'], $snLen + 1);
+		$url = strtok($url, '?');
+	} else {
+		$url = "";
+	}
 }
 
 $_GET['url'] = $_REQUEST['url'] = $url;
@@ -56,13 +56,13 @@ 
  * Very quickly pass through references to files
  */
 if ($url && file_exists($fileName)) {
-    $fileURL = (dirname($_SERVER['SCRIPT_NAME']) == '/' ? '' : dirname($_SERVER['SCRIPT_NAME'])) . '/' . $url;
-    if (isset($_SERVER['QUERY_STRING'])) {
-        $fileURL .= '?' . $_SERVER['QUERY_STRING'];
-    }
-    header($_SERVER['SERVER_PROTOCOL'] . ' 301 Moved Permanently');
-    header("Location: $fileURL");
-    die();
+	$fileURL = (dirname($_SERVER['SCRIPT_NAME']) == '/' ? '' : dirname($_SERVER['SCRIPT_NAME'])) . '/' . $url;
+	if (isset($_SERVER['QUERY_STRING'])) {
+		$fileURL .= '?' . $_SERVER['QUERY_STRING'];
+	}
+	header($_SERVER['SERVER_PROTOCOL'] . ' 301 Moved Permanently');
+	header("Location: $fileURL");
+	die();
 }
 
 require_once 'framework/main.php';

Spacing +8 added lines, -8 removed lines

@@ -26,8 +26,8 @@ 
 if ($isIIS) {
     if ($_SERVER['REQUEST_URI'] == $_SERVER['SCRIPT_NAME']) {
         $url = "";
-    } elseif ($ruLen > $snLen && substr($_SERVER['REQUEST_URI'], 0, $snLen + 1) == ($_SERVER['SCRIPT_NAME'] . '/')) {
-        $url = substr($_SERVER['REQUEST_URI'], $snLen + 1);
+    } elseif ($ruLen > $snLen && substr($_SERVER['REQUEST_URI'], 0, $snLen+1) == ($_SERVER['SCRIPT_NAME'].'/')) {
+        $url = substr($_SERVER['REQUEST_URI'], $snLen+1);
         $url = strtok($url, '?');
     } else {
         $url = $_SERVER['REQUEST_URI'];
@@ -39,8 +39,8 @@ 
 
 // Apache will populate the server variables this way
 } else {
-    if ($ruLen > $snLen && substr($_SERVER['REQUEST_URI'], 0, $snLen + 1) == ($_SERVER['SCRIPT_NAME'] . '/')) {
-        $url = substr($_SERVER['REQUEST_URI'], $snLen + 1);
+    if ($ruLen > $snLen && substr($_SERVER['REQUEST_URI'], 0, $snLen+1) == ($_SERVER['SCRIPT_NAME'].'/')) {
+        $url = substr($_SERVER['REQUEST_URI'], $snLen+1);
         $url = strtok($url, '?');
     } else {
         $url = "";
@@ -49,18 +49,18 @@ 
 
 $_GET['url'] = $_REQUEST['url'] = $url;
 
-$fileName = dirname($_SERVER['SCRIPT_FILENAME']) . '/' . $url;
+$fileName = dirname($_SERVER['SCRIPT_FILENAME']).'/'.$url;
 
 /**
  * This code is a very simple wrapper for sending files
  * Very quickly pass through references to files
  */
 if ($url && file_exists($fileName)) {
-    $fileURL = (dirname($_SERVER['SCRIPT_NAME']) == '/' ? '' : dirname($_SERVER['SCRIPT_NAME'])) . '/' . $url;
+    $fileURL = (dirname($_SERVER['SCRIPT_NAME']) == '/' ? '' : dirname($_SERVER['SCRIPT_NAME'])).'/'.$url;
     if (isset($_SERVER['QUERY_STRING'])) {
-        $fileURL .= '?' . $_SERVER['QUERY_STRING'];
+        $fileURL .= '?'.$_SERVER['QUERY_STRING'];
     }
-    header($_SERVER['SERVER_PROTOCOL'] . ' 301 Moved Permanently');
+    header($_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently');
     header("Location: $fileURL");
     die();
 }

install.php

Indentation +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@
  ************************************************************************************/
 
 if (!file_exists('framework') || !file_exists('framework/_config.php')) {
-    include 'install-frameworkmissing.html';
+	include 'install-frameworkmissing.html';
 } else {
-    include './framework/src/Dev/Install/install.php';
+	include './framework/src/Dev/Install/install.php';
 }

mysite/code/Page_Controller.php

Indentation +23 added lines, -23 removed lines

@@ -2,28 +2,28 @@
 
 class Page_Controller extends ContentController
 {
-    /**
-     * An array of actions that can be accessed via a request. Each array element should be an action name, and the
-     * permissions or conditions required to allow the user to access it.
-     *
-     * <code>
-     * array (
-     *     'action', // anyone can access this action
-     *     'action' => true, // same as above
-     *     'action' => 'ADMIN', // you must have ADMIN permissions to access this action
-     *     'action' => '->checkAction' // you can only access this action if $this->checkAction() returns true
-     * );
-     * </code>
-     *
-     * @var array
-     */
-    private static $allowed_actions = array(
-    );
+	/**
+	 * An array of actions that can be accessed via a request. Each array element should be an action name, and the
+	 * permissions or conditions required to allow the user to access it.
+	 *
+	 * <code>
+	 * array (
+	 *     'action', // anyone can access this action
+	 *     'action' => true, // same as above
+	 *     'action' => 'ADMIN', // you must have ADMIN permissions to access this action
+	 *     'action' => '->checkAction' // you can only access this action if $this->checkAction() returns true
+	 * );
+	 * </code>
+	 *
+	 * @var array
+	 */
+	private static $allowed_actions = array(
+	);
 
-    public function init()
-    {
-        parent::init();
-        // You can include any CSS or JS required by your project here.
-        // See: http://doc.silverstripe.org/framework/en/reference/requirements
-    }
+	public function init()
+	{
+		parent::init();
+		// You can include any CSS or JS required by your project here.
+		// See: http://doc.silverstripe.org/framework/en/reference/requirements
+	}
 }

mysite/code/Page.php

Indentation +4 added lines, -4 removed lines

@@ -4,9 +4,9 @@
 
 class Page extends SiteTree
 {
-    private static $db = array(
-    );
+	private static $db = array(
+	);
 
-    private static $has_one = array(
-    );
+	private static $has_one = array(
+	);
 }