Project

General

Profile

« Previous | Next » 

Revision 1572

Added by Dietmar over 12 years ago

! security fix, force SMTP Authentifikation
! server and email settings only for superadmin

View differences:

index.php
407 407
	}
408 408

  
409 409
	// Work-out which wbmailer routine should be checked
410
	$template->set_var(array(
411
				'TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE' => $TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'],
412
				'TEXT_WBMAILER_DEFAULT_SENDER_MAIL' => $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'],
413
				'TEXT_WBMAILER_DEFAULT_SENDER_NAME' => $TEXT['WBMAILER_DEFAULT_SENDER_NAME'],
414
				'TEXT_WBMAILER_NOTICE' => $TEXT['WBMAILER_NOTICE'],
415
				'TEXT_WBMAILER_FUNCTION' => $TEXT['WBMAILER_FUNCTION'],
416
				'TEXT_WBMAILER_SMTP_HOST' => $TEXT['WBMAILER_SMTP_HOST'],
417
				'TEXT_WBMAILER_PHP' => $TEXT['WBMAILER_PHP'],
418
				'TEXT_WBMAILER_SMTP' => $TEXT['WBMAILER_SMTP'],
419
				'TEXT_WBMAILER_SMTP_AUTH' => $TEXT['WBMAILER_SMTP_AUTH'],
420
				'TEXT_WBMAILER_SMTP_AUTH_NOTICE' => $TEXT['REQUIRED'].' '.$TEXT['WBMAILER_SMTP_AUTH'],
421
				'TEXT_WBMAILER_SMTP_USERNAME' => $TEXT['WBMAILER_SMTP_USERNAME'],
422
				'TEXT_WBMAILER_SMTP_PASSWORD' => $TEXT['WBMAILER_SMTP_PASSWORD'],
423
				'SMTP_AUTH_SELECTED' => ' checked="checked"'
424
				));
410 425
	if(WBMAILER_ROUTINE == 'phpmail')
411 426
	{
412 427
		$template->set_var('PHPMAIL_SELECTED', ' checked="checked"');
413 428
		$template->set_var('SMTP_VISIBILITY', ' style="display: none;"');
414
		$template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"');
429
		$template->set_var('SMTP_VISIBILITY_AUTH', '');
430
		// $template->set_var('SMTP_AUTH_SELECTED', '');
415 431
	} elseif(WBMAILER_ROUTINE == 'smtp')
416 432
	{
417 433
		$template->set_var('SMTPMAIL_SELECTED', ' checked="checked"');
418 434
		$template->set_var('SMTP_VISIBILITY', '');
435
		$template->set_var('SMTP_VISIBILITY_AUTH', '');
419 436
	}
420

  
437
/* deprecated
421 438
	// Work-out if SMTP authentification should be checked
422 439
	if(WBMAILER_SMTP_AUTH)
423 440
	{
......
432 449
	} else {
433 450
		$template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"');
434 451
	}
435

  
452
*/
436 453
	// Work-out if intro feature is enabled
437 454
	if(INTRO_PAGE)
438 455
	{
......
598 615

  
599 616
	// Insert language headings
600 617
	$template->set_var(array(
601
								'HEADING_GENERAL_SETTINGS' => $HEADING['GENERAL_SETTINGS'],
602
								'HEADING_DEFAULT_SETTINGS' => $HEADING['DEFAULT_SETTINGS'],
603
								'HEADING_SEARCH_SETTINGS' => $HEADING['SEARCH_SETTINGS'],
604
								'HEADING_SERVER_SETTINGS' => $HEADING['SERVER_SETTINGS'],
605
								'HEADING_WBMAILER_SETTINGS' => $HEADING['WBMAILER_SETTINGS'],
606
								'HEADING_ADMINISTRATION_TOOLS' => $HEADING['ADMINISTRATION_TOOLS']
607
								)
608
						);
618
					'HEADING_GENERAL_SETTINGS' => $HEADING['GENERAL_SETTINGS'],
619
					'HEADING_DEFAULT_SETTINGS' => $HEADING['DEFAULT_SETTINGS'],
620
					'HEADING_SEARCH_SETTINGS' => $HEADING['SEARCH_SETTINGS'],
621
					'HEADING_SERVER_SETTINGS' => $HEADING['SERVER_SETTINGS'],
622
					'HEADING_WBMAILER_SETTINGS' => $HEADING['WBMAILER_SETTINGS'],
623
					'HEADING_ADMINISTRATION_TOOLS' => $HEADING['ADMINISTRATION_TOOLS']
624
					)
625
			);
609 626
	// Insert language text and messages
610 627
	$template->set_var(array(
611
								'TEXT_WEBSITE_TITLE' => $TEXT['WEBSITE_TITLE'],
612
								'TEXT_WEBSITE_DESCRIPTION' => $TEXT['WEBSITE_DESCRIPTION'],
613
								'TEXT_WEBSITE_KEYWORDS' => $TEXT['WEBSITE_KEYWORDS'],
614
								'TEXT_WEBSITE_HEADER' => $TEXT['WEBSITE_HEADER'],
615
								'TEXT_WEBSITE_FOOTER' => $TEXT['WEBSITE_FOOTER'],
616
								'TEXT_HEADER' => $TEXT['HEADER'],
617
								'TEXT_FOOTER' => $TEXT['FOOTER'],
618
								'TEXT_VISIBILITY' => $TEXT['VISIBILITY'],
619
								'TEXT_RESULTS_HEADER' => $TEXT['RESULTS_HEADER'],
620
								'TEXT_RESULTS_LOOP' => $TEXT['RESULTS_LOOP'],
621
								'TEXT_RESULTS_FOOTER' => $TEXT['RESULTS_FOOTER'],
622
								'TEXT_NO_RESULTS' => $TEXT['NO_RESULTS'],
623
								'TEXT_TEXT' => $TEXT['TEXT'],
624
								'TEXT_DEFAULT' => $TEXT['DEFAULT'],
625
								'TEXT_LANGUAGE' => $TEXT['LANGUAGE'],
626
								'TEXT_TIMEZONE' => $TEXT['TIMEZONE'],
627
								'TEXT_CHARSET' => $TEXT['CHARSET'],
628
								'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'],
629
								'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'],
630
								'TEXT_TEMPLATE' => $TEXT['TEMPLATE'],
631
								'TEXT_THEME' => $TEXT['THEME'],
632
								'TEXT_WYSIWYG_EDITOR' => $TEXT['WYSIWYG_EDITOR'],
633
								'TEXT_PAGE_LEVEL_LIMIT' => $TEXT['PAGE_LEVEL_LIMIT'],
634
								'TEXT_INTRO_PAGE' => $TEXT['INTRO_PAGE'],
635
								'TEXT_FRONTEND' => $TEXT['FRONTEND'],
636
								'TEXT_LOGIN' => $TEXT['LOGIN'],
637
								'TEXT_REDIRECT_AFTER' => $TEXT['REDIRECT_AFTER'],
638
								'TEXT_SIGNUP' => $TEXT['SIGNUP'],
639
								'TEXT_PHP_ERROR_LEVEL' => $TEXT['PHP_ERROR_LEVEL'],
640
								'TEXT_PAGES_DIRECTORY' => $TEXT['PAGES_DIRECTORY'],
641
								'TEXT_MEDIA_DIRECTORY' => $TEXT['MEDIA_DIRECTORY'],
642
								'TEXT_PAGE_EXTENSION' => $TEXT['PAGE_EXTENSION'],
643
								'TEXT_PAGE_SPACER' => $TEXT['PAGE_SPACER'],
644
								'TEXT_RENAME_FILES_ON_UPLOAD' => $TEXT['RENAME_FILES_ON_UPLOAD'],
645
								'TEXT_APP_NAME' => $TEXT['APP_NAME'],
646
								'TEXT_SESSION_IDENTIFIER' => $TEXT['SESSION_IDENTIFIER'],
647
								'TEXT_SEC_ANCHOR' => $TEXT['SEC_ANCHOR'],
648
								'TEXT_SERVER_OPERATING_SYSTEM' => $TEXT['SERVER_OPERATING_SYSTEM'],
649
								'TEXT_LINUX_UNIX_BASED' => $TEXT['LINUX_UNIX_BASED'],
650
								'TEXT_WINDOWS' => $TEXT['WINDOWS'],
651
								'TEXT_ADMIN' => $TEXT['ADMIN'],
652
								'TEXT_TYPE' => $TEXT['TYPE'],
653
								'TEXT_DATABASE' => $TEXT['DATABASE'],
654
								'TEXT_HOST' => $TEXT['HOST'],
655
								'TEXT_USERNAME' => $TEXT['USERNAME'],
656
								'TEXT_PASSWORD' => $TEXT['PASSWORD'],
657
								'TEXT_NAME' => $TEXT['NAME'],
658
								'TEXT_TABLE_PREFIX' => $TEXT['TABLE_PREFIX'],
659
								'TEXT_SAVE' => $TEXT['SAVE'],
660
								'TEXT_RESET' => $TEXT['RESET'],
661
								'TEXT_CHANGES' => $TEXT['CHANGES'],
662
								'TEXT_ENABLED' => $TEXT['ENABLED'],
663
								'TEXT_DISABLED' => $TEXT['DISABLED'],
664
								'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'],
665
								'TEXT_MANAGE' => $TEXT['MANAGE'],
666
								'TEXT_SEARCH' => $TEXT['SEARCH'],
667
								'TEXT_PUBLIC' => $TEXT['PUBLIC'],
668
								'TEXT_PRIVATE' => $TEXT['PRIVATE'],
669
								'TEXT_REGISTERED' => $TEXT['REGISTERED'],
670
								'TEXT_NONE' => $TEXT['NONE'],
671
								'TEXT_FILES' => strtoupper(substr($TEXT['FILES'], 0, 1)).substr($TEXT['FILES'], 1),
672
								'TEXT_DIRECTORIES' => $TEXT['DIRECTORIES'],
673
								'TEXT_FILESYSTEM_PERMISSIONS' => $TEXT['FILESYSTEM_PERMISSIONS'],
674
								'TEXT_USER' => $TEXT['USER'],
675
								'TEXT_GROUP' => $TEXT['GROUP'],
676
								'TEXT_OTHERS' => $TEXT['OTHERS'],
677
								'TEXT_READ' => $TEXT['READ'],
678
								'TEXT_WRITE' => $TEXT['WRITE'],
679
								'TEXT_EXECUTE' => $TEXT['EXECUTE'],
680
								'TEXT_WARN_PAGE_LEAVE' => '',
681
								'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'],
682
								'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'],
683
								'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'],
684
								'TEXT_SECTION_BLOCKS' => $TEXT['SECTION_BLOCKS'],
685
								'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
686
								'TEXT_PAGE_TRASH' => $TEXT['PAGE_TRASH'],
687
								'TEXT_PAGE_LANGUAGES' => $TEXT['PAGE_LANGUAGES'],
688
								'TEXT_INLINE' => $TEXT['INLINE'],
689
								'TEXT_SEPARATE' => $TEXT['SEPARATE'],
690
								'TEXT_HOME_FOLDERS' => $TEXT['HOME_FOLDERS'],
691
								'TEXT_WYSIWYG_STYLE' => $TEXT['WYSIWYG_STYLE'],
692
								'TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS' => $TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'],
693
								'TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE' => $TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'],
694
								'TEXT_WBMAILER_DEFAULT_SENDER_MAIL' => $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'],
695
								'TEXT_WBMAILER_DEFAULT_SENDER_NAME' => $TEXT['WBMAILER_DEFAULT_SENDER_NAME'],
696
								'TEXT_WBMAILER_NOTICE' => $TEXT['WBMAILER_NOTICE'],
697
								'TEXT_WBMAILER_FUNCTION' => $TEXT['WBMAILER_FUNCTION'],
698
								'TEXT_WBMAILER_SMTP_HOST' => $TEXT['WBMAILER_SMTP_HOST'],
699
								'TEXT_WBMAILER_PHP' => $TEXT['WBMAILER_PHP'],
700
								'TEXT_WBMAILER_SMTP' => $TEXT['WBMAILER_SMTP'],
701
								'TEXT_WBMAILER_SMTP_AUTH' => $TEXT['WBMAILER_SMTP_AUTH'],
702
								'TEXT_WBMAILER_SMTP_AUTH_NOTICE' => $TEXT['WBMAILER_SMTP_AUTH_NOTICE'],
703
								'TEXT_WBMAILER_SMTP_USERNAME' => $TEXT['WBMAILER_SMTP_USERNAME'],
704
								'TEXT_WBMAILER_SMTP_PASSWORD' => $TEXT['WBMAILER_SMTP_PASSWORD'],
705
								'MODE_SWITCH_WARNING' => $MESSAGE['SETTINGS']['MODE_SWITCH_WARNING'],
706
								'WORLD_WRITEABLE_WARNING' => $MESSAGE['SETTINGS']['WORLD_WRITEABLE_WARNING'],
707
								'TEXT_MODULE_ORDER' => $TEXT['MODULE_ORDER'],
708
								'TEXT_MAX_EXCERPT' => $TEXT['MAX_EXCERPT'],
709
								'TEXT_TIME_LIMIT' => $TEXT['TIME_LIMIT']
710
								));
628
					'TEXT_WEBSITE_TITLE' => $TEXT['WEBSITE_TITLE'],
629
					'TEXT_WEBSITE_DESCRIPTION' => $TEXT['WEBSITE_DESCRIPTION'],
630
					'TEXT_WEBSITE_KEYWORDS' => $TEXT['WEBSITE_KEYWORDS'],
631
					'TEXT_WEBSITE_HEADER' => $TEXT['WEBSITE_HEADER'],
632
					'TEXT_WEBSITE_FOOTER' => $TEXT['WEBSITE_FOOTER'],
633
					'TEXT_HEADER' => $TEXT['HEADER'],
634
					'TEXT_FOOTER' => $TEXT['FOOTER'],
635
					'TEXT_VISIBILITY' => $TEXT['VISIBILITY'],
636
					'TEXT_RESULTS_HEADER' => $TEXT['RESULTS_HEADER'],
637
					'TEXT_RESULTS_LOOP' => $TEXT['RESULTS_LOOP'],
638
					'TEXT_RESULTS_FOOTER' => $TEXT['RESULTS_FOOTER'],
639
					'TEXT_NO_RESULTS' => $TEXT['NO_RESULTS'],
640
					'TEXT_TEXT' => $TEXT['TEXT'],
641
					'TEXT_DEFAULT' => $TEXT['DEFAULT'],
642
					'TEXT_LANGUAGE' => $TEXT['LANGUAGE'],
643
					'TEXT_TIMEZONE' => $TEXT['TIMEZONE'],
644
					'TEXT_CHARSET' => $TEXT['CHARSET'],
645
					'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'],
646
					'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'],
647
					'TEXT_TEMPLATE' => $TEXT['TEMPLATE'],
648
					'TEXT_THEME' => $TEXT['THEME'],
649
					'TEXT_WYSIWYG_EDITOR' => $TEXT['WYSIWYG_EDITOR'],
650
					'TEXT_PAGE_LEVEL_LIMIT' => $TEXT['PAGE_LEVEL_LIMIT'],
651
					'TEXT_INTRO_PAGE' => $TEXT['INTRO_PAGE'],
652
					'TEXT_FRONTEND' => $TEXT['FRONTEND'],
653
					'TEXT_LOGIN' => $TEXT['LOGIN'],
654
					'TEXT_REDIRECT_AFTER' => $TEXT['REDIRECT_AFTER'],
655
					'TEXT_SIGNUP' => $TEXT['SIGNUP'],
656
					'TEXT_PHP_ERROR_LEVEL' => $TEXT['PHP_ERROR_LEVEL'],
657
					'TEXT_PAGES_DIRECTORY' => $TEXT['PAGES_DIRECTORY'],
658
					'TEXT_MEDIA_DIRECTORY' => $TEXT['MEDIA_DIRECTORY'],
659
					'TEXT_PAGE_EXTENSION' => $TEXT['PAGE_EXTENSION'],
660
					'TEXT_PAGE_SPACER' => $TEXT['PAGE_SPACER'],
661
					'TEXT_RENAME_FILES_ON_UPLOAD' => $TEXT['RENAME_FILES_ON_UPLOAD'],
662
					'TEXT_APP_NAME' => $TEXT['APP_NAME'],
663
					'TEXT_SESSION_IDENTIFIER' => $TEXT['SESSION_IDENTIFIER'],
664
					'TEXT_SEC_ANCHOR' => $TEXT['SEC_ANCHOR'],
665
					'TEXT_SERVER_OPERATING_SYSTEM' => $TEXT['SERVER_OPERATING_SYSTEM'],
666
					'TEXT_LINUX_UNIX_BASED' => $TEXT['LINUX_UNIX_BASED'],
667
					'TEXT_WINDOWS' => $TEXT['WINDOWS'],
668
					'TEXT_ADMIN' => $TEXT['ADMIN'],
669
					'TEXT_TYPE' => $TEXT['TYPE'],
670
					'TEXT_DATABASE' => $TEXT['DATABASE'],
671
					'TEXT_HOST' => $TEXT['HOST'],
672
					'TEXT_USERNAME' => $TEXT['USERNAME'],
673
					'TEXT_PASSWORD' => $TEXT['PASSWORD'],
674
					'TEXT_NAME' => $TEXT['NAME'],
675
					'TEXT_TABLE_PREFIX' => $TEXT['TABLE_PREFIX'],
676
					'TEXT_SAVE' => $TEXT['SAVE'],
677
					'TEXT_RESET' => $TEXT['RESET'],
678
					'TEXT_CHANGES' => $TEXT['CHANGES'],
679
					'TEXT_ENABLED' => $TEXT['ENABLED'],
680
					'TEXT_DISABLED' => $TEXT['DISABLED'],
681
					'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'],
682
					'TEXT_MANAGE' => $TEXT['MANAGE'],
683
					'TEXT_SEARCH' => $TEXT['SEARCH'],
684
					'TEXT_PUBLIC' => $TEXT['PUBLIC'],
685
					'TEXT_PRIVATE' => $TEXT['PRIVATE'],
686
					'TEXT_REGISTERED' => $TEXT['REGISTERED'],
687
					'TEXT_NONE' => $TEXT['NONE'],
688
					'TEXT_FILES' => strtoupper(substr($TEXT['FILES'], 0, 1)).substr($TEXT['FILES'], 1),
689
					'TEXT_DIRECTORIES' => $TEXT['DIRECTORIES'],
690
					'TEXT_FILESYSTEM_PERMISSIONS' => $TEXT['FILESYSTEM_PERMISSIONS'],
691
					'TEXT_USER' => $TEXT['USER'],
692
					'TEXT_GROUP' => $TEXT['GROUP'],
693
					'TEXT_OTHERS' => $TEXT['OTHERS'],
694
					'TEXT_READ' => $TEXT['READ'],
695
					'TEXT_WRITE' => $TEXT['WRITE'],
696
					'TEXT_EXECUTE' => $TEXT['EXECUTE'],
697
					'TEXT_WARN_PAGE_LEAVE' => '',
698
					'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'],
699
					'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'],
700
					'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'],
701
					'TEXT_SECTION_BLOCKS' => $TEXT['SECTION_BLOCKS'],
702
					'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
703
					'TEXT_PAGE_TRASH' => $TEXT['PAGE_TRASH'],
704
					'TEXT_PAGE_LANGUAGES' => $TEXT['PAGE_LANGUAGES'],
705
					'TEXT_INLINE' => $TEXT['INLINE'],
706
					'TEXT_SEPARATE' => $TEXT['SEPARATE'],
707
					'TEXT_HOME_FOLDERS' => $TEXT['HOME_FOLDERS'],
708
					'TEXT_WYSIWYG_STYLE' => $TEXT['WYSIWYG_STYLE'],
709
					'TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS' => $TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'],
710
					'MODE_SWITCH_WARNING' => $MESSAGE['SETTINGS']['MODE_SWITCH_WARNING'],
711
					'WORLD_WRITEABLE_WARNING' => $MESSAGE['SETTINGS']['WORLD_WRITEABLE_WARNING'],
712
					'TEXT_MODULE_ORDER' => $TEXT['MODULE_ORDER'],
713
					'TEXT_MAX_EXCERPT' => $TEXT['MAX_EXCERPT'],
714
					'TEXT_TIME_LIMIT' => $TEXT['TIME_LIMIT']
715
					));
711 716

  
712 717
if($is_advanced)
713 718
{
......
717 722
	$template->parse('show_checkbox_3',       'show_checkbox_3_block', true);
718 723
	$template->parse('show_php_error_level',  'show_php_error_level_block', true);
719 724
	$template->parse('show_charset',          'show_charset_block', true);
720
	$template->parse('show_access',           'show_access_block', true);
721 725
	$template->parse('show_wysiwyg',          'show_wysiwyg_block', true);
722 726
	$template->parse('show_search',           'show_search_block', false);
723 727
	$template->parse('show_redirect_timer',   'show_redirect_timer_block', true);
......
728 732
	$template->set_block('show_checkbox_3', '');
729 733
	$template->set_block('show_php_error_level', '');
730 734
	$template->set_block('show_charset', '');
731
	$template->set_block('show_access', '');
732 735
	$template->set_block('show_wysiwyg', '');
733 736
	$template->set_block('show_search', '');
734 737
	$template->set_block('show_redirect_timer', '');
735 738
}
739
if($is_advanced && $admin->get_user_id()=='1')
740
{
741
	$template->parse('show_access', 'show_access_block', true);
742
}else {
743
	$template->set_block('show_access', '');
744
}
736 745

  
737 746
// Parse template objects output
738 747
$template->parse('main', 'main_block', false);
739 748
$template->pparse('output', 'page');
740 749

  
741 750
$admin->print_footer();
742

  
743
?>

Also available in: Unified diff