| Zeile 32 | Zeile 32 |
|---|
$table = new Table;
$table->construct_header($lang->recovery_codes);
|
$table = new Table;
$table->construct_header($lang->recovery_codes);
|
$table->construct_cell($lang->recovery_codes_warning);
| $table->construct_cell("{$lang->recovery_codes_warning} <strong><a href=\"javascript:window.print()\">{$lang->print_recovery_codes}</a></strong>");
|
$table->construct_row();
$table->construct_cell(implode("<br />", $codes));
| $table->construct_row();
$table->construct_cell(implode("<br />", $codes));
|
| Zeile 42 | Zeile 42 |
|---|
$page->output_footer();
}
|
$page->output_footer();
}
|
| |
|
if(!$mybb->input['action'])
{
require_once MYBB_ROOT."inc/3rdparty/2fa/GoogleAuthenticator.php";
| if(!$mybb->input['action'])
{
require_once MYBB_ROOT."inc/3rdparty/2fa/GoogleAuthenticator.php";
|
| Zeile 51 | Zeile 52 |
|---|
if($mybb->request_method == "post")
{
|
if($mybb->request_method == "post")
{
|
$query = $db->simple_select("adminoptions", "permissions, defaultviews, 2fasecret, recovery_codes", "uid='{$mybb->user['uid']}'");
| $query = $db->simple_select("adminoptions", "permissions, defaultviews, authsecret, recovery_codes", "uid='{$mybb->user['uid']}'");
|
$adminopts = $db->fetch_array($query);
|
$adminopts = $db->fetch_array($query);
|
$secret = $adminopts['2fasecret'];
| $secret = $adminopts['authsecret'];
|
// Was the option changed? empty = disabled so ==
if($mybb->input['2fa'] == empty($secret))
{
| // Was the option changed? empty = disabled so ==
if($mybb->input['2fa'] == empty($secret))
{
|
| Zeile 83 | Zeile 84 |
|---|
"defaultviews" => $db->escape_string($adminopts['defaultviews']),
"uid" => $mybb->user['uid'],
"codepress" => $mybb->get_input('codepress', MyBB::INPUT_INT), // It's actually CodeMirror but for compatibility purposes lets leave it codepress
|
"defaultviews" => $db->escape_string($adminopts['defaultviews']),
"uid" => $mybb->user['uid'],
"codepress" => $mybb->get_input('codepress', MyBB::INPUT_INT), // It's actually CodeMirror but for compatibility purposes lets leave it codepress
|
"2fasecret" => $db->escape_string($secret),
| "authsecret" => $db->escape_string($secret),
|
"recovery_codes" => $db->escape_string($adminopts['recovery_codes']),
);
|
"recovery_codes" => $db->escape_string($adminopts['recovery_codes']),
);
|
|
|
$db->replace_query("adminoptions", $sqlarray, "uid");
$plugins->run_hooks("admin_home_preferences_start_commit");
| $db->replace_query("adminoptions", $sqlarray, "uid");
$plugins->run_hooks("admin_home_preferences_start_commit");
|
| Zeile 105 | Zeile 106 |
|---|
$page->output_nav_tabs($sub_tabs, 'preferences');
|
$page->output_nav_tabs($sub_tabs, 'preferences');
|
$query = $db->simple_select("adminoptions", "notes, cpstyle, cplanguage, codepress, 2fasecret", "uid='".$mybb->user['uid']."'", array('limit' => 1));
| $query = $db->simple_select("adminoptions", "notes, cpstyle, cplanguage, codepress, authsecret", "uid='".$mybb->user['uid']."'", array('limit' => 1));
|
$admin_options = $db->fetch_array($query);
$form = new Form("index.php?module=home-preferences", "post");
| $admin_options = $db->fetch_array($query);
$form = new Form("index.php?module=home-preferences", "post");
|
| Zeile 121 | Zeile 122 |
|---|
}
closedir($dir);
ksort($folders);
|
}
closedir($dir);
ksort($folders);
|
$setting_code = $form->generate_select_box("cpstyle", $folders, $admin_options['cpstyle']);
| $styles = array_merge(array('' => $lang->use_default), $folders);
$setting_code = $form->generate_select_box("cpstyle", $styles, $admin_options['cpstyle']);
|
$languages = array_merge(array('' => $lang->use_default), $lang->get_languages(1));
$language_code = $form->generate_select_box("cplanguage", $languages, $admin_options['cplanguage']);
|
$languages = array_merge(array('' => $lang->use_default), $lang->get_languages(1));
$language_code = $form->generate_select_box("cplanguage", $languages, $admin_options['cplanguage']);
|
$table = new Table;
$table->construct_header($lang->global_preferences);
$table->construct_cell("<strong>{$lang->acp_theme}</strong><br /><small>{$lang->select_acp_theme}</small><br /><br />{$setting_code}");
$table->construct_row();
$table->construct_cell("<strong>{$lang->acp_language}</strong><br /><small>{$lang->select_acp_language}</small><br /><br />{$language_code}");
$table->construct_row();
$table->construct_cell("<strong>{$lang->codemirror}</strong><br /><small>{$lang->use_codemirror_desc}</small><br /><br />".$form->generate_on_off_radio('codepress', $admin_options['codepress']));
$table->construct_row();
| $form_container = new FormContainer($lang->preferences);
$form_container->output_row_header($lang->global_preferences);
$form_container->output_row($lang->acp_theme, $lang->select_acp_theme, $setting_code);
$form_container->output_row($lang->acp_language, $lang->select_acp_language, $language_code);
$form_container->output_row($lang->codemirror, $lang->use_codemirror_desc, $form->generate_on_off_radio('codepress', $admin_options['codepress']));
|
// If 2FA is enabled we need to display a link to the recovery codes page
|
// If 2FA is enabled we need to display a link to the recovery codes page
|
if(!empty($admin_options['2fasecret']))
{
| if(!empty($admin_options['authsecret']))
{
|
$lang->use_2fa_desc .= "<br />".$lang->recovery_codes_desc." ".$lang->recovery_codes_warning;
|
$lang->use_2fa_desc .= "<br />".$lang->recovery_codes_desc." ".$lang->recovery_codes_warning;
|
}
$table->construct_cell("<strong>{$lang->my2fa}</strong><br /><small>{$lang->use_2fa_desc}</small><br /><br />".$form->generate_on_off_radio('2fa', (int)!empty($admin_options['2fasecret'])));
$table->construct_row();
if(!empty($admin_options['2fasecret']))
| }
$form_container->output_row($lang->my2fa, $lang->use_2fa_desc, $form->generate_on_off_radio('2fa', (int)!empty($admin_options['authsecret'])));
if(!empty($admin_options['authsecret']))
|
{
|
{
|
$qr = $auth->getQRCodeGoogleUrl($mybb->user['username']."@".str_replace(" ", "", $mybb->settings['bbname']), $admin_options['2fasecret']);
$table->construct_cell("<strong>{$lang->my2fa_qr}</strong><br /><img src=\"{$qr}\"");
$table->construct_row();
}
| $qr = $auth->getQRCodeGoogleUrl($mybb->user['username']."@".str_replace(" ", "", $mybb->settings['bbname']), $admin_options['authsecret']);
$form_container->output_row($lang->my2fa_qr . "<br /><img src=\"{$qr}\"");
}
$form_container->end();
|
|
|
$table->output($lang->preferences);
| $table = new Table;
|
$table->construct_header($lang->notes_not_shared);
|
$table->construct_header($lang->notes_not_shared);
|
| Zeile 171 | Zeile 166 |
|---|
$page->output_footer();
}
|
$page->output_footer();
}
|
| | /**
* Generate 10 random recovery codes, each with a length of 6 and without duplicates
*
* @return array
*/
|
function generate_recovery_codes()
{
$t = array();
| function generate_recovery_codes()
{
$t = array();
|