Fix formatting in mod/settings

[friendica.git] / mod / uexport.php

diff --git a/mod/uexport.php b/mod/uexport.php
index d00cb14ecd9e99f82bd90d185029f09b06c199a8..5a897f4abe23355a4aab37f69b82155f7a5dbdd3 100644 (file)
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function uexport_init(App $a) {
        if (!local_user()) {
@@ -43,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
        ));
@@ -52,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) {
@@ -67,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;
@@ -114,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,
@@ -125,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);
 }
 
 /**
@@ -139,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
@@ -153,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";
        }
 }