yohan/SemanticScuttle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better import for XML bookmark file.

Browse Source 
Support for adding multiple bookmarks at once with my modified Firefox's Scuttle plugin.
This commit is contained in:
yohan 2015-09-13 03:33:39 +02:00
parent 795de13414
commit 7699c685e6
4 changed files with 293 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
data/templates/default/editbookmark.tpl.php
View File

@ -1,6 +1,5 @@
<?php <?php
$this->includeTemplate($GLOBALS['top_include']); $this->includeTemplate($GLOBALS['top_include']);
$accessPublic = ''; $accessPublic = '';
$accessShared = ''; $accessShared = '';
$accessPrivate = ''; $accessPrivate = '';
@ -33,6 +32,14 @@ if (is_array($row['tags'])) {
$row['tags'] = implode(', ', $row['tags']); $row['tags'] = implode(', ', $row['tags']);
} }
if (! is_array($row['bAddress'])) {
$row['bAddress'] = array($row['bAddress']);
}
if (! is_array($row['bTitle'])) {
$row['bTitle'] = array($row['bTitle']);
}
$ajaxUrl = ROOT . 'ajax/' $ajaxUrl = ROOT . 'ajax/'
. ( . (
($GLOBALS['adminsAreAdvisedTagsFromOtherAdmins'] && $currentUser->isAdmin()) ($GLOBALS['adminsAreAdvisedTagsFromOtherAdmins'] && $currentUser->isAdmin())
@ -40,18 +47,8 @@ $ajaxUrl = ROOT . 'ajax/'
: 'getcontacttags' : 'getcontacttags'
) . '.php'; ) . '.php';
?> ?>
<form action="<?php echo $formaction; ?>" method="post"> <form onsubmit="var ind = 0; var cb = document.getElementById('checkbox'+ind); while (cb !== undefined) {var title = document.getElementById('titleField'+ind); var address = document.getElementById('address'+ind); if(cb.checked) {cb.parentNode.removeChild(cb);} else {cb.parentNode.removeChild(cb); title.parentNode.removeChild(title); address.parentNode.removeChild(address);} ind++; cb = document.getElementById('checkbox'+ind);}" action="<?php echo $formaction; ?>" method="post">
<table> <table>
<tr>
<th align="left"><?php echo T_('Address'); ?></th>
<td><input type="text" id="address" name="address" size="75" maxlength="65535" value="<?php echo filter($row['bAddress'], 'xml'); ?>" onblur="useAddress(this)" /></td>
<td>← <?php echo T_('Required'); ?></td>
</tr>
<tr>
<th align="left"><?php echo T_('Title'); ?></th>
<td><input type="text" id="titleField" name="title" size="75" maxlength="255" value="<?php echo filter($row['bTitle'], 'xml'); ?>" onkeypress="this.style.backgroundImage = 'none';" /></td>
<td>← <?php echo T_('Required'); ?></td>
</tr>
<tr> <tr>
<th align="left"> <th align="left">
<?php echo T_('Description'); ?> <?php echo T_('Description'); ?>
@ -126,14 +123,40 @@ $ajaxUrl = ROOT . 'ajax/'
<?php <?php
} elseif (isset($referrer)) { } elseif (isset($referrer)) {
?> ?>
<input type="hidden" name="referrer" value="<?php echo $referrer; ?>" /> <input type="hidden" name="referrer" value="<?php echo filter($referrer, 'xml'); ?>" />
<?php <?php
} }
?> ?>
</td> </td>
<td></td> <td></td>
</tr> </tr>
</table> <?php
foreach($row['bAddress'] as $index => $address) {
?>
<tr>
<td height="20px"></td>
<td><input type="checkbox" id="checkbox<?php echo $index; ?>" checked /></td>
<td></td>
</tr>
<tr>
<th align="left"><?php echo T_('Address'); ?></th>
<td><input type="text" id="address<?php echo $index; ?>" name="address[<?php echo $index; ?>]" size="75" maxlength="65535" value="<?php echo filter($address, 'xml'); ?>" onblur="useAddress(this)" /></td>
<td>← <?php echo T_('Required'); ?></td>
</tr>
<tr>
<th align="left"><?php echo T_('Title'); ?></th>
<td><input type="text" id="titleField<?php echo $index; ?>" name="title[<?php echo $index; ?>]" size="75" maxlength="255" value="<?php echo filter($row['bTitle'][$index], 'xml'); ?>" onkeypress="this.style.backgroundImage = 'none';" /></td>
<td>← <?php echo T_('Required'); ?></td>
</tr>
<tr>
<td height="20px"></td>
<td></td>
<td></td>
</tr>
<?php
}
?>
</table>
</form> </form>
<link href="<?php echo ROOT ?>js/jquery-ui-1.8.11/themes/base/jquery.ui.all.css" rel="stylesheet" type="text/css"/> <link href="<?php echo ROOT ?>js/jquery-ui-1.8.11/themes/base/jquery.ui.all.css" rel="stylesheet" type="text/css"/>

139
www/bookmarks.php
View File

@ -29,15 +29,21 @@ $cacheservice =SemanticScuttle_Service_Factory::get('Cache');
isset($_GET['action']) ? define('GET_ACTION', $_GET['action']): define('GET_ACTION', ''); isset($_GET['action']) ? define('GET_ACTION', $_GET['action']): define('GET_ACTION', '');
isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', ''); isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
isset($_GET['title']) ? define('GET_TITLE', $_GET['title']): define('GET_TITLE', ''); // define does not support arrays before PHP version 7
isset($_GET['address']) ? define('GET_ADDRESS', $_GET['address']): define('GET_ADDRESS', ''); isset($_GET['title']) ? $TITLE = $_GET['title']: $TITLE = array();
//isset($_GET['title']) ? define('GET_TITLE', $_GET['title']): define('GET_TITLE', '');
isset($_GET['address']) ? $ADDRESS = $_GET['address']: $ADDRESS = array();
//isset($_GET['address']) ? define('GET_ADDRESS', $_GET['address']): define('GET_ADDRESS', '');
isset($_GET['description']) ? define('GET_DESCRIPTION', $_GET['description']): define('GET_DESCRIPTION', ''); isset($_GET['description']) ? define('GET_DESCRIPTION', $_GET['description']): define('GET_DESCRIPTION', '');
isset($_GET['privateNote']) ? define('GET_PRIVATENOTE', $_GET['privateNote']): define('GET_PRIVATENOTE', ''); isset($_GET['privateNote']) ? define('GET_PRIVATENOTE', $_GET['privateNote']): define('GET_PRIVATENOTE', '');
isset($_GET['tags']) ? define('GET_TAGS', $_GET['tags']): define('GET_TAGS', ''); isset($_GET['tags']) ? define('GET_TAGS', $_GET['tags']): define('GET_TAGS', '');
isset($_GET['copyOf']) ? define('GET_COPYOF', $_GET['copyOf']): define('GET_COPYOF', ''); isset($_GET['copyOf']) ? define('GET_COPYOF', $_GET['copyOf']): define('GET_COPYOF', '');
isset($_POST['title']) ? define('POST_TITLE', $_POST['title']): define('POST_TITLE', ''); // define does not support arrays before PHP version 7
isset($_POST['address']) ? define('POST_ADDRESS', $_POST['address']): define('POST_ADDRESS', ''); isset($_POST['title']) ? $TITLE = $_POST['title']: $TITLE = array();
//isset($_POST['title']) ? define('POST_TITLE', $_POST['title']): define('POST_TITLE', '');
isset($_POST['address']) ? $ADDRESS = $_POST['address']: $ADDRESS = array();
//isset($_POST['address']) ? define('POST_ADDRESS', $_POST['address']): define('POST_ADDRESS', '');
isset($_POST['description']) ? define('POST_DESCRIPTION', $_POST['description']): define('POST_DESCRIPTION', ''); isset($_POST['description']) ? define('POST_DESCRIPTION', $_POST['description']): define('POST_DESCRIPTION', '');
isset($_POST['privateNote']) ? define('POST_PRIVATENOTE', $_POST['privateNote']): define('POST_PRIVATENOTE', ''); isset($_POST['privateNote']) ? define('POST_PRIVATENOTE', $_POST['privateNote']): define('POST_PRIVATENOTE', '');
isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', ''); isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', '');
@ -53,7 +59,13 @@ if (!isset($_POST['tags'])) {
$_POST['tags'] = array(); $_POST['tags'] = array();
} }
//echo '<p>' . var_export($_POST, true) . '</p>';die(); //echo '<p>' . var_export($_POST, true) . '</p>';die();
if (! is_array($ADDRESS)) {
$ADDRESS = array($ADDRESS);
}
if (! is_array($TITLE)) {
$TITLE = array($TITLE);
}
if ((GET_ACTION == "add") && !$userservice->isLoggedOn()) { if ((GET_ACTION == "add") && !$userservice->isLoggedOn()) {
$loginqry = str_replace("'", '%27', stripslashes($_SERVER['QUERY_STRING'])); $loginqry = str_replace("'", '%27', stripslashes($_SERVER['QUERY_STRING']));
@ -130,53 +142,72 @@ $tplVars['loadjs'] = true;
$saved = false; $saved = false;
$templatename = 'bookmarks.tpl'; $templatename = 'bookmarks.tpl';
if ($userservice->isLoggedOn() && POST_SUBMITTED != '') { if ($userservice->isLoggedOn() && POST_SUBMITTED != '') {
if (!POST_TITLE || !POST_ADDRESS) { if (!$TITLE || !$ADDRESS) {
$tplVars['error'] = T_('Your bookmark must have a title and an address'); $tplVars['error'] = T_('Your bookmark must have a title and an address');
$templatename = 'editbookmark.tpl'; $templatename = 'editbookmark.tpl';
} else { }
$address = trim(POST_ADDRESS); else {
if (!SemanticScuttle_Model_Bookmark::isValidUrl($address)) { $address = array_map('trim', $ADDRESS);
$tplVars['error'] = T_('This bookmark URL may not be added'); $valid = 1;
$templatename = 'editbookmark.tpl'; foreach($address as $value) {
} else if ($bookmarkservice->bookmarkExists($address, $currentUserID)) { if (!SemanticScuttle_Model_Bookmark::isValidUrl($value)) {
// If the bookmark exists already, edit the original $tplVars['error'] = T_('This bookmark URL may not be added' + $value);
$bookmark = $bookmarkservice->getBookmarkByAddress($address); $templatename = 'editbookmark.tpl';
header('Location: '. createURL('edit', $bookmark['bId'])); $valid = 0;
exit(); break;
// If it's new, save it }
} else { }
$title = trim(POST_TITLE); if ($valid) {
$description = trim(POST_DESCRIPTION); $title = array_map('trim', $TITLE);
$privateNote = trim(POST_PRIVATENOTE); $description = trim(POST_DESCRIPTION);
$status = intval(POST_STATUS); $privateNote = trim(POST_PRIVATENOTE);
$categories = explode(',', $_POST['tags']); $status = intval(POST_STATUS);
$saved = true; $categories = explode(',', $_POST['tags']);
if ($bookmarkservice->addBookmark($address, $title, $description, $privateNote, $status, $categories)) { $saved = true;
if (POST_POPUP != '') { foreach($address as $index => $value) {
$tplVars['msg'] = '<script type="text/javascript">window.close();</script>'; if ($bookmarkservice->bookmarkExists($value, $currentUserID)) {
} else { // If the bookmark exists already, edit the original
$tplVars['msg'] = T_('Bookmark saved') . ' <a href="javascript:history.go(-2)">'.T_('(Come back to previous page.)').'</a>'; $bookmark = $bookmarkservice->getBookmarkByAddress($value);
// Redirection option $bId = intval($bookmark['bId']);
if ($GLOBALS['useredir']) { $row = $bookmarkservice->getBookmark($bId, true);
$address = $GLOBALS['url_redir'] . $address; $categories = array_unique(array_merge($row['tags'], $categories));
} if (!$bookmarkservice->updateBookmark($bId, $value, $title[$index], $description, $privateNote, $status, $categories)) {
} $tplvars['error'] = T_('Error while saving this bookmark : ' + $value);
} else { $templatename = 'editbookmark.tpl';
$tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.'); $saved = false;
$templatename = 'editbookmark.tpl'; break;
$saved = false; }
} }
} // If it's new, save it
elseif (!$bookmarkservice->addBookmark($value, $title[$index], $description, $privateNote, $status, $categories)) {
$tplVars['error'] = T_('There was an error saving this bookmark : ' + $value + ' Please try again or contact the administrator.');
$templatename = 'editbookmark.tpl';
$saved = false;
break;
}
}
if ($saved) {
if (POST_POPUP != '') {
$tplVars['msg'] = '<script type="text/javascript">window.close();</script>';
}
else {
$tplVars['msg'] = T_('Bookmark saved') . ' <a href="javascript:history.go(-2)">'.T_('(Come back to previous page.)').'</a>';
}
}
}
} }
} }
if (GET_ACTION == "add") { if (GET_ACTION == "add") {
// If the bookmark exists already, edit the original // If the bookmark exists already, edit the original
if ($bookmarkservice->bookmarkExists(stripslashes(GET_ADDRESS), $currentUserID)) { if (count($ADDRESS) === 1) {
$bookmark =& $bookmarkservice->getBookmarks(0, NULL, $currentUserID, NULL, NULL, NULL, NULL, NULL, NULL, $bookmarkservice->getHash(stripslashes(GET_ADDRESS))); if ($bookmarkservice->bookmarkExists(stripslashes($ADDRESS[0]), $currentUserID)) {
$popup = (GET_POPUP!='') ? '?popup=1' : ''; $bookmark =& $bookmarkservice->getBookmarks(0, NULL, $currentUserID, NULL, NULL, NULL, NULL, NULL, NULL, $bookmarkservice->getHash(stripslashes($ADDRESS[0])));
header('Location: '. createURL('edit', $bookmark['bookmarks'][0]['bId'] . $popup)); $popup = (GET_POPUP!='') ? '?popup=1' : '';
exit(); header('Location: '. createURL('edit', $bookmark['bookmarks'][0]['bId'] . $popup));
exit();
}
} }
$templatename = 'editbookmark.tpl'; $templatename = 'editbookmark.tpl';
} }
@ -186,10 +217,10 @@ if ($templatename == 'editbookmark.tpl') {
$tplVars['formaction'] = createURL('bookmarks', $currentUsername); $tplVars['formaction'] = createURL('bookmarks', $currentUsername);
if (POST_SUBMITTED != '') { if (POST_SUBMITTED != '') {
$tplVars['row'] = array( $tplVars['row'] = array(
'bTitle' => stripslashes(POST_TITLE), 'bTitle' => array_map('stripslashes', $TITLE),
'bAddress' => stripslashes(POST_ADDRESS), 'bAddress' => array_map('stripslashes', $ADDRESS),
'bDescription' => stripslashes(POST_DESCRIPTION), 'bDescription' => stripslashes(POST_DESCRIPTION),
'bPrivateNote' => stripslashes(POST_PRIVATENOTE), 'bPrivateNote' => stripslashes(POST_PRIVATENOTE),
'tags' => ($_POST['tags'] ? $_POST['tags'] : array()), 'tags' => ($_POST['tags'] ? $_POST['tags'] : array()),
'bStatus' => $GLOBALS['defaults']['privacy'], 'bStatus' => $GLOBALS['defaults']['privacy'],
); );
@ -202,12 +233,14 @@ if ($templatename == 'editbookmark.tpl') {
} }
}else { //copy from pop-up bookmarklet }else { //copy from pop-up bookmarklet
$tplVars['row'] = array( $tplVars['row'] = array(
'bTitle' => stripslashes(GET_TITLE), 'bTitle' => array_map('stripslashes', $TITLE),
'bAddress' => stripslashes(GET_ADDRESS), //'bTitle' => stripslashes(GET_TITLE),
'bDescription' => stripslashes(GET_DESCRIPTION), 'bAddress' => array_map('stripslashes', $ADDRESS),
'bPrivateNote' => stripslashes(GET_PRIVATENOTE), //'bAddress' => stripslashes(GET_ADDRESS),
'tags' => (GET_TAGS ? explode(',', stripslashes(GET_TAGS)) : array()), 'bDescription' => stripslashes(GET_DESCRIPTION),
'bStatus' => $GLOBALS['defaults']['privacy'] 'bPrivateNote' => stripslashes(GET_PRIVATENOTE),
'tags' => (GET_TAGS ? explode(',', stripslashes(GET_TAGS)) : array()),
'bStatus' => $GLOBALS['defaults']['privacy']
); );
} }

28
www/edit.php
View File

@ -29,8 +29,12 @@ $bookmarkservice = SemanticScuttle_Service_Factory :: get('Bookmark');
isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', ''); isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
isset($_POST['delete']) ? define('POST_DELETE', $_POST['delete']): define('POST_DELETE', ''); isset($_POST['delete']) ? define('POST_DELETE', $_POST['delete']): define('POST_DELETE', '');
isset($_POST['title']) ? define('POST_TITLE', $_POST['title']): define('POST_TITLE', ''); // define does not support arrays before PHP version 7
isset($_POST['address']) ? define('POST_ADDRESS', $_POST['address']): define('POST_ADDRESS', ''); isset($_POST['title']) ? $TITLE = $_POST['title']: $TITLE = array();
//isset($_POST['title']) ? define('POST_TITLE', $_POST['title']): define('POST_TITLE', '');
isset($_POST['address']) ? $ADDRESS = $_POST['address']: $ADDRESS = array();
//isset($_POST['address']) ? define('POST_ADDRESS', $_POST['address']): define('POST_ADDRESS', '');
isset($_POST['description']) ? define('POST_DESCRIPTION', $_POST['description']): define('POST_DESCRIPTION', ''); isset($_POST['description']) ? define('POST_DESCRIPTION', $_POST['description']): define('POST_DESCRIPTION', '');
isset($_POST['privateNote']) ? define('POST_PRIVATENOTE', $_POST['privateNote']): define('POST_PRIVATENOTE', ''); isset($_POST['privateNote']) ? define('POST_PRIVATENOTE', $_POST['privateNote']): define('POST_PRIVATENOTE', '');
isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', $GLOBALS['defaults']['privacy']); isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', $GLOBALS['defaults']['privacy']);
@ -40,6 +44,14 @@ isset($_GET['popup']) ? define('GET_POPUP', $_GET['popup']): define('GET_POPUP',
isset($_POST['popup']) ? define('POST_POPUP', $_POST['popup']): define('POST_POPUP', ''); isset($_POST['popup']) ? define('POST_POPUP', $_POST['popup']): define('POST_POPUP', '');
isset($_POST['referrer']) ? define('POST_REFERRER', $_POST['referrer']): define('POST_REFERRER', ''); isset($_POST['referrer']) ? define('POST_REFERRER', $_POST['referrer']): define('POST_REFERRER', '');
if (! is_array($ADDRESS)) {
$ADDRESS = array($ADDRESS);
}
if (! is_array($TITLE)) {
$TITLE = array($TITLE);
}
// Header variables // Header variables
$tplVars['pagetitle'] = T_('Edit Bookmark'); $tplVars['pagetitle'] = T_('Edit Bookmark');
$tplVars['subtitle'] = T_('Edit Bookmark'); $tplVars['subtitle'] = T_('Edit Bookmark');
@ -52,28 +64,24 @@ if (!($row = $bookmarkservice->getBookmark(intval($bookmark), true))) {
$templateservice->loadTemplate('error.404.tpl', $tplVars); $templateservice->loadTemplate('error.404.tpl', $tplVars);
exit(); exit();
} else { } else {
if (!$bookmarkservice->editAllowed($row)) { if (!$bookmarkservice->editAllowed($row)) {
$tplVars['error'] = T_('You are not allowed to edit this bookmark'); $tplVars['error'] = T_('You are not allowed to edit this bookmark');
$templateservice->loadTemplate('error.500.tpl', $tplVars); $templateservice->loadTemplate('error.500.tpl', $tplVars);
exit(); exit();
} else if (POST_SUBMITTED != '') { } else if (POST_SUBMITTED != '') {
if (!$TITLE || !$ADDRESS) {
if (!POST_TITLE || !POST_ADDRESS) {
$tplVars['error'] = T_('Your bookmark must have a title and an address'); $tplVars['error'] = T_('Your bookmark must have a title and an address');
} else { } else {
// Update bookmark // Update bookmark
$bId = intval($bookmark); $bId = intval($bookmark);
$address = trim(POST_ADDRESS); $address = array_map('trim', $ADDRESS);
$title = trim(POST_TITLE); $title = array_map('trim', $TITLE);
$description = trim(POST_DESCRIPTION); $description = trim(POST_DESCRIPTION);
$privateNote = trim(POST_PRIVATENOTE); $privateNote = trim(POST_PRIVATENOTE);
$status = intval(POST_STATUS); $status = intval(POST_STATUS);
$tags = trim(POST_TAGS); $tags = trim(POST_TAGS);
if (!$bookmarkservice->updateBookmark($bId, $address, $title, $description, $privateNote, $status, $tags)) { if (!$bookmarkservice->updateBookmark($bId, $address[0], $title[0], $description, $privateNote, $status, $tags)) {
$tplvars['error'] = T_('Error while saving your bookmark'); $tplvars['error'] = T_('Error while saving your bookmark');
} else { } else {
if (POST_POPUP != '') { if (POST_POPUP != '') {

200
www/importNetscape.php
View File

@ -44,68 +44,45 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
// File handle // File handle
$html = file_get_contents($_FILES['userfile']['tmp_name']); $html = file_get_contents($_FILES['userfile']['tmp_name']);
// Create array
$matches = parse_netscape_bookmarks($html);
//var_dump($matches);
// Create link array $size = count($matches);
//preg_match_all('/<a\s+(.*?)\s*\/*>([^<]*)/si', $html, $matches);
preg_match_all('/<a\s+(.*?)>([^<]*?)<\/a>.*?(<dd>([^<]*)|<dt>)/si', $html, $matches);
//var_dump($matches);die();
$links = $matches[1];
$titles = $matches[2];
$descriptions = $matches[4];
$size = count($links);
for ($i = 0; $i < $size; $i++) { for ($i = 0; $i < $size; $i++) {
$bDatetime = gmdate('Y-m-d H:i:s', $matches[$i]['time']); //bDateTime optional
// echo "<hr/>"; $bCategories = $matches[$i]['tags']; //bCategories optional
// echo $links[$i]."<br/>"; $bAddress = $matches[$i]['uri'];
$bDescription = $matches[$i]['note'];
preg_match_all('/(\w*\s*=\s*"[^"]*")/', $links[$i], $attributes); $bTitle = $matches[$i]['title'];
//$attributes = $attributes[0]; // we keep just one row $bPrivateNote = '';
$bDatetime = ""; //bDateTime optional
$bCategories = ""; //bCategories optional
foreach ($attributes[0] as $attribute) {
$att = preg_split('/\s*=\s*/s', $attribute, 2);
$attrTitle = $att[0];
$attrVal = eregi_replace('"', '&quot;', preg_replace('/([\'"]?)(.*)\1/', '$2', $att[1]));
switch ($attrTitle) {
case "HREF":
$bAddress = $attrVal;
break;
case "ADD_DATE":
$bDatetime = gmdate('Y-m-d H:i:s', $attrVal);
break;
case "TAGS":
$bCategories = $attrVal;
break;
case "NOTE":
$bPrivateNote = $attrVal;
}
}
$bTitle = trim($titles[$i]);
$bDescription = trim($descriptions[$i]);
if ($bookmarkservice->bookmarkExists($bAddress, $userservice->getCurrentUserId())) { if ($bookmarkservice->bookmarkExists($bAddress, $userservice->getCurrentUserId())) {
$tplVars['error'] = T_('You have already submitted some of these bookmarks.'); //$tplVars['error'] = T_('You have already submitted some of these bookmarks.');
// If the bookmark exists already, edit the original
$bookmark = $bookmarkservice->getBookmarkByAddress($bAddress);
$bId = intval($bookmark['bId']);
$row = $bookmarkservice->getBookmark($bId, true);
$categories = array_unique(array_merge($row['tags'], $bCategories));
//var_dump('update', $bId, $bAddress, $row['bTitle'], $row['bDescription'], $row['bPrivateNote'], $row['bStatus'], $categories);
if ($bookmarkservice->updateBookmark($bId, $bAddress, $row['bTitle'], $row['bDescription'], $row['bPrivateNote'], $row['bStatus'], $categories)) {
$countImportedBookmarks++;
}
else {
$tplvars['error'] = T_('Error while saving this bookmark : ' + $bAddress);
}
} else { } else {
// If bookmark is local (like javascript: or place: in Firefox3), do nothing // If bookmark is local (like javascript: or place: in Firefox3), do nothing
if(substr($bAddress, 0, 7) == "http://" || substr($bAddress, 0, 8) == "https://") { if(substr($bAddress, 0, 7) == "http://" || substr($bAddress, 0, 8) == "https://") {
// If bookmark claims to be from the future, set it to be now instead // If bookmark claims to be from the future, set it to be now instead
if (strtotime($bDatetime) > time()) { if (strtotime($bDatetime) > time()) {
$bDatetime = gmdate('Y-m-d H:i:s'); $bDatetime = gmdate('Y-m-d H:i:s');
} }
//var_dump('add ', $bAddress, $bTitle, $bDescription, $bPrivateNote, $status, $bCategories, $bDatetime);
if ($bookmarkservice->addBookmark($bAddress, $bTitle, $bDescription, $bPrivateNote, $status, $bCategories, null, $bDatetime, false, true)) { if ($bookmarkservice->addBookmark($bAddress, $bTitle, $bDescription, $bPrivateNote, $status, $bCategories, null, $bDatetime, false, true)) {
$countImportedBookmarks++; $countImportedBookmarks++;
} else { } else {
$tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.'); $tplVars['error'] = T_('There was an error saving your bookmark : ' . $bAddress . ' Please try again or contact the administrator.');
} }
} }
} }
@ -123,4 +100,131 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
$tplVars['formaction'] = createURL('importNetscape'); $tplVars['formaction'] = createURL('importNetscape');
$templateservice->loadTemplate($templatename, $tplVars); $templateservice->loadTemplate($templatename, $tplVars);
} }
/**
* Basically netscape bookmark files often come so badly formed, there's
* no reliable way I could find to parse them with DOM or SimpleXML,
* even after running HTML Tidy on them. So, this function does a bunch of
* transformations on the general format of a netscape bookmark file, to get
* Each bookmark and its description onto one line, and goes through line by
* line, matching tags and attributes. It's messy, but it works better than
* anything I could find in hours of googling, and anything that I could
* write after hours with DOM and SimpleXML. I didn't want to pull in a big
* DOM parsing library just to do this one thing, so this is it.
* @todo - running Tidy before doing this might be beneficial.
* ?? $bkmk_str = tidy_parse_string($bkmk_str)->cleanRepair();
*
* Update 2013-07-08:
* Just tested this on an export of some bookmarks from Pinboard.in
* and it seems that it is still working, so good for me.
*/
/*
print '<PRE>';
var_dump(parse_netscape_bookmarks(file_get_contents('bookmarks_export.htm')));
*/
function parse_netscape_bookmarks($bkmk_str, $default_tag = null) {
$i = 0;
$next = false;
$items = [];
$current_tag = $default_tag = $default_tag ?: 'autoimported-'.date("Ymd");
$bkmk_str = str_replace(["\r","\n","\t"], ['','',' '], $bkmk_str);
$bkmk_str = preg_replace_callback('@<dd>(.*?)(<A|<\/|<DL|<DT|<P)@mis', function($m) {
return '<dd>'.str_replace(["\r", "\n"], ['', '<br>'], trim($m[1])).'</';
}, $bkmk_str);
$bkmk_str = preg_replace('/>(\s*?)</mis', ">\n<", $bkmk_str);
$bkmk_str = preg_replace('/(<!DOCTYPE|<META|<!--|<TITLE|<H1|<P)(.*?)\n/i', '', $bkmk_str);
$bkmk_str = trim($bkmk_str);
$bkmk_str = preg_replace('/\n<dd/i', '<dd', $bkmk_str);
//best way to do it :
$bkmk_str = preg_replace('/(?<=.)<\/DL>/', "\n</DL>", $bkmk_str);
$lines = explode("\n", $bkmk_str);
$str_bool = function($str, $default = false) {
if (!$str) {
return false;
} elseif (!is_string($str) && $str) {
return true;
}
$true = 'y|yes|on|checked|ok|1|true|array|\+|okay|yes+|t|one';
$false = 'n|no|off|empty|null|false|0|-|exit|die|neg|f|zero|void';
if (preg_match("/^($true)$/i", $str)) {
return true;
} elseif (preg_match("/^($false)$/i", $str)) {
return false;
}
return $default;
};
$tags = array($default_tag);
foreach ($lines as $line_no => $line) {
/* If we match a tag, set current tag to that, if <DL>, stop tag. */
if (preg_match('/^<h\d(.*?)>(.*?)<\/h\d>/i', $line, $m1)) {
$current_tag = trim(preg_replace("/\s+/", "_", strtr($m1[2], ', /+', '____')));
$tags[] = $current_tag;
continue;
} elseif (preg_match('/^<\/DL>/i', $line)) {
$current_tag = $default_tag;
array_pop($tags);
}
if (preg_match('/<a/i', $line, $m2)) {
$items[$i]['tags'] = $tags;
if (preg_match('/href="(.*?)"/i', $line, $m3)) {
$items[$i]['uri'] = $m3[1];
// $items[$i]['meta'] = meta($m3[1]);
} else {
$items[$i]['uri'] = '';
// $items[$i]['meta'] = '';
}
if (preg_match('/<a(.*?)>(.*?)<\/a>/i', $line, $m4)) {
$items[$i]['title'] = $m4[2];
// $items[$i]['slug'] = slugify($m4[2]);
} else {
$items[$i]['title'] = 'untitled';
// $items[$i]['slug'] = '';
}
if (preg_match('/note="(.*?)"<\/a>/i', $line, $m5)) {
$items[$i]['note'] = $m5[1];
} elseif (preg_match('/<dd>(.*?)<\//i', $line, $m6)) {
$items[$i]['note'] = str_replace('<br>', "\n", $m6[1]);
} else {
$items[$i]['note'] = '';
}
if (preg_match('/(tags?|labels?|folders?)="(.*?)"/i', $line, $m7)) {
array_unique(array_merge($items[$i]['tags'], explode(' ', trim(preg_replace("/\s+/", " ", strtr($m7[2], ',', ' '))))));
}
if (preg_match('/add_date="(.*?)"/i', $line, $m8)) {
$items[$i]['time'] = $m8[1];
} else {
$items[$i]['time'] = time();
}
if (preg_match('/(public|published|pub)="(.*?)"/i', $line, $m9)) {
$items[$i]['pub'] = $str_bool($m9[2], false) ? 1 : 0;
} elseif (preg_match('/(private|shared)="(.*?)"/i', $line, $m10)) {
$items[$i]['pub'] = $str_bool($m10[2], true) ? 0 : 1;
}
$i++;
}
}
ksort($items);
return $items;
}
?> ?>