From eefac414f5371431c653a2528545957dc7293b18 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 5 Nov 2012 20:34:09 +0000
Subject: [PATCH] Bookmark: Fetch title for bookmark added from interface ref
 #145

---
 ajax/editBookmark.php | 11 +++++++++--
 js/bookmarks.js       |  6 ++++--
 templates/list.php    |  5 +++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ajax/editBookmark.php b/ajax/editBookmark.php
index 3ac60707..12c2364c 100644
--- a/ajax/editBookmark.php
+++ b/ajax/editBookmark.php
@@ -26,20 +26,27 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
 OCP\JSON::checkAppEnabled('bookmarks');
+require_once OC_App::getAppPath('bookmarks').'/bookmarksHelper.php';
 
 // If we go the dialog form submit
 if(isset($_POST['url'])) {
+	$title = '';
 	$tags = isset($_POST['item']['tags']) ? $_POST['item']['tags'] : array();
 	$pub = isset($_POST['is_public']) ? true : false;
 
 	if(isset($_POST['record_id']) && is_numeric($_POST['record_id']) ) { //EDIT
 		$bm = $_POST['record_id'];
 		OC_Bookmarks_Bookmarks::editBookmark($bm, $_POST['url'], $_POST['title'], $tags, $_POST['description'], $pub);
+		$title = $_POST['title'];
 	}
 	else {
-		$bm = OC_Bookmarks_Bookmarks::addBookmark($_POST['url'], $_POST['title'], $tags, $_POST['description'], $pub);
+		if(isset($_POST['from_own'])) {
+			$datas = getURLMetadata($_POST['url']);
+			if(isset($datas['title'])) $title = $datas['title'];
+		}
+		$bm = OC_Bookmarks_Bookmarks::addBookmark($_POST['url'], $title, $tags, $_POST['description'], $pub);
 	}
-	OCP\JSON::success(array('id'=>$bm));
+	OCP\JSON::success(array('id'=>$bm,'title'=>$title));
 	exit();
 }
 OC_JSON::error();
diff --git a/js/bookmarks.js b/js/bookmarks.js
index 15361b82..c8336f64 100644
--- a/js/bookmarks.js
+++ b/js/bookmarks.js
@@ -153,10 +153,11 @@ function getBookmarks() {
 
 			for(var i in bookmarks.data) {
 				updateBookmarksList(bookmarks.data[i]);
-				$("#firstrun").hide();
 			}
 			if($('.bookmarks_list').is(':empty')) {
 				$("#firstrun").show();
+			} else {
+				$("#firstrun").hide();
 			}
 
 			$('.bookmark_link').click(recordClick);
@@ -196,7 +197,7 @@ function addBookmark(event) {
 	event.preventDefault();
 	url = $('#add_url').val();
 	$('#add_url').val('');
-	bookmark = { url: url, description:'', title:''};
+	bookmark = { url: url, description:'', title:'', from_own: '1'};
 	$.ajax({
 		type: 'POST',
 		url: OC.filePath('bookmarks', 'ajax', 'editBookmark.php'),
@@ -204,6 +205,7 @@ function addBookmark(event) {
 		success: function(data){
 			if (data.status == 'success') {
 				bookmark.id = data.id;
+				bookmark.title = data.title
 				bookmark.added_date = new Date();
 				updateBookmarksList(bookmark, 'prepend');
 			}
diff --git a/templates/list.php b/templates/list.php
index 107b3c85..c5ba03c5 100644
--- a/templates/list.php
+++ b/templates/list.php
@@ -9,8 +9,9 @@
 ?>
 <input type="hidden" id="bookmarkFilterTag" value="<?php echo $_['req_tag']; ?>" />
 <div id="controls">
-	<form id="add_form"><input type="text" id="add_url" value="" placeholder="<?php echo $l->t('Address'); ?>"/>
-	<input type="submit" value="<?php echo $l->t('Add bookmark'); ?>" id="bookmark_add_submit" />
+	<form id="add_form">
+		<input type="text" id="add_url" value="" placeholder="<?php echo $l->t('Address'); ?>"/>
+		<input type="submit" value="<?php echo $l->t('Add bookmark'); ?>" id="bookmark_add_submit" />
 	</form>
 	<div id="view_type">
 		<input type="button" class="list" value="<?php echo $l->t('List')?>" />