Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-14 09:44:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed global config variable in twig templates

Browse Source 
* rest from account.create_character moved to twig
* fixed some grammar errors
* fixed some separators in kathrine template
This commit is contained in:
slawkens
2017-09-11 17:41:27 +02:00
parent 4685c7b868
commit 5b14c6d4d4
13 changed files with 148 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
system/pages/accountmanagement.php
View File

@@ -130,7 +130,6 @@ if(!$logged)
'account_registered' => $account_registered,
'account_rlname' => $account_rlname,
'account_location' => $account_location,
'config' => $config,
'actions' => $actions,
'players' => $players
));
@@ -195,7 +194,6 @@ if(!$logged)
if($config['mail_enabled'] && $config['send_mail_when_change_password'])
{
$mailBody = $twig->render('mail.password_changed.html.twig', array(
'config' => $config,
'new_password' => $org_pass
));
@@ -314,7 +312,7 @@ if(!$logged)
$account_logged->setCustomField("rlname", $new_rlname);
$account_logged->setCustomField("location", $new_location);
$account_logged->setCustomField("country", $new_country);
$account_logged->logAction('Changed Real Name to ' . $new_rlname . ', Location to ' . $new_location . ' and Country to ' . $config['countries'][$new_country] . '.');
$account_logged->logAction('Changed Real Name to <b>' . $new_rlname . '</b>, Location to <b>' . $new_location . '</b> and Country to <b>' . $config['countries'][$new_country] . '</b>.');
echo $twig->render('success.html.twig', array(
'title' => 'Public Information Changed',
'description' => 'Your public information has been changed.'
@@ -380,7 +378,7 @@ if(!$logged)
echo '</ul> </table> </div> </table></div></td></tr><br/><center><table border="0" cellspacing="0" cellpadding="0" ><form action="?subtopic=accountmanagement" method="post" ><tr><td style="border:0px;" ><div class="BigButton" style="background-image:url('.$template_path.'/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url('.$template_path.'/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Back" alt="Back" src="'.$template_path.'/images/buttons/_sbutton_back.gif" ></div></div></td></tr></form></table></center>';
}
else
$reg_errors[] = 'Your account is already registred.';
$reg_errors[] = 'Your account is already registered.';
}
else
$reg_errors[] = 'Wrong password to account.';
@@ -666,7 +664,6 @@ if(!$logged)
echo $twig->render('error_box.html.twig', array('errors' => $errors));
}
echo $twig->render('account.change_sex.html.twig', array(
'config' => $config,
'players' => $account_logged->getPlayersList(),
'player_sex' => isset($player) ? $player->getSex() : -1,
'points' => $points
@@ -747,12 +744,18 @@ if(!$logged)
if(isset($_POST['savecharacter']) && $_POST['savecharacter'] == 1) {
if(empty($newchar_name))
$errors[] = 'Please enter a name for your character!';
if(strlen($newchar_name) > 25)
else if(strlen($newchar_name) > 25)
$errors[] = 'Name is too long. Max. lenght <b>25</b> letters.';
else if(strlen($newchar_name) < 3)
$errors[] = 'Name is too short. Min. lenght <b>25</b> letters.';
$errors[] = 'Name is too short. Min. lenght <b>3</b> letters.';
else {
$exist = new OTS_Player();
$exist->find($newchar_name);
if($exist->isLoaded()) {
$errors[] = 'Character with this name already exist.';
}
}
if(empty($newchar_sex) && $newchar_sex != "0")
$errors[] = 'Please select the sex for your character!';
@@ -772,12 +775,6 @@ if(!$logged)
$newchar_town = $config['character_towns'][0];
}
$exist = new OTS_Player();
$exist->find($newchar_name);
if($exist->isLoaded()) {
$errors[] .= 'Character with this name already exist.';
}
if(empty($errors)) {
$error = '';
if(!admin() && !check_name_new_char($newchar_name, $error)) {
@@ -923,39 +920,11 @@ if(!$logged)
if(!$newchar_created) {
echo $twig->render('account.create_character.html.twig', array(
'config' => $config,
'newchar_name' => $newchar_name
'name' => $newchar_name,
'sex' => $newchar_sex,
'vocation' => $newchar_vocation,
'town' => $newchar_town
));
echo '<div class="InnerTableContainer" > <table style="width:100%;" ><tr>';
if(count($config['character_samples']) > 1)
{
echo '<td><table class="TableContent" width="100%" ><tr class="Odd" valign="top"><td width="160"><br /><b>Select your vocation:</b></td><td><table class="TableContent" width="100%" >';
foreach($config['character_samples'] as $key => $sample_char)
{
echo '<tr><td><input type="radio" name="vocation" id="vocation' . $key . '" value="'.$key.'" ';
if($newchar_vocation == $key)
echo 'checked="checked" ';
echo '><label for="vocation' . $key . '">'.$config['vocations'][$key].'</label></td></tr>';
}
echo '</table></td></table>';
}
if(count($config['character_towns']) > 1)
{
echo '<td><table class="TableContent" width="100%" ><tr class="Odd" valign="top"><td width="160"><br /><b>Select your city:</b></td><td><table class="TableContent" width="100%" >';
foreach($config['character_towns'] as $town_id)
{
echo '<tr><td><input type="radio" name="town" id="town' . $town_id . '" value="' . $town_id . '" ';
if($newchar_town == $town_id)
echo 'checked="checked" ';
echo '><label for="town' . $town_id . '">'.$config['towns'][$town_id].'</label></td></tr>';
}
echo '</table></td></tr></table></table></div>';
}
else
echo '</tr></table></div>';
echo '</table></div></td></tr><br/><table style="width:100%;" ><tr align="center" ><td><table border="0" cellspacing="0" cellpadding="0" ><tr><td style="border:0px;" ><div class="BigButton" style="background-image:url('.$template_path.'/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url('.$template_path.'/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Submit" alt="Submit" src="'.$template_path.'/images/buttons/_sbutton_submit.gif" ></div></div></td><tr></form></table></td><td><table border="0" cellspacing="0" cellpadding="0" ><form action="?subtopic=accountmanagement" method="post" ><tr><td style="border:0px;" ><div class="BigButton" style="background-image:url('.$template_path.'/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url('.$template_path.'/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Back" alt="Back" src="'.$template_path.'/images/buttons/_sbutton_back.gif" ></div></div></td></tr></form></table></td></tr></table>';
}
}
?>

6
system/pages/characters.php
View File

@@ -80,7 +80,8 @@ if($player->isLoaded() && !$player->isDeleted())
$account = $player->getAccount();
$rows = 0;
$outfit = $config['outfit_images_url'] . '?id=' . $player->getLookType() . (fieldExist('lookaddons', 'players') ? '&addons=' . $player->getLookAddons() : '') . '&head=' . $player->getLookHead() . '&body=' . $player->getLookBody() . '&legs=' . $player->getLookLegs() . '&feet=' . $player->getLookFeet();
if($config['characters']['outfit'])
$outfit = $config['outfit_images_url'] . '?id=' . $player->getLookType() . (fieldExist('lookaddons', 'players') ? '&addons=' . $player->getLookAddons() : '') . '&head=' . $player->getLookHead() . '&body=' . $player->getLookBody() . '&legs=' . $player->getLookLegs() . '&feet=' . $player->getLookFeet();
$flag = '';
if($config['account_country'])
@@ -396,10 +397,9 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
}
echo $twig->render('characters.html.twig', array(
'outfit' => $outfit,
'outfit' => isset($outfit) ? $outfit : null,
'player' => $player,
'account' => $account,
'config' => $config,
'flag' => $flag,
'oldName' => $oldName,
'sex' => $player_sex,

1
system/pages/forum.php
View File

@@ -621,7 +621,6 @@ if($action == 'new_thread')
echo $twig->render('forum.new_thread.html.twig', array(
'section_id' => $section_id,
'config' => $config,
'players' => $players_from_account,
'post_player_id' => $char_id,
'post_thread' => $post_topic,

1
system/pages/news.php
View File

@@ -280,7 +280,6 @@ if(!$news_cached)
$account_players->orderBy('group_id', POT::ORDER_DESC);
echo $twig->render('news.add.html.twig', array(
'config' => $config,
'action' => $action,
'news_link' => getPageLink(PAGE),
'news_link_form' => getPageLink('news', ($action == 'edit' ? 'edit' : 'add')),