X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fuexport.php;h=3114add7e4a56ae325ce024b379fd232a053f9fe;hb=4a7c3b9eefd381bb5c77a96a4311ceb558a1c1a5;hp=f216f551fa191f412bc66bdf408cb45933e2afea;hpb=776552226b62da07d41b4d60c5e387f5875df5b8;p=friendica.git

diff --git a/mod/uexport.php b/mod/uexport.php
index f216f551fa..3114add7e4 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -1,59 +1,15 @@
 <?php
 
-
 function uexport_init(&$a){
 	if(! local_user())
 		killme();
-        
-	$tabs = array(
-		array(
-			'label'	=> t('Account settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings',
-			'selected'	=> '',
-		),	
-		array(
-			'label'	=> t('Display settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/display',
-			'selected'	=>'',
-		),	
-		
-		array(
-			'label'	=> t('Connector settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
-			'selected'	=> '',
-		),
-		array(
-			'label'	=> t('Plugin settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/addon',
-			'selected'	=> '',
-		),
-		array(
-			'label' => t('Connected apps'),
-			'url' => $a->get_baseurl(true) . '/settings/oauth',
-			'selected' => '',
-		),
-		array(
-			'label' => t('Export personal data'),
-			'url' => $a->get_baseurl(true) . '/uexport',
-			'selected' => 'active'
-		),
-		array(
-			'label' => t('Remove account'),
-			'url' => $a->get_baseurl(true) . '/removeme',
-			'selected' => ''
-		)
-	);
-	
-	$tabtpl = get_markup_template("generic_links_widget.tpl");
-	$a->page['aside'] = replace_macros($tabtpl, array(
-		'$title' => t('Settings'),
-		'$class' => 'settings-widget',
-		'$items' => $tabs,
-	));
+
+	require_once("mod/settings.php");
+        settings_init($a);
 }
 
 function uexport_content(&$a){
-    
+
     if ($a->argc > 1) {
         header("Content-type: application/json");
         header('Content-Disposition: attachment; filename="'.$a->user['nickname'].'.'.$a->argv[1].'"');
@@ -70,25 +26,26 @@ function uexport_content(&$a){
       * 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)')),
+            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);
-        
+
     $tpl = get_markup_template("uexport.tpl");
     return replace_macros($tpl, array(
         '$baseurl' => $a->get_baseurl(),
         '$title' => t('Export personal data'),
         '$options' => $options
     ));
-    
-    
+
+
 }
 
 function _uexport_multirow($query) {
 	$result = array();
 	$r = q($query);
-	if(count($r)) {
+//	if(count($r)) {
+	if ($r){
 		foreach($r as $rr){
             $p = array();
 			foreach($rr as $k => $v)
@@ -102,7 +59,7 @@ function _uexport_multirow($query) {
 function _uexport_row($query) {
 	$result = array();
 	$r = q($query);
-	if(count($r)) {
+	if ($r) {
 		foreach($r as $rr)
 			foreach($rr as $k => $v)
 				$result[$k] = $v;
@@ -117,7 +74,7 @@ function uexport_account($a){
 	$user = _uexport_row(
         sprintf( "SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval(local_user()) )
 	);
-    
+
 	$contact = _uexport_multirow(
         sprintf( "SELECT * FROM `contact` WHERE `uid` = %d ",intval(local_user()) )
 	);
@@ -128,29 +85,29 @@ function uexport_account($a){
 	);
 
     $photo = _uexport_multirow(
-        sprintf( "SELECT * FROM photo WHERE uid = %d AND profile = 1", intval(local_user()) )
+        sprintf( "SELECT * FROM `photo` WHERE uid = %d AND profile = 1", intval(local_user()) )
     );
     foreach ($photo as &$p) $p['data'] = bin2hex($p['data']);
 
     $pconfig = _uexport_multirow(
-        sprintf( "SELECT * FROM pconfig WHERE uid = %d",intval(local_user()) )
+        sprintf( "SELECT * FROM `pconfig` WHERE uid = %d",intval(local_user()) )
     );
 
     $group = _uexport_multirow(
-        sprintf( "SELECT * FROM group WHERE uid = %d",intval(local_user()) )
+        sprintf( "SELECT * FROM `group` WHERE uid = %d",intval(local_user()) )
     );
-    
+
     $group_member = _uexport_multirow(
-        sprintf( "SELECT * FROM group_member WHERE uid = %d",intval(local_user()) )
+        sprintf( "SELECT * FROM `group_member` WHERE uid = %d",intval(local_user()) )
     );
 
 	$output = array(
         'version' => FRIENDICA_VERSION,
         'schema' => DB_UPDATE_VERSION,
         'baseurl' => $a->get_baseurl(),
-        'user' => $user, 
-        'contact' => $contact, 
-        'profile' => $profile, 
+        'user' => $user,
+        'contact' => $contact,
+        'profile' => $profile,
         'photo' => $photo,
         'pconfig' => $pconfig,
         'group' => $group,
@@ -166,8 +123,9 @@ function uexport_account($a){
  * echoes account data and items as separated json, one per line
  */
 function uexport_all(&$a) {
-    
-    uexport_account($a);
+
+	uexport_account($a);
+	echo "\n";
 
 	$r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ",
 		intval(local_user())
@@ -184,14 +142,14 @@ function uexport_all(&$a) {
 			intval($x),
 			intval(500)
 		);
-		if(count($r)) {
+		/*if(count($r)) {
 			foreach($r as $rr)
 				foreach($rr as $k => $v)
 					$item[][$k] = $v;
-		}
+		}*/
 
-		$output = array('item' => $item);
-		echo json_encode($output);
+		$output = array('item' => $r);
+		echo json_encode($output)."\n";
 	}
 
-}
\ No newline at end of file
+}