Merge remote-tracking branch 'origin/master' into video-audio

Conflicts:
	inc/parser/xhtml.php

1 files changed, 32 insertions, 32 deletions

diff --git a/lib/plugins/authmysql/conf/metadata.php b/lib/plugins/authmysql/conf/metadata.php
index 05d150fdf..54d6f1404 100644
--- a/lib/plugins/authmysql/conf/metadata.php
+++ b/lib/plugins/authmysql/conf/metadata.php
@@ -1,34 +1,34 @@
 <?php
 
-$meta['server']           = array('string');
-$meta['user']             = array('string');
-$meta['password']         = array('password');
-$meta['database']         = array('string');
-$meta['charset']          = array('string');
-$meta['debug']            = array('multichoice','_choices' => array(0,1,2));
-$meta['forwardClearPass'] = array('onoff');
-$meta['TablesToLock']     = array('array');
-$meta['checkPass']        = array('');
-$meta['getUserInfo']      = array('');
-$meta['getGroups']        = array('');
-$meta['getUsers']         = array('');
-$meta['FilterLogin']      = array('string');
-$meta['FilterName']       = array('string');
-$meta['FilterEmail']      = array('string');
-$meta['FilterGroup']      = array('string');
-$meta['SortOrder']        = array('string');
-$meta['addUser']          = array('');
-$meta['addGroup']         = array('');
-$meta['addUserGroup']     = array('');
-$meta['delGroup']         = array('');
-$meta['getUserID']        = array('');
-$meta['delUser']          = array('');
-$meta['delUserRefs']      = array('');
-$meta['updateUser']       = array('string');
-$meta['UpdateLogin']      = array('string');
-$meta['UpdatePass']       = array('string');
-$meta['UpdateEmail']      = array('string');
-$meta['UpdateName']       = array('string');
-$meta['UpdateTarget']     = array('string');
-$meta['delUserGroup']     = array('');
-$meta['getGroupID']       = array('');
\ No newline at end of file
+$meta['server']           = array('string','_caution' => 'danger');
+$meta['user']             = array('string','_caution' => 'danger');
+$meta['password']         = array('password','_caution' => 'danger');
+$meta['database']         = array('string','_caution' => 'danger');
+$meta['charset']          = array('string','_caution' => 'danger');
+$meta['debug']            = array('multichoice','_choices' => array(0,1,2),'_caution' => 'security');
+$meta['forwardClearPass'] = array('onoff','_caution' => 'danger');
+$meta['TablesToLock']     = array('array','_caution' => 'danger');
+$meta['checkPass']        = array('','_caution' => 'danger');
+$meta['getUserInfo']      = array('','_caution' => 'danger');
+$meta['getGroups']        = array('','_caution' => 'danger');
+$meta['getUsers']         = array('','_caution' => 'danger');
+$meta['FilterLogin']      = array('string','_caution' => 'danger');
+$meta['FilterName']       = array('string','_caution' => 'danger');
+$meta['FilterEmail']      = array('string','_caution' => 'danger');
+$meta['FilterGroup']      = array('string','_caution' => 'danger');
+$meta['SortOrder']        = array('string','_caution' => 'danger');
+$meta['addUser']          = array('','_caution' => 'danger');
+$meta['addGroup']         = array('','_caution' => 'danger');
+$meta['addUserGroup']     = array('','_caution' => 'danger');
+$meta['delGroup']         = array('','_caution' => 'danger');
+$meta['getUserID']        = array('','_caution' => 'danger');
+$meta['delUser']          = array('','_caution' => 'danger');
+$meta['delUserRefs']      = array('','_caution' => 'danger');
+$meta['updateUser']       = array('string','_caution' => 'danger');
+$meta['UpdateLogin']      = array('string','_caution' => 'danger');
+$meta['UpdatePass']       = array('string','_caution' => 'danger');
+$meta['UpdateEmail']      = array('string','_caution' => 'danger');
+$meta['UpdateName']       = array('string','_caution' => 'danger');
+$meta['UpdateTarget']     = array('string','_caution' => 'danger');
+$meta['delUserGroup']     = array('','_caution' => 'danger');
+$meta['getGroupID']       = array('','_caution' => 'danger');
\ No newline at end of file