nextcloud / server

lib/private/Template/Base.php

Indentation +156 added lines, -156 removed lines

@@ -31,161 +31,161 @@
 use OCP\Defaults;
 
 class Base {
-	private $template; // The template
-	private $vars; // Vars
-
-	/** @var \OCP\IL10N */
-	private $l10n;
-
-	/** @var Defaults */
-	private $theme;
-
-	/**
-	 * @param string $template
-	 * @param string $requestToken
-	 * @param \OCP\IL10N $l10n
-	 * @param Defaults $theme
-	 */
-	public function __construct($template, $requestToken, $l10n, $theme ) {
-		$this->vars = array();
-		$this->vars['requesttoken'] = $requestToken;
-		$this->l10n = $l10n;
-		$this->template = $template;
-		$this->theme = $theme;
-	}
-
-	/**
-	 * @param string $serverRoot
-	 * @param string|false $app_dir
-	 * @param string $theme
-	 * @param string $app
-	 * @return string[]
-	 */
-	protected function getAppTemplateDirs($theme, $app, $serverRoot, $app_dir) {
-		// Check if the app is in the app folder or in the root
-		if( file_exists($app_dir.'/templates/' )) {
-			return [
-				$serverRoot.'/themes/'.$theme.'/apps/'.$app.'/templates/',
-				$app_dir.'/templates/',
-			];
-		}
-		return [
-			$serverRoot.'/themes/'.$theme.'/'.$app.'/templates/',
-			$serverRoot.'/'.$app.'/templates/',
-		];
-	}
-
-	/**
-	 * @param string $serverRoot
-	 * @param string $theme
-	 * @return string[]
-	 */
-	protected function getCoreTemplateDirs($theme, $serverRoot) {
-		return [
-			$serverRoot.'/themes/'.$theme.'/core/templates/',
-			$serverRoot.'/core/templates/',
-		];
-	}
-
-	/**
-	 * Assign variables
-	 * @param string $key key
-	 * @param array|bool|integer|string $value value
-	 * @return bool
-	 *
-	 * This function assigns a variable. It can be accessed via $_[$key] in
-	 * the template.
-	 *
-	 * If the key existed before, it will be overwritten
-	 */
-	public function assign( $key, $value) {
-		$this->vars[$key] = $value;
-		return true;
-	}
-
-	/**
-	 * Appends a variable
-	 * @param string $key key
-	 * @param mixed $value value
-	 * @return boolean|null
-	 *
-	 * This function assigns a variable in an array context. If the key already
-	 * exists, the value will be appended. It can be accessed via
-	 * $_[$key][$position] in the template.
-	 */
-	public function append( $key, $value ) {
-		if( array_key_exists( $key, $this->vars )) {
-			$this->vars[$key][] = $value;
-		}
-		else{
-			$this->vars[$key] = array( $value );
-		}
-	}
-
-	/**
-	 * Prints the proceeded template
-	 * @return bool
-	 *
-	 * This function proceeds the template and prints its output.
-	 */
-	public function printPage() {
-		$data = $this->fetchPage();
-		if( $data === false ) {
-			return false;
-		}
-		else{
-			print $data;
-			return true;
-		}
-	}
-
-	/**
-	 * Process the template
-	 *
-	 * @param array|null $additionalParams
-	 * @return string This function processes the template.
-	 *
-	 * This function processes the template.
-	 */
-	public function fetchPage($additionalParams = null) {
-		return $this->load($this->template, $additionalParams);
-	}
-
-	/**
-	 * doing the actual work
-	 *
-	 * @param string $file
-	 * @param array|null $additionalParams
-	 * @return string content
-	 *
-	 * Includes the template file, fetches its output
-	 */
-	protected function load($file, $additionalParams = null) {
-		// Register the variables
-		$_ = $this->vars;
-		$l = $this->l10n;
-		$theme = $this->theme;
-
-		if(!is_null($additionalParams)) {
-			$_ = array_merge( $additionalParams, $this->vars );
-			foreach ($_ as $var => $value) {
-				${$var} = $value;
-			}
-		}
-
-		// Include
-		ob_start();
-		try {
-			include $file;
-			$data = ob_get_contents();
-		} catch (\Exception $e) {
-			@ob_end_clean();
-			throw $e;
-		}
-		@ob_end_clean();
-
-		// Return data
-		return $data;
-	}
+    private $template; // The template
+    private $vars; // Vars
+
+    /** @var \OCP\IL10N */
+    private $l10n;
+
+    /** @var Defaults */
+    private $theme;
+
+    /**
+     * @param string $template
+     * @param string $requestToken
+     * @param \OCP\IL10N $l10n
+     * @param Defaults $theme
+     */
+    public function __construct($template, $requestToken, $l10n, $theme ) {
+        $this->vars = array();
+        $this->vars['requesttoken'] = $requestToken;
+        $this->l10n = $l10n;
+        $this->template = $template;
+        $this->theme = $theme;
+    }
+
+    /**
+     * @param string $serverRoot
+     * @param string|false $app_dir
+     * @param string $theme
+     * @param string $app
+     * @return string[]
+     */
+    protected function getAppTemplateDirs($theme, $app, $serverRoot, $app_dir) {
+        // Check if the app is in the app folder or in the root
+        if( file_exists($app_dir.'/templates/' )) {
+            return [
+                $serverRoot.'/themes/'.$theme.'/apps/'.$app.'/templates/',
+                $app_dir.'/templates/',
+            ];
+        }
+        return [
+            $serverRoot.'/themes/'.$theme.'/'.$app.'/templates/',
+            $serverRoot.'/'.$app.'/templates/',
+        ];
+    }
+
+    /**
+     * @param string $serverRoot
+     * @param string $theme
+     * @return string[]
+     */
+    protected function getCoreTemplateDirs($theme, $serverRoot) {
+        return [
+            $serverRoot.'/themes/'.$theme.'/core/templates/',
+            $serverRoot.'/core/templates/',
+        ];
+    }
+
+    /**
+     * Assign variables
+     * @param string $key key
+     * @param array|bool|integer|string $value value
+     * @return bool
+     *
+     * This function assigns a variable. It can be accessed via $_[$key] in
+     * the template.
+     *
+     * If the key existed before, it will be overwritten
+     */
+    public function assign( $key, $value) {
+        $this->vars[$key] = $value;
+        return true;
+    }
+
+    /**
+     * Appends a variable
+     * @param string $key key
+     * @param mixed $value value
+     * @return boolean|null
+     *
+     * This function assigns a variable in an array context. If the key already
+     * exists, the value will be appended. It can be accessed via
+     * $_[$key][$position] in the template.
+     */
+    public function append( $key, $value ) {
+        if( array_key_exists( $key, $this->vars )) {
+            $this->vars[$key][] = $value;
+        }
+        else{
+            $this->vars[$key] = array( $value );
+        }
+    }
+
+    /**
+     * Prints the proceeded template
+     * @return bool
+     *
+     * This function proceeds the template and prints its output.
+     */
+    public function printPage() {
+        $data = $this->fetchPage();
+        if( $data === false ) {
+            return false;
+        }
+        else{
+            print $data;
+            return true;
+        }
+    }
+
+    /**
+     * Process the template
+     *
+     * @param array|null $additionalParams
+     * @return string This function processes the template.
+     *
+     * This function processes the template.
+     */
+    public function fetchPage($additionalParams = null) {
+        return $this->load($this->template, $additionalParams);
+    }
+
+    /**
+     * doing the actual work
+     *
+     * @param string $file
+     * @param array|null $additionalParams
+     * @return string content
+     *
+     * Includes the template file, fetches its output
+     */
+    protected function load($file, $additionalParams = null) {
+        // Register the variables
+        $_ = $this->vars;
+        $l = $this->l10n;
+        $theme = $this->theme;
+
+        if(!is_null($additionalParams)) {
+            $_ = array_merge( $additionalParams, $this->vars );
+            foreach ($_ as $var => $value) {
+                ${$var} = $value;
+            }
+        }
+
+        // Include
+        ob_start();
+        try {
+            include $file;
+            $data = ob_get_contents();
+        } catch (\Exception $e) {
+            @ob_end_clean();
+            throw $e;
+        }
+        @ob_end_clean();
+
+        // Return data
+        return $data;
+    }
 
 }

Spacing +11 added lines, -11 removed lines

@@ -46,7 +46,7 @@ 
 	 * @param \OCP\IL10N $l10n
 	 * @param Defaults $theme
 	 */
-	public function __construct($template, $requestToken, $l10n, $theme ) {
+	public function __construct($template, $requestToken, $l10n, $theme) {
 		$this->vars = array();
 		$this->vars['requesttoken'] = $requestToken;
 		$this->l10n = $l10n;
@@ -63,7 +63,7 @@ 
 	 */
 	protected function getAppTemplateDirs($theme, $app, $serverRoot, $app_dir) {
 		// Check if the app is in the app folder or in the root
-		if( file_exists($app_dir.'/templates/' )) {
+		if (file_exists($app_dir.'/templates/')) {
 			return [
 				$serverRoot.'/themes/'.$theme.'/apps/'.$app.'/templates/',
 				$app_dir.'/templates/',
@@ -98,7 +98,7 @@ 
 	 *
 	 * If the key existed before, it will be overwritten
 	 */
-	public function assign( $key, $value) {
+	public function assign($key, $value) {
 		$this->vars[$key] = $value;
 		return true;
 	}
@@ -113,12 +113,12 @@ 
 	 * exists, the value will be appended. It can be accessed via
 	 * $_[$key][$position] in the template.
 	 */
-	public function append( $key, $value ) {
-		if( array_key_exists( $key, $this->vars )) {
+	public function append($key, $value) {
+		if (array_key_exists($key, $this->vars)) {
 			$this->vars[$key][] = $value;
 		}
-		else{
-			$this->vars[$key] = array( $value );
+		else {
+			$this->vars[$key] = array($value);
 		}
 	}
 
@@ -130,10 +130,10 @@ 
 	 */
 	public function printPage() {
 		$data = $this->fetchPage();
-		if( $data === false ) {
+		if ($data === false) {
 			return false;
 		}
-		else{
+		else {
 			print $data;
 			return true;
 		}
@@ -166,8 +166,8 @@ 
 		$l = $this->l10n;
 		$theme = $this->theme;
 
-		if(!is_null($additionalParams)) {
-			$_ = array_merge( $additionalParams, $this->vars );
+		if (!is_null($additionalParams)) {
+			$_ = array_merge($additionalParams, $this->vars);
 			foreach ($_ as $var => $value) {
 				${$var} = $value;
 			}

lib/public/AppFramework/Http/TemplateResponse.php

Indentation +119 added lines, -119 removed lines

@@ -37,124 +37,124 @@
  */
 class TemplateResponse extends Response {
 
-	/**
-	 * name of the template
-	 * @var string
-	 */
-	protected $templateName;
-
-	/**
-	 * parameters
-	 * @var array
-	 */
-	protected $params;
-
-	/**
-	 * rendering type (admin, user, blank)
-	 * @var string
-	 */
-	protected $renderAs;
-
-	/**
-	 * app name
-	 * @var string
-	 */
-	protected $appName;
-
-	/**
-	 * constructor of TemplateResponse
-	 * @param string $appName the name of the app to load the template from
-	 * @param string $templateName the name of the template
-	 * @param array $params an array of parameters which should be passed to the
-	 * template
-	 * @param string $renderAs how the page should be rendered, defaults to user
-	 * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0
-	 */
-	public function __construct($appName, $templateName, array $params=array(),
-	                            $renderAs='user') {
-		$this->templateName = $templateName;
-		$this->appName = $appName;
-		$this->params = $params;
-		$this->renderAs = $renderAs;
-	}
-
-
-	/**
-	 * Sets template parameters
-	 * @param array $params an array with key => value structure which sets template
-	 *                      variables
-	 * @return TemplateResponse Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function setParams(array $params){
-		$this->params = $params;
-
-		return $this;
-	}
-
-
-	/**
-	 * Used for accessing the set parameters
-	 * @return array the params
-	 * @since 6.0.0
-	 */
-	public function getParams(){
-		return $this->params;
-	}
-
-
-	/**
-	 * Used for accessing the name of the set template
-	 * @return string the name of the used template
-	 * @since 6.0.0
-	 */
-	public function getTemplateName(){
-		return $this->templateName;
-	}
-
-
-	/**
-	 * Sets the template page
-	 * @param string $renderAs admin, user or blank. Admin also prints the admin
-	 *                         settings header and footer, user renders the normal
-	 *                         normal page including footer and header and blank
-	 *                         just renders the plain template
-	 * @return TemplateResponse Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function renderAs($renderAs){
-		$this->renderAs = $renderAs;
-
-		return $this;
-	}
-
-
-	/**
-	 * Returns the set renderAs
-	 * @return string the renderAs value
-	 * @since 6.0.0
-	 */
-	public function getRenderAs(){
-		return $this->renderAs;
-	}
-
-
-	/**
-	 * Returns the rendered html
-	 * @return string the rendered html
-	 * @since 6.0.0
-	 */
-	public function render(){
-		// \OCP\Template needs an empty string instead of 'blank' for an unwrapped response
-		$renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs;
-
-		$template = new \OCP\Template($this->appName, $this->templateName, $renderAs);
-
-		foreach($this->params as $key => $value){
-			$template->assign($key, $value);
-		}
-
-		return $template->fetchPage($this->params);
-	}
+    /**
+     * name of the template
+     * @var string
+     */
+    protected $templateName;
+
+    /**
+     * parameters
+     * @var array
+     */
+    protected $params;
+
+    /**
+     * rendering type (admin, user, blank)
+     * @var string
+     */
+    protected $renderAs;
+
+    /**
+     * app name
+     * @var string
+     */
+    protected $appName;
+
+    /**
+     * constructor of TemplateResponse
+     * @param string $appName the name of the app to load the template from
+     * @param string $templateName the name of the template
+     * @param array $params an array of parameters which should be passed to the
+     * template
+     * @param string $renderAs how the page should be rendered, defaults to user
+     * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0
+     */
+    public function __construct($appName, $templateName, array $params=array(),
+                                $renderAs='user') {
+        $this->templateName = $templateName;
+        $this->appName = $appName;
+        $this->params = $params;
+        $this->renderAs = $renderAs;
+    }
+
+
+    /**
+     * Sets template parameters
+     * @param array $params an array with key => value structure which sets template
+     *                      variables
+     * @return TemplateResponse Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function setParams(array $params){
+        $this->params = $params;
+
+        return $this;
+    }
+
+
+    /**
+     * Used for accessing the set parameters
+     * @return array the params
+     * @since 6.0.0
+     */
+    public function getParams(){
+        return $this->params;
+    }
+
+
+    /**
+     * Used for accessing the name of the set template
+     * @return string the name of the used template
+     * @since 6.0.0
+     */
+    public function getTemplateName(){
+        return $this->templateName;
+    }
+
+
+    /**
+     * Sets the template page
+     * @param string $renderAs admin, user or blank. Admin also prints the admin
+     *                         settings header and footer, user renders the normal
+     *                         normal page including footer and header and blank
+     *                         just renders the plain template
+     * @return TemplateResponse Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function renderAs($renderAs){
+        $this->renderAs = $renderAs;
+
+        return $this;
+    }
+
+
+    /**
+     * Returns the set renderAs
+     * @return string the renderAs value
+     * @since 6.0.0
+     */
+    public function getRenderAs(){
+        return $this->renderAs;
+    }
+
+
+    /**
+     * Returns the rendered html
+     * @return string the rendered html
+     * @since 6.0.0
+     */
+    public function render(){
+        // \OCP\Template needs an empty string instead of 'blank' for an unwrapped response
+        $renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs;
+
+        $template = new \OCP\Template($this->appName, $this->templateName, $renderAs);
+
+        foreach($this->params as $key => $value){
+            $template->assign($key, $value);
+        }
+
+        return $template->fetchPage($this->params);
+    }
 
 }

lib/public/AppFramework/Http/Template/IMenuAction.php

Indentation +25 added lines, -25 removed lines

@@ -31,34 +31,34 @@
  */
 interface IMenuAction {
 
-	/**
-	 * @since 14.0.0
-	 * @return string
-	 */
-	public function getId(): string;
+    /**
+     * @since 14.0.0
+     * @return string
+     */
+    public function getId(): string;
 
-	/**
-	 * @since 14.0.0
-	 * @return string
-	 */
-	public function getLabel(): string;
+    /**
+     * @since 14.0.0
+     * @return string
+     */
+    public function getLabel(): string;
 
-	/**
-	 * @since 14.0.0
-	 * @return string
-	 */
-	public function getLink(): string;
+    /**
+     * @since 14.0.0
+     * @return string
+     */
+    public function getLink(): string;
 
-	/**
-	 * @since 14.0.0
-	 * @return int
-	 */
-	public function getPriority(): int;
+    /**
+     * @since 14.0.0
+     * @return int
+     */
+    public function getPriority(): int;
 
-	/**
-	 * @since 14.0.0
-	 * @return string
-	 */
-	public function render(): string;
+    /**
+     * @since 14.0.0
+     * @return string
+     */
+    public function render(): string;
 
 }
\ No newline at end of file

lib/public/AppFramework/Http/Template/PublicTemplateResponse.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	public function getPrimaryAction(): IMenuAction {
 		$lowest = null;
 		foreach ($this->headerActions as $action) {
-			if($lowest === null || $action->getPriority() < $lowest->getPriority()) {
+			if ($lowest === null || $action->getPriority() < $lowest->getPriority()) {
 				$lowest = $action;
 			}
 		}
@@ -86,7 +86,7 @@ 
 		$list = [];
 		$primary = $this->getPrimaryAction();
 		foreach ($this->headerActions as $action) {
-			if($primary !== $action) {
+			if ($primary !== $action) {
 				$list[] = $action;
 			}
 		}

Indentation +118 added lines, -118 removed lines

@@ -33,123 +33,123 @@
  */
 class PublicTemplateResponse extends TemplateResponse {
 
-	private $headerTitle = '';
-	private $headerDetails = '';
-	private $headerActions = [];
-
-	/**
-	 * PublicTemplateResponse constructor.
-	 *
-	 * @param string $appName
-	 * @param string $templateName
-	 * @param array $params
-	 * @since 14.0.0
-	 */
-	public function __construct(string $appName, string $templateName, array $params = array()) {
-		parent::__construct($appName, $templateName, $params, 'public');
-		\OC_Util::addScript('core', 'public/publicpage');
-	}
-
-	/**
-	 * @param string $title
-	 * @since 14.0.0
-	 */
-	public function setHeaderTitle(string $title) {
-		$this->headerTitle = $title;
-	}
-
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getHeaderTitle(): string {
-		return $this->headerTitle;
-	}
-
-	/**
-	 * @param string $details
-	 * @since 14.0.0
-	 */
-	public function setHeaderDetails(string $details) {
-		$this->headerDetails = $details;
-	}
-
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getHeaderDetails(): string {
-		return $this->headerDetails;
-	}
-
-	/**
-	 * @param array $actions
-	 * @since 14.0.0
-	 */
-	public function setHeaderActions(array $actions) {
-		foreach ($actions as $action) {
-			if ($actions instanceof IMenuAction) {
-				throw new \InvalidArgumentException('Actions must be of type IMenuAction');
-			}
-			$this->headerActions[] = $action;
-		}
-	}
-
-	/**
-	 * @param IMenuAction $action
-	 * @since 14.0.0
-	 */
-	public function addAction(IMenuAction $action) {
-		$this->headerActions[] = $action;
-	}
-
-	/**
-	 * @return IMenuAction
-	 * @since 14.0.0
-	 */
-	public function getPrimaryAction(): IMenuAction {
-		$lowest = null;
-		foreach ($this->headerActions as $action) {
-			if($lowest === null || $action->getPriority() < $lowest->getPriority()) {
-				$lowest = $action;
-			}
-		}
-		return $lowest;
-	}
-
-	/**
-	 * @return int
-	 * @since 14.0.0
-	 */
-	public function getActionCount(): int {
-		return count($this->headerActions);
-	}
-
-	/**
-	 * @return IMenuAction[]
-	 * @since 14.0.0
-	 */
-	public function getOtherActions(): array {
-		$list = [];
-		$primary = $this->getPrimaryAction();
-		foreach ($this->headerActions as $action) {
-			if($primary !== $action) {
-				$list[] = $action;
-			}
-		}
-		return $list;
-	}
-
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function render() {
-		$params = array_merge($this->getParams(), [
-			'template' => $this,
-		]);
-		$this->setParams($params);
-		return  parent::render();
-	}
+    private $headerTitle = '';
+    private $headerDetails = '';
+    private $headerActions = [];
+
+    /**
+     * PublicTemplateResponse constructor.
+     *
+     * @param string $appName
+     * @param string $templateName
+     * @param array $params
+     * @since 14.0.0
+     */
+    public function __construct(string $appName, string $templateName, array $params = array()) {
+        parent::__construct($appName, $templateName, $params, 'public');
+        \OC_Util::addScript('core', 'public/publicpage');
+    }
+
+    /**
+     * @param string $title
+     * @since 14.0.0
+     */
+    public function setHeaderTitle(string $title) {
+        $this->headerTitle = $title;
+    }
+
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function getHeaderTitle(): string {
+        return $this->headerTitle;
+    }
+
+    /**
+     * @param string $details
+     * @since 14.0.0
+     */
+    public function setHeaderDetails(string $details) {
+        $this->headerDetails = $details;
+    }
+
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function getHeaderDetails(): string {
+        return $this->headerDetails;
+    }
+
+    /**
+     * @param array $actions
+     * @since 14.0.0
+     */
+    public function setHeaderActions(array $actions) {
+        foreach ($actions as $action) {
+            if ($actions instanceof IMenuAction) {
+                throw new \InvalidArgumentException('Actions must be of type IMenuAction');
+            }
+            $this->headerActions[] = $action;
+        }
+    }
+
+    /**
+     * @param IMenuAction $action
+     * @since 14.0.0
+     */
+    public function addAction(IMenuAction $action) {
+        $this->headerActions[] = $action;
+    }
+
+    /**
+     * @return IMenuAction
+     * @since 14.0.0
+     */
+    public function getPrimaryAction(): IMenuAction {
+        $lowest = null;
+        foreach ($this->headerActions as $action) {
+            if($lowest === null || $action->getPriority() < $lowest->getPriority()) {
+                $lowest = $action;
+            }
+        }
+        return $lowest;
+    }
+
+    /**
+     * @return int
+     * @since 14.0.0
+     */
+    public function getActionCount(): int {
+        return count($this->headerActions);
+    }
+
+    /**
+     * @return IMenuAction[]
+     * @since 14.0.0
+     */
+    public function getOtherActions(): array {
+        $list = [];
+        $primary = $this->getPrimaryAction();
+        foreach ($this->headerActions as $action) {
+            if($primary !== $action) {
+                $list[] = $action;
+            }
+        }
+        return $list;
+    }
+
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function render() {
+        $params = array_merge($this->getParams(), [
+            'template' => $this,
+        ]);
+        $this->setParams($params);
+        return  parent::render();
+    }
 
 }
\ No newline at end of file

apps/files_sharing/templates/public.php

Braces +10 added lines, -4 removed lines

@@ -34,17 +34,23 @@
 		<div id="preview">
 			<?php if (isset($_['folder'])): ?>
 				<?php print_unescaped($_['folder']); ?>
-			<?php else: ?>
+			<?php else {
+    : ?>
 				<?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'audio'): ?>
 					<div id="imgframe">
-						<audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px">
+						<audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']);
+}
+?>px; max-height: <?php p($_['previewMaxY']); ?>px">
 							<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
 						</audio>
 					</div>
-				<?php else: ?>
+				<?php else {
+    : ?>
 					<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
 					<div id="imgframe"></div>
-				<?php endif; ?>
+				<?php endif;
+}
+?>
 				<?php if ($_['previewURL'] === $_['downloadURL']): ?>
 					<div class="directDownload">
 						<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">

apps/files_sharing/lib/Template/ExternalShareMenuAction.php

Spacing +9 added lines, -9 removed lines

@@ -40,15 +40,15 @@
 	}
 
 	public function render(): string {
-		return '<li>' .
-			'<a id="save" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' .
-			'<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
-			'<span id="save-button">' . Util::sanitizeHTML($this->getLabel()) . '</span>' .
-			'<form class="save-form hidden" action="#">' .
-			'<input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' .
-			'<button id="save-button-confirm" class="icon-confirm svg" disabled=""></button>' .
-			'</form>' .
-			'</a>' .
+		return '<li>'.
+			'<a id="save" data-protected="false" data-owner-display-name="'.Util::sanitizeHTML($this->displayname).'" data-owner="'.Util::sanitizeHTML($this->owner).'" data-name="'.Util::sanitizeHTML($this->shareName).'">'.
+			'<span class="icon '.Util::sanitizeHTML($this->getIcon()).'"></span>'.
+			'<span id="save-button">'.Util::sanitizeHTML($this->getLabel()).'</span>'.
+			'<form class="save-form hidden" action="#">'.
+			'<input type="text" id="remote_address" placeholder="user@yourNextcloud.org">'.
+			'<button id="save-button-confirm" class="icon-confirm svg" disabled=""></button>'.
+			'</form>'.
+			'</a>'.
 			'</li>';
 	}
 }
\ No newline at end of file

Indentation +33 added lines, -33 removed lines

@@ -28,41 +28,41 @@
 
 class ExternalShareMenuAction extends SimpleMenuAction {
 
-	/** @var string */
-	private $owner;
+    /** @var string */
+    private $owner;
 
-	/** @var string */
-	private $displayname;
+    /** @var string */
+    private $displayname;
 
-	/** @var string */
-	private $shareName;
+    /** @var string */
+    private $shareName;
 
-	/**
-	 * ExternalShareMenuAction constructor.
-	 *
-	 * @param string $label
-	 * @param string $icon
-	 * @param string $owner
-	 * @param string $displayname
-	 * @param string $shareName
-	 */
-	public function __construct(string $label, string $icon, string $owner, string $displayname, string $shareName) {
-		parent::__construct('save', $label, $icon);
-		$this->owner = $owner;
-		$this->displayname = $displayname;
-		$this->shareName = $shareName;
-	}
+    /**
+     * ExternalShareMenuAction constructor.
+     *
+     * @param string $label
+     * @param string $icon
+     * @param string $owner
+     * @param string $displayname
+     * @param string $shareName
+     */
+    public function __construct(string $label, string $icon, string $owner, string $displayname, string $shareName) {
+        parent::__construct('save', $label, $icon);
+        $this->owner = $owner;
+        $this->displayname = $displayname;
+        $this->shareName = $shareName;
+    }
 
-	public function render(): string {
-		return '<li>' .
-			'<a id="save" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' .
-			'<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
-			'<span id="save-button">' . Util::sanitizeHTML($this->getLabel()) . '</span>' .
-			'<form class="save-form hidden" action="#">' .
-			'<input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' .
-			'<button id="save-button-confirm" class="icon-confirm svg" disabled=""></button>' .
-			'</form>' .
-			'</a>' .
-			'</li>';
-	}
+    public function render(): string {
+        return '<li>' .
+            '<a id="save" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' .
+            '<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
+            '<span id="save-button">' . Util::sanitizeHTML($this->getLabel()) . '</span>' .
+            '<form class="save-form hidden" action="#">' .
+            '<input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' .
+            '<button id="save-button-confirm" class="icon-confirm svg" disabled=""></button>' .
+            '</form>' .
+            '</a>' .
+            '</li>';
+    }
 }
\ No newline at end of file

apps/files_sharing/composer/composer/autoload_static.php

Spacing +57 added lines, -57 removed lines

@@ -6,76 +6,76 @@
 
 class ComposerStaticInitFiles_Sharing
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Files_Sharing\\' => 18,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Files_Sharing\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\Files_Sharing\\Activity\\Filter' => __DIR__ . '/..' . '/../lib/Activity/Filter.php',
-        'OCA\\Files_Sharing\\Activity\\Providers\\Base' => __DIR__ . '/..' . '/../lib/Activity/Providers/Base.php',
-        'OCA\\Files_Sharing\\Activity\\Providers\\Downloads' => __DIR__ . '/..' . '/../lib/Activity/Providers/Downloads.php',
-        'OCA\\Files_Sharing\\Activity\\Providers\\Groups' => __DIR__ . '/..' . '/../lib/Activity/Providers/Groups.php',
-        'OCA\\Files_Sharing\\Activity\\Providers\\PublicLinks' => __DIR__ . '/..' . '/../lib/Activity/Providers/PublicLinks.php',
-        'OCA\\Files_Sharing\\Activity\\Providers\\RemoteShares' => __DIR__ . '/..' . '/../lib/Activity/Providers/RemoteShares.php',
-        'OCA\\Files_Sharing\\Activity\\Providers\\Users' => __DIR__ . '/..' . '/../lib/Activity/Providers/Users.php',
-        'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinks' => __DIR__ . '/..' . '/../lib/Activity/Settings/PublicLinks.php',
-        'OCA\\Files_Sharing\\Activity\\Settings\\RemoteShare' => __DIR__ . '/..' . '/../lib/Activity/Settings/RemoteShare.php',
-        'OCA\\Files_Sharing\\Activity\\Settings\\Shared' => __DIR__ . '/..' . '/../lib/Activity/Settings/Shared.php',
-        'OCA\\Files_Sharing\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Files_Sharing\\Cache' => __DIR__ . '/..' . '/../lib/Cache.php',
-        'OCA\\Files_Sharing\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
-        'OCA\\Files_Sharing\\Collaboration\\ShareRecipientSorter' => __DIR__ . '/..' . '/../lib/Collaboration/ShareRecipientSorter.php',
-        'OCA\\Files_Sharing\\Command\\CleanupRemoteStorages' => __DIR__ . '/..' . '/../lib/Command/CleanupRemoteStorages.php',
-        'OCA\\Files_Sharing\\Controller\\ExternalSharesController' => __DIR__ . '/..' . '/../lib/Controller/ExternalSharesController.php',
-        'OCA\\Files_Sharing\\Controller\\PublicPreviewController' => __DIR__ . '/..' . '/../lib/Controller/PublicPreviewController.php',
-        'OCA\\Files_Sharing\\Controller\\RemoteController' => __DIR__ . '/..' . '/../lib/Controller/RemoteController.php',
-        'OCA\\Files_Sharing\\Controller\\ShareAPIController' => __DIR__ . '/..' . '/../lib/Controller/ShareAPIController.php',
-        'OCA\\Files_Sharing\\Controller\\ShareController' => __DIR__ . '/..' . '/../lib/Controller/ShareController.php',
-        'OCA\\Files_Sharing\\Controller\\ShareInfoController' => __DIR__ . '/..' . '/../lib/Controller/ShareInfoController.php',
-        'OCA\\Files_Sharing\\Controller\\ShareesAPIController' => __DIR__ . '/..' . '/../lib/Controller/ShareesAPIController.php',
-        'OCA\\Files_Sharing\\DeleteOrphanedSharesJob' => __DIR__ . '/..' . '/../lib/DeleteOrphanedSharesJob.php',
-        'OCA\\Files_Sharing\\Exceptions\\BrokenPath' => __DIR__ . '/..' . '/../lib/Exceptions/BrokenPath.php',
-        'OCA\\Files_Sharing\\Exceptions\\S2SException' => __DIR__ . '/..' . '/../lib/Exceptions/S2SException.php',
-        'OCA\\Files_Sharing\\ExpireSharesJob' => __DIR__ . '/..' . '/../lib/ExpireSharesJob.php',
-        'OCA\\Files_Sharing\\External\\Cache' => __DIR__ . '/..' . '/../lib/External/Cache.php',
-        'OCA\\Files_Sharing\\External\\Manager' => __DIR__ . '/..' . '/../lib/External/Manager.php',
-        'OCA\\Files_Sharing\\External\\Mount' => __DIR__ . '/..' . '/../lib/External/Mount.php',
-        'OCA\\Files_Sharing\\External\\MountProvider' => __DIR__ . '/..' . '/../lib/External/MountProvider.php',
-        'OCA\\Files_Sharing\\External\\Scanner' => __DIR__ . '/..' . '/../lib/External/Scanner.php',
-        'OCA\\Files_Sharing\\External\\Storage' => __DIR__ . '/..' . '/../lib/External/Storage.php',
-        'OCA\\Files_Sharing\\External\\Watcher' => __DIR__ . '/..' . '/../lib/External/Watcher.php',
-        'OCA\\Files_Sharing\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
-        'OCA\\Files_Sharing\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
-        'OCA\\Files_Sharing\\ISharedStorage' => __DIR__ . '/..' . '/../lib/ISharedStorage.php',
-        'OCA\\Files_Sharing\\Middleware\\OCSShareAPIMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/OCSShareAPIMiddleware.php',
-        'OCA\\Files_Sharing\\Middleware\\ShareInfoMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/ShareInfoMiddleware.php',
-        'OCA\\Files_Sharing\\Middleware\\SharingCheckMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/SharingCheckMiddleware.php',
-        'OCA\\Files_Sharing\\Migration\\OwncloudGuestShareType' => __DIR__ . '/..' . '/../lib/Migration/OwncloudGuestShareType.php',
-        'OCA\\Files_Sharing\\Migration\\SetPasswordColumn' => __DIR__ . '/..' . '/../lib/Migration/SetPasswordColumn.php',
-        'OCA\\Files_Sharing\\MountProvider' => __DIR__ . '/..' . '/../lib/MountProvider.php',
-        'OCA\\Files_Sharing\\Scanner' => __DIR__ . '/..' . '/../lib/Scanner.php',
-        'OCA\\Files_Sharing\\ShareBackend\\File' => __DIR__ . '/..' . '/../lib/ShareBackend/File.php',
-        'OCA\\Files_Sharing\\ShareBackend\\Folder' => __DIR__ . '/..' . '/../lib/ShareBackend/Folder.php',
-        'OCA\\Files_Sharing\\SharedMount' => __DIR__ . '/..' . '/../lib/SharedMount.php',
-        'OCA\\Files_Sharing\\SharedStorage' => __DIR__ . '/..' . '/../lib/SharedStorage.php',
-        'OCA\\Files_Sharing\\Template\\ExternalShareMenuAction' => __DIR__ . '/..' . '/../lib/Template/ExternalShareMenuAction.php',
-        'OCA\\Files_Sharing\\Template\\LinkMenuAction' => __DIR__ . '/..' . '/../lib/Template/LinkMenuAction.php',
-        'OCA\\Files_Sharing\\Updater' => __DIR__ . '/..' . '/../lib/Updater.php',
+    public static $classMap = array(
+        'OCA\\Files_Sharing\\Activity\\Filter' => __DIR__.'/..'.'/../lib/Activity/Filter.php',
+        'OCA\\Files_Sharing\\Activity\\Providers\\Base' => __DIR__.'/..'.'/../lib/Activity/Providers/Base.php',
+        'OCA\\Files_Sharing\\Activity\\Providers\\Downloads' => __DIR__.'/..'.'/../lib/Activity/Providers/Downloads.php',
+        'OCA\\Files_Sharing\\Activity\\Providers\\Groups' => __DIR__.'/..'.'/../lib/Activity/Providers/Groups.php',
+        'OCA\\Files_Sharing\\Activity\\Providers\\PublicLinks' => __DIR__.'/..'.'/../lib/Activity/Providers/PublicLinks.php',
+        'OCA\\Files_Sharing\\Activity\\Providers\\RemoteShares' => __DIR__.'/..'.'/../lib/Activity/Providers/RemoteShares.php',
+        'OCA\\Files_Sharing\\Activity\\Providers\\Users' => __DIR__.'/..'.'/../lib/Activity/Providers/Users.php',
+        'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinks' => __DIR__.'/..'.'/../lib/Activity/Settings/PublicLinks.php',
+        'OCA\\Files_Sharing\\Activity\\Settings\\RemoteShare' => __DIR__.'/..'.'/../lib/Activity/Settings/RemoteShare.php',
+        'OCA\\Files_Sharing\\Activity\\Settings\\Shared' => __DIR__.'/..'.'/../lib/Activity/Settings/Shared.php',
+        'OCA\\Files_Sharing\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Files_Sharing\\Cache' => __DIR__.'/..'.'/../lib/Cache.php',
+        'OCA\\Files_Sharing\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
+        'OCA\\Files_Sharing\\Collaboration\\ShareRecipientSorter' => __DIR__.'/..'.'/../lib/Collaboration/ShareRecipientSorter.php',
+        'OCA\\Files_Sharing\\Command\\CleanupRemoteStorages' => __DIR__.'/..'.'/../lib/Command/CleanupRemoteStorages.php',
+        'OCA\\Files_Sharing\\Controller\\ExternalSharesController' => __DIR__.'/..'.'/../lib/Controller/ExternalSharesController.php',
+        'OCA\\Files_Sharing\\Controller\\PublicPreviewController' => __DIR__.'/..'.'/../lib/Controller/PublicPreviewController.php',
+        'OCA\\Files_Sharing\\Controller\\RemoteController' => __DIR__.'/..'.'/../lib/Controller/RemoteController.php',
+        'OCA\\Files_Sharing\\Controller\\ShareAPIController' => __DIR__.'/..'.'/../lib/Controller/ShareAPIController.php',
+        'OCA\\Files_Sharing\\Controller\\ShareController' => __DIR__.'/..'.'/../lib/Controller/ShareController.php',
+        'OCA\\Files_Sharing\\Controller\\ShareInfoController' => __DIR__.'/..'.'/../lib/Controller/ShareInfoController.php',
+        'OCA\\Files_Sharing\\Controller\\ShareesAPIController' => __DIR__.'/..'.'/../lib/Controller/ShareesAPIController.php',
+        'OCA\\Files_Sharing\\DeleteOrphanedSharesJob' => __DIR__.'/..'.'/../lib/DeleteOrphanedSharesJob.php',
+        'OCA\\Files_Sharing\\Exceptions\\BrokenPath' => __DIR__.'/..'.'/../lib/Exceptions/BrokenPath.php',
+        'OCA\\Files_Sharing\\Exceptions\\S2SException' => __DIR__.'/..'.'/../lib/Exceptions/S2SException.php',
+        'OCA\\Files_Sharing\\ExpireSharesJob' => __DIR__.'/..'.'/../lib/ExpireSharesJob.php',
+        'OCA\\Files_Sharing\\External\\Cache' => __DIR__.'/..'.'/../lib/External/Cache.php',
+        'OCA\\Files_Sharing\\External\\Manager' => __DIR__.'/..'.'/../lib/External/Manager.php',
+        'OCA\\Files_Sharing\\External\\Mount' => __DIR__.'/..'.'/../lib/External/Mount.php',
+        'OCA\\Files_Sharing\\External\\MountProvider' => __DIR__.'/..'.'/../lib/External/MountProvider.php',
+        'OCA\\Files_Sharing\\External\\Scanner' => __DIR__.'/..'.'/../lib/External/Scanner.php',
+        'OCA\\Files_Sharing\\External\\Storage' => __DIR__.'/..'.'/../lib/External/Storage.php',
+        'OCA\\Files_Sharing\\External\\Watcher' => __DIR__.'/..'.'/../lib/External/Watcher.php',
+        'OCA\\Files_Sharing\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
+        'OCA\\Files_Sharing\\Hooks' => __DIR__.'/..'.'/../lib/Hooks.php',
+        'OCA\\Files_Sharing\\ISharedStorage' => __DIR__.'/..'.'/../lib/ISharedStorage.php',
+        'OCA\\Files_Sharing\\Middleware\\OCSShareAPIMiddleware' => __DIR__.'/..'.'/../lib/Middleware/OCSShareAPIMiddleware.php',
+        'OCA\\Files_Sharing\\Middleware\\ShareInfoMiddleware' => __DIR__.'/..'.'/../lib/Middleware/ShareInfoMiddleware.php',
+        'OCA\\Files_Sharing\\Middleware\\SharingCheckMiddleware' => __DIR__.'/..'.'/../lib/Middleware/SharingCheckMiddleware.php',
+        'OCA\\Files_Sharing\\Migration\\OwncloudGuestShareType' => __DIR__.'/..'.'/../lib/Migration/OwncloudGuestShareType.php',
+        'OCA\\Files_Sharing\\Migration\\SetPasswordColumn' => __DIR__.'/..'.'/../lib/Migration/SetPasswordColumn.php',
+        'OCA\\Files_Sharing\\MountProvider' => __DIR__.'/..'.'/../lib/MountProvider.php',
+        'OCA\\Files_Sharing\\Scanner' => __DIR__.'/..'.'/../lib/Scanner.php',
+        'OCA\\Files_Sharing\\ShareBackend\\File' => __DIR__.'/..'.'/../lib/ShareBackend/File.php',
+        'OCA\\Files_Sharing\\ShareBackend\\Folder' => __DIR__.'/..'.'/../lib/ShareBackend/Folder.php',
+        'OCA\\Files_Sharing\\SharedMount' => __DIR__.'/..'.'/../lib/SharedMount.php',
+        'OCA\\Files_Sharing\\SharedStorage' => __DIR__.'/..'.'/../lib/SharedStorage.php',
+        'OCA\\Files_Sharing\\Template\\ExternalShareMenuAction' => __DIR__.'/..'.'/../lib/Template/ExternalShareMenuAction.php',
+        'OCA\\Files_Sharing\\Template\\LinkMenuAction' => __DIR__.'/..'.'/../lib/Template/LinkMenuAction.php',
+        'OCA\\Files_Sharing\\Updater' => __DIR__.'/..'.'/../lib/Updater.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitFiles_Sharing::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitFiles_Sharing::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitFiles_Sharing::$classMap;

apps/files_sharing/composer/composer/autoload_classmap.php

Spacing +50 added lines, -50 removed lines

@@ -6,54 +6,54 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Files_Sharing\\Activity\\Filter' => $baseDir . '/../lib/Activity/Filter.php',
-    'OCA\\Files_Sharing\\Activity\\Providers\\Base' => $baseDir . '/../lib/Activity/Providers/Base.php',
-    'OCA\\Files_Sharing\\Activity\\Providers\\Downloads' => $baseDir . '/../lib/Activity/Providers/Downloads.php',
-    'OCA\\Files_Sharing\\Activity\\Providers\\Groups' => $baseDir . '/../lib/Activity/Providers/Groups.php',
-    'OCA\\Files_Sharing\\Activity\\Providers\\PublicLinks' => $baseDir . '/../lib/Activity/Providers/PublicLinks.php',
-    'OCA\\Files_Sharing\\Activity\\Providers\\RemoteShares' => $baseDir . '/../lib/Activity/Providers/RemoteShares.php',
-    'OCA\\Files_Sharing\\Activity\\Providers\\Users' => $baseDir . '/../lib/Activity/Providers/Users.php',
-    'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinks' => $baseDir . '/../lib/Activity/Settings/PublicLinks.php',
-    'OCA\\Files_Sharing\\Activity\\Settings\\RemoteShare' => $baseDir . '/../lib/Activity/Settings/RemoteShare.php',
-    'OCA\\Files_Sharing\\Activity\\Settings\\Shared' => $baseDir . '/../lib/Activity/Settings/Shared.php',
-    'OCA\\Files_Sharing\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Files_Sharing\\Cache' => $baseDir . '/../lib/Cache.php',
-    'OCA\\Files_Sharing\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
-    'OCA\\Files_Sharing\\Collaboration\\ShareRecipientSorter' => $baseDir . '/../lib/Collaboration/ShareRecipientSorter.php',
-    'OCA\\Files_Sharing\\Command\\CleanupRemoteStorages' => $baseDir . '/../lib/Command/CleanupRemoteStorages.php',
-    'OCA\\Files_Sharing\\Controller\\ExternalSharesController' => $baseDir . '/../lib/Controller/ExternalSharesController.php',
-    'OCA\\Files_Sharing\\Controller\\PublicPreviewController' => $baseDir . '/../lib/Controller/PublicPreviewController.php',
-    'OCA\\Files_Sharing\\Controller\\RemoteController' => $baseDir . '/../lib/Controller/RemoteController.php',
-    'OCA\\Files_Sharing\\Controller\\ShareAPIController' => $baseDir . '/../lib/Controller/ShareAPIController.php',
-    'OCA\\Files_Sharing\\Controller\\ShareController' => $baseDir . '/../lib/Controller/ShareController.php',
-    'OCA\\Files_Sharing\\Controller\\ShareInfoController' => $baseDir . '/../lib/Controller/ShareInfoController.php',
-    'OCA\\Files_Sharing\\Controller\\ShareesAPIController' => $baseDir . '/../lib/Controller/ShareesAPIController.php',
-    'OCA\\Files_Sharing\\DeleteOrphanedSharesJob' => $baseDir . '/../lib/DeleteOrphanedSharesJob.php',
-    'OCA\\Files_Sharing\\Exceptions\\BrokenPath' => $baseDir . '/../lib/Exceptions/BrokenPath.php',
-    'OCA\\Files_Sharing\\Exceptions\\S2SException' => $baseDir . '/../lib/Exceptions/S2SException.php',
-    'OCA\\Files_Sharing\\ExpireSharesJob' => $baseDir . '/../lib/ExpireSharesJob.php',
-    'OCA\\Files_Sharing\\External\\Cache' => $baseDir . '/../lib/External/Cache.php',
-    'OCA\\Files_Sharing\\External\\Manager' => $baseDir . '/../lib/External/Manager.php',
-    'OCA\\Files_Sharing\\External\\Mount' => $baseDir . '/../lib/External/Mount.php',
-    'OCA\\Files_Sharing\\External\\MountProvider' => $baseDir . '/../lib/External/MountProvider.php',
-    'OCA\\Files_Sharing\\External\\Scanner' => $baseDir . '/../lib/External/Scanner.php',
-    'OCA\\Files_Sharing\\External\\Storage' => $baseDir . '/../lib/External/Storage.php',
-    'OCA\\Files_Sharing\\External\\Watcher' => $baseDir . '/../lib/External/Watcher.php',
-    'OCA\\Files_Sharing\\Helper' => $baseDir . '/../lib/Helper.php',
-    'OCA\\Files_Sharing\\Hooks' => $baseDir . '/../lib/Hooks.php',
-    'OCA\\Files_Sharing\\ISharedStorage' => $baseDir . '/../lib/ISharedStorage.php',
-    'OCA\\Files_Sharing\\Middleware\\OCSShareAPIMiddleware' => $baseDir . '/../lib/Middleware/OCSShareAPIMiddleware.php',
-    'OCA\\Files_Sharing\\Middleware\\ShareInfoMiddleware' => $baseDir . '/../lib/Middleware/ShareInfoMiddleware.php',
-    'OCA\\Files_Sharing\\Middleware\\SharingCheckMiddleware' => $baseDir . '/../lib/Middleware/SharingCheckMiddleware.php',
-    'OCA\\Files_Sharing\\Migration\\OwncloudGuestShareType' => $baseDir . '/../lib/Migration/OwncloudGuestShareType.php',
-    'OCA\\Files_Sharing\\Migration\\SetPasswordColumn' => $baseDir . '/../lib/Migration/SetPasswordColumn.php',
-    'OCA\\Files_Sharing\\MountProvider' => $baseDir . '/../lib/MountProvider.php',
-    'OCA\\Files_Sharing\\Scanner' => $baseDir . '/../lib/Scanner.php',
-    'OCA\\Files_Sharing\\ShareBackend\\File' => $baseDir . '/../lib/ShareBackend/File.php',
-    'OCA\\Files_Sharing\\ShareBackend\\Folder' => $baseDir . '/../lib/ShareBackend/Folder.php',
-    'OCA\\Files_Sharing\\SharedMount' => $baseDir . '/../lib/SharedMount.php',
-    'OCA\\Files_Sharing\\SharedStorage' => $baseDir . '/../lib/SharedStorage.php',
-    'OCA\\Files_Sharing\\Template\\ExternalShareMenuAction' => $baseDir . '/../lib/Template/ExternalShareMenuAction.php',
-    'OCA\\Files_Sharing\\Template\\LinkMenuAction' => $baseDir . '/../lib/Template/LinkMenuAction.php',
-    'OCA\\Files_Sharing\\Updater' => $baseDir . '/../lib/Updater.php',
+    'OCA\\Files_Sharing\\Activity\\Filter' => $baseDir.'/../lib/Activity/Filter.php',
+    'OCA\\Files_Sharing\\Activity\\Providers\\Base' => $baseDir.'/../lib/Activity/Providers/Base.php',
+    'OCA\\Files_Sharing\\Activity\\Providers\\Downloads' => $baseDir.'/../lib/Activity/Providers/Downloads.php',
+    'OCA\\Files_Sharing\\Activity\\Providers\\Groups' => $baseDir.'/../lib/Activity/Providers/Groups.php',
+    'OCA\\Files_Sharing\\Activity\\Providers\\PublicLinks' => $baseDir.'/../lib/Activity/Providers/PublicLinks.php',
+    'OCA\\Files_Sharing\\Activity\\Providers\\RemoteShares' => $baseDir.'/../lib/Activity/Providers/RemoteShares.php',
+    'OCA\\Files_Sharing\\Activity\\Providers\\Users' => $baseDir.'/../lib/Activity/Providers/Users.php',
+    'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinks' => $baseDir.'/../lib/Activity/Settings/PublicLinks.php',
+    'OCA\\Files_Sharing\\Activity\\Settings\\RemoteShare' => $baseDir.'/../lib/Activity/Settings/RemoteShare.php',
+    'OCA\\Files_Sharing\\Activity\\Settings\\Shared' => $baseDir.'/../lib/Activity/Settings/Shared.php',
+    'OCA\\Files_Sharing\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Files_Sharing\\Cache' => $baseDir.'/../lib/Cache.php',
+    'OCA\\Files_Sharing\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
+    'OCA\\Files_Sharing\\Collaboration\\ShareRecipientSorter' => $baseDir.'/../lib/Collaboration/ShareRecipientSorter.php',
+    'OCA\\Files_Sharing\\Command\\CleanupRemoteStorages' => $baseDir.'/../lib/Command/CleanupRemoteStorages.php',
+    'OCA\\Files_Sharing\\Controller\\ExternalSharesController' => $baseDir.'/../lib/Controller/ExternalSharesController.php',
+    'OCA\\Files_Sharing\\Controller\\PublicPreviewController' => $baseDir.'/../lib/Controller/PublicPreviewController.php',
+    'OCA\\Files_Sharing\\Controller\\RemoteController' => $baseDir.'/../lib/Controller/RemoteController.php',
+    'OCA\\Files_Sharing\\Controller\\ShareAPIController' => $baseDir.'/../lib/Controller/ShareAPIController.php',
+    'OCA\\Files_Sharing\\Controller\\ShareController' => $baseDir.'/../lib/Controller/ShareController.php',
+    'OCA\\Files_Sharing\\Controller\\ShareInfoController' => $baseDir.'/../lib/Controller/ShareInfoController.php',
+    'OCA\\Files_Sharing\\Controller\\ShareesAPIController' => $baseDir.'/../lib/Controller/ShareesAPIController.php',
+    'OCA\\Files_Sharing\\DeleteOrphanedSharesJob' => $baseDir.'/../lib/DeleteOrphanedSharesJob.php',
+    'OCA\\Files_Sharing\\Exceptions\\BrokenPath' => $baseDir.'/../lib/Exceptions/BrokenPath.php',
+    'OCA\\Files_Sharing\\Exceptions\\S2SException' => $baseDir.'/../lib/Exceptions/S2SException.php',
+    'OCA\\Files_Sharing\\ExpireSharesJob' => $baseDir.'/../lib/ExpireSharesJob.php',
+    'OCA\\Files_Sharing\\External\\Cache' => $baseDir.'/../lib/External/Cache.php',
+    'OCA\\Files_Sharing\\External\\Manager' => $baseDir.'/../lib/External/Manager.php',
+    'OCA\\Files_Sharing\\External\\Mount' => $baseDir.'/../lib/External/Mount.php',
+    'OCA\\Files_Sharing\\External\\MountProvider' => $baseDir.'/../lib/External/MountProvider.php',
+    'OCA\\Files_Sharing\\External\\Scanner' => $baseDir.'/../lib/External/Scanner.php',
+    'OCA\\Files_Sharing\\External\\Storage' => $baseDir.'/../lib/External/Storage.php',
+    'OCA\\Files_Sharing\\External\\Watcher' => $baseDir.'/../lib/External/Watcher.php',
+    'OCA\\Files_Sharing\\Helper' => $baseDir.'/../lib/Helper.php',
+    'OCA\\Files_Sharing\\Hooks' => $baseDir.'/../lib/Hooks.php',
+    'OCA\\Files_Sharing\\ISharedStorage' => $baseDir.'/../lib/ISharedStorage.php',
+    'OCA\\Files_Sharing\\Middleware\\OCSShareAPIMiddleware' => $baseDir.'/../lib/Middleware/OCSShareAPIMiddleware.php',
+    'OCA\\Files_Sharing\\Middleware\\ShareInfoMiddleware' => $baseDir.'/../lib/Middleware/ShareInfoMiddleware.php',
+    'OCA\\Files_Sharing\\Middleware\\SharingCheckMiddleware' => $baseDir.'/../lib/Middleware/SharingCheckMiddleware.php',
+    'OCA\\Files_Sharing\\Migration\\OwncloudGuestShareType' => $baseDir.'/../lib/Migration/OwncloudGuestShareType.php',
+    'OCA\\Files_Sharing\\Migration\\SetPasswordColumn' => $baseDir.'/../lib/Migration/SetPasswordColumn.php',
+    'OCA\\Files_Sharing\\MountProvider' => $baseDir.'/../lib/MountProvider.php',
+    'OCA\\Files_Sharing\\Scanner' => $baseDir.'/../lib/Scanner.php',
+    'OCA\\Files_Sharing\\ShareBackend\\File' => $baseDir.'/../lib/ShareBackend/File.php',
+    'OCA\\Files_Sharing\\ShareBackend\\Folder' => $baseDir.'/../lib/ShareBackend/Folder.php',
+    'OCA\\Files_Sharing\\SharedMount' => $baseDir.'/../lib/SharedMount.php',
+    'OCA\\Files_Sharing\\SharedStorage' => $baseDir.'/../lib/SharedStorage.php',
+    'OCA\\Files_Sharing\\Template\\ExternalShareMenuAction' => $baseDir.'/../lib/Template/ExternalShareMenuAction.php',
+    'OCA\\Files_Sharing\\Template\\LinkMenuAction' => $baseDir.'/../lib/Template/LinkMenuAction.php',
+    'OCA\\Files_Sharing\\Updater' => $baseDir.'/../lib/Updater.php',
 );

core/templates/layout.public.php

Indentation +13 added lines, -13 removed lines

@@ -4,9 +4,9 @@ 
 	<meta charset="utf-8">
 	<title>
 		<?php
-		p(!empty($_['application'])?$_['application'].' - ':'');
-		p($theme->getTitle());
-		?>
+        p(!empty($_['application'])?$_['application'].' - ':'');
+        p($theme->getTitle());
+        ?>
 	</title>
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="referrer" content="never">
@@ -42,11 +42,11 @@ 
 		</div>
 
 		<?php
-		/** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
-		if($template->getActionCount() !== 0) {
-			$primary = $template->getPrimaryAction();
-			$others = $template->getOtherActions();
-			?>
+        /** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
+        if($template->getActionCount() !== 0) {
+            $primary = $template->getPrimaryAction();
+            $others = $template->getOtherActions();
+            ?>
 		<div class="header-right">
 			<span id="header-primary-action" class="<?php if($template->getActionCount() === 1) {  p($primary->getIcon()); } ?>">
 				<a href="<?php p($primary->getLink()); ?>">
@@ -58,11 +58,11 @@ 
 			<div id="share-menu" class="popovermenu menu">
 				<ul>
 					<?php
-						/** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
-						foreach($template->getOtherActions() as $action) {
-							print_unescaped($action->render());
-						}
-					?>
+                        /** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
+                        foreach($template->getOtherActions() as $action) {
+                            print_unescaped($action->render());
+                        }
+                    ?>
 				</ul>
 			</div>
 			<?php } ?>

Spacing +7 added lines, -7 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,7 +14,7 @@ 
 	<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->getColorPrimary()); ?>">
 	<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
@@ -25,7 +25,7 @@ 
 	<?php emit_script_loading_tags($_); ?>
 	<?php print_unescaped($_['headers']); ?>
 </head>
-<body id="<?php p($_['bodyid']);?>">
+<body id="<?php p($_['bodyid']); ?>">
 <?php include('layout.noscript.warning.php'); ?>
 <header>
 	<div id="header" class="<?php p($_['header-classes']); ?>">
@@ -43,23 +43,23 @@ 
 
 		<?php
 		/** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
-		if($template->getActionCount() !== 0) {
+		if ($template->getActionCount() !== 0) {
 			$primary = $template->getPrimaryAction();
 			$others = $template->getOtherActions();
 			?>
 		<div class="header-right">
-			<span id="header-primary-action" class="<?php if($template->getActionCount() === 1) {  p($primary->getIcon()); } ?>">
+			<span id="header-primary-action" class="<?php if ($template->getActionCount() === 1) {  p($primary->getIcon()); } ?>">
 				<a href="<?php p($primary->getLink()); ?>">
 					<span class="share-menutoggle-text"><?php p($primary->getLabel()) ?></span>
 				</a>
 			</span>
-			<?php if($template->getActionCount()>1) { ?>
+			<?php if ($template->getActionCount() > 1) { ?>
 			<span class="menutoggle icon-more-white"></span>
 			<div id="share-menu" class="popovermenu menu">
 				<ul>
 					<?php
 						/** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
-						foreach($template->getOtherActions() as $action) {
+						foreach ($template->getOtherActions() as $action) {
 							print_unescaped($action->render());
 						}
 					?>