- Although the port isn't used while testing a website, changing it prevents confusion. - Fix bug that made it impossible to check rdp:// as it would add http:// in front of it.
This commit is contained in:
parent
2c1ef315c7
commit
fa97fb6653
|
@ -5,6 +5,7 @@ Changelog
|
||||||
Not yet released
|
Not yet released
|
||||||
----------------
|
----------------
|
||||||
|
|
||||||
|
#629: Fix bug that made it impossible to check rdp:// and fixed port update.
|
||||||
b49659f: Added question to notification faq about not recieving notifications.
|
b49659f: Added question to notification faq about not recieving notifications.
|
||||||
ef28908: Indentation fix.
|
ef28908: Indentation fix.
|
||||||
#605: Added Norwegian language.
|
#605: Added Norwegian language.
|
||||||
|
|
|
@ -278,15 +278,15 @@ class ServerController extends AbstractServerController {
|
||||||
'telegram' => in_array($_POST['telegram'], array('yes', 'no')) ? $_POST['telegram'] : 'no',
|
'telegram' => in_array($_POST['telegram'], array('yes', 'no')) ? $_POST['telegram'] : 'no',
|
||||||
);
|
);
|
||||||
// make sure websites start with http://
|
// make sure websites start with http://
|
||||||
if ($clean['type'] == 'website' && substr($clean['ip'], 0, 4) != 'http') {
|
if ($clean['type'] == 'website' && substr($clean['ip'], 0, 4) != 'http' && substr($clean['ip'], 0, 3) != 'rdp') {
|
||||||
$clean['ip'] = 'http://'.$clean['ip'];
|
$clean['ip'] = 'http://'.$clean['ip'];
|
||||||
}
|
}
|
||||||
|
|
||||||
// validate the lot
|
// validate the lot
|
||||||
$server_validator = new \psm\Util\Server\ServerValidator($this->db);
|
$server_validator = new \psm\Util\Server\ServerValidator($this->db);
|
||||||
|
|
||||||
// format port from http/s url
|
// format port from http, https or rdp url
|
||||||
if ($clean['type'] == 'website' && empty($clean['port'])) {
|
if ($clean['type'] == 'website') {
|
||||||
$tmp = parse_url($clean["ip"]);
|
$tmp = parse_url($clean["ip"]);
|
||||||
if (isset($tmp["port"])) {
|
if (isset($tmp["port"])) {
|
||||||
$clean["port"] = $tmp["port"];
|
$clean["port"] = $tmp["port"];
|
||||||
|
|
Loading…
Reference in New Issue