Skip to content

Overriding detected server port #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jcsaaddupuy wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Overriding detected server port #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
953a85f
Removed feedurl variable from href.
Mar 21, 2013
d0fff1e
Removed feedurl variable from href.
jcsaaddupuy Mar 21, 2013
69baade
Merge branch 'master' of github.com:jcsaaddupuy/Shaarli
jcsaaddupuy Mar 21, 2013
52fe473
Added $GLOBALS['config']['IGNORE_SERVER_PORT']
jcsaaddupuy Mar 21, 2013
d20599f
Replaced \$GLOBALS[config][IGNORE_SERVER_PORT] with generic \$GLOBALS…
jcsaaddupuy Mar 21, 2013
32593c1
Added comment
jcsaaddupuy Mar 21, 2013
f684a04
Merge remote branch 'upstream/master'
jcsaaddupuy Mar 21, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
$GLOBALS['config']['UPDATECHECK_FILENAME'] = $GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt'; // For updates check of Shaarli.
$GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400 ; // Updates check frequency for Shaarli. 86400 seconds=24 hours
// Note: You must have publisher.php in the same directory as Shaarli index.php
$GLOBALS['config']['ACTUAL_SERVER_PORT'] = $_SERVER["SERVER_PORT"] ; //Override port used in generated URLs.
// -----------------------------------------------------------------------------------------------
// You should not touch below (or at your own risks !)
// Optionnal config file.
Expand Down Expand Up @@ -437,8 +438,8 @@ function ban_canLogin()
// You can append $_SERVER['SCRIPT_NAME'] to get the current script URL.
function serverUrl()
{
$https = (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS'])=='on')) || $_SERVER["SERVER_PORT"]=='443'; // HTTPS detection.
$serverport = ($_SERVER["SERVER_PORT"]=='80' || ($https && $_SERVER["SERVER_PORT"]=='443') ? '' : ':'.$_SERVER["SERVER_PORT"]);
$https = (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS'])=='on')) || $GLOBALS['config']['ACTUAL_SERVER_PORT'] =='443'; // HTTPS detection.
$serverport = ($GLOBALS['config']['ACTUAL_SERVER_PORT'] =='80' || ($https && $GLOBALS['config']['ACTUAL_SERVER_PORT'] =='443') ? '' : ':'.$GLOBALS['config']['ACTUAL_SERVER_PORT'] );
return 'http'.($https?'s':'').'://'.$_SERVER["SERVER_NAME"].$serverport;
}

Expand Down Expand Up @@ -2419,4 +2420,4 @@ function invalidateCaches()
if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'ws=')) { processWS(); exit; } // Webservices (for jQuery/jQueryUI)
if (!isset($_SESSION['LINKS_PER_PAGE'])) $_SESSION['LINKS_PER_PAGE']=$GLOBALS['config']['LINKS_PER_PAGE'];
renderPage();
?>
?>
4 changes: 2 additions & 2 deletions tpl/includes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="format-detection" content="telephone=no" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
<link rel="alternate" type="application/rss+xml" href="?do=rss{$searchcrits}#" title="RSS Feed" />
<link rel="alternate" type="application/atom+xml" href="?do=atom{$searchcrits}#" title="ATOM Feed" />
<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />
<link type="text/css" rel="stylesheet" href="inc/shaarli.css?version={$version|urlencode}#" />
{if condition="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version}#" />{/if}
Expand Down
4 changes: 2 additions & 2 deletions tpl/page.header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
{else}
<a href="?do=login">Login</a>
{/if}
<a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a>
<a href="{$feedurl}?do=atom{$searchcrits}" style="padding-left:10px;" class="nomobile">ATOM Feed</a>
<a href="?do=rss{$searchcrits}" class="nomobile">RSS Feed</a>
<a href="?do=atom{$searchcrits}" style="padding-left:10px;" class="nomobile">ATOM Feed</a>
<a href="?do=tagcloud">Tag cloud</a>
<a href="?do=picwall{$searchcrits}">Picture wall</a>
<a href="?do=daily">Daily</a>
Expand Down