FS#1160 Wrong URL in "file uploaded" notification email

other

• 

  2007-06-13 peppe

  Since DokuWiki version rc2007-05-24 I get a notification email every time a file is uploaded (before, notification emails were sent only when a page was created or modified). However, the URL in the email is wrong. For instance:
  
  A file was uploaded to your DokuWiki. Here are the details:
  
  File        : http://www.cli.di.unipi.it/doku//doku/lib/exe/fetch.php/img.jpg
  Date        : 19:53 13/06/2007
  [...]
  
  ... but the right link is http://www.cli.di.unipi.it/doku/lib/exe/fetch.php/img.jpg (the wiki is available at http://www.cli.di.unipi.it/doku/).
  
  I haven't a config setting for basedir and baseurl, because DW autodetects them properly: when a page is created or modified, I get the *right* URL.
• 

  2007-06-13 gb

  Confirmed on devel revision
• 

  2007-06-13 andi

  fixed in devel
• 

  2007-06-13 gb

  Easy to understand:
  
   DOKU_URL = http://server/path-to/wiki/
   DOKU_BASE = /path-to/wiki/
  
  and in the uploadmail.txt message file @MEDIA@ gets replaced :
  
   @MEDIA@ = DOKU_URL.ml($id,'',true,'&')
  
  with function ml(...) saying:
  
   $xlink = DOKU_BASE;
  
  thus we end with DOKU_URL.DOKU_BASE... i.e. http://server/path-to/wiki//path-to/wiki/...
  
  
  diff -r a715d55b2de9 inc/common.php
  --- a/inc/common.php    Wed Jun 13 18:40:15 2007 +0000
  +++ b/inc/common.php    Wed Jun 13 21:31:42 2007 +0200
  @@ -376,7 +376,7 @@ function ml($id='',$more='',$direct=true
      $more = str_replace(',',$sep,$more);
    }
  
  -  $xlink = DOKU_BASE;
  +  $xlink = '';
  
    // external URLs are always direct without rewriting
    if(preg_match('#^(https?|ftp)://#i',$id)){
  
  
  Needs testing.