|
From: Garvin H. <gar...@us...> - 2004-03-21 16:37:34
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29876 Modified Files: NEWS htaccess.rewrite.tpl index.php serendipity_admin.php serendipity_admin_installer.inc.php serendipity_config.inc.php serendipity_functions.inc.php serendipity_sidebar_items.php serendipity_xmlrpc.php Log Message: Used zem's patch (as announced at the beginning of this week). This eases maintenance for later path corrections. Please test. Index: serendipity_admin_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- serendipity_admin_installer.inc.php 2 Mar 2004 17:35:24 -0000 1.57 +++ serendipity_admin_installer.inc.php 21 Mar 2004 16:26:56 -0000 1.58 @@ -332,10 +332,10 @@ } // Attempt to create the archives directory - if ( !is_dir($_POST['serendipityPath'] . 'archives') && @mkdir($_POST['serendipityPath'] . 'archives', $umask) !== true ) { - $errs[] = sprintf(DIRECTORY_CREATE_ERROR, $_POST['serendipityPath'] . 'archives'); - $errs[] = sprintf(DIRECTORY_RUN_CMD , 'mkdir' , $_POST['serendipityPath'] . 'archives'); - $errs[] = sprintf(DIRECTORY_RUN_CMD , 'chmod go+rwx', $_POST['serendipityPath'] . 'archives'); + if ( !is_dir($_POST['serendipityPath'] . PATH_ARCHIVES) && @mkdir($_POST['serendipityPath'] . PATH_ARCHIVES, $umask) !== true ) { + $errs[] = sprintf(DIRECTORY_CREATE_ERROR, $_POST['serendipityPath'] . PATH_ARCHIVES); + $errs[] = sprintf(DIRECTORY_RUN_CMD , 'mkdir' , $_POST['serendipityPath'] . PATH_ARCHIVES); + $errs[] = sprintf(DIRECTORY_RUN_CMD , 'chmod go+rwx', $_POST['serendipityPath'] . PATH_ARCHIVES); } // plugins directory now part of basic CVS @@ -430,12 +430,30 @@ $content = str_replace( array( '{PREFIX}', - '{indexFile}' + '{indexFile}', + '{PAT_UNSUBSCRIBE}', '{PATH_UNSUBSCRIBE}', + '{PAT_ARCHIVES}', '{PATH_ARCHIVES}', + '{PAT_ARCHIVES_SHORT}', + '{PAT_FEEDS}', '{PATH_FEEDS}', + '{PAT_FEED}', + '{PAT_ADMIN}', '{PATH_ADMIN}', + '{PAT_ENTRIES}', '{PATH_ENTRIES}', + '{PAT_ARCHIVE}', '{PATH_ARCHIVE}', + '{PAT_CATEGORIES}', '{PATH_CATEGORIES}', ), array( $_POST['serendipityHTTPPath'], - $_POST['indexFile'] + $_POST['indexFile'], + trim(PAT_UNSUBSCRIBE, '@/i'), PATH_UNSUBSCRIBE, + trim(PAT_ARCHIVES, '@/i'), PATH_ARCHIVES, + trim(PAT_ARCHIVES_SHORT, '@/i'), + trim(PAT_FEEDS, '@/i'), PATH_FEEDS, + trim(PAT_FEED, '@/i'), + trim(PAT_ADMIN, '@/i'), PATH_ADMIN, + trim(PAT_ENTRIES, '@/i'), PATH_ENTRIES, + trim(PAT_ARCHIVE, '@/i'), PATH_ARCHIVE, + trim(PAT_CATEGORIES, '@/i'), PATH_CATEGORIES, ), implode('', $a) Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- serendipity_config.inc.php 15 Mar 2004 10:12:47 -0000 1.57 +++ serendipity_config.inc.php 21 Mar 2004 16:26:56 -0000 1.58 @@ -34,6 +34,32 @@ */ include('serendipity_lang.inc.php'); +/* URI paths + * These could be defined in the language headers, except that would break + * backwards URL compatibility + */ +@define('PATH_ARCHIVES', 'archives'); +@define('PATH_ARCHIVE', 'archive'); +@define('PATH_UNSUBSCRIBE', 'unsubscribe'); +@define('PATH_FEEDS', 'feeds'); +@define('PATH_ADMIN', 'admin'); +@define('PATH_ENTRIES', 'entries'); +@define('PATH_CATEGORIES', 'categories'); + +/* URI patterns + * Note that it's important to use @ as the pattern delimiter. + */ +@define('PAT_UNSUBSCRIBE', '@/'.PATH_UNSUBSCRIBE.'/(.*)/([0-9]+)@'); +@define('PAT_ARCHIVES', '@/'.PATH_ARCHIVES.'/(\d+)\.html@'); +@define('PAT_ARCHIVES_SHORT', '@/'.PATH_ARCHIVES.'/(\d+)_short\.html@'); +@define('PAT_COMMENTSUB', '@/(\d+)_\w*\.html@i'); +@define('PAT_FEEDS', '@/'.PATH_FEEDS.'/@'); +@define('PAT_FEED', '@/(index|atom|rss|b2rss|b2rdf).(rss|rdf|rss2|xml)$@'); +@define('PAT_ADMIN', '@/'.PATH_ADMIN.'$@'); +@define('PAT_ENTRIES', '@/'.PATH_ENTRIES.'$@'); +@define('PAT_ARCHIVE', '@/'.PATH_ARCHIVE.'$@'); +@define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/(.*)@'); + /* * Kill the script if we are not installed, and not inside the installer */ Index: serendipity_admin.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- serendipity_admin.php 4 Mar 2004 12:39:17 -0000 1.32 +++ serendipity_admin.php 21 Mar 2004 16:26:56 -0000 1.33 @@ -78,7 +78,7 @@ </div> <div class="serendipitySideBarItem"> <div class="serendipitySideBarContent"> - • <a href="<?php echo $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>entries"><?php echo AUTHOR_SUITE; ?></a><br /> + • <a href="<?php echo $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ENTRIES; ?>"><?php echo AUTHOR_SUITE; ?></a><br /> • <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG; ?></a><br /> • <a href="?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a><br /> </div> Index: index.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/index.php,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- index.php 15 Mar 2004 09:10:24 -0000 1.35 +++ index.php 21 Mar 2004 16:26:56 -0000 1.36 @@ -13,12 +13,12 @@ $track_referer = true; $uri = $_SERVER['REQUEST_URI']; -if (preg_match('@/unsubscribe/(.*)/([0-9]+)@', $uri, $res)) { +if (preg_match(PAT_UNSUBSCRIBE, $uri, $res)) { serendipity_cancelSubscription(urldecode($res[1]), $res[2]); - $uri = '/archives/'. $res[2] .'_untitled.html'; + $uri = '/'.PATH_UNSUBSCRIBE.'/'. $res[2] .'_untitled.html'; } -if (preg_match('@/archives/(\d+)\.html@', $uri, $matches)) { +if (preg_match(PAT_ARCHIVES, $uri, $matches)) { header('Content-Type: text/html; charset='. LANG_CHARSET); $range = $matches[1]; $_GET['serendipity']['action'] = 'read'; @@ -38,13 +38,13 @@ ob_end_clean(); if (isset($serendipity['pregenerate']) && $serendipity['pregenerate']) { - $fp = fopen('./archives/' . $matches[1], 'w'); + $fp = fopen('./'.PATH_ARCHIVES.'/' . $matches[1], 'w'); fwrite($fp, $data); fclose($fp); } echo $data; -} else if (preg_match('@/archives/(\d+)_short\.html@', $uri, $matches)) { +} else if (preg_match(PAT_ARCHIVES_SHORT, $uri, $matches)) { header('Content-Type: text/html; charset='. LANG_CHARSET); $range = $matches[1]; $_GET['serendipity']['action'] = 'read'; @@ -70,7 +70,7 @@ } echo $data; -} else if (preg_match('@/(\d+)_\w*\.html@i', $uri, $matches)) { +} else if (preg_match(PAT_COMMENTSUB, $uri, $matches)) { serendipity_rememberComment(); if (!empty($serendipity['POST']['submit'])) { @@ -113,12 +113,12 @@ ob_end_clean(); if (isset($serendipity['pregenerate']) && $serendipity['pregenerate']) { - $fp = fopen('./archives/' . $matches[1], 'w'); + $fp = fopen('./'.PATH_ARCHIVES.'/' . $matches[1], 'w'); fwrite($fp, $data); fclose($fp); } print $data; -} else if (preg_match('@/feeds/@', $uri)) { +} else if (preg_match(PAT_FEEDS, $uri)) { header('Content-Type: text/html; charset=utf-8'); if (preg_match('@/(index|atom|rss|b2rss|b2rdf).(rss|rdf|rss2|xml)$@', $uri, $matches)) { $_GET['version'] = serendipity_discover_rss($matches[1], $matches[2]); @@ -131,7 +131,7 @@ $data = ltrim($data); if ($serendipity['pregenerate']) { - $fp = fopen('./feeds/index.' . $matches[1], 'w'); + $fp = fopen('./'.PATH_FEEDS.'/index.' . $matches[1], 'w'); fwrite($fp, $data); fclose($fp); } @@ -139,17 +139,17 @@ print $data; exit; } -} else if (preg_match('@/admin$@', $uri)) { +} else if (preg_match(PAT_ADMIN, $uri)) { header("Location: {$serendipity['serendipityHTTPPath']}serendipity_admin.php"); exit; -} else if (preg_match('@/entries$@', $uri)) { +} else if (preg_match(PAT_ENTRIES, $uri)) { header("Location: {$serendipity['serendipityHTTPPath']}serendipity_entries.php"); exit; -} else if (preg_match('@/archive$@', $uri)) { +} else if (preg_match(PAT_ARCHIVE, $uri)) { header('Content-Type: text/html; charset='. LANG_CHARSET); $serendipity['GET']['action'] = 'archives'; include_once('serendipity_genpage.inc.php'); -} else if (preg_match('@/categories/(.*)@', $uri, $matches) || +} else if (preg_match(PAT_CATEGORIES, $uri, $matches) || preg_match('@/(index\.(php|html))?@', $uri) || preg_match('@/(' . preg_quote($serendipity['indexFile']) . ')?@', $uri)) { Index: htaccess.rewrite.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/htaccess.rewrite.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- htaccess.rewrite.tpl 4 Mar 2004 09:50:11 -0000 1.4 +++ htaccess.rewrite.tpl 21 Mar 2004 16:26:56 -0000 1.5 @@ -3,16 +3,16 @@ DirectoryIndex {PREFIX}{indexFile} RewriteEngine On -RewriteRule ^archives/([0-9]+)\.html {indexFile}?url=/archives/$1.html [L,QSA] -RewriteRule ^archives/([0-9]+)_short*\.html {indexFile}?url=/archives/$1_short.html [L,NC,QSA] +RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [L,QSA] +RewriteRule ^{PAT_ARCHIVES_SHORT} {indexFile}?url=/{PATH_ARCHIVES}/$1_short.html [L,NC,QSA] RewriteRule ^([0-9]+)_[0-9a-z_]*\.html {indexFile}?url=$1_article.html [L,NC,QSA] -RewriteRule ^feeds/(.*) {indexFile}?url=/feeds/$1 [L,QSA] -RewriteRule ^unsubscribe/(.*)/([0-9]+) {indexFile}?url=/unsubscribe/$1/$2 [L,QSA] -RewriteRule ^admin serendipity_admin.php [L,QSA] -RewriteRule ^entries serendipity_entries.php [L,QSA] -RewriteRule ^archive {indexFile}?url=/archive [L,QSA] -RewriteRule ^categories/(.*) {indexFile}?url=categories/$1 [L,QSA] -RewriteRule ^(atom|index|rss|b2rss|b2rdf)\.(rss|xml|rdf|rss2) rss.php?file=$1&ext=$2 +RewriteRule ^{PAT_FEEDS}/(.*) {indexFile}?url=/{PATH_FEEDS}/$1 [L,QSA] +RewriteRule ^{PAT_UNSUBSCRIBE} {indexFile}?url=/{PATH_UNSUBSCRIBE}/$1/$2 [L,QSA] +RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA] +RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA] +RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA] +RewriteRule ^{PAT_CATEGORIES} {indexFile}?url={PATH_ARCHIVE}/$1 [L,QSA] +RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2 RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA] RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA] @@ -31,4 +31,4 @@ <Files sqlite.db> deny from all </Files> -# END s9y \ No newline at end of file +# END s9y Index: serendipity_xmlrpc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- serendipity_xmlrpc.php 7 Jan 2004 17:45:55 -0000 1.13 +++ serendipity_xmlrpc.php 21 Mar 2004 16:26:56 -0000 1.14 @@ -250,8 +250,8 @@ 'mt_convert_breaks' => new XML_RPC_Value('', 'string'), 'mt_keywords' => new XML_RPC_Value('', 'string'), 'title' => new XML_RPC_Value($entry['title'],'string'), - 'permalink' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/archives/' . $postid . '_.html', 'string'), - 'link' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/archives/' . $postid . '_.html', 'string')); + 'permalink' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string'), + 'link' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string')); $entry = new XML_RPC_Value($tmp, 'struct'); return new XML_RPC_Response($entry); } Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- NEWS 16 Mar 2004 09:25:37 -0000 1.90 +++ NEWS 21 Mar 2004 16:26:56 -0000 1.91 @@ -3,6 +3,9 @@ Version 0.6 () ------------------------------------------------------------------------ + * Abstract archives/URL locations and regex-patterns in a central + place for easier maintenance (zem) + * Optimized db indizes on 'entries' (zem) * Added shoutbox plugin (Matthias Lange, garvinhicking) Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.229 retrieving revision 1.230 diff -u -d -r1.229 -r1.230 --- serendipity_functions.inc.php 19 Mar 2004 11:05:13 -0000 1.229 +++ serendipity_functions.inc.php 21 Mar 2004 16:26:56 -0000 1.230 @@ -391,7 +391,7 @@ } $monthName = ucfirst(strftime("%B", mktime(0,0,0,$month))); // Prepare the table - $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . $year . sprintf('%02d', $month) . '.html' . $base_query; + $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . $year . sprintf('%02d', $month) . '.html' . $base_query; ?> <table width="100%" class="serendipity_calendar" cellspacing="1"> <tr> @@ -468,7 +468,7 @@ } // Print day - $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . date('Ymd', mktime(0,0,0, $month, $currDay, $year)) . '.html' . $base_query; + $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . date('Ymd', mktime(0,0,0, $month, $currDay, $year)) . '.html' . $base_query; if (date('m') == $month && date('Y') == $year @@ -1499,14 +1499,14 @@ $dated = date('Ymd', $timestamp); $datem = date('Ym', $timestamp); - @unlink("{$serendipity['serendipityPath']}/archives/{$dated}.html"); - @unlink("{$serendipity['serendipityPath']}/archives/{$datem}.html"); + @unlink("{$serendipity['serendipityPath']}/".PATH_ARCHIVES."/{$dated}.html"); + @unlink("{$serendipity['serendipityPath']}/".PATH_ARCHIVES."/{$datem}.html"); } // Fixme (the _* part) ! - @unlink("{$serendipity['serendipityPath']}/archives/{$id}_*.html"); - @unlink("{$serendipity['serendipityPath']}/feeds/index.rss"); - @unlink("{$serendipity['serendipityPath']}/feeds/index.rss2"); + @unlink("{$serendipity['serendipityPath']}/".PATH_ARCHIVES."/{$id}_*.html"); + @unlink("{$serendipity['serendipityPath']}/".PATH_FEEDS."/index.rss"); + @unlink("{$serendipity['serendipityPath']}/".PATH_FEEDS."/index.rss2"); @unlink("{$serendipity['serendipityPath']}/index.html"); } @@ -1730,7 +1730,7 @@ function serendipity_archiveURL($id, $title, $key = 'baseURL') { global $serendipity; - return $serendipity[$key] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . $id . '_' . serendipity_makeFilename($title) . '.html'; + return $serendipity[$key] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . $id . '_' . serendipity_makeFilename($title) . '.html'; } /** @@ -2356,10 +2356,10 @@ for($x=1; $x<13; $x++) { $entries = serendipity_postAmount($currYear, $x); if ($entries > 0) { - $a = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . "archives/$currYear" . sprintf('%02s', $x) . '.html\'>'; + $a = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES."/$currYear" . sprintf('%02s', $x) . '.html\'>'; $b = '</a>'; - $c = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . "archives/$currYear" . sprintf('%02s', $x) . '_short.html\'>'; - $d = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . "archives/$currYear" . sprintf('%02s', $x) . '.html\'>'; + $c = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES."/$currYear" . sprintf('%02s', $x) . '_short.html\'>'; + $d = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES."/$currYear" . sprintf('%02s', $x) . '.html\'>'; } else { $a = $c = '<span style="color: #CDCDCD">'; $b = $d = '</span>'; Index: serendipity_sidebar_items.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- serendipity_sidebar_items.php 16 Mar 2004 09:03:04 -0000 1.50 +++ serendipity_sidebar_items.php 21 Mar 2004 16:26:56 -0000 1.51 @@ -95,7 +95,7 @@ for($x = 0; $x < 3; $x++) { $ts -= 1; - $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . date('Ym', $ts) . '.html'; + $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES.'/' . date('Ym', $ts) . '.html'; $ts_title = ucfirst(strftime("%B %Y", $ts)); @@ -105,7 +105,7 @@ } echo "<a href='{$serendipity['serendipityHTTPPath']}'>" . RECENT . "</a><br />\n"; - echo "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . "archive'>" . OLDER . "</a>\n"; + echo "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVE."'>" . OLDER . "</a>\n"; } } @@ -401,7 +401,7 @@ global $serendipity; $title = SUPERUSER . ':'; - echo "<a href=\"{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . "entries\" title=\"$title\">\$ su -</a>"; + echo "<a href=\"{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ENTRIES."\" title=\"$title\">\$ su -</a>"; } } @@ -530,7 +530,7 @@ htmlentities($category['category_description']), ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'), serendipity_getTemplateFile('img/xml.gif'), - $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'categories/' . $category['categoryid'] . '_' . $category_id, + $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES.'/' . $category['categoryid'] . '_' . $category_id, htmlentities($category['category_description']), htmlentities($category['category_name']) ); |
