Merge branch '0.8.x' into small-fixes

diff --combined lib/util.php
index d147590011d8b5812d3c986949d67fba80360260,f6d50b18074be35f8729ae3410ed2f6fbe30c44b..9a51477f40d627025f9bed9ef3a73909c6b54cd7
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -114,7 -114,7 +114,7 @@@ function common_check_user($nickname, $
          return false;
      }
      $user = User::staticGet('nickname', $nickname);
 -    if (is_null($user)) {
 +    if (is_null($user) || $user === false) {
          return false;
      } else {
          if (0 == strcmp(common_munge_password($password, $user->id),
@@@ -497,6 -497,22 +497,22 @@@ function common_linkify($url) 
  
      $attrs = array('href' => $longurl, 'rel' => 'external');
  
+     $is_attachment = false;
+     $attachment_id = null;
+     $has_thumb = false;
+ 
+     // Check to see whether there's a filename associated with this URL.
+     // If there is, it's an upload and qualifies as an attachment
+ 
+     $localfile = File::staticGet('url', $longurl);
+ 
+     if (!empty($localfile)) {
+         if (isset($localfile->filename)) {
+             $is_attachment = true;
+             $attachment_id = $localfile->id;
+         }
+     }
+ 
  // if this URL is an attachment, then we set class='attachment' and id='attahcment-ID'
  // where ID is the id of the attachment for the given URL.
  //
@@@ -504,24 -520,35 +520,35 @@@
  // we're currently picking up oembeds only.
  // I think the best option is another file_view table in the db
  // and associated dbobject.
+ 
      $query = "select file_oembed.file_id as file_id from file join file_oembed on file.id = file_oembed.file_id where file.url='$longurl'";
      $file = new File;
      $file->query($query);
      $file->fetch();
  
      if (!empty($file->file_id)) {
+         $is_attachment = true;
+         $attachment_id = $file->file_id;
+ 
          $query = "select file_thumbnail.file_id as file_id from file join file_thumbnail on file.id = file_thumbnail.file_id where file.url='$longurl'";
          $file2 = new File;
          $file2->query($query);
          $file2->fetch();
  
-         if (empty($file2->file_id)) {
-             $attrs['class'] = 'attachment';
-         } else {
+         if (!empty($file2)) {
+             $has_thumb = true;
+         }
+     }
+ 
+     // Add clippy
+     if ($is_attachment) {
+         $attrs['class'] = 'attachment';
+         if ($has_thumb) {
              $attrs['class'] = 'attachment thumbnail';
          }
-         $attrs['id'] = "attachment-{$file->file_id}";
+         $attrs['id'] = "attachment-{$attachment_id}";
      }
+ 
      return XMLStringer::estring('a', $attrs, $display);
  }
  
@@@ -826,89 -853,91 +853,91 @@@ function common_broadcast_notice($notic
  
  function common_enqueue_notice($notice)
  {
+     $transports = array('omb', 'sms', 'public', 'twitter', 'facebook', 'ping');
+ 
+     if (common_config('xmpp', 'enabled'))
+     {
+         $transports[] = 'jabber';
+     }
+ 
      if (common_config('queue','subsystem') == 'stomp') {
-       // use an external message queue system via STOMP
-       require_once("Stomp.php");
-       $con = new Stomp(common_config('queue','stomp_server'));
-       if (!$con->connect()) {
-               common_log(LOG_ERR, 'Failed to connect to queue server');
-               return false;
-       }
-       $queue_basename = common_config('queue','queue_basename');
-       foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook', 'ping') as $transport) {
-               if (!$con->send(
-                       '/queue/'.$queue_basename.'-'.$transport, // QUEUE
-                       $notice->id,            // BODY of the message
-                       array (                 // HEADERS of the msg
-                       'created' => $notice->created
-                       ))) {
-                       common_log(LOG_ERR, 'Error sending to '.$transport.' queue');
-                       return false;
-               }
-         common_log(LOG_DEBUG, 'complete remote queueing notice ID = ' . $notice->id . ' for ' . $transport);
-       }
- 
-       //send tags as headers, so they can be used as JMS selectors
-         common_log(LOG_DEBUG, 'searching for tags ' . $notice->id);
-         $tags = array();
-       $tag = new Notice_tag();
-         $tag->notice_id = $notice->id;
-         if ($tag->find()) {
-             while ($tag->fetch()) {
-               common_log(LOG_DEBUG, 'tag found = ' . $tag->tag);
-               array_push($tags,$tag->tag);
-             }
-         }
-         $tag->free();
- 
-       $con->send('/topic/laconica.'.$notice->profile_id,
-                       $notice->content,
-                       array(
-                               'profile_id' => $notice->profile_id,
-                               'created' => $notice->created,
-                               'tags' => implode($tags,' - ')
-                               )
-                       );
-         common_log(LOG_DEBUG, 'sent to personal topic ' . $notice->id);
-       $con->send('/topic/laconica.allusers',
-                       $notice->content,
-                       array(
-                               'profile_id' => $notice->profile_id,
-                               'created' => $notice->created,
-                               'tags' => implode($tags,' - ')
-                               )
-                       );
-         common_log(LOG_DEBUG, 'sent to catch-all topic ' . $notice->id);
-       $result = true;
+         common_enqueue_notice_stomp($notice, $transports);
      }
      else {
-       // in any other case, 'internal'
-       foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook', 'ping') as $transport) {
-               $qi = new Queue_item();
-               $qi->notice_id = $notice->id;
-               $qi->transport = $transport;
-               $qi->created = $notice->created;
-               $result = $qi->insert();
-               if (!$result) {
-                   $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-                   common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message);
-                   return false;
-               }
-               common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id . ' for ' . $transport);
-         }
+         common_enqueue_notice_db($notice, $transports);
      }
      return $result;
  }
  
- function common_post_inbox_transports()
+ function common_enqueue_notice_stomp($notice, $transports)
  {
-     $transports = array('omb', 'sms');
+     // use an external message queue system via STOMP
+     require_once("Stomp.php");
+ 
+     $server = common_config('queue','stomp_server');
+     $username = common_config('queue', 'stomp_username');
+     $password = common_config('queue', 'stomp_password');
+ 
+     $con = new Stomp($server);
+ 
+     if (!$con->connect($username, $password)) {
+         common_log(LOG_ERR, 'Failed to connect to queue server');
+         return false;
+     }
+ 
+     $queue_basename = common_config('queue','queue_basename');
  
-     if (common_config('xmpp', 'enabled')) {
-         $transports = array_merge($transports, array('jabber', 'public'));
+     foreach ($transports as $transport) {
+         $result = $con->send('/queue/'.$queue_basename.'-'.$transport, // QUEUE
+                              $notice->id,             // BODY of the message
+                              array ('created' => $notice->created));
+         if (!$result) {
+             common_log(LOG_ERR, 'Error sending to '.$transport.' queue');
+             return false;
+         }
+         common_log(LOG_DEBUG, 'complete remote queueing notice ID = ' . $notice->id . ' for ' . $transport);
      }
  
-     return $transports;
+     //send tags as headers, so they can be used as JMS selectors
+     common_log(LOG_DEBUG, 'searching for tags ' . $notice->id);
+     $tags = array();
+     $tag = new Notice_tag();
+     $tag->notice_id = $notice->id;
+     if ($tag->find()) {
+         while ($tag->fetch()) {
+             common_log(LOG_DEBUG, 'tag found = ' . $tag->tag);
+             array_push($tags,$tag->tag);
+         }
+     }
+     $tag->free();
+ 
+     $con->send('/topic/laconica.'.$notice->profile_id,
+                $notice->content,
+                array(
+                      'profile_id' => $notice->profile_id,
+                      'created' => $notice->created,
+                      'tags' => implode($tags,' - ')
+                      )
+                );
+     common_log(LOG_DEBUG, 'sent to personal topic ' . $notice->id);
+     $con->send('/topic/laconica.allusers',
+                $notice->content,
+                array(
+                      'profile_id' => $notice->profile_id,
+                      'created' => $notice->created,
+                      'tags' => implode($tags,' - ')
+                      )
+                );
+     common_log(LOG_DEBUG, 'sent to catch-all topic ' . $notice->id);
+     $result = true;
+ }
+ 
+ function common_enqueue_notice_db($notice, $transports)
+ {
+     // in any other case, 'internal'
+     foreach ($transports as $transport) {
+         common_enqueue_notice_transport($notice, $transport);
+     }
  }
  
  function common_enqueue_notice_transport($notice, $transport)