Changeset 1644

Timestamp:

12/28/06 14:13:19 (22 months ago)

Author:

mbonetti

Message:

Experimental: UTF-8 category names

Location:

trunk/gregarius

Files:

• admin/channels.php (modified) (2 diffs)
• cls/categories.php (modified) (1 diff)
• cls/channels.php (modified) (2 diffs)
• util.php (modified) (2 diffs)

trunk/gregarius/admin/channels.php

@@ -547 +547 @@
                         list($retcde, $retmsg) = add_channel($u__, $fid, $t__, $d__);
                         if ($retcde && count($c__)) {
-                            __exp__submitTag($retcde,$c__,"'channel'");
+                            __exp__submitTag($retcde,utf_encode($c__),"'channel'");
                         }
                         echo ($retcde<0 ?$retmsg:" OK")."</p></li>\n";
@@ -642 +642 @@
 
         rss_query($sql);
-        __exp__submitTag($cid,$tags,"'channel'");
+        __exp__submitTag($cid,utf8_decode($tags),"'channel'");
         rss_invalidate_cache();
         $ret__ = CST_ADMIN_DOMAIN_CHANNEL;

trunk/gregarius/cls/categories.php

@@ -35 +35 @@
         $this->id = $id;
         if (getConfig('rss.output.usemodrewrite')) {
-            $this->rlink = getPath().preg_replace("/[^a-zA-Z0-9_]/", "_", $name)."/";
+            $this->rlink = $this -> makeFolderUrl($name); //.preg_replace("/[^a-zA-Z0-9_]/", "_", $name)."/";
         } else {
             $this->rlink = getPath()."feed.php?vfolder=$id";

trunk/gregarius/cls/channels.php

@@ -130 +130 @@
         $this->id = $id;
         if (getConfig('rss.output.usemodrewrite')) {
-            $this->rlink = getPath().preg_replace("/[^a-zA-Z0-9_]/", "_", $name)."/";
+            $this->rlink = $this -> makeFolderUrl($name); // getPath().preg_replace("/[^a-zA-Z0-9_]/", "_", $name)."/";
         } else {
             $this->rlink = getPath()."feed.php?folder=$id";
@@ -136 +136 @@
         $this->isRootFolder = ($id == 0);
         $this->rootList = $rootList;
+    }
+    
+    function makeFolderUrl($fn) {
+        return getPath(
+            preg_replace('#\s#','_',sanitize($fn,RSS_SANITIZER_URL))
+        ) .'/';
     }
     

trunk/gregarius/util.php

@@ -965 +965 @@
 // moved from ajax.php
 function __exp__submitTag($id,$tags,$type = "'item'") {
+    $tags = strip_tags($tags);
     $ftags = utf8_encode( preg_replace(ALLOWED_TAGS_REGEXP,'', trim($tags)));
     $tarr = array_slice(explode(" ",$ftags),0,MAX_TAGS_PER_ITEM);
@@ -980 +981 @@
             continue;
         }
+        $ttag = sanitize($ttag,
+            RSS_SANITIZER_NO_SPACES | RSS_SANITIZER_SIMPLE_SQL
+        );
+        
         rss_query( "insert into ". getTable('tag')
                    . " (tag) values ('$ttag')", false );