Replace dba::select(limit => 1) by dba::selectOne

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index df3fcf7244c2b21dfa9723f7c60cc9a0e3ab3540..952956440ac8d54f7e95db93183c05a579132037 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -895,7 +895,7 @@ function admin_page_site_post(App $a)
        $allowed_sites          =       ((x($_POST,'allowed_sites'))            ? notags(trim($_POST['allowed_sites']))         : '');
        $allowed_email          =       ((x($_POST,'allowed_email'))            ? notags(trim($_POST['allowed_email']))         : '');
        $no_oembed_rich_content = x($_POST,'no_oembed_rich_content');
-       $allowed_oembed         =       ((x($_POST,'allowed_embed'))            ? notags(trim($_POST['allowed_embed']))         : '');
+       $allowed_oembed         =       ((x($_POST,'allowed_oembed'))           ? notags(trim($_POST['allowed_oembed']))                : '');
        $block_public           =       ((x($_POST,'block_public'))             ? True                                          : False);
        $force_publish          =       ((x($_POST,'publish_all'))              ? True                                          : False);
        $global_directory       =       ((x($_POST,'directory'))                ? notags(trim($_POST['directory']))             : '');
@@ -1263,7 +1263,7 @@ function admin_page_site(App $a)
                '$banner'               => array('banner', t("Banner/Logo"), $banner, ""),
                '$shortcut_icon'        => array('shortcut_icon', t("Shortcut icon"), Config::get('system','shortcut_icon'),  t("Link to an icon that will be used for browsers.")),
                '$touch_icon'           => array('touch_icon', t("Touch icon"), Config::get('system','touch_icon'),  t("Link to an icon that will be used for tablets and mobiles.")),
-               '$info'                 => array('info', t('Additional Info'), $info, t('For public servers: you can add additional information here that will be listed at %s/servers.', System::baseUrl()), get_server()),
+               '$info'                 => array('info', t('Additional Info'), $info, t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())),
                '$language'             => array('language', t("System language"), Config::get('system','language'), "", $lang_choices),
                '$theme'                => array('theme', t("System theme"), Config::get('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
                '$theme_mobile'         => array('theme_mobile', t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), t("Theme for mobile devices"), $theme_choices_mobile),
@@ -1551,8 +1551,8 @@ function admin_page_users(App $a)
 {
        if ($a->argc > 2) {
                $uid = $a->argv[3];
-               $user = q("SELECT `username`, `blocked` FROM `user` WHERE `uid` = %d", intval($uid));
-               if (count($user) == 0) {
+               $user = dba::selectOne('user', ['username', 'blocked'], ['uid' => $uid]);
+               if (DBM::is_result($user)) {
                        notice('User not found' . EOL);
                        goaway('admin/users');
                        return ''; // NOTREACHED
@@ -1563,15 +1563,15 @@ function admin_page_users(App $a)
                                // delete user
                                User::remove($uid);
 
-                               notice(t("User '%s' deleted", $user[0]['username']) . EOL);
+                               notice(t("User '%s' deleted", $user['username']) . EOL);
                                break;
                        case "block":
                                check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
                                q("UPDATE `user` SET `blocked` = %d WHERE `uid` = %s",
-                                       intval(1 - $user[0]['blocked']),
+                                       intval(1 - $user['blocked']),
                                        intval($uid)
                                );
-                               notice(sprintf(($user[0]['blocked'] ? t("User '%s' unblocked") : t("User '%s' blocked")), $user[0]['username']) . EOL);
+                               notice(sprintf(($user['blocked'] ? t("User '%s' unblocked") : t("User '%s' blocked")), $user['username']) . EOL);
                                break;
                }
                goaway('admin/users');
@@ -2120,7 +2120,7 @@ function admin_page_themes(App $a)
                '$function'            => 'themes',
                '$plugins'             => $plugins,
                '$pcount'              => count($themes),
-               '$noplugshint'         => t('No themes found on the system. They should be paced in %1$s', '<code>/view/themes</code>'),
+               '$noplugshint'         => t('No themes found on the system. They should be placed in %1$s', '<code>/view/themes</code>'),
                '$experimental'        => t('[Experimental]'),
                '$unsupported'         => t('[Unsupported]'),
                '$form_security_token' => get_form_security_token("admin_themes"),