From bb04e46bede0a8fdc46abaa71423f2cebf8d15e9 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 13 Aug 2012 18:18:18 +0000
Subject: [PATCH] Remove not really working is_public / sharing things

---
 index.php           |  2 --
 js/addBm.js         |  1 -
 js/bookmarks.js     |  2 +-
 lib/bookmarks.php   |  9 ---------
 templates/addBm.php |  2 --
 templates/list.php  | 17 -----------------
 6 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/index.php b/index.php
index 8168be1a..d1f626c4 100644
--- a/index.php
+++ b/index.php
@@ -37,7 +37,6 @@ OCP\Util::addscript('bookmarks','addBm');
 OCP\Util::addscript('bookmarks','tag-it');
 OCP\Util::addStyle('bookmarks', 'jquery.tagit');
 $qtags = OC_Bookmarks_Bookmarks::findTags();
-$shared = OC_Bookmarks_Bookmarks::findSharing();
 
 $tags = array();
 foreach($qtags as $tag) {
@@ -57,5 +56,4 @@ $tmpl->assign('bookmark', $bm);
 
 $tmpl->assign('req_tag',isset($_GET['tag']) ? $_GET['tag'] : '');
 $tmpl->assign('tags', json_encode($tags), false);
-$tmpl->assign('shared', $shared);
 $tmpl->printPage();
diff --git a/js/addBm.js b/js/addBm.js
index c2b6d406..4a9c1cfe 100644
--- a/js/addBm.js
+++ b/js/addBm.js
@@ -44,7 +44,6 @@
 				base.$el.find('.title').val(record.title);
 				base.$el.find('.url_input').val(record.url);
 				base.$el.find('.desc').val(record.description);
-				base.$el.find('.is_public').val(record.public);
 				tagit_elem = base.$el.find('.tags');
 				for(var i=0;i<record.tags.length;i++) {
 					tagit_elem.tagit('createTag', record.tags[i]);
diff --git a/js/bookmarks.js b/js/bookmarks.js
index 1f57c2b9..fb5cd926 100644
--- a/js/bookmarks.js
+++ b/js/bookmarks.js
@@ -175,7 +175,7 @@ function createEditDialog(record){
 	dialog_html = $('#edit_dialog').html();
 	var dialog = $(dialog_html).dialog({
 		width : 620,
-		height: 400,
+		height: 350,
 		title: t('bookmark', 'Edit bookmark'),
 		modal: true,
 		close : function(event, ui) {
diff --git a/lib/bookmarks.php b/lib/bookmarks.php
index d25d0388..111006bb 100644
--- a/lib/bookmarks.php
+++ b/lib/bookmarks.php
@@ -25,15 +25,6 @@
  */
 class OC_Bookmarks_Bookmarks{
 
-
-	/**
-	* @brief Find People with whome we shared bookmarks and how much
-	*/
-	public static function findSharing($offset = 0, $limit = 10){
-		$query = OCP\DB::prepare('SELECT \'@public\' as name, count(*) as nbr from  *PREFIX*bookmarks where public=1 group by public LIMIT '.$offset.',  '.$limit);
-		$tags = $query->execute()->fetchAll();
-		return $tags;
-	}
 	/**
 	* @brief Finds all tags for bookmarks
 	*/
diff --git a/templates/addBm.php b/templates/addBm.php
index 83912d12..065efb18 100644
--- a/templates/addBm.php
+++ b/templates/addBm.php
@@ -35,8 +35,6 @@
 
 			<li>
 				<input type="submit" class="submit" value="<?php echo $l->t("Save");?>" />
-				<input type="checkbox" <?php if($_['bookmark']['is_public']){echo 'checked="checked"';} ?> id="is_public" name="is_public">
-				<label for="is_public" class="is_public_label"><?php echo $l->t("Make this link public");?></label>
 				<input type="hidden" class="record_id" value="" name="record_id" />
 				<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>">
 			</li>
diff --git a/templates/list.php b/templates/list.php
index 43e0acaa..79fc3859 100644
--- a/templates/list.php
+++ b/templates/list.php
@@ -31,23 +31,6 @@
 	<label><?php echo $l->t('Related Tags'); ?></label>
 	<ul class="tag_list">
 	</ul>
-	<label><?php echo $l->t('Shared with'); ?></label>
-
-	<ul class="share_list">
-		<?php foreach($_['shared'] as $users):?>
-			<li><span class="tag"><?php echo $users['name'];?></span>
-				<p class="tags_actions">
-					<span class="bookmark_edit">
-						<img class="svg" src="<?php echo OCP\image_path('core','actions/rename.svg') ?>" title="Edit">
-					</span>
-					<span class="bookmark_delete">
-						<img class="svg" src="<?php echo OCP\image_path('core','actions/delete.svg') ?>" title="Delete">
-					</span>
-				</p>
-				<em><?php echo $users['nbr'];?></em>
-			</li>
-		<?php endforeach;?>
-	<ul>
 
 </div>