Fix formatting in Core\Theme
This commit is contained in:
parent
66e5586d21
commit
acbc733dce
|
@ -1,7 +1,9 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file src/Core/Theme.php
|
||||
*/
|
||||
|
||||
namespace Friendica\Core;
|
||||
|
||||
use Friendica\Core\System;
|
||||
|
@ -28,60 +30,53 @@ class Theme
|
|||
* @param string $theme the name of the theme
|
||||
* @return array
|
||||
*/
|
||||
|
||||
public static function getInfo($theme)
|
||||
{
|
||||
$info=[
|
||||
$info = [
|
||||
'name' => $theme,
|
||||
'description' => "",
|
||||
'author' => [],
|
||||
'maintainer' => [],
|
||||
'version' => "",
|
||||
'credits' => "",
|
||||
'experimental' => false,
|
||||
'unsupported' => false
|
||||
'experimental' => file_exists("view/theme/$theme/experimental"),
|
||||
'unsupported' => file_exists("view/theme/$theme/unsupported")
|
||||
];
|
||||
|
||||
if (file_exists("view/theme/$theme/experimental"))
|
||||
$info['experimental'] = true;
|
||||
if (file_exists("view/theme/$theme/unsupported"))
|
||||
$info['unsupported'] = true;
|
||||
|
||||
if (!is_file("view/theme/$theme/theme.php")) return $info;
|
||||
if (!is_file("view/theme/$theme/theme.php")) {
|
||||
return $info;
|
||||
}
|
||||
|
||||
$a = get_app();
|
||||
$stamp1 = microtime(true);
|
||||
$f = file_get_contents("view/theme/$theme/theme.php");
|
||||
$theme_file = file_get_contents("view/theme/$theme/theme.php");
|
||||
$a->save_timestamp($stamp1, "file");
|
||||
|
||||
$r = preg_match("|/\*.*\*/|msU", $f, $m);
|
||||
$result = preg_match("|/\*.*\*/|msU", $theme_file, $matches);
|
||||
|
||||
if ($r) {
|
||||
$ll = explode("\n", $m[0]);
|
||||
foreach ( $ll as $l ) {
|
||||
$l = trim($l,"\t\n\r */");
|
||||
if ($l != "") {
|
||||
list($k, $v) = array_map("trim", explode(":", $l, 2));
|
||||
$k= strtolower($k);
|
||||
if ($k == "author") {
|
||||
|
||||
$r=preg_match("|([^<]+)<([^>]+)>|", $v, $m);
|
||||
if ($r) {
|
||||
$info['author'][] = ['name'=>$m[1], 'link'=>$m[2]];
|
||||
if ($result) {
|
||||
$comment_lines = explode("\n", $matches[0]);
|
||||
foreach ($comment_lines as $comment_line) {
|
||||
$comment_line = trim($comment_line, "\t\n\r */");
|
||||
if ($comment_line != "") {
|
||||
list($key, $value) = array_map("trim", explode(":", $comment_line, 2));
|
||||
$key = strtolower($key);
|
||||
if ($key == "author") {
|
||||
$result = preg_match("|([^<]+)<([^>]+)>|", $value, $matches);
|
||||
if ($result) {
|
||||
$info['author'][] = ['name' => $matches[1], 'link' => $matches[2]];
|
||||
} else {
|
||||
$info['author'][] = ['name'=>$v];
|
||||
$info['author'][] = ['name' => $value];
|
||||
}
|
||||
} elseif ($k == "maintainer") {
|
||||
$r=preg_match("|([^<]+)<([^>]+)>|", $v, $m);
|
||||
if ($r) {
|
||||
$info['maintainer'][] = ['name'=>$m[1], 'link'=>$m[2]];
|
||||
} elseif ($key == "maintainer") {
|
||||
$result = preg_match("|([^<]+)<([^>]+)>|", $value, $matches);
|
||||
if ($result) {
|
||||
$info['maintainer'][] = ['name' => $matches[1], 'link' => $matches[2]];
|
||||
} else {
|
||||
$info['maintainer'][] = ['name'=>$v];
|
||||
}
|
||||
} else {
|
||||
if (array_key_exists($k, $info)) {
|
||||
$info[$k] = $v;
|
||||
$info['maintainer'][] = ['name' => $value];
|
||||
}
|
||||
} elseif (array_key_exists($key, $info)) {
|
||||
$info[$key] = $value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -99,7 +94,7 @@ class Theme
|
|||
*/
|
||||
public static function getScreenshot($theme)
|
||||
{
|
||||
$exts = ['.png','.jpg'];
|
||||
$exts = ['.png', '.jpg'];
|
||||
foreach ($exts as $ext) {
|
||||
if (file_exists('view/theme/' . $theme . '/screenshot' . $ext)) {
|
||||
return(System::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext);
|
||||
|
@ -113,7 +108,7 @@ class Theme
|
|||
{
|
||||
logger("Addons: uninstalling theme " . $theme);
|
||||
|
||||
include_once("view/theme/$theme/theme.php");
|
||||
include_once "view/theme/$theme/theme.php";
|
||||
if (function_exists("{$theme}_uninstall")) {
|
||||
$func = "{$theme}_uninstall";
|
||||
$func();
|
||||
|
@ -124,13 +119,13 @@ class Theme
|
|||
{
|
||||
// silently fail if theme was removed
|
||||
|
||||
if (! file_exists("view/theme/$theme/theme.php")) {
|
||||
if (!file_exists("view/theme/$theme/theme.php")) {
|
||||
return false;
|
||||
}
|
||||
|
||||
logger("Addons: installing theme $theme");
|
||||
|
||||
include_once("view/theme/$theme/theme.php");
|
||||
include_once "view/theme/$theme/theme.php";
|
||||
|
||||
if (function_exists("{$theme}_install")) {
|
||||
$func = "{$theme}_install";
|
||||
|
@ -140,7 +135,6 @@ class Theme
|
|||
logger("Addons: FAILED installing theme $theme");
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -159,18 +153,18 @@ class Theme
|
|||
$file = basename($file);
|
||||
|
||||
// Make sure $root ends with a slash / if it's not blank
|
||||
if ($root !== '' && $root[strlen($root)-1] !== '/') {
|
||||
if ($root !== '' && $root[strlen($root) - 1] !== '/') {
|
||||
$root = $root . '/';
|
||||
}
|
||||
$theme_info = get_app()->theme_info;
|
||||
if (is_array($theme_info) && array_key_exists('extends',$theme_info)) {
|
||||
if (is_array($theme_info) && array_key_exists('extends', $theme_info)) {
|
||||
$parent = $theme_info['extends'];
|
||||
} else {
|
||||
$parent = 'NOPATH';
|
||||
}
|
||||
$theme = current_theme();
|
||||
$thname = $theme;
|
||||
$ext = substr($file,strrpos($file,'.')+1);
|
||||
$ext = substr($file, strrpos($file, '.') + 1);
|
||||
$paths = [
|
||||
"{$root}view/theme/$thname/$ext/$file",
|
||||
"{$root}view/theme/$parent/$ext/$file",
|
||||
|
@ -178,7 +172,7 @@ class Theme
|
|||
];
|
||||
foreach ($paths as $p) {
|
||||
// strpos() is faster than strstr when checking if one string is in another (http://php.net/manual/en/function.strstr.php)
|
||||
if (strpos($p,'NOPATH') !== false) {
|
||||
if (strpos($p, 'NOPATH') !== false) {
|
||||
continue;
|
||||
} elseif (file_exists($p)) {
|
||||
return $p;
|
||||
|
|
Loading…
Reference in New Issue
Block a user