Fixed rdp:// bug and fixed port not updating #418 (#629)

- 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:
Tim 2018-08-30 00:08:22 +02:00 committed by GitHub
parent 2c1ef315c7
commit fa97fb6653
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -5,6 +5,7 @@ Changelog
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.
ef28908: Indentation fix.
#605: Added Norwegian language.

View File

@ -278,15 +278,15 @@ class ServerController extends AbstractServerController {
'telegram' => in_array($_POST['telegram'], array('yes', 'no')) ? $_POST['telegram'] : 'no',
);
// 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'];
}
// validate the lot
$server_validator = new \psm\Util\Server\ServerValidator($this->db);
// format port from http/s url
if ($clean['type'] == 'website' && empty($clean['port'])) {
// format port from http, https or rdp url
if ($clean['type'] == 'website') {
$tmp = parse_url($clean["ip"]);
if (isset($tmp["port"])) {
$clean["port"] = $tmp["port"];