rooty/OwncloudBookmarksOfficial
1
0
Fork 0
mirror of https://github.com/owncloud/bookmarks.git synced 2025-02-02 02:52:10 +01:00
Code Issues Releases Activity

Fix http / https protocol requirement

Browse Source 
Fix the http / https prefix requirement when adding a bookmark by :
1 - Constructing URLs for both protocols,
2 - Retrieving both pages titles,
3 - Choosing the one which works, with a systematic preference for https.
This commit is contained in:
TtuxX 2014-12-26 13:14:13 +01:00
parent 2133641eee
commit e6dcb38e25
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
controller/rest/bookmarkcontroller.php
View File

@ -68,19 +68,35 @@ class BookmarkController extends ApiController {
*/
public function newBookmark($url = "", $item = array(), $from_own = 0, $title = "", $is_public = false, $description = "") {
// Check if it is a valid URL
if ($from_own == 0) {
// allow only http(s) and (s)ftp
$protocols = '/^[hs]{0,1}[tf]{0,1}tp[s]{0,1}\:\/\//i';
// if not (allowed) protocol is given, assume http and https (and fetch both)
if (! preg_match($protocols, $url)) {
// append https to url and fetch it
$url_https = 'https://' . $url;
$datas_https = Bookmarks::getURLMetadata($url_https);
// append http to url and fetch it
$url_http = 'http://' . $url;
$datas_http = Bookmarks::getURLMetadata($url_http);
}
// adopt https if it works (switch to http if it doesn't)
if (isset($datas_https['title'])) { // test if https works
$title = $datas_https['title'];
$url = $url_https;
} elseif (isset($datas_http['title'])) { // otherwise test http for results
$title = $datas_http['title'];
$url = $url_http;
}
}
// Check if it is a valid URL (after adding http(s) prefix)
if (filter_var($url, FILTER_VALIDATE_URL) === FALSE) {
return new JSONResponse(array('status' => 'error'), Http::STATUS_BAD_REQUEST);
}
$tags = isset($item['tags']) ? $item['tags'] : array();
if ($from_own == 0) {
$datas = Bookmarks::getURLMetadata($url);
if (isset($datas['title'])) {
$title = $datas['title'];
}
}
$id = Bookmarks::addBookmark($this->userId, $this->db, $url, $title, $tags, $description, $is_public);
$bm = Bookmarks::findUniqueBookmark($id, $this->userId, $this->db);
return new JSONResponse(array('item' => $bm, 'status' => 'success'));