Merge pull request #2739 from annando/1608-session-close

[friendica.git] / mod / uexport.php

diff --git a/mod/uexport.php b/mod/uexport.php
index eacf300f3f514baccffae6cfef0581f35a9144d9..3114add7e4a56ae325ce024b379fd232a053f9fe 100644 (file)
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -1,65 +1,14 @@
 <?php
 
-if(! function_exists('uexport_init')) {
-function uexport_init(&$a) {
+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',
-                       '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,
-       ));
-*/
-}
 }
 
-if(! function_exists('uexport_content')) {
-function uexport_content(&$a) {
+function uexport_content(&$a){
 
     if ($a->argc > 1) {
         header("Content-type: application/json");
@@ -77,8 +26,8 @@ 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);
 
@@ -89,10 +38,9 @@ function uexport_content(&$a) {
         '$options' => $options
     ));
 
-}
+
 }
 
-if(! function_exists('_uexport_multirow')) {
 function _uexport_multirow($query) {
        $result = array();
        $r = q($query);
@@ -107,9 +55,7 @@ function _uexport_multirow($query) {
        }
     return $result;
 }
-}
 
-if(! function_exists('_uexport_row')) {
 function _uexport_row($query) {
        $result = array();
        $r = q($query);
@@ -121,10 +67,9 @@ function _uexport_row($query) {
        }
     return $result;
 }
-}
 
-if(! function_exists('uexport_account')) {
-function uexport_account($a) {
+
+function uexport_account($a){
 
        $user = _uexport_row(
         sprintf( "SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval(local_user()) )
@@ -171,16 +116,15 @@ function uexport_account($a) {
 
     //echo "<pre>"; var_dump(json_encode($output)); killme();
        echo json_encode($output);
-}
+
 }
 
 /**
  * echoes account data and items as separated json, one per line
  */
-if(! function_exists('uexport_all')) {
 function uexport_all(&$a) {
 
-    uexport_account($a);
+       uexport_account($a);
        echo "\n";
 
        $r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ",
@@ -207,5 +151,5 @@ function uexport_all(&$a) {
                $output = array('item' => $r);
                echo json_encode($output)."\n";
        }
-}
+
 }