Skip to content

Commit 54d9fa2

Browse files
carlbennettcarlbennett
committed
Hotfix - revert last night's changes
1 parent 7fafde3 commit 54d9fa2

File tree

3 files changed

+2
-134
lines changed

3 files changed

+2
-134
lines changed

‎src/controllers/Packet/Index.php

Lines changed: 2 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -19,79 +19,12 @@
1919

2020
class Index extends Controller {
2121

22-
const PAGINATION_LIMIT_DEF = 15; // The default amount of items per page.
23-
const PAGINATION_LIMIT_MIN = 5; // The least amount of items per page.
24-
const PAGINATION_LIMIT_MAX = 250; // The most amount of items per page.
25-
2622
public function &run( Router &$router, View &$view, array &$args ) {
2723

2824
$model = new PacketIndexModel();
2925

30-
$query = $router->getRequestQueryArray();
31-
32-
if ( $view instanceof PacketIndexHtmlView ) {
33-
34-
$model->order = (
35-
isset( $query['order'] ) ? $query['order'] : 'packet-id-asc'
36-
);
37-
38-
switch ( $model->order ) {
39-
case 'id-asc':
40-
$order = [ 'id','ASC' ]; break;
41-
42-
case 'id-desc':
43-
$order = [ 'id','DESC' ]; break;
44-
45-
case 'packet-id-asc':
46-
$order = [ 'packet_application_layer_id,packet_id','ASC' ]; break;
47-
48-
case 'packet-id-desc':
49-
$order = [ 'packet_application_layer_id,packet_id','DESC' ]; break;
50-
51-
case 'created-datetime-asc':
52-
$order = [ 'created_datetime','ASC' ]; break;
53-
54-
case 'created-datetime-desc':
55-
$order = [ 'created_datetime','DESC' ]; break;
56-
57-
case 'user-id-asc':
58-
$order = [ 'user_id','ASC' ]; break;
59-
60-
case 'user-id-desc':
61-
$order = [ 'user_id','DESC' ]; break;
62-
63-
default:
64-
$order = null;
65-
}
66-
67-
$model->page = ( isset( $query['page'] ) ? (int) $query['page'] : 0 );
68-
69-
$model->limit = (
70-
isset( $query['limit'] ) ?
71-
(int) $query['limit'] : self::PAGINATION_LIMIT_DEF
72-
);
73-
74-
if ( $model->page < 1 ) { $model->page = 1; }
75-
76-
if ( $model->limit < self::PAGINATION_LIMIT_MIN ) {
77-
$model->limit = self::PAGINATION_LIMIT_MIN;
78-
}
79-
80-
if ( $model->limit > self::PAGINATION_LIMIT_MAX ) {
81-
$model->limit = self::PAGINATION_LIMIT_MAX;
82-
}
83-
84-
$model->pages = ceil( Packet::getPacketCount() / $model->limit );
85-
86-
if ( $model->page > $model->pages ) { $model->page = $model->pages; }
87-
88-
$model->packets = Packet::getAllPackets(
89-
$order,
90-
$model->limit,
91-
$model->limit * ( $model->page - 1 )
92-
);
93-
94-
} else if ( $view instanceof PacketIndexJSONView ) {
26+
if ( $view instanceof PacketIndexHtmlView
27+
|| $view instanceof PacketIndexJSONView ) {
9528

9629
$model->packets = Packet::getAllPackets();
9730

‎src/models/Packet/Index.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66

77
class Index extends Model {
88

9-
public $limit;
10-
public $order;
119
public $packets;
12-
public $page;
13-
public $pages;
1410
public $timestamp;
1511
public $user;
1612

‎src/templates/Packet/Index.phtml

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -11,55 +11,12 @@ $title = 'Packet Index';
1111
$description = 'The index for packets on BNETDocs';
1212
$this->opengraph->attach(new Pair('url', '/packet/index'));
1313

14-
$page = $this->getContext()->page;
15-
$pages = $this->getContext()->pages;
16-
$limit = $this->getContext()->limit;
17-
$order = $this->getContext()->order;
18-
19-
$no_prev = ($page <= 1);
20-
$no_next = ($page >= $pages);
21-
2214
$this->additional_css[] = '/a/forms.css';
2315
require('./header.inc.phtml');
2416
?>
2517
<article>
2618
<header>Packet Index</header>
2719
<section>
28-
<form method="GET">
29-
<input type="hidden" name="page" value="<?php echo $page; ?>"/>
30-
<input type="hidden" name="limit" value="<?php echo $limit; ?>"/>
31-
<label for="order">Order by:</label>
32-
<select name="order" id="order" onchange="form.submit();"
33-
style="display:inline-block;width:200px;">
34-
<option value="id-asc"<?php
35-
if ($order === 'id-asc') { echo ' selected="selected"';
36-
} ?>>Database Id (Ascending)</option>
37-
<option value="id-desc"<?php
38-
if ($order === 'id-desc') { echo ' selected="selected"';
39-
} ?>>Database Id (Descending)</option>
40-
<option value="packet-id-asc"<?php
41-
if ($order === 'packet-id-asc') { echo ' selected="selected"';
42-
} ?>>Packet Id (Ascending)</option>
43-
<option value="packet-id-desc"<?php
44-
if ($order === 'packet-id-desc') { echo ' selected="selected"';
45-
} ?>>Packet Id (Descending)</option>
46-
<option value="created-datetime-asc"<?php
47-
if ($order === 'created-datetime-asc') {
48-
echo ' selected="selected"';
49-
} ?>>Created Timestamp (Ascending)</option>
50-
<option value="created-datetime-desc"<?php
51-
if ($order === 'created-datetime-desc') {
52-
echo ' selected="selected"';
53-
} ?>>Created Timestamp (Descending)</option>
54-
<option value="user-id-asc"<?php
55-
if ($order === 'user-id-asc') { echo ' selected="selected"';
56-
} ?>>User Id (Ascending)</option>
57-
<option value="user-id-desc"<?php
58-
if ($order === 'user-id-desc') { echo ' selected="selected"';
59-
} ?>>User Id (Descending)</option>
60-
</select>
61-
<input type="submit" value="Reorder"/>
62-
</form>
6320
<table>
6421
<thead>
6522
<tr>
@@ -90,24 +47,6 @@ require('./header.inc.phtml');
9047
<a href="<?php echo Common::relativeUrlToAbsolute('/packet/index.php'); ?>">PHP</a>, and
9148
<a href="<?php echo Common::relativeUrlToAbsolute('/packet/index.vb'); ?>">VB6</a>.
9249
</p>
93-
<hr/>
94-
<span class="float-left">
95-
<?php if (!$no_prev) { ?>
96-
<a class="button" href="<?php echo Common::relativeUrlToAbsolute('/packet/index?page=' . ($page - 1) . '&limit=' . $limit . '&order=' . $order); ?>">Prev</a>
97-
<?php } else { ?>
98-
<button class="button button-disabled" disabled="disabled">Prev</button>
99-
<?php } ?>
100-
</span>
101-
<span class="float-right">
102-
<?php if (!$no_next) { ?>
103-
<a class="button" href="<?php echo Common::relativeUrlToAbsolute('/packet/index?page=' . ($page + 1) . '&limit=' . $limit . '&order=' . $order); ?>">Next</a>
104-
<?php } else { ?>
105-
<button class="button button-disabled" disabled="disabled">Next</button>
106-
<?php } ?>
107-
</span>
108-
<p class="center" style="line-height:24px;">
109-
<strong><?php echo number_format($page); ?></strong> of <?php echo number_format($pages); ?>
110-
</p>
11150
</section>
11251
</article>
11352
<?php require("./footer.inc.phtml"); ?>

0 commit comments

Comments
 (0)