mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-02-05 19:11:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

URL absolue pour token

Browse Source 
Corrige https://github.com/marienfressinaud/FreshRSS/issues/213
Abandonne le protocole relatif "//" et repasse à des "http://" ou
"https://" explicites
This commit is contained in:
Alexandre Alapetite
2013-10-26 20:49:23 +02:00
parent dd5273871a
commit 8bb25589ff
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/configure/display.phtml
View File

@@ -56,7 +56,7 @@
<?php $token = $this->conf->token (); ?>
<div class="group-controls">
<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo Translate::t ('blank_to_disable'); ?>"/>
<i class="icon i_help"></i> <?php echo Translate::t('explain_token', Url::display(), $token); ?>
<i class="icon i_help"></i> <?php echo Translate::t('explain_token', Url::display(null, 'html', true), $token); ?>
</div>
</div>

13
lib/minz/Url.php
View File

@@ -22,11 +22,14 @@ class Url {
$url_string = '';
if ($absolute) {
$protocol = (is_array ($url) && isset ($url['protocol'])) ? ($url['protocol'] . ':') : ''; //Empty protocol will use automatic http or https
$url_string = $protocol
. '//'
. Request::getDomainName ()
. Request::getBaseUrl ();
if (is_array ($url) && isset ($url['protocol'])) {
$protocol = $url['protocol'];
} elseif (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
$protocol = 'https:';
} else {
$protocol = 'http:';
}
$url_string = $protocol . '//' . Request::getDomainName () . Request::getBaseUrl ();
}
else {
$url_string = '.';