Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1571) +++ branches/2.8.x/CHANGELOG (revision 1572) @@ -11,6 +11,9 @@ ! = Update/Change =========================== add small Features 2.8.2 ========================== +14 Jan-2012 Build 1572 Dietmar Woellbrink (Luisehahne) +! security fix, force SMTP Authentifikation +! server and email settings only for superadmin 12 Jan-2012 Build 1571 Dietmar Woellbrink (Luisehahne) # remove session_start() in /account/logout.php 10 Jan-2012 Build 1570 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/themes/templates/settings.htt =================================================================== --- branches/2.8.x/wb/admin/themes/templates/settings.htt (revision 1571) +++ branches/2.8.x/wb/admin/themes/templates/settings.htt (revision 1572) @@ -2,6 +2,8 @@
+ + {FTAN} @@ -38,6 +40,7 @@ + + + + + + + + + + + + + @@ -185,6 +200,7 @@ + + + + + + - + - + + - + +
{TEXT_PAGE_LEVEL_LIMIT}: @@ -48,13 +51,14 @@
{TEXT_PAGE_TRASH}: + + - -
@@ -61,6 +65,7 @@
{TEXT_PAGE_LANGUAGES}: @@ -79,6 +84,7 @@
{TEXT_HOME_FOLDERS}: @@ -88,6 +94,7 @@
{TEXT_MANAGE_SECTIONS}: @@ -106,6 +113,7 @@
{TEXT_INTRO_PAGE}: @@ -115,6 +123,7 @@
{TEXT_HOMEPAGE_REDIRECTION}: @@ -133,6 +142,7 @@
{TEXT_LOGIN}: @@ -142,6 +152,7 @@
{TEXT_REDIRECT_AFTER}: @@ -149,6 +160,7 @@
{TEXT_SIGNUP}: @@ -160,6 +172,7 @@
{TEXT_PHP_ERROR_LEVEL}: @@ -171,6 +184,8 @@
{TEXT_WYSIWYG_STYLE}:
  @@ -208,6 +224,7 @@
{TEXT_CHARSET}: @@ -219,6 +236,7 @@
{TEXT_TIMEZONE}: @@ -306,6 +324,7 @@
{TEXT_HEADER}: @@ -360,6 +379,8 @@
  @@ -395,7 +416,6 @@
{TEXT_FILESYSTEM_PERMISSIONS}:
 @@ -547,21 +567,24 @@ {TEXT_WBMAILER_SMTP_HOST}:
{TEXT_WBMAILER_SMTP_AUTH}: - +
{TEXT_WBMAILER_SMTP_USERNAME}:
{TEXT_WBMAILER_SMTP_PASSWORD}:
  Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1571) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1572) @@ -52,5 +52,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.2'); -if(!defined('REVISION')) define('REVISION', '1571'); +if(!defined('REVISION')) define('REVISION', '1572'); if(!defined('SP')) define('SP', 'SP2'); Index: branches/2.8.x/wb/admin/settings/save.php =================================================================== --- branches/2.8.x/wb/admin/settings/save.php (revision 1571) +++ branches/2.8.x/wb/admin/settings/save.php (revision 1572) @@ -51,11 +51,23 @@ $pattern = '/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.(([0-9]{1,3})|([a-zA-Z]{2,6}))$/'; if(false == preg_match($pattern, $_POST['server_email'])) { - $admin->print_error($MESSAGE['USERS']['INVALID_EMAIL']. + $admin->print_error($MESSAGE['USERS_INVALID_EMAIL']. '
Email: '.htmlentities($_POST['server_email']).'', $js_back); } } +if(isset($_POST['wbmailer_routine']) && ($_POST['wbmailer_routine']=='smtp')) { + + $checkSmtpHost = (isset($_POST['wbmailer_smtp_host']) && ($_POST['wbmailer_smtp_host']=='') ? false : true); + $checkSmtpUser = (isset($_POST['wbmailer_smtp_username']) && ($_POST['wbmailer_smtp_username']=='') ? false : true); + $checkSmtpPassword = (isset($_POST['wbmailer_smtp_password']) && ($_POST['wbmailer_smtp_password']=='') ? false : true); + if(!$checkSmtpHost || !$checkSmtpUser || !$checkSmtpPassword) { + $admin->print_error($TEXT['REQUIRED'].' '.$TEXT['WBMAILER_SMTP_AUTH']. + '
'.$MESSAGE['GENERIC_FILL_IN_ALL'].'', $js_back); + } + +} + // Work-out file mode if($advanced == '') { @@ -138,8 +150,6 @@ $allow_tags_in_fields = array('website_header', 'website_footer'); $allow_empty_values = array('website_header','website_footer','sec_anchor','pages_directory','page_spacer'); $disallow_in_fields = array('pages_directory', 'media_directory','wb_version'); -// Create new database object -/*$database = new database(); */ // Query current settings in the db, then loop through them and update the db with the new value $settings = array(); @@ -148,57 +158,59 @@ $sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'settings`'; $sql .= 'ORDER BY `name`'; -$res_settings = $database->query($sql); -$passed = false; -while($setting = $res_settings->fetchRow()) -{ - $old_settings[$setting['name']] = $setting['value']; - $setting_name = $setting['name']; - $value = $admin->get_post($setting_name); - $value = isset($_POST[$setting_name]) ? $value : $old_settings[$setting_name] ; - switch ($setting_name) { - case 'default_timezone': - $value=$value*60*60; - $passed = true; +if($res_settings = $database->query($sql)) { + $passed = false; + while($setting = $res_settings->fetchRow()) + { + $old_settings[$setting['name']] = $setting['value']; + $setting_name = $setting['name']; + $value = $admin->get_post($setting_name); + $value = isset($_POST[$setting_name]) ? $value : $old_settings[$setting_name] ; + switch ($setting_name) { + case 'default_timezone': + $value=$value*60*60; + $passed = true; + break; + case 'string_dir_mode': + $value=$dir_mode; + $passed = true; + break; + case 'string_file_mode': + $value=$file_mode; + $passed = true; break; - case 'string_dir_mode': - $value=$dir_mode; - $passed = true; - break; - case 'string_file_mode': - $value=$file_mode; - $passed = true; - break; - case 'pages_directory': - break; - case 'wbmailer_smtp_auth': - $value = isset($_POST[$setting_name]) ? $_POST[$setting_name] : '' ; - $passed = true; - break; - default : - $passed = in_array($setting_name, $allow_empty_values); - break; - } - if (!in_array($setting_name, $allow_tags_in_fields)) - { - $value = strip_tags($value); - } + case 'pages_directory': + break; + case 'wbmailer_smtp_auth': + // $value = isset($_POST[$setting_name]) ? $_POST[$setting_name] : '' ; + $value = true ; + $passed = true; + break; + default : + $passed = in_array($setting_name, $allow_empty_values); + break; + } + if (!in_array($setting_name, $allow_tags_in_fields)) + { + $value = strip_tags($value); + } - if ( !in_array($value, $disallow_in_fields) && (isset($_POST[$setting_name]) || $passed == true) ) - { - $value = trim($admin->add_slashes($value)); - $sql = 'UPDATE `'.TABLE_PREFIX.'settings` '; - $sql .= 'SET `value` = \''.$value.'\' '; - $sql .= 'WHERE `name` <> \'wb_version\' '; - $sql .= 'AND `name` = \''.$setting_name.'\' '; + if ( !in_array($value, $disallow_in_fields) && (isset($_POST[$setting_name]) || $passed == true) ) + { + $value = trim($admin->add_slashes($value)); + $sql = 'UPDATE `'.TABLE_PREFIX.'settings` '; + $sql .= 'SET `value` = \''.$value.'\' '; + $sql .= 'WHERE `name` != \'wb_version\' '; + $sql .= 'AND `name` = \''.$setting_name.'\' '; - if (!$database->query($sql)) - { - if($database->is_error()) { - $admin->print_error($database->get_error, $js_back ); - } - } + if (!$database->query($sql)) + { + if($database->is_error()) { + $admin->print_error($database->get_error, $js_back ); + } + } + } } } Index: branches/2.8.x/wb/admin/settings/setting.js =================================================================== --- branches/2.8.x/wb/admin/settings/setting.js (revision 1571) +++ branches/2.8.x/wb/admin/settings/setting.js (revision 1572) @@ -17,13 +17,6 @@ document.getElementById('row_wbmailer_smtp_auth_mode').style.display = ''; document.getElementById('row_wbmailer_smtp_username').style.display = ''; document.getElementById('row_wbmailer_smtp_password').style.display = ''; - if( document.settings.wbmailer_smtp_auth.checked == true ) { - document.getElementById('row_wbmailer_smtp_username').style.display = ''; - document.getElementById('row_wbmailer_smtp_password').style.display = ''; - } else { - document.getElementById('row_wbmailer_smtp_username').style.display = 'none'; - document.getElementById('row_wbmailer_smtp_password').style.display = 'none'; - } } else if(type == 'phpmail') { document.getElementById('row_wbmailer_smtp_settings').style.display = 'none'; document.getElementById('row_wbmailer_smtp_host').style.display = 'none'; @@ -32,8 +25,12 @@ document.getElementById('row_wbmailer_smtp_password').style.display = 'none'; } } - +/* */ function toggle_wbmailer_auth() { + document.getElementById('row_wbmailer_smtp_username').style.display = ''; + document.getElementById('row_wbmailer_smtp_password').style.display = ''; + document.settings.wbmailer_smtp_auth.checked == true; +/* if( document.settings.wbmailer_smtp_auth.checked == true ) { document.getElementById('row_wbmailer_smtp_username').style.display = ''; document.getElementById('row_wbmailer_smtp_password').style.display = ''; @@ -41,4 +38,5 @@ document.getElementById('row_wbmailer_smtp_username').style.display = 'none'; document.getElementById('row_wbmailer_smtp_password').style.display = 'none'; } -} \ No newline at end of file +*/ +} Index: branches/2.8.x/wb/admin/settings/index.php =================================================================== --- branches/2.8.x/wb/admin/settings/index.php (revision 1571) +++ branches/2.8.x/wb/admin/settings/index.php (revision 1572) @@ -407,17 +407,34 @@ } // Work-out which wbmailer routine should be checked + $template->set_var(array( + 'TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE' => $TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'], + 'TEXT_WBMAILER_DEFAULT_SENDER_MAIL' => $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'], + 'TEXT_WBMAILER_DEFAULT_SENDER_NAME' => $TEXT['WBMAILER_DEFAULT_SENDER_NAME'], + 'TEXT_WBMAILER_NOTICE' => $TEXT['WBMAILER_NOTICE'], + 'TEXT_WBMAILER_FUNCTION' => $TEXT['WBMAILER_FUNCTION'], + 'TEXT_WBMAILER_SMTP_HOST' => $TEXT['WBMAILER_SMTP_HOST'], + 'TEXT_WBMAILER_PHP' => $TEXT['WBMAILER_PHP'], + 'TEXT_WBMAILER_SMTP' => $TEXT['WBMAILER_SMTP'], + 'TEXT_WBMAILER_SMTP_AUTH' => $TEXT['WBMAILER_SMTP_AUTH'], + 'TEXT_WBMAILER_SMTP_AUTH_NOTICE' => $TEXT['REQUIRED'].' '.$TEXT['WBMAILER_SMTP_AUTH'], + 'TEXT_WBMAILER_SMTP_USERNAME' => $TEXT['WBMAILER_SMTP_USERNAME'], + 'TEXT_WBMAILER_SMTP_PASSWORD' => $TEXT['WBMAILER_SMTP_PASSWORD'], + 'SMTP_AUTH_SELECTED' => ' checked="checked"' + )); if(WBMAILER_ROUTINE == 'phpmail') { $template->set_var('PHPMAIL_SELECTED', ' checked="checked"'); $template->set_var('SMTP_VISIBILITY', ' style="display: none;"'); - $template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"'); + $template->set_var('SMTP_VISIBILITY_AUTH', ''); + // $template->set_var('SMTP_AUTH_SELECTED', ''); } elseif(WBMAILER_ROUTINE == 'smtp') { $template->set_var('SMTPMAIL_SELECTED', ' checked="checked"'); $template->set_var('SMTP_VISIBILITY', ''); + $template->set_var('SMTP_VISIBILITY_AUTH', ''); } - +/* deprecated // Work-out if SMTP authentification should be checked if(WBMAILER_SMTP_AUTH) { @@ -432,7 +449,7 @@ } else { $template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"'); } - +*/ // Work-out if intro feature is enabled if(INTRO_PAGE) { @@ -598,116 +615,104 @@ // Insert language headings $template->set_var(array( - 'HEADING_GENERAL_SETTINGS' => $HEADING['GENERAL_SETTINGS'], - 'HEADING_DEFAULT_SETTINGS' => $HEADING['DEFAULT_SETTINGS'], - 'HEADING_SEARCH_SETTINGS' => $HEADING['SEARCH_SETTINGS'], - 'HEADING_SERVER_SETTINGS' => $HEADING['SERVER_SETTINGS'], - 'HEADING_WBMAILER_SETTINGS' => $HEADING['WBMAILER_SETTINGS'], - 'HEADING_ADMINISTRATION_TOOLS' => $HEADING['ADMINISTRATION_TOOLS'] - ) - ); + 'HEADING_GENERAL_SETTINGS' => $HEADING['GENERAL_SETTINGS'], + 'HEADING_DEFAULT_SETTINGS' => $HEADING['DEFAULT_SETTINGS'], + 'HEADING_SEARCH_SETTINGS' => $HEADING['SEARCH_SETTINGS'], + 'HEADING_SERVER_SETTINGS' => $HEADING['SERVER_SETTINGS'], + 'HEADING_WBMAILER_SETTINGS' => $HEADING['WBMAILER_SETTINGS'], + 'HEADING_ADMINISTRATION_TOOLS' => $HEADING['ADMINISTRATION_TOOLS'] + ) + ); // Insert language text and messages $template->set_var(array( - 'TEXT_WEBSITE_TITLE' => $TEXT['WEBSITE_TITLE'], - 'TEXT_WEBSITE_DESCRIPTION' => $TEXT['WEBSITE_DESCRIPTION'], - 'TEXT_WEBSITE_KEYWORDS' => $TEXT['WEBSITE_KEYWORDS'], - 'TEXT_WEBSITE_HEADER' => $TEXT['WEBSITE_HEADER'], - 'TEXT_WEBSITE_FOOTER' => $TEXT['WEBSITE_FOOTER'], - 'TEXT_HEADER' => $TEXT['HEADER'], - 'TEXT_FOOTER' => $TEXT['FOOTER'], - 'TEXT_VISIBILITY' => $TEXT['VISIBILITY'], - 'TEXT_RESULTS_HEADER' => $TEXT['RESULTS_HEADER'], - 'TEXT_RESULTS_LOOP' => $TEXT['RESULTS_LOOP'], - 'TEXT_RESULTS_FOOTER' => $TEXT['RESULTS_FOOTER'], - 'TEXT_NO_RESULTS' => $TEXT['NO_RESULTS'], - 'TEXT_TEXT' => $TEXT['TEXT'], - 'TEXT_DEFAULT' => $TEXT['DEFAULT'], - 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], - 'TEXT_TIMEZONE' => $TEXT['TIMEZONE'], - 'TEXT_CHARSET' => $TEXT['CHARSET'], - 'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'], - 'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'], - 'TEXT_TEMPLATE' => $TEXT['TEMPLATE'], - 'TEXT_THEME' => $TEXT['THEME'], - 'TEXT_WYSIWYG_EDITOR' => $TEXT['WYSIWYG_EDITOR'], - 'TEXT_PAGE_LEVEL_LIMIT' => $TEXT['PAGE_LEVEL_LIMIT'], - 'TEXT_INTRO_PAGE' => $TEXT['INTRO_PAGE'], - 'TEXT_FRONTEND' => $TEXT['FRONTEND'], - 'TEXT_LOGIN' => $TEXT['LOGIN'], - 'TEXT_REDIRECT_AFTER' => $TEXT['REDIRECT_AFTER'], - 'TEXT_SIGNUP' => $TEXT['SIGNUP'], - 'TEXT_PHP_ERROR_LEVEL' => $TEXT['PHP_ERROR_LEVEL'], - 'TEXT_PAGES_DIRECTORY' => $TEXT['PAGES_DIRECTORY'], - 'TEXT_MEDIA_DIRECTORY' => $TEXT['MEDIA_DIRECTORY'], - 'TEXT_PAGE_EXTENSION' => $TEXT['PAGE_EXTENSION'], - 'TEXT_PAGE_SPACER' => $TEXT['PAGE_SPACER'], - 'TEXT_RENAME_FILES_ON_UPLOAD' => $TEXT['RENAME_FILES_ON_UPLOAD'], - 'TEXT_APP_NAME' => $TEXT['APP_NAME'], - 'TEXT_SESSION_IDENTIFIER' => $TEXT['SESSION_IDENTIFIER'], - 'TEXT_SEC_ANCHOR' => $TEXT['SEC_ANCHOR'], - 'TEXT_SERVER_OPERATING_SYSTEM' => $TEXT['SERVER_OPERATING_SYSTEM'], - 'TEXT_LINUX_UNIX_BASED' => $TEXT['LINUX_UNIX_BASED'], - 'TEXT_WINDOWS' => $TEXT['WINDOWS'], - 'TEXT_ADMIN' => $TEXT['ADMIN'], - 'TEXT_TYPE' => $TEXT['TYPE'], - 'TEXT_DATABASE' => $TEXT['DATABASE'], - 'TEXT_HOST' => $TEXT['HOST'], - 'TEXT_USERNAME' => $TEXT['USERNAME'], - 'TEXT_PASSWORD' => $TEXT['PASSWORD'], - 'TEXT_NAME' => $TEXT['NAME'], - 'TEXT_TABLE_PREFIX' => $TEXT['TABLE_PREFIX'], - 'TEXT_SAVE' => $TEXT['SAVE'], - 'TEXT_RESET' => $TEXT['RESET'], - 'TEXT_CHANGES' => $TEXT['CHANGES'], - 'TEXT_ENABLED' => $TEXT['ENABLED'], - 'TEXT_DISABLED' => $TEXT['DISABLED'], - 'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'], - 'TEXT_MANAGE' => $TEXT['MANAGE'], - 'TEXT_SEARCH' => $TEXT['SEARCH'], - 'TEXT_PUBLIC' => $TEXT['PUBLIC'], - 'TEXT_PRIVATE' => $TEXT['PRIVATE'], - 'TEXT_REGISTERED' => $TEXT['REGISTERED'], - 'TEXT_NONE' => $TEXT['NONE'], - 'TEXT_FILES' => strtoupper(substr($TEXT['FILES'], 0, 1)).substr($TEXT['FILES'], 1), - 'TEXT_DIRECTORIES' => $TEXT['DIRECTORIES'], - 'TEXT_FILESYSTEM_PERMISSIONS' => $TEXT['FILESYSTEM_PERMISSIONS'], - 'TEXT_USER' => $TEXT['USER'], - 'TEXT_GROUP' => $TEXT['GROUP'], - 'TEXT_OTHERS' => $TEXT['OTHERS'], - 'TEXT_READ' => $TEXT['READ'], - 'TEXT_WRITE' => $TEXT['WRITE'], - 'TEXT_EXECUTE' => $TEXT['EXECUTE'], - 'TEXT_WARN_PAGE_LEAVE' => '', - 'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'], - 'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'], - 'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'], - 'TEXT_SECTION_BLOCKS' => $TEXT['SECTION_BLOCKS'], - 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], - 'TEXT_PAGE_TRASH' => $TEXT['PAGE_TRASH'], - 'TEXT_PAGE_LANGUAGES' => $TEXT['PAGE_LANGUAGES'], - 'TEXT_INLINE' => $TEXT['INLINE'], - 'TEXT_SEPARATE' => $TEXT['SEPARATE'], - 'TEXT_HOME_FOLDERS' => $TEXT['HOME_FOLDERS'], - 'TEXT_WYSIWYG_STYLE' => $TEXT['WYSIWYG_STYLE'], - 'TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS' => $TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'], - 'TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE' => $TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'], - 'TEXT_WBMAILER_DEFAULT_SENDER_MAIL' => $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'], - 'TEXT_WBMAILER_DEFAULT_SENDER_NAME' => $TEXT['WBMAILER_DEFAULT_SENDER_NAME'], - 'TEXT_WBMAILER_NOTICE' => $TEXT['WBMAILER_NOTICE'], - 'TEXT_WBMAILER_FUNCTION' => $TEXT['WBMAILER_FUNCTION'], - 'TEXT_WBMAILER_SMTP_HOST' => $TEXT['WBMAILER_SMTP_HOST'], - 'TEXT_WBMAILER_PHP' => $TEXT['WBMAILER_PHP'], - 'TEXT_WBMAILER_SMTP' => $TEXT['WBMAILER_SMTP'], - 'TEXT_WBMAILER_SMTP_AUTH' => $TEXT['WBMAILER_SMTP_AUTH'], - 'TEXT_WBMAILER_SMTP_AUTH_NOTICE' => $TEXT['WBMAILER_SMTP_AUTH_NOTICE'], - 'TEXT_WBMAILER_SMTP_USERNAME' => $TEXT['WBMAILER_SMTP_USERNAME'], - 'TEXT_WBMAILER_SMTP_PASSWORD' => $TEXT['WBMAILER_SMTP_PASSWORD'], - 'MODE_SWITCH_WARNING' => $MESSAGE['SETTINGS']['MODE_SWITCH_WARNING'], - 'WORLD_WRITEABLE_WARNING' => $MESSAGE['SETTINGS']['WORLD_WRITEABLE_WARNING'], - 'TEXT_MODULE_ORDER' => $TEXT['MODULE_ORDER'], - 'TEXT_MAX_EXCERPT' => $TEXT['MAX_EXCERPT'], - 'TEXT_TIME_LIMIT' => $TEXT['TIME_LIMIT'] - )); + 'TEXT_WEBSITE_TITLE' => $TEXT['WEBSITE_TITLE'], + 'TEXT_WEBSITE_DESCRIPTION' => $TEXT['WEBSITE_DESCRIPTION'], + 'TEXT_WEBSITE_KEYWORDS' => $TEXT['WEBSITE_KEYWORDS'], + 'TEXT_WEBSITE_HEADER' => $TEXT['WEBSITE_HEADER'], + 'TEXT_WEBSITE_FOOTER' => $TEXT['WEBSITE_FOOTER'], + 'TEXT_HEADER' => $TEXT['HEADER'], + 'TEXT_FOOTER' => $TEXT['FOOTER'], + 'TEXT_VISIBILITY' => $TEXT['VISIBILITY'], + 'TEXT_RESULTS_HEADER' => $TEXT['RESULTS_HEADER'], + 'TEXT_RESULTS_LOOP' => $TEXT['RESULTS_LOOP'], + 'TEXT_RESULTS_FOOTER' => $TEXT['RESULTS_FOOTER'], + 'TEXT_NO_RESULTS' => $TEXT['NO_RESULTS'], + 'TEXT_TEXT' => $TEXT['TEXT'], + 'TEXT_DEFAULT' => $TEXT['DEFAULT'], + 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], + 'TEXT_TIMEZONE' => $TEXT['TIMEZONE'], + 'TEXT_CHARSET' => $TEXT['CHARSET'], + 'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'], + 'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'], + 'TEXT_TEMPLATE' => $TEXT['TEMPLATE'], + 'TEXT_THEME' => $TEXT['THEME'], + 'TEXT_WYSIWYG_EDITOR' => $TEXT['WYSIWYG_EDITOR'], + 'TEXT_PAGE_LEVEL_LIMIT' => $TEXT['PAGE_LEVEL_LIMIT'], + 'TEXT_INTRO_PAGE' => $TEXT['INTRO_PAGE'], + 'TEXT_FRONTEND' => $TEXT['FRONTEND'], + 'TEXT_LOGIN' => $TEXT['LOGIN'], + 'TEXT_REDIRECT_AFTER' => $TEXT['REDIRECT_AFTER'], + 'TEXT_SIGNUP' => $TEXT['SIGNUP'], + 'TEXT_PHP_ERROR_LEVEL' => $TEXT['PHP_ERROR_LEVEL'], + 'TEXT_PAGES_DIRECTORY' => $TEXT['PAGES_DIRECTORY'], + 'TEXT_MEDIA_DIRECTORY' => $TEXT['MEDIA_DIRECTORY'], + 'TEXT_PAGE_EXTENSION' => $TEXT['PAGE_EXTENSION'], + 'TEXT_PAGE_SPACER' => $TEXT['PAGE_SPACER'], + 'TEXT_RENAME_FILES_ON_UPLOAD' => $TEXT['RENAME_FILES_ON_UPLOAD'], + 'TEXT_APP_NAME' => $TEXT['APP_NAME'], + 'TEXT_SESSION_IDENTIFIER' => $TEXT['SESSION_IDENTIFIER'], + 'TEXT_SEC_ANCHOR' => $TEXT['SEC_ANCHOR'], + 'TEXT_SERVER_OPERATING_SYSTEM' => $TEXT['SERVER_OPERATING_SYSTEM'], + 'TEXT_LINUX_UNIX_BASED' => $TEXT['LINUX_UNIX_BASED'], + 'TEXT_WINDOWS' => $TEXT['WINDOWS'], + 'TEXT_ADMIN' => $TEXT['ADMIN'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_DATABASE' => $TEXT['DATABASE'], + 'TEXT_HOST' => $TEXT['HOST'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_PASSWORD' => $TEXT['PASSWORD'], + 'TEXT_NAME' => $TEXT['NAME'], + 'TEXT_TABLE_PREFIX' => $TEXT['TABLE_PREFIX'], + 'TEXT_SAVE' => $TEXT['SAVE'], + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_CHANGES' => $TEXT['CHANGES'], + 'TEXT_ENABLED' => $TEXT['ENABLED'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'], + 'TEXT_MANAGE' => $TEXT['MANAGE'], + 'TEXT_SEARCH' => $TEXT['SEARCH'], + 'TEXT_PUBLIC' => $TEXT['PUBLIC'], + 'TEXT_PRIVATE' => $TEXT['PRIVATE'], + 'TEXT_REGISTERED' => $TEXT['REGISTERED'], + 'TEXT_NONE' => $TEXT['NONE'], + 'TEXT_FILES' => strtoupper(substr($TEXT['FILES'], 0, 1)).substr($TEXT['FILES'], 1), + 'TEXT_DIRECTORIES' => $TEXT['DIRECTORIES'], + 'TEXT_FILESYSTEM_PERMISSIONS' => $TEXT['FILESYSTEM_PERMISSIONS'], + 'TEXT_USER' => $TEXT['USER'], + 'TEXT_GROUP' => $TEXT['GROUP'], + 'TEXT_OTHERS' => $TEXT['OTHERS'], + 'TEXT_READ' => $TEXT['READ'], + 'TEXT_WRITE' => $TEXT['WRITE'], + 'TEXT_EXECUTE' => $TEXT['EXECUTE'], + 'TEXT_WARN_PAGE_LEAVE' => '', + 'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'], + 'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'], + 'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'], + 'TEXT_SECTION_BLOCKS' => $TEXT['SECTION_BLOCKS'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_PAGE_TRASH' => $TEXT['PAGE_TRASH'], + 'TEXT_PAGE_LANGUAGES' => $TEXT['PAGE_LANGUAGES'], + 'TEXT_INLINE' => $TEXT['INLINE'], + 'TEXT_SEPARATE' => $TEXT['SEPARATE'], + 'TEXT_HOME_FOLDERS' => $TEXT['HOME_FOLDERS'], + 'TEXT_WYSIWYG_STYLE' => $TEXT['WYSIWYG_STYLE'], + 'TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS' => $TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'], + 'MODE_SWITCH_WARNING' => $MESSAGE['SETTINGS']['MODE_SWITCH_WARNING'], + 'WORLD_WRITEABLE_WARNING' => $MESSAGE['SETTINGS']['WORLD_WRITEABLE_WARNING'], + 'TEXT_MODULE_ORDER' => $TEXT['MODULE_ORDER'], + 'TEXT_MAX_EXCERPT' => $TEXT['MAX_EXCERPT'], + 'TEXT_TIME_LIMIT' => $TEXT['TIME_LIMIT'] + )); if($is_advanced) { @@ -717,7 +722,6 @@ $template->parse('show_checkbox_3', 'show_checkbox_3_block', true); $template->parse('show_php_error_level', 'show_php_error_level_block', true); $template->parse('show_charset', 'show_charset_block', true); - $template->parse('show_access', 'show_access_block', true); $template->parse('show_wysiwyg', 'show_wysiwyg_block', true); $template->parse('show_search', 'show_search_block', false); $template->parse('show_redirect_timer', 'show_redirect_timer_block', true); @@ -728,11 +732,16 @@ $template->set_block('show_checkbox_3', ''); $template->set_block('show_php_error_level', ''); $template->set_block('show_charset', ''); - $template->set_block('show_access', ''); $template->set_block('show_wysiwyg', ''); $template->set_block('show_search', ''); $template->set_block('show_redirect_timer', ''); } +if($is_advanced && $admin->get_user_id()=='1') +{ + $template->parse('show_access', 'show_access_block', true); +}else { + $template->set_block('show_access', ''); +} // Parse template objects output $template->parse('main', 'main_block', false); @@ -739,5 +748,3 @@ $template->pparse('output', 'page'); $admin->print_footer(); - -?> \ No newline at end of file