Changeset 1155:49ba58cbf593

Timestamp:

04/09/13 09:15:41 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

twig

Parents:

1154:e85c1417b8a4 (diff), 1143:fbf575ae9bda (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

Files:

• admin/js/jquery/jquery.constantfooter.js (deleted)
• admin/post.php (modified) (7 diffs)
• admin/style/dc_logo_small.png (deleted)
• admin/style/default.css (modified) (20 diffs)
• admin/style/default.css (modified) (26 diffs)
• inc/admin/lib.dc.page.php (modified) (2 diffs)
• inc/admin/lib.dc.page.php (modified) (1 diff)
• inc/core/class.dc.blog.php (modified) (2 diffs)
• inc/core/class.dc.blog.php (modified) (1 diff)
• inc/prepend.php (modified) (5 diffs)
• inc/prepend.php (modified) (1 diff)
• plugins/aboutConfig/index.php (modified) (1 diff)

admin/post.php

@@ -15 +15 @@
 dcPage::check('usage,contentadmin');
 
-$post_id = '';
-$cat_id = '';
-$post_dt = '';
-$post_format = $core->auth->getOption('post_format');
-$post_password = '';
-$post_url = '';
-$post_lang = $core->auth->getInfo('user_lang');
-$post_title = '';
-$post_excerpt = '';
-$post_excerpt_xhtml = '';
-$post_content = '';
-$post_content_xhtml = '';
-$post_notes = '';
-$post_status = $core->auth->getInfo('user_post_status');
-$post_selected = false;
-$post_open_comment = $core->blog->settings->system->allow_comments;
-$post_open_tb = $core->blog->settings->system->allow_trackbacks;
+function savePost($form) {
+     global $_ctx;
+     $_ctx->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">'.$page_title;
-if ($post_id) {
-     switch ($post_status) {
-          case 1:
-               $img_status = sprintf($img_status_pattern,__('published'),'check-on.png');
-               break;
-          case 0:
-               $img_status = sprintf($img_status_pattern,__('unpublished'),'check-off.png');
-               break;
-          case -1:
-               $img_status = sprintf($img_status_pattern,__('scheduled'),'scheduled.png');
-               break;
-          case -2:
-               $img_status = sprintf($img_status_pattern,__('pending'),'check-wrn.png');
-               break;
-          default:
-               $img_status = '';
-     }
-     echo ' &ldquo;'.$post_title.'&rdquo;'.' '.$img_status;
-}
-echo '</span></h2>';
-
-if ($post_id && $post->post_status == 1) {
-     echo '<p><a href="'.$post->getURL().'" onclick="window.open(this.href);return false;" title="'.$post_title.' ('.__('new window').')'.'">'.__('Go to this entry on the site').' <img src="images/outgoing-blue.png" alt="" /></a></p>';
-}
-if ($post_id)
-{
-     echo '<p>';
-     if ($prev_link) { echo $prev_link; }
-     if ($next_link && $prev_link) { echo ' - '; }
-     if ($next_link) { echo $next_link; }
-     
-     # --BEHAVIOR-- adminPostNavLinks
-     $core->callBehavior('adminPostNavLinks',isset($post) ? $post : null);
-     
-     echo '</p>';
-}
-
-# Exit if we cannot view page
-if (!$can_view_page) {
-     dcPage::helpBlock('core_post');
-     dcPage::close();
-     exit;
-}
-
-/* Post form if we can edit post
--------------------------------------------------------- */
-if ($can_edit_post)
-{
-     echo '<div class="multi-part" title="'.__('Edit entry').'" id="edit-entry">';
-     echo '<form action="post.php" method="post" id="entry-form">';
-     echo '<div id="entry-wrapper">';
-     echo '<div id="entry-content"><div class="constrained">';
-     
-     echo
-     '<p class="col"><label class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').
-     form::field('post_title',20,255,html::escapeHTML($post_title),'maximal').
-     '</label></p>'.
-     
-     '<p class="area" id="excerpt-area"><label for="post_excerpt">'.__('Excerpt:').'</label> '.
-     form::textarea('post_excerpt',50,5,html::escapeHTML($post_excerpt)).
-     '</p>'.
-     
-     '<p class="area"><label class="required" '.
-     'for="post_content"><abbr title="'.__('Required field').'">*</abbr> '.__('Content:').'</label> '.
-     form::textarea('post_content',50,$core->auth->getOption('edit_size'),html::escapeHTML($post_content)).
-     '</p>'.
-     
-     '<p class="area" id="notes-area"><label for="post_notes">'.__('Notes:').'</label>'.
-     form::textarea('post_notes',50,5,html::escapeHTML($post_notes)).
-     '</p>';
-     
-     # --BEHAVIOR-- adminPostForm
-     $core->callBehavior('adminPostForm',isset($post) ? $post : null);
-     
-     echo
-     '<p>'.
-     ($post_id ? form::hidden('id',$post_id) : '').
-     '<input type="submit" value="'.__('Save').' (s)" '.
-     'accesskey="s" name="save" /> ';
-     if ($post_id) {
-          $preview_url =
-          $core->blog->url.$core->url->getURLFor('preview',$core->auth->userID().'/'.
-          http::browserUID(DC_MASTER_KEY.$core->auth->userID().$core->auth->getInfo('user_pwd')).
-          '/'.$post->post_url);
-          echo '<a id="post-preview" href="'.$preview_url.'" class="button" accesskey="p">'.__('Preview').' (p)'.'</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/style/default.css

@@ -40 +40 @@
      margin-bottom: 0.6em;
 }
+
 h2 {
      color: #666;
@@ -52 +53 @@
      font-size: 1.2em;
 }
+
 p, div.p {
      margin: 0 0 1em 0;
 }
+
 hr {
      height: 1px;
@@ -61 +64 @@
      border-style: solid;
 }
+
 pre, code {
      font: 100% "Andale Mono","Courier New",monospace;
@@ -77 +81 @@
      cursor: help;
 }
+
 
 /* LAYOUT
@@ -431 +436 @@
      color: #666;
 }
+
 #dashboard-items {
      float: left;
@@ -536 +542 @@
      height: 500px;
 }
+
 #add-file-f {
      position: relative;
@@ -619 +626 @@
      display: inline;
 }
+
 #default-favs h3 {
      margin-top: 2em;
      margin-bottom: 1em;
 }
+
 .fav-list {
      list-style-type: none;
@@ -915 +924 @@
      vertical-align: middle;
 }
+
 /* Si quelque chose a besoin d'être caché sauf pour les revues d'écran */
 .hidden {
@@ -949 +959 @@
      overflow: auto;
 }
+
 .grid {
      background: transparent repeat url('grid.png') 0 0;
 }
+
 .line p {
      margin: 0;
@@ -958 +970 @@
      color: #666;
 }
+
 ul.nice {
      margin: 1em 0;
@@ -1006 +1019 @@
      margin-bottom: .5em;
 }
-
 th, td {
      border-width: 0 0 1px 0;
@@ -1021 +1033 @@
      border-width: 0;
 }
+
 table .maximal, table.maximal {
      width: 100%;
@@ -1027 +1040 @@
      width: 1px;
 }
+
 table .nowrap {
      white-space: nowrap;
@@ -1117 +1131 @@
      font-weight: normal;
 }
+
 input, textarea, select {
      background: #f9f9f9;
@@ -1149 +1164 @@
      background: transparent;
 }
+
 label {
      display: block;
@@ -1194 +1210 @@
      resize: vertical;
 }
+
 label.required {
      font-weight: bold;
@@ -1218 +1235 @@
      top: 0;
 }
+
 label .maximal, textarea.maximal, input.maximal {
      width: 100%;
@@ -1232 +1250 @@
      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;
@@ -1351 +1380 @@
      background-color: #2373A8;
 }
-
 /* jQuery Autocomplete plugin */
 .ac_results {
@@ -1384 +1412 @@
      color: white;
 }
+
+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;
+}

admin/style/default.css

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 */
+
+/* ------------------------------------------------------------------ html */
 body {
      font: 75%/1.5em Helvetica,Arial,sans-serif;
@@ -151 +153 @@
      height: 2em;
 }
+#info-box1 p {
+     margin: 0;
+     display: inline;
+}
 #info-box1 select {
      width: 15em;
@@ -193 +199 @@
 }
 #content {
-     margin: 1.5em 1.5em 4em 13em;
+     margin: 1.5em 1.5em .5em 13em;
      padding: 1em;
      background: #fff;
-     -webkit-border-radius: .5em;
-     -moz-border-radius: .5em;
      border-radius: .5em;
      border: 1px solid #ddd;
@@ -255 +259 @@
      background: #dfdfdf;
      text-decoration: none;
-     -webkit-border-top-left-radius: .3em;
-     -webkit-border-top-right-radius: .3em;
-     -moz-border-radius-topleft: .3em;
-     -moz-border-radius-topright: .3em;
      border-top-left-radius: .3em;
      border-top-right-radius: .3em;
@@ -282 +282 @@
      float: left;
      margin-top: 1.2em;
-     margin-bottom: 1em;
+     margin-bottom: .5em;
 }
 #main-menu h3 {
@@ -302 +302 @@
      padding: .2em 0 0 32px;
      background-repeat: no-repeat;
-     background-position: 12px .2em;
+     background-position: 12px .4em;
 }
 #main-menu a {
@@ -340 +340 @@
 #footer {
      clear: both;
-     padding: .75em 2em;
-     margin: 6em 15px .5em 15px;
-     -webkit-border-radius: .3em;
-     -moz-border-radius: .3em;
-     border-radius: .3em;
-     background: #575859 url(dc_logo_small.png) no-repeat right bottom;
-     color: #fff;
+     padding: .75em .75em 0 0;
+     text-align: right;
 }
 #footer p {
@@ -355 +350 @@
 }
 #footer a {
-     color: #f5f5f5;
 }
 #footer p span.credit {
@@ -378 +372 @@
      border: 1px solid #999;
      padding: 1em 1em 0 1em;
-     -moz-border-radius: 4px;
-     -webkit-border-radius: 4px;
      border-radius: 4px;
 }
@@ -513 +505 @@
      border: 1px solid #ccc;
      border-left: 1em solid #E5E3DA;
-     -moz-border-radius: .3em;
-     -webkit-border-radius: .3em;
      border-radius: .3em;
 }
@@ -668 +658 @@
      border: 1px solid #ddd;
      padding: .2em;
-     -moz-border-radius: .5em;
-     -webkit-border-radius: .5em;
      border-radius: .5em;
 }
@@ -764 +752 @@
      border: 1px solid #f3f3f3;
      cursor: pointer;
-     -moz-border-radius: 4px;
-     -webkit-border-radius: 4px;
      border-radius: 4px;
 }
@@ -804 +790 @@
 }
 #help-button {
-     position: absolute;
-     top: 6.2em;
+     position: fixed;
+     top: 3.2em;
      right: 0px;
      cursor: pointer;
@@ -815 +801 @@
      text-transform: capitalize;
      padding: .33em .75em .33em 1em;
-     -moz-border-radius: 1em 0 0 1em;
-     -webkit-border-top-left-radius: 1em;
-     -webkit-border-bottom-left-radius: 1em;
+     border-radius: 1em 0 0 1em;
      color: #444;
 }
@@ -879 +863 @@
 div.message, p.message, 
 div.static-msg, p.static-msg {
-     padding: 0.5em 0.5em 0.5em 40px;
+     padding: 0.5em 0.5em 0.5em 48px;
      margin-bottom: 1em;
-     -moz-border-radius: 8px;
-     -webkit-border-radius: 8px;
      border-radius: 8px;
 }
@@ -890 +872 @@
 }
 div.error, p.error {
-     background: #e5bfbf url(msg-error.png) no-repeat 5px 5px;
-     color: #600;
+     background: #ffdec8 url(msg-error.png) no-repeat .7em .7em;
+     color: #000;
 }
 div.message, p.message, 
 div.static-msg, p.static-msg {
-     background: #666 url(msg-std.png) no-repeat 5px 5px;
+     background: #666 url(msg-std.png) no-repeat .7em .7em;
      color: #fff;
 }
@@ -1015 +997 @@
      right: 0;
 }
+.distrib img {
+     display: block;
+     float: right;
+     margin-top: -1em;
+}
 /* TABLES
 -------------------------------------------------------- */
@@ -1041 +1028 @@
 th {
      text-align: left;
+     border-bottom-color: #666;
 }
 .noborder td, td.noborder, .noborder th, th.noborder {
@@ -1056 +1044 @@
      white-space: nowrap;
      vertical-align: top;
+}
+table.settings, table.prefs {
+     width: 80%;
+}
+table.settings th:first-child, table.prefs th:first-child {
+     width: 20%;
+}
+table.settings th + th, table.prefs th + th {
+     width: 30%;
+}
+table.settings th + th + th, table.prefs th + th + th {
+     width: 10%;
+}
+table.settings th:last-child, table.prefs th:last-child {
+     width: 40%;
 }
 
@@ -1136 +1139 @@
      border-color: #000 #ccc #ccc #000;
 }
+input.invalid, textarea.invalid, select.invalid {
+     border: 1px solid red;
+     background: #fff; 
+     color: red;
+     box-shadow: 0 0 0 1px rgba(218, 62, 90, 0.3)
+}
 input, textarea, select, option {
      font: 1em "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif;
@@ -1167 +1176 @@
      color: #666;
 }
+span.form-note {
+     font-style:italic;
+     font-weight: normal;
+     color: #666;
+}
 p.form-note.warn, p.form-note.info, p.warning {
      font-style: normal;
@@ -1172 +1186 @@
 }
 p.form-note.warn, p.warning {
-     background: #ffd url(warning.png) no-repeat .2em .2em;
+     background: #ffd url(warning.png) no-repeat .3em .3em;
      border: 1px solid #f0c020;
 }
 p.form-note.info {
-     background: #eef url(info.png) no-repeat .2em .2em;
+     background: #eef url(info.png) no-repeat .3em .2em;
      border: 1px solid #99f;
 }
@@ -1209 +1223 @@
 p.field {
      position: relative;
-
+     
 }
 p.field label {
@@ -1275 +1289 @@
      padding: .1em .5em 0 .5em;
      text-shadow: 0 1px 1px rgba(0,0,0,.3);
-     -webkit-border-radius: .2em;
-     -moz-border-radius: .2em;
      border-radius: .2em;
      margin-bottom: .1em;
@@ -1358 +1370 @@
 }
 a.button.add {
-     -webkit-border-radius: .5em;
-     -moz-border-radius: .5em;
      border-radius: .5em;
      margin-bottom: .1em;     
-     background: #2C8FD1 url(add.png) no-repeat 6px center;
+     background: #2C8FD1 url(../images/add.png) no-repeat 6px center;
      color: #fff;
      padding: .2em 16px .2em 30px;
@@ -1369 +1379 @@
 a.button.add:hover, a.button.add:focus {
      background-color: #2373A8;
+}
+/* jQuery Autocomplete plugin */
+.ac_results {
+     padding: 0px;
+     border: 1px dotted #f90;
+     background-color: white;
+     overflow: hidden;
+     z-index: 99999;
+}
+.ac_results ul {
+     width: 100%;
+     list-style-position: outside;
+     list-style: none;
+     padding: 0;
+     margin: 0;
+}
+.ac_results li {
+     margin: 0px;
+     padding: 2px 5px;
+     cursor: default;
+     display: block;
+     font: menu;
+     font-size: 1em;
+     line-height: 16px;
+     overflow: hidden;
+}
+.ac_loading {
+     background: transparent url('loader.gif') right center no-repeat;
+}
+.ac_over {
+     background-color: #06c;
+     color: white;
 }
 

inc/admin/lib.dc.page.php

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

inc/admin/lib.dc.page.php

@@ -173 +173 @@
           self::jsLoad('js/jquery/jquery.biscuit.js').
           self::jsLoad('js/jquery/jquery.bgFade.js').
-          self::jsLoad('js/jquery/jquery.constantfooter.js').
           self::jsLoad('js/common.js').
           self::jsLoad('js/prelude.js').

inc/core/class.dc.blog.php

@@ -805 +805 @@
           
           if (!empty($params['user_id'])) {
-               $strReq .= "AND U.user_id = '".$this->con->escape($params['user_id'])."' ";
+               $strReq .= "AND U.user_id ".$this->con->in($params['user_id'])." ";
           }
           
@@ -889 +889 @@
                     $strReq .= 'ORDER BY post_dt DESC ';
                }
-          }
-          
-          if (!$count_only && !empty($params['limit'])) {
-               $strReq .= $this->con->limit($params['limit']);
+               if (!empty($params['limit'])) {
+                    $strReq .= $this->con->limit($params['limit']);
+               }
           }
           

inc/core/class.dc.blog.php

@@ -228 +228 @@
                'SELECT post_id, COUNT(post_id) AS nb_comment,comment_trackback '.
                'FROM '.$this->prefix.'comment '.
-               'WHERE post_id'.$this->con->in($a_ids).
-               'AND comment_status = 1 ';
+               'WHERE comment_status = 1 '.
+               (count($a_ids) > 0 ? 'AND post_id'.$this->con->in($a_ids) : ' ');
           
           if ($del) {

inc/prepend.php

@@ -12 +12 @@
 
 /* ------------------------------------------------------------------------------------------- */
-#  ClearBricks, DotClear classes auto-loader
+#  ClearBricks, Twig, DotClear classes auto-loader
 if (@is_dir('/usr/lib/clearbricks')) {
      define('CLEARBRICKS_PATH','/usr/lib/clearbricks');
@@ -46 +46 @@
 $__autoload['dcWorkspace']              = dirname(__FILE__).'/core/class.dc.workspace.php';
 $__autoload['dcPrefs']                  = dirname(__FILE__).'/core/class.dc.prefs.php';
+$__autoload['dcTwigPage']               = dirname(__FILE__).'/core/class.dc.twig.page.php';
 
 $__autoload['rsExtPost']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
@@ -52 +53 @@
 $__autoload['rsExtUser']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
 
+$__autoload['dcAdminContext']                = dirname(__FILE__).'/admin/class.dc.admincontext.php';
 $__autoload['dcMenu']                   = dirname(__FILE__).'/admin/class.dc.menu.php';
 $__autoload['dcPage']                   = dirname(__FILE__).'/admin/lib.dc.page.php';
@@ -63 +65 @@
 $__autoload['context']                  = dirname(__FILE__).'/public/lib.tpl.context.php';
 $__autoload['dcUrlHandlers']            = dirname(__FILE__).'/public/lib.urlhandlers.php';
+$__autoload['dcForm']              = dirname(__FILE__).'/admin/class.dc.form.php';
+$__autoload['dcFormExtension']               = dirname(__FILE__).'/admin/class.dc.form.php';
+$__autoload['dcTabExtension']           = dirname(__FILE__).'/admin/class.dc.tab.php';
+$__autoload['dcItemList']               = dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['dcListFetcher']            = dirname(__FILE__).'/admin/class.dc.list.php';
+
+foreach (array('dcFilterSet', 'dcFilter','dcFilterCombo','dcFilterText','dcFilterBoolean') as $c) {
+     $__autoload[$c] = dirname(__FILE__).'/admin/class.dc.filter.php';
+}
 
 # Clearbricks extensions
 html::$absolute_regs[] = '/(<param\s+name="movie"\s+value=")(.*?)(")/msu';
 html::$absolute_regs[] = '/(<param\s+name="FlashVars"\s+value=".*?(?:mp3|flv)=)(.*?)(&|")/msu';
+
+if (@is_dir('/usr/lib/twig')) {
+     define('TWIG_PATH','/usr/lib/Twig');
+} elseif (is_dir(dirname(__FILE__).'/libs/Twig')) {
+     define('TWIG_PATH',dirname(__FILE__).'/libs/Twig');
+} elseif (isset($_SERVER['TWIG_PATH']) && is_dir($_SERVER['TWIG_PATH'])) {
+     define('TWIG_PATH',$_SERVER['TWIG_PATH']);
+}
+
+if (!defined('TWIG_PATH') || !is_dir(TWIG_PATH)) {
+     exit('No Twig path defined');
+}
+require TWIG_PATH.'/Autoloader.php';
+Twig_Autoloader::register();
+
 /* ------------------------------------------------------------------------------------------- */
 
@@ -123 +149 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.5.1-dev');
+define('DC_VERSION','2.99-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');

inc/prepend.php

@@ -149 +149 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.5-dev');
+define('DC_VERSION','2.99-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');

plugins/aboutConfig/index.php

@@ -12 +12 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-# Local navigation
-if (!empty($_POST['gs_nav'])) {
-     http::redirect($p_url.$_POST['gs_nav']);
-     exit;
-}
-if (!empty($_POST['ls_nav'])) {
-     http::redirect($p_url.$_POST['ls_nav']);
-     exit;
-}
-
-# Local settings update
-if (!empty($_POST['s']) && is_array($_POST['s']))
+class adminPageAboutConfig
 {
-     try
+     public static $p_url = 'plugin.php?p=aboutConfig';
+     
+     # Update local settings
+     public static function updLocal($form)
      {
-          foreach ($_POST['s'] as $ns => $s)
-          {
-               $core->blog->settings->addNamespace($ns);
+          self::updSettings($form);
+     }
+     
+     # Update global settings
+     public static function updGlobal($form)
+     {
+          self::updSettings($form,true);
+     }
+     
+     # Update settings
+     protected static function updSettings($form,$global=false)
+     {
+          global $core,$_ctx;
+          
+          $part = $global ? 'global' : 'local';
+          $prefix = $part.'_';
+          
+          try {
+               foreach ($core->blog->settings->dumpNamespaces() as $ns => $namespace) {
+                    $core->blog->settings->addNamespace($ns);
+                    $ns_settings = $global ? 
+                         $namespace->dumpGlobalSettings() : $namespace->dumpSettings();
+                    
+                    foreach ($ns_settings as $k => $v) {
+                         // need to cast type
+                         $f = (string) $form->{$prefix.$ns.'_'.$k};
+                         settype($f,$v['type']);
+                         
+                         $core->blog->settings->$ns->put($k,$f,null,null,true,$global);
+                         $form->{$prefix.$ns.'_'.$k} = $f;
+                    }
+               }
+               $core->blog->triggerBlog();
                
-               foreach ($s as $k => $v)      {
-                    $core->blog->settings->$ns->put($k,$v);
-               }
-               
-               $core->blog->triggerBlog();
+               http::redirect(self::$p_url.'&upd=1&part='.$part);
+          }
+          catch (Exception $e) {
+               $_ctx->addError($e->getMessage());
+          }
+     }
+     
+     # Set nav and settings forms
+     public static function setForms($global=false)
+     {
+          global $core, $_ctx;
+          
+          $prefix = $global ? 'global_' : 'local_';
+          $action = $global ? 'updGlobal' : 'updLocal';
+          
+          if (!empty($_POST[$prefix.'nav'])) {
+               http::redirect(self::$p_url.$_POST[$prefix.'nav']);
+               exit;
           }
           
-          http::redirect($p_url.'&upd=1');
-     }
-     catch (Exception $e)
-     {
-          $core->error->add($e->getMessage());
+          $nav_form = new dcForm($core,$prefix.'nav_form','plugin.php');
+          $settings_form = new dcForm($core,$prefix.'settings_form','plugin.php');
+          
+          $settings = $combo = array();
+          foreach ($core->blog->settings->dumpNamespaces() as $ns => $namespace) {
+               $ns_settings = $global ? 
+                    $namespace->dumpGlobalSettings() : $namespace->dumpSettings();
+               
+               foreach ($ns_settings as $k => $v) {
+                    $settings[$ns][$k] = $v;
+               }
+          }
+          
+          ksort($settings);
+          foreach ($settings as $ns => $s) {
+               $combo['#'.$prefix.$ns] = $ns;
+               ksort($s);
+               foreach ($s as $k => $v) {
+                    if ($v['type'] == 'boolean') {
+                         $settings_form->addField(
+                              new dcFieldCombo($prefix.$ns.'_'.$k,
+                                   '',array(1 => __('yes'),0 => __('no'))));
+                    }
+                    else {
+                         $settings_form->addField(
+                              new dcFieldText($prefix.$ns.'_'.$k,''));
+                    }
+                    $settings_form->{$prefix.$ns.'_'.$k} = $v['value'];
+               }
+          }
+          
+          $nav_form
+               ->addField(
+                    new dcFieldCombo($prefix.'nav','',$combo,array(
+                         "label" => __('Goto:'))))
+               ->addField(
+                    new dcFieldSubmit($prefix.'nav_submit',__('OK')))
+               ->addField(
+                    new dcFieldHidden ('p','aboutConfig'))
+               ;
+          
+          $settings_form
+               ->addField(
+                    new dcFieldSubmit($prefix.'submit',__('Save'),array(
+                         'action' => array('adminPageAboutConfig',$action))))
+               ->addField(
+                    new dcFieldHidden ('p','aboutConfig'))
+               ;
+          
+          $_ctx->{$prefix.'settings'} = $settings;
+          
+          $nav_form->setup();
+          $settings_form->setup();
      }
 }
 
-# Global settings update
-if (!empty($_POST['gs']) && is_array($_POST['gs']))
-{
-     try
-     {
-          foreach ($_POST['gs'] as $ns => $s)
-          {
-               $core->blog->settings->addNamespace($ns);
-               
-               foreach ($s as $k => $v)      {
-                    $core->blog->settings->$ns->put($k,$v,null,null,true,true);
-               }
-               
-               $core->blog->triggerBlog();
-          }
-          
-          http::redirect($p_url.'&upd=1&part=global');
-     }
-     catch (Exception $e)
-     {
-          $core->error->add($e->getMessage());
-     }
+# Local settings forms
+adminPageAboutConfig::setForms();
+
+# Global settings forms
+adminPageAboutConfig::setForms(true);
+
+# Commons
+if (!empty($_GET['upd'])) {
+     $_ctx->setAlert(__('Configuration successfully updated'));
 }
-
-$part = !empty($_GET['part']) && $_GET['part'] == 'global' ? 'global' : 'local';
-
-function settingLine($id,$s,$ns,$field_name,$strong_label)
-{
-     if ($s['type'] == 'boolean') {
-          $field = form::combo(array($field_name.'['.$ns.']['.$id.']',$field_name.'_'.$id),
-          array(__('yes') => 1, __('no') => 0),$s['value'] ? 1 : 0);
-     } else {
-          $field = form::field(array($field_name.'['.$ns.']['.$id.']',$field_name.'_'.$id),40,null,
-          html::escapeHTML($s['value']));
-     }
-     
-     $slabel = $strong_label ? '<strong>%s</strong>' : '%s';
-     
-     return
-     '<tr>'.
-     '<td scope="raw"><label for="s_'.$id.'">'.sprintf($slabel,html::escapeHTML($id)).'</label></td>'.
-     '<td>'.$field.'</td>'.
-     '<td>'.$s['type'].'</td>'.
-     '<td>'.html::escapeHTML($s['label']).'</td>'.
-     '</tr>';
+if (!empty($_GET['upda'])) {
+     $_ctx->setAlert(__('Settings definition successfully updated'));
 }
+$_ctx->default_tab = !empty($_GET['part']) && $_GET['part'] == 'global' ? 'global' : 'local';
+$_ctx->fillPageTitle('about:config');
+$core->tpl->display('@aboutConfig/index.html.twig');
 ?>
-<html>
-<head>
-  <title>about:config</title>
-  <?php echo dcPage::jsPageTabs($part); ?>
-  <style type="text/css">
-  table.settings { border: 1px solid #999; margin-bottom: 2em; }
-  table.settings th { background: #f5f5f5; color: #444; padding-top: 0.3em; padding-bottom: 0.3em; }
-  p.anchor-nav {float: right; }
-  </style>
-     <script type="text/javascript">
-     //<![CDATA[
-     $(function() {
-          $("#gs_submit").hide();
-          $("#ls_submit").hide();
-          $("#gs_nav").change(function() {
-               window.location = $("#gs_nav option:selected").val();
-          })
-          $("#ls_nav").change(function() {
-               window.location = $("#ls_nav option:selected").val();
-          })
-     });
-     //]]>
-     </script>
-</head>
-
-<body>
-<?php
-if (!empty($_GET['upd'])) {
-     dcPage::message(__('Configuration successfully updated'));
-}
-
-if (!empty($_GET['upda'])) {
-     dcPage::message(__('Settings definition successfully updated'));
-}
-?>
-<h2><?php echo html::escapeHTML($core->blog->name); ?> &rsaquo; <span class="page-title">about:config</span></h2>
-
-<div id="local" class="multi-part" title="<?php echo __('blog settings'); ?>">
-
-<?php 
-$table_header = '<table class="settings" id="%s"><caption>%s</caption>'.
-'<thead>'.
-'<tr>'."\n".
-'  <th class="nowrap">Setting ID</th>'."\n".
-'  <th>'.__('Value').'</th>'."\n".
-'  <th>'.__('Type').'</th>'."\n".
-'  <th class="maximalx">'.__('Description').'</th>'."\n".
-'</tr>'."\n".
-'</thead>'."\n".
-'<tbody>';
-$table_footer = '</tbody></table>';
-
-$settings = array();
-foreach ($core->blog->settings->dumpNamespaces() as $ns => $namespace) {
-     foreach ($namespace->dumpSettings() as $k => $v) {
-          $settings[$ns][$k] = $v;
-     }
-}
-ksort($settings);
-if (count($settings) > 0) {
-     $ns_combo = array();
-     foreach ($settings as $ns => $s) {
-          $ns_combo[$ns] = '#l_'.$ns;
-     }
-     echo 
-          '<form action="plugin.php" method="post">'.
-          '<p class="anchor-nav">'.
-          '<label for="ls_nav" class="classic">'.__('Goto:').'</label> '.form::combo('ls_nav',$ns_combo).
-          ' <input type="submit" value="'.__('Ok').'" id="ls_submit" />'.
-          '<input type="hidden" name="p" value="aboutConfig" />'.
-          $core->formNonce().'</p></form>';
-}
-?>
-
-<form action="plugin.php" method="post">
-
-<?php
-foreach ($settings as $ns => $s)
-{
-     ksort($s);
-     echo sprintf($table_header,'l_'.$ns,$ns);
-     foreach ($s as $k => $v)
-     {
-          echo settingLine($k,$v,$ns,'s',!$v['global']);
-     }
-     echo $table_footer;
-}
-?>
-
-<p><input type="submit" value="<?php echo __('Save'); ?>" />
-<input type="hidden" name="p" value="aboutConfig" />
-<?php echo $core->formNonce(); ?></p>
-</form>
-</div>
-
-<div id="global" class="multi-part" title="<?php echo __('global settings'); ?>">
-
-<?php
-$settings = array();
-
-foreach ($core->blog->settings->dumpNamespaces() as $ns => $namespace) {
-     foreach ($namespace->dumpGlobalSettings() as $k => $v) {
-          $settings[$ns][$k] = $v;
-     }
-}
-
-ksort($settings);
-
-if (count($settings) > 0) {
-     $ns_combo = array();
-     foreach ($settings as $ns => $s) {
-          $ns_combo[$ns] = '#g_'.$ns;
-     }
-     echo 
-          '<form action="plugin.php" method="post">'.
-          '<p class="anchor-nav">'.
-          '<label for="gs_nav" class="classic">'.__('Goto:').'</label> '.form::combo('gs_nav',$ns_combo).
-          ' <input type="submit" value="'.__('Ok').'" id="gs_submit" />'.
-          '<input type="hidden" name="p" value="aboutConfig" />'.
-          $core->formNonce().'</p></form>';
-}
-?>
-
-<form action="plugin.php" method="post">
-
-<?php
-foreach ($settings as $ns => $s)
-{
-     ksort($s);
-     echo sprintf($table_header,'g_'.$ns,$ns);
-     foreach ($s as $k => $v)
-     {
-          echo settingLine($k,$v,$ns,'gs',false);
-     }
-     echo $table_footer;
-}
-?>
-
-<p><input type="submit" value="<?php echo __('Save'); ?>" />
-<input type="hidden" name="p" value="aboutConfig" />
-<?php echo $core->formNonce(); ?></p>
-</form>
-</div>
-
-</body>
-</html>