git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@150 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
parent
c35ab1bf2b
commit
a62b9742ee
5 changed files with 549 additions and 544 deletions
28
about.php
28
about.php
|
@ -1,22 +1,22 @@
|
||||||
<?php
|
<?php
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
Copyright (C) 2004, 2005 Scuttle project
|
Copyright (C) 2004, 2005 Scuttle project
|
||||||
http://sourceforge.net/projects/scuttle/
|
http://sourceforge.net/projects/scuttle/
|
||||||
|
|
||||||
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');
|
||||||
$templateservice =& ServiceFactory::getServiceInstance('TemplateService');
|
$templateservice =& ServiceFactory::getServiceInstance('TemplateService');
|
||||||
|
|
|
@ -1,23 +1,23 @@
|
||||||
<?php
|
<?php
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
Copyright (C) 2005 - 2006 Scuttle project
|
Copyright (C) 2005 - 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
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
header('Content-Type: text/xml; charset=UTF-8');
|
header('Content-Type: text/xml; charset=UTF-8');
|
||||||
header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT");
|
header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT");
|
||||||
|
@ -40,7 +40,7 @@ function getTitle($url) {
|
||||||
$encoding = strtoupper($matches[1][0]);
|
$encoding = strtoupper($matches[1][0]);
|
||||||
|
|
||||||
// Convert to UTF-8 from the original encoding
|
// Convert to UTF-8 from the original encoding
|
||||||
if (function_exists('mb_convert_encoding') {
|
if (function_exists("mb_convert_encoding") {
|
||||||
$title = @mb_convert_encoding($title, 'UTF-8', $encoding);
|
$title = @mb_convert_encoding($title, 'UTF-8', $encoding);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,6 +61,10 @@ function getTitle($url) {
|
||||||
echo '<?xml version="1.0" encoding="utf-8"?>';
|
echo '<?xml version="1.0" encoding="utf-8"?>';
|
||||||
?>
|
?>
|
||||||
<response>
|
<response>
|
||||||
<method>getTitle</method>
|
<method>
|
||||||
<result><?php echo getTitle($_GET['url']); ?></result>
|
getTitle
|
||||||
|
</method>
|
||||||
|
<result>
|
||||||
|
<?php echo getTitle($_GET['url']); ?>
|
||||||
|
</result>
|
||||||
</response>
|
</response>
|
32
index.php
32
index.php
|
@ -1,23 +1,23 @@
|
||||||
<?php
|
<?php
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
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');
|
||||||
$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
|
$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
|
||||||
|
@ -36,7 +36,7 @@ if (isset($_GET['action'])){
|
||||||
// Header variables
|
// Header variables
|
||||||
$tplVars['loadjs'] = true;
|
$tplVars['loadjs'] = true;
|
||||||
$tplVars['rsschannels'] = array(
|
$tplVars['rsschannels'] = array(
|
||||||
array(sprintf(T_('%s: Recent bookmarks'), $sitename), createURL('rss').'?sort='.getSortOrder())
|
array(sprintf(T_('%s: Recent bookmarks'), $sitename), createURL('rss').'?sort='.getSortOrder())
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($usecache) {
|
if ($usecache) {
|
||||||
|
|
|
@ -225,6 +225,7 @@ class BookmarkService {
|
||||||
// if that user is on the logged-in user's watchlist, get the public AND contacts-only
|
// if that user is on the logged-in user's watchlist, get the public AND contacts-only
|
||||||
// bookmarks; otherwise, just get the public bookmarks.
|
// bookmarks; otherwise, just get the public bookmarks.
|
||||||
// - if the $user is set and IS the logged-in user, then get all bookmarks.
|
// - if the $user is set and IS the logged-in user, then get all bookmarks.
|
||||||
|
|
||||||
$userservice =& ServiceFactory::getServiceInstance('UserService');
|
$userservice =& ServiceFactory::getServiceInstance('UserService');
|
||||||
$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
|
$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
|
||||||
$tag2tagservice =& ServiceFactory::getServiceInstance('Tag2TagService');
|
$tag2tagservice =& ServiceFactory::getServiceInstance('Tag2TagService');
|
||||||
|
@ -321,7 +322,7 @@ class BookmarkService {
|
||||||
$query_4 .= ' T'. $i .'.tag = "'. $this->db->sql_escape($tags[$i]) .'"';
|
$query_4 .= ' T'. $i .'.tag = "'. $this->db->sql_escape($tags[$i]) .'"';
|
||||||
|
|
||||||
$query_4 .= ') AND T'. $i .'.bId = B.bId';
|
$query_4 .= ') AND T'. $i .'.bId = B.bId';
|
||||||
//die($query_4);
|
//die($query_4);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Search terms
|
// Search terms
|
||||||
|
@ -362,7 +363,7 @@ class BookmarkService {
|
||||||
$query_4 .= ' AND B.bHash = "'. $hash .'"';
|
$query_4 .= ' AND B.bHash = "'. $hash .'"';
|
||||||
}
|
}
|
||||||
$query = $query_1 . $query_2 . $query_3 . $query_4 . $query_5;
|
$query = $query_1 . $query_2 . $query_3 . $query_4 . $query_5;
|
||||||
//die($query);
|
//die($query);
|
||||||
if (!($dbresult = & $this->db->sql_query_limit($query, intval($perpage), intval($start)))) {
|
if (!($dbresult = & $this->db->sql_query_limit($query, intval($perpage), intval($start)))) {
|
||||||
message_die(GENERAL_ERROR, 'Could not get bookmarks', '', __LINE__, __FILE__, $query, $this->db);
|
message_die(GENERAL_ERROR, 'Could not get bookmarks', '', __LINE__, __FILE__, $query, $this->db);
|
||||||
return false;
|
return false;
|
||||||
|
|
30
users.php
30
users.php
|
@ -1,23 +1,23 @@
|
||||||
<?php
|
<?php
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
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');
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue