Merge branch 'master' into extension_manager

* master: (33 commits)
  translation update
  translation update
  translation update
  translation update
  translation update
  changed style of `<file>` slightly to help tell it apart from `<code>`
  translation update
  translation update
  translation update
  translation update
  translation update
  translation update
  translation update
  removed now unused interwiki icons
  removed old, possibly never used interwiki definitions
  FS#2806 - fix auth capability listing in html_debug()
  translation update
  change 'debug' setting to 'security' (rather than 'danger')
  convert from iso-8859-1 if not utf8
  add 'danger' alert to authpgsql config settings
  ...

1 files changed, 16 insertions, 16 deletions

diff --git a/lib/plugins/authldap/conf/metadata.php b/lib/plugins/authldap/conf/metadata.php
index a3256628c..6aa53c40d 100644
--- a/lib/plugins/authldap/conf/metadata.php
+++ b/lib/plugins/authldap/conf/metadata.php
@@ -1,19 +1,19 @@
 <?php
-$meta['server']      = array('string');
-$meta['port']        = array('numeric');
-$meta['usertree']    = array('string');
-$meta['grouptree']   = array('string');
-$meta['userfilter']  = array('string');
-$meta['groupfilter'] = array('string');
-$meta['version']     = array('numeric');
-$meta['starttls']    = array('onoff');
-$meta['referrals']   = array('onoff');
-$meta['deref']       = array('multichoice','_choices' => array(0,1,2,3));
-$meta['binddn']      = array('string');
-$meta['bindpw']      = array('password');
+$meta['server']      = array('string','_caution' => 'danger');
+$meta['port']        = array('numeric','_caution' => 'danger');
+$meta['usertree']    = array('string','_caution' => 'danger');
+$meta['grouptree']   = array('string','_caution' => 'danger');
+$meta['userfilter']  = array('string','_caution' => 'danger');
+$meta['groupfilter'] = array('string','_caution' => 'danger');
+$meta['version']     = array('numeric','_caution' => 'danger');
+$meta['starttls']    = array('onoff','_caution' => 'danger');
+$meta['referrals']   = array('onoff','_caution' => 'danger');
+$meta['deref']       = array('multichoice','_choices' => array(0,1,2,3),'_caution' => 'danger');
+$meta['binddn']      = array('string','_caution' => 'danger');
+$meta['bindpw']      = array('password','_caution' => 'danger');
 //$meta['mapping']['name']  unsupported in config manager
 //$meta['mapping']['grps']  unsupported in config manager
-$meta['userscope']   = array('multichoice','_choices' => array('sub','one','base'));
-$meta['groupscope']  = array('multichoice','_choices' => array('sub','one','base'));
-$meta['groupkey']    = array('string');
-$meta['debug']       = array('onoff');
\ No newline at end of file
+$meta['userscope']   = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger');
+$meta['groupscope']  = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger');
+$meta['groupkey']    = array('string','_caution' => 'danger');
+$meta['debug']       = array('onoff','_caution' => 'security');
\ No newline at end of file