Project

General

Profile

« Previous | Next » 

Revision 1716

Added by Dietmar about 12 years ago

! update folder admin/settings admin/skel/htt
! change Template to div container

View differences:

branches/2.8.x/wb/admin/skel/themes/htt/settings.htt
1 1
<!-- BEGIN main_block -->
2

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

  
7 5
{FTAN}
8 6

  
9
<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" class="settings_table">
10
<tr>
11
	<td colspan="3"><h2>{HEADING_GENERAL_SETTINGS}</h2></td>
12
</tr>
13
<tr>
14
	<td class="setting_name">{TEXT_WEBSITE_TITLE}:</td>
15
	<td class="setting_value" colspan="2">
16
		<input type="text" name="website_title" value="{WEBSITE_TITLE}" />
17
	</td>
18
</tr>
19
<tr>
20
	<td class="setting_name">{TEXT_WEBSITE_DESCRIPTION}:</td>
21
	<td class="setting_value" colspan="2">
22
		<textarea name="website_description" cols="50" rows="3">{WEBSITE_DESCRIPTION}</textarea>
23
	</td>
24
</tr>
25
<tr>
26
	<td class="setting_name">{TEXT_WEBSITE_KEYWORDS}:</td>
27
	<td class="setting_value" colspan="2">
28
		<textarea name="website_keywords" cols="50" rows="3" >{WEBSITE_KEYWORDS}</textarea>
29
	</td>
30
</tr>
31
<tr>
32
	<td class="setting_name">{TEXT_WEBSITE_HEADER}:</td>
33
	<td class="setting_value" colspan="2">
34
		<textarea name="website_header" cols="50" rows="3">{WEBSITE_HEADER}</textarea>
35
	</td>
36
</tr>
37
<tr>
38
	<td class="setting_name">{TEXT_WEBSITE_FOOTER}:</td>
39
	<td class="setting_value" colspan="2">
40
		<textarea name="website_footer" cols="50" rows="3">{WEBSITE_FOOTER}</textarea>
41
	</td>
42
</tr>
43
</table>
44
<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" class="settings_table">
7
	<fieldset>
8
		<div class="mbox sub-row">
9
			<label class="setting_name">&nbsp;</label>
10
			<div style="margin-top: 5px;">
11
				<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="cright {DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
12
			</div>
13
		</div>
14
		<br />
15
	</fieldset>
16
	<fieldset>
17
		<legend>{HEADING_GENERAL_SETTINGS}</legend>
18
		<div class="mbox sub-row">
19
			<label class="setting_name">{TEXT_WEBSITE_TITLE}:</label>
20
			<input type="text" class="vert" name="website_title" value="{WEBSITE_TITLE}" />
21
		</div>
22

  
23
		<div class="mbox sub-row">
24
			<label class="setting_name">{TEXT_WEBSITE_DESCRIPTION}:</label>
25
			<textarea class="vert" name="website_description" cols="50" rows="4">{WEBSITE_DESCRIPTION}</textarea>
26
		</div>
27

  
28
		<div class="mbox sub-row">
29
			<label class="setting_name">{TEXT_WEBSITE_KEYWORDS}:</label>
30
			<textarea class="vert" name="website_keywords" cols="50" rows="4">{WEBSITE_KEYWORDS}</textarea>
31
		</div>
32

  
33
		<div class="mbox sub-row">
34
			<label class="setting_name">{TEXT_WEBSITE_HEADER}:</label>
35
			<textarea class="vert" name="website_header" cols="50" rows="4">{WEBSITE_HEADER}</textarea>
36
		</div>
37

  
38
		<div class="mbox sub-row">
39
			<label class="setting_name">{TEXT_WEBSITE_FOOTER}:</label>
40
			<textarea class="vert" name="website_footer" cols="50" rows="4">{WEBSITE_FOOTER}</textarea>
41
		</div>
42
		<div class="mbox sub-row">
43
			<label class="setting_name">{TEXT_WEBSITE_SIGNATURE}:</label>
44
			<textarea class="vert" name="website_signature" cols="50" rows="4">{WEBSITE_SIGNATURE}</textarea>
45
		</div>
46
	</fieldset>
47
	<fieldset>
45 48
<!-- BEGIN show_page_level_limit_block -->
46
<tr{DISPLAY_ADVANCED}>
47
	<td class="setting_name">{TEXT_PAGE_LEVEL_LIMIT}:</td>
48
	<td class="setting_value" colspan="2">
49
		<div class="mbox sub-row">
50
		<label class="setting_name">{TEXT_PAGE_LEVEL_LIMIT}:</label>
49 51
		<select name="page_level_limit">
50 52
		<!-- BEGIN page_level_limit_list_block -->
51 53
			<option value="{NUMBER}"{SELECTED}>{NUMBER}</option>
52 54
		<!-- END page_level_limit_list_block -->
53 55
		</select>
54
	</td>
55
</tr>
56
		</div>
57

  
56 58
<!-- END show_page_level_limit_block -->
57
<tr>
58
	<td class="setting_name">{TEXT_PAGE_TRASH}:</td>
59
	<td class="setting_value" colspan="2">
60
		<input type="radio" name="page_trash" id="page_trash_inline" style="width: 14px; height: 14px;" value="inline"{PAGE_TRASH_INLINE} />
59
		<div class="mbox sub-row">
60
			<label class="setting_name">{TEXT_PAGE_TRASH}:</label>
61
			<span>
62
				<input class="radio" type="radio" name="page_trash" id="page_trash_inline" value="inline"{PAGE_TRASH_INLINE} />
61 63
		<label for="page_trash_inline">{TEXT_ENABLED}</label>
62
		<input type="radio" name="page_trash" id="page_trash_disabled" style="width: 14px; height: 14px;" value="disabled"{PAGE_TRASH_DISABLED} />
64
			</span>
65
			<span>
66
				<input class="radio" type="radio" name="page_trash" id="page_trash_disabled" value="disabled"{PAGE_TRASH_DISABLED} />
63 67
		<label for="page_trash_disabled">{TEXT_DISABLED}</label>
64
		<div style="margin: 0; padding: 0;{DISPLAY_PAGE_TRASH_SEPARATE}">
65
			<input type="radio" name="page_trash" id="page_trash_separate" style="width: 14px; height: 14px;" value="separate"{PAGE_TRASH_SEPARATE} />
66
			<label for="page_trash_separate">{TEXT_SEPARATE}</label>
68
			</span>
67 69
		</div>
68
	</td>
69
</tr>
70 70
<!-- BEGIN show_checkbox_1_block -->
71
<tr{DISPLAY_ADVANCED}>
72
        <td class="setting_name">{TEXT_PAGE_LANGUAGES}:</td>
73
        <td class="setting_value" colspan="2">
74
                <input type="radio" name="page_languages" id="page_languages_true" style="width: 14px; height: 14px;" value="true"{PAGE_LANGUAGES_ENABLED} />
71

  
72
		<div class="mbox sub-row">
73
			<label class="setting_name">{TEXT_PAGE_LANGUAGES}:</label>
74
			<span>
75
				<input class="radio" type="radio" name="page_languages" id="page_languages_true" value="true"{PAGE_LANGUAGES_ENABLED} />
75 76
                <label for="page_languages_true">{TEXT_ENABLED}</label>
76
                <input type="radio" name="page_languages" id="page_languages_false" style="width: 14px; height: 14px;" value="false"{PAGE_LANGUAGES_DISABLED} />
77
			</span>
78
			<span>
79
				<input class="radio" type="radio" name="page_languages" id="page_languages_false" value="false"{PAGE_LANGUAGES_DISABLED} />
77 80
                <label for="page_languages_false">{TEXT_DISABLED}</label>
78
		</td>
79
</tr>
80
<tr{DISPLAY_ADVANCED}>
81
	<td class="setting_name">{TEXT_MULTIPLE_MENUS}:</td>
82
	<td class="setting_value" colspan="2">
83
		<input type="radio" name="multiple_menus" id="multiple_menus_true" style="width: 14px; height: 14px;" value="true"{MULTIPLE_MENUS_ENABLED} />
81
			</span>
82
		</div>
83

  
84
		<div class="mbox sub-row">
85
			<label class="setting_name">{TEXT_MULTIPLE_MENUS}:</label>
86
			<span>
87
				<input class="radio" type="radio" name="multiple_menus" id="multiple_menus_true" value="true"{MULTIPLE_MENUS_ENABLED} />
84 88
		<label for="multiple_menus_true">{TEXT_ENABLED}</label>
85
		<input type="radio" name="multiple_menus" id="multiple_menus_false" style="width: 14px; height: 14px;" value="false"{MULTIPLE_MENUS_DISABLED} />
89
			</span>
90
			<span>
91
				<input class="radio" type="radio" name="multiple_menus" id="multiple_menus_false" value="false"{MULTIPLE_MENUS_DISABLED} />
86 92
		<label for="multiple_menus_false">{TEXT_DISABLED}</label>
87
	</td>
88
</tr>
93
			</span>
94
		</div>
95

  
89 96
<!-- END show_checkbox_1_block -->
90
<tr>
91
	<td class="setting_name">{TEXT_HOME_FOLDERS}:</td>
92
	<td class="setting_value" colspan="2">
93
		<input type="radio" name="home_folders" id="home_folders_true" style="width: 14px; height: 14px;" value="true"{HOME_FOLDERS_ENABLED} />
97
		<div class="mbox sub-row">
98
		<label class="setting_name">{TEXT_HOME_FOLDERS}:</label>
99
			<span>
100
			<input class="radio" type="radio" name="home_folders" id="home_folders_true" value="true"{HOME_FOLDERS_ENABLED} />
94 101
		<label for="home_folders_true">{TEXT_ENABLED}</label>
95
		<input type="radio" name="home_folders" id="home_folders_false" style="width: 14px; height: 14px;" value="false"{HOME_FOLDERS_DISABLED} />
102
			</span>
103
			<span>
104
			<input class="radio" type="radio" name="home_folders" id="home_folders_false" value="false"{HOME_FOLDERS_DISABLED} />
96 105
		<label for="home_folders_false">{TEXT_DISABLED}</label>
97
	</td>
98
</tr>
106
			</span>
107
		</div>
99 108
<!-- BEGIN show_checkbox_2_block -->
100
<tr{DISPLAY_ADVANCED}>
101
	<td class="setting_name">{TEXT_MANAGE_SECTIONS}:</td>
102
	<td class="setting_value" colspan="2">
103
		<input type="radio" name="manage_sections" id="manage_sections_true" style="width: 14px; height: 14px;" value="true"{MANAGE_SECTIONS_ENABLED} />
109

  
110
		<div class="mbox sub-row">
111
		<label class="setting_name">{TEXT_MANAGE_SECTIONS}:</label>
112
			<span>
113
			<input class="radio"  type="radio" name="manage_sections" id="manage_sections_true" value="true"{MANAGE_SECTIONS_ENABLED} />
104 114
		<label for="manage_sections_true">{TEXT_ENABLED}</label>
105
		<input type="radio" name="manage_sections" id="manage_sections_false" style="width: 14px; height: 14px;" value="false"{MANAGE_SECTIONS_DISABLED} />
115
			</span>
116
			<span>
117
			<input class="radio"  type="radio" name="manage_sections" id="manage_sections_false" value="false"{MANAGE_SECTIONS_DISABLED} />
106 118
		<label for="manage_sections_false">{TEXT_DISABLED}</label>
107
	</td>
108
</tr>
109
<tr{DISPLAY_ADVANCED}>
110
	<td class="setting_name">{TEXT_SECTION_BLOCKS}:</td>
111
	<td class="setting_value" colspan="2">
112
		<input type="radio" name="section_blocks" id="section_blocks_true" style="width: 14px; height: 14px;" value="true"{SECTION_BLOCKS_ENABLED} />
119
			</span>
120
		</div>
121

  
122
		<div class="mbox sub-row">
123
			<label class="setting_name">{TEXT_SECTION_BLOCKS}:</label>
124
			<span>
125
			<input class="radio" type="radio" name="section_blocks" id="section_blocks_true" value="true"{SECTION_BLOCKS_ENABLED} />
113 126
		<label for="section_blocks_true">{TEXT_ENABLED}</label>
114
		<input type="radio" name="section_blocks" id="section_blocks_false" style="width: 14px; height: 14px;" value="false"{SECTION_BLOCKS_DISABLED} />
127
			</span>
128
			<span>
129
			<input class="radio" type="radio" name="section_blocks" id="section_blocks_false" value="false"{SECTION_BLOCKS_DISABLED} />
115 130
		<label for="section_blocks_false">{TEXT_DISABLED}</label>
116
	</td>
117
</tr>
131
			</span>
132
		</div>
133

  
118 134
<!-- END show_checkbox_2_block -->
119
<tr>
120
	<td class="setting_name">{TEXT_INTRO_PAGE}:</td>
121
	<td class="setting_value" colspan="2">
122
		<input type="radio" name="intro_page" id="intro_page_true" style="width: 14px; height: 14px;" value="true"{INTRO_PAGE_ENABLED} />
135
		<div class="mbox sub-row">
136
			<label class="setting_name">{TEXT_INTRO_PAGE}:</label>
137
			<span>
138
			<input class="radio" type="radio" name="intro_page" id="intro_page_true" value="true"{INTRO_PAGE_ENABLED} />
123 139
		<label for="intro_page_true">{TEXT_ENABLED}</label>
124
		<input type="radio" name="intro_page" id="intro_page_false" style="width: 14px; height: 14px;" value="false"{INTRO_PAGE_DISABLED} />
140
			</span>
141
			<span>
142
			<input class="radio" type="radio" name="intro_page" id="intro_page_false" value="false"{INTRO_PAGE_DISABLED} />
125 143
		<label for="intro_page_false">{TEXT_DISABLED}</label>
126
	</td>
127
</tr>
144
			</span>
145
		</div>
128 146
<!-- BEGIN show_checkbox_3_block -->
129
<tr{DISPLAY_ADVANCED}>
130
	<td class="setting_name">{TEXT_HOMEPAGE_REDIRECTION}:</td>
131
	<td class="setting_value" colspan="2">
132
		<input type="radio" name="homepage_redirection" id="homepage_redirection_true" style="width: 14px; height: 14px;" value="true"{HOMEPAGE_REDIRECTION_ENABLED} />
147

  
148
		<div class="mbox sub-row">
149
			<label class="setting_name">{TEXT_HOMEPAGE_REDIRECTION}:</label>
150
			<span>
151
			<input class="radio" type="radio" name="homepage_redirection" id="homepage_redirection_true" value="true"{HOMEPAGE_REDIRECTION_ENABLED} />
133 152
		<label for="homepage_redirection_true">{TEXT_ENABLED}</label>
134
		<input type="radio" name="homepage_redirection" id="homepage_redirection_false" style="width: 14px; height: 14px;" value="false"{HOMEPAGE_REDIRECTION_DISABLED} />
153
			</span>
154
			<span>
155
			<input class="radio" type="radio" name="homepage_redirection" id="homepage_redirection_false" value="false"{HOMEPAGE_REDIRECTION_DISABLED} />
135 156
		<label for="homepage_redirection_false">{TEXT_DISABLED}</label>
136
	</td>
137
</tr>
138
<tr{DISPLAY_ADVANCED}>
139
	<td class="setting_name">{TEXT_SMART_LOGIN}:</td>
140
	<td class="setting_value" colspan="2">
141
		<input type="radio" name="smart_login" id="smart_login_true" style="width: 14px; height: 14px;" value="true"{SMART_LOGIN_ENABLED} />
157
			</span>
158
		</div>
159

  
160
		<div class="mbox sub-row">
161
			<label class="setting_name">{TEXT_SMART_LOGIN}:</label>
162
			<span>
163
			<input class="radio" type="radio" name="smart_login" id="smart_login_true" value="true"{SMART_LOGIN_ENABLED} />
142 164
		<label for="smart_login_true">{TEXT_ENABLED}</label>
143
		<input type="radio" name="smart_login" id="smart_login_false" style="width: 14px; height: 14px;" value="false"{SMART_LOGIN_DISABLED} />
165
			</span>
166
			<span>
167
			<input class="radio" type="radio" name="smart_login" id="smart_login_false" value="false"{SMART_LOGIN_DISABLED} />
144 168
		<label for="smart_login_false">{TEXT_DISABLED}</label>
145
	</td>
146
</tr>
169
			</span>
170
		</div>
171

  
147 172
<!-- END show_checkbox_3_block -->
148
<tr>
149
	<td class="setting_name">{TEXT_LOGIN}:</td>
150
	<td class="setting_value" colspan="2">
151
		<input type="radio" name="frontend_login" id="frontend_login_true" style="width: 14px; height: 14px;" value="true"{PRIVATE_ENABLED} />
173
		<div class="mbox sub-row">
174
			<label class="setting_name">{TEXT_LOGIN}:</label>
175
			<span>
176
			<input class="radio" type="radio" name="frontend_login" id="frontend_login_true" value="true"{PRIVATE_ENABLED} />
152 177
		<label for="frontend_login_true">{TEXT_ENABLED}</label>
153
		<input type="radio" name="frontend_login" id="frontend_login_false" style="width: 14px; height: 14px;" value="false"{PRIVATE_DISABLED} />
154
		<label for="frontend_login_false">{TEXT_DISABLED}</label>
155
	</td>
156
</tr>
178
			</span>
179
			<span>
180
			<input class="radio" type="radio" name="frontend_login" id="frontend_login_false" value="false"{PRIVATE_DISABLED} />
181
		<label for="_login_false">{TEXT_DISABLED}</label>
182
			</span>
183
		</div>
184

  
185
		<div class="mbox sub-row">
186
			<label class="setting_name">{TEXT_CONFIRMED_REGISTRATION}:</label>
187
			<span>
188
			<input class="radio" type="radio" name="confirmed_registration" id="confirmed_registration_true" value="1"{CONFIRMED_REGISTRATION_ENABLED} />
189
		<label for="confirmed_registration_true">{TEXT_ENABLED}</label>
190
			</span>
191
			<span>
192
			<input class="radio" type="radio" name="confirmed_registration" id="confirmed_registration_false" value="0"{CONFIRMED_REGISTRATION_DISABLED} />
193
		<label for="confirmed_registration_false">{TEXT_DISABLED}</label>
194
			</span>
195
		</div>
196

  
197
		<div class="mbox sub-row">
198
			<label class="setting_name">{TEXT_SIGNUP}:</label>
199
			<select name="frontend_signup">
200
				<option value="false">{TEXT_DISABLED}</option>
201
				<!-- BEGIN group_list_block -->
202
					<option value="{ID}" {SELECTED}>{NAME}</option>
203
				<!-- END group_list_block -->
204
			</select>
205
		</div>
206

  
157 207
<!-- BEGIN show_redirect_timer_block -->
158
<tr{DISPLAY_ADVANCED}>
159
	<td class="setting_name">{TEXT_REDIRECT_AFTER}:</td>
160
	<td class="setting_value" colspan="2">
161
		<input type="text" name="redirect_timer" value="{REDIRECT_TIMER}" style="width:50%;" />
162
		<label>&nbsp;&nbsp;( <strong>-1</strong> = {TEXT_DISABLED}, <strong>0 -10000</strong> )</label><br />
163
	</td>
164
</tr>
208
		<div class="mbox sub-row">
209
			<label class="setting_name">{TEXT_REDIRECT_AFTER}:</label>
210
			<span>
211
			<input type="text" name="redirect_timer" value="{REDIRECT_TIMER}" style="width:19%;" />
212
			&nbsp;&nbsp;( <strong>-1</strong> = {TEXT_DISABLED}, <strong>0 -10000</strong> )
213
			</span>
214
		</div>
165 215
<!-- END show_redirect_timer_block -->
166
<tr>
167
	<td class="setting_name">{TEXT_SIGNUP}:</td>
168
	<td class="setting_value" colspan="2">
169
		<select name="frontend_signup">
170
			<option value="false">{TEXT_DISABLED}</option>
171
			<!-- BEGIN group_list_block -->
172
				<option value="{ID}" {SELECTED}>{NAME}</option>
173
			<!-- END group_list_block -->
174
		</select>
175
	</td>
176
</tr>
216

  
177 217
<!-- BEGIN show_php_error_level_block -->
178
<tr{DISPLAY_ADVANCED}>
179
	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
180
	<td class="setting_value" colspan="2">
218
		<div class="mbox sub-row">
219
			<label class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</label>
181 220
		<select name="er_level">
182 221
			<option value="">{TEXT_PLEASE_SELECT}...</option>
183 222
			<!-- BEGIN error_reporting_list_block -->
184 223
				<option value="{VALUE}"{SELECTED}>{NAME}</option>
185 224
			<!-- END error_reporting_list_block -->
186 225
		</select>
187
	</td>
188
</tr>
226
		</div>
189 227
<!-- END show_php_error_level_block -->
228

  
190 229
<!-- BEGIN show_wysiwyg_block -->
191
<tr{DISPLAY_ADVANCED}>
192
	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>
193
	<td class="setting_value" colspan="2">
230
		<div class="mbox sub-row none">
231
			<label class="setting_name">{TEXT_WYSIWYG_STYLE}:</label>
194 232
		<input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" />
195
	</td>
196
</tr>
197
<tr{DISPLAY_ADVANCED}>
198
	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
199
	<td class="setting_value" colspan="2">
233
		</div>
234

  
235
		<div class="mbox sub-row">
236
			<label class="setting_name">{TEXT_WYSIWYG_EDITOR}:</label>
237
			<div class="input" >
200 238
		<select name="wysiwyg_editor">
201 239
		<!-- BEGIN editor_list_block -->
202 240
			<option value="{FILE}"{SELECTED}>{NAME}</option>
203 241
		<!-- END editor_list_block -->
204 242
		</select>
205
	</td>
206
</tr>
243
			</div>
244
		</div>
207 245
<!-- END show_wysiwyg_block -->
208
<tr>
209
	<td class="">&nbsp;</td>
210
	<td class="">
211
		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
212
		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
213
	</td>
214
	<td class="" style="text-align: right;">
215
		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
216
	</td>
217
</tr>
218
</table>
219
<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" class="settings_table">
220
<tr>
221
	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_DEFAULT_SETTINGS}</h2></td>
222
</tr>
223
<tr>
224
	<td class="setting_name">{TEXT_LANGUAGE}:</td>
225
	<td class="setting_value" colspan="2">
246
		<div class="mbox sub-row">
247
			<label class="setting_name">&nbsp;</label>
248
			<div style="margin-top: 5px;">
249
				<input class="save" type="submit" name="submit" value="{TEXT_SAVE}" />
250
				<input class="delete" type="reset" name="reset" value="{TEXT_RESET}" />
251
				<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="cright {DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
252
			</div>
253
		</div>
254
		<br />
255
	</fieldset>
256

  
257
	<fieldset>
258
		<legend>{HEADING_DEFAULT_SETTINGS}</legend>
259
		<div class="mbox sub-row">
260
			<label class="setting_name">{TEXT_LANGUAGE}:</label>
261
			<div class="input" >
226 262
		<select name="default_language">
227 263
			<!-- BEGIN language_list_block -->
228 264
			<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
229 265
			<!-- END language_list_block -->
230 266
		</select>
231
	</td>
232
</tr>
267
			</div>
268
		</div>
269

  
233 270
<!-- BEGIN show_charset_block -->
234
<tr{DISPLAY_ADVANCED}>
235
	<td class="setting_name">{TEXT_CHARSET}:</td>
236
	<td class="setting_value" colspan="2">
271
		<div class="mbox sub-row">
272
	 		<label class="setting_name">{TEXT_CHARSET}:</label>
273
			<div class="input" >
237 274
		<select name="default_charset">
238 275
			<option value="">{TEXT_PLEASE_SELECT}...</option>
239 276
			<!-- BEGIN charset_list_block -->
240 277
				<option value="{VALUE}" {SELECTED}>{NAME}</option>
241 278
			<!-- END charset_list_block -->
242 279
		</select>
243
	</td>
244
</tr>
280
			</div>
281
		</div>
282

  
245 283
<!-- END show_charset_block -->
246
<tr>
247
	<td class="setting_name">{TEXT_TIMEZONE}:</td>
248
	<td class="setting_value" colspan="2">
284
		<div class="mbox sub-row">
285
	 		<label class="setting_name">{TEXT_TIMEZONE}:</label>
286
			<div class="input" >
249 287
		<select name="default_timezone">
250 288
			<option value="0">{TEXT_PLEASE_SELECT}...</option>
251 289
			<!-- BEGIN timezone_list_block -->
252 290
				<option value="{VALUE}" {SELECTED}>{NAME}</option>
253 291
			<!-- END timezone_list_block -->
254 292
		</select>
255
	</td>
256
</tr>
257
<tr>
258
	<td class="setting_name">{TEXT_DATE_FORMAT}:</td>
259
	<td class="setting_value" colspan="2">
293
			</div>
294
		</div>
295

  
296
		<div class="mbox sub-row">
297
	 		<label class="setting_name">{TEXT_DATE_FORMAT}:</label>
298
			<div class="input" >
260 299
		<select name="default_date_format">
261 300
			<option value="M d Y">{TEXT_PLEASE_SELECT}...</option>
262 301
			<!-- BEGIN date_format_list_block -->
263 302
				<option value="{VALUE}" {SELECTED}>{NAME}</option>
264 303
			<!-- END date_format_list_block -->
265 304
		</select>
266
	</td>
267
</tr>
268
<tr>
269
	<td class="setting_name">{TEXT_TIME_FORMAT}:</td>
270
	<td class="setting_value" colspan="2">
305
			</div>
306
		</div>
307

  
308
		<div class="mbox sub-row">
309
	 		<label class="setting_name">{TEXT_TIME_FORMAT}:</label>
310
			<div class="input" >
271 311
		<select name="default_time_format">
272 312
			<option value="g:i A">{TEXT_PLEASE_SELECT}...</option>
273 313
			<!-- BEGIN time_format_list_block -->
274 314
				<option value="{VALUE}" {SELECTED}>{NAME}</option>
275 315
			<!-- END time_format_list_block -->
276 316
		</select>
277
	</td>
278
</tr>
279
<tr>
280
	<td class="setting_name">{TEXT_TEMPLATE}:</td>
281
	<td class="setting_value" colspan="2">
317
			</div>
318
		</div>
319

  
320
		<div class="mbox sub-row">
321
	 		<label class="setting_name">{TEXT_TEMPLATE}:</label>
322
			<div class="input" >
282 323
		<select name="default_template">
283 324
		<!-- BEGIN template_list_block -->
284 325
			<option value="{FILE}"{SELECTED}>{NAME}</option>
285 326
		<!-- END template_list_block -->
286 327
		</select>
287
	</td>
288
</tr>
289
<tr>
290
	<td class="setting_name">{TEXT_THEME}:</td>
291
	<td class="setting_value" colspan="2">
328
			</div>
329
		</div>
330

  
331
		<div class="mbox sub-row">
332
	 		<label class="setting_name">{TEXT_THEME}:</label>
333
			<div class="input" >
292 334
		<select name="default_theme">
293 335
		<!-- BEGIN theme_list_block -->
294 336
			<option value="{FILE}"{SELECTED}>{NAME}</option>
295 337
		<!-- END theme_list_block -->
296 338
		</select>
297
	</td>
298
</tr>
299
<tr>
300
	<td>&nbsp;</td>
301
	<td>
302
		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
303
		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
304
	</td>
305
	<td style="text-align: right;">
306
		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
307
	</td>
308
</tr>
309
</table>
310
<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" class="settings_table">
311
<tr>
312
	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_SEARCH_SETTINGS}</h2></td>
313
</tr>
314
<tr>
315
	<td class="setting_name">{TEXT_VISIBILITY}:</td>
316
	<td class="setting_value" colspan="2">
339
			</div>
340
		</div>
341
		<div class="mbox sub-row">
342
			<label class="setting_name">&nbsp;</label>
343
			<div style="margin-top: 5px;">
344
				<input class="save" type="submit" name="submit" value="{TEXT_SAVE}" />
345
				<input class="delete" type="reset" name="reset" value="{TEXT_RESET}" />
346
				<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="cright {DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
347
			</div>
348
		</div>
349
		<br />
350
	</fieldset>
351

  
352
	<fieldset>
353
		<legend>{HEADING_SEARCH_SETTINGS}</legend>
354
		<div class="mbox sub-row">
355
	 		<label class="setting_name">{TEXT_VISIBILITY}:</label>
356
			<div class="input" >
317 357
		<select name="search">
318 358
			<option value="public">{TEXT_PUBLIC}</option>
319 359
			<option value="private" {PRIVATE_SEARCH}>{TEXT_PRIVATE}</option>
320 360
			<option value="registered" {REGISTERED_SEARCH}>{TEXT_REGISTERED}</option>
321 361
			<option value="none" {NONE_SEARCH}>{TEXT_NONE}</option>
322 362
		</select>
323
	</td>
324
</tr>
325
<tr>
326
	<td class="setting_name">{TEXT_TEMPLATE}:</td>
327
	<td class="setting_value" colspan="2">
363
			</div>
364
		</div>
365

  
366
		<div class="mbox sub-row">
367
	 		<label class="setting_name">{TEXT_TEMPLATE}:</label>
368
			<div class="input" >
328 369
		<select name="search_template">
329 370
		<!-- BEGIN search_template_list_block -->
330 371
			<option value="{FILE}"{SELECTED}>{NAME}</option>
331 372
		<!-- END search_template_list_block -->
332 373
		</select>
333
	</td>
334
</tr>
374
			</div>
375
		</div>
335 376
<!-- BEGIN show_search_block -->
336
<tr{DISPLAY_ADVANCED}>
337
	<td class="setting_name">{TEXT_HEADER}:</td>
338
	<td class="setting_value" colspan="2">
377

  
378
		<div class="mbox sub-row">
379
	 		<label class="setting_name">{TEXT_HEADER}:</label>
380
			<div class="input" >
339 381
		<textarea name="search_header" style="height: 100px;" cols="50" rows="3">{SEARCH_HEADER}</textarea>
340
	</td>
341
</tr>
342
<tr{DISPLAY_ADVANCED}>
343
	<td class="setting_name">{TEXT_RESULTS_HEADER}:</td>
344
	<td class="setting_value" colspan="2">
382
			</div>
383
		</div>
384

  
385
		<div class="mbox sub-row">
386
	 		<label class="setting_name">{TEXT_RESULTS_HEADER}:</label>
387
			<div class="input" >
345 388
		<textarea name="search_results_header" cols="50" rows="3">{SEARCH_RESULTS_HEADER}</textarea>
346
	</td>
347
</tr>
348
<tr{DISPLAY_ADVANCED}>
349
	<td class="setting_name">{TEXT_RESULTS_LOOP}:</td>
350
	<td class="setting_value" colspan="2">
389
			</div>
390
		</div>
391

  
392
		<div class="mbox sub-row">
393
	 		<label class="setting_name">{TEXT_RESULTS_LOOP}:</label>
394
			<div class="input" >
351 395
		<textarea name="search_results_loop" cols="50" rows="3">{SEARCH_RESULTS_LOOP}</textarea>
352
	</td>
353
</tr>
354
<tr{DISPLAY_ADVANCED}>
355
	<td class="setting_name">{TEXT_RESULTS_FOOTER}:</td>
356
	<td class="setting_value" colspan="2">
396
			</div>
397
		</div>
398

  
399
		<div class="mbox sub-row">
400
	 		<label class="setting_name">{TEXT_RESULTS_FOOTER}:</label>
401
			<div class="input" >
357 402
		<textarea name="search_results_footer" cols="50" rows="3">{SEARCH_RESULTS_FOOTER}</textarea>
358
	</td>
359
</tr>
360
<tr{DISPLAY_ADVANCED}>
361
	<td class="setting_name">{TEXT_NO_RESULTS}:</td>
362
	<td class="setting_value" colspan="2">
403
			</div>
404
		</div>
405

  
406
		<div class="mbox sub-row">
407
	 		<label class="setting_name">{TEXT_NO_RESULTS}:</label>
408
			<div class="input" >
363 409
		<input type="text" name="search_no_results" value="{SEARCH_NO_RESULTS}" />
364
	</td>
365
</tr>
366
<tr{DISPLAY_ADVANCED}>
367
	<td class="setting_name">{TEXT_FOOTER}:</td>
368
	<td class="setting_value" colspan="2">
410
			</div>
411
		</div>
412
		<div class="mbox sub-row">
413
	 		<label class="setting_name">{TEXT_FOOTER}:</label>
414
			<div class="input" >
369 415
		<textarea name="search_footer" cols="50" rows="3">{SEARCH_FOOTER}</textarea>
370
	</td>
371
</tr>
372
<tr{DISPLAY_ADVANCED}>
373
	<td class="setting_name">{TEXT_MODULE_ORDER}:</td>
374
	<td class="setting_value" colspan="2">
416
			</div>
417
		</div>
418

  
419
		<div class="mbox sub-row">
420
	 		<label class="setting_name">{TEXT_MODULE_ORDER}:</label>
421
			<div class="input" >
375 422
		<input type="text" name="search_module_order" value="{SEARCH_MODULE_ORDER}" />
376
	</td>
377
</tr>
378
<tr{DISPLAY_ADVANCED}>
379
	<td class="setting_name">{TEXT_MAX_EXCERPT}:</td>
380
	<td class="setting_value" colspan="2">
423
			</div>
424
		</div>
425

  
426
		<div class="mbox sub-row">
427
	 		<label class="setting_name">{TEXT_MAX_EXCERPT}:</label>
428
			<div class="input" >
381 429
		<input type="text" name="search_max_excerpt" value="{SEARCH_MAX_EXCERPT}" />
382
	</td>
383
</tr>
384
<tr{DISPLAY_ADVANCED}>
385
	<td class="setting_name">{TEXT_TIME_LIMIT}:</td>
386
	<td class="setting_value" colspan="2">
430
			</div>
431
		</div>
432

  
433
		<div class="mbox sub-row">
434
	 		<label class="setting_name">{TEXT_TIME_LIMIT}:</label>
435
			<div class="input" >
387 436
		<input type="text" name="search_time_limit" value="{SEARCH_TIME_LIMIT}" />
388
	</td>
389
</tr>
437
			</div>
438
		</div>
390 439
<!-- END show_search_block -->
391
<tr>
392
	<td>&nbsp;</td>
393
	<td>
394
		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
395
		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
396
	</td>
397
	<td style="text-align: right;">
398
		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
399
	</td>
400
</tr>
401
</table>
440
		<div class="mbox sub-row">
441
			<label class="setting_name">&nbsp;</label>
442
			<div style="margin-top: 5px;">
443
				<input class="save" type="submit" name="submit" value="{TEXT_SAVE}" />
444
				<input class="delete" type="reset" name="reset" value="{TEXT_RESET}" />
445
				<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="cright {DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
446
			</div>
447
		</div>
448
		<br />
449
	</fieldset>
450

  
402 451
<!-- BEGIN show_access_block -->
403
<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" class="settings_table">
404
<tr>
405
	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_SERVER_SETTINGS}</h2></td>
406
</tr>
407
<tr>
408
	<td class="setting_name">{TEXT_SERVER_OPERATING_SYSTEM}:</td>
409
	<td colspan="2" class="setting_value">
410
		<input type="radio" name="operating_system" id="operating_system_linux" onclick="javascript: change_os('linux');" style="width: 14px; height: 14px;" value="linux"{LINUX_SELECTED} />
452
	<fieldset>
453
		<legend>{HEADING_SERVER_SETTINGS}</legend>
454
		<div class="mbox sub-row">
455
	 		<label class="setting_name">{TEXT_SERVER_OPERATING_SYSTEM}:</label>
456
			<span>
457
				<input class="radio" type="radio" name="operating_system" id="operating_system_linux" onclick="javascript: change_os('linux');" value="linux"{LINUX_SELECTED} />
411 458
		<label for="operating_system_linux" onclick="javascript: change_os('linux');">{TEXT_LINUX_UNIX_BASED}</label>
412
		<input type="radio" name="operating_system" id="operating_system_windows" onclick="javascript: change_os('windows');" style="width: 14px; height: 14px;" value="windows"{WINDOWS_SELECTED} />
459
			</span>
460
			<span>
461
				<input class="radio" type="radio" name="operating_system" id="operating_system_windows" onclick="javascript: change_os('windows');" value="windows"{WINDOWS_SELECTED} />
413 462
		<label for="operating_system_windows" onclick="javascript: change_os('windows');">{TEXT_WINDOWS}</label>
414
	</td>
415
</tr>
416
<tr>
417
	<td class="setting_name"><div id="{BASIC_FILE_PERMS_ID}1" style="margin: 0; padding: 0;">&nbsp;</div></td>
418
	<td colspan="2" class="setting_value">
463
			</span>
464
		</div>
465

  
466
		<div class="mbox sub-row">
467
	 		<label class="setting_name none" id="{BASIC_FILE_PERMS_ID}1">&nbsp;</label>
468
			<div class="input none" >
419 469
		<div id="{BASIC_FILE_PERMS_ID}2" style="margin: 0; padding: 0;">
420
			<input type="checkbox" name="world_writeable" id="world_writeable" style="width: 14px; height: 14px;" value="true"{WORLD_WRITEABLE_SELECTED} />
470
				<input type="checkbox" name="world_writeable" id="world_writeable" value="true"{WORLD_WRITEABLE_SELECTED} />
421 471
			<label for="world_writeable">
422 472
				{TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS} (777)
423 473
			</label>
424 474
			<span class="warning">({WORLD_WRITEABLE_WARNING})</span>
425 475
		</div>
426 476
		<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div>
427
	</td>
428
</tr>
429
<tr{DISPLAY_ADVANCED}>
430
	<td class="setting_name"><div id="{ADVANCED_FILE_PERMS_ID}1" style="margin: 0; padding: 0;">{TEXT_FILESYSTEM_PERMISSIONS}:</div></td>
431
	<td class="" id="file_mode">
432
		<table class="permission_box" summary="" cellpadding="2" cellspacing="0" border="0" style="margin: 1px auto; width:95%;" id="{ADVANCED_FILE_PERMS_ID}2">
477
			</div>
478
		</div>
479
		<br class="clear none" />
480
		<div class="mbox sub-row">
481
	 		<label class="setting_name" id="{ADVANCED_FILE_PERMS_ID}1">{TEXT_FILESYSTEM_PERMISSIONS}:</label>
482
			<div class="cleft" id="file_mode">
483
				<div class="input" >
484
					<table class="permission_box" summary="" cellpadding="2" cellspacing="0" border="0" id="{ADVANCED_FILE_PERMS_ID}2">
433 485
			<caption>{TEXT_FILES}: {STRING_FILE_MODE}</caption>
434 486
		<thead>
435 487
		<tr>
......
471 523
			</td>
472 524
		</tr>
473 525
		</table>
474
	</td>
475
	<td class="" id="dir_mode" style="text-align: right;">
476
		<table class="permission_box" summary="" cellpadding="2" cellspacing="0" border="0" style="margin: 1px auto; width:95%;" id="{ADVANCED_FILE_PERMS_ID}3">
526
				</div>
527
			</div>
528
			<div class="cright" id="dir_mode">
529
				<div class="input" >
530
					<table class="permission_box" summary="" cellpadding="2" cellspacing="0" border="0" id="{ADVANCED_FILE_PERMS_ID}3">
477 531
		<caption>{TEXT_DIRECTORIES}: {STRING_DIR_MODE}</caption>
478 532
		<thead>
479 533
		<tr>
......
515 569
			</td>
516 570
		</tr>
517 571
		</table>
518
	</td>
519
</tr>
520
<tr{DISPLAY_ADVANCED}>
521
<td colspan="3"><hr /></td>
522
</tr>
523
<tr{DISPLAY_ADVANCED}>
524
        <td class="setting_name">{TEXT_DEV_INFOS}:</td>
525
        <td colspan="2" class="setting_value">
526
                <input type="radio" name="dev_infos" id="dev_infos_true" style="width: 14px; height: 14px;" value="true"{DEV_INFOS_ENABLED} />
572
				</div>
573
			<br />
574
			</div>
575
		</div>
576
		<br class="none" style="clear: both;" />
577
		<div class="mbox sub-row">
578
	 		<label class="setting_name">{TEXT_DEV_INFOS}:</label>
579
			<span>
580
				<input class="radio" type="radio" name="dev_infos" id="dev_infos_true" value="true"{DEV_INFOS_ENABLED} />
527 581
                <label for="dev_infos_true">{TEXT_ENABLED}</label>
528
                <input type="radio" name="dev_infos" id="dev_infos_false" style="width: 14px; height: 14px;" value="false"{DEV_INFOS_DISABLED} />
582
			</span>
583
			<span>
584
				<input class="radio" type="radio" name="dev_infos" id="dev_infos_false" value="false"{DEV_INFOS_DISABLED} />
529 585
                <label for="dev_infos_false">{TEXT_DISABLED}</label>
530
		</td>
531
</tr>
532
<tr{DISPLAY_ADVANCED}>
533
	<td class="setting_name">{TEXT_PAGES_DIRECTORY}:</td>
534
	<td colspan="2" class="setting_value"><input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" /></td>
535
</tr>
536
<tr{DISPLAY_ADVANCED}>
537
	<td class="setting_name">{TEXT_PAGE_ICON_DIR}:</td>
538
	<td colspan="2" class="setting_value">
539
		<input class="c33" type="text" id="page_icon_dir" name="page_icon_dir" value="{PAGE_ICON_DIR}" />
540
	</td>
541
</tr>
542
<tr{DISPLAY_ADVANCED}>
543
	<td class="setting_name">{TEXT_MEDIA_DIRECTORY}:</td>
544
	<td colspan="2" class="setting_value"><input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" /></td>
545
</tr>
546
<tr{DISPLAY_ADVANCED}>
547
	<td class="setting_name">{TEXT_PAGE_EXTENSION}:</td>
548
	<td colspan="2" class="setting_value"><input type="text" name="page_extension" value="{PAGE_EXTENSION}" /></td>
549
</tr>
550
<tr{DISPLAY_ADVANCED}>
551
	<td class="setting_name">{TEXT_PAGE_SPACER}:</td>
552
	<td colspan="2" class="setting_value"><input type="text" name="page_spacer" value="{PAGE_SPACER}" /></td>
553
</tr>
554
<tr{DISPLAY_ADVANCED}>
555
	<td class="setting_name">{TEXT_RENAME_FILES_ON_UPLOAD}:</td>
556
	<td colspan="2" class="setting_value"><input type="text" name="rename_files_on_upload" value="{RENAME_FILES_ON_UPLOAD}" /></td>
557
</tr>
558
<tr{DISPLAY_ADVANCED}>
559
	<td class="setting_name">{TEXT_SESSION_IDENTIFIER}:</td>
560
	<td colspan="2" class="setting_value"><input type="text" name="app_name" value="{APP_NAME}" /></td>
561
</tr>
562
<tr{DISPLAY_ADVANCED}>
563
	<td class="setting_name">{TEXT_SEC_ANCHOR}:</td>
564
	<td colspan="2" class="setting_value"><input type="text" name="sec_anchor" value="{SEC_ANCHOR}" /></td>
565
</tr>
566
</table>
567
<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" class="settings_table">
568
<!-- BASIC MAILER SETTINGS -->
569
<tr>
570
	<td colspan="3" style="padding-top: 10px;">
571
		<h2>{HEADING_WBMAILER_SETTINGS}</h2>
586
			</span>
587
		</div>
588

  
589
		<div class="mbox sub-row">
590
	 		<label class="setting_name">{TEXT_PAGES_DIRECTORY}:</label>
591
			<div class="input" >
592
				<input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" />
593
			</div>
594
		</div>
595

  
596
		<div class="mbox sub-row">
597
	 		<label class="setting_name">{TEXT_PAGE_ICON_DIR}:</label>
598
			<div class="input" >
599
			<input type="text" id="page_icon_dir" name="page_icon_dir" value="{PAGE_ICON_DIR}" />
600
			</div>
601
		</div>
602

  
603
		<div class="mbox sub-row">
604
	 		<label class="setting_name">{TEXT_MEDIA_DIRECTORY}:</label>
605
			<div class="input" >
606
			<input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" />
607
			</div>
608
		</div>
609

  
610
		<div class="mbox sub-row">
611
	 		<label class="setting_name">{TEXT_PAGE_EXTENSION}:</label>
612
			<div class="input" >
613
			<input type="text" name="page_extension" value="{PAGE_EXTENSION}" />
614
			</div>
615
		</div>
616

  
617
		<div class="mbox sub-row">
618
	 		<label class="setting_name">{TEXT_PAGE_SPACER}:</label>
619
			<div class="input" >
620
			<input type="text" name="page_spacer" value="{PAGE_SPACER}" />
621
			</div>
622
		</div>
623

  
624
		<div class="mbox sub-row">
625
	 		<label class="setting_name">{TEXT_RENAME_FILES_ON_UPLOAD}:</label>
626
			<div class="input" >
627
			<input type="text" name="rename_files_on_upload" value="{RENAME_FILES_ON_UPLOAD}" />
628
			</div>
629
		</div>
630

  
631
		<div class="mbox sub-row">
632
	 		<label class="setting_name">{TEXT_SESSION_IDENTIFIER}:</label>
633
			<div class="input" >
634
			<input type="text" name="app_name" value="{APP_NAME}" />
635
			</div>
636
		</div>
637

  
638
		<div class="mbox sub-row">
639
	 		<label class="setting_name">{TEXT_SEC_ANCHOR}:</label>
640
			<div class="input" >
641
			<input type="text" name="sec_anchor" value="{SEC_ANCHOR}" />
642
			</div>
643
		</div>
644
		<br />
645
		<div class="mbox sub-row">
646
			<label class="setting_name">&nbsp;</label>
647
			<div style="margin-top: 5px;">
648
				<input class="save" type="submit" name="submit" value="{TEXT_SAVE}" />
649
				<input class="delete" type="reset" name="reset" value="{TEXT_RESET}" />
650
				<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="cright {DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
651
			</div>
652
		</div>
653
		<br />
654
	</fieldset>
655

  
656

  
657
	<fieldset>
658
		<legend>{HEADING_WBMAILER_SETTINGS}</legend>
572 659
		<p class="msg-box" style="line-height: 150%; margin-top: 0;">{TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE}</p>
573
	</td>
574
</tr>
575
<tr>
576
	<td class="setting_name">{TEXT_WBMAILER_DEFAULT_SENDER_MAIL}:</td>
577
	<td colspan="2" class="setting_value"><input type="text" name="server_email" value="{SERVER_EMAIL}" /></td>
578
</tr>
579
<tr>
580
	<td class="setting_name">{TEXT_WBMAILER_DEFAULT_SENDER_NAME}:</td>
581
	<td colspan="2" class="setting_value"><input type="text" name="wbmailer_default_sendername" value="{WBMAILER_DEFAULT_SENDERNAME}" /></td>
582
</tr>
583
<tr>
584
	<td class="setting_name">{TEXT_WBMAILER_FUNCTION}:</td>
585
	<td colspan="2" class="setting_value">
586
		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_phpmail" onclick="javascript: change_wbmailer('phpmail');" style="width: 14px; height: 14px;" value="phpmail"{PHPMAIL_SELECTED} />
660
		<div class="mbox sub-row">
661
	 		<label class="setting_name">{TEXT_WBMAILER_DEFAULT_SENDER_MAIL}:</label>
662
			<div class="input" >
663
				<input type="text" name="server_email" value="{SERVER_EMAIL}" />
664
			</div>
665
		</div>
666

  
667
		<div class="mbox sub-row">
668
	 		<label class="setting_name">{TEXT_WBMAILER_DEFAULT_SENDER_NAME}:</label>
669
			<div class="input" >
670
				<input type="text" name="wbmailer_default_sendername" value="{WBMAILER_DEFAULT_SENDERNAME}" />
671
			</div>
672
		</div>
673

  
674
		<div class="mbox sub-row">
675
	 		<label class="setting_name">{TEXT_WBMAILER_FUNCTION}:</label>
676
			<span>
677
				<input type="radio" name="wbmailer_routine" id="wbmailer_routine_phpmail" onclick="javascript: change_wbmailer('phpmail');" value="phpmail"{PHPMAIL_SELECTED} />
587 678
		<label for="wbmailer_routine_phpmail" onclick="javascript: change_wbmailer('phpmail');">{TEXT_WBMAILER_PHP}</label>
588
		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');" style="width: 14px; height: 14px;" value="smtp"{SMTPMAIL_SELECTED} />
679
			</span>
680
			<span>
681
				<input type="radio" name="wbmailer_routine" id="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');" value="smtp"{SMTPMAIL_SELECTED} />
589 682
		<label for="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');">{TEXT_WBMAILER_SMTP}</label>
590
	</td>
591
</tr>
592
<!-- MORE ADVANCED SMTP MAILER SETTINGS -->
593
<tr id="row_wbmailer_smtp_settings"{SMTP_VISIBILITY}>
594
	<td colspan="3" style="padding-top: 10px;"><p class="msg-box" style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_NOTICE}</p></td>
595
</tr>
596
<tr id="row_wbmailer_smtp_host"{SMTP_VISIBILITY}>
597
	<td class="setting_name">{TEXT_WBMAILER_SMTP_HOST}:</td>
598
	<td colspan="2" class="setting_value"><input type="text" name="wbmailer_smtp_host" value="{WBMAILER_SMTP_HOST}" /></td>
599
</tr>
600
<!--  -->
601
<tr id="row_wbmailer_smtp_auth_mode"{SMTP_VISIBILITY}>
602
	<td class="setting_name">{TEXT_WBMAILER_SMTP_AUTH}:</td>
603
	<td colspan="2" class="setting_value">
604
		<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} />
683
			</span>
684
		</div>
685

  
686
		<div class="mbox sub-row" id="row_wbmailer_smtp_settings"{SMTP_VISIBILITY} >
687
			<div >
688
				<p class="msg-box" style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_NOTICE}</p>
689
			</div>
690
		</div>
691
		<br />
692
		<div class="mbox sub-row" id="row_wbmailer_smtp_host"{SMTP_VISIBILITY} >
693
	 		<label class="setting_name">{TEXT_WBMAILER_SMTP_HOST}:</label>
694
			<div class="input" >
695
			<input type="text" name="wbmailer_smtp_host" value="{WBMAILER_SMTP_HOST}" />
696
			</div>
697
		</div>
698

  
699
		<div class="mbox sub-row" id="row_wbmailer_smtp_auth_mode"{SMTP_VISIBILITY}>
700
	 		<label class="setting_name">{TEXT_WBMAILER_SMTP_AUTH}:</label>
701
			<span>
702
				<input type="checkbox" name="wbmailer_smtp_auth" id="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth();" value="true" disabled="disabled" {SMTP_AUTH_SELECTED} />
605 703
		<label for="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth(this.value);">({TEXT_WBMAILER_SMTP_AUTH_NOTICE})</label>
606
	</td>
607
</tr>
704
			</span>
705
		</div>
608 706

  
609
<tr id="row_wbmailer_smtp_username"{SMTP_VISIBILITY}>
610
	<td class="setting_name">{TEXT_WBMAILER_SMTP_USERNAME}:</td>
611
	<td colspan="2" class="setting_value"><input type="text" name="wbmailer_smtp_username" value="{WBMAILER_SMTP_USERNAME}" /></td>
612
</tr>
613
<tr id="row_wbmailer_smtp_password"{SMTP_VISIBILITY}>
614
	<td class="setting_name">{TEXT_WBMAILER_SMTP_PASSWORD}:</td>
615
	<td colspan="2" class="setting_value"><input type="password" name="wbmailer_smtp_password" value="{WBMAILER_SMTP_PASSWORD}" /></td>
616
</tr>
617
<tr>
618
	<td>&nbsp;</td>
619
	<td>
620
		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
621
		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
622
	</td>
623
	<td style="text-align: right;">
624
		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
625
	</td>
626
</tr>
627
</table>
707
		<div class="mbox sub-row" id="row_wbmailer_smtp_username"{SMTP_VISIBILITY}>
708
	 		<label class="setting_name">{TEXT_WBMAILER_SMTP_USERNAME}:</label>
709
			<div class="input" >
710
			<input type="text" name="wbmailer_smtp_username" value="{WBMAILER_SMTP_USERNAME}" />
711
			</div>
712
		</div>
713

  
714
		<div class="mbox sub-row" id="row_wbmailer_smtp_password"{SMTP_VISIBILITY}>
715
	 		<label class="setting_name">{TEXT_WBMAILER_SMTP_PASSWORD}:</label>
716
			<div class="input" >
717
			<input type="password" name="wbmailer_smtp_password" value="{WBMAILER_SMTP_PASSWORD}" />
718
			</div>
719
		</div>
720
		<br />
721
		<div class="mbox sub-row">
722
			<label class="setting_name">&nbsp;</label>
723
			<div style="margin-top: 5px;">
724
				<input class="save" type="submit" name="submit" value="{TEXT_SAVE}" />
725
				<input class="delete" type="reset" name="reset" value="{TEXT_RESET}" />
726
				<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="cright {DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
727
			</div>
728
		</div>
729
	</fieldset>
628 730
<!-- END show_access_block -->
731
	<hr class="hr-top" />
732
	<fieldset class="hr-top">
733
		<div class="mbox sub-row">
734
			<h4 class="warning cleft {DISPLAY_ADVANCED_BUTTON}">{MODE_SWITCH_WARNING}</h4>
735
			<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="cright {DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
736
		</div>
737
	</fieldset>
629 738

  
630 739
</form>
631 740

  
632
<hr size="1" />
633

  
634
<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
635
<br />
636
<h4 class="warning {DISPLAY_ADVANCED_BUTTON}">{MODE_SWITCH_WARNING}</h4>
637 741
<script src="{ADMIN_URL}/settings/setting.js" type="text/javascript"></script>
638
<!-- END main_block -->
742
<!-- END main_block -->
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.3');
54
if(!defined('REVISION')) define('REVISION', '1715');
54
if(!defined('REVISION')) define('REVISION', '1716');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/admin/settings/save.php
4 4
 * @category        admin
5 5
 * @package         settings
6 6
 * @author          WebsiteBaker Project
7
 * @copyright       2009-2012, Website Baker Org. e.V.
7
 * @copyright       2009-2012, WebsiteBaker Org. e.V.
8 8
 * @link			http://www.websitebaker2.org/
9 9
 * @license         http://www.gnu.org/licenses/gpl.html
10 10
 * @platform        WebsiteBaker 2.8.x
......
47 47
if(isset($_POST['server_email']))
48 48
{
49 49
	$_POST['server_email'] = strip_tags($_POST['server_email']);
50
    // $pattern = '/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9]([-a-z0-9_]?[a-z0-9])*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z]{2})|([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})(\.([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})){3})(:[0-9]{1,5})?\r/im';
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
    if(false == preg_match($pattern, $_POST['server_email']))
50
//    // $pattern = '/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9]([-a-z0-9_]?[a-z0-9])*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z]{2})|([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})(\.([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})){3})(:[0-9]{1,5})?\r/im';
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
//    if(false == preg_match($pattern, $_POST['server_email']))
53
	if(!$admin->validate_email($_POST['server_email']))
53 54
    {
54 55
		$admin->print_error($MESSAGE['USERS_INVALID_EMAIL'].
55 56
			'<br /><strong>Email: '.htmlentities($_POST['server_email']).'</strong>', $js_back);
......
152 153
	}
153 154
}
154 155

  
155
$allow_tags_in_fields = array('website_header', 'website_footer');
156
$allow_empty_values = array('website_header','website_footer','sec_anchor','pages_directory','page_spacer');
156
$allow_tags_in_fields = array('website_header', 'website_footer','website_signature');
157
$allow_empty_values = array('website_header','website_footer','sec_anchor','pages_directory','page_spacer','website_signature');
157 158
$disallow_in_fields = array('pages_directory', 'media_directory','wb_version');
158 159

  
159 160
// Query current settings in the db, then loop through them and update the db with the new value
branches/2.8.x/wb/admin/settings/languages/EN.php
1
<?php
2
/****************************************************************************************
3
 * extended language definition for WebsiteBaker                                        *
4
 * ACP-module  pages                                                                    *
5
 * english (GB)                                                                         *
6
 ****************************************************************************************/
7

  
8
$TEXT['WEBSITE_SIGNATURE'] = 'Contact Signature';
0 9

  
branches/2.8.x/wb/admin/settings/languages/DE.php
1
<?php
2
/****************************************************************************************
3
 * extended language definition for WebsiteBaker                                        *
4
 * ACP-module  pages                                                                    *
5
 * deutsch                                                                              *
6
 ****************************************************************************************/
7

  
8

  
9
$TEXT['WEBSITE_SIGNATURE'] = 'Kontakt Signature';
0 10

  
branches/2.8.x/wb/admin/settings/index.php
4 4
 * @category        admin
5 5
 * @package         settings
6 6
 * @author          Ryan Djurovich, WebsiteBaker Project
7
 * @copyright       2009-2011, Website Baker Org. e.V.
7
 * @copyright       2009-2012, WebsiteBaker Org. e.V.
8 8
 * @link			http://www.websitebaker2.org/
9 9
 * @license         http://www.gnu.org/licenses/gpl.html
10 10
 * @platform        WebsiteBaker 2.8.x
......
24 24
	$admin = new admin('Settings', 'settings_basic');
25 25
}
26 26

  
27
// add new values, later in upgrade-script
28
$cfg = array(
29
	'website_signature' => defined('WEBSITE_SIGNATURE') ? WEBSITE_SIGNATURE : '',
30
	'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') ? CONFIRMED_REGISTRATION : '0'),
31
	);
32
db_update_key_value( 'settings', $cfg );
33

  
27 34
// Include the WB functions file
28 35
require_once(WB_PATH.'/framework/functions.php');
29 36
require_once(WB_PATH.'/framework/functions-utf8.php');
30 37

  
38
$mLang = ModLanguage::getInstance();
39
$mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE);
40

  
31 41
// Setup template object, parse vars to it, then parse it
32 42
// Create new template object
33
$template = new Template(dirname($admin->correct_theme_source('settings.htt')));
43
$template = new Template(dirname($admin->correct_theme_source('settings.htt')),'keep');
34 44
// $template->debug = true;
35 45
$template->set_file('page',        'settings.htt');
36 46
$template->set_block('page',       'main_block', 'main');
......
145 155
		}
146 156
	}
147 157

  
158
	$sSelected = ' selected="selected"';
159
	$checked   = ' checked="checked"';
160
/*-- insert all needed vars from language files ----------------------------------------*/
161
	$template->set_var($mLang->getLangArray());
162

  
148 163
	$template->set_var(array(
149 164
						'WB_URL' => WB_URL,
150 165
						'THEME_URL' => THEME_URL,
......
152 167
					 ));
153 168

  
154 169
	// Insert language values
155
	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language' ORDER BY directory");
156
	if($result->numRows() > 0)
170
	$sql  = 'SELECT `name`, `directory` FROM `'.TABLE_PREFIX.'addons` ';
171
	$sql .= 'WHERE `type` = \'language\' ';
172
	$sql .= 'AND `function` != \'theme\' ';
173
	$sql .= 'ORDER BY `directory`';
174

  
175
	if( ($result = $database->query($sql)) && ($result->numRows() > 0) )
176
//	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language' ORDER BY directory");
177
//	if($result->numRows() > 0)
157 178
	{
158 179
		while($addon = $result->fetchRow()) {
159 180
	        $langIcons = (empty($addon['directory'])) ? 'none' : strtolower($addon['directory']);
......
161 182
			$template->set_var('CODE',        $addon['directory']);
162 183
			$template->set_var('NAME',        $addon['name']);
163 184
			$template->set_var('FLAG',        THEME_URL.'/images/flags/'.$langIcons);
164
			$template->set_var('SELECTED',    (DEFAULT_LANGUAGE == $addon['directory'] ? ' selected="selected"' : '') );
185
			$template->set_var('SELECTED',    (DEFAULT_LANGUAGE == $addon['directory'] ? $sSelected : '') );
165 186
			$template->parse('language_list', 'language_list_block', true);
166 187
		}
167 188
	}
......
175 196
			$template->set_var('VALUE', $hour_offset);
176 197
			$template->set_var('NAME', $title);
177 198
			if(DEFAULT_TIMEZONE == $hour_offset*60*60) {
178
				$template->set_var('SELECTED', ' selected="selected"');
199
				$template->set_var('SELECTED', $sSelected);
179 200
			} else {
180 201
				$template->set_var('SELECTED', '');
181 202
			}
......
189 210
		$template->set_var('VALUE', $code);
190 211
		$template->set_var('NAME', $title);
191 212
		if(DEFAULT_CHARSET == $code) {
192
			$template->set_var('SELECTED', ' selected="selected"');
213
			$template->set_var('SELECTED', $sSelected);
193 214
		} else {
194 215
			$template->set_var('SELECTED', '');
195 216
		}
......
208 229
		}
209 230
		$template->set_var('NAME', $title);
210 231
		if(DEFAULT_DATE_FORMAT == $format) {
211
			$template->set_var('SELECTED', ' selected="selected"');
232
			$template->set_var('SELECTED', $sSelected);
212 233
		} else {
213 234
			$template->set_var('SELECTED', '');
214 235
		}
......
226 247
		}
227 248
		$template->set_var('NAME', $title);
228 249
		if(DEFAULT_TIME_FORMAT == $format) {
229
			$template->set_var('SELECTED', ' selected="selected"');
250
			$template->set_var('SELECTED', $sSelected);
230 251
		} else {
231 252
			$template->set_var('SELECTED', '');
232 253
		}
233 254
		$template->parse('time_format_list', 'time_format_list_block', true);
234 255
	}
235 256

  
236
	// Insert templates
237
	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function != 'theme' ORDER BY name");
238
	if($result->numRows() > 0) {
239
		while($addon = $result->fetchRow()) {
240
			$template->set_var('FILE', $addon['directory']);
241
			$template->set_var('NAME', $addon['name']);
242
			if(($addon['directory'] == DEFAULT_TEMPLATE) ? $selected = ' selected="selected"' : $selected = '');
243
			$template->set_var('SELECTED', $selected);
244
			$template->parse('template_list', 'template_list_block', true);
257
// Insert templates
258
	$sql  = 'SELECT `name`, `directory` FROM `'.TABLE_PREFIX.'addons` ';
259
	$sql .= 'WHERE `type` = \'template\' ';
260
	$sql .= 'AND `function` != \'theme\' ';
261
	$sql .= 'ORDER BY `name`';
262
	if( ($result = $database->query($sql)) && ($result->numRows() > 0) )
263
	{
264
//	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function != 'theme' ORDER BY name");
265
//	if($result->numRows() > 0) {
266
		while($addon = $result->fetchRow())
267
		{
268
			if( $admin->get_permission($addon['directory'],'template' ) )
269
			{
270
				$template->set_var('FILE', $addon['directory']);
271
				$template->set_var('NAME', $addon['name']);
272
				$selected = (($addon['directory'] == DEFAULT_TEMPLATE) ? $sSelected : '');
273
				$template->set_var('SELECTED', $selected);
274
				$template->parse('template_list', 'template_list_block', true);
275
			}
245 276
		}
246 277
	}
247 278

  
248
	// Insert backend theme
249
	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function = 'theme' ORDER BY name");
250
	if($result->numRows() > 0) {
251
		while($addon = $result->fetchRow()) {
252
			$template->set_var('FILE', $addon['directory']);
253
			$template->set_var('NAME', $addon['name']);
254
			if(($addon['directory'] == DEFAULT_THEME) ? $selected = ' selected="selected"' : $selected = '');
255
			$template->set_var('SELECTED', $selected);
256
			$template->parse('theme_list', 'theme_list_block', true);
279
// Insert backend theme
280
	$sql  = 'SELECT `name`, `directory` FROM `'.TABLE_PREFIX.'addons` ';
281
	$sql .= 'WHERE `type` = \'template\' ';
282
	$sql .= 'AND `function` = \'theme\' ';
283
	$sql .= 'ORDER BY `name`';
284

  
285

  
286
	if( ($result = $database->query($sql)) && ($result->numRows() > 0) )
287
	{
288
//	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function = 'theme' ORDER BY name");
289
//	if($result->numRows() > 0) {
290
		while($addon = $result->fetchRow())
291
		{
292
			if( $admin->get_permission($addon['directory'],'template' ) )
293
			{
294
				$template->set_var('FILE', $addon['directory']);
295
				$template->set_var('NAME', $addon['name']);
296
				$selected = (($addon['directory'] == DEFAULT_THEME) ? $sSelected : '');
297
				$template->set_var('SELECTED', $selected);
298
				$template->parse('theme_list', 'theme_list_block', true);
299
			}
257 300
		}
258 301
	}
259 302

  
......
262 305
	$module_name=$TEXT['NONE'];
263 306
	$template->set_var('FILE', $file);
264 307
	$template->set_var('NAME', $module_name);
265
	$selected = (!defined('WYSIWYG_EDITOR') || $file == WYSIWYG_EDITOR) ? ' selected="selected"' : '';
308
	$selected = (!defined('WYSIWYG_EDITOR') || $file == WYSIWYG_EDITOR) ? $sSelected : '';
266 309
	$template->set_var('SELECTED', $selected);
267 310
	$template->parse('editor_list', 'editor_list_block', true);
268
	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'wysiwyg' ORDER BY name");
269
	if($result->numRows() > 0)
311
	$sql  = 'SELECT `name`, `directory` FROM `'.TABLE_PREFIX.'addons` ';
312
	$sql .= 'WHERE `type` = \'module\' ';
313
	$sql .= 'AND `function` = \'wysiwyg\' ';
314
	$sql .= 'ORDER BY `name`';
315
	if( ($result = $database->query($sql)) && ($result->numRows() > 0) )
270 316
	{
317
//	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'wysiwyg' ORDER BY name");
318
//	if($result->numRows() > 0)
319
//	{
271 320
		while($addon = $result->fetchRow())
272 321
	    {
273
			$template->set_var('FILE', $addon['directory']);
274
			$template->set_var('NAME', $addon['name']);
275
			$selected = (!defined('WYSIWYG_EDITOR') || $addon['directory'] == WYSIWYG_EDITOR) ? ' selected="selected"' : '';
276
			$template->set_var('SELECTED', $selected);
277
			$template->parse('editor_list', 'editor_list_block', true);
322
			if( $admin->get_permission($addon['directory'],'module' ) )
323
			{
324
				$template->set_var('FILE', $addon['directory']);
325
				$template->set_var('NAME', $addon['name']);
326
				$selected = (!defined('WYSIWYG_EDITOR') || $addon['directory'] == WYSIWYG_EDITOR) ? $sSelected : '';
327
				$template->set_var('SELECTED', $selected);
328
				$template->parse('editor_list', 'editor_list_block', true);
329
			}
278 330
		}
279 331
	}
280 332

  
281 333
// Insert templates for search settings
282 334
	$search_template = ( ($search_template == DEFAULT_TEMPLATE) || ($search_template == '') ) ? '' : $search_template;
283
	$selected = ( ($search_template != DEFAULT_TEMPLATE) ) ?  ' selected="selected"' : $selected = '';
335
	$selected = ( ($search_template != DEFAULT_TEMPLATE) ) ?  $sSelected : '';
284 336

  
285 337
	$template->set_var(array(
286 338
	        'FILE' => '',
......
289 341
	    ));
290 342
	$template->parse('search_template_list', 'search_template_list_block', true);
291 343

  
292
	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function = 'template' ORDER BY name");
293
	if($result->numRows() > 0)
344
	$sql  = 'SELECT `name`, `directory` FROM `'.TABLE_PREFIX.'addons` ';
345
	$sql .= 'WHERE `type` = \'template\' ';
346
	$sql .= 'AND `function` = \'template\' ';
347
	$sql .= 'ORDER BY `name`';
348
    if( ($result = $database->query($sql)) && ($result->numRows() > 0) )
294 349
	{
350
//	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function = 'template' ORDER BY name");
351
//	if($result->numRows() > 0)
352
//	{
295 353
		while($addon = $result->fetchRow())
296 354
	    {
297
			$template->set_var('FILE', $addon['directory']);
298
			$template->set_var('NAME', $addon['name']);
299
	        $selected = ($addon['directory'] == $search_template) ? ' selected="selected"' :  $selected = '';
300
			$template->set_var('SELECTED', $selected);
301
			$template->parse('search_template_list', 'search_template_list_block', true);
302

  
355
			if( $admin->get_permission($addon['directory'],'template' ) )
356
			{
357
				$template->set_var('FILE', $addon['directory']);
358
				$template->set_var('NAME', $addon['name']);
359
		        $selected = ($addon['directory'] == $search_template) ? $sSelected :  '';
360
				$template->set_var('SELECTED', $selected);
361
				$template->parse('search_template_list', 'search_template_list_block', true);
362
			}
303 363
		}
304 364
	}
305 365

  
......
309 369
	{
310 370
		$template->set_var('VALUE', $value);
311 371
		$template->set_var('NAME', $title);
312
	    $selected = (ER_LEVEL == $value) ? ' selected="selected"' : '';
372
	    $selected = (ER_LEVEL == $value) ? $sSelected : '';
313 373
	    $template->set_var('SELECTED', $selected);
314 374
		$template->parse('error_reporting_list', 'error_reporting_list_block', true);
315 375
	}
316 376

  
377

  
317 378
	// Insert permissions values
318 379
	if($admin->get_permission('settings_advanced') != true)
319 380
	{
......
326 387
		$template->set_var('NUMBER', $i);
327 388
		if(PAGE_LEVEL_LIMIT == $i)
328 389
	    {
329
			$template->set_var('SELECTED', ' selected="selected"');
390
			$template->set_var('SELECTED', $sSelected);
330 391
		} else {
331 392
			$template->set_var('SELECTED', '');
332 393
		}
......
336 397
	// Work-out if multiple menus feature is enabled
337 398
	if(defined('MULTIPLE_MENUS') && MULTIPLE_MENUS == true)
338 399
	{
339
		$template->set_var('MULTIPLE_MENUS_ENABLED', ' checked="checked"');
400
		$template->set_var('MULTIPLE_MENUS_ENABLED', $checked);
340 401
	} else {
341
		$template->set_var('MULTIPLE_MENUS_DISABLED', ' checked="checked"');
402
		$template->set_var('MULTIPLE_MENUS_DISABLED', $checked);
342 403
	}
343 404

  
344 405
	// Work-out if page languages feature is enabled
345 406
	if(defined('PAGE_LANGUAGES') && PAGE_LANGUAGES == true)
346 407
	{
347
	        $template->set_var('PAGE_LANGUAGES_ENABLED', ' checked="checked"');
408
        $template->set_var('PAGE_LANGUAGES_ENABLED', $checked);
348 409
	} else {
349
	        $template->set_var('PAGE_LANGUAGES_DISABLED', ' checked="checked"');
410
        $template->set_var('PAGE_LANGUAGES_DISABLED', $checked);
350 411
	}
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff