Merge branch '0.8.x' into userdesign

Conflicts: lib/attachmentlist.php lib/noticelist.php
author: Evan Prodromou <evan@controlyourself.ca> 2009-05-26 23:24:01 -0400
committer: Evan Prodromou <evan@controlyourself.ca> 2009-05-26 23:24:01 -0400
commit: 648d967226f3b47aa6237d2be9d1a82df4f78402 (patch)
tree: 2592f56f0073ee21ce320a158233fdb1bd2710c4 /actions
parent: 6335c9cf59b384da24506c4a3f799315fbbc4b09 (diff)
parent: 0b53a820c2b4224b66b2a24f67302b4c5ca1deed (diff)
5 files changed, 49 insertions, 366 deletions
diff --git a/actions/attachment.php b/actions/attachment.php
index b9187ff08..16ee723d9 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -31,8 +31,6 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-//require_once INSTALLDIR.'/lib/personalgroupnav.php';
-//require_once INSTALLDIR.'/lib/feedlist.php';
 require_once INSTALLDIR.'/lib/attachmentlist.php';
 
 /**
@@ -67,11 +65,11 @@ class AttachmentAction extends Action
     {
         parent::prepare($args);
 
-        $id = $this->arg('attachment');
-
-        $this->attachment = File::staticGet($id);
+        if ($id = $this->trimmed('attachment')) {
+            $this->attachment = File::staticGet($id);
+        }
 
-        if (!$this->attachment) {
+        if (empty($this->attachment)) {
             $this->clientError(_('No such attachment.'), 404);
             return false;
         }
@@ -178,10 +176,8 @@ class AttachmentAction extends Action
 
     function showContent()
     {
-        $this->elementStart('ul', array('class' => 'attachments'));
         $ali = new Attachment($this->attachment, $this);
         $cnt = $ali->show();
-        $this->elementEnd('ul');
     }
 
     /**
diff --git a/actions/attachment_ajax.php b/actions/attachment_ajax.php
index 1620b27dd..3d83393c5 100644
--- a/actions/attachment_ajax.php
+++ b/actions/attachment_ajax.php
@@ -46,26 +46,6 @@ require_once INSTALLDIR.'/actions/attachment.php';
 class Attachment_ajaxAction extends AttachmentAction
 {
     /**
-     * Load attributes based on database arguments
-     *
-     * Loads all the DB stuff
-     *
-     * @param array $args $_REQUEST array
-     *
-     * @return success flag
-     */
-
-    function prepare($args)
-    {
-        parent::prepare($args);
-        if (!$this->attachment) {
-            $this->clientError(_('No such attachment.'), 404);
-            return false;
-        }
-        return true;
-    }
-
-    /**
      * Show page, a template method.
      *
      * @return nothing
@@ -95,8 +75,6 @@ class Attachment_ajaxAction extends AttachmentAction
         $this->elementEnd('div');
     }
 
-
-
     /**
      * Last-modified date for page
      *
diff --git a/actions/attachments_ajax.php b/actions/attachment_thumbnail.php
index 402d8b5e7..b4070e747 100644
--- a/actions/attachments_ajax.php
+++ b/actions/attachment_thumbnail.php
@@ -31,9 +31,7 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-//require_once INSTALLDIR.'/lib/personalgroupnav.php';
-//require_once INSTALLDIR.'/lib/feedlist.php';
-require_once INSTALLDIR.'/actions/attachments.php';
+require_once INSTALLDIR.'/actions/attachment.php';
 
 /**
  * Show notice attachments
@@ -45,39 +43,8 @@ require_once INSTALLDIR.'/actions/attachments.php';
  * @link     http://laconi.ca/
  */
 
-class Attachments_ajaxAction extends AttachmentsAction
+class Attachment_thumbnailAction extends AttachmentAction
 {
-    function showContent()
-    {
-    }
-
-    /**
-     * Fill the content area of the page
-     *
-     * Shows a single notice list item.
-     *
-     * @return void
-     */
-
-    function showContentBlock()
-    {
-        $al = new AttachmentList($this->notice, $this);
-        $cnt = $al->show();
-    }
-
-    /**
-     * Extra <head> content
-     *
-     * We show the microid(s) for the author, if any.
-     *
-     * @return void
-     */
-
-    function extraHead()
-    {
-    }
-
-
     /**
      * Show page, a template method.
      *
@@ -100,16 +67,52 @@ class Attachments_ajaxAction extends AttachmentsAction
      */
     function showCore()
     {
-        $this->elementStart('div', array('id' => 'core'));
-        if (Event::handle('StartShowContentBlock', array($this))) {
-            $this->showContentBlock();
-            Event::handle('EndShowContentBlock', array($this));
+        $file_thumbnail = File_thumbnail::staticGet('file_id', $this->attachment->id);
+        if (empty($file_thumbnail->url)) {
+            return;
         }
-        $this->elementEnd('div');
+        $this->element('img', array('src' => $file_thumbnail->url, 'alt' => 'Thumbnail'));
     }
 
+    /**
+     * Last-modified date for page
+     *
+     * When was the content of this page last modified? Based on notice,
+     * profile, avatar.
+     *
+     * @return int last-modified date as unix timestamp
+     */
+/*
+    function lastModified()
+    {
+        return max(strtotime($this->notice->created),
+                   strtotime($this->profile->modified),
+                   ($this->avatar) ? strtotime($this->avatar->modified) : 0);
+    }
+*/
 
-
-
+    /**
+     * An entity tag for this page
+     *
+     * Shows the ETag for the page, based on the notice ID and timestamps
+     * for the notice, profile, and avatar. It's weak, since we change
+     * the date text "one hour ago", etc.
+     *
+     * @return string etag
+     */
+/*
+    function etag()
+    {
+        $avtime = ($this->avatar) ?
+          strtotime($this->avatar->modified) : 0;
+
+        return 'W/"' . implode(':', array($this->arg('action'),
+                                          common_language(),
+                                          $this->notice->id,
+                                          strtotime($this->notice->created),
+                                          strtotime($this->profile->modified),
+                                          $avtime)) . '"';
+    }
+*/
 }
 
diff --git a/actions/attachments.php b/actions/attachments.php
deleted file mode 100644
index 6b31c839d..000000000
--- a/actions/attachments.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?php
-/**
- * Laconica, the distributed open-source microblogging tool
- *
- * Show notice attachments
- *
- * 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  Personal
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008-2009 Control Yourself, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
- */
-
-if (!defined('LACONICA')) {
-    exit(1);
-}
-
-//require_once INSTALLDIR.'/lib/personalgroupnav.php';
-//require_once INSTALLDIR.'/lib/feedlist.php';
-require_once INSTALLDIR.'/lib/attachmentlist.php';
-
-/**
- * Show notice attachments
- *
- * @category Personal
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
- */
-
-class AttachmentsAction extends Action
-{
-    /**
-     * Notice object to show
-     */
-
-    var $notice = null;
-
-    /**
-     * Profile of the notice object
-     */
-
-    var $profile = null;
-
-    /**
-     * Avatar of the profile of the notice object
-     */
-
-    var $avatar = null;
-
-    /**
-     * Is this action read-only?
-     *
-     * @return boolean true
-     */
-
-    function isReadOnly($args)
-    {
-        return true;
-    }
-
-    /**
-     * Last-modified date for page
-     *
-     * When was the content of this page last modified? Based on notice,
-     * profile, avatar.
-     *
-     * @return int last-modified date as unix timestamp
-     */
-
-    function lastModified()
-    {
-        return max(strtotime($this->notice->created),
-                   strtotime($this->profile->modified),
-                   ($this->avatar) ? strtotime($this->avatar->modified) : 0);
-    }
-
-    /**
-     * An entity tag for this page
-     *
-     * Shows the ETag for the page, based on the notice ID and timestamps
-     * for the notice, profile, and avatar. It's weak, since we change
-     * the date text "one hour ago", etc.
-     *
-     * @return string etag
-     */
-
-    function etag()
-    {
-        $avtime = ($this->avatar) ?
-          strtotime($this->avatar->modified) : 0;
-
-        return 'W/"' . implode(':', array($this->arg('action'),
-                                          common_language(),
-                                          $this->notice->id,
-                                          strtotime($this->notice->created),
-                                          strtotime($this->profile->modified),
-                                          $avtime)) . '"';
-    }
-
-    /**
-     * Title of the page
-     *
-     * @return string title of the page
-     */
-
-    function title()
-    {
-        return sprintf(_('%1$s\'s status on %2$s'),
-                       $this->profile->nickname,
-                       common_exact_date($this->notice->created));
-    }
-
-
-    /**
-     * Load attributes based on database arguments
-     *
-     * Loads all the DB stuff
-     *
-     * @param array $args $_REQUEST array
-     *
-     * @return success flag
-     */
-
-    function prepare($args)
-    {
-        parent::prepare($args);
-
-        $id = $this->arg('notice');
-
-        $this->notice = Notice::staticGet($id);
-
-        if (!$this->notice) {
-            $this->clientError(_('No such notice.'), 404);
-            return false;
-        }
-
-
-/*
-// STOP if there are no attachments
-// maybe even redirect if there's a single one
-// RYM FIXME TODO
-            $this->clientError(_('No such attachment.'), 404);
-            return false;
-
-*/
-
-
-
-
-        $this->profile = $this->notice->getProfile();
-
-        if (!$this->profile) {
-            $this->serverError(_('Notice has no profile'), 500);
-            return false;
-        }
-
-        $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-        return true;
-    }
-
-
-
-    /**
-     * Handle input
-     *
-     * Only handles get, so just show the page.
-     *
-     * @param array $args $_REQUEST data (unused)
-     *
-     * @return void
-     */
-
-    function handle($args)
-    {
-        parent::handle($args);
-
-        if ($this->notice->is_local == 0) {
-            if (!empty($this->notice->url)) {
-                common_redirect($this->notice->url, 301);
-            } else if (!empty($this->notice->uri) && preg_match('/^https?:/', $this->notice->uri)) {
-                common_redirect($this->notice->uri, 301);
-            }
-        } else {
-            $f2p = new File_to_post;
-            $f2p->post_id = $this->notice->id;
-            $file = new File;
-            $file->joinAdd($f2p);
-            $file->selectAdd();
-            $file->selectAdd('file.id as id');
-            $count = $file->find(true);
-            if (!$count) return;
-            if (1 === $count) {
-                common_redirect(common_local_url('attachment', array('attachment' => $file->id)), 301);
-            } else {
-                $this->showPage();
-            }
-        }
-    }
-
-    /**
-     * Don't show local navigation
-     *
-     * @return void
-     */
-
-    function showLocalNavBlock()
-    {
-    }
-
-    /**
-     * Fill the content area of the page
-     *
-     * Shows a single notice list item.
-     *
-     * @return void
-     */
-
-    function showContent()
-    {
-        $al = new AttachmentList($this->notice, $this);
-        $cnt = $al->show();
-    }
-
-    /**
-     * Don't show page notice
-     *
-     * @return void
-     */
-
-    function showPageNoticeBlock()
-    {
-    }
-
-    /**
-     * Don't show aside
-     *
-     * @return void
-     */
-
-    function showAside() {
-    }
-
-    /**
-     * Extra <head> content
-     *
-     * We show the microid(s) for the author, if any.
-     *
-     * @return void
-     */
-
-    function extraHead()
-    {
-        $user = User::staticGet($this->profile->id);
-
-        if (!$user) {
-            return;
-        }
-
-        if ($user->emailmicroid && $user->email && $this->notice->uri) {
-            $id = new Microid('mailto:'. $user->email,
-                              $this->notice->uri);
-            $this->element('meta', array('name' => 'microid',
-                                         'content' => $id->toString()));
-        }
-
-        if ($user->jabbermicroid && $user->jabber && $this->notice->uri) {
-            $id = new Microid('xmpp:', $user->jabber,
-                              $this->notice->uri);
-            $this->element('meta', array('name' => 'microid',
-                                         'content' => $id->toString()));
-        }
-    }
-}
-
diff --git a/actions/tag.php b/actions/tag.php
index 47420e4c3..e9351d241 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -49,8 +49,6 @@ class TagAction extends Action
     {
         $pop = new PopularNoticeSection($this);
         $pop->show();
-        $freqatt = new FrequentAttachmentSection($this);
-        $freqatt->show();
     }
 
     function title()
author	Evan Prodromou <evan@controlyourself.ca>	2009-05-26 23:24:01 -0400
committer	Evan Prodromou <evan@controlyourself.ca>	2009-05-26 23:24:01 -0400
commit	648d967226f3b47aa6237d2be9d1a82df4f78402 (patch)
tree	2592f56f0073ee21ce320a158233fdb1bd2710c4 /actions
parent	6335c9cf59b384da24506c4a3f799315fbbc4b09 (diff)
parent	0b53a820c2b4224b66b2a24f67302b4c5ca1deed (diff)