Permalink
Browse files

- 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>
1 parent 616df74 commit 9ce0bb50d2e8288c22e9cb801a2168b2c76a070c @scronide committed Dec 28, 2010
Showing with 616 additions and 204 deletions.
  1. +3 −0 AUTHORS
  2. +7 −6 config.inc.php.example
  3. +7 −6 debug.inc.php
  4. +7 −7 edit.php
  5. +459 −72 functions.inc.php
  6. +23 −17 header.inc.php
  7. +1 −1 jsScuttle.php
  8. +1 −1 readme.txt
  9. +67 −56 rss.php
  10. +20 −13 scuttle.css
  11. +2 −2 templates/register.tpl.php
  12. +17 −21 templates/rss.tpl.php
  13. +2 −2 templates/top.inc.php
View
@@ -1,5 +1,8 @@
Scuttle contains code from the following open-source projects:
+Drupal
+http://www.drupal.org/
+
jQuery
http://www.jquery.com/
@@ -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';
View
@@ -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");
+ }
}
View
@@ -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);
}
-?>
Oops, something went wrong.

0 comments on commit 9ce0bb5

Please sign in to comment.