Changeset 2715:a87ddf7dbfb5

Timestamp:

05/20/14 08:39:33 (11 years ago)

Author:

Dsls

Branch:

twig

Parents:

2683:fb8aa74332f1 (diff), 2714:eed2e5727277 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with default (admin/post.php still to update with editor preferences, in twig template)

Files:

• admin/index.php (modified) (7 diffs)
• admin/plugin.php (modified) (1 diff)
• admin/plugin.php (modified) (3 diffs)
• admin/post.php (modified) (4 diffs)
• inc/admin/prepend.php (modified) (2 diffs)
• inc/admin/prepend.php (modified) (16 diffs)
• inc/core/class.dc.core.php (modified) (1 diff)
• inc/core/class.dc.core.php (modified) (89 diffs)
• inc/prepend.php (modified) (1 diff)
• inc/prepend.php (modified) (3 diffs)

admin/index.php

@@ -15 +15 @@
      exit;
 }
+if (!empty($_GET['tf'])) {
+     define('DC_CONTEXT_ADMIN',true);
+     require dirname(__FILE__).'/../inc/load_theme_file.php';
+     exit;
+}
 
 require dirname(__FILE__).'/../inc/admin/prepend.php';
@@ -43 +48 @@
 $plugins_install = $core->plugins->installModules();
 
+# Send plugins install messages to templates
+if (!empty($plugins_install['success'])) {
+     $_ctx->addMessagesList(__('Following plugins have been installed:'),$plugins_install['success']);
+}
+if (!empty($plugins_install['failure'])) {
+     $_ctx->addMessagesList(__('Following plugins have not been installed:'),$plugins_install['failure']);
+}
+
+# Send plugins errors messages to templates
+$_ctx->modules_errors = $core->auth->isSuperAdmin() ? $core->plugins->getErrors() : array();
+
+# Send Dotclear updates notifications to tempaltes
+$_ctx->updater = array();
+if ($core->auth->isSuperAdmin() && is_readable(DC_DIGESTS)) {
+
+     $updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions');
+     $new_v = $updater->check(DC_VERSION);
+     $version_info = $new_v ? $updater->getInfoURL() : '';
+
+     if ($updater->getNotify() && $new_v) {
+          $_ctx->updater = array(
+               'new_version'  => $new_v,
+               'version_info' => $version_info
+          );
+     }
+}
+
 # Check dashboard module prefs
 $ws = $core->auth->user_prefs->addWorkspace('dashboard');
+
+# Doclinks prefs
 if (!$core->auth->user_prefs->dashboard->prefExists('doclinks')) {
      if (!$core->auth->user_prefs->dashboard->prefExists('doclinks',true)) {
@@ -51 +85 @@
      $core->auth->user_prefs->dashboard->put('doclinks',true,'boolean');
 }
+
+# Send doclinks to templates
+$_ctx->dashboard_doclinks = array();
+if ($core->auth->user_prefs->dashboard->doclinks && !empty($__resources['doc'])) {
+     $_ctx->dashboard_doclinks = $__resources['doc'];
+}
+
+# Dcnews prefs
 if (!$core->auth->user_prefs->dashboard->prefExists('dcnews')) {
      if (!$core->auth->user_prefs->dashboard->prefExists('dcnews',true)) {
@@ -57 +99 @@
      $core->auth->user_prefs->dashboard->put('dcnews',true,'boolean');
 }
+
+# Send dcnews to templates
+$_ctx->dashboard_dcnews = array();
+if ($core->auth->user_prefs->dashboard->dcnews && !empty($__resources['rss_news'])) {
+     try
+     {
+          $feed_reader = new feedReader;
+          $feed_reader->setCacheDir(DC_TPL_CACHE);
+          $feed_reader->setTimeout(2);
+          $feed_reader->setUserAgent('Dotclear - http://www.dotclear.org/');
+          $feed = $feed_reader->parse($__resources['rss_news']);
+          if ($feed) {
+               $items = array();
+               $i = 1;
+               foreach ($feed->items as $item) {
+                    $items[] = array(
+                         'title' => $item->title,
+                         'link' => isset($item->link) ? $item->link : '',
+                         'date' => dt::dt2str(__('%d %B %Y'),$item->pubdate,'Europe/Paris'),
+                         'content' => html::clean($item->content)
+                    );
+                    $i++;
+                    if ($i > 3) { break; }
+               }
+               $_ctx->dashboard_dcnews = $items;
+          }
+     }
+     catch (Exception $e) {}
+}
+
+# Quick entry prefs
 if (!$core->auth->user_prefs->dashboard->prefExists('quickentry')) {
      if (!$core->auth->user_prefs->dashboard->prefExists('quickentry',true)) {
-          $core->auth->user_prefs->dashboard->put('quickentry',false,'boolean','',null,true);
-     }
-     $core->auth->user_prefs->dashboard->put('quickentry',false,'boolean');
-}
-
-// Handle folded/unfolded sections in admin from user preferences
-$ws = $core->auth->user_prefs->addWorkspace('toggles');
-if (!$core->auth->user_prefs->toggles->prefExists('unfolded_sections')) {
-     $core->auth->user_prefs->toggles->put('unfolded_sections','','string','Folded sections in admin',null,true);
-}
-
+          $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean','',null,true);
+     }
+     $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean');
+}
+
+# Send quick entry to templates
+$_ctx->dashboard_quickentry = false;
+if ($core->auth->user_prefs->dashboard->quickentry &&$core->auth->check('usage,contentadmin',$core->blog->id))
+{
+     $categories_combo = array(' ' => '');
+     try {
+          $categories = $core->blog->getCategories(array('post_type'=>'post'));
+          while ($categories->fetch()) {
+               $categories_combo[$categories->cat_id] =
+                    str_repeat('  ',$categories->level-1).
+                    ($categories->level-1 == 0 ? '' : '• ').
+                    html::escapeHTML($categories->cat_title);
+          }
+     } catch (Exception $e) { }
+
+     $form = new dcForm($core,array('quickentry','quick-entry'),'post.php');
+     $form
+          ->addField(
+               new dcFieldText('post_title','', array(
+                    'size'         => 20,
+                    'required'     => true,
+                    'label'        => __('Title'))))
+          ->addField(
+               new dcFieldTextArea('post_content','', array(
+                    'required'     => true,
+                    'label'        => __("Content:"))))
+          ->addField(
+               new dcFieldCombo('cat_id','',$categories_combo,array(
+                    "label" => __('Category:'))))
+          ->addField(
+               new dcFieldSubmit('save',__('Save'),array(
+                    'action' => 'savePost')))
+          ->addField(
+               new dcFieldHidden ('post_status',-2))
+          ->addField(
+               new dcFieldHidden ('post_format',$core->auth->getOption('post_format')))
+          ->addField(
+               new dcFieldHidden ('post_excerpt',''))
+          ->addField(
+               new dcFieldHidden ('post_lang',$core->auth->getInfo('user_lang')))
+          ->addField(
+               new dcFieldHidden ('post_notes',''))
+     ;
+     if ($core->auth->check('publish',$core->blog->id)) {
+          $form->addField(
+               new dcFieldHidden ('save-publish',__('Save and publish')));
+     }
+
+     $_ctx->dashboard_quickentry = true;
+}
 
 # Dashboard icons
@@ -76 +193 @@
 $favs = $core->favs->getUserFavorites();
 $core->favs->appendDashboardIcons($__dashboard_icons);
+
 
 # Check plugins and themes update from repository
@@ -101 +219 @@
 
 $dashboardItem = 0;
+
 
 if ($core->auth->user_prefs->dashboard->dcnews) {
@@ -168 +287 @@
 $core->callBehavior('adminDashboardContents', $core, $__dashboard_contents);
 
-/* DISPLAY
--------------------------------------------------------- */
-dcPage::open(__('Dashboard'),
-     dcPage::jsLoad('js/_index.js').
-     $core->callBehavior('adminPostEditor').
-     # --BEHAVIOR-- adminDashboardHeaders
-     $core->callBehavior('adminDashboardHeaders'),
-     dcPage::breadcrumb(
-          array(
-          __('Dashboard').' : '.html::escapeHTML($core->blog->name) => ''
-          ),
-          array('home_link' =>false)
-     )
-);
-
-# Dotclear updates notifications
-if ($core->auth->isSuperAdmin() && is_readable(DC_DIGESTS))
-{
-     $updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions');
-     $new_v = $updater->check(DC_VERSION);
-     $version_info = $new_v ? $updater->getInfoURL() : '';
-
-     if ($updater->getNotify() && $new_v) {
-          echo
-          '<div class="dc-update"><h3>'.sprintf(__('Dotclear %s is available!'),$new_v).'</h3> '.
-          '<p><a class="button submit" href="update.php">'.sprintf(__('Upgrade now'),$new_v).'</a> '.
-          '<a class="button" href="update.php?hide_msg=1">'.__('Remind me later').'</a>'.
-          ($version_info ? ' </p>'.
-          '<p class="updt-info"><a href="'.$version_info.'">'.__('Information about this version').'</a>' : '').'</p>'.
-          '</div>';
-     }
-}
-
-if ($core->auth->getInfo('user_default_blog') != $core->blog->id && $core->auth->getBlogCount() > 1) {
-     echo
-     '<p><a href="index.php?default_blog=1" class="button">'.__('Make this blog my default blog').'</a></p>';
-}
-
+# Blog status message
 if ($core->blog->status == 0) {
-     echo '<p class="static-msg">'.__('This blog is offline').'.</p>';
+     $_ctx->addMessageStatic(__('This blog is offline'));
 } elseif ($core->blog->status == -1) {
-     echo '<p class="static-msg">'.__('This blog is removed').'.</p>';
-}
-
+     $_ctx->addMessageStatic(__('This blog is removed'));
+}
+
+# Config errors messages
 if (!defined('DC_ADMIN_URL') || !DC_ADMIN_URL) {
-     echo
-     '<p class="static-msg">'.
-     sprintf(__('%s is not defined, you should edit your configuration file.'),'DC_ADMIN_URL').
-     ' '.__('See <a href="http://dotclear.org/documentation/2.0/admin/config">documentation</a> for more information.').
-     '</p>';
-}
-
+     $_ctx->addMessageStatic(
+          sprintf(__('%s is not defined, you should edit your configuration file.'),'DC_ADMIN_URL').' '.
+          __('See <a href="http://dotclear.org/documentation/2.0/admin/config">documentation</a> for more information.')
+     );
+}
 if (!defined('DC_ADMIN_MAILFROM') || !DC_ADMIN_MAILFROM) {
-     echo
-     '<p class="static-msg">'.
-     sprintf(__('%s is not defined, you should edit your configuration file.'),'DC_ADMIN_MAILFROM').
-     ' '.__('See <a href="http://dotclear.org/documentation/2.0/admin/config">documentation</a> for more information.').
-     '</p>';
-}
-
-$err = array();
-
-# Check cache directory
-if ( $core->auth->isSuperAdmin() ) {
-     if (!is_dir(DC_TPL_CACHE) || !is_writable(DC_TPL_CACHE)) {
-          $err[] = '<p>'.__("The cache directory does not exist or is not writable. You must create this directory with sufficient rights and affect this location to \"DC_TPL_CACHE\" in inc/config.php file.").'</p>';
-     }
-} else {
-     if (!is_dir(DC_TPL_CACHE) || !is_writable(DC_TPL_CACHE)) {
-          $err[] = '<p>'.__("The cache directory does not exist or is not writable. You should contact your administrator.").'</p>';
-     }
-}
-
-# Check public directory
-if ( $core->auth->isSuperAdmin() ) {
-     if (!is_dir($core->blog->public_path) || !is_writable($core->blog->public_path)) {
-          $err[] = '<p>'.__("There is no writable directory /public/ at the location set in about:config \"public_path\". You must create this directory with sufficient rights (or change this setting).").'</p>';
-     }
-} else {
-     if (!is_dir($core->blog->public_path) || !is_writable($core->blog->public_path)) {
-          $err[] = '<p>'.__("There is no writable root directory for the media manager. You should contact your administrator.").'</p>';
-     }
-}
-
-# Error list
-if (count($err) > 0) {
-     echo '<div class="error"><p><strong>'.__('Error:').'</strong></p>'.
-     '<ul><li>'.implode("</li><li>",$err).'</li></ul></div>';
-}
-
-# Plugins install messages
-if (!empty($plugins_install['success']))
-{
-     echo '<div class="success">'.__('Following plugins have been installed:').'<ul>';
-     foreach ($plugins_install['success'] as $k => $v) {
-          echo '<li>'.$k.'</li>';
-     }
-     echo '</ul></div>';
-}
-if (!empty($plugins_install['failure']))
-{
-     echo '<div class="error">'.__('Following plugins have not been installed:').'<ul>';
-     foreach ($plugins_install['failure'] as $k => $v) {
-          echo '<li>'.$k.' ('.$v.')</li>';
-     }
-     echo '</ul></div>';
-}
-# Errors modules notifications
-if ($core->auth->isSuperAdmin())
-{
-     $list = $core->plugins->getErrors();
-     if (!empty($list)) {
-          echo
-          '<div class="error" id="module-errors" class="error"><p>'.__('Errors have occured with following plugins:').'</p> '.
-          '<ul><li>'.implode("</li>\n<li>", $list).'</li></ul></div>';
-     }
-}
-
-# Dashboard columns (processed first, as we need to know the result before displaying the icons.)
-$dashboardItems = '';
-
-foreach ($__dashboard_items as $i)
-{
-     if ($i->count() > 0)
-     {
-          $dashboardItems .= '';
-          foreach ($i as $v) {
-               $dashboardItems .= $v;
-          }
-          $dashboardItems .= '';
-     }
-}
-
-# Dashboard elements
-echo '<div id="dashboard-main">';
-
-# Dashboard icons
-echo '<div id="icons">';
-foreach ($__dashboard_icons as $i)
-{
-     echo
-     '<p><a href="'.$i[1].'"><img src="'.dc_admin_icon_url($i[2]).'" alt="" />'.
-     '<br /><span>'.$i[0].'</span></a></p>';
-}
-echo '</div>';
-
-if ($core->auth->user_prefs->dashboard->quickentry) {
-     if ($core->auth->check('usage,contentadmin',$core->blog->id))
-     {
-          # Getting categories
-          $categories_combo = dcAdminCombos::getCategoriesCombo(
-               $core->blog->getCategories(array('post_type'=>'post'))
-          );
-
-          echo
-          '<div id="quick">'.
-          '<h3>'.__('Quick entry').'</h3>'.
-          '<form id="quick-entry" action="'.$core->adminurl->get('admin.post').'" method="post" class="fieldset">'.
-          '<h4>'.__('New entry').'</h4>'.
-          '<p class="col"><label for="post_title" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label>'.
-          form::field('post_title',20,255,'','maximal').
-          '</p>'.
-          '<p class="area"><label class="required" '.
-          'for="post_content"><abbr title="'.__('Required field').'">*</abbr> '.__('Content:').'</label> '.
-          form::textarea('post_content',50,10).
-          '</p>'.
-          '<p><label for="cat_id" class="classic">'.__('Category:').'</label> '.
-          form::combo('cat_id',$categories_combo).'</p>'.
-          ($core->auth->check('categories', $core->blog->id)
-               ? '<div>'.
-               '<p id="new_cat" class="q-cat">'.__('Add a new category').'</p>'.
-               '<p class="q-cat"><label for="new_cat_title">'.__('Title:').'</label> '.
-               form::field('new_cat_title',30,255,'','').'</p>'.
-               '<p class="q-cat"><label for="new_cat_parent">'.__('Parent:').'</label> '.
-               form::combo('new_cat_parent',$categories_combo,'','').
-               '</p>'.
-               '<p class="form-note info clear">'.__('This category will be created when you will save your post.').'</p>'.
-               '</div>'
-               : '').
-          '<p><input type="submit" value="'.__('Save').'" name="save" /> '.
-          ($core->auth->check('publish',$core->blog->id)
-               ? '<input type="hidden" value="'.__('Save and publish').'" name="save-publish" />'
-               : '').
-          $core->formNonce().
-          form::hidden('post_status',-2).
-          form::hidden('post_format',$core->auth->getOption('post_format')).
-          form::hidden('post_excerpt','').
-          form::hidden('post_lang',$core->auth->getInfo('user_lang')).
-          form::hidden('post_notes','').
-          '</p>'.
-          '</form>'.
-          '</div>';
-     }
-}
-
-foreach ($__dashboard_contents as $i)
-{
-     if ($i->count() > 0)
-     {
-          $dashboardContents .= '';
-          foreach ($i as $v) {
-               $dashboardContents .= $v;
-          }
-          $dashboardContents .= '';
-     }
-}
-
-if ($dashboardContents != '' || $dashboardItems != '') {
-     echo
-     '<div id="dashboard-boxes">'.
-     '<div class="db-items">'.$dashboardItems.$dashboardContents.'</div>'.
-     '</div>';
-}
-
-echo '</div>'; #end dashboard-main
-dcPage::helpBlock('core_dashboard');
-dcPage::close();
+     $_ctx->addMessageStatic(
+          sprintf(__('%s is not defined, you should edit your configuration file.'),'DC_ADMIN_MAILFROM').' '.
+          __('See <a href="http://dotclear.org/documentation/2.0/admin/config">documentation</a> for more information.')
+     );
+}
+$_ctx->dashboard_icons = $__dashboard_icons;
+//print_r($__dashboard_icons);exit;
+$_ctx->setBreadCrumb(__('Dashboard').' : '.html::escapeHTML($core->blog->name), false);
+$core->tpl->display('index.html.twig');
+?>

admin/plugin.php

@@ -35 +35 @@
      
      $p_info = $core->plugins->getModules($p);
+     $p_name = $p;
      $p_url = 'plugin.php?p='.$p;
      $p_title = $p_head = $p_content = '';

admin/plugin.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -15 +15 @@
 dcPage::check('usage,contentadmin');
 
+$has_content = false;
 $p_file = '';
 $p = !empty($_REQUEST['p']) ? $_REQUEST['p'] : null;
-$popup = (integer) !empty($_REQUEST['popup']);
-
-if ($popup) {
-     $open_f = array('dcPage','openPopup');
-     $close_f = array('dcPage','closePopup');
-} else {
-     $open_f = array('dcPage','open');
-     $close_f = array('dcPage','close');
-}
+$popup = $_ctx->popup = (integer) !empty($_REQUEST['popup']);
 
 if ($core->plugins->moduleExists($p)) {
      $p_file = $core->plugins->moduleRoot($p).'/index.php';
 }
+if (file_exists($p_file)) {
 
-if (file_exists($p_file))
-{
-     # Loading plugin
+//* Keep this for old style plugins using dcPage
+     if ($popup) {
+          $open_f = array('dcPage','openPopup');
+          $close_f = array('dcPage','closePopup');
+     } else {
+          $open_f = array('dcPage','open');
+          $close_f = array('dcPage','close');
+     }
+     
      $p_info = $core->plugins->getModules($p);
-
      $p_name = $p;
      $p_url = 'plugin.php?p='.$p;
-
-     $p_title = 'no content - plugin';
-     $p_head = '';
-     $p_content = '<p>'.__('No content found on this plugin.').'</p>';
-
+     $p_title = $p_head = $p_content = '';
+//*/ 
+     # Get page content
      ob_start();
      include $p_file;
@@ -48 +45 @@
      ob_end_clean();
 
-     if (preg_match('|<head>(.*?)</head|ms',$res,$m)) {
-          if (preg_match('|<title>(.*?)</title>|ms',$m[1],$mt)) {
-               $p_title = $mt[1];
-          }
-
-          if (preg_match_all('|(<script.*?>.*?</script>)|ms',$m[1],$ms)) {
-               foreach ($ms[1] as $v) {
-                    $p_head .= $v."\n";
+     # Check context and display
+     if ($_ctx->hasPageTitle() && !empty($res)) {
+          $has_content = true;
+          echo $res;
+     }
+//* Keep this for old style plugins using dcPage
+     elseif (!$_ctx->hasPageTitle()) {
+          
+          if (preg_match('|<head>(.*?)</head|ms',$res,$m)) {
+               if (preg_match('|<title>(.*?)</title>|ms',$m[1],$mt)) {
+                    $p_title = $mt[1];
+               }
+               
+               if (preg_match_all('|(<script.*?>.*?</script>)|ms',$m[1],$ms)) {
+                    foreach ($ms[1] as $v) {
+                         $p_head .= $v."\n";
+                    }
+               }
+               
+               if (preg_match_all('|(<style.*?>.*?</style>)|ms',$m[1],$ms)) {
+                    foreach ($ms[1] as $v) {
+                         $p_head .= $v."\n";
+                    }
+               }
+               
+               if (preg_match_all('|(<link.*?/>)|ms',$m[1],$ms)) {
+                    foreach ($ms[1] as $v) {
+                         $p_head .= $v."\n";
+                    }
                }
           }
-
-          if (preg_match_all('|(<style.*?>.*?</style>)|ms',$m[1],$ms)) {
-               foreach ($ms[1] as $v) {
-                    $p_head .= $v."\n";
-               }
-          }
-
-          if (preg_match_all('|(<link.*?/>)|ms',$m[1],$ms)) {
-               foreach ($ms[1] as $v) {
-                    $p_head .= $v."\n";
-               }
+          
+          if (preg_match('|<body.*?>(.+)</body>|ms',$res,$m)) {
+               $p_content = $m[1];
+               
+               call_user_func($open_f,$p_title,$p_head);
+               echo $p_content;
+               call_user_func($close_f);
+               
+               $has_content = true;
           }
      }
-
-     if (preg_match('|<body.*?>(.+)</body>|ms',$res,$m)) {
-          $p_content = $m[1];
-     }
-
-     call_user_func($open_f,$p_title,$p_head);
-     echo $p_content;
-     call_user_func($close_f);
+//*/
 }
-else
-{
-     call_user_func($open_f,__('Plugin not found'),'',
-          dcPage::breadcrumb(
-               array(
-                    __('System') => '',
-                    __('Plugin not found') => ''
-               ))
-     );
-
-     echo '<p>'.__('The plugin you reached does not exist or does not have an admin page.').'</p>';
-
-     call_user_func($close_f);
+# No plugin or content found
+if (!$has_content) {
+     $_ctx->setBreadcrumb(__('Plugin not found'));
+     $_ctx->addError(__('The plugin you reached does not exist or does not have an admin page.'));
+     $core->tpl->display('plugin.html.twig');
 }
+?>

admin/post.php

@@ -15 +15 @@
 dcPage::check('usage,contentadmin');
 
-$post_id = '';
-$cat_id = '';
-$post_dt = '';
-$post_format = $core->auth->getOption('post_format');
-$post_editor = $core->auth->getOption('editor');
-$post_password = '';
-$post_url = '';
-$post_lang = $core->auth->getInfo('user_lang');
-$post_title = '';
-$post_excerpt = '';
-$post_excerpt_xhtml = '';
-$post_content = '';
-$post_content_xhtml = '';
-$post_notes = '';
-$post_status = $core->auth->getInfo('user_post_status');
-$post_selected = false;
-$post_open_comment = $core->blog->settings->system->allow_comments;
-$post_open_tb = $core->blog->settings->system->allow_trackbacks;
+class PostActions 
+{
+     public static function savePost($form) {
+          global $_ctx, $core;
+          if (!$form->can_edit_post) {
+               return;
+          }
+          try {
+               $form->check($_ctx);
+               $form->cat_id = (integer) $form->cat_id;
+     
+               if (!empty($form->post_dt)) {
+                    try
+                    {
+                         $post_dt = strtotime($form->post_dt);
+                         if ($post_dt == false || $post_dt == -1) {
+                              $bad_dt = true;
+                              throw new Exception(__('Invalid publication date'));
+                         }
+                         $form->post_dt = date('Y-m-d H:i',$post_dt);
+                    }
+                    catch (Exception $e)
+                    {
+                         $core->error->add($e->getMessage());
+                    }
+               }
+               $post_excerpt = $form->post_excerpt;
+               $post_content = $form->post_content;
+               $post_excerpt_xhtml = '';
+               $post_content_xhtml = '';
+               $core->blog->setPostContent(
+                    $form->id,$form->post_format,$form->post_lang,
+                    $post_excerpt,$post_excerpt_xhtml,$post_content,$post_content_xhtml
+               );
+               $form->post_excerpt = $post_excerpt;
+               $form->post_content = $post_content;
+               $form->post_excerpt_xhtml = $post_excerpt_xhtml;
+               $form->post_content_xhtml = $post_content_xhtml;
+               
+               $cur = $core->con->openCursor($core->prefix.'post');
+     
+               $cur->post_title = $form->post_title;
+               $cur->cat_id = $form->cat_id ? $form->cat_id : null;
+               $cur->post_dt = $form->post_dt ? date('Y-m-d H:i:00',strtotime($form->post_dt)) : '';
+               $cur->post_format = $form->post_format;
+               $cur->post_password = $form->post_password;
+               $cur->post_lang = $form->post_lang;
+               $cur->post_title = $form->post_title;
+               $cur->post_excerpt = $form->post_excerpt;
+               $cur->post_excerpt_xhtml = $form->post_excerpt_xhtml;
+               $cur->post_content = $form->post_content;
+               $cur->post_content_xhtml = $form->post_content_xhtml;
+               $cur->post_notes = $form->post_notes;
+               $cur->post_status = $form->post_status;
+               $cur->post_selected = (integer) $form->post_selected;
+               $cur->post_open_comment = (integer) $form->post_open_comment;
+               $cur->post_open_tb = (integer) $form->post_open_tb;
+     
+               if (!empty($form->post_url)) {
+                    $cur->post_url = $form->post_url;
+               }
+     
+               # Update post
+               if ($form->id)
+               {
+                    # --BEHAVIOR-- adminBeforePostUpdate
+                    $core->callBehavior('adminBeforePostUpdate',$cur,$form->id);
+                    
+                    $core->blog->updPost($form->id,$cur);
+                    
+                    # --BEHAVIOR-- adminAfterPostUpdate
+                    $core->callBehavior('adminAfterPostUpdate',$cur,$form->id);
+                    http::redirect('post.php?id='.$form->id.'&upd=1');
+               }
+               else
+               {
+                    $cur->user_id = $core->auth->userID();
+                                        # --BEHAVIOR-- adminBeforePostCreate
+                    $core->callBehavior('adminBeforePostCreate',$cur);
+                    
+                    $return_id = $core->blog->addPost($cur);
+                    
+                    # --BEHAVIOR-- adminAfterPostCreate
+                    $core->callBehavior('adminAfterPostCreate',$cur,$return_id);
+                    
+                    http::redirect('post.php?id='.$return_id.'&crea=1');
+               }
+
+          } catch (Exception $e) {
+               $_ctx->addError($e->getMessage());
+          }
+     }
+     public static function deletePost($form) {
+          global $core,$_ctx;
+          if ($form->can_delete) {
+               try {
+                    $post_id = $form->id;
+                    $core->callBehavior('adminBeforePostDelete',$post_id);
+                    $core->blog->delPost($post_id);
+                    http::redirect('posts.php');
+                    exit;
+               } catch (Exception $e) {
+                    $_ctx->addError($e->getMessage());
+               }
+          }
+     }
+}
 
 $page_title = __('New entry');
-
+$post_id='';
 $can_view_page = true;
 $can_edit_post = $core->auth->check('usage,contentadmin',$core->blog->id);
@@ -41 +130 @@
 $can_delete = false;
 
-$post_headlink = '<link rel="%s" title="%s" href="'.$core->adminurl->get('admin.post',array('id' => "%s"),'&').'" />';
-$post_link = '<a href="'.$core->adminurl->get('admin.post',array('id' => "%s"),'&').'" title="%s">%s</a>';
+$post_headlink = '<link rel="%s" title="%s" href="post.php?id=%s" />';
+$post_link = '<a href="post.php?id=%s" title="%s">%s</a>';
 
 $next_link = $prev_link = $next_headlink = $prev_headlink = null;
@@ -48 +137 @@
 # If user can't publish
 if (!$can_publish) {
-     $post_status = -2;
+     $form->post_status = -2;
 }
 
 # Getting categories
-$categories_combo = dcAdminCombos::getCategoriesCombo(
-     $core->blog->getCategories(array('post_type'=>'post'))
-);
-
-$status_combo = dcAdminCombos::getPostStatusesCombo();
-
-$img_status_pattern = '<img class="img_select_option" alt="%1$s" title="%1$s" src="images/%2$s" />';
+$categories_combo = array('&nbsp;' => '');
+try {
+     $categories = $core->blog->getCategories(array('post_type'=>'post'));
+     while ($categories->fetch()) {
+          $categories_combo[$categories->cat_id] = 
+               str_repeat('&nbsp;&nbsp;',$categories->level-1).
+               ($categories->level-1 == 0 ? '' : '&bull; ').
+               html::escapeHTML($categories->cat_title);
+     }
+} catch (Exception $e) { }
+
+# Status combo
+foreach ($core->blog->getAllPostStatus() as $k => $v) {
+     $status_combo[$k] = $v;
+}
 
 # Formaters combo
-$formaters_combo = dcAdminCombos::getFormatersCombo();
-foreach ($formaters_combo as $editor => $formats) {
-     foreach ($formats as $format) {
-          $formaters_combo[$editor][$format] = "$editor:$format";
-     }
+foreach ($core->getFormaters() as $v) {
+     $formaters_combo[$v] = $v;
 }
 
 # Languages combo
 $rs = $core->blog->getLangs(array('order'=>'asc'));
-$lang_combo = dcAdminCombos::getLangsCombo($rs,true);
-
-# Validation flag
-$bad_dt = false;
-
-# Trackbacks
-$TB = new dcTrackback($core);
-$tb_urls = $tb_excerpt = '';
-
-if (count($formaters_combo)==0 || !$core->auth->getOption('editor') || $core->auth->getOption('editor')=='') {
-     dcPage::addNotice("message", 
-                           sprintf(__('Choose an active editor in %s.'), 
-                                          '<a href="preferences.php#user-options">'.__('your preferences').'</a>'
-                                          )
-                           );
-}
-
+$all_langs = l10n::getISOcodes(0,1);
+$lang_combo = array('' => '', __('Most used') => array(), __('Available') => l10n::getISOcodes(0,1));
+while ($rs->fetch()) {
+     if (isset($all_langs[$rs->post_lang])) {
+          $lang_combo[__('Most used')][$rs->post_lang] = $all_langs[$rs->post_lang];
+          unset($lang_combo[__('Available')][$rs->post_lang]);
+     } else {
+          $lang_combo[__('Most used')][$rs->post_lang] = $all_langs[$rs->post_lang];
+     }
+}
+unset($all_langs);
+unset($rs);
+
+$form = new dcForm($core,'post','post.php');
+$form
+     ->addField(
+          new dcFieldText('post_title','', array(
+               'maxlength'         => 255,
+               'required'     => true,
+               'label'        => __('Title:'))))
+     ->addField(
+          new dcFieldTextArea('post_excerpt','', array(
+               'cols'         => 50,
+               'rows'         => 5,
+               'label'        => __("Excerpt:").'<span class="form-note">'.
+               __('Add an introduction to the post.').'</span>')))
+     ->addField(
+          new dcFieldTextArea('post_content','', array(
+               'required'     => true,
+               'label'        => __("Content:"))))
+     ->addField(
+          new dcFieldTextArea('post_notes','', array(
+               'label'        => __("Notes"))))
+     ->addField(
+          new dcFieldSubmit('save',__('Save'),array(
+               'action' => array('PostActions','savePost'))))
+     ->addField(
+          new dcFieldSubmit('delete',__('Delete'),array(
+               'action' => array('PostActions','deletePost'))))
+     ->addField(
+          new dcFieldCombo('post_status',$core->auth->getInfo('user_post_status'),$status_combo,array(
+               'disabled' => !$can_publish,
+               'label' => __('Entry status'))))
+     ->addField(
+          new dcFieldCombo('cat_id','',$categories_combo,array(
+               "label" => __('Category'))))
+     ->addField(
+          new dcFieldCombo('new_cat_parent','',$categories_combo,array(
+               "label" => __('Parent:'))))
+     ->addField(
+          new dcFieldText('new_cat_title','', array(
+               'maxlength'         => 255,
+               'label'        => __('Title'))))
+          
+     ->addField(
+          new dcFieldText('post_dt','',array(
+               "label" => __('Publication date and hour'))))
+     ->addField(
+          new dcFieldCombo('post_format',$core->auth->getOption('post_format'),$formaters_combo,array(
+               "label" => __('Text formating'))))
+     ->addField(
+          new dcFieldCheckbox ('post_open_comment',$core->blog->settings->system->allow_comments,array(
+               "label" => __('Accept comments'))))
+     ->addField(
+          new dcFieldCheckbox ('post_open_tb',$core->blog->settings->system->allow_trackbacks,array(
+               "label" => __('Accept trackbacks'))))
+     ->addField(
+          new dcFieldCheckbox ('post_selected',array(1=>false),array(
+               "label" => __('Selected entry'))))
+     ->addField(
+          new dcFieldCombo ('post_lang',$core->auth->getInfo('user_lang'),$lang_combo, array(
+               "label" => __('Entry lang:'))))
+     ->addField(
+          new dcFieldText('post_password','',array(
+               "maxlength" => 32,
+               "label" => __('Entry password:'))))
+     ->addField(
+          new dcFieldText('post_url','',array(
+               "maxlength" => 255,
+               "label" => __('Basename:'))))
+     ->addField(
+          new dcFieldHidden ('id',''))
+;
 # Get entry informations
-if (!empty($_REQUEST['id'])) {
-     $page_title = __('Edit entry');
-
+if (!empty($_REQUEST['id']))
+{
      $params['post_id'] = $_REQUEST['id'];
-
+     
      $post = $core->blog->getPosts($params);
-
-     if ($post->isEmpty()) {
+     
+     if ($post->isEmpty())
+     {
           $core->error->add(__('This entry does not exist.'));
           $can_view_page = false;
-     } else {
-          $post_id = $post->post_id;
-          $cat_id = $post->cat_id;
-          $post_dt = date('Y-m-d H:i',strtotime($post->post_dt));
-          $post_format = $post->post_format;
-        # try to retrieve editor from post meta
-        $meta_editor = $core->meta->getMetaStr($post->post_meta,'editor');
-        if (!empty($meta_editor)) {
-            $post_editor = $meta_editor;
-        }
-          $post_password = $post->post_password;
-          $post_url = $post->post_url;
-          $post_lang = $post->post_lang;
-          $post_title = $post->post_title;
-          $post_excerpt = $post->post_excerpt;
-          $post_excerpt_xhtml = $post->post_excerpt_xhtml;
-          $post_content = $post->post_content;
-          $post_content_xhtml = $post->post_content_xhtml;
-          $post_notes = $post->post_notes;
-          $post_status = $post->post_status;
-          $post_selected = (boolean) $post->post_selected;
-          $post_open_comment = (boolean) $post->post_open_comment;
-          $post_open_tb = (boolean) $post->post_open_tb;
-
-          $can_edit_post = $post->isEditable();
-          $can_delete= $post->isDeletable();
-
+     }
+     else
+     {
+          $form->id = $post_id = $post->post_id;
+          $form->cat_id = $post->cat_id;
+          $form->post_dt = date('Y-m-d H:i',strtotime($post->post_dt));
+          $form->post_format = $post->post_format;
+          $form->post_password = $post->post_password;
+          $form->post_url = $post->post_url;
+          $form->post_lang = $post->post_lang;
+          $form->post_title = $post->post_title;
+          $form->post_excerpt = $post->post_excerpt;
+          $form->post_excerpt_xhtml = $post->post_excerpt_xhtml;
+          $form->post_content = $post->post_content;
+          $form->post_content_xhtml = $post->post_content_xhtml;
+          $form->post_notes = $post->post_notes;
+          $form->post_status = $post->post_status;
+          $form->post_selected = (boolean) $post->post_selected;
+          $form->post_open_comment = (boolean) $post->post_open_comment;
+          $form->post_open_tb = (boolean) $post->post_open_tb;
+          $form->can_edit_post = $post->isEditable();
+          $form->can_delete= $post->isDeletable();
           $next_rs = $core->blog->getNextPost($post,1);
           $prev_rs = $core->blog->getNextPost($post,-1);
-
+          
           if ($next_rs !== null) {
-               $next_link = sprintf($post_link,$next_rs->post_id,
-                    html::escapeHTML($next_rs->post_title),__('Next entry').'&nbsp;&#187;');
-               $next_headlink = sprintf($post_headlink,'next',
-                    html::escapeHTML($next_rs->post_title),$next_rs->post_id);
-          }
-
+               $_ctx->next_post = array('id' => $next_rs->post_id,'title' => $next_rs->post_title);
+          }
           if ($prev_rs !== null) {
-               $prev_link = sprintf($post_link,$prev_rs->post_id,
-                    html::escapeHTML($prev_rs->post_title),'&#171;&nbsp;'.__('Previous entry'));
-               $prev_headlink = sprintf($post_headlink,'previous',
-                    html::escapeHTML($prev_rs->post_title),$prev_rs->post_id);
-          }
-
-          try {
-               $core->media = new dcMedia($core);
-          } catch (Exception $e) {
-               $core->error->add($e->getMessage());
-          }
-
-          # Sanitize trackbacks excerpt
-          $tb_excerpt = empty($_POST['tb_excerpt']) ?
-               $post_excerpt_xhtml.' '.$post_content_xhtml :
-               $_POST['tb_excerpt'];
-          $tb_excerpt = html::decodeEntities(html::clean($tb_excerpt));
-          $tb_excerpt = text::cutString(html::escapeHTML($tb_excerpt), 255);
-          $tb_excerpt = preg_replace('/\s+/ms', ' ', $tb_excerpt);
-     }
-}
-if (isset($_REQUEST['section']) && $_REQUEST['section']=='trackbacks') {
-     $anchor = 'trackbacks';
-} else {
-     $anchor = 'comments';
-}
-
-$comments_actions_page = new dcCommentsActionsPage($core,$core->adminurl->get('admin.post'),array('id' => $post_id, '_ANCHOR'=>$anchor,'section' => $anchor));
-
-if ($comments_actions_page->process()) {
-     return;
-}
-
-# Ping blogs
-if (!empty($_POST['ping']))
-{
-     if (!empty($_POST['tb_urls']) && $post_id && $post_status == 1 && $can_edit_post)
-     {
-          $tb_urls = $_POST['tb_urls'];
-          $tb_urls = str_replace("\r", '', $tb_urls);
-          $tb_post_title = html::escapeHTML(trim(html::clean($post_title)));
-          $tb_post_url = $post->getURL();
-
-          foreach (explode("\n", $tb_urls) as $tb_url)
-          {
-               try {
-                    $TB->ping($tb_url, $post_id, $tb_post_title, $tb_excerpt, $tb_post_url);
-               } catch (Exception $e) {
-                    $core->error->add($e->getMessage());
-               }
-          }
-
-          if (!$core->error->flag()) {
-               dcPage::addSuccessNotice(__('All pings sent.'));
-               http::redirect($core->adminurl->get(
-                    'admin.post',
-                    array('id' => $post_id, 'tb'=> '1')
-               ));
-          }
-     }
-}
-
-# Format excerpt and content
-elseif (!empty($_POST) && $can_edit_post) {
-
-     if (strpos($_POST['post_format'], ':')!==false) {
-          list($post_editor, $post_format) = explode(':', $_POST['post_format']);
-     } else {
-          $post_format = $_POST['post_format'];
-          $post_editor = '';
-     }
-
-     $post_excerpt = $_POST['post_excerpt'];
-     $post_content = $_POST['post_content'];
-
-     $post_title = $_POST['post_title'];
-
-     $cat_id = (integer) $_POST['cat_id'];
-
-     if (isset($_POST['post_status'])) {
-          $post_status = (integer) $_POST['post_status'];
-     }
-
-     if (empty($_POST['post_dt'])) {
-          $post_dt = '';
-     } else {
-          try
-          {
-               $post_dt = strtotime($_POST['post_dt']);
-               if ($post_dt == false || $post_dt == -1) {
-                    $bad_dt = true;
-                    throw new Exception(__('Invalid publication date'));
-               }
-               $post_dt = date('Y-m-d H:i',$post_dt);
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
-          }
-     }
-
-     $post_open_comment = !empty($_POST['post_open_comment']);
-     $post_open_tb = !empty($_POST['post_open_tb']);
-     $post_selected = !empty($_POST['post_selected']);
-     $post_lang = $_POST['post_lang'];
-     $post_password = !empty($_POST['post_password']) ? $_POST['post_password'] : null;
-
-     $post_notes = $_POST['post_notes'];
-
-     if (isset($_POST['post_url'])) {
-          $post_url = $_POST['post_url'];
-     }
-
-     $core->blog->setPostContent(
-          $post_id,$post_format,$post_lang,
-          $post_excerpt,$post_excerpt_xhtml,$post_content,$post_content_xhtml
-     );
-}
-
-# Delete post
-if (!empty($_POST['delete']) && $can_delete)
-{
-     try {
-          # --BEHAVIOR-- adminBeforePostDelete
-          $core->callBehavior('adminBeforePostDelete',$post_id);
-          $core->blog->delPost($post_id);
-          http::redirect('posts.php');
-     } catch (Exception $e) {
-          $core->error->add($e->getMessage());
-     }
-}
-
-# Create or update post
-if (!empty($_POST) && !empty($_POST['save']) && $can_edit_post && !$bad_dt)
-{
-     # Create category
-     if (!empty($_POST['new_cat_title']) && $core->auth->check('categories', $core->blog->id)) {
-
-          $cur_cat = $core->con->openCursor($core->prefix.'category');
-          $cur_cat->cat_title = $_POST['new_cat_title'];
-          $cur_cat->cat_url = '';
-
-          $parent_cat = !empty($_POST['new_cat_parent']) ? $_POST['new_cat_parent'] : '';
-
-          # --BEHAVIOR-- adminBeforeCategoryCreate
-          $core->callBehavior('adminBeforeCategoryCreate', $cur_cat);
-
-          $cat_id = $core->blog->addCategory($cur_cat, (integer) $parent_cat);
-
-          # --BEHAVIOR-- adminAfterCategoryCreate
-          $core->callBehavior('adminAfterCategoryCreate', $cur_cat, $cat_id);
-     }
-
-     $cur = $core->con->openCursor($core->prefix.'post');
-
-     $cur->post_title = $post_title;
-     $cur->cat_id = ($cat_id ? $cat_id : null);
-     $cur->post_dt = $post_dt ? date('Y-m-d H:i:00',strtotime($post_dt)) : '';
-     $cur->post_format = $post_format;
-     $cur->post_meta = serialize(array('editor' => $post_editor));
-     $cur->post_password = $post_password;
-     $cur->post_lang = $post_lang;
-     $cur->post_title = $post_title;
-     $cur->post_excerpt = $post_excerpt;
-     $cur->post_excerpt_xhtml = $post_excerpt_xhtml;
-     $cur->post_content = $post_content;
-     $cur->post_content_xhtml = $post_content_xhtml;
-     $cur->post_notes = $post_notes;
-     $cur->post_status = $post_status;
-     $cur->post_selected = (integer) $post_selected;
-     $cur->post_open_comment = (integer) $post_open_comment;
-     $cur->post_open_tb = (integer) $post_open_tb;
-
-     if (isset($_POST['post_url'])) {
-          $cur->post_url = $post_url;
-     }
-
-     # Update post
-     if ($post_id) {
-          try {
-            $meta = $core->meta;
-            $meta->delPostMeta($post_id,'editor');
-            $meta->setPostMeta($post_id,'editor',$post_editor);
-
-               # --BEHAVIOR-- adminBeforePostUpdate
-               $core->callBehavior('adminBeforePostUpdate',$cur,$post_id);
-
-               $core->blog->updPost($post_id,$cur);
-
-               # --BEHAVIOR-- adminAfterPostUpdate
-               $core->callBehavior('adminAfterPostUpdate',$cur,$post_id);
-               dcPage::addSuccessNotice (sprintf(__('The post "%s" has been successfully updated'),html::escapeHTML($cur->post_title)));
-               http::redirect($core->adminurl->get(
-                    'admin.post',
-                    array('id' => $post_id)
-               ));
-          } catch (Exception $e) {
-               $core->error->add($e->getMessage());
-          }
-     } else {
-          $cur->user_id = $core->auth->userID();
-
-          try {
-               # --BEHAVIOR-- adminBeforePostCreate
-               $core->callBehavior('adminBeforePostCreate',$cur);
-
-               $return_id = $core->blog->addPost($cur);
-
-            $meta = $core->meta;
-            $meta->delPostMeta($return_id,'editor');
-            $meta->setPostMeta($return_id,'editor',$post_editor);
-
-               # --BEHAVIOR-- adminAfterPostCreate
-               $core->callBehavior('adminAfterPostCreate',$cur,$return_id);
-
-               dcPage::addSuccessNotice(__('Entry has been successfully created.'));
-               http::redirect($core->adminurl->get(
-                    'admin.post',
-                    array('id' => $return_id)
-               ));
-          } catch (Exception $e) {
-               $core->error->add($e->getMessage());
-          }
-     }
-}
-
-# Getting categories
-$categories_combo = dcAdminCombos::getCategoriesCombo(
-     $core->blog->getCategories(array('post_type'=>'post'))
-);
+               $_ctx->prev_post = array('id' => $prev_rs->post_id,'title' => $prev_rs->post_title);
+          }
+          $page_title = __('Edit entry');
+
+     }
+}
+if ($post_id) {
+     $_ctx->post_id = $post->post_id;
+
+     $_ctx->preview_url =
+          $core->blog->url.$core->url->getURLFor('preview',$core->auth->userID().'/'.
+          http::browserUID(DC_MASTER_KEY.$core->auth->userID().$core->auth->getInfo('user_pwd')).
+          '/'.$post->post_url);
+          
+     
+     $form_comment = new dcForm($core,'add-comment','comment.php');
+     $form_comment
+          ->addField(
+               new dcFieldText('comment_author','', array(
+                    'maxlength'         => 255,
+                    'required'     => true,
+                    'label'        => __('Name:'))))
+          ->addField(
+               new dcFieldText('comment_email','', array(
+                    'maxlength'         => 255,
+                    'required'     => true,
+                    'label'        => __('Email:'))))
+          ->addField(
+               new dcFieldText('comment_site','', array(
+                    'maxlength'         => 255,
+                    'label'        => __('Web site:'))))
+          ->addField(
+               new dcFieldTextArea('comment_content','', array(
+                    'required'     => true,
+                    'label'        => __('Comment:'))))
+          ->addField(
+               new dcFieldHidden('post_id',$post_id))
+          ->addField(
+               new dcFieldSubmit('add',__('Save'),array(
+                    'action' => 'addComment')))
+          ;
+
+     
+}
+
+$form->setup();
+
+$sidebar_blocks = new ArrayObject(array(
+     'status-box' => array(
+          'title' => __('Status'),
+          'items' => array('post_status','post_dt','post_lang','post_format')),
+     'metas-box' => array(
+          'title' => __('Ordering'),
+          'items' => array('post_selected','cat_id')),
+     'options-box' => array(
+          'title' => __('Options'),
+          'items' => array('post_open_comment','post_open_tb','post_password','post_url'))
+));
+
+$main_blocks = new ArrayObject(array(
+     "post_title","post_excerpt","post_content","post_notes"
+));
+
+
+$_ctx->sidebar_blocks = $sidebar_blocks;
+$_ctx->main_blocks = $main_blocks;
+
 /* DISPLAY
 -------------------------------------------------------- */
@@ -375 +363 @@
      $default_tab = 'comments';
 }
-elseif (!empty($_GET['tb'])) {
-     $default_tab = 'trackbacks';
-}
-
-if ($post_id) {
-     switch ($post_status) {
-          case 1:
-               $img_status = sprintf($img_status_pattern,__('Published'),'check-on.png');
-               break;
-          case 0:
-               $img_status = sprintf($img_status_pattern,__('Unpublished'),'check-off.png');
-               break;
-          case -1:
-               $img_status = sprintf($img_status_pattern,__('Scheduled'),'scheduled.png');
-               break;
-          case -2:
-               $img_status = sprintf($img_status_pattern,__('Pending'),'check-wrn.png');
-               break;
-          default:
-               $img_status = '';
-     }
-     $edit_entry_str = __('&ldquo;%s&rdquo;');
-     $page_title_edit = sprintf($edit_entry_str, html::escapeHTML($post_title)).' '.$img_status;
-} else {
-     $img_status = '';
-}
-
-$admin_post_behavior = '';
-if (($core->auth->getOption('editor')==$post_editor) 
-    && in_array($post_format, $core->getFormaters($core->auth->getOption('editor')))) {
-    $admin_post_behavior = $core->callBehavior('adminPostEditor');
-}
-
-dcPage::open($page_title.' - '.__('Entries'),
-     dcPage::jsDatePicker().
-     dcPage::jsModal().
-     dcPage::jsMetaEditor().
-    $admin_post_behavior.
-     dcPage::jsLoad('js/_post.js').
-     dcPage::jsConfirmClose('entry-form','comment-form').
-     # --BEHAVIOR-- adminPostHeaders
-     $core->callBehavior('adminPostHeaders').
-     dcPage::jsPageTabs($default_tab).
-     $next_headlink."\n".$prev_headlink,
-     dcPage::breadcrumb(
+$page_title_edit = __('Edit entry');
+$_ctx
+     ->setBreadCrumb(
           array(
                html::escapeHTML($core->blog->name) => '',
                __('Entries') => 'posts.php',
                ($post_id ? $page_title_edit : $page_title) => ''
-          ))
-);
+     ))
+     ->default_tab = $default_tab;
+$_ctx->post_status = $form->post_status;
+$_ctx->post_title = $form->post_title;
+if ($form->post_status == 1) {
+     $_ctx->post_url = $post->getURL();
+}
 
 if (!empty($_GET['upd'])) {
-     dcPage::success(__('Entry has been successfully updated.'));
+     $_ctx->setAlert(__('Entry has been successfully updated.'));
 }
 elseif (!empty($_GET['crea'])) {
-     dcPage::success(__('Entry has been successfully created.'));
+     $_ctx->setAlert(__('Entry has been successfully created.'));
 }
 elseif (!empty($_GET['attached'])) {
-     dcPage::success(__('File has been successfully attached.'));
+     $_ctx->setAlert(__('File has been successfully attached.'));
 }
 elseif (!empty($_GET['rmattach'])) {
-     dcPage::success(__('Attachment has been successfully removed.'));
-}
-
+     $_ctx->setAlert(__('Attachment has been successfully removed.'));
+}
 if (!empty($_GET['creaco'])) {
-     dcPage::success(__('Comment has been successfully created.'));
-}
-if (!empty($_GET['tbsent'])) {
-     dcPage::success(__('All pings sent.'));
-}
-
-# XHTML conversion
-if (!empty($_GET['xconv']))
-{
-     $post_excerpt = $post_excerpt_xhtml;
-     $post_content = $post_content_xhtml;
-     $post_format = 'xhtml';
-
-     dcPage::message(__('Don\'t forget to validate your XHTML conversion by saving your post.'));
-}
-
-if ($post_id && $post->post_status == 1) {
-     echo '<p><a class="onblog_link outgoing" href="'.$post->getURL().'" title="'.$post_title.'">'.__('Go to this entry on the site').' <img src="images/outgoing-blue.png" alt="" /></a></p>';
-}
-if ($post_id)
-{
-     echo '<p class="nav_prevnext">';
-     if ($prev_link) { echo $prev_link; }
-     if ($next_link && $prev_link) { echo ' | '; }
-     if ($next_link) { echo $next_link; }
-
-     # --BEHAVIOR-- adminPostNavLinks
-     $core->callBehavior('adminPostNavLinks',isset($post) ? $post : null);
-
-     echo '</p>';
-}
-
-# Exit if we cannot view page
-if (!$can_view_page) {
-     dcPage::helpBlock('core_post');
-     dcPage::close();
-     exit;
-}
-/* Post form if we can edit post
--------------------------------------------------------- */
-if ($can_edit_post) {
-     if (count($formaters_combo)>0 && ($core->auth->getOption('editor') && $core->auth->getOption('editor')!='')) {
-          // temporay removed until we can switch easily editor
-        // $post_format_field = form::combo('post_format',$formaters_combo,"$post_editor:$post_format",'maximal');
-
-        $post_format_field = sprintf('%s (%s)', $post_format, $post_editor);
-          $post_format_field .= form::hidden('post_format',"$post_editor:$post_format");
-     } else {
-          $post_format_field = sprintf(__('Choose an active editor in %s.'), 
-          '<a href="preferences.php#user-options">'.__('your preferences').'</a>'
-          );
-          $post_format_field .= form::hidden('post_format','xhtml');
-     }
-
-     $sidebar_items = new ArrayObject(array(
-          'status-box' => array(
-               'title' => __('Status'),
-               'items' => array(
-                    'post_status' =>
-                         '<p class="entry-status"><label for="post_status">'.__('Entry status').' '.$img_status.'</label>'.
-                         form::combo('post_status',$status_combo,$post_status,'maximal','',!$can_publish).
-                         '</p>',
-                    'post_dt' =>
-                         '<p><label for="post_dt">'.__('Publication date and hour').'</label>'.
-                         form::field('post_dt',16,16,$post_dt,($bad_dt ? 'invalid' : '')).
-                         '</p>',
-                    'post_lang' =>
-                         '<p><label for="post_lang">'.__('Entry language').'</label>'.
-                         form::combo('post_lang',$lang_combo,$post_lang).
-                         '</p>',
-                    'post_format' =>
-                         '<div>'.
-                         '<h5 id="label_format"><label for="post_format" class="classic">'.__('Text formatting').'</label></h5>'.
-                         '<p>'.$post_format_field.'</p>'.
-                         '<p class="format_control control_no_xhtml">'.
-                         '<a id="convert-xhtml" class="button'.($post_id && $post_format != 'wiki' ? ' hide' : '').'" href="'.
-                         $core->adminurl->get('admin.post',array('id'=> $post_id,'xconv'=> '1')).
-                         '">'.
-                         __('Convert to XHTML').'</a></p></div>')),
-          'metas-box' => array(
-               'title' => __('Filing'),
-               'items' => array(
-                    'post_selected' =>
-                         '<p><label for="post_selected" class="classic">'.
-                         form::checkbox('post_selected',1,$post_selected).' '.
-                         __('Selected entry').'</label></p>',
-                    'cat_id' =>
-                         '<div>'.
-                         '<h5 id="label_cat_id">'.__('Category').'</h5>'.
-                         '<p><label for="cat_id">'.__('Category:').'</label>'.
-                         form::combo('cat_id',$categories_combo,$cat_id,'maximal').
-                         '</p>'.
-                         ($core->auth->check('categories', $core->blog->id) ?
-                              '<div>'.
-                              '<h5 id="create_cat">'.__('Add a new category').'</h5>'.
-                              '<p><label for="new_cat_title">'.__('Title:').' '.
-                              form::field('new_cat_title',30,255,'','maximal').'</label></p>'.
-                              '<p><label for="new_cat_parent">'.__('Parent:').' '.
-                              form::combo('new_cat_parent',$categories_combo,'','maximal').
-                              '</label></p>'.
-                              '</div>'
-                         : '').
-                         '</div>')),
-          'options-box' => array(
-               'title' => __('Options'),
-               'items' => array(
-                    'post_open_comment_tb' =>
-                         '<div>'.
-                         '<h5 id="label_comment_tb">'.__('Comments and trackbacks list').'</h5>'.
-                         '<p><label for="post_open_comment" class="classic">'.
-                         form::checkbox('post_open_comment',1,$post_open_comment).' '.
-                         __('Accept comments').'</label></p>'.
-                         ($core->blog->settings->system->allow_comments ?
-                              (isContributionAllowed($post_id,strtotime($post_dt),true) ?
-                                   '' :
-                                   '<p class="form-note warn">'.
-                                   __('Warning: Comments are not more accepted for this entry.').'</p>') :
-                              '<p class="form-note warn">'.
-                              __('Comments are not accepted on this blog so far.').'</p>').
-                         '<p><label for="post_open_tb" class="classic">'.
-                         form::checkbox('post_open_tb',1,$post_open_tb).' '.
-                         __('Accept trackbacks').'</label></p>'.
-                         ($core->blog->settings->system->allow_trackbacks ?
-                              (isContributionAllowed($post_id,strtotime($post_dt),false) ?
-                                   '' :
-                                   '<p class="form-note warn">'.
-                                   __('Warning: Trackbacks are not more accepted for this entry.').'</p>') :
-                              '<p class="form-note warn">'.__('Trackbacks are not accepted on this blog so far.').'</p>').
-                         '</div>',
-                    'post_password' =>
-                         '<p><label for="post_password">'.__('Password').'</label>'.
-                         form::field('post_password',10,32,html::escapeHTML($post_password),'maximal').
-                         '</p>',
-                    'post_url' =>
-                         '<div class="lockable">'.
-                         '<p><label for="post_url">'.__('Edit basename').'</label>'.
-                         form::field('post_url',10,255,html::escapeHTML($post_url),'maximal').
-                         '</p>'.
-                         '<p class="form-note warn">'.
-                         __('Warning: If you set the URL manually, it may conflict with another entry.').
-                         '</p></div>'
-     ))));
-
-     $main_items = new ArrayObject(array(
-          "post_title" =>
-               '<p class="col">'.
-               '<label class="required no-margin bold"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label>'.
-               form::field('post_title',20,255,html::escapeHTML($post_title),'maximal').
-               '</p>',
-
-          "post_excerpt" =>
-               '<p class="area" id="excerpt-area"><label for="post_excerpt" class="bold">'.__('Excerpt:').' <span class="form-note">'.
-               __('Introduction to the post.').'</span></label> '.
-               form::textarea('post_excerpt',50,5,html::escapeHTML($post_excerpt)).
-               '</p>',
-
-          "post_content" =>
-               '<p class="area" id="content-area"><label class="required bold" '.
-               'for="post_content"><abbr title="'.__('Required field').'">*</abbr> '.__('Content:').'</label> '.
-               form::textarea('post_content',50,$core->auth->getOption('edit_size'),html::escapeHTML($post_content)).
-               '</p>',
-
-          "post_notes" =>
-               '<p class="area" id="notes-area"><label for="post_notes" class="bold">'.__('Personal notes:').' <span class="form-note">'.
-               __('Unpublished notes.').'</span></label>'.
-               form::textarea('post_notes',50,5,html::escapeHTML($post_notes)).
-               '</p>'
-          )
-     );
-
-     # --BEHAVIOR-- adminPostFormItems
-     $core->callBehavior('adminPostFormItems',$main_items,$sidebar_items, isset($post) ? $post : null);
-
-     echo '<div class="multi-part" title="'.($post_id ? __('Edit entry') : __('New entry')).'" id="edit-entry">';
-     echo '<form action="'.$core->adminurl->get('admin.post').'" method="post" id="entry-form">';
-     echo '<div id="entry-wrapper">';
-     echo '<div id="entry-content"><div class="constrained">';
-
-     echo '<h3 class="out-of-screen-if-js">'.__('Edit post').'</h3>';
-
-     foreach ($main_items as $id => $item) {
-          echo $item;
-     }
-
-     # --BEHAVIOR-- adminPostForm (may be deprecated)
-     $core->callBehavior('adminPostForm',isset($post) ? $post : null);
-
-     echo
-     '<p class="border-top">'.
-     ($post_id ? form::hidden('id',$post_id) : '').
-     '<input type="submit" value="'.__('Save').' (s)" '.
-     'accesskey="s" name="save" /> ';
-     if ($post_id) {
-          $preview_url =
-          $core->blog->url.$core->url->getURLFor('preview',$core->auth->userID().'/'.
-          http::browserUID(DC_MASTER_KEY.$core->auth->userID().$core->auth->getInfo('user_pwd')).
-          '/'.$post->post_url);
-          echo '<a id="post-preview" href="'.$preview_url.'" class="button modal" accesskey="p">'.__('Preview').' (p)'.'</a> ';
-     } else {
-          echo
-          '<a id="post-cancel" href="index.php" class="button" accesskey="c">'.__('Cancel').' (c)</a>';
-     }
-
-     echo
-     ($can_delete ? '<input type="submit" class="delete" value="'.__('Delete').'" name="delete" />' : '').
-     $core->formNonce().
-     '</p>';
-
-     echo '</div></div>';          // End #entry-content
-     echo '</div>';      // End #entry-wrapper
-
-     echo '<div id="entry-sidebar">';
-
-     foreach ($sidebar_items as $id => $c) {
-          echo '<div id="'.$id.'" class="sb-box">'.
-               '<h4>'.$c['title'].'</h4>';
-          foreach ($c['items'] as $e_name=>$e_content) {
-               echo $e_content;
-          }
-          echo '</div>';
-     }
-
-
-     # --BEHAVIOR-- adminPostFormSidebar (may be deprecated)
-     $core->callBehavior('adminPostFormSidebar',isset($post) ? $post : null);
-     echo '</div>';      // End #entry-sidebar
-
-     echo '</form>';
-
-     # --BEHAVIOR-- adminPostForm
-     $core->callBehavior('adminPostAfterForm',isset($post) ? $post : null);
-
-     echo '</div>';
-}
-
-if ($post_id)
-{
-     /* Comments
-     -------------------------------------------------------- */
-
-     $params = array('post_id' => $post_id, 'order' => 'comment_dt ASC');
-
-     $comments = $core->blog->getComments(array_merge($params,array('comment_trackback'=>0)));
-
-     echo
-     '<div id="comments" class="clear multi-part" title="'.__('Comments').'">';
-     $combo_action = $comments_actions_page->getCombo();
-     $has_action = !empty($combo_action) && !$comments->isEmpty();
-     echo
-     '<p class="top-add"><a class="button add" href="#comment-form">'.__('Add a comment').'</a></p>';
-
-     if ($has_action) {
-          echo '<form action="'.$core->adminurl->get('admin.post').'" id="form-comments" method="post">';
-     }
-
-     echo '<h3>'.__('Comments').'</h3>';
-     if (!$comments->isEmpty()) {
-          showComments($comments,$has_action);
-     } else {
-          echo '<p>'.__('No comments').'</p>';
-     }
-
-     if ($has_action) {
-          echo
-          '<div class="two-cols">'.
-          '<p class="col checkboxes-helpers"></p>'.
-
-          '<p class="col right"><label for="action" class="classic">'.__('Selected comments action:').'</label> '.
-          form::combo('action',$combo_action).
-          form::hidden(array('section'),'comments').
-          form::hidden(array('id'),$post_id).
-          $core->formNonce().
-          '<input type="submit" value="'.__('ok').'" /></p>'.
-          '</div>'.
-          '</form>';
-     }
-     /* Add a comment
-     -------------------------------------------------------- */
-
-     echo
-     '<div class="fieldset clear">'.
-     '<h3>'.__('Add a comment').'</h3>'.
-
-     '<form action="comment.php" method="post" id="comment-form">'.
-     '<div class="constrained">'.
-     '<p><label for="comment_author" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Name:').'</label>'.
-     form::field('comment_author',30,255,html::escapeHTML($core->auth->getInfo('user_cn'))).
-     '</p>'.
-
-     '<p><label for="comment_email">'.__('Email:').'</label>'.
-     form::field('comment_email',30,255,html::escapeHTML($core->auth->getInfo('user_email'))).
-     '</p>'.
-
-     '<p><label for="comment_site">'.__('Web site:').'</label>'.
-     form::field('comment_site',30,255,html::escapeHTML($core->auth->getInfo('user_url'))).
-     '</p>'.
-
-     '<p class="area"><label for="comment_content" class="required"><abbr title="'.__('Required field').'">*</abbr> '.
-     __('Comment:').'</label> '.
-     form::textarea('comment_content',50,8,html::escapeHTML('')).
-     '</p>'.
-
-     '<p>'.
-     form::hidden('post_id',$post_id).
-     $core->formNonce().
-     '<input type="submit" name="add" value="'.__('Save').'" /></p>'.
-     '</div>'. #constrained
-
-     '</form>'.
-     '</div>'. #add comment
-     '</div>'; #comments
-}
-
-if ($post_id && $post_status == 1)
-{
-     /* Trackbacks
-     -------------------------------------------------------- */
-
-     $params = array('post_id' => $post_id, 'order' => 'comment_dt ASC');
-     $trackbacks = $core->blog->getComments(array_merge($params, array('comment_trackback' => 1)));
-
-     # Actions combo box
-     $combo_action = $comments_actions_page->getCombo();
-     $has_action = !empty($combo_action) && !$trackbacks->isEmpty();
-
-     if (!empty($_GET['tb_auto'])) {
-          $tb_urls = implode("\n", $TB->discover($post_excerpt_xhtml.' '.$post_content_xhtml));
-     }
-
-     # Display tab
-     echo
-     '<div id="trackbacks" class="clear multi-part" title="'.__('Trackbacks').'">';
-
-     # tracbacks actions
-     if ($has_action) {
-          echo '<form action="post.php" id="form-trackbacks" method="post">';
-     }
-
-     echo '<h3>'.__('Trackbacks received').'</h3>';
-
-     if (!$trackbacks->isEmpty()) {
-          showComments($trackbacks, $has_action, true);
-     } else {
-          echo '<p>'.__('No trackback').'</p>';
-     }
-
-     if ($has_action) {
-          echo
-          '<div class="two-cols">'.
-          '<p class="col checkboxes-helpers"></p>'.
-
-          '<p class="col right"><label for="action" class="classic">'.__('Selected trackbacks action:').'</label> '.
-          form::combo('action', $combo_action).
-          form::hidden('id',$post_id).
-          form::hidden(array('section'),'trackbacks').
-          $core->formNonce().
-          '<input type="submit" value="'.__('ok').'" /></p>'.
-          '</div>'.
-          '</form>';
-     }
-
-     /* Add trackbacks
-     -------------------------------------------------------- */
-     if ($can_edit_post && $post->post_status) {
-          echo
-          '<div class="fieldset clear">';
-
-          echo
-          '<h3>'.__('Ping blogs').'</h3>'.
-          '<form action="post.php?id='.$post_id.'" id="trackback-form" method="post">'.
-          '<p><label for="tb_urls" class="area">'.__('URLs to ping:').'</label>'.
-          form::textarea('tb_urls', 60, 5, $tb_urls).
-          '</p>'.
-
-          '<p><label for="tb_excerpt" class="area">'.__('Excerpt to send:').'</label>'.
-          form::textarea('tb_excerpt', 60, 5, $tb_excerpt).'</p>'.
-
-          '<p>'.
-          $core->formNonce().
-          '<input type="submit" name="ping" value="'.__('Ping blogs').'" />'.
-          (empty($_GET['tb_auto']) ?
-               '&nbsp;&nbsp;<a class="button" href="'.
-               'post.php?id='.$post_id.'&amp;tb_auto=1&amp;tb=1'.
-               '">'.__('Auto discover ping URLs').'</a>'
-          : '').
-          '</p>'.
-          '</form>';
-
-          $pings = $TB->getPostPings($post_id);
-
-          if (!$pings->isEmpty())
-          {
-               echo '<h3>'.__('Previously sent pings').'</h3>';
-
-               echo '<ul class="nice">';
-               while ($pings->fetch()) {
-                    echo
-                    '<li>'.dt::dt2str(__('%Y-%m-%d %H:%M'), $pings->ping_dt).' - '.
-                    $pings->ping_url.'</li>';
-               }
-               echo '</ul>';
-          }
-
-          echo '</div>';
-     }
-
-     echo '</div>'; #trackbacks
-}
-
-# Controls comments or trakbacks capabilities
-function isContributionAllowed($id,$dt,$com=true)
-{
-     global $core;
-
-     if (!$id) {
-          return true;
-     }
-     if ($com) {
-          if (($core->blog->settings->system->comments_ttl == 0) ||
-               (time() - $core->blog->settings->system->comments_ttl*86400 < $dt)) {
-               return true;
-          }
-     } else {
-          if (($core->blog->settings->system->trackbacks_ttl == 0) ||
-               (time() - $core->blog->settings->system->trackbacks_ttl*86400 < $dt)) {
-               return true;
-          }
-     }
-     return false;
-}
-
-# Show comments or trackbacks
-function showComments($rs,$has_action,$tb=false)
-{
-     echo
-     '<div class="table-outer">'.
-     '<table class="comments-list"><tr>'.
-     '<th colspan="2" class="first">'.__('Author').'</th>'.
-     '<th>'.__('Date').'</th>'.
-     '<th class="nowrap">'.__('IP address').'</th>'.
-     '<th>'.__('Status').'</th>'.
-     '<th>'.__('Edit').'</th>'.
-     '</tr>';
-     $comments = array();
-     if (isset($_REQUEST['comments'])) {
-          foreach ($_REQUEST['comments'] as $v) {
-               $comments[(integer)$v]=true;
-          }
-     }
-
-     while($rs->fetch())
-     {
-          $comment_url = 'comment.php?id='.$rs->comment_id;
-
-          $img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
-          switch ($rs->comment_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,__('Pending'),'check-wrn.png');
-                    break;
-               case -2:
-                    $img_status = sprintf($img,__('Junk'),'junk.png');
-                    break;
-          }
-
-          echo
-          '<tr class="line'.($rs->comment_status != 1 ? ' offline' : '').'"'.
-          ' id="c'.$rs->comment_id.'">'.
-
-          '<td class="nowrap">'.
-          ($has_action ? form::checkbox(array('comments[]'),$rs->comment_id,isset($comments[$rs->comment_id]),'','',0,'title="'.($tb ? __('select this trackback') : __('select this comment')).'"') : '').'</td>'.
-          '<td class="maximal">'.html::escapeHTML($rs->comment_author).'</td>'.
-          '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$rs->comment_dt).'</td>'.
-          '<td class="nowrap"><a href="comments.php?ip='.$rs->comment_ip.'">'.$rs->comment_ip.'</a></td>'.
-          '<td class="nowrap status">'.$img_status.'</td>'.
-          '<td class="nowrap status"><a href="'.$comment_url.'">'.
-          '<img src="images/edit-mini.png" alt="" title="'.__('Edit this comment').'" /> '.__('Edit').'</a></td>'.
-
-          '</tr>';
-     }
-
-     echo '</table></div>';
-}
-
-dcPage::helpBlock('core_post','core_trackbacks','core_wiki');
-dcPage::close();
+     $_ctx->setAlert(__('Comment has been successfully created.'));
+}    
+     
+$core->tpl->display('post.html.twig');
+?>

inc/admin/prepend.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -174 +174 @@
 */
 }
+
+$core->adminurl = new dcAdminURL($core);
+
+$core->adminurl->register('admin.posts','posts.php');
+$core->adminurl->register('admin.post','post.php');
+$core->adminurl->register('admin.blog.theme','blog_theme.php');
+$core->adminurl->register('admin.blog.pref','blog_pref.php');
+$core->adminurl->register('admin.blogs','blogs.php');
+$core->adminurl->register('admin.categories','categories.php');
+$core->adminurl->register('admin.category','category.php');
+$core->adminurl->register('admin.comments','comments.php');
+$core->adminurl->register('admin.comments','comment.php');
+$core->adminurl->register('admin.help','help.php');
+$core->adminurl->register('admin.home','index.php');
+$core->adminurl->register('admin.langs','langs.php');
+$core->adminurl->register('admin.media','media.php');
+$core->adminurl->register('admin.media_item','media_item.php');
+$core->adminurl->register('admin.plugins','plugins.php');
+$core->adminurl->register('admin.plugin','plugin.php');
+$core->adminurl->register('admin.user.preferences','preferences.php');
+$core->adminurl->register('admin.user','user.php');
+$core->adminurl->register('admin.users','users.php');
 
 if ($core->auth->userID() && $core->blog !== null)

inc/admin/prepend.php

@@ -24 +24 @@
 function dc_load_locales() {
      global $_lang, $core;
-
+     
      $_lang = $core->auth->getInfo('user_lang');
      $_lang = preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$_lang) ? $_lang : 'en';
-
+     
      l10n::lang($_lang);
      if (l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/date') === false && $_lang != 'en') {
@@ -40 +40 @@
 {
      global $core;
-
+     
      $core->auth->user_prefs->addWorkspace('interface');
      $user_ui_iconset = @$core->auth->user_prefs->interface->iconset;
      if (($user_ui_iconset) && ($img)) {
           $icon = false;
-          if ((preg_match('/^images\/menu\/(.+)$/',$img,$m)) ||
+          if ((preg_match('/^images\/menu\/(.+)$/',$img,$m)) || 
                (preg_match('/^index\.php\?pf=(.+)$/',$img,$m))) {
                if ($m[1]) {
@@ -65 +65 @@
      # We have session information in constants
      $_COOKIE[DC_SESSION_NAME] = DC_AUTH_SESS_ID;
-
+     
      if (!$core->auth->checkSession(DC_AUTH_SESS_UID)) {
           throw new Exception('Invalid session data.');
      }
-
+     
      # Check nonce from POST requests
      if (!empty($_POST))
@@ -77 +77 @@
           }
      }
-
+     
      if (empty($_SESSION['sess_blog_id'])) {
           throw new Exception('Permission denied.');
      }
-
+     
      # Loading locales
      dc_load_locales();
-
+     
      $core->setBlog($_SESSION['sess_blog_id']);
      if (!$core->blog->id) {
@@ -100 +100 @@
                $p[3] = '/';
                call_user_func_array('setcookie',$p);
-
+               
                http::redirect('auth.php');
           }
@@ -108 +108 @@
                ,20);
      }
-
+     
      # Check nonce from POST requests
      if (!empty($_POST))
@@ -119 +119 @@
           }
      }
-
-
+     
+     
      if (!empty($_REQUEST['switchblog'])
      && $core->auth->getPermissions($_REQUEST['switchblog']) !== false)
@@ -131 +131 @@
                unset($_SESSION['media_manager_page']);
           }
-
+          
           # Removing switchblog from URL
           $redir = $_SERVER['REQUEST_URI'];
@@ -139 +139 @@
           exit;
      }
-
+     
      # Check blog to use and log out if no result
      if (isset($_SESSION['sess_blog_id']))
@@ -154 +154 @@
           }
      }
-
+     
      # Loading locales
      dc_load_locales();
-
+     
      if (isset($_SESSION['sess_blog_id'])) {
           $core->setBlog($_SESSION['sess_blog_id']);
@@ -165 +165 @@
      }
 
-/*
+/*   
      # Check add to my fav fired
      if (!empty($_REQUEST['add-favorite'])) {
@@ -206 +206 @@
      }
      unset($f);
-
+     
      if (($hfiles = @scandir($locales_root.$_lang.'/help')) !== false)
      {
@@ -227 +227 @@
      # [] : Title, URL, small icon, large icon, permissions, id, class
      # NB : '*' in permissions means any, null means super admin only
-
-
+     
+     
      # Menus creation
      $_menu = new ArrayObject();
@@ -246 +246 @@
      }
 
-
+     
      # Set menu titles
-
+     
      $_menu['System']->title = __('System settings');
      $_menu['Blog']->title = __('Blog');
@@ -278 +278 @@
           preg_match('/post.php$/',$_SERVER['REQUEST_URI']),
           $core->auth->check('usage,contentadmin',$core->blog->id));
-
+     
      $_menu['System']->prependItem(__('Update'),'update.php','images/menu/update.png',
           preg_match('/update.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
@@ -301 +301 @@
 }
 
+# Add admin default templates path
+$core->tpl->getLoader()->addPath(dirname(__FILE__).'/default-templates');
+# Set admin context
+$_ctx = new dcAdminContext($core);
+$core->tpl->addExtension($_ctx);
+
+# --BEHAVIOR-- adminPrepend
+$core->callBehavior('adminPrepend',$core,$_ctx);
+?>

inc/core/class.dc.core.php

@@ -901 +901 @@
                'edit_size' => 24,
                'enable_wysiwyg' => true,
+            'editor' => 'dcLegacyEditor',
                'post_format' => 'wiki'
           );

inc/core/class.dc.core.php

@@ -39 +39 @@
      public $rest;       ///< <b>dcRestServer</b> dcRestServer object
      public $log;        ///< <b>dcLog</b>             dcLog object
+     public $tpl;        ///< <b>Twig_Environment</b>  Twig_Environment object
      public $stime;      ///< <b>float</b>             starting time
-
+     
      private $versions = null;
      private $formaters = array();
      private $behaviors = array();
      private $post_types = array();
-
+     
      /**
      dcCore constructor inits everything related to Dotclear. It takes arguments
      to init database connection.
-
+     
      @param    driver    <b>string</b>  Database driver name
      @param    host      <b>string</b>  Database hostname
@@ -67 +68 @@
 
           $this->con = dbLayer::init($driver,$host,$db,$user,$password,$persist);
-
+          
           # define weak_locks for mysql
           if ($this->con instanceof mysqlConnection) {
@@ -74 +75 @@
                mysqliConnection::$weak_locks = true;
           }
-
+          
           # define searchpath for postgresql
           if ($this->con instanceof pgsqlConnection)
@@ -86 +87 @@
                }
           }
-
+          
           $this->prefix = $prefix;
-
+          
           $this->error = new dcError();
           $this->auth = $this->authInstance();
           $this->session = new sessionDB($this->con,$this->prefix.'session',DC_SESSION_NAME,'',null,DC_ADMIN_SSL);
           $this->url = new dcUrlHandlers();
-
+          
           $this->plugins = new dcPlugins($this);
-
+          
           $this->rest = new dcRestServer($this);
-
+          
           $this->meta = new dcMeta($this);
-
+          
           $this->log = new dcLog($this);
      }
-
+     
      private function authInstance()
      {
@@ -112 +113 @@
                $c = DC_AUTH_CLASS;
           }
-
+          
           if (!class_exists($c)) {
                throw new Exception('Authentication class '.$c.' does not exist.');
           }
-
+          
           if ($c != 'dcAuth' && !is_subclass_of($c,'dcAuth')) {
                throw new Exception('Authentication class '.$c.' does not inherit dcAuth.');
           }
-
+          
           return new $c($this);
      }
-
-
+     
+     /**
+     Create template environment (Twig_Environment instance)
+     
+     default-templates path must be added from admin|public/prepend.php with:
+     $core->tpl->getLoader()->addPath('PATH_TO/default-templates');
+     Selected theme path must be added with:
+     $core->tpl->getLoader()->prependPath('PATH_TO/MY_THEME');
+     */
+     public function loadTemplateEnvironment()
+     {
+          $cache_dir = path::real(DC_TPL_CACHE.'/twtpl',false);
+          if (!is_dir($cache_dir)) {
+               try {
+                    files::makeDir($cache_dir);
+               } catch (Exception $e) {
+                    $cache_dir = false;
+               }
+          }
+          
+          $this->tpl = new Twig_Environment(
+               new Twig_Loader_Filesystem(dirname(__FILE__).'/../swf'),
+               array(
+                    'auto_reload' => true,
+                    'autoescape' => false,
+                    'base_template_class' => 'Twig_Template',
+                    'cache' => $cache_dir, 
+                    'charset' => 'UTF-8',
+                    'debug' => DC_DEBUG,
+                    'optimizations' => -1,
+                    'strict_variables' => 0 //DC_DEBUG // Please fix undefined variables!
+               )
+          );
+          $this->tpl->addExtension(new dcFormExtension($this));
+          $this->tpl->addExtension(new dcTabExtension($this));
+     }
+     
      /// @name Blog init methods
      //@{
      /**
      Sets a blog to use in <var>blog</var> property.
-
+     
      @param    id        <b>string</b>       Blog ID
      */
@@ -136 +172 @@
           $this->blog = new dcBlog($this, $id);
      }
-
+     
      /**
      Unsets <var>blog</var> property.
@@ -145 +181 @@
      }
      //@}
-
-
+     
+     
      /// @name Blog status methods
      //@{
      /**
      Returns an array of available blog status codes and names.
-
+     
      @return   <b>array</b> Simple array with codes in keys and names in value
      */
@@ -162 +198 @@
           );
      }
-
+     
      /**
      Returns a blog status name given to a code. This is intended to be
      human-readable and will be translated, so never use it for tests.
      If status code does not exist, returns <i>offline</i>.
-
+     
      @param    s    <b>integer</b> Status code
      @return   <b>string</b> Blog status name
@@ -180 +216 @@
      }
      //@}
-
+     
      /// @name Admin nonce secret methods
      //@{
-
+     
      public function getNonce()
      {
           return crypt::hmac(DC_MASTER_KEY,session_id());
      }
-
+     
      public function checkNonce($secret)
      {
@@ -194 +230 @@
                return false;
           }
-
+          
           return $secret == crypt::hmac(DC_MASTER_KEY,session_id());
      }
-
+     
      public function formNonce()
      {
@@ -203 +239 @@
                return;
           }
-
+          
           return form::hidden(array('xd_check'),$this->getNonce());
      }
      //@}
-
+     
      /// @name Text Formatters methods
      //@{
@@ -225 +261 @@
           }
      }
-
+     
      /// @name Text Formatters methods
      //@{
@@ -232 +268 @@
      transform text. The function must be a valid callback and takes one
      argument: the string to transform. It returns the transformed string.
-
+     
      @param    name      <b>string</b>       Formater name
      @param    func      <b>callback</b>     Function to use, must be a valid and callable callback
@@ -256 +292 @@
           return $editors;
      }
-
+     
      /**
      Returns formaters list by editor
-
+     
      @param    editor_id <b>string</b>  Editor id (dcLegacyEditor, dcCKEditor, ...)
      @return   <b>array</b> An array of formaters names in values.
@@ -288 +324 @@
           return $formaters_list;
      }
-
+     
      /**
      If <var>$name</var> is a valid formater, it returns <var>$str</var>
      transformed using that formater.
-
+     
      @param    editor_id <b>string</b>  Editor id (dcLegacyEditor, dcCKEditor, ...)
      @param    name      <b>string</b>       Formater name
@@ -303 +339 @@
                return call_user_func($this->formaters[$editor_id][$name],$str);
           }
-
+          
           return $str;
      }
      //@}
-
+     
      /**
      If <var>$name</var> is a valid formater, it returns <var>$str</var>
@@ -322 +358 @@
      //@}
 
-
+     
      /// @name Behaviors methods
      //@{
@@ -328 +364 @@
      Adds a new behavior to behaviors stack. <var>$func</var> must be a valid
      and callable callback.
-
+     
      @param    behavior  <b>string</b>       Behavior name
      @param    func      <b>callback</b>     Function to call
@@ -338 +374 @@
           }
      }
-
+     
      /**
      Tests if a particular behavior exists in behaviors stack.
-
+     
      @param    behavior  <b>string</b>  Behavior name
      @return   <b>boolean</b>
@@ -349 +385 @@
           return isset($this->behaviors[$behavior]);
      }
-
+     
      /**
      Get behaviors stack (or part of).
-
+     
      @param    behavior  <b>string</b>       Behavior name
      @return   <b>array</b>
@@ -359 +395 @@
      {
           if (empty($this->behaviors)) return null;
-
+          
           if ($behavior == '') {
                return $this->behaviors;
@@ -365 +401 @@
                return $this->behaviors[$behavior];
           }
-
+          
           return array();
      }
-
+     
      /**
      Calls every function in behaviors stack for a given behavior and returns
      concatened result of each function.
-
+     
      Every parameters added after <var>$behavior</var> will be pass to
      behavior calls.
-
+     
      @param    behavior  <b>string</b>  Behavior name
      @return   <b>string</b> Behavior concatened result
@@ -385 +421 @@
                $args = func_get_args();
                array_shift($args);
-
+               
                $res = '';
-
+               
                foreach ($this->behaviors[$behavior] as $f) {
                     $res .= call_user_func_array($f,$args);
                }
-
+               
                return $res;
           }
      }
      //@}
-
+     
      /// @name Post types URLs management
      //@{
@@ -404 +440 @@
                $type = 'post';
           }
-
+          
           $url = sprintf($this->post_types[$type]['admin_url'],$post_id);
           return $escaped ? html::escapeURL($url) : $url;
      }
-
+     
      public function getPostPublicURL($type,$post_url,$escaped=true)
      {
@@ -414 +450 @@
                $type = 'post';
           }
-
+          
           $url = sprintf($this->post_types[$type]['public_url'],$post_url);
           return $escaped ? html::escapeURL($url) : $url;
      }
-
+     
      public function setPostType($type,$admin_url,$public_url,$label='')
      {
@@ -427 +463 @@
           );
      }
-
+     
      public function getPostTypes()
      {
@@ -433 +469 @@
      }
      //@}
-
+     
      /// @name Versions management methods
      //@{
      /**
      Returns a given $module version.
-
+     
      @param    module    <b>string</b>  Module name
      @return   <b>string</b>  Module version
@@ -449 +485 @@
                $strReq = 'SELECT module, version FROM '.$this->prefix.'version';
                $rs = $this->con->select($strReq);
-
+               
                while ($rs->fetch()) {
                     $this->versions[$rs->module] = $rs->version;
                }
           }
-
+          
           if (isset($this->versions[$module])) {
                return $this->versions[$module];
@@ -461 +497 @@
           }
      }
-
+     
      /**
      Sets $version to given $module.
-
+     
      @param    module    <b>string</b>  Module name
      @param    version   <b>string</b>  Module version
@@ -471 +507 @@
      {
           $cur_version = $this->getVersion($module);
-
+          
           $cur = $this->con->openCursor($this->prefix.'version');
           $cur->module = (string) $module;
           $cur->version = (string) $version;
-
+          
           if ($cur_version === null) {
                $cur->insert();
@@ -481 +517 @@
                $cur->update("WHERE module='".$this->con->escape($module)."'");
           }
-
+          
           $this->versions[$module] = $version;
      }
-
+     
      /**
      Removes given $module version entry.
-
+     
      @param    module    <b>string</b>  Module name
      */
@@ -495 +531 @@
           'DELETE FROM '.$this->prefix.'version '.
           "WHERE module = '".$this->con->escape($module)."' ";
-
+          
           $this->con->execute($strReq);
-
+          
           if (is_array($this->versions)) {
                unset($this->versions[$module]);
           }
      }
-
+     
      //@}
-
+     
      /// @name Users management methods
      //@{
      /**
      Returns a user by its ID.
-
+     
      @param    id        <b>string</b>       User ID
      @return   <b>record</b>
@@ -516 +552 @@
      {
           $params['user_id'] = $id;
-
+          
           return $this->getUsers($params);
      }
-
+     
      /**
      Returns a users list. <b>$params</b> is an array with the following
      optionnal parameters:
-
+     
       - <var>q</var>: search string (on user_id, user_name, user_firstname)
       - <var>user_id</var>: user ID
       - <var>order</var>: ORDER BY clause (default: user_id ASC)
       - <var>limit</var>: LIMIT clause (should be an array ![limit,offset])
-
+     
      @param    params         <b>array</b>        Parameters
      @param    count_only     <b>boolean</b>      Only counts results
@@ -553 +589 @@
                'WHERE NULL IS NULL ';
           }
-
+          
           if (!empty($params['q'])) {
                $q = $this->con->escape(str_replace('*','%',strtolower($params['q'])));
@@ -562 +598 @@
                     ') ';
           }
-
+          
           if (!empty($params['user_id'])) {
                $strReq .= "AND U.user_id = '".$this->con->escape($params['user_id'])."' ";
           }
-
+          
           if (!$count_only) {
                $strReq .= 'GROUP BY U.user_id,user_super,user_status,user_pwd,user_change_pwd,'.
                'user_name,user_firstname,user_displayname,user_email,user_url,'.
                'user_desc, user_lang,user_tz,user_post_status,user_options ';
-
+               
                if (!empty($params['order']) && !$count_only) {
                     $strReq .= 'ORDER BY '.$this->con->escape($params['order']).' ';
@@ -578 +614 @@
                }
           }
-
+          
           if (!$count_only && !empty($params['limit'])) {
                $strReq .= $this->con->limit($params['limit']);
           }
-
+          
           $rs = $this->con->select($strReq);
           $rs->extend('rsExtUser');
           return $rs;
      }
-
+     
      /**
      Create a new user. Takes a cursor as input and returns the new user ID.
-
+     
      @param    cur       <b>cursor</b>       User cursor
      @return   <b>string</b>
@@ -599 +635 @@
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           if ($cur->user_id == '') {
                throw new Exception(__('No user ID given'));
           }
-
+          
           if ($cur->user_pwd == '') {
                throw new Exception(__('No password given'));
           }
-
+          
           $this->getUserCursor($cur);
-
+          
           if ($cur->user_creadt === null) {
                $cur->user_creadt = date('Y-m-d H:i:s');
           }
-
+          
           $cur->insert();
-
+          
           $this->auth->afterAddUser($cur);
-
+          
           return $cur->user_id;
      }
-
+     
      /**
      Updates an existing user. Returns the user ID.
-
+     
      @param    id        <b>string</b>       User ID
      @param    cur       <b>cursor</b>       User cursor
@@ -631 +667 @@
      {
           $this->getUserCursor($cur);
-
+          
           if (($cur->user_id !== null || $id != $this->auth->userID()) &&
           !$this->auth->isSuperAdmin()) {
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           $cur->update("WHERE user_id = '".$this->con->escape($id)."' ");
-
+          
           $this->auth->afterUpdUser($id,$cur);
-
+          
           if ($cur->user_id !== null) {
                $id = $cur->user_id;
           }
-
+          
           # Updating all user's blogs
           $rs = $this->con->select(
@@ -650 +686 @@
                "WHERE user_id = '".$this->con->escape($id)."' "
                );
-
+          
           while ($rs->fetch()) {
                $b = new dcBlog($this,$rs->blog_id);
@@ -656 +692 @@
                unset($b);
           }
-
+          
           return $id;
      }
-
+     
      /**
      Deletes a user.
-
+     
      @param    id        <b>string</b>       User ID
      */
@@ -670 +706 @@
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           if ($id == $this->auth->userID()) {
                return;
           }
-
+          
           $rs = $this->getUser($id);
-
+          
           if ($rs->nb_post > 0) {
                return;
           }
-
+          
           $strReq = 'DELETE FROM '.$this->prefix.'user '.
                     "WHERE user_id = '".$this->con->escape($id)."' ";
-
+          
           $this->con->execute($strReq);
-
+          
           $this->auth->afterDelUser($id);
      }
-
+     
      /**
      Checks whether a user exists.
-
+     
      @param    id        <b>string</b>       User ID
      @return   <b>boolean</b>
@@ -700 +736 @@
                     'FROM '.$this->prefix.'user '.
                     "WHERE user_id = '".$this->con->escape($id)."' ";
-
+          
           $rs = $this->con->select($strReq);
-
+          
           return !$rs->isEmpty();
      }
-
+     
      /**
      Returns all user permissions as an array which looks like:
-
+     
       - [blog_id]
         - [name] => Blog name
         - [url] => Blog URL
         - [p]
-          - [permission] => true
+          - [permission] => true
           - ...
-
+     
      @param    id        <b>string</b>       User ID
      @return   <b>array</b>
@@ -725 +761 @@
                     'INNER JOIN '.$this->prefix.'blog B ON P.blog_id = B.blog_id '.
                     "WHERE user_id = '".$this->con->escape($id)."' ";
-
+          
           $rs = $this->con->select($strReq);
-
+          
           $res = array();
-
+          
           while ($rs->fetch())
           {
@@ -738 +774 @@
                );
           }
-
+          
           return $res;
      }
-
+     
      /**
      Sets user permissions. The <var>$perms</var> array looks like:
-
+     
       - [blog_id] => '|perm1|perm2|'
       - ...
-
+     
      @param    id        <b>string</b>       User ID
      @param    perms     <b>array</b>        Permissions array
@@ -756 +792 @@
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           $strReq = 'DELETE FROM '.$this->prefix.'permissions '.
                     "WHERE user_id = '".$this->con->escape($id)."' ";
-
+          
           $this->con->execute($strReq);
-
+          
           foreach ($perms as $blog_id => $p) {
                $this->setUserBlogPermissions($id, $blog_id, $p, false);
           }
      }
-
+     
      /**
      Sets user permissions for a given blog. <var>$perms</var> is an array with
      permissions in values
-
+     
      @param    id             <b>string</b>       User ID
      @param    blog_id        <b>string</b>       Blog ID
@@ -781 +817 @@
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           $no_perm = empty($perms);
-
+          
           $perms = '|'.implode('|',array_keys($perms)).'|';
-
+          
           $cur = $this->con->openCursor($this->prefix.'permissions');
-
+          
           $cur->user_id = (string) $id;
           $cur->blog_id = (string) $blog_id;
           $cur->permissions = $perms;
-
+          
           if ($delete_first || $no_perm)
           {
@@ -797 +833 @@
                          "WHERE blog_id = '".$this->con->escape($blog_id)."' ".
                          "AND user_id = '".$this->con->escape($id)."' ";
-
+               
                $this->con->execute($strReq);
           }
-
+          
           if (!$no_perm) {
                $cur->insert();
           }
      }
-
+     
      /**
      Sets a user default blog. This blog will be selected when user log in.
-
+     
      @param    id             <b>string</b>       User ID
      @param    blog_id        <b>string</b>       Blog ID
@@ -815 +851 @@
      {
           $cur = $this->con->openCursor($this->prefix.'user');
-
+          
           $cur->user_default_blog = (string) $blog_id;
-
+          
           $cur->update("WHERE user_id = '".$this->con->escape($id)."'");
      }
-
+     
      private function getUserCursor($cur)
      {
@@ -827 +863 @@
                throw new Exception(__('User ID must contain at least 2 characters using letters, numbers or symbols.'));
           }
-
+          
           if ($cur->user_url !== null && $cur->user_url != '') {
                if (!preg_match('|^http(s?)://|',$cur->user_url)) {
@@ -833 +869 @@
                }
           }
-
+          
           if ($cur->isField('user_pwd')) {
                if (strlen($cur->user_pwd) < 6) {
@@ -840 +876 @@
                $cur->user_pwd = crypt::hmac(DC_MASTER_KEY,$cur->user_pwd);
           }
-
+          
           if ($cur->user_lang !== null && !preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$cur->user_lang)) {
                throw new Exception(__('Invalid user language code'));
           }
-
+          
           if ($cur->user_upddt === null) {
                $cur->user_upddt = date('Y-m-d H:i:s');
           }
-
+          
           if ($cur->user_options !== null) {
                $cur->user_options = serialize((array) $cur->user_options);
           }
      }
-
+     
      /**
      Returns user default settings in an associative array with setting names in
      keys.
-
+     
      @return   <b>array</b>
      */
@@ -870 +906 @@
      }
      //@}
-
+     
      /// @name Blog management methods
      //@{
      /**
      Returns all blog permissions (users) as an array which looks like:
-
+     
       - [user_id]
         - [name] => User name
@@ -882 +918 @@
         - [super] => (true|false) super admin
         - [p]
-          - [permission] => true
+          - [permission] => true
           - ...
-
+     
      @param    id             <b>string</b>       Blog ID
      @param    with_super     <b>boolean</b>      Includes super admins in result
@@ -897 +933 @@
           'JOIN '.$this->prefix.'permissions P ON U.user_id = P.user_id '.
           "WHERE blog_id = '".$this->con->escape($id)."' ";
-
+          
           if ($with_super) {
                $strReq .=
@@ -906 +942 @@
                'WHERE user_super = 1 ';
           }
-
+          
           $rs = $this->con->select($strReq);
-
+          
           $res = array();
-
+          
           while ($rs->fetch())
           {
@@ -922 +958 @@
                );
           }
-
+          
           return $res;
      }
-
+     
      /**
      Returns a blog of given ID.
-
+     
      @param    id        <b>string</b>       Blog ID
      @return   <b>record</b>
@@ -935 +971 @@
      {
           $blog = $this->getBlogs(array('blog_id'=>$id));
-
+          
           if ($blog->isEmpty()) {
                return false;
           }
-
+          
           return $blog;
      }
-
+     
      /**
      Returns a record of blogs. <b>$params</b> is an array with the following
      optionnal parameters:
-
+     
       - <var>blog_id</var>: Blog ID
       - <var>q</var>: Search string on blog_id, blog_name and blog_url
       - <var>limit</var>: limit results
-
+     
      @param    params         <b>array</b>        Parameters
      @param    count_only     <b>boolean</b>      Count only results
@@ -959 +995 @@
           $join = '';    // %1$s
           $where = '';   // %2$s
-
+          
           if ($count_only)
           {
@@ -977 +1013 @@
                'WHERE NULL IS NULL '.
                '%2$s ';
-
+               
                if (!empty($params['order'])) {
                     $strReq .= 'ORDER BY '.$this->con->escape($params['order']).' ';
@@ -983 +1019 @@
                     $strReq .= 'ORDER BY B.blog_id ASC ';
                }
-
+               
                if (!empty($params['limit'])) {
                     $strReq .= $this->con->limit($params['limit']);
                }
           }
-
+          
           if ($this->auth->userID() && !$this->auth->isSuperAdmin())
           {
@@ -999 +1035 @@
                $where = 'AND blog_status IN (1,0) ';
           }
-
+          
           if (!empty($params['blog_id'])) {
                $where .= "AND B.blog_id = '".$this->con->escape($params['blog_id'])."' ";
           }
-
+          
           if (!empty($params['q'])) {
                $params['q'] = strtolower(str_replace('*','%',$params['q']));
@@ -1013 +1049 @@
                ') ';
           }
-
+          
           $strReq = sprintf($strReq,$join,$where);
           return $this->con->select($strReq);
      }
-
+     
      /**
      Creates a new blog.
-
+     
      @param    cur            <b>cursor</b>       Blog cursor
      */
@@ -1028 +1064 @@
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           $this->getBlogCursor($cur);
-
+          
           $cur->blog_creadt = date('Y-m-d H:i:s');
           $cur->blog_upddt = date('Y-m-d H:i:s');
           $cur->blog_uid = md5(uniqid());
-
+          
           $cur->insert();
      }
-
+     
      /**
      Updates a given blog.
-
+     
      @param    id        <b>string</b>       Blog ID
      @param    cur       <b>cursor</b>       Blog cursor
@@ -1047 +1083 @@
      {
           $this->getBlogCursor($cur);
-
+          
           $cur->blog_upddt = date('Y-m-d H:i:s');
-
+          
           $cur->update("WHERE blog_id = '".$this->con->escape($id)."'");
      }
-
+     
      private function getBlogCursor($cur)
      {
@@ -1058 +1094 @@
                && !preg_match('/^[A-Za-z0-9._-]{2,}$/',$cur->blog_id)) ||
                (!$cur->blog_id)) {
-               throw new Exception(__('Blog ID must contain at least 2 characters using letters, numbers or symbols.'));
-          }
-
+               throw new Exception(__('Blog ID must contain at least 2 characters using letters, numbers or symbols.')); 
+          }
+          
           if (($cur->blog_name !== null && $cur->blog_name == '') ||
                (!$cur->blog_name)) {
                throw new Exception(__('No blog name'));
           }
-
+          
           if (($cur->blog_url !== null && $cur->blog_url == '') ||
                (!$cur->blog_url)) {
                throw new Exception(__('No blog URL'));
           }
-
+          
           if ($cur->blog_desc !== null) {
                $cur->blog_desc = html::clean($cur->blog_desc);
           }
      }
-
+     
      /**
      Removes a given blog.
      @warning This will remove everything related to the blog (posts,
      categories, comments, links...)
-
+     
      @param    id        <b>string</b>       Blog ID
      */
@@ -1088 +1124 @@
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           $strReq = 'DELETE FROM '.$this->prefix.'blog '.
                     "WHERE blog_id = '".$this->con->escape($id)."' ";
-
+          
           $this->con->execute($strReq);
      }
-
+     
      /**
      Checks if a blog exist.
-
+     
      @param    id        <b>string</b>       Blog ID
      @return   <b>boolean</b>
@@ -1106 +1142 @@
                     'FROM '.$this->prefix.'blog '.
                     "WHERE blog_id = '".$this->con->escape($id)."' ";
-
+          
           $rs = $this->con->select($strReq);
-
+          
           return !$rs->isEmpty();
      }
-
+     
      /**
      Count posts on a blog
-
+     
      @param    id        <b>string</b>       Blog ID
      @param    type      <b>string</b>       Post type
@@ -1124 +1160 @@
                     'FROM '.$this->prefix.'post '.
                     "WHERE blog_id = '".$this->con->escape($id)."' ";
-
+          
           if ($type) {
                $strReq .= "AND post_type = '".$this->con->escape($type)."' ";
           }
-
+          
           return $this->con->select($strReq)->f(0);
      }
      //@}
-
+     
      /// @name HTML Filter methods
      //@{
@@ -1139 +1175 @@
      tidy extension is present). If <b>enable_html_filter</b> blog setting is
      false, returns not filtered string.
-
+     
      @param    str  <b>string</b>       String to filter
      @return   <b>string</b> Filtered string.
@@ -1148 +1184 @@
                return $str;
           }
-
+          
           $filter = new htmlFilter;
           $str = trim($filter->apply($str));
@@ -1154 +1190 @@
      }
      //@}
-
+     
      /// @name wiki2xhtml methods
      //@{
@@ -1161 +1197 @@
           $this->wiki2xhtml = new wiki2xhtml;
      }
-
+     
      /**
      Returns a transformed string with wiki2xhtml.
-
+     
      @param    str       <b>string</b>       String to transform
      @return   <b>string</b>  Transformed string
@@ -1175 +1211 @@
           return $this->wiki2xhtml->transform($str);
      }
-
+     
      /**
      Inits <var>wiki2xhtml</var> property for blog post.
@@ -1182 +1218 @@
      {
           $this->initWiki();
-
+          
           $this->wiki2xhtml->setOpts(array(
                'active_title' => 1,
@@ -1214 +1250 @@
                'note_str' => '<div class="footnotes"><h4>Notes</h4>%s</div>'
           ));
-
+          
           $this->wiki2xhtml->registerFunction('url:post',array($this,'wikiPostLink'));
-
+          
           # --BEHAVIOR-- coreWikiPostInit
           $this->callBehavior('coreInitWikiPost',$this->wiki2xhtml);
      }
-
+     
      /**
      Inits <var>wiki2xhtml</var> property for simple blog comment (basic syntax).
@@ -1227 +1263 @@
      {
           $this->initWiki();
-
+          
           $this->wiki2xhtml->setOpts(array(
                'active_title' => 0,
@@ -1256 +1292 @@
                'active_fr_syntax' => 0
           ));
-
+          
           # --BEHAVIOR-- coreInitWikiSimpleComment
           $this->callBehavior('coreInitWikiSimpleComment',$this->wiki2xhtml);
      }
-
+     
      /**
      Inits <var>wiki2xhtml</var> property for blog comment.
@@ -1267 +1303 @@
      {
           $this->initWiki();
-
+          
           $this->wiki2xhtml->setOpts(array(
                'active_title' => 0,
@@ -1296 +1332 @@
                'active_fr_syntax' => 0
           ));
-
+          
           # --BEHAVIOR-- coreInitWikiComment
           $this->callBehavior('coreInitWikiComment',$this->wiki2xhtml);
      }
-
+     
      public function wikiPostLink($url,$content)
      {
-          if (!($this->blog instanceof dcBlog)) {
+          if (!($this->blog instanceof dcBlog)) { 
                return array();
           }
-
+          
           $post_id = abs((integer) substr($url,5));
           if (!$post_id) {
                return array();
           }
-
+          
           $post = $this->blog->getPosts(array('post_id'=>$post_id));
           if ($post->isEmpty()) {
                return array();
           }
-
+          
           $res = array('url' => $post->getURL());
           $post_title = $post->post_title;
-
+          
           if ($content != $url) {
                $res['title'] = html::escapeHTML($post->post_title);
           }
-
+          
           if ($content == '' || $content == $url) {
                $res['content'] = html::escapeHTML($post->post_title);
           }
-
+          
           if ($post->post_lang) {
                $res['lang'] = $post->post_lang;
           }
-
+          
           return $res;
      }
      //@}
-
+     
      /// @name Maintenance methods
      //@{
@@ -1341 +1377 @@
      Creates default settings for active blog. Optionnal parameter
      <var>defaults</var> replaces default params while needed.
-
+     
      @param    defaults       <b>array</b>   Default parameters
      */
@@ -1426 +1462 @@
                );
           }
-
+          
           $settings = new dcSettings($this,null);
           $settings->addNamespace('system');
-
+          
           foreach ($defaults as $v) {
                $settings->system->put($v[0],$v[2],$v[1],$v[3],false,true);
           }
      }
-
+     
      /**
      Recreates entries search engine index.
-
+     
      @param    start     <b>integer</b>      Start entry index
      @param    limit     <b>integer</b>      Number of entry to index
-
+     
      @return   <b>integer</b>      <var>$start</var> and <var>$limit</var> sum
      */
@@ -1449 +1485 @@
           $rs = $this->con->select($strReq);
           $count = $rs->f(0);
-
+          
           $strReq = 'SELECT post_id, post_title, post_excerpt_xhtml, post_content_xhtml '.
                     'FROM '.$this->prefix.'post ';
-
+          
           if ($start !== null && $limit !== null) {
                $strReq .= $this->con->limit($start,$limit);
           }
-
+          
           $rs = $this->con->select($strReq,true);
-
+          
           $cur = $this->con->openCursor($this->prefix.'post');
-
+          
           while ($rs->fetch())
           {
                $words = $rs->post_title.' '. $rs->post_excerpt_xhtml.' '.
                $rs->post_content_xhtml;
-
+               
                $cur->post_words = implode(' ',text::splitWords($words));
                $cur->update('WHERE post_id = '.(integer) $rs->post_id);
                $cur->clean();
           }
-
+          
           if ($start+$limit > $count) {
                return null;
@@ -1476 +1512 @@
           return $start+$limit;
      }
-
+     
      /**
      Recreates comments search engine index.
-
+     
      @param    start     <b>integer</b>      Start comment index
      @param    limit     <b>integer</b>      Number of comments to index
-
+     
      @return   <b>integer</b>      <var>$start</var> and <var>$limit</var> sum
      */
@@ -1491 +1527 @@
           $rs = $this->con->select($strReq);
           $count = $rs->f(0);
-
+          
           $strReq = 'SELECT comment_id, comment_content '.
                     'FROM '.$this->prefix.'comment ';
-
+          
           if ($start !== null && $limit !== null) {
                $strReq .= $this->con->limit($start,$limit);
           }
-
+          
           $rs = $this->con->select($strReq);
-
+          
           $cur = $this->con->openCursor($this->prefix.'comment');
-
+          
           while ($rs->fetch())
           {
@@ -1509 +1545 @@
                $cur->clean();
           }
-
+          
           if ($start+$limit > $count) {
                return null;
@@ -1515 +1551 @@
           return $start+$limit;
      }
-
+     
      /**
      Reinits nb_comment and nb_trackback in post table.
@@ -1521 +1557 @@
      public function countAllComments()
      {
-
+     
           $updCommentReq = 'UPDATE '.$this->prefix.'post P '.
                'SET nb_comment = ('.
@@ -1537 +1573 @@
           $this->con->execute($updTrackbackReq);
      }
-
+     
      /**
      Empty templates cache directory
@@ -1550 +1586 @@
      /**
       Return elapsed time since script has been started
-      @param     $mtime <b>float</b> timestamp (microtime format) to evaluate delta from
-                                          current time is taken if null
-      @return <b>float</b>          elapsed time
+      @param   $mtime <b>float</b> timestamp (microtime format) to evaluate delta from
+                                     current time is taken if null
+      @return <b>float</b>        elapsed time
       */
      public function getElapsedTime ($mtime=null) {

inc/prepend.php

@@ -78 +78 @@
 $__autoload['context']                  = dirname(__FILE__).'/public/lib.tpl.context.php';
 $__autoload['dcUrlHandlers']            = dirname(__FILE__).'/public/lib.urlhandlers.php';
+$__autoload['dcAdminURL']            = dirname(__FILE__).'/admin/lib.dc.adminurl.php';
 $__autoload['dcPostsActionsPage']            = dirname(__FILE__).'/admin/actions/class.dcactionposts.php';
 $__autoload['dcCommentsActionsPage']              = dirname(__FILE__).'/admin/actions/class.dcactioncomments.php';

inc/prepend.php

@@ -15 +15 @@
 
 /* ------------------------------------------------------------------------------------------- */
-#  ClearBricks, DotClear classes auto-loader
+#  ClearBricks, Twig, DotClear classes auto-loader
 if (@is_dir('/usr/lib/clearbricks')) {
      define('CLEARBRICKS_PATH','/usr/lib/clearbricks');
-} elseif (is_dir(dirname(__FILE__).'/libs/clearbricks')) {
-     define('CLEARBRICKS_PATH',dirname(__FILE__).'/libs/clearbricks');
+} elseif (is_dir(dirname(__FILE__).'/../vendor/dotclear/clearbricks')) {
+     define('CLEARBRICKS_PATH',dirname(__FILE__).'/../vendor/dotclear/clearbricks');
 } elseif (isset($_SERVER['CLEARBRICKS_PATH']) && is_dir($_SERVER['CLEARBRICKS_PATH'])) {
      define('CLEARBRICKS_PATH',$_SERVER['CLEARBRICKS_PATH']);
@@ -29 +29 @@
 
 require CLEARBRICKS_PATH.'/_common.php';
-$__autoload['dcCore']        = dirname(__FILE__).'/core/class.dc.core.php';
-$__autoload['dcAuth']        = dirname(__FILE__).'/core/class.dc.auth.php';
-$__autoload['dcBlog']        = dirname(__FILE__).'/core/class.dc.blog.php';
-$__autoload['dcCategories']  = dirname(__FILE__).'/core/class.dc.categories.php';
-$__autoload['dcError']       = dirname(__FILE__).'/core/class.dc.error.php';
-$__autoload['dcMeta']        = dirname(__FILE__).'/core/class.dc.meta.php';
-$__autoload['dcMedia']       = dirname(__FILE__).'/core/class.dc.media.php';
-$__autoload['dcPostMedia']   = dirname(__FILE__).'/core/class.dc.postmedia.php';
-$__autoload['dcModules']     = dirname(__FILE__).'/core/class.dc.modules.php';
-$__autoload['dcPlugins']     = dirname(__FILE__).'/core/class.dc.plugins.php';
-$__autoload['dcThemes']      = dirname(__FILE__).'/core/class.dc.themes.php';
-$__autoload['dcRestServer']  = dirname(__FILE__).'/core/class.dc.rest.php';
-$__autoload['dcNamespace']   = dirname(__FILE__).'/core/class.dc.namespace.php';
-$__autoload['dcSettings']    = dirname(__FILE__).'/core/class.dc.settings.php';
-$__autoload['dcTrackback']   = dirname(__FILE__).'/core/class.dc.trackback.php';
-$__autoload['dcUpdate']      = dirname(__FILE__).'/core/class.dc.update.php';
-$__autoload['dcUtils']       = dirname(__FILE__).'/core/class.dc.utils.php';
-$__autoload['dcXmlRpc']      = dirname(__FILE__).'/core/class.dc.xmlrpc.php';
-$__autoload['dcLog']         = dirname(__FILE__).'/core/class.dc.log.php';
-$__autoload['dcWorkspace']   = dirname(__FILE__).'/core/class.dc.workspace.php';
-$__autoload['dcPrefs']       = dirname(__FILE__).'/core/class.dc.prefs.php';
-$__autoload['dcStore']       = dirname(__FILE__).'/core/class.dc.store.php';
-$__autoload['dcStoreReader'] = dirname(__FILE__).'/core/class.dc.store.reader.php';
-$__autoload['dcStoreParser'] = dirname(__FILE__).'/core/class.dc.store.parser.php';
-$__autoload['dcFavorites']   = dirname(__FILE__).'/admin/class.dc.favorites.php';
-
-$__autoload['rsExtPost']    = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
-$__autoload['rsExtComment'] = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
-$__autoload['rsExtDates']   = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
-$__autoload['rsExtUser']    = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
-
-$__autoload['dcMenu']            = dirname(__FILE__).'/admin/class.dc.menu.php';
-$__autoload['dcPage']            = dirname(__FILE__).'/admin/lib.dc.page.php';
-$__autoload['adminGenericList']  = dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['adminPostList']     = dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['adminPostMiniList'] = dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['adminCommentList']  = dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['adminUserList']     = dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['dcPager']           = dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['dcAdminCombos']     = dirname(__FILE__).'/admin/lib.admincombos.php';
-$__autoload['adminModulesList']  = dirname(__FILE__).'/admin/lib.moduleslist.php';
-$__autoload['adminThemesList']   = dirname(__FILE__).'/admin/lib.moduleslist.php';
+$__autoload['dcCore']                   = dirname(__FILE__).'/core/class.dc.core.php';
+$__autoload['dcAuth']                   = dirname(__FILE__).'/core/class.dc.auth.php';
+$__autoload['dcBlog']                   = dirname(__FILE__).'/core/class.dc.blog.php';
+$__autoload['dcCategories']             = dirname(__FILE__).'/core/class.dc.categories.php';
+$__autoload['dcError']                  = dirname(__FILE__).'/core/class.dc.error.php';
+$__autoload['dcMeta']                   = dirname(__FILE__).'/core/class.dc.meta.php';
+$__autoload['dcMedia']                  = dirname(__FILE__).'/core/class.dc.media.php';
+$__autoload['dcPostMedia']                   = dirname(__FILE__).'/core/class.dc.postmedia.php';
+$__autoload['dcModules']                = dirname(__FILE__).'/core/class.dc.modules.php';
+$__autoload['dcPlugins']                = dirname(__FILE__).'/core/class.dc.plugins.php';
+$__autoload['dcThemes']                 = dirname(__FILE__).'/core/class.dc.themes.php';
+$__autoload['dcRestServer']             = dirname(__FILE__).'/core/class.dc.rest.php';
+$__autoload['dcNamespace']              = dirname(__FILE__).'/core/class.dc.namespace.php';
+$__autoload['dcSettings']               = dirname(__FILE__).'/core/class.dc.settings.php';
+$__autoload['dcTrackback']              = dirname(__FILE__).'/core/class.dc.trackback.php';
+$__autoload['dcUpdate']                 = dirname(__FILE__).'/core/class.dc.update.php';
+$__autoload['dcUtils']                  = dirname(__FILE__).'/core/class.dc.utils.php';
+$__autoload['dcXmlRpc']                 = dirname(__FILE__).'/core/class.dc.xmlrpc.php';
+$__autoload['dcLog']                    = dirname(__FILE__).'/core/class.dc.log.php';
+$__autoload['dcWorkspace']              = dirname(__FILE__).'/core/class.dc.workspace.php';
+$__autoload['dcPrefs']                  = dirname(__FILE__).'/core/class.dc.prefs.php';
+$__autoload['dcTwigPage']               = dirname(__FILE__).'/core/class.dc.twig.page.php';
+$__autoload['dcStore']             = dirname(__FILE__).'/core/class.dc.store.php';
+$__autoload['dcStoreReader']       = dirname(__FILE__).'/core/class.dc.store.reader.php';
+$__autoload['dcStoreParser']       = dirname(__FILE__).'/core/class.dc.store.parser.php';
+$__autoload['dcFavorites']              = dirname(__FILE__).'/admin/class.dc.favorites.php';
+
+$__autoload['rsExtPost']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
+$__autoload['rsExtComment']             = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
+$__autoload['rsExtDates']               = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
+$__autoload['rsExtUser']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
+
+$__autoload['dcAdminContext']                = dirname(__FILE__).'/admin/class.dc.admincontext.php';
+$__autoload['dcMenu']                   = dirname(__FILE__).'/admin/class.dc.menu.php';
+$__autoload['dcPage']                   = dirname(__FILE__).'/admin/lib.dc.page.php';
+$__autoload['adminGenericList']         = dirname(__FILE__).'/admin/lib.pager.php';
+$__autoload['adminPostList']            = dirname(__FILE__).'/admin/lib.pager.php';
+$__autoload['adminPostMiniList']        = dirname(__FILE__).'/admin/lib.pager.php';
+$__autoload['adminCommentList']         = dirname(__FILE__).'/admin/lib.pager.php';
+$__autoload['adminUserList']            = dirname(__FILE__).'/admin/lib.pager.php';
+$__autoload['dcPager']        = dirname(__FILE__).'/admin/lib.pager.php';
+$__autoload['dcAdminCombos']            = dirname(__FILE__).'/admin/lib.admincombos.php';
+$__autoload['adminModulesList']              = dirname(__FILE__).'/admin/lib.moduleslist.php';
+$__autoload['adminThemesList']               = dirname(__FILE__).'/admin/lib.moduleslist.php';
 $__autoload['dcThemeConfig']     = dirname(__FILE__).'/admin/lib.themeconfig.php';
 
-$__autoload['dcTemplate']            = dirname(__FILE__).'/public/class.dc.template.php';
-$__autoload['context']               = dirname(__FILE__).'/public/lib.tpl.context.php';
-$__autoload['dcUrlHandlers']         = dirname(__FILE__).'/public/lib.urlhandlers.php';
+$__autoload['dcTemplate']               = dirname(__FILE__).'/public/class.dc.template.php';
+$__autoload['context']                  = dirname(__FILE__).'/public/lib.tpl.context.php';
+$__autoload['dcUrlHandlers']            = dirname(__FILE__).'/public/lib.urlhandlers.php';
 $__autoload['dcAdminURL']            = dirname(__FILE__).'/admin/lib.dc.adminurl.php';
-$__autoload['dcPostsActionsPage']    = dirname(__FILE__).'/admin/actions/class.dcactionposts.php';
-$__autoload['dcCommentsActionsPage'] = dirname(__FILE__).'/admin/actions/class.dcactioncomments.php';
-$__autoload['dcActionsPage']         = dirname(__FILE__).'/admin/actions/class.dcaction.php';
+$__autoload['dcPostsActionsPage']            = dirname(__FILE__).'/admin/actions/class.dcactionposts.php';
+$__autoload['dcCommentsActionsPage']              = dirname(__FILE__).'/admin/actions/class.dcactioncomments.php';
+$__autoload['dcActionsPage']            = dirname(__FILE__).'/admin/actions/class.dcaction.php';
+$__autoload['dcForm']              = dirname(__FILE__).'/admin/class.dc.form.php';
+$__autoload['dcFormExtension']               = dirname(__FILE__).'/admin/class.dc.form.php';
+$__autoload['dcTabExtension']           = dirname(__FILE__).'/admin/class.dc.tab.php';
+$__autoload['dcItemList']               = dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['dcListFetcher']            = dirname(__FILE__).'/admin/class.dc.list.php';
+
+foreach (array('dcFilterSet', 'dcFilter','dcFilterCombo','dcFilterText','dcFilterBoolean') as $c) {
+     $__autoload[$c] = dirname(__FILE__).'/admin/class.dc.filter.php';
+}
 
 # Clearbricks extensions
 html::$absolute_regs[] = '/(<param\s+name="movie"\s+value=")(.*?)(")/msu';
 html::$absolute_regs[] = '/(<param\s+name="FlashVars"\s+value=".*?(?:mp3|flv)=)(.*?)(&|")/msu';
+
+if (@is_dir('/usr/lib/twig')) {
+     define('TWIG_PATH','/usr/lib/Twig');
+} elseif (is_dir(dirname(__FILE__).'/../vendor/twig/twig/lib/Twig')) {
+     define('TWIG_PATH',dirname(__FILE__).'/../vendor/twig/twig/lib/Twig');
+} elseif (isset($_SERVER['TWIG_PATH']) && is_dir($_SERVER['TWIG_PATH'])) {
+     define('TWIG_PATH',$_SERVER['TWIG_PATH']);
+}
+
+if (!defined('TWIG_PATH') || !is_dir(TWIG_PATH)) {
+     exit('No Twig path defined');
+}
+require TWIG_PATH.'/Autoloader.php';
+Twig_Autoloader::register();
+
 /* ------------------------------------------------------------------------------------------- */
 
@@ -140 +166 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.7-dev');
+define('DC_VERSION','2.99-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');