Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19438/include
Modified Files:
functions.inc.php functions_entries.inc.php
Log Message:
- Add ability to see all entries made by a single user
- Groundwork for dynamic URIs
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- functions.inc.php 15 Dec 2004 19:46:34 -0000 1.12
+++ functions.inc.php 22 Dec 2004 17:44:52 -0000 1.13
@@ -316,8 +316,20 @@
return $serendipity[$key] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . $path;
}
+function serendipity_makePermalink($format, $data) {
+ static $keys = array('%id%', '%title%');
+ $replacements = array((int)$data['id'], serendipity_makeFilename($data['title']));
+ return str_replace($keys, $replacements, $format);
+}
+
+function serendipity_makePermalinkRegex($format) {
+ static $keys = array('%id%', '%title%');
+ static $regexValues = array('([0-9]+)', '[0-9a-z\.\_!;,\+\-]+');
+ return str_replace($keys, $regexValues, preg_quote($format));
+}
+
function serendipity_archiveURL($id, $title, $key = 'baseURL', $checkrewrite = true) {
- $path = PATH_ARCHIVES . '/' . (int)$id . '-' . serendipity_makeFilename($title) . '.html';
+ $path = PATH_ARCHIVES . '/' . serendipity_makePermalink(PERM_ARCHIVES, array('id'=>$id, 'title' => $title));
if ( $checkrewrite ) {
$path = serendipity_rewriteURL($path, $key);
}
Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- functions_entries.inc.php 19 Dec 2004 22:16:37 -0000 1.30
+++ functions_entries.inc.php 22 Dec 2004 17:44:52 -0000 1.31
@@ -146,6 +146,11 @@
}
}
+ if (isset($serendipity['GET']['viewAuthor'])) {
+ $cond['and'] .= " AND e.authorid = ". (int)$serendipity['GET']['viewAuthor'];
+ }
+
+
if (isset($serendipity['GET']['category'])) {
$categoryid = (int)$serendipity['GET']['category'];
@@ -568,6 +573,7 @@
$entry['link_rdf'] = serendipity_rewriteURL(PATH_FEEDS . '/ei_'. $entry['id'] .'.rdf');
$entry['link_viewmode_threaded'] = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?url='. $entry['commURL'] .'&serendipity[cview]='. VIEWMODE_THREADED;
$entry['link_viewmode_linear'] = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?url='. $entry['commURL'] .'&serendipity[cview]='. VIEWMODE_LINEAR;
+ $entry['link_username'] = serendipity_rewriteURL(PATH_AUTHORS .'/'. serendipity_makePermalink(PERM_AUTHORS, array('id' => $entry['authorid'], 'title' => $entry['username'])));
if (strlen($entry['extended'])) {
$entry['has_extended'] = true;
@@ -1046,14 +1052,14 @@
htmlspecialchars($cat['category_description']),
$xmlImg,
str_repeat(' ', $level * 3),
- serendipity_rewriteURL(PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . $category_id, 'serendipityHTTPPath'),
+ serendipity_rewriteURL(PATH_CATEGORIES . '/' . serendipity_makePermalink(PERM_CATEGORIES, array('id' => $cat['categoryid'], 'title' => $category_id)), 'serendipityHTTPPath'),
htmlspecialchars($cat['category_description']),
htmlspecialchars($cat['category_name']));
} else {
$ret .= sprintf(
'%s<a href="%s" title="%s">%s</a><br />',
str_repeat(' ', $level * 3),
- serendipity_rewriteURL(PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . $category_id, 'serendipityHTTPPath'),
+ serendipity_rewriteURL(PATH_CATEGORIES . '/' . serendipity_makePermalink(PERM_CATEGORIES, array('id' => $cat['categoryid'], 'title' => $category_id)), 'serendipityHTTPPath'),
htmlspecialchars($cat['category_description']),
htmlspecialchars($cat['category_name']));
}
|
