* fixed country selection in create account

* deleted some useless code
This commit is contained in:
slawkens 2017-09-14 16:37:01 +02:00
parent c546a46847
commit 801188f957
8 changed files with 11 additions and 21 deletions

View File

@ -19,8 +19,6 @@ function generate_search_form($autofocus = false)
global $config, $twig; global $config, $twig;
return $twig->render('characters.form.html.twig', array( return $twig->render('characters.form.html.twig', array(
'link' => getPageLink('characters'), 'link' => getPageLink('characters'),
'vdarkborder' => $config['vdarkborder'],
'darkborder' => $config['darkborder'],
'autofocus' => $autofocus 'autofocus' => $autofocus
)); ));
} }

View File

@ -279,6 +279,7 @@ If you haven\'t registered on ' . $config['lua']['serverName'] . ' please ignore
'countries' => isset($countries) ? $countries : null, 'countries' => isset($countries) ? $countries : null,
'accept_rules' => isset($_POST['accept_rules']) ? $_POST['accept_rules'] : false, 'accept_rules' => isset($_POST['accept_rules']) ? $_POST['accept_rules'] : false,
'country_recognized' => $country_recognized, 'country_recognized' => $country_recognized,
'country' => isset($country) ? $country : null,
'errors' => $errors 'errors' => $errors
)); ));
?> ?>

View File

@ -737,7 +737,6 @@ if($action == 'move_thread')
'post_id' => $post['id'], 'post_id' => $post['id'],
'sections' => $sections, 'sections' => $sections,
'section_link' => getForumBoardLink($post['section']), 'section_link' => getForumBoardLink($post['section']),
'config' => $config
)); ));
} }
} }

View File

@ -22,16 +22,10 @@ $config_salt_enabled = fieldExist('salt', 'accounts');
$action_type = isset($_REQUEST['action_type']) ? $_REQUEST['action_type'] : ''; $action_type = isset($_REQUEST['action_type']) ? $_REQUEST['action_type'] : '';
if($action == '') if($action == '')
{ {
echo $twig->render('account.lost.form.html.twig', array( echo $twig->render('account.lost.form.html.twig');
'vdarkborder' => $config['vdarkborder'],
'darkborder' => $config['darkborder'],
'template_path' => $template_path
));
} }
else if($action == 'step1' && $action_type == '') { else if($action == 'step1' && $action_type == '') {
echo $twig->render('account.lost.noaction.html.twig', array( echo $twig->render('account.lost.noaction.html.twig');
'template_path' => $template_path
));
} }
elseif($action == 'step1' && $action_type == 'email') elseif($action == 'step1' && $action_type == 'email')
{ {

View File

@ -60,8 +60,6 @@ if($canEdit) {
'link' => getPageLink('screenshots', ($action == 'edit' ? 'edit' : 'add')), 'link' => getPageLink('screenshots', ($action == 'edit' ? 'edit' : 'add')),
'action' => $action, 'action' => $action,
'id' => isset($id) ? $id : null, 'id' => isset($id) ? $id : null,
'vdarkborder' => $config['vdarkborder'],
'darkborder' => $config['darkborder'],
'comment' => isset($comment) ? $comment : null, 'comment' => isset($comment) ? $comment : null,
'image' => isset($image) ? $image : null, 'image' => isset($image) ? $image : null,
'author' => isset($author) ? $author : null 'author' => isset($author) ? $author : null

View File

@ -3,20 +3,20 @@ The Lost Account Interface can help you to get back your account name and passwo
<input type="hidden" name="character" value=""> <input type="hidden" name="character" value="">
<table cellspacing="1" cellpadding="4" border="0" width="100%"> <table cellspacing="1" cellpadding="4" border="0" width="100%">
<tr> <tr>
<td bgcolor="{{ vdarkborder }}" class="white"><b>Please enter your character name</b></td> <td bgcolor="{{ config.vdarkborder }}" class="white"><b>Please enter your character name</b></td>
</tr> </tr>
<tr> <tr>
<td bgcolor="{{ darkborder }}"> <td bgcolor="{{ config.darkborder }}">
<input type="text" name="nick" size="40" autofocus/><br> <input type="text" name="nick" size="40" autofocus/><br>
</td> </td>
</tr> </tr>
</table> </table>
<table cellspacing="1" cellpadding="4" border="0" width="100%"> <table cellspacing="1" cellpadding="4" border="0" width="100%">
<tr> <tr>
<td bgcolor="{{ vdarkborder }}" class="white"><b>What do you want?</b></td> <td bgcolor="{{ config.vdarkborder }}" class="white"><b>What do you want?</b></td>
</tr> </tr>
<tr> <tr>
<td bgcolor="{{ darkborder }}"> <td bgcolor="{{ config.darkborder }}">
<input type="radio" name="action_type" id="action_type_email" value="email"> <input type="radio" name="action_type" id="action_type_email" value="email">
<label for="action_type_email"> Send me new password and my account name to account e-mail adress.</label><br/> <label for="action_type_email"> Send me new password and my account name to account e-mail adress.</label><br/>
<input type=radio name="action_type" id="action_type_key" value="reckey"> <input type=radio name="action_type" id="action_type_key" value="reckey">

View File

@ -1,7 +1,7 @@
<form action="{{ link }}" method="post"> <form action="{{ link }}" method="post">
<table width="100%" border="0" cellspacing="1" cellpadding="4"> <table width="100%" border="0" cellspacing="1" cellpadding="4">
<tr><td bgcolor="{{ vdarkborder }}" class="white"><B>Search Character</B></TD></TR> <tr><td bgcolor="{{ config.vdarkborder }}" class="white"><B>Search Character</B></TD></TR>
<tr><td bgcolor="{{ darkborder }}"> <tr><td bgcolor="{{ config.darkborder }}">
<table border="0" cellpadding="1"> <table border="0" cellpadding="1">
<tr> <tr>
<td>Name:</td><td><input name="name" value="" size="29" maxlength="29"{% if autofocus %} autofocus{% endif %}></TD> <td>Name:</td><td><input name="name" value="" size="29" maxlength="29"{% if autofocus %} autofocus{% endif %}></TD>

View File

@ -4,10 +4,10 @@
{% endif %} {% endif %}
<table width="100%" border="0" cellspacing="1" cellpadding="4"> <table width="100%" border="0" cellspacing="1" cellpadding="4">
<tr> <tr>
<td bgcolor="{{ vdarkborder }}" class="white"><b>{% if action == 'edit' %}Edit{% else %}Add{% endif %} screenshot</b></td> <td bgcolor="{{ config.vdarkborder }}" class="white"><b>{% if action == 'edit' %}Edit{% else %}Add{% endif %} screenshot</b></td>
</tr> </tr>
<tr> <tr>
<td bgcolor="{{ darkborder }}"> <td bgcolor="{{ config.darkborder }}">
<table border="0" cellpadding="1"> <table border="0" cellpadding="1">
<tr> <tr>
<td>Comment:</td> <td>Comment:</td>