nextcloud / server

lib/private/Template/JSResourceLocator.php

Indentation +124 added lines, -124 removed lines

@@ -32,128 +32,128 @@
 use Psr\Log\LoggerInterface;
 
 class JSResourceLocator extends ResourceLocator {
-	protected JSCombiner $jsCombiner;
-	protected IAppManager $appManager;
-
-	public function __construct(LoggerInterface $logger, JSCombiner $JSCombiner, IAppManager $appManager) {
-		parent::__construct($logger);
-
-		$this->jsCombiner = $JSCombiner;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * @param string $script
-	 */
-	public function doFind($script) {
-		$theme_dir = 'themes/'.$this->theme.'/';
-
-		// Extracting the appId and the script file name
-		$app = substr($script, 0, strpos($script, '/'));
-		$scriptName = basename($script);
-
-		if (strpos($script, '/l10n/') !== false) {
-			// For language files we try to load them all, so themes can overwrite
-			// single l10n strings without having to translate all of them.
-			$found = 0;
-			$found += $this->appendScriptIfExist($this->serverroot, 'core/'.$script);
-			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'core/'.$script);
-			$found += $this->appendScriptIfExist($this->serverroot, $script);
-			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script);
-			$found += $this->appendScriptIfExist($this->serverroot, 'apps/'.$script);
-			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script);
-
-			if ($found) {
-				return;
-			}
-		} elseif ($this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script)
-			|| $this->appendScriptIfExist($this->serverroot, $theme_dir.$script)
-			|| $this->appendScriptIfExist($this->serverroot, $script)
-			|| $this->appendScriptIfExist($this->serverroot, $theme_dir."dist/$app-$scriptName")
-			|| $this->appendScriptIfExist($this->serverroot, "dist/$app-$scriptName")
-			|| $this->appendScriptIfExist($this->serverroot, 'apps/'.$script)
-			|| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script.'.json')
-			|| $this->appendScriptIfExist($this->serverroot, $theme_dir.'core/'.$script)
-			|| $this->appendScriptIfExist($this->serverroot, 'core/'.$script)
-			|| (strpos($scriptName, '/') === -1 && ($this->appendScriptIfExist($this->serverroot, $theme_dir."dist/core-$scriptName")
-				|| $this->appendScriptIfExist($this->serverroot, "dist/core-$scriptName")))
-			|| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/'.$script.'.json')
-		) {
-			return;
-		}
-
-		$script = substr($script, strpos($script, '/') + 1);
-		$app_url = null;
-
-		try {
-			$app_url = $this->appManager->getAppWebPath($app);
-		} catch (AppPathNotFoundException) {
-			// pass
-		}
-
-		try {
-			$app_path = $this->appManager->getAppPath($app);
-
-			// Account for the possibility of having symlinks in app path. Only
-			// do this if $app_path is set, because an empty argument to realpath
-			// gets turned into cwd.
-			$app_path = realpath($app_path);
-
-			// missing translations files will be ignored
-			if (strpos($script, 'l10n/') === 0) {
-				$this->appendScriptIfExist($app_path, $script, $app_url);
-				return;
-			}
-
-			if (!$this->cacheAndAppendCombineJsonIfExist($app_path, $script.'.json', $app)) {
-				$this->appendScriptIfExist($app_path, $script, $app_url);
-			}
-		} catch (AppPathNotFoundException) {
-			$this->logger->error('Could not find resource {resource} to load', [
-				'resource' => $app . '/' . $script . '.js',
-				'app' => 'jsresourceloader',
-			]);
-		}
-	}
-
-	/**
-	 * @param string $script
-	 */
-	public function doFindTheme($script) {
-	}
-
-	/**
-	 * Try to find ES6 script file (`.mjs`) with fallback to plain javascript (`.js`)
-	 * @see appendIfExist()
-	 */
-	protected function appendScriptIfExist(string $root, string $file, string $webRoot = null) {
-		if (!$this->appendIfExist($root, $file . '.mjs', $webRoot)) {
-			return $this->appendIfExist($root, $file . '.js', $webRoot);
-		}
-		return true;
-	}
-
-	protected function cacheAndAppendCombineJsonIfExist($root, $file, $app = 'core') {
-		if (is_file($root.'/'.$file)) {
-			if ($this->jsCombiner->process($root, $file, $app)) {
-				$this->append($this->serverroot, $this->jsCombiner->getCachedJS($app, $file), false, false);
-			} else {
-				// Add all the files from the json
-				$files = $this->jsCombiner->getContent($root, $file);
-				$app_url = null;
-				try {
-					$app_url = $this->appManager->getAppWebPath($app);
-				} catch (AppPathNotFoundException) {
-					// pass
-				}
-
-				foreach ($files as $jsFile) {
-					$this->append($root, $jsFile, $app_url);
-				}
-			}
-			return true;
-		}
-
-		return false;
-	}
+    protected JSCombiner $jsCombiner;
+    protected IAppManager $appManager;
+
+    public function __construct(LoggerInterface $logger, JSCombiner $JSCombiner, IAppManager $appManager) {
+        parent::__construct($logger);
+
+        $this->jsCombiner = $JSCombiner;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * @param string $script
+     */
+    public function doFind($script) {
+        $theme_dir = 'themes/'.$this->theme.'/';
+
+        // Extracting the appId and the script file name
+        $app = substr($script, 0, strpos($script, '/'));
+        $scriptName = basename($script);
+
+        if (strpos($script, '/l10n/') !== false) {
+            // For language files we try to load them all, so themes can overwrite
+            // single l10n strings without having to translate all of them.
+            $found = 0;
+            $found += $this->appendScriptIfExist($this->serverroot, 'core/'.$script);
+            $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'core/'.$script);
+            $found += $this->appendScriptIfExist($this->serverroot, $script);
+            $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script);
+            $found += $this->appendScriptIfExist($this->serverroot, 'apps/'.$script);
+            $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script);
+
+            if ($found) {
+                return;
+            }
+        } elseif ($this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script)
+            || $this->appendScriptIfExist($this->serverroot, $theme_dir.$script)
+            || $this->appendScriptIfExist($this->serverroot, $script)
+            || $this->appendScriptIfExist($this->serverroot, $theme_dir."dist/$app-$scriptName")
+            || $this->appendScriptIfExist($this->serverroot, "dist/$app-$scriptName")
+            || $this->appendScriptIfExist($this->serverroot, 'apps/'.$script)
+            || $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script.'.json')
+            || $this->appendScriptIfExist($this->serverroot, $theme_dir.'core/'.$script)
+            || $this->appendScriptIfExist($this->serverroot, 'core/'.$script)
+            || (strpos($scriptName, '/') === -1 && ($this->appendScriptIfExist($this->serverroot, $theme_dir."dist/core-$scriptName")
+                || $this->appendScriptIfExist($this->serverroot, "dist/core-$scriptName")))
+            || $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/'.$script.'.json')
+        ) {
+            return;
+        }
+
+        $script = substr($script, strpos($script, '/') + 1);
+        $app_url = null;
+
+        try {
+            $app_url = $this->appManager->getAppWebPath($app);
+        } catch (AppPathNotFoundException) {
+            // pass
+        }
+
+        try {
+            $app_path = $this->appManager->getAppPath($app);
+
+            // Account for the possibility of having symlinks in app path. Only
+            // do this if $app_path is set, because an empty argument to realpath
+            // gets turned into cwd.
+            $app_path = realpath($app_path);
+
+            // missing translations files will be ignored
+            if (strpos($script, 'l10n/') === 0) {
+                $this->appendScriptIfExist($app_path, $script, $app_url);
+                return;
+            }
+
+            if (!$this->cacheAndAppendCombineJsonIfExist($app_path, $script.'.json', $app)) {
+                $this->appendScriptIfExist($app_path, $script, $app_url);
+            }
+        } catch (AppPathNotFoundException) {
+            $this->logger->error('Could not find resource {resource} to load', [
+                'resource' => $app . '/' . $script . '.js',
+                'app' => 'jsresourceloader',
+            ]);
+        }
+    }
+
+    /**
+     * @param string $script
+     */
+    public function doFindTheme($script) {
+    }
+
+    /**
+     * Try to find ES6 script file (`.mjs`) with fallback to plain javascript (`.js`)
+     * @see appendIfExist()
+     */
+    protected function appendScriptIfExist(string $root, string $file, string $webRoot = null) {
+        if (!$this->appendIfExist($root, $file . '.mjs', $webRoot)) {
+            return $this->appendIfExist($root, $file . '.js', $webRoot);
+        }
+        return true;
+    }
+
+    protected function cacheAndAppendCombineJsonIfExist($root, $file, $app = 'core') {
+        if (is_file($root.'/'.$file)) {
+            if ($this->jsCombiner->process($root, $file, $app)) {
+                $this->append($this->serverroot, $this->jsCombiner->getCachedJS($app, $file), false, false);
+            } else {
+                // Add all the files from the json
+                $files = $this->jsCombiner->getContent($root, $file);
+                $app_url = null;
+                try {
+                    $app_url = $this->appManager->getAppWebPath($app);
+                } catch (AppPathNotFoundException) {
+                    // pass
+                }
+
+                foreach ($files as $jsFile) {
+                    $this->append($root, $jsFile, $app_url);
+                }
+            }
+            return true;
+        }
+
+        return false;
+    }
 }

lib/private/legacy/template/functions.php

Indentation +118 added lines, -118 removed lines

@@ -35,7 +35,7 @@ 
  *
  */
 function p($string) {
-	print(\OCP\Util::sanitizeHTML($string));
+    print(\OCP\Util::sanitizeHTML($string));
 }
 
 
@@ -45,14 +45,14 @@ 
  * @param string $opts, additional optional options
  */
 function emit_css_tag($href, $opts = '') {
-	$s = '<link rel="stylesheet"';
-	if (!empty($href)) {
-		$s .= ' href="' . $href .'"';
-	}
-	if (!empty($opts)) {
-		$s .= ' '.$opts;
-	}
-	print_unescaped($s.">\n");
+    $s = '<link rel="stylesheet"';
+    if (!empty($href)) {
+        $s .= ' href="' . $href .'"';
+    }
+    if (!empty($opts)) {
+        $s .= ' '.$opts;
+    }
+    print_unescaped($s.">\n");
 }
 
 /**
@@ -60,12 +60,12 @@ 
  * @param array $obj all the script information from template
  */
 function emit_css_loading_tags($obj) {
-	foreach ($obj['cssfiles'] as $css) {
-		emit_css_tag($css);
-	}
-	foreach ($obj['printcssfiles'] as $css) {
-		emit_css_tag($css, 'media="print"');
-	}
+    foreach ($obj['cssfiles'] as $css) {
+        emit_css_tag($css);
+    }
+    foreach ($obj['printcssfiles'] as $css) {
+        emit_css_tag($css, 'media="print"');
+    }
 }
 
 /**
@@ -75,24 +75,24 @@ 
  * @param string $content_type the type of the source (e.g. 'module')
  */
 function emit_script_tag(string $src, string $script_content = '', string $content_type = '') {
-	$nonceManager = \OC::$server->get(\OC\Security\CSP\ContentSecurityPolicyNonceManager::class);
+    $nonceManager = \OC::$server->get(\OC\Security\CSP\ContentSecurityPolicyNonceManager::class);
 
-	$defer_str = ' defer';
-	$type = $content_type !== '' ? ' type="' . $content_type . '"' : '';
+    $defer_str = ' defer';
+    $type = $content_type !== '' ? ' type="' . $content_type . '"' : '';
 
-	$s = '<script nonce="' . $nonceManager->getNonce() . '"';
-	if (!empty($src)) {
-		// emit script tag for deferred loading from $src
-		$s .= $defer_str.' src="' . $src .'"' . $type . '>';
-	} elseif ($script_content !== '') {
-		// emit script tag for inline script from $script_content without defer (see MDN)
-		$s .= ">\n".$script_content."\n";
-	} else {
-		// no $src nor $src_content, really useless empty tag
-		$s .= '>';
-	}
-	$s .= '</script>';
-	print_unescaped($s."\n");
+    $s = '<script nonce="' . $nonceManager->getNonce() . '"';
+    if (!empty($src)) {
+        // emit script tag for deferred loading from $src
+        $s .= $defer_str.' src="' . $src .'"' . $type . '>';
+    } elseif ($script_content !== '') {
+        // emit script tag for inline script from $script_content without defer (see MDN)
+        $s .= ">\n".$script_content."\n";
+    } else {
+        // no $src nor $src_content, really useless empty tag
+        $s .= '>';
+    }
+    $s .= '</script>';
+    print_unescaped($s."\n");
 }
 
 /**
@@ -100,13 +100,13 @@ 
  * @param array $obj all the script information from template
  */
 function emit_script_loading_tags($obj) {
-	foreach ($obj['jsfiles'] as $jsfile) {
-		$type = str_ends_with($jsfile, '.mjs') ? 'module' : '';
-		emit_script_tag($jsfile, '', $type);
-	}
-	if (!empty($obj['inline_ocjs'])) {
-		emit_script_tag('', $obj['inline_ocjs']);
-	}
+    foreach ($obj['jsfiles'] as $jsfile) {
+        $type = str_ends_with($jsfile, '.mjs') ? 'module' : '';
+        emit_script_tag($jsfile, '', $type);
+    }
+    if (!empty($obj['inline_ocjs'])) {
+        emit_script_tag('', $obj['inline_ocjs']);
+    }
 }
 
 /**
@@ -115,7 +115,7 @@ 
  * @param string|array $string the string which will be printed as it is
  */
 function print_unescaped($string) {
-	print($string);
+    print($string);
 }
 
 /**
@@ -131,13 +131,13 @@ 
  * if an array is given it will add all scripts
  */
 function script($app, $file = null) {
-	if (is_array($file)) {
-		foreach ($file as $script) {
-			Util::addScript($app, $script, 'core');
-		}
-	} else {
-		Util::addScript($app, $file, 'core');
-	}
+    if (is_array($file)) {
+        foreach ($file as $script) {
+            Util::addScript($app, $script, 'core');
+        }
+    } else {
+        Util::addScript($app, $file, 'core');
+    }
 }
 
 /**
@@ -147,13 +147,13 @@ 
  * if an array is given it will add all scripts
  */
 function vendor_script($app, $file = null) {
-	if (is_array($file)) {
-		foreach ($file as $f) {
-			OC_Util::addVendorScript($app, $f);
-		}
-	} else {
-		OC_Util::addVendorScript($app, $file);
-	}
+    if (is_array($file)) {
+        foreach ($file as $f) {
+            OC_Util::addVendorScript($app, $f);
+        }
+    } else {
+        OC_Util::addVendorScript($app, $file);
+    }
 }
 
 /**
@@ -163,13 +163,13 @@ 
  * if an array is given it will add all styles
  */
 function style($app, $file = null) {
-	if (is_array($file)) {
-		foreach ($file as $f) {
-			OC_Util::addStyle($app, $f);
-		}
-	} else {
-		OC_Util::addStyle($app, $file);
-	}
+    if (is_array($file)) {
+        foreach ($file as $f) {
+            OC_Util::addStyle($app, $f);
+        }
+    } else {
+        OC_Util::addStyle($app, $file);
+    }
 }
 
 /**
@@ -179,13 +179,13 @@ 
  * if an array is given it will add all styles
  */
 function vendor_style($app, $file = null) {
-	if (is_array($file)) {
-		foreach ($file as $f) {
-			OC_Util::addVendorStyle($app, $f);
-		}
-	} else {
-		OC_Util::addVendorStyle($app, $file);
-	}
+    if (is_array($file)) {
+        foreach ($file as $f) {
+            OC_Util::addVendorStyle($app, $f);
+        }
+    } else {
+        OC_Util::addVendorStyle($app, $file);
+    }
 }
 
 /**
@@ -194,7 +194,7 @@ 
  * if an array is given it will add all styles
  */
 function translation($app) {
-	OC_Util::addTranslations($app);
+    OC_Util::addTranslations($app);
 }
 
 /**
@@ -204,15 +204,15 @@ 
  * if an array is given it will add all components
  */
 function component($app, $file) {
-	if (is_array($file)) {
-		foreach ($file as $f) {
-			$url = link_to($app, 'component/' . $f . '.html');
-			OC_Util::addHeader('link', ['rel' => 'import', 'href' => $url]);
-		}
-	} else {
-		$url = link_to($app, 'component/' . $file . '.html');
-		OC_Util::addHeader('link', ['rel' => 'import', 'href' => $url]);
-	}
+    if (is_array($file)) {
+        foreach ($file as $f) {
+            $url = link_to($app, 'component/' . $f . '.html');
+            OC_Util::addHeader('link', ['rel' => 'import', 'href' => $url]);
+        }
+    } else {
+        $url = link_to($app, 'component/' . $file . '.html');
+        OC_Util::addHeader('link', ['rel' => 'import', 'href' => $url]);
+    }
 }
 
 /**
@@ -225,7 +225,7 @@ 
  * For further information have a look at \OCP\IURLGenerator::linkTo
  */
 function link_to($app, $file, $args = []) {
-	return \OC::$server->getURLGenerator()->linkTo($app, $file, $args);
+    return \OC::$server->getURLGenerator()->linkTo($app, $file, $args);
 }
 
 /**
@@ -233,7 +233,7 @@ 
  * @return string url to the online documentation
  */
 function link_to_docs($key) {
-	return \OC::$server->getURLGenerator()->linkToDocs($key);
+    return \OC::$server->getURLGenerator()->linkToDocs($key);
 }
 
 /**
@@ -245,7 +245,7 @@ 
  * For further information have a look at \OCP\IURLGenerator::imagePath
  */
 function image_path($app, $image) {
-	return \OC::$server->getURLGenerator()->imagePath($app, $image);
+    return \OC::$server->getURLGenerator()->imagePath($app, $image);
 }
 
 /**
@@ -254,7 +254,7 @@ 
  * @return string link to the image
  */
 function mimetype_icon($mimetype) {
-	return \OC::$server->getMimeTypeDetector()->mimeTypeIcon($mimetype);
+    return \OC::$server->getMimeTypeDetector()->mimeTypeIcon($mimetype);
 }
 
 /**
@@ -264,7 +264,7 @@ 
  * @return string link to the preview
  */
 function preview_icon($path) {
-	return \OC::$server->getURLGenerator()->linkToRoute('core.Preview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path]);
+    return \OC::$server->getURLGenerator()->linkToRoute('core.Preview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path]);
 }
 
 /**
@@ -273,7 +273,7 @@ 
  * @return string
  */
 function publicPreview_icon($path, $token) {
-	return \OC::$server->getURLGenerator()->linkToRoute('files_sharing.PublicPreview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path, 'token' => $token]);
+    return \OC::$server->getURLGenerator()->linkToRoute('files_sharing.PublicPreview.getPreview', ['x' => 32, 'y' => 32, 'file' => $path, 'token' => $token]);
 }
 
 /**
@@ -284,7 +284,7 @@ 
  * For further information have a look at OC_Helper::humanFileSize
  */
 function human_file_size($bytes) {
-	return OC_Helper::humanFileSize($bytes);
+    return OC_Helper::humanFileSize($bytes);
 }
 
 /**
@@ -293,9 +293,9 @@ 
  * @return int timestamp without time value
  */
 function strip_time($timestamp) {
-	$date = new \DateTime("@{$timestamp}");
-	$date->setTime(0, 0, 0);
-	return (int)$date->format('U');
+    $date = new \DateTime("@{$timestamp}");
+    $date->setTime(0, 0, 0);
+    return (int)$date->format('U');
 }
 
 /**
@@ -307,39 +307,39 @@ 
  * @return string timestamp
  */
 function relative_modified_date($timestamp, $fromTime = null, $dateOnly = false) {
-	/** @var \OC\DateTimeFormatter $formatter */
-	$formatter = \OC::$server->query('DateTimeFormatter');
+    /** @var \OC\DateTimeFormatter $formatter */
+    $formatter = \OC::$server->query('DateTimeFormatter');
 
-	if ($dateOnly) {
-		return $formatter->formatDateSpan($timestamp, $fromTime);
-	}
-	return $formatter->formatTimeSpan($timestamp, $fromTime);
+    if ($dateOnly) {
+        return $formatter->formatDateSpan($timestamp, $fromTime);
+    }
+    return $formatter->formatTimeSpan($timestamp, $fromTime);
 }
 
 function html_select_options($options, $selected, $params = []) {
-	if (!is_array($selected)) {
-		$selected = [$selected];
-	}
-	if (isset($params['combine']) && $params['combine']) {
-		$options = array_combine($options, $options);
-	}
-	$value_name = $label_name = false;
-	if (isset($params['value'])) {
-		$value_name = $params['value'];
-	}
-	if (isset($params['label'])) {
-		$label_name = $params['label'];
-	}
-	$html = '';
-	foreach ($options as $value => $label) {
-		if ($value_name && is_array($label)) {
-			$value = $label[$value_name];
-		}
-		if ($label_name && is_array($label)) {
-			$label = $label[$label_name];
-		}
-		$select = in_array($value, $selected) ? ' selected="selected"' : '';
-		$html .= '<option value="' . \OCP\Util::sanitizeHTML($value) . '"' . $select . '>' . \OCP\Util::sanitizeHTML($label) . '</option>'."\n";
-	}
-	return $html;
+    if (!is_array($selected)) {
+        $selected = [$selected];
+    }
+    if (isset($params['combine']) && $params['combine']) {
+        $options = array_combine($options, $options);
+    }
+    $value_name = $label_name = false;
+    if (isset($params['value'])) {
+        $value_name = $params['value'];
+    }
+    if (isset($params['label'])) {
+        $label_name = $params['label'];
+    }
+    $html = '';
+    foreach ($options as $value => $label) {
+        if ($value_name && is_array($label)) {
+            $value = $label[$value_name];
+        }
+        if ($label_name && is_array($label)) {
+            $label = $label[$label_name];
+        }
+        $select = in_array($value, $selected) ? ' selected="selected"' : '';
+        $html .= '<option value="' . \OCP\Util::sanitizeHTML($value) . '"' . $select . '>' . \OCP\Util::sanitizeHTML($label) . '</option>'."\n";
+    }
+    return $html;
 }