aboutsummaryrefslogtreecommitdiffstats
path: root/mod/admin.php
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2012-03-02 00:00:03 -0800
committerfabrixxm <fabrix.xm@gmail.com>2012-03-02 00:00:03 -0800
commit3a609adfb77a94d5b8681496a9306d9cf4efcafb (patch)
tree153968c7a8ac649be69438ff5374863735699bab /mod/admin.php
parentf55ffcd48ce5c0b3254ae1a02fda7b29d875fa09 (diff)
parentb6b7742579d16a4eab97249758a62c5ff33bd07d (diff)
downloadvolse-hubzilla-3a609adfb77a94d5b8681496a9306d9cf4efcafb.tar.gz
volse-hubzilla-3a609adfb77a94d5b8681496a9306d9cf4efcafb.tar.bz2
volse-hubzilla-3a609adfb77a94d5b8681496a9306d9cf4efcafb.zip
Merge pull request #55 from fabrixxm/master
Some minor and one majior mod in templates
Diffstat (limited to 'mod/admin.php')
-rwxr-xr-xmod/admin.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/mod/admin.php b/mod/admin.php
index 0f600e312..94bf44503 100755
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -366,7 +366,7 @@ function admin_page_users_post(&$a){
intval( $uid )
);
}
- notice( sprintf( tt("%s user blocked", "%s users blocked/unblocked", count($users)), count($users)) );
+ notice( sprintf( tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)), count($users)) );
}
if (x($_POST,'page_users_delete')){
require_once("include/Contact.php");
@@ -428,6 +428,7 @@ function admin_page_users(&$a){
LEFT JOIN `contact` ON `register`.`uid` = `contact`.`uid`
LEFT JOIN `user` ON `register`.`uid` = `user`.`uid`;");
+
/* get users */
$total = q("SELECT count(*) as total FROM `user` where 1");
@@ -435,7 +436,8 @@ function admin_page_users(&$a){
$a->set_pager_total($total[0]['total']);
$a->set_pager_itemspage(100);
}
-
+
+
$users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`
FROM
(SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
@@ -469,6 +471,7 @@ function admin_page_users(&$a){
}
$users = array_map("_setup_users", $users);
+
$t = get_markup_template("admin_users.tpl");
$o = replace_macros($t, array(
// strings //