From: Marcus Campbell <marcus.campbell@gmail.com>
Date: Tue, 21 Dec 2010 08:47:47 +0000 (-0800)
Subject: - Enforce minimum elapsed time on registration form
X-Git-Url: https://projects.mako.cc/source/scuttle/commitdiff_plain/6b106efb4f8497f1bd9dc334683751508caa176e?ds=inline

- Enforce minimum elapsed time on registration form
- Removed redirection after save
- Show most recent page of results on index, rather than most recent day
- Minor code style updates
- Shameless self-aggrandising

Signed-off-by: Marcus Campbell <marcus.campbell@gmail.com>
---

diff --git a/about.php b/about.php
index c089cb9..d5b3572 100644
--- a/about.php
+++ b/about.php
@@ -1,7 +1,7 @@
 <?php
 /***************************************************************************
-Copyright (c) 2004 - 2010 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2010 Marcus Campbell
+http://scuttle.org/
 
 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
diff --git a/ajaxDelete.php b/ajaxDelete.php
index 1972a20..fb99301 100644
--- a/ajaxDelete.php
+++ b/ajaxDelete.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2005 - 2010 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2005 - 2010 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
diff --git a/ajaxGetTitle.php b/ajaxGetTitle.php
index 14b1f46..81e2329 100644
--- a/ajaxGetTitle.php
+++ b/ajaxGetTitle.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2005 - 2010 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2005 - 2010 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
diff --git a/ajaxIsAvailable.php b/ajaxIsAvailable.php
index 8cd10c0..d1a64a3 100644
--- a/ajaxIsAvailable.php
+++ b/ajaxIsAvailable.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2006 - 2010 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2006 - 2010 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
diff --git a/alltags.php b/alltags.php
index 1b0476f..331ac59 100644
--- a/alltags.php
+++ b/alltags.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2010 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,13 +18,14 @@ along with this program; if not, write to the Free Software
 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');
-$tagservice =& ServiceFactory::getServiceInstance('TagService');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
-$cacheservice =& ServiceFactory::getServiceInstance('CacheService');
+$tagservice      =& ServiceFactory::getServiceInstance('TagService');
+$userservice     =& ServiceFactory::getServiceInstance('UserService');
+$cacheservice    =& ServiceFactory::getServiceInstance('CacheService');
 
-list($url, $user) = explode('/', $_SERVER['PATH_INFO']);
+@list($url, $user) = explode('/', $_SERVER['PATH_INFO']);
 if (!$user) {
     header('Location: '. createURL('populartags'));
     exit;
diff --git a/api/httpauth.inc.php b/api/httpauth.inc.php
index bc26582..79191cf 100644
--- a/api/httpauth.inc.php
+++ b/api/httpauth.inc.php
@@ -5,7 +5,7 @@
 function authenticate() {
     header('WWW-Authenticate: Basic realm="del.icio.us API"');
     header('HTTP/1.0 401 Unauthorized');
-    die("Use of the API calls requires authentication.");
+    die(T_('Use of the API calls requires authentication.'));
 }
 
 if (!isset($_SERVER['PHP_AUTH_USER'])) {
diff --git a/api/posts_add.php b/api/posts_add.php
index 77c3288..f9e060e 100644
--- a/api/posts_add.php
+++ b/api/posts_add.php
@@ -10,11 +10,11 @@
 // - No support for 'replace' variable
 
 // Force HTTP authentication
-require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once 'httpauth.inc.php';
+require_once '../header.inc.php';
 
 $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
+$userservice     =& ServiceFactory::getServiceInstance('UserService');
 
 // Get all the bookmark's passed-in information
 if (isset($_REQUEST['url']) && (trim($_REQUEST['url']) != ''))
@@ -67,17 +67,16 @@ if (isset($_REQUEST['status'])) {
 
 // Error out if there's no address or description
 if (is_null($url) || is_null($description)) {
-    $added = false;
+    $added = FALSE;
 } else {
 // We're good with info; now insert it!
     if ($bookmarkservice->bookmarkExists($url, $userservice->getCurrentUserId()))
-        $added = false;
+        $added = FALSE;
     else
-        $added = $bookmarkservice->addBookmark($url, $description, $extended, $status, $tags, $dt, true);
+        $added = $bookmarkservice->addBookmark($url, $description, $extended, $status, $tags, $dt, TRUE);
 }
 
 // Set up the XML file and output the result.
 header('Content-Type: text/xml');
 echo '<?xml version="1.0" standalone="yes" ?'.">\r\n";
 echo '<result code="'. ($added ? 'done' : 'something went wrong') .'" />';
-?>
\ No newline at end of file
diff --git a/api/posts_all.php b/api/posts_all.php
index 03026c4..4f05d39 100644
--- a/api/posts_all.php
+++ b/api/posts_all.php
@@ -5,11 +5,11 @@
 // - doesn't include the filtered tag as an attribute on the root element (we do)
 
 // Force HTTP authentication first!
-require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once 'httpauth.inc.php';
+require_once '../header.inc.php';
 
 $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
+$userservice     =& ServiceFactory::getServiceInstance('UserService');
 
 // Check to see if a tag was specified.
 if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != ''))
@@ -47,4 +47,3 @@ foreach($bookmarks['bookmarks'] as $row) {
 }
 
 echo '</posts>';
-?>
\ No newline at end of file
diff --git a/api/posts_dates.php b/api/posts_dates.php
index 7098756..672a312 100644
--- a/api/posts_dates.php
+++ b/api/posts_dates.php
@@ -3,11 +3,11 @@
 // by tag).
 
 // Force HTTP authentication first!
-require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once 'httpauth.inc.php';
+require_once '../header.inc.php';
 
 $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
+$userservice     =& ServiceFactory::getServiceInstance('UserService');
 
 // Check to see if a tag was specified.
 if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != ''))
@@ -26,17 +26,18 @@ header('Content-Type: text/xml');
 echo '<?xml version="1.0" standalone="yes" ?'.">\r\n";
 echo '<dates tag="'. (is_null($tag) ? '' : filter($tag, 'xml')) .'" user="'. filter($currentusername, 'xml') ."\">\r\n";
 
+$count    = 0;
 $lastdate = NULL;
-foreach($bookmarks['bookmarks'] as $row) {
+foreach ($bookmarks['bookmarks'] as $row) {
     $thisdate = gmdate('Y-m-d', strtotime($row['bDatetime']));
     if ($thisdate != $lastdate && $lastdate != NULL) {
         echo "\t<date count=\"". $count .'" date="'. $lastdate ."\" />\r\n";
         $count = 1;
-    } else {
-        $count = $count + 1;
+    }
+    else {
+        $count++;
     }
     $lastdate = $thisdate;
 }
 
 echo "</dates>";
-?>
\ No newline at end of file
diff --git a/api/posts_delete.php b/api/posts_delete.php
index 737a4fb..9bf0ce3 100644
--- a/api/posts_delete.php
+++ b/api/posts_delete.php
@@ -7,27 +7,27 @@
 // - doesn't set the Content-Type to text/xml (we do).
 
 // Force HTTP authentication first!
-require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once 'httpauth.inc.php';
+require_once '../header.inc.php';
 
 $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
+$userservice     =& ServiceFactory::getServiceInstance('UserService');
 
 // Note that del.icio.us only errors out if no URL was passed in; there's no error on attempting
 // to delete a bookmark you don't have.
 
 // Error out if there's no address
 if (is_null($_REQUEST['url'])) {
-    $deleted = false;
-} else {
+    $deleted = FALSE;
+}
+else {
     $bookmark = $bookmarkservice->getBookmarkByAddress($_REQUEST['url']);
     $bid = $bookmark['bId'];
     $delete = $bookmarkservice->deleteBookmark($bid);
-    $deleted = true;
+    $deleted = TRUE;
 }
 
 // Set up the XML file and output the result.
 header('Content-Type: text/xml');
 echo '<?xml version="1.0" standalone="yes" ?'.">\r\n";
 echo '<result code="'. ($deleted ? 'done' : 'something went wrong') .'" />';
-?>
\ No newline at end of file
diff --git a/api/posts_get.php b/api/posts_get.php
index 8be067b..d54f86a 100644
--- a/api/posts_get.php
+++ b/api/posts_get.php
@@ -10,11 +10,11 @@
 // - Uses today, instead of the last bookmarked date, if no date is specified
 
 // Force HTTP authentication first!
-require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once 'httpauth.inc.php';
+require_once '../header.inc.php';
 
 $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
+$userservice     =& ServiceFactory::getServiceInstance('UserService');
 
 // Check to see if a tag was specified.
 if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != ''))
@@ -40,7 +40,7 @@ header('Content-Type: text/xml');
 echo '<?xml version="1.0" standalone="yes" ?'.">\r\n";
 echo '<posts'. (is_null($dtstart) ? '' : ' dt="'. $dtstart .'"') .' tag="'. (is_null($tag) ? '' : filter($tag, 'xml')) .'" user="'. filter($currentusername, 'xml') ."\">\r\n";
 
-foreach($bookmarks['bookmarks'] as $row) {
+foreach ($bookmarks['bookmarks'] as $row) {
     if (is_null($row['bDescription']) || (trim($row['bDescription']) == ''))
         $description = '';
     else
@@ -59,4 +59,3 @@ foreach($bookmarks['bookmarks'] as $row) {
 }
 
 echo '</posts>';
-?>
\ No newline at end of file
diff --git a/api/posts_recent.php b/api/posts_recent.php
index 22fc2bd..476eecb 100644
--- a/api/posts_recent.php
+++ b/api/posts_recent.php
@@ -4,14 +4,14 @@
 
 // Set default and max number of posts
 $countDefault = 15;
-$countMax = 100;
+$countMax     = 100;
 
 // Force HTTP authentication first!
-require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once 'httpauth.inc.php';
+require_once '../header.inc.php';
 
 $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
+$userservice     =& ServiceFactory::getServiceInstance('UserService');
 
 // Check to see if a tag was specified.
 if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != ''))
@@ -41,7 +41,7 @@ header('Content-Type: text/xml');
 echo '<?xml version="1.0" standalone="yes" ?'.">\r\n";
 echo '<posts tag="'. (is_null($tag) ? '' : filter($tag, 'xml')) .'" user="'. filter($currentusername, 'xml') ."\">\r\n";
 
-foreach($bookmarks['bookmarks'] as $row) {
+foreach ($bookmarks['bookmarks'] as $row) {
     if (is_null($row['bDescription']) || (trim($row['bDescription']) == ''))
         $description = '';
     else
@@ -60,4 +60,3 @@ foreach($bookmarks['bookmarks'] as $row) {
 }
 
 echo '</posts>';
-?>
\ No newline at end of file
diff --git a/api/posts_update.php b/api/posts_update.php
index de379d2..9e37e1f 100644
--- a/api/posts_update.php
+++ b/api/posts_update.php
@@ -5,22 +5,18 @@
 // - doesn't set the Content-Type to text/xml (we do).
 
 // Force HTTP authentication first!
-require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once 'httpauth.inc.php';
+require_once '../header.inc.php';
 
 $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
+$userservice     =& ServiceFactory::getServiceInstance('UserService');
 
 // Get the posts relevant to the passed-in variables.
 $bookmarks =& $bookmarkservice->getBookmarks(0, 1, $userservice->getCurrentUserId());
 
-$currentuser = $userservice->getCurrentUser();
-$currentusername = $currentuser[$userservice->getFieldName('username')];
-
 // Set up the XML file and output all the tags.
 header('Content-Type: text/xml');
 echo '<?xml version="1.0" standalone="yes" ?'.">\r\n";
-foreach($bookmarks['bookmarks'] as $row) {
+foreach ($bookmarks['bookmarks'] as $row) {
     echo '<update time="'. gmdate('Y-m-d\TH:i:s\Z', strtotime($row['bDatetime'])) .'" />';
 }
-?>
\ No newline at end of file
diff --git a/api/tags_get.php b/api/tags_get.php
index 2584566..e731873 100644
--- a/api/tags_get.php
+++ b/api/tags_get.php
@@ -5,10 +5,10 @@
 // - tags can't have spaces
 
 // Force HTTP authentication first!
-require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once 'httpauth.inc.php';
+require_once '../header.inc.php';
 
-$tagservice =& ServiceFactory::getServiceInstance('TagService');
+$tagservice  =& ServiceFactory::getServiceInstance('TagService');
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 
 // Get the tags relevant to the passed-in variables.
@@ -18,8 +18,7 @@ $tags =& $tagservice->getTags($userservice->getCurrentUserId());
 header('Content-Type: text/xml');
 echo '<?xml version="1.0" standalone="yes" ?'.">\r\n";
 echo "<tags>\r\n";
-foreach($tags as $row) {
-    echo "\t<tag count=\"". $row['bCount'] .'" tag="'. filter(convertTag($row['tag'], 'out'), 'xml') ."\" />\r\n";
+foreach ($tags as $row) {
+  echo "\t<tag count=\"". $row['bCount'] .'" tag="'. filter(convertTag($row['tag'], 'out'), 'xml') ."\" />\r\n";
 }
 echo "</tags>";
-?>
\ No newline at end of file
diff --git a/api/tags_rename.php b/api/tags_rename.php
index 20831e7..191b362 100644
--- a/api/tags_rename.php
+++ b/api/tags_rename.php
@@ -5,33 +5,33 @@
 // - oddly, returns an entirely different result (<result></result>) than the other API calls.
 
 // Force HTTP authentication first!
-require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once 'httpauth.inc.php';
+require_once '../header.inc.php';
 
-$tagservice =& ServiceFactory::getServiceInstance('TagService');
+$tagservice  =& ServiceFactory::getServiceInstance('TagService');
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 
 // Get the tag info.
 if (isset($_REQUEST['old']) && (trim($_REQUEST['old']) != ''))
-    $old = trim($_REQUEST['old']);
+  $old = trim($_REQUEST['old']);
 else
-    $old = NULL;
+  $old = NULL;
 
 if (isset($_REQUEST['new']) && (trim($_REQUEST['new']) != ''))
-    $new = trim($_REQUEST['new']);
+  $new = trim($_REQUEST['new']);
 else
-    $new = NULL;
+  $new = NULL;
 
 if (is_null($old) || is_null($new)) {
-    $renamed = false;
-} else {
-    // Rename the tag.
-    $result = $tagservice->renameTag($userservice->getCurrentUserId(), $old, $new, true);
-    $renamed = $result;
+  $renamed = FALSE;
+}
+else {
+  // Rename the tag.
+  $result = $tagservice->renameTag($userservice->getCurrentUserId(), $old, $new, TRUE);
+  $renamed = $result;
 }
 
 // Set up the XML file and output the result.
 header('Content-Type: text/xml');
 echo '<?xml version="1.0" standalone="yes" ?'.">\r\n";
 echo '<result>'. ($renamed ? 'done' : 'something went wrong') .'</result>';
-?>
diff --git a/bookmarks.php b/bookmarks.php
index 7dd1f40..d264531 100644
--- a/bookmarks.php
+++ b/bookmarks.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2010 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,12 +18,12 @@ along with this program; if not, write to the Free Software
 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');
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
-$cacheservice =& ServiceFactory::getServiceInstance('CacheService');
+$userservice     =& ServiceFactory::getServiceInstance('UserService');
+$cacheservice    =& ServiceFactory::getServiceInstance('CacheService');
 
 $tplVars = array();
 
@@ -96,11 +95,13 @@ if ($loggedon && isset($_POST['submitted'])) {
         $templatename = 'editbookmark.tpl';
     } else {
         $address = trim($_POST['address']);
+
         // If the bookmark exists already, edit the original
         if ($bookmarkservice->bookmarkExists($address, $currentUserID)) {
             $bookmark =& $bookmarkservice->getBookmarkByAddress($address);
             header('Location: '. createURL('edit', $bookmark['bId']));
             exit();
+
         // If it's new, save it
         } else {
             $title = trim($_POST['title']);
@@ -113,11 +114,6 @@ if ($loggedon && isset($_POST['submitted'])) {
                     $tplVars['msg'] = '<script type="text/javascript">window.close();</script>';
                 } else {
                     $tplVars['msg'] = T_('Bookmark saved');
-                    // Redirection option
-                    if ($GLOBALS['useredir']) {
-                        $address = $GLOBALS['url_redir'] . $address;
-                    }
-                    header('Location: '. $address);
                 }
             } else {
                 $tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.');
@@ -225,4 +221,3 @@ if ($usecache && $endcache) {
     // Cache output if existing copy has expired
     $cacheservice->End($hash);
 }
-?>
diff --git a/config.inc.php.example b/config.inc.php.example
index a355bfa..a8c32c9 100644
--- a/config.inc.php.example
+++ b/config.inc.php.example
@@ -2,7 +2,7 @@
 ######################################################################
 # SCUTTLE: Online social bookmarks manager
 ######################################################################
-# Copyright (c) 2005 - 2010 Scuttle project
+# Copyright (c) 2005 - 2010 Marcus Campbell
 # http://scuttle.org/
 #
 # This module is to configure the main options for your site
@@ -92,8 +92,6 @@ $adminemail = 'admin@example.org';
 # filetypes    : An array of bookmark extensions that Scuttle should
 #                add system tags for.
 # reservedusers : An array of usernames that cannot be registered
-# url_blacklist   : Array of regex patterns. User is banned and existing
-#                     bookmarks are hidden if a match is found.
 # email_whitelist : Array of regex patterns. Used to whitelist addresses that
 #                     may otherwise match the blacklist.
 # email_blacklist : Array of regex patterns. Registration is blocked if a
@@ -104,7 +102,7 @@ $top_include       = 'top.inc.php';
 $bottom_include    = 'bottom.inc.php';
 $shortdate         = 'd-m-Y';
 $longdate          = 'j F Y';
-$nofollow          = true;
+$nofollow          = TRUE;
 $defaultPerPage    = 10;
 $defaultRecentDays = 14;
 $defaultOrderBy    = 'date_desc';
@@ -113,12 +111,12 @@ $root              = NULL;
 $cookieprefix      = 'SCUTTLE';
 $tableprefix       = 'sc_';
 $adminemail        = 'admin@example.org';
-$cleanurls         = false;
+$cleanurls         = FALSE;
 
-$usecache          = false;
+$usecache          = FALSE;
 $dir_cache         = dirname(__FILE__) .'/cache/';
 
-$useredir          = false;
+$useredir          = FALSE;
 $url_redir         = 'http://www.google.com/url?sa=D&q=';
 
 $filetypes         = array(
diff --git a/debug.inc.php b/debug.inc.php
index 8bd7f33..346140a 100644
--- a/debug.inc.php
+++ b/debug.inc.php
@@ -1,6 +1,6 @@
 <?php
 // Turn debugging on
-define('SCUTTLE_DEBUG',true);
+define('SCUTTLE_DEBUG', TRUE);
 
 // generic debugging function
 // Sample:
@@ -13,4 +13,3 @@ function pc_debug($file, $line, $message) {
         error_log("SCUTTLE_DEBUG disabled");
     }
 }
-?>
\ No newline at end of file
diff --git a/edit.php b/edit.php
index cca8e47..bae38e4 100644
--- a/edit.php
+++ b/edit.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,11 +18,11 @@ along with this program; if not, write to the Free Software
 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');
-$templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
-$userservice = & ServiceFactory :: getServiceInstance('UserService');
+$bookmarkservice = & ServiceFactory::getServiceInstance('BookmarkService');
+$templateservice = & ServiceFactory::getServiceInstance('TemplateService');
+$userservice     = & ServiceFactory::getServiceInstance('UserService');
 
 // Header variables
 $tplVars['subtitle'] = T_('Edit Bookmark');
diff --git a/header.inc.php b/header.inc.php
index b8971c3..1002aab 100644
--- a/header.inc.php
+++ b/header.inc.php
@@ -2,9 +2,7 @@
 ini_set('display_errors', '1');
 ini_set('mysql.trace_mode', '0');
 
-error_reporting(E_ALL ^ E_NOTICE);
-
-define('DEBUG', true);
+error_reporting(E_ALL & ~E_WARNING & ~E_NOTICE);
 session_start();
 
 require_once dirname(__FILE__) .'/services/servicefactory.php';
@@ -29,8 +27,8 @@ if (!isset($root)) {
     $root     = $protocol .'://'. $_SERVER['HTTP_HOST'] . $root;
 }
 
-// Error codes
 define('GENERAL_MESSAGE',  200);
 define('GENERAL_ERROR',    202);
 define('CRITICAL_MESSAGE', 203);
 define('CRITICAL_ERROR',   204);
+define('DEBUG',            TRUE);
diff --git a/history.php b/history.php
index f27cf09..8a31972 100644
--- a/history.php
+++ b/history.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,7 +18,7 @@ along with this program; if not, write to the Free Software
 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');
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
diff --git a/import.php b/import.php
index f45da13..2af25d0 100644
--- a/import.php
+++ b/import.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
-require_once('header.inc.php');
+require_once 'header.inc.php';
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
 $tplVars = array();
diff --git a/importNetscape.php b/importNetscape.php
index b41345b..97c0a4f 100644
--- a/importNetscape.php
+++ b/importNetscape.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,7 +18,7 @@ along with this program; if not, write to the Free Software
 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');
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
diff --git a/index.php b/index.php
index f89e64e..2a9d8ab 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2010 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,18 +18,16 @@ along with this program; if not, write to the Free Software
 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');
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
-$cacheservice =& ServiceFactory::getServiceInstance('CacheService');
+$userservice     =& ServiceFactory::getServiceInstance('UserService');
+$cacheservice    =& ServiceFactory::getServiceInstance('CacheService');
 
 $tplvars = array();
-if (isset($_GET['action'])){
-    if ($_GET['action'] == "logout") {
-        $userservice->logout($path);
-        $tplvars['msg'] = T_('You have now logged out');
-    }
+if (isset($_GET['action']) && 'logout' == $_GET['action']) {
+  $userservice->logout($path);
+  $tplvars['msg'] = T_('You have now logged out');
 }
 
 // Header variables
@@ -53,26 +50,16 @@ if ($usecache) {
 
 // Pagination
 $perpage = getPerPageCount();
-if (isset($_GET['page']) && intval($_GET['page']) > 1) {
-    $page = $_GET['page'];
-    $start = ($page - 1) * $perpage;
-} else {
-    $page = 0;
-    $start = 0;
-}
-
-$dtend = date('Y-m-d H:i:s', strtotime('tomorrow'));
-$dtstart = date('Y-m-d H:i:s', strtotime($dtend .' -'. $defaultRecentDays .' days'));
 
-$tplVars['page'] = $page;
-$tplVars['start'] = $start;
+$tplVars['page']     = 0;
+$tplVars['start']    = 0;
 $tplVars['popCount'] = 30;
 $tplVars['sidebar_blocks'] = array('recent');
 $tplVars['range'] = 'all';
 $tplVars['pagetitle'] = T_('Store, share and tag your favourite links');
 $tplVars['subtitle'] = T_('Recent Bookmarks');
-$tplVars['bookmarkCount'] = $start + 1;
-$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, $dtstart, $dtend);
+$tplVars['bookmarkCount'] = 1;
+$bookmarks =& $bookmarkservice->getBookmarks(0, $perpage, NULL, NULL, NULL, getSortOrder(), NULL);
 $tplVars['total'] = $bookmarks['total'];
 $tplVars['bookmarks'] =& $bookmarks['bookmarks'];
 $tplVars['cat_url'] = createURL('tags', '%2$s');
@@ -84,4 +71,3 @@ if ($usecache) {
     // Cache output if existing copy has expired
     $cacheservice->End($hash);
 }
-?>
\ No newline at end of file
diff --git a/locales/de_DE/LC_MESSAGES/messages.po b/locales/de_DE/LC_MESSAGES/messages.po
index 208f26f..1b98a13 100644
--- a/locales/de_DE/LC_MESSAGES/messages.po
+++ b/locales/de_DE/LC_MESSAGES/messages.po
@@ -1,5 +1,5 @@
 # Scuttle de-DE Translation
-# Copyright (C) 2005 - 2006 Scuttle project
+# Copyright (C) 2005 - 2006 Marcus Campbell
 # This file is distributed under the same license as the Scuttle package.
 # Ogee <ogee@ogee.de>
 #
diff --git a/locales/dk_DK/LC_MESSAGES/messages.po b/locales/dk_DK/LC_MESSAGES/messages.po
index 3d06851..db93765 100644
--- a/locales/dk_DK/LC_MESSAGES/messages.po
+++ b/locales/dk_DK/LC_MESSAGES/messages.po
@@ -1,5 +1,5 @@
 # Scuttle dk-DK Translation
-# Copyright (C) 2006 Scuttle project
+# Copyright (C) 2006 Marcus Campbell
 # This file is distributed under the same license as the Scuttle package.
 # Nicki Brøchner <nicki.brochner@gmail.com>
 #
diff --git a/locales/en_GB/LC_MESSAGES/messages.po b/locales/en_GB/LC_MESSAGES/messages.po
index 46ea298..446f034 100644
--- a/locales/en_GB/LC_MESSAGES/messages.po
+++ b/locales/en_GB/LC_MESSAGES/messages.po
@@ -1,5 +1,5 @@
 # Scuttle en-GB Translation
-# Copyright (C) 2005 - 2006 Scuttle project
+# Copyright (C) 2005 - 2006 Marcus Campbell
 # This file is distributed under the same license as the Scuttle package.
 # Marcus Campbell <marcus.campbell@gmail.com>
 #
diff --git a/locales/es_ES/LC_MESSAGES/messages.po b/locales/es_ES/LC_MESSAGES/messages.po
index 73567fb..35f6f3a 100644
--- a/locales/es_ES/LC_MESSAGES/messages.po
+++ b/locales/es_ES/LC_MESSAGES/messages.po
@@ -1,5 +1,5 @@
 # Scuttle es-ES Translation
-# Copyright (C) 2005 - 2006 Scuttle project
+# Copyright (C) 2005 - 2006 Marcus Campbell
 # This file is distributed under the same license as the Scuttle package.
 # Francisco Portero <fportero@serbinario.com>
 #
diff --git a/locales/fr_FR/LC_MESSAGES/messages.po b/locales/fr_FR/LC_MESSAGES/messages.po
index 96572aa..b71e8b7 100644
--- a/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/locales/fr_FR/LC_MESSAGES/messages.po
@@ -1,5 +1,5 @@
 # Scuttle fr-FR Translation
-# Copyright (C) 2005 - 2006 Scuttle project
+# Copyright (C) 2005 - 2006 Marcus Campbell
 # This file is distributed under the same license as the Scuttle package.
 # <toony.sf@chezouam.net>
 # nitram <nitram@no-log.org>
diff --git a/locales/hi_IN/LC_MESSAGES/messages.po b/locales/hi_IN/LC_MESSAGES/messages.po
index af6b412..f60296d 100644
--- a/locales/hi_IN/LC_MESSAGES/messages.po
+++ b/locales/hi_IN/LC_MESSAGES/messages.po
@@ -1,5 +1,5 @@
 # Scuttle hi-IN Translation
-# Copyright (C) 2005 - 2006 Scuttle project
+# Copyright (C) 2005 - 2006 Marcus Campbell
 # This file is distributed under the same license as the Scuttle package.
 # Debashish Chakrabarty <debashish @ gmail.com>
 # Ravishankar Shrivastava <raviratlami@yahoo.com>
diff --git a/locales/it_IT/LC_MESSAGES/messages.po b/locales/it_IT/LC_MESSAGES/messages.po
index 46d86d3..fa77a56 100644
--- a/locales/it_IT/LC_MESSAGES/messages.po
+++ b/locales/it_IT/LC_MESSAGES/messages.po
@@ -1,5 +1,5 @@
 # Scuttle it-IT Translation
-# Copyright (C) 2005 - 2006 Scuttle project
+# Copyright (C) 2005 - 2006 Marcus Campbell
 # This file is distributed under the same license as the Scuttle package.
 # <upcome@gmail.com>
 #
diff --git a/locales/ja_JP/LC_MESSAGES/messages.po b/locales/ja_JP/LC_MESSAGES/messages.po
index e59c6aa..644784d 100644
--- a/locales/ja_JP/LC_MESSAGES/messages.po
+++ b/locales/ja_JP/LC_MESSAGES/messages.po
@@ -1,5 +1,5 @@
 # Scuttle ja-JP Translation
-# Copyright (C) 2005 - 2006 Scuttle project
+# Copyright (C) 2005 - 2006 Marcus Campbell
 # This file is distributed under the same license as the Scuttle package.
 # Tadashi Jokagi <elf2000@users.sourceforge.net>, 2005-2006.
 #
diff --git a/locales/lt_LT/LC_MESSAGES/messages.po b/locales/lt_LT/LC_MESSAGES/messages.po
index 90cd169..0013c05 100644
--- a/locales/lt_LT/LC_MESSAGES/messages.po
+++ b/locales/lt_LT/LC_MESSAGES/messages.po
@@ -1,5 +1,5 @@
 # Scuttle lt-LT Translation
-# Copyright (C) 2005 - 2006 Scuttle project
+# Copyright (C) 2005 - 2006 Marcus Campbell
 # This file is distributed under the same license as the Scuttle package.
 # Audrius Radzevičius <audrius@gmail.com>
 #
diff --git a/locales/nl_NL/LC_MESSAGES/messages.po b/locales/nl_NL/LC_MESSAGES/messages.po
index 1dd6526..5782028 100644
--- a/locales/nl_NL/LC_MESSAGES/messages.po
+++ b/locales/nl_NL/LC_MESSAGES/messages.po
@@ -1,5 +1,5 @@
 # Scuttle nl-NL Translation
-# Copyright (C) 2005 - 2006 Scuttle project
+# Copyright (C) 2005 - 2006 Marcus Campbell
 # This file is distributed under the same license as the Scuttle package.
 # <alley@ilikeu2.nl>
 #
diff --git a/locales/pt_BR/LC_MESSAGES/messages.po b/locales/pt_BR/LC_MESSAGES/messages.po
index 36df105..1c6f1ae 100644
--- a/locales/pt_BR/LC_MESSAGES/messages.po
+++ b/locales/pt_BR/LC_MESSAGES/messages.po
@@ -1,5 +1,5 @@
 # Scuttle pt-BR Translation
-# Copyright (C) 2006 Scuttle project
+# Copyright (C) 2006 Marcus Campbell
 # This file is distributed under the same license as the Scuttle package.
 # Marcelo Jorge Vieira (metal) <metal@alucinados.com>, 2006.
 #
diff --git a/locales/zh_CN/LC_MESSAGES/messages.po b/locales/zh_CN/LC_MESSAGES/messages.po
index b6aadcb..6c52851 100644
--- a/locales/zh_CN/LC_MESSAGES/messages.po
+++ b/locales/zh_CN/LC_MESSAGES/messages.po
@@ -1,5 +1,5 @@
 # Scuttle zh-CN Translation
-# Copyright (C) 2005 - 2006 Scuttle project
+# Copyright (C) 2005 - 2006 Marcus Campbell
 # This file is distributed under the same license as the Scuttle package.
 # Yanni Zheng <ynzheng@gmail.com>
 #
diff --git a/login.php b/login.php
index d361394..38ca360 100644
--- a/login.php
+++ b/login.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,8 +18,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
-require_once('header.inc.php');
-$userservice =& ServiceFactory::getServiceInstance('UserService');
+require_once 'header.inc.php';
+$userservice     =& ServiceFactory::getServiceInstance('UserService');
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
 
 $tplVars = array();
diff --git a/password.php b/password.php
index bbbb017..fba6f97 100644
--- a/password.php
+++ b/password.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2005 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2005 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
-require_once('header.inc.php');
+require_once 'header.inc.php';
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
 $tplVars = array();
diff --git a/populartags.php b/populartags.php
index daef205..5bda611 100644
--- a/populartags.php
+++ b/populartags.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (C) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (C) 2004 - 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,7 +18,7 @@ along with this program; if not, write to the Free Software
 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');
 $tagservice =& ServiceFactory::getServiceInstance('TagService');
 $userservice =& ServiceFactory::getServiceInstance('UserService');
diff --git a/profile.php b/profile.php
index d834144..81be208 100644
--- a/profile.php
+++ b/profile.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (C) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (C) 2004 - 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,7 +18,7 @@ along with this program; if not, write to the Free Software
 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');
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 
diff --git a/readme.txt b/readme.txt
index fdbd954..fba23fa 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,7 @@
 Scuttle 0.8.0
 http://scuttle.org/
 
-Copyright (C) 2004 - 2010 Scuttle project
+Copyright (C) 2004 - 2010 Marcus Campbell
 Available under the GNU General Public License
 
 ============
diff --git a/register.php b/register.php
index 8f95ed6..e93c2ab 100644
--- a/register.php
+++ b/register.php
@@ -30,14 +30,20 @@ if ($_POST['submitted']) {
     $posteduser = trim(utf8_strtolower($_POST['username']));
     $postedpass = trim($_POST['password']);
     $postedconf = trim($_POST['passconf']);
+    $postedmail = trim($_POST['email']);
 
     // Check token
     if (!isset($_SESSION['token']) || $_POST['token'] != $_SESSION['token']) {
       $tplVars['error'] = T_('Form could not be authenticated. Please try again.');
     }
 
+    // Check elapsed time
+    if (!isset($_SESSION['token_time']) || time() - $_SESSION['token_time'] < 1) {
+      $tplVars['error'] = T_('Form was submitted too quickly. Please wait before trying again.');
+    }
+
     // Check if form is incomplete
-    elseif (!$posteduser || !$postedpass || !($_POST['email'])) {
+    elseif (!$posteduser || !$postedpass || !$postedmail) {
       $tplVars['error'] = T_('You <em>must</em> enter a username, password and e-mail address.');
     }
 
@@ -62,17 +68,17 @@ if ($_POST['submitted']) {
     }
 
     // Check if e-mail address is blocked
-    elseif ($userservice->isBlockedEmail($_POST['email'])) {
+    elseif ($userservice->isBlockedEmail($postedmail)) {
       $tplVars['error'] = T_('This e-mail address is not permitted.');
     }
 
     // Check if e-mail address is valid
-    elseif (!$userservice->isValidEmail($_POST['email'])) {
+    elseif (!$userservice->isValidEmail($postedmail)) {
       $tplVars['error'] = T_('E-mail address is not valid. Please try again.');
     }
 
     // Register details
-    elseif ($userservice->addUser($posteduser, $_POST['password'], $_POST['email'])) {
+    elseif ($userservice->addUser($posteduser, $_POST['password'], $postedmail)) {
       // Log in with new username
       $login = $userservice->login($posteduser, $_POST['password']);
       if ($login) {
diff --git a/rss.php b/rss.php
index 4db9773..cf10478 100644
--- a/rss.php
+++ b/rss.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (C) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (C) 2004 - 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,7 +18,7 @@ along with this program; if not, write to the Free Software
 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');
 $cacheservice =& ServiceFactory::getServiceInstance('CacheService');
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
diff --git a/search.inc.php b/search.inc.php
index 1c2cbc3..9feaf5c 100644
--- a/search.inc.php
+++ b/search.inc.php
@@ -2,23 +2,21 @@
     <table>
     <tr>
         <?php
-        $logged_on = false;
+        $logged_on = FALSE;
         if ($userservice->isLoggedOn()) {
-            $currentUser = $userservice->getCurrentUser();
-            $currentUsername = $currentUser[$userservice->getFieldName('username')];
-            $logged_on = true;
+          $currentUser = $userservice->getCurrentUser();
+          $currentUsername = $currentUser[$userservice->getFieldName('username')];
+          $logged_on = TRUE;
         }
         if ($logged_on || isset($user)) {
         ?>
         <td><?php echo T_('Search' /* Search ... for */); ?></td>
         <td>
             <select name="range">
-                <?php
-                if (!in_array($range, array($currentUsername, 'all', 'watchlist'))) {
-                ?>
+                <?php if (!in_array($range, array($currentUsername, 'all', 'watchlist')) && $user != $currentUsername): ?>
                 <option value="<?php echo $user ?>"<?php echo $selectUser; ?>><?php echo T_("this user's bookmarks"); ?></option>
                 <?php
-                }
+                endif;
                 if ($logged_on) {
                 ?>
                 <option value="<?php echo $currentUsername; ?>"<?php echo $selectMy; ?>><?php echo T_('my bookmarks'); ?></option>
diff --git a/search.php b/search.php
index f0919d8..1932c28 100644
--- a/search.php
+++ b/search.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2005 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2005 - 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
-require_once('header.inc.php');
+require_once 'header.inc.php';
 
 // POST
 if (isset($_POST['terms'])) {
diff --git a/tagdelete.php b/tagdelete.php
index 2d39219..2d76a3c 100644
--- a/tagdelete.php
+++ b/tagdelete.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
-require_once('header.inc.php');
+require_once 'header.inc.php';
 $tagservice = & ServiceFactory :: getServiceInstance('TagService');
 $templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
 $userservice = & ServiceFactory :: getServiceInstance('UserService');
diff --git a/tagrename.php b/tagrename.php
index 99fa9c8..87163b0 100644
--- a/tagrename.php
+++ b/tagrename.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
-require_once('header.inc.php');
+require_once 'header.inc.php';
 $tagservice = & ServiceFactory :: getServiceInstance('TagService');
 $templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
 $userservice = & ServiceFactory :: getServiceInstance('UserService');
diff --git a/tags.php b/tags.php
index 04188ca..be35861 100644
--- a/tags.php
+++ b/tags.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,7 +18,7 @@ along with this program; if not, write to the Free Software
 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');
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
diff --git a/templates/dynamictags.inc.php b/templates/dynamictags.inc.php
index 9e1b60d..b42819e 100644
--- a/templates/dynamictags.inc.php
+++ b/templates/dynamictags.inc.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
 Copyright (c) 2005 - 2010 Marcus Campbell
-http://sourceforge.net/projects/scuttle/
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
diff --git a/watch.php b/watch.php
index 61981bb..cfd7cee 100644
--- a/watch.php
+++ b/watch.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
-require_once('header.inc.php');
+require_once 'header.inc.php';
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 
 @list($url, $user) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL;
diff --git a/watchlist.php b/watchlist.php
index 8e618ed..3ecc79c 100644
--- a/watchlist.php
+++ b/watchlist.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (c) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2006 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -18,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 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');
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');