Remove remaining references of unused urlpath config key

diff --git a/doc/Config.md b/doc/Config.md
index 3e0459f9c8aa480f9fa6429fde8164a34b365f45..afd4e65277d0c0671e678737e68e7522a9e399c1 100644 (file)
--- a/doc/Config.md
+++ b/doc/Config.md
@@ -43,7 +43,7 @@ Some examples of common known configuration files:
 Addons can define their own default configuration values in `addon/[addon]/config/[addon].config.php` which is loaded when the addon is activated.
 
 If needed, an alternative `config` path can be used by using the `FRIENDICA_CONFIG_DIR` environment variable (full path required!).
-This is useful in case of hardening the system by separating configuration from program binaries. 
+This is useful in case of hardening the system by separating configuration from program binaries.
 
 ### Static Configuration location
 
@@ -160,16 +160,6 @@ $a->config['register_policy'] = REGISTER_CLOSED;
         </tr>
                <tr>
                        <td><pre>
-$a->path = "value";
-</pre></td>
-                       <td><pre>
-'system' => [
-       'urlpath' => 'value',
-],
-</pre></td>
-               </tr>
-               <tr>
-                       <td><pre>
 $default_timezone = "value";
 </pre></td>
                        <td><pre>
@@ -313,7 +303,7 @@ Enabling the admin panel for an account, and thus making the account holder admi
     'config' => [
         'admin_email' => 'someone@example.com',
     ]
-    
+
 
 Where you have to match the email address used for the account with the one you enter to the `config/local.config.php` file.
 If more than one account should be able to access the admin panel, separate the email addresses with a comma.

diff --git a/doc/Install.md b/doc/Install.md
index f613b2ffc3c5130afe56b9f79feeac3053f13276..3c162d519ba153c7e7a2db31e17e333059757437 100644 (file)
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -218,7 +218,6 @@ All options will be saved in the `config/local.config.php` and are overruling th
 -      `-U|--dbuser <username>` The username of the mysql/mariadb database login (env `MYSQL_USER` or `MYSQL_USERNAME`)
 -      `-P|--dbpass <password>` The password of the mysql/mariadb database login (env `MYSQL_PASSWORD`)
 -      `-d|--dbdata <database>` The name of the mysql/mariadb database (env `MYSQL_DATABASE`)
--      `-u|--urlpath <url_path>` The URL path of Friendica - f.e. '/friendica' (env `FRIENDICA_URL_PATH`)
 -      `-b|--phppath <php_path>` The path of the PHP binary (env `FRIENDICA_PHP_PATH`)
 -      `-A|--admin <mail>` The admin email address of Friendica (env `FRIENDICA_ADMIN_MAIL`)
 -      `-T|--tz <timezone>` The timezone of Friendica (env `FRIENDICA_TZ`)

diff --git a/doc/Settings.md b/doc/Settings.md
index 00c8be2c2e09ce2136c912fae76aa05f7c22926a..7ca0e22286ce5e26cc0569230e83b660f1062502 100644 (file)
--- a/doc/Settings.md
+++ b/doc/Settings.md
@@ -419,7 +419,7 @@ We strongly discourage you from doing so, as this will break federation to other
 Say you have a subdirectory for tests and put Friendica into a further subdirectory, the config would be:
 
        'system' => [
-               'urlpath' => 'tests/friendica',
+               'url' => 'https://example.com/tests/friendica',
        ],
 
 ## Other exceptions

diff --git a/doc/de/Settings.md b/doc/de/Settings.md
index 34b349e88520aa4dfb2af308ef3409135050e23d..cee965ccafa8f009d629e107443e509da798c22c 100644 (file)
--- a/doc/de/Settings.md
+++ b/doc/de/Settings.md
@@ -410,7 +410,7 @@ Wir raten allerdings dringen davon ab, da es die Interoperabilität mit anderen
 Mal angenommen, du hast ein Unterverzeichnis tests und willst Friendica in ein weiteres Unterverzeichnis installieren, dann lautet die Konfiguration hierfür:
 
        'system' => [
-               'urlpath' => 'tests/friendica',
+               'url' => 'https://example.com/tests/friendica',
        ],
 
 ## Weitere Ausnahmen

diff --git a/src/App/BaseURL.php b/src/App/BaseURL.php
index 83416866f092e0c36fa3dccb156bd95ec99a2995..0ebf72dbf834b85bd04da9952d82d503dfbe7ba5 100644 (file)
--- a/src/App/BaseURL.php
+++ b/src/App/BaseURL.php
@@ -17,8 +17,7 @@ use Psr\Http\Message\UriInterface;
 use Psr\Log\LoggerInterface;
 
 /**
- * A class which checks and contains the basic
- * environment for the BaseURL (url, urlpath, ssl_policy, hostname, scheme)
+ * A class which checks and contains the basic environment for the BaseURL (url)
  */
 class BaseURL extends Uri implements UriInterface
 {

diff --git a/static/defaults.config.php b/static/defaults.config.php
index d821ff18131de85297efab43713d680e9d459430..4a150ec7abeebb8acccff5f2c8939b20432b0dfb 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -126,6 +126,11 @@ return [
                // Display "Emoji Only" posts in big.
                'big_emojis' => true,
 
+               // basepath (String)
+               // Absolute file path to your Friendica install
+               // Examples: /var/www, /home/user/friendica...
+               'basepath' => '',
+
                // bulk_delivery (Boolean)
                // Delivers AP messages in a bulk (experimental)
                'bulk_delivery' => false,
@@ -576,6 +581,12 @@ return [
                // Transmit pending events upon accepted contact request for groups
                'transmit_pending_events' => false,
 
+               // url (String)
+               // The absolute URL used to access your Friendica node. It should include the scheme, the domain name, and the
+               // sub-folder if any. Used by command-line processes to send correct links to your Friendica server.
+               // Example: https://example.com/friendica
+               'url' => '',
+
                // username_min_length (Integer)
                // The minimum character length a username can be.
                // This length is checked once the username has been trimmed and multiple spaces have been collapsed into one.

diff --git a/tests/datasets/config/transformer/C.node.config.php b/tests/datasets/config/transformer/C.node.config.php
index 44969d1eb5633db0f5867aabe3ff4db04524de03..0b2964acd2df125273bc3c40ad5c7e3bacfbbd14 100644 (file)
--- a/tests/datasets/config/transformer/C.node.config.php
+++ b/tests/datasets/config/transformer/C.node.config.php
@@ -17,7 +17,6 @@ return [
                'temppath' => '/tmp/friendica.local',
                'theme' => 'frio',
                'url' => 'https://friendica.local',
-               'urlpath' => '',
                'build' => 1508,
                'maintenance' => false,
                'dbupdate' => 1,

diff --git a/tests/src/Console/AutomaticInstallationConsoleTest.php b/tests/src/Console/AutomaticInstallationConsoleTest.php
index 7fe56bb1526c426e8d4526339927699947dc9128..f3466c0203625016d4eb33bf591136a481fa1bed 100644 (file)
--- a/tests/src/Console/AutomaticInstallationConsoleTest.php
+++ b/tests/src/Console/AutomaticInstallationConsoleTest.php
@@ -129,7 +129,6 @@ class AutomaticInstallationConsoleTest extends ConsoleTestCase
                                        ],
                                        'system' => [
                                                'basepath'         => '',
-                                               'urlpath'          => '',
                                                'url'              => 'http://friendica.local',
                                                'ssl_policy'       => 0,
                                                'default_timezone' => '',
@@ -152,7 +151,6 @@ class AutomaticInstallationConsoleTest extends ConsoleTestCase
                                                'admin_email' => 'admin@philipp.info',
                                        ],
                                        'system' => [
-                                               'urlpath'          => 'test/it',
                                                'url'              => 'http://friendica.local/test/it',
                                                'basepath'         => '',
                                                'ssl_policy'       => '2',
@@ -176,7 +174,6 @@ class AutomaticInstallationConsoleTest extends ConsoleTestCase
                                                'admin_email' => 'admin@philipp.info',
                                        ],
                                        'system' => [
-                                               'urlpath'          => 'test/it',
                                                'url'              => 'https://friendica.local/test/it',
                                                'basepath'         => '',
                                                'ssl_policy'       => '1',
@@ -352,7 +349,6 @@ FIN;
                self::assertConfigEntry('system', 'default_timezone', $assertion, ($default) ? Installer::DEFAULT_TZ : null);
                self::assertConfigEntry('system', 'language', $assertion, ($default) ? Installer::DEFAULT_LANG : null);
                self::assertConfigEntry('system', 'url', $assertion);
-               self::assertConfigEntry('system', 'urlpath', $assertion);
                self::assertConfigEntry('system', 'ssl_policy', $assertion, ($default) ? App\BaseURL::DEFAULT_SSL_SCHEME : null);
                self::assertConfigEntry('system', 'basepath', ($realBasepath) ? $this->root->url() : $assertion);
        }
@@ -446,7 +442,6 @@ return [
        ],
        'system' => [
                'basepath' => '{$conf('system', 'basepath')}',
-               'urlpath' => '{$conf('system', 'urlpath')}',
                'url' => '{$conf('system', 'url')}',
                'ssl_policy' => '{$conf('system', 'ssl_policy')}',
                'default_timezone' => '{$conf('system', 'default_timezone')}',
@@ -604,7 +599,7 @@ CONF;
                self::assertStuckDB($txt);
                self::assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php'));
 
-               self::assertConfig(['config' => ['hostname' => 'friendica.local'], 'system' => ['url' => 'http://friendica.local', 'ssl_policy' => 0, 'urlpath' => '']], false, true, false, true);
+               self::assertConfig(['config' => ['hostname' => 'friendica.local'], 'system' => ['url' => 'http://friendica.local', 'ssl_policy' => 0]], false, true, false, true);
        }
 
        public function testGetHelp()