Revert some more unwarranted formatting

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index 2856c164018cc16d7ad76ed75edaf5e5684e2410..c9ff23e2d84c9e1899c0031d25e8585e2f60e3d3 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1127,18 +1127,20 @@ function admin_page_dbsync(&$a) {
  * @param App $a
  */
 function admin_page_users_post(&$a){
-       $pending        =       (x($_POST, 'pending')                   ? $_POST['pending']             : array());
-       $users          =       (x($_POST, 'user')                      ? $_POST['user']                : array());
-       $nu_name        =       (x($_POST, 'new_user_name')             ? $_POST['new_user_name']       : '');
-       $nu_nickname    =       (x($_POST, 'new_user_nickname')         ? $_POST['new_user_nickname']   : '');
-       $nu_email       =       (x($_POST, 'new_user_email')            ? $_POST['new_user_email']      : '');
+       $pending     =  (x($_POST, 'pending')                   ? $_POST['pending']             : array());
+       $users       =  (x($_POST, 'user')                      ? $_POST['user']                : array());
+       $nu_name     =  (x($_POST, 'new_user_name')             ? $_POST['new_user_name']       : '');
+       $nu_nickname =  (x($_POST, 'new_user_nickname')         ? $_POST['new_user_nickname']   : '');
+       $nu_email    =  (x($_POST, 'new_user_email')            ? $_POST['new_user_email']      : '');
+       $nu_language = get_config('system', 'language');
 
        check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
 
        if(!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) {
                require_once('include/user.php');
 
-               $result = create_user(array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1));
+               $result = create_user(array('username'=>$nu_name, 'email'=>$nu_email, 
+                       'nickname'=>$nu_nickname, 'verified'=>1, 'language'=>$nu_language));
                if(! $result['success']) {
                        notice($result['message']);
                        return;
@@ -1304,26 +1306,8 @@ function admin_page_users(&$a){
        $sql_order = "`".str_replace('.','`.`',$order)."`";
        $sql_order_direction = ($order_direction==="+")?"ASC":"DESC";
 
-/*     $users = q("SELECT `user`.* , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired`
-                               FROM
-                                       (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
-                                       FROM `item`
-                                       WHERE `item`.`type` = 'wall'
-                                       GROUP BY `item`.`uid`) AS `lastitem`
-                                                RIGHT OUTER JOIN `user` ON `user`.`uid` = `lastitem`.`uid`,
-                                          `contact`
-                               WHERE
-                                          `user`.`uid` = `contact`.`uid`
-                                               AND `user`.`verified` =1
-                                       AND `contact`.`self` =1
-                               ORDER BY $sql_order $sql_order_direction LIMIT %d, %d
-                               ",
-                               intval($a->pager['start']),
-                               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`
+                               (SELECT MAX(`changed`) FROM `item` FORCE INDEX (`uid_wall_changed`) WHERE `wall` AND `uid` = `user`.`uid`) AS `lastitem_date`
                                FROM `user`
                                INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
                                WHERE `user`.`verified`