- Updated default filetypes used for system tags

- Added support for RSS media enclosures
- Restricted registration fields to match DB limits
- Updated debug mode activation
- Updated form style
- Minor code style updates

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

AUTHORS

@@ -1,5 +1,8 @@
Scuttle contains code from the following open-source projects:

Drupal
http://www.drupal.org/

jQuery
http://www.jquery.com/

config.inc.php.example

@@ -120,18 +120,19 @@ $useredir          = FALSE;
$url_redir         = 'http://www.google.com/url?sa=D&q=';

$filetypes         = array(
                       'audio' => array('mp3', 'ogg', 'wav'),
                       'document' => array('doc', 'odt', 'pdf'),
                       'image' => array('gif', 'jpeg', 'jpg', 'png'),
                       'video' => array('avi', 'mov', 'mp4', 'mpeg', 'mpg', 'wmv')
                      'audio'      => array('aac', 'mp3', 'm4a', 'oga', 'ogg', 'wav'),
                      'document'   => array('doc', 'docx', 'odt', 'pages', 'pdf', 'txt'),
                      'image'      => array('gif', 'jpe', 'jpeg', 'jpg', 'png', 'svg'),
                      'bittorrent' => array('torrent'),
                      'video'      => array('avi', 'flv', 'mov', 'mp4', 'mpeg', 'mpg', 'm4v', 'ogv', 'wmv')
                     );

$reservedusers     = array('all', 'watchlist');

$email_whitelist   = NULL;
$email_blacklist   = array(
                       '/(.*-){2,}/',
                        '/mailinator\.com/i'
                      '/(.*-){2,}/',
                      '/mailinator\.com/i'
                     );

include_once 'debug.inc.php';

debug.inc.php

@@ -1,15 +1,16 @@
<?php
// Turn debugging on
define('SCUTTLE_DEBUG', TRUE);
define('SCUTTLE_DEBUG', FALSE);

// generic debugging function
// Sample:
//     pc_debug(__FILE__, __LINE__, "This is a debug message.");

function pc_debug($file, $line, $message) {
    if (defined('SCUTTLE_DEBUG') && SCUTTLE_DEBUG) {
        error_log("---DEBUG-". $sitename .": [$file][$line]: $message");
    } else {
        error_log("SCUTTLE_DEBUG disabled");
    }
  if (defined('SCUTTLE_DEBUG') && SCUTTLE_DEBUG) {
    error_log("---DEBUG-". $sitename .": [$file][$line]: $message");
  }
  else {
    error_log("SCUTTLE_DEBUG disabled");
  }
}

edit.php

@@ -1,6 +1,6 @@
<?php
/***************************************************************************
Copyright (c) 2004 - 2006 Marcus Campbell
Copyright (c) 2004 - 2010 Marcus Campbell
http://scuttle.org/

This program is free software; you can redistribute it and/or modify
@@ -20,17 +20,18 @@

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');
$tplVars['loadjs'] = true;
$tplVars['loadjs']   = TRUE;

list ($url, $bookmark) = explode('/', $_SERVER['PATH_INFO']);

if (!($row = $bookmarkservice->getBookmark(intval($bookmark), true))) {
    $tplVars['error'] = sprintf(T_('Bookmark with id %s not was not found'), $bookmark);
    $tplVars['error'] = sprintf(T_('Bookmark with id %s was not found'), $bookmark);
    $templateservice->loadTemplate('error.404.tpl', $tplVars);
    exit();
} else {
@@ -89,4 +90,3 @@
    $tplVars['referrer'] = $_SERVER['HTTP_REFERER'];
    $templateservice->loadTemplate('editbookmark.tpl', $tplVars);
}
?>