equal
deleted
inserted
replaced
229 |
229 |
230 $template->add_header('<script type="text/javascript" src="' . scriptPath . '/plugins/yubikey/yubikey.js"></script>'); |
230 $template->add_header('<script type="text/javascript" src="' . scriptPath . '/plugins/yubikey/yubikey.js"></script>'); |
231 $template->add_header('<link rel="stylesheet" type="text/css" href="' . scriptPath . '/plugins/yubikey/yubikey.css" />'); |
231 $template->add_header('<link rel="stylesheet" type="text/css" href="' . scriptPath . '/plugins/yubikey/yubikey.css" />'); |
232 // config option for all users have yubikey |
232 // config option for all users have yubikey |
233 $user_flags = 0; |
233 $user_flags = 0; |
|
234 $yk_enabled = 0; |
234 if ( $session->user_logged_in ) |
235 if ( $session->user_logged_in ) |
235 { |
236 { |
236 $q = $db->sql_query('SELECT COUNT(yubi_uid) > 0 FROM ' . table_prefix . "yubikey WHERE user_id = {$session->user_id};"); |
237 $q = $db->sql_query('SELECT COUNT(y.yubi_uid) > 0, u.user_yubikey_flags FROM ' . table_prefix . "yubikey AS y LEFT JOIN " . table_prefix . "users AS u ON ( u.user_id = y.user_id ) WHERE y.user_id = {$session->user_id};"); |
237 if ( !$q ) |
238 if ( !$q ) |
238 $db->_die(); |
239 $db->_die(); |
239 |
240 |
240 list($user_flags) = $db->fetchrow_num(); |
241 list($yk_enabled, $user_flags) = $db->fetchrow_num(); |
241 $db->free_result(); |
242 $db->free_result(); |
242 } |
243 } |
243 |
244 |
244 $template->add_header('<script type="text/javascript">var yk_reg_require_otp = ' . getConfig('yubikey_reg_require_otp', '0') . '; var yk_user_enabled = ' . $user_flags . ';</script>'); |
245 $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>'); |
245 } |
246 } |
246 |
247 |