From 29394042d35897492f34a884b60a0a54ceaebfc9 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Wed, 13 Feb 2002 23:12:52 +0000 Subject: [PATCH] Server settings used for emails ... git-svn-id: file:///svn/phpbb/trunk@2136 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_board.php | 14 ++++++-- .../subSilver/admin/board_config_body.tpl | 32 ++++++++++++------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index 0f8eb4457e..3e91077ef3 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -131,6 +131,12 @@ $template->assign_vars(array( "L_CONFIGURATION_TITLE" => $lang['General_Config'], "L_CONFIGURATION_EXPLAIN" => $lang['Config_explain'], "L_GENERAL_SETTINGS" => $lang['General_settings'], + "L_SERVER_NAME" => $lang['Server_name'], + "L_SERVER_NAME_EXPLAIN" => $lang['Server_name_explain'], + "L_SERVER_PORT" => $lang['Server_port'], + "L_SERVER_PORT_EXPLAIN" => $lang['Server_port_explain'], + "L_SCRIPT_PATH" => $lang['Script_path'], + "L_SCRIPT_PATH_EXPLAIN" => $lang['Script_path_explain'], "L_SITE_NAME" => $lang['Site_name'], "L_SITE_DESCRIPTION" => $lang['Site_desc'], "L_DISABLE_BOARD" => $lang['Board_disable'], @@ -142,10 +148,10 @@ $template->assign_vars(array( "L_COOKIE_SETTINGS" => $lang['Cookie_settings'], "L_COOKIE_SETTINGS_EXPLAIN" => $lang['Cookie_settings_explain'], "L_COOKIE_NAME" => $lang['Cookie_name'], - "L_COOKIE_DOMAIN" => $lang['Cookie_domain'], "L_COOKIE_PATH" => $lang['Cookie_path'], - "L_SESSION_LENGTH" => $lang['Session_length'], "L_COOKIE_SECURE" => $lang['Cookie_secure'], + "L_COOKIE_SECURE_EXPLAIN" => $lang['Cookie_secure_explain'], + "L_SESSION_LENGTH" => $lang['Session_length'], "L_PRIVATE_MESSAGING" => $lang['Private_Messaging'], "L_INBOX_LIMIT" => $lang['Inbox_limits'], "L_SENTBOX_LIMIT" => $lang['Sentbox_limits'], @@ -212,6 +218,9 @@ $template->assign_vars(array( "L_SUBMIT" => $lang['Submit'], "L_RESET" => $lang['Reset'], + "SERVER_NAME" => $new['cookie_domain'], + "SCRIPT_PATH" => $new['script_path'], + "SERVER_PORT" => $new['server_port'], "SITENAME" => $new['sitename'], "SITE_DESCRIPTION" => $new['site_desc'], "S_DISABLE_BOARD_YES" => $disable_board_yes, @@ -242,7 +251,6 @@ $template->assign_vars(array( "SENTBOX_LIMIT" => $new['max_sentbox_privmsgs'], "SAVEBOX_LIMIT" => $new['max_savebox_privmsgs'], "COOKIE_NAME" => $new['cookie_name'], - "COOKIE_DOMAIN" => $new['cookie_domain'], "COOKIE_PATH" => $new['cookie_path'], "SESSION_LENGTH" => $new['session_length'], "S_COOKIE_SECURE_ENABLED" => $cookie_secure_yes, diff --git a/phpBB/templates/subSilver/admin/board_config_body.tpl b/phpBB/templates/subSilver/admin/board_config_body.tpl index 75306e0ed7..165805a031 100644 --- a/phpBB/templates/subSilver/admin/board_config_body.tpl +++ b/phpBB/templates/subSilver/admin/board_config_body.tpl @@ -7,6 +7,18 @@ {L_GENERAL_SETTINGS} + + {L_SERVER_NAME}
{L_SERVER_NAME_EXPLAIN} + + + + {L_SERVER_PORT}
{L_SERVER_PORT_EXPLAIN} + + + + {L_SCRIPT_PATH}
{L_SCRIPT_PATH_EXPLAIN} + + {L_SITE_NAME} @@ -78,25 +90,21 @@ {L_COOKIE_SETTINGS_EXPLAIN} - {L_COOKIE_NAME} + {L_COOKIE_NAME} - {L_COOKIE_DOMAIN} - + {L_COOKIE_PATH} + - {L_COOKIE_PATH} - - - - {L_SESSION_LENGTH} - - - - {L_COOKIE_SECURE} + {L_COOKIE_SECURE}
{L_COOKIE_SECURE_EXPLAIN} {L_DISABLED}   {L_ENABLED} + + {L_SESSION_LENGTH} + + {L_PRIVATE_MESSAGING}