X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Ffriendica.php;h=f2cb5c50b6fe1b55f9ad07053da15d1d2dcc03c0;hb=bedab33e0b3a1636332c8f07c157a357bf3fd459;hp=f1b0fb4761b83fe782df41f379b8cf2c3a8e0d61;hpb=2fa6cc000013089d59d9cc221b544ed1a7a4cd37;p=friendica.git

diff --git a/mod/friendica.php b/mod/friendica.php
index f1b0fb4761..f2cb5c50b6 100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -8,7 +8,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 function friendica_init(App $a)
 {
@@ -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'],
@@ -34,7 +34,7 @@ function friendica_init(App $a)
 		$visible_addons = [];
 		if (is_array($a->addons) && count($a->addons)) {
 			$r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				foreach ($r as $rr) {
 					$visible_addons[] = $rr['name'];
 				}
@@ -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>';
@@ -93,7 +94,7 @@ function friendica_content(App $a)
 	$visible_addons = [];
 	if (is_array($a->addons) && count($a->addons)) {
 		$r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r as $rr) {
 				$visible_addons[] = $rr['name'];
 			}