diff --git a/system/pages/accountmanagement.php b/system/pages/accountmanagement.php
index e1f121bb..0231d5b6 100644
--- a/system/pages/accountmanagement.php
+++ b/system/pages/accountmanagement.php
@@ -22,14 +22,14 @@ $config_salt_enabled = fieldExist('salt', 'accounts');
if(!$logged)
{
if($action == "logout") {
- echo $twig->render('account.logout.html');
+ echo $twig->render('account.logout.html.twig');
}
else
{
if(!empty($errors))
- echo $twig->render('error_box.html', array('errors' => $errors));
+ echo $twig->render('error_box.html.twig', array('errors' => $errors));
- echo $twig->render('account.login.html', array(
+ echo $twig->render('account.login.html.twig', array(
'redirect' => isset($_REQUEST['redirect']) ? $_REQUEST['redirect'] : null,
'account' => USE_ACCOUNT_NAME ? 'Name' : 'Number',
'error' => isset($errors[0]) ? $errors[0] : null
@@ -42,7 +42,7 @@ if(!$logged)
{
$redirect = urldecode($_REQUEST['redirect']);
- echo $twig->render('account.redirect.html', array(
+ echo $twig->render('account.redirect.html.twig', array(
'redirect' => $redirect
));
return;
@@ -116,7 +116,7 @@ if(!$logged)
);
}
- echo $twig->render('account.management.html', array(
+ echo $twig->render('account.management.html.twig', array(
'welcome_message' => $welcome_message,
'recovery_key' => $recovery_key,
'email_change' => $email_change,
@@ -141,7 +141,7 @@ if(!$logged)
$new_password2 = isset($_POST['newpassword2']) ? $_POST['newpassword2'] : NULL;
$old_password = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : NULL;
if(empty($new_password) && empty($new_password2) && empty($old_password)) {
- echo $twig->render('account.change_password.html');
+ echo $twig->render('account.change_password.html.twig');
}
else
{
@@ -170,10 +170,10 @@ if(!$logged)
}
if(!empty($show_msgs)){
//show errors
- echo $twig->render('error_box.html', array('errors' => $show_msg));
+ echo $twig->render('error_box.html.twig', array('errors' => $show_msg));
//show form
- echo $twig->render('account.change_password.html');
+ echo $twig->render('account.change_password.html.twig');
}
else
{
@@ -194,7 +194,7 @@ if(!$logged)
$message = '';
if($config['mail_enabled'] && $config['send_mail_when_change_password'])
{
- $mailBody = $twig->render('mail.password_changed.html', array(
+ $mailBody = $twig->render('mail.password_changed.html.twig', array(
'config' => $config,
'new_password' => $org_pass
));
@@ -205,7 +205,7 @@ if(!$logged)
$message = '
An error occorred while sending email with password:
' . $mailer->ErrorInfo . '
@@ -645,7 +645,7 @@ if(!$logged)
$player->save();
$account_logged->setCustomField("premium_points", $points - $config['account_change_character_name_points']);
$account_logged->logAction('Changed sex on character ' . $player->getName() . ' from ' . $old_sex_str . ' to ' . $new_sex_str . '.');
- echo $twig->render('success.html', array(
+ echo $twig->render('success.html.twig', array(
'title' => 'Character Sex Changed',
'description' => 'The character ' . $player->getName() . ' sex has been changed to ' . $new_sex_str . '.'
));
@@ -663,9 +663,9 @@ if(!$logged)
if(!$sex_changed) {
if(!empty($errors)) {
- echo $twig->render('error_box.html', array('errors' => $errors));
+ echo $twig->render('error_box.html.twig', array('errors' => $errors));
}
- echo $twig->render('account.change_sex.html', array(
+ echo $twig->render('account.change_sex.html.twig', array(
'config' => $config,
'players' => $account_logged->getPlayersList(),
'player_sex' => isset($player) ? $player->getSex() : -1,
@@ -698,7 +698,7 @@ if(!$logged)
else
$player->setCustomField('deleted', 1);
$account_logged->logAction('Deleted character ' . $player->getName() . '.');
- echo $twig->render('success.html', array(
+ echo $twig->render('success.html.twig', array(
'title' => 'Character Deleted',
'description' => 'The character ' . $player_name . ' has been deleted.'
));
@@ -728,9 +728,9 @@ if(!$logged)
}
if(!$dontshowtableagain) {
if(!empty($errors)) {
- echo $twig->render('error_box.html', array('errors' => $errors));
+ echo $twig->render('error_box.html.twig', array('errors' => $errors));
}
- echo $twig->render('account.delete_character.html');
+ echo $twig->render('account.delete_character.html.twig');
}
}
@@ -902,7 +902,7 @@ if(!$logged)
foreach($loaded_items_to_copy as $save_item)
$db->query("INSERT INTO `player_items` (`player_id` ,`pid` ,`sid` ,`itemtype`, `count`, `attributes`) VALUES ('".$player->getId()."', '".$save_item['pid']."', '".$save_item['sid']."', '".$save_item['itemtype']."', '".$save_item['count']."', '".$save_item['attributes']."');");
- echo $twig->render('success.html', array(
+ echo $twig->render('success.html.twig', array(
'title' => 'Character Created',
'description' => 'The character ' . $newchar_name . ' has been created. Please select the outfit when you log in for the first time. @@ -918,11 +918,11 @@ if(!$logged) } if(count($errors) > 0) { - echo $twig->render('error_box.html', array('errors' => $errors)); + echo $twig->render('error_box.html.twig', array('errors' => $errors)); } if(!$newchar_created) { - echo $twig->render('account.create_character.html', array( + echo $twig->render('account.create_character.html.twig', array( 'config' => $config, 'newchar_name' => $newchar_name diff --git a/system/pages/admin/dashboard.php b/system/pages/admin/dashboard.php index b3017edb..fde5bb44 100644 --- a/system/pages/admin/dashboard.php +++ b/system/pages/admin/dashboard.php @@ -48,7 +48,7 @@ $tmp = ''; if(fetchDatabaseConfig('site_closed_message', $tmp)) $closed_message = $tmp; -echo $twig->render('admin.dashboard.html', array( +echo $twig->render('admin.dashboard.html.twig', array( 'is_closed' => $is_closed, 'closed_message' => $closed_message, 'status' => $status diff --git a/system/pages/admin/login.php b/system/pages/admin/login.php index a7ce4a24..14322d34 100644 --- a/system/pages/admin/login.php +++ b/system/pages/admin/login.php @@ -20,5 +20,5 @@ if(isset($errors)) { } } -echo $twig->render('admin.login.html'); +echo $twig->render('admin.login.html.twig'); ?> \ No newline at end of file diff --git a/system/pages/admin/mailer.php b/system/pages/admin/mailer.php index a0917a11..2ad4a21d 100644 --- a/system/pages/admin/mailer.php +++ b/system/pages/admin/mailer.php @@ -38,7 +38,7 @@ if($preview) { } -echo $twig->render('admin.mailer.html', array( +echo $twig->render('admin.mailer.html.twig', array( 'mail_subject' => $mail_subject, 'mail_content' => $mail_content, 'preview_done' => $preview_done diff --git a/system/pages/admin/notepad.php b/system/pages/admin/notepad.php index 8e65c8a6..73ad6867 100644 --- a/system/pages/admin/notepad.php +++ b/system/pages/admin/notepad.php @@ -28,7 +28,7 @@ else $_content = $notepad_content; } -echo $twig->render('admin.notepad.html', array('content' => isset($_content) ? $_content : null)); +echo $twig->render('admin.notepad.html.twig', array('content' => isset($_content) ? $_content : null)); class Notepad { diff --git a/system/pages/admin/pages.php b/system/pages/admin/pages.php index 66547906..f91ef59d 100644 --- a/system/pages/admin/pages.php +++ b/system/pages/admin/pages.php @@ -81,7 +81,7 @@ if(!empty($action)) } if(!empty($errors)) - echo $twig->render('error_box.html', array('errors' => $errors)); + echo $twig->render('error_box.html.twig', array('errors' => $errors)); } ?> render('admin.plugins.form.html'); +echo $twig->render('admin.plugins.form.html.twig'); $message = ''; if(isset($_FILES["plugin"]["name"])) @@ -142,7 +142,7 @@ foreach(scandir($path) as $file) ); } -echo $twig->render('admin.plugins.html', array( +echo $twig->render('admin.plugins.html.twig', array( 'plugins' => $rows )); ?> \ No newline at end of file diff --git a/system/pages/admin/statistics.php b/system/pages/admin/statistics.php index 2bb8416a..2c857bec 100644 --- a/system/pages/admin/statistics.php +++ b/system/pages/admin/statistics.php @@ -29,7 +29,7 @@ $total_houses = $query['how_much']; $points = $db->query('SELECT `premium_points`, `' . (USE_ACCOUNT_NAME ? 'name' : 'id') . '` as `name` FROM `accounts` ORDER BY `premium_points` DESC LIMIT 10;'); -echo $twig->render('admin.statistics.html', array( +echo $twig->render('admin.statistics.html.twig', array( 'total_accounts' => $total_accounts, 'total_players' => $total_players, 'total_guilds' => $total_guilds, diff --git a/system/pages/admin/visitors.php b/system/pages/admin/visitors.php index 2310c7de..1dfe533c 100644 --- a/system/pages/admin/visitors.php +++ b/system/pages/admin/visitors.php @@ -29,7 +29,7 @@ function compare($a, $b) { $tmp = $visitors->getVisitors(); usort($tmp, 'compare'); -echo $twig->render('admin.visitors.html', array( +echo $twig->render('admin.visitors.html.twig', array( 'config_visitors_counter_ttl' => $config['visitors_counter_ttl'], 'visitors' => $tmp )); diff --git a/system/pages/characters.php b/system/pages/characters.php index 90cb7adc..27d27872 100644 --- a/system/pages/characters.php +++ b/system/pages/characters.php @@ -17,7 +17,7 @@ $groups = new OTS_Groups_List(); function generate_search_form($autofocus = false) { global $config, $twig; - return $twig->render('characters.form.html', array( + return $twig->render('characters.form.html.twig', array( 'link' => getPageLink('characters'), 'vdarkborder' => $config['vdarkborder'], 'darkborder' => $config['darkborder'], @@ -39,7 +39,7 @@ function retrieve_former_name($name) } } - return ""; + return ''; } $name = ''; @@ -395,7 +395,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil $account_players->orderBy('name'); } - echo $twig->render('characters.html', array( + echo $twig->render('characters.html.twig', array( 'outfit' => $outfit, 'player' => $player, 'account' => $account, @@ -439,7 +439,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil else { $search_errors[] = 'Character ' . $name . ' does not exist or has been deleted.'; - echo $twig->render('error_box.html', array('errors' => $search_errors)); + echo $twig->render('error_box.html.twig', array('errors' => $search_errors)); $search_errors = array(); $promotion = ''; @@ -468,4 +468,4 @@ else } if(!empty($search_errors)) - echo $twig->render('error_box.html', array('errors' => $search_errors)); \ No newline at end of file + echo $twig->render('error_box.html.twig', array('errors' => $search_errors)); \ No newline at end of file diff --git a/system/pages/commands.php b/system/pages/commands.php index dc9154f6..3dacf611 100644 --- a/system/pages/commands.php +++ b/system/pages/commands.php @@ -69,10 +69,10 @@ if($canEdit) } if(!empty($errors)) - echo $twig->render('error_box.html', array('errors' => $errors)); + echo $twig->render('error_box.html.twig', array('errors' => $errors)); } - echo $twig->render('commands.form.html', array( + echo $twig->render('commands.form.html.twig', array( 'link' => getPageLink('commands', ($action == 'edit' ? 'edit' : 'add')), 'action' => $action, 'id' => isset($id) ? $id : null, @@ -91,7 +91,7 @@ $commands = ' ORDER BY `ordering`;'); $last = $commands->rowCount(); -echo $twig->render('commands.html', array( +echo $twig->render('commands.html.twig', array( 'commands' => $commands, 'last' => $last, 'canEdit' => $canEdit, diff --git a/system/pages/createaccount.php b/system/pages/createaccount.php index cde51437..9a7d34b2 100644 --- a/system/pages/createaccount.php +++ b/system/pages/createaccount.php @@ -392,7 +392,7 @@ function validate_form(thisform) } if(!empty($errors)) - echo $twig->render('error_box.html', array('errors' => $errors)); + echo $twig->render('error_box.html.twig', array('errors' => $errors)); ?> To play on you need an account. All you have to do to create your new account is to enter an account , passwordrender('forum.boards.html', array( + echo $twig->render('forum.boards.html.twig', array( 'boards' => $boards, 'config' => $config )); @@ -404,7 +404,7 @@ if($action == 'new_post') if(!$saved) { if(!empty($errors)) - echo $twig->render('error_box.html', array('errors' => $errors)); + echo $twig->render('error_box.html.twig', array('errors' => $errors)); echo '
|