nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix formatting in Core\Theme

Browse source
This commit is contained in:
Hypolite Petovan 2018-04-28 18:28:23 -04:00
parent 66e5586d21
commit acbc733dce
1 changed files with 153 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/Core/Theme.php
View file

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