move scripts to just before </body>, add event for scripts that need to be in <head>

[quix0rs-gnu-social.git] / lib / rssaction.php
diff --git a/lib/rssaction.php b/lib/rssaction.php

index 6c982705efaea13508eaf634143427aab159eada..60611e48d0f0a22a9fc87434a74e90773f532dbe 100644 (file)
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -1,6 +1,6 @@
  <?php
  /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
   *
   * Base class for RSS 1.0 feed actions
   *
@@ -20,15 +20,15 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   *
   * @category  Mail
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
   * @author    Earle Martin <earle@downlode.org>
- * @copyright 2008-9 Control Yourself, Inc.
+ * @copyright 2008-9 StatusNet, Inc.
   * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
   */
  
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  
  define('DEFAULT_RSS_LIMIT', 48);
  
@@ -102,7 +102,7 @@ class Rss10Action extends Action
              if (!isset($_SERVER['PHP_AUTH_USER'])) {
  
                  # This header makes basic auth go
-                header('WWW-Authenticate: Basic realm="Laconica RSS"');
+                header('WWW-Authenticate: Basic realm="StatusNet RSS"');
  
                  # If the user hits cancel -- bam!
                  $this->show_basic_auth_error();
@@ -123,11 +123,7 @@ class Rss10Action extends Action
          }
  
          // Get the list of notices
-        if (empty($this->tag)) {
-            $this->notices = $this->getNotices($this->limit);
-        } else {
-            $this->notices = $this->getTaggedNotices($this->tag, $this->limit);
-        }
+        $this->notices = $this->getNotices($this->limit);
          $this->showRss();
      }
  
@@ -248,7 +244,7 @@ class Rss10Action extends Action
          $this->element('dc:creator', null, ($profile->fullname) ? $profile->fullname : $profile->nickname);
          $this->element('foaf:maker', array('rdf:resource' => $creator_uri));
          $this->element('sioc:has_creator', array('rdf:resource' => $creator_uri.'#acct'));
-        $this->element('laconica:postIcon', array('rdf:resource' => $profile->avatarUrl()));
+        $this->element('statusnet:postIcon', array('rdf:resource' => $profile->avatarUrl()));
          $this->element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
          if ($notice->reply_to) {
              $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
@@ -357,8 +353,8 @@ class Rss10Action extends Action
                                                'http://rdfs.org/sioc/types#',
                                                'xmlns:rdfs' =>
                                                'http://www.w3.org/2000/01/rdf-schema#',
-                                              'xmlns:laconica' =>
-                                              'http://laconi.ca/ont/',
+                                              'xmlns:statusnet' =>
+                                              'http://status.net/ont/',
                                                'xmlns' => 'http://purl.org/rss/1.0/'));
          $this->elementStart('sioc:Site', array('rdf:about' => common_root_url()));
          $this->element('sioc:name', null, common_config('site', 'name'));