diff --git a/config.php b/config.php index edc1ff55..c628ed25 100644 --- a/config.php +++ b/config.php @@ -35,6 +35,7 @@ $config = array( // gesior backward support (templates & pages) // allows using gesior templates and pages with myaac + // might bring some performance when disabled 'backward_support' => true, // head options (html) @@ -231,7 +232,7 @@ $config = array( 'google_analytics_id' => '', // e.g.: UA-XXXXXXX-X 'experiencetable_columns' => 5, // how many columns to display in experience table page. * experiencetable_rows, 5 = 500 (will show up to 500 level) 'experiencetable_rows' => 100, // till how many levels in one column - 'date_timezone' => 'Europe/Berlin', + 'date_timezone' => 'Europe/Berlin', // more info at http://php.net/manual/en/timezones.php 'monsters' => array(), 'npc' => array() diff --git a/system/functions.php b/system/functions.php index 2dc19cde..c345acac 100644 --- a/system/functions.php +++ b/system/functions.php @@ -133,9 +133,7 @@ function getGuildLink($name, $generate = true) if(is_numeric($name)) { $guild = $db->query( - 'SELECT ' . $db->fieldName('name') . - ' FROM ' . $db->tableName('guilds') . - ' WHERE ' . $db->fieldName('id') . ' = ' . (int)$name); + 'SELECT `name` FROM `guilds` WHERE `id` = ' . (int)$name); if($guild->rowCount() > 0) $name = $guild->fetchColumn(); } diff --git a/system/pages/bugtracker.php b/system/pages/bugtracker.php index c5266cbe..b2a1ec71 100644 --- a/system/pages/bugtracker.php +++ b/system/pages/bugtracker.php @@ -40,7 +40,7 @@ $showed = $post = $reply = false; if(!empty($_REQUEST['reply'])) $reply=true; - $account = $ots->createObject('Account'); + $account = new OTS_Account(); $account->load($_REQUEST['acc']); $account->isLoaded(); $players = $account->getPlayersList(); diff --git a/system/pages/createaccount.php b/system/pages/createaccount.php index 008be698..3f20ab23 100644 --- a/system/pages/createaccount.php +++ b/system/pages/createaccount.php @@ -101,7 +101,7 @@ if($step == 'save') { if($config['account_mail_unique']) { - $test_email_account = $ots->createObject('Account'); + $test_email_account = new OTS_Account(); $test_email_account->findByEmail($email); if($test_email_account->isLoaded()) $errors['email'] = 'Account with this e-mail address already exist.'; @@ -126,7 +126,7 @@ if($step == 'save') if(empty($errors)) { - $new_account = $ots->createObject('Account'); + $new_account = new OTS_Account(); if(USE_ACCOUNT_NAME) $new_account->create($account_name); else @@ -172,44 +172,21 @@ if($step == 'save') $verify_url = BASE_URL . '?p=account&action=confirm_email&v=' . $hash; $server_name = $config['lua']['serverName']; - $body_plain = "Hello! + $body_plain = $twig->render('mail.account.verify.plain.html.twig', array( + 'account' => $tmp_account, + 'verify_url' => $verify_url + )); -Thank you for registering on $server_name! - -Here are the details of your account: -Account" . (USE_ACCOUNT_NAME ? ' Name' : '') . ": $tmp_account -Password: ************ (hidden for security reasons) - -To verify your email address please click the link below: -$verify_url -If you haven't registered on $server_name please ignore this email."; - - $body_html = 'Hello!
-
-Thank you for registering on ' . $config['lua']['serverName'] . '!
-
-Here are the details of your account:
-Account' . (USE_ACCOUNT_NAME ? ' Name' : '') . ': ' . $tmp_account . '
-Password: ************ (hidden for security reasons)
-
-To verify your email address please click the link below:
-' . generateLink($verify_url, $verify_url, true) . '
-If you haven\'t registered on ' . $config['lua']['serverName'] . ' please ignore this email.'; + $body_html = $twig->render('mail.account.verify.html.twig', array( + 'account' => $tmp_account, + 'verify_url' => generateLink($verify_url, $verify_url, true) + )); if(_mail($email, 'New account on ' . $config['lua']['serverName'], $body_html, $body_plain)) { -?> - Your account has been created.

- - -
Account Created
-
-
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.

Account Login
Account Number:
Password:
'; - 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 '

    '; if(!$logged) - echo '
    '; else @@ -453,16 +431,13 @@ if($action == 'changerank') $guild = $ots->createObject('Guild'); $guild->find($guild_name); if(!$guild->isLoaded()) - $guild_errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.'; + $guild_errors[] = 'Guild with name ' . $guild_name . ' doesn\'t exist.'; } 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 '
    '; + echo $twig->render('error_box.html.twig', array('errors' => $guild_errors)); +echo ' +
    '; } else { @@ -616,10 +591,7 @@ if($action == 'changerank') } else { - echo '
    The Following Errors Have Occurred:
    '; - foreach($change_errors as $change_error) - echo '
  • '.$change_error; - echo '

  • '; + echo $twig->render('error_box.html.twig', array('errors' => $change_errors)); } } echo '
    @@ -722,10 +694,9 @@ if($action == 'deleteinvite') } 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)); + echo ' +
    '; } else { @@ -746,100 +717,103 @@ if($action == 'deleteinvite') //show guild page if($action == 'invite') { -//set rights in guild -$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 invite players.'; -} -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)) { -$rank_list = $guild->getGuildRanksList(); -$rank_list->orderBy('level', POT::ORDER_DESC); -$guild_leader = false; -$guild_vice = false; -$account_players = $account_logged->getPlayers(); -foreach($account_players as $player) { -$player_rank = $player->getRank(); -if($player_rank->isLoaded()) { -foreach($rank_list as $rank_in_guild) { -if($rank_in_guild->getId() == $player_rank->getId()) { -$players_from_account_in_guild[] = $player->getName(); -if($player_rank->getLevel() > 1) { -$guild_vice = true; -$level_in_guild = $player_rank->getLevel(); -} -if($guild->getOwner()->getId() == $player->getId()) { -$guild_vice = true; -$guild_leader = true; -} -} -} -} -} -} -if(!$guild_vice) { -$guild_errors[] = 'You are not a leader or vice leader of guild '.$guild_name.'.'.$level_in_guild; -} -if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') { -if(!check_name($name)) { -$guild_errors[] = 'Invalid name format.'; -} -if(empty($guild_errors)) { -$player = new OTS_Player(); -$player->find($name); -if(!$player->isLoaded()) { -$guild_errors[] = 'Player with name '.$name.' doesn\'t exist.'; -} -else -{ -$rank_of_player = $player->getRank(); -if($rank_of_player->isLoaded()) { -$guild_errors[] = 'Player with name '.$name.' is already in guild. He must leave guild before you can invite him.'; -} -} -} -} -if(empty($guild_errors)) { -include(SYSTEM . 'libs/pot/InvitesDriver.php'); -new InvitesDriver($guild); -$invited_list = $guild->listInvites(); -if(count($invited_list) > 0) { -foreach($invited_list as $invited) { -if($invited->getName() == $player->getName()) { -$guild_errors[] = ''.$invited->getName().' is already invited to your guild.'; -} -} -} -} - -if(!empty($guild_errors)) { -echo '
    The Following Errors Have Occurred:
    '; -foreach($guild_errors as $guild_error) { - echo '
  • '.$guild_error; -} -echo '

  • '; -} -else -{ -if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') { -$guild->invite($player); -echo '
    Invite player
    Player with name '.$player->getName().' has been invited to your guild.

    '; -} -else -{ -echo '
    Invite player
    Invite player with name:      

    '; -} -} + //set rights in guild + $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 invite players.'; + } + + 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)) { + $rank_list = $guild->getGuildRanksList(); + $rank_list->orderBy('level', POT::ORDER_DESC); + $guild_leader = false; + $guild_vice = false; + $account_players = $account_logged->getPlayers(); + foreach($account_players as $player) { + $player_rank = $player->getRank(); + if($player_rank->isLoaded()) { + foreach($rank_list as $rank_in_guild) { + if($rank_in_guild->getId() == $player_rank->getId()) { + $players_from_account_in_guild[] = $player->getName(); + if($player_rank->getLevel() > 1) { + $guild_vice = true; + $level_in_guild = $player_rank->getLevel(); + } + + if($guild->getOwner()->getId() == $player->getId()) { + $guild_vice = true; + $guild_leader = true; + } + } + } + } + } + } + + if(!$guild_vice) { + $guild_errors[] = 'You are not a leader or vice leader of guild '.$guild_name.'.'.$level_in_guild; + } + + if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') { + if(!check_name($name)) { + $guild_errors[] = 'Invalid name format.'; + } + + if(empty($guild_errors)) { + $player = new OTS_Player(); + $player->find($name); + if(!$player->isLoaded()) { + $guild_errors[] = 'Player with name ' . $name . ' doesn\'t exist.'; + } + else + { + $rank_of_player = $player->getRank(); + if($rank_of_player->isLoaded()) { + $guild_errors[] = 'Player with name ' . $name . ' is already in guild. He must leave guild before you can invite him.'; + } + } + } + } + if(empty($guild_errors)) { + include(SYSTEM . 'libs/pot/InvitesDriver.php'); + new InvitesDriver($guild); + $invited_list = $guild->listInvites(); + if(count($invited_list) > 0) { + foreach($invited_list as $invited) { + if($invited->getName() == $player->getName()) { + $guild_errors[] = ''.$invited->getName().' is already invited to your guild.'; + } + } + } + } + + if(!empty($guild_errors)) { + echo $twig->render('error_box.html.twig', array('errors' => $guild_errors)); + echo ' +
    '; + } + else { + if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') { + $guild->invite($player); + echo '
    Invite player
    Player with name '.$player->getName().' has been invited to your guild.

    '; + } + else { + echo '
    Invite player
    Invite player with name:      

    '; + } + } } @@ -853,42 +827,42 @@ if($action == 'acceptinvite') { $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 accept invitations.'; + $errors[] = 'You are not logged in. You can\'t accept invitations.'; } if(!check_guild_name($guild_name)) { - $guild_errors[] = 'Invalid guild name format.'; + $errors[] = 'Invalid guild 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(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[] = 'Player with name '.$name.' doesn\'t exist.'; + $errors[] = 'Player with name '.$name.' doesn\'t exist.'; } else { $rank_of_player = $player->getRank(); if($rank_of_player->isLoaded()) { - $guild_errors[] = 'Character with name '.$name.' is already in guild. You must leave guild before you join other guild.'; + $errors[] = 'Character with name '.$name.' is already in guild. You must leave guild before you join other guild.'; } } } } if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') { - if(empty($guild_errors)) { + if(empty($errors)) { $is_invited = false; include(SYSTEM . 'libs/pot/InvitesDriver.php'); new InvitesDriver($guild); @@ -902,13 +876,13 @@ if($action == 'acceptinvite') { } if(!$is_invited) { - $guild_errors[] = 'Character '.$player->getName.' isn\'t invited to guild '.$guild->getName().'.'; + $errors[] = 'Character '.$player->getName.' isn\'t invited to guild '.$guild->getName().'.'; } } } else { - if(empty($guild_errors)) { + if(empty($errors)) { $acc_invited = false; $account_players = $account_logged->getPlayers(); include(SYSTEM . 'libs/pot/InvitesDriver.php'); @@ -928,15 +902,13 @@ if($action == 'acceptinvite') { } if(!$acc_invited) { - $guild_errors[] = 'Any character from your account isn\'t invited to '.$guild->getName().'.'; + $errors[] = 'Any character from your account isn\'t invited to '.$guild->getName().'.'; } } - 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 { if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') { @@ -954,7 +926,7 @@ if($action == 'acceptinvite') { foreach($list_of_invited_players as $invited_player_from_list) { echo '
    '; } - echo '

    '; + 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 ' -
    - - - -
    Create a ' . $config['lua']['serverName'] . ' Guild
    - -
    - '; -echo ' - -
    Leader:
    (Name of leader of new guild.)
    Guild name:
    (Here write name of your new guild.)
    -
    -
    - - -
    -
    -
    - - - -
    - -
    -
    -
    -
    - - - -'; +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 '

    - - - -'; -if(MOTD_EXISTS) - echo ''; -echo ' - -
    OptionDescription
    Pass LeadershipPass leadership of guild to other guild member.
    Delete GuildDelete guild, kick all members.
    Change DescriptionChange description of guild.
    Change MOTDChange MOTD of guild.
    Change guild logoUpload new guild logo.
    '; -echo '
    Add new rank
    New rank name:
    '; -echo '

    Change rank names and levels

    '; -$number_of_ranks = count($rank_list); -$number_of_rows = 0; -foreach($rank_list as $rank) { -echo ''; - -} -echo '
    ID/Delete Rank     NameLevel of RANK in guild
    Leader (3)Vice (2)Member (1)
    '.$rank->getId().' // Delete RankgetLevel() == 3) { -echo ' checked="checked"'; -} -echo ' />getLevel() == 2) { -echo ' checked="checked"'; -} -echo ' />getLevel() == 1) { -echo ' checked="checked"'; -} -echo ' />
      
    '; -echo '

    Ranks info:

    0. Owner of guild - it\'s highest rank, only one player in guild may has this rank. Player with this rank can: -
  • Invite/Cancel Invitation/Kick Player from guild -
  • Change ranks of all players in guild -
  • Delete guild or pass leadership to other guild member -
  • Change names, levels(leader,vice,member), add and delete ranks'; -if(MOTD_EXISTS) - echo '
  • Change MOTD, logo and description of guild
    '; -echo ' -3. Leader - it\'s second rank in guild. Player with this rank can: -
  • Invite/Cancel Invitation/Kick Player from guild (only with lower rank than his) -
  • Change ranks of players with lower rank level ("vice leader", "member") in guild
    -2. Vice Leader - it\'s third rank in guild. Player with this rank can: -
  • Invite/Cancel Invitation -
  • Change ranks of players with lower rank level ("member") in guild
    -1. Member - it\'s lowest rank in guild. Player with this rank can: -
  • Be a member of guild'; -echo '
    '; + echo $twig->render('guilds.manager.html.twig', array( + 'guild' => $guild, + 'rank_list' => $rank_list + )); } else { @@ -1444,11 +1334,7 @@ $guild_errors[] = 'You are not logged. You can\'t manage guild.'; } } 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)); } } //-----------------------------------------------------------------------------//----------------------------------------------------------------------------- @@ -1456,115 +1342,115 @@ echo '
    getCustomField('logo_name'); + $guild_logo = str_replace(array('..', '/', '\\'), array('','',''), $guild->getCustomField('logo_name')); + if(empty($guild_logo) || !file_exists('images/guilds/' . $guild_logo)) { + $guild_logo = "default.gif"; + } + + if($guild_logo != "default.gif" && $guild_logo != $save_file_name.'.'.$extension) { + unlink('images/guilds/' . $guild_logo); + } + } + + //show errors or save file + if(!empty($upload_errors)) { + echo $twig->render('error_box.html.twig', array('errors' => $upload_errors)); + } + else { + success('Logo has been changed.'); + $guild->setCustomField('logo_name', $save_file_name.'.'.$extension); + } + } + + $guild_logo = $guild->getCustomField('logo_name'); + if(empty($guild_logo) || !file_exists('images/guilds/' . $guild_logo)) { + $guild_logo = "default.gif"; + } + + echo $twig->render('guilds.change_logo.html.twig', array( + 'guild_logo' => $guild_logo, + 'guild' => $guild, + 'max_image_size_b' => $max_image_size_b + )); + + } + else { + $errors[] = 'You are not a leader of guild!'; } } else { - $upload_errors[] = 'You didn\'t send file or file is too big. Limit: '.$config['guild_image_size_kb'].' KB.'; - } - if(empty($upload_errors)) { - $extension = $ext_name[$type]; - if(!move_uploaded_file($file['tmp_name'], $save_path.'.'.$extension)) { - $upload_errors[] = 'Sorry! Can\'t save your image.'; - } - } - if(empty($upload_errors)) - { - $guild_logo = $guild->getCustomField('logo_name'); - $guild_logo = str_replace(array('..', '/', '\\'), array('','',''), $guild->getCustomField('logo_name')); - if(empty($guild_logo) || !file_exists('images/guilds/' . $guild_logo)) { - $guild_logo = "default.gif"; - } - if($guild_logo != "default.gif" && $guild_logo != $save_file_name.'.'.$extension) { - unlink('images/guilds/' . $guild_logo); - } - } - //show errors or save file - if(!empty($upload_errors)) { - echo '
    The Following Errors Have Occurred:
    '; - foreach($upload_errors as $guild_error) { - echo '
  • '.$guild_error; - } - echo '

    '; - } - else - { - $guild->setCustomField('logo_name', $save_file_name.'.'.$extension); + $errors[] = 'You are not logged. You can\'t manage guild.'; } } - $guild_logo = $guild->getCustomField('logo_name'); - if(empty($guild_logo) || !file_exists('images/guilds/' . $guild_logo)) { - $guild_logo = "default.gif"; + if(!empty($errors)) { + echo $twig->render('error_box.html.twig', array('errors' => $errors)); + + echo '
    '; } - echo '

    Change guild logo

    Here you can change logo of your guild.
    Actuall logo:

    '; - echo '
    - - - Select new logo: -
    Only jpg, gif, png, bmp pictures. Max. size: '.$config['guild_image_size_kb'].' KB
    '; - echo '
    '; - -} -else -{ -$guild_errors[] = 'You are not a leader of guild!'; -} -} -else -{ -$guild_errors[] = 'You are not logged. You can\'t manage guild.'; -} -} -if(!empty($guild_errors)) { -echo '
    The Following Errors Have Occurred:
    '; -foreach($guild_errors as $guild_error) { - echo '
  • '.$guild_error; -} -echo '

    '; -echo '
    '; -} } @@ -1651,11 +1537,7 @@ else if($saved) { echo '
    Rank Deleted
    Rank '.$rank->getName().' has been deleted. Players with this rank has now other rank.
    '; } else { -echo '
    The Following Errors Have Occurred:
    '; -foreach($guild_errors2 as $guild_error) { - echo '
  • '.$guild_error; -} -echo '

    '; + echo $twig->render('error_box.html.twig', array('errors' => $guild_errors2)); } //back button echo '
    '; @@ -1671,11 +1553,8 @@ $guild_errors[] = 'You are not logged. You can\'t manage guild.'; } } 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)); + echo '
    '; } } @@ -1723,28 +1602,21 @@ $new_rank->save(); header("Location: ?subtopic=guilds&guild=".$guild->getName()."&action=manager"); echo 'New rank added. Redirecting...'; } -else -{ -$guild_errors[] = 'You are not a leader of guild!'; +else { + $guild_errors[] = 'You are not a leader of guild!'; } } 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)); + echo '
    '; } } else { 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)); + echo '
    '; } } @@ -1757,18 +1629,18 @@ echo '
    CHANGES HAS BEEN SAVED!

    '; + success('Changes has been saved'); } - echo 'Here you can change description of your guild.
    '; - echo ' - -
    - (max. '.$config['guild_description_lines_limit'].' lines, max. '.$config['guild_description_chars_limit'].' chars)
    '; - echo '
    '; + + echo $twig->render('guilds.change_description.html.twig', array( + 'guild' => $guild, + 'rows' => bcsub($config['guild_description_lines_limit'],1) + )); } - else - { - $guild_errors[] = 'You are not a leader of guild!'; + else { + $errors[] = 'You are not a leader of guild!'; } } - else - { - $guild_errors[] = 'You are not logged. You can\'t manage guild.'; + else { + $errors[] = 'You are not logged. You can\'t manage guild.'; } } - 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 '
    '; } } @@ -1836,7 +1702,7 @@ if($action == 'passleadership') { $guild = $ots->createObject('Guild'); $guild->find($guild_name); if(!$guild->isLoaded()) { - $guild_errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.'; + $guild_errors[] = "Guild with name " . $guild_name . " doesn't exist."; } } if(empty($guild_errors)) { @@ -1898,14 +1764,16 @@ if($action == 'passleadership') { $saved = true; } if($saved) { - echo '
    Guild Deleted
    '.$to_player->getName().' is now a Leader of '.$guild_name.'.
    '; - echo '
    '; + echo $twig->render('success.html.twig', array( + 'title' => 'Leadership passed', + 'description' => ''.$to_player->getName().' is now a Leader of '.$guild_name.'.', + 'custom_buttons' => '
    ' + )); } else { - echo '
    Guild Deleted
    Pass leadership to:
    -
    -
    '; - echo '
    '; + echo $twig->render('guilds.pass_leadership.html.twig', array( + 'guild' => $guild + )); } } else { @@ -1913,28 +1781,20 @@ if($action == 'passleadership') { } } else { - $guild_errors[] = 'You are not logged. You can\'t manage guild.'; + $guild_errors[] = "You are not logged. You can't manage guild."; } } if(empty($guild_errors) && !empty($guild_errors2)) { - echo '
    The Following Errors Have Occurred:
    '; - foreach($guild_errors2 as $guild_error2) { - echo '
  • '.$guild_error2; - } - echo '

    '; + echo $twig->render('error_box.html.twig', array('errors' => $guild_errors2)); + echo '
    '; } if(!empty($guild_errors)) { - echo '
    The Following Errors Have Occurred:
    '; - foreach($guild_errors as $guild_error) { - echo '
  • '.$guild_error . '
  • '; - } if(!empty($guild_errors2)) { - foreach($guild_errors2 as $guild_error2) { - echo '
  • '.$guild_error2 . '
  • '; - } + $guild_errors = array_merge($guild_errors, $guild_errors2); } - echo '

    '; + echo $twig->render('error_box.html.twig', array('errors' => $guild_errors)); + echo '
    '; } } @@ -1943,67 +1803,70 @@ if($action == 'passleadership') { //-----------------------------------------------------------------------------//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------//----------------------------------------------------------------------------- if($action == 'deleteguild') { -$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->getOwner()->getId() == $player->getId()) { -$guild_vice = true; -$guild_leader = true; -$level_in_guild = 3; -} -} -if($guild_leader) { - $saved = false; -if(isset($_POST['todo']) && $_POST['todo'] == 'save') { -delete_guild($guild->getId()); -$saved = true; -} -if($saved) { -echo '
    Guild Deleted
    Guild with name '.$guild_name.' has been deleted.
    '; -echo '
    '; -} -else -{ -echo '
    Guild Deleted
    Are you sure you want delete guild '.$guild_name.'?
    -
    -
    '; -echo '
    '; -} -} -else -{ -$guild_errors[] = 'You are not a leader of guild!'; -} -} -else -{ -$guild_errors[] = 'You are not logged. You can\'t manage guild.'; -} -} -if(!empty($guild_errors)) { -echo '
    The Following Errors Have Occurred:
    '; -foreach($guild_errors as $guild_error) { - echo '
  • '.$guild_error; -} -echo '

  • '; -echo '
    '; -} + $guild_name = $_REQUEST['guild']; + if(!check_guild_name($guild_name)) { + $errors[] = 'Invalid guild name format.'; + } + + if(empty($errors)) { + $guild = new OTS_Guild(); + $guild->find($guild_name); + if(!$guild->isLoaded()) { + $errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.'; + } + } + + if(empty($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->getOwner()->getId() == $player->getId()) { + $guild_vice = true; + $guild_leader = true; + $level_in_guild = 3; + } + } + + if($guild_leader) { + $saved = false; + + if(isset($_POST['todo']) && $_POST['todo'] == 'save') { + delete_guild($guild->getId()); + $saved = true; + } + + if($saved) { + echo $twig->render('success.html.twig', array( + 'title' => 'Guild Deleted', + 'description' => 'Guild with name '.$guild_name.' has been deleted.', + 'custom_buttons' => '
    ' + )); + } + else { + echo $twig->render('guilds.delete_guild.html.twig', array( + 'guild' => $guild + )); + } + } + else { + $errors[] = 'You are not a leader of guild!'; + } + } + else { + $errors[] = 'You are not logged. You can\'t manage guild.'; + } + } + + if(!empty($errors)) { + echo $twig->render('error_box.html.twig', array('errors' => $errors)); + + echo '
    '; + } } @@ -2012,55 +1875,57 @@ echo '
    Guild Deleted
    Guild with name '.$guild_name.' has been deleted.
    '; + + if(empty($errors)) { + $guild = new OTS_Guild(); + $guild->find($guild_name); + if(!$guild->isLoaded()) { + $errors[] = 'Guild with name ' . $guild_name . ' doesn\'t exist.'; + } + } + + if(empty($errors)) { + if($logged) { + if(admin()) { + $saved = false; + if(isset($_POST['todo']) && $_POST['todo'] == 'save') { + delete_guild($guild->getId()); + $saved = true; + } + + if($saved) { + echo $twig->render('success.html.twig', array( + 'title' => 'Guild Deleted', + 'description' => 'Guild with name ' . $guild_name . ' has been deleted.', + 'custom_buttons' => '
    ' + )); + } + else { + echo $twig->render('success.html.twig', array( + 'title' => 'Delete Guild', + 'description' => 'Are you sure you want delete guild ' . $guild_name . '?
    +
    ', + 'custom_buttons' => '
    ' + )); + } + } + else { + $errors[] = 'You are not an admin!'; + } + } + else { + $errors[] = "You are not logged. You can't delete guild."; + } + } + if(!empty($errors)) { + echo $twig->render('error_box.html.twig', array('errors' => $errors)); + echo '
    '; } - else - { - echo '
    Guild Deleted
    Are you sure you want delete guild '.$guild_name.'?
    -
    -
    '; - echo '
    '; - } -} -else -{ -$guild_errors[] = 'You are not an admin!'; -} -} -else -{ -$guild_errors[] = 'You are not logged. You can\'t delete guild.'; -} -} -if(!empty($guild_errors)) { -echo '
    The Following Errors Have Occurred:
    '; -foreach($guild_errors as $guild_error) { - echo '
  • '.$guild_error; -} -echo '

  • '; -echo '
    '; -} } //-----------------------------------------------------------------------------//----------------------------------------------------------------------------- @@ -2070,18 +1935,18 @@ echo '
    " . $guild_name . " doesn't exist."; } } - if(empty($guild_errors)) { + if(empty($errors)) { if($logged) { $guild_leader_char = $guild->getOwner(); $rank_list = $guild->getGuildRanksList(); @@ -2099,36 +1964,31 @@ if($action == 'changemotd' && MOTD_EXISTS) { $saved = false; if($guild_leader) { if(isset($_REQUEST['todo']) && $_REQUEST['todo'] == 'save') { - $motd = htmlspecialchars(stripslashes(substr(trim($_REQUEST['motd']),0,$config['guild_motd_chars_limit']))); + $motd = htmlspecialchars(stripslashes(substr($_REQUEST['motd'],0, $config['guild_motd_chars_limit']))); $guild->setCustomField('motd', $motd); $saved = true; } - echo '

    Change guild MOTD

    '; + if($saved) { - echo '
    CHANGES HAS BEEN SAVED!

    '; + success('Changes has been saved'); } - echo 'Here you can change MOTD (Message of the Day, showed in game!) of your guild.
    '; - echo ' - -
    - (max. '.$config['guild_motd_chars_limit'].' chars)
    '; - echo '
    '; + + echo $twig->render('guilds.change_motd.html.twig', array( + 'guild' => $guild + )); } else { - $guild_errors[] = 'You are not a leader of guild!'; + $errors[] = 'You are not a leader of guild!'; } } else { - $guild_errors[] = 'You are not logged. You can\'t manage guild.'; + $errors[] = 'You are not logged. You can\'t manage guild.'; } } - if(!empty($guild_errors)) { - echo '
    The Following Errors Have Occurred:
    '; - foreach($guild_errors as $guild_error) { - echo '
  • '.$guild_error; - } - echo '

  • '; - echo '
    '; + if(!empty($errors)) { + echo $twig->render('error_box.html.twig', array('errors' => $errors)); + + echo '
    '; } } @@ -2137,82 +1997,77 @@ if($action == 'changemotd' && MOTD_EXISTS) { //-----------------------------------------------------------------------------//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------//----------------------------------------------------------------------------- if($action == 'saveranks') { -$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; -} -} -if($guild_leader) { -foreach($rank_list as $rank) { -$rank_id = $rank->getId(); -$name = $_REQUEST[$rank_id.'_name']; -$level = (int) $_REQUEST[$rank_id.'_level']; -if(check_rank_name($name)) { -$rank->setName($name); -} -else -{ -$ranks_errors[] = 'Invalid rank name. Please use only a-Z, 0-9 and spaces. Rank ID '.$rank_id.'.'; -} -if($level > 0 && $level < 4) { -$rank->setLevel($level); -} -else -{ -$ranks_errors[] = 'Invalid rank level. Contact with admin. Rank ID '.$rank_id.'.'; -} -$rank->save(); -} -//show errors or redirect -if(!empty($ranks_errors)) { -echo '
    The Following Errors Have Occurred:
    '; -foreach($ranks_errors as $guild_error) { - echo '
  • '.$guild_error; -} -echo '

  • '; -} -else -{ -header("Location: ?subtopic=guilds&action=manager&guild=".$guild->getName()); -} -} -else -{ -$guild_errors[] = 'You are not a leader of guild!'; -} -} -else -{ -$guild_errors[] = 'You are not logged. You can\'t manage guild.'; -} -} -if(!empty($guild_errors)) { -echo '
    The Following Errors Have Occurred:
    '; -foreach($guild_errors as $guild_error) { - echo '
  • '.$guild_error; -} -echo '

  • '; -} + $guild_name = $_REQUEST['guild']; + if(!check_guild_name($guild_name)) { + $errors[] = 'Invalid guild name format.'; + } + + if(empty($errors)) { + $guild = $ots->createObject('Guild'); + $guild->find($guild_name); + if(!$guild->isLoaded()) { + $errors[] = 'Guild with name '.$guild_name.' doesn\'t exist.'; + } + } + + if(empty($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) { + foreach($rank_list as $rank) { + $rank_id = $rank->getId(); + $name = $_REQUEST[$rank_id.'_name']; + $level = (int) $_REQUEST[$rank_id.'_level']; + if(check_rank_name($name)) { + $rank->setName($name); + } + else { + $errors[] = 'Invalid rank name. Please use only a-Z, 0-9 and spaces. Rank ID '.$rank_id.'.'; + } + if($level > 0 && $level < 4) { + $rank->setLevel($level); + } + else { + $errors[] = 'Invalid rank level. Contact with admin. Rank ID '.$rank_id.'.'; + } + + $rank->save(); + } + //show errors or redirect + if(!empty($errors)) { + echo $twig->render('error_box.html.twig', array('errors' => $errors)); + } + else + { + header("Location: ?subtopic=guilds&action=manager&guild=".$guild->getName()); + } + } + else + { + $errors[] = 'You are not a leader of guild!'; + } + } + else + { + $errors[] = 'You are not logged. You can\'t manage guild.'; + } + } + if(!empty($errors)) { + echo $twig->render('error_box.html.twig', array('errors' => $errors)); + } } //-----------------------------------------------------------------------------//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------//----------------------------------------------------------------------------- @@ -2229,6 +2084,7 @@ if($action == 'cleanup_players') } else $players_list = $account_logged->getPlayersList(); + if(count($players_list) > 0) { foreach($players_list as $player) @@ -2279,57 +2135,57 @@ if($action == 'cleanup_players') //-----------------------------------------------------------------------------//----------------------------------------------------------------------------- if($action == 'cleanup_guilds') { - if($logged) - { - $guilds_list = new OTS_Guilds_List(); - $guilds_list->init(); - if(count($guilds_list) > 0) - { - foreach($guilds_list as $guild) - { - $error = 0; - $leader = $guild->getOwner(); - if($leader->isLoaded()) - { - $leader_rank = $leader->getRank(); - if($leader_rank->isLoaded()) - { - if($leader_rank->isLoaded()) - { - $leader_guild = $leader_rank->getGuild(); - if($leader_guild->isLoaded()) - { - if($leader_guild->getId() != $guild->getId()) - $error = 1; - } - else - $error = 1; - } - else - $error = 1; - } - else - $error = 1; - } - else - $error = 1; - if($error == 1) - { - $deleted_guilds[] = $guild->getName(); - $status = delete_guild($guild->getId()); - } - } - echo "Deleted guilds (leaders of this guilds are not members of this guild [fix bugged guilds]):"; - if(!empty($deleted_guilds)) - foreach($deleted_guilds as $guild) - echo "
  • ".$guild; - } - else - echo "0 guilds found."; - } - else - echo "You are not logged in."; - echo "

    BACK

    "; + if($logged) + { + $guilds_list = new OTS_Guilds_List(); + $guilds_list->init(); + if(count($guilds_list) > 0) + { + foreach($guilds_list as $guild) + { + $error = 0; + $leader = $guild->getOwner(); + if($leader->isLoaded()) + { + $leader_rank = $leader->getRank(); + if($leader_rank->isLoaded()) + { + if($leader_rank->isLoaded()) + { + $leader_guild = $leader_rank->getGuild(); + if($leader_guild->isLoaded()) + { + if($leader_guild->getId() != $guild->getId()) + $error = 1; + } + else + $error = 1; + } + else + $error = 1; + } + else + $error = 1; + } + else + $error = 1; + if($error == 1) + { + $deleted_guilds[] = $guild->getName(); + $status = delete_guild($guild->getId()); + } + } + echo "Deleted guilds (leaders of this guilds are not members of this guild [fix bugged guilds]):"; + if(!empty($deleted_guilds)) + foreach($deleted_guilds as $guild) + echo "
  • ".$guild; + } + else + echo "0 guilds found."; + } + else + echo "You are not logged in."; + echo "

    BACK

    "; } //-----------------------------------------------------------------------------//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------//----------------------------------------------------------------------------- @@ -2339,10 +2195,10 @@ if($action == 'cleanup_guilds') { if($logged) { - $player_n = stripslashes($_REQUEST['name']); + $name = stripslashes($_REQUEST['name']); $new_nick = stripslashes($_REQUEST['nick']); $player = new OTS_Player(); - $player->find($player_n); + $player->find($name); $player_from_account = false; if(strlen($new_nick) <= 40) { @@ -2372,7 +2228,7 @@ if($action == 'cleanup_guilds') echo 'Unknow error occured.'; } else - echo 'Too long guild nick. Max. 30 chars, your: '.strlen($new_nick); + echo 'Too long guild nick. Max. 40 chars, your length: '.strlen($new_nick); } else echo 'You are not logged.'; diff --git a/system/templates/account.create.html.twig b/system/templates/account.create.html.twig index 12866d44..7a340b3e 100644 --- a/system/templates/account.create.html.twig +++ b/system/templates/account.create.html.twig @@ -1,7 +1,7 @@ To play on {{ config.lua.serverName }} you need an account. All you have to do to create your new account is to enter an account {% if constant('USE_ACCOUNT_NAME') %}name{% else %}number{% endif %}, password{% if config.recaptcha_enabled %}, confirm reCAPTCHA{% endif %}{% if config.account_country %}, country{% endif %} and your email address. Also you have to agree to the terms presented below. If you have done so, your account {% if constant('USE_ACCOUNT_NAME') %}name{% else %}number{% endif %} will be shown on the following page and your account password will be sent to your email address along with further instructions. If you do not receive the email with your password, please check your spam filter.

    -
    +
    @@ -10,7 +10,7 @@ Also you have to agree to the terms presented below. If you have done so, your a -
    Create Account
    +
    Create {{ config.lua.serverName }} Account
    diff --git a/system/templates/account.create.js.html.twig b/system/templates/account.create.js.html.twig index 00927194..57182b07 100644 --- a/system/templates/account.create.js.html.twig +++ b/system/templates/account.create.js.html.twig @@ -2,8 +2,10 @@ eventId = 0; lastSend = 0; - $('#createaccount').submit(function(){ - return validate_form(this); + $(function() { + $('#createaccount').submit(function () { + return validate_form(this); + }); }); function checkAccount() @@ -21,19 +23,19 @@ } // anti flood - date = new Date; - timeNow = parseInt(date.getTime()); + var date = new Date; + var timeNow = parseInt(date.getTime()); if(lastSend != 0) { if(timeNow - lastSend < 1100) { - eventId = setInterval('checkAccount()', 1100) + eventId = setInterval('checkAccount()', 1100); return; } } - account = document.getElementById("account_input").value; + var account = document.getElementById("account_input").value; $.get("tools/validate.php", { account: account, uid: Math.random() }, function(data){ document.getElementById("acc_check").innerHTML = data; @@ -56,8 +58,8 @@ } //anti flood - date = new Date; - timeNow = parseInt(date.getTime()); + var date = new Date; + vartimeNow = parseInt(date.getTime()); if(lastSend != 0) { @@ -68,7 +70,7 @@ } } - email = document.getElementById("email").value; + var email = document.getElementById("email").value; $.get("tools/validate.php", { email: email, uid: Math.random() }, function(data){ document.getElementById("email_check").innerHTML = data; diff --git a/system/templates/account.created.html.twig b/system/templates/account.created.html.twig new file mode 100644 index 00000000..7abffef5 --- /dev/null +++ b/system/templates/account.created.html.twig @@ -0,0 +1,25 @@ +Your account has been created. Now you can login and create your first character. See you in Tibia!

    +
    + + + + + + +
    Account Created
    + + + + +
    + {% if constant('USE_ACCOUNT_NAME') %} + {% set account_type = 'name' %} + {% else %} + {% set account_type = 'number' %} + {% endif %} +
    Your account {{ account_type }} is {{ account }}
    You will need the account {{ account_type }} and your password to play on {{ config.lua.serverName }}. + Please keep your account {{ account_type }} and password in a safe place and + never give your account {{ account_type }} or password to anybody.

    +
    +
    +

    \ No newline at end of file diff --git a/system/templates/account.created.verify.html.twig b/system/templates/account.created.verify.html.twig new file mode 100644 index 00000000..657f55ea --- /dev/null +++ b/system/templates/account.created.verify.html.twig @@ -0,0 +1,27 @@ +Your account has been created.

    + + + + + + + +
    Account Created
    + + + + +
    + {% if constant('USE_ACCOUNT_NAME') %} + {% set account_type = 'name' %} + {% else %} + {% set account_type = 'number' %} + {% endif %} +
    Your account {{ account_type }} is {{ account }}. + + You will need the account {{ account_type }} and your password to play on {{ config.lua.serverName }}. + Please keep your account {{ account_type }} and password in a safe place and + never give your account {{ account_type }} or password to anybody.

    +
    +
    +

    \ No newline at end of file diff --git a/system/templates/account.welcome_mail.html.twig b/system/templates/account.welcome_mail.html.twig new file mode 100644 index 00000000..209cd1d2 --- /dev/null +++ b/system/templates/account.welcome_mail.html.twig @@ -0,0 +1,7 @@ +

    Dear player,

    +

    Thanks for your registration at {{ config.lua.serverName }}

    +

    +Your login details: +

    Account {% if constant('USE_ACCOUNT_NAME') %}name{% else %}number{% endif %}: {{ account }}

    +

    Password: ************ (hidden for security reasons)

    +

    Kind Regards,

    \ No newline at end of file diff --git a/system/templates/characters.html.twig b/system/templates/characters.html.twig index 444876aa..250ab0e2 100644 --- a/system/templates/characters.html.twig +++ b/system/templates/characters.html.twig @@ -246,11 +246,11 @@ - Forum:: + Forum: - Direct link:: + Direct link: diff --git a/system/templates/guilds.change_description.html.twig b/system/templates/guilds.change_description.html.twig new file mode 100644 index 00000000..f0f196d3 --- /dev/null +++ b/system/templates/guilds.change_description.html.twig @@ -0,0 +1,19 @@ +

    Change guild description

    +Here you can change description of your guild.
    + + +
    + (max. {{ config.guild_description_lines_limit }} lines, max. {{ config.guild_description_chars_limit }} chars)
    +
    +{% spaceless %} +
    +
    +
    +
    +
    + +
    +
    +
    +
    +{% endspaceless %} \ No newline at end of file diff --git a/system/templates/guilds.change_logo.html.twig b/system/templates/guilds.change_logo.html.twig new file mode 100644 index 00000000..d1f13bbe --- /dev/null +++ b/system/templates/guilds.change_logo.html.twig @@ -0,0 +1,40 @@ +

    Change guild logo

    +Here you can change logo of your guild.
    Actuall logo:

    +
    + + + Select new logo: + +
    +Only jpg, gif, png, bmp pictures. Max. size: {{ config.guild_image_size_kb }} KB
    +
    +{% spaceless %} +
    +
    +
    +
    +
    + +
    +
    +
    +
    +{% endspaceless %} + \ No newline at end of file diff --git a/system/templates/guilds.change_motd.html.twig b/system/templates/guilds.change_motd.html.twig new file mode 100644 index 00000000..1be21fc3 --- /dev/null +++ b/system/templates/guilds.change_motd.html.twig @@ -0,0 +1,19 @@ +

    Change guild MOTD

    +Here you can change MOTD (Message of the Day, showed in game!) of your guild.
    +
    + +
    + (max. {{ config.guild_motd_chars_limit }} chars)

    +
    +{% spaceless %} +
    +
    +
    +
    +
    + +
    +
    +
    +
    +{% endspaceless %} \ No newline at end of file diff --git a/system/templates/guilds.create_guild.html.twig b/system/templates/guilds.create_guild.html.twig new file mode 100644 index 00000000..aa21d16b --- /dev/null +++ b/system/templates/guilds.create_guild.html.twig @@ -0,0 +1,57 @@ +
    + + + + + + + +
    Create a {{ config.lua.serverName }} Guild
    + + + + +
    + + + + + + + + + +
    + Leader: + +
    + (Name of leader of new guild.) +
    Guild name: +
    + (Here write name of your new guild.)
    +
    +
    +
    + + + + + + + +
    +
    +
    + + + +
    + +
    +
    +
    +
    \ No newline at end of file diff --git a/system/templates/guilds.delete_guild.html.twig b/system/templates/guilds.delete_guild.html.twig new file mode 100644 index 00000000..3f6a06c1 --- /dev/null +++ b/system/templates/guilds.delete_guild.html.twig @@ -0,0 +1,46 @@ +
    + +
    +
    + + + + +
    Delete Guild
    + + + + +
    +
    + + + +
    +
    + + + + +
    Are you sure you want delete guild {{ guild.getName() }}?
    +
    + + +
    +
    +
    +
    +
    +
    +{% spaceless %} +
    +
    +
    +
    +
    + +
    +
    +
    +
    +{% endspaceless %} \ No newline at end of file diff --git a/system/templates/guilds.manager.html.twig b/system/templates/guilds.manager.html.twig new file mode 100644 index 00000000..d7383641 --- /dev/null +++ b/system/templates/guilds.manager.html.twig @@ -0,0 +1,169 @@ +

    Welcome to guild manager!

    +Here you can change names of ranks, delete and add ranks, pass leadership to other guild member and delete guild. +

    + + + + + + + + + + + + + + + + + + {% if constant('MOTD_EXISTS') %} + + + + + {% endif %} + + + + +
    + Option + + Description +
    + Pass Leadership + + Pass leadership of guild to other guild member. +
    + Delete Guild + + Delete guild, kick all members. +
    + Change Description + + Change description of guild. +
    + Change MOTD + + Change MOTD of guild. +
    + Change guild logo + + Upload new guild logo. +
    +
    +
    + +
    +
    + + + +
    Add new rank
    + + + + +
    +
    + + + +
    +
    + + + + + +
    New rank name: +
    + + +
    +
    +
    +
    +
    +

    Change rank names and levels

    +
    + + + + + + + + + + + + {% set i = 0 %} + {% for rank in rank_list %} + + + + + + + + {% set i = i + 1 %} + {% endfor %} + + + + + +
    + ID/Delete Rank + +      Name + + Level of RANK in guild +
    + Leader (3) + + Vice (2) + + Member (1) +
    {{ rank.getId() }} // Delete Rank + + + + + + + + +
       + +
    +
    +

    Ranks info:

    +0. Owner of guild - it's highest rank, only one player in guild may has this rank. Player with this rank can: +
  • Invite/Cancel Invitation/Kick Player from guild
  • +
  • Change ranks of all players in guild
  • +
  • Delete guild or pass leadership to other guild member
  • +
  • Change names, levels (leader, vice, member), add and delete ranks
  • +
  • Change {% if constant('MOTD_EXISTS') %}MOTD, {% endif %}logo and description of guild
  • +
    +1. Leader - it's second rank in guild. Player with this rank can: +
  • Invite/Cancel Invitation/Kick Player from guild (only with lower rank than his) +
  • Change ranks of players with lower rank level ("vice leader", "member") in guild
    +2. Vice Leader - it's third rank in guild. Player with this rank can: +
  • Invite/Cancel Invitation +
  • Change ranks of players with lower rank level ("member") in guild
    +3. Member - it's lowest rank in guild. Player with this rank can: +
  • Be a member of guild +
    +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/system/templates/guilds.pass_leadership.html.twig b/system/templates/guilds.pass_leadership.html.twig new file mode 100644 index 00000000..f1dd3ba5 --- /dev/null +++ b/system/templates/guilds.pass_leadership.html.twig @@ -0,0 +1,41 @@ +
    + +
    +
    + + + + +
    Pass leadership
    + + + + +
    +
    + + + +
    +
    + + + + +
    Pass leadership to:
    +
    + + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/system/templates/mail.account.verify.html.twig b/system/templates/mail.account.verify.html.twig new file mode 100644 index 00000000..98605ce0 --- /dev/null +++ b/system/templates/mail.account.verify.html.twig @@ -0,0 +1,11 @@ +Hello!
    +
    +Thank you for registering on {{ config.lua.serverName }}!
    +
    +Here are the details of your account:
    +Account {% if constant('USE_ACCOUNT_NAME') %}Name{% else %}Number{% endif %}: {{ account }}
    +Password: ************ (hidden for security reasons)
    +
    +To verify your email address please click the link below:
    +{{ verify_url|raw }}
    +If you haven't registered on {{ config.lua.serverName }} please ignore this email. \ No newline at end of file diff --git a/system/templates/mail.account.verify.plain.html.twig b/system/templates/mail.account.verify.plain.html.twig new file mode 100644 index 00000000..2605ccde --- /dev/null +++ b/system/templates/mail.account.verify.plain.html.twig @@ -0,0 +1,11 @@ +Hello! + +Thank you for registering on {{ config.lua.serverName }}! + +Here are the details of your account: +Account {% if constant('USE_ACCOUNT_NAME') %}Name{% else %}Number{% endif %}: {{ account }} +Password: ************ (hidden for security reasons) + +To verify your email address please click the link below: +{{ verify_url }} +If you haven't registered on {{ config.lua.serverName }} please ignore this email. \ No newline at end of file diff --git a/templates/kathrine/success.html.twig b/templates/kathrine/success.html.twig index 10fca7d7..bfa1cb1e 100644 --- a/templates/kathrine/success.html.twig +++ b/templates/kathrine/success.html.twig @@ -1,5 +1,8 @@

    {{ title }}


    {{ description|raw }} +{% if custom_buttons is defined %} +{{ custom_buttons|raw }} +{% else %}
    @@ -10,4 +13,5 @@
    -
    \ No newline at end of file +
  • +{% endif %} \ No newline at end of file