diff --git a/actions/admin/settings/100.panel.php b/actions/admin/settings/100.panel.php index 690081b9..a8ec8bba 100644 --- a/actions/admin/settings/100.panel.php +++ b/actions/admin/settings/100.panel.php @@ -93,23 +93,6 @@ return array( 'option_options' => array('Manual' => $lng['serversettings']['manual'], 'Dropdown' => $lng['serversettings']['dropdown']), 'save_method' => 'storeSettingField', ), - 'use_webfonts' => array( - 'label' => $lng['serversettings']['enablewebfonts'], - 'settinggroup' => 'panel', - 'varname' => 'use_webfonts', - 'type' => 'bool', - 'default' => true, - 'save_method' => 'storeSettingField', - ), - 'webfont' => array( - 'label' => $lng['serversettings']['definewebfont']['title'], - 'settinggroup' => 'panel', - 'varname' => 'webfont', - 'type' => 'string', - 'default' => 'Numans', - 'string_emptyallowed' => false, - 'save_method' => 'storeSettingField', - ), 'panel_adminmail' => array( 'label' => $lng['serversettings']['adminmail'], 'settinggroup' => 'panel', diff --git a/install/froxlor.sql b/install/froxlor.sql index 4c54fe76..adee90ea 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -525,8 +525,6 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'allow_preset', '1'), ('panel', 'allow_preset_admin', '0'), ('panel', 'password_regex', ''), - ('panel', 'use_webfonts', '0'), - ('panel', 'webfont', 'Numans'), ('panel', 'phpconfigs_hidestdsubdomain', '0'), ('panel', 'allow_theme_change_admin', '1'), ('panel', 'allow_theme_change_customer', '1'), diff --git a/install/templates/header.tpl b/install/templates/header.tpl index fb85ab92..b06e6422 100755 --- a/install/templates/header.tpl +++ b/install/templates/header.tpl @@ -8,11 +8,6 @@ Froxlor Server Management Panel - Installation -
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 28d6111a..49587fa8 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -2832,5 +2832,10 @@ if (isFroxlorVersion('0.9.33-dev3')) { Database::query("ALTER TABLE `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` MODIFY `ssl_cert_chainfile` text"); lastStepStatus(0); + showUpdateStep("Removing old settings"); + Database::query("DELETE FROM `".TABLE_PANEL_SETTINGS."` WHERE `settinggroup`='panel' AND `varname` = 'use_webfonts';"); + Database::query("DELETE FROM `".TABLE_PANEL_SETTINGS."` WHERE `settinggroup`='panel' AND `varname` = 'webfont';"); + lastStepStatus(0); + updateToVersion('0.9.33-rc1'); } diff --git a/lib/init.php b/lib/init.php index 6b63dc5d..927c4ea1 100644 --- a/lib/init.php +++ b/lib/init.php @@ -487,7 +487,6 @@ if (Settings::Get('ticket.enabled') == '1') { } } -$webfont = str_replace('+', ' ', Settings::Get('panel.webfont')); $js = ""; if (array_key_exists('js', $_themeoptions['variants'][$themevariant]) && is_array($_themeoptions['variants'][$themevariant]['js'])) { foreach ($_themeoptions['variants'][$themevariant]['js'] as $jsfile) { diff --git a/lng/english.lng.php b/lng/english.lng.php index 9a6943c3..336bc384 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1685,10 +1685,6 @@ $lng['serversettings']['apache_24']['description'] = 'ATTENT $lng['admin']['tickets_see_all'] = 'Can see all ticket-categories?'; $lng['serversettings']['nginx_fastcgiparams']['title'] = 'Path to fastcgi_params file'; $lng['serversettings']['nginx_fastcgiparams']['description'] = 'Specify the path to nginx\'s fastcgi_params file including filename'; -$lng['serversettings']['enablewebfonts']['title'] = 'Enable usage of a google webfont for the panel'; -$lng['serversettings']['enablewebfonts']['description'] = 'If enabled, the defined webfont is being used for the font-display'; -$lng['serversettings']['definewebfont']['title'] = 'Define a google-webfont for the panel'; -$lng['serversettings']['definewebfont']['description'] = 'If enabled, this wefont will be used for the font-display.
Note: replace spaces with the "+" sign, e.g. "Open+Sans"'; // Added in Froxlor 0.9.28-rc2 $lng['serversettings']['documentroot_use_default_value']['title'] = 'Use domain name as default value for DocumentRoot path'; diff --git a/lng/german.lng.php b/lng/german.lng.php index e60bca8a..723a1382 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1410,10 +1410,6 @@ $lng['serversettings']['apache_24']['description'] = '
Achtung: $lng['admin']['tickets_see_all'] = 'Kann alle Ticket-Kategorien sehen?'; $lng['serversettings']['nginx_fastcgiparams']['title'] = 'Pfad zur fastcgi_params Datei'; $lng['serversettings']['nginx_fastcgiparams']['description'] = 'Geben Sie den Pfad zu nginx\'s fastcgi_params Datei an. Inklusive Dateiname!'; -$lng['serversettings']['enablewebfonts']['title'] = 'Verwende Google Webfonts im Panel'; -$lng['serversettings']['enablewebfonts']['description'] = 'Wenn aktiviert, wird die angegebene Google-Schriftart eingebunden und verwendet'; -$lng['serversettings']['definewebfont']['title'] = 'Google Webfont festlegen'; -$lng['serversettings']['definewebfont']['description'] = 'Wenn aktiviert, wird diese Schriftart im Panel verwendet.
Hinweis: Leerzeichen bitte mit einem "+" ersetzen, z. B. "Open+Sans"'; // Added in Froxlor 0.9.28-rc2 $lng['serversettings']['documentroot_use_default_value']['title'] = 'Verwende Domainnamen im Documentroot'; diff --git a/templates/Sparkle/header.tpl b/templates/Sparkle/header.tpl index 93fee956..05aa5360 100644 --- a/templates/Sparkle/header.tpl +++ b/templates/Sparkle/header.tpl @@ -21,9 +21,6 @@ - - - {$css} @@ -32,11 +29,6 @@ <if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor Server Management Panel - - - diff --git a/templates/Sparkle/index.tpl b/templates/Sparkle/index.tpl index 558c9cc6..8889e132 100644 --- a/templates/Sparkle/index.tpl +++ b/templates/Sparkle/index.tpl @@ -7,9 +7,6 @@ {/if} - {if $use_webfonts == 1} - - {/if} @@ -19,11 +16,6 @@ {$title}Froxlor Server Management Panel - {if $use_webfonts == 1} - - {/if} diff --git a/templates/Sparkle/misc/alreadyinstalledhint.tpl b/templates/Sparkle/misc/alreadyinstalledhint.tpl index 928c0743..3c30ead7 100644 --- a/templates/Sparkle/misc/alreadyinstalledhint.tpl +++ b/templates/Sparkle/misc/alreadyinstalledhint.tpl @@ -6,15 +6,8 @@ - - Froxlor Server Management Panel - Installation -
diff --git a/templates/Sparkle/misc/configurehint.tpl b/templates/Sparkle/misc/configurehint.tpl index 4c465aef..f2395de4 100644 --- a/templates/Sparkle/misc/configurehint.tpl +++ b/templates/Sparkle/misc/configurehint.tpl @@ -6,15 +6,8 @@ - - Froxlor Server Management Panel - Installation -
diff --git a/templates/Sparkle/misc/dberrornice.tpl b/templates/Sparkle/misc/dberrornice.tpl index eb1d5f8d..24abe9d1 100644 --- a/templates/Sparkle/misc/dberrornice.tpl +++ b/templates/Sparkle/misc/dberrornice.tpl @@ -6,15 +6,8 @@ - - Froxlor Server Management Panel - Database error -
diff --git a/templates/Sparkle/misc/ownershiphint.tpl b/templates/Sparkle/misc/ownershiphint.tpl index 74a98275..675c95c0 100644 --- a/templates/Sparkle/misc/ownershiphint.tpl +++ b/templates/Sparkle/misc/ownershiphint.tpl @@ -6,15 +6,8 @@ - - Froxlor Server Management Panel - Installation -
diff --git a/templates/Sparkle/webftp/webftp_main_prompt.tpl b/templates/Sparkle/webftp/webftp_main_prompt.tpl index ffcfdf44..8a23ccf3 100644 --- a/templates/Sparkle/webftp/webftp_main_prompt.tpl +++ b/templates/Sparkle/webftp/webftp_main_prompt.tpl @@ -1,11 +1,3 @@ - diff --git a/webftp.php b/webftp.php index 965d02ea..97d9ced3 100644 --- a/webftp.php +++ b/webftp.php @@ -83,8 +83,6 @@ if (file_exists($hl_path.'/logo_custom.png')) { $smarty->assign('header_logo', $header_logo); $smarty->assign('theme', $theme); $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('version', Settings::Get('panel.version'));
{$action_text|escape:'htmlall'|nl2br}