Project

General

Profile

Revision b42754b9

Added by Assos Assos almost 7 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/ldap/ldap_servers/ldap_servers.module
256 256
      'variables' => array('ldap_server' => NULL, 'actions' => FALSE, 'type' => 'detail'),
257 257
      'render element' => 'element',
258 258
      'file' => 'ldap_servers.theme.inc'
259
    ),
260
     'ldap_servers_https_required' => array(
261
      'variables' => array('site_name' => NULL, 'site_mail' => FALSE, 'site_contact_link' => FALSE),
262
      'render element' => 'element',
263
      'file' => 'ldap_servers.theme.inc'
264 259
    ),
265 260
    'ldap_server_token_table' => array(
266 261
      'variables' => array('tokens' => array()),
......
802 797
  return $value;
803 798
}
804 799

  
805

  
806
/**
807
 * disable a logon form if ldap preferences exclude http logon forms
808
 *
809
 * @param drupal logon form array $form
810
 */
811
function ldap_servers_disable_http_check(&$form) {
812

  
813
  if (variable_get('ldap_servers_require_ssl_for_credentials', 0) == 1 && !drupal_is_https()) {
814

  
815
    $tokens = array(
816
      'site_name' => variable_get('site_name', 'this site'),
817
      'site_mail' =>  variable_get('site_mail', ''),
818
      );
819

  
820
    drupal_set_message(t(theme('ldap_servers_https_required', $tokens)), 'error');
821
    $form['#disabled'] = TRUE;
822
  }
823
}
824

  
825 800
function ldap_servers_ldap_extension_summary($op = 'data') {
826 801
  ldap_servers_module_load_include('inc', 'ldap_servers', 'ldap_servers.status');
827 802
  return _ldap_servers_ldap_extension_summary($op);
......
864 839
   case 'admin/help#ldap_servers':
865 840
      $servers_help .= '<h3>' . t('Configuration - Settings') . '</h3>';
866 841
      $servers_help .= '<dl>';
867
      $servers_help .= '<dt>' . t('REQUIRE HTTPS ON CREDENTIAL PAGES') . '</dt>';
868
      $servers_help .= '<dd>' . t('If checked, modules using LDAP will not allow credentials to be entered on or submitted to HTTP pages, only HTTPS. This option should be used with an approach to get all logon forms to be HTTPS.') . '</dd>';
869 842
      $servers_help .= '<dt>' . t('ENCRYPTION') . '</dt>';
870 843
      $servers_help .= '<dd>' . t('With encryption enabled, passwords will be stored in encrypted form. This is two way encryption because the actual password needs to used to bind to LDAP. So it offers minimal defense if someone gets in the filespace. It mainly helps avoid the accidental discovery of a clear text password.') . '</dd>';
871 844
      $servers_help .= '<dt>' . t('LOG DETAILED LDAP ACTIONS') . '</dt>';

Also available in: Unified diff