move atom category to its own file, too

diff --git a/lib/activity.php b/lib/activity.php
index 691ace1f6f1e245e19b1f5bb00841a1c44ac6cf1..bd1d5d56c044ec289cbd2ec1304381b77c6d5c65 100644 (file)
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -362,48 +362,3 @@ class Activity
     }
 }
 
-class AtomCategory
-{
-    public $term;
-    public $scheme;
-    public $label;
-
-    function __construct($element=null)
-    {
-        if ($element && $element->attributes) {
-            $this->term = $this->extract($element, 'term');
-            $this->scheme = $this->extract($element, 'scheme');
-            $this->label = $this->extract($element, 'label');
-        }
-    }
-
-    protected function extract($element, $attrib)
-    {
-        $node = $element->attributes->getNamedItemNS(Activity::ATOM, $attrib);
-        if ($node) {
-            return trim($node->textContent);
-        }
-        $node = $element->attributes->getNamedItem($attrib);
-        if ($node) {
-            return trim($node->textContent);
-        }
-        return null;
-    }
-
-    function asString()
-    {
-        $attribs = array();
-        if ($this->term !== null) {
-            $attribs['term'] = $this->term;
-        }
-        if ($this->scheme !== null) {
-            $attribs['scheme'] = $this->scheme;
-        }
-        if ($this->label !== null) {
-            $attribs['label'] = $this->label;
-        }
-        $xs = new XMLStringer();
-        $xs->element('category', $attribs);
-        return $xs->asString();
-    }
-}

diff --git a/lib/atomcategory.php b/lib/atomcategory.php
new file mode 100644 (file)
index 0000000..4cc3b4f
--- /dev/null
+++ b/lib/atomcategory.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Feed
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+class AtomCategory
+{
+    public $term;
+    public $scheme;
+    public $label;
+
+    function __construct($element=null)
+    {
+        if ($element && $element->attributes) {
+            $this->term = $this->extract($element, 'term');
+            $this->scheme = $this->extract($element, 'scheme');
+            $this->label = $this->extract($element, 'label');
+        }
+    }
+
+    protected function extract($element, $attrib)
+    {
+        $node = $element->attributes->getNamedItemNS(Activity::ATOM, $attrib);
+        if ($node) {
+            return trim($node->textContent);
+        }
+        $node = $element->attributes->getNamedItem($attrib);
+        if ($node) {
+            return trim($node->textContent);
+        }
+        return null;
+    }
+
+    function asString()
+    {
+        $attribs = array();
+        if ($this->term !== null) {
+            $attribs['term'] = $this->term;
+        }
+        if ($this->scheme !== null) {
+            $attribs['scheme'] = $this->scheme;
+        }
+        if ($this->label !== null) {
+            $attribs['label'] = $this->label;
+        }
+        $xs = new XMLStringer();
+        $xs->element('category', $attribs);
+        return $xs->asString();
+    }
+}