Rename dbesc to DBA::escape

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index 03035d9e11cbf06e87451d1864142323a89724fe..ec91a8a22bb47c4a8d33878d2c01b8feadf1ccee 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -15,7 +15,6 @@ use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Database\DBStructure;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
@@ -479,7 +478,7 @@ function admin_page_contactblock(App $a)
 
        $statement = DBA::select('contact', [], $condition, ['limit' => [$a->pager['start'], $a->pager['itemspage']]]);
 
-       $contacts = DBA::inArray($statement);
+       $contacts = DBA::toArray($statement);
 
        $t = get_markup_template('admin/contactblock.tpl');
        $o = replace_macros($t, [
@@ -782,12 +781,11 @@ function admin_page_workerqueue(App $a)
 {
        // get jobs from the workerqueue table
        $statement = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], ['done' => 0], ['order'=> ['priority']]);
-       $r = DBA::inArray($statement);
+       $r = DBA::toArray($statement);
 
        for($i = 0; $i < count($r); $i++) {
-               $r[$i]['parameter'] = stripslashes(implode(': ', explode('","', $r[$i]['parameter'])));
-               $r[$i]['parameter'] = substr($r[$i]['parameter'], 2, -2);
-       }
+               $r[$i]['parameter'] = implode(json_decode($r[$i]['parameter']), ': ');
+       }
 
        $t = get_markup_template('admin/workerqueue.tpl');
        return replace_macros($t, [
@@ -817,10 +815,10 @@ function admin_page_workerqueue(App $a)
 function admin_page_summary(App $a)
 {
        // are there MyISAM tables in the DB? If so, trigger a warning message
-       $r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1", dbesc(DBA::database_name()));
+       $r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1", DBA::escape(DBA::databaseName()));
        $showwarning = false;
        $warningtext = [];
-       if (DBM::is_result($r)) {
+       if (DBA::isResult($r)) {
                $showwarning = true;
                $warningtext[] = L10n::t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />', 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
        }
@@ -950,8 +948,8 @@ function admin_page_site_post(App $a)
 
                function update_table($table_name, $fields, $old_url, $new_url)
                {
-                       $dbold = dbesc($old_url);
-                       $dbnew = dbesc($new_url);
+                       $dbold = DBA::escape($old_url);
+                       $dbnew = DBA::escape($new_url);
 
                        $upd = [];
                        foreach ($fields as $f) {
@@ -962,7 +960,7 @@ function admin_page_site_post(App $a)
 
                        $r = q("UPDATE %s SET %s;", $table_name, $upds);
 
-                       if (!DBM::is_result($r)) {
+                       if (!DBA::isResult($r)) {
                                notice("Failed updating '$table_name': " . DBA::errorMessage());
                                goaway('admin/site');
                        }
@@ -1582,7 +1580,7 @@ function admin_page_dbsync(App $a)
        $failed = [];
        $r = q("SELECT `k`, `v` FROM `config` WHERE `cat` = 'database' ");
 
-       if (DBM::is_result($r)) {
+       if (DBA::isResult($r)) {
                foreach ($r as $rr) {
                        $upd = intval(substr($rr['k'], 7));
                        if ($upd < 1139 || $rr['v'] === 'success') {
@@ -1732,7 +1730,7 @@ function admin_page_users(App $a)
        if ($a->argc > 2) {
                $uid = $a->argv[3];
                $user = DBA::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]);
-               if (!DBM::is_result($user)) {
+               if (!DBA::isResult($user)) {
                        notice('User not found' . EOL);
                        goaway('admin/users');
                        return ''; // NOTREACHED
@@ -1808,25 +1806,23 @@ function admin_page_users(App $a)
        $adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
        $_setup_users = function ($e) use ($adminlist) {
                $page_types = [
-                       PAGE_NORMAL => L10n::t('Normal Account Page'),
-                       PAGE_SOAPBOX => L10n::t('Soapbox Page'),
+                       PAGE_NORMAL    => L10n::t('Normal Account Page'),
+                       PAGE_SOAPBOX   => L10n::t('Soapbox Page'),
                        PAGE_COMMUNITY => L10n::t('Public Forum'),
-                       PAGE_FREELOVE => L10n::t('Automatic Friend Page'),
-                       PAGE_PRVGROUP => L10n::t('Private Forum')
+                       PAGE_FREELOVE  => L10n::t('Automatic Friend Page'),
+                       PAGE_PRVGROUP  => L10n::t('Private Forum')
                ];
                $account_types = [
-                       ACCOUNT_TYPE_PERSON => L10n::t('Personal Page'),
+                       ACCOUNT_TYPE_PERSON       => L10n::t('Personal Page'),
                        ACCOUNT_TYPE_ORGANISATION => L10n::t('Organisation Page'),
-                       ACCOUNT_TYPE_NEWS => L10n::t('News Page'),
-                       ACCOUNT_TYPE_COMMUNITY => L10n::t('Community Forum')
+                       ACCOUNT_TYPE_NEWS         => L10n::t('News Page'),
+                       ACCOUNT_TYPE_COMMUNITY    => L10n::t('Community Forum')
                ];
 
-
-
-               $e['page-flags-raw'] = $e['page-flags'];
+               $e['page_flags_raw'] = $e['page-flags'];
                $e['page-flags'] = $page_types[$e['page-flags']];
 
-               $e['account-type-raw'] = ($e['page_flags_raw'] == 0) ? $e['account-type'] : -1;
+               $e['account_type_raw'] = ($e['page_flags_raw'] == 0) ? $e['account-type'] : -1;
                $e['account-type'] = ($e['page_flags_raw'] == 0) ? $account_types[$e['account-type']] : "";
 
                $e['register_date'] = Temporal::getRelativeDate($e['register_date']);
@@ -1835,8 +1831,10 @@ function admin_page_users(App $a)
                $e['is_admin'] = in_array($e['email'], $adminlist);
                $e['is_deletable'] = (intval($e['uid']) != local_user());
                $e['deleted'] = ($e['account_removed'] ? Temporal::getRelativeDate($e['account_expires_on']) : False);
+
                return $e;
        };
+
        $users = array_map($_setup_users, $users);
 
 
@@ -2357,11 +2355,12 @@ function admin_page_logs_post(App $a)
 function admin_page_logs(App $a)
 {
        $log_choices = [
-               LOGGER_NORMAL   => 'Normal',
-               LOGGER_TRACE    => 'Trace',
-               LOGGER_DEBUG    => 'Debug',
-               LOGGER_DATA     => 'Data',
-               LOGGER_ALL      => 'All'
+               LOGGER_WARNING => 'Warning',
+               LOGGER_INFO    => 'Info',
+               LOGGER_TRACE   => 'Trace',
+               LOGGER_DEBUG   => 'Debug',
+               LOGGER_DATA    => 'Data',
+               LOGGER_ALL     => 'All'
        ];
 
        if (ini_get('log_errors')) {