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

Merge pull request #273 from owncloud/backport-264-266-stable8.2

Browse Source 
[stable8.2] Backport #264 and #266
This commit is contained in:
blizzz 2016-08-07 12:44:04 +02:00 committed by GitHub
commit b74b4d9147
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appinfo/database.xml
View File

@ -27,7 +27,7 @@
<type>text</type>
<default></default>
<notnull>true</notnull>
<length>140</length>
<length>4096</length>
</field>
<field>
<name>user_id</name>

2
appinfo/info.xml
View File

@ -10,5 +10,5 @@
<owncloud min-version="8.1" max-version="8.2" />
</dependencies>
<ocsid>168710</ocsid>
<version>0.6.1</version>
<version>0.6.2</version>
</info>

23
controller/lib/bookmarks.php
View File

@ -428,9 +428,16 @@ class Bookmarks {
*/
public static function addBookmark($userid, IDb $db, $url, $title, $tags = array(), $description = '', $is_public = false) {
$public = $is_public ? 1 : 0;
$url_without_prefix = substr($url, strpos($url, "://") + 3); // Removes everything from the url before the "://" pattern (included)
$url_without_prefix = trim(substr($url, strpos($url, "://") + 3)); // Removes everything from the url before the "://" pattern (included)
if($url_without_prefix === '') {
throw new \InvalidArgumentException('Bookmark URL is missing');
}
$enc_url_noprefix = htmlspecialchars_decode($url_without_prefix);
$enc_url = htmlspecialchars_decode($url);
$title = mb_substr($title, 0, 4096);
$description = mb_substr($description, 0, 4096);
// Change lastmodified date if the record if already exists
$sql = "SELECT * from `*PREFIX*bookmarks` WHERE `url` like ? AND `user_id` = ?";
$query = $db->prepareQuery($sql, 1);
@ -522,8 +529,12 @@ class Bookmarks {
$dom->loadHTMLFile($file);
$links = $dom->getElementsByTagName('a');
$l = \OC::$server->getL10NFactory()->get('bookmarks');
$errors = [];
// Reintroduce transaction here!?
foreach ($links as $link) {
/* @var \DOMElement $link */
$title = $link->nodeValue;
$ref = $link->getAttribute("href");
$tag_str = '';
@ -534,11 +545,15 @@ class Bookmarks {
$desc_str = '';
if ($link->hasAttribute("description"))
$desc_str = $link->getAttribute("description");
self::addBookmark($user, $db, $ref, $title, $tags, $desc_str);
try {
self::addBookmark($user, $db, $ref, $title, $tags, $desc_str);
} catch (\InvalidArgumentException $e) {
\OC::$server->getLogger()->logException($e, ['app' => 'bookmarks']);
$errors[] = $l->t('Failed to import one bookmark, because: ') . $e->getMessage();
}
}
return array();
return $errors;
}
/**