Changeset 1525

Show
Ignore:
Timestamp:
08/06/06 13:23:04 (2 years ago)
Author:
mbonetti
Message:

Experimental: allow UTF-8 tagging

Location:
trunk/gregarius
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/gregarius/.htaccess

    r1253 r1525  
    3636  #tag view 
    3737  RewriteRule   ^tags?\/?$          tags.php?alltags [L,QSA] 
    38   RewriteRule   ^tag\/([a-zA-Z0-9_\.\+]+)$      tags.php?tag=$1 [L,QSA] 
    39   RewriteRule   ^tag\/([a-zA-Z0-9_\.\+]+)\/rss\/?$  tags.php?tag=$1&rss [L,QSA] 
     38  RewriteRule   ^tag\/(.+)$     tags.php?tag=$1 [L,QSA] 
     39  RewriteRule   ^tag\/(.+)\/rss\/?$  tags.php?tag=$1&rss [L,QSA] 
    4040   
    4141  #state view 

  • trunk/gregarius/ajax.php

    r1493 r1525  
    196196 
    197197function submit_tag_cb(ret) { 
    198     data= ret.replace(/[^a-zA-Z0-9\ _\.,]/gi,"").split(','); 
     198    data= ret.split(','); 
     199    //replace(/[^a-zA-Z0-9\ _\.,]/gi,"") 
    199200    id=data[0]; 
    200201    tags=data[1]; 
    … …  
    218219       // the tag container 
    219220       var tc=document.getElementById("t"+id); 
    220         var tags = tc.innerHTML.replace(/<\/?a[^>]*>(\ $)?/gi,"").replace(<?php echo ALLOWED_TAGS_REGEXP ?>gi,""); 
     221        var tags = tc.innerHTML.replace(/<\/?a[^>]*>(\ $)?/gi,"");  
     222        //.replace(<?php echo ALLOWED_TAGS_REGEXP ?>gi,""); 
    221223        // submit link 
    222224        toggle.innerHTML="<?php echo  LBL_TAG_SUBMIT ?>"; 

  • trunk/gregarius/constants.php

    r1502 r1525  
    164164// it is used to filter out everything but the allowed tag 
    165165// characters, plus a whitespace 
    166 define('ALLOWED_TAGS_REGEXP', '/[^a-zA-Z0-9\ _\.]/'); 
     166define('ALLOWED_TAGS_REGEXP', '//'); 
    167167 
    168168// Sanitizer constants 

  • trunk/gregarius/util.php

    r1516 r1525  
    974974// moved from ajax.php 
    975975function __exp__submitTag($id,$tags,$type = "'item'") { 
    976     $ftags = preg_replace(ALLOWED_TAGS_REGEXP,'', trim($tags)); 
     976    $ftags = utf8_encode( preg_replace(ALLOWED_TAGS_REGEXP,'', trim($tags))); 
    977977    $tarr = array_slice(explode(" ",$ftags),0,MAX_TAGS_PER_ITEM); 
    978978    $ftags = implode(" ",__priv__updateTags($id,$tarr,$type));