From f5576606e1fcc48194bb28439be16f15e51f1546 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 17 May 2010 08:26:55 +0000 Subject: [PATCH] - added description for redirect-codes - increase version number to 0.9.7-svn3 --- install/froxlor.sql | 15 ++++++++------- .../updates/froxlor/0.9/update_0.9.inc.php | 19 +++++++++++++++++++ .../preconfig/0.9/preconfig_0.9.inc.php | 10 +++++----- install/updatesql.php | 5 +++-- .../output/function.RedirectCode.php | 2 +- lib/tables.inc.php | 2 +- lng/english.lng.php | 10 ++++++++++ 7 files changed, 47 insertions(+), 16 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index a0bd7fa7..689882cb 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -451,7 +451,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.7-svn1'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.7-svn3'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900'); @@ -1034,7 +1034,8 @@ CREATE TABLE IF NOT EXISTS `ftp_quotatallies` ( DROP TABLE IF EXISTS `redirect_codes`; CREATE TABLE IF NOT EXISTS `redirect_codes` ( `id` int(5) NOT NULL auto_increment, - `code` varchar(3) NOT NULL, + `code` varchar(3) NOT NULL, + `desc` varchar(200) NOT NULL, `enabled` tinyint(1) DEFAULT '1', PRIMARY KEY (`id`) ) ENGINE=MyISAM; @@ -1043,11 +1044,11 @@ CREATE TABLE IF NOT EXISTS `redirect_codes` ( # Dumping data for table `redirect_codes` # -INSERT INTO `redirect_codes` (`id`, `code`, `enabled`) VALUES (1, '---', 1); -INSERT INTO `redirect_codes` (`id`, `code`, `enabled`) VALUES (2, '301', 1); -INSERT INTO `redirect_codes` (`id`, `code`, `enabled`) VALUES (3, '302', 1); -INSERT INTO `redirect_codes` (`id`, `code`, `enabled`) VALUES (4, '303', 1); -INSERT INTO `redirect_codes` (`id`, `code`, `enabled`) VALUES (5, '307', 1); +INSERT INTO `redirect_codes` (`id`, `code`, `desc`, `enabled`) VALUES (1, '---', 'rc_default', 1); +INSERT INTO `redirect_codes` (`id`, `code`, `desc`, `enabled`) VALUES (2, '301', 'rc_movedperm', 1); +INSERT INTO `redirect_codes` (`id`, `code`, `desc`, `enabled`) VALUES (3, '302', 'rc_found', 1); +INSERT INTO `redirect_codes` (`id`, `code`, `desc`, `enabled`) VALUES (4, '303', 'rc_seeother', 1); +INSERT INTO `redirect_codes` (`id`, `code`, `desc`, `enabled`) VALUES (5, '307', 'rc_tempred', 1); # -------------------------------------------------------- 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 b1ea0f1a..33b3b4fd 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -741,4 +741,23 @@ if(isFroxlorVersion('0.9.7-svn1')) updateToVersion('0.9.7-svn2'); } +if(isFroxlorVersion('0.9.7-svn2')) +{ + showUpdateStep("Updating from 0.9.7-svn2 to 0.9.7-svn3", false); + + showUpdateStep("Updating database tables"); + $db->query("ALTER TABLE `redirect_codes` ADD `desc` varchar(200) NOT NULL AFTER `code`;"); + lastStepStatus(0); + + showUpdateStep("Updating field-values"); + $db->query("UPDATE TABLE `redirect_codes` SET `desc` = 'rc_default' WHERE `code` = '---';"); + $db->query("UPDATE TABLE `redirect_codes` SET `desc` = 'rc_movedperm' WHERE `code` = '301';"); + $db->query("UPDATE TABLE `redirect_codes` SET `desc` = 'rc_found' WHERE `code` = '302';"); + $db->query("UPDATE TABLE `redirect_codes` SET `desc` = 'rc_seeother' WHERE `code` = '303';"); + $db->query("UPDATE TABLE `redirect_codes` SET `desc` = 'rc_tempred' WHERE `code` = '307';"); + lastStepStatus(0); + + updateToVersion('0.9.7-svn3'); +} + ?> diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php index 7cb51237..d226fb4d 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -116,11 +116,11 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) $question.= makeyesno('update_customredirect_enable', '1', '0', '1').'

'; $question.= 'Select default redirect code (default: empty): '; $question.= ''; eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); } diff --git a/install/updatesql.php b/install/updatesql.php index dbda37bb..dfb8b2f9 100644 --- a/install/updatesql.php +++ b/install/updatesql.php @@ -19,6 +19,9 @@ $updatelog = FroxlorLogger::getInstanceOf(array('loginname' => 'updater'), $db, $settings); +$filelog = FileLogger::getInstanceOf(array('loginname' => 'updater'), $settings); +$filelog->setLogFile(makeCorrectFile(dirname(__FILE__).'/update.log')); + /* * since froxlor, we have to check if there's still someone * out there using syscp and needs to upgrade @@ -89,8 +92,6 @@ if(!isFroxlor()) if(isFroxlor()) { - $filelog = FileLogger::getInstanceOf(array('loginname' => 'updater'), $settings); - $filelog->setLogFile(makeCorrectFile(dirname(__FILE__).'/update.log')); $filelog->logAction(ADM_ACTION, LOG_NOTICE, '-------------- START LOG --------------'); include_once (makeCorrectFile(dirname(__FILE__).'/updates/froxlor/0.9/update_0.9.inc.php')); $filelog->logAction(ADM_ACTION, LOG_NOTICE, '--------------- END LOG ---------------'); diff --git a/lib/functions/output/function.RedirectCode.php b/lib/functions/output/function.RedirectCode.php index 501b8252..8d3915b5 100644 --- a/lib/functions/output/function.RedirectCode.php +++ b/lib/functions/output/function.RedirectCode.php @@ -52,7 +52,7 @@ function getRedirectCodes() $codes = array(); while($rc = $db->fetch_array($result)) { - $codes[$rc['id']] = $rc['code']; + $codes[$rc['id']] = $rc['code']. ' ('.$lng['redirect_desc'][$rc['desc']].')'; } return $codes; diff --git a/lib/tables.inc.php b/lib/tables.inc.php index fdfda598..cdd9ea46 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -72,7 +72,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.7-svn2'; +$version = '0.9.7-svn3'; $dbversion = '2'; $branding = ''; diff --git a/lng/english.lng.php b/lng/english.lng.php index c77015a5..6dc72f20 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1410,4 +1410,14 @@ $lng['tasks']['aps_task_upgrade'] = 'Upgrading one or more APS packages'; $lng['tasks']['aps_task_sysupdate'] = 'Updating all APS packages'; $lng['tasks']['aps_task_sysdownload'] = 'Downloading new APS packages'; +// ADDED IN FROXLOR 0.9.7-svn3 + +// these stay only in english.lng.php - they are the same +// for all other languages and are used if not found there +$lng['redirect_desc']['rc_default'] = 'default'; +$lng['redirect_desc']['rc_movedperm'] = 'moved permanently'; +$lng['redirect_desc']['rc_found'] = 'found'; +$lng['redirect_desc']['rc_seeother'] = 'see other'; +$lng['redirect_desc']['rc_tempred'] = 'temporary redirect'; + ?>