aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor fix: improve import from Netscape files (taking tags into account)

Browse source 
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@176 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
mensonge 2008-11-27 07:27:36 +00:00
parent df984f2666
commit 1958ddd8e1
5 changed files with 90 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

150
importNetscape.php
View file

@ -1,23 +1,23 @@
<? <?
/*************************************************************************** /***************************************************************************
Copyright (C) 2004 - 2006 Scuttle project Copyright (C) 2004 - 2006 Scuttle project
http://sourceforge.net/projects/scuttle/ http://sourceforge.net/projects/scuttle/
http://scuttle.org/ http://scuttle.org/
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
@ -36,64 +36,78 @@ isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_
$tplVars = array(); $tplVars = array();
if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['size'] > 0) { if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['size'] > 0) {
$userinfo = $userservice->getCurrentObjectUser(); $userinfo = $userservice->getCurrentObjectUser();
if (is_numeric(POST_STATUS)) { if (is_numeric(POST_STATUS)) {
$status = intval(POST_STATUS); $status = intval(POST_STATUS);
} else { } else {
$status = 2; $status = 2;
} }
// File handle // File handle
$html = file_get_contents($_FILES['userfile']['tmp_name']); $html = file_get_contents($_FILES['userfile']['tmp_name']);
// Create link array
preg_match_all('/<a\s+(.*?)\s*\/*>([^<]*)/si', $html, $matches);
$links = $matches[1];
$titles = $matches[2];
$size = count($links);
for ($i = 0; $i < $size; $i++) {
$attributes = preg_split('/\s+/s', $links[$i]);
foreach ($attributes 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;
}
}
$bTitle = eregi_replace('"', '&quot;', trim($titles[$i]));
if ($bookmarkservice->bookmarkExists($bAddress, $userservice->getCurrentUserId())) { // Create link array
$tplVars['error'] = T_('You have already submitted this bookmark.'); preg_match_all('/<a\s+(.*?)\s*\/*>([^<]*)/si', $html, $matches);
} else { $links = $matches[1];
// If bookmark is local (like javascript: or place: in Firefox3), do nothing $titles = $matches[2];
if(substr($bAddress, 0, 7) == "http://") {
// If bookmark claims to be from the future, set it to be now instead $size = count($links);
if (strtotime($bDatetime) > time()) { for ($i = 0; $i < $size; $i++) {
$bDatetime = gmdate('Y-m-d H:i:s');
}
if ($bookmarkservice->addBookmark($bAddress, $bTitle, NULL, $status, NULL, $bDatetime, false, true)) { // echo "<hr/>";
$tplVars['msg'] = T_('Bookmark imported.'); // echo $links[$i]."<br/>";
} else {
$tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.'); preg_match_all('/(\w*\s*=\s*"[^"]*")/', $links[$i], $attributes);
} //$attributes = $attributes[0]; // we keep just one row
}
} $bDatetime = ""; //bDateTime optional
} $bCategories = ""; //bCategories optional
header('Location: '. createURL('bookmarks', $userinfo->getUsername()));
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;
}
}
$bTitle = eregi_replace('"', '&quot;', trim($titles[$i]));
if ($bookmarkservice->bookmarkExists($bAddress, $userservice->getCurrentUserId())) {
$tplVars['error'] = T_('You have already submitted this bookmark.');
} else {
// If bookmark is local (like javascript: or place: in Firefox3), do nothing
if(substr($bAddress, 0, 7) == "http://") {
// If bookmark claims to be from the future, set it to be now instead
if (strtotime($bDatetime) > time()) {
$bDatetime = gmdate('Y-m-d H:i:s');
}
if ($bookmarkservice->addBookmark($bAddress, $bTitle, NULL, $status, $bCategories, $bDatetime, false, true)) {
$tplVars['msg'] = T_('Bookmark imported.');
} else {
$tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.');
}
}
}
}
header('Location: '. createURL('bookmarks', $userinfo->getUsername()));
} else { } else {
$templatename = 'importNetscape.tpl'; $templatename = 'importNetscape.tpl';
$tplVars['subtitle'] = T_('Import Bookmarks from Browser File'); $tplVars['subtitle'] = T_('Import Bookmarks from Browser File');
$tplVars['formaction'] = createURL('importNetscape'); $tplVars['formaction'] = createURL('importNetscape');
$templateservice->loadTemplate($templatename, $tplVars); $templateservice->loadTemplate($templatename, $tplVars);
} }
?> ?>

4
services/userservice.php
View file

@ -462,9 +462,9 @@ class UserService {
list($emailUser, $emailDomain) = split("@", $email); list($emailUser, $emailDomain) = split("@", $email);
// Check if the email domain has a DNS record // Check if the email domain has a DNS record
if ($this->_checkdns($emailDomain)) { //if ($this->_checkdns($emailDomain)) {
return true; return true;
} //}
} }
return false; return false;
} }

1
templates/bookmarks.tpl.php
View file

@ -10,6 +10,7 @@ $cdservice =& ServiceFactory::getServiceInstance('CommonDescriptionService');
$currentObjectUser = $userservice->getCurrentObjectUser(); $currentObjectUser = $userservice->getCurrentObjectUser();
$pageName = isset($pageName)?$pageName:""; $pageName = isset($pageName)?$pageName:"";
$user = isset($user)?$user:"";
$this->includeTemplate($GLOBALS['top_include']); $this->includeTemplate($GLOBALS['top_include']);

3
templates/sidebar.block.related.php
View file

@ -2,6 +2,9 @@
$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService'); $b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
if(!isset($user)) $user="";
$logged_on_userid = $userservice->getCurrentUserId(); $logged_on_userid = $userservice->getCurrentUserId();
if ($logged_on_userid === false) { if ($logged_on_userid === false) {
$logged_on_userid = NULL; $logged_on_userid = NULL;

4
templates/top.inc.php
View file

@ -23,12 +23,12 @@ if(isset($rsschannels)) {
src="<?php echo ROOT ?>jsScuttle.php"></script> src="<?php echo ROOT ?>jsScuttle.php"></script>
<link rel="stylesheet" type="text/css" <!-- link rel="stylesheet" type="text/css"
href="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dijit/themes/nihilo/nihilo.css"> href="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dijit/themes/nihilo/nihilo.css">
<script type="text/javascript" <script type="text/javascript"
src="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dojo/dojo.xd.js" src="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dojo/dojo.xd.js"
djConfig="parseOnLoad:true, isDebug:false, usePlainJson:true"></script> djConfig="parseOnLoad:true, isDebug:false, usePlainJson:true"></script> -->
<script type="text/javascript"> <script type="text/javascript">
dojo.require("dojo.parser"); dojo.require("dojo.parser");