Merge pull request #2170 from fabrixxm/issue_1953

[friendica.git] / mod / uexport.php

diff --git a/mod/uexport.php b/mod/uexport.php
index f216f551fa191f412bc66bdf408cb45933e2afea..a44620a97657371691b8512573d066f4ea754632 100644 (file)
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -1,22 +1,25 @@
 <?php
 
-
 function uexport_init(&$a){
        if(! local_user())
                killme();
-        
+
+       require_once("mod/settings.php");
+        settings_init($a);
+
+/*
        $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',
@@ -43,17 +46,18 @@ function uexport_init(&$a){
                        'selected' => ''
                )
        );
-       
+
        $tabtpl = get_markup_template("generic_links_widget.tpl");
        $a->page['aside'] = replace_macros($tabtpl, array(
                '$title' => t('Settings'),
                '$class' => 'settings-widget',
                '$items' => $tabs,
        ));
+*/
 }
 
 function uexport_content(&$a){
-    
+
     if ($a->argc > 1) {
         header("Content-type: application/json");
         header('Content-Disposition: attachment; filename="'.$a->user['nickname'].'.'.$a->argv[1].'"');
@@ -74,21 +78,22 @@ function uexport_content(&$a){
             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 +107,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 +122,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,20 +133,20 @@ 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(
@@ -168,6 +173,7 @@ function uexport_account($a){
 function uexport_all(&$a) {
     
     uexport_account($a);
+       echo "\n";
 
        $r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ",
                intval(local_user())
@@ -184,14 +190,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
+}