keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved queries for the nodeinfo functionality and the admin page

Browse source
This commit is contained in:
Michael Vogel 2016-10-04 03:51:13 +00:00
parent 32f49b4de2
commit 66bec9475d
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
mod/admin.php
View file

@ -1277,14 +1277,14 @@ function admin_page_users(&$a){
/* ordering */ /* ordering */
$valid_orders = array( $valid_orders = array(
'contact.name', 'contact.name',
'user.email', 'user.email',
'user.register_date', 'user.register_date',
'user.login_date', 'user.login_date',
'lastitem.lastitem_date', 'lastitem_date',
'user.page-flags' 'user.page-flags'
); );
$order = "contact.name"; $order = "contact.name";
$order_direction = "+"; $order_direction = "+";
if (x($_GET,'o')){ if (x($_GET,'o')){
@ -1293,19 +1293,18 @@ function admin_page_users(&$a){
$order_direction = "-"; $order_direction = "-";
$new_order = substr($new_order,1); $new_order = substr($new_order,1);
} }
if (in_array($new_order, $valid_orders)){ if (in_array($new_order, $valid_orders)){
$order = $new_order; $order = $new_order;
} }
if (x($_GET,'d')){ if (x($_GET,'d')){
$new_direction = $_GET['d']; $new_direction = $_GET['d'];
} }
} }
$sql_order = "`".str_replace('.','`.`',$order)."`"; $sql_order = "`".str_replace('.','`.`',$order)."`";
$sql_order_direction = ($order_direction==="+")?"ASC":"DESC"; $sql_order_direction = ($order_direction==="+")?"ASC":"DESC";
$users = q("SELECT `user`.* , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired` /* $users = q("SELECT `user`.* , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired`
FROM FROM
(SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid` (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
FROM `item` FROM `item`
@ -1322,9 +1321,19 @@ function admin_page_users(&$a){
intval($a->pager['start']), intval($a->pager['start']),
intval($a->pager['itemspage']) intval($a->pager['itemspage'])
); );
*/
$users = q("SELECT `user`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`account_expired`,
(SELECT `changed` FROM `item` WHERE `wall` AND `uid` = `user`.`uid` ORDER BY `changed` DESC LIMIT 1) AS `lastitem_date`
FROM `user`
INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
WHERE `user`.`verified`
ORDER BY $sql_order $sql_order_direction LIMIT %d, %d",
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
//echo "<pre>$users"; killme(); //echo "<pre>$users"; killme();
$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email'])); $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
$_setup_users = function ($e) use ($adminlist){ $_setup_users = function ($e) use ($adminlist){
$accounts = array( $accounts = array(

11
mod/nodeinfo.php
View file

@ -184,7 +184,7 @@ function nodeinfo_cron() {
} }
} }
logger("cron_start"); logger("cron_start");
/*
$users = q("SELECT profile.*, `user`.`login_date`, `lastitem`.`lastitem_date` $users = q("SELECT profile.*, `user`.`login_date`, `lastitem`.`lastitem_date`
FROM (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid` FROM (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
FROM `item` FROM `item`
@ -198,7 +198,14 @@ function nodeinfo_cron() {
AND NOT `user`.`blocked` AND NOT `user`.`blocked`
AND NOT `user`.`account_removed` AND NOT `user`.`account_removed`
AND NOT `user`.`account_expired`"); AND NOT `user`.`account_expired`");
*/
$users = q("SELECT `user`.`uid`, `user`.`login_date`,
(SELECT `changed` FROM `item` WHERE `wall` AND `uid` = `user`.`uid` ORDER BY `changed` DESC LIMIT 1) AS `lastitem_date`
FROM `user`
INNER JOIN `profile` ON `profile`.`uid` = `user`.`uid` AND `profile`.`is-default`
WHERE (`profile`.`publish` OR `profile`.`net-publish`) AND `user`.`verified`
AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
AND NOT `user`.`account_expired`");
if (is_array($users)) { if (is_array($users)) {
$total_users = count($users); $total_users = count($users);
$active_users_halfyear = 0; $active_users_halfyear = 0;