aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>2010-01-16 10:01:37 +0000
committercweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>2010-01-16 10:01:37 +0000
commit60f66c3ce7fbe14b4836b28e24022cc4f88ce72f (patch)
tree9982615476841267d964311a926ca6fb0fdcf1c1
parent300b829705e69d3d805d5281eebe213b629621d5 (diff)
downloadsemanticscuttle-60f66c3ce7fbe14b4836b28e24022cc4f88ce72f.tar.gz
semanticscuttle-60f66c3ce7fbe14b4836b28e24022cc4f88ce72f.tar.bz2
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
-rw-r--r--src/SemanticScuttle/header.php29
-rw-r--r--www/api/export_html.php47
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 @@
<?php
+/**
+ * Base file that every other file in www/ should include.
+ *
+ * SemanticScuttle - your social bookmark manager.
+ *
+ * PHP version 5.
+ *
+ * @category Bookmarking
+ * @package SemanticScuttle
+ * @author Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author Christian Weiske <cweiske@cweiske.de>
+ * @author Eric Dane <ericdane@users.sourceforge.net>
+ * @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 @@
<?php
-// Implements the del.icio.us API request for all a user's posts, optionally filtered by tag.
+/**
+ * Implements the del.icio.us API request for all a user's posts,
+ * optionally filtered by tag.
+ *
+ * SemanticScuttle - your social bookmark manager.
+ *
+ * PHP version 5.
+ *
+ * @category Bookmarking
+ * @package SemanticScuttle
+ * @author Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author Christian Weiske <cweiske@cweiske.de>
+ * @author Eric Dane <ericdane@users.sourceforge.net>
+ * @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 '<!DOCTYPE NETSCAPE-Bookmark-file-1>'."\r\n";
-echo '<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">';
+echo '<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8" />';
echo '<!-- This is an automatically generated file. -->'."\r\n";
echo '<TITLE>Bookmarks</TITLE>'."\r\n";
echo '<H1 LAST_MODIFIED="'. date('U') .'">Bookmarks for '. htmlspecialchars($currentUser->getUsername()) .''. (is_null($tag) ? '' : ' tag="'. htmlspecialchars($tag) .'"') ." from " . $sitename ."</H1>\r\n";
@@ -31,16 +49,19 @@ echo '<DL><p>'."\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';