Changeset 1829:db77f6bb5df9 for admin/post.php

Timestamp:

09/11/13 13:26:20 (12 years ago)

Author:

kevin@…

Branch:

Ticket #1539

Parents:

1828:5274b117ae55 (diff), 1792:3ad2e47ed52d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fusion avec default

Files:

• admin/post.php (modified) (2 diffs)
• admin/post.php (modified) (9 diffs)

admin/post.php

@@ -455 +455 @@
                          '<p>'.form::combo('post_format',$formaters_combo,$post_format,'maximal').
                          '</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></div>')),
+                         '<p class="format_control control_wiki">'.
+                         '<a id="convert-xhtml" class="button'.($post_id && $post_format != 'wiki' ? ' hide' : '').'" href="post.php?id='.$post_id.'&amp;xconv=1">'.
+                         __('Convert to XHTML').'</a></p></div>')),
           'metas-box' => array(
                'title' => __('Ordering'),
@@ -533 +533 @@
           
           "post_content" =>
-               '<p class="area"><label class="required" '.
+               '<p class="area" id="content-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)).

admin/post.php

@@ -69 +69 @@
 $bad_dt = false;
 
+# Trackbacks
+$TB = new dcTrackback($core);
+$tb_urls = $tb_excerpt = '';
+
 # Get entry informations
 if (!empty($_REQUEST['id']))
@@ -128 +132 @@
                $core->error->add($e->getMessage());
           }
+
+          # Sanitize trackbacks excerpt
+          $tb_excerpt = empty($_POST['tb_excerpt']) ? 
+               $post_excerpt_xhtml.' '.$post_content_xhtml :
+               $_POST['tb_excerpt'];
+          $tb_excerpt = html::decodeEntities(html::clean($tb_excerpt));
+          $tb_excerpt = text::cutString(html::escapeHTML($tb_excerpt), 255);
+          $tb_excerpt = preg_replace('/\s+/ms', ' ', $tb_excerpt);
+     }
+}
+
+# Ping blogs
+if (!empty($_POST['ping']))
+{
+     if (!empty($_POST['tb_urls']) && $post_id && $post_status == 1 && $can_edit_post)
+     {
+          $tb_urls = $_POST['tb_urls'];
+          $tb_urls = str_replace("\r", '', $tb_urls);
+          $tb_post_title = html::escapeHTML(trim(html::clean($post_title)));
+          
+          foreach (explode("\n", $tb_urls) as $tb_url)
+          {
+               try {
+                    $TB->ping($tb_url, $post_id, $tb_post_title, $tb_excerpt, $post_url);
+               } catch (Exception $e) {
+                    $core->error->add($e->getMessage());
+               }
+          }
+          
+          if (!$core->error->flag()) {
+               http::redirect('post.php?id='.$post_id.'&tbsent=1&tb=1');
+          }
      }
 }
 
 # Format excerpt and content
-if (!empty($_POST) && $can_edit_post)
+elseif (!empty($_POST) && $can_edit_post)
 {
      $post_format = $_POST['post_format'];
@@ -294 +330 @@
 if (!empty($_GET['co'])) {
      $default_tab = 'comments';
+}
+elseif (!empty($_GET['tb'])) {
+     $default_tab = 'trackbacks';
 }
 
@@ -354 +393 @@
 if (!empty($_GET['creaco'])) {
      dcPage::success(__('Comment has been successfully created.'));
+}
+if (!empty($_GET['tbsent'])) {
+     dcPage::success(__('All pings sent.'));
 }
 
@@ -512 +554 @@
      echo '<div id="entry-content"><div class="constrained">';
 
-     echo '<h3 class="hidden">'.__('Edit post').'</h3>';
+     echo '<h3 class="out-of-screen-if-js">'.__('Edit post').'</h3>';
      
      foreach ($main_items as $id => $item) {
@@ -567 +609 @@
      
      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)
 {
+     /* Comments
+     -------------------------------------------------------- */
+
      $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
@@ -606 +641 @@
      $core->callBehavior('adminCommentsActionsCombo',array(&$combo_action));
      
-     $has_action = !empty($combo_action) && (!$trackbacks->isEmpty() || !$comments->isEmpty());
+     $has_action = !empty($combo_action) && !$comments->isEmpty();
      echo 
      '<p class="top-add"><a class="button add" href="#comment-form">'.__('Add a comment').'</a></p>';
@@ -612 +647 @@
      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>';
      }
      
@@ -676 +703 @@
      '</div>'. #add comment
      '</div>'; #comments
+}
+
+if ($post_id && $post_status == 1)
+{
+     /* Trackbacks
+     -------------------------------------------------------- */
+
+     $params = array('post_id' => $post_id, 'order' => 'comment_dt ASC');
+     $trackbacks = $core->blog->getComments(array_merge($params, array('comment_trackback' => 1)));
+     
+     # Actions combo box
+     $combo_action = 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-- adminTrackbacksActionsCombo
+     $core->callBehavior('adminTrackbacksActionsCombo', array(&$combo_action));
+     
+     $has_action = !empty($combo_action) && !$trackbacks->isEmpty();
+     
+     if (!empty($_GET['tb_auto'])) {
+          $tb_urls = implode("\n", $TB->discover($post_excerpt_xhtml.' '.$post_content_xhtml));
+     }
+     
+     # Display tab
+     echo
+     '<div id="trackbacks" class="clear multi-part" title="'.__('Trackbacks').'">';
+     
+     # tracbacks actions
+     if ($has_action) {
+          echo '<form action="comments_actions.php" id="form-trackbacks" method="post">';
+     }
+     
+     echo '<h3>'.__('Trackbacks').'</h3>';
+     
+     if (!$trackbacks->isEmpty()) {
+          showComments($trackbacks, $has_action, true);
+     } else {
+          echo '<p>'.__('No trackback').'</p>';
+     }
+     
+     if ($has_action) {
+          echo
+          '<div class="two-cols">'.
+          '<p class="col checkboxes-helpers"></p>'.
+          
+          '<p class="col right"><label for="action" class="classic">'.__('Selected trackbacks action:').'</label> '.
+          form::combo('action', $combo_action).
+          form::hidden('redir', 'post.php?id='.$post_id.'&amp;tb=1').
+          $core->formNonce().
+          '<input type="submit" value="'.__('ok').'" /></p>'.
+          '</div>'.
+          '</form>';
+     }
+     
+     /* Add trackbacks
+     -------------------------------------------------------- */
+     if ($can_edit_post && $post->post_status) {
+          echo
+          '<div class="fieldset clear">';
+
+          echo
+          '<h3>'.__('Ping blogs').'</h3>'.
+          '<form action="post.php?id='.$post_id.'" id="trackback-form" method="post">'.
+          '<p><label for="tb_urls" class="area">'.__('URLs to ping:').'</label>'.
+          form::textarea('tb_urls', 60, 5, $tb_urls).
+          '</p>'.
+
+          '<p><label for="tb_excerpt" class="area">'.__('Send excerpt:').'</label>'.
+          form::textarea('tb_excerpt', 60, 5, $tb_excerpt).'</p>'.
+
+          '<p>'.
+          $core->formNonce().
+          '<input type="submit" name="ping" value="'.__('Ping blogs').'" />'.
+          (empty($_GET['tb_auto']) ? 
+               '&nbsp;&nbsp;<a class="button" href="'.
+               'post.php?id='.$post_id.'&amp;tb_auto=1&amp;tb=1'.
+               '">'.__('Auto discover ping URLs').'</a>'
+          : '').
+          '</p>'.
+          '</form>';
+
+          $pings = $TB->getPostPings($post_id);
+
+          if (!$pings->isEmpty())
+          {
+               echo '<h3>'.__('Previously sent pings').'</h3>';
+               
+               echo '<ul class="nice">';
+               while ($pings->fetch()) {
+                    echo
+                    '<li>'.dt::dt2str(__('%Y-%m-%d %H:%M'), $pings->ping_dt).' - '.
+                    $pings->ping_url.'</li>';
+               }
+               echo '</ul>';
+          }
+
+          echo '</div>';
+     }
+
+     echo '</div>'; #trackbacks
 }