Changeset 1730

Timestamp:

06/09/07 00:15:34 (15 months ago)

Author:

mbonetti

Message:

Rolled back [1727] because it kind of completely broke my installation.
Also, we don't wanna change existing permalinks, do we?

Location:

trunk/gregarius

Files:

• .htaccess (modified) (1 diff)
• cls/channels.php (modified) (2 diffs)
• cls/wrappers/feed.php (modified) (1 diff)
• cls/wrappers/item.php (modified) (1 diff)
• themes/lilina/web/item.php (modified) (1 diff)
• util.php (modified) (1 diff)

trunk/gregarius/.htaccess

@@ -43 +43 @@
 
   #author view
-  RewriteRule    ^author/(.+)$ author.php?author=$1 [L,QSA]
+  RewriteRule ^author/(.+)$ author.php?author=$1 [L,QSA]
 
   #date view
   RewriteCond  %{env:static} ^$
-  RewriteRule    ^date/(20[0-1][0-9])/([0-9][0-9]?)/([0-9]?[0-9])/?$ feed.php?y=$1&m=$2&d=$3 [L,QSA]
+  RewriteRule ^(20[0-1][0-9])/([0-9][0-9]?)/([0-9]?[0-9])/?$ feed.php?y=$1&m=$2&d=$3 [L,QSA]
 
   #item view
   RewriteCond  %{env:static} ^$
-  RewriteRule  ^item/(.+)/(20[0-1][0-9])/([0-9][0-9]?)/?([0-9]?[0-9])?/?(.*)?$ feed.php?channel=$1&y=$2&m=$3&d=$4&iid=$5 [L,QSA]
+  RewriteRule  ^(.+)/(20[0-1][0-9])/([0-9][0-9]?)/?([0-9]?[0-9])?/?(.*)?$ feed.php?channel=$1&y=$2&m=$3&d=$4&iid=$5 [L,QSA]
   
   #feed view
   RewriteCond  %{env:static} ^$
-  RewriteRule    ^feed/(.+)/(.*)?$   feed.php?channel=$1&iid=$2 [L,QSA]
+  RewriteRule ^(.+)/(.*)?$   feed.php?channel=$1&iid=$2 [L,QSA]
 
   #feed view - without the trailing slash
   RewriteCond  %{env:static} ^$
-  RewriteRule    ^feed/(.+)/?$   feed.php?channel=$1 [L,QSA]
-
-  #folder view
-    RewriteCond  %{env:static} ^$
-    RewriteRule  ^folder/(.+)/(.*)?$        feed.php?channel=$1 [L,QSA]
+  RewriteRule ^(.+)/?$   feed.php?channel=$1 [L,QSA]
 </IfModule>
 

trunk/gregarius/cls/channels.php

@@ -88 +88 @@
 
         if (getConfig('rss.output.usemodrewrite')) {
-            $this->rlink = getPath("/feed/".rss_uri($title)) . "/";
+            $this->rlink = getPath(rss_uri($title)) . "/";
         } else {
             $this->rlink = getPath()."feed.php?channel=$id";
@@ -137 +137 @@
     
     function makeFolderUrl($fn) {
-        return getPath("folder/".
+        return getPath(
             preg_replace('#\s#','_',sanitize($fn,RSS_SANITIZER_URL))
         ) .'/';

trunk/gregarius/cls/wrappers/feed.php

@@ -84 +84 @@
     
     if (getConfig('rss.output.usemodrewrite')) {
-        return getPath()."/feed/".$GLOBALS['rss']->currentFeed->escapedTitle ."/";
+        return getPath().$GLOBALS['rss']->currentFeed->escapedTitle ."/";
     } 
     return getPath()."feed.php?channel=".$GLOBALS['rss']->currentFeed->cid ;

trunk/gregarius/cls/wrappers/item.php

@@ -57 +57 @@
     if ($GLOBALS['rss'] -> currentItem ->escapedTitle != "" && getConfig('rss.output.usemodrewrite')) {
         return getPath()
-            ."/item/".$GLOBALS['rss'] -> currentItem -> parent->escapedTitle
+            .$GLOBALS['rss'] -> currentItem -> parent->escapedTitle
             ."/$ply/$plm/$pld/"
             .$GLOBALS['rss'] -> currentItem -> escapedTitle;

trunk/gregarius/themes/lilina/web/item.php

@@ -7 +7 @@
         $thisDay = rss_locale_date("%d", $GLOBALS['rss']->currentItem->date); 
         if(getConfig('rss.output.usemodrewrite')) {
-            $dateURL =  getPath() . "date/$thisYear/$thisMon/$thisDay/";
+            $dateURL =  getPath() . "$thisYear/$thisMon/$thisDay/";
         }else{
             $dateURL = getPath() . "feed.php?y=$thisYear&m=$thisMon&d=$thisDay";

trunk/gregarius/util.php

@@ -666 +666 @@
     if (getConfig('rss.output.usemodrewrite')) {
         if ($channel) {
-            $ret .= "item/$channel/";
+            $ret .= "$channel/";
         }
         $ret .= rss_date(($dayView ? 'Y/m/d/' : 'Y/m/'), $ts, false);