From b50ebe98083d8d86cf19f2762b02809e265bd49a Mon Sep 17 00:00:00 2001 From: ruan Date: Sat, 12 Sep 2015 09:27:22 +0200 Subject: [PATCH] Refactor HTML+PHP code into simple PHP --- bans.php | 55 +++++++++++++++++++++-------------------------- includes/page.php | 24 +++++++++++---------- index.php | 2 +- info.php | 36 +++++++++++-------------------- kicks.php | 50 +++++++++++++++++++----------------------- mutes.php | 52 ++++++++++++++++++++------------------------ warnings.php | 52 ++++++++++++++++++++------------------------ 7 files changed, 119 insertions(+), 152 deletions(-) diff --git a/bans.php b/bans.php index 1e5ff4e..64810de 100644 --- a/bans.php +++ b/bans.php @@ -1,39 +1,34 @@ print_title(); $headers = array("Name", "Banned By", "Reason", "Banned On", "Banned Until"); -?> -
- print_page_header(); - $page->print_check_form(); - ?> -
-
- table_begin(); - $page->table_print_headers($headers); - $result = $page->run_query(); - while ($row = $result->fetch(PDO::FETCH_ASSOC)) { - $player_name = $page->get_name($row['uuid']); - if ($player_name === null) continue; - $page->print_table_rows($row, array( - 'Name' => $page->get_avatar($player_name, $row['uuid']), - 'Banned By' => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - 'Reason' => $page->clean($row['reason']), - 'Banned On' => $page->millis_to_date($row['time']), - 'Banned Until' => $page->expiry($row), - )); - } - $page->table_end(); - $page->print_pager(); - ?> -
-
- print_footer(); ?> -
+$page->print_page_header(); + +$page->print_check_form(); + +$page->table_begin(); +$page->table_print_headers($headers); + +$result = $page->run_query(); +while ($row = $result->fetch(PDO::FETCH_ASSOC)) { + $player_name = $page->get_name($row['uuid']); + if ($player_name === null) continue; + + $page->print_table_rows($row, array( + 'Name' => $page->get_avatar($player_name, $row['uuid']), + 'Banned By' => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + 'Reason' => $page->clean($row['reason']), + 'Banned On' => $page->millis_to_date($row['time']), + 'Banned Until' => $page->expiry($row), + )); +} +$page->table_end(); +$page->print_pager(); + +$page->print_footer(); diff --git a/includes/page.php b/includes/page.php index 546a69a..616b77e 100644 --- a/includes/page.php +++ b/includes/page.php @@ -210,17 +210,16 @@ class Page { echo ""; } - function print_page_header() { + function print_page_header($container_start = true) { $title = $this->title(); - //$type = ($title === "Bans") ? "modal-header" : "navbar-header"; - $type = "modal-header"; - echo(" -
-
-

$title

-
-
- "); + if ($container_start) { + echo '
'; + } + + echo "

$title

"; + if ($container_start) { + echo '
'; + } } function table_print_headers($headers) { @@ -277,7 +276,10 @@ class Page { echo "$pager_prev $pager_next $pager_count"; } - function print_footer() { + function print_footer($container_end = true) { + if ($container_end) { + echo "
"; + } include './includes/footer.php'; $time = microtime(true) - $this->time; echo ""; diff --git a/index.php b/index.php index 6ef3e4d..7b7661c 100644 --- a/index.php +++ b/index.php @@ -11,7 +11,7 @@ $settings = new Settings(false);

Welcome to name; ?>'s Ban List.

-

Here is where our Bans, Mutes, and Warnings are listed.

+

Here is where our Bans, Mutes, Warnings, and Kicks are listed.

diff --git a/info.php b/info.php index 7d8af6c..ecc158d 100644 --- a/info.php +++ b/info.php @@ -144,29 +144,17 @@ if ($st->execute(array($id))) { $page->name .= "Permanent"; } } + $page->print_page_header(); - ?> -
-
- print_page_header(); ?> -
- table_begin(); - $map = $info->basic_info($row, $player_name); - $permanent_val = $info->page->permanent[$type]; - foreach ($map as $key => $val) { - if ($permanent && $key === "Expires" && $val === $permanent_val) { - continue; - } - echo "$key$val"; - } - $page->table_end(false); - ?> -
-
- print_footer(); - ?> -
- table_begin(); + $map = $info->basic_info($row, $player_name); + $permanent_val = $info->page->permanent[$type]; + foreach ($map as $key => $val) { + if ($permanent && $key === "Expires" && $val === $permanent_val) { + continue; + } + echo "$key$val"; + } + $page->table_end(false); + $page->print_footer(); } diff --git a/kicks.php b/kicks.php index 527d187..47f1453 100644 --- a/kicks.php +++ b/kicks.php @@ -1,37 +1,31 @@ print_title(); $headers = array("Name", "Kicked By", "Reason", "Date"); -?> -
- print_page_header(); - ?> -
-
- table_begin(); - $page->table_print_headers($headers); - $result = $page->run_query(); - while ($row = $result->fetch(PDO::FETCH_ASSOC)) { - $player_name = $page->get_name($row['uuid']); - if ($player_name === null) continue; - $page->print_table_rows($row, array( - 'Name' => $page->get_avatar($player_name, $row['uuid']), - 'Kicked By' => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - 'Reason' => $page->clean($row['reason']), - 'Date' => $page->millis_to_date($row['time']), - )); - } - $page->table_end(); - $page->print_pager(); - ?> -
-
- print_footer(); ?> -
+$page->print_page_header(); + +$page->table_begin(); +$page->table_print_headers($headers); + +$result = $page->run_query(); +while ($row = $result->fetch(PDO::FETCH_ASSOC)) { + $player_name = $page->get_name($row['uuid']); + if ($player_name === null) continue; + + $page->print_table_rows($row, array( + 'Name' => $page->get_avatar($player_name, $row['uuid']), + 'Kicked By' => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + 'Reason' => $page->clean($row['reason']), + 'Date' => $page->millis_to_date($row['time']), + )); +} +$page->table_end(); +$page->print_pager(); + +$page->print_footer(); diff --git a/mutes.php b/mutes.php index b72cd20..031ded3 100644 --- a/mutes.php +++ b/mutes.php @@ -1,38 +1,32 @@ print_title(); $headers = array("Name", "Muted By", "Reason", "Muted On", "Muted Until"); -?> -
- print_page_header(); - ?> -
-
- table_begin(); - $page->table_print_headers($headers); - $result = $page->run_query(); - while ($row = $result->fetch(PDO::FETCH_ASSOC)) { - $player_name = $page->get_name($row['uuid']); - if ($player_name === null) continue; - $page->print_table_rows($row, array( - 'Name' => $page->get_avatar($player_name, $row['uuid']), - 'Muted By' => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - 'Reason' => $page->clean($row['reason']), - 'Muted On' => $page->millis_to_date($row['time']), - 'Muted Until' => $page->expiry($row), - )); - } - $page->table_end(); - $page->print_pager(); - ?> -
-
- print_footer(); ?> -
+$page->print_page_header(); + +$page->table_begin(); +$page->table_print_headers($headers); + +$result = $page->run_query(); +while ($row = $result->fetch(PDO::FETCH_ASSOC)) { + $player_name = $page->get_name($row['uuid']); + if ($player_name === null) continue; + + $page->print_table_rows($row, array( + 'Name' => $page->get_avatar($player_name, $row['uuid']), + 'Muted By' => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + 'Reason' => $page->clean($row['reason']), + 'Muted On' => $page->millis_to_date($row['time']), + 'Muted Until' => $page->expiry($row), + )); +} +$page->table_end(); +$page->print_pager(); + +$page->print_footer(); diff --git a/warnings.php b/warnings.php index fa88283..6f64fc1 100644 --- a/warnings.php +++ b/warnings.php @@ -1,38 +1,32 @@ print_title(); $headers = array("Name", "Warned By", "Reason", "Warned Until", "Received Warning?"); -?> -
- print_page_header(); - ?> -
-
- table_begin(); - $page->table_print_headers($headers); - $result = $page->run_query(); - while ($row = $result->fetch(PDO::FETCH_ASSOC)) { - $player_name = $page->get_name($row['uuid']); - if ($player_name === null) continue; - $page->print_table_rows($row, array( - 'Name' => $page->get_avatar($player_name, $row['uuid']), - 'Warned By' => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - 'Reason' => $page->clean($row['reason']), - 'Warned Until' => $page->expiry($row), - 'Received Warning?' => $row['warned'] ? "Yes" : "No", - )); - } - $page->table_end(); - $page->print_pager(); - ?> -
-
- print_footer(); ?> -
+$page->print_page_header(); + +$page->table_begin(); +$page->table_print_headers($headers); + +$result = $page->run_query(); +while ($row = $result->fetch(PDO::FETCH_ASSOC)) { + $player_name = $page->get_name($row['uuid']); + if ($player_name === null) continue; + + $page->print_table_rows($row, array( + 'Name' => $page->get_avatar($player_name, $row['uuid']), + 'Warned By' => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + 'Reason' => $page->clean($row['reason']), + 'Warned Until' => $page->expiry($row), + 'Received Warning?' => $row['warned'] ? "Yes" : "No", + )); +} +$page->table_end(); +$page->print_pager(); + +$page->print_footer();