-
- Your account is .
-
- You will need the account and your password to play on .
- Please keep your account and password in a safe place and
- never give your account or password to anybody.
-render('account.created.verify.html.twig', array(
+ 'account' => $tmp_account
+ ));
}
else
{
@@ -219,25 +196,15 @@ If you haven\'t registered on ' . $config['lua']['serverName'] . ' please ignore
}
else
{
- echo 'Your account has been created. Now you can login and create your first character. See you in Tibia!
';
- echo '
- Account Created |
-
-
- Your account ' . (USE_ACCOUNT_NAME ? 'name' : 'number') . ' is '.$tmp_account.' You will need the account ' . (USE_ACCOUNT_NAME ? 'name' : 'number') . ' and your password to play on '.$config['lua']['serverName'].'.
- Please keep your account ' . (USE_ACCOUNT_NAME ? 'name' : 'number') . ' and password in a safe place and
- never give your account ' . (USE_ACCOUNT_NAME ? 'name' : 'number') . ' or password to anybody.
';
-
+ echo $twig->render('account.created.html.twig', array(
+ 'account' => $tmp_account
+ ));
+
if($config['mail_enabled'] && $config['account_welcome_mail'])
{
- $mailBody = '
- Dear player,
- Thanks for your registration at ' . $config['lua']['serverName'] . '
-
- Your login details:
- Account' . (USE_ACCOUNT_NAME ? ' name' : '') . ': ' . $tmp_account . '
- Password: ' . str_repeat('*', strlen(trim($password))) . ' (hidden for security reasons)
- Kind Regards, ';
+ $mailBody = $twig->render('account.welcome_mail.html.twig', array(
+ 'account' => $tmp_account
+ ));
if(_mail($email, 'Your account on ' . $config['lua']['serverName'], $mailBody))
echo ' These informations were send on email address ' . $email . '.';
@@ -245,7 +212,6 @@ If you haven\'t registered on ' . $config['lua']['serverName'] . ' please ignore
echo '
An error occorred while sending email (' . $email . ')! Error: ' . $mailer->ErrorInfo . ' ';
}
}
- echo ' |
|
';
return;
}
diff --git a/system/pages/guilds.php b/system/pages/guilds.php
index 8d91d58f..a0938d38 100644
--- a/system/pages/guilds.php
+++ b/system/pages/guilds.php
@@ -18,25 +18,6 @@ else
define('GUILD_MEMBERS_TABLE', 'guild_membership');
define('MOTD_EXISTS', fieldExist('motd', 'guilds'));
-if($action == 'login')
-{
- if(check_guild_name($_REQUEST['guild']))
- $guild = $_REQUEST['guild'];
- if($_REQUEST['redirect'] == 'guild' || $_REQUEST['redirect'] == 'guilds')
- $redirect = $_REQUEST['redirect'];
- if(!$logged)
- echo 'Please enter your account number and your password. Create an account if you do not have one yet.
| ';
- else
- {
- echo 'Now you are logged. Redirecting...';
- if($redirect == 'guilds')
- header("Location: ?subtopic=guilds");
- elseif($redirect == 'guild')
- header("Location: ?subtopic=guilds&action=show&guild=".$guild);
- else
- echo 'Wrong address to redirect!';
- }
-}
//-----------------------------------------------------------------------------//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------//-----------------------------------------------------------------------------
@@ -187,12 +168,9 @@ if($action == 'show')
}
if(!empty($guild_errors))
{
- //show errors
- echo ' The Following Errors Have Occurred: ';
- foreach($guild_errors as $guild_error)
- echo ''.$guild_error;
- //errors and back button
- echo ' ';
+ echo $twig->render('error_box.html.twig', array('errors' => $guild_errors));
+ echo '
+';
}
else
{
@@ -402,7 +380,7 @@ if($action == 'show')
echo '
';
}
}
}
@@ -970,26 +942,26 @@ if($action == 'kickplayer') {
$guild_name = $_REQUEST['guild'];
$name = stripslashes($_REQUEST['name']);
if(!$logged) {
- $guild_errors[] = 'You are not logged in. You can\'t kick characters.';
+ $errors[] = 'You are not logged in. You can\'t kick characters.';
}
if(!check_guild_name($guild_name)) {
- $guild_errors[] = 'Invalid guild name format.';
+ $errors[] = 'Invalid guild name format.';
}
if(!check_name($name)) {
- $guild_errors[] = 'Invalid name format.';
+ $errors[] = 'Invalid name format.';
}
- if(empty($guild_errors)) {
+ if(empty($errors)) {
$guild = $ots->createObject('Guild');
$guild->find($guild_name);
if(!$guild->isLoaded()) {
- $guild_errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.';
+ $errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.';
}
}
- if(empty($guild_errors)) {
+ if(empty($errors)) {
$rank_list = $guild->getGuildRanksList();
$rank_list->orderBy('level', POT::ORDER_DESC);
$guild_leader = false;
@@ -1015,44 +987,42 @@ if($action == 'kickplayer') {
}
}
- if(empty($guild_errors)) {
+ if(empty($errors)) {
if(!$guild_leader && $level_in_guild < 3) {
- $guild_errors[] = 'You are not a leader of guild '.$guild_name.'. You can\'t kick players.';
+ $errors[] = 'You are not a leader of guild '.$guild_name.'. You can\'t kick players.';
}
}
- if(empty($guild_errors)) {
+ if(empty($errors)) {
$player = new OTS_Player();
$player->find($name);
if(!$player->isLoaded()) {
- $guild_errors[] = 'Character '.$name.' doesn\'t exist.';
+ $errors[] = 'Character '.$name.' doesn\'t exist.';
}
else
{
if($player->getRank()->isLoaded() && $player->getRank()->getGuild()->isLoaded() && $player->getRank()->getGuild()->getName() != $guild->getName()) {
- $guild_errors[] = 'Character '.$name.' isn\'t from your guild.';
+ $errors[] = 'Character '.$name.' isn\'t from your guild.';
}
}
}
- if(empty($guild_errors)) {
+ if(empty($errors)) {
if($player->getRank()->isLoaded() && $player->getRank()->getLevel() >= $level_in_guild && !$guild_leader) {
- $guild_errors[] = 'You can\'t kick character '.$name.'. Too high access level.';
+ $errors[] = 'You can\'t kick character '.$name.'. Too high access level.';
}
}
- if(empty($guild_errors)) {
+ if(empty($errors)) {
if($guild->getOwner()->getName() == $player->getName()) {
- $guild_errors[] = 'It\'s not possible to kick guild owner!';
+ $errors[] = 'It\'s not possible to kick guild owner!';
}
}
- if(!empty($guild_errors)) {
- echo ' The Following Errors Have Occurred: ';
- foreach($guild_errors as $guild_error) {
- echo ''.$guild_error;
- }
- echo ' ';
+ if(!empty($errors)) {
+ echo $twig->render('error_box.html.twig', array('errors' => $errors));
+ echo '
+';
}
else
{
@@ -1077,57 +1047,57 @@ if($action == 'leaveguild') {
$guild_name = isset($_REQUEST['guild']) ? $_REQUEST['guild'] : NULL;
$name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : NULL;
if(!$logged) {
- $guild_errors[] = 'You are not logged in. You can\'t leave guild.';
+ $errors[] = 'You are not logged in. You can\'t leave guild.';
}
if(!check_guild_name($guild_name)) {
- $guild_errors[] = 'Invalid guild name format.';
+ $errors[] = 'Invalid guild name format.';
}
- if(empty($guild_errors)) {
- $guild = $ots->createObject('Guild');
+ if(empty($errors)) {
+ $guild = new OTS_Guild();
$guild->find($guild_name);
if(!$guild->isLoaded()) {
- $guild_errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.';
+ $errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.';
}
}
$array_of_player_ig = array();
- if(empty($guild_errors)) {
+ if(empty($errors)) {
$guild_owner_name = $guild->getOwner()->getName();
if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') {
if(!check_name($name)) {
- $guild_errors[] = 'Invalid name format.';
+ $errors[] = 'Invalid name format.';
}
- if(empty($guild_errors)) {
+ if(empty($errors)) {
$player = new OTS_Player();
$player->find($name);
if(!$player->isLoaded()) {
- $guild_errors[] = 'Character '.$name.' doesn\'t exist.';
+ $errors[] = 'Character '.$name.' doesn\'t exist.';
}
else {
if($player->getAccount()->getId() != $account_logged->getId()) {
- $guild_errors[] = 'Character '.$name.' isn\'t from your account!';
+ $errors[] = 'Character '.$name.' isn\'t from your account!';
}
}
}
- if(empty($guild_errors)) {
+ if(empty($errors)) {
$player_loaded_rank = $player->getRank();
if($player_loaded_rank->isLoaded()) {
if($player_loaded_rank->getGuild()->getName() != $guild->getName()) {
- $guild_errors[] = 'Character '.$name.' isn\'t from guild '.$guild->getName().'.';
+ $errors[] = 'Character '.$name.' isn\'t from guild '.$guild->getName().'.';
}
}
else {
- $guild_errors[] = 'Character '.$name.' isn\'t in any guild.';
+ $errors[] = 'Character '.$name.' isn\'t in any guild.';
}
}
- if(empty($guild_errors)) {
+ if(empty($errors)) {
if($guild_owner_name == $player->getName()) {
- $guild_errors[] = 'You can\'t leave guild. You are an owner of guild.';
+ $errors[] = 'You can\'t leave guild. You are an owner of guild.';
}
}
}
@@ -1147,12 +1117,10 @@ if($action == 'leaveguild') {
}
}
- if(!empty($guild_errors)) {
- echo ' The Following Errors Have Occurred: ';
- foreach($guild_errors as $guild_error) {
- echo ''.$guild_error;
- }
- echo ' ';
+ if(!empty($errors)) {
+ echo $twig->render('error_box.html.twig', array('errors' => $errors));
+ echo '
+';
}
else
{
@@ -1280,11 +1248,7 @@ if($action == 'createguild')
}
if(!empty($guild_errors)) {
-echo ' The Following Errors Have Occurred: ';
-foreach($guild_errors as $guild_error) {
- echo ''.$guild_error;
-}
-echo ' ';
+ echo $twig->render('error_box.html.twig', array('errors' => $guild_errors));
unset($todo);
}
@@ -1304,52 +1268,21 @@ if(isset($todo) && $todo == 'save')
$player->setRank($rank);
}
}
- echo 'Create guild | Congratulations! You have created guild '.$guild_name.'. '.$player->getName().' is leader of this guild. Now you can invite players, change picture, description' . (MOTD_EXISTS ? ' and motd' : '') . ' of guild. Press submit to open guild manager. |
';
+ echo $twig->render('success.html.twig', array(
+ 'title' => 'Created guild',
+ 'description' => 'Congratulations! You have created guild ' . $guild_name . '. '.$player->getName().' is leader of this guild. Now you can invite players, change picture, description' . (MOTD_EXISTS ? ' and motd' : '') . ' of guild. Press submit to open guild manager.',
+ 'custom_buttons' => ''
+ ));
+
/*$db->query('INSERT INTO `guild_ranks` (`id`, `guild_id`, `name`, `level`) VALUES (null, '.$new_guild->getId().', "the Leader", 3)');
$db->query('INSERT INTO `guild_ranks` (`id`, `guild_id`, `name`, `level`) VALUES (null, '.$new_guild->getId().', "a Vice-Leader", 2)');
$db->query('INSERT INTO `guild_ranks` (`id`, `guild_id`, `name`, `level`) VALUES (null, '.$new_guild->getId().', "a Member", 1)');*/
}
-else
-{
-echo '
- ';
+else {
+ sort($array_of_player_nig);
+ echo $twig->render('guilds.create_guild.html.twig', array(
+ 'players' => $array_of_player_nig
+ ));
}
}
//-----------------------------------------------------------------------------//-----------------------------------------------------------------------------
@@ -1357,81 +1290,38 @@ echo ' (Name of leader
//-----------------------------------------------------------------------------//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------//-----------------------------------------------------------------------------
if($action == 'manager') {
-$guild_name = $_REQUEST['guild'];
-if(!check_guild_name($guild_name)) {
-$guild_errors[] = 'Invalid guild name format.';
-}
-if(empty($guild_errors)) {
-$guild = $ots->createObject('Guild');
-$guild->find($guild_name);
-if(!$guild->isLoaded()) {
-$guild_errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.';
-}
-}
-if(empty($guild_errors)) {
-if($logged) {
-$guild_leader_char = $guild->getOwner();
-$rank_list = $guild->getGuildRanksList();
-$rank_list->orderBy('level', POT::ORDER_DESC);
-$guild_leader = false;
-$account_players = $account_logged->getPlayers();
-foreach($account_players as $player) {
-if($guild_leader_char->getId() == $player->getId()) {
-$guild_vice = true;
-$guild_leader = true;
-$level_in_guild = 3;
-}
-}
+ $guild_name = $_REQUEST['guild'];
+ if(!check_guild_name($guild_name)) {
+ $guild_errors[] = 'Invalid guild name format.';
+ }
+
+ if(empty($guild_errors)) {
+ $guild = new OTS_Guild();
+ $guild->find($guild_name);
+ if(!$guild->isLoaded()) {
+ $guild_errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.';
+ }
+ }
+
+ if(empty($guild_errors)) {
+ if($logged) {
+ $guild_leader_char = $guild->getOwner();
+ $rank_list = $guild->getGuildRanksList();
+ $rank_list->orderBy('level', POT::ORDER_DESC);
+ $guild_leader = false;
+ $account_players = $account_logged->getPlayers();
+ foreach($account_players as $player) {
+ if($guild_leader_char->getId() == $player->getId()) {
+ $guild_vice = true;
+ $guild_leader = true;
+ $level_in_guild = 3;
+ }
+ }
if($guild_leader) {
-echo 'Welcome to guild manager!Here you can change names of ranks, delete and add ranks, pass leadership to other guild member and delete guild.';
-echo '
';
-echo '
|
';
-echo '