Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-26 17:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* menus are now showed by the order they're saved into menu_categories configurable

Browse Source 
* fixed visitors in admin panel showing, when cache is disabled
This commit is contained in:
slawkens 2017-11-06 08:50:06 +01:00
parent 56a0c6e6bf
commit 39fee6e57d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
system/libs/visitors.php
View File

@ -102,12 +102,12 @@ class Visitors
if($this->cacheEnabled) { if($this->cacheEnabled) {
foreach($this->data as $ip => &$details) foreach($this->data as $ip => &$details)
$details['ip'] = $ip; $details['ip'] = $ip;
return $this->data; return $this->data;
} }
global $db; global $db;
return $db->query('SELECT ' . $db->fieldName('ip') . ', ' . $db->fieldName('lastvisit') . ', ' . $db->fieldName('page') . ' FROM ' . $db->tableName(TABLE_PREFIX . 'visitors') . ' ORDER BY ' . $db->fieldName('lastvisit') . ' DESC')->fetch(); return $db->query('SELECT ' . $db->fieldName('ip') . ', ' . $db->fieldName('lastvisit') . ', ' . $db->fieldName('page') . ' FROM ' . $db->tableName(TABLE_PREFIX . 'visitors') . ' ORDER BY ' . $db->fieldName('lastvisit') . ' DESC')->fetchAll();
} }
public function getAmountVisitors() public function getAmountVisitors()

10
system/template.php
View File

@ -103,7 +103,7 @@ if($twig_loader && file_exists(BASE . $template_path))
$twig_loader->prependPath(BASE . $template_path); $twig_loader->prependPath(BASE . $template_path);
function get_template_menus() { function get_template_menus() {
global $db, $template_name; global $db, $config, $template_name;
$menus = array(); $menus = array();
$query = $db->query('SELECT `name`, `link`, `category` FROM `' . TABLE_PREFIX . 'menu` WHERE `template` = ' . $db->quote($template_name) . ' ORDER BY `category`, `ordering` ASC'); $query = $db->query('SELECT `name`, `link`, `category` FROM `' . TABLE_PREFIX . 'menu` WHERE `template` = ' . $db->quote($template_name) . ' ORDER BY `category`, `ordering` ASC');
@ -111,6 +111,12 @@ function get_template_menus() {
$menus[$menu['category']][] = array('name' => $menu['name'], 'link' => $menu['link']); $menus[$menu['category']][] = array('name' => $menu['name'], 'link' => $menu['link']);
} }
return $menus; $new_menus = array();
foreach($config['menu_categories'] as $id => $options) {
if(isset($menus[$id]))
$new_menus[$id] = $menus[$id];
}
return $new_menus;
} }
?> ?>