From 53e1e263ce2ae7567d4de26db8b542fbb5b50d83 Mon Sep 17 00:00:00 2001
From: Stefan Frech <stefan@frech.ch>
Date: Sun, 4 May 2008 20:07:53 +0000
Subject: [PATCH] Changed the "select folder" link to a button in
 bookmark_edit.php and bookmark_new.php. Fixed HTML encoded strings when
 importing bookmarks in Netscape format. Fixed some typos in index.php and
 added the "My Bookmarks" link in search mode.

---
 CHANGES           |  2 +-
 bookmark_edit.php |  4 ++--
 bookmark_new.php  |  2 +-
 import.php        |  2 ++
 index.php         | 17 ++++++++++-------
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index dd45840..df00ee0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,7 @@
 - Added the possibility to mark bookmarks and folders public/private
   when importing them.
 
-20.04.2008, Version 0.8.9 beat
+20.04.2008, Version 0.8.9 beta
 - Added the possibility to either convert favicon using ImageMagick or
   leave them in the ICO format. Updating favicon.php and install.php
   accordingly.
diff --git a/bookmark_edit.php b/bookmark_edit.php
index 44a60bf..7e8a875 100644
--- a/bookmark_edit.php
+++ b/bookmark_edit.php
@@ -146,14 +146,14 @@ else if ($post_title == "" || $post_url == "" || $post_icon) {
 	<input type=text name="url" size="50" value="<?php echo $row->url; ?>">
 	<p>Description<br>
 	<textarea name="description" cols="50" rows="8"><?php echo $row->description; ?></textarea></p>
-	<p><a href="javascript:window.childof=document.forms['bmedit'].childof; window.path=document.forms['bmedit'].path; selectfolder('<?php echo $query_string; ?>')">Select/Change folder</a><br>
+	<p><input type="button" value="Select folder" onClick="window.childof=document.forms['bmedit'].childof; window.path=document.forms['bmedit'].path; selectfolder('<?php echo $query_string; ?>')"><br>
 	<input type="text" name="path" value="<?php echo $path; ?>" size="50" readonly>
 	<input type="text" name="childof" value="<?php echo $row->childof; ?>" size="1" class="invisible" readonly></p>
 	<p>Tags<br>
 	<input type=text name="tags" size="50" value="Not yet working"></p>
 	<input type="submit" value=" OK ">
 	<input type="button" value=" Cancel " onClick="self.close()">
-	<input type="submit" value="Refresh Icon" name="favicon">
+	<?php if ($settings['show_bookmark_icon']) : ?><input type="submit" value="Refresh Icon" name="favicon"><?php endif; ?>
 	Public <input type="checkbox" name="public" <?php echo $row->public ? "checked" : "";?>>
 	</form>
 	<script>
diff --git a/bookmark_new.php b/bookmark_new.php
index fc008f2..98c7171 100644
--- a/bookmark_new.php
+++ b/bookmark_new.php
@@ -50,7 +50,7 @@ if ($post_title == '' || $post_url == '') {
 	<input type=text name="url" size="50" value="<?php echo $url; ?>"></p>
 	<p>Description<br>
 	<textarea name="description" cols="50" rows="8"><?php echo $post_description; ?></textarea></p>
-	<p><a href="javascript:window.childof=document.forms['bmnew'].childof; window.path=document.forms['bmnew'].path; selectfolder('<?php echo $query_string; ?>')">Select/Change folder</a><br>
+	<p><input type="button" value="Select folder" onClick="window.childof=document.forms['bmnew'].childof; window.path=document.forms['bmnew'].path; selectfolder('<?php echo $query_string; ?>')"><br>
 	<input type="text" name="path" value="<?php echo $path; ?>" size="50" readonly>
 	<input type="text" name="childof" value="<?php echo $folderid; ?>" size="1" class="invisible" readonly></p>
 	<p>Tags<br>
diff --git a/import.php b/import.php
index d14d145..46648c6 100644
--- a/import.php
+++ b/import.php
@@ -256,6 +256,8 @@ class import {
 	function import_netscape () {
 		while (!feof ($this->fp)){
 			$line = trim (fgets ($this->fp));
+			# netscape seems to store html encoded values
+			$line = html_entity_decode ($line, ENT_QUOTES, $this->charset);
 
 			# a folder has been found
 			if (ereg ("<DT><H3", $line)) {
diff --git a/index.php b/index.php
index ffc01ae..1174fdb 100644
--- a/index.php
+++ b/index.php
@@ -12,12 +12,9 @@ else {
 
 ?>
 
-
-
-
 <table class="caption">
 	<tr>
-		<td><span class="caption"><img src="./images/logo.png" alt=""> Online-Bookmarks of <?php echo $username; ?></span>
+		<td><span class="caption"><img src="./images/logo.png" alt=""> <?php echo $username; ?>&#039;s Online Bookmarks</span>
 		</td>
 
 		<td class="captionright">
@@ -54,6 +51,9 @@ else {
 				</tr>
 				<tr>
 					<td class="menu">
+						<?php if ($search_mode) { ?>
+						<a href="./index.php"><?php echo $settings['root_folder_name']; ?></a><br>
+						<?php } ?>
 						<a href="javascript:bookmarknew('<?php echo $folderid; ?>')">New Bookmark</a><br>
 						<a href="javascript:bookmarkedit(checkselected())">Edit Bookmarks</a><br>
 						<a href="javascript:bookmarkmove(checkselected())">Move Bookmarks</a><br>
@@ -89,7 +89,9 @@ else {
 				</tr>
 				<tr>
 					<td class="menu">
+						<?php if (admin_only ()) { ?>
 						<a href="./admin.php">Admin</a><br>
+						<?php } ?>
 						<a href="./import.php">Import</a><br>
 						<a href="./export.php">Export</a><br>
 						<a href="./sidebar.php">View as Sidebar</a><br>
@@ -108,7 +110,8 @@ else {
 			<?php if ($search_mode): ?>
 
 		<td class="main4">
-				<div style="height: <?php echo $table_height; ?>; overflow:auto;">
+			<div style="height: <?php echo $table_height; ?>; overflow:auto;">
+				<div style="margin-left:3px;" class="sh"><a class="f" href="./index.php"><img src="./images/folder_open.gif"> Back to <?php echo $settings['root_folder_name']?></a></div>
 
 					<?php
 					$query = sprintf ("SELECT bookmark.title,
@@ -152,7 +155,7 @@ else {
 								$settings['show_column_edit'],
 								$settings['show_column_move'],
 								$settings['show_column_delete'],
-								true);
+								$settings['show_public']);
 						}
 						else {
 							echo '<div> No Bookmarks found matching ' . $search . '.</div>';
@@ -164,7 +167,7 @@ else {
 			
 					?>
 
-				</div>
+			</div>
 		</td>
 
 			<?php else: ?>