1
0
Fork 0

Issue-#3873

Replace deprecated functions with new syntax.
This commit is contained in:
Adam Magness 2017-11-06 21:22:52 -05:00
commit 0dfa57948f
124 changed files with 819 additions and 679 deletions

View file

@ -5,6 +5,8 @@
*/
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System;
function theme_content(App $a) {
@ -12,7 +14,7 @@ function theme_content(App $a) {
return;
}
$colorset = get_pconfig( local_user(), 'duepuntozero', 'colorset');
$colorset = PConfig::get( local_user(), 'duepuntozero', 'colorset');
$user = true;
return clean_form($a, $colorset, $user);
@ -24,12 +26,12 @@ function theme_post(App $a) {
}
if (isset($_POST['duepuntozero-settings-submit'])){
set_pconfig(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
PConfig::set(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
}
}
function theme_admin(App $a) {
$colorset = get_config( 'duepuntozero', 'colorset');
$colorset = Config::get( 'duepuntozero', 'colorset');
$user = false;
return clean_form($a, $colorset, $user);
@ -37,7 +39,7 @@ function theme_admin(App $a) {
function theme_admin_post(App $a) {
if (isset($_POST['duepuntozero-settings-submit'])){
set_config('duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
Config::set('duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
}
}
@ -54,9 +56,9 @@ function clean_form(App $a, &$colorset, $user) {
);
if ($user) {
$color = get_pconfig(local_user(), 'duepuntozero', 'colorset');
$color = PConfig::get(local_user(), 'duepuntozero', 'colorset');
} else {
$color = get_config( 'duepuntozero', 'colorset');
$color = Config::get( 'duepuntozero', 'colorset');
}
$t = get_markup_template("theme_settings.tpl" );

View file

@ -1,11 +1,15 @@
<?php
use Friendica\Core\Config;
use Friendica\Core\PConfig;
if (file_exists("$THEMEPATH/style.css")){
echo file_get_contents("$THEMEPATH/style.css");
}
$uid = get_theme_uid();
$s_colorset = get_config('duepuntozero','colorset');
$colorset = get_pconfig( $uid, 'duepuntozero', 'colorset');
$s_colorset = Config::get('duepuntozero','colorset');
$colorset = PConfig::get( $uid, 'duepuntozero', 'colorset');
if (!x($colorset))
$colorset = $s_colorset;

View file

@ -1,14 +1,16 @@
<?php
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
function duepuntozero_init(App $a) {
set_template_engine($a, 'smarty3');
$colorset = get_pconfig( local_user(), 'duepuntozero','colorset');
$colorset = PConfig::get( local_user(), 'duepuntozero','colorset');
if (!$colorset)
$colorset = get_config('duepuntozero', 'colorset'); // user setting have priority, then node settings
$colorset = Config::get('duepuntozero', 'colorset'); // user setting have priority, then node settings
if ($colorset) {
if ($colorset == 'greenzero')
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/greenzero.css" type="text/css" media="screen" />'."\n";