maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

migrate webftp stuff to new settings-class, refs #1325

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-16 11:03:09 +01:00
parent 164b40fef3
commit 37a242a679
4 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/functions/formfields/function.getFormFieldOutput.php
View File

@@ -17,32 +17,26 @@
* *
*/ */
function getFormFieldOutput($fieldname, $fielddata) function getFormFieldOutput($fieldname, $fielddata) {
{
global $settings, $theme;
$returnvalue = ''; $returnvalue = '';
if(is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('getFormFieldOutput' . ucfirst($fielddata['type']))) if (is_array($fielddata)
{ && isset($fielddata['type'])
if(isset($fielddata['label']) && is_array($fielddata['label'])) && $fielddata['type'] != ''
{ && function_exists('getFormFieldOutput' . ucfirst($fielddata['type']))
if(isset($fielddata['label']['title']) && isset($fielddata['label']['description'])) ) {
{ if (isset($fielddata['label']) && is_array($fielddata['label'])) {
if (isset($fielddata['label']['title']) && isset($fielddata['label']['description'])) {
$fielddata['label'] = '<b>' . $fielddata['label']['title'] . '</b><br />' . $fielddata['label']['description']; $fielddata['label'] = '<b>' . $fielddata['label']['title'] . '</b><br />' . $fielddata['label']['description'];
} } else {
else
{
$fielddata['label'] = implode(' ', $fielddata['label']); $fielddata['label'] = implode(' ', $fielddata['label']);
} }
} }
if(!isset($fielddata['value']))
{ if (!isset($fielddata['value'])) {
if(isset($fielddata['default'])) if (isset($fielddata['default'])) {
{
$fielddata['value'] = $fielddata['default']; $fielddata['value'] = $fielddata['default'];
} } else {
else
{
$fielddata['value'] = null; $fielddata['value'] = null;
} }
} }
@@ -53,17 +47,14 @@ function getFormFieldOutput($fieldname, $fielddata)
* is not the case, we change the setting type to "hidden", #502 * is not the case, we change the setting type to "hidden", #502
*/ */
$do_show = true; $do_show = true;
if(isset($fielddata['websrv_avail']) && is_array($fielddata['websrv_avail'])) if (isset($fielddata['websrv_avail']) && is_array($fielddata['websrv_avail'])) {
{ $websrv = Settings::Get('system.webserver');
$websrv = $settings['system']['webserver']; if (!in_array($websrv, $fielddata['websrv_avail'])) {
if(!in_array($websrv, $fielddata['websrv_avail']))
{
$do_show = false; $do_show = false;
} }
} }
if($do_show) if ($do_show) {
{
$returnvalue = call_user_func('getFormFieldOutput' . ucfirst($fielddata['type']), $fieldname, $fielddata); $returnvalue = call_user_func('getFormFieldOutput' . ucfirst($fielddata['type']), $fieldname, $fielddata);
} }
} }

10
templates/Froxlor/index.tpl
View File

@@ -3,12 +3,12 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta http-equiv="Default-Style" content="text/css" /> <meta http-equiv="Default-Style" content="text/css" />
{if $settings.panel.no_robots == 0} {if $no_robots == 0}
<meta name="robots" content="noindex, nofollow, noarchive" /> <meta name="robots" content="noindex, nofollow, noarchive" />
<meta name="GOOGLEBOT" content="nosnippet" /> <meta name="GOOGLEBOT" content="nosnippet" />
{/if} {/if}
{if $settings.panel.use_webfonts == 1} {if $use_webfonts == 1}
<link href="//fonts.googleapis.com/css?family={$settings.panel.webfont}" rel="stylesheet"> <link href="//fonts.googleapis.com/css?family={$webfont}" rel="stylesheet">
{/if} {/if}
<link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" /> <link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
<link rel="stylesheet" href="templates/{$theme}/assets/css/main.css" /> <link rel="stylesheet" href="templates/{$theme}/assets/css/main.css" />
@@ -19,7 +19,7 @@
<title>{$title}Froxlor Server Management Panel</title> <title>{$title}Froxlor Server Management Panel</title>
<style type="text/css"> <style type="text/css">
body { body {
font-family: {if $settings.panel.use_webfonts == 1}{$webfont},{/if} Verdana, Geneva, sans-serif; font-family: {if $use_webfonts == 1}{$webfont},{/if} Verdana, Geneva, sans-serif;
} }
</style> </style>
</head> </head>
@@ -45,7 +45,7 @@
</div> </div>
<footer> <footer>
<span>Froxlor <span>Froxlor
{if ($settings.admin.show_version_login == '1' && $loggedin == 0) || ($settings.admin.show_version_footer == '1' && $loggedin == 1)} {if ($show_version_login == '1' && $loggedin == 0) || ($show_version_footer == '1' && $loggedin == 1)}
{$version}{$branding} {$version}{$branding}
{/if} {/if}
&copy; 2009-{$current_year} by <a href="http://www.froxlor.org/" rel="external">{t}the Froxlor Team{/t}</a> &copy; 2009-{$current_year} by <a href="http://www.froxlor.org/" rel="external">{t}the Froxlor Team{/t}</a>

10
templates/Sparkle/index.tpl vendored
View File

@@ -3,12 +3,12 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta http-equiv="Default-Style" content="text/css" /> <meta http-equiv="Default-Style" content="text/css" />
{if $settings.panel.no_robots == 0} {if $no_robots == 0}
<meta name="robots" content="noindex, nofollow, noarchive" /> <meta name="robots" content="noindex, nofollow, noarchive" />
<meta name="GOOGLEBOT" content="nosnippet" /> <meta name="GOOGLEBOT" content="nosnippet" />
{/if} {/if}
{if $settings.panel.use_webfonts == 1} {if $use_webfonts == 1}
<link href="//fonts.googleapis.com/css?family={$settings.panel.webfont}" rel="stylesheet"> <link href="//fonts.googleapis.com/css?family={$webfont}" rel="stylesheet">
{/if} {/if}
<link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" /> <link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
<link rel="stylesheet" href="templates/{$theme}/assets/css/main.css" /> <link rel="stylesheet" href="templates/{$theme}/assets/css/main.css" />
@@ -19,7 +19,7 @@
<title>{$title}Froxlor Server Management Panel</title> <title>{$title}Froxlor Server Management Panel</title>
<style type="text/css"> <style type="text/css">
body { body {
font-family: {if $settings.panel.use_webfonts == 1}{$webfont},{/if} Verdana, Geneva, sans-serif; font-family: {if $use_webfonts == 1}{$webfont},{/if} Verdana, Geneva, sans-serif;
} }
</style> </style>
</head> </head>
@@ -51,7 +51,7 @@
{/if} {/if}
<footer> <footer>
<span>Froxlor <span>Froxlor
{if ($settings.admin.show_version_login == '1' && $loggedin == 0) || ($settings.admin.show_version_footer == '1' && $loggedin == 1)} {if ($show_version_login == '1' && $loggedin == 0) || ($show_version_footer == '1' && $loggedin == 1)}
{$version}{$branding} {$version}{$branding}
{/if} {/if}
&copy; 2009-{$current_year} by <a href="http://www.froxlor.org/" rel="external">{t}the Froxlor Team{/t}</a> &copy; 2009-{$current_year} by <a href="http://www.froxlor.org/" rel="external">{t}the Froxlor Team{/t}</a>

10
webftp.php
View File

@@ -50,7 +50,7 @@ if (!function_exists("ftp_connect")) {
include(FROXLOR_INSTALL_DIR.'/lib/classes/Smarty/Smarty.class.php'); include(FROXLOR_INSTALL_DIR.'/lib/classes/Smarty/Smarty.class.php');
$smarty = new Smarty; $smarty = new Smarty;
$smarty->template_dir = './templates/' . $settings['panel']['default_theme'] . '/'; $smarty->template_dir = './templates/' . Settings::Get('panel.default_theme') . '/';
$smarty->compile_dir = './templates_c/'; $smarty->compile_dir = './templates_c/';
$smarty->cache_dir = './cache/'; $smarty->cache_dir = './cache/';
@@ -65,7 +65,7 @@ define('HAVE_GETTEXT', true);
require (FROXLOR_INSTALL_DIR.'/lib/functions/smarty_plugins/gettext-prefilter.php'); require (FROXLOR_INSTALL_DIR.'/lib/functions/smarty_plugins/gettext-prefilter.php');
// global Theme-variable // global Theme-variable
$theme = $settings['panel']['default_theme']; $theme = Settings::Get('panel.default_theme');
if (file_exists($hl_path.'/logo_custom.png')) { if (file_exists($hl_path.'/logo_custom.png')) {
$header_logo = $hl_path.'/logo_custom.png'; $header_logo = $hl_path.'/logo_custom.png';
@@ -73,7 +73,11 @@ if (file_exists($hl_path.'/logo_custom.png')) {
$smarty->assign('header_logo', $header_logo); $smarty->assign('header_logo', $header_logo);
$smarty->assign('theme', $theme); $smarty->assign('theme', $theme);
$smarty->assign('settings', $settings); $smarty->assign('no_robots', Settings::Get('panel.no_robots'));
$smarty->assign('use_webfonts', Settings::Get('panel.use_webfonts'));
$smarty->assign('webfont', Settings::Get('panel.webfont'));
$smarty->assign('show_version_login', Settings::Get('admin.show_version_login'));
$smarty->assign('show_version_footer', Settings::Get('admin.show_version_footer'));
$smarty->assign('loggedin', 0); $smarty->assign('loggedin', 0);
$smarty->assign('current_year', date('Y')); $smarty->assign('current_year', date('Y'));
$smarty->assign('title', 'WebFTP - '); $smarty->assign('title', 'WebFTP - ');