| Index: trunk/phase3/includes/HttpFunctions.php |
| — | — | @@ -126,14 +126,13 @@ |
| 127 | 127 | * and php support. |
| 128 | 128 | * |
| 129 | 129 | * @fixme this is wildly inaccurate and fails to actually check most stuff |
| 130 | | - * @fixme do we actually intend to have FTP support here? Does it work consistently? |
| 131 | 130 | * |
| 132 | 131 | * @param $uri Mixed: URI to check for validity |
| 133 | 132 | * @returns Boolean |
| 134 | 133 | */ |
| 135 | 134 | public static function isValidURI( $uri ) { |
| 136 | 135 | return preg_match( |
| 137 | | - '/^(f|ht)tps?:\/\/[^\/\s]\S*$/D', |
| | 136 | + '/^https?:\/\/[^\/\s]\S*$/D', |
| 138 | 137 | $uri |
| 139 | 138 | ); |
| 140 | 139 | } |
| — | — | @@ -717,7 +716,6 @@ |
| 718 | 717 | } |
| 719 | 718 | |
| 720 | 719 | if ( $this->parsedUrl['scheme'] != 'http' && |
| 721 | | - $this->parsedUrl['scheme'] != 'ftp' && |
| 722 | 720 | $this->parsedUrl['scheme'] != 'https' ) { |
| 723 | 721 | $this->status->fatal( 'http-invalid-scheme', $this->parsedUrl['scheme'] ); |
| 724 | 722 | } |