equal
deleted
inserted
replaced
47 |
47 |
48 function yubikey_validate_otp($otp) |
48 function yubikey_validate_otp($otp) |
49 { |
49 { |
50 $api_key = getConfig('yubikey_api_key'); |
50 $api_key = getConfig('yubikey_api_key'); |
51 $api_id = getConfig('yubikey_api_key_id'); |
51 $api_id = getConfig('yubikey_api_key_id'); |
52 if ( !$api_key || !$api_id ) |
52 // Don't require an API key or user ID to be installed if we're using local YMS |
|
53 if ( !(getConfig('yubikey_use_local_yms', 0) && defined('YMS_INSTALLED')) && (!$api_key || !$api_id) ) |
53 { |
54 { |
54 return array( |
55 return array( |
55 'success' => false, |
56 'success' => false, |
56 'error' => 'missing_api_key' |
57 'error' => 'missing_api_key' |
57 ); |
58 ); |
289 $db->_die(); |
290 $db->_die(); |
290 |
291 |
291 list($yk_enabled, $user_flags) = $db->fetchrow_num(); |
292 list($yk_enabled, $user_flags) = $db->fetchrow_num(); |
292 $db->free_result(); |
293 $db->free_result(); |
293 } |
294 } |
|
295 $yk_enabled = intval($yk_enabled); |
|
296 $user_flags = intval($user_flags); |
294 |
297 |
295 $template->add_header('<script type="text/javascript">var yk_reg_require_otp = ' . getConfig('yubikey_reg_require_otp', '0') . '; var yk_user_enabled = ' . $yk_enabled . '; var yk_user_flags = ' . $user_flags . ';</script>'); |
298 $template->add_header('<script type="text/javascript">var yk_reg_require_otp = ' . getConfig('yubikey_reg_require_otp', '0') . '; var yk_user_enabled = ' . $yk_enabled . '; var yk_user_flags = ' . $user_flags . ';</script>'); |
296 } |
299 } |
297 |
300 |