From 3ea5706d167df8e576bbe6ced0a4caa836f644e0 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 30 Jan 2016 16:37:18 +0100
Subject: [PATCH] Resolved namespace trouble

---
 include/dfrn.php        |  2 +-
 include/import-dfrn.php | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 50d78de3c..4c1f21dd0 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -383,7 +383,7 @@ class dfrn {
 		if ($alternatelink == "")
 			$alternatelink = $owner['url'];
 
-		$root = $doc->createElementNS(NS_ATOM, 'feed');
+		$root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed');
 		$doc->appendChild($root);
 
 		$root->setAttribute("xmlns:thr", NAMESPACE_THREAD);
diff --git a/include/import-dfrn.php b/include/import-dfrn.php
index 9660d9209..8a72e4006 100644
--- a/include/import-dfrn.php
+++ b/include/import-dfrn.php
@@ -18,15 +18,6 @@ require_once("include/items.php");
 require_once("include/tags.php");
 require_once("include/files.php");
 
-define("NS_ATOM", "http://www.w3.org/2005/Atom");
-define("NS_THR", "http://purl.org/syndication/thread/1.0");
-define("NS_GEORSS", "http://www.georss.org/georss");
-define("NS_ACTIVITY", "http://activitystrea.ms/spec/1.0/");
-define("NS_MEDIA", "http://purl.org/syndication/atommedia");
-define("NS_POCO", "http://portablecontacts.net/spec/1.0");
-define("NS_OSTATUS", "http://ostatus.org/schema/1.0");
-define("NS_STATUSNET", "http://status.net/schema/api/1/");
-
 class dfrn2 {
 	/**
 	 * @brief Add new birthday event for this person
@@ -236,7 +227,7 @@ class dfrn2 {
 		$obj_doc = new DOMDocument('1.0', 'utf-8');
 		$obj_doc->formatOutput = true;
 
-		$obj_element = $obj_doc->createElementNS(NS_ATOM, $element);
+		$obj_element = $obj_doc->createElementNS(NAMESPACE_ATOM1, $element);
 
 		$activity_type = $xpath->query('activity:object-type/text()', $activity)->item(0)->nodeValue;
 		xml_add_element($obj_doc, $obj_element, "type", $activity_type);