Normalize App parameter declaration (mod folder, 3 out of 3)

[friendica.git] / mod / uexport.php

diff --git a/mod/uexport.php b/mod/uexport.php
index 85a3fef5b6f3c05c5e4b3d251a683c78b50f26fe..d886e13b27f115d06d8538854e83592cfa1c72b8 100644 (file)
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -1,58 +1,17 @@
 <?php
 
-function uexport_init(&$a){
-       if(! local_user())
+function uexport_init(App $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){
-    
+/// @TODO Change space -> tab where wanted
+function uexport_content(App $a) {
+
     if ($a->argc > 1) {
         header("Content-type: application/json");
         header('Content-Disposition: attachment; filename="'.$a->user['nickname'].'.'.$a->argv[1].'"');
@@ -69,25 +28,25 @@ 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(),
+        '$baseurl' => App::get_baseurl(),
         '$title' => t('Export personal data'),
         '$options' => $options
     ));
-    
-    
+
+
 }
 
 function _uexport_multirow($query) {
        $result = array();
        $r = q($query);
-//     if(count($r)) {
+//     if (dbm::is_result($r)) {
        if ($r){
                foreach($r as $rr){
             $p = array();
@@ -117,7 +76,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()) )
        );
@@ -139,7 +98,7 @@ function uexport_account($a){
     $group = _uexport_multirow(
         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()) )
     );
@@ -147,10 +106,10 @@ function uexport_account($a){
        $output = array(
         'version' => FRIENDICA_VERSION,
         'schema' => DB_UPDATE_VERSION,
-        'baseurl' => $a->get_baseurl(),
-        'user' => $user, 
-        'contact' => $contact, 
-        'profile' => $profile, 
+        'baseurl' => App::get_baseurl(),
+        'user' => $user,
+        'contact' => $contact,
+        'profile' => $profile,
         'photo' => $photo,
         'pconfig' => $pconfig,
         'group' => $group,
@@ -165,14 +124,15 @@ function uexport_account($a){
 /**
  * echoes account data and items as separated json, one per line
  */
-function uexport_all(&$a) {
-    
-    uexport_account($a);
+function uexport_all(App $a) {
+
+       uexport_account($a);
+       echo "\n";
 
        $r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ",
                intval(local_user())
        );
-       if(count($r))
+       if (dbm::is_result($r))
                $total = $r[0]['total'];
 
        // chunk the output to avoid exhausting memory
@@ -184,14 +144,14 @@ function uexport_all(&$a) {
                        intval($x),
                        intval(500)
                );
-               if(count($r)) {
+               /*if (dbm::is_result($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
+}