Changeset 2141

Timestamp:

03/29/10 08:41:20 (14 years ago)

Author:

Osku

Message:

Plugin agora version 0.5.3 : long time ago since last commit :) ~ please test massively

• post_type change from threadpost to thread .
• admin available: manage threads and messages.
• new widgets: last threads, selected threads, last messages, subscribe, navigation, etc.
• Thread can be created without category.
• i18n: french available.
• fixes

Thank you to report anything

• A new demo is available on  http://www.sakeco.net/labs/agora

Location:

plugins/agora

Files:

• _admin.php (modified) (3 diffs)
• _define.php (modified) (2 diffs)
• _install.php (modified) (3 diffs)
• _prepend.php (modified) (3 diffs)
• _public.php (modified) (41 diffs)
• _widgets.php (modified) (5 diffs)
• default-templates/agora-atom-answers.xml (deleted)
• default-templates/agora-atom-messages.xml (added)
• default-templates/agora-atom.xml (modified) (1 diff)
• default-templates/agora-rss2-answers.xml (deleted)
• default-templates/agora-rss2-messages.xml (added)
• default-templates/agora-rss2.xml (modified) (1 diff)
• default-templates/agora.html (added)
• default-templates/editmessage.html (modified) (2 diffs)
• default-templates/editpost.html (modified) (5 diffs)
• default-templates/forum.html (deleted)
• default-templates/login.html (modified) (3 diffs)
• default-templates/newthread.html (modified) (7 diffs)
• default-templates/place.html (added)
• default-templates/profile.html (modified) (3 diffs)
• default-templates/profile_me.html (modified) (3 diffs)
• default-templates/register.html (modified) (5 diffs)
• default-templates/subforum.html (deleted)
• default-templates/thread.html (modified) (11 diffs)
• inc/class.agora.auth.php (modified) (1 diff)
• inc/class.agora.behaviors.php (modified) (1 diff)
• inc/class.agora.log.php (modified) (2 diffs)
• inc/class.agora.php (modified) (16 diffs)
• inc/class.agora.template.php (modified) (24 diffs)
• inc/class.agora.utils.php (modified) (1 diff)
• inc/class.rs.agora.php (modified) (6 diffs)
• index.php (modified) (2 diffs)
• js (added)
• js/_messages.js (added)
• js/_options.js (added)
• lib (added)
• lib/admin.messages.pager.php (added)
• locales/fr/main.lang.php (added)
• locales/fr/main.po (modified) (1 diff)
• message.php (added)
• messages.php (added)
• messages_actions.php (added)
• options.php (added)
• thread.php (added)

plugins/agora/_admin.php

@@ -4 +4 @@
 # This file is part of agora, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+# Copyright (c) 2009-2010 Osku ,Tomtom and contributors
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -17 +18 @@
 function agora_dashboard($core,$icons)
 {
-     $icons['agora'] = new ArrayObject(array(__('Agora'),'plugin.php?p=agora','index.php?pf=agora/icon.png'));
+     $agora = new agora($core,false);
+     $thread_count = $core->blog->getPosts(array('post_type'=>'thread'),true)->f(0);
+     $str_threads = ($thread_count > 1) ? __('%d threads') : __('%d thread');
+
+     $message_count = $agora->getMessages(array(),true)->f(0);
+     $str_messages = ($message_count > 1) ? __('%d messages') : __('%d message');
+     $icons['agora'] = new ArrayObject(array(sprintf($str_threads,$thread_count),'plugin.php?p=agora','index.php?pf=agora/icon.png'));
+     $icons['agora'][0] .= '</a> <br /><a href="plugin.php?p=agora&amp;act=messages">'.sprintf($str_messages,$message_count);
 }
 
-$_menu['Blog']->addItem(__('Agora'),
-          'plugin.php?p=agora','index.php?pf=agora/icon-small.png',
+$_menu['Plugins']->addItem(__('agora:config'),
+          'plugin.php?p=agora&amp;act=options','index.php?pf=agora/icon-small.png',
           preg_match('/plugin.php\?p=agora(&.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->check('admin',$core->blog->id));
@@ -28 +36 @@
 $core->auth->setPermissionType('moderator',__('can moderate the agora'));
 
+# Rest methods
+$core->rest->addFunction('getMessageById',array('agoraRestMethods','getMessageById'));
+
+class agoraRestMethods
+{
+     public static function getMessageById($core,$get)
+     {
+          //global $core;
+
+          if (empty($get['id'])) {
+               throw new Exception('No message ID');
+          }
+          
+          $rs = $core->blog->agora->getMessages(array('message_id' => (integer) $get['id']));
+          
+          if ($rs->isEmpty()) {
+               throw new Exception('No message for this ID');
+          }
+          
+          $rsp = new xmlTag('post');
+          $rsp->id = $rs->message_id;
+          
+          $rsp->message_dt($rs->message_dt);
+          $rsp->message_creadt($rs->message_creadt);
+          $rsp->message_upddt($rs->message_upddt);
+          $rsp->user_id($rs->user_id);
+
+          $rsp->message_content($rs->message_content);
+
+          $rsp->message_status($rs->message_status);
+          $rsp->post_title($rs->post_title);
+          $rsp->post_url($rs->post_url);
+          $rsp->post_id($rs->post_id);
+          $rsp->post_dt($rs->post_dt);
+          $rsp->user_id($rs->user_id);
+          $rsp->user_name($rs->user_name);
+          $rsp->user_firstname($rs->user_firstname);
+          $rsp->user_displayname($rs->user_displayname);
+          $rsp->user_email($rs->user_email);
+          $rsp->user_url($rs->user_url);
+          $rsp->cat_title($rs->cat_title);
+          $rsp->cat_url($rs->cat_url);
+          
+          $rsp->message_display_content($rs->getContent(true));
+          
+          if ($core->auth->userID()) {
+               # --BEHAVIOR-- adminAfterCommentDesc
+               $rsp->message_spam_disp($core->callBehavior('adminAfterMessageDesc', $rs));
+          }
+          
+          return $rsp;
+     }
+}
 ?>

plugins/agora/_define.php

@@ -4 +4 @@
 # This file is part of agora, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+# Copyright (c) 2009-2010 Osku ,Tomtom and contributors
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -15 +16 @@
 $this->registerModule(
      /* Name */          "Agora",
-     /* Description*/    "It is not a forum but almost",
+     /* Description*/    "Stuff to build a forum",
      /* Author */        "Osku, Tomtom (http://blog.zenstyle.fr) and contributors",
-     /* Version */       '0.5trunk',
+     /* Version */       '0.5.3',
      /* Permissions */   'admin'
 );

plugins/agora/_install.php

@@ -4 +4 @@
 # This file is part of agora, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+# Copyright (c) 2009-2010- Osku ,Tomtom and contributors
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -28 +29 @@
      ->message_dt             ('timestamp',  0,   false,    'now()')
      ->message_tz             ('varchar',    128, false,    "'UTC'")
+     ->message_creadt         ('timestamp',  0,   false,    'now()')
      ->message_upddt          ('timestamp',  0,   false,    'now()')
      ->message_format         ('varchar',    32,  false,    "'xhtml'")
@@ -48 +50 @@
 $changes = $si->synchronize($s);
 
+$s =& $core->blog->settings;
+$s->setNameSpace('agora');
+$s->put('agora_flag',false,'boolean','Agora activation flag',true,true);
+$s->put('agora_announce',__('<p class="message">Welcome to the Agora.</p>'),'string','Agora announce',true,true);
+$s->put('nb_message_per_feed',20,'integer','Number of messages on feeds',true,true);
+
 $core->setVersion('agora',$version);
 return true;

plugins/agora/_prepend.php

@@ -4 +4 @@
 # This file is part of agora, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+# Copyright (c) 2009-2010 Osku ,Tomtom and contributors
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -16 +17 @@
 if ($core->blog->settings->agora_flag)
 {
-     $core->url->register('agora','agora','^agora(.*)$',array('urlAgora','forum'));
-     $core->url->register('subforum','agora/sub','^agora/sub/(.+)$',array('urlAgora','subforum'));
-     $core->url->register('newthread','agora/newthread','^agora/newthread(.*)$',array('urlAgora','newthread'));
-     $core->url->register('thread','agora/thread','^agora/thread/(.+)$',array('urlAgora','thread'));
+     $core->url->register('agora','agora','^agora(.*)$',array('urlAgora','agora'));
+     $core->url->register('place','place','^place/(.+)$',array('urlAgora','place'));
+     $core->url->register('newthread','newthread','^newthread(.*)$',array('urlAgora','newthread'));
+     $core->url->register('thread','thread','^thread/(.+)$',array('urlAgora','thread'));
+     $core->url->register('threadpreview','threadpreview','^threadpreview/(.+)$',array('urlAgora','threadpreview'));
      //$core->url->register('answer','agora/answer','^agora/answer/(.+)$',array('urlAgora','answer'));
-     $core->url->register('editthread','agora/edit/thread','^agora/edit/thread/(.+)$',array('urlAgora','editthread'));
-     $core->url->register('removethread','agora/remove/thread','^agora/remove/thread/(.+)$',array('urlAgora','removethread'));
-     $core->url->register('editmessage','agora/edit/message','^agora/edit/message/(.+)$',array('urlAgora','editmessage'));
-     $core->url->register('removemessage','agora/remove/message','^agora/remove/message/(.+)$',array('urlAgora','removemessage'));
-     $core->url->register('register','agora/register','^agora/register$',array('urlAgora','register'));
-     $core->url->register('login','agora/login','^agora/login$',array('urlAgora','login'));
-     $core->url->register('logout','agora/logout','^agora/logout$',array('urlAgora','logout'));
-     $core->url->register('profile','agora/profile','^agora/profile/(.+)$',array('urlAgora','profile'));
+     $core->url->register('editthread','thread/edit','^thread/edit/(.+)$',array('urlAgora','editthread'));
+     $core->url->register('removethread','thread/remove','^thread/remove/(.+)$',array('urlAgora','removethread'));
+     $core->url->register('editmessage','message/edit','^message/edit/(.+)$',array('urlAgora','editmessage'));
+     $core->url->register('removemessage','message/remove','^message/remove/(.+)$',array('urlAgora','removemessage'));
+     $core->url->register('register','register','^register$',array('urlAgora','register'));
+     $core->url->register('login','login','^login$',array('urlAgora','login'));
+     $core->url->register('logout','logout','^logout$',array('urlAgora','logout'));
+     $core->url->register('profile','profile','^profile/(.+)$',array('urlAgora','profile'));
      //$core->url->register('userlist','agora/userlist','^agora/userlist/(.+)$',array('urlAgora','userlist'));
      //$core->url->register('recovery','agora/recovery','^agora/recovery(.*)$',array('urlAgora','recovery'));
-     $core->url->register('agofeed','agora/feed','^agora/feed/(.+)$',array('urlAgora','feed'));
+     $core->url->register('agora_feed','feed/agora','^feed/agora/(.+)$',array('urlAgora','feed'));
 }
 
-$core->setPostType('threadpost','plugin.php?p=agora&act=thread&id=%d',$core->url->getBase('thread').'/%s');
+$core->setPostType('thread','plugin.php?p=agora&act=thread&id=%d',$core->url->getBase('thread').'/%s');
 
 $__autoload['agora']               = dirname(__FILE__).'/inc/class.agora.php';
@@ -45 +47 @@
 $__autoload['rsExtMessage']        = dirname(__FILE__).'/inc/class.rs.agora.php';
 
+$core->blog->agora = new agora($core,false);
 ?>

plugins/agora/_public.php

@@ -4 +4 @@
 # This file is part of agora, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+# Copyright (c) 2009-2010 Osku ,Tomtom and contributors
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -20 +21 @@
 
 // URLs
-$core->tpl->addValue('forumURL',array('agoraTemplate','forumURL'));
+$core->tpl->addValue('agoraURL',array('agoraTemplate','agoraURL'));
 $core->tpl->addValue('registerURL',array('agoraTemplate','registerURL'));
 $core->tpl->addValue('loginURL',array('agoraTemplate','loginURL'));
@@ -26 +27 @@
 $core->tpl->addValue('logoutURL',array('agoraTemplate','logoutURL'));
 $core->tpl->addValue('AgoraFeedURL',array('agoraTemplate','AgoraFeedURL'));
-$core->tpl->addValue('SubforumFeedURL',array('agoraTemplate','SubforumFeedURL'));
+$core->tpl->addValue('placeFeedURL',array('agoraTemplate','placeFeedURL'));
 
 
@@ -34 +35 @@
 $core->tpl->addValue('RegisterPreviewEmail',array('agoraTemplate','RegisterPreviewEmail'));
 
-// Subforums loop
-$core->tpl->addBlock('Subforums',array('agoraTemplate','Subforums'));
-$core->tpl->addBlock('SubforumFirstChildren',array('agoraTemplate','SubforumFirstChildren'));
-$core->tpl->addValue('SubforumURL',array('agoraTemplate','SubforumURL'));
-$core->tpl->addValue('SubforumThreadsNumber',array('agoraTemplate','SubforumThreadsNumber'));
-$core->tpl->addValue('SubforumAnswersNumber',array('agoraTemplate','SubforumAnswersNumber'));
-$core->tpl->addValue('SubForumNewThreadLink',array('agoraTemplate','SubForumNewThreadLink'));
-$core->tpl->addValue('SubforumID',array('agoraTemplate','SubforumID'));
-$core->tpl->addValue('SubforumSpacer',array('agoraTemplate','SubforumSpacer'));
-$core->tpl->addBlock('SubforumComboSelected',array('agoraTemplate','SubforumComboSelected'));
+// places loop
+$core->tpl->addValue('placeURL',array('agoraTemplate','placeURL'));
+$core->tpl->addValue('placeThreadsNumber',array('agoraTemplate','placeThreadsNumber'));
+$core->tpl->addValue('placeAnswersNumber',array('agoraTemplate','placeAnswersNumber'));
+$core->tpl->addValue('placeNewThreadLink',array('agoraTemplate','placeNewThreadLink'));
+$core->tpl->addValue('placeID',array('agoraTemplate','placeID'));
+$core->tpl->addValue('placeSpacer',array('agoraTemplate','placeSpacer'));
+$core->tpl->addBlock('placeComboSelected',array('agoraTemplate','placeComboSelected'));
 
 // Pagination plus (getMessages)
@@ -55 +54 @@
 //$core->tpl->addBlock('ForumEntries',array('agoraTemplate','ForumEntries'));
 $core->tpl->addValue('EntryIfClosed',array('agoraTemplate','EntryIfClosed'));
-$core->tpl->addValue('ThreadAnswersCount',array('agoraTemplate','ThreadAnswersCount'));
+$core->tpl->addValue('EntryMessageCount',array('agoraTemplate','EntryMessageCount'));
 $core->tpl->addValue('EntryCreaDate',array('agoraTemplate','EntryCreaDate'));
-// Thread loop, subforum context
+$core->tpl->addValue('EntryUpdDate',array('agoraTemplate','EntryUpdDate'));
+// Thread loop, place context
 $core->tpl->addBlock('IfThreadPreview',array('agoraTemplate','IfThreadPreview'));
 $core->tpl->addValue('ThreadPreviewTitle',array('agoraTemplate','ThreadPreviewTitle'));
 $core->tpl->addValue('ThreadPreviewContent',array('agoraTemplate','ThreadPreviewContent'));
-$core->tpl->addValue('ThreadURL',array('agoraTemplate','ThreadURL'));
+//$core->tpl->addValue('ThreadURL',array('agoraTemplate','ThreadURL'));
 $core->tpl->addValue('ThreadCategoryURL',array('agoraTemplate','ThreadCategoryURL'));
-$core->tpl->addValue('AnswerThreadURL',array('agoraTemplate','AnswerThreadURL'));
+$core->tpl->addValue('MessageThreadURL',array('agoraTemplate','MessageThreadURL'));
 $core->tpl->addValue('ThreadProfileUserID',array('agoraTemplate','ThreadProfileUserID'));
 $core->tpl->addBlock('ThreadComboSelected',array('agoraTemplate','ThreadComboSelected'));
@@ -95 +95 @@
 $core->tpl->addValue('MessageOrderNumber',array('agoraTemplate','MessageOrderNumber'));
 $core->tpl->addValue('MessageAuthorID',array('agoraTemplate','MessageAuthorID'));
-$core->tpl->addValue('MessageAuthor',array('agoraTemplate','MessageAuthor'));
+$core->tpl->addValue('MessageAuthorCommonName',array('agoraTemplate','MessageAuthorCommonName'));
 $core->tpl->addValue('MessageDate',array('agoraTemplate','MessageDate'));
 $core->tpl->addValue('MessageTime',array('agoraTemplate','MessageTime'));
@@ -102 +102 @@
 $core->tpl->addValue('MessageEditContent',array('agoraTemplate','MessageEditContent'));
 $core->tpl->addValue('MessageProfileUserID',array('agoraTemplate','MessageProfileUserID'));
+$core->tpl->addValue('MessageEntryTitle',array('agoraTemplate','MessageEntryTitle'));
+$core->tpl->addValue('MessageFeedID',array('agoraTemplate','MessageFeedID'));
 //$core->tpl->addValue('',array('agoraTemplate',''));
 //$core->tpl->addValue('',array('agoraTemplate',''));
@@ -262 +264 @@
           $_ctx->agora_register['pwd'] = '';
           
-          $url = $core->blog->url.$core->url->getBase("forum");
+          $url = $core->blog->url.$core->url->getBase("agora");
           
           $register = isset($_POST['ru_login']) && isset($_POST['ru_email']);
@@ -325 +327 @@
                          $core->callBehavior('publicAfterUserCreate',$cur,$user_id);
                          
+                         header('Content-Type: text/html; charset=UTF-8');
                          http::head(201,'Created');
                          header('Content-Type: text/html');
@@ -471 +474 @@
           {
                $user_id = ($core->auth->userID() != false && isset($_SESSION['sess_user_id'])) ? $core->auth->userID() : '';
-               $_ctx->profile = $_ctx->agora->getUser($args);
-               if ($_ctx->profile->isEmpty()) {
+               //$_ctx->users->user_id = $args;
+               $_ctx->users = $_ctx->agora->getUser($args);
+               if ($_ctx->users->isEmpty()) {
                     self::p404();
                }
@@ -478 +482 @@
                $_ctx->profile_user = new ArrayObject();
                
-               $_ctx->profile_user['pseudo'] = $_ctx->profile->user_displayname;
-               $_ctx->profile_user['email'] = $_ctx->profile->user_email;
-               $_ctx->profile_user['url'] = $_ctx->profile->user_url;
-               $_ctx->profile_user['status'] = $_ctx->profile->user_status;
+               $_ctx->profile_user['pseudo'] = $_ctx->users->user_displayname;
+               $_ctx->profile_user['email'] = $_ctx->users->user_email;
+               $_ctx->profile_user['url'] = $_ctx->users->user_url;
+               $_ctx->profile_user['status'] = $_ctx->users->user_status;
                $_ctx->profile_user['pwd'] = '';
                $_ctx->profile_user['msg'] = '';
@@ -574 +578 @@
      public static function old_forum($args)
      {
-          // URL forum/ : home of the forum : see categories aka subforums
+          // URL forum/ : home of the forum : see categories aka places
           
           global $core, $_ctx;
@@ -592 +596 @@
      }
      
-     public static function forum($args)
+     public static function agora($args)
      {
           global $core;
@@ -613 +617 @@
                if (empty($_GET['q'])) {
                     $core->tpl->setPath($core->tpl->getPath(), dirname(__FILE__).'/default-templates');
-                    self::serveDocument('forum.html','text/html',false);
+                    self::serveDocument('agora.html','text/html',false);
                } else {
                     self::search();
@@ -634 +638 @@
      }
 
-     public static function subforum($args)
-     {
-          // URL forum/sub/sub_url : view threads of a subforum
+     public static function place($args)
+     {
+          // URL forum/sub/sub_url : view threads of a place
           // URL forum/sub/sub_url /newthread/ : write a new thread in the category
           
@@ -649 +653 @@
                self::p404();
           }
-          $params['without_empty'] = false;
+          //$params['without_empty'] = false;
           $params['cat_url'] = $args;
+          $params['post_type'] = 'thread';
           //$params['thread_id'] = '';
           
@@ -713 +718 @@
                     $cur->post_lang = $core->auth->getInfo('user_lang');
                     $cur->post_content = $_POST['t_content'];
-                    $cur->post_type = 'threadpost';
+                    $cur->post_type = 'thread';
                     $cur->post_open_comment = 1;
                     
@@ -719 +724 @@
                     //$cur->thread_id = '';
                
-                    $redir = $core->blog->url.$core->url->getBase("subforum").'/'.$_ctx->categories->cat_url;
+                    $redir = $core->blog->url.$core->url->getBase("place").'/'.$_ctx->categories->cat_url;
                     $redir .= strpos($redir,'?') !== false ? '&' : '?';
                
@@ -745 +750 @@
           }
           $core->tpl->setPath($core->tpl->getPath(), dirname(__FILE__).'/default-templates');
-          self::serveDocument('subforum.html','text/html',false);
+          self::serveDocument('place.html','text/html',false);
           return;
      }
@@ -777 +782 @@
           $_ctx->thread_preview['rawcontent'] = '';
           $_ctx->thread_preview['preview'] = false;
-          $_ctx->thread_preview['cat'] = (!$_ctx->categories->isEmpty()) ? $_ctx->categories->cat_id : '';
+          $_ctx->thread_preview['cat'] = ($_ctx->categories->isEmpty()) ? '' : $_ctx->categories->cat_id;
+          $_ctx->thread_preview['not_empty'] = ( $args == '' ) ? false : true;
           
           $thread_new = isset($_POST['t_content']) && isset($_POST['t_title']);
@@ -798 +804 @@
                $_ctx->thread_preview['content'] = $content;
                $_ctx->thread_preview['rawcontent'] = $_POST['t_content'];
-               $_ctx->thread_preview['cat'] = $_POST['t_cat'];
+               $_ctx->thread_preview['cat'] = (integer) $_POST['t_cat'];
+               $_ctx->thread_preview['not_empty'] = true;
                
                if ($preview)
@@ -811 +818 @@
                {
                     $cur = $core->con->openCursor($core->prefix.'post');
+                    # Magic tweak doesn't work here
+                    //$core->blog->settings->system->post_url_format = "{id}";
                     $cur->user_id = $user_id;
-                    $cur->cat_id = $_POST['t_cat'];
+                    $cur->cat_id = ((integer) $_POST['t_cat']) ? (integer) $_POST['t_cat'] : null;
                     $cur->post_title = $title;
+                    $offset = dt::getTimeOffset($core->blog->settings->blog_timezone);
+                    $cur->post_dt = date('Y-m-d H:i:s',time() + $offset);
                     $cur->post_format = 'wiki';
                     $cur->post_status = 1;
                     $cur->post_lang = $core->auth->getInfo('user_lang');
                     $cur->post_content = $_POST['t_content'];
-                    $cur->post_type = 'threadpost';
+                    $cur->post_type = 'thread';
                     $cur->post_open_comment = 1;
                     $redir = $core->blog->url.$core->url->getBase("thread").'/';
@@ -867 +878 @@
           URL forum/thread/id(& or ?)action=open : open the thead : thread->commentsActive : true 
           */
-          $n = self::getPageNumber($args);
-          
-          if ($args == '' && !$n) {
+          //$n = self::getPageNumber($args);
+          
+          if ($args == ''){// && !$n) {
                self::p404();
           }
-          
-          if ($n) {
-               $GLOBALS['_page_number'] = $n;
-          }
+          $core->blog->withoutPassword(false);
+          //if ($n) {
+          //   $GLOBALS['_page_number'] = $n;
+          //}
           
           $user_id = ($core->auth->userID() != false && isset($_SESSION['sess_user_id'])) ? $core->auth->userID() : '';
@@ -882 +893 @@
           $params = new ArrayObject();
           $params['post_url'] = $args;
-          $params['post_type'] = 'threadpost';
+          $params['post_type'] = 'thread';
           
           //$_ctx->posts = $_ctx->agora->getPostsPlus($params);
@@ -898 +909 @@
           $_ctx->post_preview['rawcontent'] = '';
           $_ctx->post_preview['preview'] = false;*/
-          $_ctx->nb_message_per_page = $core->blog->settings->agora_nb_msg_per_page_per_thread;
+          //$_ctx->nb_message_per_page = $core->blog->settings->agora_nb_msg_per_page_per_thread;
+
+          $post_id = $_ctx->posts->post_id;
+          $post_password = $_ctx->posts->post_password;
+          
+          # Password protected entry
+          if ($post_password != '' && !$_ctx->preview)
+          {
+               # Get passwords cookie
+               if (isset($_COOKIE['dc_passwd'])) {
+                    $pwd_cookie = unserialize($_COOKIE['dc_passwd']);
+               } else {
+                    $pwd_cookie = array();
+               }
+     
+               # Check for match
+               if ((!empty($_POST['password']) && $_POST['password'] == $post_password)
+               || (isset($pwd_cookie[$post_id]) && $pwd_cookie[$post_id] == $post_password))
+               {
+                    $pwd_cookie[$post_id] = $post_password;
+                    setcookie('dc_passwd',serialize($pwd_cookie),0,'/');
+               }
+               else
+               {
+                    self::serveDocument('password-form.html','text/html',false);
+                    return;
+               }
+          }
 
           $_ctx->message_preview = new ArrayObject();
@@ -994 +1032 @@
                          $cur->post_title = $_ctx->posts->post_title;
                          $cur->post_content = $_POST['p_content'];
-                         $cur->post_type =  'threadpost';*/
+                         $cur->post_type =  'thread';*/
                          $cur = $core->con->openCursor($core->prefix.'message');
                          $cur->user_id = $user_id;
                          $cur->message_format = 'wiki';
                          $cur->message_content = $_POST['p_content'];
+                         $offset = dt::getTimeOffset($core->blog->settings->blog_timezone);
+                         $cur->message_dt = date('Y-m-d H:i:s',time() + $offset);
+                         //$cur->message_dt = date('Y-m-d H:i:s');
                          $cur->post_id = $_ctx->posts->post_id;
                          $cur->message_status =  1 ;
@@ -1048 +1089 @@
           return;
      }
+
+     public static function threadpreview($args)
+     {
+          $core = $GLOBALS['core'];
+          $_ctx = $GLOBALS['_ctx'];
+          
+          if (!preg_match('#^(.+?)/([0-9a-z]{40})/(.+?)$#',$args,$m)) {
+               # The specified Preview URL is malformed.
+               self::p404();
+          }
+          else
+          {
+               $user_id = $m[1];
+               $user_key = $m[2];
+               $post_url = $m[3];
+               if (!$core->auth->checkUser($user_id,null,$user_key)) {
+                    # The user has no access to the entry.
+                    self::p404();
+               }
+               else
+               {
+                    $_ctx->preview = true;
+                    self::thread($post_url);
+               }
+          }
+     }
      
      public static function removethread($args)
@@ -1068 +1135 @@
           $params['post_id'] = $args;
           $params['no_content'] = true;
-          $params['post_type'] = 'threadpost';
+          $params['post_type'] = 'thread';
           //$_ctx->posts = $_ctx->agora->getPostsPlus($params);
           $_ctx->posts = $core->blog->getPosts($params);
@@ -1078 +1145 @@
           
           //$redir = $core->blog->url.$core->url->getBase("thread").'/'.$_ctx->posts->post_url;
-          $redir = $core->blog->url.$core->url->getBase("subforum").'/'.$_ctx->posts->cat_url;
+          $redir = $core->blog->url.$core->url->getBase("place").'/'.$_ctx->posts->cat_url;
 
           $redir .= strpos($redir,'?') !== false ? '&' : '?';
@@ -1120 +1187 @@
           
           $params['post_id'] = $args ;
-          $params['post_type'] = 'threadpost';
+          $params['post_type'] = 'thread';
           $_ctx->posts = $core->blog->getPosts($params);
 
@@ -1134 +1201 @@
           $_ctx->thread_preview['preview'] = false;
           $_ctx->thread_preview['cat'] = $_ctx->posts->cat_id;
+          $_ctx->thread_preview['not_empty'] = ( $args == '' ) ? false : true;
 
           $p_content = $_ctx->posts->post_content;
@@ -1166 +1234 @@
                $_ctx->thread_preview['title'] = $_POST['ed_title'];
                $_ctx->thread_preview['cat'] = $_POST['ed_cat'];
+               $_ctx->thread_preview['not_empty'] = true;
                
                if ($preview)
@@ -1388 +1457 @@
 
      public static function feed($args)
-     {
+     { // need review
           global $core, $_ctx;
           
           $type = null;
-          $answers = false;
+          $messages = false;
           $cat_url = false;
-          $thread_id = null;
+          $post_id = null;
           $params = array();
           $subtitle = '';
@@ -1416 +1485 @@
           }
 
-          if (preg_match('#^(atom|rss2)/answers/([0-9]+)$#',$args,$m))
-          {
-               # Thread answers feed
+          if (preg_match('#^(atom|rss2)/messages/([0-9]+)$#',$args,$m))
+          {
+               # Thread messages feed
                $type = $m[1];
-               $answers = true;
-               $thread_id = (integer) $m[2];
-          }
-          elseif (preg_match('#^(?:subforum/(.+)/)?(atom|rss2)?$#',$args,$m))
-          {
-               # All threads feed
+               $messages = true;
+               $post_id = (integer) $m[2];
+          }
+          elseif (preg_match('#^(?:place/(.+)/)?(atom|rss2)(/messages)?$#',$args,$m))
+          {
+               # All posts or comments feed
                $type = $m[2];
+               $messages = !empty($m[3]);
                if (!empty($m[1])) {
                     $cat_url = $m[1];
@@ -1434 +1504 @@
           {
                self::p404();
+               return;
           }
           
@@ -1439 +1510 @@
           {
                $params['cat_url'] = $cat_url;
-               $params['post_type'] = 'threadpost';
-               $params['threads_only'] = true;
-               $_ctx->categories = $_ctx->agora->getCategoriesPlus($params);
-
-               if ($_ctx->categories->isEmpty()) {          die ('coucou 1');        
+               $params['post_type'] = 'thread';
+               //$params['threads_only'] = true;
+               $_ctx->categories = $core->blog->getCategories($params);
+
+               if ($_ctx->categories->isEmpty()) {          //die ('coucou 1');           
                     self::p404();
                }
@@ -1449 +1520 @@
                $subtitle = ' - '.$_ctx->categories->cat_title;
           }
-          elseif ($thread_id)
-          {
-               $params['post_id'] = $thread_id;
-               $params['post_type'] = 'threadpost';
-               $_ctx->posts = $_ctx->agora->getPostsPlus($params);
+          elseif ($post_id)
+          {
+               $params['post_id'] = $post_id;
+               $params['post_type'] = 'thread';
+               //$_ctx->posts = $_ctx->agora->getPostsPlus($params);
+               $_ctx->posts = $core->blog->getPosts($params);
                
                if ($_ctx->posts->isEmpty()) { 
@@ -1463 +1535 @@
           
           $tpl = 'agora-'.$type;
-          if ($answers) {
-               $tpl .= '-answers';
-               $_ctx->nb_comment_per_page = $core->blog->settings->nb_comment_per_feed;
+          if ($messages) {
+               $tpl .= '-messages';
+               //$_ctx->nb_comment_per_page = $core->blog->settings->nb_comment_per_feed;
+               $_ctx->nb_message_per_page = $core->blog->settings->nb_message_per_feed;
           } else {
                $_ctx->nb_entry_per_page = $core->blog->settings->nb_post_per_feed;
@@ -1484 +1557 @@
 }
 
-class tplAgora
+class widgetsAgora
 {
      public static function memberWidget($w)
@@ -1490 +1563 @@
           global $core;
           
-          if ($core->url->type != 'subforum' && $core->url->type != 'thread' 
+          if ($core->url->type != 'place' && $core->url->type != 'thread' 
                && $core->url->type != 'agora' && $core->url->type != 'agora-page') {
                return;
           }
           
-          $user_displayname = ($core->auth->getInfo('user_displayname') == '' )? '   ' : $core->auth->getInfo('user_displayname');
-          
-          $content  = 
+          $user_displayname = ($core->auth->getInfo('user_displayname') == '' )? $core->auth->userID() : $core->auth->getInfo('user_displayname');
+          
+          $content = 
+               '<li><a href="'.$core->blog->url.$core->url->getBase("agora").'">'.__('Home').'</a></li>';
+          $content .=
                ($core->auth->userID() != false && isset($_SESSION['sess_user_id'])) ?
                '<li><a href="'.$core->blog->url.$core->url->getBase("newthread").'">'.__('New thread').'</a></li>'.
-               '<li><strong>'.$core->auth->userID().'</strong>&nbsp;{'.$user_displayname.'}</li>'.
-               '<li><a href="'.$core->blog->url.$core->url->getBase("profile").'/'.$core->auth->userID().'">'.__('My profil').'</a></li>'.
+               '<li><a href="'.$core->blog->url.$core->url->getBase("profile").'/'.$core->auth->userID().'"><strong>'.$user_displayname.'</strong></a></li>'.
                '<li><a href="'.$core->blog->url.$core->url->getBase("logout").'">'.__('Logout').'</a></li>' : 
                '<li><a href="'.$core->blog->url.$core->url->getBase("login").'">'.__('Login').'</a></li>'.
@@ -1545 +1619 @@
           return $res;
      }
+
+     public static function categoriesWidget($w)
+     {
+          global $core;
+
+          if ($core->url->type != 'place' && $core->url->type != 'thread' 
+               && $core->url->type != 'agora' && $core->url->type != 'agora-page') {
+               return;
+          }
+          
+          $rs = $core->blog->getCategories(array('post_type'=>'thread'));
+          if ($rs->isEmpty()) {
+               return;
+          }
+          
+          $res =
+          '<div class="places">'.
+          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '');
+          
+          $ref_level = $level = $rs->level-1;
+          while ($rs->fetch())
+          {
+               $class = '';
+               if (($core->url->type == 'place' && $_ctx->categories instanceof record && $_ctx->categories->cat_id == $rs->cat_id)
+               || ($core->url->type == 'thread' && $_ctx->posts instanceof record && $_ctx->posts->cat_id == $rs->cat_id)) {
+                    $class = ' class="place-current"';
+               }
+               
+               if ($rs->level > $level) {
+                    $res .= str_repeat('<ul><li'.$class.'>',$rs->level - $level);
+               } elseif ($rs->level < $level) {
+                    $res .= str_repeat('</li></ul>',-($rs->level - $level));
+               }
+               
+               if ($rs->level <= $level) {
+                    $res .= '</li><li'.$class.'>';
+               }
+               
+               $res .=
+               '<a href="'.$core->blog->url.$core->url->getBase('place').'/'.
+               $rs->cat_url.'">'.
+               html::escapeHTML($rs->cat_title).'</a>'.
+               ($w->postcount ? ' ('.$rs->nb_post.')' : '');
+               
+               
+               $level = $rs->level;
+          }
+          
+          if ($ref_level - $level < 0) {
+               $res .= str_repeat('</li></ul>',-($ref_level - $level));
+          }
+          $res .= '</div>';
+          
+          return $res;
+     }
+
+     public static function bestofWidget($w)
+     {
+          global $core;
+          
+          if ($w->homeonly && $core->url->type != 'agora') {
+               return;
+          }
+          
+          $params = array(
+               'post_type' => 'thread',
+               'post_selected'=>true,
+               'no_content'=>true,
+               'order'=>'post_dt desc');
+          
+          $rs = $core->blog->getPosts($params);
+          
+          if ($rs->isEmpty()) {
+               return;
+          }
+          
+          $res =
+          '<div class="selected">'.
+          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
+          '<ul>';
+          
+          while ($rs->fetch()) {
+               $res .= ' <li><a href="'.$rs->getURL().'">'.html::escapeHTML($rs->post_title).'</a></li> ';
+          }
+          
+          $res .= '</ul></div>';
+          
+          return $res;
+     }
+
+     public static function lastthreadsWidget($w)
+     {
+          global $core;
+          
+          if ($w->homeonly && $core->url->type != 'agora') {
+               return;
+          }
+          
+          $params['post_type'] = 'thread';
+          $params['limit'] = abs((integer) $w->limit);
+          $params['order'] = 'post_dt desc';
+          $params['no_content'] = true;
+          
+          if ($w->category)
+          {
+               if ($w->category == 'null') {
+                    $params['sql'] = ' AND p.cat_id IS NULL ';
+               } elseif (is_numeric($w->category)) {
+                    $params['cat_id'] = (integer) $w->category;
+               } else {
+                    $params['cat_url'] = $w->category;
+               }
+          }
+          
+          $rs = $core->blog->getPosts($params);
+          
+          if ($rs->isEmpty()) {
+               return;
+          }
+          
+          $res =
+          '<div class="lastthreads">'.
+          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
+          '<ul>';
+          
+          while ($rs->fetch()) {
+               $res .= '<li><a href="'.$rs->getURL().'">'.
+               html::escapeHTML($rs->post_title).'</a></li>';
+          }
+          
+          $res .= '</ul></div>';
+          
+          return $res;
+     }
+
+     public static function lastmessagesWidget($w)
+     {
+          global $core, $_ctx;
+          
+          if ($w->homeonly && $core->url->type != 'agora') {
+               return;
+          }
+          
+          $params['limit'] = abs((integer) $w->limit);
+          //$params['order'] = 'message_dt desc';
+          if ($w->category)
+          {
+               if ($w->category == 'null') {
+                    $params['sql'] = ' AND p.cat_id IS NULL ';
+               } elseif (is_numeric($w->category)) {
+                    $params['cat_id'] = (integer) $w->category;
+               } else {
+                    $params['cat_url'] = $w->category;
+               }
+          }
+          $agora = new agora($core);
+          $rs = $agora->getMessages($params);
+
+          if ($rs->isEmpty()) {
+               return;
+          }
+          
+          $res = '<div class="lastmessages">'.
+          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
+          '<ul>';
+          
+          while ($rs->fetch())
+          {
+               $res .= '<li><a href="'.$rs->getThreadURL().'#m'.$rs->message_id.'">'.
+               html::escapeHTML($rs->post_title).' - '.
+               html::escapeHTML($rs->getAuthorCN()).
+               '</a></li>';
+          }
+          
+          $res .= '</ul></div>';
+          
+          return $res;
+     }
+
+     public static function subscribeWidget($w)
+     {
+          global $core, $_ctx;
+
+          if ($w->homeonly && $core->url->type != 'agora') {
+               return;
+          }
+          
+          $type = ($w->type == 'atom' || $w->type == 'rss2') ? $w->type : 'rss2';
+          $mime = $type == 'rss2' ? 'application/rss+xml' : 'application/atom+xml';
+          
+          $p_title = __('This agora\'s threads %s feed');
+          $c_title = __('This agora\'s messages %s feed');
+          
+          $res =
+          '<div class="syndicate">'.
+          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
+          '<ul>';
+          
+          $res .=
+          '<li><a type="'.$mime.'" '.
+          'href="'.$core->blog->url.$core->url->getBase('agora_feed').'/'.$type.'" '.
+          'title="'.sprintf($p_title,($type == 'atom' ? 'Atom' : 'RSS')).'" class="feed">'.
+          __('Threads feed').'</a></li>'.
+          '<li><a type="'.$mime.'" '.
+          'href="'.$core->blog->url.$core->url->getBase('agora_feed').'/'.$type.'/messages" '.
+          'title="'.sprintf($c_title,($type == 'atom' ? 'Atom' : 'RSS')).'" class="feed">'.
+          __('Messages feed').'</a></li>';
+          
+          $res .= '</ul></div>';
+          
+          return $res;
+     }
 }
 ?>

plugins/agora/_widgets.php

@@ -4 +4 @@
 # This file is part of agora, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+# Copyright (c) 2009-2010 Osku ,Tomtom and contributors
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -11 +12 @@
 # -- END LICENSE BLOCK ------------------------------------
 
-
 if (!defined('DC_RC_PATH')) { return; }
 
 $core->addBehavior('initWidgets',array('agoraWidgets','initWidgetsAgoraMember'));
 $core->addBehavior('initWidgets',array('agoraWidgets','initWidgetsAgoraModerate'));
+$core->addBehavior('initWidgets',array('agoraWidgets','initWidgetsAgoraCategories'));
+$core->addBehavior('initWidgets',array('agoraWidgets','initWidgetsAgoraBestof'));
+$core->addBehavior('initWidgets',array('agoraWidgets','initWidgetsAgoraLastThreads'));
+$core->addBehavior('initWidgets',array('agoraWidgets','initWidgetsAgoraLastMessages'));
+$core->addBehavior('initWidgets',array('agoraWidgets','initWidgetsAgoraSubscribe'));
 
 class agoraWidgets 
@@ -21 +26 @@
      public static function initWidgetsAgoraMember($w)
      {
-          $w->create('memberAgoraWidget',__('Agora member connection'),array('tplAgora','memberWidget'));
-          $w->memberAgoraWidget->setting('title',__('Title:'),__('Agora connection'));
+          $w->create('memberAgoraWidget',__('Agora: navigation'),array('widgetsAgora','memberWidget'));
+          $w->memberAgoraWidget->setting('title',__('Title:'),__('Agora navigation'));
           #$widgets->privateblog->setting('text',__('Text:'),'','textarea');
           #$widgets->privateblog->setting('label',__('Button:'),__('Disconnect'));
@@ -30 +35 @@
      public static function initWidgetsAgoraModerate($w)
      {
-          $w->create('moderateAgoraWidget',__('Agora moderation'),array('tplAgora','moderateWidget'));
+          $w->create('moderateAgoraWidget',__('Agora: moderation'),array('widgetsAgora','moderateWidget'));
           $w->moderateAgoraWidget->setting('title',__('Title:'),__('Agora moderation'));
           #$widgets->privateblog->setting('text',__('Text:'),'','textarea');
@@ -36 +41 @@
           #$widgets->privateblog->setting('homeonly',__('Home page only'),0,'check');
      }
+     public static function initWidgetsAgoraCategories($w)
+     {
+          $w->create('categoriesAgoraWidget',__('Agora: categories list'),array('widgetsAgora','categoriesWidget'));
+          $w->categoriesAgoraWidget->setting('title',__('Title:'),__('Agora\'s sections'));
+          $w->categoriesAgoraWidget->setting('postcount',__('With entries counts'),0,'check');
+          #$widgets->privateblog->setting('text',__('Text:'),'','textarea');
+          #$widgets->privateblog->setting('label',__('Button:'),__('Disconnect'));
+          #$widgets->privateblog->setting('homeonly',__('Home page only'),0,'check');
+     }
+     public static function initWidgetsAgoraBestof($w)
+     {
+          $w->create('bestofAgoraWidget',__('Agora: selected threads'),array('widgetsAgora','bestofWidget'));
+          $w->bestofAgoraWidget->setting('title',__('Title:'),__('Selected threads'));
+          $w->bestofAgoraWidget->setting('homeonly',__('Home page only'),1,'check');
+     }
+     public static function initWidgetsAgoraLastThreads($w)
+     {
+          global $core;
+          $w->create('lastthreadsAgoraWidget',__('Agora: last threads'),array('widgetsAgora','lastthreadsWidget'));;
+          $w->lastthreadsAgoraWidget->setting('title',__('Title:'),__('Last threads'));
+          $rs = $core->blog->getCategories(array('post_type'=>'thread'));
+          $categories = array('' => '', __('Uncategorized') => 'null');
+          while ($rs->fetch()) {
+               $categories[str_repeat('  ',$rs->level-1).'• '.html::escapeHTML($rs->cat_title)] = $rs->cat_id;
+          }
+          $w->lastthreadsAgoraWidget->setting('category',__('Category:'),'','combo',$categories);
+          unset($rs,$categories);
+          $w->lastthreadsAgoraWidget->setting('limit',__('Entries limit:'),10);
+          $w->lastthreadsAgoraWidget->setting('homeonly',__('Home page only'),1,'check');
+     }
+     public static function initWidgetsAgoraLastMessages($w)
+     {
+          global $core;
+          $w->create('lastmessagesAgoraWidget',__('Agora: last messages'),array('widgetsAgora','lastmessagesWidget'));
+          $w->lastmessagesAgoraWidget->setting('title',__('Title:'),__('Last messages'));
+          $rs = $core->blog->getCategories(array('post_type'=>'thread'));
+          $categories = array('' => '', __('Uncategorized') => 'null');
+          while ($rs->fetch()) {
+               $categories[str_repeat('  ',$rs->level-1).'• '.html::escapeHTML($rs->cat_title)] = $rs->cat_id;
+          }
+          $w->lastmessagesAgoraWidget->setting('category',__('Category:'),'','combo',$categories);
+          unset($rs,$categories);
+          $w->lastmessagesAgoraWidget->setting('limit',__('Messages limit:'),10);
+          $w->lastmessagesAgoraWidget->setting('homeonly',__('Home page only'),1,'check');
+     }
+
+     public static function initWidgetsAgoraSubscribe($w)
+     {
+          global $core;
+          $w->create('subscribeAgoraWidget',__('Agora: subscribe links'),array('widgetsAgora','subscribeWidget'));
+          $w->subscribeAgoraWidget->setting('title',__('Title:'),__('Subscribe'));
+          $w->subscribeAgoraWidget->setting('type',__('Feeds type:'),'atom','combo',array('Atom' => 'atom', 'RSS' => 'rss2'));
+          $w->subscribeAgoraWidget->setting('homeonly',__('Home page only'),0,'check');
+     }
 }
 ?>

plugins/agora/default-templates/agora-atom.xml

@@ -18 +18 @@
   <generator uri="http://dotclear.org/">Dotclear</generator>
   
-  <tpl:Entries type="threadpost">
+  <tpl:Entries type="thread">
   
   <entry>
     <title>{{tpl:EntryTitle encode_xml="1"}}</title>
-    <link href="{{tpl:ThreadURL}}" rel="alternate" type="text/html"
+    <link href="{{tpl:EntryURL}}" rel="alternate" type="text/html"
     title="{{tpl:EntryTitle encode_xml="1"}}" />
     <id>{{tpl:EntryFeedID}}</id>

plugins/agora/default-templates/agora-rss2.xml

@@ -17 +17 @@
   <generator>Dotclear</generator>
   
-  <tpl:Entries type="threadpost">
+  <tpl:Entries type="thread">
   
   <item>
     <title>{{tpl:EntryTitle encode_xml="1"}}</title>
-    <link>{{tpl:ThreadURL}}</link>
+    <link>{{tpl:EntryURL}}</link>
     <guid isPermaLink="false">{{tpl:EntryFeedID}}</guid>
     <pubDate>{{tpl:EntryDate rfc822="1"}}</pubDate>

plugins/agora/default-templates/editmessage.html

@@ -9 +9 @@
   <title>{{tpl:lang Edit message}} - {{tpl:lang Agora}} - {{tpl:BlogName encode_html="1"}}</title>
   
-  <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Forum}}" />
+  <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Agora}}" />
   <meta name="copyright" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
   <meta name="author" content="{{tpl:BlogEditor encode_html="1"}}" />
@@ -26 +26 @@
   <link rel="top" href="{{tpl:BlogURL}}" title="{{tpl:lang Home}}" />
   <link rel="contents" href="{{tpl:BlogArchiveURL}}" title="{{tpl:lang Archives}}" />
-  <tpl:Subforums>
-  <link rel="section" href="{{tpl:SubforumURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
-  </tpl:Subforums>
+  <tpl:Categories  post_type="thread">
+  <link rel="section" href="{{tpl:placeURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
+  </tpl:Categories>
   
   <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="{{tpl:BlogFeedURL type="rss2"}}" />

plugins/agora/default-templates/editpost.html

@@ -9 +9 @@
   <title>{{tpl:lang Edit thread}} - {{tpl:lang Agora}} - {{tpl:BlogName encode_html="1"}}</title>
   
-  <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Forum}}" />
+  <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Agora}}" />
   <meta name="copyright" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
   <meta name="author" content="{{tpl:BlogEditor encode_html="1"}}" />
@@ -26 +26 @@
   <link rel="top" href="{{tpl:BlogURL}}" title="{{tpl:lang Home}}" />
   <link rel="contents" href="{{tpl:BlogArchiveURL}}" title="{{tpl:lang Archives}}" />
-  <tpl:Subforums>
-  <link rel="section" href="{{tpl:SubforumURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
-  </tpl:Subforums>
+  <tpl:Categories>
+  <link rel="section" href="{{tpl:SubAgoraURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
+  </tpl:Categories>
   
   <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="{{tpl:BlogFeedURL type="rss2"}}" />
   <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{{tpl:BlogFeedURL type="atom"}}" />
   <link rel="EditURI" type="application/rsd+xml" title="RSD" href="{{tpl:BlogRSDURL}}" />
-  <link rel="meta" type="application/xbel+xml" title="Blogroll" href="{{tpl:BlogrollXbelLink}}" />
   
   {{tpl:include src="_head.html"}}
@@ -50 +49 @@
   <div id="content-info">
 
-    <h2><a href="{{tpl:forumURL}}">{{tpl:lang Agora}}</a> &rsaquo;  <tpl:Subforums><tpl:ThreadComboSelected> {{tpl:CategoryTitle encode_html="1"}} </tpl:ThreadComboSelected></tpl:Subforums>
+    <h2><a href="{{tpl:AgoraURL}}">{{tpl:lang Agora}}</a> &rsaquo;  <tpl:Categories><tpl:ThreadComboSelected> {{tpl:CategoryTitle encode_html="1"}} </tpl:ThreadComboSelected></tpl:Categories>
      &rsaquo;  <a href="{{tpl:ThreadURL}}">{{tpl:EntryTitle}}</a>
     </h2>
@@ -82 +81 @@
 </p>
 
-                         <tpl:Subforums>
+                         <tpl:Categories>
                               <tpl:CategoriesHeader>
                                       <p class="field">
                                    <label for="ed_cat">{{tpl:lang Category}}&nbsp;:</label>
                                    <select name="ed_cat" id="ed_cat">
+                              <option value="">
+                                   &nbsp;
+                              </option>
                               </tpl:CategoriesHeader>
-                              <option value="{{tpl:SubforumID}}" <tpl:ThreadComboSelected> selected=selected  </tpl:ThreadComboSelected>>
-                                   {{tpl:SubforumSpacer}}
+                              <option value="{{tpl:placeID}}" <tpl:placeComboSelected> selected=selected  </tpl:placeComboSelected>>
+                                   {{tpl:placeSpacer}}
                                    &bull; {{tpl:CategoryTitle encode_html="1"}}
                               </option>
@@ -96 +98 @@
                                    </p>
                               </tpl:CategoriesFooter>
-                         </tpl:Subforums>
+                         </tpl:Categories>
 
   

plugins/agora/default-templates/login.html

@@ -26 +26 @@
   <link rel="top" href="{{tpl:BlogURL}}" title="{{tpl:lang Home}}" />
   <link rel="contents" href="{{tpl:BlogArchiveURL}}" title="{{tpl:lang Archives}}" />
-  <tpl:Subforums>
-  <link rel="section" href="{{tpl:SubforumURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
-  </tpl:Subforums>
   
   {{tpl:include src="_head.html"}}
@@ -45 +42 @@
   <div id="content-info">
 
-  <h2><a href="{{tpl:forumURL}}">{{tpl:lang Agora}}</a> &rsaquo; {{tpl:lang Login}}</h2>
+  <h2><a href="{{tpl:agoraURL}}">{{tpl:lang Agora}}</a> &rsaquo; {{tpl:lang Login}}</h2>
     
   </div>
@@ -62 +59 @@
 {{tpl:SysBehavior behavior="publicLoginFormBefore"}}
 
-<p class="field"><label for="li_login">{{tpl:lang login}}&nbsp;:</label>
+<p class="field"><label for="li_login">{{tpl:lang Username}}&nbsp;:</label>
      <input name="li_login" id="li_login" type="text" size="30" maxlength="255"
      value="" />

plugins/agora/default-templates/newthread.html

@@ -9 +9 @@
   <title>{{tpl:lang New thread}} - {{tpl:lang Agora}} - {{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf></title>
   
-  <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Forum}}" />
+  <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Agora}}" />
   <meta name="copyright" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
   <meta name="author" content="{{tpl:BlogEditor encode_html="1"}}" />
@@ -15 +15 @@
 
   <link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />
-  <meta name="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Forum}} - {{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" />
+  <meta name="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Agora}} - {{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" />
   <meta name="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription remove_html="1"}}" />
   <meta name="dc.language" content="{{tpl:BlogLanguage}}" />
@@ -26 +26 @@
   <link rel="top" href="{{tpl:BlogURL}}" title="{{tpl:lang Home}}" />
   <link rel="contents" href="{{tpl:BlogArchiveURL}}" title="{{tpl:lang Archives}}" />
-  <tpl:Categories post_type="threadpost">
-  <link rel="section" href="{{tpl:SubforumURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
+  <tpl:Categories  post_type="thread">
+  <link rel="section" href="{{tpl:placeURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
   </tpl:Categories>
   
@@ -33 +33 @@
   <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{{tpl:BlogFeedURL type="atom"}}" />
   <link rel="EditURI" type="application/rsd+xml" title="RSD" href="{{tpl:BlogRSDURL}}" />
-  <link rel="meta" type="application/xbel+xml" title="Blogroll" href="{{tpl:BlogrollXbelLink}}" />
   
   {{tpl:include src="_head.html"}}
@@ -50 +49 @@
   <div id="content-info">
 
-   <h2><a href="{{tpl:forumURL}}">{{tpl:lang Agora}}</a> &rsaquo;<tpl:IfThreadPreview><tpl:Subforums><tpl:SubforumComboSelected> {{tpl:CategoryTitle encode_html="1"}} </tpl:SubforumComboSelected></tpl:Subforums></tpl:IfThreadPreview></h2>
+   <h2><a href="{{tpl:agoraURL}}">{{tpl:lang Agora}}</a> &rsaquo;<tpl:IfThreadPreview><tpl:Categories><tpl:placeComboSelected> {{tpl:CategoryTitle encode_html="1"}} </tpl:placeComboSelected></tpl:Categories></tpl:IfThreadPreview></h2>
     
   </div>
@@ -62 +61 @@
       <tpl:IfThreadPreview>
         <div id="pr">
-          <h3>{{tpl:lang New thread}}</h3>
-     <h2 class="thread-preview">{{tpl:ThreadPreviewTitle}}</h2>
+          <h3>{{tpl:lang Your new thread}}</h3>
+     <h2 class="post-title">{{tpl:ThreadPreviewTitle}}</h2>
             <div class="thread-preview">{{tpl:ThreadPreviewContent}}</div>
           <p class="buttons"><input type="submit" class="submit" value="{{tpl:lang send}}" /></p>
@@ -74 +73 @@
         {{tpl:SysBehavior behavior="publicThreadFormBeforeContent"}}
         
-        <p class="field"><label for="t_title">{{tpl:lang Subject}}&nbsp;:</label>
+        <p class="field"><label class="required" for="t_title">{{tpl:lang Subject}}&nbsp;:</label>
         <input name="t_title" id="t_title" type="text" size="30" maxlength="255"
         value="{{tpl:ThreadPreviewTitle encode_html="1"}}" />
         </p>
 
-                         <tpl:Categories>
-                              <tpl:CategoriesHeader>
-                                      <p class="field">
-                                   <label for="t_cat">{{tpl:lang Category}}&nbsp;:</label>
-                                   <select name="t_cat" id="t_cat">
-                              </tpl:CategoriesHeader>
-                              <option value="{{tpl:SubforumID}}" <tpl:SubforumComboSelected> selected=selected  </tpl:SubforumComboSelected>>
-                                   {{tpl:SubforumSpacer}}
-                                   &bull; {{tpl:CategoryTitle encode_html="1"}}
-                              </option>
-                              <tpl:CategoriesFooter>
-                                   </select>
-                                   </p>
-                              </tpl:CategoriesFooter>
-                         </tpl:Categories>
+     <tpl:Categories>
+          <tpl:CategoriesHeader>
+               <p class="field">
+               <label for="t_cat">{{tpl:lang Category}}&nbsp;:</label>
+               <select name="t_cat" id="t_cat">
+          <option value="">
+               &nbsp;
+          </option>
+          </tpl:CategoriesHeader>
+          <option value="{{tpl:placeID}}" <tpl:placeComboSelected> selected=selected  </tpl:placeComboSelected>>
+               {{tpl:placeSpacer}}
+               &bull; {{tpl:CategoryTitle encode_html="1"}}
+          </option>
+          <tpl:CategoriesFooter>
+               </select>
+               </p>
+          </tpl:CategoriesFooter>
+     </tpl:Categories>
 
-        <p class="field"><label for="t_content">{{tpl:lang Message}}&nbsp;:</label>
+        <p class="field"><label class="required" for="t_content">{{tpl:lang Message}}&nbsp;:</label>
         <textarea name="t_content" id="t_content" cols="35"
         rows="7">{{tpl:ThreadPreviewContent raw="1" encode_html="1"}}</textarea>

plugins/agora/default-templates/profile.html

@@ -24 +24 @@
   <meta name="dc.format" content="text/html" />
   
-  <link rel="top" href="{{tpl:BlogURL}}" title="{{tpl:lang Home}}" />
-  <link rel="contents" href="{{tpl:BlogArchiveURL}}" title="{{tpl:lang Archives}}" />
-  <tpl:Subforums>
-  <link rel="section" href="{{tpl:SubforumURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
-  </tpl:Subforums>
-  
+  <link rel="top" href="{{tpl:agoraURL}}" title="{{tpl:lang Home}}" />
+
   {{tpl:include src="_head.html"}}
 
@@ -45 +41 @@
   <div id="content-info">
 
-  <h2><a href="{{tpl:forumURL}}">{{tpl:lang Agora}}</a> &rsaquo; {{tpl:lang profile}} &rsaquo; {{tpl:ProfileUserID}}</h2>
+  <h2><a href="{{tpl:agoraURL}}">{{tpl:lang Agora}}</a> &rsaquo; {{tpl:lang profile}} &rsaquo; {{tpl:ProfileUserID}}</h2>
     
   </div>
@@ -65 +61 @@
 
 </dl>
+
+<tpl:Entries type="thread" no_content="1" lastn="10">
+     <tpl:EntriesHeader>
+          <h2>{{tpl:lang Last threads}}</h2>
+          <ul>
+     </tpl:EntriesHeader>
+
+     <li id="p{{tpl:EntryID}}" class="thread {{tpl:EntryIfSelected}} {{tpl:EntryIfClosed}}">
+     <a href="{{tpl:EntryURL}}">{{tpl:EntryTitle encode_html="1"}}</a>
+     <em>{{tpl:lang on}} {{tpl:EntryCreaDate}}
+     <tpl:EntryIf has_category="1">(<a href="{{tpl:ThreadCategoryURL}}">{{tpl:EntryCategory}}</a>)</tpl:EntryIf>
+     </em></li>
+
+     <tpl:EntriesFooter>
+          </ul>
+     </tpl:EntriesFooter>
+</tpl:Entries>
+
+<tpl:Messages no_content="1" lastn="10" order="desc" sortby="post_id">
+     <tpl:MessagesHeader>
+          <h2>{{tpl:lang Last messages}}</h2>
+          <ul>
+     </tpl:MessagesHeader>
+
+     <li id="p{{tpl:MessageID}}" class="message">
+     <a href="{{tpl:MessageThreadURL}}#m{{tpl:MessageID}}">{{tpl:MessageEntryTitle}}</a>
+     <em>{{tpl:lang on}} {{tpl:MessageDate}}, {{tpl:MessageTime}}
+     </em></li>
+
+     <tpl:MessagesFooter>
+          </ul>
+     </tpl:MessagesFooter>
+</tpl:Messages>
 
   </div>

plugins/agora/default-templates/profile_me.html

@@ -24 +24 @@
   <meta name="dc.format" content="text/html" />
   
-  <link rel="top" href="{{tpl:BlogURL}}" title="{{tpl:lang Home}}" />
-  <link rel="contents" href="{{tpl:BlogArchiveURL}}" title="{{tpl:lang Archives}}" />
-  <tpl:Subforums>
-  <link rel="section" href="{{tpl:SubforumURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
-  </tpl:Subforums>
+  <link rel="top" href="{{tpl:agoraURL}}" title="{{tpl:lang Home}}" />
   
   {{tpl:include src="_head.html"}}
@@ -45 +41 @@
   <div id="content-info">
 
-  <h2><a href="{{tpl:forumURL}}">{{tpl:lang Agora}}</a> &rsaquo; {{tpl:lang Profile}} &rsaquo; {{tpl:ProfileUserID}}</h2>
+  <h2><a href="{{tpl:agoraURL}}">{{tpl:lang Agora}}</a> &rsaquo; {{tpl:lang Profile}} &rsaquo; {{tpl:ProfileUserID}}</h2>
     
   </div>
@@ -106 +102 @@
 </form>
 
-  </div>
+<tpl:Entries type="thread" no_content="1" lastn="10">
+     <tpl:EntriesHeader>
+          <h2>{{tpl:lang Last threads}}</h2>
+          <ul>
+     </tpl:EntriesHeader>
+
+     <li id="p{{tpl:EntryID}}" class="thread {{tpl:EntryIfSelected}} {{tpl:EntryIfClosed}}">
+     <a href="{{tpl:EntryURL}}">{{tpl:EntryTitle encode_html="1"}}</a>
+     <em>{{tpl:lang on}} {{tpl:EntryCreaDate}}
+     <tpl:EntryIf has_category="1">(<a href="{{tpl:ThreadCategoryURL}}">{{tpl:EntryCategory}}</a>)</tpl:EntryIf>
+     </em></li>
+
+     <tpl:EntriesFooter>
+          </ul>
+     </tpl:EntriesFooter>
+</tpl:Entries>
+
+<tpl:Messages no_content="1" lastn="10" order="desc" sortby="post_id">
+     <tpl:MessagesHeader>
+          <h2>{{tpl:lang Last messages}}</h2>
+          <ul>
+     </tpl:MessagesHeader>
+
+     <li id="p{{tpl:MessageID}}" class="message">
+     <a href="{{tpl:MessageThreadURL}}#m{{tpl:MessageID}}">{{tpl:MessageEntryTitle}}</a>
+     <em>{{tpl:lang on}} {{tpl:MessageDate}}, {{tpl:MessageTime}}
+     </em></li>
+
+     <tpl:MessagesFooter>
+          </ul>
+     </tpl:MessagesFooter>
+</tpl:Messages>
+
+</div>
 
 </div> <!-- End #main -->

plugins/agora/default-templates/register.html

@@ -15 +15 @@
 
   <link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />
-  <meta name="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Agora}} - {{tpl:BlogName encode_html="1"}}
+  <meta name="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Agora}} - {{tpl:BlogName encode_html="1"}}" />
   <meta name="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription remove_html="1"}}" />
   <meta name="dc.language" content="{{tpl:BlogLanguage}}" />
@@ -25 +25 @@
   
   <link rel="top" href="{{tpl:BlogURL}}" title="{{tpl:lang Home}}" />
-  <link rel="contents" href="{{tpl:BlogArchiveURL}}" title="{{tpl:lang Archives}}" />
-  <tpl:Subforums>
-  <link rel="section" href="{{tpl:SubforumURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
-  </tpl:Subforums>
+
   
   {{tpl:include src="_head.html"}}
@@ -45 +42 @@
   <div id="content-info">
 
-  <h2><a href="{{tpl:forumURL}}">{{tpl:lang Agora}}</a> &rsaquo; {{tpl:lang Register}}</h2>
+  <h2><a href="{{tpl:agoraURL}}">{{tpl:lang Agora}}</a> &rsaquo; {{tpl:lang Register}}</h2>
     
   </div>
@@ -69 +66 @@
 {{tpl:SysBehavior behavior="publicRegisterFormBefore"}}
 
-<p class="field"><label for="ru_login">{{tpl:lang login}}&nbsp;:</label>
+<p class="field"><label for="ru_login">{{tpl:lang Username}}&nbsp;:</label>
      <input name="ru_login" id="ru_login" type="text" size="30" maxlength="255"
      value="{{tpl:RegisterPreviewLogin encode_html="1"}}" />
@@ -81 +78 @@
  <p style="display:none"><input name="email2" type="text" size="30"
 maxlength="255" value="" /></p>
+
+<p class="form-help">{{tpl:lang Username must contain at least 2 characters using letters, numbers or symbols.}}</p>
 
 <!-- # --BEHAVIOR-- publicRegisterFormAfter -->

plugins/agora/default-templates/thread.html

@@ -9 +9 @@
   <title>{{tpl:EntryTitle encode_html="1"}} - {{tpl:lang Agora}} - {{tpl:BlogName encode_html="1"}}</title>
   
-  <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Forum}}" />
+  <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Agora}}" />
   <meta name="copyright" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
   <meta name="author" content="{{tpl:BlogEditor encode_html="1"}}" />
@@ -15 +15 @@
 
   <link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />
-  <meta name="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Forum}} - {{tpl:BlogName encode_html="1"}}" />
+  <meta name="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang Agora}} - {{tpl:BlogName encode_html="1"}}" />
   <meta name="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription remove_html="1"}}" />
   <meta name="dc.language" content="{{tpl:BlogLanguage}}" />
@@ -26 +26 @@
   <link rel="top" href="{{tpl:BlogURL}}" title="{{tpl:lang Home}}" />
   <link rel="contents" href="{{tpl:BlogArchiveURL}}" title="{{tpl:lang Archives}}" />
-  <tpl:Subforums>
-  <link rel="section" href="{{tpl:SubforumURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
-  </tpl:Subforums>
+  <tpl:Categories  post_type="thread">
+  <link rel="section" href="{{tpl:placeURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
+  </tpl:Categories>
   
 
   <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{{tpl:AgoraFeedURL type="atom"}}" />
   <link rel="EditURI" type="application/rsd+xml" title="RSD" href="{{tpl:BlogRSDURL}}" />
-  <link rel="meta" type="application/xbel+xml" title="Blogroll" href="{{tpl:BlogrollXbelLink}}" />
   
   {{tpl:include src="_head.html"}}
@@ -50 +49 @@
   <div id="content-info">
  
-    <h2><a href="{{tpl:forumURL}}">{{tpl:lang Agora}}</a> &rsaquo;  <a href="{{tpl:ThreadCategoryURL}}">{{tpl:EntryCategory}}</a>
+    <h2><a href="{{tpl:agoraURL}}">{{tpl:lang Agora}}</a><tpl:EntryIf has_category="1"> &rsaquo; <a href="{{tpl:ThreadCategoryURL}}">{{tpl:EntryCategory}}</a></tpl:EntryIf>
+
     </h2>
     
   </div>
 
-<div id="p" class="post {{tpl:EntryIfSelected}} {{tpl:EntryIfClosed}}">
+<div id="p{{tpl:EntryID}}" class="post {{tpl:EntryIfSelected}} {{tpl:EntryIfClosed}}">
     
     <h2 class="post-title">{{tpl:EntryTitle encode_html="1"}}</h2>
     <!--p class="post-info">{{tpl:CategoryDescription}} </p-->
-      <p class="post-info">
- {{tpl:lang by}} <a href="{{tpl:ThreadProfileUserID}}">{{tpl:EntryAuthorID}}</a> {{tpl:lang on}} {{tpl:EntryCreaDate}}
-     - <a href="{{tpl:ThreadURL}}">{{tpl:lang Permalink}}</a> 
+<p class="post-info">
+ {{tpl:lang by}} <a href="{{tpl:ThreadProfileUserID}}">{{tpl:EntryAuthorCommonName}}</a> {{tpl:lang on}} {{tpl:EntryCreaDate}}
+     - <a href="{{tpl:EntryURL}}">{{tpl:lang Permalink}}</a> 
 <tpl:userIsModo>
 - <a href="{{tpl:ModerationEditThread}}">{{tpl:lang edit}}</a>
@@ -76 +76 @@
     
     </div>
+
+  <!-- # Attachments -->
+  <tpl:Attachments>
+    <tpl:AttachmentsHeader>
+      <div id="attachments">
+      <h3>{{tpl:lang Attachments}}</h3>
+      <ul>
+    </tpl:AttachmentsHeader>
+      <li class="{{tpl:AttachmentType}}">
+        <tpl:AttachmentIf is_mp3="1">
+          {{tpl:include src="_mp3_player.html"/}} - 
+        </tpl:AttachmentIf>
+        <tpl:AttachmentIf is_flv="1">
+          {{tpl:include src="_flv_player.html"/}}
+        </tpl:AttachmentIf>
+        <tpl:AttachmentIf is_flv="0">
+          <a href="{{tpl:AttachmentURL}}"
+          title="{{tpl:AttachmentFileName}} ({{tpl:AttachmentSize}})">{{tpl:AttachmentTitle}}</a>
+        </tpl:AttachmentIf>
+      </li>
+    <tpl:AttachmentsFooter>
+      </ul>
+      </div>
+    </tpl:AttachmentsFooter>
+  </tpl:Attachments>
+ 
+
+  <tpl:EntryIf show_comments="1">
       <div id="comments">
-            <tpl:EntryTags type="nb_messages">
-    <h3>{{tpl:TagID}}&nbsp;{{tpl:lang message(s)}}</h3>
-    </tpl:EntryTags>
+    <h3>{{tpl:EntryMessageCount}}</h3>
 
 <tpl:Messages>
@@ -87 +113 @@
     </tpl:MessagesHeader>
 
-      <dt id="c{{tpl:MessageID}}" class="{{tpl:MessageIfOdd}} {{tpl:MessageIfFirst}}"><a
-      href="#c{{tpl:MessageID}}" class="comment-number">{{tpl:MessageOrderNumber}}.</a>
+      <dt id="m{{tpl:MessageID}}" class="{{tpl:MessageIfOdd}} {{tpl:MessageIfFirst}}"><a
+      href="#m{{tpl:MessageID}}" class="comment-number">{{tpl:MessageOrderNumber}}.</a>
       {{tpl:lang On}} {{tpl:MessageDate}}, {{tpl:MessageTime}}
-      {{tpl:lang by}} <a href="{{tpl:MessageProfileUserID}}">{{tpl:MessageAuthor}}</a>
+      {{tpl:lang by}} <a href="{{tpl:MessageProfileUserID}}">{{tpl:MessageAuthorCommonName}}</a>
       <tpl:userIsModo>
       - <a href="{{tpl:ModerationEditMessage}}"> {{tpl:lang edit}}</a>
@@ -113 +139 @@
         <tpl:MessagesFooter>
       </dl>
-      <tpl:agoPagination>
-        <p class="pagination"><tpl:agoPaginationIf start="0"><a href="{{tpl:agoPaginationURL offset="-1"}}" class="prev">&#171;
-        {{tpl:lang previous messages}}</a> - </tpl:agoPaginationIf>
-        {{tpl:lang page}} {{tpl:agoPaginationCurrent}} {{tpl:lang of}} {{tpl:agoPaginationCounter}}
-        <tpl:agoPaginationIf end="0"> - <a href="{{tpl:agoPaginationURL offset="+1"}}" class="next">{{tpl:lang next messages}}
-        &#187;</a></tpl:agoPaginationIf></p>
-      </tpl:agoPagination>
+
     </tpl:MessagesFooter>
 
   </tpl:Messages>
-  
+      </div>     <!--#comments -->
+
+  </tpl:EntryIf>
+
       <tpl:SysIfThreadUpdated>
       <p class="message" id="pr">{{tpl:lang Status of thread has been modified.}}</p>
     </tpl:SysIfThreadUpdated>
   
-<tpl:EntryIf comments_active="0">
- <h3>{{tpl:lang Thread closed}}</h3>
-</tpl:EntryIf>
-      </div>
 
 <tpl:EntryIf comments_active="1">
@@ -137 +156 @@
 <tpl:authForm>
     <!-- # Thread form -->
-    <form action="{{tpl:ThreadURL}}#pr" method="post" id="comment-form">
+    <form action="{{tpl:EntryURL}}#pr" method="post" id="comment-form">
 
 <tpl:SysIfFormError>
@@ -153 +172 @@
       </tpl:IfMessagePreview>
       
-      <h3>{{tpl:lang Add an answer}}</h3>
+      <h3>{{tpl:lang Add a message}}</h3>
       <fieldset>
         <!-- # --BEHAVIOR-- publicAnswerFormBeforeContent -->
@@ -175 +194 @@
     </form>
 </tpl:authForm>
-</tpl:EntryIf>
-
-  <tpl:EntryIf comments_active="1">
-  <p id="comments-feed"><a class="feed" href="{{tpl:AgoraFeedURL type="atom"}}/answers/{{tpl:EntryID}}"
-  title="{{tpl:lang This thread's answers Atom feed}}">{{tpl:lang This thread's answers feed}}</a></p>
+
+  <p id="comments-feed"><a class="feed" href="{{tpl:AgoraFeedURL type="atom"}}/messages/{{tpl:EntryID}}"
+  title="{{tpl:lang This thread's messages Atom feed}}">{{tpl:lang This thread's messages feed}}</a></p>
+
   </tpl:EntryIf>
-   
+  <tpl:EntryIf comments_active="0">{{tpl:lang Thread closed}}</tpl:EntryIf>
   </div>
 
@@ -194 +212 @@
     {{tpl:Widgets type="extra"}}
   </div> <!-- End #blogextra -->
-</div>
+</div> <!-- End #sidebar -->
 
 </div> <!-- End #wrapper -->

plugins/agora/inc/class.agora.auth.php

@@ -4 +4 @@
 # This file is part of agora, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+# Copyright (c) 2009-2010 Osku ,Tomtom and contributors
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 #
 # -- END LICENSE BLOCK ------------------------------------
-
 class dcPublicAuth extends dcAuth
 {

plugins/agora/inc/class.agora.behaviors.php

@@ -4 +4 @@
 # This file is part of agora, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+# Copyright (c) 2009-2010 Osku ,Tomtom and contributors
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html

plugins/agora/inc/class.agora.log.php

@@ -4 +4 @@
 # This file is part of agora, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+# Copyright (c) 2009-2010 Osku ,Tomtom and contributors
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -46 +47 @@
           
           if (!$count_only) {
-               $strReq .= 'GROUP BY user_id ';
+               //$strReq .= 'GROUP BY user_id ';
                
                if (!empty($params['order']) && !$count_only) {

plugins/agora/inc/class.agora.php

@@ -4 +4 @@
 # This file is part of agora, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+# Copyright (c) 2009-2010 Osku ,Tomtom and contributors
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -16 +17 @@
      private $message_status = array();
      
-     public function __construct($core)
+     public function __construct($core,$public=true)
      {
           $this->con =& $core->con;
@@ -31 +32 @@
           $this->message_status['1'] = __('published');
           
-          $this->core->auth = new dcPublicAuth($core);
+          if ($public)
+          {
+               $this->core->auth = new dcPublicAuth($core);
+          }
           $this->core->log = new dcLog($core);
      }
@@ -80 +84 @@
                $strReq .= 'GROUP BY U.user_id,user_super,user_status,user_pwd,user_name,'.
                'user_firstname,user_displayname,user_email,user_url,'.
-               'user_desc, user_lang,user_tz,user_post_status,user_options ';
+               'user_desc, user_lang,user_tz,user_post_status,user_options,'.
+               'user_creadt, user_upddt ';
                
                if (!empty($params['order']) && !$count_only) {
@@ -197 +202 @@
           $link = $this->core->blog->url.$this->core->url->getBase('register');
           $link .= strpos($link,'?') !== false ? '&' : '?';
-          $url_forum = $this->core->url->getBase('forum');
-          $url_login = $this->core->url->getBase('login');
+          $url_forum = $this->core->blog->url.$this->core->url->getBase('agora');
+          $url_login = $this->core->blog->url.$this->core->url->getBase('login');
           $sub = __('Account confirmation request on Agora');
           $msg = 
@@ -206 +211 @@
           $link.'key='.$key.
           "\n\n".
-          __('Your indormations:').
+          __('Your indormations:')."\n".
           sprintf(__('Login: %s'),$user_id)."\n".
-          sprintf(__('Password: %s'),$pwd)."\n".
-          __('Agora connection:').
-          $url_login.
+          sprintf(__('Password: %s'),$pwd)."\n\n".
+          sprintf(__('Agora connection: %s'),$url_login)."\n".
           "\n\n".
           __('If you have received this mail in error, you do not need to take any action to cancel the account.').
@@ -334 +338 @@
           */
           //$cur->nb_comment = (integer) $rs->f(0);
-          $cur->post_dt = date('Y-m-d H:i:s');
-          
+          //$cur->post_upddt = date('Y-m-d H:i:s');
+          /*$cur->post_tz = $this->core->auth->getInfo('user_tz');
+          $offset = dt::getTimeOffset($cur->post_tz);
+          $now = time() + $offset;
+          $cur->post_dt = date('Y-m-d H:i:00',$now);*/
+          $offset = dt::getTimeOffset($this->core->blog->settings->system->blog_timezone);
+          $cur->post_dt = date('Y-m-d H:i:s',time() + $offset);
           $cur->update('WHERE post_id = '.(integer) $id);
-     }
-
-     public function getThreadURL($rs)
-     {
-          $thread_id = $rs->thread_id;
-          
-          $strReq = 'SELECT post_url '.
-                    'FROM '.$this->prefix.'post '.
-                    'WHERE post_id = '.(integer) $thread_id.' ';
-          
-          $rs = $this->con->select($strReq);
-          
-          if ($rs->isEmpty()) {
-               return;
-          }
-          
-          return $rs->post_url;
-     }
-
-     /**
-     Retrieves categories. <var>$params</var> is an associative array which can
-     take the following parameters:
-     
-     - post_type: Get only entries with given type (default "post")
-     - cat_url: filter on cat_url field
-     - cat_id: filter on cat_id field
-     - start: start with a given category
-     - level: categories level to retrieve
-     - with_empty: filter empty categories
-     
-     @param    params    <b>array</b>        Parameters
-     @return   <b>record</b>
-     */
-     public function getCategoriesPlus($params=array())
-     {
-          // From /inc/core/class.dc.blog.php getCategories
-          //Just authorize Empty Categories
-          $c_params = array();
-          if (isset($params['post_type'])) {
-               $c_params['post_type'] = $params['post_type'];
-               unset($params['post_type']);
-          }
-          $counter = $this->getCategoriesCounter($c_params);
-          $counter2 = $this->getCategoriesCounter($c_params,true);
-          
-          //$without_empty = isset($params['without_empty']) ? (bool) $params['without_empty'] : ($this->core->auth->userID() == false);
-          //$with_empty = isset($params['with_empty']) ? (bool) $params['with_empty'] : ($this->core->auth->userID() == false);
-          //if (isset($params['with_empty'])) //&& ($params['with_empty']))) 
-          //{ 
-          //   $with_empty = true; 
-          //} else { 
-          //   $with_empty = $this->core->auth->userID() != false; # For public display   $this->core->auth->userID() !=
-          //} 
-          
-          $start = isset($params['start']) ? (integer) $params['start'] : 0;
-          $l = isset($params['level']) ? (integer) $params['level'] : 0;
-          
-          $rs = $this->core->blog->categories()->getChildren($start,null,'desc');
-          
-          # Get each categories total posts count
-          $data = array();
-          $stack = array();
-          $stack2 = array();
-          $level = 0;
-          $cols = $rs->columns();
-          while ($rs->fetch())
-          {
-               $nb_post = isset($counter[$rs->cat_id]) ? (integer) $counter[$rs->cat_id] : 0;
-               $nb_answer = isset($counter2[$rs->cat_id]) ? (integer) $counter2[$rs->cat_id] : 0;
-               
-               if ($rs->level > $level) {
-                    $nb_total = $nb_post;
-                    $stack[$rs->level] = (integer) $nb_post;
-                    $nb_total2 = $nb_answer;
-                    $stack2[$rs->level] = (integer) $nb_answer;
-               } elseif ($rs->level == $level) {
-                    $nb_total = $nb_post;
-                    $stack[$rs->level] += $nb_post;
-                    $nb_total2 = $nb_answer;
-                    $stack2[$rs->level] += $nb_answer;
-               } else {
-                    $nb_total = $stack[$rs->level+1] + $nb_post;
-                    $nb_total2 = $stack2[$rs->level+1] + $nb_answer;
-                    if (isset($stack[$rs->level])) {
-                         $stack[$rs->level] += $nb_total;
-                         $stack2[$rs->level] += $nb_answer;
-                    } else {
-                         $stack[$rs->level] = $nb_total;
-                         $stack2[$rs->level] = $nb_total2;
-                    }
-                    unset($stack[$rs->level+1]);
-                    unset($stack2[$rs->level+1]);
-               }
-               
-               //if (($nb_total == 0) && true) {
-               //   continue;
-               //}
-               
-               $level = $rs->level;
-               
-               $t = array();
-               foreach ($cols as $c) {
-                    $t[$c] = $rs->f($c);
-               }
-               $t['nb_post'] = $nb_post;
-               $t['nb_total'] = $nb_total;
-               $t['nb_answer'] = $nb_answer;
-               $t['nb_total2'] = $nb_total2;
-               
-               if ($l == 0 || ($l > 0 && $l == $rs->level)) {
-                    array_unshift($data,$t);
-               }
-          }
-          
-          # We need to apply filter after counting
-          if (!empty($params['cat_id']))
-          {
-               $found = false;
-               foreach ($data as $v) {
-                    if ($v['cat_id'] == $params['cat_id']) {
-                         $found = true;
-                         $data = array($v);
-                         break;
-                    }
-               }
-               if (!$found) {
-                    $data = array();
-               }
-          }
-          
-          if (!empty($params['cat_url']) && empty($params['cat_id']))
-          {
-               $found = false;
-               foreach ($data as $v) {
-                    if ($v['cat_url'] == $params['cat_url']) {
-                         $found = true;
-                         $data = array($v);
-                         break;
-                    }
-               }
-               if (!$found) {
-                    $data = array();
-               }
-          }
-          
-          return staticRecord::newFromArray($data);
-     }
-
-     private function getCategoriesCounter($params=array(),$bis=false)
-     {
-          $strReq =
-          'SELECT  C.cat_id, COUNT(P.post_id) AS nb_post, SUM(P.nb_comment) AS nb_answer '.
-          'FROM '.$this->prefix.'category AS C '.
-          'JOIN '.$this->prefix."post P ON (C.cat_id = P.cat_id AND P.blog_id = '".$this->con->escape($this->core->blog->id)."' ) ".
-          "WHERE C.blog_id = '".$this->con->escape($this->core->blog->id)."' ";
-          
-          if (!$this->core->auth->userID()) {
-               $strReq .= 'AND P.post_status = 1 ';
-          }
-          
-          if (!empty($params['post_type'])) {
-               $strReq .= "AND post_type = '".$this->con->escape($params['post_type'])."' ";
-          }
-          else {
-               $strReq .= "AND post_type = 'threadpost' ";
-          }
-          
-          //$strReq .= 'AND P.thread_id is NULL ';
-          
-          $strReq .= 'GROUP BY C.cat_id ';
-          
-          $rs = $this->con->select($strReq);
-          $counters = array();
-          $counters2 = array();
-          while ($rs->fetch()) {
-               $counters[$rs->cat_id] = $rs->nb_post;
-               $counters2[$rs->cat_id] = $rs->nb_answer;
-          }
-          
-          if ($bis) {
-               return $counters2;
-          } else {
-               return $counters;
-          }
-     }
-
-     public function getCategoryFirstChildren($id)
-     {
-          return $this->getCategoriesPlus(array('start' => $id,'level' => $id == 0 ? 1 : 2));
      }
 
@@ -580 +400 @@
           $blog_id = $this->core->blog->id;
           
-          if (!empty($res))
+          if (!empty($res) && is_array($res[$blog_id]['p']))
           {
                if (array_key_exists($perm,$res[$blog_id]['p'])) {
@@ -622 +442 @@
           $rs = $this->con->select($strReq);
           
+          $cur = $this->con->openCursor($this->prefix.'post');
+          
           if ($rs->isEmpty()) {
                return;
           }
           else {
-               $nb = $rs->f(0);         
-          }
-          
-          $meta = new dcMeta($core);
-          $meta->delPostMeta($post_id,'nb_messages');
-          $meta->setPostMeta($post_id,'nb_messages',$nb);
+               $cur->nb_comment = (integer) $rs->f(0);
+          }
+          
+          $cur->update('WHERE post_id = '.(integer) $post_id);
           
      }
@@ -656 +476 @@
                $strReq =
                'SELECT message_id,M.post_id, M.user_id, message_dt, '.
-               'message_tz, message_upddt, message_format, '.
+               'message_tz, message_creadt, message_upddt, message_format, '.
                $content_req.' message_status, '.
                'P.post_title, P.post_url, P.post_type, P.post_dt, './/P.user_id, '.
@@ -701 +521 @@
                }
           }
+
+          if (!empty($params['user_id'])) {
+               $strReq .= "AND M.user_id = '".$this->con->escape($params['user_id'])."' ";
+          }
           
           if (!empty($params['post_id'])) {
@@ -726 +550 @@
           if (isset($params['q_author'])) {
                $q_author = $this->con->escape(str_replace('*','%',strtolower($params['q_author'])));
-               $strReq .= "AND LOWER(comment_author) LIKE '".$q_author."' ";
+               $strReq .= "AND LOWER(M.user_id) LIKE '".$q_author."' ";
           }
           
@@ -771 +595 @@
           $rs->extend('rsExtMessage');
           
-          # --BEHAVIOR-- coreBlogGetComments
-          $this->core->callBehavior('agoraBlogGetMessages',$rs);
+          # --BEHAVIOR-- agoraGetMessages
+          $this->core->callBehavior('agoraGetMessages',$rs);
           
           return $rs;
@@ -793 +617 @@
                
                $cur->message_id = (integer) $rs->f(0) + 1;
+
+               $cur->message_creadt = date('Y-m-d H:i:s');
                $cur->message_upddt = date('Y-m-d H:i:s');
-
-               $offset = dt::getTimeOffset($this->core->blog->settings->blog_timezone);
-               $cur->message_dt = date('Y-m-d H:i:s',time() + $offset);
-               $cur->message_tz = $this->core->blog->settings->blog_timezone;
+               $cur->message_tz = $this->core->auth->getInfo('user_tz');
                
                # Post excerpt and content
@@ -876 +699 @@
           }
           
-          $cur = $this->con->openCursor($this->prefix.'message');
+          /*$cur = $this->con->openCursor($this->prefix.'message');
           $cur->message_status = (integer) $status;
           $this->updMessage($id,$cur);
+
+          $id = (integer) $id;
+          $status = (integer) $status;*/
+          
+          #If user can only publish, we need to check the post's owner
+          if (!$this->core->auth->check('contentadmin',$this->core->blog->id))
+          {
+               $strReq = 'SELECT message_id '.
+                         'FROM '.$this->prefix.'message '.
+                         'WHERE message_id = '.$id.' '.
+                         //"AND blog_id = '".$this->con->escape($this->core->blog->id)."' ".
+                         "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
+               
+               $rs = $this->con->select($strReq);
+               
+               if ($rs->isEmpty()) {
+                    throw new Exception(__('You are not allowed to change this entry status'));
+               }
+          }
+          
+          $cur = $this->con->openCursor($this->prefix.'message');
+          
+          $cur->message_status = $status;
+          $cur->message_upddt = date('Y-m-d H:i:s');
+          
+          $cur->update(
+               'WHERE message_id = '.$id.' '
+               //"AND blog_id = '".$this->con->escape($this->core->blog->id)."' "
+               );
+          $this->core->blog->triggerBlog();
      }
      
@@ -923 +776 @@
                throw new Exception(__('No message content'));
           }
+
+          if ($cur->message_dt == '') {
+               $offset = dt::getTimeOffset($this->core->auth->getInfo('user_tz'));
+               $now = time() + $offset;
+               $cur->message_dt = date('Y-m-d H:i:00',$now);
+          }
           
           $message_id = is_int($message_id) ? $message_id : $cur->message_id;

plugins/agora/inc/class.agora.template.php

@@ -4 +4 @@
 # This file is part of agora, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+# Copyright (c) 2009-2010 Osku ,Tomtom and contributors
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -18 +19 @@
      }
 
-     public static function forumURL($attr)
+     public static function agoraURL($attr)
      {
           global $core, $_ctx;
@@ -67 +68 @@
           
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("agofeed")."/'.$type.'"').'; ?>';
+          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("agora_feed")."/'.$type.'"').'; ?>';
      }
 
@@ -97 +98 @@
      }
 
-     /*dtd
-     <!ELEMENT tpl:Subforums - - -- Subforums loop -->
-     */
-     public static function Subforums($attr,$content)
-     {
-          global $core, $_ctx;
-          
-          $p = "\$params = array();\n";
-          
-          if (isset($attr['url'])) {
-               $p .= "\$params['cat_url'] = '".addslashes($attr['url'])."';\n";
-          }
-          
-          //if (isset($attr['without_empty'])) {  
-          //   $p .= "\$params['without_empty'] = '".(bool) $attr['without_empty']."';\n"; 
-          //} 
-          
-          if (!empty($attr['post_type'])) {
-               $p .= "\$params['post_type'] = '".addslashes($attr['post_type'])."';\n";
-          }
-          else {
-               $p .= "\$params['post_type'] = 'threadpost';\n";
-          }
-          
-          if (!empty($attr['level'])) {
-               $p .= "\$params['level'] = ".(integer) $attr['level'].";\n";
-          }
-
-          //if (isset($_ctx->subforumurl)) {
-          //   $p .= "\$params['cat_url'] = '".addslashes($_ctx->subforumurl)."';\n";
-          //}
-          
-          $res = "<?php\n";
-          $res .= $p;
-          $res .= '$_ctx->categories = $_ctx->agora->getCategoriesPlus($params);'."\n";
-          $res .= "?>\n";
-          $res .= '<?php while ($_ctx->categories->fetch()) : ?>'.$content.'<?php endwhile; $_ctx->categories = null; unset($params); ?>';
-          
-          return $res;
-     }
-
-     public static function SubforumFirstChildren($attr,$content)
-     {
-          return
-          "<?php\n".
-          '$_ctx->categories = $_ctx->agora->getCategoryFirstChildren($_ctx->categories->cat_id);'."\n".
-          'while ($_ctx->categories->fetch()) : ?>'.$content.'<?php endwhile; $_ctx->categories = null; ?>';
-     }
-
-     public static function SubforumURL($attr)
-     {
-          global $core, $_ctx;
-          
-          $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("subforum")."/".$_ctx->categories->cat_url').'; ?>';
-     }
-
-     public static function SubforumFeedURL($attr)
+     public static function placeURL($attr)
+     {
+          global $core, $_ctx;
+          
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("place")."/".$_ctx->categories->cat_url').'; ?>';
+     }
+
+     public static function placeFeedURL($attr)
      {
           $type = !empty($attr['type']) ? $attr['type'] : 'atom';
@@ -163 +115 @@
           
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("agofeed")."/subforum/".'.
+          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("agora_feed")."/place/".'.
           '$_ctx->categories->cat_url."/'.$type.'"').'; ?>';
      }
 
-     public static function ThreadAnswersCount($attr)
-     {
-          global $core, $_ctx;
-          
-          $none = 'no answer';
-          $one = 'one answer';
-          $more = '%d answers';
+     public static function authForm($attr,$content)
+     {
+          global $core;
+          
+          return
+          '<?php if ($core->auth->userID() != false && isset($_SESSION[\'sess_user_id\'])) : ?>'.
+          $content.
+          '<?php endif; ?>';
+     }
+
+     public static function notauthForm($attr,$content)
+     {
+          global $core;
+          
+          return
+          '<?php if ($core->auth->userID() == false) : ?>'.
+          $content.
+          '<?php endif; ?>';
+     }
+
+     public static function placeNewThreadLink($attr)
+     {
+          global $core, $_ctx;
+          
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          
+          return
+          '<?php if ($_ctx->categories->isEmpty()) {'.
+          ' echo '.sprintf($f,'$core->blog->url.$core->url->getBase("newthread")').';'.
+          '} else {'.
+          '  echo '.sprintf($f,'$core->blog->url.$core->url->getBase("newthread")."/".$_ctx->categories->cat_url').';'.
+          '} ?>';
+     }
+
+     public static function placeThreadsNumber($attr)
+     {
+          global $core, $_ctx;
+          
+          $none = __('no thread');
+          $one = __('one thread');
+          $more = __('%d threads');
           
           if (isset($attr['none'])) {
@@ -184 +170 @@
                $more = addslashes($attr['more']);
           }
-          $operation = '$_ctx->posts->nb_comment';
+          if (!empty($attr['full'])) {
+               $operation = '$_ctx->categories->nb_total';
+          } else {
+               $operation = '$_ctx->categories->nb_post';
+          }
+          
+          return
+          "<?php if (".$operation." == 0) {\n".
+          "  printf('".$none."',".$operation.");\n".
+          "} elseif (".$operation." == 1) {\n".
+          "  printf('".$one."',".$operation.");\n".
+          "} else {\n".
+          "  printf('".$more."',".$operation.");\n".
+          "} ?>";
+     }
+
+     public static function placeAnswersNumber($attr)
+     {
+          global $core, $_ctx;
+          
+          $none = __('no answer');
+          $one = __('one answer');
+          $more = __('%d answers');
+          
+          if (isset($attr['none'])) {
+               $none = addslashes($attr['none']);
+          }
+          if (isset($attr['one'])) {
+               $one = addslashes($attr['one']);
+          }
+          if (isset($attr['more'])) {
+               $more = addslashes($attr['more']);
+          }
+
+          if (!empty($attr['full'])) {
+               $operation = '$_ctx->categories->nb_total2';
+          } else {
+               $operation = '$_ctx->categories->nb_answer';
+          }
+          
+          return
+          "<?php if (".$operation." == 0) {\n".
+          "  printf('".$none."',".$operation.");\n".
+          "} elseif (".$operation." == 1) {\n".
+          "  printf('".$one."',".$operation.");\n".
+          "} else {\n".
+          "  printf('".$more."',".$operation.");\n".
+          "} ?>";
+     }
+
+     public static function PublicUserID($attr)
+     {
+          global $core, $_ctx;
+          
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$core->auth->userID()').'; ?>';
+     }
+     
+     public static function PublicUserDisplayName($attr)
+     {
+          global $core, $_ctx;
+          
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$core->auth->getInfo(\'user_displayname\')').'; ?>';
+     }
+
+     public static function IfThreadPreview($attr,$content)
+     {
+          global $_ctx;
+          
+          return
+          '<?php if ($_ctx->thread_preview !== null && $_ctx->thread_preview["preview"]) : ?>'.
+          $content.
+          '<?php endif; ?>';
+     }
+
+     public static function ThreadPreviewTitle($attr)
+     {
+          global $_ctx;
+          
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$_ctx->thread_preview["title"]').'; ?>';
+     }
+     
+
+     public static function ThreadPreviewContent($attr)
+     {
+          global $_ctx;
+          
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          
+          if (!empty($attr['raw'])) {
+               $co = '$_ctx->thread_preview["rawcontent"]';
+          } else {
+               $co = '$_ctx->thread_preview["content"]';
+          }
+          
+          return '<?php echo '.sprintf($f,$co).'; ?>';
+     }
+
+     public static function IfAnswerPreview($attr,$content)
+     {
+          global $_ctx;
+          
+          return
+          '<?php if ($_ctx->message_preview !== null && $_ctx->message_preview["preview"]) : ?>'.
+          $content.
+          '<?php endif; ?>';
+     }
+
+     public static function AnswerPreviewContent($attr)
+     {
+          global $_ctx;
+          
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          
+          if (!empty($attr['raw'])) {
+               $co = '$_ctx->message_preview["rawcontent"]';
+          } else {
+               $co = '$_ctx->message_preview["content"]';
+          }
+          
+          return '<?php echo '.sprintf($f,$co).'; ?>';
+     }
+
+     public static function ThreadProfileUserID($attr)
+     {
+          global $core, $_ctx;
+          
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("profile")."/".$_ctx->posts->user_id').'; ?>';
+     }
+
+     public static function ThreadURL($attr)
+     {
+          global $core, $_ctx;
+          
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("thread")."/".$_ctx->posts->post_url').'; ?>';
+     }
+
+     public static function ThreadCategoryURL($attr)
+     {
+          global $core, $_ctx;
+          
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("place")."/".$_ctx->posts->cat_url').'; ?>';
+     }
+
+     public static function MessageThreadURL($attr)
+     {
+          global $core, $_ctx;
+
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$_ctx->messages->getThreadURL()').'; ?>';
+     }
+
+     public static function EntryIfClosed($attr)
+     {
+          global $core, $_ctx;
+          
+          $ret = isset($attr['return']) ? $attr['return'] : 'closed';
+          $ret = html::escapeHTML($ret);
+          
+          return
+          '<?php if (!$_ctx->posts->post_open_comment) { '.
+          "echo '".addslashes($ret)."'; } ?>";
+     }
+
+     public static function EntryMessageCount($attr)
+     {
+          global $core, $_ctx;
+          
+          $none = 'no message';
+          $one = 'one message';
+          $more = '%d messages';
+          
+          if (isset($attr['none'])) {
+               $none = addslashes($attr['none']);
+          }
+          if (isset($attr['one'])) {
+               $one = addslashes($attr['one']);
+          }
+          if (isset($attr['more'])) {
+               $more = addslashes($attr['more']);
+          }
+          
+          if (empty($attr['count_all'])) {
+               $operation = '$_ctx->posts->nb_comment';
+          } else {
+               $operation = '($_ctx->posts->nb_comment + $_ctx->posts->nb_trackback)';
+          }
           
           return
@@ -196 +373 @@
      }
 
-     public static function authForm($attr,$content)
-     {
-          global $core;
-          
-          return
-          '<?php if ($core->auth->userID() != false && isset($_SESSION[\'sess_user_id\'])) : ?>'.
-          $content.
-          '<?php endif; ?>';
-     }
-
-     public static function notauthForm($attr,$content)
-     {
-          global $core;
-          
-          return
-          '<?php if ($core->auth->userID() == false) : ?>'.
-          $content.
-          '<?php endif; ?>';
-     }
-
-     public static function SubForumNewThreadLink($attr)
-     {
-          global $core;
-          
-          $f = $GLOBALS['core']->tpl->getFilters($attr);
-           if (isset($_ctx->categories))
-           {
-               return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("newthread")."/".$_ctx->categories->cat_url').'; ?>';
-          }
-          else
-          {
-               return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("newthread")').'; ?>';
-          }
-     }
-
-     public static function SubforumThreadsNumber($attr)
-     {
-          global $core, $_ctx;
-          
-          $none = __('no thread');
-          $one = __('one thread');
-          $more = __('%d threads');
-          
-          if (isset($attr['none'])) {
-               $none = addslashes($attr['none']);
-          }
-          if (isset($attr['one'])) {
-               $one = addslashes($attr['one']);
-          }
-          if (isset($attr['more'])) {
-               $more = addslashes($attr['more']);
-          }
-          if (!empty($attr['full'])) {
-               $operation = '$_ctx->categories->nb_total';
-          } else {
-               $operation = '$_ctx->categories->nb_post';
-          }
-          
-          return
-          "<?php if (".$operation." == 0) {\n".
-          "  printf('".$none."',".$operation.");\n".
-          "} elseif (".$operation." == 1) {\n".
-          "  printf('".$one."',".$operation.");\n".
-          "} else {\n".
-          "  printf('".$more."',".$operation.");\n".
-          "} ?>";
-     }
-
-     public static function SubforumAnswersNumber($attr)
-     {
-          global $core, $_ctx;
-          
-          $none = __('no answer');
-          $one = __('one answer');
-          $more = __('%d answers');
-          
-          if (isset($attr['none'])) {
-               $none = addslashes($attr['none']);
-          }
-          if (isset($attr['one'])) {
-               $one = addslashes($attr['one']);
-          }
-          if (isset($attr['more'])) {
-               $more = addslashes($attr['more']);
-          }
-
-          if (!empty($attr['full'])) {
-               $operation = '$_ctx->categories->nb_total2';
-          } else {
-               $operation = '$_ctx->categories->nb_answer';
-          }
-          
-          return
-          "<?php if (".$operation." == 0) {\n".
-          "  printf('".$none."',".$operation.");\n".
-          "} elseif (".$operation." == 1) {\n".
-          "  printf('".$one."',".$operation.");\n".
-          "} else {\n".
-          "  printf('".$more."',".$operation.");\n".
-          "} ?>";
-     }
-
-     public static function PublicUserID($attr)
-     {
-          global $core, $_ctx;
-          
-          $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->auth->userID()').'; ?>';
-     }
-     
-     public static function PublicUserDisplayName($attr)
-     {
-          global $core, $_ctx;
-          
-          $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->auth->getInfo(\'user_displayname\')').'; ?>';
-     }
-
-     public static function IfThreadPreview($attr,$content)
-     {
-          global $_ctx;
-          
-          return
-          '<?php if ($_ctx->thread_preview !== null && $_ctx->thread_preview["preview"]) : ?>'.
-          $content.
-          '<?php endif; ?>';
-     }
-
-     public static function ThreadPreviewTitle($attr)
-     {
-          global $_ctx;
-          
-          $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->thread_preview["title"]').'; ?>';
-     }
-     
-
-     public static function ThreadPreviewContent($attr)
-     {
-          global $_ctx;
-          
-          $f = $GLOBALS['core']->tpl->getFilters($attr);
-          
-          if (!empty($attr['raw'])) {
-               $co = '$_ctx->thread_preview["rawcontent"]';
-          } else {
-               $co = '$_ctx->thread_preview["content"]';
-          }
-          
-          return '<?php echo '.sprintf($f,$co).'; ?>';
-     }
-
-     public static function IfAnswerPreview($attr,$content)
-     {
-          global $_ctx;
-          
-          return
-          '<?php if ($_ctx->message_preview !== null && $_ctx->message_preview["preview"]) : ?>'.
-          $content.
-          '<?php endif; ?>';
-     }
-
-     public static function AnswerPreviewContent($attr)
-     {
-          global $_ctx;
-          
-          $f = $GLOBALS['core']->tpl->getFilters($attr);
-          
-          if (!empty($attr['raw'])) {
-               $co = '$_ctx->message_preview["rawcontent"]';
-          } else {
-               $co = '$_ctx->message_preview["content"]';
-          }
-          
-          return '<?php echo '.sprintf($f,$co).'; ?>';
-     }
-
-     public static function ThreadProfileUserID($attr)
-     {
-          global $core, $_ctx;
-          
-          $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("profile")."/".$_ctx->posts->user_id').'; ?>';
-     }
-
-     public static function ThreadURL($attr)
-     {
-          global $core, $_ctx;
-          
-          $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("thread")."/".$_ctx->posts->post_url').'; ?>';
-     }
-
-     public static function ThreadCategoryURL($attr)
-     {
-          global $core, $_ctx;
-          
-          $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("subforum")."/".$_ctx->posts->cat_url').'; ?>';
-     }
-
-     public static function AnswerThreadURL($attr)
-     {
-          global $core, $_ctx;
-
-          $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("thread")."/".$_ctx->agora->getThreadURL($_ctx->posts)').'; ?>';
-     }
-
-     public static function EntryIfClosed($attr)
-     {
-          global $core, $_ctx;
-          
-          $ret = isset($attr['return']) ? $attr['return'] : 'closed';
-          $ret = html::escapeHTML($ret);
-          
-          return
-          '<?php if (!$_ctx->posts->post_open_comment) { '.
-          "echo '".addslashes($ret)."'; } ?>";
-     }
-
      public static function PaginationPlus($attr,$content)
      {
@@ -605 +561 @@
      {
           global $core;
-          
+          
           $format = (!empty($attr['format'])) ? $attr['format'] : 
                $core->blog->settings->date_format.', '.$core->blog->settings->time_format; 
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          
+          
           return('<?php echo '.'dt::dt2str(\''.$format.'\','.sprintf($f,'$_ctx->posts->post_creadt').
                ',\''.$core->blog->settings->blog_timezone.'\'); ?>');
      }
 
+     public static function EntryUpdDate($attr)
+     {
+          global $core;
+          
+          $format = (!empty($attr['format'])) ? $attr['format'] : 
+               $core->blog->settings->date_format.', '.$core->blog->settings->time_format; 
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          
+          return('<?php echo '.'dt::dt2str(\''.$format.'\','.sprintf($f,'$_ctx->posts->post_upddt').
+               ',\''.$core->blog->settings->blog_timezone.'\'); ?>');
+     }
+
      public static function userIsModo($attr,$content)
      {
@@ -629 +597 @@
           
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->profile->user_id').'; ?>';
+          return '<?php echo '.sprintf($f,'$_ctx->users->user_id').'; ?>';
      }
 
@@ -637 +605 @@
           
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->profile->user_displayname').'; ?>';
+          return '<?php echo '.sprintf($f,'$_ctx->users->user_displayname').'; ?>';
      }
 
@@ -645 +613 @@
           
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->profile->user_url').'; ?>';
+          return '<?php echo '.sprintf($f,'$_ctx->users->user_url').'; ?>';
      }
 
@@ -653 +621 @@
           
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->profile->user_email').'; ?>';
+          return '<?php echo '.sprintf($f,'$_ctx->users->user_email').'; ?>';
      }
 
@@ -667 +635 @@
           }
           
-          //$_ctx->profile->user_creadt = strtotime($_ctx->profile->user_creadt);
+          //$_ctx->users->user_creadt = strtotime($_ctx->users->user_creadt);
           $iso8601 = !empty($attr['iso8601']);
           $rfc822 = !empty($attr['rfc822']);
@@ -674 +642 @@
           
           if ($rfc822) {
-               return '<?php echo '.sprintf($f,"dt::rfc822(\$_ctx->profile->user_creadt,\$core->blog->settings->blog_timezone)").'; ?>';
+               return '<?php echo '.sprintf($f,"dt::rfc822(\$_ctx->users->user_creadt,\$core->blog->settings->blog_timezone)").'; ?>';
           } elseif ($iso8601) {
-               return '<?php echo '.sprintf($f,"dt::iso8601(\$_ctx->profile->user_creadt,\$core->blog->settings->blog_timezone)").'; ?>';
-          } else {
-               return '<?php echo '.sprintf($f,"dt::str('".$format."',\$_ctx->profile->user_creadt)").'; ?>';
+               return '<?php echo '.sprintf($f,"dt::iso8601(\$_ctx->users->user_creadt,\$core->blog->settings->blog_timezone)").'; ?>';
+          } else {
+               return '<?php echo '.sprintf($f,"dt::str('".$format."',\$_ctx->users->user_creadt)").'; ?>';
           }
      }
@@ -693 +661 @@
           }
           
-          //$_ctx->profile->user_upddt = strtotime($_ctx->profile->user_upddt);
+          //$_ctx->users->user_upddt = strtotime($_ctx->users->user_upddt);
           $iso8601 = !empty($attr['iso8601']);
           $rfc822 = !empty($attr['rfc822']);
@@ -700 +668 @@
           
           if ($rfc822) {
-               return '<?php echo '.sprintf($f,"dt::rfc822(\$_ctx->profile->user_upddt,\$core->blog->settings->blog_timezone)").'; ?>';
+               return '<?php echo '.sprintf($f,"dt::rfc822(\$_ctx->users->user_upddt,\$core->blog->settings->blog_timezone)").'; ?>';
           } elseif ($iso8601) {
-               return '<?php echo '.sprintf($f,"dt::iso8601(\$_ctx->profile->user_upddt,\$core->blog->settings->blog_timezone)").'; ?>';
-          } else {
-               return '<?php echo '.sprintf($f,"dt::str('".$format."',\$_ctx->profile->user_upddt)").'; ?>';
+               return '<?php echo '.sprintf($f,"dt::iso8601(\$_ctx->users->user_upddt,\$core->blog->settings->blog_timezone)").'; ?>';
+          } else {
+               return '<?php echo '.sprintf($f,"dt::str('".$format."',\$_ctx->users->user_upddt)").'; ?>';
           }
      }
@@ -717 +685 @@
           "}\n";
 
-          $lastn = -1;
+          $lastn = 0;
           if (isset($attr['lastn'])) {
                $lastn = abs((integer) $attr['lastn'])+0;
           }
           
-          $p .= 'if (!isset($_page_number)) { $_page_number = 1; }'."\n";
-          
-          if ($lastn != 0) {
-               if ($lastn > 0) {
-                    $p .= "\$params['limit'] = ".$lastn.";\n";
-               } else {
-                    $p .= "\$params['limit'] = \$_ctx->nb_message_per_page;\n";
-               }
+          //$p .= 'if (!isset($_page_number)) { $_page_number = 1; }'."\n";
+          
+          //if ($lastn != 0) {
+          if ($lastn > 0) {
+               $p .= "\$params['limit'] = ".$lastn.";\n";
+          } else {
+               //$p .= "\$params['limit'] = \$_ctx->nb_message_per_page;\n";
+               $p .= "if (\$_ctx->nb_message_per_page !== null) { \$params['limit'] = \$_ctx->nb_message_per_page; }\n";
+          }
                
-               if (!isset($attr['ignore_pagination']) || $attr['ignore_pagination'] == "0") {
+               /*if (!isset($attr['ignore_pagination']) || $attr['ignore_pagination'] == "0") {
                     $p .= "\$params['limit'] = array(((\$_page_number-1)*\$params['limit']),\$params['limit']);\n";
                } else {
                     $p .= "\$params['limit'] = array(0, \$params['limit']);\n";
-               }
-          }
+               }*/
+          //}
           
           if (isset($attr['author'])) {
@@ -772 +741 @@
           }
 
-          $sortby = 'post_dt';
-          $order = 'desc';
+          $sortby = 'message_dt';
+          $order = 'asc';
           if (isset($attr['sortby'])) {
                switch ($attr['sortby']) {
-                    case 'title': $sortby = 'post_title'; break;
-                    case 'selected' : $sortby = 'post_selected'; break;
                     case 'author' : $sortby = 'user_id'; break;
-                    case 'date' : $sortby = 'post_dt'; break;
-                    case 'id' : $sortby = 'post_id'; break;
+                    case 'date' : $sortby = 'message_dt'; break;
+                    case 'id' : $sortby = 'message_id'; break;
+                    case 'post_id' : $sortby = 'post_id'; break;
                }
           }
@@ -853 +821 @@
      }
 
-     public static function MessageAuthor($attr)
-     {//A revoir
-          global $core, $_ctx;
-          
-          $f = $GLOBALS['core']->tpl->getFilters($attr);
-
-          return '<?php echo '.sprintf($f,'$_ctx->messages->user_id').'; ?>';
+     public static function MessageAuthorCommonName($attr)
+     {
+          global $core, $_ctx;
+          
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+
+          return '<?php echo '.sprintf($f,'$_ctx->messages->getAuthorCN()').'; ?>';
      }
 
@@ -914 +882 @@
           } elseif ($iso8601) {
                return '<?php echo '.sprintf($f,"\$_ctx->messages->getISO8601Date()").'; ?>';
+/*return '<?php echo "plop" ; ?>';*/
           } else {
                return '<?php echo '.sprintf($f,"\$_ctx->messages->getDate('".$format."')").'; ?>';
@@ -987 +956 @@
      }
 
+     public static function MessageEntryTitle($attr)
+     {
+          global $core, $_ctx;
+          
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$_ctx->messages->post_title').'; ?>';
+     }
+
+     public static function MessageFeedID($attr)
+     {
+          global $core, $_ctx;
+          
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$_ctx->messages->getFeedID()').'; ?>';
+     }
+
      public static function agoPagination($attr,$content)
      {
@@ -1064 +1049 @@
      }
 
-     public static function SubforumID($attr)
+     public static function placeID($attr)
      {
           global $core, $_ctx;
@@ -1070 +1055 @@
      }
 
-     public static function SubforumSpacer($attr)
+     public static function placeSpacer($attr)
      {
           global $core, $_ctx;
@@ -1081 +1066 @@
      }
      
-     public static function SubforumComboSelected($attr,$content)
-     {
-          global $core, $_ctx;
-          
-          return
-          '<?php if ($_ctx->categories->cat_id == $_ctx->thread_preview["cat"] ) : ?>'.
+     public static function placeComboSelected($attr,$content)
+     {
+          global $core, $_ctx;
+          
+          return
+          '<?php if (($_ctx->categories->cat_id == $_ctx->thread_preview["cat"]) && ($_ctx->thread_preview["not_empty"])) : ?>'.
           $content.
           '<?php endif; ?>';

plugins/agora/inc/class.agora.utils.php

@@ -4 +4 @@
 # This file is part of agora, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+# Copyright (c) 2009-2010 Osku ,Tomtom and contributors
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html

plugins/agora/inc/class.rs.agora.php

@@ -5 +5 @@
 # 
 # Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -11 +12 @@
 # -- END LICENSE BLOCK ------------------------------------
 
-class rsExtagora
-{
-     public static function getURL($rs)
-     {
-          return $rs->core->blog->url.$rs->core->url->getBase('forum').'/'.
-          html::sanitizeURL($rs->post_url);
-     }
-
-     public static function NewPosts($rs)
-     {
-          $now = dt::toUTC(time());
-          
-          // to be continued
-          
-     }
-
-     public static function getThreadURL($rs)
-     {
-
-
-     }
-}
 class rsExtMessage
 {
@@ -38 +17 @@
      {
           if ($absolute_urls) {
-               return html::absoluteURLs($rs->message_content_xhtml,$rs->getURL());
+               return html::absoluteURLs($rs->message_content_xhtml,$rs->getThreadURL());
           } else {
                return $rs->message_content_xhtml;
@@ -44 +23 @@
      }
 
-     public static function getURL($rs)
+     public static function getAuthorCN($rs)
+     {
+          return dcUtils::getUserCN($rs->user_id, $rs->user_name,
+          $rs->user_firstname, $rs->user_displayname);
+     }
+
+     public static function getThreadURL($rs)
      {
           return $rs->core->blog->url.$rs->core->getPostPublicURL(
@@ -71 +56 @@
      public static function getTS($rs)
      {
-          return strtotime($rs->messsage_dt);
+          return strtotime($rs->message_dt);
      }
      
@@ -83 +68 @@
           return dt::rfc822($rs->getTS(),$rs->message_tz);
      }
+
+     public static function getFeedID($rs)
+     {
+          return 'urn:md5:'.md5($rs->core->blog->uid.$rs->message_id);
+          
+          $url = parse_url($rs->core->blog->url);
+          $date_part = date('Y-m-d',strtotime($rs->message_dt));
+          
+          return 'tag:'.$url['host'].','.$date_part.':'.$rs->message_id;
+     }
 }
 ?>

plugins/agora/index.php

@@ -4 +4 @@
 # This file is part of agora, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 Osku , Tomtom and contributors
-## Licensed under the GPL version 2.0 license.
+# Copyright (c) 2009-2010 Osku ,Tomtom and contributors
+#
+# Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -11 +12 @@
 # -- END LICENSE BLOCK ------------------------------------
 
-// Setting default parameters if missing configuration
-if (is_null($core->blog->settings->agora_flag)) {
-     try {
-               $core->blog->settings->setNameSpace('agora');
-
-               // Agora is not active by default
-               $core->blog->settings->put('agora_flag',false,'boolean','Agora activation flag');
-               $core->blog->triggerBlog();
-               http::redirect(http::getSelfURI());
-          }
-     catch (Exception $e) {
-          $core->error->add($e->getMessage());
-     }
-}
-
-// Getting current parameters
-$agora_flag         = (boolean)$core->blog->settings->agora_flag;
-$agora_announce     = $core->blog->settings->agora_announce;
-$agora_nb_msg_page  = $core->blog->settings->agora_nb_msg_per_page_per_thread;
-
-if ($agora_announce === null) {
-     $agora_announce = __('<p class="message">Welcome to the Agora.</p>');
-}
-
-if ($agora_nb_msg_page === null) {
-     $agora_nb_msg_page = 10;
-}
-
-if (!empty($_POST['saveconfig']))
-{
-     try
+$act = (!empty($_REQUEST['act']) && $_REQUEST['act'] == 'thread') ? 'thread' : 'options';
+
+if ($_REQUEST['act'] == 'thread') {
+     include dirname(__FILE__).'/thread.php';
+     return;
+} 
+
+if ($_REQUEST['act'] == 'messages') {
+     include dirname(__FILE__).'/messages.php';
+     return;
+} 
+
+if ($_REQUEST['act'] == 'messages-actions') {
+     include dirname(__FILE__).'/messages_actions.php'; //not ready yet
+     return;
+} 
+
+if ($_REQUEST['act'] == 'options') {
+     include dirname(__FILE__).'/options.php'; // to finalize
+     return;
+}
+
+if (!defined('DC_CONTEXT_ADMIN')) { return; }
+dcPage::check('agora,contentadmin');
+
+
+/* Pager class
+-------------------------------------------------------- */
+class adminThreadList extends adminGenericList
+{
+     public function display($page,$nb_per_page,$enclose_block='')
      {
-          $agora_flag = (empty($_POST['agora_flag']))?false:true;
-          $agora_announce = $_POST['agora_announce'];
-          $agora_nb_msg_page = abs((integer) $_POST['agora_nb_msg_page']);
-          if ($agora_nb_msg_page <= 1) { $agora_nb_msg_page = 1; }
-
-          if (empty($_POST['agora_announce'])) {
-               throw new Exception(__('No agora announce.'));
-          }
-
-          $core->blog->settings->setNamespace('agora');
-          $core->blog->settings->put('agora_flag',$agora_flag,'boolean','Active the agora module');
-          $core->blog->settings->put('agora_announce',$agora_announce,'string','Agora announce');
-          $core->blog->settings->put('agora_nb_msg_per_page_per_thread',$agora_nb_msg_page,'integer','Number of messages per page per thread');
-
-          $core->blog->triggerBlog();
-
-          $msg = __('Configuration successfully updated.');
-     }
-
-     catch (Exception $e)
+          if ($this->rs->isEmpty())
+          {
+               echo '<p><strong>'.__('No thread').'</strong></p>';
+          }
+          else
+          {
+               $pager = new pager($page,$this->rs_count,$nb_per_page,10);
+               $pager->html_prev = $this->html_prev;
+               $pager->html_next = $this->html_next;
+               $pager->var_page = 'page';
+               
+               $html_block =
+               '<table class="clear"><tr>'.
+               '<th colspan="2">'.__('Title').'</th>'.
+               '<th>'.__('Date').'</th>'.
+               '<th>'.__('Category').'</th>'.
+               '<th>'.__('Author').'</th>'.
+               '<th>'.__('Messages').'</th>'.
+               '<th>'.__('Status').'</th>'.
+               '</tr>%s</table>';
+               
+               if ($enclose_block) {
+                    $html_block = sprintf($enclose_block,$html_block);
+               }
+               
+               echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
+               
+               $blocks = explode('%s',$html_block);
+               
+               echo $blocks[0];
+               
+               while ($this->rs->fetch())
+               {
+                    echo $this->postLine();
+               }
+               
+               echo $blocks[1];
+               
+               echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
+          }
+     }
+     
+     private function postLine()
      {
-          $core->error->add($e->getMessage());
-     }
-}
+          if ($this->core->auth->check('categories',$this->core->blog->id)) {
+               $cat_link = '<a href="category.php?id=%s">%s</a>';
+          } else {
+               $cat_link = '%2$s';
+          }
+
+          $img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
+          switch ($this->rs->post_status) {
+               case 1:
+                    $img_status = sprintf($img,__('published'),'check-on.png');
+                    break;
+               case 0:
+                    $img_status = sprintf($img,__('unpublished'),'check-off.png');
+                    break;
+               case -1:
+                    $img_status = sprintf($img,__('scheduled'),'scheduled.png');
+                    break;
+               case -2:
+                    $img_status = sprintf($img,__('pending'),'check-wrn.png');
+                    break;
+          }
+          if ($this->rs->cat_title) {
+               $cat_title = sprintf($cat_link,$this->rs->cat_id,
+               html::escapeHTML($this->rs->cat_title));
+          } else {
+               $cat_title = __('None');
+          }
+          
+          $protected = '';
+          if ($this->rs->post_password) {
+               $protected = sprintf($img,__('protected'),'locker.png');
+          }
+          
+          $selected = '';
+          if ($this->rs->post_selected) {
+               $selected = sprintf($img,__('selected'),'selected.png');
+          }
+          
+          $attach = '';
+          $nb_media = $this->rs->countMedia();
+          if ($nb_media > 0) {
+               $attach_str = $nb_media == 1 ? __('%d attachment') : __('%d attachments');
+               $attach = sprintf($img,sprintf($attach_str,$nb_media),'attach.png');
+          }
+          
+          $res = '<tr class="line'.($this->rs->post_status != 1 ? ' offline' : '').'"'.
+          ' id="p'.$this->rs->post_id.'">';
+          
+          $res .=
+          '<td class="nowrap">'.
+          form::checkbox(array('entries[]'),$this->rs->post_id,'','','',!$this->rs->isEditable()).'</td>'.
+          '<td class="maximal"><a href="'.$this->core->getPostAdminURL($this->rs->post_type,$this->rs->post_id).'">'.
+          html::escapeHTML($this->rs->post_title).'</a></td>'.
+          '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>'.
+          '<td class="nowrap">'.$cat_title.'</td>'.
+          '<td class="nowrap">'.$this->rs->user_id.'</td>'.
+          '<td class="nowrap">'.$this->rs->nb_comment.'</td>'.
+          '<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.' '.$attach.'</td>'.
+          '</tr>';
+          
+          return $res;
+     }
+}
+
+/* Getting threads
+-------------------------------------------------------- */
+$params = array(
+     'post_type' => 'thread'
+);
+
+# Getting categories
+try {
+     $categories = $core->blog->getCategories(array('post_type'=>'thread'));
+} catch (Exception $e) {
+     $core->error->add($e->getMessage());
+}
+
+# Getting authors
+try {
+     $users = $core->blog->getPostsUsers('thread');
+} catch (Exception $e) {
+     $core->error->add($e->getMessage());
+}
+
+# Getting dates
+try {
+     $dates = $core->blog->getDates(array('type'=>'month','post_type'=>'thread'));
+} catch (Exception $e) {
+     $core->error->add($e->getMessage());
+}
+
+# Getting langs
+try {
+     $langs = $core->blog->getLangs();
+} catch (Exception $e) {
+     $core->error->add($e->getMessage());
+}
+
+# Creating filter combo boxes
+if (!$core->error->flag())
+{
+     # Filter form we'll put in html_block
+     $users_combo = $categories_combo = array();
+     $users_combo['-'] = $categories_combo['-'] = '';
+     while ($users->fetch())
+     {
+          $user_cn = dcUtils::getUserCN($users->user_id,$users->user_name,
+          $users->user_firstname,$users->user_displayname);
+          
+          if ($user_cn != $users->user_id) {
+               $user_cn .= ' ('.$users->user_id.')';
+          }
+          
+          $users_combo[$user_cn] = $users->user_id; 
+     }
+     
+     while ($categories->fetch()) {
+          $categories_combo[str_repeat('&nbsp;&nbsp;',$categories->level-1).'&bull; '.
+               html::escapeHTML($categories->cat_title).
+               ' ('.$categories->nb_post.')'] = $categories->cat_id;
+     }
+     
+     $status_combo = array(
+     '-' => ''
+     );
+     foreach ($core->blog->getAllPostStatus() as $k => $v) {
+          $status_combo[$v] = (string) $k;
+     }
+     
+     $selected_combo = array(
+     '-' => '',
+     __('selected') => '1',
+     __('not selected') => '0'
+     );
+     
+     # Months array
+     $dt_m_combo['-'] = '';
+     while ($dates->fetch()) {
+          $dt_m_combo[dt::str('%B %Y',$dates->ts())] = $dates->year().$dates->month();
+     }
+     
+     $lang_combo['-'] = '';
+     while ($langs->fetch()) {
+          $lang_combo[$langs->post_lang] = $langs->post_lang;
+     }
+     
+     $sortby_combo = array(
+     __('Date') => 'post_dt',
+     __('Title') => 'post_title',
+     __('Category') => 'cat_title',
+     __('Author') => 'user_id',
+     __('Status') => 'post_status',
+     __('Selected') => 'post_selected'
+     );
+     
+     $order_combo = array(
+     __('Descending') => 'desc',
+     __('Ascending') => 'asc'
+     );
+}
+
+# Actions combo box
+$combo_action = array();
+if ($core->auth->check('publish,contentadmin',$core->blog->id))
+{
+     $combo_action[__('Status')] = array(
+          __('Publish') => 'publish',
+          __('Unpublish') => 'unpublish',
+          __('Schedule') => 'schedule',
+          __('Mark as pending') => 'pending'
+     );
+}
+$combo_action[__('Mark')] = array(
+     __('Mark as selected') => 'selected',
+     __('Mark as unselected') => 'unselected'
+);
+$combo_action[__('Change')] = array(__('Change category') => 'category');
+if ($core->auth->check('admin',$core->blog->id))
+{
+     $combo_action[__('Change')] = array_merge($combo_action[__('Change')],
+          array(__('Change author') => 'author'));
+}
+if ($core->auth->check('delete,contentadmin',$core->blog->id))
+{
+     $combo_action[__('Delete')] = array(__('Delete') => 'delete');
+}
+
+/* Get posts
+-------------------------------------------------------- */
+$user_id = !empty($_GET['user_id']) ?   $_GET['user_id'] : '';
+$cat_id = !empty($_GET['cat_id']) ?     $_GET['cat_id'] : '';
+$status = isset($_GET['status']) ? $_GET['status'] : '';
+$selected = isset($_GET['selected']) ?  $_GET['selected'] : '';
+$month = !empty($_GET['month']) ?       $_GET['month'] : '';
+$lang = !empty($_GET['lang']) ?         $_GET['lang'] : '';
+$sortby = !empty($_GET['sortby']) ?     $_GET['sortby'] : 'post_dt';
+$order = !empty($_GET['order']) ?       $_GET['order'] : 'desc';
+
+$show_filters = false;
+
+$page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1;
+$nb_per_page =  30;
+
+if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
+     if ($nb_per_page != $_GET['nb']) {
+          $show_filters = true;
+     }
+     $nb_per_page = (integer) $_GET['nb'];
+}
+
+$params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
+$params['no_content'] = true;
+
+# - User filter
+if ($user_id !== '' && in_array($user_id,$users_combo)) {
+     $params['user_id'] = $user_id;
+     $show_filters = true;
+}
+
+# - Categories filter
+if ($cat_id !== '' && in_array($cat_id,$categories_combo)) {
+     $params['cat_id'] = $cat_id;
+     $show_filters = true;
+}
+
+# - Status filter
+if ($status !== '' && in_array($status,$status_combo)) {
+     $params['post_status'] = $status;
+     $show_filters = true;
+}
+
+# - Selected filter
+if ($selected !== '' && in_array($selected,$selected_combo)) {
+     $params['post_selected'] = $selected;
+     $show_filters = true;
+}
+
+# - Month filter
+if ($month !== '' && in_array($month,$dt_m_combo)) {
+     $params['post_month'] = substr($month,4,2);
+     $params['post_year'] = substr($month,0,4);
+     $show_filters = true;
+}
+
+# - Lang filter
+if ($lang !== '' && in_array($lang,$lang_combo)) {
+     $params['post_lang'] = $lang;
+     $show_filters = true;
+}
+
+# - Sortby and order filter
+if ($sortby !== '' && in_array($sortby,$sortby_combo)) {
+     if ($order !== '' && in_array($order,$order_combo)) {
+          $params['order'] = $sortby.' '.$order;
+     }
+     
+     if ($sortby != 'post_dt' || $order != 'desc') {
+          $show_filters = true;
+     }
+}
+
+$params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
+$params['no_content'] = true;
+//$params['order'] = 'post_position ASC, post_title ASC';
+
+try {
+     $pages = $core->blog->getPosts($params);
+     $counter = $core->blog->getPosts($params,true);
+     $post_list = new adminThreadList($core,$pages,$counter->f(0));
+} catch (Exception $e) {
+     $core->error->add($e->getMessage());
+}
+
+/* DISPLAY
+-------------------------------------------------------- */
+
+# --BEHAVIOR-- adminPagesActionsCombo
+$core->callBehavior('adminThreadsActionsCombo',array(&$combo_action));
+
+/* Display
+-------------------------------------------------------- */
 ?>
 <html>
 <head>
-     <title><?php echo __('Agora'); ?></title>
+  <title><?php echo __('Threads'); ?></title>
+<?php
+ echo dcPage::jsLoad('js/_posts_list.js');
+ if (!$show_filters) {
+     echo dcPage::jsLoad('js/filter-controls.js');
+}?>
+  <script type="text/javascript">
+  //<![CDATA[
+  <?php echo dcPage::jsVar('dotclear.msg.confirm_delete_posts',__("Are you sure you want to delete selected threads?")); ?>
+  //]]>
+  </script>
 </head>
 <body>
 <?php
-echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.__('Agora').'</h2>';
-
- if (!empty($msg)) echo '<p class="message">'.$msg.'</p>';
-
-if (!empty($err)) echo '<p class="error">'.$err.'</p>'; 
-
-echo '<div id="agora_options">'.
-     '<form method="post" action="'.$p_url.'">'.
-          '<fieldset>'.
-               '<legend>'.__('Plugin activation').'</legend>'.
-                    '<div class="two-cols">'.
-                    '<div class="col">'.
-                    '<p class="field">'.
-                         form::checkbox('agora_flag', 1, $agora_flag).
-                         '<label class=" classic" for="agora_flag">'.__('Enable Agora').'</label>'.
-                    '</p>'.
-                    '</div>'.
-
-                    '</div>'.
-          '</fieldset>'.
-          '<fieldset>'.
-               '<legend>'.__('Presentation options').'</legend>'.
-                    '<div class="two-cols">'.
-                    '<p class="area"><label class="required" title="'.__('Required field').'">'.
-                         __('Agora announce:').
-                         form::textarea('agora_announce',200,4,html::escapeHTML($agora_announce)).
-                    '</label></p>'.
-                    '<div class="col">'.
-                    '<p>'.
-                         '<label class="classic" for="agora_nb_msg_page">'.sprintf(__('Display %s messages per thread\'page'),
-                         form::field('agora_nb_msg_page',2,3,$agora_nb_msg_page)).
-                         '</label>'.
-                    '</p>'.
-                    '</div>'.
-                    '<div class="col">'.
-                    '</div>'.
-
-                    '</div>'.
-          '</fieldset>'.
-          
-          '<p>'.form::hidden(array('p'),'agora').
-          $core->formNonce().
-          '<input type="submit" name="saveconfig" value="'.__('Save configuration').'" /></p>'.
-     '</form>'.
-'</div>';
+echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.__('Threads').
+' - <a class="button" href="'.$p_url.'&amp;act=thread">'.__('New thread').'</a></h2>';
+
+if (!$core->error->flag())
+{
+     if (!$show_filters) {
+          echo '<p><a id="filter-control" class="form-control" href="#">'.
+          __('Filters').'</a></p>';
+     }
+     
+     echo
+     '<form action="'.$p_url.'" method="get" id="filters-form">'.
+     '<fieldset><legend>'.__('Filters').'</legend>'.
+     '<div class="three-cols">'.
+     '<div class="col">'.
+     '<label>'.__('Author:').
+     form::combo('user_id',$users_combo,$user_id).'</label> '.
+     '<label>'.__('Category:').
+     form::combo('cat_id',$categories_combo,$cat_id).'</label> '.
+     '<label>'.__('Status:').
+     form::combo('status',$status_combo,$status).'</label> '.
+     '</div>'.
+     
+     '<div class="col">'.
+     '<label>'.__('Selected:').
+     form::combo('selected',$selected_combo,$selected).'</label> '.
+     '<label>'.__('Month:').
+     form::combo('month',$dt_m_combo,$month).'</label> '.
+     '<label>'.__('Lang:').
+     form::combo('lang',$lang_combo,$lang).'</label> '.
+     '</div>'.
+     
+     '<div class="col">'.
+     '<p><label>'.__('Order by:').
+     form::combo('sortby',$sortby_combo,$sortby).'</label> '.
+     '<label>'.__('Sort:').
+     form::combo('order',$order_combo,$order).'</label></p>'.
+     '<p><label class="classic">'. form::field('nb',3,3,$nb_per_page).' '.
+     __('Entries per page').'</label> '.
+     '<p><input type="hidden" name="p" value="agora" />'.
+     '<input type="submit" value="'.__('filter').'" /></p>'.
+     '</div>'.
+     '</div>'.
+     '<br class="clear" />'. //Opera sucks
+     '</fieldset>'.
+     '</form>';
+     
+     # Show pages
+     $post_list->display($page,$nb_per_page,
+     '<form action="posts_actions.php" method="post" id="form-entries">'.
+     
+     '%s'.
+     
+     '<div class="two-cols">'.
+     '<p class="col checkboxes-helpers"></p>'.
+     
+     '<p class="col right">'.__('Selected threads action:').' '.
+     form::combo('action',$combo_action).
+     '<input type="submit" value="'.__('ok').'" /></p>'.
+     form::hidden(array('post_type'),'thread').
+     form::hidden(array('redir'),html::escapeHTML($_SERVER['REQUEST_URI'])).
+     $core->formNonce().
+     '</div>'.
+     '</form>');
+}
 ?>
 </body>

plugins/agora/locales/fr/main.po

@@ +1 @@
+# Language: français
+# Module: agora - 0.5.3
+# Date: 2010-03-29 06:13:35
+# Translated with translater 1.3
+
 msgid ""
 msgstr ""
-"Project-Id-Version: Agora\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-01 19:07+0100\n"
-"PO-Revision-Date: 2009-10-24 07:54+0100\n"
-"Last-Translator: Kozlika <kozlika@free.fr>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: agora 0.5.3\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2010-03-29T06:13:35+00:00\n"
+"Last-Translator: Osku\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: French\n"
-"X-Poedit-Country: FRANCE\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-KeywordsList: __\n"
-"X-Poedit-Basepath: ../..\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: _public.php:188
-#, php-format
+
+#: _admin.php:22
+#: inc/class.agora.template.php:161
+msgid "%d threads"
+msgstr "%d discussions"
+
+#: _admin.php:22
+msgid "%d thread"
+msgstr "%d discussion"
+
+#: _admin.php:25
+msgid "%d messages"
+msgstr "%d messages"
+
+#: _admin.php:25
+msgid "%d message"
+msgstr "%d message"
+
+#: _admin.php:30
+msgid "agora:config"
+msgstr "agora:config"
+
+#: _admin.php:35
+msgid "is an agora member"
+msgstr "est membre de l'agora"
+
+#: _admin.php:36
+msgid "can moderate the agora"
+msgstr "peut modérer l'agora"
+
+#: _install.php:55
+msgid "<p class=\"message\">Welcome to the Agora.</p>"
+msgstr "<p class=\"message\">Bienvenue dans l'agora.</p>"
+
+#: _public.php:222
 msgid "The e-mail was sent successfully to %s."
-msgstr "L'email a été envoyé avec succès à %s."
-
-#: _public.php:204
+msgstr "Le message a été envoyé avec succès à %s."
+
+#: _public.php:238
 msgid "Your new password is in your mailbox."
-msgstr "Votre nouveau mot de passe est dans votre messagerie."
-
-#: _public.php:279
-#: _public.php:496
+msgstr "Votre nouveau mot de passe est dans votre boîte à lettres."
+
+#: _public.php:313
+#: _public.php:532
 msgid "You must provide a valid email"
 msgstr "Vous devez fournir une adresse email valide"
 
-#: _public.php:284
-#, php-format
+#: _public.php:318
 msgid "User \"%s\" already exists."
 msgstr "L'utilisateur \"%s\" existe déjà."
 
-#: _public.php:298
-#, php-format
+#: _public.php:333
 msgid "User %s successfully created. You will receive an email to activate your account."
-msgstr "L'utilisateur %s a été créé avec succès. Vous recevrez un email pour activer votre compte."
-
-#: _public.php:328
-#, php-format
+msgstr "L'utilisateur %s a été créé avec succès. Vous allez recevoir un email pour activer votre compte."
+
+#: _public.php:363
 msgid "User %s is already registred. You can log in."
 msgstr "L'utilisateur %s est déjà enregistré. Vous pouvez vous connecter."
 
-#: _public.php:336
-#, php-format
+#: _public.php:371
 msgid "User %s is now registred. You can now log in."
-msgstr "L'utilisateur %s est maintenant enregistré. Vous pouvez vous connecter."
-
-#: _public.php:347
-#: inc/class.agora.php:132
+msgstr "L'utilisateur %s est maintenant enregistré. Vous pouvez désormais vous connecter."
+
+#: _public.php:382
+#: inc/class.agora.php:143
 msgid "This is a wrong registration URL. Registration failed."
-msgstr "C'est un lien d'enregistrement incorrect. L'enregistrement a échoué."
-
-#: _public.php:482
+msgstr "Ceci est une mauvaise URL de confirmation. L'enregistrement a échoué."
+
+#: _public.php:518
 msgid "You must confirm your password"
 msgstr "Vous devez confirmer votre mot de passe"
 
-#: _public.php:486
+#: _public.php:522
 msgid "Please, check your password. Passwords don't match"
-msgstr "S'il vous plaît, vérifiez vos mots de passe. Ils ne correspondent pas"
-
-#: _public.php:513
-#, php-format
+msgstr "Veuillez vérifier vos mots de passe. Ils ne correspondent pas"
+
+#: _public.php:549
 msgid "User %s successfully updated."
-msgstr "L'utilisateur %s a été mis à jour avec succès."
-
-#: _admin.php:19
-#: _admin.php:22
-#: index.php:64
-#: index.php:67
+msgstr "L'utilsateur %s a été mis à jour avec succès"
+
+#: _public.php:1573
+#: default-templates/agora.html:26
+#: default-templates/editmessage.html:26
+#: default-templates/editpost.html:26
+#: default-templates/login.html:26
+#: default-templates/newthread.html:26
+#: default-templates/place.html:26
+#: default-templates/profile.html:26
+#: default-templates/profile_me.html:26
+#: default-templates/register.html:26
+#: default-templates/thread.html:26
+msgid "Home"
+msgstr "Accueil"
+
+#: _public.php:1576
+#: default-templates/newthread.html:9
+#: default-templates/place.html:53
+#: index.php:389
+#: thread.php:38
+msgid "New thread"
+msgstr "Nouvelle discussion"
+
+#: _public.php:1578
+msgid "Logout"
+msgstr "Déconnexion"
+
+#: _public.php:1579
+#: default-templates/login.html:9
+#: default-templates/login.html:44
+#: default-templates/login.html:55
+msgid "Login"
+msgstr "Connexion"
+
+#: _public.php:1580
+#: default-templates/register.html:9
+#: default-templates/register.html:44
+msgid "Register"
+msgstr "S'enregistrer"
+
+#: _public.php:1602
+msgid "Close the thread"
+msgstr "Fermer la discussion"
+
+#: _public.php:1603
+msgid "Open the thread"
+msgstr "Ouvrir la discussion"
+
+#: _public.php:1606
+msgid "Unpin the thread"
+msgstr "Dépingler la discussion"
+
+#: _public.php:1607
+msgid "Pin the thread"
+msgstr "Épingler la discussion"
+
+#: _public.php:1811
+msgid "This agora's threads %s feed"
+msgstr "Fil des discussions de l'agora"
+
+#: _public.php:1812
+msgid "This agora's messages %s feed"
+msgstr "Fil des messages de l'agora"
+
+#: _public.php:1823
+#: default-templates/place.html:59
+msgid "Threads feed"
+msgstr "Fil des discussions"
+
+#: _public.php:1827
+#: default-templates/place.html:62
+msgid "Messages feed"
+msgstr "Fil des messages"
+
+#: _widgets.php:28
+msgid "Agora: navigation"
+msgstr "Agora : navigation"
+
+#: _widgets.php:29
+#: _widgets.php:38
+#: _widgets.php:46
+#: _widgets.php:55
+#: _widgets.php:62
+#: _widgets.php:77
+#: _widgets.php:93
+#: thread.php:461
+msgid "Title:"
+msgstr "Titre :"
+
+#: _widgets.php:29
+msgid "Agora navigation"
+msgstr "Navigation"
+
+#: _widgets.php:30
+#: _widgets.php:39
+#: _widgets.php:48
+msgid "Text:"
+msgstr "Texte :"
+
+#: _widgets.php:31
+#: _widgets.php:40
+#: _widgets.php:49
+msgid "Button:"
+msgstr "Bouton :"
+
+#: _widgets.php:31
+#: _widgets.php:40
+#: _widgets.php:49
+msgid "Disconnect"
+msgstr "Se déconnecter"
+
+#: _widgets.php:32
+#: _widgets.php:41
+#: _widgets.php:50
+#: _widgets.php:56
+#: _widgets.php:71
+#: _widgets.php:86
+#: _widgets.php:95
+msgid "Home page only"
+msgstr "Page d'accueil uniquement"
+
+#: _widgets.php:37
+msgid "Agora: moderation"
+msgstr "Agora : modération"
+
+#: _widgets.php:38
+msgid "Agora moderation"
+msgstr "Modération de l'agora"
+
+#: _widgets.php:45
+msgid "Agora: categories list"
+msgstr "Agora : liste des catégories"
+
+#: _widgets.php:46
+msgid "Agora's sections"
+msgstr "Sections de l'agora"
+
+#: _widgets.php:47
+msgid "With entries counts"
+msgstr "Afficher le nombre de billets"
+
+#: _widgets.php:54
+msgid "Agora: selected threads"
+msgstr "Agora : discussions sélectionnées"
+
+#: _widgets.php:55
+msgid "Selected threads"
+msgstr "Discussions à retenir"
+
+#: _widgets.php:61
+msgid "Agora: last threads"
+msgstr "Agora : dernières discussions"
+
+#: _widgets.php:62
+#: default-templates/profile.html:66
+#: default-templates/profile_me.html:106
+msgid "Last threads"
+msgstr "Dernières discussions"
+
+#: _widgets.php:64
+#: _widgets.php:79
+msgid "Uncategorized"
+msgstr "Non catégorisé"
+
+#: _widgets.php:68
+#: _widgets.php:83
+#: index.php:405
+#: thread.php:379
+msgid "Category:"
+msgstr "Catégorie :"
+
+#: _widgets.php:70
+msgid "Entries limit:"
+msgstr "Nombre de discussions maximum :"
+
+#: _widgets.php:76
+msgid "Agora: last messages"
+msgstr "Agora : derniers messages"
+
+#: _widgets.php:77
+#: default-templates/profile.html:83
+#: default-templates/profile_me.html:123
+msgid "Last messages"
+msgstr "Derniers messages"
+
+#: _widgets.php:85
+msgid "Messages limit:"
+msgstr "Nombre de messages maximum :"
+
+#: _widgets.php:92
+msgid "Agora: subscribe links"
+msgstr "Agora : liens d'abonnement"
+
+#: _widgets.php:93
+msgid "Subscribe"
+msgstr "S'abonner"
+
+#: _widgets.php:94
+msgid "Feeds type:"
+msgstr "Types de fil :"
+
+#: default-templates/agora.html:9
+#: default-templates/agora.html:11
+#: default-templates/agora.html:17
+#: default-templates/agora.html:50
+#: default-templates/editmessage.html:9
+#: default-templates/editmessage.html:11
+#: default-templates/editmessage.html:17
+#: default-templates/editmessage.html:52
+#: default-templates/editpost.html:9
+#: default-templates/editpost.html:11
+#: default-templates/editpost.html:17
+#: default-templates/editpost.html:51
+#: default-templates/login.html:9
+#: default-templates/login.html:11
+#: default-templates/login.html:17
+#: default-templates/login.html:44
+#: default-templates/newthread.html:9
+#: default-templates/newthread.html:11
+#: default-templates/newthread.html:17
+#: default-templates/newthread.html:51
+#: default-templates/place.html:9
+#: default-templates/place.html:11
+#: default-templates/place.html:17
+#: default-templates/place.html:50
+#: default-templates/profile.html:9
+#: default-templates/profile.html:11
+#: default-templates/profile.html:17
+#: default-templates/profile.html:43
+#: default-templates/profile_me.html:9
+#: default-templates/profile_me.html:11
+#: default-templates/profile_me.html:17
+#: default-templates/profile_me.html:43
+#: default-templates/register.html:9
+#: default-templates/register.html:11
+#: default-templates/register.html:17
+#: default-templates/register.html:44
+#: default-templates/thread.html:9
+#: default-templates/thread.html:11
+#: default-templates/thread.html:17
+#: default-templates/thread.html:51
+#: options.php:51
+#: options.php:59
 msgid "Agora"
 msgstr "Agora"
 
-#: _admin.php:27
-msgid "is an agora member"
-msgstr "est membre de l'agora"
-
-#: _admin.php:28
-msgid "can moderate the agora"
-msgstr "peut modérer l'agora"
-
-#: index.php:33
-msgid "<p class=\"message\">Welcome to the Agora.</p>"
-msgstr "<p class=\"message\">Bienvenue dans l'Agora.</p>"
-
-#: index.php:44
+#: default-templates/agora.html:9
+#: default-templates/agora.html:17
+#: default-templates/agora.html:110
+#: default-templates/newthread.html:9
+#: default-templates/newthread.html:17
+#: default-templates/place.html:9
+#: default-templates/place.html:17
+#: default-templates/place.html:107
+#: default-templates/place.html:138
+msgid "page"
+msgstr "page"
+
+#: default-templates/agora.html:27
+#: default-templates/editmessage.html:27
+#: default-templates/editpost.html:27
+#: default-templates/login.html:27
+#: default-templates/newthread.html:27
+#: default-templates/place.html:27
+#: default-templates/thread.html:27
+msgid "Archives"
+msgstr "Archives"
+
+#: default-templates/agora.html:69
+msgid "Last thread:"
+msgstr "Dernière discussion :"
+
+#: default-templates/agora.html:70
+#: default-templates/agora.html:85
+#: default-templates/agora.html:99
+#: default-templates/place.html:95
+#: default-templates/place.html:127
+#: default-templates/thread.html:62
+#: default-templates/thread.html:118
+msgid "by"
+msgstr "par"
+
+#: default-templates/agora.html:84
+msgid "Last message:"
+msgstr "Dernier message :"
+
+#: default-templates/agora.html:99
+#: default-templates/place.html:95
+#: default-templates/place.html:127
+#: default-templates/profile.html:72
+#: default-templates/profile.html:89
+#: default-templates/profile_me.html:112
+#: default-templates/profile_me.html:129
+#: default-templates/thread.html:62
+msgid "on"
+msgstr "le"
+
+#: default-templates/agora.html:109
+#: default-templates/place.html:106
+#: default-templates/place.html:137
+msgid "previous entries"
+msgstr "billets précédents"
+
+#: default-templates/agora.html:110
+#: default-templates/place.html:107
+#: default-templates/place.html:138
+msgid "of"
+msgstr "de"
+
+#: default-templates/agora.html:111
+#: default-templates/place.html:108
+#: default-templates/place.html:139
+msgid "next entries"
+msgstr "billets suivants"
+
+#: default-templates/editmessage.html:9
+#: message.php:75
+#: message.php:255
+msgid "Edit message"
+msgstr "Editer le message"
+
+#: default-templates/editmessage.html:65
+#: default-templates/editmessage.html:86
+#: default-templates/editpost.html:67
+#: default-templates/editpost.html:114
+msgid "finish"
+msgstr "terminer"
+
+#: default-templates/editmessage.html:69
+msgid "Edit a message"
+msgstr "Modifier le message"
+
+#: default-templates/editmessage.html:75
+#: default-templates/editpost.html:103
+#: default-templates/newthread.html:99
+#: default-templates/thread.html:179
+#: message.php:199
+msgid "Message"
+msgstr "Message"
+
+#: default-templates/editmessage.html:85
+#: default-templates/editpost.html:113
+#: default-templates/newthread.html:111
+#: default-templates/register.html:88
+#: default-templates/thread.html:191
+msgid "preview"
+msgstr "prévisualiser"
+
+#: default-templates/editpost.html:9
+#: thread.php:124
+#: thread.php:374
+msgid "Edit thread"
+msgstr "Modifier la discussion"
+
+#: default-templates/editpost.html:64
+msgid "Edit the post"
+msgstr "Modifier la discussion"
+
+#: default-templates/editpost.html:71
+msgid "Edit a post"
+msgstr "Modifier la discussion"
+
+#: default-templates/editpost.html:78
+#: default-templates/newthread.html:75
+msgid "Subject"
+msgstr "Sujet"
+
+#: default-templates/editpost.html:86
+#: default-templates/newthread.html:83
+#: index.php:61
+#: index.php:239
+msgid "Category"
+msgstr "Catégorie"
+
+#: default-templates/login.html:61
+#: default-templates/register.html:68
+msgid "Username"
+msgstr "Identifiant"
+
+#: default-templates/login.html:66
+msgid "Password"
+msgstr "Mot de passe"
+
+#: default-templates/login.html:75
+#: default-templates/newthread.html:66
+#: default-templates/newthread.html:112
+#: default-templates/register.html:58
+#: default-templates/register.html:89
+#: default-templates/thread.html:170
+#: default-templates/thread.html:192
+msgid "send"
+msgstr "envoyer"
+
+#: default-templates/newthread.html:63
+msgid "Your new thread"
+msgstr "Votre nouvelle discussion"
+
+#: default-templates/newthread.html:70
+msgid "Add a thread"
+msgstr "Ajouter une discussion"
+
+#: default-templates/place.html:59
+msgid "This categorie's threads Atom feed"
+msgstr "Fil des discussions de cette catégorie"
+
+#: default-templates/place.html:62
+msgid "This category's messages Atom feed"
+msgstr "Fil des messages de cette catégorie"
+
+#: default-templates/place.html:71
+msgid "Subcategories"
+msgstr "Sous-catégories"
+
+#: default-templates/place.html:86
+msgid "Announcements"
+msgstr "Annonces"
+
+#: default-templates/place.html:119
+#: index.php:374
+#: index.php:388
+#: thread.php:287
+#: thread.php:335
+msgid "Threads"
+msgstr "Discussions"
+
+#: default-templates/profile.html:9
+#: default-templates/profile_me.html:9
+#: default-templates/profile_me.html:43
+msgid "Profile"
+msgstr "Profil"
+
+#: default-templates/profile.html:43
+msgid "profile"
+msgstr "profil"
+
+#: default-templates/profile.html:49
+#: default-templates/profile_me.html:60
+msgid "Name or nickname"
+msgstr "Nom ou pseudo"
+
+#: default-templates/profile.html:52
+#: default-templates/profile_me.html:70
+msgid "Website"
+msgstr "Site web"
+
+#: default-templates/profile.html:55
+#: default-templates/profile_me.html:85
+msgid "Creation date"
+msgstr "Date de création"
+
+#: default-templates/profile.html:58
+#: default-templates/profile_me.html:89
+msgid "Update date"
+msgstr "Date de mise à jour"
+
+#: default-templates/profile_me.html:54
+msgid "My informations"
+msgstr "Mes informations"
+
+#: default-templates/profile_me.html:65
+#: default-templates/register.html:73
+msgid "Email address"
+msgstr "Adresse email"
+
+#: default-templates/profile_me.html:75
+msgid "New password"
+msgstr "Nouveau mot de passe"
+
+#: default-templates/profile_me.html:80
+msgid "Confirm password"
+msgstr "Confirmer le mot de passe"
+
+#: default-templates/profile_me.html:99
+#: message.php:293
+#: thread.php:480
+msgid "save"
+msgstr "enregistrer"
+
+#: default-templates/register.html:55
+msgid "Your infos"
+msgstr "Vos infos"
+
+#: default-templates/register.html:62
+msgid "Register an account"
+msgstr "Enregister un compte"
+
+#: default-templates/register.html:81
+msgid "Username must contain at least 2 characters using letters, numbers or symbols."
+msgstr "L'identifiant doit contenir au moins 2 caractères parmi lettres, chiffres et symbôles."
+
+#: default-templates/thread.html:63
+msgid "Permalink"
+msgstr "Lien permanent"
+
+#: default-templates/thread.html:65
+#: default-templates/thread.html:120
+msgid "edit"
+msgstr "modifier"
+
+#: default-templates/thread.html:66
+#: default-templates/thread.html:121
+#: message.php:295
+#: messages.php:105
+#: thread.php:482
+#: thread.php:522
+msgid "delete"
+msgstr "supprimer"
+
+#: default-templates/thread.html:83
+#: thread.php:419
+msgid "Attachments"
+msgstr "Pièces jointes"
+
+#: default-templates/thread.html:117
+msgid "On"
+msgstr "Le"
+
+#: default-templates/thread.html:150
+msgid "Status of thread has been modified."
+msgstr "Le status des messages a été modifié"
+
+#: default-templates/thread.html:166
+msgid "Your answer"
+msgstr "Votre réponse"
+
+#: default-templates/thread.html:174
+msgid "Add a message"
+msgstr "Ajouter un message"
+
+#: default-templates/thread.html:198
+msgid "This thread's messages Atom feed"
+msgstr "Fil Atom des messages de cette dicussion"
+
+#: default-templates/thread.html:198
+msgid "This thread's messages feed"
+msgstr "Fil des messages de cette discussion"
+
+#: default-templates/thread.html:201
+msgid "Thread closed"
+msgstr "Discussion close"
+
+#: inc/class.agora.log.php:106
+#: inc/class.agora.log.php:112
+#: inc/class.agora.log.php:134
+msgid "No such log ID"
+msgstr "Aucun log ID"
+
+#: inc/class.agora.log.php:146
+msgid "No log message"
+msgstr "Aucun message log"
+
+#: inc/class.agora.php:25
+#: inc/class.agora.php:30
+#: index.php:108
+#: lib/admin.messages.pager.php:86
+#: message.php:342
+#: thread.php:585
+msgid "pending"
+msgstr "en attente"
+
+#: inc/class.agora.php:26
+msgid "suspended"
+msgstr "suspendu"
+
+#: inc/class.agora.php:27
+msgid "active"
+msgstr "actif"
+
+#: inc/class.agora.php:29
+#: lib/admin.messages.pager.php:89
+#: message.php:345
+#: thread.php:588
+msgid "junk"
+msgstr "indésirable"
+
+#: inc/class.agora.php:31
+#: index.php:102
+#: lib/admin.messages.pager.php:83
+#: message.php:339
+#: thread.php:582
+msgid "unpublished"
+msgstr "non publié"
+
+#: inc/class.agora.php:32
+#: index.php:99
+#: lib/admin.messages.pager.php:80
+#: message.php:336
+#: thread.php:579
+msgid "published"
+msgstr "publié"
+
+#: inc/class.agora.php:162
+msgid "Cannot login. Empty password."
+msgstr "Connexion impossible. Mot de passe vide."
+
+#: inc/class.agora.php:167
+msgid "Cannot login. Check."
+msgstr "Connexion impossible. Vérifiez."
+
+#: inc/class.agora.php:171
+msgid "User is not a member of forum"
+msgstr "L'utilisateur n'est pas membre de l'agora"
+
+#: inc/class.agora.php:206
+msgid "Account confirmation request on Agora"
+msgstr "Confirmation de création compte pour l'Agora"
+
+#: inc/class.agora.php:208
+msgid "Welcome to the forum of %s"
+msgstr "Bienvenue sur le forum de %s"
+
+#: inc/class.agora.php:209
+msgid "To activate your account and verify your e-mail address, please click on the following link:"
+msgstr "Pour activer le compte, vérifiez votre adresse email, cliquez sur le lien suivant :"
+
+#: inc/class.agora.php:213
+msgid "Your indormations:"
+msgstr "Vos informations :"
+
+#: inc/class.agora.php:214
+msgid "Login: %s"
+msgstr "Identifiant : %s"
+
+#: inc/class.agora.php:215
+msgid "Password: %s"
+msgstr "Mot de passe : %s"
+
+#: inc/class.agora.php:218
+msgid "If you have received this mail in error, you do not need to take any action to cancel the account."
+msgstr "SI vous avez reçu cet email par erreur, il n'est pas nécessaire d'annuler le compte."
+
+#: inc/class.agora.php:219
+msgid "The account will not be activated, and you will not receive any further emails."
+msgstr "Le compte ne sera pas activé et vous ne recevrez pas d'autre emails."
+
+#: inc/class.agora.php:220
+msgid "If clicking the link above does not work, copy and paste the URL in a new browser window instead."
+msgstr "Si le clic sur le lien ci-dessous ne fonctionne pas, copier et coller l'URL dans un navigateur."
+
+#: inc/class.agora.php:222
+msgid "Thank you for particape to our agora."
+msgstr "Merci de participer à notre agora."
+
+#: inc/class.agora.php:224
+msgid "This is a post-only mailing. Replies to this message are not monitored or answered."
+msgstr "Ce message est issu d'une boite email générique. Les réponses ne sont ni regardées ni répondues."
+
+#: inc/class.agora.php:353
+msgid "You are not allowed to close this thread"
+msgstr "Vous n'êtes pas autorisé à clôre la discussion."
+
+#: inc/class.agora.php:371
+msgid "You are not allowed to mark this entry as closed"
+msgstr "Vous n'êtes pas autorisé à marquer la discussion comme close"
+
+#: inc/class.agora.php:606
+msgid "You are not allowed to create an message"
+msgstr "Vous n'êtes pas autorisé à créer un message"
+
+#: inc/class.agora.php:650
+msgid "You are not allowed to update comments"
+msgstr "Vous n'êtes pas autorisé à modifier des commentaires"
+
+#: inc/class.agora.php:656
+#: inc/class.agora.php:662
+#: inc/class.agora.php:745
+msgid "No such message ID"
+msgstr "Aucun message avec cet ID"
+
+#: inc/class.agora.php:669
+msgid "You are not allowed to update this message"
+msgstr "Vous n'êtes pas autorisé à mettre à jour ce message"
+
+#: inc/class.agora.php:698
+msgid "You are not allowed to change this message's status"
+msgstr "Vous n'êtes pas autorisé à changer l'état des messages"
+
+#: inc/class.agora.php:720
+msgid "You are not allowed to change this entry status"
+msgstr "Vous n'êtes pas autorisé à modifier l'état de cette discussion"
+
+#: inc/class.agora.php:739
+msgid "You are not allowed to delete messages"
+msgstr "Vous n'êtes pas autorisé à supprimer ce message"
+
+#: inc/class.agora.php:761
+msgid "You are not allowed to delete this comment"
+msgstr "Vous n'êtes pas autorisé à supprimer ce message"
+
+#: inc/class.agora.php:776
+msgid "No message content"
+msgstr "Aucun contenu pour le message"
+
+#: inc/class.agora.php:788
+msgid "No message content xhtml"
+msgstr "Aucun contenu xhtml pour le message"
+
+#: inc/class.agora.template.php:159
+msgid "no thread"
+msgstr "aucune discussion"
+
+#: inc/class.agora.template.php:160
+msgid "one thread"
+msgstr "une discussion"
+
+#: inc/class.agora.template.php:192
+msgid "no answer"
+msgstr "aucune réponse"
+
+#: inc/class.agora.template.php:193
+msgid "one answer"
+msgstr "une réponse"
+
+#: inc/class.agora.template.php:194
+msgid "%d answers"
+msgstr "%d réponses"
+
+#: index.php:48
+msgid "No thread"
+msgstr "Aucune discussion"
+
+#: index.php:59
+#: index.php:238
+#: lib/admin.messages.pager.php:30
+msgid "Title"
+msgstr "Titre"
+
+#: index.php:60
+#: index.php:237
+#: lib/admin.messages.pager.php:31
+#: message.php:323
+#: messages.php:33
+#: thread.php:566
+msgid "Date"
+msgstr "Date"
+
+#: index.php:62
+#: index.php:240
+#: lib/admin.messages.pager.php:32
+#: message.php:322
+#: messages.php:35
+#: thread.php:565
+msgid "Author"
+msgstr "Auteur"
+
+#: index.php:63
+#: message.php:240
+#: messages.php:124
+#: messages.php:145
+#: thread.php:528
+#: thread.php:535
+msgid "Messages"
+msgstr "Messages"
+
+#: index.php:64
+#: index.php:241
+#: index.php:255
+#: lib/admin.messages.pager.php:33
+#: message.php:325
+#: messages.php:36
+#: thread.php:568
+msgid "Status"
+msgstr "État"
+
+#: index.php:71
+#: index.php:84
+#: lib/admin.messages.pager.php:41
+#: lib/admin.messages.pager.php:54
+msgid "Page(s)"
+msgstr "Page(s)"
+
+#: index.php:105
+msgid "scheduled"
+msgstr "programmé"
+
+#: index.php:115
+msgid "None"
+msgstr "Aucun"
+
+#: index.php:120
+msgid "protected"
+msgstr "protégé"
+
+#: index.php:125
+#: index.php:221
+msgid "selected"
+msgstr "sélectionné"
+
+#: index.php:131
+msgid "%d attachment"
+msgstr "%d annexe"
+
+#: index.php:131
+msgid "%d attachments"
+msgstr "%d annexes"
+
+#: index.php:143
+#: lib/admin.messages.pager.php:103
+#: message.php:356
+#: thread.php:599
+msgid "%Y-%m-%d %H:%M"
+msgstr "%Y-%m-%d %H:%M"
+
+#: index.php:222
+msgid "not selected"
+msgstr "non sélectionné"
+
+#: index.php:242
+msgid "Selected"
+msgstr "Sélectionné"
+
+#: index.php:246
+#: messages.php:40
+msgid "Descending"
+msgstr "Décroissant"
+
+#: index.php:247
+#: messages.php:41
+msgid "Ascending"
+msgstr "Croissant"
+
+#: index.php:256
+msgid "Publish"
+msgstr "Publier"
+
+#: index.php:257
+msgid "Unpublish"
+msgstr "Hors ligne"
+
+#: index.php:258
+msgid "Schedule"
+msgstr "Programmer"
+
+#: index.php:259
+msgid "Mark as pending"
+msgstr "En attente"
+
+#: index.php:262
+msgid "Mark"
+msgstr "Marquer"
+
+#: index.php:263
+msgid "Mark as selected"
+msgstr "Sélectionné"
+
+#: index.php:264
+msgid "Mark as unselected"
+msgstr "Non sélectionné"
+
+#: index.php:266
+#: index.php:269
+#: index.php:269
+msgid "Change"
+msgstr "Changer"
+
+#: index.php:266
+msgid "Change category"
+msgstr "Changer la catégorie"
+
+#: index.php:270
+msgid "Change author"
+msgstr "Changer l'auteur"
+
+#: index.php:274
+#: index.php:274
+msgid "Delete"
+msgstr "Supprimer"
+
+#: index.php:382
+msgid "Are you sure you want to delete selected threads?"
+msgstr "Êtes-vous sûr de vouloir supprimer les discussions sélectionnées"
+
+#: index.php:395
+#: index.php:400
+#: messages.php:152
+#: messages.php:157
+msgid "Filters"
+msgstr "Filtres"
+
+#: index.php:403
+#: messages.php:177
+msgid "Author:"
+msgstr "Auteur :"
+
+#: index.php:407
+#: messages.php:160
+msgid "Status:"
+msgstr "État :"
+
+#: index.php:412
+msgid "Selected:"
+msgstr "Sélectionné :"
+
+#: index.php:414
+msgid "Month:"
+msgstr "Mois :"
+
+#: index.php:416
+msgid "Lang:"
+msgstr "Langue :"
+
+#: index.php:421
+#: messages.php:168
+msgid "Order by:"
+msgstr "Trier par :"
+
+#: index.php:423
+#: messages.php:171
+msgid "Sort:"
+msgstr "Trier :"
+
+#: index.php:426
+msgid "Entries per page"
+msgstr "Billets par page"
+
+#: index.php:428
+#: messages.php:182
+msgid "filter"
+msgstr "filtre"
+
+#: index.php:444
+msgid "Selected threads action:"
+msgstr "Action sur les discussions sélectionnées :"
+
+#: index.php:446
+#: messages.php:213
+#: thread.php:551
+msgid "ok"
+msgstr "ok"
+
+#: lib/admin.messages.pager.php:19
+#: thread.php:539
+msgid "No message"
+msgstr "Aucun message"
+
+#: lib/admin.messages.pager.php:107
+#: message.php:360
+#: thread.php:603
+msgid "Edit this message"
+msgstr "Modifier ce message"
+
+#: message.php:26
+msgid "New message"
+msgstr "Nouveau message"
+
+#: message.php:62
+msgid "This message does not exist."
+msgstr "Ce message n'existe pas."
+
+#: message.php:202
+msgid "Are you sure you want to delete this message?"
+msgstr "Êtes-vous sûr de vouloir supprimer les messages sélectionnés"
+
+#: message.php:224
+msgid "Message has been successfully updated."
+msgstr "Le message a été mis à jour avec succès."
+
+#: message.php:227
+msgid "Message has been successfully created."
+msgstr "Le message a été créé avec succès."
+
+#: message.php:236
+msgid "Don't forget to validate your XHTML conversion by saving your message."
+msgstr "Enregistrez votre message pour valider la transformation en XHTML."
+
+#: message.php:260
+msgid "Message status:"
+msgstr "État du message :"
+
+#: message.php:264
+#: thread.php:387
+msgid "Published on:"
+msgstr "Publié le :"
+
+#: message.php:267
+#: thread.php:390
+msgid "Text formating:"
+msgstr "Format du texte :"
+
+#: message.php:269
+#: thread.php:392
+msgid "Convert to XHTML"
+msgstr "Convertir en XHTML"
+
+#: message.php:282
+#: options.php:82
+#: thread.php:461
+#: thread.php:469
+msgid "Required field"
+msgstr "Champ obligatoire"
+
+#: message.php:283
+#: thread.php:470
+msgid "Content:"
+msgstr "Contenu :"
+
+#: message.php:324
+#: thread.php:567
+msgid "IP address"
+msgstr "Adresse IP"
+
+#: messages.php:34
+msgid "Entry title"
+msgstr "Titre du billet"
+
+#: messages.php:98
+#: thread.php:514
+msgid "publish"
+msgstr "publier"
+
+#: messages.php:99
+#: thread.php:515
+msgid "unpublish"
+msgstr "hors ligne"
+
+#: messages.php:100
+#: thread.php:516
+msgid "mark as pending"
+msgstr "en attente"
+
+#: messages.php:101
+#: thread.php:517
+msgid "mark as junk"
+msgstr "indésirable"
+
+#: messages.php:139
+msgid "Are you sure you want to delete these messages?"
+msgstr "Êtes-vous sûr de vouloir supprimer les messages sélectionnés"
+
+#: messages.php:164
+msgid "Messages per page"
+msgstr "Messages par page"
+
+#: messages.php:193
+msgid "You have one spam message."
+msgstr "Vous avez un message spam."
+
+#: messages.php:194
+msgid "Show it."
+msgstr "L'afficher"
+
+#: messages.php:196
+msgid "You have %s spam messages."
+msgstr "Vous avez %s messages spam."
+
+#: messages.php:197
+msgid "Show them."
+msgstr "Les afficher."
+
+#: messages.php:210
+#: thread.php:547
+msgid "Selected messages action:"
+msgstr "Action pour les messages sélectionnés"
+
+#: messages_actions.php:93
+msgid "back"
+msgstr "retour"
+
+#: options.php:30
 msgid "No agora announce."
-msgstr "Aucune annonce pour l'Agora"
-
-#: index.php:53
+msgstr "Aucune annonce pour l'agora"
+
+#: options.php:40
 msgid "Configuration successfully updated."
-msgstr "La configuration a été mise à jour avec succès."
-
-#: index.php:76
+msgstr "Configuration mise à jour avec succès."
+
+#: options.php:68
 msgid "Plugin activation"
 msgstr "Activation de l'extension"
 
-#: index.php:81
+#: options.php:73
 msgid "Enable Agora"
 msgstr "Activer Agora"
 
-#: index.php:88
+#: options.php:80
 msgid "Presentation options"
 msgstr "Options de présentation"
 
-#: index.php:89
-msgid "Required field"
-msgstr "Champ obligatoire"
-
-#: index.php:90
+#: options.php:83
 msgid "Agora announce:"
-msgstr "Connexion à l'Agora :"
-
-#: index.php:97
+msgstr "Annonce de l'Agora"
+
+#: options.php:93
+msgid "Display %s messages per feed"
+msgstr "Afficher %s messages par fil"
+
+#: options.php:104
 msgid "Save configuration"
 msgstr "Enregistrer la configuration"
 
-#: inc/class.agora.php:23
-msgid "pending"
-msgstr "en attente"
-
-#: inc/class.agora.php:24
-msgid "suspended"
-msgstr "suspendu"
-
-#: inc/class.agora.php:25
-msgid "active"
-msgstr "actif"
-
-#: inc/class.agora.php:151
-msgid "Cannot login. Check."
-msgstr "Mauvais login. Vérifier."
-
-#: inc/class.agora.php:155
-msgid "User is not a member of forum"
-msgstr "Cet utilisateur n'est pas membre de l'agora"
-
-#: inc/class.agora.php:190
-msgid "Account confirmation request on Agora"
-msgstr "Demande de compte pour l'agora"
-
-#: inc/class.agora.php:192
-#, php-format
-msgid "Welcome to the forum of %s"
-msgstr "Bienvenue sur le forum de %s"
-
-#: inc/class.agora.php:193
-msgid "To activate your account and verify your e-mail address, please click on the following link:"
-msgstr "Pour activer votre compte et vérifier votre adresse email, cliquez sur le lien suivant :"
-
-#: inc/class.agora.php:197
-msgid "Your indormations:"
-msgstr "Vos informations :"
-
-#: inc/class.agora.php:198
-#, php-format
-msgid "Login: %s"
-msgstr "Utilisateur : %s"
-
-#: inc/class.agora.php:199
-#, php-format
-msgid "Password: %s"
-msgstr "Mot de passe : %s"
-
-#: inc/class.agora.php:200
+#: thread.php:80
+#: thread.php:83
+#: thread.php:86
+msgid "Most used"
+msgstr "Plus utilisées"
+
+#: thread.php:80
+#: thread.php:84
+msgid "Available"
+msgstr "Disponible"
+
+#: thread.php:103
+msgid "This thread does not exist."
+msgstr "Cette discussion n'existe pas."
+
+#: thread.php:134
+msgid "next thread"
+msgstr "discussion suivante"
+
+#: thread.php:141
+msgid "previous thread"
+msgstr "discussion précédente"
+
+#: thread.php:290
+msgid "Are you sure you want to delete this thread?"
+msgstr "Êtes-vous sûr de vouloir supprimer cette discussion ?"
+
+#: thread.php:312
+msgid "Thread has been successfully updated."
+msgstr "La discusssion a été mise à jour avec succès."
+
+#: thread.php:315
+msgid "Thread has been successfully created."
+msgstr "La discussion a été créée avec succès."
+
+#: thread.php:318
+msgid "File has been successfully attached."
+msgstr "Fichier attaché avec succès."
+
+#: thread.php:321
+msgid "Attachment has been successfully removed."
+msgstr "Pièce jointe retirée avec succès."
+
+#: thread.php:331
+msgid "Don't forget to validate your XHTML conversion by saving your post."
+msgstr "Enregistrez votre billet pour valider la transformation en XHTML."
+
+#: thread.php:338
+msgid "View thread"
+msgstr "Visualiser la discussion"
+
+#: thread.php:345
+msgid "Preview thread"
+msgstr "Prévisualier la discussion"
+
+#: thread.php:383
+msgid "Thread status:"
+msgstr "État de la discussion :"
+
+#: thread.php:396
+msgid "Accept messages"
+msgstr "Accepter les messages"
+
+#: thread.php:398
+msgid "Selected thread"
+msgstr "Discussion sélectionnée"
+
+#: thread.php:400
+msgid "Thread lang:"
+msgstr "Langue de la discussion :"
+
+#: thread.php:403
+msgid "Thread password:"
+msgstr "Mot de passe de la discussion :"
+
+#: thread.php:408
+msgid "Basename:"
+msgstr "URL spécifique :"
+
+#: thread.php:412
+msgid "Warning: If you set the URL manually, it may conflict with another thread."
+msgstr "Attention : si vous indiquez l'URL manuellement, celle-ci peut entrer en conflit avec une autre discussion."
+
+#: thread.php:435
+msgid "open"
+msgstr "ouvrir"
+
+#: thread.php:439
+msgid "remove"
+msgstr "supprimer"
+
+#: thread.php:448
+msgid "No attachment."
+msgstr "Aucune pièce jointe"
+
+#: thread.php:450
+msgid "Add files to this page"
+msgstr "Ajouter un fichier à la page"
+
+#: thread.php:465
+msgid "Excerpt:"
+msgstr "Extrait :"
+
+msgid "Forum"
+msgstr "Forum"
+
 msgid "Agora connection:"
 msgstr "Connexion à l'Agora :"
 
-#: inc/class.agora.php:203
-msgid "If you have received this mail in error, you do not need to take any action to cancel the account."
-msgstr ""
-
-#: inc/class.agora.php:204
-msgid "The account will not be activated, and you will not receive any further emails."
-msgstr ""
-
-#: inc/class.agora.php:205
-msgid "If clicking the link above does not work, copy and paste the URL in a new browser window instead."
-msgstr ""
-
-#: inc/class.agora.php:207
-msgid "Thank you for particape to our agora."
-msgstr ""
-
-#: inc/class.agora.php:209
-msgid "This is a post-only mailing. Replies to this message are not monitored or answered."
-msgstr ""
-
-#: inc/class.agora.php:725
-msgid "You are not allowed to close this thread"
-msgstr ""
-
-#: inc/class.agora.php:743
-msgid "You are not allowed to mark this entry as closed"
-msgstr ""
-
-#: inc/class.agora.template.php:339
-msgid "no thread"
-msgstr "aucun sujet"
-
-#: inc/class.agora.template.php:340
-msgid "one thread"
-msgstr "un sujet"
-
-#: inc/class.agora.template.php:341
-#, php-format
-msgid "%d threads"
-msgstr "%d sujets"
-
-#: inc/class.agora.template.php:372
-msgid "no answer"
-msgstr "aucune réponse"
-
-#: inc/class.agora.template.php:373
-msgid "one answer"
-msgstr "une réponse"
-
-#: inc/class.agora.template.php:374
-#, php-format
-msgid "%d answers"
-msgstr "%d réponses"
-
-#: inc/class.agora.log.php:105
-#: inc/class.agora.log.php:111
-#: inc/class.agora.log.php:133
-msgid "No such log ID"
-msgstr ""
-
-#: inc/class.agora.log.php:145
-msgid "No log message"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Login succesfull. You will be redirected automatically to the %s"
-#~ msgstr "Connexion réussie. Se rendre à l' %s"
-
+msgid "no message"
+msgstr "aucun message"
+
+msgid "one message"
+msgstr "un message"
+