Changeset 1727
- Timestamp:
- 06/08/07 19:57:58 (1 year ago)
- Files:
-
- trunk/gregarius/.htaccess (modified) (1 diff)
- trunk/gregarius/cls/channels.php (modified) (2 diffs)
- trunk/gregarius/cls/wrappers/feed.php (modified) (1 diff)
- trunk/gregarius/cls/wrappers/item.php (modified) (1 diff)
- trunk/gregarius/themes/lilina/web/item.php (modified) (1 diff)
- trunk/gregarius/util.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/gregarius/.htaccess
r1692 r1727 43 43 44 44 #author view 45 RewriteRule ^author/(.+)$ author.php?author=$1 [L,QSA]45 RewriteRule ^author/(.+)$ author.php?author=$1 [L,QSA] 46 46 47 47 #date view 48 48 RewriteCond %{env:static} ^$ 49 RewriteRule ^(20[0-1][0-9])/([0-9][0-9]?)/([0-9]?[0-9])/?$ feed.php?y=$1&m=$2&d=$3 [L,QSA]49 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] 50 50 51 51 #item view 52 52 RewriteCond %{env:static} ^$ 53 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]53 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] 54 54 55 55 #feed view 56 56 RewriteCond %{env:static} ^$ 57 RewriteRule ^(.+)/(.*)?$ feed.php?channel=$1&iid=$2 [L,QSA]57 RewriteRule ^feed/(.+)/(.*)?$ feed.php?channel=$1&iid=$2 [L,QSA] 58 58 59 59 #feed view - without the trailing slash 60 60 RewriteCond %{env:static} ^$ 61 RewriteRule ^(.+)/?$ feed.php?channel=$1 [L,QSA] 61 RewriteRule ^feed/(.+)/?$ feed.php?channel=$1 [L,QSA] 62 63 #folder view 64 RewriteCond %{env:static} ^$ 65 RewriteRule ^folder/(.+)/(.*)?$ feed.php?channel=$1 [L,QSA] 62 66 </IfModule> 63 67 trunk/gregarius/cls/channels.php
r1668 r1727 88 88 89 89 if (getConfig('rss.output.usemodrewrite')) { 90 $this->rlink = getPath( rss_uri($title)) . "/";90 $this->rlink = getPath("/feed/".rss_uri($title)) . "/"; 91 91 } else { 92 92 $this->rlink = getPath()."feed.php?channel=$id"; … … 137 137 138 138 function makeFolderUrl($fn) { 139 return getPath( 139 return getPath("folder/". 140 140 preg_replace('#\s#','_',sanitize($fn,RSS_SANITIZER_URL)) 141 141 ) .'/'; trunk/gregarius/cls/wrappers/feed.php
r1181 r1727 84 84 85 85 if (getConfig('rss.output.usemodrewrite')) { 86 return getPath(). $GLOBALS['rss']->currentFeed->escapedTitle ."/";86 return getPath()."/feed/".$GLOBALS['rss']->currentFeed->escapedTitle ."/"; 87 87 } 88 88 return getPath()."feed.php?channel=".$GLOBALS['rss']->currentFeed->cid ; trunk/gregarius/cls/wrappers/item.php
r1625 r1727 57 57 if ($GLOBALS['rss'] -> currentItem ->escapedTitle != "" && getConfig('rss.output.usemodrewrite')) { 58 58 return getPath() 59 . $GLOBALS['rss'] -> currentItem -> parent->escapedTitle59 ."/item/".$GLOBALS['rss'] -> currentItem -> parent->escapedTitle 60 60 ."/$ply/$plm/$pld/" 61 61 .$GLOBALS['rss'] -> currentItem -> escapedTitle; trunk/gregarius/themes/lilina/web/item.php
r1711 r1727 7 7 $thisDay = rss_locale_date("%d", $GLOBALS['rss']->currentItem->date); 8 8 if(getConfig('rss.output.usemodrewrite')) { 9 $dateURL = getPath() . " $thisYear/$thisMon/$thisDay/";9 $dateURL = getPath() . "date/$thisYear/$thisMon/$thisDay/"; 10 10 }else{ 11 11 $dateURL = getPath() . "feed.php?y=$thisYear&m=$thisMon&d=$thisDay"; trunk/gregarius/util.php
r1691 r1727 666 666 if (getConfig('rss.output.usemodrewrite')) { 667 667 if ($channel) { 668 $ret .= " $channel/";668 $ret .= "item/$channel/"; 669 669 } 670 670 $ret .= rss_date(($dayView ? 'Y/m/d/' : 'Y/m/'), $ts, false);
