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:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12

  
13 13
=========================== add small Features 2.8.2 ==========================
14
14 Jan-2012 Build 1572 Dietmar Woellbrink (Luisehahne)
15
! security fix, force SMTP Authentifikation
16
! server and email settings only for superadmin
14 17
12 Jan-2012 Build 1571 Dietmar Woellbrink (Luisehahne)
15 18
# remove session_start() in /account/logout.php
16 19
10 Jan-2012 Build 1570 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/admin/themes/templates/settings.htt
2 2

  
3 3
<form name="settings" action="save.php" method="post">
4 4
<input type="hidden" name="advanced" value="{ADVANCED}" />
5
<input type="hidden" name="wbmailer_smtp_auth" id="wbmailer_smtp_auth" value="true"  />
6

  
5 7
{FTAN}
6 8

  
7 9
<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" width="100%" class="settings_table">
......
38 40
		<textarea name="website_footer" cols="50" rows="3">{WEBSITE_FOOTER}</textarea>
39 41
	</td>
40 42
</tr>
43
<!-- BEGIN show_page_level_limit_block -->
41 44
<tr{DISPLAY_ADVANCED}>
42 45
	<td class="setting_name">{TEXT_PAGE_LEVEL_LIMIT}:</td>
43 46
	<td class="setting_value" colspan="2">
......
48 51
		</select>
49 52
	</td>
50 53
</tr>
54
<!-- END show_page_level_limit_block -->
51 55
<tr>
52 56
	<td class="setting_name">{TEXT_PAGE_TRASH}:</td>
53 57
	<td class="setting_value" colspan="2">
58
		<input type="radio" name="page_trash" id="page_trash_inline" style="width: 14px; height: 14px;" value="inline"{PAGE_TRASH_INLINE} />
59
		<label for="page_trash_inline">{TEXT_ENABLED}</label>
54 60
		<input type="radio" name="page_trash" id="page_trash_disabled" style="width: 14px; height: 14px;" value="disabled"{PAGE_TRASH_DISABLED} />
55 61
		<label for="page_trash_disabled">{TEXT_DISABLED}</label>
56
		<input type="radio" name="page_trash" id="page_trash_inline" style="width: 14px; height: 14px;" value="inline"{PAGE_TRASH_INLINE} />
57
		<label for="page_trash_inline">{TEXT_INLINE}</label>
58 62
		<div style="margin: 0; padding: 0;{DISPLAY_PAGE_TRASH_SEPARATE}">
59 63
			<input type="radio" name="page_trash" id="page_trash_separate" style="width: 14px; height: 14px;" value="separate"{PAGE_TRASH_SEPARATE} />
60 64
			<label for="page_trash_separate">{TEXT_SEPARATE}</label>
61 65
		</div>
62 66
	</td>
63 67
</tr>
68
<!-- BEGIN show_checkbox_1_block -->
64 69
<tr{DISPLAY_ADVANCED}>
65 70
        <td class="setting_name">{TEXT_PAGE_LANGUAGES}:</td>
66 71
        <td class="setting_value" colspan="2">
......
79 84
		<label for="multiple_menus_false">{TEXT_DISABLED}</label>
80 85
	</td>
81 86
</tr>
87
<!-- END show_checkbox_1_block -->
82 88
<tr>
83 89
	<td class="setting_name">{TEXT_HOME_FOLDERS}:</td>
84 90
	<td class="setting_value" colspan="2">
......
88 94
		<label for="home_folders_false">{TEXT_DISABLED}</label>
89 95
	</td>
90 96
</tr>
97
<!-- BEGIN show_checkbox_2_block -->
91 98
<tr{DISPLAY_ADVANCED}>
92 99
	<td class="setting_name">{TEXT_MANAGE_SECTIONS}:</td>
93 100
	<td class="setting_value" colspan="2">
......
106 113
		<label for="section_blocks_false">{TEXT_DISABLED}</label>
107 114
	</td>
108 115
</tr>
116
<!-- END show_checkbox_2_block -->
109 117
<tr>
110 118
	<td class="setting_name">{TEXT_INTRO_PAGE}:</td>
111 119
	<td class="setting_value" colspan="2">
......
115 123
		<label for="intro_page_false">{TEXT_DISABLED}</label>
116 124
	</td>
117 125
</tr>
126
<!-- BEGIN show_checkbox_3_block -->
118 127
<tr{DISPLAY_ADVANCED}>
119 128
	<td class="setting_name">{TEXT_HOMEPAGE_REDIRECTION}:</td>
120 129
	<td class="setting_value" colspan="2">
......
133 142
		<label for="smart_login_false">{TEXT_DISABLED}</label>
134 143
	</td>
135 144
</tr>
145
<!-- END show_checkbox_3_block -->
136 146
<tr>
137 147
	<td class="setting_name">{TEXT_LOGIN}:</td>
138 148
	<td class="setting_value" colspan="2">
......
142 152
		<label for="frontend_login_false">{TEXT_DISABLED}</label>
143 153
	</td>
144 154
</tr>
155
<!-- BEGIN show_redirect_timer_block -->
145 156
<tr{DISPLAY_ADVANCED}>
146 157
	<td class="setting_name">{TEXT_REDIRECT_AFTER}:</td>
147 158
	<td class="setting_value" colspan="2">
......
149 160
		<label>&nbsp;&nbsp;( <strong>-1</strong> = {TEXT_DISABLED}, <strong>0 -10000</strong> )</label><br />
150 161
	</td>
151 162
</tr>
163
<!-- END show_redirect_timer_block -->
152 164
<tr>
153 165
	<td class="setting_name">{TEXT_SIGNUP}:</td>
154 166
	<td class="setting_value" colspan="2">
......
160 172
		</select>
161 173
	</td>
162 174
</tr>
175
<!-- BEGIN show_php_error_level_block -->
163 176
<tr{DISPLAY_ADVANCED}>
164 177
	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
165 178
	<td class="setting_value" colspan="2">
......
171 184
		</select>
172 185
	</td>
173 186
</tr>
187
<!-- END show_php_error_level_block -->
188
<!-- BEGIN show_wysiwyg_block -->
174 189
<tr{DISPLAY_ADVANCED}>
175 190
	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>
176 191
	<td class="setting_value" colspan="2"><input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" /></td>
......
185 200
		</select>
186 201
	</td>
187 202
</tr>
203
<!-- END show_wysiwyg_block -->
188 204
<tr>
189 205
	<td class="setting_name">&nbsp;</td>
190 206
	<td class="setting_value_permissions">
......
208 224
		</select>
209 225
	</td>
210 226
</tr>
227
<!-- BEGIN show_charset_block -->
211 228
<tr{DISPLAY_ADVANCED}>
212 229
	<td class="setting_name">{TEXT_CHARSET}:</td>
213 230
	<td class="setting_value" colspan="2">
......
219 236
		</select>
220 237
	</td>
221 238
</tr>
239
<!-- END show_charset_block -->
222 240
<tr>
223 241
	<td class="setting_name">{TEXT_TIMEZONE}:</td>
224 242
	<td class="setting_value" colspan="2">
......
306 324
		</select>
307 325
	</td>
308 326
</tr>
327
<!-- BEGIN show_search_block -->
309 328
<tr{DISPLAY_ADVANCED}>
310 329
	<td class="setting_name">{TEXT_HEADER}:</td>
311 330
	<td class="setting_value" colspan="2">
......
360 379
		<input type="text" name="search_time_limit" value="{SEARCH_TIME_LIMIT}" />
361 380
	</td>
362 381
</tr>
382
<!-- END show_search_block -->
383
<!-- BEGIN show_access_block -->
363 384
<tr>
364 385
	<td class="setting_name">&nbsp;</td>
365 386
	<td class="setting_value_permissions">
......
395 416
		<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div>
396 417
	</td>
397 418
</tr>
398

  
399 419
<tr{DISPLAY_ADVANCED}>
400 420
	<td class="setting_name"><div id="{ADVANCED_FILE_PERMS_ID}1" style="margin: 0; padding: 0;">{TEXT_FILESYSTEM_PERMISSIONS}:</div></td>
401 421
	<td class="setting_value_permissions" id="file_mode">
......
547 567
	<td class="setting_name">{TEXT_WBMAILER_SMTP_HOST}:</td>
548 568
	<td class="setting_value" colspan="2"><input type="text" style="width: 250px" name="wbmailer_smtp_host" value="{WBMAILER_SMTP_HOST}" /></td>
549 569
</tr>
570
<!--  -->
550 571
<tr id="row_wbmailer_smtp_auth_mode"{SMTP_VISIBILITY}>
551 572
	<td class="setting_name">{TEXT_WBMAILER_SMTP_AUTH}:</td>
552 573
	<td class="setting_value" colspan="2">
553
		<input type="checkbox" name="wbmailer_smtp_auth" id="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth();" style="width: 14px; height: 14px;" value="true"{SMTP_AUTH_SELECTED} />
574
		<input type="checkbox" name="wbmailer_smtp_auth" id="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth();" style="width: 14px; height: 14px;" value="true" disabled="disabled" {SMTP_AUTH_SELECTED} />
554 575
		<label for="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth(this.value);">({TEXT_WBMAILER_SMTP_AUTH_NOTICE})</label>
555 576
	</td>
556 577
</tr>
557
<tr id="row_wbmailer_smtp_username"{SMTP_VISIBILITY_AUTH}>
578

  
579
<tr id="row_wbmailer_smtp_username"{SMTP_VISIBILITY}>
558 580
	<td class="setting_name">{TEXT_WBMAILER_SMTP_USERNAME}:</td>
559 581
	<td class="setting_value" colspan="2"><input type="text" style="width: 250px" name="wbmailer_smtp_username" value="{WBMAILER_SMTP_USERNAME}" /></td>
560 582
</tr>
561
<tr id="row_wbmailer_smtp_password"{SMTP_VISIBILITY_AUTH}>
583
<tr id="row_wbmailer_smtp_password"{SMTP_VISIBILITY}>
562 584
	<td class="setting_name">{TEXT_WBMAILER_SMTP_PASSWORD}:</td>
563 585
	<td class="setting_value" colspan="2"><input type="password" style="width: 250px" name="wbmailer_smtp_password" value="{WBMAILER_SMTP_PASSWORD}" /></td>
564 586
</tr>
587
<!-- END show_access_block -->
565 588
<tr>
566 589
	<td class="setting_name">&nbsp;</td>
567 590
	<td class="setting_value_permissions">
branches/2.8.x/wb/admin/interface/version.php
52 52

  
53 53
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
54 54
if(!defined('VERSION')) define('VERSION', '2.8.2');
55
if(!defined('REVISION')) define('REVISION', '1571');
55
if(!defined('REVISION')) define('REVISION', '1572');
56 56
if(!defined('SP')) define('SP', 'SP2');
branches/2.8.x/wb/admin/settings/save.php
51 51
    $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}))$/';
52 52
    if(false == preg_match($pattern, $_POST['server_email']))
53 53
    {
54
		$admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'].
54
		$admin->print_error($MESSAGE['USERS_INVALID_EMAIL'].
55 55
			'<br /><strong>Email: '.htmlentities($_POST['server_email']).'</strong>', $js_back);
56 56
	}
57 57
}
58 58

  
59
if(isset($_POST['wbmailer_routine']) && ($_POST['wbmailer_routine']=='smtp')) {
60

  
61
	$checkSmtpHost = (isset($_POST['wbmailer_smtp_host']) && ($_POST['wbmailer_smtp_host']=='') ? false : true);
62
	$checkSmtpUser = (isset($_POST['wbmailer_smtp_username']) && ($_POST['wbmailer_smtp_username']=='') ? false : true);
63
	$checkSmtpPassword = (isset($_POST['wbmailer_smtp_password']) && ($_POST['wbmailer_smtp_password']=='') ? false : true);
64
	if(!$checkSmtpHost || !$checkSmtpUser || !$checkSmtpPassword) {
65
		$admin->print_error($TEXT['REQUIRED'].' '.$TEXT['WBMAILER_SMTP_AUTH'].
66
			'<br /><strong>'.$MESSAGE['GENERIC_FILL_IN_ALL'].'</strong>', $js_back);
67
	}
68

  
69
}
70

  
59 71
// Work-out file mode
60 72
if($advanced == '')
61 73
{
......
138 150
$allow_tags_in_fields = array('website_header', 'website_footer');
139 151
$allow_empty_values = array('website_header','website_footer','sec_anchor','pages_directory','page_spacer');
140 152
$disallow_in_fields = array('pages_directory', 'media_directory','wb_version');
141
// Create new database object
142
/*$database = new database(); */
143 153

  
144 154
// Query current settings in the db, then loop through them and update the db with the new value
145 155
$settings = array();
......
148 158
$sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'settings`';
149 159
$sql .= 'ORDER BY `name`';
150 160

  
151
$res_settings = $database->query($sql);
152
$passed = false;
153
while($setting = $res_settings->fetchRow())
154
{
155
	$old_settings[$setting['name']] = $setting['value'];
156
	$setting_name = $setting['name'];
157
	$value = $admin->get_post($setting_name);
158
	$value = isset($_POST[$setting_name]) ? $value : $old_settings[$setting_name] ;
159
	switch ($setting_name) {
160
		case 'default_timezone':
161
			$value=$value*60*60;
162
			$passed = true;
161
if($res_settings = $database->query($sql)) {
162
	$passed = false;
163
	while($setting = $res_settings->fetchRow())
164
	{
165
		$old_settings[$setting['name']] = $setting['value'];
166
		$setting_name = $setting['name'];
167
		$value = $admin->get_post($setting_name);
168
		$value = isset($_POST[$setting_name]) ? $value : $old_settings[$setting_name] ;
169
		switch ($setting_name) {
170
			case 'default_timezone':
171
				$value=$value*60*60;
172
				$passed = true;
173
				break;
174
			case 'string_dir_mode':
175
				$value=$dir_mode;
176
				$passed = true;
177
				break;
178
			case 'string_file_mode':
179
				$value=$file_mode;
180
	 			$passed = true;
163 181
			break;
164
		case 'string_dir_mode':
165
			$value=$dir_mode;
166
			$passed = true;
167
			break;
168
		case 'string_file_mode':
169
			$value=$file_mode;
170
 			$passed = true;
171
		break;
172
		case 'pages_directory':
173
			break;
174
		case 'wbmailer_smtp_auth':
175
			$value = isset($_POST[$setting_name]) ? $_POST[$setting_name] : '' ;
176
 			$passed = true;
177
			break;
178
		default :
179
		    $passed = in_array($setting_name, $allow_empty_values);
180
			break;
181
	}
182
    if (!in_array($setting_name, $allow_tags_in_fields))
183
    {
184
        $value = strip_tags($value);
185
    }
182
			case 'pages_directory':
183
				break;
184
			case 'wbmailer_smtp_auth':
185
				// $value = isset($_POST[$setting_name]) ? $_POST[$setting_name] : '' ;
186
				$value = true ;
187
	 			$passed = true;
188
				break;
189
			default :
190
			    $passed = in_array($setting_name, $allow_empty_values);
191
				break;
192
		}
186 193

  
194
	    if (!in_array($setting_name, $allow_tags_in_fields))
195
	    {
196
	        $value = strip_tags($value);
197
	    }
187 198

  
188
    if ( !in_array($value, $disallow_in_fields) && (isset($_POST[$setting_name]) || $passed == true) )
189
    {
190
        $value = trim($admin->add_slashes($value));
191
        $sql = 'UPDATE `'.TABLE_PREFIX.'settings` ';
192
        $sql .= 'SET `value` = \''.$value.'\' ';
193
        $sql .= 'WHERE `name` <> \'wb_version\' ';
194
        $sql .= 'AND `name` = \''.$setting_name.'\' ';
199
	    if ( !in_array($value, $disallow_in_fields) && (isset($_POST[$setting_name]) || $passed == true) )
200
	    {
201
	        $value = trim($admin->add_slashes($value));
202
	        $sql = 'UPDATE `'.TABLE_PREFIX.'settings` ';
203
	        $sql .= 'SET `value` = \''.$value.'\' ';
204
	        $sql .= 'WHERE `name` != \'wb_version\' ';
205
	        $sql .= 'AND `name` = \''.$setting_name.'\' ';
195 206

  
196
        if (!$database->query($sql))
197
        {
198
			if($database->is_error()) {
199
				$admin->print_error($database->get_error, $js_back );
200
			}
201
        }
207
	        if (!$database->query($sql))
208
	        {
209
				if($database->is_error()) {
210
					$admin->print_error($database->get_error, $js_back );
211
				}
212
	        }
213
		}
202 214
	}
203 215
}
204 216

  
branches/2.8.x/wb/admin/settings/setting.js
17 17
		document.getElementById('row_wbmailer_smtp_auth_mode').style.display = '';
18 18
		document.getElementById('row_wbmailer_smtp_username').style.display = '';
19 19
		document.getElementById('row_wbmailer_smtp_password').style.display = '';
20
		if( document.settings.wbmailer_smtp_auth.checked == true ) {
21
			document.getElementById('row_wbmailer_smtp_username').style.display = '';
22
			document.getElementById('row_wbmailer_smtp_password').style.display = '';
23
		} else {
24
			document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
25
			document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
26
		}
27 20
	} else if(type == 'phpmail') {
28 21
		document.getElementById('row_wbmailer_smtp_settings').style.display = 'none';
29 22
		document.getElementById('row_wbmailer_smtp_host').style.display = 'none';
......
32 25
		document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
33 26
	}
34 27
}
35

  
28
/*  */
36 29
function toggle_wbmailer_auth() {
30
		document.getElementById('row_wbmailer_smtp_username').style.display = '';
31
		document.getElementById('row_wbmailer_smtp_password').style.display = '';
32
		document.settings.wbmailer_smtp_auth.checked == true;
33
/*
37 34
	if( document.settings.wbmailer_smtp_auth.checked == true ) {
38 35
		document.getElementById('row_wbmailer_smtp_username').style.display = '';
39 36
		document.getElementById('row_wbmailer_smtp_password').style.display = '';
......
41 38
		document.getElementById('row_wbmailer_smtp_username').style.display = 'none';
42 39
		document.getElementById('row_wbmailer_smtp_password').style.display = 'none';
43 40
	}
44
}
41
*/
42
}
branches/2.8.x/wb/admin/settings/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