diff --git a/acquia_spi/acquia_spi.module b/acquia_spi/acquia_spi.module index 33c0231..78f7573 100644 --- a/acquia_spi/acquia_spi.module +++ b/acquia_spi/acquia_spi.module @@ -513,6 +513,7 @@ function acquia_spi_get() { } } } + if (!empty($additional_data)) { // JSON encode this additional data. $spi['additional_data'] = drupal_json_encode($additional_data); @@ -660,8 +661,8 @@ function acquia_spi_get_version_info() { */ function acquia_spi_check_login() { $login_safe = 0; - if (module_exists('securepages')) { + if (module_exists('securepages')) { if (drupal_match_path('user/login', variable_get('securepages_pages', ''))) { $login_safe = 1; } @@ -671,7 +672,27 @@ function acquia_spi_check_login() { if (!variable_get('securepages_secure', FALSE) || !variable_get('securepages_enable', FALSE)) { $login_safe = 0; } - + } + elseif (module_exists('securelogin')) { + // All the required forms should be enabled. + $required_forms = array( + 'securelogin_form_user_login', + 'securelogin_form_user_login_block', + 'securelogin_form_user_pass', + 'securelogin_form_user_profile_form', + 'securelogin_form_user_register_form', + ); + $forms_safe = TRUE; + foreach ($required_forms as $form_variable) { + if (!variable_get($form_variable, TRUE)) { + $forms_safe = FALSE; + break; + } + } + // $conf['https'] should be false for expected behavior + if ($forms_safe && variable_get('https', FALSE)) { + $login_safe = 1; + } } return $login_safe;