/ - Diff - Club Drupal - Forge Centrale Marseille

Révision 32700c57

Ajouté par Assos Assos il y a environ 5 ans

ID 32700c5792ed296e7e0724a8ebc85dee3f731d53
Parent bd0d4c5c
Enfant fbb66ca6

Weekly update of contrib modules

     /**
      * @file
      * This class represents an ldap_authentication module's configuration
      * It is extended by LdapAuthenticationConfAdmin for configuration and other admin functions
      * It is extended by LdapAuthenticationConfAdmin for configuration and other admin functions.
      */
     module_load_include('php', 'ldap_user', 'LdapUserConf.class');
     /**
+     *
      */
     class LdapAuthenticationConf {
       /**
        * server configuration ids being used for authentication
        * Server configuration ids being used for authentication.
+       *
        * @var array
+       *
        * @see LdapServer->sid()
        */
       public $sids = array();
       public $sids = [];
       /**
        * server configuration ids being used for authentication
        * Server configuration ids being used for authentication.
+       *
        * @var associative array of LdapServer objects keyed on sids
        * @var associativearrayofLdapServerobjectskeyedonsids
+       *
        * @see LdapServer->sid()
        * @see LdapServer
        */
       public $enabledAuthenticationServers = array();
       public $enabledAuthenticationServers = [];
       /**
        * LdapUser configuration object
        * LdapUser configuration object.
+       *
        * @var LdapUser object
        * @var LdapUserobject
        */
       public $ldapUser = NULL; // ldap_user configuration object
       /**
        * Ldap_user configuration object.
        */
       public $ldapUser = NULL;
       /**
        * Has current object been saved to the database?
+       *
        * @var boolean
        * @var bool
        */
       public $inDatabase = FALSE;
       /**
         * Choice of authentication modes
+        *
         * @var integer
         *   LDAP_AUTHENTICATION_MODE_DEFAULT (LDAP_AUTHENTICATION_MIXED)
         *   LDAP_AUTHENTICATION_MIXED - signifies both LDAP and Drupal authentication are allowed
         *     Drupal authentication is attempted first.
         *   LDAP_AUTHENTICATION_EXCLUSIVE - signifies only LDAP authenication is allowed
         */
        * Choice of authentication modes.
+       *
        * @var int
        *   LDAP_AUTHENTICATION_MODE_DEFAULT (LDAP_AUTHENTICATION_MIXED)
        *   LDAP_AUTHENTICATION_MIXED - signifies both LDAP and Drupal authentication are allowed
        *     Drupal authentication is attempted first.
        *   LDAP_AUTHENTICATION_EXCLUSIVE - signifies only LDAP authenication is allowed
        */
       public $authenticationMode = LDAP_AUTHENTICATION_MODE_DEFAULT;
       /**
        * The following are used to alter the logon interface to direct users
        * to local LDAP specific authentication help
        * to local LDAP specific authentication help.
        */
       /**
        * Text describing username to use, such as "Hogwarts Username"
        *  which will be inserted on logon forms to help users figure out which
        *  username to use
        *  username to use.
+       *
        * @var string
        */
-...
       /**
        * Text describing password to use, such as "Hogwards LDAP Password"
        *  which will be inserted on logon forms.  Useful in organizations with
        *  multiple account types for authentication
        *  multiple account types for authentication.
+       *
        * @var string
        */
-...
       /**
        * Text and Url to provide help link for password such as:
        *   ldapUserHelpLinkUrl:    https://passwords.hogwarts.edu
        *   ldapUserHelpLinkText:  Hogwarts IT Password Support Page
        *   ldapUserHelpLinkText:  Hogwarts IT Password Support Page.
+       *
        * @var string
        */
-...
        * Email handling option
        *   LDAP_AUTHENTICATION_EMAIL_FIELD_REMOVE -- don't show email on user forms
        *   LDAP_AUTHENTICATION_EMAIL_FIELD_DISABLE (default) -- disable email on user forms
        *   LDAP_AUTHENTICATION_EMAIL_FIELD_ALLOW -- allow editing of email on user forms
        *   LDAP_AUTHENTICATION_EMAIL_FIELD_ALLOW -- allow editing of email on user forms.
+       *
        * @var int
        */
       public $emailOption = LDAP_AUTHENTICATION_EMAIL_FIELD_DEFAULT;
        /**
       /**
        * Email handling option
        *   LDAP_AUTHENTICATION_EMAIL_UPDATE_ON_LDAP_CHANGE_ENABLE_NOTIFY -- (default) Update stored email if LDAP email differs at login and notify user
        *   LDAP_AUTHENTICATION_EMAIL_UPDATE_ON_LDAP_CHANGE_ENABLE  -- Update stored email if LDAP email differs at login but don\'t notify user
        *   LDAP_AUTHENTICATION_EMAIL_UPDATE_ON_LDAP_CHANGE_DISABLE -- Don\'t update stored email if LDAP email differs at login
        *   LDAP_AUTHENTICATION_EMAIL_UPDATE_ON_LDAP_CHANGE_DISABLE -- Don\'t update stored email if LDAP email differs at login.
+       *
        * @var int
        */
       public $emailUpdate = LDAP_AUTHENTICATION_EMAIL_UPDATE_ON_LDAP_CHANGE_DEFAULT;
       /**
        * Email default handling option
+       *
        * This affects how email addresses that are empty are handled by
        * Email default handling option.
+       *
        * This affects how email addresses that are empty are handled by
        * the authentication process.
+       *
+       *
        *   LDAP_AUTHENTICATION_EMAIL_TEMPLATE_NONE -- leaves the email empty
        *   LDAP_AUTHENTICATION_EMAIL_TEMPLATE_IF_EMPTY (default) -- if the email is empty, it will be replaced
        *   LDAP_AUTHENTICATION_EMAIL_TEMPLATE_ALWAYS -- always use the template
+       *
+       *
        * @var int
        */
       public $emailTemplateHandling = LDAP_AUTHENTICATION_EMAIL_TEMPLATE_DEFAULT;
       /**
        * Email template.
+       *
+       *
        * @var string
        */
       public $emailTemplate = LDAP_AUTHENTICATION_DEFAULT_TEMPLATE;
       /**
        * Whether or not to display a notification to the user on login, prompting
        * Whether or not to display a notification to the user on login, prompting
        * them to change their email.
+       *
        * @var boolean
+       *
        * @var bool
        */
       public $templateUsagePromptUser = LDAP_AUTHENTICATION_TEMPLATE_USAGE_PROMPT_USER_DEFAULT;
       /**
        * Whether or not to avoid updating the email address of the user if the
        * template was used to generate it.
+       *
        * @var boolean
+       *
        * @var bool
        */
       public $templateUsageNeverUpdate = LDAP_AUTHENTICATION_TEMPLATE_USAGE_NEVER_UPDATE_DEFAULT;
       /**
        * Whether or not to use the email template if there is a user with a different
        * login name but same email address in the system.
+       *
        * @var boolean
+       *
        * @var bool
        */
       public $templateUsageResolveConflict = LDAP_AUTHENTICATION_TEMPLATE_USAGE_RESOLVE_CONFLICT_DEFAULT;
       /**
        * A PCRE regular expression (minus the delimiter and flags) that will be used
        * if $templateUsagePromptUser is set to true to determine if the email
        * address is a fake one or not.
+       *
        * if $templateUsagePromptUser is set to true to determine if the email
        * address is a fake one or not.
+       *
        * By allowing this to be customized, we let the administrators handle older
        * patterns should they decide to change the existing one, as well as avoiding
        * the complexity of determining a proper regex from the template.
+       *
+       *
        * @var string
        */
       public $templateUsagePromptRegex = LDAP_AUTHENTICATION_DEFAULT_TEMPLATE_REGEX;
       /**
        * Controls whether or not we should check on login if the email template was
        * used and redirect the user if needed.
+       *
        * @var boolean
+       *
        * @var bool
        */
       public $templateUsageRedirectOnLogin = LDAP_AUTHENTICATION_REDIRECT_ON_LOGIN_DEFAULT;
        /**
       /**
        * Password handling option
        *   LDAP_AUTHENTICATION_PASSWORD_FIELD_SHOW -- show field disabled on user forms
        *   LDAP_AUTHENTICATION_PASSWORD_FIELD_HIDE (default) -- disable password on user forms
        *   LDAP_AUTHENTICATION_PASSWORD_FIELD_ALLOW -- allow editing of password on user forms
        *   LDAP_AUTHENTICATION_PASSWORD_FIELD_ALLOW -- allow editing of password on user forms.
+       *
        * @var int
        */
-...
       public $ssoNotifyAuthentication = FALSE;
       public $ldapImplementation = FALSE;
       public $cookieExpire = LDAP_AUTHENTICATION_COOKIE_EXPIRE;
       public $apiPrefs = array();
       public $apiPrefs = [];
       /**
        * Advanced options.   whitelist / blacklist options
+       *
        * these are on the fuzzy line between authentication and authorization
        * and determine if a user is allowed to authenticate with ldap
        * Advanced options.   whitelist / blacklist options.
+       *
        * These are on the fuzzy line between authentication and authorization
        * and determine if a user is allowed to authenticate with ldap.
        */
       /**
        * text which must be present in user's LDAP entry's DN for user to authenticate with LDAP
        *   e.g. "ou=people"
        * Text which must be present in user's LDAP entry's DN for user to authenticate with LDAP
        *   e.g. "ou=people".
+       *
        * @var string
        */
       public $allowOnlyIfTextInDn = array(); // eg ou=education that must be met to allow ldap authentication
       /**
        * Eg ou=education that must be met to allow ldap authentication.
        */
       public $allowOnlyIfTextInDn = [];
       /**
        * text which prohibits logon if found in user's LDAP entry's DN for user to authenticate with LDAP
        *   e.g. "ou=guest accounts"
        * Text which prohibits logon if found in user's LDAP entry's DN for user to authenticate with LDAP
        *   e.g. "ou=guest accounts".
+       *
        * @var string
        */
       public $excludeIfTextInDn = array();
       public $excludeIfTextInDn = [];
       /**
        * code that prints 1 or 0 signifying if user is allowed
        *   should not start with <?php
        * Code that prints 1 or 0 signifying if user is allowed
        *   should not start with <?php.
+       *
        * @var string of php
        * @var stringofphp
        */
       public $allowTestPhp = NULL;
       /**
        * if at least 1 ldap authorization must exist for user to be allowed
        * If at least 1 ldap authorization must exist for user to be allowed
        *   True signfies disallow if no authorizations.
        *   False signifies don't consider authorizations.
+       *
        * @var boolean.
        * @var bool
        */
       public $excludeIfNoAuthorizations = LDAP_AUTHENTICATION_EXCL_IF_NO_AUTHZ_DEFAULT;
       public $saveable = array(
       public $saveable = [
         'sids',
         'authenticationMode',
         'loginUIUsernameTxt',
-...
         'templateUsageResolveConflict',
         'templateUsagePromptRegex',
         'templateUsageRedirectOnLogin',
       );
       ];
       /**
+       *
        */
       public function hasEnabledAuthenticationServers() {
         return !(count($this->enabledAuthenticationServers) == 0);
+      }
       /**
+       *
        */
       public function enabled_servers() {
         return $this->hasEnabledAuthenticationServers();
+      }
       function __construct() {
       /**
+       *
        */
       public function __construct() {
         $this->load();
+      }
       function load() {
       /**
+       *
        */
       public function load() {
         if ($saved = variable_get("ldap_authentication_conf", FALSE)) {
           $this->inDatabase = TRUE;
-...
               $this->{$property} = $saved[$property];
+            }
+          }
           $this->enabledAuthenticationServers = array(); // reset in case reloading instantiated object
           // Reset in case reloading instantiated object.
           $this->enabledAuthenticationServers = [];
           $enabled_ldap_servers = ldap_servers_get_servers(NULL, 'enabled');
           foreach ($this->sids as $sid => $enabled) {
             if ($enabled && isset($enabled_ldap_servers[$sid])) {
-...
+      }
       /**
        * Destructor Method
        * Destructor Method.
        */
       function __destruct() { }
       public function __destruct() {}
      /**
        * decide if a username is excluded or not
       /**
        * Decide if a username is excluded or not.
+       *
        * @param string $name
        *   as proposed drupal username.
        * @param array $ldap_user
        *   where top level keys are 'dn','attr','mail'.
+       *
        * @param string $name as proposed drupal username
        * @param array $ldap_user where top level keys are 'dn','attr','mail'
        * @return boolean FALSE means NOT allow; TRUE means allow
+       *
        * @todo.  this function should simply invoke hook_ldap_authentication_allowuser_results_alter
        * @todo. this function should simply invoke hook_ldap_authentication_allowuser_results_alter
        *   and most of this function should go in ldap_authentication_allowuser_results_alter
        */
       public function allowUser($name, $ldap_user) {
-...
          * do one of the exclude attribute pairs match
          */
         $ldap_user_conf = ldap_user_conf();
         // if user does not already exists and deferring to user settings AND user settings only allow
         // If user does not already exists and deferring to user settings AND user settings only allow.
         $user_register = variable_get('user_register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL);
         foreach ($this->excludeIfTextInDn as $test) {
           if (stripos($ldap_user['dn'], $test) !== FALSE) {
             return FALSE;//  if a match, return FALSE;
             // Match.
             return FALSE;
+          }
+        }
-...
             $code_result = php_eval($code);
             $_name = NULL;
             $_ldap_user_entry = NULL;
             if ((boolean)($code_result) == FALSE) {
             if ((boolean) ($code_result) == FALSE) {
               return FALSE;
+            }
+          }
           else {
             drupal_set_message(t(LDAP_AUTHENTICATION_DISABLED_FOR_BAD_CONF_MSG), 'warning');
             $tokens = array('!ldap_authentication_config' => l(t('LDAP Authentication Configuration'), 'admin/config/people/ldap/authentication'));
             $tokens = ['!ldap_authentication_config' => l(t('LDAP Authentication Configuration'), 'admin/config/people/ldap/authentication')];
             watchdog('ldap_authentication', 'LDAP Authentication is configured to deny users based on php execution with php_eval function, but php module is not enabled. Please enable php module or remove php code at !ldap_authentication_config .', $tokens);
             return FALSE;
+          }
-...
           if (!module_exists('ldap_authorization')) {
             drupal_set_message(t(LDAP_AUTHENTICATION_DISABLED_FOR_BAD_CONF_MSG), 'warning');
             $tokens = array('!ldap_authentication_config' => l(t('LDAP Authentication Configuration'), 'admin/config/people/ldap/authentication'));
             $tokens = ['!ldap_authentication_config' => l(t('LDAP Authentication Configuration'), 'admin/config/people/ldap/authentication')];
             watchdog('ldap_authentication', 'LDAP Authentication is configured to deny users without LDAP Authorization mappings, but LDAP Authorization module is not enabled.  Please enable and configure LDAP Authorization or disable this option at !ldap_authentication_config .', $tokens);
             return FALSE;
+          }
           $user = new stdClass();
           $user->name = $name;
           $user->ldap_authenticated = TRUE; // fake user property added for query
           // Fake user property added for query.
           $user->ldap_authenticated = TRUE;
           $consumers = ldap_authorization_get_consumers();
           $has_enabled_consumers = FALSE;
           $has_ldap_authorizations = FALSE;
-...
           if (!$has_enabled_consumers) {
             drupal_set_message(t(LDAP_AUTHENTICATION_DISABLED_FOR_BAD_CONF_MSG), 'warning');
             $tokens = array('!ldap_consumer_config' => l(t('LDAP Authorization Configuration'), 'admin/config/people/ldap/authorization'));
             $tokens = ['!ldap_consumer_config' => l(t('LDAP Authorization Configuration'), 'admin/config/people/ldap/authorization')];
             watchdog('ldap_authentication', 'LDAP Authentication is configured to deny users without LDAP Authorization mappings, but 0 LDAP Authorization consumers are configured:  !ldap_consumer_config .', $tokens);
             return FALSE;
+          }
-...
+        }
         // allow other modules to hook in and refuse if they like
         // Allow other modules to hook in and refuse if they like.
         $hook_result = TRUE;
         drupal_alter('ldap_authentication_allowuser_results', $ldap_user, $name, $hook_result);
         if ($hook_result === FALSE) {
           watchdog('ldap_authentication', "Authentication Allow User Result=refused for %name", array('%name' => $name), WATCHDOG_NOTICE);
           watchdog('ldap_authentication', "Authentication Allow User Result=refused for %name", ['%name' => $name], WATCHDOG_NOTICE);
           return FALSE;
+        }
-...
         return TRUE;
+      }
+    }

     /**
      * @file
      * This classextends by LdapAuthenticationConf for configuration and other admin functions
      * This classextends by LdapAuthenticationConf for configuration and other admin functions.
      */
     ldap_servers_module_load_include('php', 'ldap_authentication', 'LdapAuthenticationConf.class');
     /**
+     *
      */
     class LdapAuthenticationConfAdmin extends LdapAuthenticationConf {
       /**
+       *
        */
       protected function setTranslatableProperties() {
         /**
          * 0.  Logon Options
          */
         $values['authenticationModeOptions']  = array(
         $values['authenticationModeOptions'] = [
           LDAP_AUTHENTICATION_MIXED => t('Mixed mode. Drupal authentication is tried first.  On failure, LDAP authentication is performed.'),
           LDAP_AUTHENTICATION_EXCLUSIVE => t('Only LDAP Authentication is allowed except for user 1.
             If selected, (1) reset password links will be replaced with links to ldap end user documentation below.
             (2) The reset password form will be left available at user/password for user 1; but no links to it
             will be provided to anonymous users.
             (3) Password fields in user profile form will be removed except for user 1.'),
           );
         ];
         $values['authenticationServersDescription'] = t('Check all LDAP server configurations to use in authentication.
          Each will be tested for authentication until successful or
-...
          passwords etc. Should be of form http://domain.com/. Could be the institutions ldap password support page
          or a page within this drupal site that is available to anonymous users.');
         $values['ldapUserHelpLinkTextDescription']  = t('Text for above link e.g. Account Help or Campus Password Help Page');
         $values['ldapUserHelpLinkTextDescription'] = t('Text for above link e.g. Account Help or Campus Password Help Page');
         /**
          * LDAP User Restrictions
-...
         * Email
         */
         $values['emailOptionOptions'] = array(
         $values['emailOptionOptions'] = [
           LDAP_AUTHENTICATION_EMAIL_FIELD_REMOVE => t('Don\'t show an email field on user forms. LDAP derived email will be used for user and cannot be changed by user.'),
           LDAP_AUTHENTICATION_EMAIL_FIELD_DISABLE => t('Show disabled email field on user forms with LDAP derived email. LDAP derived email will be used for user and cannot be changed by user.'),
           LDAP_AUTHENTICATION_EMAIL_FIELD_ALLOW => t('Leave email field on user forms enabled. Generally used when provisioning to LDAP or not using email derived from LDAP.'),
           );
         ];
         $values['emailUpdateOptions'] = array(
         $values['emailUpdateOptions'] = [
           LDAP_AUTHENTICATION_EMAIL_UPDATE_ON_LDAP_CHANGE_ENABLE_NOTIFY => t('Update stored email if LDAP email differs at login and notify user.'),
           LDAP_AUTHENTICATION_EMAIL_UPDATE_ON_LDAP_CHANGE_ENABLE => t('Update stored email if LDAP email differs at login but don\'t notify user.'),
           LDAP_AUTHENTICATION_EMAIL_UPDATE_ON_LDAP_CHANGE_DISABLE => t('Don\'t update stored email if LDAP email differs at login.'),
           );
         $values['emailTemplateHandlingOptions'] = array(
         ];
         $values['emailTemplateHandlingOptions'] = [
           LDAP_AUTHENTICATION_EMAIL_TEMPLATE_NONE => t('Never use the template.'),
           LDAP_AUTHENTICATION_EMAIL_TEMPLATE_IF_EMPTY => t('Use the template if no email address was provided by the LDAP server.'),
           LDAP_AUTHENTICATION_EMAIL_TEMPLATE_ALWAYS => t('Always use the template.'),
         );
         ];
         /**
         * Password
         */
         $values['passwordUpdateOptions'] = array(
         $values['passwordUpdateOptions'] = [
           LDAP_AUTHENTICATION_PASSWORD_FIELD_SHOW => t('Display password field disabled (Prevents password updates).'),
           LDAP_AUTHENTICATION_PASSWORD_FIELD_HIDE => t('Don\'t show password field on user forms except login form.'),
           LDAP_AUTHENTICATION_PASSWORD_FIELD_ALLOW => t('Display password field and allow updating it. In order to change password in LDAP, LDAP provisioning for this field must be enabled.'),
           );
         ];
         /**
          *  Single Sign-On / Seamless Sign-On
          */
           $values['ldapImplementationOptions'] = array(
             'mod_auth_sspi' => t('mod_auth_sspi'),
             'mod_auth_kerb' => t('mod_auth_kerb'),
             );
         $values['ldapImplementationOptions'] = [
           'mod_auth_sspi' => t('mod_auth_sspi'),
           'mod_auth_kerb' => t('mod_auth_kerb'),
         ];
           $values['cookieExpirePeriod'] = array(-1 => t('Session'), 0 => t('Immediately')) +
             drupal_map_assoc(array(3600, 86400, 604800, 2592000, 31536000, 315360000, 630720000), 'format_interval');
         $values['cookieExpirePeriod'] = [-1 => t('Session'), 0 => t('Immediately')] +
             drupal_map_assoc([3600, 86400, 604800, 2592000, 31536000, 315360000, 630720000], 'format_interval');
           $values['ssoEnabledDescription'] = '<strong>' . t('Single Sign on is enabled.') .
         $values['ssoEnabledDescription'] = '<strong>' . t('Single Sign on is enabled.') .
             '</strong> ' . t('To disable it, disable the LDAP SSO Module on the') . ' ' . l(t('Modules Form'), 'admin/modules') . '.<p>' .
             t('Single Sign-On enables ' .
             'users of this site to be authenticated by visiting the URL ' .
             '"user/login/sso, or automatically if selecting "automated ' .
             'single sign-on" below. Set up of LDAP authentication must be ' .
             'performed on the web server. Please review the readme file of the '.
             'performed on the web server. Please review the readme file of the ' .
             'ldap_sso module for more information.')
             . '</p>';
           $values['ssoExcludedPathsDescription'] = '<p>' .
         $values['ssoExcludedPathsDescription'] = '<p>' .
             t("Which paths will not check for SSO? cron.php is common example.  Specify pages by using their paths. Enter one path per line. The '*' character is a wildcard.
               Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.",
               array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '<front>'));
             '</p>';
               ['%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '<front>']);
         '</p>';
           $values['ssoExcludedHostsDescription'] = '<p>' .
         $values['ssoExcludedHostsDescription'] = '<p>' .
             t('If your site is accessible via multiple hostnames, you may only want
               the LDAP SSO module to authenticate against some of them. To exclude
               any hostnames from SSO, enter them here. Enter one host per line.');
             '</p>';
         '</p>';
           $values['ssoRemoteUserStripDomainNameDescription'] = t('Useful when the ' .
         $values['ssoRemoteUserStripDomainNameDescription'] = t('Useful when the ' .
             'WWW server provides authentication in the form of user@realm and you ' .
             'want to have both SSO and regular forms based authentication ' .
             'available. Otherwise duplicate accounts with conflicting e-mail ' .
             'addresses may be created.');
           $values['ssoNotifyAuthenticationDescription'] = t('This displays a message to the ' .
         $values['ssoNotifyAuthenticationDescription'] = t('This displays a message to the ' .
             'user after they have succesfully authenticated using single sign on');
           $values['seamlessLogInDescription'] = t('This requires that you ' .
         $values['seamlessLogInDescription'] = t('This requires that you ' .
             'have operational NTLM or Kerberos authentication turned on for at least ' .
             'the path user/login/sso, or for the whole domain.');
           $values['cookieExpireDescription'] = t('If using the automated/seamless login, a ' .
         $values['cookieExpireDescription'] = t('If using the automated/seamless login, a ' .
             'cookie is necessary to prevent automatic login after a user ' .
             'manually logs out. Select the lifetime of the cookie.');
           $values['ldapImplementationDescription'] = t('Select the type of ' .
         $values['ldapImplementationDescription'] = t('Select the type of ' .
             'authentication mechanism you are using.');
           foreach ($values as $property => $default_value) {
             $this->$property = $default_value;
+          }
         foreach ($values as $property => $default_value) {
           $this->$property = $default_value;
+        }
+      }
       /**
        * 0.  Logon Options
        * 0.  Logon Options.
        */
       public $authenticationModeDefault = LDAP_AUTHENTICATION_MIXED;
       public $authenticationModeOptions;
       protected $authenticationServersDescription;
       protected $authenticationServersOptions = array();
       protected $authenticationServersOptions = [];
       /**
        * 1.  User Login Interface
        * 1.  User Login Interface.
        */
       protected $loginUIUsernameTxtDescription;
       protected $loginUIPasswordTxtDescription;
-...
       /**
        * 2.  LDAP User Restrictions
        * 2.  LDAP User Restrictions.
        */
       protected $allowOnlyIfTextInDnDescription;
       protected $excludeIfTextInDnDescription;
       protected $allowTestPhpDescription;
        /**
        * 4. Email
       /**
        * 4. Email.
        */
       public $emailOptionDefault = LDAP_AUTHENTICATION_EMAIL_FIELD_REMOVE;
-...
       public $emailUpdateDefault = LDAP_AUTHENTICATION_EMAIL_UPDATE_ON_LDAP_CHANGE_ENABLE_NOTIFY;
       public $emailUpdateOptions;
       public $emailTemplateHandlingDefault = LDAP_AUTHENTICATION_EMAIL_TEMPLATE_DEFAULT;
       public $emailTemplateHandlingOptions;
       public $emailTemplateDefault = LDAP_AUTHENTICATION_DEFAULT_TEMPLATE;
       public $templateUsagePromptUserDefault = LDAP_AUTHENTICATION_TEMPLATE_USAGE_PROMPT_USER_DEFAULT;
       public $templateUsagePromptRegexDefault = LDAP_AUTHENTICATION_DEFAULT_TEMPLATE_REGEX;
       public $templateUsageNeverUpdateDefault = LDAP_AUTHENTICATION_TEMPLATE_USAGE_NEVER_UPDATE_DEFAULT;
        /**
        * 5. Single Sign-On / Seamless Sign-On
       /**
        * 5. Single Sign-On / Seamless Sign-On.
        */
       public $ssoEnabledDescription;
-...
       public $hasError = FALSE;
       public $errorName = NULL;
       /**
+       *
        */
       public function clearError() {
         $this->hasError = FALSE;
         $this->errorMsg = NULL;
         $this->errorName = NULL;
+      }
       /**
+       *
        */
       public function save() {
         foreach ($this->saveable as $property) {
           $save[$property] = $this->{$property};
-...
         $this->load();
+      }
       static public function getSaveableProperty($property) {
         $ldap_authentication_conf = variable_get('ldap_authentication_conf', array());
       /**
+       *
        */
       public static function getSaveableProperty($property) {
         $ldap_authentication_conf = variable_get('ldap_authentication_conf', []);
         return isset($ldap_authentication_conf[$property]) ? $ldap_authentication_conf[$property] : FALSE;
+      }
       static public function uninstall() {
       /**
+       *
        */
       public static function uninstall() {
         variable_del('ldap_authentication_conf');
+      }
       /**
+       *
        */
       public function __construct() {
         parent::__construct();
         $this->setTranslatableProperties();
-...
+        }
+      }
       /**
+       *
        */
       public function drupalForm() {
         if (count($this->authenticationServersOptions) == 0) {
           $message = ldap_servers_no_enabled_servers_msg('configure LDAP Authentication');
           $form['intro'] = array(
           $form['intro'] = [
             '#type' => 'item',
             '#markup' => t('<h1>LDAP Authentication Settings</h1>') . $message,
           );
           ];
           return $form;
+        }
         $tokens = array();  // not sure what the tokens would be for this form?
         // Not sure what the tokens would be for this form?
         $tokens = [];
         $form['intro'] = array(
             '#type' => 'item',
             '#markup' => t('<h1>LDAP Authentication Settings</h1>'),
         );
         $form['intro'] = [
           '#type' => 'item',
           '#markup' => t('<h1>LDAP Authentication Settings</h1>'),
         ];
         $form['logon'] = array(
         $form['logon'] = [
           '#type' => 'fieldset',
           '#title' => t('Logon Options'),
           '#collapsible' => TRUE,
           '#collapsed' => FALSE,
         );
         ];
         $form['logon']['authenticationMode'] = array(
         $form['logon']['authenticationMode'] = [
           '#type' => 'radios',
           '#title' => t('Allowable Authentications'),
           '#required' => 1,
           '#default_value' => $this->authenticationMode,
           '#options' => $this->authenticationModeOptions,
         );
         ];
         $form['logon']['authenticationServers'] = array(
         $form['logon']['authenticationServers'] = [
           '#type' => 'checkboxes',
           '#title' => t('Authentication LDAP Server Configurations'),
           '#required' => FALSE,
           '#default_value' => $this->sids,
           '#options' => $this->authenticationServersOptions,
           '#description' => $this->authenticationServersDescription
         );
           '#description' => $this->authenticationServersDescription,
         ];
         $form['login_UI'] = array(
         $form['login_UI'] = [
           '#type' => 'fieldset',
           '#title' => t('User Login Interface'),
           '#collapsible' => TRUE,
           '#collapsed' => FALSE,
         );
         ];
         $form['login_UI']['loginUIUsernameTxt'] = array(
         $form['login_UI']['loginUIUsernameTxt'] = [
           '#type' => 'textfield',
           '#title' => t('Username Description Text'),
           '#required' => 0,
           '#default_value' => $this->loginUIUsernameTxt,
           '#description' => $this->loginUIUsernameTxtDescription,
         );
         ];
         $form['login_UI']['loginUIPasswordTxt'] = array(
         $form['login_UI']['loginUIPasswordTxt'] = [
           '#type' => 'textfield',
           '#title' => t('Password Description Text'),
           '#required' => 0,
           '#default_value' => $this->loginUIPasswordTxt,
           '#description' => $this->loginUIPasswordTxtDescription,
         );
         ];
         $form['login_UI']['ldapUserHelpLinkUrl'] = array(
         $form['login_UI']['ldapUserHelpLinkUrl'] = [
           '#type' => 'textfield',
           '#title' => t('LDAP Account User Help URL'),
           '#required' => 0,
           '#default_value' => $this->ldapUserHelpLinkUrl,
           '#description' => $this->ldapUserHelpLinkUrlDescription,
         );
         ];
         $form['login_UI']['ldapUserHelpLinkText'] = array(
         $form['login_UI']['ldapUserHelpLinkText'] = [
           '#type' => 'textfield',
           '#title' => t('LDAP Account User Help Link Text'),
           '#required' => 0,
           '#default_value' => $this->ldapUserHelpLinkText,
           '#description' => $this->ldapUserHelpLinkTextDescription,
         );
         ];
         $form['restrictions'] = array(
         $form['restrictions'] = [
           '#type' => 'fieldset',
           '#title' => t('LDAP User "Whitelists" and Restrictions'),
           '#collapsible' => TRUE,
           '#collapsed' => FALSE,
         );
         ];
         $form['restrictions']['allowOnlyIfTextInDn'] = array(
         $form['restrictions']['allowOnlyIfTextInDn'] = [
           '#type' => 'textarea',
           '#title' => t('Allow Only Text Test'),
           '#default_value' => $this->arrayToLines($this->allowOnlyIfTextInDn),
           '#cols' => 50,
           '#rows' => 3,
           '#description' => t($this->allowOnlyIfTextInDnDescription, $tokens),
         );
         ];
         $form['restrictions']['excludeIfTextInDn'] = array(
         $form['restrictions']['excludeIfTextInDn'] = [
           '#type' => 'textarea',
           '#title' => t('Excluded Text Test'),
           '#default_value' => $this->arrayToLines($this->excludeIfTextInDn),
           '#cols' => 50,
           '#rows' => 3,
           '#description' => t($this->excludeIfTextInDnDescription, $tokens),
         );
         ];
         $form['restrictions']['allowTestPhp'] = array(
         $form['restrictions']['allowTestPhp'] = [
           '#type' => 'textarea',
           '#title' => t('PHP to Test for Allowed LDAP Users'),
           '#default_value' => $this->allowTestPhp,
           '#cols' => 50,
           '#rows' => 3,
           '#description' => t($this->allowTestPhpDescription, $tokens),
           '#disabled' => (boolean)(!module_exists('php')),
         );
           '#disabled' => (boolean) (!module_exists('php')),
         ];
         if (!module_exists('php')) {
           $form['restrictions']['allowTestPhp']['#title'] .= ' <em>' . t('php module currently disabled') . '</em>';
+        }
         $form['restrictions']['excludeIfNoAuthorizations'] = array(
         $form['restrictions']['excludeIfNoAuthorizations'] = [
           '#type' => 'checkbox',
           '#title' => t('Deny access to users without Ldap Authorization Module
             authorization mappings such as Drupal roles.
             Requires LDAP Authorization to be enabled and configured!'),
           '#default_value' => $this->excludeIfNoAuthorizations,
           '#description' => t($this->excludeIfNoAuthorizationsDescription, $tokens),
           '#disabled' => (boolean)(!module_exists('ldap_authorization')),
         );
           '#disabled' => (boolean) (!module_exists('ldap_authorization')),
         ];
         $form['email'] = array(
         $form['email'] = [
           '#type' => 'fieldset',
           '#title' => t('Email'),
           '#collapsible' => TRUE,
           '#collapsed' => FALSE,
         );
         ];
         $form['email']['emailOption'] = array(
         $form['email']['emailOption'] = [
           '#type' => 'radios',
           '#title' => t('Email Behavior'),
           '#required' => 1,
           '#default_value' => $this->emailOption,
           '#options' => $this->emailOptionOptions,
         );
         ];
         $form['email']['emailUpdate'] = array(
         $form['email']['emailUpdate'] = [
           '#type' => 'radios',
           '#title' => t('Email Update'),
           '#required' => 1,
           '#default_value' => $this->emailUpdate,
           '#options' => $this->emailUpdateOptions,
           );
         $form['email']['template'] = array(
         ];
         $form['email']['template'] = [
           '#type' => 'fieldset',
           '#collapsible' => TRUE,
           '#title' => t('Email Templates'),
         );
         $form['email']['template']['emailTemplateHandling'] = array(
         ];
         $form['email']['template']['emailTemplateHandling'] = [
           '#type' => 'radios',
           '#title' => t('Email Template Handling'),
           '#required' => 1,
           '#default_value' => $this->emailTemplateHandling,
           '#options' => $this->emailTemplateHandlingOptions
         );
         $form['email']['template']['emailTemplate'] = array(
           '#options' => $this->emailTemplateHandlingOptions,
         ];
         $form['email']['template']['emailTemplate'] = [
           '#type' => 'textfield',
           '#title' => t('Email Template'),
           '#required' => 0,
           '#default_value' => $this->emailTemplate,
         );
         $form['email']['template']['templateUsageResolveConflict'] = array(
         ];
         $form['email']['template']['templateUsageResolveConflict'] = [
           '#type' => 'checkbox',
           '#title' => t('If a Drupal account already exists with the same email, but different account name, use the email template instead of the LDAP email.'),
           '#default_value' => $this->templateUsageResolveConflict,
         );
         $form['email']['template']['templateUsageNeverUpdate'] = array(
         ];
         $form['email']['template']['templateUsageNeverUpdate'] = [
           '#type' => 'checkbox',
           '#title' => t('Ignore the Email Update settings and never update the stored email if the template is used.'),
           '#default_value' => $this->templateUsageNeverUpdate,
         );
         $form['email']['prompts'] = array(
         ];
         $form['email']['prompts'] = [
           '#type' => 'fieldset',
           '#collapsible' => TRUE,
           '#title' => t('User Email Prompt'),
           '#description' => t('These settings allow the user to fill in their email address after logging in if the template was used to generate their email address.'),
         );
         $form['email']['prompts']['templateUsagePromptUser'] = array(
           '#description' => t('These settings allow the user to fill in their email address after logging in if the template was used to generate their email address.'),
         ];
         $form['email']['prompts']['templateUsagePromptUser'] = [
           '#type' => 'checkbox',
           '#title' => t('Prompt user for email on every page load.'),
           '#default_value' => $this->templateUsagePromptUser,
         );
         $form['email']['prompts']['templateUsageRedirectOnLogin'] = array(
         ];
         $form['email']['prompts']['templateUsageRedirectOnLogin'] = [
           '#type' => 'checkbox',
           '#title' => t('Redirect the user to the form after logging in.'),
           '#default_value' => $this->templateUsageRedirectOnLogin,
         );
         $form['email']['prompts']['templateUsagePromptRegex'] = array(
         ];
         $form['email']['prompts']['templateUsagePromptRegex'] = [
           '#type' => 'textfield',
           '#default_value' => $this->templateUsagePromptRegex,
           '#title' => t('Template Regex'),
           '#description' => t('This regex will be used to determine if the template was used to create an account.'),
         );
         ];
         $form['password'] = array(
         $form['password'] = [
           '#type' => 'fieldset',
           '#title' => t('Password'),
           '#collapsible' => TRUE,
           '#collapsed' => FALSE,
         );
         $form['password']['passwordOption'] = array(
         ];
         $form['password']['passwordOption'] = [
           '#type' => 'radios',
           '#title' => t('Password Behavior'),
           '#required' => 1,
           '#default_value' => $this->passwordOption,
           '#options' => $this->passwordUpdateOptions,
         );
         ];
         /**
          * Begin single sign-on settings
          */
         $form['sso'] = array(
         $form['sso'] = [
           '#type' => 'fieldset',
           '#title' => t('Single Sign-On'),
           '#collapsible' => TRUE,
           '#collapsed' => (boolean)(!$this->ssoEnabled),
         );
           '#collapsed' => (boolean) (!$this->ssoEnabled),
         ];
         if ($this->ssoEnabled) {
           $form['sso']['enabled'] = array(
           $form['sso']['enabled'] = [
             '#type' => 'markup',
             '#markup' => $this->ssoEnabledDescription,
           );
           ];
+        }
         else {
           $form['sso']['disabled'] = array(
           $form['sso']['disabled'] = [
             '#type' => 'markup',
             '#markup' => '<p><em>' . t('LDAP Single Sign-On module must be enabled for options below to work.')
             . ' ' . t('It is currently disabled.')
             . ' ' . l(t('See modules form'), 'admin/modules') . '</p></em>',
           );
           ];
+        }
         $form['sso']['ssoRemoteUserStripDomainName'] = array(
         $form['sso']['ssoRemoteUserStripDomainName'] = [
           '#type' => 'checkbox',
           '#title' => t('Strip REMOTE_USER domain name'),
           '#description' => t($this->ssoRemoteUserStripDomainNameDescription),
           '#default_value' => $this->ssoRemoteUserStripDomainName,
           '#disabled' => (boolean)(!$this->ssoEnabled),
         );
           '#disabled' => (boolean) (!$this->ssoEnabled),
         ];
         $form['sso']['seamlessLogin'] = array(
         $form['sso']['seamlessLogin'] = [
           '#type' => 'checkbox',
           '#title' => t('Turn on automated/seamless single sign-on'),
           '#description' => t($this->seamlessLogInDescription),
           '#default_value' => $this->seamlessLogin,
           '#disabled' => (boolean)(!$this->ssoEnabled),
           );
           '#disabled' => (boolean) (!$this->ssoEnabled),
         ];
         $form['sso']['ssoNotifyAuthentication'] = array(
         $form['sso']['ssoNotifyAuthentication'] = [
           '#type' => 'checkbox',
           '#title' => t('Notify user of successful authentication'),
           '#description' => t($this->ssoNotifyAuthenticationDescription),
           '#default_value' => $this->ssoNotifyAuthentication,
           '#disabled' => (boolean)(!$this->ssoEnabled),
           );
           '#disabled' => (boolean) (!$this->ssoEnabled),
         ];
         $form['sso']['cookieExpire'] = array(
         $form['sso']['cookieExpire'] = [
           '#type' => 'select',
           '#title' => t('Cookie Lifetime'),
           '#description' => t($this->cookieExpireDescription),
           '#default_value' => $this->cookieExpire,
           '#options' => $this->cookieExpirePeriod,
           '#disabled' => (boolean)(!$this->ssoEnabled),
         );
           '#disabled' => (boolean) (!$this->ssoEnabled),
         ];
         $form['sso']['ldapImplementation'] = array(
         $form['sso']['ldapImplementation'] = [
           '#type' => 'select',
           '#title' => t('Authentication Mechanism'),
           '#description' => t($this->ldapImplementationDescription),
           '#default_value' => $this->ldapImplementation,
           '#options' => $this->ldapImplementationOptions,
           '#disabled' => (boolean)(!$this->ssoEnabled),
         );
           '#disabled' => (boolean) (!$this->ssoEnabled),
         ];
         $form['sso']['ssoExcludedPaths'] = array(
         $form['sso']['ssoExcludedPaths'] = [
           '#type' => 'textarea',
           '#title' => t('SSO Excluded Paths'),
           '#description' => t($this->ssoExcludedPathsDescription),
           '#default_value' => $this->arrayToLines($this->ssoExcludedPaths),
           '#disabled' => (boolean)(!$this->ssoEnabled),
         );
           '#disabled' => (boolean) (!$this->ssoEnabled),
         ];
         $form['sso']['ssoExcludedHosts'] = array(
         $form['sso']['ssoExcludedHosts'] = [
           '#type' => 'textarea',
           '#title' => t('SSO Excluded Hosts'),
           '#description' => t($this->ssoExcludedHostsDescription),
           '#default_value' => $this->arrayToLines($this->ssoExcludedHosts),
           '#disabled' => (boolean)(!$this->ssoEnabled),
         );
           '#disabled' => (boolean) (!$this->ssoEnabled),
         ];
         $form['submit'] = array(
         $form['submit'] = [
           '#type' => 'submit',
           '#value' => 'Save',
         );
         ];
       return $form;
+    }
         return $form;
+      }
     /**
      * validate form, not object
      */
       public function drupalFormValidate($values)  {
       /**
        * Validate form, not object.
        */
       public function drupalFormValidate($values) {
         $this->populateFromDrupalForm($values);
-...
         return $errors;
+      }
     /**
      * validate object, not form
      */
       /**
        * Validate object, not form.
        */
       public function validate() {
         $errors = array();
         $errors = [];
         $enabled_servers = ldap_servers_get_servers(NULL, 'enabled');
         if ($this->ssoEnabled) {
           foreach ($this->sids as $sid => $discard) {
             if ($enabled_servers[$sid]->bind_method == LDAP_SERVERS_BIND_METHOD_USER || $enabled_servers[$sid]->bind_method == LDAP_SERVERS_BIND_METHOD_ANON_USER) {
               $methods = array(
               $methods = [
                 LDAP_SERVERS_BIND_METHOD_USER => 'Bind with Users Credentials',
                 LDAP_SERVERS_BIND_METHOD_ANON_USER => 'Anonymous Bind for search, then Bind with Users Credentials',
               );
               $tokens = array(
               ];
               $tokens = [
                 '!edit' => l($enabled_servers[$sid]->name, LDAP_SERVERS_INDEX_BASE_PATH . '/edit/' . $sid),
                 '%sid' => $sid,
                 '%bind_method' => $methods[$enabled_servers[$sid]->bind_method],
               );
               ];
               $errors['ssoEnabled'] = t('Single Sign On is not valid with the server !edit (id=%sid) because that server configuration uses %bind_method.  Since the user\'s credentials are never available to this module with single sign on enabled, there is no way for the ldap module to bind to the ldap server with credentials.', $tokens);
+            }
-...
         return $errors;
+      }
       /**
+       *
        */
       protected function populateFromDrupalForm($values) {
         $this->authenticationMode = ($values['authenticationMode']) ? (int)$values['authenticationMode'] : NULL;
         $this->authenticationMode = ($values['authenticationMode']) ? (int) $values['authenticationMode'] : NULL;
         $this->sids = $values['authenticationServers'];
         $this->allowOnlyIfTextInDn = $this->linesToArray($values['allowOnlyIfTextInDn']);
         $this->excludeIfTextInDn = $this->linesToArray($values['excludeIfTextInDn']);
         $this->allowTestPhp = $values['allowTestPhp'];
         $this->loginUIUsernameTxt = ($values['loginUIUsernameTxt']) ? (string)$values['loginUIUsernameTxt'] : NULL;
         $this->loginUIPasswordTxt = ($values['loginUIPasswordTxt']) ? (string)$values['loginUIPasswordTxt'] : NULL;
         $this->ldapUserHelpLinkUrl = ($values['ldapUserHelpLinkUrl']) ? (string)$values['ldapUserHelpLinkUrl'] : NULL;
         $this->ldapUserHelpLinkText = ($values['ldapUserHelpLinkText']) ? (string)$values['ldapUserHelpLinkText'] : NULL;
         $this->excludeIfNoAuthorizations = ($values['excludeIfNoAuthorizations']) ? (int)$values['excludeIfNoAuthorizations'] : NULL;
         $this->emailOption  = ($values['emailOption']) ? (int)$values['emailOption'] : NULL;
         $this->emailUpdate  = ($values['emailUpdate']) ? (int)$values['emailUpdate'] : NULL;
         $this->passwordOption  = ($values['passwordOption']) ? (int)$values['passwordOption'] : NULL;
         $this->loginUIUsernameTxt = ($values['loginUIUsernameTxt']) ? (string) $values['loginUIUsernameTxt'] : NULL;
         $this->loginUIPasswordTxt = ($values['loginUIPasswordTxt']) ? (string) $values['loginUIPasswordTxt'] : NULL;
         $this->ldapUserHelpLinkUrl = ($values['ldapUserHelpLinkUrl']) ? (string) $values['ldapUserHelpLinkUrl'] : NULL;
         $this->ldapUserHelpLinkText = ($values['ldapUserHelpLinkText']) ? (string) $values['ldapUserHelpLinkText'] : NULL;
         $this->excludeIfNoAuthorizations = ($values['excludeIfNoAuthorizations']) ? (int) $values['excludeIfNoAuthorizations'] : NULL;
         $this->emailOption = ($values['emailOption']) ? (int) $values['emailOption'] : NULL;
         $this->emailUpdate = ($values['emailUpdate']) ? (int) $values['emailUpdate'] : NULL;
         $this->passwordOption = ($values['passwordOption']) ? (int) $values['passwordOption'] : NULL;
         $this->ssoExcludedPaths = $this->linesToArray($values['ssoExcludedPaths']);
         $this->ssoExcludedHosts = $this->linesToArray($values['ssoExcludedHosts']);
         $this->ssoRemoteUserStripDomainName = ($values['ssoRemoteUserStripDomainName']) ? (int)$values['ssoRemoteUserStripDomainName'] : NULL;
         $this->seamlessLogin = ($values['seamlessLogin']) ? (int)$values['seamlessLogin'] : NULL;
         $this->ssoNotifyAuthentication = ($values['ssoNotifyAuthentication']) ? (int)$values['ssoNotifyAuthentication'] : NULL;
         $this->cookieExpire = ($values['cookieExpire']) ? (int)$values['cookieExpire'] : NULL;
         $this->ldapImplementation = ($values['ldapImplementation']) ? (string)$values['ldapImplementation'] : NULL;
         $this->ssoRemoteUserStripDomainName = ($values['ssoRemoteUserStripDomainName']) ? (int) $values['ssoRemoteUserStripDomainName'] : NULL;
         $this->seamlessLogin = ($values['seamlessLogin']) ? (int) $values['seamlessLogin'] : NULL;
         $this->ssoNotifyAuthentication = ($values['ssoNotifyAuthentication']) ? (int) $values['ssoNotifyAuthentication'] : NULL;
         $this->cookieExpire = ($values['cookieExpire']) ? (int) $values['cookieExpire'] : NULL;
         $this->ldapImplementation = ($values['ldapImplementation']) ? (string) $values['ldapImplementation'] : NULL;
         $this->emailTemplateHandling = ($values['emailTemplateHandling']) ? (int) $values['emailTemplateHandling'] : NULL;
         $this->emailTemplate = ($values['emailTemplate']) ? $values['emailTemplate'] : '';
         $this->templateUsagePromptUser = ($values['templateUsagePromptUser']) ? 1 : 0;
-...
         $this->templateUsageNeverUpdate = ($values['templateUsageNeverUpdate']) ? 1 : 0;
+      }
       /**
+       *
        */
       public function drupalFormSubmit($values) {
         $this->populateFromDrupalForm($values);
-...
+      }
       /**
+       *
        */
       protected function arrayToLines($array) {
             $lines = "";
             if (is_array($array)) {
               $lines = join("\n", $array);
+            }
             elseif (is_array(@unserialize($array))) {
               $lines = join("\n", unserialize($array));
+            }
             return $lines;
+          }
         $lines = "";
         if (is_array($array)) {
           $lines = join("\n", $array);
+        }
         elseif (is_array(@unserialize($array))) {
           $lines = join("\n", unserialize($array));
+        }
         return $lines;
+      }
       /**
+       *
        */
       protected function linesToArray($lines) {
         $lines = trim($lines);
-...
+          }
+        }
         else {
           $array = array();
           $array = [];
+        }
         return $array;
+      }

      */
     /**
      * form for adding, updating, and deleting a single ldap authorization mapping
      * Form for adding, updating, and deleting a single ldap authorization mapping.
+     *
      * @param mixed $form
      * @param mixed $form_state
+     *
      * @param <type> $form
      * @param <type> $form_state
      * @return array drupal form array
      */
     function ldap_authentication_admin_form($form, &$form_state) {
         ldap_servers_module_load_include('php', 'ldap_authentication', 'LdapAuthenticationConfAdmin.class');
         $auth_conf = new LdapAuthenticationConfAdmin();
         return $auth_conf->drupalForm();
       ldap_servers_module_load_include('php', 'ldap_authentication', 'LdapAuthenticationConfAdmin.class');
       $auth_conf = new LdapAuthenticationConfAdmin();
       return $auth_conf->drupalForm();
+    }
     /**
      * validate handler for the ldap_authentication_admin_form
      * Validate handler for the ldap_authentication_admin_form.
      */
     function ldap_authentication_admin_form_validate($form, &$form_state) {
-...
+    }
     /**
      * submit handler function for ldap_authentication_admin_form
      * Submit handler function for ldap_authentication_admin_form.
      */
     function ldap_authentication_admin_form_submit($form, &$form_state) {
       ldap_servers_module_load_include('php', 'ldap_authentication', 'LdapAuthenticationConfAdmin.class');
       $auth_conf = new LdapAuthenticationConfAdmin();
       $auth_conf->drupalFormSubmit($form_state['values']);  // add form data to object and save or create
       // Add form data to object and save or create.
       $auth_conf->drupalFormSubmit($form_state['values']);
       if (!$auth_conf->hasEnabledAuthenticationServers()) {
         drupal_set_message(t('No LDAP servers are enabled for authentication,
           so no LDAP Authentication can take place.  This essentially disables

     /**
      * @file
      * ldap_authentication helper functions
      * Ldap_authentication helper functions.
      */
     /**
       * helper function for ldap_authn_form_user_login_block_alter and ldap_authn_form_user_login_alter
+      *
       * @todo if form is being generated on non https and is set in preferences, set warning and end form development
       */
      * Helper function for ldap_authn_form_user_login_block_alter and ldap_authn_form_user_login_alter.
+     *
      * @todo if form is being generated on non https and is set in preferences, set warning and end form development
      */
     function _ldap_authentication_login_form_alter(&$form, &$form_state, $form_id) {
       if (!$auth_conf = ldap_authentication_get_valid_conf()) {
-...
       if ($form_id == 'user_login_block') {
         $user_register = variable_get('user_register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL);
         $vars = array(
         $vars = [
           'show_reset_pwd' => ldap_authentication_show_reset_pwd(),
           'auth_conf' => $auth_conf,
           );
         ];
         $form['links']['#markup'] = theme('ldap_authentication_user_login_block_links', $vars);
+      }
       // Add help information for entering in username/password
       // Add help information for entering in username/password.
       $auth_conf = ldap_authentication_get_valid_conf();
       if ($auth_conf) {
         if (isset($auth_conf->loginUIUsernameTxt)) {
-...
+      }
+    }
     /**
       * alter user editing form (profile form) based on ldap authentication configuration
+      *
       * @param array $form array from user profile
       * @param array $form_state from user profile
+      *
       * @return NULL (alters $form by reference)
       */
      * Alter user editing form (profile form) based on ldap authentication configuration.
+     *
      * @param array $form
      *   array from user profile.
      * @param array $form_state
      *   from user profile.
+     *
      * @return NULL (alters $form by reference)
      */
     function _ldap_authentication_form_user_profile_form_alter(&$form, $form_state) {
       // keep in mind admin may be editing another users profile form.  don't assume current global $user
       // Keep in mind admin may be editing another users profile form.  don't assume current global $user.
       $auth_conf = ldap_authentication_get_valid_conf();
       if ($auth_conf && ldap_authentication_ldap_authenticated($form['#user'])) {
         if ($auth_conf->emailOption == LDAP_AUTHENTICATION_EMAIL_FIELD_REMOVE) {
-...
           $form['account']['mail']['#description'] = t('This email address is automatically set and may not be changed.');
+        }
         elseif ($auth_conf->emailOption == LDAP_AUTHENTICATION_EMAIL_FIELD_ALLOW) {
           // email field is functional
           // Email field is functional.
+        }
         if (!ldap_authentication_show_reset_pwd($form['#user'])) {
           /**  If passwordOption = LDAP_AUTHENTICATION_PASSWORD_FIELD_HIDE then don't show the password fields,
             otherwise show the fields but in a disabled state.
            * otherwise show the fields but in a disabled state.
            */
             switch ($auth_conf->passwordOption) {
               case LDAP_AUTHENTICATION_PASSWORD_FIELD_HIDE:
                 $form['account']['current_pass']['#access'] = FALSE;
                 $form['account']['pass']['#access'] = FALSE;
                 break;
               case LDAP_AUTHENTICATION_PASSWORD_FIELD_SHOW:
                         // Show in a disabled state since ldap_authentication_show_reset_pwd() has returned FALSE
                 $form['account']['current_pass']['#disabled'] = TRUE;
                 if ($auth_conf->ldapUserHelpLinkUrl) {
                   $form['account']['current_pass']['#description'] = l(t($auth_conf->ldapUserHelpLinkText), $auth_conf->ldapUserHelpLinkUrl);
+                }
                 else {
                   $form['account']['current_pass']['#description'] = t('The password cannot be changed using this website');
+                }
                 $form['account']['pass']['#disabled'] = TRUE;
                 break;
           switch ($auth_conf->passwordOption) {
             case LDAP_AUTHENTICATION_PASSWORD_FIELD_HIDE:
               $form['account']['current_pass']['#access'] = FALSE;
               $form['account']['pass']['#access'] = FALSE;
               break;
             case LDAP_AUTHENTICATION_PASSWORD_FIELD_SHOW:
               // Show in a disabled state since ldap_authentication_show_reset_pwd() has returned FALSE.

... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff

Projet

Général

Profil

Club Drupal

Révision 32700c57

Ajouté par Assos Assos il y a environ 5 ans