nextcloud / server

lib/public/Response.php

Indentation +17 added lines, -17 removed lines

@@ -45,22 +45,22 @@
  */
 class Response {
 
-	/**
-	 * Sets the content disposition header (with possible workarounds)
-	 * @param string $filename file name
-	 * @param string $type disposition type, either 'attachment' or 'inline'
-	 * @since 7.0.0
-	 */
-	static public function setContentDispositionHeader( $filename, $type = 'attachment' ) {
-		\OC_Response::setContentDispositionHeader( $filename, $type );
-	}
+    /**
+     * Sets the content disposition header (with possible workarounds)
+     * @param string $filename file name
+     * @param string $type disposition type, either 'attachment' or 'inline'
+     * @since 7.0.0
+     */
+    static public function setContentDispositionHeader( $filename, $type = 'attachment' ) {
+        \OC_Response::setContentDispositionHeader( $filename, $type );
+    }
 
-	/**
-	 * Sets the content length header (with possible workarounds)
-	 * @param string|int|float $length Length to be sent
-	 * @since 8.1.0
-	 */
-	static public function setContentLengthHeader($length) {
-		\OC_Response::setContentLengthHeader($length);
-	}
+    /**
+     * Sets the content length header (with possible workarounds)
+     * @param string|int|float $length Length to be sent
+     * @since 8.1.0
+     */
+    static public function setContentLengthHeader($length) {
+        \OC_Response::setContentLengthHeader($length);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -51,8 +51,8 @@
 	 * @param string $type disposition type, either 'attachment' or 'inline'
 	 * @since 7.0.0
 	 */
-	static public function setContentDispositionHeader( $filename, $type = 'attachment' ) {
-		\OC_Response::setContentDispositionHeader( $filename, $type );
+	static public function setContentDispositionHeader($filename, $type = 'attachment') {
+		\OC_Response::setContentDispositionHeader($filename, $type);
 	}
 
 	/**

apps/files_sharing/public.php

Indentation +11 added lines, -11 removed lines

@@ -28,16 +28,16 @@
 $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
 
 if($token !== '') {
-	$protocol = \OC::$server->getRequest()->getHttpProtocol();
-	if ($protocol == 'HTTP/1.0') {
-		$status = '302 Found';
-	} else {
-		$status = '307 Temporary Redirect';
-	}
-	header($protocol.' ' . $status);
-	header('Location: ' . $urlGenerator->linkToRoute($route, array('token' => $token)));
+    $protocol = \OC::$server->getRequest()->getHttpProtocol();
+    if ($protocol == 'HTTP/1.0') {
+        $status = '302 Found';
+    } else {
+        $status = '307 Temporary Redirect';
+    }
+    header($protocol.' ' . $status);
+    header('Location: ' . $urlGenerator->linkToRoute($route, array('token' => $token)));
 } else {
-	header('HTTP/1.0 404 Not Found');
-	$tmpl = new OCP\Template('', '404', 'guest');
-	print_unescaped($tmpl->fetchPage());
+    header('HTTP/1.0 404 Not Found');
+    $tmpl = new OCP\Template('', '404', 'guest');
+    print_unescaped($tmpl->fetchPage());
 }

Spacing +3 added lines, -3 removed lines

@@ -27,15 +27,15 @@
 $token = isset($_GET['t']) ? $_GET['t'] : '';
 $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
 
-if($token !== '') {
+if ($token !== '') {
 	$protocol = \OC::$server->getRequest()->getHttpProtocol();
 	if ($protocol == 'HTTP/1.0') {
 		$status = '302 Found';
 	} else {
 		$status = '307 Temporary Redirect';
 	}
-	header($protocol.' ' . $status);
-	header('Location: ' . $urlGenerator->linkToRoute($route, array('token' => $token)));
+	header($protocol.' '.$status);
+	header('Location: '.$urlGenerator->linkToRoute($route, array('token' => $token)));
 } else {
 	header('HTTP/1.0 404 Not Found');
 	$tmpl = new OCP\Template('', '404', 'guest');

lib/private/legacy/response.php

Indentation +113 added lines, -113 removed lines

@@ -31,123 +31,123 @@
  */
 
 class OC_Response {
-	const STATUS_FOUND = 302;
-	const STATUS_NOT_MODIFIED = 304;
-	const STATUS_TEMPORARY_REDIRECT = 307;
-	const STATUS_BAD_REQUEST = 400;
-	const STATUS_FORBIDDEN = 403;
-	const STATUS_NOT_FOUND = 404;
-	const STATUS_INTERNAL_SERVER_ERROR = 500;
-	const STATUS_SERVICE_UNAVAILABLE = 503;
+    const STATUS_FOUND = 302;
+    const STATUS_NOT_MODIFIED = 304;
+    const STATUS_TEMPORARY_REDIRECT = 307;
+    const STATUS_BAD_REQUEST = 400;
+    const STATUS_FORBIDDEN = 403;
+    const STATUS_NOT_FOUND = 404;
+    const STATUS_INTERNAL_SERVER_ERROR = 500;
+    const STATUS_SERVICE_UNAVAILABLE = 503;
 
-	/**
-	* Set response status
-	* @param int $status a HTTP status code, see also the STATUS constants
-	*/
-	static public function setStatus($status) {
-		$protocol = \OC::$server->getRequest()->getHttpProtocol();
-		switch($status) {
-			case self::STATUS_NOT_MODIFIED:
-				$status = $status . ' Not Modified';
-				break;
-			case self::STATUS_TEMPORARY_REDIRECT:
-				if ($protocol == 'HTTP/1.0') {
-					$status = self::STATUS_FOUND;
-					// fallthrough
-				} else {
-					$status = $status . ' Temporary Redirect';
-					break;
-				}
-			case self::STATUS_FOUND;
-				$status = $status . ' Found';
-				break;
-			case self::STATUS_NOT_FOUND;
-				$status = $status . ' Not Found';
-				break;
-			case self::STATUS_INTERNAL_SERVER_ERROR;
-				$status = $status . ' Internal Server Error';
-				break;
-			case self::STATUS_SERVICE_UNAVAILABLE;
-				$status = $status . ' Service Unavailable';
-				break;
-		}
-		header($protocol.' '.$status);
-	}
+    /**
+     * Set response status
+     * @param int $status a HTTP status code, see also the STATUS constants
+     */
+    static public function setStatus($status) {
+        $protocol = \OC::$server->getRequest()->getHttpProtocol();
+        switch($status) {
+            case self::STATUS_NOT_MODIFIED:
+                $status = $status . ' Not Modified';
+                break;
+            case self::STATUS_TEMPORARY_REDIRECT:
+                if ($protocol == 'HTTP/1.0') {
+                    $status = self::STATUS_FOUND;
+                    // fallthrough
+                } else {
+                    $status = $status . ' Temporary Redirect';
+                    break;
+                }
+            case self::STATUS_FOUND;
+                $status = $status . ' Found';
+                break;
+            case self::STATUS_NOT_FOUND;
+                $status = $status . ' Not Found';
+                break;
+            case self::STATUS_INTERNAL_SERVER_ERROR;
+                $status = $status . ' Internal Server Error';
+                break;
+            case self::STATUS_SERVICE_UNAVAILABLE;
+                $status = $status . ' Service Unavailable';
+                break;
+        }
+        header($protocol.' '.$status);
+    }
 
-	/**
-	 * Sets the content disposition header (with possible workarounds)
-	 * @param string $filename file name
-	 * @param string $type disposition type, either 'attachment' or 'inline'
-	 */
-	static public function setContentDispositionHeader( $filename, $type = 'attachment' ) {
-		if (\OC::$server->getRequest()->isUserAgent(
-			[
-				\OC\AppFramework\Http\Request::USER_AGENT_IE,
-				\OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
-				\OC\AppFramework\Http\Request::USER_AGENT_FREEBOX,
-			])) {
-			header( 'Content-Disposition: ' . rawurlencode($type) . '; filename="' . rawurlencode( $filename ) . '"' );
-		} else {
-			header( 'Content-Disposition: ' . rawurlencode($type) . '; filename*=UTF-8\'\'' . rawurlencode( $filename )
-												 . '; filename="' . rawurlencode( $filename ) . '"' );
-		}
-	}
+    /**
+     * Sets the content disposition header (with possible workarounds)
+     * @param string $filename file name
+     * @param string $type disposition type, either 'attachment' or 'inline'
+     */
+    static public function setContentDispositionHeader( $filename, $type = 'attachment' ) {
+        if (\OC::$server->getRequest()->isUserAgent(
+            [
+                \OC\AppFramework\Http\Request::USER_AGENT_IE,
+                \OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
+                \OC\AppFramework\Http\Request::USER_AGENT_FREEBOX,
+            ])) {
+            header( 'Content-Disposition: ' . rawurlencode($type) . '; filename="' . rawurlencode( $filename ) . '"' );
+        } else {
+            header( 'Content-Disposition: ' . rawurlencode($type) . '; filename*=UTF-8\'\'' . rawurlencode( $filename )
+                                                    . '; filename="' . rawurlencode( $filename ) . '"' );
+        }
+    }
 
-	/**
-	 * Sets the content length header (with possible workarounds)
-	 * @param string|int|float $length Length to be sent
-	 */
-	static public function setContentLengthHeader($length) {
-		if (PHP_INT_SIZE === 4) {
-			if ($length > PHP_INT_MAX && stripos(PHP_SAPI, 'apache') === 0) {
-				// Apache PHP SAPI casts Content-Length headers to PHP integers.
-				// This enforces a limit of PHP_INT_MAX (2147483647 on 32-bit
-				// platforms). So, if the length is greater than PHP_INT_MAX,
-				// we just do not send a Content-Length header to prevent
-				// bodies from being received incompletely.
-				return;
-			}
-			// Convert signed integer or float to unsigned base-10 string.
-			$lfh = new \OC\LargeFileHelper;
-			$length = $lfh->formatUnsignedInteger($length);
-		}
-		header('Content-Length: '.$length);
-	}
+    /**
+     * Sets the content length header (with possible workarounds)
+     * @param string|int|float $length Length to be sent
+     */
+    static public function setContentLengthHeader($length) {
+        if (PHP_INT_SIZE === 4) {
+            if ($length > PHP_INT_MAX && stripos(PHP_SAPI, 'apache') === 0) {
+                // Apache PHP SAPI casts Content-Length headers to PHP integers.
+                // This enforces a limit of PHP_INT_MAX (2147483647 on 32-bit
+                // platforms). So, if the length is greater than PHP_INT_MAX,
+                // we just do not send a Content-Length header to prevent
+                // bodies from being received incompletely.
+                return;
+            }
+            // Convert signed integer or float to unsigned base-10 string.
+            $lfh = new \OC\LargeFileHelper;
+            $length = $lfh->formatUnsignedInteger($length);
+        }
+        header('Content-Length: '.$length);
+    }
 
-	/**
-	 * This function adds some security related headers to all requests served via base.php
-	 * The implementation of this function has to happen here to ensure that all third-party
-	 * components (e.g. SabreDAV) also benefit from this headers.
-	 */
-	public static function addSecurityHeaders() {
-		/**
-		 * FIXME: Content Security Policy for legacy ownCloud components. This
-		 * can be removed once \OCP\AppFramework\Http\Response from the AppFramework
-		 * is used everywhere.
-		 * @see \OCP\AppFramework\Http\Response::getHeaders
-		 */
-		$policy = 'default-src \'self\'; '
-			. 'script-src \'self\' \'unsafe-eval\' \'nonce-'.\OC::$server->getContentSecurityPolicyNonceManager()->getNonce().'\'; '
-			. 'style-src \'self\' \'unsafe-inline\'; '
-			. 'frame-src *; '
-			. 'img-src * data: blob:; '
-			. 'font-src \'self\' data:; '
-			. 'media-src *; ' 
-			. 'connect-src *; '
-			. 'object-src \'none\'; '
-			. 'base-uri \'self\'; ';
-		header('Content-Security-Policy:' . $policy);
-		header('X-Frame-Options: SAMEORIGIN'); // Disallow iFraming from other domains
+    /**
+     * This function adds some security related headers to all requests served via base.php
+     * The implementation of this function has to happen here to ensure that all third-party
+     * components (e.g. SabreDAV) also benefit from this headers.
+     */
+    public static function addSecurityHeaders() {
+        /**
+         * FIXME: Content Security Policy for legacy ownCloud components. This
+         * can be removed once \OCP\AppFramework\Http\Response from the AppFramework
+         * is used everywhere.
+         * @see \OCP\AppFramework\Http\Response::getHeaders
+         */
+        $policy = 'default-src \'self\'; '
+            . 'script-src \'self\' \'unsafe-eval\' \'nonce-'.\OC::$server->getContentSecurityPolicyNonceManager()->getNonce().'\'; '
+            . 'style-src \'self\' \'unsafe-inline\'; '
+            . 'frame-src *; '
+            . 'img-src * data: blob:; '
+            . 'font-src \'self\' data:; '
+            . 'media-src *; ' 
+            . 'connect-src *; '
+            . 'object-src \'none\'; '
+            . 'base-uri \'self\'; ';
+        header('Content-Security-Policy:' . $policy);
+        header('X-Frame-Options: SAMEORIGIN'); // Disallow iFraming from other domains
 
-		// Send fallback headers for installations that don't have the possibility to send
-		// custom headers on the webserver side
-		if(getenv('modHeadersAvailable') !== 'true') {
-			header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters
-			header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
-			header('X-Robots-Tag: none'); // https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
-			header('X-Download-Options: noopen'); // https://msdn.microsoft.com/en-us/library/jj542450(v=vs.85).aspx
-			header('X-Permitted-Cross-Domain-Policies: none'); // https://www.adobe.com/devnet/adobe-media-server/articles/cross-domain-xml-for-streaming.html
-		}
-	}
+        // Send fallback headers for installations that don't have the possibility to send
+        // custom headers on the webserver side
+        if(getenv('modHeadersAvailable') !== 'true') {
+            header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters
+            header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
+            header('X-Robots-Tag: none'); // https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
+            header('X-Download-Options: noopen'); // https://msdn.microsoft.com/en-us/library/jj542450(v=vs.85).aspx
+            header('X-Permitted-Cross-Domain-Policies: none'); // https://www.adobe.com/devnet/adobe-media-server/articles/cross-domain-xml-for-streaming.html
+        }
+    }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -46,29 +46,29 @@ 
 	*/
 	static public function setStatus($status) {
 		$protocol = \OC::$server->getRequest()->getHttpProtocol();
-		switch($status) {
+		switch ($status) {
 			case self::STATUS_NOT_MODIFIED:
-				$status = $status . ' Not Modified';
+				$status = $status.' Not Modified';
 				break;
 			case self::STATUS_TEMPORARY_REDIRECT:
 				if ($protocol == 'HTTP/1.0') {
 					$status = self::STATUS_FOUND;
 					// fallthrough
 				} else {
-					$status = $status . ' Temporary Redirect';
+					$status = $status.' Temporary Redirect';
 					break;
 				}
 			case self::STATUS_FOUND;
-				$status = $status . ' Found';
+				$status = $status.' Found';
 				break;
 			case self::STATUS_NOT_FOUND;
-				$status = $status . ' Not Found';
+				$status = $status.' Not Found';
 				break;
 			case self::STATUS_INTERNAL_SERVER_ERROR;
-				$status = $status . ' Internal Server Error';
+				$status = $status.' Internal Server Error';
 				break;
 			case self::STATUS_SERVICE_UNAVAILABLE;
-				$status = $status . ' Service Unavailable';
+				$status = $status.' Service Unavailable';
 				break;
 		}
 		header($protocol.' '.$status);
@@ -79,17 +79,17 @@ 
 	 * @param string $filename file name
 	 * @param string $type disposition type, either 'attachment' or 'inline'
 	 */
-	static public function setContentDispositionHeader( $filename, $type = 'attachment' ) {
+	static public function setContentDispositionHeader($filename, $type = 'attachment') {
 		if (\OC::$server->getRequest()->isUserAgent(
 			[
 				\OC\AppFramework\Http\Request::USER_AGENT_IE,
 				\OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
 				\OC\AppFramework\Http\Request::USER_AGENT_FREEBOX,
 			])) {
-			header( 'Content-Disposition: ' . rawurlencode($type) . '; filename="' . rawurlencode( $filename ) . '"' );
+			header('Content-Disposition: '.rawurlencode($type).'; filename="'.rawurlencode($filename).'"');
 		} else {
-			header( 'Content-Disposition: ' . rawurlencode($type) . '; filename*=UTF-8\'\'' . rawurlencode( $filename )
-												 . '; filename="' . rawurlencode( $filename ) . '"' );
+			header('Content-Disposition: '.rawurlencode($type).'; filename*=UTF-8\'\''.rawurlencode($filename)
+												 . '; filename="'.rawurlencode($filename).'"');
 		}
 	}
 
@@ -136,12 +136,12 @@ 
 			. 'connect-src *; '
 			. 'object-src \'none\'; '
 			. 'base-uri \'self\'; ';
-		header('Content-Security-Policy:' . $policy);
+		header('Content-Security-Policy:'.$policy);
 		header('X-Frame-Options: SAMEORIGIN'); // Disallow iFraming from other domains
 
 		// Send fallback headers for installations that don't have the possibility to send
 		// custom headers on the webserver side
-		if(getenv('modHeadersAvailable') !== 'true') {
+		if (getenv('modHeadersAvailable') !== 'true') {
 			header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters
 			header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
 			header('X-Robots-Tag: none'); // https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag