Skip to content

Commit c7f63c8

Browse files
scronidescronide
committed
Tagged 0.7.5
1 parent bce919a commit c7f63c8

File tree

142 files changed

+11091
-1747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+11091
-1747
lines changed

‎.htaccess

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
# Rewrite clean URLs onto real files
22
<IfModule mod_rewrite.c>
3-
Options +FollowSymlinks
4-
<IfDefine APACHE2>
3+
<IfDefine APACHE2>
54
AcceptPathInfo On
6-
</IfDefine>
7-
RewriteEngine On
8-
RewriteBase /
9-
RewriteCond %{REQUEST_FILENAME} !-f
10-
RewriteCond %{REQUEST_FILENAME} !-d
11-
RewriteCond %{REQUEST_FILENAME}.php -f
12-
RewriteRule ^([^/]+)/?(.*) $1.php/$2 [L]
5+
</IfDefine>
6+
RewriteEngine On
7+
RewriteBase /
8+
RewriteCond %{REQUEST_FILENAME} !-f
9+
RewriteCond %{REQUEST_FILENAME} !-d
10+
RewriteCond %{REQUEST_FILENAME}.php -f
11+
RewriteRule ^([^/]+)/?(.*) $1.php/$2 [L]
1312
</IfModule>

‎AUTHORS

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
Scuttle contains code from the following applications:
1+
Scuttle contains code from the following open-source projects:
22

3-
------------
4-
GPL Licenced
5-
------------
3+
jQuery
4+
http://www.jquery.com/
65

76
phpBB2 (database abstraction layer)
87
http://www.phpbb.com/
@@ -11,8 +10,8 @@ php-gettext
1110
Danilo Segan <danilo@kvota.net>
1211
http://savannah.nongnu.org/projects/php-gettext/
1312

14-
UTF8 Helper Functions
15-
Andreas Gohr <andi@splitbrain.org>
13+
PHP UTF-8
14+
https://sourceforge.net/projects/phputf8/
1615

1716
XSPF Web Music Player (Flash)
1817
http://musicplayer.sourceforge.net/

‎about.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/***************************************************************************
3-
Copyright (C) 2004, 2005 Scuttle project
3+
Copyright (c) 2004 - 2010 Scuttle project
44
http://sourceforge.net/projects/scuttle/
55
66
This program is free software; you can redistribute it and/or modify
@@ -18,10 +18,9 @@
1818
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1919
***************************************************************************/
2020

21-
require_once('header.inc.php');
21+
require_once 'header.inc.php';
2222
$templateservice =& ServiceFactory::getServiceInstance('TemplateService');
2323

24-
$tplVars = array();
24+
$tplVars = array();
2525
$tplVars['subtitle'] = T_('About');
2626
$templateservice->loadTemplate('about.tpl', $tplVars);
27-
?>

‎ajaxDelete.php

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/***************************************************************************
3-
Copyright (C) 2005 - 2006 Scuttle project
3+
Copyright (c) 2005 - 2010 Scuttle project
44
http://sourceforge.net/projects/scuttle/
55
http://scuttle.org/
66
@@ -19,22 +19,17 @@
1919
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2020
***************************************************************************/
2121

22-
header('Content-Type: text/xml; charset=UTF-8');
22+
header('Content-Type: text/plain; charset=UTF-8');
2323
header('Last-Modified: '. gmdate("D, d M Y H:i:s") .' GMT');
2424
header('Cache-Control: no-cache, must-revalidate');
25-
require_once('header.inc.php');
25+
require_once 'header.inc.php';
2626

27-
$bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService');
27+
$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
2828
$bookmark = intval($_GET['id']);
2929
if (!$bookmarkservice->editAllowed($bookmark)) {
30-
$result = T_('You are not allowed to delete this bookmark');
30+
echo T_('You are not allowed to delete this bookmark');
3131
} elseif ($bookmarkservice->deleteBookmark($bookmark)) {
32-
$result = 'true';
32+
echo true;
3333
} else {
34-
$result = T_('Failed to delete bookmark');
34+
echo T_('Failed to delete bookmark');
3535
}
36-
?>
37-
<response>
38-
<method>deleteConfirmed</method>
39-
<result><?php echo $result; ?></result>
40-
</response>

‎ajaxGetTitle.php

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/***************************************************************************
3-
Copyright (C) 2005 - 2006 Scuttle project
3+
Copyright (c) 2005 - 2010 Scuttle project
44
http://sourceforge.net/projects/scuttle/
55
http://scuttle.org/
66
@@ -19,11 +19,10 @@
1919
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2020
***************************************************************************/
2121

22-
header('Content-Type: text/xml; charset=UTF-8');
23-
header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT");
24-
header("Cache-Control: no-cache, must-revalidate");
25-
26-
require_once('header.inc.php');
22+
header('Content-Type: text/plain; charset=UTF-8');
23+
header('Last-Modified: '. gmdate("D, d M Y H:i:s") .' GMT');
24+
header('Cache-Control: no-cache, must-revalidate');
25+
require_once 'header.inc.php';
2726

2827
function getTitle($url) {
2928
$fd = @fopen($url, 'r');
@@ -58,9 +57,4 @@ function getTitle($url) {
5857
return false;
5958
}
6059
}
61-
echo '<?xml version="1.0" encoding="utf-8"?>';
62-
?>
63-
<response>
64-
<method>getTitle</method>
65-
<result><?php echo getTitle($_GET['url']); ?></result>
66-
</response>
60+
echo getTitle($_GET['url']);

‎ajaxIsAvailable.php

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/***************************************************************************
3-
Copyright (C) 2006 Scuttle project
3+
Copyright (c) 2006 - 2010 Scuttle project
44
http://sourceforge.net/projects/scuttle/
55
http://scuttle.org/
66
@@ -19,19 +19,10 @@
1919
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2020
***************************************************************************/
2121

22-
header('Content-Type: text/xml; charset=UTF-8');
23-
header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT");
24-
header("Cache-Control: no-cache, must-revalidate");
22+
header('Content-Type: text/plain; charset=UTF-8');
23+
header('Last-Modified: '. gmdate("D, d M Y H:i:s") .' GMT');
24+
header('Cache-Control: no-cache, must-revalidate');
25+
require_once 'header.inc.php';
2526

26-
require_once('header.inc.php');
27-
$userservice = & ServiceFactory :: getServiceInstance('UserService');
28-
if ($userservice->isReserved($_GET['username'])) {
29-
$result = 'false';
30-
} else {
31-
$result = $userservice->getUserByUsername($_GET['username']) ? 'false' : 'true';
32-
}
33-
?>
34-
<response>
35-
<method>isAvailable</method>
36-
<result><?php echo $result; ?></result>
37-
</response>
27+
$userservice =& ServiceFactory::getServiceInstance('UserService');
28+
echo !($userservice->isReserved($_GET['username']) || $userservice->getUserByUsername($_GET['username']));

‎alltags.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/***************************************************************************
3-
Copyright (C) 2004 - 2006 Scuttle project
3+
Copyright (c) 2004 - 2006 Scuttle project
44
http://sourceforge.net/projects/scuttle/
55
http://scuttle.org/
66

‎bookmarks.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/***************************************************************************
3-
Copyright (C) 2004 - 2006 Scuttle project
3+
Copyright (c) 2004 - 2006 Scuttle project
44
http://sourceforge.net/projects/scuttle/
55
http://scuttle.org/
66

‎config.inc.php.example

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
######################################################################
33
# SCUTTLE: Online social bookmarks manager
44
######################################################################
5-
# Copyright (C) 2005 - 2006 Scuttle project
5+
# Copyright (c) 2005 - 2010 Scuttle project
66
# http://sourceforge.net/projects/scuttle/
77
# http://scuttle.org/
88
#
@@ -116,5 +116,4 @@ $filetypes = array(
116116
);
117117
$reservedusers = array('all', 'watchlist');
118118

119-
include_once('debug.inc.php');
120-
?>
119+
include_once 'debug.inc.php';

‎edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/***************************************************************************
3-
Copyright (C) 2004 - 2006 Scuttle project
3+
Copyright (c) 2004 - 2006 Scuttle project
44
http://sourceforge.net/projects/scuttle/
55
http://scuttle.org/
66

‎functions.inc.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22
// UTF-8 functions
3-
require_once(dirname(__FILE__) .'/includes/utf8.php');
3+
require_once dirname(__FILE__) .'/includes/utf8/utf8.php';
44

55
// Translation
6-
require_once(dirname(__FILE__) .'/includes/php-gettext/gettext.inc');
6+
require_once dirname(__FILE__) .'/includes/php-gettext/gettext.inc';
77
$domain = 'messages';
88
T_setlocale(LC_ALL, $locale);
99
T_bindtextdomain($domain, dirname(__FILE__) .'/locales');
@@ -157,4 +157,3 @@ function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '',
157157
echo "<html>\n<body>\n". $msg_title ."\n<br /><br />\n". $msg_text ."</body>\n</html>";
158158
exit;
159159
}
160-
?>

‎header.inc.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
define('DEBUG', true);
88
session_start();
99

10-
require_once(dirname(__FILE__) .'/services/servicefactory.php');
11-
require_once(dirname(__FILE__) .'/config.inc.php');
12-
require_once(dirname(__FILE__) .'/functions.inc.php');
10+
require_once dirname(__FILE__) .'/services/servicefactory.php';
11+
require_once dirname(__FILE__) .'/config.inc.php';
12+
require_once dirname(__FILE__) .'/functions.inc.php';
1313

1414
// Determine the base URL
1515
if (!isset($root)) {
1616
$pieces = explode('/', $_SERVER['SCRIPT_NAME']);
17-
$root = '/';
18-
foreach($pieces as $piece) {
17+
$root = '/';
18+
foreach ($pieces as $piece) {
1919
if ($piece != '' && !strstr($piece, '.php')) {
2020
$root .= $piece .'/';
2121
}
@@ -24,12 +24,13 @@
2424
$root .= '/';
2525
}
2626
$path = $root;
27-
$root = 'http://'. $_SERVER['HTTP_HOST'] . $root;
27+
28+
$protocol = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
29+
$root = $protocol .'://'. $_SERVER['HTTP_HOST'] . $root;
2830
}
2931

3032
// Error codes
31-
define('GENERAL_MESSAGE', 200);
32-
define('GENERAL_ERROR', 202);
33+
define('GENERAL_MESSAGE', 200);
34+
define('GENERAL_ERROR', 202);
3335
define('CRITICAL_MESSAGE', 203);
34-
define('CRITICAL_ERROR', 204);
35-
?>
36+
define('CRITICAL_ERROR', 204);

‎history.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/***************************************************************************
3-
Copyright (C) 2006 Scuttle project
3+
Copyright (c) 2006 Scuttle project
44
http://sourceforge.net/projects/scuttle/
55
http://scuttle.org/
66

‎import.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?
1+
<?php
22
/***************************************************************************
3-
Copyright (C) 2004 - 2006 Scuttle project
3+
Copyright (c) 2004 - 2006 Scuttle project
44
http://sourceforge.net/projects/scuttle/
55
http://scuttle.org/
66

‎importNetscape.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?
1+
<?php
22
/***************************************************************************
3-
Copyright (C) 2004 - 2006 Scuttle project
3+
Copyright (c) 2004 - 2006 Scuttle project
44
http://sourceforge.net/projects/scuttle/
55
http://scuttle.org/
66

0 commit comments

Comments
 (0)