|
|
@@ -80,9 +80,9 @@ class Page { |
|
|
|
); |
|
|
|
|
|
|
|
$folder->prepare_files(); |
|
|
|
if($folder->extras['colors']) { |
|
|
|
$folder->structs['default']['txt']['colors']=$folder->extras['colors']; |
|
|
|
} |
|
|
|
|
|
|
|
$this->register_key('backgroundColor',$folder); |
|
|
|
|
|
|
|
$folder->fill_content(); |
|
|
|
foreach($f3->get('siteColors') as $k=>$v){ |
|
|
|
$f3->set($k, |
|
|
@@ -96,7 +96,7 @@ class Page { |
|
|
|
? $folder->config['includeBanner'] |
|
|
|
: $f3->get('templateVars.includeBanner') |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
if ($f3->get('hasBanner')) { |
|
|
|
$banner = new \Modules\CachedImage($folder->extras['banner']); |
|
|
|
$f3->set('banner',$banner->get_src(2000)); |
|
|
@@ -166,6 +166,12 @@ class Page { |
|
|
|
/////////////////////// |
|
|
|
// Utility functions // |
|
|
|
/////////////////////// |
|
|
|
function register_key($name, &$ff) { |
|
|
|
$f3 = \Base::instance(); |
|
|
|
if (array_key_exists($name,$ff->config)) { |
|
|
|
$f3->set($name,$ff->config[$name]); |
|
|
|
} |
|
|
|
} |
|
|
|
function linkify($string) { |
|
|
|
$pattern = "/\s@(\w+)[=]([\w,]+)\s/"; |
|
|
|
$count = 0; |