nextcloud / server

lib/private/legacy/template.php

Indentation +353 added lines, -353 removed lines

@@ -44,357 +44,357 @@
  */
 class OC_Template extends \OC\Template\Base {
 
-	/** @var string */
-	private $renderAs; // Create a full page?
-
-	/** @var string */
-	private $path; // The path to the template
-
-	/** @var array */
-	private $headers = array(); //custom headers
-
-	/** @var string */
-	protected $app; // app id
-
-	protected static $initTemplateEngineFirstRun = true;
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $app app providing the template
-	 * @param string $name of the template file (without suffix)
-	 * @param string $renderAs If $renderAs is set, OC_Template will try to
-	 *                         produce a full page in the according layout. For
-	 *                         now, $renderAs can be set to "guest", "user" or
-	 *                         "admin".
-	 * @param bool $registerCall = true
-	 */
-	public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
-		// Read the selected theme from the config file
-		self::initTemplateEngine($renderAs);
-
-		$theme = OC_Util::getTheme();
-
-		$requestToken = (OC::$server->getSession() && $registerCall) ? \OCP\Util::callRegister() : '';
-
-		$parts = explode('/', $app); // fix translation when app is something like core/lostpassword
-		$l10n = \OC::$server->getL10N($parts[0]);
-		$themeDefaults = \OC::$server->getThemingDefaults();
-
-		list($path, $template) = $this->findTemplate($theme, $app, $name);
-
-		// Set the private data
-		$this->renderAs = $renderAs;
-		$this->path = $path;
-		$this->app = $app;
-
-		parent::__construct($template, $requestToken, $l10n, $themeDefaults);
-	}
-
-	/**
-	 * @param string $renderAs
-	 */
-	public static function initTemplateEngine($renderAs) {
-		if (self::$initTemplateEngineFirstRun){
-
-			//apps that started before the template initialization can load their own scripts/styles
-			//so to make sure this scripts/styles here are loaded first we use OC_Util::addScript() with $prepend=true
-			//meaning the last script/style in this list will be loaded first
-			if (\OC::$server->getSystemConfig()->getValue ('installed', false) && $renderAs !== 'error' && !\OCP\Util::needUpgrade()) {
-				if (\OC::$server->getConfig ()->getAppValue ( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax') {
-					OC_Util::addScript ( 'backgroundjobs', null, true );
-				}
-			}
-
-			OC_Util::addStyle("tooltip",null,true);
-			OC_Util::addStyle('jquery-ui-fixes',null,true);
-			OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui',null,true);
-			OC_Util::addStyle("mobile",null,true);
-			OC_Util::addStyle("multiselect",null,true);
-			OC_Util::addStyle("fixes",null,true);
-			OC_Util::addStyle("global",null,true);
-			OC_Util::addStyle("apps",null,true);
-			OC_Util::addStyle("fonts",null,true);
-			OC_Util::addStyle("icons",null,true);
-			OC_Util::addStyle("actions",null,true);
-			OC_Util::addStyle("header",null,true);
-			OC_Util::addStyle("inputs");
-			OC_Util::addStyle("styles",null,true);
-
-			// avatars
-			\OC_Util::addScript('jquery.avatar', null, true);
-			\OC_Util::addScript('placeholder', null, true);
-
-			OC_Util::addVendorScript('select2/select2');
-			OC_Util::addVendorStyle('select2/select2', null, true);
-			OC_Util::addScript('select2-toggleselect');
-
-			OC_Util::addScript('oc-backbone', null, true);
-			OC_Util::addVendorScript('core', 'backbone/backbone', true);
-			OC_Util::addVendorScript('snapjs/dist/latest/snap', null, true);
-			OC_Util::addScript('mimetypelist', null, true);
-			OC_Util::addScript('mimetype', null, true);
-			OC_Util::addScript("apps", null, true);
-			OC_Util::addScript("oc-requesttoken", null, true);
-			OC_Util::addScript('search', 'search', true);
-			OC_Util::addScript("config", null, true);
-			OC_Util::addScript("public/appconfig", null, true);
-			OC_Util::addScript("eventsource", null, true);
-			OC_Util::addScript("octemplate", null, true);
-			OC_Util::addTranslations("core", null, true);
-			OC_Util::addScript("l10n", null, true);
-			OC_Util::addScript("js", null, true);
-			OC_Util::addScript("oc-dialogs", null, true);
-			OC_Util::addScript("jquery.ocdialog", null, true);
-			OC_Util::addScript("jquery-ui-fixes");
-			OC_Util::addStyle("jquery.ocdialog");
-			OC_Util::addScript('files/fileinfo');
-			OC_Util::addScript('files/client');
-
-			// Add the stuff we need always
-			// following logic will import all vendor libraries that are
-			// specified in core/js/core.json
-			$fileContent = file_get_contents(OC::$SERVERROOT . '/core/js/core.json');
-			if($fileContent !== false) {
-				$coreDependencies = json_decode($fileContent, true);
-				foreach(array_reverse($coreDependencies['vendor']) as $vendorLibrary) {
-					// remove trailing ".js" as addVendorScript will append it
-					OC_Util::addVendorScript(
-							substr($vendorLibrary, 0, strlen($vendorLibrary) - 3),null,true);
-				}
-			} else {
-				throw new \Exception('Cannot read core/js/core.json');
-			}
-
-			if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE])) {
-				// polyfill for btoa/atob for IE friends
-				OC_Util::addVendorScript('base64/base64');
-				// shim for the davclient.js library
-				\OCP\Util::addScript('files/iedavclient');
-			}
-
-			self::$initTemplateEngineFirstRun = false;
-		}
-
-	}
-
-
-	/**
-	 * find the template with the given name
-	 * @param string $name of the template file (without suffix)
-	 *
-	 * Will select the template file for the selected theme.
-	 * Checking all the possible locations.
-	 * @param string $theme
-	 * @param string $app
-	 * @return string[]
-	 */
-	protected function findTemplate($theme, $app, $name) {
-		// Check if it is a app template or not.
-		if( $app !== '' ) {
-			$dirs = $this->getAppTemplateDirs($theme, $app, OC::$SERVERROOT, OC_App::getAppPath($app));
-		} else {
-			$dirs = $this->getCoreTemplateDirs($theme, OC::$SERVERROOT);
-		}
-		$locator = new \OC\Template\TemplateFileLocator( $dirs );
-		$template = $locator->find($name);
-		$path = $locator->getPath();
-		return array($path, $template);
-	}
-
-	/**
-	 * Add a custom element to the header
-	 * @param string $tag tag name of the element
-	 * @param array $attributes array of attributes for the element
-	 * @param string $text the text content for the element. If $text is null then the
-	 * element will be written as empty element. So use "" to get a closing tag.
-	 */
-	public function addHeader($tag, $attributes, $text=null) {
-		$this->headers[]= array(
-			'tag' => $tag,
-			'attributes' => $attributes,
-			'text' => $text
-		);
-	}
-
-	/**
-	 * Process the template
-	 * @return boolean|string
-	 *
-	 * This function process the template. If $this->renderAs is set, it
-	 * will produce a full page.
-	 */
-	public function fetchPage($additionalParams = null) {
-		$data = parent::fetchPage($additionalParams);
-
-		if( $this->renderAs ) {
-			$page = new TemplateLayout($this->renderAs, $this->app);
-
-			// Add custom headers
-			$headers = '';
-			foreach(OC_Util::$headers as $header) {
-				$headers .= '<'.\OCP\Util::sanitizeHTML($header['tag']);
-				foreach($header['attributes'] as $name=>$value) {
-					$headers .= ' '.\OCP\Util::sanitizeHTML($name).'="'.\OCP\Util::sanitizeHTML($value).'"';
-				}
-				if ($header['text'] !== null) {
-					$headers .= '>'.\OCP\Util::sanitizeHTML($header['text']).'</'.\OCP\Util::sanitizeHTML($header['tag']).'>';
-				} else {
-					$headers .= '/>';
-				}
-			}
-
-			$page->assign('headers', $headers);
-
-			$page->assign('content', $data);
-			return $page->fetchPage();
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Include template
-	 *
-	 * @param string $file
-	 * @param array|null $additionalParams
-	 * @return string returns content of included template
-	 *
-	 * Includes another template. use <?php echo $this->inc('template'); ?> to
-	 * do this.
-	 */
-	public function inc( $file, $additionalParams = null ) {
-		return $this->load($this->path.$file.'.php', $additionalParams);
-	}
-
-	/**
-	 * Shortcut to print a simple page for users
-	 * @param string $application The application we render the template for
-	 * @param string $name Name of the template
-	 * @param array $parameters Parameters for the template
-	 * @return boolean|null
-	 */
-	public static function printUserPage( $application, $name, $parameters = array() ) {
-		$content = new OC_Template( $application, $name, "user" );
-		foreach( $parameters as $key => $value ) {
-			$content->assign( $key, $value );
-		}
-		print $content->printPage();
-	}
-
-	/**
-	 * Shortcut to print a simple page for admins
-	 * @param string $application The application we render the template for
-	 * @param string $name Name of the template
-	 * @param array $parameters Parameters for the template
-	 * @return bool
-	 */
-	public static function printAdminPage( $application, $name, $parameters = array() ) {
-		$content = new OC_Template( $application, $name, "admin" );
-		foreach( $parameters as $key => $value ) {
-			$content->assign( $key, $value );
-		}
-		return $content->printPage();
-	}
-
-	/**
-	 * Shortcut to print a simple page for guests
-	 * @param string $application The application we render the template for
-	 * @param string $name Name of the template
-	 * @param array|string $parameters Parameters for the template
-	 * @return bool
-	 */
-	public static function printGuestPage( $application, $name, $parameters = array() ) {
-		$content = new OC_Template( $application, $name, "guest" );
-		foreach( $parameters as $key => $value ) {
-			$content->assign( $key, $value );
-		}
-		return $content->printPage();
-	}
-
-	/**
-		* Print a fatal error page and terminates the script
-		* @param string $error_msg The error message to show
-		* @param string $hint An optional hint message - needs to be properly escaped
-		*/
-	public static function printErrorPage( $error_msg, $hint = '' ) {
-		if ($error_msg === $hint) {
-			// If the hint is the same as the message there is no need to display it twice.
-			$hint = '';
-		}
-
-		try {
-			$content = new \OC_Template( '', 'error', 'error', false );
-			$errors = array(array('error' => $error_msg, 'hint' => $hint));
-			$content->assign( 'errors', $errors );
-			$content->printPage();
-		} catch (\Exception $e) {
-			$logger = \OC::$server->getLogger();
-			$logger->error("$error_msg $hint", ['app' => 'core']);
-			$logger->logException($e, ['app' => 'core']);
-
-			header(self::getHttpProtocol() . ' 500 Internal Server Error');
-			header('Content-Type: text/plain; charset=utf-8');
-			print("$error_msg $hint");
-		}
-		die();
-	}
-
-	/**
-	 * print error page using Exception details
-	 * @param Exception | Throwable $exception
-	 */
-	public static function printExceptionErrorPage($exception, $fetchPage = false) {
-		try {
-			$request = \OC::$server->getRequest();
-			$content = new \OC_Template('', 'exception', 'error', false);
-			$content->assign('errorClass', get_class($exception));
-			$content->assign('errorMsg', $exception->getMessage());
-			$content->assign('errorCode', $exception->getCode());
-			$content->assign('file', $exception->getFile());
-			$content->assign('line', $exception->getLine());
-			$content->assign('trace', $exception->getTraceAsString());
-			$content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false));
-			$content->assign('remoteAddr', $request->getRemoteAddress());
-			$content->assign('requestID', $request->getId());
-			if ($fetchPage) {
-				return $content->fetchPage();
-			}
-			$content->printPage();
-		} catch (\Exception $e) {
-			$logger = \OC::$server->getLogger();
-			$logger->logException($exception, ['app' => 'core']);
-			$logger->logException($e, ['app' => 'core']);
-
-			header(self::getHttpProtocol() . ' 500 Internal Server Error');
-			header('Content-Type: text/plain; charset=utf-8');
-			print("Internal Server Error\n\n");
-			print("The server encountered an internal error and was unable to complete your request.\n");
-			print("Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.\n");
-			print("More details can be found in the server log.\n");
-		}
-		die();
-	}
-
-	/**
-	 * This is only here to reduce the dependencies in case of an exception to
-	 * still be able to print a plain error message.
-	 *
-	 * Returns the used HTTP protocol.
-	 *
-	 * @return string HTTP protocol. HTTP/2, HTTP/1.1 or HTTP/1.0.
-	 * @internal Don't use this - use AppFramework\Http\Request->getHttpProtocol instead
-	 */
-	protected static function getHttpProtocol() {
-		$claimedProtocol = strtoupper($_SERVER['SERVER_PROTOCOL']);
-		$validProtocols = [
-			'HTTP/1.0',
-			'HTTP/1.1',
-			'HTTP/2',
-		];
-		if(in_array($claimedProtocol, $validProtocols, true)) {
-			return $claimedProtocol;
-		}
-		return 'HTTP/1.1';
-	}
+    /** @var string */
+    private $renderAs; // Create a full page?
+
+    /** @var string */
+    private $path; // The path to the template
+
+    /** @var array */
+    private $headers = array(); //custom headers
+
+    /** @var string */
+    protected $app; // app id
+
+    protected static $initTemplateEngineFirstRun = true;
+
+    /**
+     * Constructor
+     *
+     * @param string $app app providing the template
+     * @param string $name of the template file (without suffix)
+     * @param string $renderAs If $renderAs is set, OC_Template will try to
+     *                         produce a full page in the according layout. For
+     *                         now, $renderAs can be set to "guest", "user" or
+     *                         "admin".
+     * @param bool $registerCall = true
+     */
+    public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
+        // Read the selected theme from the config file
+        self::initTemplateEngine($renderAs);
+
+        $theme = OC_Util::getTheme();
+
+        $requestToken = (OC::$server->getSession() && $registerCall) ? \OCP\Util::callRegister() : '';
+
+        $parts = explode('/', $app); // fix translation when app is something like core/lostpassword
+        $l10n = \OC::$server->getL10N($parts[0]);
+        $themeDefaults = \OC::$server->getThemingDefaults();
+
+        list($path, $template) = $this->findTemplate($theme, $app, $name);
+
+        // Set the private data
+        $this->renderAs = $renderAs;
+        $this->path = $path;
+        $this->app = $app;
+
+        parent::__construct($template, $requestToken, $l10n, $themeDefaults);
+    }
+
+    /**
+     * @param string $renderAs
+     */
+    public static function initTemplateEngine($renderAs) {
+        if (self::$initTemplateEngineFirstRun){
+
+            //apps that started before the template initialization can load their own scripts/styles
+            //so to make sure this scripts/styles here are loaded first we use OC_Util::addScript() with $prepend=true
+            //meaning the last script/style in this list will be loaded first
+            if (\OC::$server->getSystemConfig()->getValue ('installed', false) && $renderAs !== 'error' && !\OCP\Util::needUpgrade()) {
+                if (\OC::$server->getConfig ()->getAppValue ( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax') {
+                    OC_Util::addScript ( 'backgroundjobs', null, true );
+                }
+            }
+
+            OC_Util::addStyle("tooltip",null,true);
+            OC_Util::addStyle('jquery-ui-fixes',null,true);
+            OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui',null,true);
+            OC_Util::addStyle("mobile",null,true);
+            OC_Util::addStyle("multiselect",null,true);
+            OC_Util::addStyle("fixes",null,true);
+            OC_Util::addStyle("global",null,true);
+            OC_Util::addStyle("apps",null,true);
+            OC_Util::addStyle("fonts",null,true);
+            OC_Util::addStyle("icons",null,true);
+            OC_Util::addStyle("actions",null,true);
+            OC_Util::addStyle("header",null,true);
+            OC_Util::addStyle("inputs");
+            OC_Util::addStyle("styles",null,true);
+
+            // avatars
+            \OC_Util::addScript('jquery.avatar', null, true);
+            \OC_Util::addScript('placeholder', null, true);
+
+            OC_Util::addVendorScript('select2/select2');
+            OC_Util::addVendorStyle('select2/select2', null, true);
+            OC_Util::addScript('select2-toggleselect');
+
+            OC_Util::addScript('oc-backbone', null, true);
+            OC_Util::addVendorScript('core', 'backbone/backbone', true);
+            OC_Util::addVendorScript('snapjs/dist/latest/snap', null, true);
+            OC_Util::addScript('mimetypelist', null, true);
+            OC_Util::addScript('mimetype', null, true);
+            OC_Util::addScript("apps", null, true);
+            OC_Util::addScript("oc-requesttoken", null, true);
+            OC_Util::addScript('search', 'search', true);
+            OC_Util::addScript("config", null, true);
+            OC_Util::addScript("public/appconfig", null, true);
+            OC_Util::addScript("eventsource", null, true);
+            OC_Util::addScript("octemplate", null, true);
+            OC_Util::addTranslations("core", null, true);
+            OC_Util::addScript("l10n", null, true);
+            OC_Util::addScript("js", null, true);
+            OC_Util::addScript("oc-dialogs", null, true);
+            OC_Util::addScript("jquery.ocdialog", null, true);
+            OC_Util::addScript("jquery-ui-fixes");
+            OC_Util::addStyle("jquery.ocdialog");
+            OC_Util::addScript('files/fileinfo');
+            OC_Util::addScript('files/client');
+
+            // Add the stuff we need always
+            // following logic will import all vendor libraries that are
+            // specified in core/js/core.json
+            $fileContent = file_get_contents(OC::$SERVERROOT . '/core/js/core.json');
+            if($fileContent !== false) {
+                $coreDependencies = json_decode($fileContent, true);
+                foreach(array_reverse($coreDependencies['vendor']) as $vendorLibrary) {
+                    // remove trailing ".js" as addVendorScript will append it
+                    OC_Util::addVendorScript(
+                            substr($vendorLibrary, 0, strlen($vendorLibrary) - 3),null,true);
+                }
+            } else {
+                throw new \Exception('Cannot read core/js/core.json');
+            }
+
+            if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE])) {
+                // polyfill for btoa/atob for IE friends
+                OC_Util::addVendorScript('base64/base64');
+                // shim for the davclient.js library
+                \OCP\Util::addScript('files/iedavclient');
+            }
+
+            self::$initTemplateEngineFirstRun = false;
+        }
+
+    }
+
+
+    /**
+     * find the template with the given name
+     * @param string $name of the template file (without suffix)
+     *
+     * Will select the template file for the selected theme.
+     * Checking all the possible locations.
+     * @param string $theme
+     * @param string $app
+     * @return string[]
+     */
+    protected function findTemplate($theme, $app, $name) {
+        // Check if it is a app template or not.
+        if( $app !== '' ) {
+            $dirs = $this->getAppTemplateDirs($theme, $app, OC::$SERVERROOT, OC_App::getAppPath($app));
+        } else {
+            $dirs = $this->getCoreTemplateDirs($theme, OC::$SERVERROOT);
+        }
+        $locator = new \OC\Template\TemplateFileLocator( $dirs );
+        $template = $locator->find($name);
+        $path = $locator->getPath();
+        return array($path, $template);
+    }
+
+    /**
+     * Add a custom element to the header
+     * @param string $tag tag name of the element
+     * @param array $attributes array of attributes for the element
+     * @param string $text the text content for the element. If $text is null then the
+     * element will be written as empty element. So use "" to get a closing tag.
+     */
+    public function addHeader($tag, $attributes, $text=null) {
+        $this->headers[]= array(
+            'tag' => $tag,
+            'attributes' => $attributes,
+            'text' => $text
+        );
+    }
+
+    /**
+     * Process the template
+     * @return boolean|string
+     *
+     * This function process the template. If $this->renderAs is set, it
+     * will produce a full page.
+     */
+    public function fetchPage($additionalParams = null) {
+        $data = parent::fetchPage($additionalParams);
+
+        if( $this->renderAs ) {
+            $page = new TemplateLayout($this->renderAs, $this->app);
+
+            // Add custom headers
+            $headers = '';
+            foreach(OC_Util::$headers as $header) {
+                $headers .= '<'.\OCP\Util::sanitizeHTML($header['tag']);
+                foreach($header['attributes'] as $name=>$value) {
+                    $headers .= ' '.\OCP\Util::sanitizeHTML($name).'="'.\OCP\Util::sanitizeHTML($value).'"';
+                }
+                if ($header['text'] !== null) {
+                    $headers .= '>'.\OCP\Util::sanitizeHTML($header['text']).'</'.\OCP\Util::sanitizeHTML($header['tag']).'>';
+                } else {
+                    $headers .= '/>';
+                }
+            }
+
+            $page->assign('headers', $headers);
+
+            $page->assign('content', $data);
+            return $page->fetchPage();
+        }
+
+        return $data;
+    }
+
+    /**
+     * Include template
+     *
+     * @param string $file
+     * @param array|null $additionalParams
+     * @return string returns content of included template
+     *
+     * Includes another template. use <?php echo $this->inc('template'); ?> to
+     * do this.
+     */
+    public function inc( $file, $additionalParams = null ) {
+        return $this->load($this->path.$file.'.php', $additionalParams);
+    }
+
+    /**
+     * Shortcut to print a simple page for users
+     * @param string $application The application we render the template for
+     * @param string $name Name of the template
+     * @param array $parameters Parameters for the template
+     * @return boolean|null
+     */
+    public static function printUserPage( $application, $name, $parameters = array() ) {
+        $content = new OC_Template( $application, $name, "user" );
+        foreach( $parameters as $key => $value ) {
+            $content->assign( $key, $value );
+        }
+        print $content->printPage();
+    }
+
+    /**
+     * Shortcut to print a simple page for admins
+     * @param string $application The application we render the template for
+     * @param string $name Name of the template
+     * @param array $parameters Parameters for the template
+     * @return bool
+     */
+    public static function printAdminPage( $application, $name, $parameters = array() ) {
+        $content = new OC_Template( $application, $name, "admin" );
+        foreach( $parameters as $key => $value ) {
+            $content->assign( $key, $value );
+        }
+        return $content->printPage();
+    }
+
+    /**
+     * Shortcut to print a simple page for guests
+     * @param string $application The application we render the template for
+     * @param string $name Name of the template
+     * @param array|string $parameters Parameters for the template
+     * @return bool
+     */
+    public static function printGuestPage( $application, $name, $parameters = array() ) {
+        $content = new OC_Template( $application, $name, "guest" );
+        foreach( $parameters as $key => $value ) {
+            $content->assign( $key, $value );
+        }
+        return $content->printPage();
+    }
+
+    /**
+     * Print a fatal error page and terminates the script
+     * @param string $error_msg The error message to show
+     * @param string $hint An optional hint message - needs to be properly escaped
+     */
+    public static function printErrorPage( $error_msg, $hint = '' ) {
+        if ($error_msg === $hint) {
+            // If the hint is the same as the message there is no need to display it twice.
+            $hint = '';
+        }
+
+        try {
+            $content = new \OC_Template( '', 'error', 'error', false );
+            $errors = array(array('error' => $error_msg, 'hint' => $hint));
+            $content->assign( 'errors', $errors );
+            $content->printPage();
+        } catch (\Exception $e) {
+            $logger = \OC::$server->getLogger();
+            $logger->error("$error_msg $hint", ['app' => 'core']);
+            $logger->logException($e, ['app' => 'core']);
+
+            header(self::getHttpProtocol() . ' 500 Internal Server Error');
+            header('Content-Type: text/plain; charset=utf-8');
+            print("$error_msg $hint");
+        }
+        die();
+    }
+
+    /**
+     * print error page using Exception details
+     * @param Exception | Throwable $exception
+     */
+    public static function printExceptionErrorPage($exception, $fetchPage = false) {
+        try {
+            $request = \OC::$server->getRequest();
+            $content = new \OC_Template('', 'exception', 'error', false);
+            $content->assign('errorClass', get_class($exception));
+            $content->assign('errorMsg', $exception->getMessage());
+            $content->assign('errorCode', $exception->getCode());
+            $content->assign('file', $exception->getFile());
+            $content->assign('line', $exception->getLine());
+            $content->assign('trace', $exception->getTraceAsString());
+            $content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false));
+            $content->assign('remoteAddr', $request->getRemoteAddress());
+            $content->assign('requestID', $request->getId());
+            if ($fetchPage) {
+                return $content->fetchPage();
+            }
+            $content->printPage();
+        } catch (\Exception $e) {
+            $logger = \OC::$server->getLogger();
+            $logger->logException($exception, ['app' => 'core']);
+            $logger->logException($e, ['app' => 'core']);
+
+            header(self::getHttpProtocol() . ' 500 Internal Server Error');
+            header('Content-Type: text/plain; charset=utf-8');
+            print("Internal Server Error\n\n");
+            print("The server encountered an internal error and was unable to complete your request.\n");
+            print("Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.\n");
+            print("More details can be found in the server log.\n");
+        }
+        die();
+    }
+
+    /**
+     * This is only here to reduce the dependencies in case of an exception to
+     * still be able to print a plain error message.
+     *
+     * Returns the used HTTP protocol.
+     *
+     * @return string HTTP protocol. HTTP/2, HTTP/1.1 or HTTP/1.0.
+     * @internal Don't use this - use AppFramework\Http\Request->getHttpProtocol instead
+     */
+    protected static function getHttpProtocol() {
+        $claimedProtocol = strtoupper($_SERVER['SERVER_PROTOCOL']);
+        $validProtocols = [
+            'HTTP/1.0',
+            'HTTP/1.1',
+            'HTTP/2',
+        ];
+        if(in_array($claimedProtocol, $validProtocols, true)) {
+            return $claimedProtocol;
+        }
+        return 'HTTP/1.1';
+    }
 }

Spacing +48 added lines, -48 removed lines

@@ -69,7 +69,7 @@ 
 	 *                         "admin".
 	 * @param bool $registerCall = true
 	 */
-	public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
+	public function __construct($app, $name, $renderAs = "", $registerCall = true) {
 		// Read the selected theme from the config file
 		self::initTemplateEngine($renderAs);
 
@@ -95,31 +95,31 @@ 
 	 * @param string $renderAs
 	 */
 	public static function initTemplateEngine($renderAs) {
-		if (self::$initTemplateEngineFirstRun){
+		if (self::$initTemplateEngineFirstRun) {
 
 			//apps that started before the template initialization can load their own scripts/styles
 			//so to make sure this scripts/styles here are loaded first we use OC_Util::addScript() with $prepend=true
 			//meaning the last script/style in this list will be loaded first
-			if (\OC::$server->getSystemConfig()->getValue ('installed', false) && $renderAs !== 'error' && !\OCP\Util::needUpgrade()) {
-				if (\OC::$server->getConfig ()->getAppValue ( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax') {
-					OC_Util::addScript ( 'backgroundjobs', null, true );
+			if (\OC::$server->getSystemConfig()->getValue('installed', false) && $renderAs !== 'error' && !\OCP\Util::needUpgrade()) {
+				if (\OC::$server->getConfig()->getAppValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
+					OC_Util::addScript('backgroundjobs', null, true);
 				}
 			}
 
-			OC_Util::addStyle("tooltip",null,true);
-			OC_Util::addStyle('jquery-ui-fixes',null,true);
-			OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui',null,true);
-			OC_Util::addStyle("mobile",null,true);
-			OC_Util::addStyle("multiselect",null,true);
-			OC_Util::addStyle("fixes",null,true);
-			OC_Util::addStyle("global",null,true);
-			OC_Util::addStyle("apps",null,true);
-			OC_Util::addStyle("fonts",null,true);
-			OC_Util::addStyle("icons",null,true);
-			OC_Util::addStyle("actions",null,true);
-			OC_Util::addStyle("header",null,true);
+			OC_Util::addStyle("tooltip", null, true);
+			OC_Util::addStyle('jquery-ui-fixes', null, true);
+			OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui', null, true);
+			OC_Util::addStyle("mobile", null, true);
+			OC_Util::addStyle("multiselect", null, true);
+			OC_Util::addStyle("fixes", null, true);
+			OC_Util::addStyle("global", null, true);
+			OC_Util::addStyle("apps", null, true);
+			OC_Util::addStyle("fonts", null, true);
+			OC_Util::addStyle("icons", null, true);
+			OC_Util::addStyle("actions", null, true);
+			OC_Util::addStyle("header", null, true);
 			OC_Util::addStyle("inputs");
-			OC_Util::addStyle("styles",null,true);
+			OC_Util::addStyle("styles", null, true);
 
 			// avatars
 			\OC_Util::addScript('jquery.avatar', null, true);
@@ -154,13 +154,13 @@ 
 			// Add the stuff we need always
 			// following logic will import all vendor libraries that are
 			// specified in core/js/core.json
-			$fileContent = file_get_contents(OC::$SERVERROOT . '/core/js/core.json');
-			if($fileContent !== false) {
+			$fileContent = file_get_contents(OC::$SERVERROOT.'/core/js/core.json');
+			if ($fileContent !== false) {
 				$coreDependencies = json_decode($fileContent, true);
-				foreach(array_reverse($coreDependencies['vendor']) as $vendorLibrary) {
+				foreach (array_reverse($coreDependencies['vendor']) as $vendorLibrary) {
 					// remove trailing ".js" as addVendorScript will append it
 					OC_Util::addVendorScript(
-							substr($vendorLibrary, 0, strlen($vendorLibrary) - 3),null,true);
+							substr($vendorLibrary, 0, strlen($vendorLibrary) - 3), null, true);
 				}
 			} else {
 				throw new \Exception('Cannot read core/js/core.json');
@@ -191,12 +191,12 @@ 
 	 */
 	protected function findTemplate($theme, $app, $name) {
 		// Check if it is a app template or not.
-		if( $app !== '' ) {
+		if ($app !== '') {
 			$dirs = $this->getAppTemplateDirs($theme, $app, OC::$SERVERROOT, OC_App::getAppPath($app));
 		} else {
 			$dirs = $this->getCoreTemplateDirs($theme, OC::$SERVERROOT);
 		}
-		$locator = new \OC\Template\TemplateFileLocator( $dirs );
+		$locator = new \OC\Template\TemplateFileLocator($dirs);
 		$template = $locator->find($name);
 		$path = $locator->getPath();
 		return array($path, $template);
@@ -209,8 +209,8 @@ 
 	 * @param string $text the text content for the element. If $text is null then the
 	 * element will be written as empty element. So use "" to get a closing tag.
 	 */
-	public function addHeader($tag, $attributes, $text=null) {
-		$this->headers[]= array(
+	public function addHeader($tag, $attributes, $text = null) {
+		$this->headers[] = array(
 			'tag' => $tag,
 			'attributes' => $attributes,
 			'text' => $text
@@ -227,14 +227,14 @@ 
 	public function fetchPage($additionalParams = null) {
 		$data = parent::fetchPage($additionalParams);
 
-		if( $this->renderAs ) {
+		if ($this->renderAs) {
 			$page = new TemplateLayout($this->renderAs, $this->app);
 
 			// Add custom headers
 			$headers = '';
-			foreach(OC_Util::$headers as $header) {
+			foreach (OC_Util::$headers as $header) {
 				$headers .= '<'.\OCP\Util::sanitizeHTML($header['tag']);
-				foreach($header['attributes'] as $name=>$value) {
+				foreach ($header['attributes'] as $name=>$value) {
 					$headers .= ' '.\OCP\Util::sanitizeHTML($name).'="'.\OCP\Util::sanitizeHTML($value).'"';
 				}
 				if ($header['text'] !== null) {
@@ -263,7 +263,7 @@ 
 	 * Includes another template. use <?php echo $this->inc('template'); ?> to
 	 * do this.
 	 */
-	public function inc( $file, $additionalParams = null ) {
+	public function inc($file, $additionalParams = null) {
 		return $this->load($this->path.$file.'.php', $additionalParams);
 	}
 
@@ -274,10 +274,10 @@ 
 	 * @param array $parameters Parameters for the template
 	 * @return boolean|null
 	 */
-	public static function printUserPage( $application, $name, $parameters = array() ) {
-		$content = new OC_Template( $application, $name, "user" );
-		foreach( $parameters as $key => $value ) {
-			$content->assign( $key, $value );
+	public static function printUserPage($application, $name, $parameters = array()) {
+		$content = new OC_Template($application, $name, "user");
+		foreach ($parameters as $key => $value) {
+			$content->assign($key, $value);
 		}
 		print $content->printPage();
 	}
@@ -289,10 +289,10 @@ 
 	 * @param array $parameters Parameters for the template
 	 * @return bool
 	 */
-	public static function printAdminPage( $application, $name, $parameters = array() ) {
-		$content = new OC_Template( $application, $name, "admin" );
-		foreach( $parameters as $key => $value ) {
-			$content->assign( $key, $value );
+	public static function printAdminPage($application, $name, $parameters = array()) {
+		$content = new OC_Template($application, $name, "admin");
+		foreach ($parameters as $key => $value) {
+			$content->assign($key, $value);
 		}
 		return $content->printPage();
 	}
@@ -304,10 +304,10 @@ 
 	 * @param array|string $parameters Parameters for the template
 	 * @return bool
 	 */
-	public static function printGuestPage( $application, $name, $parameters = array() ) {
-		$content = new OC_Template( $application, $name, "guest" );
-		foreach( $parameters as $key => $value ) {
-			$content->assign( $key, $value );
+	public static function printGuestPage($application, $name, $parameters = array()) {
+		$content = new OC_Template($application, $name, "guest");
+		foreach ($parameters as $key => $value) {
+			$content->assign($key, $value);
 		}
 		return $content->printPage();
 	}
@@ -317,23 +317,23 @@ 
 		* @param string $error_msg The error message to show
 		* @param string $hint An optional hint message - needs to be properly escaped
 		*/
-	public static function printErrorPage( $error_msg, $hint = '' ) {
+	public static function printErrorPage($error_msg, $hint = '') {
 		if ($error_msg === $hint) {
 			// If the hint is the same as the message there is no need to display it twice.
 			$hint = '';
 		}
 
 		try {
-			$content = new \OC_Template( '', 'error', 'error', false );
+			$content = new \OC_Template('', 'error', 'error', false);
 			$errors = array(array('error' => $error_msg, 'hint' => $hint));
-			$content->assign( 'errors', $errors );
+			$content->assign('errors', $errors);
 			$content->printPage();
 		} catch (\Exception $e) {
 			$logger = \OC::$server->getLogger();
 			$logger->error("$error_msg $hint", ['app' => 'core']);
 			$logger->logException($e, ['app' => 'core']);
 
-			header(self::getHttpProtocol() . ' 500 Internal Server Error');
+			header(self::getHttpProtocol().' 500 Internal Server Error');
 			header('Content-Type: text/plain; charset=utf-8');
 			print("$error_msg $hint");
 		}
@@ -366,7 +366,7 @@ 
 			$logger->logException($exception, ['app' => 'core']);
 			$logger->logException($e, ['app' => 'core']);
 
-			header(self::getHttpProtocol() . ' 500 Internal Server Error');
+			header(self::getHttpProtocol().' 500 Internal Server Error');
 			header('Content-Type: text/plain; charset=utf-8');
 			print("Internal Server Error\n\n");
 			print("The server encountered an internal error and was unable to complete your request.\n");
@@ -392,7 +392,7 @@ 
 			'HTTP/1.1',
 			'HTTP/2',
 		];
-		if(in_array($claimedProtocol, $validProtocols, true)) {
+		if (in_array($claimedProtocol, $validProtocols, true)) {
 			return $claimedProtocol;
 		}
 		return 'HTTP/1.1';

core/templates/layout.user.php

Spacing +21 added lines, -21 removed lines

@@ -4,7 +4,7 @@ 
 		<meta charset="utf-8">
 		<title>
 			<?php
-				p(!empty($_['application'])?$_['application'].' - ':'');
+				p(!empty($_['application']) ? $_['application'].' - ' : '');
 				p($theme->getTitle());
 			?>
 		</title>
@@ -14,16 +14,16 @@ 
 		<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:$theme->getTitle()); ?>">
+		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] != 'files') ? $_['application'] : $theme->getTitle()); ?>">
 		<meta name="mobile-web-app-capable" content="yes">
 		<meta name="theme-color" content="<?php p($theme->getMailHeaderColor()); ?>">
 		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
 		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>">
 		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="#0082c9">
-		<?php foreach($_['cssfiles'] as $cssfile): ?>
+		<?php foreach ($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>">
 		<?php endforeach; ?>
-		<?php foreach($_['printcssfiles'] as $cssfile): ?>
+		<?php foreach ($_['printcssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print">
 		<?php endforeach; ?>
 		<?php if (isset($_['inline_ocjs'])): ?>
@@ -31,12 +31,12 @@ 
 				<?php print_unescaped($_['inline_ocjs']); ?>
 			</script>
 		<?php endif; ?>
-		<?php foreach($_['jsfiles'] as $jsfile): ?>
+		<?php foreach ($_['jsfiles'] as $jsfile): ?>
 			<script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
-	<body id="<?php p($_['bodyid']);?>">
+	<body id="<?php p($_['bodyid']); ?>">
 	<?php include('layout.noscript.warning.php'); ?>
 	<div id="notification-container">
 		<div id="notification"></div>
@@ -54,7 +54,7 @@ 
 
 				<a href="#" class="header-appname-container menutoggle" tabindex="2">
 					<h1 class="header-appname">
-						<?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
+						<?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?>
 					</h1>
 					<span class="icon-caret"></span>
 				</a>
@@ -64,7 +64,7 @@ 
 			<div id="header-right">
 				<form class="searchbox" action="#" method="post" role="search" novalidate>
 					<label for="searchbox" class="hidden-visually">
-						<?php p($l->t('Search'));?>
+						<?php p($l->t('Search')); ?>
 					</label>
 					<input id="searchbox" type="search" name="query"
 						value="" required
@@ -76,8 +76,8 @@ 
 						<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
 							<?php if ($_['userAvatarSet']): ?>
 								<img alt="" width="32" height="32"
-								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
-								srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']]));?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']]));?> 4x"
+								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>"
+								srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']])); ?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']])); ?> 4x"
 								>
 							<?php endif; ?>
 						</div>
@@ -86,19 +86,19 @@ 
 					</div>
 					<div id="expanddiv">
 					<ul>
-					<?php foreach($_['settingsnavigation'] as $entry):?>
+					<?php foreach ($_['settingsnavigation'] as $entry):?>
 						<li>
 							<a href="<?php print_unescaped($entry['href']); ?>"
-								<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
-								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
+								<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
+								<img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>">
 								<?php p($entry['name']) ?>
 							</a>
 						</li>
 					<?php endforeach; ?>
 						<li>
 							<a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>>
-								<img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg') . '?v=' . $_['versionHash']); ?>">
-								<?php p($l->t('Log out'));?>
+								<img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg').'?v='.$_['versionHash']); ?>">
+								<?php p($l->t('Log out')); ?>
 							</a>
 						</li>
 					</ul>
@@ -110,13 +110,13 @@ 
 		<nav role="navigation"><div id="navigation">
 			<div id="apps">
 				<ul>
-				<?php foreach($_['navigation'] as $entry): ?>
+				<?php foreach ($_['navigation'] as $entry): ?>
 					<li data-id="<?php p($entry['id']); ?>">
 						<a href="<?php print_unescaped($entry['href']); ?>" tabindex="3"
-							<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
+							<?php if ($entry['active']): ?> class="active"<?php endif; ?>>
 							<svg width="32" height="32" viewBox="0 0 32 32">
 								<defs><filter id="invert"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
-								<image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon"></image>
+								<image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon"></image>
 							</svg>
 							<div class="icon-loading-dark" style="display:none;"></div>
 							<span>
@@ -127,14 +127,14 @@ 
 				<?php endforeach; ?>
 				<?php
 					/* show "More apps" link to app administration directly in app navigation, as last entry */
-					if(OC_User::isAdminUser(OC_User::getUser())):
+					if (OC_User::isAdminUser(OC_User::getUser())):
 				?>
 					<li id="apps-management">
 						<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4"
-							<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
+							<?php if ($_['appsmanagement_active']): ?> class="active"<?php endif; ?>>
 							<svg width="32" height="32" viewBox="0 0 32 32" class="app-icon">
 								<defs><filter id="invert"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
-								<image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>"></image>
+								<image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="<?php print_unescaped(image_path('settings', 'apps.svg').'?v='.$_['versionHash']); ?>"></image>
 							</svg>
 							<div class="icon-loading-dark" style="display:none;"></div>
 							<span>