Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / uexport.php

diff --git a/mod/uexport.php b/mod/uexport.php
index c6f76cfce5200004ac7e6541812e1b43c2e35348..f0d91eeab029f94b0e5609760b716b7b19d97c4d 100644 (file)
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -5,8 +5,9 @@
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 function uexport_init(App $a) {
        if (!local_user()) {
@@ -42,12 +43,12 @@ function uexport_content(App $a) {
         */
        $options = [
                ['uexport/account', L10n::t('Export account'), L10n::t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')],
-               ['uexport/backup', L10n::t('Export all'), L10n::t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')],
+               ['uexport/backup', L10n::t('Export all'), L10n::t("Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account \x28photos are not exported\x29")],
        ];
        Addon::callHooks('uexport_options', $options);
 
-       $tpl = get_markup_template("uexport.tpl");
-       return replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate("uexport.tpl");
+       return Renderer::replaceMacros($tpl, [
                '$baseurl' => System::baseUrl(),
                '$title' => L10n::t('Export personal data'),
                '$options' => $options
@@ -57,7 +58,7 @@ function uexport_content(App $a) {
 function _uexport_multirow($query) {
        $result = [];
        $r = q($query);
-       if (DBM::is_result($r)) {
+       if (DBA::isResult($r)) {
                foreach ($r as $rr) {
                        $p = [];
                        foreach ($rr as $k => $v) {
@@ -72,7 +73,7 @@ function _uexport_multirow($query) {
 function _uexport_row($query) {
        $result = [];
        $r = q($query);
-       if (DBM::is_result($r)) {
+       if (DBA::isResult($r)) {
                foreach ($r as $rr) {
                        foreach ($rr as $k => $v) {
                                $result[$k] = $v;
@@ -141,10 +142,11 @@ function uexport_all(App $a) {
        uexport_account($a);
        echo "\n";
 
+       $total = 0;
        $r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ",
                intval(local_user())
        );
-       if (DBM::is_result($r)) {
+       if (DBA::isResult($r)) {
                $total = $r[0]['total'];
        }
        // chunk the output to avoid exhausting memory