Merge remote-tracking branch 'origin/auth_getUserData_improvements'

* origin/auth_getUserData_improvements:
  KISS - remove class constants for REQUIRE_GROUPS & IGNORE_GROUPS and replace with boolean values
  use $requireGroups constants in auth classes; comments; code improvements
  fix comment errors, sp. & grammar
  code styling - add missing braces
  Allow user info to be retrieved without groups
  Restore correct public interface of getUserData() for authldap plugin

Conflicts:
	inc/common.php

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php
index b04735639..b38b591a3 100644
--- a/lib/plugins/auth.php
+++ b/lib/plugins/auth.php
@@ -229,14 +229,15 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin {
      * at least these fields:
      *
      * name string  full name of the user
-     * mail string  email addres of the user
+     * mail string  email address of the user
      * grps array   list of groups the user is in
      *
      * @author  Andreas Gohr <andi@splitbrain.org>
      * @param   string $user the user name
+     * @param   bool $requireGroups whether or not the returned data must include groups
      * @return  array containing user data or false
      */
-    public function getUserData($user) {
+    public function getUserData($user, $requireGroups=true) {
         if(!$this->cando['external']) msg("no valid authorisation system in use", -1);
         return false;
     }