From 6629da68cdd37aa1eb7ee2858a24f1c9caca9d0c Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Fri, 22 Jan 2010 14:12:23 +0000 Subject: [PATCH] More renaming SysCP -> Froxlor (installer defaults, header - graphic - setting - name) --- actions/admin/settings/100.panel.php | 8 ++++---- install/froxlor.sql | 4 ++-- install/install.php | 6 +++--- install/lng/english.lng.php | 2 +- install/updates/froxlor/upgrade_syscp.inc.php | 2 ++ lng/english.lng.php | 4 ++-- lng/german.lng.php | 4 ++-- lng/portugues.lng.php | 4 ++-- templates/header.tpl | 2 +- 9 files changed, 19 insertions(+), 17 deletions(-) diff --git a/actions/admin/settings/100.panel.php b/actions/admin/settings/100.panel.php index 57ae88a7..ba1fdd21 100644 --- a/actions/admin/settings/100.panel.php +++ b/actions/admin/settings/100.panel.php @@ -131,10 +131,10 @@ return array( 'default' => false, 'save_method' => 'storeSettingField', ), - 'admin_syscp_graphic' => array( - 'label' => $lng['admin']['syscp_graphic'], + 'admin_froxlor_graphic' => array( + 'label' => $lng['admin']['froxlor_graphic'], 'settinggroup' => 'admin', - 'varname' => 'syscp_graphic', + 'varname' => 'froxlor_graphic', 'type' => 'string', 'default' => '', 'save_method' => 'storeSettingField', @@ -160,4 +160,4 @@ return array( ), ); -?> \ No newline at end of file +?> diff --git a/install/froxlor.sql b/install/froxlor.sql index 8ddb6b8b..76bbfd74 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -1,4 +1,4 @@ -# $Id: syscp.sql 2722 2009-05-04 18:59:28Z flo $ +# $Id$ # -------------------------------------------------------- # @@ -526,7 +526,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (95, 'autoresponder', 'last_autoresponder_run', '0'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (96, 'admin', 'show_version_login', '0'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (97, 'admin', 'show_version_footer', '0'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (98, 'admin', 'syscp_graphic', 'images/header.gif'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (98, 'admin', 'froxlor_graphic', 'images/header.gif'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (99, 'system', 'mod_fcgid_wrapper', '0'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (100, 'system', 'mod_fcgid_starter', '0'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (101, 'system', 'mod_fcgid_peardir', '/usr/share/php/:/usr/share/php5/'); diff --git a/install/install.php b/install/install.php index 559d7d12..27bfdd91 100644 --- a/install/install.php +++ b/install/install.php @@ -222,7 +222,7 @@ if(!empty($_POST['mysql_database'])) } else { - $mysql_database = 'syscp'; + $mysql_database = 'froxlor'; } if(!empty($_POST['mysql_unpriv_user'])) @@ -231,7 +231,7 @@ if(!empty($_POST['mysql_unpriv_user'])) } else { - $mysql_unpriv_user = 'syscp'; + $mysql_unpriv_user = 'froxlor'; } if(!empty($_POST['mysql_unpriv_pass'])) @@ -697,7 +697,7 @@ if(isset($_POST['installstep']) ?> -
+
diff --git a/install/lng/english.lng.php b/install/lng/english.lng.php index 7e5d9ec2..402f6ee3 100644 --- a/install/lng/english.lng.php +++ b/install/lng/english.lng.php @@ -70,7 +70,7 @@ $lng['install']['notinstalled'] = 'not installed!'; $lng['install']['phpbcmath'] = 'Testing if PHP bcmath-extension is installed...'; $lng['install']['bcmathdescription'] = 'Traffic-calculation related functions will not work correctly!'; $lng['install']['openbasedir'] = 'Testing if open_basedir is enabled...'; -$lng['install']['openbasedirenabled'] = 'enabled. Froxlor will not work properly with open_basedir enabled. Please disable open_basedir for syscp'; +$lng['install']['openbasedirenabled'] = 'enabled. Froxlor will not work properly with open_basedir enabled. Please disable open_basedir for Froxlor'; /** * Renamed in 1.2.19-svn40 diff --git a/install/updates/froxlor/upgrade_syscp.inc.php b/install/updates/froxlor/upgrade_syscp.inc.php index b38a32b9..e9066a7d 100644 --- a/install/updates/froxlor/upgrade_syscp.inc.php +++ b/install/updates/froxlor/upgrade_syscp.inc.php @@ -249,6 +249,8 @@ if($settings['panel']['frontend'] == 'froxlor' } } } + + $db->query("UPDATE `panel_settings` SET `varname` = 'froxlor_graphic' WHERE `varname` = 'syscp_graphic'"); } ?> diff --git a/lng/english.lng.php b/lng/english.lng.php index ddb1093c..b06412ea 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -957,8 +957,8 @@ $lng['admin']['show_version_login']['title'] = 'Show Froxlor version on login'; $lng['admin']['show_version_login']['description'] = 'Show the Froxlor version in the footer on the login page'; $lng['admin']['show_version_footer']['title'] = 'Show Froxlor version in footer'; $lng['admin']['show_version_footer']['description'] = 'Show the Froxlor version in the footer on the rest of the pages'; -$lng['admin']['syscp_graphic']['title'] = 'Header graphic for SysCP'; -$lng['admin']['syscp_graphic']['description'] = 'What graphic should be shown in the header'; +$lng['admin']['froxlor_graphic']['title'] = 'Header graphic for Froxlor'; +$lng['admin']['froxlor_graphic']['description'] = 'What graphic should be shown in the header'; //improved syscp diff --git a/lng/german.lng.php b/lng/german.lng.php index fe394a47..e6f1b649 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -960,8 +960,8 @@ $lng['admin']['show_version_login']['title'] = 'Zeige Froxlor Version beim Login $lng['admin']['show_version_login']['description'] = 'Zeige Froxlor Version in der Fußzeile der Loginseite'; $lng['admin']['show_version_footer']['title'] = 'Zeige Froxlor Version in Fußzeile'; $lng['admin']['show_version_footer']['description'] = 'Zeige Froxlor Version in der Fußzeile aller anderen Seiten'; -$lng['admin']['syscp_graphic']['title'] = 'Grafik im Kopfbereich des Panels'; -$lng['admin']['syscp_graphic']['description'] = 'Welche Grafik soll im Kopfbereich des Panels anstatt des Froxlor Logos angezeigt werden?'; +$lng['admin']['froxlor_graphic']['title'] = 'Grafik im Kopfbereich des Panels'; +$lng['admin']['froxlor_graphic']['description'] = 'Welche Grafik soll im Kopfbereich des Panels anstatt des Froxlor Logos angezeigt werden?'; //improved syscp diff --git a/lng/portugues.lng.php b/lng/portugues.lng.php index 580dbf1c..7338c076 100644 --- a/lng/portugues.lng.php +++ b/lng/portugues.lng.php @@ -977,8 +977,8 @@ $lng['admin']['show_version_login']['title'] = 'Mostrar versão do SysCP n $lng['admin']['show_version_login']['description'] = 'Mostar a versão do SysCP no rodapé da página de login'; $lng['admin']['show_version_footer']['title'] = 'Mostar versão do SysCP no rodapé'; $lng['admin']['show_version_footer']['description'] = 'Mostar a versão do SysCP no rodapé do resto das páginas'; -$lng['admin']['syscp_graphic']['title'] = 'Cabeçalho gráfico do SyCP'; -$lng['admin']['syscp_graphic']['description'] = 'Quais gráficos devem aparece no topor'; +$lng['admin']['froxlor_graphic']['title'] = 'Cabeçalho gráfico do Froxlor'; +$lng['admin']['froxlor_graphic']['description'] = 'Quais gráficos devem aparece no topor'; $lng['menue']['phpsettings']['maintitle'] = 'Configurações do PHP'; $lng['admin']['phpsettings']['title'] = 'Configurações do PHP'; $lng['admin']['phpsettings']['description'] = 'Descrição'; diff --git a/templates/header.tpl b/templates/header.tpl index a2ef028d..2a84dfe2 100644 --- a/templates/header.tpl +++ b/templates/header.tpl @@ -22,7 +22,7 @@ // --> - +