Changeset 848:ad18a33a3cef for admin

Timestamp:

07/31/12 13:18:23 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

sexy

Message:

sexy step 1 : no more comments ...

Location:

admin

Files:

• blog_pref.php (modified) (5 diffs)
• comment.php (deleted)
• comments.php (deleted)
• comments_actions.php (deleted)
• index.php (modified) (3 diffs)
• install/index.php (modified) (2 diffs)
• post.php (modified) (9 diffs)
• search.php (modified) (3 diffs)
• services.php (modified) (4 diffs)

admin/blog_pref.php

@@ -135 +135 @@
      if ($nb_post_per_feed <= 1) { $nb_post_per_feed = 1; }
      
-     $nb_comment_per_feed = abs((integer) $_POST['nb_comment_per_feed']);
-     if ($nb_comment_per_feed <= 1) { $nb_comment_per_feed = 1; }
-     
      try
      {
@@ -182 +179 @@
           $blog_settings->system->put('date_format',$_POST['date_format']);
           $blog_settings->system->put('time_format',$_POST['time_format']);
-          $blog_settings->system->put('comments_ttl',abs((integer) $_POST['comments_ttl']));
-          $blog_settings->system->put('trackbacks_ttl',abs((integer) $_POST['trackbacks_ttl']));
-          $blog_settings->system->put('allow_comments',!empty($_POST['allow_comments']));
-          $blog_settings->system->put('allow_trackbacks',!empty($_POST['allow_trackbacks']));
-          $blog_settings->system->put('comments_pub',empty($_POST['comments_pub']));
-          $blog_settings->system->put('trackbacks_pub',empty($_POST['trackbacks_pub']));
-          $blog_settings->system->put('comments_nofollow',!empty($_POST['comments_nofollow']));
-          $blog_settings->system->put('wiki_comments',!empty($_POST['wiki_comments']));
           $blog_settings->system->put('enable_xmlrpc',!empty($_POST['enable_xmlrpc']));
           
@@ -199 +188 @@
           $blog_settings->system->put('media_img_title_pattern',$_POST['media_img_title_pattern']);
           $blog_settings->system->put('nb_post_per_feed',$nb_post_per_feed);
-          $blog_settings->system->put('nb_comment_per_feed',$nb_comment_per_feed);
           $blog_settings->system->put('short_feed_items',!empty($_POST['short_feed_items']));
           
@@ -331 +319 @@
      
      echo
-     '<fieldset><legend>'.__('Comments and trackbacks').'</legend>'.
-     '<div class="two-cols">'.
-     '<div class="col">'.
-     '<p><label for="allow_comments" class="classic">'.
-     form::checkbox('allow_comments','1',$blog_settings->system->allow_comments).
-     __('Accept comments').'</label></p>'.
-     
-     '<p><label for="comments_pub" class="classic">'.
-     form::checkbox('comments_pub','1',!$blog_settings->system->comments_pub).
-     __('Moderate comments').'</label></p>'.
-     
-     '<p><label for="comments_ttl" class="classic">'.sprintf(__('Leave comments open for %s days'),
-     form::field('comments_ttl',2,3,$blog_settings->system->comments_ttl)).
-     '</label></p>'.
-     '<p class="form-note">'.__('Leave blank to disable this feature.').'</p>'.
-     
-     '<p><label for="wiki_comments" class="classic">'.
-     form::checkbox('wiki_comments','1',$blog_settings->system->wiki_comments).
-     __('Wiki syntax for comments').'</label></p>'.
-     '</div>'.
-     
-     '<div class="col">'.
-     '<p><label for="allow_trackbacks" class="classic">'.
-     form::checkbox('allow_trackbacks','1',$blog_settings->system->allow_trackbacks).
-     __('Accept trackbacks').'</label></p>'.
-     
-     '<p><label for="trackbacks_pub" class="classic">'.
-     form::checkbox('trackbacks_pub','1',!$blog_settings->system->trackbacks_pub).
-     __('Moderate trackbacks').'</label></p>'.
-     
-     '<p><label for="trackbacks_ttl" class="classic">'.sprintf(__('Leave trackbacks open for %s days'),
-     form::field('trackbacks_ttl',2,3,$blog_settings->system->trackbacks_ttl)).'</label></p>'.
-     '<p class="form-note">'.__('Leave blank to disable this feature.').'</p>'.
-     
-     '<p><label for="comments_nofollow" class="classic">'.
-     form::checkbox('comments_nofollow','1',$blog_settings->system->comments_nofollow).
-     __('Add "nofollow" relation on comments and trackbacks links').'</label></p>'.
-     '</div>'.
-     '</div>'.
-     '<br class="clear" />'. //Opera sucks
-     '</fieldset>';
-     
-     echo
      '<fieldset><legend>'.__('Blog presentation').'</legend>'.
      '<div class="two-cols">'.
@@ -397 +342 @@
      '<p><label for="nb_post_per_feed" class="classic">'.sprintf(__('Display %s entries per feed'),
      form::field('nb_post_per_feed',2,3,$blog_settings->system->nb_post_per_feed)).
-     '</label></p>'.
-     
-     '<p><label for="nb_comment_per_feed" class="classic">'.sprintf(__('Display %s comments per feed'),
-     form::field('nb_comment_per_feed',2,3,$blog_settings->system->nb_comment_per_feed)).
      '</label></p>'.
      

admin/index.php

@@ -71 +71 @@
 $str_entries = ($post_count > 1) ? __('%d entries') : __('%d entry');
 
-$comment_count = $core->blog->getComments(array(),true)->f(0);
-$str_comments = ($comment_count > 1) ? __('%d comments') : __('%d comment');
-
 $ws = $core->auth->user_prefs->addWorkspace('favorites');
 $count = 0;
@@ -83 +80 @@
                $count++;
                $title = ($fav['name'] == 'posts' ? sprintf($str_entries,$post_count) : 
-                    ($fav['name'] == 'comments' ? sprintf($str_comments,$comment_count) : $fav['title']));
+                    $fav['title']);
                $__dashboard_icons[$fav['name']] = new ArrayObject(array(__($title),$fav['url'],$fav['large-icon']));
 
@@ -98 +95 @@
                $count++;
                $title = ($fav['name'] == 'posts' ? sprintf($str_entries,$post_count) : 
-                    ($fav['name'] == 'comments' ? sprintf($str_comments,$comment_count) : $fav['title']));
+                    $fav['title']);
                $__dashboard_icons[$fav['name']] = new ArrayObject(array(__($title),$fav['url'],$fav['large-icon']));
 

admin/install/index.php

@@ -166 +166 @@
           $cur->post_content_xhtml = $cur->post_content;
           $cur->post_status = 1;
-          $cur->post_open_comment = 1;
-          $cur->post_open_tb = 0;
           $post_id = $core->blog->addPost($cur);
-          
-          # Add a comment to it
-          $cur = $core->con->openCursor($core->prefix.'comment');
-          $cur->post_id = $post_id;
-          $cur->comment_tz = $default_tz;
-          $cur->comment_author = __('Dotclear Team');
-          $cur->comment_email = 'contact@dotclear.net';
-          $cur->comment_site = 'http://www.dotclear.org/';
-          $cur->comment_content = __("<p>This is a comment.</p>\n<p>To delete it, log in and ".
-               "view your blog's comments. Then you might remove or edit it.</p>");
-          $core->blog->addComment($cur);
           
           #  Plugins initialization
@@ -210 +197 @@
           $init_fav['posts'] = array('posts','Entries','posts.php',
                'images/menu/entries.png','images/menu/entries-b.png',
-               'usage,contentadmin',null,null);
-          $init_fav['comments'] = array('comments','Comments','comments.php',
-               'images/menu/comments.png','images/menu/comments-b.png',
                'usage,contentadmin',null,null);
           $init_fav['prefs'] = array('prefs','My preferences','preferences.php',

admin/post.php

@@ -30 +30 @@
 $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;
 
 $page_title = __('New entry');
@@ -117 +115 @@
           $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;
           
           $page_title = __('Edit entry');
@@ -170 +166 @@
      }
      
-     $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'];
@@ -207 +201 @@
      $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'])) {
@@ -275 +267 @@
      $default_tab = '';
 }
-if (!empty($_GET['co'])) {
-     $default_tab = 'comments';
-}
 
 dcPage::open($page_title.' - '.__('Entries'),
@@ -285 +274 @@
      dcPage::jsMetaEditor().
      dcPage::jsLoad('js/_post.js').
-     dcPage::jsConfirmClose('entry-form','comment-form').
+     dcPage::jsConfirmClose('entry-form').
      # --BEHAVIOR-- adminPostHeaders
      $core->callBehavior('adminPostHeaders').
@@ -305 +294 @@
 }
 
-if (!empty($_GET['creaco'])) {
-          echo '<p class="message">'.__('Comment has been successfully created.').'</p>';
-     }
 
 # XHTML conversion
@@ -421 +407 @@
      '<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>'.
-     '<p><label for="post_open_tb" class="classic">'.form::checkbox('post_open_tb',1,$post_open_tb).' '.
-     __('Accept trackbacks').'</label></p>'.
      '<p><label for="post_selected" class="classic">'.form::checkbox('post_selected',1,$post_selected).' '.
      __('Selected entry').'</label></p>'.
@@ -457 +439 @@
      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>';
-}
-
-
-# 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>';
 }
 

admin/search.php

@@ -49 +49 @@
           }
      }
-     # Get comments
-     elseif ($qtype == 'c')
-     {
-          $starting_scripts .= dcPage::jsLoad('js/_comments.js');
-          
-          $params['search'] = $q;
-          $params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
-          $params['no_content'] = true;
-          $params['order'] = 'comment_dt DESC';
-          
-          try {
-               $comments = $core->blog->getComments($params);
-               $counter = $core->blog->getComments($params,true);
-               $comment_list = new adminCommentList($core,$comments,$counter->f(0));
-          } catch (Exception $e) {
-               $core->error->add($e->getMessage());
-          }
-     }
 }
 
@@ -78 +60 @@
 '<p><label for="q">'.__('Query:').' </label>'.form::field('q',30,255,html::escapeHTML($q)).'</p>'.
 '<p><label for="qtype1" class="classic">'.form::radio(array('qtype','qtype1'),'p',$qtype == 'p').' '.__('Search entries').'</label> '.
-'<label for="qtype2" class="classic">'.form::radio(array('qtype','qtype2'),'c',$qtype == 'c').' '.__('Search comments').'</label></p>'.
+'</p>'.
 '</p><input type="submit" value="'.__('Search').'" /></p>'.
 '</div>'.
@@ -134 +116 @@
           );
      }
-     # Show posts
-     elseif ($qtype == 'c')
-     {
-          # Actions combo box
-          $combo_action = array();
-          if ($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 ($core->auth->check('delete,contentadmin',$core->blog->id))
-          {
-               $combo_action[__('Delete')] = 'delete';
-          }
-          
-          if ($counter->f(0) > 0) {
-               printf('<h3>'.
-               ($counter->f(0) == 1 ? __('%d comment found') : __('%d comments found')).
-               '</h3>',$counter->f(0));
-          }
-          
-          $comment_list->display($page,$nb_per_page,
-          '<form action="comments_actions.php" method="post" id="form-comments">'.
-          
-          '%s'.
-          
-          '<div class="two-cols">'.
-          '<p class="col checkboxes-helpers"></p>'.
-          
-          '<p class="col right"><label for="action2" class="classic">'.__('Selected comments action:').'</label> '.
-          form::combo(array('action','action2'),$combo_action).
-          '<input type="submit" value="'.__('ok').'" /></p>'.
-          form::hidden('redir',preg_replace('/%/','%%',$redir)).
-          $core->formNonce().
-          '</div>'.
-          '</form>'
-          );
-     }
 }
 

admin/services.php

@@ -18 +18 @@
 
 $core->rest->addFunction('getPostById',array('dcRestMethods','getPostById'));
-$core->rest->addFunction('getCommentById',array('dcRestMethods','getCommentById'));
 $core->rest->addFunction('quickPost',array('dcRestMethods','quickPost'));
 $core->rest->addFunction('validatePostMarkup',array('dcRestMethods','validatePostMarkup'));
@@ -70 +69 @@
           $rsp->post_status($rs->post_status);
           $rsp->post_selected($rs->post_selected);
-          $rsp->post_open_comment($rs->post_open_comment);
-          $rsp->post_open_tb($rs->post_open_tb);
-          $rsp->nb_comment($rs->nb_comment);
-          $rsp->nb_trackback($rs->nb_trackback);
           $rsp->user_name($rs->user_name);
           $rsp->user_firstname($rs->user_firstname);
@@ -100 +95 @@
      }
      
-     public static function getCommentById($core,$get)
-     {
-          if (empty($get['id'])) {
-               throw new Exception('No comment ID');
-          }
-          
-          $rs = $core->blog->getComments(array('comment_id' => (integer) $get['id']));
-          
-          if ($rs->isEmpty()) {
-               throw new Exception('No comment for this ID');
-          }
-          
-          $rsp = new xmlTag('post');
-          $rsp->id = $rs->comment_id;
-          
-          $rsp->comment_dt($rs->comment_dt);
-          $rsp->comment_upddt($rs->comment_upddt);
-          $rsp->comment_author($rs->comment_author);
-          $rsp->comment_site($rs->comment_site);
-          $rsp->comment_content($rs->comment_content);
-          $rsp->comment_trackback($rs->comment_trackback);
-          $rsp->comment_status($rs->comment_status);
-          $rsp->post_title($rs->post_title);
-          $rsp->post_url($rs->post_url);
-          $rsp->post_id($rs->post_id);
-          $rsp->post_dt($rs->post_dt);
-          $rsp->user_id($rs->user_id);
-          
-          $rsp->comment_display_content($rs->getContent(true));
-          
-          if ($core->auth->userID()) {
-               $rsp->comment_ip($rs->comment_ip);
-               $rsp->comment_email($rs->comment_email);
-               $rsp->comment_spam_disp(dcAntispam::statusMessage($rs));
-          }
-          
-          return $rsp;
-     }
      
      public static function quickPost($core,$get,$post)
@@ -150 +107 @@
           $cur->post_lang = !empty($post['post_lang']) ? $post['post_lang'] : '';
           $cur->post_status = !empty($post['post_status']) ? (integer) $post['post_status'] : 0;
-          $cur->post_open_comment = (integer) $core->blog->settings->system->allow_comments;
-          $cur->post_open_tb = (integer) $core->blog->settings->system->allow_trackbacks;
           
           # --BEHAVIOR-- adminBeforePostCreate