Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

author: Evan Prodromou <evan@controlyourself.ca> 2009-01-22 12:35:25 +0100
committer: Evan Prodromou <evan@controlyourself.ca> 2009-01-22 12:35:25 +0100
commit: a2a2dd88b5a580715a1b8256a5d8b7743675711c (patch)
tree: d9daa558200526d52aec315ccd196bef7dd46d5a /lib
parent: 6a3204d08e035812cf111e20f72bf0c7ffb4c601 (diff)
parent: f89f6a8eb0d16fc7c4114ba9279466189b857ea6 (diff)
9 files changed, 505 insertions, 79 deletions
diff --git a/lib/action.php b/lib/action.php
index 5987abf3c..bf053424f 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -53,7 +53,6 @@ require_once INSTALLDIR.'/lib/htmloutputter.php';
  *
  * @see      HTMLOutputter
  */
-
 class Action extends HTMLOutputter // lawsuit
 {
     var $args;
@@ -69,20 +68,30 @@ class Action extends HTMLOutputter // lawsuit
      * @see XMLOutputter::__construct
      * @see HTMLOutputter::__construct
      */
-
     function __construct($output='php://output', $indent=true)
     {
         parent::__construct($output, $indent);
     }
 
-    // For initializing members of the class
 
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
     function prepare($argarray)
     {
         $this->args =& common_copy_args($argarray);
         return true;
     }
 
+    /**
+     * Show page, a template method.
+     *
+     * @return nothing
+     */
     function showPage()
     {
         $this->startHTML();
@@ -91,6 +100,11 @@ class Action extends HTMLOutputter // lawsuit
         $this->endHTML();
     }
 
+    /**
+     * Show head, a template method.
+     *
+     * @return nothing
+     */
     function showHead()
     {
         // XXX: attributes (profile?)
@@ -105,6 +119,11 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('head');
     }
 
+    /**
+     * Show title, a template method.
+     *
+     * @return nothing
+     */
     function showTitle()
     {
         $this->element('title', null,
@@ -113,13 +132,24 @@ class Action extends HTMLOutputter // lawsuit
                                common_config('site', 'name')));
     }
 
-    // SHOULD overload
+    /**
+     * Returns the page title
+     *
+     * SHOULD overload
+     *
+     * @return string page title
+     */
 
     function title()
     {
         return _("Untitled page");
     }
 
+    /**
+     * Show stylesheets
+     *
+     * @return nothing
+     */
     function showStylesheets()
     {
         $this->element('link', array('rel' => 'stylesheet',
@@ -145,6 +175,11 @@ class Action extends HTMLOutputter // lawsuit
         }
     }
 
+    /**
+     * Show javascript headers
+     *
+     * @return nothing
+     */
     function showScripts()
     {
         $this->element('script', array('type' => 'text/javascript',
@@ -161,38 +196,66 @@ class Action extends HTMLOutputter // lawsuit
                        ' ');
     }
 
+    /**
+     * Show OpenSearch headers
+     *
+     * @return nothing
+     */
     function showOpenSearch()
     {
-        $this->element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
+        $this->element('link', array('rel' => 'search',
+                                     'type' => 'application/opensearchdescription+xml',
                                      'href' =>  common_local_url('opensearch', array('type' => 'people')),
                                      'title' => common_config('site', 'name').' People Search'));
-
         $this->element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
                                      'href' =>  common_local_url('opensearch', array('type' => 'notice')),
                                      'title' => common_config('site', 'name').' Notice Search'));
     }
 
-    // MAY overload
-
+    /**
+     * Show feed headers
+     *
+     * MAY overload
+     *
+     * @return nothing
+     */
     function showFeeds()
     {
         // does nothing by default
     }
 
-    // SHOULD overload
-
+    /**
+     * Show description.
+     *
+     * SHOULD overload
+     *
+     * @return nothing
+     */
     function showDescription()
     {
         // does nothing by default
     }
 
-    // MAY overload
-
+    /**
+     * Show extra stuff in <head>.
+     *
+     * MAY overload
+     *
+     * @return nothing
+     */
     function extraHead()
     {
         // does nothing by default
     }
 
+    
+    /**
+     * Show body.
+     *
+     * Calls template methods
+     *
+     * @return nothing
+     */
     function showBody()
     {
         $this->elementStart('body', array('id' => $this->trimmed('action')));
@@ -204,6 +267,13 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('body');
     }
 
+    /**
+     * Show header of the page.
+     *
+     * Calls template methods
+     *
+     * @return nothing
+     */
     function showHeader()
     {
         $this->elementStart('div', array('id' => 'header'));
@@ -218,14 +288,18 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('div');
     }
 
+    /**
+     * Show configured logo.
+     *
+     * @return nothing
+     */
     function showLogo()
     {
         $this->elementStart('address', array('id' => 'site_contact',
                                              'class' => 'vcard'));
         $this->elementStart('a', array('class' => 'url home bookmark',
                                        'href' => common_local_url('public')));
-        if (common_config('site', 'logo') || file_exists(theme_file('logo.png')))
-        {
+        if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) {
             $this->element('img', array('class' => 'logo photo',
                                         'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : theme_path('logo.png'),
                                         'alt' => common_config('site', 'name')));
@@ -235,6 +309,11 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('address');
     }
 
+    /**
+     * Show primary navigation.
+     *
+     * @return nothing
+     */
     function showPrimaryNav()
     {
         $this->elementStart('dl', array('id' => 'site_nav_global_primary'));
@@ -271,10 +350,15 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('dd');
         $this->elementEnd('dl');
     }
-
-    // Revist. Should probably do an hAtom pattern here
+    
+    /**
+     * Show site notice.
+     *
+     * @return nothing
+     */
     function showSiteNotice()
     {
+        // Revist. Should probably do an hAtom pattern here
         $text = common_config('site', 'notice');
         if ($text) {
             $this->elementStart('dl', array('id' => 'site_notice',
@@ -285,19 +369,38 @@ class Action extends HTMLOutputter // lawsuit
         }
     }
 
-    // MAY overload if no notice form needed... or direct message box????
-
+    /**
+     * Show notice form.
+     *
+     * MAY overload if no notice form needed... or direct message box????
+     *
+     * @return nothing
+     */
     function showNoticeForm()
     {
         $notice_form = new NoticeForm($this);
         $notice_form->show();
     }
-
+    
+    /**
+     * Show anonymous message.
+     *
+     * SHOULD overload
+     *
+     * @return nothing
+     */
     function showAnonymousMessage()
     {
         // needs to be defined by the class
     }
 
+    /**
+     * Show core.
+     *
+     * Shows local navigation, content block and aside.
+     *
+     * @return nothing
+     */
     function showCore()
     {
         $this->elementStart('div', array('id' => 'core'));
@@ -307,6 +410,11 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('div');
     }
 
+    /**
+     * Show local navigation block.
+     *
+     * @return nothing
+     */
     function showLocalNavBlock()
     {
         $this->elementStart('dl', array('id' => 'site_nav_local_views'));
@@ -317,13 +425,23 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('dl');
     }
 
-    // SHOULD overload
-
+    /**
+     * Show local navigation.
+     *
+     * SHOULD overload
+     *
+     * @return nothing
+     */
     function showLocalNav()
     {
         // does nothing by default
     }
 
+    /**
+     * Show content block.
+     *
+     * @return nothing
+     */
     function showContentBlock()
     {
         $this->elementStart('div', array('id' => 'content'));
@@ -336,10 +454,21 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('div');
     }
 
-    function showPageTitle() {
-        $this->element('h1', NULL, $this->title());
+    /**
+     * Show page title.
+     *
+     * @return nothing
+     */
+    function showPageTitle()
+    {
+        $this->element('h1', null, $this->title());
     }
 
+    /**
+     * Show page notice block.
+     *
+     * @return nothing
+     */
     function showPageNoticeBlock()
     {
         $this->elementStart('dl', array('id' => 'page_notice',
@@ -349,20 +478,35 @@ class Action extends HTMLOutputter // lawsuit
         $this->showPageNotice();
         $this->elementEnd('dd');
         $this->elementEnd('dl');
-	}
-
-    // SHOULD overload (unless there's not a notice)
+    }
 
+    /**
+     * Show page notice.
+     *
+     * SHOULD overload (unless there's not a notice)
+     *
+     * @return nothing
+     */
     function showPageNotice()
     {
     }
 
-    // MUST overload
-
+    /**
+     * Show content.
+     *
+     * MUST overload (unless there's not a notice)
+     *
+     * @return nothing
+     */
     function showContent()
     {
     }
 
+    /**
+     * Show Aside.
+     *
+     * @return nothing
+     */
     function showAside()
     {
         $this->elementStart('div', array('id' => 'aside_primary',
@@ -372,8 +516,13 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('div');
     }
 
-    // MAY overload if there are feeds
-
+    /**
+     * Show export data feeds.
+     *
+     * MAY overload if there are feeds
+     *
+     * @return nothing
+     */
     function showExportData()
     {
         // is there structure to this?
@@ -381,12 +530,23 @@ class Action extends HTMLOutputter // lawsuit
         // can we reuse list of feeds from showFeeds() ?
     }
 
-    // SHOULD overload
-
-    function showSections() {
+    /**
+     * Show sections.
+     *
+     * SHOULD overload
+     *
+     * @return nothing
+     */
+    function showSections()
+    {
         // for each section, show it
     }
 
+    /**
+     * Show footer.
+     *
+     * @return nothing
+     */
     function showFooter()
     {
         $this->elementStart('div', array('id' => 'footer'));
@@ -395,6 +555,11 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('div');
     }
 
+    /**
+     * Show secondary navigation.
+     *
+     * @return nothing
+     */
     function showSecondaryNav()
     {
         $this->elementStart('dl', array('id' => 'site_nav_global_secondary'));
@@ -418,6 +583,11 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('dl');
     }
 
+    /**
+     * Show licenses.
+     *
+     * @return nothing
+     */
     function showLicenses()
     {
         $this->elementStart('dl', array('id' => 'licenses'));
@@ -426,6 +596,11 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('dl');
     }
 
+    /**
+     * Show Laconica license.
+     *
+     * @return nothing
+     */
     function showLaconicaLicense()
     {
         $this->element('dt', array('id' => 'site_laconica_license'), _('Laconica software license'));
@@ -442,6 +617,11 @@ class Action extends HTMLOutputter // lawsuit
         // do it
     }
 
+    /**
+     * Show content license.
+     *
+     * @return nothing
+     */
     function showContentLicense()
     {
         $this->element('dt', array('id' => 'site_content_license'), _('Laconica software license'));
@@ -461,24 +641,52 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('dd');
     }
 
-    // For comparison with If-Last-Modified
-    // If not applicable, return null
-
+    /**
+     * Return last modified, if applicable.
+     *
+     * MAY override
+     *
+     * @return string last modified http header
+     */
     function lastModified()
     {
+        // For comparison with If-Last-Modified
+        // If not applicable, return null
         return null;
     }
 
+    /**
+     * Return etag, if applicable.
+     *
+     * MAY override
+     *
+     * @return string etag http header
+     */
     function etag()
     {
         return null;
     }
 
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @return boolean is read only action?
+     */
     function isReadOnly()
     {
         return false;
     }
 
+    /**
+     * Returns query argument or default value if not found
+     *
+     * @param string $key requested argument
+     * @param string $def default value to return if $key is not provided
+     *
+     * @return boolean is read only action?
+     */
     function arg($key, $def=null)
     {
         if (array_key_exists($key, $this->args)) {
@@ -488,24 +696,34 @@ class Action extends HTMLOutputter // lawsuit
         }
     }
 
+    /**
+     * Returns trimmed query argument or default value if not found
+     *
+     * @param string $key requested argument
+     * @param string $def default value to return if $key is not provided
+     *
+     * @return boolean is read only action?
+     */
     function trimmed($key, $def=null)
     {
         $arg = $this->arg($key, $def);
-        return (is_string($arg)) ? trim($arg) : $arg;
+        return is_string($arg) ? trim($arg) : $arg;
     }
 
-    // Note: argarray ignored, since it's now passed in in prepare()
-
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return boolean is read only action?
+     */
     function handle($argarray=null)
     {
-
-        $lm = $this->lastModified();
+        $lm   = $this->lastModified();
         $etag = $this->etag();
-
         if ($etag) {
             header('ETag: ' . $etag);
         }
-
         if ($lm) {
             header('Last-Modified: ' . date(DATE_RFC1123, $lm));
             $if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
@@ -523,11 +741,27 @@ class Action extends HTMLOutputter // lawsuit
         }
     }
 
+    /**
+     * Has etag? (private)
+     *
+     * @param string $etag          etag http header
+     * @param string $if_none_match ifNoneMatch http header
+     *
+     * @return boolean
+     */
     function _hasEtag($etag, $if_none_match)
     {
         return ($if_none_match) && in_array($etag, explode(',', $if_none_match));
     }
 
+    /**
+     * Boolean understands english (yes, no, true, false)
+     *
+     * @param string $key query key we're interested in 
+     * @param string $def default value
+     *
+     * @return boolean interprets yes/no strings as boolean
+     */
     function boolean($key, $def=false)
     {
         $arg = strtolower($this->trimmed($key));
@@ -543,6 +777,14 @@ class Action extends HTMLOutputter // lawsuit
         }
     }
 
+    /**
+     * Server error
+     *
+     * @param string  $msg  error message to display
+     * @param integer $code http error code, 500 by default
+     *
+     * @return nothing
+     */
     function serverError($msg, $code=500)
     {
         $action = $this->trimmed('action');
@@ -550,6 +792,14 @@ class Action extends HTMLOutputter // lawsuit
         common_server_error($msg, $code);
     }
 
+    /**
+     * Client error
+     *
+     * @param string  $msg  error message to display
+     * @param integer $code http error code, 400 by default
+     *
+     * @return nothing
+     */
     function clientError($msg, $code=400)
     {
         $action = $this->trimmed('action');
@@ -557,10 +807,15 @@ class Action extends HTMLOutputter // lawsuit
         common_user_error($msg, $code);
     }
 
+    /**
+     * Returns the current URL
+     *
+     * @return string current URL
+     */
     function selfUrl()
     {
         $action = $this->trimmed('action');
-        $args = $this->args;
+        $args   = $this->args;
         unset($args['action']);
         foreach (array_keys($_COOKIE) as $cookie) {
             unset($args[$cookie]);
@@ -568,11 +823,21 @@ class Action extends HTMLOutputter // lawsuit
         return common_local_url($action, $args);
     }
 
-    // Added @id to li for some control.
-    // XXX: We might want to move this to htmloutputter.php
-
+    /**
+     * Generate a menu item
+     *
+     * @param string  $url         menu URL
+     * @param string  $text        menu name
+     * @param string  $title       title attribute, null by default
+     * @param boolean $is_selected current menu item, false by default
+     * @param string  $id          element id, null by default
+     *
+     * @return nothing
+     */
     function menuItem($url, $text, $title=null, $is_selected=false, $id=null)
     {
+        // Added @id to li for some control.
+        // XXX: We might want to move this to htmloutputter.php
         $lattrs = array();
         if ($is_selected) {
             $lattrs['class'] = 'current';
@@ -589,10 +854,20 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('li');
     }
 
-    // Does a little before-after block for next/prev page
-
+    /**
+     * Generate pagination links
+     *
+     * @param boolean $have_before is there something before?
+     * @param boolean $have_after  is there something after?
+     * @param integer $page        current page
+     * @param string  $action      current action
+     * @param array   $args        rest of query arguments
+     *
+     * @return nothing
+     */
     function pagination($have_before, $have_after, $page, $action, $args=null)
     {
+        // Does a little before-after block for next/prev page
         if ($have_before || $have_after) {
             $this->elementStart('div', array('class' => 'pagination'));
             $this->elementStart('dl', null);
@@ -600,26 +875,22 @@ class Action extends HTMLOutputter // lawsuit
             $this->elementStart('dd', null);
             $this->elementStart('ul', array('class' => 'nav'));
         }
-
         if ($have_before) {
-            $pargs = array('page' => $page-1);
-            $newargs = ($args) ? array_merge($args,$pargs) : $pargs;
-
+            $pargs   = array('page' => $page-1);
+            $newargs = $args ? array_merge($args, $pargs) : $pargs;
             $this->elementStart('li', array('class' => 'nav_prev'));
             $this->element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'prev'),
                            _('After'));
             $this->elementEnd('li');
         }
-
         if ($have_after) {
-            $pargs = array('page' => $page+1);
-            $newargs = ($args) ? array_merge($args,$pargs) : $pargs;
+            $pargs   = array('page' => $page+1);
+            $newargs = $args ? array_merge($args, $pargs) : $pargs;
             $this->elementStart('li', array('class' => 'nav_next'));
             $this->element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'next'),
                            _('Before'));
             $this->elementEnd('li');
         }
-
         if ($have_before || $have_after) {
             $this->elementEnd('ul');
             $this->elementEnd('dd');
diff --git a/lib/blockform.php b/lib/blockform.php
index ea22c1cec..af766b823 100644
--- a/lib/blockform.php
+++ b/lib/blockform.php
@@ -150,6 +150,6 @@ class BlockForm extends Form
 
     function formActions()
     {
-        $this->out->submit('submit', _('block'), 'submit', null, _('Block this user'));
+        $this->out->submit('submit', _('Block'), 'submit', null, _('Block this user'));
     }
 }
diff --git a/lib/error.php b/lib/error.php
new file mode 100644
index 000000000..9842053d8
--- /dev/null
+++ b/lib/error.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * Error action.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ *
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * 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/>.
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Base class for displaying HTTP errors
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ */
+class ErrorAction extends Action
+{
+    var $code    = null;
+    var $message = null;
+    var $status  = null;
+    var $default = null;
+
+    function __construct($message, $code, $output='php://output', $indent=true)
+    {
+        parent::__construct($output, $indent);
+
+        $this->code = $code;
+        $this->message = $message;
+
+        // XXX: hack alert: usually we aren't going to
+        // call this page directly, but because it's
+        // an action it needs an args array anyway
+        $this->prepare($_REQUEST);
+    }
+
+    /**
+     *  To specify additional HTTP headers for the action
+     *
+     *  @return void
+     */
+    function extraHeaders()
+    {
+        $status_string = $this->status[$this->code];
+        header('HTTP/1.1 '.$this->code.' '.$status_string);
+    }
+    
+    /**
+     * Display content.
+     *
+     * @return nothing
+     */
+    function showContent()
+    {
+        $this->element('div', array('class' => 'error'), $this->message);
+    }
+
+    /**
+     * Page title.
+     *
+     * @return page title
+     */
+    function title()
+    {
+        return $this->message;
+    }
+
+    function isReadOnly()
+    {
+        return true;
+    }
+    
+    function showPage() 
+    {
+        parent::showPage();
+        
+        // We don't want to have any more output after this
+        exit();
+    }
+
+    // Overload a bunch of stuff so the page isn't too bloated
+
+    function showBody()
+    {
+        $this->elementStart('body', array('id' => 'error'));
+        $this->elementStart('div', 'wrap');
+        $this->showHeader();
+        $this->showCore();
+        $this->showFooter();
+        $this->elementEnd('div');
+        $this->elementEnd('body');
+    }
+
+    function showCore()
+    {
+        $this->elementStart('div', array('id' => 'core'));
+        $this->showContentBlock();
+        $this->elementEnd('div');
+    }
+
+    function showHeader()
+    {
+        $this->elementStart('div', array('id' => 'header'));
+        $this->showLogo();
+        $this->elementEnd('div');
+    }
+
+}
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index f6e326078..ca674f3c8 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -78,9 +78,9 @@ class GroupEditForm extends Form
     function id()
     {
         if ($this->group) {
-            return 'group_edit-' . $this->group->id;
+            return 'form_group_edit-' . $this->group->id;
         } else {
-            return 'group_add';
+            return 'form_group_add';
         }
     }
 
@@ -92,7 +92,7 @@ class GroupEditForm extends Form
 
     function formClass()
     {
-        return 'form_group_add';
+        return 'form_settings';
     }
 
     /**
@@ -111,6 +111,18 @@ class GroupEditForm extends Form
         }
     }
 
+
+    /**
+     * Name of the form
+     *
+     * @return void
+     */
+
+    function formLegend()
+    {
+        $this->out->element('legend', null, _('Create a new group'));
+    }
+
     /**
      * Data elements of the form
      *
@@ -121,6 +133,7 @@ class GroupEditForm extends Form
     {
         $this->out->elementStart('ul', 'form_data');
         $this->out->elementStart('li');
+        $this->out->hidden('groupid', $this->group->id);
         $this->out->input('nickname', _('Nickname'),
                      ($this->out->arg('nickname')) ? $this->out->arg('nickname') : $this->group->nickname,
                      _('1-64 lowercase letters or numbers, no punctuation or spaces'));
@@ -135,7 +148,7 @@ class GroupEditForm extends Form
                      _('URL of the homepage or blog of the group or topic'));
         $this->out->elementEnd('li');
         $this->out->elementStart('li');
-        $this->out->textarea('description', _('description'),
+        $this->out->textarea('description', _('Description'),
                         ($this->out->arg('description')) ? $this->out->arg('description') : $this->group->description,
                         _('Describe the group or topic in 140 chars'));
         $this->out->elementEnd('li');
diff --git a/lib/groupminilist.php b/lib/groupminilist.php
index e4d4c68fd..fe38d0340 100644
--- a/lib/groupminilist.php
+++ b/lib/groupminilist.php
@@ -49,7 +49,7 @@ class GroupMiniList extends GroupList
 {
     function show()
     {
-        $this->out->elementStart('ul', 'groups');
+        $this->out->elementStart('ul', 'entities groups xoxo');
 
         $cnt = 0;
 
@@ -73,7 +73,7 @@ class GroupMiniList extends GroupList
                                        $this->group->fullname :
                                        $this->group->nickname,
                                        'href' => $this->group->homeUrl(),
-                                       'rel' => 'contact',
+                                       'rel' => 'contact group',
                                        'class' => 'url'));
         $logo = ($this->group->stream_logo) ?
           $this->group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE);
@@ -85,7 +85,7 @@ class GroupMiniList extends GroupList
                                     'alt' =>  ($this->group->fullname) ?
                                     $this->group->fullname :
                                     $this->group->nickname));
-        $this->out->element('span', 'fn nickname', $this->group->nickname);
+        $this->out->element('span', 'fn org nickname', $this->group->nickname);
         $this->out->elementEnd('a');
         $this->out->elementEnd('li');
     }
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 1e164933c..f9245414f 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -108,6 +108,8 @@ class HTMLOutputter extends XMLOutputter
         }
 
         header('Content-Type: '.$type);
+        
+        $this->extraHeaders();
 
         $this->startXML('html',
                         '-//W3C//DTD XHTML 1.0 Strict//EN',
@@ -132,6 +134,16 @@ class HTMLOutputter extends XMLOutputter
         $this->elementEnd('html');
         $this->endXML();
     }
+    
+    /**
+    *  To specify additional HTTP headers for the action
+    *
+    *  @return void
+    */
+    function extraHeaders()
+    {
+        // Needs to be overloaded
+    }
 
     /**
      * Output an HTML text input element
diff --git a/lib/profilelist.php b/lib/profilelist.php
index f7ed5d19c..73c129efe 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -93,8 +93,7 @@ class ProfileList extends Widget
         $user = common_current_user();
 
 
-        $this->out->elementStart('div', array('id' => 'user_profile',
-                                              'class' => 'vcard'));
+        $this->out->elementStart('div', 'entity_profile vcard');
 
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
         $this->out->elementStart('a', array('href' => $this->profile->profileurl,
@@ -113,7 +112,7 @@ class ProfileList extends Widget
         $this->out->elementEnd('a');
         
         if ($this->profile->fullname) {
-            $this->out->elementStart('dl', 'user_fn');
+            $this->out->elementStart('dl', 'entity_fn');
             $this->out->element('dt', null, 'Full name');
             $this->out->elementStart('dd');
             $this->out->elementStart('span', 'fn');
@@ -123,7 +122,7 @@ class ProfileList extends Widget
             $this->out->elementEnd('dl');
         }
         if ($this->profile->location) {
-            $this->out->elementStart('dl', 'user_location');
+            $this->out->elementStart('dl', 'entity_location');
             $this->out->element('dt', null, _('Location'));
             $this->out->elementStart('dd', 'location');
             $this->out->raw($this->highlight($this->profile->location));
@@ -131,7 +130,7 @@ class ProfileList extends Widget
             $this->out->elementEnd('dl');
         }
         if ($this->profile->homepage) {
-            $this->out->elementStart('dl', 'user_url');
+            $this->out->elementStart('dl', 'entity_url');
             $this->out->element('dt', null, _('URL'));
             $this->out->elementStart('dd');
             $this->out->elementStart('a', array('href' => $this->profile->homepage,
@@ -142,7 +141,7 @@ class ProfileList extends Widget
             $this->out->elementEnd('dl');
         }
         if ($this->profile->bio) {
-            $this->out->elementStart('dl', 'user_note');
+            $this->out->elementStart('dl', 'entity_note');
             $this->out->element('dt', null, _('Note'));
             $this->out->elementStart('dd', 'note');
             $this->out->raw($this->highlight($this->profile->bio));
@@ -156,7 +155,7 @@ class ProfileList extends Widget
             # Get tags
             $tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
 
-            $this->out->elementStart('dl', 'user_tags');
+            $this->out->elementStart('dl', 'entity_tags');
             $this->out->elementStart('dt');
             if ($user->id == $this->owner->id) {
                 $this->out->element('a', array('href' => common_local_url('tagother',
diff --git a/lib/profileminilist.php b/lib/profileminilist.php
index c6970f808..56b768419 100644
--- a/lib/profileminilist.php
+++ b/lib/profileminilist.php
@@ -49,7 +49,7 @@ class ProfileMiniList extends ProfileList
 {
     function show()
     {
-        $this->out->elementStart('ul', 'users');
+        $this->out->elementStart('ul', 'entities users xoxo');
 
         $cnt = 0;
 
@@ -73,7 +73,7 @@ class ProfileMiniList extends ProfileList
                                        $this->profile->fullname :
                                        $this->profile->nickname,
                                        'href' => $this->profile->profileurl,
-                                       'rel' => 'contact',
+                                       'rel' => 'contact member',
                                        'class' => 'url'));
         $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE);
         $this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
diff --git a/lib/util.php b/lib/util.php
index 4f791a493..d30a56c77 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1588,11 +1588,6 @@ function common_session_token()
     return $_SESSION['token'];
 }
 
-function common_nudge_response()
-{
-    common_element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
-}
-
 function common_cache_key($extra)
 {
     return 'laconica:' . common_keyize(common_config('site', 'name')) . ':' . $extra;
author	Evan Prodromou <evan@controlyourself.ca>	2009-01-22 12:35:25 +0100
committer	Evan Prodromou <evan@controlyourself.ca>	2009-01-22 12:35:25 +0100
commit	a2a2dd88b5a580715a1b8256a5d8b7743675711c (patch)
tree	d9daa558200526d52aec315ccd196bef7dd46d5a /lib
parent	6a3204d08e035812cf111e20f72bf0c7ffb4c601 (diff)
parent	f89f6a8eb0d16fc7c4114ba9279466189b857ea6 (diff)