Changeset 1648

Timestamp:

01/02/07 14:24:57 (20 months ago)

Author:

mbonetti

Message:

More uniform handling of UTF-8 uri generation. Will probably need better
filtering in rss_uri(). Fix for #150, too.

Location:

trunk/gregarius

Files:

• cls/channels.php (modified) (1 diff)
• cls/items.php (modified) (2 diffs)
• feed.php (modified) (9 diffs)
• util.php (modified) (1 diff)

trunk/gregarius/cls/channels.php

@@ -90 +90 @@
             //$this->rlink = getPath().preg_replace("/[^a-zA-Z0-9_]/", "_", $title)."/";
             /* EXPERIMENTAL! */
-            $this->rlink = getPath() . utf8_uri_encode(preg_replace('/[\s&\/\+]/','_',$title)) . "/";
+            $this->rlink = getPath(rss_uri($title)) . "/";
         } else {
             $this->rlink = getPath()."feed.php?channel=$id";

trunk/gregarius/cls/items.php

@@ -73 +73 @@
             $this->title = "[nt]";
         }
-        $this->escapedTitle = preg_replace("/[^A-Za-z0-9%\.]/", "_", utf8_uri_encode($title));
+        $this->escapedTitle = rss_uri($title); //preg_replace("/[^A-Za-z0-9%\.]/", "_", utf8_uri_encode($title));
+        
         $this->url = trim($url);
         $this->enclosure = $enclosure;
@@ -136 +137 @@
             $this->iconUrl = $icon;
         }
-        $this->escapedTitle = preg_replace("/[^A-Za-z0-9\.]/", "_", $title);
+        //$this->escapedTitle = preg_replace("/[^A-Za-z0-9\.]/", "_", $title);
+        $this->escapedTitle = rss_uri($title);
     } 
     

trunk/gregarius/feed.php

@@ -914 +914 @@
     $prev = $succ = $up = null;
     if (isset($_REQUEST['channel'])) {
-        $escaped_title = preg_replace("/[^A-Za-z0-9\.]/","_",$_REQUEST['channel']);
+        $escaped_title = rss_uri($_REQUEST['channel']); //preg_replace("/[^A-Za-z0-9\.]/","_",$_REQUEST['channel']);
     } else {
         $escaped_title = null;
@@ -1125 +1125 @@
                                     'url' =>  makeArchiveUrl($pts_,$escaped_title,$cid,true)
                                            . (getConfig('rss.output.usemodrewrite') ?
-                                              preg_replace("/[^A-Za-z0-9\.%]/","_",utf8_uri_encode($ptitle_)):
+                                              rss_uri($ptitle_):
                                               "&iid=$piid_"),
                                     'lbl' => htmlentities( $ptitle_,ENT_COMPAT,"UTF-8" )
@@ -1143 +1143 @@
                                     'url' =>  makeArchiveUrl($ts_,$escaped_title,$cid,true)
                                            . (getConfig('rss.output.usemodrewrite') ?
-                                              preg_replace("/[^A-Za-z0-9\.%]/","_",utf8_uri_encode($title_)) :
+                                              rss_uri($title_) :
                                               "&iid=$iid_"),
                                     'lbl' => htmlentities($title_,ENT_COMPAT,"UTF-8")
@@ -1206 +1206 @@
                                 'url' => getPath().
                                        ( getConfig('rss.output.usemodrewrite') ?
-                                         preg_replace("/[^A-Za-z0-9\.]/","_",$title_) ."/"
+                                         rss_uri($title_) ."/"
                                          :"feed.php?channel=$cid_") ,
                                 'lbl' => htmlentities( $title_,ENT_COMPAT,"UTF-8" )
@@ -1216 +1216 @@
                                 'url' => getPath().
                                        ( getConfig('rss.output.usemodrewrite') ?
-                                         preg_replace("/[^A-Za-z0-9\.]/","_",$title_) ."/"
+                                         rss_uri($title_) ."/"
                                          :"feed.php?channel=$cid_") ,
                                 'lbl' => htmlentities( $title_,ENT_COMPAT,"UTF-8" )
@@ -1255 +1255 @@
                             'url' => getPath().
                                    ( getConfig('rss.output.usemodrewrite') ?
-                                     preg_replace("/[^A-Za-z0-9\.]/","_",$vftitle_) ."/"
+                                     rss_uri($vftitle_) ."/"
                                      :"feed.php?vfolder=$vfid_") ,
                             'lbl' => htmlentities( $vftitle_,ENT_COMPAT,"UTF-8" )
@@ -1267 +1267 @@
                             'url' => getPath().
                                    ( getConfig('rss.output.usemodrewrite') ?
-                                     preg_replace("/[^A-Za-z0-9\.]/","_",$vftitle_) ."/"
+                                     rss_uri($vftitle_) ."/"
                                      :"feed.php?vfolder=$vfid_") ,
                             'lbl' => htmlentities( $vftitle_,ENT_COMPAT,"UTF-8" )
@@ -1318 +1318 @@
                             'url' => getPath().
                                    ( getConfig('rss.output.usemodrewrite') ?
-                                     preg_replace("/[^A-Za-z0-9\.]/","_",$ftitle__) ."/"
+                                     rss_uri($ftitle__) ."/"
                                      :"feed.php?folder=$fid__") ,
                             'lbl' => htmlentities( $ftitle__,ENT_COMPAT,"UTF-8" )
@@ -1330 +1330 @@
                             'url' => getPath().
                                    ( getConfig('rss.output.usemodrewrite') ?
-                                     preg_replace("/[^A-Za-z0-9\.]/","_",$ftitle__) ."/"
+                                    rss_uri($ftitle__) ."/"
                                      :"feed.php?folder=$fid__") ,
                             'lbl' => htmlentities( $ftitle__,ENT_COMPAT,"UTF-8" )

trunk/gregarius/util.php

@@ -1156 +1156 @@
 }
 
+function rss_uri($title, $sep='_') {
+    return utf8_uri_encode(preg_replace('#[\s&/\+\'"\?]#',$sep,$title));
+}
 ?>