Merge pull request #2888 from annando/1610-priority-dbclean

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index 4dc6064a7d9eb8576cef9290f1523a201dfafeb3..287eff27258c41ef278811c8cc486e5a7da74b84 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -282,14 +282,14 @@ function admin_page_federation(&$a) {
        foreach ($platforms as $p) {
                // get a total count for the platform, the name and version of the
                // highest version and the protocol tpe
-               $c = q('SELECT COUNT(*) AS `total`, `platform`, `network`, `version` FROM `gserver`
+               $c = qu('SELECT COUNT(*) AS `total`, `platform`, `network`, `version` FROM `gserver`
                                WHERE `platform` LIKE "%s" AND `last_contact` > `last_failure` AND `version` != ""
                                ORDER BY `version` ASC;', $p);
                $total = $total + $c[0]['total'];
 
                // what versions for that platform do we know at all?
                // again only the active nodes
-               $v = q('SELECT COUNT(*) AS `total`, `version` FROM `gserver`
+               $v = qu('SELECT COUNT(*) AS `total`, `version` FROM `gserver`
                                WHERE `last_contact` > `last_failure` AND `platform` LIKE "%s"  AND `version` != ""
                                GROUP BY `version`
                                ORDER BY `version`;', $p);
@@ -434,17 +434,17 @@ function admin_page_summary(&$a) {
 
        logger('accounts: '.print_r($accounts,true),LOGGER_DATA);
 
-       $r = q("SELECT COUNT(`id`) AS `count` FROM `register`");
+       $r = qu("SELECT COUNT(`id`) AS `count` FROM `register`");
        $pending = $r[0]['count'];
 
-       $r = q("SELECT COUNT(*) AS `total` FROM `deliverq` WHERE 1");
+       $r = qu("SELECT COUNT(*) AS `total` FROM `deliverq` WHERE 1");
        $deliverq = (($r) ? $r[0]['total'] : 0);
 
-       $r = q("SELECT COUNT(*) AS `total` FROM `queue` WHERE 1");
+       $r = qu("SELECT COUNT(*) AS `total` FROM `queue` WHERE 1");
        $queue = (($r) ? $r[0]['total'] : 0);
 
        if (get_config('system','worker')) {
-               $r = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE 1");
+               $r = qu("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE 1");
                $workerqueue = (($r) ? $r[0]['total'] : 0);
        } else {
                $workerqueue = 0;
@@ -820,7 +820,7 @@ function admin_page_site_post(&$a) {
 function admin_page_site(&$a) {
 
        /* Installed langs */
-       $lang_choices = get_avaiable_languages();
+       $lang_choices = get_available_languages();
 
        if(strlen(get_config('system','directory_submit_url')) AND
                !strlen(get_config('system','directory'))) {
@@ -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;
@@ -1269,7 +1271,7 @@ function admin_page_users(&$a){
 
 
        /* get users */
-       $total = q("SELECT COUNT(*) AS `total` FROM `user` WHERE 1");
+       $total = qu("SELECT COUNT(*) AS `total` FROM `user` WHERE 1");
        if(count($total)) {
                $a->set_pager_total($total[0]['total']);
                $a->set_pager_itemspage(100);
@@ -1277,14 +1279,14 @@ function admin_page_users(&$a){
 
        /* ordering */
        $valid_orders = array(
-               'contact.name', 
+               'contact.name',
                'user.email',
                'user.register_date',
                'user.login_date',
-               'lastitem.lastitem_date',
+               'lastitem_date',
                'user.page-flags'
        );
-       
+
        $order = "contact.name";
        $order_direction = "+";
        if (x($_GET,'o')){
@@ -1293,38 +1295,28 @@ function admin_page_users(&$a){
                        $order_direction = "-";
                        $new_order = substr($new_order,1);
                }
-               
+
                if (in_array($new_order, $valid_orders)){
                        $order = $new_order;
                }
                if (x($_GET,'d')){
                        $new_direction = $_GET['d'];
-                       
                }
        }
        $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
-                               ",
+
+       $users = qu("SELECT `user`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`account_expired`, `contact`.`last-item` 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();
-                               
+
        $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
        $_setup_users = function ($e) use ($adminlist){
                $accounts = array(