X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fuexport.php;h=17715ac35fcda08224265518760207f4aff63f14;hb=a876c208504af3ee801689886ec8cab8f3eeff00;hp=c1b3dd1e4b169e7a6f5c9ca3227f2306b9fdce0e;hpb=cdc8a3b68d524ae8f1476ba066410926f4f9c429;p=friendica.git

diff --git a/mod/uexport.php b/mod/uexport.php
index c1b3dd1e4b..17715ac35f 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -3,14 +3,15 @@
  * @file mod/uexport.php
  */
 use Friendica\App;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 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()) {
-		killme();
+		exit();
 	}
 
 	require_once("mod/settings.php");
@@ -25,14 +26,14 @@ function uexport_content(App $a) {
 		switch ($a->argv[1]) {
 			case "backup":
 				uexport_all($a);
-				killme();
+				exit();
 				break;
 			case "account":
 				uexport_account($a);
-				killme();
+				exit();
 				break;
 			default:
-				killme();
+				exit();
 		}
 	}
 
@@ -44,10 +45,10 @@ function uexport_content(App $a) {
 		['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 \x28photos are not exported\x29")],
 	];
-	Addon::callHooks('uexport_options', $options);
+	Hook::callAll('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;
@@ -129,12 +130,14 @@ function uexport_account($a) {
 		'group_member' => $group_member,
 	];
 
-	//echo "<pre>"; var_dump(json_encode($output)); killme();
 	echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR);
 }
 
 /**
  * echoes account data and items as separated json, one per line
+ *
+ * @param App $a
+ * @throws Exception
  */
 function uexport_all(App $a) {
 
@@ -145,13 +148,12 @@ 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 (DBA::isResult($r)) {
 		$total = $r[0]['total'];
 	}
 	// chunk the output to avoid exhausting memory
 
 	for ($x = 0; $x < $total; $x += 500) {
-		$item = [];
 		$r = q("SELECT * FROM `item` WHERE `uid` = %d LIMIT %d, %d",
 			intval(local_user()),
 			intval($x),