Merge pull request #215 from Manawyrm/master

Fix statistics 404 and HTTPS in installer
这个提交包含在:
Peter Goodhall 2018-11-08 23:00:07 +00:00 提交者 GitHub
当前提交 e186c3e639
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 3 个文件被更改,包括 7 次插入7 次删除

查看文件

@ -10,9 +10,9 @@
<h2><?php echo $page_title; ?></h2>
<ul class="tabs">
<li><a href="statistics">General</a></li>
<li><a href="statistics">Satellite Contacts</a></li>
<li class="active"><a href="statistics/custom">Custom</a></li>
<li><a href="<?php echo site_url('statistics');?>#home">General</a></li>
<li><a href="<?php echo site_url('statistics');?>#space">Satellite Contacts</a></li>
<li class="active"><a href="<?php echo site_url('statistics');?>/custom">Custom</a></li>
</ul>
<p>This is a work in-progress</p>

查看文件

@ -10,9 +10,9 @@
<h2><?php echo $page_title; ?></h2>
<ul class="tabs">
<li><a href="statistics">General</a></li>
<li><a href="statistics">Satellite Contacts</a></li>
<li class="active"><a href="statistics/custom">Custom</a></li>
<li><a href="<?php echo site_url('statistics');?>#home">General</a></li>
<li><a href="<?php echo site_url('statistics');?>#space">Satellite Contacts</a></li>
<li class="active"><a href="<?php echo site_url('statistics');?>/custom">Custom</a></li>
</ul>
<p>This is a work in-progress</p>

查看文件

@ -101,7 +101,7 @@ if($_POST) {
<fieldset>
<legend>Configuration Settings</legend>
<label for="directory">Directory</label><input type="text" id="directory" value="<?php echo str_replace("/install/", "", $_SERVER['REQUEST_URI']); ?>" class="input_text" name="directory" />
<label for="websiteurl">Website URL</label><input type="text" id="websiteurl" value="http://<?php echo $_SERVER['HTTP_HOST'].str_replace("/install/", "", $_SERVER['REQUEST_URI']); ?>" class="input_text" name="websiteurl" />
<label for="websiteurl">Website URL</label><input type="text" id="websiteurl" value="<?php echo $_SERVER['REQUEST_SCHEME']; ?>://<?php echo $_SERVER['HTTP_HOST'].str_replace("/install/", "", $_SERVER['REQUEST_URI']); ?>" class="input_text" name="websiteurl" />
<label for="locator">Default Gridsquare</label><input type="text" id="locator" value="IO91JS" class="input_text" name="locator" />
</fieldset>