Changes in [1713:e29741a2433d:1714:28737e5f6607]

Files:

• .hgsubstate (modified) (1 diff)
• admin/blog_pref.php (modified) (3 diffs)
• admin/images/trash.png (modified) (previous)
• admin/index.php (modified) (2 diffs)
• admin/js/_index.js (modified) (1 diff)
• admin/js/_post.js (modified) (3 diffs)
• admin/js/common.js (modified) (5 diffs)
• admin/js/tool-man/cookies.js (added)
• admin/js/tool-man/coordinates.js (added)
• admin/js/tool-man/core.js (added)
• admin/js/tool-man/css.js (added)
• admin/js/tool-man/drag.js (added)
• admin/js/tool-man/dragsort.js (added)
• admin/js/tool-man/events.js (added)
• admin/media.php (modified) (5 diffs)
• admin/post.php (modified) (2 diffs)
• admin/services.php (modified) (2 diffs)
• admin/style/default.css (modified) (4 diffs)
• admin/style/jsToolBar/jsToolBar.css (modified) (2 diffs)
• admin/style/user.png (added)
• inc/admin/lib.dc.page.php (modified) (5 diffs)
• inc/core/class.dc.blog.php (modified) (3 diffs)
• inc/core/class.dc.core.php (modified) (4 diffs)
• inc/core/class.dc.trackback.php (modified) (13 diffs)
• inc/core/class.dc.xmlrpc.php (modified) (1 diff)
• inc/prepend.php (modified) (1 diff)
• locales/fr/main.po (modified) (2 diffs)
• locales/fr/plugins.po (modified) (1 diff)
• plugins/attachments/js/post.js (modified) (1 diff)
• plugins/pages/_prepend.php (modified) (1 diff)
• plugins/pings/post.js (modified) (1 diff)
• plugins/tags/js/post.js (modified) (1 diff)

.hgsubstate

@@ -1 @@
-f5e0517435fc94082b6acaad5f4f111252b6149f inc/libs/clearbricks
+3811959404614e7014b897d3d3b96caad10e214f inc/libs/clearbricks

admin/blog_pref.php

@@ -580 +580 @@
                $user_url_p = '%1$s';
           }
-          
+
+          # Sort users list on user_id key
+          ksort($blog_users);
+
+          $post_type = $core->getPostTypes();
+          $current_blog_id = $core->blog->id;
+          if ($blog_id != $core->blog->id) {
+               $core->setBlog($blog_id);
+          }
+
           foreach ($blog_users as $k => $v)
           {
@@ -586 +595 @@
                {
                     echo
+                    '<div class="user-perm">'.
                     '<h4>'.sprintf($user_url_p,html::escapeHTML($k)).
                     ' ('.html::escapeHTML(dcUtils::getUserCN(
                          $k, $v['name'], $v['firstname'], $v['displayname']
                     )).')</h4>';
-                    
-                    echo '<ul class="nice">';
+
+                    if ($core->auth->isSuperAdmin()) {
+                         echo 
+                         '<p>'.__('Email:').' '.
+                         ($v['email'] != '' ? '<a href="mailto:'.$v['email'].'">'.$v['email'].'</a>' : __('(none)')).
+                         '</p>';
+                    }
+
+                    echo
+                    '<h5>'.__('Publications on this blog:').'</h5>'.
+                    '<ul>';
+                    foreach ($post_type as $type => $pt_info) {
+                         $params = array(
+                              'post_type' => $type,
+                              'user_id' => $k
+                              );
+                         echo '<li>'.sprintf(__('%1$s: %2$s'),__($pt_info['label']),$core->blog->getPosts($params,true)->f(0)).'</li>';
+                    }
+                    echo
+                    '</ul>';
+
+                    echo
+                    '<h5>'.__('Permissions:').'</h5>'.
+                    '<ul>';
                     if ($v['super']) {
-                         echo '<li>'.__('Super administrator').'</li>';
+                         echo '<li class="user_super">'.__('Super administrator').'</li>';
                     } else {
                          foreach ($v['p'] as $p => $V) {
-                              echo '<li>'.__($perm_types[$p]).'</li>';
+                              echo '<li '.($p == 'admin' ? 'class="user_admin"' : '').'>'.__($perm_types[$p]).'</li>';
                          }
                     }
-                    echo '</ul>';
+                    echo 
+                    '</ul>';
                     
                     if (!$v['super'] && $core->auth->isSuperAdmin()) {
                          echo 
                          '<form action="users_actions.php" method="post">'.
-                         '<p><input type="submit" value="'.__('Change permissions').'" />'.
+                         '<p class="change-user-perm"><input type="submit" class="reset" value="'.__('Change permissions').'" />'.
                          form::hidden(array('redir'),'blog_pref.php?id='.$k).
                          form::hidden(array('action'),'perms').
@@ -613 +646 @@
                          '</form>';
                     }
+                    echo '</div>';
                }
+          }
+          if ($current_blog_id != $core->blog->id) {
+               $core->setBlog($current_blog_id);
           }
      }

admin/index.php

@@ -63 +63 @@
      $core->auth->user_prefs->dashboard->put('quickentry',false,'boolean');
 }
+
+// Handle folded/unfolded sections in admin from user preferences
+$ws = $core->auth->user_prefs->addWorkspace('toggles');
+if (!$core->auth->user_prefs->toggles->prefExists('unfolded_sections')) {
+     $core->auth->user_prefs->toggles->put('unfolded_sections','','string','Folded sections in admin',null,true);
+}
+
 
 # Dashboard icons
@@ -210 +217 @@
 
      if ($updater->getNotify() && $new_v) {
-          $message =
-          '<div><p>'.sprintf(__('Dotclear %s is available!'),$new_v).'</p> '.
-          '<ul><li><strong><a href="update.php">'.sprintf(__('Upgrade now'),$new_v).'</a></strong>'.
-          '</li><li><a href="update.php?hide_msg=1">'.__('Remind me later').'</a>'.
-          ($version_info ? ' </li><li><a href="'.$version_info.'">'.__('information about this version').'</a>' : '').
-          '</li></ul></div>';
-          dcPage::message($message,false,true);
+          echo
+          '<div class="dc-update"><h3>'.sprintf(__('Dotclear %s is available!'),$new_v).'</h3> '.
+          '<p><a class="button submit" href="update.php">'.sprintf(__('Upgrade now'),$new_v).'</a> '.
+          '<a href="update.php?hide_msg=1">'.__('Remind me later').'</a>'.
+          ($version_info ? ' </p>'.
+          '<p><a href="'.$version_info.'" class="info">'.__('information about this version').'</a>' : '').'</p>'.
+          '</div>';
      }
 }

admin/js/_index.js

@@ -75 +75 @@
      $('#quick h3').toggleWithLegend($('#quick').children().not('h3'),{
           legend_click: true,
-          cookie: 'dcx_quick_entry'
+          user_pref: 'dcx_quick_entry'
      });
 });

admin/js/_post.js

@@ -120 +120 @@
           // Hide some fields
           $('#notes-area label').toggleWithLegend($('#notes-area').children().not('label'),{
-               cookie: 'dcx_post_notes',
+               user_pref: 'dcx_post_notes',
                legend_click:true,
                hide: $('#post_notes').val() == ''
@@ -129 +129 @@
           });
           $('#post_lang').parent().children('label').toggleWithLegend($('#post_lang'),{
-               cookie: 'dcx_post_lang',
+               user_pref: 'dcx_post_lang',
                legend_click: true
           });
           $('#post_password').parent().children('label').toggleWithLegend($('#post_password'),{
-               cookie: 'dcx_post_password',
+               user_pref: 'dcx_post_password',
                legend_click: true,
                hide: $('#post_password').val() == ''
           });
           $('#post_status').parent().children('label').toggleWithLegend($('#post_status'),{
-               cookie: 'dcx_post_status',
+               user_pref: 'dcx_post_status',
                legend_click: true
           });
           $('#post_dt').parent().children('label').toggleWithLegend($('#post_dt').parent().children().not('label'),{
-               cookie: 'dcx_post_dt',
+               user_pref: 'dcx_post_dt',
                legend_click: true
           });
           $('#label_format').toggleWithLegend($('#label_format').parent().children().not('#label_format'),{
-               cookie: 'dcx_post_format',
+               user_pref: 'dcx_post_format',
                legend_click: true
           });
           $('#cat_id').parent().children('label').toggleWithLegend($('#cat_id'),{
-               cookie: 'cat_id',
+               user_pref: 'cat_id',
                legend_click: true
           });
@@ -158 +158 @@
           });
           $('#post_url').parent().children('label').toggleWithLegend($('#post_url').parent().children().not('label'),{
-               cookie: 'post_url',
+               user_pref: 'post_url',
                legend_click: true
           });
           // We load toolbar on excerpt only when it's ready
           $('#excerpt-area label').toggleWithLegend($('#excerpt-area').children().not('label'),{
-               cookie: 'dcx_post_excerpt',
+               user_pref: 'dcx_post_excerpt',
                legend_click: true,
                hide: $('#post_excerpt').val() == ''

admin/js/common.js

@@ -63 +63 @@
           img_off_src: dotclear.img_minus_src,
           img_off_alt: dotclear.img_minus_alt,
+          unfolded_sections: dotclear.unfolded_sections,
           hide: true,
           speed: 0,
           legend_click: false,
           fn: false, // A function called on first display,
-          cookie: false,
-          reverse_cookie: false // Reverse cookie behavior
+          user_pref: false,
+          reverse_user_pref: false, // Reverse cookie behavior
+          user_pref:false,
+          reverse_user_pref: false
      };
      var p = jQuery.extend(defaults,s);
@@ -78 +81 @@
           p.hide = p.reverse_cookie;
      }
-
+     
+     var set_user_pref = p.hide ^ p.reverse_user_pref;
+     if (p.user_pref && (p.user_pref in p.unfolded_sections)) {
+          p.hide = p.reverse_user_pref;
+     }
      var toggle = function(i,speed) {
           speed = speed || 0;
@@ -102 +109 @@
                }
           }
-
           p.hide = !p.hide;
      };
@@ -125 +131 @@
           }
           $(ctarget).click(function() {
+               if (p.user_pref && set_user_pref) {
+                    if (p.hide ^ p.reverse_user_pref) {
+                         jQuery.post('services.php', 
+                              {'f':'setSectionFold','section':p.user_pref,'value':1,xd_check: dotclear.nonce},
+                              function(data) {});
+                    } else {
+                         jQuery.post('services.php', 
+                              {'f':'setSectionFold','section':p.user_pref,'value':0,xd_check: dotclear.nonce},
+                              function(data) {});
+                    }
+                    jQuery.cookie(p.user_pref,'',{expires: -1});
+               }
                toggle(i,p.speed);
                return false;
@@ -348 +366 @@
      }
      $('#blog-menu h3:first').toggleWithLegend($('#blog-menu ul:first'),
-          $.extend({cookie:'dc_blog_menu'},menu_settings)
+          $.extend({user_pref:'dc_blog_menu'},menu_settings)
      );
      $('#system-menu h3:first').toggleWithLegend($('#system-menu ul:first'),
-          $.extend({cookie:'dc_system_menu'},menu_settings)
+          $.extend({user_pref:'dc_system_menu'},menu_settings)
      );
      $('#plugins-menu h3:first').toggleWithLegend($('#plugins-menu ul:first'),
-          $.extend({cookie:'dc_plugins_menu'},menu_settings)
+          $.extend({user_pref:'dc_plugins_menu'},menu_settings)
      );
      $('#favorites-menu h3:first').toggleWithLegend($('#favorites-menu ul:first'),
-          $.extend({cookie:'dc_favorites_menu',hide:false,reverse_cookie:true},menu_settings)
+          $.extend({user_pref:'dc_favorites_menu',hide:false,reverse_user_pref:true},menu_settings)
      );
 

admin/media.php

@@ -231 +231 @@
 $core->auth->user_prefs->addWorkspace('interface');
 $user_ui_enhanceduploader = $core->auth->user_prefs->interface->enhanceduploader;
-
 
 if (!isset($core->media)) {
@@ -343 +342 @@
 if ($core_media_writable)
 {
-     echo '<div class="two-cols">';
+     echo 
+     '<h3>'.sprintf(__('In %s:'),($d == '' ? '“'.__('Media manager').'”' : '“'.$d.'”')).'</h3>'.
+     '<div class="media-action-box">';
      
      if ($user_ui_enhanceduploader) {
           echo
-          '<div class="col enhanced_uploader">';
+          '<div class="enhanced_uploader">';
      } else {
           echo
-          '<div class="col">';
-     }
-
-     echo
-     '<div class="fieldset">'.
-     '<h3>'.__('Add files').'</h3>'.
+          '<div>';
+     }
+
+     echo
+     '<h4>'.__('Add files').'</h4>'.
      '<p>'.__('Please take care to publish media that you own and that are not protected by copyright.').'</p>'.
      '<p class="max-sizer form-note info">&nbsp;'.__('Maximum file size allowed:').' '.files::size(DC_MAX_UPLOAD_SIZE).'</p>'.
@@ -391 +391 @@
      '<p style="clear:both;">'.form::hidden(array('d'),$d).'</p>'.
      '</form>'.
-     '</div></div>';
-
-     echo
-     '<div class="col">'.
-     '<form class="clear fieldset" action="'.html::escapeURL($page_url).'" method="post">'.
+     '</div>'.
+     '</div>';
+
+     echo
+     '<div class="media-action-box">'.
+     '<form action="'.html::escapeURL($page_url).'" method="post">'.
      '<div id="new-dir-f">'.
-     '<h3>'.__('New directory').'</h3>'.
+     '<h4>'.__('Create new directory').'</h4>'.
      $core->formNonce().
      '<p><label for="newdir">'.__('Directory Name:').'</label>'.
@@ -404 +405 @@
      form::hidden(array('d'),html::escapeHTML($d)).'</p>'.
      '</div>'.
-     '</form></div>';
-     
-     echo '</div>';
-}
+     '</form>'.
+     '</div>';
+     }
 
 # Empty remove form (for javascript actions)
 echo
-'<form id="media-remove-hide" action="'.html::escapeURL($page_url).'" method="post"><div class="clear">'.
+'<form id="media-remove-hide" action="'.html::escapeURL($page_url).'" method="post" class="hidden">'.
+'<div>'.
 form::hidden('rmyes',1).form::hidden('d',html::escapeHTML($d)).
 form::hidden('remove','').
 $core->formNonce().
-'</div></form>';
+'</div>'.
+'</form>';
 
 # Get zip directory
@@ -422 +424 @@
 {
      echo
-     '<p class="zip-dl"><a class="submit" href="'.html::escapeURL($page_url).'&amp;zipdl=1">'.
-     __('Download this directory as a zip file').'</a></p>';
+     '<div class="media-action-box">'.
+     '<h4>'.__('Backup content').'</h4>'.
+     '<p>'.__('Compress this directory with its content as a zip file and download it.').'</p>'.
+     '<p><a class="submit" href="'.html::escapeURL($page_url).'&amp;zipdl=1">'.
+     __('Download').'</a></p>'.
+     '</div>';
 }
 

admin/post.php

@@ -518 +518 @@
           "post_excerpt" =>
                '<p class="area" id="excerpt-area"><label for="post_excerpt">'.__('Excerpt:').'<span class="form-note">'.
-               __('Add an introduction to the post.').'</span></label> '.
+               __('Introduction to the post.').'</span></label> '.
                form::textarea('post_excerpt',50,5,html::escapeHTML($post_excerpt)).
                '</p>',
@@ -530 +530 @@
           "post_notes" =>
                '<p class="area" id="notes-area"><label for="post_notes">'.__('Personal notes:').'<span class="form-note">'.
-               __('Add unpublished notes.').'</span></label>'.
+               __('Unpublished notes.').'</span></label>'.
                form::textarea('post_notes',50,5,html::escapeHTML($post_notes)).
                '</p>'

admin/services.php

@@ -26 +26 @@
 $core->rest->addFunction('setPostMeta',array('dcRestMethods','setPostMeta'));
 $core->rest->addFunction('searchMeta',array('dcRestMethods','searchMeta'));
+$core->rest->addFunction('setSectionFold',array('dcRestMethods','setSectionFold'));
 
 $core->rest->serve();
@@ -412 +413 @@
           return $rsp;
      }
+     
+     public static function setSectionFold($core,$get,$post)
+     {
+          if (empty($post['section'])) {
+               throw new Exception('No section name');
+          }
+          if ($core->auth->user_prefs->toggles === null) {
+               $core->auth->user_prefs->addWorkspace('toggles');
+          }
+          $section = $post['section'];
+          $status = isset($post['value']) && ($post['value'] != 0);
+          if ($core->auth->user_prefs->toggles->prefExists('unfolded_sections')) {
+               $toggles = explode(',',trim($core->auth->user_prefs->toggles->unfolded_sections));
+          } else {
+               $toggles = array();
+          }
+          $k = array_search($section,$toggles);
+          if ($status) { // true == Fold section ==> remove it from unfolded list
+               if ($k !== false) {
+                    unset($toggles[$k]);
+               } 
+          } else { // false == unfold section ==> add it to unfolded list
+               if ($k === false) {
+                    $toggles[]=$section;
+               }; 
+          }
+          $core->auth->user_prefs->toggles->put('unfolded_sections',join(',',$toggles));
+          return true;
+     }
+          
+     
 }
 ?>

admin/style/default.css

@@ -797 +797 @@
      border: none;
 }
-.media-item {
+.media-item, .media-action-box {
      position: relative;
      border: 1px solid #ccc;
@@ -803 +803 @@
      padding: 1em;
      width: 300px;
-     height: 120px;
      display: inline-block;
      vertical-align: top;
-}
-div.media-list .media-item {
+     min-height: 120px
 }
 a.media-icon {
@@ -905 +903 @@
      margin-left: 0;
 }
+/* in blog_pref */
+.user-perm {
+     margin: 2em 0px;
+     background: transparent url(user.png) no-repeat left top;
+     width: 320px;
+     display: inline-block;
+     vertical-align: top;
+}
+.user-perm h4, .user-perm h5, .user-perm p, .user-perm ul, .user-perm li {
+     margin: .5em 0 .33em;
+     padding: 0;
+}
+.user-perm h4 {
+     padding-left: 28px;
+}
+.user-perm ul {
+     list-style-type: inside;
+}
+.user-perm li {
+     margin-left: 1em;
+     padding-left: 0;
+}
+.user-perm h5 {
+     margin:   1em 0 0 0;
+}
+li.user_super, li.user_admin {
+     margin-left: 0;
+     padding-left: 1em;
+     list-style: none;
+     background: transparent url(../images/superadmin.png) no-repeat -2px 2px;
+}
+li.user_admin {
+     background-image: url(../images/admin.png);
+}
+
 /* -------------------------------------------------------------------- Themes */
 #themes {
@@ -1162 +1195 @@
 .success a {
      color: #666;
+}
+.dc-update {
+     padding: 1em 48px 0.5em 48px;
+     margin-bottom: 1em;
+     border-radius: 8px;
+     background: #A2CBE9 url(msg-success.png) no-repeat .7em .7em;
+}
+.dc-update a {
+     color: #000;
+     border-color: #000;
+     margin-right: 1em;
+}
+a.info {
+     margin-left: 2em;
+     font-weight: bold;
 }
 /* ------------------------------------------------------------------ navigation */

admin/style/jsToolBar/jsToolBar.css

@@ -48 +48 @@
      width: 12em;
      margin-right: .6rem;
+     border: 1px solid #ccc; 
 }
 .jstElements button {
@@ -71 +72 @@
      background: #dfdfdf;
 }
-
-.jstSpacer {
-     width : 2px;
+span.jstSpacer {
+     width : 6px;
      height: 28px;
      margin-right: 0;

inc/admin/lib.dc.page.php

@@ -114 +114 @@
           echo
           self::jsCommon().
+          self::jsToggles().
           $head;
 
@@ -253 +254 @@
           echo
           self::jsCommon().
+          self::jsToggles().
           $head;
 
@@ -444 +446 @@
      }
 
+     public static function jsToggles()
+     {
+          if($GLOBALS['core']->auth->user_prefs->toggles) {
+               $unfolded_sections = explode(',',$GLOBALS['core']->auth->user_prefs->toggles->unfolded_sections);
+               foreach ($unfolded_sections as $k=>&$v) {
+                    if ($v == '') {
+                         unset($unfolded_sections[$k]);
+                    } else {
+                         $v = "'".html::escapeJS($v)."':true";
+                    }
+               }
+          } else {
+               $unfolded_sections=array();
+          }
+          return '<script type="text/javascript">'."\n".
+                         "//<![CDATA[\n".
+                         'dotclear.unfolded_sections = {'.join(",",$unfolded_sections)."};\n".
+                         "\n//]]>\n".
+                    "</script>\n";
+     }
+     
      public static function jsCommon()
      {
@@ -544 +567 @@
           self::jsVar('dotclear.msg.load_enhanced_uploader',
                __('Loading enhanced uploader, please wait.')).
-          "\n//]]>\n".
+               "\n//]]>\n".
           "</script>\n";
      }
@@ -792 +815 @@
 }
 
+public static function jsToolMan()
+{
+     return
+     '<script type="text/javascript" src="js/tool-man/core.js"></script>'.
+     '<script type="text/javascript" src="js/tool-man/events.js"></script>'.
+     '<script type="text/javascript" src="js/tool-man/css.js"></script>'.
+     '<script type="text/javascript" src="js/tool-man/coordinates.js"></script>'.
+     '<script type="text/javascript" src="js/tool-man/drag.js"></script>'.
+     '<script type="text/javascript" src="js/tool-man/dragsort.js"></script>'.
+     '<script type="text/javascript" src="js/dragsort-tablerows.js"></script>';
+}
+
 public static function jsMetaEditor()
 {

inc/core/class.dc.blog.php

@@ -199 +199 @@
      /**
      Updates comments and trackbacks counters in post table. Should be called
-     every time comments or trackbacks are added, removed or changed there status.
+     every time comments or trackbacks are added, removed or changed their status.
      
      @param    ids       <b>mixed</b>        Comment(s) ID(s)
@@ -1880 +1880 @@
      - cat_id: (integer or array) Get comments belonging to entries of given category ID
      - comment_id: (integer) Get comment with given ID
+     - comment_site: (string) Get comments with given comment_site
      - comment_status: (integer) Get comments with given comment_status
      - comment_trackback: (integer) Get only comments (0) or trackbacks (1)
@@ -1969 +1970 @@
           if (isset($params['comment_id']) && $params['comment_id'] !== '') {
                $strReq .= 'AND comment_id = '.(integer) $params['comment_id'].' ';
+          }
+          
+          if (isset($params['comment_site'])) {
+               $comment_site = $this->con->escape(str_replace('*','%',$params['comment_site']));
+               $strReq .= "AND comment_site LIKE '".$comment_site."' ";
           }
           

inc/core/class.dc.core.php

@@ -345 +345 @@
      }
      
-     public function setPostType($type,$admin_url,$public_url)
+     public function setPostType($type,$admin_url,$public_url,$label='')
      {
           $this->post_types[$type] = array(
                'admin_url' => $admin_url,
-               'public_url' => $public_url
+               'public_url' => $public_url,
+               'label' => ($label != '' ? $label : $type)
           );
      }
@@ -817 +818 @@
           $strReq =
           'SELECT U.user_id AS user_id, user_super, user_name, user_firstname, '.
-          'user_displayname, permissions '.
+          'user_displayname, user_email, permissions '.
           'FROM '.$this->prefix.'user U '.
           'JOIN '.$this->prefix.'permissions P ON U.user_id = P.user_id '.
@@ -826 +827 @@
                'UNION '.
                'SELECT U.user_id AS user_id, user_super, user_name, user_firstname, '.
-               "user_displayname, NULL AS permissions ".
+               "user_displayname, user_email, NULL AS permissions ".
                'FROM '.$this->prefix.'user U '.
                'WHERE user_super = 1 ';
@@ -841 +842 @@
                     'firstname' => $rs->user_firstname,
                     'displayname' => $rs->user_displayname,
+                    'email' => $rs->user_email,
                     'super' => (boolean) $rs->user_super,
                     'p' => $this->auth->parsePermissions($rs->permissions)

inc/core/class.dc.trackback.php

@@ -14 +14 @@
 /**
 @ingroup DC_CORE
-@brief Trackbacks sender and server
-
-Sends and receives trackbacks. Also handles trackbacks auto discovery.
+@brief Trackbacks/Pingbacks sender and server
+
+Sends and receives trackbacks/pingbacks. Also handles trackbacks/pingbacks auto discovery.
 */
 class dcTrackback
@@ -146 +146 @@
      }
      //@}
+     
+     private function pingAlreadyDone($post_id, $from_url)
+     {
+          $params = array(
+               'post_id' => $post_id,
+               'comment_site' => $from_url,
+               'comment_trackback' => 1,
+          );
+          
+          $rs = $this->core->blog->getComments($params, true);
+          if ($rs && !$rs->isEmpty()) {
+               return ($rs->f(0));
+          }
+          
+          return false;
+     }
+     
+     private function addBacklink($post_id, $url, $blog_name, $title, $excerpt, &$comment)
+     {
+          if (empty($blog_name)) {
+               $blog_name = 'Anonymous blog';
+          }
+          
+          $comment =
+          "<!-- TB -->\n".
+          '<p><strong>'.($title ? $title : $blog_name)."</strong></p>\n".
+          '<p>'.$excerpt.'</p>';
+          
+          $cur = $this->core->con->openCursor($this->core->prefix.'comment');
+          $cur->comment_author = (string) $blog_name;
+          $cur->comment_site = (string) $url;
+          $cur->comment_content = (string) $comment;
+          $cur->post_id = $post_id;
+          $cur->comment_trackback = 1;
+          $cur->comment_status = $this->core->blog->settings->system->trackbacks_pub ? 1 : -1;
+          $cur->comment_ip = http::realIP();
+          
+          # --BEHAVIOR-- publicBeforeTrackbackCreate
+          $this->core->callBehavior('publicBeforeTrackbackCreate',$cur);
+          if ($cur->post_id) {
+               $comment_id = $this->core->blog->addComment($cur);
+               
+               # --BEHAVIOR-- publicAfterTrackbackCreate
+               $this->core->callBehavior('publicAfterTrackbackCreate',$cur,$comment_id);
+          }
+     }
      
      /// @name Receive trackbacks
@@ -176 +222 @@
           $charset = '';
           $comment = '';
-          
+                    
           $err = false;
           $msg = '';
@@ -209 +255 @@
                     $msg = 'Trackbacks are not allowed for this post or weblog.';
                }
+
+               $url = trim(html::clean($url));
+               if ($this->pingAlreadyDone($post->post_id, $url)) {
+                    $err = true;
+                    $msg = 'The trackback has already been registered';
+               }
           }
           
@@ -216 +268 @@
                
                if (!$charset) {
-                    $charset = mb_detect_encoding($title.' '.$excerpt.' '.$blog_name,
-                    'UTF-8,ISO-8859-1,ISO-8859-2,ISO-8859-3,'.
-                    'ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,'.
-                    'ISO-8859-9,ISO-8859-10,ISO-8859-13,ISO-8859-14,ISO-8859-15');
+                    $charset = self::detectCharset($title.' '.$excerpt.' '.$blog_name);
                }
                
@@ -244 +293 @@
                $blog_name = text::cutString($blog_name,60);
                
-               $url = trim(html::clean($url));
-               
-               if (!$blog_name) {
-                    $blog_name = 'Anonymous blog';
-               }
-               
-               $comment =
-               "<!-- TB -->\n".
-               '<p><strong>'.($title ? $title : $blog_name)."</strong></p>\n".
-               '<p>'.$excerpt.'</p>';
-               
-               $cur = $this->core->con->openCursor($this->core->prefix.'comment');
-               $cur->comment_author = (string) $blog_name;
-               $cur->comment_site = (string) $url;
-               $cur->comment_content = (string) $comment;
-               $cur->post_id = $post_id;
-               $cur->comment_trackback = 1;
-               $cur->comment_status = $this->core->blog->settings->system->trackbacks_pub ? 1 : -1;
-               $cur->comment_ip = http::realIP();
-               
                try
                {
-                    # --BEHAVIOR-- publicBeforeTrackbackCreate
-                    $this->core->callBehavior('publicBeforeTrackbackCreate',$cur);
-                    if ($cur->post_id) {
-                         $comment_id = $this->core->blog->addComment($cur);
-                         
-                         # --BEHAVIOR-- publicAfterTrackbackCreate
-                         $this->core->callBehavior('publicAfterTrackbackCreate',$cur,$comment_id);
-                    }
+                    $this->addBacklink($post_id, $url, $blog_name, $title, $excerpt, $comment);
                }
                catch (Exception $e)
@@ -281 +303 @@
                }
           }
-          
-          
-          $debug_trace =
-          "  <debug>\n".
-          '    <title>'.$title."</title>\n".
-          '    <excerpt>'.$excerpt."</excerpt>\n".
-          '    <url>'.$url."</url>\n".
-          '    <blog_name>'.$blog_name."</blog_name>\n".
-          '    <charset>'.$charset."</charset>\n".
-          '    <comment>'.$comment."</comment>\n".
-          "  </debug>\n";
           
           $resp =
@@ -303 +314 @@
           
           if (!empty($_POST['__debug'])) {
-               $resp .= $debug_trace;
+               $resp .= 
+               "  <debug>\n".
+               '    <title>'.$title."</title>\n".
+               '    <excerpt>'.$excerpt."</excerpt>\n".
+               '    <url>'.$url."</url>\n".
+               '    <blog_name>'.$blog_name."</blog_name>\n".
+               '    <charset>'.$charset."</charset>\n".
+               '    <comment>'.$comment."</comment>\n".
+               "  </debug>\n";
           }
           
@@ -362 +381 @@
           }
 
+          if ($this->pingAlreadyDone($posts->post_id, $from_url)) {
+               throw new Exception(__('Don\'t repeat yourself, please.'), 48);
+          }
+          
           # OK. We've found our champion. Time to check the remote part.
           try {
@@ -381 +404 @@
                $remote_content = $http->getContent();
 
-               $charset = mb_detect_encoding($remote_content,
-                    'UTF-8,ISO-8859-1,ISO-8859-2,ISO-8859-3,'.
-                    'ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,'.
-                    'ISO-8859-9,ISO-8859-10,ISO-8859-13,ISO-8859-14,ISO-8859-15');
-
+               $charset = self::getCharsetFromRequest($http->getHeader('content-type'));
+
+               if (!$charset) {
+                    $charset = self::detectCharset($remote_content);
+               }
+               
                if (strtolower($charset) != 'utf-8') {
                     $remote_content = iconv($charset,'UTF-8',$remote_content);
@@ -416 +440 @@
                }
                if ($excerpt) {
-                    $excerpt = '(&#8230;) '.text::cutString(html::escapeHTML($excerpt),255).' (&#8230;)';
+                    $excerpt = '(&#8230;) '.text::cutString(html::escapeHTML($excerpt),200).' (&#8230;)';
                }
                else {
-                    $excerpt = '(??)';
-               }
-
-               $comment =
-               "<!-- TB -->\n".
-               '<p><strong>'.$title."</strong></p>\n".
-               '<p>'.$excerpt.'</p>';
-               
-               $cur = $this->core->con->openCursor($this->core->prefix.'comment');
-               $cur->comment_author = 'Anonymous blog';
-               $cur->comment_site = (string) $from_url;
-               $cur->comment_content = (string) $comment;
-               $cur->post_id = $posts->post_id;
-               $cur->comment_trackback = 1;
-               $cur->comment_status = $this->core->blog->settings->system->trackbacks_pub ? 1 : -1;
-               $cur->comment_ip = http::realIP();
-               
-               # --BEHAVIOR-- publicBeforeTrackbackCreate
-               $this->core->callBehavior('publicBeforeTrackbackCreate',$cur);
-               if ($cur->post_id) {
-                    $comment_id = $this->core->blog->addComment($cur);
-                    
-                    # --BEHAVIOR-- publicAfterTrackbackCreate
-                    $this->core->callBehavior('publicAfterTrackbackCreate',$cur,$comment_id);
-               }
+                    $excerpt = '(&#8230;)';
+               }
+
+               $this->addBacklink($posts->post_id, $from_url, '', $title, $excerpt, $comment);
           }
           catch (Exception $e) {
@@ -464 +467 @@
      }
      
-     private static function getCharsetFromRequest()
-     {
-          if (isset($_SERVER['CONTENT_TYPE']))
-          {
-               if (preg_match('|charset=([a-zA-Z0-9-]+)|',$_SERVER['CONTENT_TYPE'],$m)) {
+     private static function getCharsetFromRequest($header = '')
+     {
+          if (!$header && isset($_SERVER['CONTENT_TYPE'])) {
+               $header = $_SERVER['CONTENT_TYPE'];
+          }
+          
+          if ($header) {
+               if (preg_match('|charset=([a-zA-Z0-9-]+)|',$header,$m)) {
                     return $m[1];
                }
@@ -475 +481 @@
           return null;
      }
-     
+
+     private static function detectCharset($string)
+     {
+          return mb_detect_encoding($remote_content,
+                    'UTF-8,ISO-8859-1,ISO-8859-2,ISO-8859-3,'.
+                    'ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,'.
+                    'ISO-8859-9,ISO-8859-10,ISO-8859-13,ISO-8859-14,ISO-8859-15');
+     }
+          
      /// @name Trackbacks auto discovery
      //@{

inc/core/class.dc.xmlrpc.php

@@ -1644 +1644 @@
                throw new Exception(__('No valid source URL provided? Try again!'), 0);
           }
-          
+
+          if (!(filter_var($to_url, FILTER_VALIDATE_URL) && preg_match('!^https?://!',$to_url))) {
+               throw new Exception(__('No valid target URL provided? Try again!'), 0);
+          }
+
+          if (html::sanitizeURL(urldecode($from_url)) == html::sanitizeURL(urldecode($to_url))) {
+               throw new Exception(__('LOL!'), 0);
+          }
+          
+          # Time to get things done...
           $this->setBlog(true);
           $tb = new dcTrackback($this->core);

inc/prepend.php

@@ -220 +220 @@
 $core->url->register('xmlrpc','xmlrpc','^xmlrpc/(.+)$',array('dcUrlHandlers','xmlrpc'));
 
-$core->setPostType('post','post.php?id=%d',$core->url->getURLFor('post','%s'));
+$core->setPostType('post','post.php?id=%d',$core->url->getURLFor('post','%s'),'Posts');
 
 # Store upload_max_filesize in bytes

locales/fr/main.po

@@ -3038 +3038 @@
 msgstr "Billet précédent"
 
-msgid "Add an introduction to the post."
-msgstr "Ajoute une introduction au billet."
-
-msgid "Add unpublished notes."
-msgstr "Ajoute des notes non publiées."
+msgid "Introduction to the post."
+msgstr "Introduction au billet."
+
+msgid "Unpublished notes."
+msgstr "Notes non publiées."
 
 msgid "Edit basename:"
@@ -3286 +3286 @@
 msgstr "Modifier le %1$s de %2$s"
 
-msgid "Backup"
-msgstr "Sauvegarde"
+msgid "Backup content"
+msgstr "Sauvegarder le contenu"
+
+msgid "Create new directory"
+msgstr "Créer un répertoire"
+
+msgid "In %s:"
+msgstr "Dans %s :"
+
+msgid "Download"
+msgstr "Télécharger"
+
+msgid "Compress this directory with its content as a zip file and download it."
+msgstr "Compressez ce dossier et son contenu dans un fichier zip et téléchargez-le."
+
+msgid "Permissions:"
+msgstr "Permissions :"
+
+msgid "Publications on this blog:"
+msgstr "Publications sur ce blog :"
+
+msgid "Posts"
+msgstr "Billets"
+
+msgid "%1$s: %2$s"
+msgstr "%1$s : %2$s"

locales/fr/plugins.po

@@ -1987 +1987 @@
 msgid "Drag widgets here to remove them from this sidebar."
 msgstr "Glisser les widgets ici pour les retirer du volet."
+
+msgid "Pages"
+msgstr "Pages"

plugins/attachments/js/post.js

@@ -1 +1 @@
 $(function() {
      $('h5.s-attachments').toggleWithLegend($('.s-attachments').not('h5'),{
-          cookie: 'dcx_attachments',
+          user_pref: 'dcx_attachments',
           legend_click: true
      });

plugins/pages/_prepend.php

@@ -17 +17 @@
 $core->url->register('pagespreview','pagespreview','^pagespreview/(.+)$',array('urlPages','pagespreview'));
 
-$core->setPostType('page','plugin.php?p=pages&act=page&id=%d',$core->url->getURLFor('pages','%s'));
+$core->setPostType('page','plugin.php?p=pages&act=page&id=%d',$core->url->getURLFor('pages','%s'),'Pages');
 
 # We should put this as settings later

plugins/pings/post.js

@@ -13 +13 @@
           }
           $('h5.ping-services').toggleWithLegend($('p.ping-services'),{
-               cookie: 'dcx_ping_services',
+               user_pref: 'dcx_ping_services',
                legend_click: true
           });

plugins/tags/js/post.js

@@ -60 +60 @@
 
      $('h5 .s-tags').toggleWithLegend($('.s-tags').not('label'),{
-          cookie: 'post_tags',
+          user_pref: 'post_tags',
           legend_clik: true
      });