Skip to content

Commit

Permalink
Better filtering for the plugin editor
Browse files Browse the repository at this point in the history
  • Loading branch information
@mystralkk
mystralkk committed Mar 12, 2020
1 parent fcd520a commit 94ef8cc
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 27 deletions.
16 changes: 11 additions & 5 deletions public_html/admin/plugins.php
View file
Expand Up @@ -424,7 +424,7 @@ function listplugins($token)
array('text' => $LANG32[43], 'field' => 'pi_load', 'sort' => true),
array('text' => $LANG32[16], 'field' => 'pi_name', 'sort' => true),
array('text' => $LANG32[17], 'field' => 'pi_version', 'sort' => true),
array('text' => $LANG32[50], 'field' => 'pi_dependencies', 'sort' => true),
array('text' => $LANG32[50], 'field' => 'pi_dependencies', 'sort' => false), // No corresponding field in "plugins" table
array('text' => $LANG_ADMIN['enabled'], 'field' => 'pi_enabled', 'sort' => true),
array('text' => $LANG32[25], 'field' => 'delete', 'sort' => false),
);
Expand Down Expand Up @@ -1333,12 +1333,18 @@ function plugin_get_pluginname($plugin)
SEC_checkToken();
$pi_name = Geeklog\Input::fGet('pi_name', '');
changePluginStatus($pi_name);

$sorting = '';
if (!empty($_GET['order']) && !empty($_GET['direction'])) { // Remember how the list was sorted
$ord = trim($_GET['order']);
$dir = trim($_GET['direction']);
$old = trim($_GET['prevorder']);
$sorting = "?order=$ord&direction=$dir&prevorder=$old";
$ord = (int) Geeklog\Input::fGet('order', 0);
$dir = Geeklog\Input::fGet('direction', '');
$old = Geeklog\Input::fGet('prevorder', '');

if (in_array($ord, [1, 2, 3, 5]) &&
in_array($dir, ['ASC', 'DESC']) &&
in_array($old, ['pi_load', 'pi_name', 'pi_version', 'pi_enabled'])) {
$sorting = "?order=$ord&direction=$dir&prevorder=$old";
}
}
COM_redirect($_CONF['site_admin_url'] . '/plugins.php' . $sorting);
} elseif (($mode === 'change_load_order') && SEC_checkToken()) {
Expand Down
51 changes: 29 additions & 22 deletions system/lib-admin.php
View file
Expand Up @@ -239,15 +239,16 @@ function ADMIN_list($component, $fieldFunction, $header_arr, $text_arr,
$group_by_sql = '';
$limit = '';
$prevOrder = Geeklog\Input::fGet('prevorder', ''); // what was the last sorting?
$prevOrder = preg_replace('/[^0-9A-Za-z_]/', '', $prevOrder);
$query = Geeklog\Input::request('q', ''); // get query (text-search)
if (!empty($query)) {
$query = GLText::stripTags($query);
}

$query_limit = '';
if (isset($_REQUEST['query_limit'])) { // get query-limit (list-length)
$query_limit = (int) Geeklog\Input::fRequest('query_limit');
if ($query_limit == 0) {
$query_limit = (int) Geeklog\Input::fRequest('query_limit', 0);
if ($query_limit <= 0) {
$query_limit = DEFAULT_ENTRIES_PER_PAGE;
}
}
Expand All @@ -262,20 +263,20 @@ function ADMIN_list($component, $fieldFunction, $header_arr, $text_arr,
$currentPage = $page;
}
if ($currentPage <= 0) {
$currentPage = 1; #current page has to be larger 0
$currentPage = 1; // current page has to be larger 0
}

$help_url = ''; # do we have a help url for the block-header?
$help_url = ''; // do we have a help url for the block-header?
if (!empty($text_arr['help_url'])) {
$help_url = $text_arr['help_url'];
}

$form_url = ''; # what is the form-url for the search button and list sorters?
$form_url = ''; // what is the form-url for the search button and list sorters?
if (!empty($text_arr['form_url'])) {
$form_url = $text_arr['form_url'];
}

$title = ''; # what is the title of the page?
$title = ''; // what is the title of the page?
if (!empty($text_arr['title'])) {
$title = $text_arr['title'];
}
Expand Down Expand Up @@ -334,31 +335,36 @@ function ADMIN_list($component, $fieldFunction, $header_arr, $text_arr,
}

$has_extras = '';
if (isset($text_arr['has_extras'])) { # does this one use extras? (search, google paging)
if (isset($text_arr['has_extras'])) { // does this one use extras? (search, google paging)
$has_extras = $text_arr['has_extras'];
}
if ($has_extras) { // show search
$admin_templates->set_var('lang_search', $LANG_ADMIN['search']);
$admin_templates->set_var('lang_submit', $LANG_ADMIN['submit']);
$admin_templates->set_var('lang_limit_results',
$LANG_ADMIN['limit_results']);
$admin_templates->set_var('lang_limit_results', $LANG_ADMIN['limit_results']);
$admin_templates->set_var('last_query', htmlspecialchars($query));
$admin_templates->set_var('filter', $filter);
}

$sql_query = DB_escapeString($query); // replace quotes etc for security
$sql = $query_arr['sql']; // get sql from array that builds data
$sql = $query_arr['sql']; // get sql from array that builds data

$order_var = ''; # number that is displayed in URL
$order_var_link = ''; # Variable for google paging.
$order_var = ''; // number that is displayed in URL
$order_var_link = ''; // Variable for google paging.

// is the order set in the link (when sorting the list)
if (!isset($_GET['order'])) {
$order = $defSort_arr['field']; // no, get the default
} else {
$order_var = (int) Geeklog\Input::fGet('order');
$order_var_link = "&amp;order=$order_var"; # keep the variable for the google paging
$order = $header_arr[$order_var]['field']; # current order field name
$order_var = (int) Geeklog\Input::fGet('order', 0);

if (isset($header_arr[$order_var])) {
$order_var_link = "&amp;order=$order_var"; // keep the variable for the google paging
$order = $header_arr[$order_var]['field']; // current order field name
} else {
$order_var = '';
$order = $defSort_arr['field']; // no, get the default
}
}

if (isset($header_arr[$order_var]['sort_field'])) {
Expand All @@ -380,7 +386,7 @@ function ADMIN_list($component, $fieldFunction, $header_arr, $text_arr,

$direction = Geeklog\Input::fGet('direction', $defSort_arr['direction']); // get direction to sort after
$direction = strtoupper($direction);
if ($order == $prevOrder) { #reverse direction if prev. order was the same
if ($order == $prevOrder) { // reverse direction if prev. order was the same
$direction = ($direction === 'DESC') ? 'ASC' : 'DESC';
} else {
$direction = ($direction === 'DESC') ? 'DESC' : 'ASC';
Expand All @@ -405,16 +411,17 @@ function ADMIN_list($component, $fieldFunction, $header_arr, $text_arr,
// HEADER FIELDS array(text, field, sort, class)
// this part defines the contents & format of the header fields

for ($i = 0; $i < count($header_arr); $i++) { #iterate through all headers
for ($i = 0; $i < count($header_arr); $i++) { // iterate through all headers
$header_text = $header_arr[$i]['text'];
$th_subtags = '';
if ($header_arr[$i]['sort'] != false) { # is this sortable?
if ($order == $header_arr[$i]['field']) { # is this currently sorted?
if ($header_arr[$i]['sort'] != false) { // is this sortable?
if ($order == $header_arr[$i]['field']) { // is this currently sorted?
$header_text .= $img_arrow;
}
# make the mouseover effect is sortable

// make the mouseover effect is sortable
$th_subtags = " onmouseover=\"this.style.cursor='pointer';\"";
$order_var = $i; # assign number to field so we know what to sort
$order_var = $i; // assign number to field so we know what to sort
if (strpos($form_url, '?') > 0) {
$separator = '&amp;';
} else {
Expand Down Expand Up @@ -556,7 +563,7 @@ function ADMIN_list($component, $fieldFunction, $header_arr, $text_arr,
if ($fieldValue !== false) { # return was there, so write line
$this_row = true;
} else {
$fieldValue = ''; // dont give emtpy fields
$fieldValue = ''; // don't give empty fields
}
if (!empty($header_arr[$j]['field_class'])) {
$admin_templates->set_var('class', $header_arr[$j]['field_class']);
Expand Down

0 comments on commit 94ef8cc

Please sign in to comment.