Commit 174ebb94 authored by Erase's avatar Erase

Minor fix for HTTPS detection

parent c9da6b6a
RSS-Fusion-Démo (version 0.6.3)
RSS-Fusion-Démo (version 0.6.3b)
----------
**Exemple d'utilisation de [RSS-Fusion]** à travers un outil permettant de fusionner plusieurs flux RSS/ATOM afin de n'en former qu'un seul, lui même filtré par un ensemble de mots clés conditionnant l'affichage ou non des items.
......
......@@ -71,7 +71,7 @@
if(!is_null($oFeeds->objParseFeed)){
//~ Set <link> RSS
$rss_link = ($_SERVER['SSL'] ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']);
$rss_link = ((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] === 'on' || $_SERVER['HTTPS'] === 1)) || $_SERVER['SSL'] ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']);
if(array_key_exists('link', $_POST) && !empty($_POST['link'])){
$rss_link = htmlspecialchars($_POST['link'], ENT_QUOTES, Config::get('characterSet'));
}
......
......@@ -103,8 +103,8 @@
<input type="text" name="desc" value="Flux généré avec RSS Fusion" id="desc">
</fieldset>
<fieldset class="full-form">
<label for="link">URL flux général</label>
<input type="text" name="link" value="<?php echo ($_SERVER['SSL'] ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']);?>" id="link">
<label for="link">Base URL du flux général</label>
<input type="text" name="link" value="<?php echo ((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] === 'on' || $_SERVER['HTTPS'] === 1)) || $_SERVER['SSL'] ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']);?>" id="link">
</fieldset>
<div class="clear"></div>
<fieldset class="fsubmit full-form">
......@@ -127,7 +127,7 @@
&nbsp; &nbsp;| &nbsp; &nbsp; 
Sources disponibles sur <a href="https://framagit.org/Erase/RSS-Fusion-Demo" target="_blank" title="RSS-Fusion-Démo sur Framagit">Framagit</a>
&nbsp; &nbsp;| &nbsp; &nbsp; 
<span class="small">version 0.6.3</span>
<span class="small">version 0.6.3b</span>
</div>
</footer>
</div>
......
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 200;
src: local('Source Sans Pro ExtraLight'), local('SourceSansPro-ExtraLight'), url(fonts/Source Sans ProtoadOcfmlt9b38dHJxOBGEMbjGELOEJD5J8DUmxkO-A.ttf) format('truetype');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 400;
src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(fonts/Source Sans ProODelI1aHBYDBqgeIAH2zlNzbP97U9sKh0jjxbPbfOKg.ttf) format('truetype');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 700;
src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(fonts/Source Sans ProtoadOcfmlt9b38dHJxOBGLsbIrGiHa6JIepkyt5c0A0.ttf) format('truetype');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: italic;
font-weight: 400;
src: local('Source Sans Pro Italic'), local('SourceSansPro-Italic'), url(fonts/Source Sans ProM2Jd71oPJhLKp0zdtTvoM0DauxaEVho0aInXGvhmB4k.ttf) format('truetype');
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment