Permalink
Browse files

Fixed whitespace usage

  • Loading branch information...
1 parent 92458d9 commit 0c6ac1960e8ef2ae0d8445f63250fa2c31978a70 @chillu chillu committed Feb 18, 2013
Showing with 21 additions and 20 deletions.
  1. +1 −1 admin/javascript/lang/nl_NL.js
  2. +2 −2 control/Director.php
  3. +9 −9 control/HTTPResponse.php
  4. +3 −3 dev/Debug.php
  5. +1 −1 model/DB.php
  6. +5 −4 security/Security.php
@@ -1,5 +1,5 @@
if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
- if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
+ if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
} else {
ss.i18n.addDictionary('nl_NL', {
'LeftAndMain.CONFIRMUNSAVED': "Weet u zeker dat u deze pagina wilt verlaten?\n\WAARSCHUWING: Uw veranderingen zijn niet opgeslagen.\n\nKies OK om te verlaten, of Cancel om op de huidige pagina te blijven.",
View
@@ -714,8 +714,8 @@ public static function forceSSL($patterns = null) {
$matched = false;
if($patterns) {
- // Calling from the command-line?
- if(!isset($_SERVER['REQUEST_URI'])) return;
+ // Calling from the command-line?
+ if(!isset($_SERVER['REQUEST_URI'])) return;
// protect portions of the site based on the pattern
$relativeURL = self::makeRelative(Director::absoluteURL($_SERVER['REQUEST_URI']));
View
@@ -224,21 +224,21 @@ public function output() {
<meta http-equiv=\"refresh\" content=\"1; url=$url\" />
<script type=\"text/javascript\">setTimeout('window.location.href = \"$url\"', 50);</script>";
} else {
- $line = $file = null;
+ $line = $file = null;
if(!headers_sent($file, $line)) {
header($_SERVER['SERVER_PROTOCOL'] . " $this->statusCode " . $this->getStatusDescription());
foreach($this->headers as $header => $value) {
header("$header: $value", true, $this->statusCode);
}
} else {
- // It's critical that these status codes are sent; we need to report a failure if not.
- if($this->statusCode >= 300) {
- user_error(
- "Couldn't set response type to $this->statusCode because " .
- "of output on line $line of $file",
- E_USER_WARNING
- );
- }
+ // It's critical that these status codes are sent; we need to report a failure if not.
+ if($this->statusCode >= 300) {
+ user_error(
+ "Couldn't set response type to $this->statusCode because " .
+ "of output on line $line of $file",
+ E_USER_WARNING
+ );
+ }
}
// Only show error pages or generic "friendly" errors if the status code signifies
View
@@ -230,7 +230,7 @@ public static function noticeHandler($errno, $errstr, $errfile, $errline, $errco
if(Director::isDev()) {
return self::showError($errno, $errstr, $errfile, $errline, $errcontext, "Notice");
} else {
- return false;
+ return false;
}
}
@@ -278,8 +278,8 @@ public static function warningHandler($errno, $errstr, $errfile, $errline, $errc
if(Director::isDev()) {
return self::showError($errno, $errstr, $errfile, $errline, $errcontext, "Warning");
} else {
- return false;
- }
+ return false;
+ }
}
/**
View
@@ -91,7 +91,7 @@ public static function set_alternative_database_name($name = null) {
$key = md5($key); // Ensure key is correct length for chosen cypher
$ivSize = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CFB);
- $iv = mcrypt_create_iv($ivSize);
+ $iv = mcrypt_create_iv($ivSize);
$encrypted = mcrypt_encrypt(
MCRYPT_RIJNDAEL_256, $key, $name, MCRYPT_MODE_CFB, $iv
);
View
@@ -244,7 +244,7 @@ public static function permissionFailure($controller = null, $messageSet = null)
$controller->redirect(
Config::inst()->get('Security', 'login_url')
- . "?BackURL=" . urlencode($_SERVER['REQUEST_URI'])
+ . "?BackURL=" . urlencode($_SERVER['REQUEST_URI'])
);
}
return;
@@ -941,14 +941,15 @@ public static function ignore_disallowed_actions() {
* Set a custom log-in URL if you have built your own log-in page.
*/
public static function set_login_url($loginUrl) {
- self::$login_url = $loginUrl;
-}
+ self::$login_url = $loginUrl;
+ }
+
/**
* Get the URL of the log-in page.
* Defaults to Security/login but can be re-set with {@link set_login_url()}
*/
public static function login_url() {
- return self::$login_url;
+ return self::$login_url;
}
}

0 comments on commit 0c6ac19

Please sign in to comment.