Changeset 1315:220e119ae6c8 for admin

Timestamp:

08/09/13 08:01:31 (12 years ago)

Author:

Dsls

Branch:

twig

Parents:

1158:9d7267aec27b (diff), 1314:99a1319b79fc (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

Location:

admin

Files:

• auth.php (modified) (4 diffs)
• index.php (modified) (7 diffs)
• plugin.php (modified) (2 diffs)
• post.php (modified) (8 diffs)
• posts.php (modified) (5 diffs)
• style/default.css (modified) (42 diffs)

admin/auth.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
@@ -14 +14 @@
 
 # If we have a session cookie, go to index.php
-if (isset($_SESSION['sess_user_id']))
-{
+if (isset($_SESSION['sess_user_id'])) {
      http::redirect('index.php');
 }
@@ -23 +22 @@
 $dlang = http::getAcceptLanguage();
 $dlang = ($dlang == '' ? 'en' : $dlang);
-if ($dlang != 'en' && preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$dlang))
-{
+if ($dlang != 'en' && preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$dlang)) {
      l10n::set(dirname(__FILE__).'/../locales/'.$dlang.'/main');
 }
-
-$page_url = http::getHost().$_SERVER['REQUEST_URI'];
-
-$change_pwd = $core->auth->allowPassChange() && isset($_POST['new_pwd']) && isset($_POST['new_pwd_c']) && isset($_POST['login_data']);
-$login_data = !empty($_POST['login_data']) ? html::escapeHTML($_POST['login_data']) : null;
-$recover = $core->auth->allowPassChange() && !empty($_REQUEST['recover']);
-$safe_mode = !empty($_REQUEST['safe_mode']);
-$akey = $core->auth->allowPassChange() && !empty($_GET['akey']) ? $_GET['akey'] : null;
-$user_id = $user_pwd = $user_key = $user_email = null;
-$err = $msg = null;
 
 # Auto upgrade
@@ -43 +31 @@
      try {
           if (($changes = dotclearUpgrade($core)) !== false) {
-               $msg = __('Dotclear has been upgraded.').'<!-- '.$changes.' -->';
-          }
-     } catch (Exception $e) {
-          $err = $e->getMessage();
-     }
-}
-
-# If we have POST login informations, go throug auth process
-if (!empty($_POST['user_id']) && !empty($_POST['user_pwd']))
+               $_ctx->setAlert(__('Dotclear has been upgraded.').'<!-- '.$changes.' -->');
+          }
+     }
+     catch (Exception $e) {
+          $_ctx->addError($e->getMessage());
+     }
+}
+
+/**
+Actions for authentication on admin pages
+*/
+class adminPageAuth
 {
-     $user_id = !empty($_POST['user_id']) ? $_POST['user_id'] : null;
-     $user_pwd = !empty($_POST['user_pwd']) ? $_POST['user_pwd'] : null;
-}
-# If we have COOKIE login informations, go throug auth process
-elseif (isset($_COOKIE['dc_admin']) && strlen($_COOKIE['dc_admin']) == 104)
-{
+     # Send new password from recover email
+     public static function send($akey)
+     {
+          global $core, $_ctx;
+          
+          $_ctx->akey = true;
+          
+          try  {
+               $recover_res = $core->auth->recoverUserPassword($akey);
+               
+               $subject = mb_encode_mimeheader('DotClear '.__('Your new password'),'UTF-8','B');
+               $message =
+               __('Username:').' '.$recover_res['user_id']."\n".
+               __('Password:').' '.$recover_res['new_pass']."\n\n".
+               preg_replace('/\?(.*)$/','',http::getHost().$_SERVER['REQUEST_URI']);
+               
+               $headers[] = 'From: dotclear@'.$_SERVER['HTTP_HOST'];
+               $headers[] = 'Content-Type: text/plain; charset=UTF-8;';
+               
+               mail::sendMail($recover_res['user_email'],$subject,$message,$headers);
+               $_ctx->setAlert(__('Your new password is in your mailbox.'));
+          }
+          catch (Exception $e) {
+               $_ctx->addError($e->getMessage());
+          }
+     }
+     
+     # Authentication process
+     public static function process($form,$user_id,$user_pwd,$user_key=null)
+     {
+          global $core, $_ctx;
+          
+          # We check the user
+          $check_user = $core->auth->checkUser($user_id,$user_pwd,$user_key) === true;
+          
+          $cookie_admin = http::browserUID(DC_MASTER_KEY.$user_id.
+               crypt::hmac(DC_MASTER_KEY,$user_pwd)).bin2hex(pack('a32',$user_id));
+          
+          if ($check_user && $core->auth->mustChangePassword())
+          {
+               $form->login_data = join('/',array(
+                    base64_encode($user_id),
+                    $cookie_admin,
+                    $form->user_remember == '' ? '0' : '1'
+               ));
+               
+               if (!$core->auth->allowPassChange()) {
+                    $_ctx->addError(__('You have to change your password before you can login.'));
+               } else {
+                    $_ctx->addError(__('In order to login, you have to change your password now.'));
+                    $_ctx->change_pwd = true;
+               }
+          }
+          elseif ($check_user && $form->safe_mode != '' && !$core->auth->isSuperAdmin()) 
+          {
+               $_ctx->addError(__('Safe Mode can only be used for super administrators.'));
+          }
+          elseif ($check_user)
+          {
+               $core->session->start();
+               $_SESSION['sess_user_id'] = $user_id;
+               $_SESSION['sess_browser_uid'] = http::browserUID(DC_MASTER_KEY);
+               
+               if ($form->blog != '') {
+                    $_SESSION['sess_blog_id'] = $form->blog;
+               }
+               
+               if ($form->safe_mode != '' && $core->auth->isSuperAdmin()) {
+                    $_SESSION['sess_safe_mode'] = true;
+               }
+               
+               if ($form->user_remember != '') {
+                    setcookie('dc_admin',$cookie_admin,strtotime('+15 days'),'','',DC_ADMIN_SSL);
+               }
+               
+               http::redirect('index.php');
+          }
+          else
+          {
+               if (isset($_COOKIE['dc_admin'])) {
+                    unset($_COOKIE['dc_admin']);
+                    setcookie('dc_admin',false,-600,'','',DC_ADMIN_SSL);
+               }
+               $_ctx->addError(__('Wrong username or password'));
+          }
+     }
+     
+     # Login form action
+     public static function login($form)
+     {
+          global $_ctx;
+          
+          if ($form->user_id != '' && $form->user_pwd != '') {
+               self::process($form,$form->user_id,$form->user_pwd);
+          }
+          
+          # Send post values to form
+          $form->user_id = $form->user_id;
+     }
+
+     # Recover password form action
+     public static function recover($form)
+     {
+          global $core, $_ctx;
+          
+          if ($form->user_id == '' || $form->user_email == '') {
+               return;
+          }
+          
+          $user_id = $form->user_id;
+          $user_email = $form->user_email;
+          $page_url = http::getHost().$_SERVER['REQUEST_URI'];
+          
+          try {
+               $recover_key = $core->auth->setRecoverKey($user_id,$user_email);
+               
+               $subject = mail::B64Header('DotClear '.__('Password reset'));
+               $message =
+               __('Someone has requested to reset the password for the following site and username.')."\n\n".
+               $page_url."\n".__('Username:').' '.$user_id."\n\n".
+               __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.')."\n".
+               $page_url.'?akey='.$recover_key;
+               
+               $headers[] = 'From: '.(defined('DC_ADMIN_MAILFROM') && DC_ADMIN_MAILFROM ? DC_ADMIN_MAILFROM : 'dotclear@local');
+               $headers[] = 'Content-Type: text/plain; charset=UTF-8;';
+               
+               mail::sendMail($user_email,$subject,$message,$headers);
+               $_ctx->setAlert(sprintf(__('The e-mail was sent successfully to %s.'),$user_email));
+          }
+          catch (Exception $e) {
+               $_ctx->addError($e->getMessage());
+          }
+          
+          # Send post values to form
+          $form->user_id = $form->user_id;
+          $form->user_email = $form->user_email;
+     }
+
+     # Change password form action
+     public static function change($form)
+     {
+          global $core, $_ctx;
+          
+          if ($form->login_data) {
+               return;
+          }
+          $_ctx->change_pwd = true;
+          
+          $new_pwd = (string) $form->new_pwd;
+          $new_pwd_c = (string) $form->new_pwd_c;
+          
+          try {
+               $tmp_data = explode('/',$form->login_data);
+               if (count($tmp_data) != 3) {
+                    throw new Exception();
+               }
+               $data = array(
+                    'user_id'=>base64_decode($tmp_data[0]),
+                    'cookie_admin'=>$tmp_data[1],
+                    'user_remember'=>$tmp_data[2]=='1'
+               );
+               if ($data['user_id'] === false) {
+                    throw new Exception();
+               }
+               
+               # Check login informations
+               $check_user = false;
+               if (isset($data['cookie_admin']) && strlen($data['cookie_admin']) == 104)
+               {
+                    $user_id = substr($data['cookie_admin'],40);
+                    $user_id = @unpack('a32',@pack('H*',$user_id));
+                    if (is_array($user_id))
+                    {
+                         $user_id = $user_id[1];
+                         $user_key = substr($data['cookie_admin'],0,40);
+                         $check_user = $core->auth->checkUser($user_id,null,$user_key) === true;
+                    }
+               }
+               
+               if (!$core->auth->allowPassChange() || !$check_user) {
+                    $_ctx->change_pwd = false;
+                    throw new Exception();
+               }
+               
+               if ($new_pwd != $new_pwd_c) {
+                    throw new Exception(__("Passwords don't match"));
+               }
+               
+               if ($core->auth->checkUser($user_id,$new_pwd) === true) {
+                    throw new Exception(__("You didn't change your password."));
+               }
+               
+               $cur = $core->con->openCursor($core->prefix.'user');
+               $cur->user_change_pwd = 0;
+               $cur->user_pwd = $new_pwd;
+               $core->updUser($core->auth->userID(),$cur);
+               
+               $core->session->start();
+               $_SESSION['sess_user_id'] = $user_id;
+               $_SESSION['sess_browser_uid'] = http::browserUID(DC_MASTER_KEY);
+               
+               if ($data['user_remember']) {
+                    setcookie('dc_admin',$data['cookie_admin'],strtotime('+15 days'),'','',DC_ADMIN_SSL);
+               }
+               
+               http::redirect('index.php');
+          }
+          catch (Exception $e) {
+               $_ctx->addError($e->getMessage());
+          }
+          
+          # Send post values to form
+          $form->login_data = $form->login_data;
+     }
+}
+
+# Form fields
+$form = new dcForm($core,'auth','auth.php');
+$form
+     ->addField(
+          new dcFieldText('user_id','',array(
+               "label" => __('Username:'))))
+     ->addField(
+          new dcFieldPassword('user_pwd','',array(
+               "label" => __('Password:'))))
+     ->addField(
+          new dcFieldText('user_email','',array(
+               "label" => __('Email:'))))
+     ->addField(
+          new dcFieldPassword('new_pwd','',array(
+               "label" => __('New password:'))))
+     ->addField(
+          new dcFieldPassword('new_pwd_c','',array(
+               "label" => __('Confirm password:'))))
+     ->addField(
+          new dcFieldCheckbox ('user_remenber',1,array(
+               "label" => __('Remember my ID on this computer'))))
+     ->addField(
+          new dcFieldSubmit('auth_login',__('log in'),array(
+               'action' => array('adminPageAuth','login'))))
+     ->addField(
+          new dcFieldSubmit('auth_recover',__('recover'),array(
+               'action' => array('adminPageAuth','recover'))))
+     ->addField(
+          new dcFieldSubmit('auth_change',__('change'),array(
+               'action' => array('adminPageAuth','change'))))
+     ->addField(
+          new dcFieldHidden ('safe_mode','0'))
+     ->addField(
+          new dcFieldHidden ('recover','0'))
+     ->addField(
+          new dcFieldHidden ('login_data',''))
+     ->addField(
+          new dcFieldHidden ('blog',''));
+
+# Context variables
+$_ctx->allow_pass_change = $core->auth->allowPassChange();
+$_ctx->change_pwd = $core->auth->allowPassChange() && $form->new_pwd != '' && $form->new_pwd_c != '' && $form->login_data != '';
+$_ctx->recover = $form->recover = $core->auth->allowPassChange() && !empty($_REQUEST['recover']);
+$_ctx->setSafeMode(!empty($_REQUEST['safe_mode'])); 
+$form->safe_mode = !empty($_REQUEST['safe_mode']);
+$_ctx->akey = false;
+
+# If we have no POST login informations and have COOKIE login informations, go throug auth process
+if ($form->user_id == '' && $form->user_pwd == '' 
+ && isset($_COOKIE['dc_admin']) && strlen($_COOKIE['dc_admin']) == 104) {
+
      # If we have a remember cookie, go through auth process with user_key
      $user_id = substr($_COOKIE['dc_admin'],40);
      $user_id = @unpack('a32',@pack('H*',$user_id));
-     if (is_array($user_id))
-     {
+     
+     if (is_array($user_id)) {
           $user_id = $user_id[1];
           $user_key = substr($_COOKIE['dc_admin'],0,40);
-          $user_pwd = null;
-     }
-     else
-     {
-          $user_id = null;
-     }
-}
-
-# Recover password
-if ($recover && !empty($_POST['user_id']) && !empty($_POST['user_email']))
-{
-     $user_id = !empty($_POST['user_id']) ? $_POST['user_id'] : null;
-     $user_email = !empty($_POST['user_email']) ? $_POST['user_email'] : '';
-     try
-     {
-          $recover_key = $core->auth->setRecoverKey($user_id,$user_email);
-          
-          $subject = mail::B64Header('DotClear '.__('Password reset'));
-          $message =
-          __('Someone has requested to reset the password for the following site and username.')."\n\n".
-          $page_url."\n".__('Username:').' '.$user_id."\n\n".
-          __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.')."\n".
-          $page_url.'?akey='.$recover_key;
-          
-          $headers[] = 'From: '.(defined('DC_ADMIN_MAILFROM') && DC_ADMIN_MAILFROM ? DC_ADMIN_MAILFROM : 'dotclear@local');
-          $headers[] = 'Content-Type: text/plain; charset=UTF-8;';
-          
-          mail::sendMail($user_email,$subject,$message,$headers);
-          $msg = sprintf(__('The e-mail was sent successfully to %s.'),$user_email);
-     }
-     catch (Exception $e)
-     {
-          $err = $e->getMessage();
-     }
-}
-# Send new password
-elseif ($akey)
-{
-     try
-     {
-          $recover_res = $core->auth->recoverUserPassword($akey);
-          
-          $subject = mb_encode_mimeheader('DotClear '.__('Your new password'),'UTF-8','B');
-          $message =
-          __('Username:').' '.$recover_res['user_id']."\n".
-          __('Password:').' '.$recover_res['new_pass']."\n\n".
-          preg_replace('/\?(.*)$/','',$page_url);
-          
-          $headers[] = 'From: dotclear@'.$_SERVER['HTTP_HOST'];
-          $headers[] = 'Content-Type: text/plain; charset=UTF-8;';
-          
-          mail::sendMail($recover_res['user_email'],$subject,$message,$headers);
-          $msg = __('Your new password is in your mailbox.');
-     }
-     catch (Exception $e)
-     {
-          $err = $e->getMessage();
-     }
-}
-# Change password and retry to log
-elseif ($change_pwd)
-{
-     try
-     {
-          $tmp_data = explode('/',$_POST['login_data']);
-          if (count($tmp_data) != 3) {
-               throw new Exception();
-          }
-          $data = array(
-               'user_id'=>base64_decode($tmp_data[0]),
-               'cookie_admin'=>$tmp_data[1],
-               'user_remember'=>$tmp_data[2]=='1'
-          );
-          if ($data['user_id'] === false) {
-               throw new Exception();
-          }
-          
-     # Check login informations
-     $check_user = false;
-     if (isset($data['cookie_admin']) && strlen($data['cookie_admin']) == 104)
-     {
-          $user_id = substr($data['cookie_admin'],40);
-          $user_id = @unpack('a32',@pack('H*',$user_id));
-          if (is_array($user_id))
-          {
-               $user_id = $user_id[1];
-               $user_key = substr($data['cookie_admin'],0,40);
-               $check_user = $core->auth->checkUser($user_id,null,$user_key) === true;
-          }
-     }
-     
-          if (!$core->auth->allowPassChange() || !$check_user) {
-               $change_pwd = false;
-               throw new Exception();
-          }
-          
-          if ($_POST['new_pwd'] != $_POST['new_pwd_c']) {
-               throw new Exception(__("Passwords don't match"));
-          }
-          
-          if ($core->auth->checkUser($user_id,$_POST['new_pwd']) === true) {
-               throw new Exception(__("You didn't change your password."));
-          }
-          
-          $cur = $core->con->openCursor($core->prefix.'user');
-          $cur->user_change_pwd = 0;
-          $cur->user_pwd = $_POST['new_pwd'];
-          $core->updUser($core->auth->userID(),$cur);
-          
-          $core->session->start();
-          $_SESSION['sess_user_id'] = $user_id;
-          $_SESSION['sess_browser_uid'] = http::browserUID(DC_MASTER_KEY);
-          
-          if ($data['user_remember'])
-          {
-               setcookie('dc_admin',$data['cookie_admin'],strtotime('+15 days'),'','',DC_ADMIN_SSL);
-          }
-          
-          http::redirect('index.php');
-     }
-     catch (Exception $e)
-     {
-          $err = $e->getMessage();
-     }
-}
-# Try to log
-elseif ($user_id !== null && ($user_pwd !== null || $user_key !== null))
-{
-     # We check the user
-     $check_user = $core->auth->checkUser($user_id,$user_pwd,$user_key) === true;
-     
-     $cookie_admin = http::browserUID(DC_MASTER_KEY.$user_id.
-          crypt::hmac(DC_MASTER_KEY,$user_pwd)).bin2hex(pack('a32',$user_id));
-     
-     if ($check_user && $core->auth->mustChangePassword())
-     {
-          $login_data = join('/',array(
-               base64_encode($user_id),
-               $cookie_admin,
-               empty($_POST['user_remember'])?'0':'1'
-          ));
-          
-          if (!$core->auth->allowPassChange()) {
-               $err = __('You have to change your password before you can login.');
-          } else {
-               $err = __('In order to login, you have to change your password now.');
-               $change_pwd = true;
-          }
-     }
-     elseif ($check_user && !empty($_POST['safe_mode']) && !$core->auth->isSuperAdmin()) 
-     {
-          $err = __('Safe Mode can only be used for super administrators.');
-     }
-     elseif ($check_user)
-     {
-          $core->session->start();
-          $_SESSION['sess_user_id'] = $user_id;
-          $_SESSION['sess_browser_uid'] = http::browserUID(DC_MASTER_KEY);
-          
-          if (!empty($_POST['blog'])) {
-               $_SESSION['sess_blog_id'] = $_POST['blog'];
-          }
-          
-          if (!empty($_POST['safe_mode']) && $core->auth->isSuperAdmin()) {
-               $_SESSION['sess_safe_mode'] = true;
-          }
-          
-          if (!empty($_POST['user_remember'])) {
-               setcookie('dc_admin',$cookie_admin,strtotime('+15 days'),'','',DC_ADMIN_SSL);
-          }
-          
-          http::redirect('index.php');
-     }
-     else
-     {
-          if (isset($_COOKIE['dc_admin'])) {
-               unset($_COOKIE['dc_admin']);
-               setcookie('dc_admin',false,-600,'','',DC_ADMIN_SSL);
-          }
-          $err = __('Wrong username or password');
-     }
+          $user_pwd = '';
+          
+          adminPageAuth::process($form,$user_id,$user_pwd,$user_key);
+     }
+}
+# If we have an akey, go throug send password process
+elseif ($core->auth->allowPassChange() && !empty($_GET['akey'])) {
+     adminPageAuth::send($_GET['akey']);
 }
 
 if (isset($_GET['user'])) {
-     $user_id = $_GET['user'];
-}
-
-header('Content-Type: text/html; charset=UTF-8');
+     $form->user_id = $_GET['user'];
+}
+
+$form->setup();
+
+$core->tpl->display('auth.html.twig');
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-xml:lang="<?php echo $dlang; ?>" lang="<?php echo $dlang; ?>">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <meta http-equiv="Content-Style-Type" content="text/css" />
-  <meta http-equiv="Content-Language" content="<?php echo $dlang; ?>" />
-  <meta name="ROBOTS" content="NOARCHIVE,NOINDEX,NOFOLLOW" />
-  <meta name="GOOGLEBOT" content="NOSNIPPET" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title><?php echo html::escapeHTML(DC_VENDOR_NAME); ?></title>
-  
-<?php
-echo dcPage::jsLoadIE7();
-echo dcPage::jsCommon();
-?>
-  
-     <link rel="stylesheet" href="style/default.css" type="text/css" media="screen" />
-      
-  <?php
-  # --BEHAVIOR-- loginPageHTMLHead
-  $core->callBehavior('loginPageHTMLHead');
-  ?>
-  
-  <script type="text/javascript">
-  //<![CDATA[
-  $(window).load(function() {
-    var uid = $('input[name=user_id]');
-    var upw = $('input[name=user_pwd]');
-    uid.focus();
-    
-    if (upw.length == 0) { return; }
-    
-    if ($.browser.mozilla) {
-      uid.keypress(processKey);
-    } else {
-      uid.keydown(processKey);
-    }
-    function processKey(evt) {
-      if (evt.keyCode == 13 && upw.val() == '') {
-         upw.focus();
-         return false;
-      }
-      return true;
-    };
-    $.cookie('dc_admin_test_cookie',true);
-    if ($.cookie('dc_admin_test_cookie')) {
-      $('#cookie_help').hide();
-      $.cookie('dc_admin_test_cookie', '', {'expires': -1});
-    } else {
-      $('#cookie_help').show();
-    }
-    $('#issue #more').toggleWithLegend($('#issue').children().not('#more'));
-  });
-  //]]>
-  </script>
-</head>
-
-<body id="dotclear-admin" class="auth">
-
-<form action="auth.php" method="post" id="login-screen">
-<h1><?php echo html::escapeHTML(DC_VENDOR_NAME); ?></h1>
-
-<?php
-if ($err) {
-     echo '<div class="error">'.$err.'</div>';
-}
-if ($msg) {
-     echo '<p class="message">'.$msg.'</p>';
-}
-
-if ($akey)
-{
-     echo '<p><a href="auth.php">'.__('Back to login screen').'</a></p>';
-}
-elseif ($recover)
-{
-     echo
-     '<fieldset><legend>'.__('Request a new password').'</legend>'.
-     '<p><label for="user_id">'.__('Username:').'</label> '.
-     form::field(array('user_id','user_id'),20,32,html::escapeHTML($user_id)).'</p>'.
-     
-     '<p><label for="user_email">'.__('Email:').'</label> '.
-     form::field(array('user_email','user_email'),20,255,html::escapeHTML($user_email)).'</p>'.
-     
-     '<p><input type="submit" value="'.__('recover').'" />'.
-     form::hidden(array('recover'),1).'</p>'.
-     '</fieldset>'.
-     
-     '<div id="issue">'.
-     '<p><a href="auth.php">'.__('Back to login screen').'</a></p></div>';
-}
-elseif ($change_pwd)
-{
-     echo
-     '<fieldset><legend>'.__('Change your password').'</legend>'.
-     '<p><label for="new_pwd">'.__('New password:').'</label> '.
-     form::password(array('new_pwd','new_pwd'),20,255).'</p>'.
-     
-     '<p><label for="new_pwd_c">'.__('Confirm password:').'</label> '.
-     form::password(array('new_pwd_c','new_pwd_c'),20,255).'</p>'.
-     '</fielset>'.
-     
-     '<p><input type="submit" value="'.__('change').'" />'.
-     form::hidden('login_data',$login_data).'</p>';
-}
-else
-{
-     if (is_callable(array($core->auth,'authForm')))
-     {
-          echo $core->auth->authForm($user_id);
-     }
-     else
-     {
-          if ($safe_mode) {
-               echo '<fieldset>';
-               echo '<legend>'.__('Safe mode login').'</legend>';
-               echo 
-                    '<p class="form-note info">'.
-                    __('This mode allows you to login without activating any of your plugins. This may be useful to solve compatibility problems').'&nbsp;<br />'.
-                    __('Disable or delete any plugin suspected to cause trouble, then log out and log back in normally.').
-                    '</p>';
-          }
-          else {
-               echo '<div class="fieldset">';
-          }
-
-          echo
-          '<p><label for="user_id">'.__('Username:').'</label> '.
-          form::field(array('user_id','user_id'),20,32,html::escapeHTML($user_id)).'</p>'.
-          
-          '<p><label for="user_pwd">'.__('Password:').'</label> '.
-          form::password(array('user_pwd','user_pwd'),20,255).'</p>'.
-          
-          '<p>'.
-          form::checkbox(array('user_remember','user_remember'),1).
-          '<label for="user_remember" class="classic">'.
-          __('Remember my ID on this computer').'</label></p>'.
-          
-          '<p><input class="add button" type="submit" value="'.__('log in').'" /></p>';
-          
-          if (!empty($_REQUEST['blog'])) {
-               echo form::hidden('blog',html::escapeHTML($_REQUEST['blog']));
-          }
-          if($safe_mode) {
-               echo 
-               form::hidden('safe_mode',1).
-               '</fieldset>';
-          }
-          else {
-               echo '</div>';
-          }
-          echo
-          '<p id="cookie_help" class="error">'.__('You must accept cookies in order to use the private area.').'</p>';
-
-          echo '<div id="issue">';
-          
-          if ($safe_mode) {
-               echo
-               '<p><a href="auth.php" id="normal_mode_link">'.__('Get back to normal authentication').'</a></p>';
-          } else {
-               echo '<p id="more"><strong>'.__('Connection issue?').'</strong></p>';
-               if ($core->auth->allowPassChange()) {
-                    echo '<p><a href="auth.php?recover=1">'.__('I forgot my password').'</a></p>';
-               }
-               echo '<p><a href="auth.php?safe_mode=1" id="safe_mode_link">'.__('I want to log in in safe mode').'</a></p>';
-          }
-          
-          echo '</div>';
-     }
-}
-?>
-</form>
-</body>
-</html>

admin/index.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
@@ -13 +13 @@
 if (!empty($_GET['pf'])) {
      require dirname(__FILE__).'/../inc/load_plugin_file.php';
+     exit;
+}
+if (!empty($_GET['tf'])) {
+     define('DC_CONTEXT_ADMIN',true);
+     require dirname(__FILE__).'/../inc/load_theme_file.php';
      exit;
 }
@@ -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[$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;
 }
 
@@ -118 +242 @@
 }
 
-# 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->fillPageTitle(__('Dashboard'));
+$core->tpl->display('index.html.twig');
 ?>

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_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;
      $res = ob_get_contents();
      ob_end_clean();
-     
-     if (preg_match('|<head>(.*?)</head|ms',$res,$m)) {
-          if (preg_match('|<title>(.*?)</title>|ms',$m[1],$mt)) {
-               $p_title = $mt[1];
-          }
+
+     # 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_all('|(<script.*?>.*?</script>)|ms',$m[1],$ms)) {
-               foreach ($ms[1] as $v) {
-                    $p_head .= $v."\n";
+          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'));
-     
-     echo '<h2 class="page-title">'.__('Plugin not found').'</h2>';
-     
-     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->fillPageTitle(__('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

@@ -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');
 
-$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->setAlert('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;
+     $status_combo[$k] = $v;
 }
-$img_status_pattern = '<img class="img_select_option" alt="%1$s" title="%1$s" src="images/%2$s" />';
 
 # 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();
 
 /* DISPLAY
@@ -294 +181 @@
 }
 
-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
-);
+$_ctx
+     ->fillPageTitle(__('Entries'),'posts.php')
+     ->fillPageTitle($page_title)
+     ->default_tab = $default_tab;
 
-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">';
-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 = __('Edit entry &ldquo;%s&rdquo;');
-     echo sprintf($edit_entry_str, html::escapeHTML($post_title)).' '.$img_status;
-} else {
-     echo $page_title;
-}
-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="'.($post_id ? __('Edit entry') : __('New 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:').'</label>'.
-     form::field('post_title',20,255,html::escapeHTML($post_title),'maximal').
-     '</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">'.__('Personal 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" 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">';
-     
-     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();
+$core->tpl->display('post.html.twig');
 ?>

admin/posts.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
@@ -12 +12 @@
 
 require dirname(__FILE__).'/../inc/admin/prepend.php';
-
+global $_ctx;
 dcPage::check('usage,contentadmin');
 
@@ -48 +48 @@
      # Filter form we'll put in html_block
      $users_combo = $categories_combo = array();
-     $users_combo['-'] = $categories_combo['-'] = '';
      while ($users->fetch())
      {
@@ -61 +60 @@
      }
      
-     $categories_combo[__('None')] = 'NULL';
+
+# Getting categories
+$categories_combo = array();
+try {
+     $categories = $core->blog->getCategories(array('post_type'=>'post'));
      while ($categories->fetch()) {
-          $categories_combo[str_repeat('  ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').
-               html::escapeHTML($categories->cat_title).
-               ' ('.$categories->nb_post.')'] = $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) { }
      $status_combo = array(
-     '-' => ''
      );
      foreach ($core->blog->getAllPostStatus() as $k => $v) {
-          $status_combo[$v] = (string) $k;
+          $status_combo[(string) $k] = (string)$v;
      }
      
      $selected_combo = array(
-     '-' => '',
-     __('selected') => '1',
-     __('not selected') => '0'
+     '1' => __('is selected'),
+     '0' => __('is not selected')
      );
      
      # Months array
-     $dt_m_combo['-'] = '';
      while ($dates->fetch()) {
-          $dt_m_combo[dt::str('%B %Y',$dates->ts())] = $dates->year().$dates->month();
+          $dt_m_combo[$dates->year().$dates->month()] = dt::str('%B %Y',$dates->ts());
      }
      
-     $lang_combo['-'] = '';
      while ($langs->fetch()) {
           $lang_combo[$langs->post_lang] = $langs->post_lang;
      }
-     
-     $sortby_combo = array(
-     __('Date') => 'post_dt',
-     __('Title') => 'post_title',
-     __('Category') => 'cat_title',
-     __('Author') => 'user_id',
-     __('Status') => 'post_status',
-     __('Selected') => 'post_selected'
-     );
-     
-     $order_combo = array(
-     __('Descending') => 'desc',
-     __('Ascending') => 'asc'
-     );
 }
+$form = new dcForm($core,'post','post.php');
+
 
 # Actions combo box
@@ -138 +126 @@
 $core->callBehavior('adminPostsActionsCombo',array(&$combo_action));
 
-/* Get posts
--------------------------------------------------------- */
-$user_id = !empty($_GET['user_id']) ?   $_GET['user_id'] : '';
-$cat_id = !empty($_GET['cat_id']) ?     $_GET['cat_id'] : '';
-$status = isset($_GET['status']) ? $_GET['status'] : '';
-$selected = isset($_GET['selected']) ?  $_GET['selected'] : '';
-$month = !empty($_GET['month']) ?       $_GET['month'] : '';
-$lang = !empty($_GET['lang']) ?         $_GET['lang'] : '';
-$sortby = !empty($_GET['sortby']) ?     $_GET['sortby'] : 'post_dt';
-$order = !empty($_GET['order']) ?       $_GET['order'] : 'desc';
 
-$show_filters = false;
 
-$page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1;
-$nb_per_page =  30;
-
-if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
-     if ($nb_per_page != $_GET['nb']) {
-          $show_filters = true;
+class monthdcFilterCombo extends dcFilterCombo {
+     public function applyFilter($params) {
+          $month=$this->avalues['values'][0];
+          $params['post_month'] = substr($month,4,2);
+          $params['post_year'] = substr($month,0,4);
      }
-     $nb_per_page = (integer) $_GET['nb'];
 }
 
-$params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
-$params['no_content'] = true;
+class PostsFetcher extends dcListFetcher {
 
-# - User filter
-if ($user_id !== '' && in_array($user_id,$users_combo)) {
-     $params['user_id'] = $user_id;
-     $show_filters = true;
-} else {
-     $user_id='';
-}
+     public function getEntries($params,$offset,$limit) {
+          $params['limit'] = array($offset,$limit);
+          return $this->core->blog->getPosts($params);
+     }
 
-# - Categories filter
-if ($cat_id !== '' && in_array($cat_id,$categories_combo)) {
-     $params['cat_id'] = $cat_id;
-     $show_filters = true;
-} else {
-     $cat_id='';
-}
-
-# - Status filter
-if ($status !== '' && in_array($status,$status_combo)) {
-     $params['post_status'] = $status;
-     $show_filters = true;
-} else {
-     $status='';
-}
-
-# - Selected filter
-if ($selected !== '' && in_array($selected,$selected_combo)) {
-     $params['post_selected'] = $selected;
-     $show_filters = true;
-} else {
-     $selected='';
-}
-
-# - Month filter
-if ($month !== '' && in_array($month,$dt_m_combo)) {
-     $params['post_month'] = substr($month,4,2);
-     $params['post_year'] = substr($month,0,4);
-     $show_filters = true;
-} else {
-     $month='';
-}
-
-# - Lang filter
-if ($lang !== '' && in_array($lang,$lang_combo)) {
-     $params['post_lang'] = $lang;
-     $show_filters = true;
-} else {
-     $lang='';
-}
-
-# - Sortby and order filter
-if ($sortby !== '' && in_array($sortby,$sortby_combo)) {
-     if ($order !== '' && in_array($order,$order_combo)) {
-          $params['order'] = $sortby.' '.$order;
-     } else {
-          $order='desc';
+     public function getEntriesCount($params) {
+          $count = $this->core->blog->getPosts($params,true);
+          return $count->f(0);
      }
-     
-     if ($sortby != 'post_dt' || $order != 'desc') {
-          $show_filters = true;
-     }
-} else {
-     $sortby='post_dt';
-     $order='desc';
-}
-
-# Get posts
-try {
-     $posts = $core->blog->getPosts($params);
-     $counter = $core->blog->getPosts($params,true);
-     $post_list = new adminPostList($core,$posts,$counter->f(0));
-} catch (Exception $e) {
-     $core->error->add($e->getMessage());
 }
 
 /* DISPLAY
 -------------------------------------------------------- */
-$starting_script = dcPage::jsLoad('js/_posts_list.js');
-if (!$show_filters) {
-     $starting_script .= dcPage::jsLoad('js/filter-controls.js');
-}
+$filterSet = new dcFilterSet($core,'fposts','posts.php');
 
-dcPage::open(__('Entries'),$starting_script);
+$filterSet
+     ->addFilter(new dcFilterRichCombo(
+          'users',__('Author'), __('Author'), 'user_id', $users_combo,array(
+               'multiple' => true)))
+     ->addFilter(new dcFilterRichCombo(
+          'category',__('Category'), __('Category'), 'cat_id', $categories_combo))
+     ->addFilter(new dcFilterRichCombo(
+          'post_status',__('Status'), __('Status'), 'post_status', $status_combo))
+     ->addFilter(new dcFilterRichCombo(
+          'lang',__('Lang'), __('Lang'), 'post_lang', $lang_combo))
+     ->addFilter(new dcFilterCombo(
+          'selected',__('Selected'), __('The post : '),'post_selected', $selected_combo))
+     ->addFilter(new monthdcFilterCombo(
+          'month',__('Month'),__('Month'), 'post_month', $dt_m_combo,array('singleval' => 1)))
+     ->addFilter(new dcFilterText(
+          'search',__('Contains'),__('The entry contains'), 'search',20,255));
 
-if (!$core->error->flag())
-{
-     echo 
-     '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Entries').'</span></h2>'.
-     '<p class="top-add"><a class="button add" href="post.php">'.__('New entry').'</a></p>';
-     
-     if (!$show_filters) {
-          echo '<p><a id="filter-control" class="form-control" href="#">'.
-          __('Filters').'</a></p>';
-     }
-     
-     echo
-     '<form action="posts.php" method="get" id="filters-form">'.
-     '<fieldset><legend>'.__('Filters').'</legend>'.
-     '<div class="three-cols">'.
-     '<div class="col">'.
-     '<label for="user_id">'.__('Author:').
-     form::combo('user_id',$users_combo,$user_id).'</label> '.
-     '<label for="cat_id">'.__('Category:').
-     form::combo('cat_id',$categories_combo,$cat_id).'</label> '.
-     '<label for="status">'.__('Status:').
-     form::combo('status',$status_combo,$status).'</label> '.
-     '</div>'.
-     
-     '<div class="col">'.
-     '<label for="selected">'.__('Selected:').
-     form::combo('selected',$selected_combo,$selected).'</label> '.
-     '<label for="month">'.__('Month:').
-     form::combo('month',$dt_m_combo,$month).'</label> '.
-     '<label for="lang">'.__('Lang:').
-     form::combo('lang',$lang_combo,$lang).'</label> '.
-     '</div>'.
-     
-     '<div class="col">'.
-     '<p><label for="sortby">'.__('Order by:').
-     form::combo('sortby',$sortby_combo,$sortby).'</label> '.
-     '<label for="order">'.__('Sort:').
-     form::combo('order',$order_combo,$order).'</label></p>'.
-     '<p><label for="nb" class="classic">'.  form::field('nb',3,3,$nb_per_page).' '.
-     __('Entries per page').'</label></p> '.
-     '<p><input type="submit" value="'.__('Apply filters').'" /></p>'.
-     '</div>'.
-     '</div>'.
-     '<br class="clear" />'. //Opera sucks
-     '</fieldset>'.
-     '</form>';
-     
-     # Show posts
-     $post_list->display($page,$nb_per_page,
-     '<form action="posts_actions.php" method="post" id="form-entries">'.
-     
-     '%s'.
-     
-     '<div class="two-cols">'.
-     '<p class="col checkboxes-helpers"></p>'.
-     
-     '<p class="col right"><label for="action" class="classic">'.__('Selected entries action:').'</label> '.
-     form::combo('action',$combo_action).
-     '<input type="submit" value="'.__('ok').'" /></p>'.
-     form::hidden(array('user_id'),$user_id).
-     form::hidden(array('cat_id'),$cat_id).
-     form::hidden(array('status'),$status).
-     form::hidden(array('selected'),$selected).
-     form::hidden(array('month'),$month).
-     form::hidden(array('lang'),$lang).
-     form::hidden(array('sortby'),$sortby).
-     form::hidden(array('order'),$order).
-     form::hidden(array('page'),$page).
-     form::hidden(array('nb'),$nb_per_page).
-     $core->formNonce().
-     '</div>'.
-     '</form>'
-     );
-}
 
-dcPage::helpBlock('core_posts');
-dcPage::close();
+$lfetcher = new PostsFetcher($core);
+$lposts = new dcItemList ($core,array('lposts','form-entries'),$filterSet,$lfetcher,'posts_actions.php');
+$lposts->addTemplate('posts_cols.html.twig');
+
+$lposts
+     ->addColumn(new dcColumn('title',__('Title'),'post_title'))
+     ->addColumn(new dcColumn('cat',__('Category'),'cat_title'))
+     ->addColumn(new dcColumn('date',__('Date'),'post_date'))
+     ->addColumn(new dcColumn('datetime',__('Date and Time'),'post_dt'))
+     ->addColumn(new dcColumn('author',__('Author'),'user_id'))
+     ->addColumn(new dcColumn('status',__('Status'),'post_status'));
+
+
+$lposts->setup();
+
+$_ctx
+     ->fillPageTitle(__('Entries'),'posts.php');
+
+
+$core->tpl->display('posts.html.twig');
+
+
 ?>

admin/style/default.css

@@ -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
@@ -13 +13 @@
 
 /* ------------------------------------------------------------------ html */
+html {
+     font-size: 62.5%;
+}
 body {
-     font: 75%/1.5em Helvetica,Arial,sans-serif;
+     font: 1.2rem/1.5 Helvetica,Arial,sans-serif;
      color: #333;
-     background: #f5f5f5;
-     margin: 0;
-     padding: 0;
-}
-body.auth {
      background: #fff;
+     margin: 0;
+     padding: 0;
 }
 
@@ -38 +38 @@
 h1, h2, h3, h4, h5, h6, p {
      margin-top: 0;
-     margin-bottom: 0.6em;
-}
-
+     margin-bottom: 1rem;
+}
 h2 {
      color: #666;
-     font-size: 1.4em;
-     padding: 4px 0;
+     font-size: 1.8rem;
+     padding: 0 0 1.8rem;
+     font-weight: normal;
+}
+h2 a:link, h2 a:visited {
+     color: #666;
+     border-color: #000;
 }
 .page-title {
      color: #d30e60;
 }
+#content > h2 {
+     padding: 0 1.8rem .6rem;
+     margin: 0 -1.8rem 1rem;
+     background: #fff url(dc_bg_title.png) repeat-x center bottom;
+}
 h3 {
-     color: #333;
-     font-size: 1.2em;
-}
-
+     color: #575859;
+     font-size: 1.4rem;
+}
 p, div.p {
      margin: 0 0 1em 0;
 }
-
 hr {
      height: 1px;
-     border-width: 1px 0 0 0;
+     border-width: 1px 0 0;
      border-color: #999;
      border-style: solid;
 }
-
 pre, code {
      font: 100% "Andale Mono","Courier New",monospace;
@@ -82 +88 @@
 }
 
-
 /* LAYOUT
 -------------------------------------------------------- */
@@ -90 +95 @@
      height: 3em;
      position: relative;
+     border-bottom: 4px solid #A2CBE9;
 }
 #prelude {
-     background: #575859;
-     line-height: 1.5em;
-     margin: 0;
-     padding: 0 1.7em 0 1em;
+     line-height: 1.9;
+     margin: 0;
+     padding: 0;
      overflow: hidden;
      position: absolute;
-     top: 1.2em;
+     top: 3em;
      left: 0;
+     background: #A2CBE9;
+     width: 14.5em;
      }
 #prelude li {
      list-style-type: none;
-     margin: 0 1em 0 0;
+     margin: 0;
      background:transparent;
-     }
+}
 #prelude li a {
-     color:#fff;
-     }
+     padding-left: 1.6rem;
+     background: #A2CBE9;
+     color: #000;
+     border-bottom-color: #A2CBE9;
+}
 #top {
      margin: 0;
      padding: 0;
-     width: 13em;
+     width: 14.5em;
      float: left;
+     line-height: 3em;
 }
 #top h1 {
      padding: 0;
      margin: 0;
-     height: 3em;
+     height: 3.6rem;
      text-indent: -1000px;
-     background: transparent url(dc_logo.png) no-repeat 0 50%;
+     background: #575859 url(dc_logo.png) no-repeat 0 50%;
 }
 #top h1 a {
      position: absolute;
-     top: 3px;
+     top: 0;
      left: 0;
-     width: 130px;
-     height: 60px;
+     width: 14.5em;
+     height: 3.6rem;
      border: none;
-     outline: none;
      color: #fff;
+}
+#top h1 a:hover, #top h1 a:focus {
+     background: transparent url(dc_logo_hover.png) no-repeat 0 50%;  
 }
 #info-boxes {
      background: #575859;
-     font-size: .95em;
-     height: 3em;
+     font-size: 1em;
+     line-height: 3em;
 }
 #info-box1 {
      margin: 0;
-     padding: .5em 3px 4px 0;
+     padding: 0 3px 0 1.8rem;
      color: #fff;
-     float: left;
+     display: inline-block;
      background: #575859;
 }
 #info-box2 {
-     margin: .1em 0 0 0;
-     padding: .5em 1.3em 4px 0;
+     margin: 0;
+     padding: 0 1.3em 0 0;
      color: #fff;
      float: right;
      text-align: right;
      background: #575859;
-     height: 2em;
 }
 #info-box1 p {
@@ -158 +170 @@
 }
 #info-box1 select {
-     width: 15em;
+     width: 14.5em;
 }
 #info-box1 a img, #info-box2 a img {
@@ -164 +176 @@
      padding-left: .3em;
      }
-#info-box1 a, #info-box2 a {
+#info-boxes a {
      background: #575859;
      font-weight: bold;
@@ -178 +190 @@
 }
 #info-box2 a.active {
-     border-bottom-color: #f5f5f5;
+     border-bottom-color: #fff;
      margin: 0;
      padding: 1.2em .5em;
-     background-color: #f5f5f5;
+     background-color: #fff;
      color: #333;
      font-weight: bold;
 }
 #info-box2 span {
-     color: #575859;
-}
-/* prelude */
+     color: #999;
+}
+/* main blocks */
 #wrapper {
      width: 100%;
@@ -195 +207 @@
      width: 100%;
      float: right;
-     margin-left: -13em;
+     margin-left: -14.5em;
      margin-top: 0;
+     background: #fff url(dc_bg.png);
 }
 #content {
-     margin: 1.5em 1.5em .5em 13em;
-     padding: 1em;
+     margin: 0 0 0 14.5em;
+     padding: .9rem 1.8rem 1.8rem;
      background: #fff;
-     border-radius: .5em;
-     border: 1px solid #ddd;
 }
      /* Micro clearfix thx to Nicolas Gallagher */
@@ -244 +255 @@
 /* -------------------------------------------------------------- layout - onglets */
 .part-tabs ul {
-     padding: .3em 0 1px 1em;
-     border-bottom: 1px solid #999;
+     padding: .5em 0 .3em 1em;
+     border-bottom: 1px solid #ccc;
 }
 .part-tabs li {
@@ -253 +264 @@
 }
 .part-tabs li a {
-     padding: .3em 0.5em;
+     padding: .5em 0.5em;
      margin-right: .5em;
-     border: 1px solid #999;
+     border: 1px solid #ccc;
      border-bottom: none;
      background: #dfdfdf;
      text-decoration: none;
-     border-top-left-radius: .3em;
-     border-top-right-radius: .3em;
      color: #000;
+     background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #dfdfdf), color-stop(1, #fafafa) );
+     background:-moz-linear-gradient( center top, #dfdfdf 5%, #fafafa 100% );
+     filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#dfdfdf', endColorstr='#fafafa');
+     background-color:#ededed;
 }
 .part-tabs li.part-tabs-link a {
@@ -273 +286 @@
 .part-tabs li.part-tabs-active a {
      background: #fff;
-     border-bottom: 1px solid #fff;
-     color: #000;
+     border: 1px solid #d30e60;
+     color: #d30e60;
      font-weight: bold;
+     border-bottom-color: #fff;
 }
 /* ------------------------------------------------------------------ main-menu */
 #main-menu {
-     width: 13em;
+     width: 14.5em;
      float: left;
-     margin-top: 1.2em;
-     margin-bottom: .5em;
+     margin:0;
+     padding-top: .5em;
+     padding-bottom: 1em;
+     background: #f7f7f7;
 }
 #main-menu h3 {
-     margin: 0 0 0.5em;
-     padding: .5em 0 0 .5em;
-     text-transform: uppercase;
+     margin: 0;
+     padding: 1.2rem 0 1rem 2.2rem;
+     text-indent: -1.6rem;
      color: #666;
-     font-size: 1.1em;
+     font-size: 1.4rem;
+}
+#main-menu h3 img[alt="cacher"] {
+     vertical-align: top;
 }
 #main-menu ul {
-     font-size: .95em;
-     margin: 0 0 1em 0;
+     margin: 0 0 1.8rem 0;
      padding: 0;
      list-style: none;
@@ -300 +318 @@
      display: block;
      margin: 0.5em 0 0;
-     padding: .2em 0 0 32px;
+     padding: .3rem 0 0 30px;
      background-repeat: no-repeat;
-     background-position: 12px .4em;
+     background-position: 8px .3em;
 }
 #main-menu a {
-     font-weight: bold;
+     color: #333;
+     border-bottom-color: #ccc;
 }
 #main-menu .active a {
      border-bottom: none;
-     color: #333;
+     color: #d30e60;
 }
 #main-menu .active {
-     background-color: #fff;
-     padding: .4em 0 .1em 32px;
-     background-position: 12px .4em;
-     border-top: 1px solid #ddd;
-     border-bottom: 1px solid #ddd;
-     margin-right: -1px;
-}
-#favorites-menu {
-     margin: 0 0 2em;
+     font-weight: bolder;
+}
+#search-menu {
+     padding: .3rem .4rem 0;
+}
+#search-menu p {
+     display: inline-block;
+}
+#search-menu #q {
+     width: 12rem;
+     border-bottom-left-radius: .6em;
+     border-top-left-radius: .6em;
+     border-color: #999;
+     background: transparent url(search.png) no-repeat 4px center;
+     text-indent: 18px;
+     height: 2rem;
+     padding: 0 2px; 
+}
+#search-menu input[type="submit"] {
+     padding: .1rem .3rem;
+     background: #dfdfdf;
+     border-color: #999;
+     color: #666;
+     border-bottom-right-radius: .6em;
+     border-top-right-radius: .6em;
+     text-shadow: none;
+     height: 2.2rem;
+     font-size: 1rem;
+     margin-left: -.5em;
+}
+#search-menu input[type="submit"]:hover,
+#search-menu input[type="submit"]:focus {
+     background: #575859;
+     color: #fff;
+}
+#favorites-menu, #blog-menu, #system-menu, #plugins-menu {
+     border-bottom: 1px dashed #A2CBE9;
 }
 #favorites-menu h3 {
-     color: #333;
-     text-transform: none;
+     color: #000;
+     font-variant: small-caps;
 }
 #favorites-menu a {
      color: #333;
-}
-#favorites-menu .active {
-     background-color: transparent;
-     border: none;
-}
-#favorites-menu .active a {
-     font-weight: bold;
-     color: #666;
 }
 /* ------------------------------------------------------------------ footer */
 #footer {
      clear: both;
-     padding: .75em .75em 0 0;
+     padding: .6rem 1.2rem .6rem 0;
      text-align: right;
+     border-top: .1rem solid #ccc;
 }
 #footer p {
@@ -347 +387 @@
      padding: 0 1em;
      text-align: center;
-     font-size: 1.1em;
+     font-size: 1em;
 }
 #footer a {
 }
 #footer p span.credit {
-     font-size: .85em;
+     font-size: 1rem;
      font-weight: normal;
 }
@@ -360 +400 @@
      width: 18em;
      margin: 1.5em auto 0;
-     font-size: 1.1em;
+     font-size: 1.4rem;
 }
 #login-screen h1 {
@@ -367 +407 @@
      height: 50px;
      margin-bottom: .5em;
-     margin-left: .5em;
+     margin-left: 0;
 }
 #login-screen fieldset, #login-screen .fieldset {
-     border: 1px solid #999;
+     border: 1px solid #A8DC26;
      padding: 1em 1em 0 1em;
      border-radius: 4px;
 }
+#login-screen legend {
+     border: 1px solid #A8DC26;
+}
 #login-screen input[type=text], #login-screen input[type=password], #login-screen input[type=submit] {
      width: 100%;
 }
 #login-screen #issue {
-     margin-left: 1em;
-     font-size: 1em;
+     margin-left: 1.5rem;
+     font-size: 1.2rem;
 }
 #login-screen #issue strong {font-weight: normal;}
@@ -404 +447 @@
      width: 210px;
      text-align: center;
-     margin: 2em 0 0 0;
+     margin: 2em 0;
      display:inline-block;
 }
@@ -436 +479 @@
      color: #666;
 }
-
 #dashboard-items {
      float: left;
@@ -482 +524 @@
 }
 #entry-content {
-     margin-right: 18em;
+     margin-right: 19em;
+     margin-left: 1.2rem;
 }
 #entry-sidebar {
@@ -542 +585 @@
      height: 500px;
 }
-
 #add-file-f {
      position: relative;
@@ -626 +668 @@
      display: inline;
 }
-
 #default-favs h3 {
      margin-top: 2em;
      margin-bottom: 1em;
 }
-
 .fav-list {
      list-style-type: none;
@@ -785 +825 @@
 /* ------------------------------------------------------------------ contextual help */
 #help {
-     margin-top: 2em;
+     margin-top: 4em;
      background: #f5f5f5;
      z-index: 100;
 }
 #help-button {
-     position: fixed;
-     top: 3.2em;
+     background: transparent url(../images/page_help.png) no-repeat 6px center;
+     position: absolute;
+     top: 3.6rem;
      right: 0px;
+     padding: 0 2rem 0 3rem;
      cursor: pointer;
-     background: #fc3;
-     border: 1px solid #dde;
-     border-right: none;
-     font-size: 1.1em;
-     font-weight: bold;
-     text-transform: capitalize;
-     padding: .33em .75em .33em 1em;
-     border-radius: 1em 0 0 1em;
-     color: #444;
+     color: #2373A8;
+     line-height: 4.2rem;
+}
+#help-button span {
+     padding: .6rem 0 .1rem 0;
+     border-bottom: 1px solid #2373A8;
 }
 .help-box {
@@ -812 +851 @@
 }
 #content.with-help #help-button {
-     right: 282px;
+     right: 28.2rem;
+     background-color: #f5f5f5;
+     position: fixed;
+     border-top: 2px solid #FFD478;
+     border-left: 2px solid #FFD478;
+     border-bottom: 2px solid #FFD478;
+     border-bottom-left-radius: 1rem;
+     border-top-left-radius: 1rem;
 }
 #content.with-help #help {
      display: block;
      position: absolute;
-     top: 40px;
+     top: 3.6rem;
      right: 0;
-     width: 280px;
-     border-left: 2px solid #fc3;
+     width: 28rem;
+     border-left: 2px solid #FFD478;
+     border-top: 2px solid #FFD478;
      margin-top: 0;
      padding: 10px 0 0 0;
@@ -838 +885 @@
 /* ------------------------------------------------------------------ popups */
 body.popup #wrapper, body.popup #top {
-     margin-top: -1.5em;
+     width: 100%;
+     padding: 0;
+}
+body.popup #wrapper {
      float: none;
-}
-body.popup #top h1 {
-     background: transparent;
+     margin:0;
+     display: block;
+}
+body.popup h1, body.popup #top {
+     margin: 0;
+     border-bottom: 1px solid;
+     font-weight: normal;
+     color: #fff;
+     background: #575859;
+     font-size: 1.5em;
+     text-indent: .6rem;
+     line-height: 1.3em;
 }
 body.popup #main {
-     margin-left: -35px;
-     margin-bottom: 1em;
+     margin-bottom: 1em 0;
 }
 body.popup #content {
-     margin-left: 35px;
-     margin-left: 2em;  /* 3.2 */
-}
-body.popup #footer {
-     display: none; /* 3.2 */
+     margin: 0;
+     padding: .6rem 0 !important;
+}
+body.popup #content h2 {
+     margin: 0 0 1em;
 }
 body.popup #footer p {
-     margin-left: 35px;
      border: none;
 }
@@ -868 +925 @@
 }
 p.error, p.message, p.static-msg {
-     padding-top: 1em;
-     padding-bottom: 1em;
+     padding-top: 1rem;
+     padding-bottom: 1rem;
 }
 div.error, p.error {
@@ -883 +940 @@
 div.static-msg a, p.static-msg a {
      color: #fff;
+}
+#content > .message, #content > .error {
+     margin-right: 14em
+}
+/* ------------------------------------------------------------------ navigation */
+.anchor-nav {
+     background: #575859;
+     color: #fff;
+     padding: .4rem 1.2rem;
+     float: right;
 }
 /* ------------------------------------------------------------------ debug */
@@ -924 +991 @@
      vertical-align: middle;
 }
-
 /* Si quelque chose a besoin d'être caché sauf pour les revues d'écran */
 .hidden {
@@ -959 +1025 @@
      overflow: auto;
 }
-
 .grid {
      background: transparent repeat url('grid.png') 0 0;
 }
-
 .line p {
      margin: 0;
@@ -970 +1034 @@
      color: #666;
 }
-
 ul.nice {
      margin: 1em 0;
@@ -1005 +1068 @@
 -------------------------------------------------------- */
 table {
-     font-size: 1em;
+     font-size: 1.2rem;
      border-collapse: collapse;
      margin: 0 0 1em 0;
 }
 tr.line:hover {
-     background: #ddd;
+     background: #f3f3f3;
 }
 caption {
      color: #333;
-     font-size: 1.2em;
      font-weight: bold;
      text-align: left;
      margin-bottom: .5em;
 }
+
 th, td {
      border-width: 0 0 1px 0;
      border-style: solid;
-     border-color: #ccc;
-     padding: 3px 5px;
+     border-color: #e3e3e3;
+     padding: .4rem .5rem;
      vertical-align: top;
 }
 th {
      text-align: left;
-     border-bottom-color: #666;
+     border-bottom-color: #aaa;
 }
 .noborder td, td.noborder, .noborder th, th.noborder {
      border-width: 0;
 }
-
 table .maximal, table.maximal {
      width: 100%;
@@ -1040 +1102 @@
      width: 1px;
 }
-
 table .nowrap {
      white-space: nowrap;
@@ -1131 +1192 @@
      font-weight: normal;
 }
-
 input, textarea, select {
      background: #f9f9f9;
@@ -1137 +1197 @@
      border-width: 1px;
      border-style: solid;
-     border-color: #000 #ccc #ccc #000;
+     border-color: #666 #ccc #ccc #999;
 }
 input.invalid, textarea.invalid, select.invalid {
@@ -1146 +1206 @@
 }
 input, textarea, select, option {
-     font: 1em "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif;
+     font: 100% "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif;
 }
 input[type=text], input[type=password], textarea {
@@ -1152 +1212 @@
      margin-right: .3em;
 }
-input[type=checkbox], input[type=radio] {
-     border: none;
-}
 textarea {
      padding: 2px 0;
 }
-
-input[type=checkbox], input[type=radio] {
+input[type=checkbox], input[type=radio], input[type=file] {
+     border: none;
      margin: 0;
      padding: 0;
      background: transparent;
 }
-
 label {
      display: block;
@@ -1210 +1266 @@
      resize: vertical;
 }
-
 label.required {
      font-weight: bold;
@@ -1232 +1287 @@
      display: inline;
      position: absolute;
-     left: 15em;
+     left: 14.5em;
      top: 0;
 }
-
 label .maximal, textarea.maximal, input.maximal {
      width: 100%;
@@ -1250 +1304 @@
      padding-left: 20px;
 }
-
-a#toggle-filters {
-     font-weight: bold;
-     background: url(../images/plus.png) no-repeat 0 0;
-     padding-left: 20px;
-}
-
-a#toggle-filters.opened {
-     background: url(../images/minus.png) no-repeat 0 0;
-}
-
 .constrained {
      margin: 0;
@@ -1269 +1312 @@
 
 /* --------------------------------------------------------------- buttons */
-h2 a.button {
-     color: #333;
-     font-weight: normal;
-     font-size: .75em;
-     vertical-align: middle;
-}
 /* commun */
 input[type=submit],
@@ -1287 +1324 @@
      text-align: center;
      text-decoration: none;
-     padding: .1em .5em 0 .5em;
+     padding: .1em .5em;
      text-shadow: 0 1px 1px rgba(0,0,0,.3);
      border-radius: .2em;
@@ -1369 +1406 @@
      content: "\ab\a0";
 }
-a.button.add {
-     border-radius: .5em;
-     margin-bottom: .1em;     
-     background: #2C8FD1 url(../images/add.png) no-repeat 6px center;
-     color: #fff;
-     padding: .2em 16px .2em 30px;
-     border: 1px solid #2373A8;
-}
-a.button.add:hover, a.button.add:focus {
-     background-color: #2373A8;
-}
+.button.add {
+     background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #9dce2c), color-stop(1, #8cb82b) );
+     background:-moz-linear-gradient( center top, #9dce2c 5%, #8cb82b 100% );
+     filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9dce2c', endColorstr='#8cb82b');
+     background-color:#9dce2c;
+     border:1px solid #83c41a;
+     padding:.6rem 1.8rem;
+     text-shadow:1px 1px 0 #689324;
+     color: #000;
+     text-shadow: 1px 1px 0 #BBDB58;
+     font-weight: normal;
+     font-size: 1.4rem;
+}
+.button.add:hover, .button.add:focus {
+     background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #8cb82b), color-stop(1, #9dce2c) );
+     background:-moz-linear-gradient( center top, #8cb82b 5%, #9dce2c 100% );
+     filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8cb82b', endColorstr='#9dce2c');
+     background-color:#8cb82b;
+     border:1px solid #83c41a;
+}
+.button-add:focus {
+     outline: dotted 1px;
+}
+.button.add:active {
+     position:relative;
+     top:1px;
+}
+
 /* jQuery Autocomplete plugin */
 .ac_results {
@@ -1413 +1467 @@
 }
 
-form#filters {font-size: 100%; background: #f0f0f0; padding: 1em; border-radius: .5em; border: 1px solid #ddd;}
-form#filters .margintop {padding-top: 1.33em;}
-form#filters ul, form#filters p {list-style-type:none;margin: 0; padding: 0 0 .5em 0; margin-left: 1em;}
-form#filters .col30 {border-left: 1px solid #999;}
-form#filters .col30 h3 {margin-left: 1em;}
-
-p.line, li.line { position: relative; padding: 3px 0 0 28px; margin: 0 0 1em 0;}
-li.line input[type=submit] {position: absolute; left:0;top:0; padding: 0 .1em; margin: 0;}
-li.line input[type=checkbox], li.line input[type=checkbox] {position: absolute; left: 0; top: .2em; padding: 0 .1em; margin: 0;}
-li.line select { margin-right: 2em;}
-li.line label { display: block; width: 8em; float: left;}
-li.line label img {margin-right: 8px;}
-li.line span.or {
-     text-align: right;
-     margin-left: 5em;
-     font-weight: bold;
-}
-p.line label.or + select {margin-left: 2em;}
-li.line { padding: 0 0 0 20px; height: 1em;}
-li.line label {width: auto;}
-
-#available_filters input[type=submit] {padding: 0 .1em; margin-left: .5em;}
-
-div.pagination span, div.pagination a {
-     margin-right: 1em;
-}
+/* ---------------------------------------------------------------------------
+     Media queries vite fait en attendant la reprise complète du layout
+---------------------------------------------------------------------------- */
+@media screen and (max-width: 920px) {
+     #top, #top h1 a {width: 42px !important;overflow:hidden;}
+}
+@media screen and (max-width: 800px) {
+     #top, #info-boxes, #info-box1, #info-box2 {
+          display:inline-block;
+          vertical-align:middle;
+          margin:0;
+          padding:0;
+          line-height: 3.2rem;
+     }
+     #info-box1 select {width: 14rem;}
+     #main-menu, #main, #content, #content h2, #entry-wrapper, #entry-sidebar, #entry-content, .two-cols .col, .two-cols .col:first-child {
+     display:block;
+     width: 98%;
+     margin:0 auto;
+     padding:0;
+     float:none;
+     text-align: left;
+     clear: both;
+     }
+     #content {
+          width: 100%;
+          padding-top: .5em;
+     }
+}
+@media screen and (max-width: 720px) {
+     .smallscreen {display: none;}
+     #help-button {width:20px; overflow: hidden;}
+}
+@media screen and (max-width: 492px) {
+     #header {min-height:3.6rem;}
+     #wrapper {font-size: 1.6rem;}
+     .page-title, #info-boxes, .media-item {display: inline-block;}
+     div.media-list .media-item {width: 90%; float: none}
+     #top h1 a, #top {height: auto;}
+     #info-box1 p.nomobile, label.nomobile {display: none;}
+     #help-button {height:26px; width:26px; background-color: #A2CBE9; padding: 0; margin:0;font-size: 1rem;line-height: 68px}
+}