Merge commit 'jeff-themovie/private-rss' into 0.8.x

diff --combined lib/rssaction.php
index 9898894edd678e8fafd6a09c7d829cb2073672d2,40fe11c6673f32c5b63741ae38adfafb99537da5..6c982705efaea13508eaf634143427aab159eada
--- 1/lib/rssaction.php
--- 2/lib/rssaction.php
+++ b/lib/rssaction.php
@@@ -39,7 -39,6 +39,7 @@@ class Rss10Action extends Actio
      var $creators = array();
      var $limit = DEFAULT_RSS_LIMIT;
      var $notices = null;
 +    var $tags_already_output = array();
  
      /**
       * Constructor
@@@ -97,6 -96,31 +97,31 @@@
      {
          // Parent handling, including cache check
          parent::handle($args);
+ 
+         if (common_config('site', 'private')) {
+             if (!isset($_SERVER['PHP_AUTH_USER'])) {
+ 
+                 # This header makes basic auth go
+                 header('WWW-Authenticate: Basic realm="Laconica RSS"');
+ 
+                 # If the user hits cancel -- bam!
+                 $this->show_basic_auth_error();
+                 return;
+             } else {
+                 $nickname = $_SERVER['PHP_AUTH_USER'];
+                 $password = $_SERVER['PHP_AUTH_PW'];
+ 
+                 if (!common_check_user($nickname, $password)) {
+                     # basic authentication failed
+                     list($proxy, $ip) = common_client_ip();
+ 
+                     common_log(LOG_WARNING, "Failed RSS auth attempt, nickname = $nickname, proxy = $proxy, ip = $ip.");
+                     $this->show_basic_auth_error();
+                     return;
+                 }
+             }
+         }
+ 
          // Get the list of notices
          if (empty($this->tag)) {
              $this->notices = $this->getNotices($this->limit);
@@@ -106,6 -130,18 +131,18 @@@
          $this->showRss();
      }
  
+     function show_basic_auth_error()
+     {
+         header('HTTP/1.1 401 Unauthorized');
+         header('Content-Type: application/xml; charset=utf-8');
+         $this->startXML();
+         $this->elementStart('hash');
+         $this->element('error', null, 'Could not authenticate you.');
+         $this->element('request', null, $_SERVER['REQUEST_URI']);
+         $this->elementEnd('hash');
+         $this->endXML();
+     }
+ 
      /**
       * Get the notices to output in this stream
       *
@@@ -193,6 -229,24 +230,6 @@@
          }
      }
  
 -    // XXX: Surely there should be a common function to do this?
 -    function extract_tags ($string)
 -    {
 -        $count = preg_match_all('/(?:^|\s)#([A-Za-z0-9_\-\.]{1,64})/', strtolower($string), $match);
 -        if (!count)
 -        {
 -            return array();
 -        }
 -
 -        $rv = array();
 -        foreach ($match[1] as $tag)
 -        {
 -            $rv[] = common_canonical_tag($tag);
 -        } 
 -
 -        return array_unique($rv);
 -    }
 -       
      function showItem($notice)
      {
          $profile = Profile::staticGet($notice->profile_id);
@@@ -217,11 -271,6 +254,11 @@@
              $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
              $this->element('sioc:reply_of', array('rdf:resource' => $replyurl));
          }
 +        if (!empty($notice->conversation)) {
 +            $conversationurl = common_local_url('conversation',
 +                                         array('id' => $notice->conversation));
 +            $this->element('sioc:has_discussion', array('rdf:resource' => $conversationurl));
 +        }
          $attachments = $notice->attachments();
          if($attachments){
              foreach($attachments as $attachment){
@@@ -251,28 -300,18 +288,28 @@@
                  $this->element('sioc:links_to', array('rdf:resource'=>$attachment->url));
              }
          }
 -        $tags = $this->extract_tags($notice->content);
 -        if (!empty($tags)) {
 -            foreach ($tags as $tag)
 -            {
 -                $tagpage = common_local_url('tag', array('tag' => $tag));
 -                $tagrss  = common_local_url('tagrss', array('tag' => $tag));
 +
 +        $tag = new Notice_tag();
 +        $tag->notice_id = $notice->id;
 +        if ($tag->find()) {
 +            $entry['tags']=array();
 +            while ($tag->fetch()) {
 +                $tagpage = common_local_url('tag', array('tag' => $tag->tag));
 +
 +                if ( in_array($tag, $this->tags_already_output) ) {
 +                    $this->element('ctag:tagged', array('rdf:resource'=>$tagpage.'#concept'));
 +                    continue;
 +                }
 +
 +                $tagrss  = common_local_url('tagrss', array('tag' => $tag->tag));
                  $this->elementStart('ctag:tagged');
 -                $this->elementStart('ctag:Tag', array('rdf:about'=>$tagpage.'#concept', 'ctag:label'=>$tag));
 +                $this->elementStart('ctag:Tag', array('rdf:about'=>$tagpage.'#concept', 'ctag:label'=>$tag->tag));
                  $this->element('foaf:page', array('rdf:resource'=>$tagpage));
                  $this->element('rdfs:seeAlso', array('rdf:resource'=>$tagrss));
                  $this->elementEnd('ctag:Tag');
                  $this->elementEnd('ctag:tagged');
 +
 +                $this->tags_already_output[] = $tag->tag;
              }
          }
          $this->elementEnd('item');
@@@ -318,8 -357,6 +355,8 @@@
                                                'http://rdfs.org/sioc/ns#',
                                                'xmlns:sioct' =>
                                                'http://rdfs.org/sioc/types#',
 +                                              'xmlns:rdfs' =>
 +                                              'http://www.w3.org/2000/01/rdf-schema#',
                                                'xmlns:laconica' =>
                                                'http://laconi.ca/ont/',
                                                'xmlns' => 'http://purl.org/rss/1.0/'));