Changeset 1080:4f4478e9973d

Timestamp:

12/18/12 14:36:48 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

twig

Parents:

1079:e3bf3d268635 (diff), 1077:e80b1a400723 (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:

Fusion avec default

Files:

• admin/index.php (modified) (6 diffs)
• admin/post.php (modified) (7 diffs)
• inc/admin/lib.dc.page.php (modified) (5 diffs)
• inc/admin/prepend.php (modified) (1 diff)
• inc/admin/prepend.php (modified) (2 diffs)
• inc/prepend.php (modified) (4 diffs)
• inc/prepend.php (modified) (1 diff)

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)) {
@@ -62 +135 @@
      }
      $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[] = new formSelectOption(
+                    str_repeat('  ',$categories->level-1).
+                    ($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title),
+                    $categories->cat_id
+               );
+          }
+     }
+     catch (Exception $e) { }
+     
+     $form = new dcForm($core,'quickentry','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;
 }
 
@@ -118 +244 @@
 }
 
-# Latest news for dashboard
+# Send dashboard icons to templates
+$icons = array();
+foreach ($__dashboard_icons as $i) {
+     $icons[] = array(
+          'title'   => $i[0],
+          'url'     => $i[1],
+          'img'     => dc_admin_icon_url($i[2])
+     );
+}
+$_ctx->dashboard_icons = $icons;
+
+# Dashboard items
 $__dashboard_items = new ArrayObject(array(new ArrayObject,new ArrayObject));
-
-# Documentation links
-$dashboardItem = 0;
-if ($core->auth->user_prefs->dashboard->doclinks) {
-     if (!empty($__resources['doc']))
-     {
-          $doc_links = '<h3>'.__('Documentation and support').'</h3><ul>';
-     
-          foreach ($__resources['doc'] as $k => $v) {
-               $doc_links .= '<li><a href="'.$v.'" title="'.$k.' '.__('(external link)').'">'.$k.'</a></li>';
-          }
-     
-          $doc_links .= '</ul>';
-          $__dashboard_items[$dashboardItem][] = $doc_links;
-          $dashboardItem++;
-     }
-}
-
-if ($core->auth->user_prefs->dashboard->dcnews) {
-     try
-     {
-          if (empty($__resources['rss_news'])) {
-               throw new Exception();
-          }
-     
-          $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)
-          {
-               $latest_news = '<h3>'.__('Latest news').'</h3><dl id="news">';
-               $i = 1;
-               foreach ($feed->items as $item)
-               {
-                    $dt = isset($item->link) ? '<a href="'.$item->link.'" title="'.$item->title.' '.__('(external link)').'">'.
-                         $item->title.'</a>' : $item->title;
-               
-                    if ($i < 3) {
-                         $latest_news .=
-                         '<dt>'.$dt.'</dt>'.
-                         '<dd><p><strong>'.dt::dt2str(__('%d %B %Y:'),$item->pubdate,'Europe/Paris').'</strong> '.
-                         '<em>'.text::cutString(html::clean($item->content),120).'...</em></p></dd>';
-                    } else {
-                         $latest_news .=
-                         '<dt>'.$dt.'</dt>'.
-                         '<dd>'.dt::dt2str(__('%d %B %Y:'),$item->pubdate,'Europe/Paris').'</dd>';
-                    }
-                    $i++;
-                    if ($i > 3) { break; }
-               }
-               $latest_news .= '</dl>';
-               $__dashboard_items[$dashboardItem][] = $latest_news;
-               $dashboardItem++;
-          }
-     }
-     catch (Exception $e) {}
-}
-
 $core->callBehavior('adminDashboardItems', $core, $__dashboard_items);
 
+# Send dashboard items to templates
+$items = array();
+foreach ($__dashboard_items as $i) {    
+     if ($i->count() > 0) {
+          foreach ($i as $v) {
+               $items[] = $v;
+          }
+     }
+}
+$_ctx->dashboard_items = $items;
+
 # Dashboard content
-$dashboardContents = '';
 $__dashboard_contents = new ArrayObject(array(new ArrayObject,new ArrayObject));
 $core->callBehavior('adminDashboardContents', $core, $__dashboard_contents);
 
-/* DISPLAY
--------------------------------------------------------- */
-dcPage::open(__('Dashboard'),
-     dcPage::jsToolBar().
-     dcPage::jsLoad('js/_index.js').
-     # --BEHAVIOR-- adminDashboardHeaders
-     $core->callBehavior('adminDashboardHeaders')
-);
-
-echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Dashboard').'</span></h2>';
-
-if ($core->auth->getInfo('user_default_blog') != $core->blog->id && $core->auth->blog_count > 1) {
-     echo
-     '<p><a href="index.php?default_blog=1" class="button">'.__('Make this blog my default blog').'</a></p>';
-}
-
+# Send dashboard contents to templates
+$contents = array();
+foreach ($__dashboard_contents as $i) { 
+     if ($i->count() > 0) {
+          foreach ($i as $v) {
+               $contents[] = $v;
+          }
+     }
+}
+$_ctx->dashboard_contents = $contents;
+
+# 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>';
-}
-
-# Plugins install messages
-if (!empty($plugins_install['success']))
-{
-     echo '<div class="static-msg">'.__('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>';
-}
-
-# Dashboard columns (processed first, as we need to know the result before displaying the icons.)
-$dashboardItems = '';
-
-# 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) {
-          $dashboardItems .=
-          '<div id="upg-notify" class="static-msg"><p>'.sprintf(__('Dotclear %s is available!'),$new_v).'</p> '.
-          '<ul><li><strong><a href="update.php">'.sprintf(__('Upgrade now'),$new_v).'</a></strong>'.
-          '</li><li><a href="update.php?hide_msg=1">'.__('Remind me later').'</a>'.
-          ($version_info ? ' </li><li><a href="'.$version_info.'">'.__('information about this version').'</a>' : '').
-          '</li></ul></div>';
-     }
-}
-
-# Errors modules notifications
-if ($core->auth->isSuperAdmin())
-{
-     $list = array();
-     foreach ($core->plugins->getErrors() as $k => $error) {
-          $list[] = '<li>'.$error.'</li>';
-     }
-     
-     if (count($list) > 0) {
-          $dashboardItems .=
-          '<div id="module-errors" class="error"><p>'.__('Some plugins are installed twice:').'</p> '.
-          '<ul>'.implode("\n",$list).'</ul></div>';
-     }
-     
-}
-
-foreach ($__dashboard_items as $i)
-{    
-     if ($i->count() > 0)
-     {
-          $dashboardItems .= '<div>';
-          foreach ($i as $v) {
-               $dashboardItems .= $v;
-          }
-          $dashboardItems .= '</div>';
-     }
-}
-
-# Dashboard icons
-echo '<div id="dashboard-main"'.($dashboardItems ? '' : ' class="fullwidth"').'><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))
-     {
-          $categories_combo = array('&nbsp;' => '');
-          try {
-               $categories = $core->blog->getCategories(array('post_type'=>'post'));
-               while ($categories->fetch()) {
-                    $categories_combo[] = new formSelectOption(
-                         str_repeat('&nbsp;&nbsp;',$categories->level-1).
-                         ($categories->level-1 == 0 ? '' : '&bull; ').html::escapeHTML($categories->cat_title),
-                         $categories->cat_id
-                    );
-               }
-          } catch (Exception $e) { }
-     
-          echo
-          '<div id="quick">'.
-          '<h3>'.__('Quick entry').'</h3>'.
-          '<form id="quick-entry" action="post.php" method="post">'.
-          '<fieldset><legend>'.__('New entry').'</legend>'.
-          '<p class="col"><label for="post_title" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').
-          form::field('post_title',20,255,'','maximal').
-          '</label></p>'.
-          '<p class="area"><label class="required" '.
-          'for="post_content"><abbr title="'.__('Required field').'">*</abbr> '.__('Content:').'</label> '.
-          form::textarea('post_content',50,7).
-          '</p>'.
-          '<p><label for="cat_id" class="classic">'.__('Category:').' '.
-          form::combo('cat_id',$categories_combo).'</label></p>'.
-          '<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>'.
-          '</fieldset>'.
-          '</form>'.
-          '</div>';
-     }
-}
-
-foreach ($__dashboard_contents as $i)
-{    
-     if ($i->count() > 0)
-     {
-          $dashboardContents .= '<div>';
-          foreach ($i as $v) {
-               $dashboardContents .= $v;
-          }
-          $dashboardContents .= '</div>';
-     }
-}
-echo ($dashboardContents ? '<div id="dashboard-contents">'.$dashboardContents.'</div>' : '');
-
-echo '</div>';
-
-echo ($dashboardItems ? '<div id="dashboard-items">'.$dashboardItems.'</div>' : '');
-
-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->setPageTitle(__('Dashboard'));
+$core->tpl->display('index.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_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;
+function savePost($form) {
+     global $_ctx;
+     $_ctx->setMessage('save');
+
+}
+
+function deletePost($form) {
+     print_r($form); exit;
+}
 
 $page_title = __('New entry');
@@ -47 +39 @@
 # If user can't publish
 if (!$can_publish) {
-     $post_status = -2;
+     $form->post_status = -2;
 }
 
@@ -55 +47 @@
      $categories = $core->blog->getCategories(array('post_type'=>'post'));
      while ($categories->fetch()) {
-          $categories_combo[] = new formSelectOption(
-               str_repeat('  ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title),
-               $categories->cat_id
-          );
+          $categories_combo[$categories->cat_id] = 
+               str_repeat('  ',$categories->level-1).
+               ($categories->level-1 == 0 ? '' : '• ').
+               html::escapeHTML($categories->cat_title);
      }
 } catch (Exception $e) { }
@@ -64 +56 @@
 # Status combo
 foreach ($core->blog->getAllPostStatus() as $k => $v) {
-     $status_combo[$v] = (string) $k;
-}
-$img_status_pattern = '<img class="img_select_option" alt="%1$s" title="%1$s" src="images/%2$s" />';
+     $status_combo[$k] = $v;
+}
 
 # Formaters combo
@@ -88 +79 @@
 unset($rs);
 
-# Validation flag
-$bad_dt = false;
-
+$form = new dcForm($core,'post','post.php');
+$form
+     ->addField(
+          new dcFieldText('post_title','', array(
+               'size'         => 20,
+               'required'     => true,
+               'label'        => __('Title'))))
+     ->addField(
+          new dcFieldTextArea('post_excerpt','', array(
+               'cols'         => 50,
+               'rows'         => 5,
+               'label'        => __("Excerpt:"))))
+     ->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' => 'savePost')))
+     ->addField(
+          new dcFieldSubmit('delete',__('Delete'),array(
+               'action' => '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 dcFieldText('post_dt','',array(
+               "label" => __('Published on:'))))
+     ->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',false,array(
+               "label" => __('Selected entry'))))
+     ->addField(
+          new dcFieldCombo ('post_lang',$core->auth->getInfo('user_lang'),$lang_combo, array(
+               "label" => __('Entry lang:'))))
+     ->addField(
+          new dcFieldHidden ('id',''))
+;
 # Get entry informations
 if (!empty($_REQUEST['id']))
@@ -105 +146 @@
      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;
-          $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;
+          $form->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();
           
-          $page_title = __('Edit entry');
-          
-          $can_edit_post = $post->isEditable();
-          $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);
-          }
-          
-          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) {}
-     }
-}
-
-# Format excerpt and content
-if (!empty($_POST) && $can_edit_post)
-{
-     $post_format = $_POST['post_format'];
-     $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)
-{
-     $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_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
-          {
-               # --BEHAVIOR-- adminBeforePostUpdate
-               $core->callBehavior('adminBeforePostUpdate',$cur,$post_id);
-               
-               $core->blog->updPost($post_id,$cur);
-               
-               # --BEHAVIOR-- adminAfterPostUpdate
-               $core->callBehavior('adminAfterPostUpdate',$cur,$post_id);
-               
-               http::redirect('post.php?id='.$post_id.'&upd=1');
-          }
-          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);
-               
-               # --BEHAVIOR-- adminAfterPostCreate
-               $core->callBehavior('adminAfterPostCreate',$cur,$return_id);
-               
-               http::redirect('post.php?id='.$return_id.'&crea=1');
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
-          }
-     }
-}
+     }
+}
+
+$form->setup();
+
+
+
+// TODO: Do it better later, required by some javascripts
+$some_globals = array(
+     'rtl' => l10n::getTextDirection($_lang) == 'rtl',
+     'Nonce' => $core->getNonce(),
+     'sess_id' => session_id(),
+     'sess_uid' => $_SESSION['sess_browser_uid'],
+     'media_manage' => $core->auth->check('media,media_admin',$core->blog->id),
+     'enable_wysiwyg' => isset($core->auth) && $core->auth->getOption('enable_wysiwyg'),
+     'edit_size' => $core->auth->getOption('edit_size')
+);
+foreach($some_globals as $name => $value) {
+     $_ctx->$name = $value;
+};
+//
+
+
 
 /* DISPLAY
@@ -293 +199 @@
      $default_tab = 'comments';
 }
-
-dcPage::open($page_title.' - '.__('Entries'),
-     dcPage::jsDatePicker().
-     dcPage::jsToolBar().
-     dcPage::jsModal().
-     dcPage::jsMetaEditor().
-     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
-);
-
-if (!empty($_GET['upd'])) {
-     dcPage::message(__('Entry has been successfully updated.'));
-}
-elseif (!empty($_GET['crea'])) {
-     dcPage::message(__('Entry has been successfully created.'));
-}
-elseif (!empty($_GET['attached'])) {
-     dcPage::message(__('File has been successfully attached.'));
-}
-elseif (!empty($_GET['rmattach'])) {
-     dcPage::message(__('Attachment has been successfully removed.'));
-}
-
-if (!empty($_GET['creaco'])) {
-     dcPage::message(__('Comment has been successfully created.'));
-}
-
-# 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.'));
-}
-
-echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.'<a href="posts.php">'.__('Entries').'</a> &rsaquo; <span class="page-title">'.$page_title;
-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 = '';
-     }
-     echo ' &ldquo;'.$post_title.'&rdquo;'.' '.$img_status;
-}
-echo '</span></h2>';
-
-if ($post_id && $post->post_status == 1) {
-     echo '<p><a href="'.$post->getURL().'" onclick="window.open(this.href);return false;" title="'.$post_title.' ('.__('new window').')'.'">'.__('Go to this entry on the site').' <img src="images/outgoing-blue.png" alt="" /></a></p>';
-}
-if ($post_id)
-{
-     echo '<p>';
-     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)
-{
-     echo '<div class="multi-part" title="'.__('Edit entry').'" id="edit-entry">';
-     echo '<form action="post.php" method="post" id="entry-form">';
-     echo '<div id="entry-wrapper">';
-     echo '<div id="entry-content"><div class="constrained">';
-     
-     echo
-     '<p class="col"><label class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').
-     form::field('post_title',20,255,html::escapeHTML($post_title),'maximal').
-     '</label></p>'.
-     
-     '<p class="area" id="excerpt-area"><label for="post_excerpt">'.__('Excerpt:').'</label> '.
-     form::textarea('post_excerpt',50,5,html::escapeHTML($post_excerpt)).
-     '</p>'.
-     
-     '<p class="area"><label class="required" '.
-     '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>'.
-     
-     '<p class="area" id="notes-area"><label for="post_notes">'.__('Notes:').'</label>'.
-     form::textarea('post_notes',50,5,html::escapeHTML($post_notes)).
-     '</p>';
-     
-     # --BEHAVIOR-- adminPostForm
-     $core->callBehavior('adminPostForm',isset($post) ? $post : null);
-     
-     echo
-     '<p>'.
-     ($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">'.__('Preview').'</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">';
-     
-     echo
-     '<p><label for="cat_id">'.__('Category:').
-     form::combo('cat_id',$categories_combo,$cat_id,'maximal').
-     '</label></p>'.
-     
-     '<p><label for="post_status">'.__('Entry status:').
-     form::combo('post_status',$status_combo,$post_status,'','',!$can_publish).
-     '</label></p>'.
-     
-     '<p><label for="post_dt">'.__('Published on:').
-     form::field('post_dt',16,16,$post_dt,($bad_dt ? 'invalid' : '')).
-     '</label></p>'.
-     
-     '<p><label for="post_format">'.__('Text formating:').
-     form::combo('post_format',$formaters_combo,$post_format).
-     '</label>'.
-     '</p>'.
-     '<p>'.($post_id && $post_format != 'xhtml' ? '<a id="convert-xhtml" class="button" href="post.php?id='.$post_id.'&amp;xconv=1">'.__('Convert to XHTML').'</a>' : '').'</p>'.
-     
-     '<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">'.__('Warning: Comments are not accepted on this blog.').'</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">'.__('Warning: Trackbacks are not accepted on this blog.').'</p>').
-
-     '<p><label for="post_selected" class="classic">'.form::checkbox('post_selected',1,$post_selected).' '.
-     __('Selected entry').'</label></p>'.
-     
-     '<p><label for="post_lang">'.__('Entry lang:').
-     form::combo('post_lang',$lang_combo,$post_lang).
-     '</label></p>'.
-     
-     '<p><label for="post_password">'.__('Entry password:').
-     form::field('post_password',10,32,html::escapeHTML($post_password),'maximal').
-     '</label></p>'.
-     
-     '<div class="lockable">'.
-     '<p><label for="post_url">'.__('Basename:').
-     form::field('post_url',10,255,html::escapeHTML($post_url),'maximal').
-     '</label></p>'.
-     '<p class="form-note warn">'.
-     __('Warning: If you set the URL manually, it may conflict with another entry.').
-     '</p>'.
-     '</div>';
-     
-     # --BEHAVIOR-- adminPostFormSidebar
-     $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 && $post->post_status == 1) {
-          echo '<p><a href="trackbacks.php?id='.$post_id.'" class="multi-part">'.
-          __('Ping blogs').'</a></p>';
-     }
-     
-}
-
-
-/* Comments and trackbacks
--------------------------------------------------------- */
-if ($post_id)
-{
-     $params = array('post_id' => $post_id, 'order' => 'comment_dt ASC');
-     
-     $comments = $core->blog->getComments(array_merge($params,array('comment_trackback'=>0)));
-     $trackbacks = $core->blog->getComments(array_merge($params,array('comment_trackback'=>1)));
-     
-     # Actions combo box
-     $combo_action = array();
-     if ($can_edit_post && $core->auth->check('publish,contentadmin',$core->blog->id))
-     {
-          $combo_action[__('publish')] = 'publish';
-          $combo_action[__('unpublish')] = 'unpublish';
-          $combo_action[__('mark as pending')] = 'pending';
-          $combo_action[__('mark as junk')] = 'junk';
-     }
-     
-     if ($can_edit_post && $core->auth->check('delete,contentadmin',$core->blog->id))
-     {
-          $combo_action[__('Delete')] = 'delete';
-     }
-     
-     # --BEHAVIOR-- adminCommentsActionsCombo
-     $core->callBehavior('adminCommentsActionsCombo',array(&$combo_action));
-     
-     $has_action = !empty($combo_action) && (!$trackbacks->isEmpty() || !$comments->isEmpty());
-     
-     echo
-     '<div id="comments" class="multi-part" title="'.__('Comments').'">';
-     
-     if ($has_action) {
-          echo '<form action="comments_actions.php" id="form-comments" method="post">';
-     }
-     
-     echo '<h3>'.__('Trackbacks').'</h3>';
-     
-     if (!$trackbacks->isEmpty()) {
-          showComments($trackbacks,$has_action,true);
-     } else {
-          echo '<p>'.__('No trackback').'</p>';
-     }
-     
-     echo '<h3>'.__('Comments').'</h3>';
-     if (!$comments->isEmpty()) {
-          showComments($comments,$has_action);
-     } else {
-          echo '<p>'.__('No comment').'</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('redir','post.php?id='.$post_id.'&amp;co=1').
-          $core->formNonce().
-          '<input type="submit" value="'.__('ok').'" /></p>'.
-          '</div>'.
-          '</form>';
-     }
-     
-     echo '</div>';
-}
-
-/* Add a comment
--------------------------------------------------------- */
-if ($post_id)
-{
-     echo
-     '<div class="multi-part" id="add-comment" title="'.__('Add a comment').'">'.
-     '<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:').
-     form::field('comment_author',30,255,html::escapeHTML($core->auth->getInfo('user_cn'))).
-     '</label></p>'.
-     
-     '<p><label for="comment_email">'.__('Email:').
-     form::field('comment_email',30,255,html::escapeHTML($core->auth->getInfo('user_email'))).
-     '</label></p>'.
-     
-     '<p><label for="comment_site">'.__('Web site:').
-     form::field('comment_site',30,255,html::escapeHTML($core->auth->getInfo('user_url'))).
-     '</label></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>'.
-     '</form>'.
-     '</div>';
-}
-
-# 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
-     '<table class="comments-list"><tr>'.
-     '<th colspan="2">'.__('Author').'</th>'.
-     '<th>'.__('Date').'</th>'.
-     '<th class="nowrap">'.__('IP address').'</th>'.
-     '<th>'.__('Status').'</th>'.
-     '<th>&nbsp;</th>'.
-     '</tr>';
-     
-     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,'','','',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').'" /></a></td>'.
-          
-          '</tr>';
-     }
-     
-     echo '</table>';
-}
-
-dcPage::helpBlock('core_post','core_wiki');
-dcPage::close();
+$_ctx->default_tab = $default_tab;
+$_ctx->setPageTitle($page_title);
+
+$core->tpl->display('post.html.twig');
 ?>

inc/admin/lib.dc.page.php

@@ -49 +49 @@
      
      # Top of admin page
-     public static function open($title='', $head='')
-     {
-          global $core;
-          
-          # List of user's blogs
-          if ($core->auth->blog_count == 1 || $core->auth->blog_count > 20)
-          {
-               $blog_box =
-               '<p>'.__('Blog:').' <strong title="'.html::escapeHTML($core->blog->url).'">'.
-               html::escapeHTML($core->blog->name).'</strong>';
-               
-               if ($core->auth->blog_count > 20) {
-                    $blog_box .= ' - <a href="blogs.php">'.__('Change blog').'</a>';
-               }
-               $blog_box .= '</p>';
-          }
-          else
-          {
-               $rs_blogs = $core->getBlogs(array('order'=>'LOWER(blog_name)','limit'=>20));
-               $blogs = array();
-               while ($rs_blogs->fetch()) {
-                    $blogs[html::escapeHTML($rs_blogs->blog_name.' - '.$rs_blogs->blog_url)] = $rs_blogs->blog_id;
-               }
-               $blog_box =
-               '<p><label for="switchblog" class="classic">'.
-               __('Blogs:').' '.
-               $core->formNonce().
-               form::combo('switchblog',$blogs,$core->blog->id).
-               '</label></p>'.
-               '<noscript><p><input type="submit" value="'.__('ok').'" /></p></noscript>';
-          }
-          
-          $safe_mode = isset($_SESSION['sess_safe_mode']) && $_SESSION['sess_safe_mode'];
-          
-          # Display
-          header('Content-Type: text/html; charset=UTF-8');
-          echo
-          '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" '.
-          ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'."\n".
-          '<html xmlns="http://www.w3.org/1999/xhtml" '.
-          'xml:lang="'.$core->auth->getInfo('user_lang').'" '.
-          'lang="'.$core->auth->getInfo('user_lang').'">'."\n".
-          "<head>\n".
-          '  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />'."\n".
-          '  <title>'.$title.' - '.html::escapeHTML($core->blog->name).' - '.html::escapeHTML(DC_VENDOR_NAME).' - '.DC_VERSION.'</title>'."\n".
-          
-          '  <meta name="ROBOTS" content="NOARCHIVE,NOINDEX,NOFOLLOW" />'."\n".
-          '  <meta name="GOOGLEBOT" content="NOSNIPPET" />'."\n".
-          
-          self::jsLoadIE7().
-          '    <link rel="stylesheet" href="style/default.css" type="text/css" media="screen" />'."\n"; 
-          if (l10n::getTextDirection($GLOBALS['_lang']) == 'rtl') {
-               echo
-          '    <link rel="stylesheet" href="style/default-rtl.css" type="text/css" media="screen" />'."\n"; 
-          }
-
-          $core->auth->user_prefs->addWorkspace('interface');
-          $user_ui_hide_std_favicon = $core->auth->user_prefs->interface->hide_std_favicon;
-          if (!$user_ui_hide_std_favicon) {
-               echo '<link rel="icon" type="image/png" href="images/favicon.png" />';
-          }
-          
-          echo
-          self::jsCommon().
-          $head;
-          
-          # --BEHAVIOR-- adminPageHTMLHead
-          $core->callBehavior('adminPageHTMLHead');
-          
-          echo
-          "</head>\n".
-          '<body id="dotclear-admin'.
-          ($safe_mode ? ' safe-mode' : '').
-          '">'."\n".
-          
-          '<div id="header">'.
-          '<ul id="prelude"><li><a href="#content">'.__('Go to the content').'</a></li><li><a href="#main-menu">'.__('Go to the menu').'</a></li></ul>'."\n".
-          '<div id="top"><h1><a href="index.php">'.DC_VENDOR_NAME.'</a></h1></div>'."\n"; 
-          
-          echo
-          '<div id="info-boxes">'.
-          '<div id="info-box1">'.
-          '<form action="index.php" method="post">'.
-          $blog_box.
-          '<p><a href="'.$core->blog->url.'" onclick="window.open(this.href);return false;" title="'.__('Go to site').' ('.__('new window').')'.'">'.__('Go to site').' <img src="images/outgoing.png" alt="" /></a>'.
-          '</p></form>'.
-          '</div>'.
-          '<div id="info-box2">'.
-          '<a'.(preg_match('/index.php$/',$_SERVER['REQUEST_URI']) ? ' class="active"' : '').' href="index.php">'.__('My dashboard').'</a>'.
-          '<span> | </span><a'.(preg_match('/preferences.php(\?.*)?$/',$_SERVER['REQUEST_URI']) ? ' class="active"' : '').' href="preferences.php">'.__('My preferences').'</a>'.
-          '<span> | </span><a href="index.php?logout=1" class="logout">'.sprintf(__('Logout %s'),$core->auth->userID()).' <img src="images/logout.png" alt="" /></a>'.
-          '</div>'.
-          '</div>'.
-          '</div>';
-          
-          echo
-          '<div id="wrapper">'."\n".
-          '<div id="main">'."\n".
-          '<div id="content">'."\n";
-          
-          # Safe mode
-          if ($safe_mode)
-          {
-               echo
-               '<div class="error"><h3>'.__('Safe mode').'</h3>'.
-               '<p>'.__('You are in safe mode. All plugins have been temporarily disabled. Remind to log out then log in again normally to get back all functionalities').'</p>'.
-               '</div>';
-          }
+     public static function open($title='',$head='',$popup=false)
+     {
+          global $core, $_ctx;
+          
+          $_ctx->popup = (boolean) $popup;
+          $_ctx->page_header = $head;
+          $_ctx->setPageTitle($title);
+          
+          ob_start();
+     }
+     
+     public static function close()
+     {
+          $res = ob_get_contents();
+          ob_end_clean();
+          
+          global $core, $_ctx;
           
           if ($core->error->flag()) {
-               echo
-               '<div class="error"><p><strong>'.(count($core->error->getErrors()) > 1 ? __('Errors:') : __('Error:')).'</p></strong>'.
-               $core->error->toHTML().
-               '</div>';
-          }
-     }
-     
-     public static function close()
-     {
-          global $core;
-
-          $menu =& $GLOBALS['_menu'];
-          
-          echo
-          "</div>\n".         // End of #content
-          "</div>\n".         // End of #main
-          
-          '<div id="main-menu">'."\n";
-          
-          foreach ($menu as $k => $v) {
-               echo $menu[$k]->draw();
-          }
-          
-          $text = sprintf(__('Thank you for using %s.'),'<a href="http://dotclear.org/">Dotclear '.DC_VERSION.'</a>');
-
-          # --BEHAVIOR-- adminPageFooter
-          $textAlt = $core->callBehavior('adminPageFooter',$core,$text);
-
-          echo
-          '</div>'."\n".      // End of #main-menu
-          '<div id="footer"><p>'.($textAlt != '' ? $textAlt : $text).'</p></div>'."\n".
-          "</div>\n";         // End of #wrapper
-          
-          if (defined('DC_DEV') && DC_DEV === true) {
-               echo self::debugInfo();
-          }
-          
-          echo
-          '</body></html>';
-     }
-     
-     public static function openPopup($title='', $head='')
-     {
-          global $core;
-          
-          # Display
-          header('Content-Type: text/html; charset=UTF-8');
-          echo
-          '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" '.
-          ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'."\n".
-          '<html xmlns="http://www.w3.org/1999/xhtml" '.
-          'xml:lang="'.$core->auth->getInfo('user_lang').'" '.
-          'lang="'.$core->auth->getInfo('user_lang').'">'."\n".
-          "<head>\n".
-          '  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />'."\n".
-          '  <title>'.$title.' - '.html::escapeHTML($core->blog->name).' - '.html::escapeHTML(DC_VENDOR_NAME).' - '.DC_VERSION.'</title>'."\n".
-          
-          '  <meta name="ROBOTS" content="NOARCHIVE,NOINDEX,NOFOLLOW" />'."\n".
-          '  <meta name="GOOGLEBOT" content="NOSNIPPET" />'."\n".
-          
-          self::jsLoadIE7().
-          '    <link rel="stylesheet" href="style/default.css" type="text/css" media="screen" />'."\n"; 
-          if (l10n::getTextDirection($GLOBALS['_lang']) == 'rtl') {
-               echo
-               '    <link rel="stylesheet" href="style/default-rtl.css" type="text/css" media="screen" />'."\n"; 
-          }
-          
-          echo
-          self::jsCommon().
-          $head;
-          
-          # --BEHAVIOR-- adminPageHTMLHead
-          $core->callBehavior('adminPageHTMLHead');
-          
-          echo
-          "</head>\n".
-          '<body id="dotclear-admin" class="popup">'."\n".
-          
-          '<div id="top"><h1>'.DC_VENDOR_NAME.'</h1></div>'."\n";
-          
-          echo
-          '<div id="wrapper">'."\n".
-          '<div id="main">'."\n".
-          '<div id="content">'."\n";
-          
-          if ($core->error->flag()) {
-               echo
-               '<div class="error"><strong>'.__('Errors:').'</strong>'.
-               $core->error->toHTML().
-               '</div>';
-          }
+               foreach($core->error->getErrors() as $e) {
+                    $_ctx->addError($e);
+               }
+          }
+          $_ctx->page_content = $res;
+          $core->tpl->display('page_layout.html.twig');
+     }
+     
+     public static function openPopup($title='',$head='')
+     {
+          self::open($title,$head,true);
      }
      
      public static function closePopup()
      {
-          echo
-          "</div>\n".         // End of #content
-          "</div>\n".         // End of #main
-          '<div id="footer"><p>&nbsp;</p></div>'."\n".
-          "</div>\n".         // End of #wrapper
-          '</body></html>';
+          self::close();
      }
 
@@ -278 +102 @@
      }
      
-     private static function debugInfo()
-     {
-          $global_vars = implode(', ',array_keys($GLOBALS));
-          
-          $res =
-          '<div id="debug"><div>'.
-          '<p>memory usage: '.memory_get_usage().' ('.files::size(memory_get_usage()).')</p>';
-          
-          if (function_exists('xdebug_get_profiler_filename'))
-          {
-               $res .= '<p>Elapsed time: '.xdebug_time_index().' seconds</p>';
-               
-               $prof_file = xdebug_get_profiler_filename();
-               if ($prof_file) {
-                    $res .= '<p>Profiler file : '.xdebug_get_profiler_filename().'</p>';
-               } else {
-                    $prof_url = http::getSelfURI();
-                    $prof_url .= (strpos($prof_url,'?') === false) ? '?' : '&';
-                    $prof_url .= 'XDEBUG_PROFILE';
-                    $res .= '<p><a href="'.html::escapeURL($prof_url).'">Trigger profiler</a></p>';
-               }
-               
-               /* xdebug configuration:
-               zend_extension = /.../xdebug.so
-               xdebug.auto_trace = On
-               xdebug.trace_format = 0
-               xdebug.trace_options = 1
-               xdebug.show_mem_delta = On
-               xdebug.profiler_enable = 0
-               xdebug.profiler_enable_trigger = 1
-               xdebug.profiler_output_dir = /tmp
-               xdebug.profiler_append = 0
-               xdebug.profiler_output_name = timestamp
-               */
-          }
-          
-          $res .=
-          '<p>Global vars: '.$global_vars.'</p>'.
-          '</div></div>';
-          
-          return $res;
-     }
-     
      public static function help($page,$index='')
      {
@@ -400 +181 @@
           self::jsVar('dotclear.nonce',$GLOBALS['core']->getNonce()).
           
-          self::jsVar('dotclear.img_plus_src','images/expand.png').
+          self::jsVar('dotclear.img_plus_src','images/plus.png').
           self::jsVar('dotclear.img_plus_alt',__('uncover')).
-          self::jsVar('dotclear.img_minus_src','images/hide.png').
+          self::jsVar('dotclear.img_minus_src','images/minus.png').
           self::jsVar('dotclear.img_minus_alt',__('hide')).
           self::jsVar('dotclear.img_menu_on','images/menu_on.png').
@@ -433 +214 @@
           self::jsVar('dotclear.msg.confirm_delete_post',
                __("Are you sure you want to delete this entry?")).
-          self::jsVar('dotclear.msg.confirm_spam_delete',
-               __('Are you sure you want to delete all spams?')).
           self::jsVar('dotclear.msg.confirm_delete_comments',
                __('Are you sure you want to delete selected comments (%s)?')).
@@ -689 +468 @@
           "//<![CDATA[\n".
           "dotclear.candyUpload = {};\n".
-          self::jsVar('dotclear.msg.activate_enhanced_uploader',__('Temporarily activate enhanced uploader')).
-          self::jsVar('dotclear.msg.disable_enhanced_uploader',__('Temporarily disable enhanced uploader')).
+          self::jsVar('dotclear.msg.activate_enhanced_uploader',__('Activate enhanced uploader')).
+          self::jsVar('dotclear.msg.disable_enhanced_uploader',__('Disable enhanced uploader')).
           self::jsVar('$._candyUpload.prototype.locales.file_uploaded',__('File successfully uploaded.')).
           self::jsVar('$._candyUpload.prototype.locales.max_file_size',__('Maximum file size allowed:')).

inc/admin/prepend.php

@@ -375 +375 @@
      }
 }
+
+# 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/admin/prepend.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 
+define('DC_CONTEXT_ADMIN',true);
+
 require_once dirname(__FILE__).'/../prepend.php';
 
@@ -19 +21 @@
 // HTTP/1.0
 header("Pragma: no-cache");
-
-define('DC_CONTEXT_ADMIN',true);
 
 function dc_valid_fav($url) {

inc/prepend.php

@@ -12 +12 @@
 
 /* ------------------------------------------------------------------------------------------- */
-#  ClearBricks, DotClear classes auto-loader
+#  ClearBricks, Twig, DotClear classes auto-loader
 if (@is_dir('/usr/lib/clearbricks')) {
      define('CLEARBRICKS_PATH','/usr/lib/clearbricks');
@@ -46 +46 @@
 $__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['rsExtPost']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
@@ -52 +53 @@
 $__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';
@@ -63 +65 @@
 $__autoload['context']                  = dirname(__FILE__).'/public/lib.tpl.context.php';
 $__autoload['dcUrlHandlers']            = dirname(__FILE__).'/public/lib.urlhandlers.php';
+$__autoload['dcForm']              = dirname(__FILE__).'/admin/class.dc.form.php';
+$__autoload['dcFormExtension']               = dirname(__FILE__).'/admin/class.dc.form.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__).'/libs/twig')) {
+     define('TWIG_PATH',dirname(__FILE__).'/libs/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();
+
 /* ------------------------------------------------------------------------------------------- */
 

inc/prepend.php

@@ -181 +181 @@
 } catch (Exception $e) {
      init_prepend_l10n();
-     __error(__('Unable to connect to database')
-          ,$e->getCode() == 0 ?
-          sprintf(__('<p>This either means that the username and password information in '.
-          'your <strong>config.php</strong> file is incorrect or we can\'t contact '.
-          'the database server at "<em>%s</em>". This could mean your '.
-          'host\'s database server is down.</p> '.
-          '<ul><li>Are you sure you have the correct username and password?</li>'.
-          '<li>Are you sure that you have typed the correct hostname?</li>'.
-          '<li>Are you sure that the database server is running?</li></ul>'.
-          '<p>If you\'re unsure what these terms mean you should probably contact '.
-          'your host. If you still need help you can always visit the '.
-          '<a href="http://forum.dotclear.net/">Dotclear Support Forums</a>.</p>').
-          (DC_DEBUG ?
-               __('The following error was encountered while trying to read the database:').'</p><ul><li>'.$e->getMessage().'</li></ul>' :  '')
-          ,(DC_DBHOST != '' ? DC_DBHOST : 'localhost')
-          )
-          : ''
-          ,20);
+     if (!defined('DC_CONTEXT_ADMIN')) {
+          __error(__('Site temporarily unavailable'),
+               __('<p>We apologize for this temporary unavailability.<br />'.
+               'Thank you for your understanding.</p>'),
+               20);
+     } else {
+          __error(__('Unable to connect to database')
+               ,$e->getCode() == 0 ?
+               sprintf(__('<p>This either means that the username and password information in '.
+               'your <strong>config.php</strong> file is incorrect or we can\'t contact '.
+               'the database server at "<em>%s</em>". This could mean your '.
+               'host\'s database server is down.</p> '.
+               '<ul><li>Are you sure you have the correct username and password?</li>'.
+               '<li>Are you sure that you have typed the correct hostname?</li>'.
+               '<li>Are you sure that the database server is running?</li></ul>'.
+               '<p>If you\'re unsure what these terms mean you should probably contact '.
+               'your host. If you still need help you can always visit the '.
+               '<a href="http://forum.dotclear.net/">Dotclear Support Forums</a>.</p>').
+               (DC_DEBUG ?
+                    __('The following error was encountered while trying to read the database:').'</p><ul><li>'.$e->getMessage().'</li></ul>' :  '')
+               ,(DC_DBHOST != '' ? DC_DBHOST : 'localhost')
+               )
+               : ''
+               ,20);
+     }
 }