Skip to content

Commit ecbdda9

Browse files
author
Till Brehm
committed
Added new input filters.
1 parent c3ab7bc commit ecbdda9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1018
-21
lines changed

‎interface/web/admin/form/directive_snippets.tform.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@
7171
1 => array ( 'type' => 'UNIQUE',
7272
'errmsg'=> 'directive_snippets_name_error_unique'),
7373
),
74+
'filters' => array(
75+
0 => array( 'event' => 'SAVE',
76+
'type' => 'STRIPTAGS'),
77+
1 => array( 'event' => 'SAVE',
78+
'type' => 'STRIPNL')
79+
),
7480
'default' => '',
7581
'value' => '',
7682
'width' => '30',

‎interface/web/admin/form/groups.tform.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@
8181
'name' => array (
8282
'datatype' => 'VARCHAR',
8383
'formtype' => 'TEXT',
84+
'filters' => array(
85+
0 => array( 'event' => 'SAVE',
86+
'type' => 'STRIPTAGS'),
87+
1 => array( 'event' => 'SAVE',
88+
'type' => 'STRIPNL')
89+
),
8490
'regex' => '/^.{1,30}$/',
8591
'errmsg' => 'name_err',
8692
'default' => '',
@@ -94,6 +100,10 @@
94100
'description' => array (
95101
'datatype' => 'TEXT',
96102
'formtype' => 'TEXTAREA',
103+
'filters' => array(
104+
0 => array( 'event' => 'SAVE',
105+
'type' => 'STRIPTAGS')
106+
),
97107
'regex' => '',
98108
'errmsg' => '',
99109
'default' => '',

‎interface/web/admin/form/iptables.tform.php‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@
5252
'source_ip' => array (
5353
'datatype' => 'VARCHAR',
5454
'formtype' => 'TEXT',
55+
'filters' => array(
56+
0 => array( 'event' => 'SAVE',
57+
'type' => 'STRIPTAGS'),
58+
1 => array( 'event' => 'SAVE',
59+
'type' => 'STRIPNL')
60+
),
5561
'default' => '',
5662
'value' => '',
5763
'width' => '',
@@ -60,6 +66,12 @@
6066
'destination_ip' => array (
6167
'datatype' => 'VARCHAR',
6268
'formtype' => 'TEXT',
69+
'filters' => array(
70+
0 => array( 'event' => 'SAVE',
71+
'type' => 'STRIPTAGS'),
72+
1 => array( 'event' => 'SAVE',
73+
'type' => 'STRIPNL')
74+
),
6375
'default' => '',
6476
'value' => '',
6577
'width' => '',
@@ -68,6 +80,12 @@
6880
'singleport' => array (
6981
'datatype' => 'VARCHAR',
7082
'formtype' => 'TEXT',
83+
'filters' => array(
84+
0 => array( 'event' => 'SAVE',
85+
'type' => 'STRIPTAGS'),
86+
1 => array( 'event' => 'SAVE',
87+
'type' => 'STRIPNL')
88+
),
7189
'default' => '',
7290
'value' => '',
7391
'width' => '',
@@ -76,6 +94,12 @@
7694
'multiport' => array (
7795
'datatype' => 'VARCHAR',
7896
'formtype' => 'TEXT',
97+
'filters' => array(
98+
0 => array( 'event' => 'SAVE',
99+
'type' => 'STRIPTAGS'),
100+
1 => array( 'event' => 'SAVE',
101+
'type' => 'STRIPNL')
102+
),
79103
'default' => '',
80104
'value' => '',
81105
'width' => '',
@@ -84,6 +108,12 @@
84108
'state' => array (
85109
'datatype' => 'VARCHAR',
86110
'formtype' => 'TEXT',
111+
'filters' => array(
112+
0 => array( 'event' => 'SAVE',
113+
'type' => 'STRIPTAGS'),
114+
1 => array( 'event' => 'SAVE',
115+
'type' => 'STRIPNL')
116+
),
87117
'default' => '',
88118
'value' => '',
89119
'width' => '',

‎interface/web/admin/form/server.tform.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@
6161
'server_name' => array (
6262
'datatype' => 'VARCHAR',
6363
'formtype' => 'TEXT',
64+
'filters' => array(
65+
0 => array( 'event' => 'SAVE',
66+
'type' => 'STRIPTAGS'),
67+
1 => array( 'event' => 'SAVE',
68+
'type' => 'STRIPNL')
69+
),
6470
'default' => '',
6571
'value' => '',
6672
'width' => '30',

‎interface/web/admin/form/server_config.tform.php‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,12 @@
145145
'validators' => array(0 => array('type' => 'NOTEMPTY',
146146
'errmsg' => 'nameservers_error_empty'),
147147
),
148+
'filters' => array(
149+
0 => array( 'event' => 'SAVE',
150+
'type' => 'STRIPTAGS'),
151+
1 => array( 'event' => 'SAVE',
152+
'type' => 'STRIPNL')
153+
),
148154
'value' => '',
149155
'width' => '40',
150156
'maxlength' => '255'
@@ -316,6 +322,12 @@
316322
'monit_user' => array(
317323
'datatype' => 'VARCHAR',
318324
'formtype' => 'TEXT',
325+
'filters' => array(
326+
0 => array( 'event' => 'SAVE',
327+
'type' => 'STRIPTAGS'),
328+
1 => array( 'event' => 'SAVE',
329+
'type' => 'STRIPNL')
330+
),
319331
'default' => '',
320332
'value' => '',
321333
'width' => '40',
@@ -344,6 +356,12 @@
344356
'munin_user' => array(
345357
'datatype' => 'VARCHAR',
346358
'formtype' => 'TEXT',
359+
'filters' => array(
360+
0 => array( 'event' => 'SAVE',
361+
'type' => 'STRIPTAGS'),
362+
1 => array( 'event' => 'SAVE',
363+
'type' => 'STRIPNL')
364+
),
347365
'default' => '',
348366
'value' => '',
349367
'width' => '40',
@@ -426,6 +444,12 @@
426444
'dkim_path' => array(
427445
'datatype' => 'VARCHAR',
428446
'formtype' => 'TEXT',
447+
'filters' => array(
448+
0 => array( 'event' => 'SAVE',
449+
'type' => 'STRIPTAGS'),
450+
1 => array( 'event' => 'SAVE',
451+
'type' => 'STRIPNL')
452+
),
429453
'default' => '/var/lib/amavis/dkim',
430454
'value' => '',
431455
'width' => '40',
@@ -527,6 +551,12 @@
527551
'relayhost' => array(
528552
'datatype' => 'VARCHAR',
529553
'formtype' => 'TEXT',
554+
'filters' => array(
555+
0 => array( 'event' => 'SAVE',
556+
'type' => 'STRIPTAGS'),
557+
1 => array( 'event' => 'SAVE',
558+
'type' => 'STRIPNL')
559+
),
530560
'default' => '',
531561
'value' => '',
532562
'width' => '40',
@@ -535,6 +565,12 @@
535565
'relayhost_user' => array(
536566
'datatype' => 'VARCHAR',
537567
'formtype' => 'TEXT',
568+
'filters' => array(
569+
0 => array( 'event' => 'SAVE',
570+
'type' => 'STRIPTAGS'),
571+
1 => array( 'event' => 'SAVE',
572+
'type' => 'STRIPNL')
573+
),
538574
'default' => '',
539575
'value' => '',
540576
'width' => '40',
@@ -719,6 +755,12 @@
719755
'website_autoalias' => array(
720756
'datatype' => 'VARCHAR',
721757
'formtype' => 'TEXT',
758+
'filters' => array(
759+
0 => array( 'event' => 'SAVE',
760+
'type' => 'STRIPTAGS'),
761+
1 => array( 'event' => 'SAVE',
762+
'type' => 'STRIPNL')
763+
),
722764
'default' => '',
723765
'value' => '',
724766
'width' => '40',
@@ -1135,6 +1177,12 @@
11351177
'validators' => array( 0 => array('type' => 'NOTEMPTY',
11361178
'errmsg' => 'htaccess_allow_override_error_empty'),
11371179
),
1180+
'filters' => array(
1181+
0 => array( 'event' => 'SAVE',
1182+
'type' => 'STRIPTAGS'),
1183+
1 => array( 'event' => 'SAVE',
1184+
'type' => 'STRIPNL')
1185+
),
11381186
'value' => '',
11391187
'width' => '40',
11401188
'maxlength' => '255'
@@ -1161,6 +1209,12 @@
11611209
'validators' => array(0 => array('type' => 'NOTEMPTY',
11621210
'errmsg' => 'apps_vhost_port_error_empty'),
11631211
),
1212+
'filters' => array(
1213+
0 => array( 'event' => 'SAVE',
1214+
'type' => 'STRIPTAGS'),
1215+
1 => array( 'event' => 'SAVE',
1216+
'type' => 'STRIPNL')
1217+
),
11641218
'value' => '',
11651219
'width' => '40',
11661220
'maxlength' => '255'
@@ -1172,13 +1226,25 @@
11721226
'validators' => array(0 => array('type' => 'NOTEMPTY',
11731227
'errmsg' => 'apps_vhost_ip_error_empty'),
11741228
),
1229+
'filters' => array(
1230+
0 => array( 'event' => 'SAVE',
1231+
'type' => 'STRIPTAGS'),
1232+
1 => array( 'event' => 'SAVE',
1233+
'type' => 'STRIPNL')
1234+
),
11751235
'value' => '',
11761236
'width' => '40',
11771237
'maxlength' => '255'
11781238
),
11791239
'apps_vhost_servername' => array(
11801240
'datatype' => 'VARCHAR',
11811241
'formtype' => 'TEXT',
1242+
'filters' => array(
1243+
0 => array( 'event' => 'SAVE',
1244+
'type' => 'STRIPTAGS'),
1245+
1 => array( 'event' => 'SAVE',
1246+
'type' => 'STRIPNL')
1247+
),
11821248
'default' => '',
11831249
'value' => '',
11841250
'width' => '40',
@@ -1187,6 +1253,12 @@
11871253
'awstats_conf_dir' => array(
11881254
'datatype' => 'VARCHAR',
11891255
'formtype' => 'TEXT',
1256+
'filters' => array(
1257+
0 => array( 'event' => 'SAVE',
1258+
'type' => 'STRIPTAGS'),
1259+
1 => array( 'event' => 'SAVE',
1260+
'type' => 'STRIPNL')
1261+
),
11901262
'default' => '',
11911263
'value' => '',
11921264
'width' => '40',
@@ -1486,6 +1558,12 @@
14861558
'xmpp_server_admins' => array(
14871559
'datatype' => 'VARCHAR',
14881560
'formtype' => 'TEXT',
1561+
'filters' => array(
1562+
0 => array( 'event' => 'SAVE',
1563+
'type' => 'STRIPTAGS'),
1564+
1 => array( 'event' => 'SAVE',
1565+
'type' => 'STRIPNL')
1566+
),
14891567
'default' => 'admin@service.com, superuser@service.com',
14901568
'value' => '',
14911569
'width' => '15'
@@ -1494,6 +1572,12 @@
14941572
'xmpp_modules_enabled' => array(
14951573
'datatype' => 'TEXT',
14961574
'formtype' => 'TEXT',
1575+
'filters' => array(
1576+
0 => array( 'event' => 'SAVE',
1577+
'type' => 'STRIPTAGS'),
1578+
1 => array( 'event' => 'SAVE',
1579+
'type' => 'STRIPNL')
1580+
),
14971581
'default' => "saslauth, tls, dialback, disco, discoitems, version, uptime, time, ping, admin_adhoc, admin_telnet, bosh, posix, announce, offline, webpresence, mam, stream_management, message_carbons",
14981582
'value' => '',
14991583
'separator' => ","

‎interface/web/admin/form/server_php.tform.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,12 @@
112112
'validators' => array(0 => array('type' => 'NOTEMPTY',
113113
'errmsg' => 'server_php_name_error_empty'),
114114
),
115+
'filters' => array(
116+
0 => array( 'event' => 'SAVE',
117+
'type' => 'STRIPTAGS'),
118+
1 => array( 'event' => 'SAVE',
119+
'type' => 'STRIPNL')
120+
),
115121
'default' => '',
116122
'value' => '',
117123
'separator' => '',
@@ -135,6 +141,12 @@
135141
'php_fastcgi_binary' => array(
136142
'datatype' => 'VARCHAR',
137143
'formtype' => 'TEXT',
144+
'filters' => array(
145+
0 => array( 'event' => 'SAVE',
146+
'type' => 'STRIPTAGS'),
147+
1 => array( 'event' => 'SAVE',
148+
'type' => 'STRIPNL')
149+
),
138150
'default' => '',
139151
'value' => '',
140152
'width' => '40',
@@ -143,6 +155,12 @@
143155
'php_fastcgi_ini_dir' => array(
144156
'datatype' => 'VARCHAR',
145157
'formtype' => 'TEXT',
158+
'filters' => array(
159+
0 => array( 'event' => 'SAVE',
160+
'type' => 'STRIPTAGS'),
161+
1 => array( 'event' => 'SAVE',
162+
'type' => 'STRIPNL')
163+
),
146164
'default' => '',
147165
'value' => '',
148166
'width' => '40',
@@ -165,6 +183,12 @@
165183
'php_fpm_init_script' => array(
166184
'datatype' => 'VARCHAR',
167185
'formtype' => 'TEXT',
186+
'filters' => array(
187+
0 => array( 'event' => 'SAVE',
188+
'type' => 'STRIPTAGS'),
189+
1 => array( 'event' => 'SAVE',
190+
'type' => 'STRIPNL')
191+
),
168192
'default' => '',
169193
'value' => '',
170194
'width' => '40',
@@ -173,6 +197,12 @@
173197
'php_fpm_ini_dir' => array(
174198
'datatype' => 'VARCHAR',
175199
'formtype' => 'TEXT',
200+
'filters' => array(
201+
0 => array( 'event' => 'SAVE',
202+
'type' => 'STRIPTAGS'),
203+
1 => array( 'event' => 'SAVE',
204+
'type' => 'STRIPNL')
205+
),
176206
'default' => '',
177207
'value' => '',
178208
'width' => '40',
@@ -181,6 +211,12 @@
181211
'php_fpm_pool_dir' => array(
182212
'datatype' => 'VARCHAR',
183213
'formtype' => 'TEXT',
214+
'filters' => array(
215+
0 => array( 'event' => 'SAVE',
216+
'type' => 'STRIPTAGS'),
217+
1 => array( 'event' => 'SAVE',
218+
'type' => 'STRIPNL')
219+
),
184220
'default' => '',
185221
'value' => '',
186222
'width' => '40',

0 commit comments

Comments
 (0)