X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fuexport.php;h=5a897f4abe23355a4aab37f69b82155f7a5dbdd3;hb=3359f3f5c7ecc4b6a34c4fcfc095ab4dd5fab0f1;hp=b00f9bdf927e44188e3b8c8aea2f84a77b08ac75;hpb=fd5d058156185c6c02c1285a794139d07f4d13ce;p=friendica.git

diff --git a/mod/uexport.php b/mod/uexport.php
index b00f9bdf92..5a897f4abe 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -1,6 +1,8 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function uexport_init(App $a) {
 	if (!local_user()) {
@@ -42,7 +44,7 @@ function uexport_content(App $a) {
 
 	$tpl = get_markup_template("uexport.tpl");
 	return replace_macros($tpl, array(
-		'$baseurl' => App::get_baseurl(),
+		'$baseurl' => System::baseUrl(),
 		'$title' => t('Export personal data'),
 		'$options' => $options
 	));
@@ -51,7 +53,7 @@ function uexport_content(App $a) {
 function _uexport_multirow($query) {
 	$result = array();
 	$r = q($query);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$p = array();
 			foreach ($rr as $k => $v) {
@@ -66,7 +68,7 @@ function _uexport_multirow($query) {
 function _uexport_row($query) {
 	$result = array();
 	$r = q($query);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			foreach ($rr as $k => $v) {
 				$result[$k] = $v;
@@ -113,7 +115,7 @@ function uexport_account($a) {
 	$output = array(
 		'version' => FRIENDICA_VERSION,
 		'schema' => DB_UPDATE_VERSION,
-		'baseurl' => App::get_baseurl(),
+		'baseurl' => System::baseUrl(),
 		'user' => $user,
 		'contact' => $contact,
 		'profile' => $profile,
@@ -124,7 +126,7 @@ function uexport_account($a) {
 	);
 
 	//echo "<pre>"; var_dump(json_encode($output)); killme();
-	echo json_encode($output);
+	echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR);
 }
 
 /**
@@ -138,7 +140,7 @@ function uexport_all(App $a) {
 	$r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ",
 		intval(local_user())
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$total = $r[0]['total'];
 	}
 	// chunk the output to avoid exhausting memory
@@ -152,6 +154,6 @@ function uexport_all(App $a) {
 		);
 
 		$output = array('item' => $r);
-		echo json_encode($output) . "\n";
+		echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR). "\n";
 	}
 }