diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-02 04:07:23 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-02 04:07:23 -0500 |
| commit | f0fdd1a163b6bc7213eeb48c6ee9025087bb0032 (patch) | |
| tree | 2e7855a389313397b310a70b0e6072a5ba6dcce1 /mod/admin.php | |
| parent | b7ab2a2fc92bbd7ec3a506e18f950579e10719eb (diff) | |
| parent | 90bdddca0d1b2e2128646d1f698b6d514e748001 (diff) | |
| download | volse-hubzilla-f0fdd1a163b6bc7213eeb48c6ee9025087bb0032.tar.gz volse-hubzilla-f0fdd1a163b6bc7213eeb48c6ee9025087bb0032.tar.bz2 volse-hubzilla-f0fdd1a163b6bc7213eeb48c6ee9025087bb0032.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
item table update for file feature
probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
diabook commit
conversation: remove templating items in code and move it to template.
Enabled automated doc building. Changes: -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them
template proc: avoid a notice and allow template name to include to be passed with a variable value
show relation in contact_template
admin: fix small string
fix visualization in groupeditor
less html in mod/group.php, template for group members editor, quattro theme for group edit.
* master:
Diffstat (limited to 'mod/admin.php')
| -rwxr-xr-x | mod/admin.php | 7 |
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 // |