george/PrivateBin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1003 from PrivateBin/yourls-cleanup

Browse Source 
improve configuration wording, adjust self check
This commit is contained in:
El RIDO
2022-11-03 19:54:56 +01:00
committed by GitHub
parent 449dbb8377 987ead2719
commit 66600e5eb3
5 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Configuration.php
View File

@@ -236,6 +236,14 @@ class Configuration
if (!array_key_exists($this->_configuration['expire']['default'], $this->_configuration['expire_options'])) {
$this->_configuration['expire']['default'] = key($this->_configuration['expire_options']);
}
// ensure the basepath ends in a slash, if one is set
if (
strlen($this->_configuration['main']['basepath']) &&
substr_compare($this->_configuration['main']['basepath'], '/', -1) !== 0
) {
$this->_configuration['main']['basepath'] .= '/';
}
}
/**

2
lib/YourlsProxy.php
View File

@@ -48,7 +48,7 @@ class YourlsProxy
*/
public function __construct(Configuration $conf, $link)
{
if (strpos($link, $conf->getKey('basepath') . '/?') === false) {
if (strpos($link, $conf->getKey('basepath') . '?') === false) {
$this->_error = 'Trying to shorten a URL that isn\'t pointing at our instance.';
return;
}