From 60f66c3ce7fbe14b4836b28e24022cc4f88ce72f Mon Sep 17 00:00:00 2001 From: cweiske Date: Sat, 16 Jan 2010 10:01:37 +0000 Subject: Coding standards changes, add header to some files git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@582 b3834d28-1941-0410-a4f8-b48e95affb8f --- src/SemanticScuttle/header.php | 29 +++++++++++++++++++------- www/api/export_html.php | 47 ++++++++++++++++++++++++++++++------------ 2 files changed, 56 insertions(+), 20 deletions(-) diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php index c51104d..4a0a919 100644 --- a/src/SemanticScuttle/header.php +++ b/src/SemanticScuttle/header.php @@ -1,6 +1,21 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ if (!file_exists(dirname(__FILE__) .'/../../data/config.php')) { - die('Please copy "config.php.dist" to "config.php" in data/ folder.'); + die('Please copy "config.php.dist" to "config.php" in data/ folder.'); } set_include_path( get_include_path() . PATH_SEPARATOR @@ -26,13 +41,13 @@ require_once 'SemanticScuttle/constants.php'; // Debug Management using constants if (DEBUG_MODE) { - ini_set('display_errors', '1'); - ini_set('mysql.trace_mode', '1'); - error_reporting(E_ALL); + ini_set('display_errors', '1'); + ini_set('mysql.trace_mode', '1'); + error_reporting(E_ALL); } else { - ini_set('display_errors', '0'); - ini_set('mysql.trace_mode', '0'); - error_reporting(0); + ini_set('display_errors', '0'); + ini_set('mysql.trace_mode', '0'); + error_reporting(0); } // 2 // Second requirements part which could display bugs diff --git a/www/api/export_html.php b/www/api/export_html.php index 0f36c07..8d70927 100644 --- a/www/api/export_html.php +++ b/www/api/export_html.php @@ -1,29 +1,47 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ // del.icio.us behavior: // - 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 '../../src/SemanticScuttle/header.php'; +require_once 'httpauth.inc.php'; /* Service creation: only useful services are created */ -$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); +$bookmarkservice = SemanticScuttle_Service_Factory::get('Bookmark'); // Check to see if a tag was specified. -if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != '')) +if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != '')) { $tag = trim($_REQUEST['tag']); -else - $tag = NULL; +} else { + $tag = null; +} // Get the posts relevant to the passed-in variables. -$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, $userservice->getCurrentUserId(), $tag, NULL, getSortOrder()); +$bookmarks = $bookmarkservice->getBookmarks( + 0, null, $userservice->getCurrentUserId(), + $tag, null, getSortOrder() +); // Set up the XML file and output all the posts. echo ''."\r\n"; -echo ''; +echo ''; echo ''."\r\n"; echo 'Bookmarks'."\r\n"; echo '

Bookmarks for '. htmlspecialchars($currentUser->getUsername()) .''. (is_null($tag) ? '' : ' tag="'. htmlspecialchars($tag) .'"') ." from " . $sitename ."

\r\n"; @@ -31,16 +49,19 @@ echo '

'."\r\n"; -foreach($bookmarks['bookmarks'] as $row) { - if (is_null($row['bDescription']) || (trim($row['bDescription']) == '')) +foreach ($bookmarks['bookmarks'] as $row) { + if (is_null($row['bDescription']) || (trim($row['bDescription']) == '')) { $description = ''; - else + } else { $description = 'description="'. filter($row['bDescription'], 'xml') .'" '; + } $taglist = ''; if (count($row['tags']) > 0) { - foreach($row['tags'] as $tag) + foreach ($row['tags'] as $tag) { $taglist .= convertTag($tag) .','; + } + $taglist = substr($taglist, 0, -1); } else { $taglist = 'system:unfiled'; -- cgit v1.2.3