Changeset 2405

Timestamp:

06/28/10 12:46:50 (13 years ago)

Author:

JcDenis

Message:

kUtRL 0.4

• Switched to DC 2.2
• Fixed no short urls on preview mode
• Fixed lock hash of deleted urls
• Fixed hide new short url widget on kutrl pages
• Fixed typo
• Added active mode that shorten urls on default template values
• Added special tweeter message for post (can include post title)
• Added kutrl special 404 page

Location:

plugins/kUtRL

Files:

• _admin.php (modified) (14 diffs)
• _define.php (modified) (1 diff)
• _install.php (modified) (5 diffs)
• _prepend.php (modified) (3 diffs)
• _public.php (modified) (22 diffs)
• _widgets.php (modified) (5 diffs)
• default-templates/img (added)
• default-templates/img/broken-link.png (added)
• default-templates/kutrl.html (modified) (2 diffs)
• default-templates/kutrl404.html (added)
• inc/index.link.php (modified) (9 diffs)
• inc/index.setting.php (modified) (10 diffs)
• inc/lib.kutrl.log.php (modified) (1 diff)
• inc/lib.kutrl.srv.php (modified) (2 diffs)
• inc/lib.wiki.kutrl.php (modified) (4 diffs)
• inc/services/class.local.service.php (modified) (5 diffs)
• index.php (modified) (2 diffs)
• locales/fr/main.lang.php (modified) (9 diffs)
• locales/fr/main.po (modified) (10 diffs)
• release.txt (modified) (1 diff)

plugins/kUtRL/_admin.php

@@ -23 +23 @@
 );
 
-$s = kutrlSettings($core);
-
 # Admin behaviors
-if ($s->kutrl_active)
+if ($core->blog->settings->kUtRL->kutrl_active)
 {
      $core->addBehavior('adminPostHeaders',array('adminKutrl','adminPostHeaders'));
@@ -39 +37 @@
 
 # Import/export
-if ($s->kutrl_extend_importexport)
+if ($core->blog->settings->kUtRL->kutrl_extend_importexport)
 {
      $core->addBehavior('exportFull',array('backupKutrl','exportFull'));
@@ -55 +53 @@
           return dcPage::jsLoad('index.php?pf=kUtRL/js/admin.js');
      }
-
+     
      public static function adminPostFormSidebar($post)
      {
           global $core;
-          $s = kutrlSettings($core);
-
+          $s = $core->blog->settings->kUtRL;
+          
           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;
-          }
-
+          
+          try
+          {
+               $kut = new $core->kutrlServices[$s->kutrl_admin_service]($core,$s->kutrl_limit_to_blog);
+          }
+          catch (Exception $e)
+          {
+               return;
+          }
+          
           if ($post)
           {
@@ -81 +81 @@
                $rs = false;
           }
-
+          
           echo 
           '<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)
           {
@@ -131 +131 @@
                }
                $href = $kut->url_base.$rs->hash;
-
+               
                echo 
                '<p><label class="classic">'.
@@ -140 +140 @@
           echo '</div>';
      }
-
+     
      public static function adminAfterPostUpdate($cur,$post_id)
      {
           global $core;
-          $s = kutrlSettings($core);
-
+          $s = $core->blog->settings->kUtRL;
+          
           # Create: see adminAfterPostCreate
           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;
-          }
-
+          
+          try
+          {
+               $kut = new $core->kutrlServices[$s->kutrl_admin_service]($core,$s->kutrl_limit_to_blog);
+          }
+          catch (Exception $e)
+          {
+               return;
+          }
+          
           if (empty($_POST['kutrl_old_post_url'])) return;
-
+          
           $old_post_url = $_POST['kutrl_old_post_url'];
-
+          
           if (!($rs = $kut->isKnowUrl($old_post_url))) return;
-
+          
           $rs = $core->blog->getPosts(array('post_id'=>$post_id));
-
+          
           if ($rs->isEmpty()) return;
-
+          
           $new_post_url = $rs->getURL();
-
+          
           # Delete
           if (!empty($_POST['kutrl_delete']))
@@ -179 +181 @@
           {
                if ($old_post_url == $new_post_url) return;
-
+               
                $kut->remove($old_post_url);
-
+               
                $rs = $kut->hash($new_post_url,$custom); // better to update (not yet implemented)
                $url = $kut->url_base.$rs->hash;
-
+               
                # Send new url by libDcTwitter
-               if (!empty($rs) && !empty($_POST['kutrl_twit_send'])) {
+               if (!empty($rs) && !empty($_POST['kutrl_twit_send']))
+               {
+                    $twit = $core->blog->settings->kUtRL->kutrl_twit_post_msg;
+                    if (!$twit)
+                    {
+                         $twit = kutrlLibDcTwitter::getMessage('kUtRL');
+                    }
+                    if ($twit)
+                    {
+                         $twit = str_replace(
+                              array('%L','%B','%U'),
+                              array($url,$core->blog->name,$core->auth->getInfo('user_cn'))
+                              ,$twit
+                         );
+                         kutrlLibDcTwitter::sendMessage('kUtRL',$twit);
+                    }
+               }
+          }
+     }
+     
+     public static function adminAfterPostCreate($cur,$post_id)
+     {
+          global $core;
+          $s = $core->blog->settings->kUtRL;
+          
+          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;
+          }
+          
+          $rs = $core->blog->getPosts(array('post_id'=>$post_id));
+          
+          if ($rs->isEmpty()) return;
+          
+          $custom = !empty($_POST['kutrl_create_custom']) && $kut->allow_customized_hash ?
+               $_POST['kutrl_create_custom'] : null;
+          
+          $rs = $kut->hash($rs->getURL(),$custom);
+          $kut->url_base.$rs->hash;
+          
+          # Send new url by libDcTwitter
+          if (!empty($rs) && !empty($_POST['kutrl_twit_send']))
+          {
+               $twit = $core->blog->settings->kUtRL->kutrl_twit_post_msg;
+               if (!$twit)
+               {
                     $twit = kutrlLibDcTwitter::getMessage('kUtRL');
+               }
+               if ($twit)
+               {
                     $twit = str_replace(
                          array('%L','%B','%U'),
@@ -197 +255 @@
           }
      }
-
-     public static function adminAfterPostCreate($cur,$post_id)
-     {
-          global $core;
-          $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;
-          }
-
+     
+     public static function adminBeforePostDelete($post_id)
+     {
+          global $core;
+          $s = $core->blog->settings->kUtRL;
+          
+          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;
+          }
+          
           $rs = $core->blog->getPosts(array('post_id'=>$post_id));
-
+          
           if ($rs->isEmpty()) return;
-
-          $custom = !empty($_POST['kutrl_create_custom']) && $kut->allow_customized_hash ?
-               $_POST['kutrl_create_custom'] : null;
-
-          $rs = $kut->hash($rs->getURL(),$custom);
-          $kut->url_base.$rs->hash;
-
-          # Send new url by libDcTwitter
-          if (!empty($rs) && !empty($_POST['kutrl_twit_send'])) {
-               $twit = kutrlLibDcTwitter::getMessage('kUtRL');
-               $twit = str_replace(
-                    array('%L','%B','%U'),
-                    array($url,$core->blog->name,$core->auth->getInfo('user_cn'))
-                    ,$twit
-               );
-               kutrlLibDcTwitter::sendMessage('kUtRL',$twit);
-          }
-     }
-
-     public static function adminBeforePostDelete($post_id)
-     {
-          global $core;
-          $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;
-          }
-
-          $rs = $core->blog->getPosts(array('post_id'=>$post_id));
-
-          if ($rs->isEmpty()) return;
-
+          
           $kut->remove($rs->getURL());
      }
-
+     
      public static function adminPostsActionsCombo($args)
      {
           global $core;
-          $s = kutrlSettings($core);
-
+          $s = $core->blog->settings->kUtRL;
+          
           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';
@@ -275 +297 @@
           if ($action != 'kutrl_create' 
            && $action != 'kutrl_delete') return;
-
-          $s = kutrlSettings($core);
-
+          
+          $s = $core->blog->settings->kUtRL;
+          
           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;
-          }
-
+          
+          try
+          {
+               $kut = new $core->kutrlServices[$s->kutrl_admin_service]($core,$s->kutrl_limit_to_blog);
+          }
+          catch (Exception $e)
+          {
+               return;
+          }
+          
           while ($posts->fetch())
           {
                $url = $posts->getURL();
-
+               
                if ($action == 'kutrl_create')
                {
                     $kut->hash($url);
                }
-
+               
                if ($action == 'kutrl_delete')
                {
@@ -319 +343 @@
           );
      }
-
+     
      public static function exportFull($core,$exp)
      {
           $exp->exportTable('kutrl');
      }
-
+     
      public static function importInit($bk,$core)
      {
@@ -330 +354 @@
           $bk->kutrl = new kutrlLog($core);
      }
-
+     
      public static function importSingle($line,$bk,$core)
      {
@@ -342 +366 @@
           }
      }
-
+     
      public static function importFull($line,$bk,$core)
      {
@@ -348 +372 @@
           {
                $bk->cur_kutrl->clean();
-
+               
                $bk->cur_kutrl->kut_id = (integer) $line->kut_id;
                $bk->cur_kutrl->blog_id = (string) $line->blog_id;
@@ -358 +382 @@
                $bk->cur_kutrl->kut_counter = (integer) $line->kut_counter;
                $bk->cur_kutrl->kut_password = (string) $line->kut_password;
-
+               
                $bk->cur_kutrl->insert();
           }

plugins/kUtRL/_define.php

@@ -17 +17 @@
      /* Description*/         "Use, create and serve short url on your blog",
      /* Author */             "JC Denis",
-     /* Version */            '0.3.3',
+     /* Version */            '0.4',
      /* Permissions */        'admin'
 );
-     /* date */          #20100528
+     /* date */          #20100628
 ?>

plugins/kUtRL/_install.php

@@ -23 +23 @@
 try
 {
-     # Check DC version (dev on)
-     if (!version_compare(DC_VERSION,'2.1.6','>='))
+     if (version_compare(DC_VERSION,'2.2-alpha','<'))
      {
-          throw new Exception('Plugin called kUtRL requires Dotclear 2.1.6 or higher.');
+          throw new Exception('Plugin called kUtRL requires Dotclear 2.2 or higher.');
      }
-
+     
      # Table
      $t = new dbStruct($core->con,$core->prefix);
@@ -41 +40 @@
           ->kut_password('varchar',32,true)
           ->kut_counter('bigint',0,false,0)
-
+          
           ->primary('pk_kutrl','kut_id')
           ->index('idx_kut_blog_id','btree','blog_id')
@@ -47 +46 @@
           ->index('idx_kut_service','btree','kut_service')
           ->index('idx_kut_type','btree','kut_type');
-
+     
      $ti = new dbStruct($core->con,$core->prefix);
      $changes = $ti->synchronize($t);
-
+     
      # Settings
-     $s = kutrlSettings($core);
+     $core->blog->settings->addNamespace('kUtRL');
+     $s = $core->blog->settings->kUtRL;
      $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);
@@ -58 +58 @@
      $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);
+     $s->put('kutrl_tpl_passive',true,'boolean','Return long url on kutrl tags if kutrl is unactivate',false,true);
+     $s->put('kutrl_tpl_active',false,'boolean','Return short url on dotclear tags if kutrl is active',false,true);
      $s->put('kutrl_admin_entry_default',true,'boolean','Create short link an new entry by default',false,true);
      # Settings for features related to others plugins
@@ -71 +72 @@
      $s->put('kutrl_srv_local_public',false,'boolean','Enabled local service public page',false,true);
      $s->put('kutrl_srv_local_css',$local_css,'string','Special CSS for kutrl local service',false,true);
+     $s->put('kutrl_srv_local_404_active',false,'boolean','Use special 404 page on unknow urls',false,true);
      # Settings for "bilbolinks" service
      $s->put('kutrl_srv_bilbolinks_base','http://tux-pla.net/','string','URL of bilbolinks service',false,true);
      # 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);
+     $s->put('kutrl_twit_msg','%L by %U on %B','string','Tweet message to send',false,true);
+     $s->put('kutrl_twit_onadmin',true,'boolean','Send tweet on new link on administration form',false,true);
+     $s->put('kutrl_twit_onpublic',false,'boolean','Send tweet on new link on public form',false,true);
+     $s->put('kutrl_twit_ontpl',false,'boolean','Send tweet on new link on templates',false,true);
+     $s->put('kutrl_twit_onwiki',false,'boolean','Send tweet on new link on wiki synthax',false,true);
+     $s->put('kutrl_twit_post_msg','%T on %L','string','Special tweet message to send on admin edit entry page',false,true);
      
-
      # Version
      $core->setVersion('kUtRL',$new_version);
-
+     
      # Get dcMiniUrl records as this plugin do the same
      if ($core->plugins->moduleExists('dcMiniUrl'))

plugins/kUtRL/_prepend.php

@@ -12 +12 @@
 
 if (!defined('DC_RC_PATH')) return;
+if (version_compare(DC_VERSION,'2.2-alpha','<')){return;}
 
 global $__autoload, $core;
+
+# Namespace for settings
+$core->blog->settings->addNamespace('kUtRL');
 
 # Main class
@@ -23 +27 @@
 
 $__autoload['localKutrlService'] = dirname(__FILE__).'/inc/services/class.local.service.php';
+$__autoload['isgdKutrlService'] = dirname(__FILE__).'/inc/services/class.isgd.service.php';
+$__autoload['shorttoKutrlService'] = dirname(__FILE__).'/inc/services/class.shortto.service.php';
+$__autoload['trimKutrlService'] = dirname(__FILE__).'/inc/services/class.trim.service.php';
+$__autoload['bitlyKutrlService'] = dirname(__FILE__).'/inc/services/class.bitly.service.php';
+$__autoload['bilbolinksKutrlService'] = dirname(__FILE__).'/inc/services/class.bilbolinks.service.php';
+
 $core->kutrlServices['local'] = 'localKutrlService';
-
-$__autoload['isgdKutrlService'] = dirname(__FILE__).'/inc/services/class.isgd.service.php';
 $core->kutrlServices['isgd'] = 'isgdKutrlService';
-
-$__autoload['shorttoKutrlService'] = dirname(__FILE__).'/inc/services/class.shortto.service.php';
 $core->kutrlServices['shortto'] = 'shorttoKutrlService';
-
-$__autoload['trimKutrlService'] = dirname(__FILE__).'/inc/services/class.trim.service.php';
 $core->kutrlServices['trim'] = 'trimKutrlService';
-
-$__autoload['bitlyKutrlService'] = dirname(__FILE__).'/inc/services/class.bitly.service.php';
 $core->kutrlServices['bitly'] = 'bitlyKutrlService';
-
-$__autoload['bilbolinksKutrlService'] = dirname(__FILE__).'/inc/services/class.bilbolinks.service.php';
 $core->kutrlServices['bilbolinks'] = 'bilbolinksKutrlService';
 
@@ -52 +52 @@
 $__autoload['kutrlLibDcTwitter'] = 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.2-alpha','>=')) { 
-          $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 (kutrlSettings($core)->kutrl_extend_activityreport && defined('ACTIVITY_REPORT'))
+if ($core->blog->settings->kUtRL->kutrl_extend_activityreport && defined('ACTIVITY_REPORT'))
 {
      require_once dirname(__FILE__).'/inc/lib.kutrl.activityreport.php';

plugins/kUtRL/_public.php

@@ -15 +15 @@
 require_once dirname(__FILE__).'/_widgets.php';
 
-$core->addBehavior('publicBeforeDocument',array('urlKutrl','publicBeforeDocument'));
-$core->addBehavior('publicHeadContent',array('urlKutrl','publicHeadContent'));
+$core->tpl->setPath($core->tpl->getPath(),dirname(__FILE__).'/default-templates');
+
+$core->addBehavior('publicBeforeDocument',array('pubKutrl','publicBeforeDocument'));
+$core->addBehavior('publicHeadContent',array('pubKutrl','publicHeadContent'));
+$core->addBehavior('publicBeforeContentFilter',array('pubKutrl','publicBeforeContentFilter'));
 
 $core->tpl->addBlock('kutrlPageIf',array('tplKutrl','pageIf'));
@@ -45 +48 @@
      {
           global $core, $_ctx;
-          $s = kutrlSettings($core);
-
+          $s = $core->blog->settings->kUtRL;
+          
+          # Not active, go to default 404
           if (!$s->kutrl_active)
           {
@@ -52 +56 @@
                return;
           }
-
+          # Not a valid url, go to kutrl 404
           if (!preg_match('#^(|(/(.*?)))$#',$args,$m))
           {
-               self::p404();
-               return;
-          }
-
+               self::kutrl404();
+               return;
+          }
+          
           $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,$s->kutrl_limit_to_blog);
-
+          
+          # Nothing on url
           if ($m[1] == '/')
           {
                $_ctx->kutrl_msg = 'No link given.';
           }
-
-          // find suffix on redirect url
+          # find suffix on redirect url
           $suffix = '';
           if (preg_match('@^([^?/#]+)(.*?)$@',$args,$more))
@@ -78 +82 @@
                $suffix = $more[2];
           }
-
+          # No arg, go to kurtl page
           if ($args == '')
           {
@@ -84 +88 @@
                return;
           }
-
+          # Not find, go to kutrl 404
           if (false === ($url = $kut->getUrl($args)))
           {
-               $_ctx->kutrl_msg = 'Failed to find short link.';
-               self::pageKutrl($kut);
-               return;
-          }
-
+               //$_ctx->kutrl_msg = 'Failed to find short link.';
+               //self::pageKutrl($kut);
+               
+               self::kutrl404();
+               return;
+          }
+          # Removed (empty url), go to kutrl 404
+          if (!$url)
+          {
+               self::kutrl404();
+               return;
+          }
+          
           $core->blog->triggerBlog();
           http::redirect($url.$suffix);
           return;
      }
-
+     
      private static function pageKutrl($kut)
      {
           global $core, $_ctx;
-          $s = kutrlSettings($core);
-
-          if (!$s->kutrl_active || !$s->kutrl_srv_local_public)
+          $s = $core->blog->settings->kUtRL;
+          
+          # Not active, go to default 404
+          if (!$s->kutrl_active)
           {
                self::p404();
                return;
           }
-
-          # Valid form
+          # Public page not active, go to kutrl 404
+          if (!$s->kutrl_srv_local_public)
+          {
+               self::kutrl404();
+               return;
+          }
+          # Validation form
           $url = !empty($_POST['longurl']) ? trim($core->con->escape($_POST['longurl'])) : '';
           if (!empty($url))
@@ -114 +132 @@
                $hmf = !empty($_POST['hmf']) ? $_POST['hmf'] : '!';
                $hmfu = !empty($_POST['hmfp']) ? hmfKutrl::unprotect($_POST['hmfp']) : '?';
-
+               
                $err = false;
                if (!$err)
@@ -217 +235 @@
                }
           }
-
+          
           $core->tpl->setPath($core->tpl->getPath(),dirname(__FILE__).'/default-templates');
           self::serveDocument('kutrl.html');
           return;
      }
-
+     
+     protected static function kutrl404()
+     {
+          global $core;
+          
+          if (!$core->blog->settings->kUtRL->kutrl_srv_local_404_active)
+          {
+               self::p404();
+               return;
+          }
+          
+          $core->tpl->setPath($core->tpl->getPath(),dirname(__FILE__).'/default-templates');
+          $_ctx =& $GLOBALS['_ctx'];
+          $core = $GLOBALS['core'];
+          
+          header('Content-Type: text/html; charset=UTF-8');
+          http::head(404,'Not Found');
+          $core->url->type = '404';
+          $_ctx->current_tpl = 'kutrl404.html';
+          $_ctx->content_type = 'text/html';
+          
+          echo $core->tpl->getData($_ctx->current_tpl);
+          
+          # --BEHAVIOR-- publicAfterDocument
+          $core->callBehavior('publicAfterDocument',$core);
+          exit;
+     }
+}
+
+class pubKutrl
+{
+     # Replace long urls on the fly for default tags
+     public static function publicBeforeContentFilter($core,$tag,$args)
+     {
+          if (!$core->blog->settings->kUtRL->kutrl_active 
+           || !$core->blog->settings->kUtRL->kutrl_tpl_active) return;
+          
+          $know_tags = array(
+               'AttachmentURL',
+               'MediaURL',
+               'EntryAuthorURL',
+               'EntryURL',
+               'CommentAuthorURL',
+               'CommentPostURL'
+          );
+          
+          # Unknow tag
+          if (!in_array($tag,$know_tags)) return;
+          
+          global $_ctx;
+          
+          # Oups
+          if (!$_ctx->exists('kutrl')) return;
+          
+          # Existing
+          if (false !== ($kutrl_rs = $_ctx->kutrl->isKnowUrl($args[0])))
+          {
+               $args[0] = $_ctx->kutrl->url_base.$kutrl_rs->hash;
+          }
+          # New
+          elseif (false !== ($kutrl_rs = $_ctx->kutrl->hash($args[0])))
+          {
+               $args[0] = $_ctx->kutrl->url_base.$kutrl_rs->hash;
+          
+               # Send new url by libDcTwitter
+               if ($_ctx->kutrl_twit_ontpl)
+               {
+                    $twit = kutrlLibDcTwitter::getMessage('kUtRL');
+                    $twit = str_replace(array('%L','%B','%U'),array($_ctx->kutrl->url_base.$kutrl_rs->hash,$core->blog->name,__('public')),$twit);
+                    kutrlLibDcTwitter::sendMessage('kUtRL',$twit);
+               }
+          }
+     }
+     
      public static function publicBeforeDocument($core)
      {
           global $_ctx;
-          $s = kutrlSettings($core);
+          $s = $core->blog->settings->kUtRL;
 
           # Passive : all kutrl tag return long url
@@ -232 +323 @@
           # 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 
            || !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 = kutrlSettings($core);
-          $css = $s->kutrl_srv_local_css;
+          $css = $core->blog->settings->kUtRL->kutrl_srv_local_css;
           if ($css)
           {
@@ -261 +351 @@
           return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("kutrl")').'; ?>';
      }
-
+     
      public static function pageIf($attr,$content)
      {
           $operator = isset($attr['operator']) ? self::getOperator($attr['operator']) : '&&';
-
+          
           if (isset($attr['is_active']))
           {
                $sign = (boolean) $attr['is_active'] ? '' : '!';
-               $if[] = $sign.'$s->kutrl_srv_local_public';
-          }
-
+               $if[] = $sign.'$core->blog->settings->kUtRL->kutrl_srv_local_public';
+          }
+          
           if (empty($if))
           {
                return $content;
           }
-
+          
           return 
-          "<?php \$s = kutrlSettings(\$core); ".
-          "if(".implode(' '.$operator.' ',$if).") : ?>\n".
+          "<?php 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']))
           {
@@ -293 +382 @@
                $if[] = '"" '.$sign.'= $_ctx->kutrl_msg';
           }
-
+          
           if (empty($if))
           {
                return $content;
           }
-
+          
           return 
           "<?php if(".implode(' '.$operator.' ',$if).") : ?>\n".
@@ -304 +393 @@
           "<?php endif; ?>\n";
      }
-
+     
      public static function pageMsg($attr)
      {
           return '<?php echo $_ctx->kutrl_msg; ?>';
      }
-
+     
      public static function humanField($attr)
      {
           return "<?php echo sprintf(__('Rewrite \"%s\" in next field to show that you are not a robot:'),\$_ctx->kutrl_hmf); ?>";
      }
-
+     
      public static function humanFieldProtect($attr)
      {
@@ -321 +410 @@
           "<?php echo \$core->formNonce(); ?>";
      }
-
+     
      public static function AttachmentKutrlIf($attr,$content)
      {
           return self::genericKutrlIf('$attach_f->file_url',$attr,$content);
      }
-
+     
      public static function AttachmentKutrl($attr)
      {
           return self::genericKutrl('$attach_f->file_url',$attr);
      }
-
+     
      public static function MediaKutrlIf($attr,$content)
      {
           return self::genericKutrlIf('$_ctx->file_url',$attr,$content);
      }
-
+     
      public static function MediaKutrl($attr)
      {
           return self::genericKutrl('$_ctx->file_url',$attr);
      }
-
+     
      public static function EntryAuthorKutrlIf($attr,$content)
      {
           return self::genericKutrlIf('$_ctx->posts->user_url',$attr,$content);
      }
-
+     
      public static function EntryAuthorKutrl($attr)
      {
           return self::genericKutrl('$_ctx->posts->user_url',$attr);
      }
-
+     
      public static function EntryKutrlIf($attr,$content)
      {
           return self::genericKutrlIf('$_ctx->posts->getURL()',$attr,$content);
      }
-
+     
      public static function EntryKutrl($attr)
      {
           return self::genericKutrl('$_ctx->posts->getURL()',$attr);
      }
-
+     
      public static function CommentAuthorKutrlIf($attr,$content)
      {
           return self::genericKutrlIf('$_ctx->comments->getAuthorURL()',$attr,$content);
      }
-
+     
      public static function CommentAuthorKutrl($attr)
      {
           return self::genericKutrl('$_ctx->comments->getAuthorURL()',$attr);
      }
-
+     
      public static function CommentPostKutrlIf($attr,$content)
      {
           return self::genericKutrlIf('$_ctx->comments->getPostURL()',$attr,$content);
      }
-
+     
      public static function CommentPostKutrl($attr)
      {
           return self::genericKutrl('$_ctx->comments->getPostURL()',$attr);
      }
-
+     
      protected static function genericKutrlIf($str,$attr,$content)
      {
           $operator = isset($attr['operator']) ? self::getOperator($attr['operator']) : '&&';
-
+          
           if (isset($attr['is_active']))
           {
@@ -391 +480 @@
                $if[] = $sign.'$_ctx->exists("kutrl")';
           }
-
+          
           if (isset($attr['passive_mode']))
           {
@@ -397 +486 @@
                $if[] = $sign.'$_ctx->kutrl_passive';
           }
-
+          
           if (isset($attr['has_kutrl']))
           {
@@ -403 +492 @@
                $if[] = '($_ctx->exists("kutrl") && false '.$sign.'== $_ctx->kutrl->select('.$str.',null,null,"kutrl"))';
           }
-
+          
           if (empty($if))
           {
@@ -413 +502 @@
           "<?php endif; ?>\n";
      }
-
+     
      protected static function genericKutrl($str,$attr)
      {
@@ -419 +508 @@
           return 
           "<?php \n".
+          # Preview
+          "if (\$_ctx->preview) { \n".
+          " echo ".sprintf($f,$str)."; ".
+          "} else { \n".
+          # Disable
           "if (!\$_ctx->exists('kutrl')) { \n".
+          # Passive mode
           " if (\$_ctx->kutrl_passive) { ".
           "  echo ".sprintf($f,$str)."; ".
@@ -436 +531 @@
            "\$twit = kutrlLibDcTwitter::getMessage('kUtRL'); ".
            "\$twit = str_replace(array('%L','%B','%U'),array(\$_ctx->kutrl->url_base.\$kutrl_rs->hash,\$core->blog->name,__('public')),\$twit); ".
-           "kutrlLibDcTwitter::sendMessage('kUtRL',\$twit); ";
+           "kutrlLibDcTwitter::sendMessage('kUtRL',\$twit); ".
            " unset(\$twit); ".
           "} \n".
-
+          
           " } \n".
           " unset(\$kutrl_rs); \n".
@@ -445 +540 @@
           "?>\n";
      }
-
+     
      protected static function getOperator($op)
      {
@@ -464 +559 @@
 {
      public static $chars = 'abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789';
-
+     
      public static function create($len=6)
      {
@@ -470 +565 @@
           $chars = self::$chars;
 
-          for($i = 0;$i < $len; $i++) {
+          for($i = 0;$i < $len; $i++)
+          {
                $res .= $chars[rand(0,strlen($chars)-1)];
           }
-
+          
           return $res;
      }
-
+     
      public static function protect($str)
      {
@@ -482 +578 @@
           $chars = self::$chars;
 
-          for($i = 0; $i < strlen($str);$i++) {
+          for($i = 0; $i < strlen($str);$i++)
+          {
                $res .= $chars[rand(0,strlen($chars)-1)].$str[$i];
           }
-
+          
           return $res;
      }
-
+     
      public static function unprotect($str)
      {
           $res = '';
 
-          for($i = 0; $i < strlen($str);$i++) {
+          for($i = 0; $i < strlen($str);$i++)
+          {
                $i++;
                $res .= $str[$i];
           }
-
+          
           return $res;
      }

plugins/kUtRL/_widgets.php

@@ -30 +30 @@
           );
      }
-
+     
      public static function adminRank($w)
      {
@@ -80 +80 @@
           );
      }
-
+     
      public static function publicShorten($w)
      {
           global $core;
-          $s = kutrlSettings($core);
-
+          $s = $core->blog->settings->kUtRL;
+          
           if (!$s->kutrl_active 
            || !$s->kutrl_srv_local_public 
-           || !$w->homeonly && $core->url->type != 'default') return;
-
+           || $w->homeonly && $core->url->type != 'default'
+           || $core->url->type == 'kutrl') return;
+          
           $hmf = hmfKutrl::create();
           $hmfp = hmfKutrl::protect($hmf);
-
+          
           return 
           '<div class="shortenkutrlwidget">'.
@@ -113 +114 @@
           '</div>';
      }
-
+     
      public static function publicRank($w)
      {
           global $core;
-          $s = kutrlSettings($core);
-
+          $s = $core->blog->settings->kUtRL;
+          
           if (!$s->kutrl_active 
            || $w->homeonly && $core->url->type != 'default') return;
-
+          
           $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) {
+          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 '.
@@ -147 +149 @@
                $type.$hide.$more.'ORDER BY '.$order.$limit
           );
-
+          
           if ($rs->isEmpty()) return;
-
+          
           $content = '';
           $i = 0;
-
+          
           while($rs->fetch())
           {
                $i++;
                $rank = '<span class="rankkutrl-rank">'.$i.'</span>';
-
+               
                $hash = $rs->kut_hash;
                $url = $core->blog->url.$core->url->getBase('kutrl').'/'.$hash;
                $cut_len = - abs((integer) $w->urllen);
-
+               
                if (strlen($url) > $cut_len)
+               {
                     $url = '...'.substr($url,$cut_len);
+               }
 /*
                if (strlen($hash) > $cut_len)
+               {
                     $url = '...'.substr($hash,$cut_len);
-*/
+               }
+//*/
                if ($rs->kut_counter == 0)
+               {
                     $counttext = __('never followed');
+               }
                elseif ($rs->kut_counter == 1)
+               {
                     $counttext = __('followed one time');
+               }
                else
+               {
                     $counttext = sprintf(__('followed %s times'),$rs->kut_counter);
-
+               }
+               
                $content .= 
                     '<li><a href="'.
@@ -187 +199 @@
 
           }
-
+          
           if (!$content) return;
-
+          
           return 
           '<div class="rankkutrlwidget">'.

plugins/kUtRL/default-templates/kutrl.html

@@ -50 +50 @@
       <p><strong>{{tpl:kutrlMsg}}</strong></p>
      </tpl:kutrlMsgIf>
-
+ 
      <tpl:kutrlPageIf is_active="1">
       <form name="dokutrl" method="post" action="{{tpl:kutrlPageURL}}">
@@ -64 +64 @@
       </p>
       </form>
-     <tpl:kutrlPageIf>
+     </tpl:kutrlPageIf>
   </div>
   

plugins/kUtRL/inc/index.link.php

@@ -18 +18 @@
 $s_limit_to_blog = (boolean) $s->kutrl_limit_to_blog;
 
-if (isset($core->kutrlServices[$s_admin_service])) {
+if (isset($core->kutrlServices[$s_admin_service]))
+{
      $kut = new $core->kutrlServices[$s_admin_service]($core,$s_limit_to_blog);
 }
@@ -25 +26 @@
 if ($action == 'createlink') {
 
-     try {
+     try
+     {
           if (!isset($core->kutrlServices[$s_admin_service]))
                throw new Exception('Unknow service');
-
+          
           $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 ($s_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 (null !== $hash && false !== ($rs = $kut->isKnowHash($hash)))
                throw new Exception(__('This custom short url is already taken.'));
-
+          
           if (false !== ($rs = $kut->isKnowUrl($url)))
           {
@@ -74 +76 @@
                if (false === ($rs = $kut->hash($url,$hash)))
                {
-                    if ($kut->error->flag()) {
+                    if ($kut->error->flag())
+                    {
                          throw new Exception($kut->error->toHTML());
                     }
@@ -91 +94 @@
 
                     # Send new url by libDcTwitter
-                    if ($s->kutrl_twit_onadmin) {
+                    if ($s->kutrl_twit_onadmin)
+                    {
                          $twit = kutrlLibDcTwitter::getMessage('kUtRL');
                          $twit = str_replace(
@@ -103 +107 @@
           }
      }
-     catch (Exception $e) {
+     catch (Exception $e)
+     {
           $core->error->add($e->getMessage());
      }
@@ -117 +122 @@
 '</h2>'.$msg;
 
-if (!isset($core->kutrlServices[$s_admin_service])) {
-
+if (!isset($core->kutrlServices[$s_admin_service]))
+{
      echo '<p>'.__('You must set an admin service.').'</p>';
 }
@@ -125 +130 @@
      echo '
      <form id="create-link" method="post" action="'.$p_url.'">
-
+     
      <h3>'.sprintf(__('Shorten link using service "%s"'),$kut->name).'</h3>
      <p class="classic"><label for="str">'.__('Long link:').
      form::field('str',100,255,'').'</label></p>';
-
-     if ($kut->allow_customized_hash) {
-
+     
+     if ($kut->allow_customized_hash)
+     {
           echo
           '<p class="classic"><label for="custom">'.
@@ -137 +142 @@
           form::field('custom',50,32,'').'</label></p>'.
           '<p class="form-note">'.__('Only if you want a custom short link.').'</p>';
-
-          if ($s_admin_service == 'local') {
+          
+          if ($s_admin_service == 'local')
+          {
                echo '<p class="form-note">'.
                __('You can use "bob!!" if you want a semi-custom link, it starts with "bob" and "!!" will be replaced by an increment value.').
@@ -144 +150 @@
           }
      }
-
+     
      echo '
      <div class="clear">

plugins/kUtRL/inc/index.setting.php

@@ -21 +21 @@
 $s_limit_to_blog = (boolean) $s->kutrl_limit_to_blog;
 $s_tpl_passive = (boolean) $s->kutrl_tpl_passive;
+$s_tpl_active = (boolean) $s->kutrl_tpl_active;
 $s_admin_entry_default = (string) $s->kutrl_admin_entry_default;
 
@@ -27 +28 @@
 $s_twit_ontpl = (boolean) $s->kutrl_twit_ontpl;
 $s_twit_onwiki = (boolean) $s->kutrl_twit_onwiki;
+$s_twit_post_msg = (string) $s->kutrl_twit_post_msg;
 
 $section = isset($_REQUEST['section']) ? $_REQUEST['section'] : '';
@@ -42 +44 @@
           $s_limit_to_blog = isset($_POST['s_limit_to_blog']);
           $s_tpl_passive = isset($_POST['s_tpl_passive']);
+          $s_tpl_active = isset($_POST['s_tpl_active']);
           $s_admin_entry_default = isset($_POST['s_admin_entry_default']);
 
@@ -48 +51 @@
           $s_twit_ontpl = isset($_POST['s_twit_ontpl']);
           $s_twit_onwiki = isset($_POST['s_twit_onwiki']);
+          $s_twit_post_msg = $_POST['s_twit_post_msg'];
 
           $s->put('kutrl_active',$s_active);
@@ -55 +59 @@
           $s->put('kutrl_limit_to_blog',$s_limit_to_blog);
           $s->put('kutrl_tpl_passive',$s_tpl_passive);
+          $s->put('kutrl_tpl_active',$s_tpl_active);
           $s->put('kutrl_admin_entry_default',$s_admin_entry_default);
 
@@ -61 +66 @@
           $s->put('kutrl_twit_ontpl',$s_twit_ontpl);
           $s->put('kutrl_twit_onwiki',$s_twit_onwiki);
+          $s->put('kutrl_twit_post_msg',$s_twit_post_msg);
 
           # Save libDcTwitter settings
@@ -100 +106 @@
 
 <fieldset id="setting-plugin"><legend>'. __('Plugin activation').'</legend>
-<p class="field"><label>'.
+<p><label class="classic">'.
 form::checkbox(array('s_active'),'1',$s_active).
 __('Enable plugin').'</label></p>
@@ -106 +112 @@
 
 <fieldset id="setting-option"><legend>'. __('General rules').'</legend>
-<p class="field"><label>'.
+<p><label class="classic">'.
 form::checkbox(array('s_limit_to_blog'),'1',$s_limit_to_blog).
 __('Limit short link to current blog').'</label></p>
 <p class="form-note">'.__('Only link started with this blog URL could be shortened.').'</p>
-<p class="field"><label>'.
+<p><label class="classic">'.
 form::checkbox(array('s_tpl_passive'),'1',$s_tpl_passive).
 __('Passive mode').'</label></p>
-<p class="form-note">'.__('If this extension is disabled and the passive mode is enabled, "kutrl" tags will display long urls instead of nothing on templates.').'</p>
-<p class="field"><label>'.
+<p class="form-note">'.__('If this extension is disabled and the passive mode is enabled, "kutrl" tags (like EntryKurl) will display long urls instead of nothing on templates.').'</p>
+<p><label class="classic">'.
+form::checkbox(array('s_tpl_active'),'1',$s_tpl_active).
+__('Active mode').'</label></p>
+<p class="form-note">'.__('If the active mode is enabled, all know default template tags (like EntryURL) will display short urls instead of long ones on templates.').'</p>
+<p><label class="classic">'.
 form::checkbox(array('s_admin_entry_default'),'1',$s_admin_entry_default).
 __('Create short link for new entries').'</label></p>
@@ -121 +131 @@
 
 <fieldset id="setting-service"><legend>'. __('Default services').'</legend>
-<p class="field"><label>';
+<p><label>';
 if (!empty($msg) && isset($core->kutrlServices[$s_admin_service])) {
      $o = new $core->kutrlServices[$s_admin_service]($core);
      echo $o->testService() ? $img_green : $img_red;
 }
-echo '&nbsp;'.__('Administration:').
+echo '&nbsp;'.__('Administration:').'<br />'.
 form::combo(array('s_admin_service'),$services_combo,$s_admin_service).'
 </label></p>
 <p class="form-note">'.__('Service to use in this admin page and on edit page of an entry.').'</p>
-<p class="field"><label>';
+<p><label>';
 if (!empty($msg) && isset($core->kutrlServices[$s_tpl_service])) {
      $o = new $core->kutrlServices[$s_tpl_service]($core);
      echo $o->testService() ? $img_green : $img_red;
 }
-echo '&nbsp;'.__('Templates:').
+echo '&nbsp;'.__('Templates:').'<br />'.
 form::combo(array('s_tpl_service'),$ext_services_combo,$s_tpl_service).'
 </label></p>
 <p class="form-note">'.__('Shorten links automatically when using template value like "EntryKutrl".').'</p>
-<p class="field"><label>';
+<p><label>';
 if (!empty($msg) && isset($core->kutrlServices[$s_wiki_service])) {
      $o = new $core->kutrlServices[$s_wiki_service]($core);
      echo $o->testService() ? $img_green : $img_red;
 }
-echo '&nbsp;'.__('Contents:').
+echo '&nbsp;'.__('Contents:').'<br />'.
 form::combo(array('s_wiki_service'),$ext_services_combo,$s_wiki_service).'
 </label></p>
@@ -158 +168 @@
 echo '
 <p class="form-note">'.__('Use wildcard %L for short URL, %B for blog name, %U for user name.').'</p>
+<p><label class="classic">'.__('Entry message:').'<br />'.
+form::field('s_twit_post_msg',50,255,$s_twit_post_msg,'',2).'
+</label></p>
+<p class="form-note">'.__('This is a special message that can be used on admin enrty page, use wildcard %T for entry title, %L for short URL, %B for blog name, %U for user name.').'</p>
 </div><div class="col">
 <h3>'.__('Activation').'</h3>
 <p>'.__('Send message when short url is created on:').'</p>
-<p class="field"><label>'.
+<p><label class="classic">'.
 form::checkbox(array('s_twit_onadmin'),'1',$s_twit_onadmin).
 __('administration form').'</label></p>
-<p class="field"><label>'.
+<p><label class="classic">'.
 form::checkbox(array('s_twit_onpublic'),'1',$s_twit_onpublic).
 __('public form').'</label></p>
-<p class="field"><label>'.
+<p><label class="classic">'.
 form::checkbox(array('s_twit_ontpl'),'1',$s_twit_ontpl).
 __('template').'</label></p>
-<p class="field"><label>'.
+<p><label class="classic">'.
 form::checkbox(array('s_twit_onwiki'),'1',$s_twit_onwiki).
 __('content').'</label></p>

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

@@ -103 +103 @@
           return $rs->isEmpty() ? false : $rs;
      }
+     
+     public function clear($id)
+     {
+          $id = (integer) $id;
+          
+          $cur = $this->con->openCursor($this->table);
+          $this->con->writeLock($this->table);
+          
+          try
+          {
+               $cur->kut_url = '';
+               $cur->kut_dt = date('Y-m-d H:i:s');
+               $cur->kut_counter = 0;
+               
+               $cur->update(
+                    "WHERE blog_id='".$this->blog."' ".
+                    "AND kut_id='".$id."' "
+               );
+               $this->con->unlock();
+               
+               return true;
+          }
+          catch (Exception $e)
+          {
+               $this->con->unlock();
+               throw $e;
+          }
+          return false;
+     }
 
      public function delete($id)

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

@@ -32 +32 @@
      {
           $this->core = $core;
-          $this->s = kutrlSettings($core);
+          $this->s = $core->blog->settings->kUtRL;
           $this->log = new kutrlLog($core);
           $this->limit_to_blog = (boolean) $limit_to_blog;
@@ -173 +173 @@
      }
 
-     # Delete url on service
-     public function deleteUrl($url)
+     # Delete url on service (second argument really delete urls)
+     public function deleteUrl($url,$delete=false)
      {
           return null;

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

@@ -20 +20 @@
      {
           global $core;
-          $s = kutrlSettings($core);
+          $s = $core->blog->settings->kUtRL;
 
           # Do nothing on comment preview and post preview
           if (!empty($_POST['preview']) 
-           || !empty($GLOBALS['c_ctx']) && $GLOBALS['c_ctx']->preview) return;
-
+           || !empty($GLOBALS['_ctx']) && $GLOBALS['_ctx']->preview) return;
+          
           if (!$s->kutrl_active || !$s->kutrl_wiki_service 
            || !isset($core->kutrlServices[$s->kutrl_wiki_service])) return;
-
-          try {
+          
+          try
+          {
                $kut = new $core->kutrlServices[$s->kutrl_wiki_service]($core,$s->kutrl_limit_to_blog);
           }
-          catch (Exception $e) {
+          catch (Exception $e)
+          {
                return;
           }
-
+          
           foreach($kut->allowed_protocols as $protocol)
           {
@@ -44 +46 @@
           }
      }
-
+     
      public static function transform($url,$content)
      {
           global $core;
-          $s = kutrlSettings($core);
-
+          $s = $core->blog->settings->kUtRL;
+          
           if (!$s->kutrl_active || !$s->kutrl_wiki_service 
            || !isset($core->kutrlServices[$s->kutrl_wiki_service])) return;
-
-          try {
+          
+          try
+          {
                $kut = new $core->kutrlServices[$s->kutrl_wiki_service]($core,$s->kutrl_limit_to_blog);
           }
-          catch (Exception $e) {
+          catch (Exception $e)
+          {
                return array();
           }
-
+          
           # Test if long url exists
           $is_new = false;
           $rs = $kut->isKnowUrl($url);
-          if (!$rs) {
+          if (!$rs)
+          {
                $is_new = true;
                $rs = $kut->hash($url);
@@ -79 +84 @@
                $res['title'] = sprintf(__('%s (Shorten with %s)'),$rs->url,__($kut->name));
                if ($testurl == $content) $res['content'] = $res['url'];
-
+               
                # Send new url by libDcTwitter
-               if ($s->kutrl_twit_onwiki && $is_new) {
+               if ($s->kutrl_twit_onwiki && $is_new)
+               {
                     $user = !defined('DC_CONTEXT_ADMIN') ? __('public') : $core->auth->getInfo('user_cn');
                     $twit = kutrlLibDcTwitter::getMessage('kUtRL');
@@ -87 +93 @@
                     kutrlLibDcTwitter::sendMessage('kUtRL',$twit);
                }
-
+               
                return $res;
           }

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

@@ -33 +33 @@
      public function saveSettings()
      {
-          $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->put('kutrl_srv_local_protocols',$_POST['kutrl_srv_local_protocols'],'string');
+          $this->s->put('kutrl_srv_local_public',isset($_POST['kutrl_srv_local_public']),'boolean');
+          $this->s->put('kutrl_srv_local_css',$_POST['kutrl_srv_local_css'],'string');
+          $this->s->put('kutrl_srv_local_404_active',isset($_POST['kutrl_srv_local_404_active']),'boolean');
      }
 
@@ -41 +42 @@
      {
           echo
+          '<div class="two-cols"><div class="col">'.
+          
+          '<p><strong>'.__('Settings:').'</strong></p>'.
+         '<p><label class="classic">'.
+          __('Allowed protocols:').'<br />'.
+         form::field(array('kutrl_srv_local_protocols'),50,255,$this->s->kutrl_srv_local_protocols).
+          '</label></p>'.
+
+         '<p class="form-note">'.
+         __('Use comma seperated list like: "http:,https:,ftp:"').
+         '</p>'.
+
+          '<p><label class="classic">'.
+          form::checkbox(array('kutrl_srv_local_public'),'1',$this->s->kutrl_srv_local_public).' '.
+          __('Enable public page for visitors to shorten links').
+          '</label></p>'.
+
+          '<p class="area" id="style-area"><label for="_style">'.__('CSS:').'</label>'.
+          form::textarea('kutrl_srv_local_css',50,3,html::escapeHTML($this->s->kutrl_srv_local_css),'',2).
+          '</p>'.
+          '<p class="form-note">'.__('You can add here special cascading style sheet. Body of page has class "dc-kutrl" and widgets have class "shortenkutrlwidget" and "rankkutrlwidget".').'</p>'.
+
+          '<p><label class="classic">'.
+          form::checkbox(array('kutrl_srv_local_404_active'),'1',$this->s->kutrl_srv_local_404_active).' '.
+          __('Enable special 404 error public page for unknow urls').
+          '</label></p>'.
+          '<p class="form-note">'.__('If this is not activated, the default 404 page of the theme will be display.').'</p>'.
+
+          '</div><div class="col">'.
+          
+          '<p><strong>'.__('Note:').'</strong></p>'.
           '<p>'.
           __('This service use your own Blog to shorten and serve URL.').'<br />'.
@@ -59 +91 @@
           echo 
           '</p>'.
-
-         '<p><label class="classic">'.
-          __('Allowed protocols:').'<br />'.
-         form::field(array('kutrl_srv_local_protocols'),50,255,$this->s->kutrl_srv_local_protocols).
-          '</label></p>'.
-
-         '<p class="form-note">'.
-         __('Use comma seperated list like: "http:,https:,ftp:"').
-         '</p>'.
-
-          '<p><label class="classic">'.
-          form::checkbox(array('kutrl_srv_local_public'),'1',$this->s->kutrl_srv_local_public).' '.
-          __('Enable public page for visitors to shorten links').
-          '</label></p>'.
-
-          '<p class="area" id="style-area"><label for="_style">'.__('CSS:').'</label>'.
-          form::textarea('kutrl_srv_local_css',50,3,html::escapeHTML($this->s->kutrl_srv_local_css),'',2).
-          '</p>'.
-          '<p class="form-note">'.__('You can add here special cascading style sheet. Body of page has class "dc-kutrl" and widgets have class "shortenkutrlwidget" and "rankkutrlwidget".').'</p>';
+          '<p>'.__('There are two templates delivered with kUtRL, if you do not use default theme, you may adapt them to yours.').'<br />'.
+          __('Files are in plugin directory /default-templates, just copy them into your theme and edit them.').'</p>'.
+          
+          '</div></div>';
      }
 
@@ -223 +240 @@
                return false;
           }
+          if (!$rs->url) //previously removed url
+          {
+               return false;
+          }
+          
           $this->log->counter($rs->id,'up');
           return $rs->url;
      }
 
-     public function deleteUrl($url)
+     public function deleteUrl($url,$delete=false)
      {
           if (false === ($rs = $this->log->select($url,null,null,'local')))
@@ -233 +255 @@
                return false;
           }
-          $this->log->delete($rs->id);
+          if ($delete)
+          {
+               $this->log->delete($rs->id);
+          }
+          else
+          {
+               $this->log->clear($rs->id,'');
+          }
           return true;
      }

plugins/kUtRL/index.php

@@ -17 +17 @@
 
 # Settings
-$s = kutrlSettings($core);
+$s = $core->blog->settings->kUtRL;
 
 # Default values
@@ -66 +66 @@
 
 ?>
-?>

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

@@ -1 +1 @@
 <?php
-// Language: français 
-// Module: kUtRL - 0.3
-// Date: 2010-04-14 22:23:45 
-// Translated with dcTranslater - 1.3 
+// Language: Français 
+// Module: kUtRL - 0.4
+// Date: 2010-06-28 10:43:43 
+// Translated with dcTranslater - 1.4.1 
 
 #_admin.php:19
 #_widgets.php:22
 #default-templates/kutrl.html:48
-#inc/index.link.php:112
+#inc/index.link.php:117
 #inc/index.links.php:203
 #inc/index.service.php:42
-#inc/index.setting.php:87
+#inc/index.setting.php:93
 #index.php:41
 #index.php:42
@@ -24 +24 @@
 
 #_admin.php:108
-#inc/index.link.php:136
+#inc/index.link.php:141
 $GLOBALS['__l10n']['Custom short link:'] = 'Lien court personnalisé :';
 
@@ -31 +31 @@
 
 #_admin.php:122
-#_widgets.php:171
+#_widgets.php:178
 $GLOBALS['__l10n']['never followed'] = 'jamais suivi';
 
 #_admin.php:126
-#_widgets.php:173
+#_widgets.php:182
 $GLOBALS['__l10n']['followed one time'] = 'suivi une fois';
 
 #_admin.php:130
-#_widgets.php:175
+#_widgets.php:186
 $GLOBALS['__l10n']['followed %s times'] = 'suivi %s fois';
 
 #_admin.php:137
-#_admin.php:268
+#_admin.php:292
 $GLOBALS['__l10n']['delete short link'] = 'effacer un lien court';
 
-#_admin.php:267
+#_admin.php:291
 $GLOBALS['__l10n']['create short link'] = 'créer un lien court';
 
-#_public.php:123
+#_public.php:141
 $GLOBALS['__l10n']['Failed to verify protected field.'] = 'Impossible de vérifier le champs de protection.';
 
-#_public.php:131
-#inc/index.link.php:38
+#_public.php:149
+#inc/index.link.php:40
 #inc/services/class.bilbolinks.service.php:64
 #inc/services/class.bitly.service.php:76
-#inc/services/class.local.service.php:89
+#inc/services/class.local.service.php:106
 #inc/services/class.trim.service.php:65
 $GLOBALS['__l10n']['Service is not well configured.'] = 'Le service n\'est pas correctement configuré.';
 
-#_public.php:139
+#_public.php:157
 $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
+#_public.php:165
+#inc/index.link.php:49
 $GLOBALS['__l10n']['This link is too short.'] = 'Ce lien est trop court.';
 
-#_public.php:155
-#inc/index.link.php:50
+#_public.php:173
+#inc/index.link.php:52
 $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
+#_public.php:182
+#inc/index.link.php:55
 $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
+#_public.php:190
+#inc/index.link.php:58
 $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
+#_public.php:203
+#_public.php:222
+#inc/index.link.php:69
+#inc/index.link.php:90
 $GLOBALS['__l10n']['Short link for %s is %s'] = 'Le lien court pour %s est %s';
 
-#_public.php:196
+#_public.php:214
 $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
+#_public.php:231
+#_public.php:310
+#_public.php:532
+#inc/lib.wiki.kutrl.php:90
 $GLOBALS['__l10n']['public'] = 'publique';
 
-#_public.php:314
-#_widgets.php:105
+#_public.php:403
+#_widgets.php:106
 $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 :';
 
@@ -141 +142 @@
 $GLOBALS['__l10n']['Hide no followed links'] = 'Cacher les liens non suivis';
 
-#_widgets.php:101
+#_widgets.php:102
 #default-templates/kutrl.html:55
-#inc/index.link.php:129
+#inc/index.link.php:134
 $GLOBALS['__l10n']['Long link:'] = 'Lien long :';
 
-#_widgets.php:108
+#_widgets.php:109
 #default-templates/kutrl.html:62
 $GLOBALS['__l10n']['Create'] = 'Créer';
 
-#inc/index.link.php:35
+#default-templates/kutrl404.html:14
+#default-templates/kutrl404.html:38
+$GLOBALS['__l10n']['URL not found'] = 'URL non trouvée';
+
+#default-templates/kutrl404.html:42
+$GLOBALS['__l10n']['The URL you are looking for does not exist.'] = 'Le lien que vous recherchez n\'existe pas.';
+
+#default-templates/kutrl404.html:45
+$GLOBALS['__l10n']['Create your own short URL'] = 'Créer votre propre lien court';
+
+#inc/index.link.php:37
 $GLOBALS['__l10n']['There is nothing to shorten.'] = 'I n\'y a rien à réduire.';
 
-#inc/index.link.php:41
+#inc/index.link.php:43
 $GLOBALS['__l10n']['This service does not allowed custom hash.'] = 'Ce service n\'accepte pas les liens court personnalisés.';
 
-#inc/index.link.php:44
+#inc/index.link.php:46
 $GLOBALS['__l10n']['This link is not a valid URL.'] = 'Ce lien n\'est pas valide.';
 
-#inc/index.link.php:59
+#inc/index.link.php:61
 $GLOBALS['__l10n']['This custom short url is already taken.'] = 'Ce lien court personnalisé est déjà pris.';
 
-#inc/index.link.php:79
+#inc/index.link.php:82
 $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.link.php:121
 #inc/index.links.php:207
 #inc/index.service.php:52
-#inc/index.setting.php:97
+#inc/index.setting.php:103
 $GLOBALS['__l10n']['New link'] = 'Nouveau lien';
 
-#inc/index.link.php:121
+#inc/index.link.php:126
 $GLOBALS['__l10n']['You must set an admin service.'] = 'Vous devez définir un service admin.';
 
-#inc/index.link.php:128
+#inc/index.link.php:133
 $GLOBALS['__l10n']['Shorten link using service "%s"'] = 'Raccourcir un lien en utilisant le service "%s"';
 
-#inc/index.link.php:138
+#inc/index.link.php:143
 $GLOBALS['__l10n']['Only if you want a custom short link.'] = 'Uniquement si vous souhaitez un lien court personnalisé.';
 
-#inc/index.link.php:142
+#inc/index.link.php:148
 $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.';
 
@@ -193 +204 @@
 
 #inc/index.links.php:132
-#inc/index.setting.php:82
+#inc/index.setting.php:88
 $GLOBALS['__l10n']['disabled'] = 'Désactivé';
 
@@ -218 +229 @@
 $GLOBALS['__l10n']['Learn more about %s.'] = 'En savoir plus à propos de %s.';
 
-#inc/index.setting.php:96
+#inc/index.setting.php:102
 #index.php:36
 $GLOBALS['__l10n']['Settings'] = 'Paramètres';
 
-#inc/index.setting.php:101
+#inc/index.setting.php:107
 $GLOBALS['__l10n']['Plugin activation'] = 'Activation de l\'extension';
 
-#inc/index.setting.php:104
+#inc/index.setting.php:110
 $GLOBALS['__l10n']['Enable plugin'] = 'Activer l\'extension';
 
-#inc/index.setting.php:107
+#inc/index.setting.php:113
 $GLOBALS['__l10n']['General rules'] = 'Réglages';
 
-#inc/index.setting.php:110
+#inc/index.setting.php:116
 $GLOBALS['__l10n']['Limit short link to current blog'] = 'Limiter les liens court à ce blog';
 
-#inc/index.setting.php:111
+#inc/index.setting.php:117
 $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
+#inc/index.setting.php:120
 $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
+#inc/index.setting.php:121
+$GLOBALS['__l10n']['If this extension is disabled and the passive mode is enabled, "kutrl" tags (like EntryKurl) 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" (comme EntryKutrl) afficheront les liens longs au lieu de rien.';
+
+#inc/index.setting.php:124
+$GLOBALS['__l10n']['Active mode'] = 'Mode actif';
+
+#inc/index.setting.php:125
+$GLOBALS['__l10n']['If the active mode is enabled, all know default template tags (like EntryURL) will display short urls instead of long ones on templates.'] = 'Si le mode actif est acitvé, les balises de thème (comme EntryURL) afficheront les liens court au lieu des longs.';
+
+#inc/index.setting.php:128
 $GLOBALS['__l10n']['Create short link for new entries'] = 'Créer un lien court pour les nouveaux billets';
 
-#inc/index.setting.php:119
+#inc/index.setting.php:129
 $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
+#inc/index.setting.php:132
 $GLOBALS['__l10n']['Default services'] = 'Services par défaut';
 
-#inc/index.setting.php:128
+#inc/index.setting.php:138
 $GLOBALS['__l10n']['Administration:'] = 'Administration :';
 
-#inc/index.setting.php:131
+#inc/index.setting.php:141
 $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
+#inc/index.setting.php:147
 $GLOBALS['__l10n']['Templates:'] = 'Templates :';
 
-#inc/index.setting.php:140
+#inc/index.setting.php:150
 $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
+#inc/index.setting.php:156
 $GLOBALS['__l10n']['Contents:'] = 'Contenus :';
 
-#inc/index.setting.php:149
+#inc/index.setting.php:159
 $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
+#inc/index.setting.php:169
 $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
+#inc/index.setting.php:170
+$GLOBALS['__l10n']['Entry message:'] = 'Message d\'un billet :';
+
+#inc/index.setting.php:173
+$GLOBALS['__l10n']['This is a special message that can be used on admin enrty page, use wildcard %T for entry title, %L for short URL, %B for blog name, %U for user name.'] = 'C\'est un message spécial qui sera utilisé sur la page d\'édition d\'un billet, utiliser les jokers %T pour le titre du billet, %L pour le lien court, %B pour le blog, %U pour l\'utilisateur.';
+
+#inc/index.setting.php:175
 $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
+#inc/index.setting.php:176
+$GLOBALS['__l10n']['Send message when short url is created on:'] = 'Envoyer un message lorsqu\'un lien court est créé dans :';
+
+#inc/index.setting.php:179
 $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/index.setting.php:182
+$GLOBALS['__l10n']['public form'] = 'le formulaire de la page publique';
+
+#inc/index.setting.php:185
+$GLOBALS['__l10n']['template'] = 'les balises de thème';
+
+#inc/index.setting.php:188
+$GLOBALS['__l10n']['content'] = 'le contenu (wiki)';
 
 #inc/lib.dc.twitter.php:169
@@ -310 +333 @@
 $GLOBALS['__l10n']['Message'] = 'Message';
 
-#inc/lib.dc.twitter.php:301
+#inc/lib.dc.twitter.php:296
 $GLOBALS['__l10n']['User is not set.'] = 'L\'utilisateur est pas renseigné.';
 
-#inc/lib.dc.twitter.php:309
+#inc/lib.dc.twitter.php:304
 $GLOBALS['__l10n']['Nothing to send.'] = 'Il n\'y a rien à envoyer.';
 
-#inc/lib.dc.twitter.php:333
+#inc/lib.dc.twitter.php:328
 $GLOBALS['__l10n']['Failed to send message (%s)'] = 'Impossible d\'envoyer le message (%s)';
 
-#inc/lib.dc.twitter.php:393
+#inc/lib.dc.twitter.php:388
 $GLOBALS['__l10n']['Failed to get short url (%s)'] = 'Impossible de récupérer le lien court (%s)';
 
-#inc/lib.dc.twitter.php:399
+#inc/lib.dc.twitter.php:394
 $GLOBALS['__l10n']['Failed to get short url'] = 'Impossible de récupérer le lien court';
 
@@ -337 +360 @@
 $GLOBALS['__l10n']['There is nothing to configure for this service.'] = 'Il n\'y a rien à configurer pour ce service.';
 
-#inc/lib.wiki.kutrl.php:73
+#inc/lib.wiki.kutrl.php:84
 $GLOBALS['__l10n']['%s (Shorten with %s)'] = '% (réduit avec %s)';
 
@@ -383 +406 @@
 $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
+#inc/services/class.local.service.php:46
+$GLOBALS['__l10n']['Settings:'] = 'paramètre :';
+
+#inc/services/class.local.service.php:48
+$GLOBALS['__l10n']['Allowed protocols:'] = 'Protocoles autorisés :';
+
+#inc/services/class.local.service.php:53
+$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:58
+$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:61
+$GLOBALS['__l10n']['CSS:'] = 'CSS :';
+
+#inc/services/class.local.service.php:64
+$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.local.service.php:68
+$GLOBALS['__l10n']['Enable special 404 error public page for unknow urls'] = 'Activer la page spéciale d\'erreur 404 pour les liens inconnus';
+
+#inc/services/class.local.service.php:70
+$GLOBALS['__l10n']['If this is not activated, the default 404 page of the theme will be display.'] = 'Si cette option est désactivée, la page d\'erreur 404 par défaut du thème sera utilisée.';
+
+#inc/services/class.local.service.php:74
+$GLOBALS['__l10n']['Note:'] = 'Note :';
+
+#inc/services/class.local.service.php:76
 $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:45
+#inc/services/class.local.service.php:77
 $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:48
+#inc/services/class.local.service.php:80
 $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
+#inc/services/class.local.service.php:86
 $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
+#inc/services/class.local.service.php:88
 $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:63
-$GLOBALS['__l10n']['Allowed protocols:'] = 'Protocoles autorisés :';
-
-#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: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:76
-$GLOBALS['__l10n']['CSS:'] = 'CSS :';
-
-#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.local.service.php:120
+#inc/services/class.local.service.php:93
+$GLOBALS['__l10n']['There are two templates delivered with kUtRL, if you do not use default theme, you may adapt them to yours.'] = 'Il y a deux templates livrés avec kUtRL, si vous n\'utilisez pas le thème par défaut, vous devrez peut-être les adapter au votre.';
+
+#inc/services/class.local.service.php:94
+$GLOBALS['__l10n']['Files are in plugin directory /default-templates, just copy them into your theme and edit them.'] = 'Les fichiers sont dans le répertoire /default-templates du plugin, copiez les dans votre thème et modifiez les.';
+
+#inc/services/class.local.service.php:137
 $GLOBALS['__l10n']['Custom short link is already taken.'] = 'Le lien court personnalisé est déjà pris.';
 
-#inc/services/class.local.service.php:130
+#inc/services/class.local.service.php:147
 $GLOBALS['__l10n']['Custom short link is not valid.'] = 'Le lien court personnalisé n\'est pas valide.';
 
-#inc/services/class.local.service.php:141
+#inc/services/class.local.service.php:158
 $GLOBALS['__l10n']['Failed to save link.'] = 'Impossible d\'enregistrer le lien.';
 

plugins/kUtRL/locales/fr/main.po

@@ -1 @@
-# Language: français
-# Module: kUtRL - 0.3
-# Date: 2010-04-14 22:23:46
-# Translated with translater 1.3
+# Language: Français
+# Module: kUtRL - 0.4
+# Date: 2010-06-28 10:43:43
+# Translated with translater 1.4.1
 
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: kUtRL 0.3\n"
+"Project-Id-Version: kUtRL 0.4\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2010-04-14T22:23:46+00:00\n"
+"PO-Revision-Date: 2010-06-28T10:43:43+00:00\n"
 "Last-Translator: JC Denis\n"
 "Language-Team: \n"
@@ -18 +18 @@
 #: _widgets.php:22
 #: default-templates/kutrl.html:48
-#: inc/index.link.php:112
+#: inc/index.link.php:117
 #: inc/index.links.php:203
 #: inc/index.service.php:42
-#: inc/index.setting.php:87
+#: inc/index.setting.php:93
 #: index.php:41
 #: index.php:42
@@ -37 +37 @@
 
 #: _admin.php:108
-#: inc/index.link.php:136
+#: inc/index.link.php:141
 msgid "Custom short link:"
 msgstr "Lien court personnalisé :"
@@ -46 +46 @@
 
 #: _admin.php:122
-#: _widgets.php:171
+#: _widgets.php:178
 msgid "never followed"
 msgstr "jamais suivi"
 
 #: _admin.php:126
-#: _widgets.php:173
+#: _widgets.php:182
 msgid "followed one time"
 msgstr "suivi une fois"
 
 #: _admin.php:130
-#: _widgets.php:175
+#: _widgets.php:186
 msgid "followed %s times"
 msgstr "suivi %s fois"
 
 #: _admin.php:137
-#: _admin.php:268
+#: _admin.php:292
 msgid "delete short link"
 msgstr "effacer un lien court"
 
-#: _admin.php:267
+#: _admin.php:291
 msgid "create short link"
 msgstr "créer un lien court"
 
-#: _public.php:123
+#: _public.php:141
 msgid "Failed to verify protected field."
 msgstr "Impossible de vérifier le champs de protection."
 
-#: _public.php:131
-#: inc/index.link.php:38
+#: _public.php:149
+#: inc/index.link.php:40
 #: inc/services/class.bilbolinks.service.php:64
 #: inc/services/class.bitly.service.php:76
-#: inc/services/class.local.service.php:89
+#: inc/services/class.local.service.php:106
 #: inc/services/class.trim.service.php:65
 msgid "Service is not well configured."
 msgstr "Le service n'est pas correctement configuré."
 
-#: _public.php:139
+#: _public.php:157
 msgid "This string is not a valid URL."
 msgstr "Cette chaine n'est pas un lien valide."
 
-#: _public.php:147
-#: inc/index.link.php:47
+#: _public.php:165
+#: inc/index.link.php:49
 msgid "This link is too short."
 msgstr "Ce lien est trop court."
 
-#: _public.php:155
-#: inc/index.link.php:50
+#: _public.php:173
+#: inc/index.link.php:52
 msgid "This type of link is not allowed."
 msgstr "Ce type de lien n'est pas autorisé."
 
-#: _public.php:164
-#: inc/index.link.php:53
+#: _public.php:182
+#: inc/index.link.php:55
 msgid "Short links are limited to this blog URL."
 msgstr "Les liens courts sont limités à l'URL de ce blog."
 
-#: _public.php:172
-#: inc/index.link.php:56
+#: _public.php:190
+#: inc/index.link.php:58
 msgid "This link is already a short link."
 msgstr "Ce lien est dèjà un lien court."
 
-#: _public.php:185
-#: _public.php:204
-#: inc/index.link.php:67
-#: inc/index.link.php:87
+#: _public.php:203
+#: _public.php:222
+#: inc/index.link.php:69
+#: inc/index.link.php:90
 msgid "Short link for %s is %s"
 msgstr "Le lien court pour %s est %s"
 
-#: _public.php:196
+#: _public.php:214
 msgid "Failed to create short link."
 msgstr "Impossible de créer le lien court."
 
-#: _public.php:213
-#: _public.php:432
-#: inc/lib.wiki.kutrl.php:78
+#: _public.php:231
+#: _public.php:310
+#: _public.php:532
+#: inc/lib.wiki.kutrl.php:90
 msgid "public"
 msgstr "publique"
 
-#: _public.php:314
-#: _widgets.php:105
+#: _public.php:403
+#: _widgets.php:106
 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 :"
@@ -186 +187 @@
 msgstr "Cacher les liens non suivis"
 
-#: _widgets.php:101
+#: _widgets.php:102
 #: default-templates/kutrl.html:55
-#: inc/index.link.php:129
+#: inc/index.link.php:134
 msgid "Long link:"
 msgstr "Lien long :"
 
-#: _widgets.php:108
+#: _widgets.php:109
 #: default-templates/kutrl.html:62
 msgid "Create"
 msgstr "Créer"
 
-#: inc/index.link.php:35
+#: default-templates/kutrl404.html:14
+#: default-templates/kutrl404.html:38
+msgid "URL not found"
+msgstr "URL non trouvée"
+
+#: default-templates/kutrl404.html:42
+msgid "The URL you are looking for does not exist."
+msgstr "Le lien que vous recherchez n'existe pas."
+
+#: default-templates/kutrl404.html:45
+msgid "Create your own short URL"
+msgstr "Créer votre propre lien court"
+
+#: inc/index.link.php:37
 msgid "There is nothing to shorten."
 msgstr "I n'y a rien à réduire."
 
-#: inc/index.link.php:41
+#: inc/index.link.php:43
 msgid "This service does not allowed custom hash."
 msgstr "Ce service n'accepte pas les liens court personnalisés."
 
-#: inc/index.link.php:44
+#: inc/index.link.php:46
 msgid "This link is not a valid URL."
 msgstr "Ce lien n'est pas valide."
 
-#: inc/index.link.php:59
+#: inc/index.link.php:61
 msgid "This custom short url is already taken."
 msgstr "Ce lien court personnalisé est déjà pris."
 
-#: inc/index.link.php:79
+#: inc/index.link.php:82
 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.link.php:121
 #: inc/index.links.php:207
 #: inc/index.service.php:52
-#: inc/index.setting.php:97
+#: inc/index.setting.php:103
 msgid "New link"
 msgstr "Nouveau lien"
 
-#: inc/index.link.php:121
+#: inc/index.link.php:126
 msgid "You must set an admin service."
 msgstr "Vous devez définir un service admin."
 
-#: inc/index.link.php:128
+#: inc/index.link.php:133
 msgid "Shorten link using service \"%s\""
 msgstr "Raccourcir un lien en utilisant le service \"%s\""
 
-#: inc/index.link.php:138
+#: inc/index.link.php:143
 msgid "Only if you want a custom short link."
 msgstr "Uniquement si vous souhaitez un lien court personnalisé."
 
-#: inc/index.link.php:142
+#: inc/index.link.php:148
 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."
@@ -253 +267 @@
 
 #: inc/index.links.php:132
-#: inc/index.setting.php:82
+#: inc/index.setting.php:88
 msgid "disabled"
 msgstr "Désactivé"
@@ -286 +300 @@
 msgstr "En savoir plus à propos de %s."
 
-#: inc/index.setting.php:96
+#: inc/index.setting.php:102
 #: index.php:36
 msgid "Settings"
 msgstr "Paramètres"
 
-#: inc/index.setting.php:101
+#: inc/index.setting.php:107
 msgid "Plugin activation"
 msgstr "Activation de l'extension"
 
-#: inc/index.setting.php:104
+#: inc/index.setting.php:110
 msgid "Enable plugin"
 msgstr "Activer l'extension"
 
-#: inc/index.setting.php:107
+#: inc/index.setting.php:113
 msgid "General rules"
 msgstr "Réglages"
 
-#: inc/index.setting.php:110
+#: inc/index.setting.php:116
 msgid "Limit short link to current blog"
 msgstr "Limiter les liens court à ce blog"
 
-#: inc/index.setting.php:111
+#: inc/index.setting.php:117
 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
+#: inc/index.setting.php:120
 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
+#: inc/index.setting.php:121
+msgid "If this extension is disabled and the passive mode is enabled, \"kutrl\" tags (like EntryKurl) 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\" (comme EntryKutrl) afficheront les liens longs au lieu de rien."
+
+#: inc/index.setting.php:124
+msgid "Active mode"
+msgstr "Mode actif"
+
+#: inc/index.setting.php:125
+msgid "If the active mode is enabled, all know default template tags (like EntryURL) will display short urls instead of long ones on templates."
+msgstr "Si le mode actif est acitvé, les balises de thème (comme EntryURL) afficheront les liens court au lieu des longs."
+
+#: inc/index.setting.php:128
 msgid "Create short link for new entries"
 msgstr "Créer un lien court pour les nouveaux billets"
 
-#: inc/index.setting.php:119
+#: inc/index.setting.php:129
 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
+#: inc/index.setting.php:132
 msgid "Default services"
 msgstr "Services par défaut"
 
-#: inc/index.setting.php:128
+#: inc/index.setting.php:138
 msgid "Administration:"
 msgstr "Administration :"
 
-#: inc/index.setting.php:131
+#: inc/index.setting.php:141
 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
+#: inc/index.setting.php:147
 msgid "Templates:"
 msgstr "Templates :"
 
-#: inc/index.setting.php:140
+#: inc/index.setting.php:150
 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
+#: inc/index.setting.php:156
 msgid "Contents:"
 msgstr "Contenus :"
 
-#: inc/index.setting.php:149
+#: inc/index.setting.php:159
 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
+#: inc/index.setting.php:169
 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
+#: inc/index.setting.php:170
+msgid "Entry message:"
+msgstr "Message d'un billet :"
+
+#: inc/index.setting.php:173
+msgid "This is a special message that can be used on admin enrty page, use wildcard %T for entry title, %L for short URL, %B for blog name, %U for user name."
+msgstr "C'est un message spécial qui sera utilisé sur la page d'édition d'un billet, utiliser les jokers %T pour le titre du billet, %L pour le lien court, %B pour le blog, %U pour l'utilisateur."
+
+#: inc/index.setting.php:175
 msgid "Activation"
 msgstr "Activation"
 
-#: inc/index.setting.php:162
+#: inc/index.setting.php:176
 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
+msgstr "Envoyer un message lorsqu'un lien court est créé dans :"
+
+#: inc/index.setting.php:179
 msgid "administration form"
 msgstr "le formulaire de la page d'administration"
 
-#: inc/index.setting.php:168
+#: inc/index.setting.php:182
 msgid "public form"
-msgstr "le forumlaire publique"
-
-#: inc/index.setting.php:171
+msgstr "le formulaire de la page publique"
+
+#: inc/index.setting.php:185
 msgid "template"
-msgstr "le thème"
-
-#: inc/index.setting.php:174
+msgstr "les balises de thème"
+
+#: inc/index.setting.php:188
 msgid "content"
-msgstr "le contenu"
+msgstr "le contenu (wiki)"
 
 #: inc/lib.dc.twitter.php:169
@@ -407 +437 @@
 msgstr "Message"
 
-#: inc/lib.dc.twitter.php:301
+#: inc/lib.dc.twitter.php:296
 msgid "User is not set."
 msgstr "L'utilisateur est pas renseigné."
 
-#: inc/lib.dc.twitter.php:309
+#: inc/lib.dc.twitter.php:304
 msgid "Nothing to send."
 msgstr "Il n'y a rien à envoyer."
 
-#: inc/lib.dc.twitter.php:333
+#: inc/lib.dc.twitter.php:328
 msgid "Failed to send message (%s)"
 msgstr "Impossible d'envoyer le message (%s)"
 
-#: inc/lib.dc.twitter.php:393
+#: inc/lib.dc.twitter.php:388
 msgid "Failed to get short url (%s)"
 msgstr "Impossible de récupérer le lien court (%s)"
 
-#: inc/lib.dc.twitter.php:399
+#: inc/lib.dc.twitter.php:394
 msgid "Failed to get short url"
 msgstr "Impossible de récupérer le lien court"
@@ -443 +473 @@
 msgstr "Il n'y a rien à configurer pour ce service."
 
-#: inc/lib.wiki.kutrl.php:73
+#: inc/lib.wiki.kutrl.php:84
 msgid "%s (Shorten with %s)"
 msgstr "% (réduit avec %s)"
@@ -501 +531 @@
 msgstr "Une erreur est survenu avec le code \"%s\" et le message \"%s\""
 
-#: inc/services/class.local.service.php:44
+#: inc/services/class.local.service.php:46
+msgid "Settings:"
+msgstr "paramètre :"
+
+#: inc/services/class.local.service.php:48
+msgid "Allowed protocols:"
+msgstr "Protocoles autorisés :"
+
+#: inc/services/class.local.service.php:53
+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:58
+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:61
+msgid "CSS:"
+msgstr "CSS :"
+
+#: inc/services/class.local.service.php:64
+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.local.service.php:68
+msgid "Enable special 404 error public page for unknow urls"
+msgstr "Activer la page spéciale d'erreur 404 pour les liens inconnus"
+
+#: inc/services/class.local.service.php:70
+msgid "If this is not activated, the default 404 page of the theme will be display."
+msgstr "Si cette option est désactivée, la page d'erreur 404 par défaut du thème sera utilisée."
+
+#: inc/services/class.local.service.php:74
+msgid "Note:"
+msgstr "Note :"
+
+#: inc/services/class.local.service.php:76
 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:45
+#: inc/services/class.local.service.php:77
 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:48
+#: inc/services/class.local.service.php:80
 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:54
+#: inc/services/class.local.service.php:86
 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:56
+#: inc/services/class.local.service.php:88
 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:63
-msgid "Allowed protocols:"
-msgstr "Protocoles autorisés :"
-
-#: 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: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:76
-msgid "CSS:"
-msgstr "CSS :"
-
-#: 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.local.service.php:120
+#: inc/services/class.local.service.php:93
+msgid "There are two templates delivered with kUtRL, if you do not use default theme, you may adapt them to yours."
+msgstr "Il y a deux templates livrés avec kUtRL, si vous n'utilisez pas le thème par défaut, vous devrez peut-être les adapter au votre."
+
+#: inc/services/class.local.service.php:94
+msgid "Files are in plugin directory /default-templates, just copy them into your theme and edit them."
+msgstr "Les fichiers sont dans le répertoire /default-templates du plugin, copiez les dans votre thème et modifiez les."
+
+#: inc/services/class.local.service.php:137
 msgid "Custom short link is already taken."
 msgstr "Le lien court personnalisé est déjà pris."
 
-#: inc/services/class.local.service.php:130
+#: inc/services/class.local.service.php:147
 msgid "Custom short link is not valid."
 msgstr "Le lien court personnalisé n'est pas valide."
 
-#: inc/services/class.local.service.php:141
+#: inc/services/class.local.service.php:158
 msgid "Failed to save link."
 msgstr "Impossible d'enregistrer le lien."

plugins/kUtRL/release.txt

@@ -3 +3 @@
  - Added passworded links
  - fixed or removed tweet from comment when it is spam
+
+0.4 20100628
+ * Switched to DC 2.2
+ * Fixed no short urls on preview mode
+ * Fixed lock hash of deleted urls
+ * Fixed hide new short url widget on kutrl pages
+ * Fixed typo
+ * Added active mode that shorten urls on default template values
+ * Added special tweeter message for post (can include post title)
+ * Added kutrl special 404 page
 
 0.3.3 20100528