Functionality is now split

[friendica.git] / mod / friendica.php

diff --git a/mod/friendica.php b/mod/friendica.php
index 8c3e4485862b5ec97b42e58f05b190b3a86e8f01..f2cb5c50b6fe1b55f9ad07053da15d1d2dcc03c0 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -17,12 +17,12 @@ function friendica_init(App $a)
 
                $sql_extra = '';
                if (x($a->config, 'admin_nickname')) {
-                       $sql_extra = sprintf(" AND `nickname` = '%s' ", dbesc(Config::get('config', 'admin_nickname')));
+                       $sql_extra = sprintf(" AND `nickname` = '%s' ", DBA::escape(Config::get('config', 'admin_nickname')));
                }
                if (!empty(Config::get('config', 'admin_email'))) {
                        $adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
 
-                       $r = q("SELECT `username`, `nickname` FROM `user` WHERE `email` = '%s' $sql_extra", dbesc($adminlist[0]));
+                       $r = q("SELECT `username`, `nickname` FROM `user` WHERE `email` = '%s' $sql_extra", DBA::escape($adminlist[0]));
                        $admin = [
                                'name' => $r[0]['username'],
                                'profile'=> System::baseUrl() . '/profile/' . $r[0]['nickname'],
@@ -75,8 +75,9 @@ function friendica_content(App $a)
 {
        $o = '<h1>Friendica</h1>' . PHP_EOL;
        $o .= '<p>';
-       $o .= L10n::t('This is Friendica, version') . ' <strong>' . FRIENDICA_VERSION . '</strong> ';
-       $o .= L10n::t('running at web location') . ' ' . System::baseUrl();
+       $o .= L10n::t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
+               '<strong>' . FRIENDICA_VERSION . '</strong>', System::baseUrl(), '<strong>' . DB_UPDATE_VERSION . '</strong>',
+               '<strong>' . Config::get("system", "post_update_version") . '</strong>');
        $o .= '</p>' . PHP_EOL;
 
        $o .= '<p>';