X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fuexport.php;h=c1b3dd1e4b169e7a6f5c9ca3227f2306b9fdce0e;hb=5c63de1692c5be4ca457e03fc037683909a44348;hp=e0b9be91f393ea2b222bb877fe3bf81fb550bd77;hpb=94f6f12ba3a5c1d506255803e709cb640147ebf4;p=friendica.git

diff --git a/mod/uexport.php b/mod/uexport.php
index e0b9be91f3..c1b3dd1e4b 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -1,7 +1,12 @@
 <?php
-
+/**
+ * @file mod/uexport.php
+ */
 use Friendica\App;
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function uexport_init(App $a) {
 	if (!local_user()) {
@@ -35,26 +40,26 @@ function uexport_content(App $a) {
 	 * options shown on "Export personal data" page
 	 * list of array( 'link url', 'link text', 'help text' )
 	 */
-	$options = array(
-		array('uexport/account', t('Export account'), t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')),
-		array('uexport/backup', t('Export all'), 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)')),
-	);
-	call_hooks('uexport_options', $options);
+	$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 \x28photos are not exported\x29")],
+	];
+	Addon::callHooks('uexport_options', $options);
 
 	$tpl = get_markup_template("uexport.tpl");
-	return replace_macros($tpl, array(
+	return replace_macros($tpl, [
 		'$baseurl' => System::baseUrl(),
-		'$title' => t('Export personal data'),
+		'$title' => L10n::t('Export personal data'),
 		'$options' => $options
-	));
+	]);
 }
 
 function _uexport_multirow($query) {
-	$result = array();
+	$result = [];
 	$r = q($query);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
-			$p = array();
+			$p = [];
 			foreach ($rr as $k => $v) {
 				$p[$k] = $v;
 			}
@@ -65,9 +70,9 @@ function _uexport_multirow($query) {
 }
 
 function _uexport_row($query) {
-	$result = array();
+	$result = [];
 	$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;
@@ -108,10 +113,10 @@ function uexport_account($a) {
 	);
 
 	$group_member = _uexport_multirow(
-		sprintf("SELECT * FROM `group_member` WHERE uid = %d", intval(local_user()))
+		sprintf("SELECT `group_member`.`gid`, `group_member`.`contact-id` FROM `group_member` INNER JOIN `group` ON `group`.`id` = `group_member`.`gid` WHERE `group`.`uid` = %d", intval(local_user()))
 	);
 
-	$output = array(
+	$output = [
 		'version' => FRIENDICA_VERSION,
 		'schema' => DB_UPDATE_VERSION,
 		'baseurl' => System::baseUrl(),
@@ -122,10 +127,10 @@ function uexport_account($a) {
 		'pconfig' => $pconfig,
 		'group' => $group,
 		'group_member' => $group_member,
-	);
+	];
 
 	//echo "<pre>"; var_dump(json_encode($output)); killme();
-	echo json_encode($output);
+	echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR);
 }
 
 /**
@@ -136,23 +141,24 @@ 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 (DBM::is_result($r)) {
 		$total = $r[0]['total'];
 	}
 	// chunk the output to avoid exhausting memory
 
 	for ($x = 0; $x < $total; $x += 500) {
-		$item = array();
+		$item = [];
 		$r = q("SELECT * FROM `item` WHERE `uid` = %d LIMIT %d, %d",
 			intval(local_user()),
 			intval($x),
 			intval(500)
 		);
 
-		$output = array('item' => $r);
-		echo json_encode($output) . "\n";
+		$output = ['item' => $r];
+		echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR). "\n";
 	}
 }