Merge remote-tracking branch 'upstream/develop' into 1701-curl-range

Conflicts:
	mod/oexchange.php
	mod/uimport.php

diff --cc include/network.php
index 6bec9934edd921b169cbac1700fd6ca9daff6a5d,969f583828851a59ceb55c97d072a6bae5ef325a..b7839de218e213d0462ecd72eef24f507125d4bf
--- 1/include/network.php
--- 2/include/network.php
+++ b/include/network.php
@@@ -4,9 -4,6 +4,8 @@@
   * @file include/network.php
   */
  
- use \Friendica\Core\PConfig;
 +use \Friendica\Core\Config;
 +
  require_once("include/xml.php");
  require_once('include/Probe.php');
  

diff --cc mod/oexchange.php
index 28a9f4a2418b97e6ee342233b9fd4f86cad031be,47547e691ceec4728bc0a4cab06a612e8fd8713d..4f2d7e0eb8449e97a0c48f8e1332367b05f46d97
--- 1/mod/oexchange.php
--- 2/mod/oexchange.php
+++ b/mod/oexchange.php
@@@ -1,17 -1,20 +1,16 @@@
  <?php
--
- function oexchange_init(App &$a) {
 -
+ function oexchange_init(App $a) {
  
 -      if(($a->argc > 1) && ($a->argv[1] === 'xrd')) {
 +      if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
                $tpl = get_markup_template('oexchange_xrd.tpl');
  
                $o = replace_macros($tpl, array('$base' => App::get_baseurl()));
                echo $o;
                killme();
        }
 -
 -
  }
  
- function oexchange_content(App &$a) {
+ function oexchange_content(App $a) {
  
        if (! local_user()) {
                $o = login(false);

diff --cc mod/uexport.php
index 8b487380ece4b6296118ed85575d28d95344fea2,d886e13b27f115d06d8538854e83592cfa1c72b8..cada539bcd251071f4d7ce3fedbb27c87aebb4ee
--- 1/mod/uexport.php
--- 2/mod/uexport.php
+++ b/mod/uexport.php
@@@ -10,41 -10,37 +10,41 @@@ function uexport_init(App $a) 
  }
  
  /// @TODO Change space -> tab where wanted
- function uexport_content(App &$a){
+ 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].'"');
 -        switch($a->argv[1]) {
 -            case "backup": uexport_all($a); killme(); break;
 -            case "account": uexport_account($a); killme(); break;
 -            default:
 -                killme();
 -        }
 -    }
 -
 -    /**
 -      * 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);
 -
 -    $tpl = get_markup_template("uexport.tpl");
 -    return replace_macros($tpl, array(
 -        '$baseurl' => App::get_baseurl(),
 -        '$title' => t('Export personal data'),
 -        '$options' => $options
 -    ));
 -
 +      if ($a->argc > 1) {
 +              header("Content-type: application/json");
 +              header('Content-Disposition: attachment; filename="'.$a->user['nickname'].'.'.$a->argv[1].'"');
 +              switch($a->argv[1]) {
 +                      case "backup":
 +                              uexport_all($a);
 +                              killme();
 +                              break;
 +                      case "account":
 +                              uexport_account($a);
 +                              killme();
 +                              break;
 +                      default:
 +                              killme();
 +              }
 +      }
  
 +      /**
 +       * 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);
 +
 +      $tpl = get_markup_template("uexport.tpl");
 +      return replace_macros($tpl, array(
 +              '$baseurl' => App::get_baseurl(),
 +              '$title' => t('Export personal data'),
 +              '$options' => $options
 +      ));
  }
  
  function _uexport_multirow($query) {

diff --cc mod/uimport.php
index 55e04c5338785b46564b14bfe820d4ef196b1474,e9934393e8a29e41435d32453f709124bbd872a0..336ec1c2dd74e131b4e12af37b22d5ce979023cf
--- 1/mod/uimport.php
--- 2/mod/uimport.php
+++ b/mod/uimport.php
@@@ -6,39 -6,39 +6,39 @@@
  \r
  require_once("include/uimport.php");\r
  \r
- function uimport_post(App &$a) {\r
+ function uimport_post(App $a) {\r
        switch($a->config['register_policy']) {\r
 -        case REGISTER_OPEN:\r
 -            $blocked = 0;\r
 -            $verified = 1;\r
 -            break;\r
 +      case REGISTER_OPEN:\r
 +              $blocked = 0;\r
 +              $verified = 1;\r
 +              break;\r
  \r
 -        case REGISTER_APPROVE:\r
 -            $blocked = 1;\r
 -            $verified = 0;\r
 -            break;\r
 +      case REGISTER_APPROVE:\r
 +              $blocked = 1;\r
 +              $verified = 0;\r
 +              break;\r
  \r
 -        default:\r
 -        case REGISTER_CLOSED:\r
 -            if((! x($_SESSION,'authenticated') && (! x($_SESSION,'administrator')))) {\r
 -                notice( t('Permission denied.') . EOL );\r
 -                return;\r
 -            }\r
 -            $blocked = 1;\r
 -            $verified = 0;\r
 -            break;\r
 +      default:\r
 +      case REGISTER_CLOSED:\r
 +              if ((! x($_SESSION,'authenticated') && (! x($_SESSION,'administrator')))) {\r
 +                      notice( t('Permission denied.') . EOL );\r
 +                      return;\r
 +              }\r
 +              $blocked = 1;\r
 +              $verified = 0;\r
 +              break;\r
        }\r
  \r
 -    if (x($_FILES,'accountfile')){\r
 -        /// @TODO Pass $blocked / $verified, send email to admin on REGISTER_APPROVE\r
 -        import_account($a, $_FILES['accountfile']);\r
 -        return;\r
 -    }\r
 +      if (x($_FILES,'accountfile')){\r
 +              /// @TODO Pass $blocked / $verified, send email to admin on REGISTER_APPROVE\r
 +              import_account($a, $_FILES['accountfile']);\r
 +              return;\r
 +      }\r
  }\r
  \r
- function uimport_content(App &$a) {\r
+ function uimport_content(App $a) {\r
  \r
 -      if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {\r
 +      if ((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {\r
                notice("Permission denied." . EOL);\r
                return;\r
        }\r