diff --git a/install/froxlor.sql b/install/froxlor.sql index afac1f80..5aec6b32 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -469,7 +469,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bind_enable', '1'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindreload_command', '/etc/init.d/bind9 reload'); -INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.28-svn1'); +INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.28-svn2'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'deactivatetime', '900'); 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 ed03caba..bd7a315e 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1832,70 +1832,79 @@ if(isFroxlorVersion('0.9.27')) { if ($db->num_rows($handle) < 1) { $db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'aliasconfigdir', '/var/www/php-fpm/');"); } - - // Insert ISO-Codes into database. Default value is foo, which is not a valid language code. - $db->query("ALTER TABLE `panel_languages` ADD `iso` CHAR( 3 ) NOT NULL DEFAULT 'foo' AFTER `language`"); - - $handle = $db->query("SELECT `language` FROM `panel_languages` WHERE `iso`='foo'"); - - $langauges = $db->fetch_array($handle); - foreach($languages as $language){ - switch ($language) { - case "Deutsch": - $db->query("UPDATE `panel_languages` SET `iso`='de' WHERE `language` = 'Deutsch'"); - break; - case "English": - $db->query("UPDATE `panel_languages` SET `iso`='en' WHERE `language` = 'English'"); - break; - case "Français": - $db->query("UPDATE `panel_languages` SET `iso`='fr' WHERE `language` = 'Français'"); - break; - case "Chinese": - $db->query("UPDATE `panel_languages` SET `iso`='zh' WHERE `language` = 'Chinese'"); - break; - case "Catalan": - $db->query("UPDATE `panel_languages` SET `iso`='ca' WHERE `language` = 'Catalan'"); - break; - case "Español": - $db->query("UPDATE `panel_languages` SET `iso`='es' WHERE `language` = 'Español'"); - break; - case "Português": - $db->query("UPDATE `panel_languages` SET `iso`='pt' WHERE `language` = 'Português'"); - break; - case "Danish": - $db->query("UPDATE `panel_languages` SET `iso`='da' WHERE `language` = 'Danish'"); - break; - case "Italian": - $db->query("UPDATE `panel_languages` SET `iso`='it' WHERE `language` = 'Italian'"); - break; - case "Bulgarian": - $db->query("UPDATE `panel_languages` SET `iso`='bg' WHERE `language` = 'Bulgarian'"); - break; - case "Slovak": - $db->query("UPDATE `panel_languages` SET `iso`='sk' WHERE `language` = 'Slovak'"); - break; - case "Dutch": - $db->query("UPDATE `panel_languages` SET `iso`='nl' WHERE `language` = 'Dutch'"); - break; - case "Russian": - $db->query("UPDATE `panel_languages` SET `iso`='ru' WHERE `language` = 'Russian'"); - break; - case "Hungarian": - $db->query("UPDATE `panel_languages` SET `iso`='hu' WHERE `language` = 'Hungarian'"); - break; - case "Swedish": - $db->query("UPDATE `panel_languages` SET `iso`='sv' WHERE `language` = 'Swedish'"); - break; - case "Czech": - $db->query("UPDATE `panel_languages` SET `iso`='cz' WHERE `language` = 'Czech'"); - break; - case "Polski": - $db->query("UPDATE `panel_languages` SET `iso`='pl' WHERE `language` = 'Polski'"); - break; - default: - showUpdateStep("Sorry, but I don't know the ISO-639 language code for ".$language.". Please update the entry in `panel_languages` manually.\n"); - } - } updateToVersion('0.9.28-svn1'); } + +if(isFroxlorVersion('0.9.28-svn1')) { + showUpdateStep("Updating from 0.9.28-svn1 to 0.9.28-svn2"); + lastStepStatus(0); + + // Insert ISO-Codes into database. Default value is foo, which is not a valid language code. + $db->query("ALTER TABLE `panel_languages` ADD `iso` CHAR( 3 ) NOT NULL DEFAULT 'foo' AFTER `language`"); + + $handle = $db->query("SELECT `language` FROM `panel_languages` WHERE `iso`='foo'"); + + $langauges = $db->fetch_array($handle); + foreach($languages as $language){ + switch ($language) { + case "Deutsch": + $db->query("UPDATE `panel_languages` SET `iso`='de' WHERE `language` = 'Deutsch'"); + break; + case "English": + $db->query("UPDATE `panel_languages` SET `iso`='en' WHERE `language` = 'English'"); + break; + case "Français": + $db->query("UPDATE `panel_languages` SET `iso`='fr' WHERE `language` = 'Français'"); + break; + case "Chinese": + $db->query("UPDATE `panel_languages` SET `iso`='zh' WHERE `language` = 'Chinese'"); + break; + case "Catalan": + $db->query("UPDATE `panel_languages` SET `iso`='ca' WHERE `language` = 'Catalan'"); + break; + case "Español": + $db->query("UPDATE `panel_languages` SET `iso`='es' WHERE `language` = 'Español'"); + break; + case "Português": + $db->query("UPDATE `panel_languages` SET `iso`='pt' WHERE `language` = 'Português'"); + break; + case "Danish": + $db->query("UPDATE `panel_languages` SET `iso`='da' WHERE `language` = 'Danish'"); + break; + case "Italian": + $db->query("UPDATE `panel_languages` SET `iso`='it' WHERE `language` = 'Italian'"); + break; + case "Bulgarian": + $db->query("UPDATE `panel_languages` SET `iso`='bg' WHERE `language` = 'Bulgarian'"); + break; + case "Slovak": + $db->query("UPDATE `panel_languages` SET `iso`='sk' WHERE `language` = 'Slovak'"); + break; + case "Dutch": + $db->query("UPDATE `panel_languages` SET `iso`='nl' WHERE `language` = 'Dutch'"); + break; + case "Russian": + $db->query("UPDATE `panel_languages` SET `iso`='ru' WHERE `language` = 'Russian'"); + break; + case "Hungarian": + $db->query("UPDATE `panel_languages` SET `iso`='hu' WHERE `language` = 'Hungarian'"); + break; + case "Swedish": + $db->query("UPDATE `panel_languages` SET `iso`='sv' WHERE `language` = 'Swedish'"); + break; + case "Czech": + $db->query("UPDATE `panel_languages` SET `iso`='cz' WHERE `language` = 'Czech'"); + break; + case "Polski": + $db->query("UPDATE `panel_languages` SET `iso`='pl' WHERE `language` = 'Polski'"); + break; + default: + showUpdateStep("Sorry, but I don't know the ISO-639 language code for ".$language.". Please update the entry in `panel_languages` manually.\n"); + } + } + + updateToVersion('0.9.28-svn2'); +} + + diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 14e80f51..8d59240c 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -73,6 +73,6 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.28-svn1'; +$version = '0.9.28-svn2'; $dbversion = '2'; $branding = '';