Changeset 2190

Timestamp:

04/15/10 00:32:13 (13 years ago)

Author:

JcDenis

Message:

kUtRL 0.3:

• Added DC 2.2 compatibility (new settings)
• Added semi-custom hash on kUtRL service
• Added status update for Twitter/Identi?.ca on new short link
• Added services error management (first step)
• Added options to widgets
• Upgraded bitly service to v3
• Changed admin design

Location:

plugins/kUtRL

Files:

• _admin.php (modified) (16 diffs)
• _define.php (modified) (2 diffs)
• _install.php (modified) (4 diffs)
• _prepend.php (modified) (2 diffs)
• _public.php (modified) (12 diffs)
• _uninstall.php (modified) (1 diff)
• _widgets.php (modified) (5 diffs)
• inc/index.link.php (added)
• inc/index.links.php (added)
• inc/index.service.php (added)
• inc/index.setting.php (added)
• inc/lib.dc.twitter.php (added)
• inc/lib.kutrl.activityreport.php (modified) (2 diffs)
• inc/lib.kutrl.index.list.php (deleted)
• inc/lib.kutrl.log.php (modified) (4 diffs)
• inc/lib.kutrl.srv.php (modified) (5 diffs)
• inc/lib.wiki.kutrl.php (modified) (5 diffs)
• inc/patch.dcminiurl.php (modified) (1 diff)
• inc/services/class.bilbolinks.service.php (modified) (4 diffs)
• inc/services/class.bitly.service.php (modified) (5 diffs)
• inc/services/class.isgd.service.php (modified) (3 diffs)
• inc/services/class.local.service.php (modified) (8 diffs)
• inc/services/class.shortto.service.php (modified) (3 diffs)
• inc/services/class.trim.service.php (modified) (7 diffs)
• index.php (modified) (2 diffs)
• js (added)
• js/admin.js (added)
• js/main.js (added)
• js/service.js (added)
• js/setting.js (added)
• locales/fr/main.lang.php (modified) (2 diffs)
• locales/fr/main.po (modified) (5 diffs)
• release.txt (modified) (1 diff)

plugins/kUtRL/_admin.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -17 +17 @@
 # Plugin menu
 $_menu['Plugins']->addItem(
-     __('kUtRL'),
+     __('Links shortener'),
      'plugin.php?p=kUtRL','index.php?pf=kUtRL/icon.png',
      preg_match('/plugin.php\?p=kUtRL(&.*)?$/',$_SERVER['REQUEST_URI']),
@@ -23 +23 @@
 );
 
+$s = kutrlSettings($core);
+
 # Admin behaviors
-if ($core->blog->settings->kutrl_active)
+if ($s->kutrl_active)
 {
+     $core->addBehavior('adminPostHeaders',array('adminKutrl','adminPostHeaders'));
      $core->addBehavior('adminPostFormSidebar',array('adminKutrl','adminPostFormSidebar'));
      $core->addBehavior('adminAfterPostUpdate',array('adminKutrl','adminAfterPostUpdate')); // update existing short url
@@ -36 +39 @@
 
 # Import/export
-if ($core->blog->settings->kutrl_extend_importexport)
+if ($s->kutrl_extend_importexport)
 {
      $core->addBehavior('exportFull',array('backupKutrl','exportFull'));
@@ -48 +51 @@
 class adminKutrl
 {
+     public static function adminPostHeaders()
+     {
+          return dcPage::jsLoad('index.php?pf=kUtRL/js/admin.js');
+     }
+
      public static function adminPostFormSidebar($post)
      {
           global $core;
-
-          $_active = (boolean) $core->blog->settings->kutrl_active;
-          $_admin = (string) $core->blog->settings->kutrl_admin_service;
-          $_limit_to_blog = (boolean) $core->blog->settings->kutrl_limit_to_blog;
-
-          if (!$_active || !$_admin) return;
-          if (!isset($core->kutrlServices[$_admin])) return;
-
-          try
-          {
-               $kut = new $core->kutrlServices[$_admin]($core,$_limit_to_blog);
-          }
-          catch (Exception $e)
-          {
+          $s = kutrlSettings($core);
+
+          if (!$s->kutrl_active || !$s->kutrl_admin_service
+           || !isset($core->kutrlServices[$s->kutrl_admin_service])) return;
+
+          try {
+               $kut = new $core->kutrlServices[$s->kutrl_admin_service]($core,$s->kutrl_limit_to_blog);
+          }
+          catch (Exception $e) {
                return;
           }
@@ -80 +83 @@
 
           echo 
-          '<h3 class="clear">'.__('Short link').'</h3>'.
+          '<h3 id="kutrl-form-title" class="clear">'.__('Short link').'</h3>'.
+          '<div id="kutrl-form-content">'.
           form::hidden(array('kutrl_old_post_url'),$post_url);
 
           if (!$rs)
           {
-               if (empty($_POST['kutrl_old_post_url']) && $core->blog->settings->kutrl_admin_entry_default)
+               if (empty($_POST['kutrl_old_post_url']) && $s->kutrl_admin_entry_default)
                {
                     $chk = true;
@@ -94 +98 @@
                }
                echo 
-               '<p><label class="classic">'.form::checkbox('kutrl_create',1,$chk,'',3).' '.
+               '<p><label class="classic">'.
+               form::checkbox('kutrl_create',1,$chk,'',3).' '.
                __('Create short link').'</label></p>';
                
@@ -101 +106 @@
                     echo 
                     '<p class="classic">'.
-                    '<label for="custom">'.__('Custom short link:').'</label>'.
-                    form::field('kutrl_create_custom',32,32,'').
-                    '</p>';
-               }
+                    '<label for="custom">'.__('Custom short link:').' '.
+                    form::field('kutrl_create_custom',32,32,'',3).
+                    '</label></p>';
+               }
+               echo
+               '<p><label class="classic">'.
+               form::checkbox('kutrl_twit_send',1,0,'',3).' '.
+               __('Send to Twitter status').'</label></p>';
           }
           else
@@ -124 +133 @@
 
                echo 
-               '<p><label class="classic">'.form::checkbox('kutrl_delete',1,!empty($_POST['kutrl_delete']),'',3).' '.
+               '<p><label class="classic">'.
+               form::checkbox('kutrl_delete',1,!empty($_POST['kutrl_delete']),'',3).' '.
                __('delete short link').'</label></p>'.
                '<p><a href="'.$href.'" '.'title="'.$title.'">'.$href.'</a></p>';
           }
+          echo '</div>';
      }
 
@@ -133 +144 @@
      {
           global $core;
+          $s = kutrlSettings($core);
 
           # Create: see adminAfterPostCreate
-          if (!empty($_POST['kutrl_create'])) return;
-
-          $_active = (boolean) $core->blog->settings->kutrl_active;
-          $_admin = (string) $core->blog->settings->kutrl_admin_service;
-          $_limit_to_blog = (boolean) $core->blog->settings->kutrl_limit_to_blog;
-
-          if (!$_active || !$_admin) return;
-          if (!isset($core->kutrlServices[$_admin])) return;
-
-          try
-          {
-               $kut = new $core->kutrlServices[$_admin]($core,$_limit_to_blog);
-          }
-          catch (Exception $e)
-          {
+          if (!empty($_POST['kutrl_create'])
+           || !$s->kutrl_active || !$s->kutrl_admin_service 
+           || !isset($core->kutrlServices[$s->kutrl_admin_service])) return;
+
+          try {
+               $kut = new $core->kutrlServices[$s->kutrl_admin_service]($core,$s->kutrl_limit_to_blog);
+          }
+          catch (Exception $e) {
                return;
           }
@@ -177 +182 @@
                $kut->remove($old_post_url);
 
-               $kut->hash($new_post_url,$custom); // better to update (not yet implemented)
+               $rs = $kut->hash($new_post_url,$custom); // better to update (not yet implemented)
+
+               # Send new url by libDcTwitter
+               if (!empty($rs) && !empty($_POST['kutrl_twit_send'])) {
+                    $twit = libDcTwitter::getMessage('kUtRL');
+                    $twit = str_replace(
+                         array('%L','%B','%U'),
+                         array($rs['url'],$core->blog->name,$core->auth->getInfo('user_cn'))
+                         ,$twit
+                    );
+                    libDcTwitter::sendMessage('kUtRL',$twit);
+               }
           }
      }
@@ -184 +200 @@
      {
           global $core;
-
-          if (empty($_POST['kutrl_create'])) return;
-
-          $_active = (boolean) $core->blog->settings->kutrl_active;
-          $_admin = (string) $core->blog->settings->kutrl_admin_service;
-          $_limit_to_blog = (boolean) $core->blog->settings->kutrl_limit_to_blog;
-
-          if (!$_active || !$_admin) return;
-          if (!isset($core->kutrlServices[$_admin])) return;
-
-          try
-          {
-               $kut = new $core->kutrlServices[$_admin]($core,$_limit_to_blog);
-          }
-          catch (Exception $e)
-          {
+          $s = kutrlSettings($core);
+
+          if (empty($_POST['kutrl_create']) 
+           || !$s->kutrl_active || !$s->kutrl_admin_service 
+           || !isset($core->kutrlServices[$s->kutrl_admin_service])) return;
+
+          try {
+               $kut = new $core->kutrlServices[$s->kutrl_admin_service]($core,$s->kutrl_limit_to_blog);
+          }
+          catch (Exception $e) {
                return;
           }
@@ -210 +220 @@
                $_POST['kutrl_create_custom'] : null;
 
-          $kut->hash($rs->getURL(),$custom);
+          $rs = $kut->hash($rs->getURL(),$custom);
+
+          # Send new url by libDcTwitter
+          if (!empty($rs) && !empty($_POST['kutrl_twit_send'])) {
+               $twit = libDcTwitter::getMessage('kUtRL');
+               $twit = str_replace(
+                    array('%L','%B','%U'),
+                    array($rs['url'],$core->blog->name,$core->auth->getInfo('user_cn'))
+                    ,$twit
+               );
+               libDcTwitter::sendMessage('kUtRL',$twit);
+          }
      }
 
@@ -216 +237 @@
      {
           global $core;
-
-          $_active = (boolean) $core->blog->settings->kutrl_active;
-          $_admin = (string) $core->blog->settings->kutrl_admin_service;
-          $_limit_to_blog = (boolean) $core->blog->settings->kutrl_limit_to_blog;
-
-          if (!$_active || !$_admin) return;
-          if (!isset($core->kutrlServices[$_admin])) return;
-
-          try
-          {
-               $kut = new $core->kutrlServices[$_admin]($core,$_limit_to_blog);
-          }
-          catch (Exception $e)
-          {
+          $s = kutrlSettings($core);
+
+          if (!$s->kutrl_active || !$s->kutrl_admin_service 
+           || !isset($core->kutrlServices[$s->kutrl_admin_service])) return;
+
+          try {
+               $kut = new $core->kutrlServices[$s->kutrl_admin_service]($core,$s->kutrl_limit_to_blog);
+          }
+          catch (Exception $e) {
                return;
           }
@@ -243 +259 @@
      {
           global $core;
-
-          $_active = (boolean) $core->blog->settings->kutrl_active;
-          $_admin = (string) $core->blog->settings->kutrl_admin_service;
-          $_auth_check = $core->auth->check('admin',$core->blog->id);
-
-          if (!$_active || !$_admin || !$_auth_check) return;
-          if (!isset($core->kutrlServices[$_admin])) return;
-
-          $args[0][__('create short link')] = 'kutrl_create';
-          $args[0][__('delete short link')] = 'kutrl_delete';
+          $s = kutrlSettings($core);
+
+          if (!$s->kutrl_active || !$s->kutrl_admin_service
+           || !$core->auth->check('admin',$core->blog->id) 
+           || !isset($core->kutrlServices[$s->kutrl_admin_service])) return;
+
+          $args[0][__('kUtRL')][__('create short link')] = 'kutrl_create';
+          $args[0][__('kUtRL')][__('delete short link')] = 'kutrl_delete';
      }
 
@@ -260 +274 @@
            && $action != 'kutrl_delete') return;
 
-
-          $_active = (boolean) $core->blog->settings->kutrl_active;
-          $_admin = (string) $core->blog->settings->kutrl_admin_service;
-          $_limit_to_blog = (boolean) $core->blog->settings->kutrl_limit_to_blog;
-
-          if (!$_active || !$_admin) return;
-          if (!isset($core->kutrlServices[$_admin])) return;
-
-          try
-          {
-               $kut = new $core->kutrlServices[$_admin]($core,$_limit_to_blog);
-          }
-          catch (Exception $e)
-          {
+          $s = kutrlSettings($core);
+
+          if (!$s->kutrl_active || !$s->kutrl_admin_service 
+           || !isset($core->kutrlServices[$s->kutrl_admin_service])) return;
+
+          try {
+               $kut = new $core->kutrlServices[$s->kutrl_admin_service]($core,$s->kutrl_limit_to_blog);
+          }
+          catch (Exception $e) {
                return;
           }

plugins/kUtRL/_define.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -17 +17 @@
      /* Description*/         "Use, create and serve short url on your blog",
      /* Author */             "JC Denis",
-     /* Version */            '0.2',
+     /* Version */            '0.3',
      /* Permissions */        'admin'
 );
-     /* date */          #20091223
+     /* date */          #20100414
 ?>

plugins/kUtRL/_install.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -28 +28 @@
           throw new Exception('Plugin called kUtRL requires Dotclear 2.1.6 or higher.');
      }
-     # Check DC version (new settings)
-     if (version_compare(DC_VERSION,'2.2','>='))
-     {
-          throw new Exception('Plugin called kUtRL requires Dotclear up to 2.2.');
-     }
 
      # Table
-     $s = null;
-     $s = new dbStruct($core->con,$core->prefix);
-     $s->kutrl
+     $t = new dbStruct($core->con,$core->prefix);
+     $t->kutrl
           ->kut_id('bigint',0,false)
           ->blog_id('varchar',32,false)
@@ -54 +48 @@
           ->index('idx_kut_type','btree','kut_type');
 
-     $si = new dbStruct($core->con,$core->prefix);
-     $changes = $si->synchronize($s);
+     $ti = new dbStruct($core->con,$core->prefix);
+     $changes = $ti->synchronize($t);
 
      # Settings
-     $s = null;
-     $s =& $core->blog->settings;
-     $s->setNameSpace('kUtRL');
+     $s = kutrlSettings($core);
      $s->put('kutrl_active',false,'boolean','Enabled kutrl plugin',false,true);
      $s->put('kutrl_admin_service','local','string','Service to use to shorten links on admin',false,true);
      $s->put('kutrl_tpl_service','local','string','Service to use to shorten links on template',false,true);
-     $s->put('kutrl_wiki_service','','string','Service to use to shorten links on contents',false,true);
+     $s->put('kutrl_wiki_service','local','string','Service to use to shorten links on contents',false,true);
      $s->put('kutrl_limit_to_blog',false,'boolean','Limited short url to current blog\'s url',false,true);
      $s->put('kutrl_tpl_passive',true,'boolean','Template return long url if kutrl is unactivate',false,true);
@@ -81 +73 @@
      # Settings for "bilbolinks" service
      $s->put('kutrl_srv_bilbolinks_base','http://tux-pla.net/','string','URL of bilbolinks service',false,true);
-     $s->setNameSpace('system');
+     # Twitter settings
+     $s->put('kutrl_twit_msg','%B : %U (from kUtRL)','string','Twit message to post',false,true);
+     $s->put('kutrl_twit_onadmin',true,'boolean','Post twit on new link on administration form',false,true);
+     $s->put('kutrl_twit_onpublic',false,'boolean','Post twit on new link on public form',false,true);
+     $s->put('kutrl_twit_ontpl',false,'boolean','Post twit on new link on templates',false,true);
+     $s->put('kutrl_twit_onwiki',false,'boolean','Post twit on new link on wiki synthax',false,true);
+     
 
      # Version

plugins/kUtRL/_prepend.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -49 +49 @@
 $core->url->register('kutrl','go','^go(/(.*?)|)$',array('urlKutrl','redirectUrl'));
 
+# Generic Dotclear class for Twitter and Identi.ca
+if (array_key_exists('libDcTwitter',$__autoload))  {
+     $r = new ReflectionClass(dirname(__FILE__).'/inc/lib.dc.twitter.php');
+     if (version_compare(libDcTwitter::VERSION, $r->VERSION,'<')) {
+          $__autoload['libDcTwitter'] = dirname(__FILE__).'/inc/lib.dc.twitter.php';
+     }
+     unset($r);
+} else {
+     $__autoload['libDcTwitter'] = dirname(__FILE__).'/inc/lib.dc.twitter.php';
+}
+
+# DC 2.1.6 vs 2.2 settings
+function kutrlSettings($core,$namespace='kUtRL')
+{
+     if (!version_compare(DC_VERSION,'2.1.6','<=')) { 
+          $core->blog->settings->addNamespace($namespace); 
+          return $core->blog->settings->{$namespace}; 
+     } else { 
+          $core->blog->settings->setNamespace($namespace); 
+          return $core->blog->settings; 
+     }
+}
+
 # Add kUtRL events on plugin activityReport
-if ($core->blog->settings->kutrl_extend_activityreport && defined('ACTIVITY_REPORT'))
+if (kutrlSettings($core)->kutrl_extend_activityreport && defined('ACTIVITY_REPORT'))
 {
      require_once dirname(__FILE__).'/inc/lib.kutrl.activityreport.php';

plugins/kUtRL/_public.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -45 +45 @@
      {
           global $core, $_ctx;
-
-          $_active = (boolean) $core->blog->settings->kutrl_active;
-          $_limit_to_blog = (boolean) $core->blog->settings->kutrl_limit_to_blog;
-
-          if (!$_active)
+          $s = kutrlSettings($core);
+
+          if (!$s->kutrl_active)
           {
                self::p404();
@@ -61 +59 @@
           }
 
-          $args = $m[3];
+          $args = isset($m[3]) ? $m[3] : '';
           $_ctx->kutrl_msg = '';
           $_ctx->kutrl_hmf = hmfKutrl::create();
           $_ctx->kutrl_hmfp = hmfKutrl::protect($_ctx->kutrl_hmf);
 
-          $kut = new $core->kutrlServices['local']($core,$_limit_to_blog);
+          $kut = new $core->kutrlServices['local']($core,$s->kutrl_limit_to_blog);
 
           if ($m[1] == '/')
@@ -102 +100 @@
      {
           global $core, $_ctx;
-
-          $_active = (boolean) $core->blog->settings->kutrl_active;
-          $_public = (boolean) $core->blog->settings->kutrl_srv_local_public;
-          $_limit_to_blog = (boolean) $core->blog->settings->kutrl_limit_to_blog;
-
-          if (!$_active || !$_public)
+          $s = kutrlSettings($core);
+
+          if (!$s->kutrl_active || !$s->kutrl_srv_local_public)
           {
                self::p404();
@@ -164 +159 @@
                if (!$err)
                {
-                    if ($_limit_to_blog && !$kut->isBlogUrl($url))
+                    if ($s->kutrl_limit_to_blog && !$kut->isBlogUrl($url))
                     {
                          $err = true;
@@ -212 +207 @@
                          );
                          $core->blog->triggerBlog();
+                         
+                         if ($s->kutrl_twit_onpublic) {
+                              # Send new url by libDcTwitter
+                              $twit = libDcTwitter::getMessage('kUtRL');
+                              $twit = str_replace(array('%L','%B','%U'),array($new_url,$core->blog->name,__('public')),$twit);
+                              libDcTwitter::sendMessage('kUtRL',$twit);
+                         }
                     }
                }
@@ -224 +226 @@
      {
           global $_ctx;
-
-          $_active = (boolean) $core->blog->settings->kutrl_active;
-          $_tpl_service = (string) $core->blog->settings->kutrl_tpl_service;
-          $_limit_to_blog = (boolean) $core->blog->settings->kutrl_limit_to_blog;
-
-          #Passive : all kutrl tag return long url
-          $_ctx->kutrl_passive = (boolean) $core->blog->settings->kutrl_tpl_passive;
-
-          if (!$_active || !$_tpl_service) return;
-          if (!isset($core->kutrlServices[$_tpl_service])) return;
-
-          $_ctx->kutrl = new $core->kutrlServices[$_tpl_service]($core,$_limit_to_blog);
+          $s = kutrlSettings($core);
+
+          # Passive : all kutrl tag return long url
+          $_ctx->kutrl_passive = (boolean) $s->kutrl_tpl_passive;
+          # Twitter feature when auto create short link on template
+          $_ctx->kutrl_twit_ontpl = (boolean) $s->kutrl_twit_ontpl;
+
+          if (!$s->kutrl_active || !$s->kutrl_tpl_service) return;
+          if (!isset($core->kutrlServices[$s->kutrl_tpl_service])) return;
+
+          $_ctx->kutrl = new $core->kutrlServices[$s->kutrl_tpl_service]($core,$s->kutrl_limit_to_blog);
      }
 
      public static function publicHeadContent($core)
      {
-          $s = $core->blog->settings->kutrl_srv_local_css;
-          if ($s)
+          $s = kutrlSettings($core);
+          $css = $s->kutrl_srv_local_css;
+          if ($css)
           {
                echo 
                "\n<!-- CSS for kUtRL --> \n".
                "<style type=\"text/css\"> \n".
-               html::escapeHTML($s)."\n".
+               html::escapeHTML($css)."\n".
                "</style>\n";
           }
@@ -267 +269 @@
           {
                $sign = (boolean) $attr['is_active'] ? '' : '!';
-               $if[] = $sign.'$core->blog->settings->kutrl_srv_local_public';
+               $if[] = $sign.'$s->kutrl_srv_local_public';
+          }
+
+          if (empty($if))
+          {
+               return $content;
+          }
+
+          return 
+          "<?php \$s = kutrlSettings(\$core); ".
+          "if(".implode(' '.$operator.' ',$if).") : ?>\n".
+          $content.
+          "<?php endif; unset(\$s);?>\n";
+     }
+
+     public static function pageMsgIf($attr,$content)
+     {
+          $operator = isset($attr['operator']) ? self::getOperator($attr['operator']) : '&&';
+
+          if (isset($attr['has_message']))
+          {
+               $sign = (boolean) $attr['has_message'] ? '!' : '=';
+               $if[] = '"" '.$sign.'= $_ctx->kutrl_msg';
           }
 
@@ -281 +305 @@
      }
 
-     public static function pageMsgIf($attr,$content)
-     {
-          $operator = isset($attr['operator']) ? self::getOperator($attr['operator']) : '&&';
-
-          if (isset($attr['has_message']))
-          {
-               $sign = (boolean) $attr['has_message'] ? '!' : '=';
-               $if[] = '"" '.$sign.'= $_ctx->kutrl_msg';
-          }
-
-          if (empty($if))
-          {
-               return $content;
-          }
-
-          return 
-          "<?php if(".implode(' '.$operator.' ',$if).") : ?>\n".
-          $content.
-          "<?php endif; ?>\n";
-     }
-
      public static function pageMsg($attr)
      {
@@ -309 +312 @@
      public static function humanField($attr)
      {
-          return "<?php echo sprintf(__('Write \"%s\" in next field to see if you are not a robot:'),\$_ctx->kutrl_hmf); ?>";
+          return "<?php echo sprintf(__('Rewrite \"%s\" in next field to show that you are not a robot:'),\$_ctx->kutrl_hmf); ?>";
      }
 
@@ -423 +426 @@
           " if (false !== (\$kutrl_rs = \$_ctx->kutrl->hash(".$str."))) { ".
           "  echo ".sprintf($f,'$_ctx->kutrl->url_base.$kutrl_rs->hash')."; ".
+          
+          # Send new url by libDcTwitter
+          "if (\$_ctx->kutrl_twit_ontpl) { ".
+           "\$twit = libDcTwitter::getMessage('kUtRL'); ".
+           "\$twit = str_replace(array('%L','%B','%U'),array(\$_ctx->kutrl->url_base.\$kutrl_rs->hash,\$core->blog->name,__('public')),\$twit); ".
+           "libDcTwitter::sendMessage('kUtRL',\$twit); ";
+           " unset(\$twit); ".
+          "} \n".
+
           " } \n".
           " unset(\$kutrl_rs); \n".
@@ -446 +458 @@
 class hmfKutrl
 {
-     public static $chars = 'abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNPQRSTUVWXYZ123456789';
+     public static $chars = 'abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789';
 
      public static function create($len=6)

plugins/kUtRL/_uninstall.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 

plugins/kUtRL/_widgets.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -33 +33 @@
      public static function adminRank($w)
      {
-          $w->create('rankkutrl',__('Top mini links'),
+          $w->create('rankkutrl',__('Top of short links'),
                array('widgetKutrl','publicRank')
           );
           $w->rankkutrl->setting('title',
-               __('Title:'),__('Top mini links'),'text'
+               __('Title:'),__('Top of short links'),'text'
           );
           $w->rankkutrl->setting('text',
-               __('Text:'),'%rank% - %url% - %counttext%','text'
+               __('Text: (Use wildcard %rank%, %hash%, %url%, %count%, %counttext%)'),'%rank% - %url% - %counttext%','text'
           );
           $w->rankkutrl->setting('urllen',
-               __('Link length (if truncate)'),20
+               __('URL length (if truncate)'),20,'text'
           );
           $w->rankkutrl->setting('type',
                __('Type:'),'all','combo',array(
                     __('All') => '-',
-                    __('Mini URL') => 'normal',
-                    __('Custom URL')=>'custom'
+                    __('Mini URL') => 'localnormal',
+                    __('Custom URL') => 'localcustom',
+                    __('Semi-custom') => 'localmix'
+               )
+          );
+          $w->rankkutrl->setting('mixprefix',
+               __('Semi-custom prefix: (only if you want limit to a particular prefix)'),
+               '','text'
+          );
+          $w->rankkutrl->setting('sortby',
+               __('Sort by:'),'kut_counter','combo',array(
+                    __('Date') => 'kut_dt',
+                    __('Rank') => 'kut_counter',
+                    __('Hash') => 'kut_hash'
                )
           );
@@ -72 +84 @@
      {
           global $core;
+          $s = kutrlSettings($core);
 
-          if ($w->homeonly && $core->url->type != 'default') return;
-
-          if (!$core->blog->settings->kutrl_active 
-           || !$core->blog->settings->kutrl_srv_local_public) return;
+          if (!$s->kutrl_active 
+           || !$s->kutrl_srv_local_public 
+           || !$w->homeonly && $core->url->type != 'default') return;
 
           $hmf = hmfKutrl::create();
@@ -91 +103 @@
           '</label></p>'.
           '<p><label>'.
-           sprintf(__('Write "%s" in next field to see if you are not a robot:'),$hmf).'<br />'.
+           sprintf(__('Rewrite \"%s\" in next field to show that you are not a robot:'),$hmf).'<br />'.
            form::field('hmf',20,255,'').
           '</label></p>'.
@@ -105 +117 @@
      {
           global $core;
+          $s = kutrlSettings($core);
 
-          if ($w->homeonly && $core->url->type != 'default') return;
+          if (!$s->kutrl_active 
+           || $w->homeonly && $core->url->type != 'default') return;
 
-          if (!$core->blog->settings->kutrl_active) return;
-
-          if ($w->type == 'normal')
-          {
-               $type = "AND kut_type ='".$core->con->escape('localnormal')."' ";
-          }
-          elseif ($w->type == 'custom')
-          {
-               $type = "AND kut_type ='".$core->con->escape('localcustom')."' ";
-          }
-          else
-          {
-               $type = "AND kut_type ".$core->con->in(array('localnormal','localcustom'))." ";
-          }
+          $type = in_array($w->type,array('localnormal','localmix','localcustom')) ?
+               "AND kut_type ='".$w->type."' " :
+               "AND kut_type ".$core->con->in(array('localnormal','localmix','localcustom'))." ";
 
           $hide = (boolean) $w->hideempty ? 'AND kut_counter > 0 ' : '';
 
+          $more = '';
+          if ($w->type == 'localmix' && '' != $w->mixprefix) {
+               $more = "AND kut_hash LIKE '".$core->con->escape($w->mixprefix)."%' ";
+          }
+
+          $order = ($w->sortby && in_array($w->sortby,array('kut_dt','kut_counter','kut_hash'))) ? 
+               $w->sortby.' ' : 'kut_dt ';
+
+          $order .= $w->sort == 'desc' ? 'DESC' : 'ASC';
+
+          $limit = $core->con->limit(abs((integer) $w->limit));
+
           $rs = $core->con->select(
-          'SELECT kut_counter, kut_hash '.
-          "FROM ".$core->prefix."kutrl ".
-          "WHERE blog_id='".$core->con->escape($core->blog->id)."' ".
-          "AND kut_service = 'local' ".
-          $type.$hide.
-          'ORDER BY kut_counter '.($w->sort == 'asc' ? 'ASC' : 'DESC').',kut_hash ASC '.
-          $core->con->limit(abs((integer) $w->limit)));
+               'SELECT kut_counter, kut_hash '.
+               "FROM ".$core->prefix."kutrl ".
+               "WHERE blog_id='".$core->con->escape($core->blog->id)."' ".
+               "AND kut_service = 'local' ".
+               $type.$hide.$more.'ORDER BY '.$order.$limit
+          );
 
           if ($rs->isEmpty()) return;

plugins/kUtRL/inc/lib.kutrl.activityreport.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -11 +11 @@
 # -- END LICENSE BLOCK ------------------------------------
 
+# This file is used with plugin activityReport
+
 if (!defined('DC_RC_PATH')){return;}
 
-# This file is used with plugin activityReport
 $core->activityReport->addGroup('kutrl',__('Plugin kUtRL'));
 

plugins/kUtRL/inc/lib.kutrl.log.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -11 +11 @@
 # -- END LICENSE BLOCK ------------------------------------
 
+# This file contents class to acces local short links records
+
 class kutrlLog
 {
@@ -38 +40 @@
           $this->con->writeLock($this->table);
 
-          $cur->kut_id = $this->nextId();
-          $cur->blog_id = $this->blog;
-          $cur->kut_url = (string) $url;
-          $cur->kut_hash = (string) $hash;
-          $cur->kut_type = (string) $type;
-          $cur->kut_service = (string) $service;
-          $cur->kut_dt = date('Y-m-d H:i:s');
-          $cur->kut_counter = 0;
-
-          $cur->insert();
-          $this->con->unlock();
-
-          return array(
-               'url' => $url,
-               'hash' => $hash,
-               'type' => $type,
-               'service' => $service,
-               'counter '=> 0
-          );
+          try {
+               $cur->kut_id = $this->nextId();
+               $cur->blog_id = $this->blog;
+               $cur->kut_url = (string) $url;
+               $cur->kut_hash = (string) $hash;
+               $cur->kut_type = (string) $type;
+               $cur->kut_service = (string) $service;
+               $cur->kut_dt = date('Y-m-d H:i:s');
+               $cur->kut_counter = 0;
+
+               $cur->insert();
+               $this->con->unlock();
+
+               return array(
+                    'id' => $cur->kut_id,
+                    'url' => $url,
+                    'hash' => $hash,
+                    'type' => $type,
+                    'service' => $service,
+                    'counter '=> 0
+               );
+          }
+          catch (Exception $e)
+          {
+               $this->con->unlock();
+               throw $e;
+          }
+          return false;
      }
 
      public function select($url=null,$hash=null,$type=null,$service='kutrl')
      {
-          $this->con->writeLock($this->table);
+          //$this->con->writeLock($this->table);
 
           $req = 
@@ -67 +78 @@
           'kut_type as type, kut_service as service, kut_counter as counter '.
           'FROM '.$this->table.' '.
-          "WHERE blog_id='".$this->blog."' ".
-          "AND kut_service='".$this->con->escape($service)."' ";
+          "WHERE blog_id = '".$this->blog."' ".
+          "AND kut_service = '".$this->con->escape($service)."' ";
 
           if (null !== $url)
-               $req .= "AND kut_url='".$this->con->escape($url)."' ";
+               $req .= "AND kut_url = '".$this->con->escape($url)."' ";
 
           if (null !== $hash)
-               $req .= "AND kut_hash='".$this->con->escape($hash)."' ";
-          
-          if (null !== $type && is_array($type))
-               $req .= "AND kut_type '".$this->con->in($type)."' ";
-
-          if (null !== $type && is_string($type))
-               $req .= "AND kut_type='".$this->con->escape($type)."' ";
+               $req .= "AND kut_hash = '".$this->con->escape($hash)."' ";
+
+          if (null !== $type) {
+               if (is_array($type)) {
+                    $req .= "AND kut_type '".$this->con->in($type)."' ";
+               }
+               else {
+                    $req .= "AND kut_type = '".$this->con->escape($type)."' ";
+               }
+          }
 
           $req .= 'ORDER BY kut_dt DESC '.$this->con->limit(1);
 
           $rs = $this->con->select($req);
-          $this->con->unlock();
+          //$this->con->unlock();
 
           return $rs->isEmpty() ? false : $rs;

plugins/kUtRL/inc/lib.kutrl.srv.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -11 +11 @@
 # -- END LICENSE BLOCK ------------------------------------
 
+# This file contents parent class of shorten link services 
+
 class kutrlServices
 {
      public $core;
+     public $error;
      public $s;
      public $log;
@@ -29 +32 @@
      {
           $this->core = $core;
-          $this->s =& $core->blog->settings;
+          $this->s = kutrlSettings($core);
           $this->log = new kutrlLog($core);
           $this->limit_to_blog = (boolean) $limit_to_blog;
+          $this->error = new dcError();
+          $this->error->setHTMLFormat('%s',"%s\n");
      }
 
@@ -100 +105 @@
      }
 
+     # Test if an custom short url is know
+     public function isKnowHash($hash)
+     {
+          return $this->log->select(null,$hash,$this->id,'kutrl');
+     }
+
      # Create hash from url
      public function hash($url,$hash=null)
@@ -121 +132 @@
           }
           if ($this->limit_to_blog && !$this->isBlogUrl($url))
+          {
+               return false;
+          }
+          if ($hash && false !== ($rs = $this->isKnowHash($hash)))
           {
                return false;

plugins/kUtRL/inc/lib.wiki.kutrl.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -10 +10 @@
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # -- END LICENSE BLOCK ------------------------------------
+
+# This file contents class to shorten url pass through wiki
 
 if (!defined('DC_RC_PATH')){return;}
@@ -18 +20 @@
      {
           global $core;
+          $s = kutrlSettings($core);
 
-          $_active = (boolean) $core->blog->settings->kutrl_active;
-          $_wiki_service = (string) $core->blog->settings->kutrl_wiki_service;
-          $_limit_to_blog = (boolean) $core->blog->settings->kutrl_limit_to_blog;
+          # Do nothing on comment preview and post preview
+          if (!empty($_POST['preview']) 
+           || !empty($GLOBALS['c_ctx']) && $GLOBALS['c_ctx']->preview) return;
 
-          if (!$_active || !$_wiki_service) return;
+          if (!$s->kutrl_active || !$s->kutrl_wiki_service 
+           || !isset($core->kutrlServices[$s->kutrl_wiki_service])) return;
 
-          if (!isset($core->kutrlServices[$_wiki_service])) return;
-
-          try
-          {
-               $kut = new $core->kutrlServices[$_wiki_service]($core,$_limit_to_blog);
+          try {
+               $kut = new $core->kutrlServices[$s->kutrl_wiki_service]($core,$s->kutrl_limit_to_blog);
           }
-          catch (Exception $e)
-          {
+          catch (Exception $e) {
                return;
           }
@@ -48 +48 @@
      {
           global $core;
+          $s = kutrlSettings($core);
 
-          $_active = (boolean) $core->blog->settings->kutrl_active;
-          $_wiki_service = (string) $core->blog->settings->kutrl_wiki_service;
-          $_limit_to_blog = (boolean) $core->blog->settings->kutrl_limit_to_blog;
+          if (!$s->kutrl_active || !$s->kutrl_wiki_service 
+           || !isset($core->kutrlServices[$s->kutrl_wiki_service])) return;
 
-          if (!$_active || !$_wiki_service) return;
-
-          if (!isset($core->kutrlServices[$_wiki_service])) return;
-
-          try
-          {
-               $kut = new $core->kutrlServices[$_wiki_service]($core,$_limit_to_blog);
+          try {
+               $kut = new $core->kutrlServices[$s->kutrl_wiki_service]($core,$s->kutrl_limit_to_blog);
           }
-          catch (Exception $e)
-          {
+          catch (Exception $e) {
                return array();
           }
@@ -80 +74 @@
                if ($testurl == $content) $res['content'] = $res['url'];
 
+               # Send new url by libDcTwitter
+               if ($s->kutrl_twit_onwiki) {
+                    $user = !defined('DC_CONTEXT_ADMIN') ? __('public') : $core->auth->getInfo('user_cn');
+                    $twit = libDcTwitter::getMessage('kUtRL');
+                    $twit = str_replace(array('%L','%B','%U'),array($res['url'],$core->blog->name,$user),$twit);
+                    libDcTwitter::sendMessage('kUtRL',$twit);
+               }
+
                return $res;
           }

plugins/kUtRL/inc/patch.dcminiurl.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 

plugins/kUtRL/inc/services/class.bilbolinks.service.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -43 +43 @@
           }
 
-          $this->s->setNameSpace('kUtRL');
           $this->s->put('kutrl_srv_bilbolinks_base',$base);
-          $this->s->setNameSpace('system');
      }
 
@@ -62 +60 @@
      public function testService()
      {
-          if (empty($this->url_base)) return false;
+          if (empty($this->url_base))
+          {
+               $this->error->add(__('Service is not well configured.'));
+               return false;
+          }
 
           $arg = array('longurl' => urlencode($this->url_test));
           if (!self::post($this->url_api,$arg,true,true))
           {
+               $this->error->add(__('Service is unavailable.'));
                return false;
           }
@@ -78 +81 @@
           if (!($response = self::post($this->url_api,$arg,true,true)))
           {
+               $this->error->add(__('Service is unavailable.'));
                return false;
           }
           if ($response == 'You are too speed!')
           {
+               $this->error->add(__('Service rate limit exceeded.'));
                return false;
           }

plugins/kUtRL/inc/services/class.bitly.service.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -19 +19 @@
      public $home = 'http://bit.ly';
 
-     private $url_api = 'http://api.bit.ly/';
+     private $url_api = 'http://api.bit.ly/v3/';
      private $args = array(
-          'version' => '2.0.1',
           'format' => 'xml',
           'login' => '',
@@ -42 +41 @@
      public function saveSettings()
      {
-          $this->s->setNameSpace('kUtRL');
           $this->s->put('kutrl_srv_bitly_login',$_POST['kutrl_srv_bitly_login']);
           $this->s->put('kutrl_srv_bitly_apikey',$_POST['kutrl_srv_bitly_apikey']);
           $this->s->put('kutrl_srv_bitly_history',isset($_POST['kutrl_srv_bitly_history']));
-          $this->s->setNameSpace('system');
      }
 
@@ -75 +72 @@
      public function testService()
      {
-          if (empty($this->args['login']) || empty($this->args['apiKey'])) return false;
+          if (empty($this->args['login']) || empty($this->args['apiKey']))
+          {
+               $this->error->add(__('Service is not well configured.'));
+               return false;
+          }
 
           $args = $this->args;
           $args['hash'] = 'WP9vc';
-          if (!($rs = self::post($this->url_api.'info',$args,true)))
+          if (!($response = self::post($this->url_api.'expand',$args,true)))
           {
+               $this->error->add(__('Failed to call service.'));
                return false;
           }
-          $rsp = simplexml_load_string($rs);
-          if ($rsp->errorCode == 203)
-          {
+
+          $rsp = simplexml_load_string($response);
+
+          $err_msg = (string) $rsp->status_txt;
+          if ($err_msg != 'OK') {
+               $err_no = (integer) $rsp->status_code;
+               $this->error->add(sprintf(__('An error occured with code %s and message "%s"'),$err_no,$err_msg));
                return false;
           }
@@ -98 +104 @@
           if (!($response = self::post($this->url_api.'shorten',$args,true)))
           {
+               $this->error->add(__('Failed to call service.'));
                return false;
           }
+
           $rsp = simplexml_load_string($response);
 
-          if (0 != $rsp->errorCode)
-          {
+          $err_msg = (string) $rsp->status_txt;
+          if ($err_msg != 'OK') {
+               $err_no = (integer) $rsp->status_code;
+               $this->error->add(sprintf(__('An error occured with code %s and message "%s"'),$err_no,$err_msg));
                return false;
           }
 
           $rs = new ArrayObject();
-          $rs->hash = (string) $rsp->results->nodeKeyVal->userHash[0]; //!?
-          $rs->url = $url;
+          $rs->hash = (string) $rsp->data[0]->hash;
+          $rs->url = (string) $rsp->data[0]->long_url;
           $rs->type = $this->id;
 

plugins/kUtRL/inc/services/class.isgd.service.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -37 +37 @@
           if (!self::post($this->url_api,$arg,true,true))
           {
+               $this->error->add(__('Service is unavailable.'));
                return false;
           }
@@ -48 +49 @@
           if (!($response = self::post($this->url_api,$arg,true,true)))
           {
+               $this->error->add(__('Service is unavailable.'));
                return false;
           }

plugins/kUtRL/inc/services/class.local.service.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -16 +16 @@
 {
      public $id = 'local';
-     public $name = 'My blog';
+     public $name = 'kUtRL';
      public $home = 'http://kutrl.fr';
 
@@ -23 +23 @@
           parent::__construct($core,$limit_to_blog);
 
-          $protocols = (string) $core->blog->settings->kutrl_srv_local_protocols;
+          $protocols = (string) $this->s->kutrl_srv_local_protocols;
           $this->allowed_protocols = empty($protocols) ? array() : explode(',',$protocols);
           $this->allow_customized_hash = true;
@@ -33 +33 @@
      public function saveSettings()
      {
-          $this->s->setNameSpace('kUtRL');
           $this->s->put('kutrl_srv_local_protocols',$_POST['kutrl_srv_local_protocols']);
           $this->s->put('kutrl_srv_local_public',isset($_POST['kutrl_srv_local_public']));
           $this->s->put('kutrl_srv_local_css',$_POST['kutrl_srv_local_css']);
-          $this->s->setNameSpace('system');
      }
 
@@ -84 +82 @@
      public function testService()
      {
-          return !empty($this->allowed_protocols);
+          if (!empty($this->allowed_protocols))
+          {
+               return true;
+          }
+          else {
+               $this->error->add(__('Service is not well configured.'));
+               return false;
+          }
      }
 
      public function createHash($url,$hash=null)
      {
+          # Create response object
           $rs = new ArrayObject();
           $rs->type = 'local';
           $rs->url = $url;
 
+          # Normal link
           if ($hash === null)
           {
                $type = 'localnormal';
-               $rs->hash = $this->next($this->last());
-          }
-          else
-          {
+               $rs->hash = $this->next($this->last('localnormal'));
+          }
+
+          # Mixed custom link
+          elseif (preg_match('/^([A-Za-z0-9]{2,})!!$/',$hash,$m))
+          {
+               $type = 'localmix';
+               $rs->hash = $m[1].$this->next(-1,$m[1]);
+          }
+
+          # Custom link
+          elseif (preg_match('/^[A-Za-z0-9.-_]{2,}$/',$hash))
+          {
+               if (false !== $this->log->select(null,$hash,null,'local'))
+               {
+                    $this->error->add(__('Custom short link is already taken.'));
+                    return false;
+               }
                $type = 'localcustom';
                $rs->hash = $hash;
           }
 
-          $this->log->insert($rs->url,$rs->hash,$type,$rs->type);
-          return $rs;
-     }
-
-     protected function last()
+          # Wrong char in custom hash
+          else
+          {
+               $this->error->add(__('Custom short link is not valid.'));
+               return false;
+          }
+
+          # Save link
+          try {
+               $this->log->insert($rs->url,$rs->hash,$type,$rs->type);
+               return $rs;
+          }
+          catch (Exception $e)
+          {
+               $this->error->add(__('Failed to save link.'));
+          }
+          return false;
+     }
+
+     protected function last($type)
      {
           return 
-          false === ($rs = $this->log->select(null,null,'localnormal','local')) ?
+          false === ($rs = $this->log->select(null,null,$type,'local')) ?
           -1 : $rs->hash;
      }
 
-     protected function next($last_id)
+     protected function next($last_id,$prefix='')
      {
           if ($last_id == -1)
@@ -141 +177 @@
 
           return 
-          false === ($rs = $this->log->select(null,$next_id,'localnormal','local')) ?
-          $next_id : $this->next($next_id);
+          false === $this->log->select(null,$prefix.$next_id,null,'local') ?
+          $next_id : $this->next($next_id,$prefix);
      }
 
      protected function append($id)
      {
-          for ($x = 0; $x < strlen($id); $x++)
+          $id = str_split($id);
+          for ($x = 0; $x < count($id); $x++)
           {
                $id[$x] = 0;
           }
-          $id .= 0;
-
-          return $id;
+          return implode($id).'0';
      }
 
      protected function increment($id,$pos)
      {
+          $id = str_split($id);
           $char = $id[$pos];
 
@@ -170 +206 @@
           $id[$pos] = $new_char;
           
-          if ($pos != (strlen($id) - 1))
-          {
-               for ($x = ($pos + 1); $x < strlen($id); $x++)
+          if ($pos != (count($id) - 1))
+          {
+               for ($x = ($pos + 1); $x < count($id); $x++)
                {
                     $id[$x] = 0;
@@ -178 +214 @@
           }
 
-          return $id;
+          return implode($id);
      }
 

plugins/kUtRL/inc/services/class.shortto.service.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -37 +37 @@
           if (!self::post($this->url_api,$arg,true,true))
           {
+               $this->error->add(__('Service is unavailable.'));
                return false;
           }
@@ -48 +49 @@
           if (!($response = self::post($this->url_api,$arg,true,true)))
           {
+               $this->error->add(__('Service is unavailable.'));
                return false;
           }

plugins/kUtRL/inc/services/class.trim.service.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -38 +38 @@
      public function saveSettings()
      {
-          $this->s->setNameSpace('kUtRL');
           $this->s->put('kutrl_srv_trim_username',$_POST['kutrl_srv_trim_username']);
           $this->s->put('kutrl_srv_trim_password',$_POST['kutrl_srv_trim_password']);
-          $this->s->setNameSpace('system');
      }
 
@@ -63 +61 @@
      public function testService()
      {
-          if (empty($this->args['username']) || empty($this->args['password'])) return false;
-          if (time() < $this->api_rate_time + 300) return false; // bloc service within 5min on API rate limit
+          if (empty($this->args['username']) || empty($this->args['password']))
+          {
+               $this->error->add(__('Service is not well configured.'));
+               return false;
+          }
+          if (time() < $this->api_rate_time + 300) // bloc service within 5min on API rate limit
+          {
+               $this->error->add(__('Prevent service rate limit.'));
+               return false; 
+          }
 
           if (!($rsp = self::post($this->url_api.'verify.xml',$this->args,true,true)))
           {
+               $this->error->add(__('Service is unavailable.'));
                return false;
           }
@@ -76 +83 @@
                return true;
           }
+          $this->error->add(__('Authentication to service failed.'));
           return false;
      }
@@ -86 +94 @@
           if (!($rsp = self::post($this->url_api.'trim_url.xml',$arg,true,true)))
           {
+               $this->error->add(__('Service is unavailable.'));
                return false;
           }
@@ -94 +103 @@
           if ($r['code'] == 425)
           {
-               $this->s->setNameSpace('kUtRL');
                $this->s->put('kutrl_srv_trim_apiratetime',time());
-               $this->s->setNameSpace('system');
+
+               $this->error->add(__('Service rate limit exceeded.'));
                return false;
           }
@@ -108 +117 @@
                return $rs;
           }
+          $this->error->add(__('Unreadable service response.'));
           return false;
      }

plugins/kUtRL/index.php

@@ -3 +3 @@
 # This file is part of kUtRL, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -13 +13 @@
 if (!defined('DC_CONTEXT_ADMIN')){return;}
 
+# Check user perms
+dcPage::check('admin');
+
 # Settings
-$s =& $core->blog->settings;
-$_active = (boolean) $s->kutrl_active;
-$_admin_service = (string) $s->kutrl_admin_service;
-$_tpl_service = (string) $s->kutrl_tpl_service;
-$_wiki_service = (string) $s->kutrl_wiki_service;
-$_limit_to_blog = (boolean) $s->kutrl_limit_to_blog;
-$_tpl_passive = (boolean) $s->kutrl_tpl_passive;
-$_admin_entry_default = (string) $s->kutrl_admin_entry_default;
+$s = kutrlSettings($core);
 
-# Vars
-$img_green = '<img src="images/check-on.png" alt="ok" />';
-$img_red = '<img src="images/check-off.png" alt="fail" />';
-$default_tab = !$_active ? 'settings' : 'new';
-$default_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : $default_tab;
-$msg = '';
+# Default values
+$show_filters = false;
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
-# List filters and controls and params
-require_once dirname(__FILE__).'/inc/lib.kutrl.index.list.php';
+$header = 
+dcPage::jsLoad('index.php?pf=kUtRL/js/main.js').
+'<script type="text/javascript">'."\n//<![CDATA[\n".
+"jcToolsBox.prototype.text_wait = '".html::escapeJS(__('Please wait'))."';\n".
+"\n//]]>\n</script>\n".
+'<style type="text/css">
+.titleKutrl { margin: -20px; text-align:center; } 
+.titleKutrl a { border:none; text-decoration: none; } 
+</style>';
 
-$show_filters = false;
-$urlsrv = !empty($_GET['urlsrv']) ? $_GET['urlsrv'] : '';
-$sortby = !empty($_GET['sortby']) ? $_GET['sortby'] : 'kut_dt';
-$order = !empty($_GET['order']) ? $_GET['order'] : 'desc';
+$footer = '<hr class="clear"/><p class="right">
+<a class="button" href="'.$p_url.'&amp;part=setting" title="'.__('Configure extension').'">'.__('Settings').'</a> - 
+<a class="button" href="'.$p_url.'&amp;part=service" title="'.__('Configure services').'">'.__('Services').'</a> - 
+kUtRL - '.$core->plugins->moduleInfo('kUtRL','version').'&nbsp;
+<img alt="'.__('kUtRL').'" src="index.php?pf=kUtRL/icon.png" />
+</p>
+ <h2 class="titleKutrl"><a title="kUtRL, '.__('Links shortener').' | http://kutrl.fr" href="http://kutrl.fr">
+ <img alt="kUtRL, '.__('Links shortener').' | http://kutrl.fr" src="index.php?pf=kUtRL/inc/img/kutrl_logo.png" />
+ </a></h2>
+';
 
-$page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1;
-$nb_per_page =  30;
-if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
-     if ($nb_per_page != $_GET['nb']) $show_filters = true;
-     $nb_per_page = (integer) $_GET['nb'];
+# Messages
+$msg = isset($_REQUEST['msg']) ? $_REQUEST['msg'] : '';
+$msg_list = array(
+     'savesetting' => __('Configuration successfully saved'),
+     'saveservice' => __('Services successfully updated'),
+     'createlink' => __('Link successfully shorten'),
+     'deletelinks' => __('Links successfully deleted')
+);
+if (isset($msg_list[$msg])) {
+     $msg = sprintf('<p class="message">%s</p>',$msg_list[$msg]);
 }
 
-# Combos
-$combo_action = array(
-     __('delete short link') => 'kutrl_list_delete'
-);
+# Pages
+$start_part = $s->kutrl_active ? 'links' : 'setting';
+$default_part = isset($_REQUEST['part']) ? $_REQUEST['part'] : $start_part;
 
-$sortby_combo = array(
-     __('Date') => 'kut_dt',
-     __('Long link') => 'kut_url',
-     __('Short link') => 'kut_hash'
-);
+if (!file_exists(dirname(__FILE__).'/inc/index.'.$default_part.'.php')) {
+     $default_part = 'setting';
+}
+include dirname(__FILE__).'/inc/index.'.$default_part.'.php';
 
-$order_combo = array(
-     __('Descending') => 'desc',
-     __('Ascending') => 'asc'
-);
-
-$services_combo = array();
-foreach($core->kutrlServices as $service_id => $service)
-{
-     $o = new $service($core);
-     $services_combo[__($o->name)] = $o->id;
-}
-$ext_services_combo = array_merge(array(__('disabled')=>''),$services_combo);
-$lst_services_combo = array_merge(array('-'=>''),$services_combo);
-
-# Params for list
-$params = array();
-$params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
-
-if ($sortby != '' && in_array($sortby,$sortby_combo))
-{
-     if ($urlsrv != '' && in_array($urlsrv,$lst_services_combo))
-          $params['kut_type'] = $urlsrv;
-
-     if ($order != '' && in_array($order,$order_combo))
-          $params['order'] = $sortby.' '.$order;
-
-     if ($sortby != 'kut_dt' || $order != 'desc' || $urlsrv != '')
-          $show_filters = true;
-}
-
-$pager_base_url = 
-     $p_url.
-     '&amp;tab=list'.
-     '&amp;urlsrv='.$urlsrv.
-     '&amp;sortby='.$sortby.
-     '&amp;order='.$order.
-     '&amp;nb='.$nb_per_page.
-     '&amp;page=%s';
-
-# Delete links from list
-if (isset($_POST['action']) && $_POST['action'] == 'kutrl_list_delete')
-{
-     try
-     {
-          $l = new kutrlLog($core);
-          foreach($_POST['entries'] as $k => $id)
-          {
-               $rs = $l->getLogs(array('kut_id'=>$id));
-               if ($rs->isEmpty()) continue;
-
-               if(!isset($core->kutrlServices[$rs->kut_type])) continue;
-
-               $o = new $core->kutrlServices[$rs->kut_type]($core);
-               $o->remove($rs->kut_url);
-          }
-
-          $core->blog->triggerBlog();
-          http::redirect($p_url.'&tab=list&urlsrv='.$urlsrv.'&sortby='.$sortby.'&order='.$order.'&nb='.$nb_per_page.'&page='.$page.'&updlist=1');
-     }
-     catch (Exception $e)
-     {
-          $core->error->add($e->getMessage());
-     }
-}
-
-# Save settings
-if (!empty($_POST['settings']))
-{
-     try
-     {
-          $_active = isset($_POST['_active']);
-          $_admin_service = $_POST['_admin_service'];
-          $_tpl_service = $_POST['_tpl_service'];
-          $_wiki_service = $_POST['_wiki_service'];
-          $_limit_to_blog = isset($_POST['_limit_to_blog']);
-          $_tpl_passive = isset($_POST['_tpl_passive']);
-          $_admin_entry_default = isset($_POST['_admin_entry_default']);
-
-          $s->setNamespace('kUtRL');
-          $s->put('kutrl_active',$_active);
-          $s->put('kutrl_admin_service',$_admin_service);
-          $s->put('kutrl_tpl_service',$_tpl_service);
-          $s->put('kutrl_wiki_service',$_wiki_service);
-          $s->put('kutrl_limit_to_blog',$_limit_to_blog);
-          $s->put('kutrl_tpl_passive',$_tpl_passive);
-          $s->put('kutrl_admin_entry_default',$_admin_entry_default);
-          $s->setNamespace('system');
-
-          $core->blog->triggerBlog();
-          http::redirect($p_url.'&tab=settings&updsettings=1');
-     }
-     catch (Exception $e)
-     {
-          $core->error->add($e->getMessage());
-     }
-}
-
-# Save services settings
-if (!empty($_POST['services']))
-{
-     try
-     {
-          foreach($core->kutrlServices as $service_id => $service)
-          {
-               $o = new $service($core);
-               $o->saveSettings();
-          }
-          $core->blog->triggerBlog();
-          http::redirect($p_url.'&tab=services&updservices=1');
-     }
-     catch (Exception $e)
-     {
-          $core->error->add($e->getMessage());
-     }
-}
-
-# Create a new link
-if (isset($_POST['str'])) {
-
-     try {
-          if (!isset($core->kutrlServices[$_admin_service]))
-               throw new Exception('Unknow service');
-
-          $kut = new $core->kutrlServices[$_admin_service]($core,$_limit_to_blog);
-
-          $url = trim($core->con->escape($_POST['str']));
-          $hash = empty($_POST['custom']) ? null : $_POST['custom'];
-
-          if (empty($url))
-               throw new Exception(__('There is nothing to shorten.'));
-
-          if (!$kut->testService())
-               throw new Exception(__('Service is not well configured.'));
-
-          if (null !== $hash && !$kut->allow_customized_hash)
-               throw new Exception(__('This service does not allowed custom hash.'));
-
-          if (!$kut->isValidUrl($url))
-               throw new Exception(__('This link is not a valid URL.'));
-
-          if (!$kut->isLongerUrl($url))
-               throw new Exception(__('This link is too short.'));
-
-          if (!$kut->isProtocolUrl($url))
-               throw new Exception(__('This type of link is not allowed.'));
-
-          if ($_limit_to_blog && !$kut->isBlogUrl($url))
-               throw new Exception(__('Short links are limited to this blog URL.'));
-
-          if ($kut->isServiceUrl($url))
-               throw new Exception(__('This link is already a short link.'));
-
-          if (false !== ($rs = $kut->isKnowUrl($url)))
-          {
-               $url = $rs->url;
-               $new_url = $kut->url_base.$rs->hash;
-               $msg = sprintf(__('Short link for %s is %s'),html::escapeHTML($url),'<a href="'.$new_url.'">'.$new_url.'</a>');
-          }
-          else
-          {
-               if (false === ($rs = $kut->hash($url,$hash)))
-               {
-                    throw new Exception(__('Failed to create short link.'));
-               }
-               else
-               {
-                    $url = $rs->url;
-                    $new_url = $kut->url_base.$rs->hash;
-                    $msg = sprintf(__('Short link for %s is %s'),html::escapeHTML($url),'<a href="'.$new_url.'">'.$new_url.'</a>');
-               }
-          }
-     }
-     catch (Exception $e)
-     {
-          $core->error->add($e->getMessage());
-          $tab = 'new';
-     }
-}
-
-try
-{
-     $log = new kutrlLog($core);
-
-     $list_all = $log->getLogs($params);
-     $list_counter = $log->getLogs($params,true)->f(0);
-     $list_current = new kutrlIndexList($core,$list_all,$list_counter,$pager_base_url);
-}
-catch (Exception $e)
-{
-     $core->error->add($e->getMessage());
-}
-
-if (!empty($msg)) $msg = '<p class="message">'.$msg.'</p>';
-$title = 'kUtRL, '.__('Links shortener');
 ?>
-<html>
- <head>
-  <title><?php echo __('kUtRL'); ?></title>
-  <?php echo 
-     dcPage::jsToolBar().
-     dcPage::jsLoad('js/_posts_list.js').
-     dcPage::jsPageTabs($default_tab);
-  ?>
-  <script type="text/javascript">
-    $(function() {
-     <?php
-     foreach($core->kutrlServices as $service_id => $service)
-     {
-          echo "\$('#".$service_id."-options-title').toggleWithLegend(\$('#".$service_id."-options-content'),{cookie:'dcx_kutrl_admin_".$service_id."_options'});\n";
-     }
-     ?>
-    });
-  </script>
-  <style type="text/css">
-  .titleKutrl {
-     margin: -20px;
-     text-align:center;
-  }
-  .titleKutrl a {
-     border:none;
-     text-decoration: none;
-  }
-  </style>
- </head>
- <body>
- <h2><?php echo $title; ?></h2>
-  <?php echo $msg; ?>
-
-  <div class="multi-part" id="new" title="<?php echo __('Shorten link'); ?>">
-  
-  <?php if (!isset($core->kutrlServices[$_admin_service])) { ?>
-  
-     <p><?php echo __('You must set an admin service.'); ?></p>
-     
-  <?php } else { $kut = new $core->kutrlServices[$_admin_service]($core,$_limit_to_blog); ?>
-
-   <form action="plugin.php" method="post">
-
-    <p class="classic"><label for="str">
-     <?php echo __('Long link:'); ?></label>
-     <?php echo form::field('str',100,255,''); ?>
-    </p>
-
-     <?php  if ($kut->allow_customized_hash) { ?>
-
-    <p class="classic"><label for="custom">
-     <?php echo __('Custom short link:'); ?> *</label>
-     <?php echo form::field('custom',50,32,''); ?>
-    </p>
-    <p class="form-note">* 
-     <?php echo __('Only if you want a custom short link.'); ?>
-    </p>
-
-     <?php } ?>
-
-    <p class="classic">
-     <input type="submit" name="submit" id="submit" 
-      value="<?php echo __('Create short link'); ?>" />
-     <?php echo 
-      form::hidden(array('p'),'kUtRL').
-      form::hidden(array('t'),'list').
-      $core->formNonce();
-      ?>
-    </p>
-   </form>
-   
-  <?php } ?>
-  </div>
-
-  <div class="multi-part" id="settings" title="<?php echo __('Settings'); ?>">
-   <form method="post" action="plugin.php">
-
-   <?php 
-   if (isset($_GET['updsettings']))
-     echo '<p class="message">'.__('Configuration successfully updated').'</p>';
-   ?>
-
-    <p><label class="classic"><?php echo
-      form::checkbox(array('_active'),'1',$_active).' '.
-     __('Enable plugin'); ?>
-     </label></p>
-
-    <p><label class="classic"><?php echo
-      form::checkbox(array('_limit_to_blog'),'1',$_limit_to_blog).' '.
-     __('Limit short link to current blog'); ?>
-     </label></p>
-    <p class="form-note">
-      <?php echo __('Only link started with this blog URL could be shortened.'); ?>
-    </p>
-
-    <p><label class="classic"><?php echo
-      form::checkbox(array('_tpl_passive'),'1',$_tpl_passive).' '.
-     __('Passive mode'); ?>
-     </label></p>
-    <p class="form-note">
-      <?php echo __('If this extension is disabled and the passive mode is enabled, "kutrl" tags will display long urls instead of nothing on templates.'); ?>
-    </p>
-
-    <p><label class="classic"><?php echo
-      form::checkbox(array('_admin_entry_default'),'1',$_admin_entry_default).' '.
-     __('Create short link for new entries'); ?>
-     </label></p>
-    <p class="form-note">
-      <?php echo __('This can be changed on page of creation/edition of an entry.'); ?>
-    </p>
-
-    <p><label class="classic">
-      <?php 
-      echo __('Administration:').'<br />';
-     echo form::combo(array('_admin_service'),$services_combo,$_admin_service); ?>
-     </label>
-     </p>
-    <p class="form-note">
-      <?php echo __('Service to use in this admin page.'); ?>
-    </p>
-
-    <p><label class="classic">
-      <?php 
-      echo __('Templates:').'<br />';
-     echo form::combo(array('_tpl_service'),$ext_services_combo,$_tpl_service); ?>
-     </label>
-     </p>
-    <p class="form-note">
-      <?php echo __('Shorten links automatically when using template value like "EntryKutrl".'); ?>
-    </p>
-
-    <p><label class="classic">
-      <?php 
-      echo __('Contents:').'<br />';
-     echo form::combo(array('_wiki_service'),$ext_services_combo,$_wiki_service); ?>
-     </label>
-     </p>
-    <p class="form-note">
-      <?php echo __('Shorten links automatically found in contents using wiki synthax.'); ?>
-    </p>
-
-    <p>
-     <input type="submit" name="settings" value="<?php echo __('Save'); ?>" />
-     <?php echo 
-      form::hidden(array('p'),'kUtRL').
-      form::hidden(array('tab'),'settings').
-      $core->formNonce();
-     ?>
-     </p>
-   </form>
-   
-  </div>
-
-  <div class="multi-part" id="services" title="<?php echo __('Services'); ?>">
-   <form method="post" action="plugin.php">
-   
-   <?php 
-   if (isset($_GET['updservices']))
-     echo '<p class="message">'.__('Configuration successfully updated.').'</p>';
-   ?>
-
-     <?php
-     foreach($core->kutrlServices as $service_id => $service)
-     {
-          $o = new $service($core);
-          
-          echo '<h2 id="'.$service_id.'-options-title">'.$o->name.'</h2>';
-
-          if (isset($_GET['updservices']))
-          {
-               echo '<p><em>'.(
-               $o->testService() ?
-                    $img_green.' '.sprintf(__('%s API is well configured and runing.'),$o->name) :
-                    $img_red.' '.sprintf(__('%s API is not well configured or not online.'),$o->name)
-               ).'</em></p>';
-          }
-          echo '<div id="'.$service_id.'-options-content">';
-
-          if (!empty($o->home))
-          { 
-               echo '<p><a title="'.__('homepage').'" href="'.$o->home.'">'.sprintf(__('Learn more about %s.'),$o->name).'</a></p>';
-          }
-
-          $o->settingsForm();
-
-          echo '</div>';
-     }
-     ?>
-   
-    <p>
-     <input type="submit" name="services" value="<?php echo __('Save'); ?>" />
-     <?php echo 
-      form::hidden(array('p'),'kUtRL').
-      form::hidden(array('tab'),'services').
-      $core->formNonce();
-     ?>
-     </p>
-   </form>
-   </div>
-
-  <div class="multi-part" id="list" title="<?php echo __('Know links'); ?>">
-
-   <?php 
-   if (isset($_GET['updlist']))
-     echo '<p class="message">'.__('List successfully updated.').'</p>';
-   ?>
-
-<?php if (!$show_filters) { 
-   echo dcPage::jsLoad('js/filter-controls.js'); ?>
-   <p>
-    <a id="filter-control" class="form-control" href="#">
-    <?php echo __('Filters'); ?></a>
-   </p>
-<?php } ?>
-
-   <form action="<?php echo $p_url; ?>&amp;tab=list" method="get" id="filters-form">
-    <fieldset><legend><?php echo __('Filters'); ?></legend>
-     <div class="three-cols">
-      <div class="col">
-       <label>
-        <?php echo __('Service:').form::combo('urlsrv',$lst_services_combo,$urlsrv); ?>
-       </label> 
-      </div>
-      <div class="col">
-       <label>
-        <?php echo __('Order by:').form::combo('sortby',$sortby_combo,$sortby); ?>
-       </label> 
-       <label>
-        <?php echo __('Sort:').form::combo('order',$order_combo,$order); ?>
-       </label>
-      </div>
-      <div class="col">
-       <p>
-        <label class="classic">
-         <?php echo form::field('nb',3,3,$nb_per_page).' '.__('Entries per page'); ?>
-        </label> 
-        <input type="submit" value="<?php echo __('filter'); ?>" />
-        <?php echo
-           form::hidden(array('p'),'kUtRL').
-          form::hidden(array('tab'),'list');
-          ?>
-        </p>
-      </div>
-     </div>
-     <br class="clear" />
-    </fieldset>
-   </form>
-   <form action="plugin.php" method="post" id="form-actions">
-    <?php $list_current->display($page,$nb_per_page,$pager_base_url); ?>
-
-     <div class="two-cols">
-     <p class="col checkboxes-helpers"></p>
-     <p class="col right">
-      <?php 
-       echo __('Selected links action:').' '.
-       form::combo(array('action'),$combo_action).
-       '<input type="submit" value="'.__('ok').'" />'.
-       form::hidden(array('urlsrv'),$urlsrv).
-       form::hidden(array('sortby'),$sortby).
-       form::hidden(array('order'),$order).
-       form::hidden(array('page'),$page).
-       form::hidden(array('nb'),$nb_per_page).
-       form::hidden(array('p'),'kUtRL').
-       form::hidden(array('tab'),'list').
-       $core->formNonce();
-      ?>
-     </p>
-    </div>
-   </form>
-  </div>
-  
-  <?php echo dcPage::helpBlock('kUtRL'); ?>
-
-  <hr class="clear"/>
-  <p class="right">
-   kUtRL - <?php echo $core->plugins->moduleInfo('kUtRL','version'); ?>&nbsp;
-   <img alt="kUtRL" src="index.php?pf=kUtRL/icon.png" />
-  </p>
- <h2 class="titleKutrl"><a title="<?php echo $title; ?> | http://kutrl.fr" href="http://kutrl.fr"><img alt="<?php echo $title; ?> | http://kutrl.fr" src="index.php?pf=kUtRL/inc/img/kutrl_logo.png" /></a></h2>
- </body>
-</html>
+?>

plugins/kUtRL/locales/fr/main.lang.php

@@ -1 +1 @@
 <?php
 // Language: français 
-// Module: kUtRL - 0.1.2
-// Date: 2009-12-12 12:48:16 
+// Module: kUtRL - 0.3
+// Date: 2010-04-14 22:23:45 
 // Translated with dcTranslater - 1.3 
 
-#_admin.php:82
-#index.php:55
-$GLOBALS['__l10n']['Short link'] = 'Lien court';
-
-#_admin.php:97
-#index.php:315
-$GLOBALS['__l10n']['Create short link'] = 'Créer un lien court';
-
-#_admin.php:103
-#index.php:304
-$GLOBALS['__l10n']['Custom short link:'] = 'Lien court personnalisé :';
-
-#_admin.php:113
-#_widgets.php:157
-$GLOBALS['__l10n']['never followed'] = 'jamais suivi';
-
-#_admin.php:117
-#_widgets.php:159
-$GLOBALS['__l10n']['followed one time'] = 'suivi une fois';
-
-#_admin.php:121
-#_widgets.php:161
-$GLOBALS['__l10n']['followed %s times'] = 'suivi %s fois';
-
-#_admin.php:127
-#_admin.php:254
-#index.php:49
-$GLOBALS['__l10n']['delete short link'] = 'Effacer un lien court';
-
-#_admin.php:253
-$GLOBALS['__l10n']['create short link'] = 'créer un lien court';
-
-#_public.php:128
-$GLOBALS['__l10n']['Failed to verify protected field.'] = 'Impossible de vérifier le champs de protection.';
-
-#_public.php:136
-#index.php:190
-$GLOBALS['__l10n']['Service is not well configured.'] = 'Le service n\'est pas correctement configuré.';
-
-#_public.php:144
-$GLOBALS['__l10n']['This string is not a valid URL.'] = 'Cette chaine n\'est pas un lien valide.';
-
-#_public.php:152
-#index.php:199
-$GLOBALS['__l10n']['This link is too short.'] = 'Ce lien est trop court.';
-
-#_public.php:160
-#index.php:202
-$GLOBALS['__l10n']['This type of link is not allowed.'] = 'Ce type de lien n\'est pas autorisé.';
-
-#_public.php:169
-#index.php:205
-$GLOBALS['__l10n']['Short links are limited to this blog URL.'] = 'Les liens court sont limité à l\'URL de ce blog.';
-
-#_public.php:177
-#index.php:208
-$GLOBALS['__l10n']['This link is already a short link.'] = 'Ce lien est dèjà un lien court.';
-
-#_public.php:190
-#_public.php:209
-#index.php:214
-#index.php:226
-$GLOBALS['__l10n']['Short link for %s is %s'] = 'Le lien court pour %s est %s';
-
-#_public.php:201
-#index.php:220
-$GLOBALS['__l10n']['Failed to create short link.'] = 'Impossible de créer le lien court.';
-
-#_public.php:311
-#_widgets.php:93
-$GLOBALS['__l10n']['Write "%s" in next field to see if you are not a robot:'] = 'Ecrire "%s" dans le champs suivant :';
-
+#_admin.php:19
 #_widgets.php:22
 #default-templates/kutrl.html:48
-#index.php:251
+#inc/index.link.php:112
+#inc/index.links.php:203
+#inc/index.service.php:42
+#inc/index.setting.php:87
+#index.php:41
+#index.php:42
 $GLOBALS['__l10n']['Links shortener'] = 'Réducteur de liens';
 
+#_admin.php:85
+#inc/index.links.php:118
+$GLOBALS['__l10n']['Short link'] = 'Lien court';
+
+#_admin.php:102
+$GLOBALS['__l10n']['Create short link'] = 'Créer un lien court';
+
+#_admin.php:108
+#inc/index.link.php:136
+$GLOBALS['__l10n']['Custom short link:'] = 'Lien court personnalisé :';
+
+#_admin.php:115
+$GLOBALS['__l10n']['Send to Twitter status'] = 'Envoyer au status Twitter';
+
+#_admin.php:122
+#_widgets.php:171
+$GLOBALS['__l10n']['never followed'] = 'jamais suivi';
+
+#_admin.php:126
+#_widgets.php:173
+$GLOBALS['__l10n']['followed one time'] = 'suivi une fois';
+
+#_admin.php:130
+#_widgets.php:175
+$GLOBALS['__l10n']['followed %s times'] = 'suivi %s fois';
+
+#_admin.php:137
+#_admin.php:268
+$GLOBALS['__l10n']['delete short link'] = 'effacer un lien court';
+
+#_admin.php:267
+$GLOBALS['__l10n']['create short link'] = 'créer un lien court';
+
+#_public.php:123
+$GLOBALS['__l10n']['Failed to verify protected field.'] = 'Impossible de vérifier le champs de protection.';
+
+#_public.php:131
+#inc/index.link.php:38
+#inc/services/class.bilbolinks.service.php:64
+#inc/services/class.bitly.service.php:76
+#inc/services/class.local.service.php:89
+#inc/services/class.trim.service.php:65
+$GLOBALS['__l10n']['Service is not well configured.'] = 'Le service n\'est pas correctement configuré.';
+
+#_public.php:139
+$GLOBALS['__l10n']['This string is not a valid URL.'] = 'Cette chaine n\'est pas un lien valide.';
+
+#_public.php:147
+#inc/index.link.php:47
+$GLOBALS['__l10n']['This link is too short.'] = 'Ce lien est trop court.';
+
+#_public.php:155
+#inc/index.link.php:50
+$GLOBALS['__l10n']['This type of link is not allowed.'] = 'Ce type de lien n\'est pas autorisé.';
+
+#_public.php:164
+#inc/index.link.php:53
+$GLOBALS['__l10n']['Short links are limited to this blog URL.'] = 'Les liens courts sont limités à l\'URL de ce blog.';
+
+#_public.php:172
+#inc/index.link.php:56
+$GLOBALS['__l10n']['This link is already a short link.'] = 'Ce lien est dèjà un lien court.';
+
+#_public.php:185
+#_public.php:204
+#inc/index.link.php:67
+#inc/index.link.php:87
+$GLOBALS['__l10n']['Short link for %s is %s'] = 'Le lien court pour %s est %s';
+
+#_public.php:196
+$GLOBALS['__l10n']['Failed to create short link.'] = 'Impossible de créer le lien court.';
+
+#_public.php:213
+#_public.php:432
+#inc/lib.wiki.kutrl.php:78
+$GLOBALS['__l10n']['public'] = 'publique';
+
+#_public.php:314
+#_widgets.php:105
+$GLOBALS['__l10n']['Rewrite "%s" in next field to show that you are not a robot:'] = 'Recopier "%s" dans le champs suivant pour montrer que vous n\'êtes pas une machine :';
+
 #_widgets.php:26
-#index.php:286
 $GLOBALS['__l10n']['Shorten link'] = 'Réduire un lien';
 
 #_widgets.php:35
 #_widgets.php:39
-$GLOBALS['__l10n']['Top mini links'] = 'Top des mini liens';
+$GLOBALS['__l10n']['Top of short links'] = 'Top des liens courts';
+
+#_widgets.php:42
+$GLOBALS['__l10n']['Text: (Use wildcard %rank%, %hash%, %url%, %count%, %counttext%)'] = 'Texte : (Ustiliser les jokers %rank%, %hash%, %url%, %count%, %counttext%)';
 
 #_widgets.php:45
-$GLOBALS['__l10n']['Link length (if truncate)'] = 'Longueur du lien (si tronqué)';
+$GLOBALS['__l10n']['URL length (if truncate)'] = 'Longueur de l\'URL (si tronqué)';
 
 #_widgets.php:49
@@ -100 +117 @@
 
 #_widgets.php:51
-$GLOBALS['__l10n']['Custom URL'] = 'URL personalisé';
-
-#_widgets.php:61
+$GLOBALS['__l10n']['Custom URL'] = 'URL personnalisé';
+
+#_widgets.php:52
+$GLOBALS['__l10n']['Semi-custom'] = 'Semi-personnalisé';
+
+#_widgets.php:56
+$GLOBALS['__l10n']['Semi-custom prefix: (only if you want limit to a particular prefix)'] = 'Préfixe des liens semi-personnalisé : (Seulement si vous voulez limiter à un préfixe particulier)';
+
+#_widgets.php:60
+$GLOBALS['__l10n']['Sort by:'] = 'Trier par :';
+
+#_widgets.php:62
+$GLOBALS['__l10n']['Rank'] = 'Rang';
+
+#_widgets.php:63
+#inc/index.links.php:34
+$GLOBALS['__l10n']['Hash'] = 'Hash';
+
+#_widgets.php:73
 $GLOBALS['__l10n']['Limit:'] = 'Limite :';
 
-#_widgets.php:64
+#_widgets.php:76
 $GLOBALS['__l10n']['Hide no followed links'] = 'Cacher les liens non suivis';
 
-#_widgets.php:89
+#_widgets.php:101
 #default-templates/kutrl.html:55
-#index.php:297
+#inc/index.link.php:129
 $GLOBALS['__l10n']['Long link:'] = 'Lien long :';
 
-#_widgets.php:96
+#_widgets.php:108
 #default-templates/kutrl.html:62
 $GLOBALS['__l10n']['Create'] = 'Créer';
 
-#inc/lib.kutrl.activityreport.php:16
+#inc/index.link.php:35
+$GLOBALS['__l10n']['There is nothing to shorten.'] = 'I n\'y a rien à réduire.';
+
+#inc/index.link.php:41
+$GLOBALS['__l10n']['This service does not allowed custom hash.'] = 'Ce service n\'accepte pas les liens court personnalisés.';
+
+#inc/index.link.php:44
+$GLOBALS['__l10n']['This link is not a valid URL.'] = 'Ce lien n\'est pas valide.';
+
+#inc/index.link.php:59
+$GLOBALS['__l10n']['This custom short url is already taken.'] = 'Ce lien court personnalisé est déjà pris.';
+
+#inc/index.link.php:79
+$GLOBALS['__l10n']['Failed to create short link. This could be caused by a service failure.'] = 'Impossible de créé un lien court. Ceci peut être causé par un problème du service.';
+
+#inc/index.link.php:116
+#inc/index.links.php:207
+#inc/index.service.php:52
+#inc/index.setting.php:97
+$GLOBALS['__l10n']['New link'] = 'Nouveau lien';
+
+#inc/index.link.php:121
+$GLOBALS['__l10n']['You must set an admin service.'] = 'Vous devez définir un service admin.';
+
+#inc/index.link.php:128
+$GLOBALS['__l10n']['Shorten link using service "%s"'] = 'Raccourcir un lien en utilisant le service "%s"';
+
+#inc/index.link.php:138
+$GLOBALS['__l10n']['Only if you want a custom short link.'] = 'Uniquement si vous souhaitez un lien court personnalisé.';
+
+#inc/index.link.php:142
+$GLOBALS['__l10n']['You can use "bob!!" if you want a semi-custom link, it starts with "bob" and "!!" will be replaced by an increment value.'] = 'Vous pouvez utiliser "bob!!" si vous souhaitez un lien semi-personnalisé, il commencera par "bob" et "!!" sera remplacé par une valeur incrémentale.';
+
+#inc/index.links.php:23
+$GLOBALS['__l10n']['No short link'] = 'Pas de lien court';
+
+#inc/index.links.php:37
+$GLOBALS['__l10n']['Service'] = 'Service';
+
+#inc/index.links.php:117
+$GLOBALS['__l10n']['Long link'] = 'Lien long';
+
+#inc/index.links.php:132
+#inc/index.setting.php:82
+$GLOBALS['__l10n']['disabled'] = 'Désactivé';
+
+#inc/index.links.php:220
+$GLOBALS['__l10n']['Service:'] = 'Service :';
+
+#inc/index.links.php:250
+$GLOBALS['__l10n']['Delete selected short links'] = 'Effacer les liens sélectionnés';
+
+#inc/index.service.php:51
+#index.php:37
+$GLOBALS['__l10n']['Services'] = 'Services';
+
+#inc/index.service.php:66
+$GLOBALS['__l10n']['%s API is well configured and runing.'] = 'L\'API %s est correctement configurée et est fonctionnelle.';
+
+#inc/index.service.php:67
+$GLOBALS['__l10n']['Failed to test %s API.'] = 'Impossible de tester l\'API %s.';
+
+#inc/index.service.php:76
+$GLOBALS['__l10n']['homepage'] = 'page d\'accueil';
+
+#inc/index.service.php:76
+$GLOBALS['__l10n']['Learn more about %s.'] = 'En savoir plus à propos de %s.';
+
+#inc/index.setting.php:96
+#index.php:36
+$GLOBALS['__l10n']['Settings'] = 'Paramètres';
+
+#inc/index.setting.php:101
+$GLOBALS['__l10n']['Plugin activation'] = 'Activation de l\'extension';
+
+#inc/index.setting.php:104
+$GLOBALS['__l10n']['Enable plugin'] = 'Activer l\'extension';
+
+#inc/index.setting.php:107
+$GLOBALS['__l10n']['General rules'] = 'Réglages';
+
+#inc/index.setting.php:110
+$GLOBALS['__l10n']['Limit short link to current blog'] = 'Limiter les liens court à ce blog';
+
+#inc/index.setting.php:111
+$GLOBALS['__l10n']['Only link started with this blog URL could be shortened.'] = 'Uniquement les liens commençant par l\'URL de ce blog pourront être réduits.';
+
+#inc/index.setting.php:114
+$GLOBALS['__l10n']['Passive mode'] = 'Mode passif';
+
+#inc/index.setting.php:115
+$GLOBALS['__l10n']['If this extension is disabled and the passive mode is enabled, "kutrl" tags will display long urls instead of nothing on templates.'] = 'Si cette extension est désactivée et que le mode passif est activé, les balises "kutrl" afficheront les longues URL au lieu de rien.';
+
+#inc/index.setting.php:118
+$GLOBALS['__l10n']['Create short link for new entries'] = 'Créer un lien court pour les nouveaux billets';
+
+#inc/index.setting.php:119
+$GLOBALS['__l10n']['This can be changed on page of creation/edition of an entry.'] = 'Ceci peut être changé sur la page d\'édition / création d\'un billet.';
+
+#inc/index.setting.php:122
+$GLOBALS['__l10n']['Default services'] = 'Services par défaut';
+
+#inc/index.setting.php:128
+$GLOBALS['__l10n']['Administration:'] = 'Administration :';
+
+#inc/index.setting.php:131
+$GLOBALS['__l10n']['Service to use in this admin page and on edit page of an entry.'] = 'Service à utiliser sur cette page d\'administration ou sur la page d\'édition d\'un billet.';
+
+#inc/index.setting.php:137
+$GLOBALS['__l10n']['Templates:'] = 'Templates :';
+
+#inc/index.setting.php:140
+$GLOBALS['__l10n']['Shorten links automatically when using template value like "EntryKutrl".'] = 'Réduit automatiquement les liens des templates utilisant les balises tels que "EntryKutrl".';
+
+#inc/index.setting.php:146
+$GLOBALS['__l10n']['Contents:'] = 'Contenus :';
+
+#inc/index.setting.php:149
+$GLOBALS['__l10n']['Shorten links automatically found in contents using wiki synthax.'] = 'Réduit automatiquement les liens des contenus utilisant la syntax wiki.';
+
+#inc/index.setting.php:159
+$GLOBALS['__l10n']['Use wildcard %L for short URL, %B for blog name, %U for user name.'] = 'Utiliser les jokers %L pour le lien court, %B pour le nom du blog, %U pour l\'utilisateur.';
+
+#inc/index.setting.php:161
+$GLOBALS['__l10n']['Activation'] = 'Activation';
+
+#inc/index.setting.php:162
+$GLOBALS['__l10n']['Send message when short url is created on:'] = 'Envoyer un message lorsqu\'un lien court est créé sur :';
+
+#inc/index.setting.php:165
+$GLOBALS['__l10n']['administration form'] = 'le formulaire de la page d\'administration';
+
+#inc/index.setting.php:168
+$GLOBALS['__l10n']['public form'] = 'le forumlaire publique';
+
+#inc/index.setting.php:171
+$GLOBALS['__l10n']['template'] = 'le thème';
+
+#inc/index.setting.php:174
+$GLOBALS['__l10n']['content'] = 'le contenu';
+
+#inc/lib.dc.twitter.php:169
+$GLOBALS['__l10n']['Twitter account'] = 'Compte Twitter';
+
+#inc/lib.dc.twitter.php:170
+#inc/lib.dc.twitter.php:178
+#inc/services/class.bitly.service.php:51
+#inc/services/class.trim.service.php:47
+$GLOBALS['__l10n']['Login:'] = 'Identifiant :';
+
+#inc/lib.dc.twitter.php:176
+#inc/lib.dc.twitter.php:184
+$GLOBALS['__l10n']['Type a password only to change old one.'] = 'Entrer un mot de passe uniquement pour changer l\'ancien.';
+
+#inc/lib.dc.twitter.php:177
+$GLOBALS['__l10n']['Identi.ca account'] = 'Compte Identi.ca';
+
+#inc/lib.dc.twitter.php:185
+$GLOBALS['__l10n']['Message'] = 'Message';
+
+#inc/lib.dc.twitter.php:301
+$GLOBALS['__l10n']['User is not set.'] = 'L\'utilisateur est pas renseigné.';
+
+#inc/lib.dc.twitter.php:309
+$GLOBALS['__l10n']['Nothing to send.'] = 'Il n\'y a rien à envoyer.';
+
+#inc/lib.dc.twitter.php:333
+$GLOBALS['__l10n']['Failed to send message (%s)'] = 'Impossible d\'envoyer le message (%s)';
+
+#inc/lib.dc.twitter.php:393
+$GLOBALS['__l10n']['Failed to get short url (%s)'] = 'Impossible de récupérer le lien court (%s)';
+
+#inc/lib.dc.twitter.php:399
+$GLOBALS['__l10n']['Failed to get short url'] = 'Impossible de récupérer le lien court';
+
+#inc/lib.kutrl.activityreport.php:17
 $GLOBALS['__l10n']['Plugin kUtRL'] = 'Extension kUtRL';
 
-#inc/lib.kutrl.activityreport.php:22
+#inc/lib.kutrl.activityreport.php:23
 $GLOBALS['__l10n']['Short link creation'] = 'Création de lien court';
 
-#inc/lib.kutrl.activityreport.php:23
+#inc/lib.kutrl.activityreport.php:24
 $GLOBALS['__l10n']['New short link of type "%s" and hash "%s" was created.'] = 'Un nouveau lien court de type "%s" et de hash "%s" a été créé.';
 
-#inc/lib.kutrl.index.list.php:20
-$GLOBALS['__l10n']['No short link'] = 'Pas de lien court';
-
-#inc/lib.kutrl.index.list.php:31
-$GLOBALS['__l10n']['Service'] = 'Service';
-
-#inc/lib.kutrl.index.list.php:32
-$GLOBALS['__l10n']['Hash'] = 'Hash';
-
-#inc/lib.kutrl.srv.php:47
+#inc/lib.kutrl.srv.php:52
 $GLOBALS['__l10n']['There is nothing to configure for this service.'] = 'Il n\'y a rien à configurer pour ce service.';
 
-#inc/lib.wiki.kutrl.php:79
+#inc/lib.wiki.kutrl.php:73
 $GLOBALS['__l10n']['%s (Shorten with %s)'] = '% (réduit avec %s)';
 
-#inc/services/class.bilbolinks.service.php:54
+#inc/services/class.bilbolinks.service.php:52
 $GLOBALS['__l10n']['Url of the service:'] = 'URL du service :';
 
-#inc/services/class.bilbolinks.service.php:58
+#inc/services/class.bilbolinks.service.php:56
 $GLOBALS['__l10n']['This is the root URL of the "bilbolinks" service you want to use. Ex: "http://tux-pla.net/".'] = 'Ceci est l\'URL du service bilbolinks que vous souhaitez utiliser. Ex: "http://tux-pla.net/".';
 
-#inc/services/class.bitly.service.php:54
-#inc/services/class.trim.service.php:49
-$GLOBALS['__l10n']['Login:'] = 'Login :';
-
-#inc/services/class.bitly.service.php:58
+#inc/services/class.bilbolinks.service.php:71
+#inc/services/class.bilbolinks.service.php:83
+#inc/services/class.isgd.service.php:39
+#inc/services/class.isgd.service.php:51
+#inc/services/class.shortto.service.php:39
+#inc/services/class.shortto.service.php:51
+#inc/services/class.trim.service.php:76
+#inc/services/class.trim.service.php:96
+$GLOBALS['__l10n']['Service is unavailable.'] = 'Le service n\'est pas disponible.';
+
+#inc/services/class.bilbolinks.service.php:88
+#inc/services/class.trim.service.php:107
+$GLOBALS['__l10n']['Service rate limit exceeded.'] = 'La limitation d\'envoie au service est atteinte.';
+
+#inc/services/class.bitly.service.php:55
 $GLOBALS['__l10n']['This is your login to sign up to bit.ly.'] = 'Ceci est votre login d\'inscription sur bit.ly.';
 
-#inc/services/class.bitly.service.php:60
+#inc/services/class.bitly.service.php:57
 $GLOBALS['__l10n']['API Key:'] = 'Clé API :';
 
-#inc/services/class.bitly.service.php:64
+#inc/services/class.bitly.service.php:61
 $GLOBALS['__l10n']['This is your personnal bit.ly API key. You can find it on your account page.'] = 'Ceci est votre clé personnelle pour l\'API bit.ly. Vous pouvez la trouver sur la page de vore compte.';
 
+#inc/services/class.bitly.service.php:65
+$GLOBALS['__l10n']['Publish history'] = 'Publier l\'historique';
+
 #inc/services/class.bitly.service.php:68
-$GLOBALS['__l10n']['Publish history'] = 'Publier l\'historique';
-
-#inc/services/class.bitly.service.php:71
 $GLOBALS['__l10n']['This publish all short links on your bit.ly public page.'] = 'Ceci publie tous vos liens sur votre page public bit.ly';
 
-#inc/services/class.local.service.php:46
+#inc/services/class.bitly.service.php:84
+#inc/services/class.bitly.service.php:106
+$GLOBALS['__l10n']['Failed to call service.'] = 'Impossible d\'appeler le service.';
+
+#inc/services/class.bitly.service.php:93
+#inc/services/class.bitly.service.php:115
+$GLOBALS['__l10n']['An error occured with code %s and message "%s"'] = 'Une erreur est survenu avec le code "%s" et le message "%s"';
+
+#inc/services/class.local.service.php:44
 $GLOBALS['__l10n']['This service use your own Blog to shorten and serve URL.'] = 'Ce service utilise votre propre blog pour réduire et servir des liens.';
 
-#inc/services/class.local.service.php:47
+#inc/services/class.local.service.php:45
 $GLOBALS['__l10n']['This means that with this service short links start with "%s".'] = 'Cela signifie qu\'avec ce service vos liens courts commencent par "%s".';
 
-#inc/services/class.local.service.php:50
+#inc/services/class.local.service.php:48
 $GLOBALS['__l10n']['You can use Dotclear\'s plugin called myUrlHandlers to change short links prefix on your blog.'] = 'Vous pouvez utiliser l\'extension myUrlHandlers pour Dotclear afin de changer le prefix de vos liens courts depuis votre blog.';
 
+#inc/services/class.local.service.php:54
+$GLOBALS['__l10n']['We recommand that you use a rewrite engine in order to remove \'index.php\' from your blog\'s URL.'] = 'Nous vous recommandons d\'utiliser la réécriture d\'URL pour supprimer \'index.php de l\'URL de votre blog.';
+
 #inc/services/class.local.service.php:56
-$GLOBALS['__l10n']['We recommand that you use a rewrite engine in order to remove \'index.php\' from your blog\'s URL.'] = 'Nous vous recommandons d\'utiliser la réécriture d\'URL pour supprimer \'index.php de l\'URL de votre blog.';
-
-#inc/services/class.local.service.php:58
 $GLOBALS['__l10n']['You can find more about this on the Dotclear\'s documentation.'] = 'Vous trouverez plus d\'information à ce sujet dans la documentation Dotclear.';
 
-#inc/services/class.local.service.php:65
+#inc/services/class.local.service.php:63
 $GLOBALS['__l10n']['Allowed protocols:'] = 'Protocoles autorisés :';
 
-#inc/services/class.local.service.php:70
+#inc/services/class.local.service.php:68
 $GLOBALS['__l10n']['Use comma seperated list like: "http:,https:,ftp:"'] = 'Utiliser une virgule pour séparer la liste des protocoles. Ex: "http:,https:,ftp:"';
 
-#inc/services/class.local.service.php:75
+#inc/services/class.local.service.php:73
 $GLOBALS['__l10n']['Enable public page for visitors to shorten links'] = 'Activer la page publique pour que les visiteurs puissent réduire des liens';
 
-#inc/services/class.local.service.php:78
+#inc/services/class.local.service.php:76
 $GLOBALS['__l10n']['CSS:'] = 'CSS :';
 
-#inc/services/class.local.service.php:81
+#inc/services/class.local.service.php:79
 $GLOBALS['__l10n']['You can add here special cascading style sheet. Body of page has class "dc-kutrl" and widgets have class "shortenkutrlwidget" and "rankkutrlwidget".'] = 'Vous pouvez ajouter des styles ici. La balise "body" a la class "dc-kutrl" et les widgets ont les class "shortenkutrlwidget" et "rankkutrlwidget".';
 
-#inc/services/class.trim.service.php:53
+#inc/services/class.local.service.php:120
+$GLOBALS['__l10n']['Custom short link is already taken.'] = 'Le lien court personnalisé est déjà pris.';
+
+#inc/services/class.local.service.php:130
+$GLOBALS['__l10n']['Custom short link is not valid.'] = 'Le lien court personnalisé n\'est pas valide.';
+
+#inc/services/class.local.service.php:141
+$GLOBALS['__l10n']['Failed to save link.'] = 'Impossible d\'enregistrer le lien.';
+
+#inc/services/class.trim.service.php:51
 $GLOBALS['__l10n']['This is your login to sign up to tr.im.'] = 'Ceci est votre login d\'inscription sur tr.im.';
 
-#inc/services/class.trim.service.php:59
+#inc/services/class.trim.service.php:57
 $GLOBALS['__l10n']['This is your password to sign up to tr.im.'] = 'Ceci est votre mot de passe d\'inscription sur tr.im.';
 
-#index.php:54
-$GLOBALS['__l10n']['Long link'] = 'Lien long';
-
-#index.php:69
-$GLOBALS['__l10n']['disabled'] = 'Désactivé';
-
-#index.php:187
-$GLOBALS['__l10n']['There is nothing to shorten.'] = 'I n\'y a rien à réduire.';
-
-#index.php:193
-$GLOBALS['__l10n']['This service does not allowed custom hash.'] = 'Ce service n\'accepte pas les liens court personnalisés.';
-
-#index.php:196
-$GLOBALS['__l10n']['This link is not a valid URL.'] = 'Ce lien n\'est pas valide.';
-
-#index.php:290
-$GLOBALS['__l10n']['You must set an admin service.'] = 'Vous devez définir un service admin.';
-
-#index.php:308
-$GLOBALS['__l10n']['Only if you want a custom short link.'] = 'Uniquement si vous souhaitez un lien court personnalisé.';
-
-#index.php:327
-$GLOBALS['__l10n']['Settings'] = 'Paramètres';
-
-#index.php:337
-$GLOBALS['__l10n']['Enable plugin'] = 'Activer l\'extension';
-
-#index.php:342
-$GLOBALS['__l10n']['Limit short link to current blog'] = 'Limiter les liens court à ce blog';
-
-#index.php:345
-$GLOBALS['__l10n']['Only link started with this blog URL could be shortened.'] = 'Uniquement les liens commençant par l\'URL de ce blog pourront être réduits.';
-
-#index.php:350
-$GLOBALS['__l10n']['Passive mode'] = 'Mode passif';
-
-#index.php:353
-$GLOBALS['__l10n']['If this extension is disabled and the passive mode is enabled, "kutrl" tags will display long urls instead of nothing on templates.'] = 'Si cette extension est désactivée et que le mode passif est activé, les balises "kutrl" affichreront les longues URL au lieu de rien.';
-
-#index.php:358
-$GLOBALS['__l10n']['Create short link for new entries'] = 'Créer un lien court pour les nouveaux billets';
-
-#index.php:361
-$GLOBALS['__l10n']['This can be changed on page of creation/edition of an entry.'] = 'Ceci peut être changé sur la page d\'édition / création d\'un billet.';
-
-#index.php:366
-$GLOBALS['__l10n']['Administration:'] = 'Administration :';
-
-#index.php:371
-$GLOBALS['__l10n']['Service to use in this admin page.'] = 'Service a utiliser pour réduire des liens depuis cette page.';
-
-#index.php:376
-$GLOBALS['__l10n']['Templates:'] = 'Templates :';
-
-#index.php:381
-$GLOBALS['__l10n']['Shorten links automatically when using template value like "EntryKutrl".'] = 'Réduit automatiquement les liens des templates utilisant les balises tels que "EntryKutrl".';
-
-#index.php:386
-$GLOBALS['__l10n']['Contents:'] = 'Contenus :';
-
-#index.php:391
-$GLOBALS['__l10n']['Shorten links automatically found in contents using wiki synthax.'] = 'Réduit automatiquement les liens des contenus utilisant la syntax wiki.';
-
-#index.php:406
-$GLOBALS['__l10n']['Services'] = 'Services';
-
-#index.php:411
-$GLOBALS['__l10n']['Configuration successfully updated.'] = 'La configuration a été correctement enregistrée.';
-
-#index.php:425
-$GLOBALS['__l10n']['%s API is well configured and runing.'] = 'L\'API %s est correctement configurée et est fonctionnelle.';
-
-#index.php:426
-$GLOBALS['__l10n']['%s API is not well configured or not online.'] = 'L\'API n\'est pas correctement configurée ou est hors ligne.';
-
-#index.php:433
-$GLOBALS['__l10n']['homepage'] = 'page d\'accueil';
-
-#index.php:433
-$GLOBALS['__l10n']['Learn more about %s.'] = 'En savoir plus à propos de %s.';
-
-#index.php:453
-$GLOBALS['__l10n']['Know links'] = 'Liens connus';
-
-#index.php:457
-$GLOBALS['__l10n']['List successfully updated.'] = 'Liste mise à jour avec succès.';
-
-#index.php:473
-$GLOBALS['__l10n']['Service:'] = 'Service :';
-
-#index.php:507
-$GLOBALS['__l10n']['Selected links action:'] = 'Action sur les liens selectionnés :';
+#inc/services/class.trim.service.php:70
+$GLOBALS['__l10n']['Prevent service rate limit.'] = 'Prévention de la limitation d\'envoie du service.';
+
+#inc/services/class.trim.service.php:85
+$GLOBALS['__l10n']['Authentication to service failed.'] = 'Authentification au service échoué.';
+
+#inc/services/class.trim.service.php:119
+$GLOBALS['__l10n']['Unreadable service response.'] = 'La réponse du service n\'est pas lisible.';
+
+#index.php:28
+$GLOBALS['__l10n']['Please wait'] = 'Veuillez patienter';
+
+#index.php:36
+$GLOBALS['__l10n']['Configure extension'] = 'Configurer l\'extension';
+
+#index.php:37
+$GLOBALS['__l10n']['Configure services'] = 'Configurer les services';
+
+#index.php:49
+$GLOBALS['__l10n']['Configuration successfully saved'] = 'Configuration sauvegardée avec succès';
+
+#index.php:50
+$GLOBALS['__l10n']['Services successfully updated'] = 'Services mises à jour avec succès';
+
+#index.php:51
+$GLOBALS['__l10n']['Link successfully shorten'] = 'Lien raccourcie avec succès';
+
+#index.php:52
+$GLOBALS['__l10n']['Links successfully deleted'] = 'Liens supprimés avec succès';
 
 ?>

plugins/kUtRL/locales/fr/main.po

@@ -1 +1 @@
 # Language: français
-# Module: kUtRL - 0.1.2
-# Date: 2009-12-12 12:48:16
+# Module: kUtRL - 0.3
+# Date: 2010-04-14 22:23:46
 # Translated with translater 1.3
 
@@ -7 +7 @@
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: kUtRL 0.1.2\n"
+"Project-Id-Version: kUtRL 0.3\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-12-12T12:48:16+00:00\n"
+"PO-Revision-Date: 2010-04-14T22:23:46+00:00\n"
 "Last-Translator: JC Denis\n"
 "Language-Team: \n"
@@ -15 +15 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _admin.php:82
-#: index.php:55
+#: _admin.php:19
+#: _widgets.php:22
+#: default-templates/kutrl.html:48
+#: inc/index.link.php:112
+#: inc/index.links.php:203
+#: inc/index.service.php:42
+#: inc/index.setting.php:87
+#: index.php:41
+#: index.php:42
+msgid "Links shortener"
+msgstr "Réducteur de liens"
+
+#: _admin.php:85
+#: inc/index.links.php:118
 msgid "Short link"
 msgstr "Lien court"
 
-#: _admin.php:97
-#: index.php:315
+#: _admin.php:102
 msgid "Create short link"
 msgstr "Créer un lien court"
 
-#: _admin.php:103
-#: index.php:304
+#: _admin.php:108
+#: inc/index.link.php:136
 msgid "Custom short link:"
 msgstr "Lien court personnalisé :"
 
-#: _admin.php:113
-#: _widgets.php:157
+#: _admin.php:115
+msgid "Send to Twitter status"
+msgstr "Envoyer au status Twitter"
+
+#: _admin.php:122
+#: _widgets.php:171
 msgid "never followed"
 msgstr "jamais suivi"
 
-#: _admin.php:117
-#: _widgets.php:159
+#: _admin.php:126
+#: _widgets.php:173
 msgid "followed one time"
 msgstr "suivi une fois"
 
-#: _admin.php:121
-#: _widgets.php:161
+#: _admin.php:130
+#: _widgets.php:175
 msgid "followed %s times"
 msgstr "suivi %s fois"
 
-#: _admin.php:127
-#: _admin.php:254
-#: index.php:49
+#: _admin.php:137
+#: _admin.php:268
 msgid "delete short link"
-msgstr "Effacer un lien court"
-
-#: _admin.php:253
+msgstr "effacer un lien court"
+
+#: _admin.php:267
 msgid "create short link"
 msgstr "créer un lien court"
 
-#: _public.php:128
+#: _public.php:123
 msgid "Failed to verify protected field."
 msgstr "Impossible de vérifier le champs de protection."
 
-#: _public.php:136
-#: index.php:190
+#: _public.php:131
+#: inc/index.link.php:38
+#: inc/services/class.bilbolinks.service.php:64
+#: inc/services/class.bitly.service.php:76
+#: inc/services/class.local.service.php:89
+#: inc/services/class.trim.service.php:65
 msgid "Service is not well configured."
 msgstr "Le service n'est pas correctement configuré."
 
-#: _public.php:144
+#: _public.php:139
 msgid "This string is not a valid URL."
 msgstr "Cette chaine n'est pas un lien valide."
 
-#: _public.php:152
-#: index.php:199
+#: _public.php:147
+#: inc/index.link.php:47
 msgid "This link is too short."
 msgstr "Ce lien est trop court."
 
-#: _public.php:160
-#: index.php:202
+#: _public.php:155
+#: inc/index.link.php:50
 msgid "This type of link is not allowed."
 msgstr "Ce type de lien n'est pas autorisé."
 
-#: _public.php:169
-#: index.php:205
+#: _public.php:164
+#: inc/index.link.php:53
 msgid "Short links are limited to this blog URL."
-msgstr "Les liens court sont limité à l'URL de ce blog."
-
-#: _public.php:177
-#: index.php:208
+msgstr "Les liens courts sont limités à l'URL de ce blog."
+
+#: _public.php:172
+#: inc/index.link.php:56
 msgid "This link is already a short link."
 msgstr "Ce lien est dèjà un lien court."
 
-#: _public.php:190
-#: _public.php:209
-#: index.php:214
-#: index.php:226
+#: _public.php:185
+#: _public.php:204
+#: inc/index.link.php:67
+#: inc/index.link.php:87
 msgid "Short link for %s is %s"
 msgstr "Le lien court pour %s est %s"
 
-#: _public.php:201
-#: index.php:220
+#: _public.php:196
 msgid "Failed to create short link."
 msgstr "Impossible de créer le lien court."
 
-#: _public.php:311
-#: _widgets.php:93
-msgid "Write \"%s\" in next field to see if you are not a robot:"
-msgstr "Ecrire \"%s\" dans le champs suivant :"
-
-#: _widgets.php:22
-#: default-templates/kutrl.html:48
-#: index.php:251
-msgid "Links shortener"
-msgstr "Réducteur de liens"
+#: _public.php:213
+#: _public.php:432
+#: inc/lib.wiki.kutrl.php:78
+msgid "public"
+msgstr "publique"
+
+#: _public.php:314
+#: _widgets.php:105
+msgid "Rewrite \"%s\" in next field to show that you are not a robot:"
+msgstr "Recopier \"%s\" dans le champs suivant pour montrer que vous n'êtes pas une machine :"
 
 #: _widgets.php:26
-#: index.php:286
 msgid "Shorten link"
 msgstr "Réduire un lien"
@@ -118 +134 @@
 #: _widgets.php:35
 #: _widgets.php:39
-msgid "Top mini links"
-msgstr "Top des mini liens"
+msgid "Top of short links"
+msgstr "Top des liens courts"
+
+#: _widgets.php:42
+msgid "Text: (Use wildcard %rank%, %hash%, %url%, %count%, %counttext%)"
+msgstr "Texte : (Ustiliser les jokers %rank%, %hash%, %url%, %count%, %counttext%)"
 
 #: _widgets.php:45
-msgid "Link length (if truncate)"
-msgstr "Longueur du lien (si tronqué)"
+msgid "URL length (if truncate)"
+msgstr "Longueur de l'URL (si tronqué)"
 
 #: _widgets.php:49
@@ -135 +155 @@
 #: _widgets.php:51
 msgid "Custom URL"
-msgstr "URL personalisé"
-
-#: _widgets.php:61
+msgstr "URL personnalisé"
+
+#: _widgets.php:52
+msgid "Semi-custom"
+msgstr "Semi-personnalisé"
+
+#: _widgets.php:56
+msgid "Semi-custom prefix: (only if you want limit to a particular prefix)"
+msgstr "Préfixe des liens semi-personnalisé : (Seulement si vous voulez limiter à un préfixe particulier)"
+
+#: _widgets.php:60
+msgid "Sort by:"
+msgstr "Trier par :"
+
+#: _widgets.php:62
+msgid "Rank"
+msgstr "Rang"
+
+#: _widgets.php:63
+#: inc/index.links.php:34
+msgid "Hash"
+msgstr "Hash"
+
+#: _widgets.php:73
 msgid "Limit:"
 msgstr "Limite :"
 
-#: _widgets.php:64
+#: _widgets.php:76
 msgid "Hide no followed links"
 msgstr "Cacher les liens non suivis"
 
-#: _widgets.php:89
+#: _widgets.php:101
 #: default-templates/kutrl.html:55
-#: index.php:297
+#: inc/index.link.php:129
 msgid "Long link:"
 msgstr "Lien long :"
 
-#: _widgets.php:96
+#: _widgets.php:108
 #: default-templates/kutrl.html:62
 msgid "Create"
 msgstr "Créer"
 
-#: inc/lib.kutrl.activityreport.php:16
+#: inc/index.link.php:35
+msgid "There is nothing to shorten."
+msgstr "I n'y a rien à réduire."
+
+#: inc/index.link.php:41
+msgid "This service does not allowed custom hash."
+msgstr "Ce service n'accepte pas les liens court personnalisés."
+
+#: inc/index.link.php:44
+msgid "This link is not a valid URL."
+msgstr "Ce lien n'est pas valide."
+
+#: inc/index.link.php:59
+msgid "This custom short url is already taken."
+msgstr "Ce lien court personnalisé est déjà pris."
+
+#: inc/index.link.php:79
+msgid "Failed to create short link. This could be caused by a service failure."
+msgstr "Impossible de créé un lien court. Ceci peut être causé par un problème du service."
+
+#: inc/index.link.php:116
+#: inc/index.links.php:207
+#: inc/index.service.php:52
+#: inc/index.setting.php:97
+msgid "New link"
+msgstr "Nouveau lien"
+
+#: inc/index.link.php:121
+msgid "You must set an admin service."
+msgstr "Vous devez définir un service admin."
+
+#: inc/index.link.php:128
+msgid "Shorten link using service \"%s\""
+msgstr "Raccourcir un lien en utilisant le service \"%s\""
+
+#: inc/index.link.php:138
+msgid "Only if you want a custom short link."
+msgstr "Uniquement si vous souhaitez un lien court personnalisé."
+
+#: inc/index.link.php:142
+msgid "You can use \"bob!!\" if you want a semi-custom link, it starts with \"bob\" and \"!!\" will be replaced by an increment value."
+msgstr "Vous pouvez utiliser \"bob!!\" si vous souhaitez un lien semi-personnalisé, il commencera par \"bob\" et \"!!\" sera remplacé par une valeur incrémentale."
+
+#: inc/index.links.php:23
+msgid "No short link"
+msgstr "Pas de lien court"
+
+#: inc/index.links.php:37
+msgid "Service"
+msgstr "Service"
+
+#: inc/index.links.php:117
+msgid "Long link"
+msgstr "Lien long"
+
+#: inc/index.links.php:132
+#: inc/index.setting.php:82
+msgid "disabled"
+msgstr "Désactivé"
+
+#: inc/index.links.php:220
+msgid "Service:"
+msgstr "Service :"
+
+#: inc/index.links.php:250
+msgid "Delete selected short links"
+msgstr "Effacer les liens sélectionnés"
+
+#: inc/index.service.php:51
+#: index.php:37
+msgid "Services"
+msgstr "Services"
+
+#: inc/index.service.php:66
+msgid "%s API is well configured and runing."
+msgstr "L'API %s est correctement configurée et est fonctionnelle."
+
+#: inc/index.service.php:67
+msgid "Failed to test %s API."
+msgstr "Impossible de tester l'API %s."
+
+#: inc/index.service.php:76
+msgid "homepage"
+msgstr "page d'accueil"
+
+#: inc/index.service.php:76
+msgid "Learn more about %s."
+msgstr "En savoir plus à propos de %s."
+
+#: inc/index.setting.php:96
+#: index.php:36
+msgid "Settings"
+msgstr "Paramètres"
+
+#: inc/index.setting.php:101
+msgid "Plugin activation"
+msgstr "Activation de l'extension"
+
+#: inc/index.setting.php:104
+msgid "Enable plugin"
+msgstr "Activer l'extension"
+
+#: inc/index.setting.php:107
+msgid "General rules"
+msgstr "Réglages"
+
+#: inc/index.setting.php:110
+msgid "Limit short link to current blog"
+msgstr "Limiter les liens court à ce blog"
+
+#: inc/index.setting.php:111
+msgid "Only link started with this blog URL could be shortened."
+msgstr "Uniquement les liens commençant par l'URL de ce blog pourront être réduits."
+
+#: inc/index.setting.php:114
+msgid "Passive mode"
+msgstr "Mode passif"
+
+#: inc/index.setting.php:115
+msgid "If this extension is disabled and the passive mode is enabled, \"kutrl\" tags will display long urls instead of nothing on templates."
+msgstr "Si cette extension est désactivée et que le mode passif est activé, les balises \"kutrl\" afficheront les longues URL au lieu de rien."
+
+#: inc/index.setting.php:118
+msgid "Create short link for new entries"
+msgstr "Créer un lien court pour les nouveaux billets"
+
+#: inc/index.setting.php:119
+msgid "This can be changed on page of creation/edition of an entry."
+msgstr "Ceci peut être changé sur la page d'édition / création d'un billet."
+
+#: inc/index.setting.php:122
+msgid "Default services"
+msgstr "Services par défaut"
+
+#: inc/index.setting.php:128
+msgid "Administration:"
+msgstr "Administration :"
+
+#: inc/index.setting.php:131
+msgid "Service to use in this admin page and on edit page of an entry."
+msgstr "Service à utiliser sur cette page d'administration ou sur la page d'édition d'un billet."
+
+#: inc/index.setting.php:137
+msgid "Templates:"
+msgstr "Templates :"
+
+#: inc/index.setting.php:140
+msgid "Shorten links automatically when using template value like \"EntryKutrl\"."
+msgstr "Réduit automatiquement les liens des templates utilisant les balises tels que \"EntryKutrl\"."
+
+#: inc/index.setting.php:146
+msgid "Contents:"
+msgstr "Contenus :"
+
+#: inc/index.setting.php:149
+msgid "Shorten links automatically found in contents using wiki synthax."
+msgstr "Réduit automatiquement les liens des contenus utilisant la syntax wiki."
+
+#: inc/index.setting.php:159
+msgid "Use wildcard %L for short URL, %B for blog name, %U for user name."
+msgstr "Utiliser les jokers %L pour le lien court, %B pour le nom du blog, %U pour l'utilisateur."
+
+#: inc/index.setting.php:161
+msgid "Activation"
+msgstr "Activation"
+
+#: inc/index.setting.php:162
+msgid "Send message when short url is created on:"
+msgstr "Envoyer un message lorsqu'un lien court est créé sur :"
+
+#: inc/index.setting.php:165
+msgid "administration form"
+msgstr "le formulaire de la page d'administration"
+
+#: inc/index.setting.php:168
+msgid "public form"
+msgstr "le forumlaire publique"
+
+#: inc/index.setting.php:171
+msgid "template"
+msgstr "le thème"
+
+#: inc/index.setting.php:174
+msgid "content"
+msgstr "le contenu"
+
+#: inc/lib.dc.twitter.php:169
+msgid "Twitter account"
+msgstr "Compte Twitter"
+
+#: inc/lib.dc.twitter.php:170
+#: inc/lib.dc.twitter.php:178
+#: inc/services/class.bitly.service.php:51
+#: inc/services/class.trim.service.php:47
+msgid "Login:"
+msgstr "Identifiant :"
+
+#: inc/lib.dc.twitter.php:176
+#: inc/lib.dc.twitter.php:184
+msgid "Type a password only to change old one."
+msgstr "Entrer un mot de passe uniquement pour changer l'ancien."
+
+#: inc/lib.dc.twitter.php:177
+msgid "Identi.ca account"
+msgstr "Compte Identi.ca"
+
+#: inc/lib.dc.twitter.php:185
+msgid "Message"
+msgstr "Message"
+
+#: inc/lib.dc.twitter.php:301
+msgid "User is not set."
+msgstr "L'utilisateur est pas renseigné."
+
+#: inc/lib.dc.twitter.php:309
+msgid "Nothing to send."
+msgstr "Il n'y a rien à envoyer."
+
+#: inc/lib.dc.twitter.php:333
+msgid "Failed to send message (%s)"
+msgstr "Impossible d'envoyer le message (%s)"
+
+#: inc/lib.dc.twitter.php:393
+msgid "Failed to get short url (%s)"
+msgstr "Impossible de récupérer le lien court (%s)"
+
+#: inc/lib.dc.twitter.php:399
+msgid "Failed to get short url"
+msgstr "Impossible de récupérer le lien court"
+
+#: inc/lib.kutrl.activityreport.php:17
 msgid "Plugin kUtRL"
 msgstr "Extension kUtRL"
 
-#: inc/lib.kutrl.activityreport.php:22
+#: inc/lib.kutrl.activityreport.php:23
 msgid "Short link creation"
 msgstr "Création de lien court"
 
-#: inc/lib.kutrl.activityreport.php:23
+#: inc/lib.kutrl.activityreport.php:24
 msgid "New short link of type \"%s\" and hash \"%s\" was created."
 msgstr "Un nouveau lien court de type \"%s\" et de hash \"%s\" a été créé."
 
-#: inc/lib.kutrl.index.list.php:20
-msgid "No short link"
-msgstr "Pas de lien court"
-
-#: inc/lib.kutrl.index.list.php:31
-msgid "Service"
-msgstr "Service"
-
-#: inc/lib.kutrl.index.list.php:32
-msgid "Hash"
-msgstr "Hash"
-
-#: inc/lib.kutrl.srv.php:47
+#: inc/lib.kutrl.srv.php:52
 msgid "There is nothing to configure for this service."
 msgstr "Il n'y a rien à configurer pour ce service."
 
-#: inc/lib.wiki.kutrl.php:79
+#: inc/lib.wiki.kutrl.php:73
 msgid "%s (Shorten with %s)"
 msgstr "% (réduit avec %s)"
 
-#: inc/services/class.bilbolinks.service.php:54
+#: inc/services/class.bilbolinks.service.php:52
 msgid "Url of the service:"
 msgstr "URL du service :"
 
-#: inc/services/class.bilbolinks.service.php:58
+#: inc/services/class.bilbolinks.service.php:56
 msgid "This is the root URL of the \"bilbolinks\" service you want to use. Ex: \"http://tux-pla.net/\"."
 msgstr "Ceci est l'URL du service bilbolinks que vous souhaitez utiliser. Ex: \"http://tux-pla.net/\"."
 
-#: inc/services/class.bitly.service.php:54
-#: inc/services/class.trim.service.php:49
-msgid "Login:"
-msgstr "Login :"
-
-#: inc/services/class.bitly.service.php:58
+#: inc/services/class.bilbolinks.service.php:71
+#: inc/services/class.bilbolinks.service.php:83
+#: inc/services/class.isgd.service.php:39
+#: inc/services/class.isgd.service.php:51
+#: inc/services/class.shortto.service.php:39
+#: inc/services/class.shortto.service.php:51
+#: inc/services/class.trim.service.php:76
+#: inc/services/class.trim.service.php:96
+msgid "Service is unavailable."
+msgstr "Le service n'est pas disponible."
+
+#: inc/services/class.bilbolinks.service.php:88
+#: inc/services/class.trim.service.php:107
+msgid "Service rate limit exceeded."
+msgstr "La limitation d'envoie au service est atteinte."
+
+#: inc/services/class.bitly.service.php:55
 msgid "This is your login to sign up to bit.ly."
 msgstr "Ceci est votre login d'inscription sur bit.ly."
 
-#: inc/services/class.bitly.service.php:60
+#: inc/services/class.bitly.service.php:57
 msgid "API Key:"
 msgstr "Clé API :"
 
-#: inc/services/class.bitly.service.php:64
+#: inc/services/class.bitly.service.php:61
 msgid "This is your personnal bit.ly API key. You can find it on your account page."
 msgstr "Ceci est votre clé personnelle pour l'API bit.ly. Vous pouvez la trouver sur la page de vore compte."
 
-#: inc/services/class.bitly.service.php:68
+#: inc/services/class.bitly.service.php:65
 msgid "Publish history"
 msgstr "Publier l'historique"
 
-#: inc/services/class.bitly.service.php:71
+#: inc/services/class.bitly.service.php:68
 msgid "This publish all short links on your bit.ly public page."
 msgstr "Ceci publie tous vos liens sur votre page public bit.ly"
 
-#: inc/services/class.local.service.php:46
+#: inc/services/class.bitly.service.php:84
+#: inc/services/class.bitly.service.php:106
+msgid "Failed to call service."
+msgstr "Impossible d'appeler le service."
+
+#: inc/services/class.bitly.service.php:93
+#: inc/services/class.bitly.service.php:115
+msgid "An error occured with code %s and message \"%s\""
+msgstr "Une erreur est survenu avec le code \"%s\" et le message \"%s\""
+
+#: inc/services/class.local.service.php:44
 msgid "This service use your own Blog to shorten and serve URL."
 msgstr "Ce service utilise votre propre blog pour réduire et servir des liens."
 
-#: inc/services/class.local.service.php:47
+#: inc/services/class.local.service.php:45
 msgid "This means that with this service short links start with \"%s\"."
 msgstr "Cela signifie qu'avec ce service vos liens courts commencent par \"%s\"."
 
-#: inc/services/class.local.service.php:50
+#: inc/services/class.local.service.php:48
 msgid "You can use Dotclear's plugin called myUrlHandlers to change short links prefix on your blog."
 msgstr "Vous pouvez utiliser l'extension myUrlHandlers pour Dotclear afin de changer le prefix de vos liens courts depuis votre blog."
 
-#: inc/services/class.local.service.php:56
+#: inc/services/class.local.service.php:54
 msgid "We recommand that you use a rewrite engine in order to remove 'index.php' from your blog's URL."
 msgstr "Nous vous recommandons d'utiliser la réécriture d'URL pour supprimer 'index.php de l'URL de votre blog."
 
-#: inc/services/class.local.service.php:58
+#: inc/services/class.local.service.php:56
 msgid "You can find more about this on the Dotclear's documentation."
 msgstr "Vous trouverez plus d'information à ce sujet dans la documentation Dotclear."
 
-#: inc/services/class.local.service.php:65
+#: inc/services/class.local.service.php:63
 msgid "Allowed protocols:"
 msgstr "Protocoles autorisés :"
 
-#: inc/services/class.local.service.php:70
+#: inc/services/class.local.service.php:68
 msgid "Use comma seperated list like: \"http:,https:,ftp:\""
 msgstr "Utiliser une virgule pour séparer la liste des protocoles. Ex: \"http:,https:,ftp:\""
 
-#: inc/services/class.local.service.php:75
+#: inc/services/class.local.service.php:73
 msgid "Enable public page for visitors to shorten links"
 msgstr "Activer la page publique pour que les visiteurs puissent réduire des liens"
 
-#: inc/services/class.local.service.php:78
+#: inc/services/class.local.service.php:76
 msgid "CSS:"
 msgstr "CSS :"
 
-#: inc/services/class.local.service.php:81
+#: inc/services/class.local.service.php:79
 msgid "You can add here special cascading style sheet. Body of page has class \"dc-kutrl\" and widgets have class \"shortenkutrlwidget\" and \"rankkutrlwidget\"."
 msgstr "Vous pouvez ajouter des styles ici. La balise \"body\" a la class \"dc-kutrl\" et les widgets ont les class \"shortenkutrlwidget\" et \"rankkutrlwidget\"."
 
-#: inc/services/class.trim.service.php:53
+#: inc/services/class.local.service.php:120
+msgid "Custom short link is already taken."
+msgstr "Le lien court personnalisé est déjà pris."
+
+#: inc/services/class.local.service.php:130
+msgid "Custom short link is not valid."
+msgstr "Le lien court personnalisé n'est pas valide."
+
+#: inc/services/class.local.service.php:141
+msgid "Failed to save link."
+msgstr "Impossible d'enregistrer le lien."
+
+#: inc/services/class.trim.service.php:51
 msgid "This is your login to sign up to tr.im."
 msgstr "Ceci est votre login d'inscription sur tr.im."
 
-#: inc/services/class.trim.service.php:59
+#: inc/services/class.trim.service.php:57
 msgid "This is your password to sign up to tr.im."
 msgstr "Ceci est votre mot de passe d'inscription sur tr.im."
 
-#: index.php:54
-msgid "Long link"
-msgstr "Lien long"
-
-#: index.php:69
-msgid "disabled"
-msgstr "Désactivé"
-
-#: index.php:187
-msgid "There is nothing to shorten."
-msgstr "I n'y a rien à réduire."
-
-#: index.php:193
-msgid "This service does not allowed custom hash."
-msgstr "Ce service n'accepte pas les liens court personnalisés."
-
-#: index.php:196
-msgid "This link is not a valid URL."
-msgstr "Ce lien n'est pas valide."
-
-#: index.php:290
-msgid "You must set an admin service."
-msgstr "Vous devez définir un service admin."
-
-#: index.php:308
-msgid "Only if you want a custom short link."
-msgstr "Uniquement si vous souhaitez un lien court personnalisé."
-
-#: index.php:327
-msgid "Settings"
-msgstr "Paramètres"
-
-#: index.php:337
-msgid "Enable plugin"
-msgstr "Activer l'extension"
-
-#: index.php:342
-msgid "Limit short link to current blog"
-msgstr "Limiter les liens court à ce blog"
-
-#: index.php:345
-msgid "Only link started with this blog URL could be shortened."
-msgstr "Uniquement les liens commençant par l'URL de ce blog pourront être réduits."
-
-#: index.php:350
-msgid "Passive mode"
-msgstr "Mode passif"
-
-#: index.php:353
-msgid "If this extension is disabled and the passive mode is enabled, \"kutrl\" tags will display long urls instead of nothing on templates."
-msgstr "Si cette extension est désactivée et que le mode passif est activé, les balises \"kutrl\" affichreront les longues URL au lieu de rien."
-
-#: index.php:358
-msgid "Create short link for new entries"
-msgstr "Créer un lien court pour les nouveaux billets"
-
-#: index.php:361
-msgid "This can be changed on page of creation/edition of an entry."
-msgstr "Ceci peut être changé sur la page d'édition / création d'un billet."
-
-#: index.php:366
-msgid "Administration:"
-msgstr "Administration :"
-
-#: index.php:371
-msgid "Service to use in this admin page."
-msgstr "Service a utiliser pour réduire des liens depuis cette page."
-
-#: index.php:376
-msgid "Templates:"
-msgstr "Templates :"
-
-#: index.php:381
-msgid "Shorten links automatically when using template value like \"EntryKutrl\"."
-msgstr "Réduit automatiquement les liens des templates utilisant les balises tels que \"EntryKutrl\"."
-
-#: index.php:386
-msgid "Contents:"
-msgstr "Contenus :"
-
-#: index.php:391
-msgid "Shorten links automatically found in contents using wiki synthax."
-msgstr "Réduit automatiquement les liens des contenus utilisant la syntax wiki."
-
-#: index.php:406
-msgid "Services"
-msgstr "Services"
-
-#: index.php:411
-msgid "Configuration successfully updated."
-msgstr "La configuration a été correctement enregistrée."
-
-#: index.php:425
-msgid "%s API is well configured and runing."
-msgstr "L'API %s est correctement configurée et est fonctionnelle."
-
-#: index.php:426
-msgid "%s API is not well configured or not online."
-msgstr "L'API n'est pas correctement configurée ou est hors ligne."
-
-#: index.php:433
-msgid "homepage"
-msgstr "page d'accueil"
-
-#: index.php:433
-msgid "Learn more about %s."
-msgstr "En savoir plus à propos de %s."
-
-#: index.php:453
-msgid "Know links"
-msgstr "Liens connus"
-
-#: index.php:457
-msgid "List successfully updated."
-msgstr "Liste mise à jour avec succès."
-
-#: index.php:473
-msgid "Service:"
-msgstr "Service :"
-
-#: index.php:507
-msgid "Selected links action:"
-msgstr "Action sur les liens selectionnés :"
-
+#: inc/services/class.trim.service.php:70
+msgid "Prevent service rate limit."
+msgstr "Prévention de la limitation d'envoie du service."
+
+#: inc/services/class.trim.service.php:85
+msgid "Authentication to service failed."
+msgstr "Authentification au service échoué."
+
+#: inc/services/class.trim.service.php:119
+msgid "Unreadable service response."
+msgstr "La réponse du service n'est pas lisible."
+
+#: index.php:28
+msgid "Please wait"
+msgstr "Veuillez patienter"
+
+#: index.php:36
+msgid "Configure extension"
+msgstr "Configurer l'extension"
+
+#: index.php:37
+msgid "Configure services"
+msgstr "Configurer les services"
+
+#: index.php:49
+msgid "Configuration successfully saved"
+msgstr "Configuration sauvegardée avec succès"
+
+#: index.php:50
+msgid "Services successfully updated"
+msgstr "Services mises à jour avec succès"
+
+#: index.php:51
+msgid "Link successfully shorten"
+msgstr "Lien raccourcie avec succès"
+
+#: index.php:52
+msgid "Links successfully deleted"
+msgstr "Liens supprimés avec succès"
+

plugins/kUtRL/release.txt

@@ -1 +1 @@
 x.x xxxxxxxx
- - Added public page of the list of know urls
+ - Added public page of the list of know urls and in/visible status
+ - Added passworded links
+
+0.3 20100414
+ * Added DC 2.2 compatibility (new settings)
+ * Added semi-custom hash on kUtRL service
+ * Added status update for Twitter/Identi.ca on new short link
+ * Added services error management (first step)
+ * Added options to widgets
+ * Upgraded bitly service to v3
+ * Changed admin design
 
 0.2 20091223