Merge pull request #163 from bergware/6.4-wip

Minor changes in SSL settings
This commit is contained in:
tom mortensen
2017-09-05 07:45:39 -07:00
committed by GitHub
4 changed files with 16 additions and 14 deletions

View File

@@ -101,7 +101,7 @@ foreach (glob("/var/log/plugins/*.plg",GLOB_NOSORT) as $plugin_link) {
if ($changes !== false) {
$txtfile = "/tmp/plugins/".basename($plugin_file,'.plg').".txt";
file_put_contents($txtfile,$changes);
$version .= "&nbsp;<a href='#' title='View Release Notes' onclick=\"openBox('/plugins/dynamix.plugin.manager/include/ShowChanges.php?file=".urlencode($txtfile)."','Release Notes',600,900); return false\"><img src='/webGui/images/information.png' class='icon'></a>";
$version .= "&nbsp;<a href='#' title='View Release Notes' onclick=\"openBox('/plugins/dynamix.plugin.manager/include/ShowChanges.php?file=".urlencode($txtfile)."','Release Notes',600,900); return false\"><span class='fa fa-info-circle big blue-text'></span></a>";
}
//write plugin information
$empty = false;

View File

@@ -57,24 +57,24 @@ Use SSL/TLS:
<?=mk_option($var['USE_SSL'], "yes", "Yes")?>
</select>
> Determines how the webGui responds to http and/or https protocol.
> Determines how the webGui responds to HTTP and/or HTTPS protocol.
>
> Select **No** to disable https (but https is redirected to http).
> Select **No** to disable HTTPS (but HTTPS is redirected to HTTP).
>
> Select **Yes** to enable https and redirect http to https.
> Select **Yes** to enable HTTPS and redirect HTTP to HTTPS.
>
> With **Auto** selected, behaves like **Yes** if a non-self-signed SSL certificate is
> installed; otherwise, behaves like **No**.
http port:
: <input type="number" name="PORT" min="0" max="65535" value="<?=htmlspecialchars($var['PORT'])?>">
HTTP port:
: <input type="number" name="PORT" class="trim" min="0" max="65535" value="<?=htmlspecialchars($var['PORT'])?>">
> Enter the http port, default is 80.
> Enter the HTTP port, default is 80.
https port:
: <input type="number" name="PORTSSL" min="0" max="65535" value="<?=htmlspecialchars($var['PORTSSL'])?>">
HTTPS port:
: <input type="number" name="PORTSSL" class="trim" min="0" max="65535" value="<?=htmlspecialchars($var['PORTSSL'])?>">
> Enter the https port, default is 443.
> Enter the HTTPS port, default is 443.
&nbsp;
: <input type="submit" name="changePorts" value="Apply"><input type="button" value="Done" onclick="done()">

View File

@@ -1,6 +1,5 @@
html{font-family:arimo;-ms-overflow-style:-ms-autohiding-scrollbar}
html{font-family:arimo}
body{font-size:14px;color:#606E7F;background-color:#E4E2E4;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
::-webkit-scrollbar{display:none}
@media (max-width:1920px){#template{min-width:1080px;margin:0}}
@media (min-width:1921px){#template{min-width:1080px;max-width:1920px;margin:0 auto}}
img{border:0;text-decoration:none;vertical-align:middle}
@@ -52,6 +51,8 @@ form+p{display:none}
#header .text-right{float:right;text-align:left;padding-left:5px;padding-right:20px}
#menu{position:fixed;top:0;left:0;bottom:12px;width:65px;padding:0;margin:0;background:#383A34;z-index:100;box-shadow:inset -1px 0 2px #EDEAEF}
#nav-block{position:absolute;top:0;bottom:12px;color:#5D6833;white-space:nowrap;float:left;overflow-y:scroll;direction:rtl}
#nav-block::-webkit-scrollbar{display:none}
#nav-block{-ms-overflow-style:none;overflow:-moz-scrollbars-none}
#nav-block>div{direction:ltr}
#nav-item{width:24px;text-align:left;padding:14px 24px 14px 16px;border-bottom:#42453E 1px solid;font-size:18px;overflow:hidden}
#nav-item:hover{width:150px;color:#5D6833;background:#ABC056;border-bottom-color:#5D6833;-webkit-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out}

View File

@@ -1,6 +1,5 @@
html{font-family:arimo;-ms-overflow-style:-ms-autohiding-scrollbar}
html{font-family:arimo}
body{font-size:14px;color:#606E7F;background-color:#1B1D1B;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
::-webkit-scrollbar{display:none}
@media (max-width:1920px){#template{min-width:1080px;margin:0}}
@media (min-width:1921px){#template{min-width:1080px;max-width:1920px;margin:0 auto}}
img{border:0;text-decoration:none;vertical-align:middle}
@@ -52,6 +51,8 @@ form+p{display:none}
#header .text-right{float:right;text-align:left;padding-left:5px;padding-right:20px}
#menu{position:fixed;top:0;left:0;bottom:12px;width:65px;padding:0;margin:0;background:#383A34;z-index:100;box-shadow:inset -1px 0 2px #121510}
#nav-block{position:absolute;top:0;bottom:12px;color:#5D6833;white-space:nowrap;float:left;overflow-y:scroll;direction:rtl}
#nav-block::-webkit-scrollbar{display:none}
#nav-block{-ms-overflow-style:none;overflow:-moz-scrollbars-none}
#nav-block>div{direction:ltr}
#nav-item{width:24px;text-align:left;padding:14px 24px 14px 16px;border-bottom:#42453E 1px solid;font-size:18px;overflow:hidden}
#nav-item:hover{width:150px;color:#5D6833;background:#ABC056;border-bottom-color:#5D6833;-webkit-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out}