MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[frio] Fix typo schema -> scheme

Browse source
This commit is contained in:
Hypolite Petovan 2018-04-24 20:26:14 -04:00
commit 3bfa6facfc
12 changed files with 71 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

8
view/theme/frio/php/default.php
View file

@ -43,10 +43,10 @@ if (!isset($minimal)) {
if (is_null($uid)) {
$uid = Profile::getThemeUid();
}
$schema = PConfig::get($uid, 'frio', 'schema');
if (($schema) && ($schema != '---')) {
if (file_exists('view/theme/frio/schema/' . $schema . '.php')) {
$schemefile = 'view/theme/frio/schema/' . $schema . '.php';
$scheme = PConfig::get($uid, 'frio', 'scheme');
if (($scheme) && ($scheme != '---')) {
if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
$schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
require_once $schemefile;
}
} else {

26
view/theme/frio/php/schema.php → view/theme/frio/php/scheme.php
View file

@ -1,41 +1,41 @@
<?php
/**
* @brief: Get info header of the shema
* @brief: Get info header of the scheme
*
* This function parses the header of the shemename.php file for inormations like
* This function parses the header of the schemename.php file for informations like
* Author, Description and Overwrites. Most of the code comes from the Addon::getInfo()
* function. We use this to get the variables which get overwritten through the shema.
* function. We use this to get the variables which get overwritten through the scheme.
* All color variables which get overwritten through the theme have to be
* listed (comma seperated) in the shema header under Overwrites:
* This seemst not to be the best solution. We need to investigate further.
* listed (comma separated) in the scheme header under Overwrites:
* This seems not to be the best solution. We need to investigate further.
*
* @param string $schema Name of the shema
* @param string $scheme Name of the scheme
* @return array With theme information
* 'author' => Author Name
* 'description' => Schema description
* 'version' => Schema version
* 'description' => Scheme description
* 'version' => Scheme version
* 'overwrites' => Variables which overwriting custom settings
*/
use Friendica\Core\PConfig;
function get_schema_info($schema)
function get_scheme_info($scheme)
{
$theme = current_theme();
$themepath = 'view/theme/' . $theme . '/';
$schema = PConfig::get(local_user(), 'frio', 'schema');
$scheme = PConfig::get(local_user(), 'frio', 'scheme');
$info = [
'name' => $schema,
'name' => $scheme,
'description' => '',
'author' => [],
'version' => '',
'overwrites' => []
];
if (!is_file($themepath . 'schema/' . $schema . '.php')) return $info;
if (!is_file($themepath . 'scheme/' . $scheme . '.php')) return $info;
$f = file_get_contents($themepath . 'schema/' . $schema . '.php');
$f = file_get_contents($themepath . 'scheme/' . $scheme . '.php');
$r = preg_match('|/\*.*\*/|msU', $f, $m);