Author: epithet
Date: Thu Aug 16 19:48:37 2007
New Revision: 754
Modified:
trunk/htdocs/system/classes/feedbackhandler.php
trunk/htdocs/system/classes/format.php
trunk/htdocs/system/classes/post.php
trunk/htdocs/system/classes/url.php
trunk/htdocs/system/schema/mysql/schema.sql
trunk/htdocs/system/schema/sqlite/schema.sql
Log:
Standardize names for URL rules. Issue #350, thanks, tinyau.
Modified: trunk/htdocs/system/classes/feedbackhandler.php
=========================================================================== ===
--- trunk/htdocs/system/classes/feedbackhandler.php (original)
+++ trunk/htdocs/system/classes/feedbackhandler.php Thu Aug 16 19:48:37 2007
@@ -22,7 +22,7 @@
if ( $post->info->comments_disabled ) {
// comments are disabled, so let's just send
// them back to the post's permalink
- Utils::redirect( URL::get( 'display_posts_by_slug', array('slug'=>$post->slug) ) );
+ Utils::redirect( URL::get( 'display_entry', array('slug'=>$post->slug) ) );
}
if( $post && !$post->info->comments_disabled ) {
@@ -112,7 +112,7 @@
}
else {
// do something more intelligent here
- echo 'You forgot to add some content to your comment, please <a href="' . URL::get( 'display_posts_by_slug', array( 'slug' => $post->slug ) ) . '" title="Return to "'.$post->title.'"">go back and try again</a>.';
+ echo sprintf(_t('You forgot to add some content to your comment, please <a href="%1$s" title="Return to "%2$s"">go back and try again</a>.'), $post->permalink, $post->title );
}
}
}
Modified: trunk/htdocs/system/classes/format.php
=========================================================================== ===
--- trunk/htdocs/system/classes/format.php (original)
+++ trunk/htdocs/system/classes/format.php Thu Aug 16 19:48:37 2007
@@ -142,7 +142,7 @@
{
$array = array ( $array );
}
- $fn = create_function('$a,$b', 'return "<a href=\\"" . URL::get("display_posts_by_tag", array( "tag" => $b) ) . "\\" rel=\\"tag\\">" . $a . "</a>";');
+ $fn = create_function('$a,$b', 'return "<a href=\\"" . URL::get("display_entries_by_tag", array( "tag" => $b) ) . "\\" rel=\\"tag\\">" . $a . "</a>";');
$array = array_map($fn, $array, array_keys($array));
$last = array_pop($array);
$out = implode($between, $array);
Modified: trunk/htdocs/system/classes/post.php
=========================================================================== ===
--- trunk/htdocs/system/classes/post.php (original)
+++ trunk/htdocs/system/classes/post.php Thu Aug 16 19:48:37 2007
@@ -525,7 +525,6 @@
return URL::get(
array(
"display_{$content_type}",
- 'display_posts_by_slug',
),
$this,
false
Modified: trunk/htdocs/system/classes/url.php
=========================================================================== ===
--- trunk/htdocs/system/classes/url.php (original)
+++ trunk/htdocs/system/classes/url.php Thu Aug 16 19:48:37 2007
@@ -99,7 +99,7 @@
* values and returns the built URL.
*
* <code>
- * URL::get( 'display_posts_by_date', array(
+ * URL::get( 'display_entries_by_date', array(
* 'year' => '2000',
* 'month' => '05',
* 'day' => '01',
Modified: trunk/htdocs/system/schema/mysql/schema.sql
=========================================================================== ===
--- trunk/htdocs/system/schema/mysql/schema.sql (original)
+++ trunk/htdocs/system/schema/mysql/schema.sql Thu Aug 16 19:48:37 2007
@@ -185,18 +185,17 @@
('habari', 'content'),
('habari', 'comment');
-INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_posts_by_date', '%^(?P<year>[1,2]{1}[\\d]{3})(?:/(?P<month>[\\d]{2}))?(?:/(?P<day>[\\d]{2}) )?(?:/page/(?P<page>\\d+))?/?$%i', '{$year}/({$month}/)({$day}/)(page/{$page}/)', 'UserThemeHandler', 'display_date', '2', '1', '1', 'Displays posts for a specific date.');
+INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_entries_by_date', '%^(?P<year>[1,2]{1}[\\d]{3})(?:/(?P<month>[\\d]{2}))?(?:/(?P<day>[\\d]{2}) )?(?:/page/(?P<page>\\d+))?/?$%i', '{$year}/({$month}/)({$day}/)(page/{$page}/)', 'UserThemeHandler', 'display_date', '2', '1', '1', 'Displays posts for a specific date.');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_feed_by_type', '/^feed\\/(?P<feed_type>atom|rs[sd])[\\/]?$/i', 'feed/{$feed_type}', 'FeedHandler', 'display_feed', '5', '1', '0', 'Return feed per specified feed type');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('admin', '/^admin[\\/]*(?P<page>[^\\/]*)[\\/]?$/i', 'admin/({$page})', 'AdminHandler', 'admin', '6', '1', '0', 'An admin action');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('userprofile', '/^admin\\/(?P<page>user)\\/(?P<user>[^\\/]+)\\/?$/', 'admin/{$page}/{$user}', 'AdminHandler', 'admin', '4', '1', '1', 'The profile page for a specific user');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('user', '/^user\\/(?P<page>[^\\/]*)[\\/]?$/i', 'user/{$page}', 'UserHandler', '{$page}', '7', '1', '0', 'A user action or display, for instance the login screen');
-INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_posts_by_slug', '%^(?P<slug>[^/]+)(?:/page/(?P<page>\\d+))?/?$%i', '{$slug}(/page/{$page}/)', 'UserThemeHandler', 'display_post', '99', '1', '1', 'Return post matching specified slug');
-INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_entry_by_slug', '%^(?P<slug>[^/]+)(?:/page/(?P<page>\\d+))?/?$%i', '{$slug}(/page/{$page}/)', 'UserThemeHandler', 'display_post', '100', '1', '1', 'Return entry matching specified slug');
-INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_page_by_slug', '%^(?P<slug>[^/]+)(?:/page/(?P<page>\\d+))?/?$%i', '{$slug}(/page/{$page}/)', 'UserThemeHandler', 'display_post', '100', '1', '1', 'Return page matching specified slug');
+INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_entry', '%^(?P<slug>[^/]+)(?:/page/(?P<page>\\d+))?/?$%i', '{$slug}(/page/{$page}/)', 'UserThemeHandler', 'display_post', '100', '1', '1', 'Return entry matching specified slug');
+INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_page', '%^(?P<slug>[^/]+)(?:/page/(?P<page>\\d+))?/?$%i', '{$slug}(/page/{$page}/)', 'UserThemeHandler', 'display_post', '100', '1', '1', 'Return page matching specified slug');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('index_page', '/^(?:|page\\/(?P<page>\\d+)[\\/]?)$/', '(page/{$page})', 'UserThemeHandler', 'display_home', '1000', '1', '1', 'Homepage (index) display');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('rsd', '/^rsd$/i', 'rsd', 'AtomHandler', 'rsd', '1', '1', '0', 'RSD output');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('introspection', '/^atom$/i', 'atom', 'AtomHandler', 'introspection', '1', '1', '0', 'Atom introspection');
-INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('collection', '/^atom\\/(?P<index>.+)[\\/]?$/i', 'atom/{$index}', 'AtomHandler', 'collection', '1', '1', '0', 'Atom collection');
+INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('collection', '/^atom\\/(?P<index>.+)[\\/]?$/i', 'atom/{$index}', 'AtomHandler', 'collection', '8', '1', '0', 'Atom collection');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('search', '/^search(?:\\/(?P<criteria>[^\\/]+))?(?:\\/page\\/(?P<page>\\d+))?$/i', 'search(/{$criteria})(/page/{$page}/)', 'UserThemeHandler', 'search', '8', '1', '1', 'Searches posts');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('comment', '/^(?P<id>[0-9]+)\\/feedback[\\/]?$/i', '{$id}/feedback', 'FeedbackHandler', 'add_comment', '8', '1', '0', 'Adds a comment to a post');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('ajax', '/^ajax\\/(?P<context>[^\\/]+)[\\/]?$/i', 'ajax/{$context}', 'AjaxHandler', 'ajax', '8', '1', '0', 'Ajax handling');
@@ -205,7 +204,7 @@
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('entry_comments', '/^(?P<slug>[^\\/]+)\\/atom\\/comments$/i', '{$slug}/atom/comments', 'AtomHandler', 'entry_comments', '8', '1', '0', 'Entry comments');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('comments', '/^atom\\/comments$/i', 'atom/comments', 'AtomHandler', 'comments', '7', '1', '0', 'Entries comments');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('tag_collection', '/^tag\\/(?P<tag>[^\\/]+)\\/atom$/i', 'tag/{$tag}/atom', 'AtomHandler', 'tag_collection', '8', '1', '0', 'Atom Tag Collection');
-INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_posts_by_tag', '%^tag/(?P<tag>[^/]*)(?:/page/(?P<page>\\d+))?[/]?$%i', 'tag/{$tag}(/page/{$page}/)', 'UserThemeHandler', 'display_tag', '5', '1', '1', 'Return posts matching specified tag');
+INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_entries_by_tag', '%^tag/(?P<tag>[^/]*)(?:/page/(?P<page>\\d+))?[/]?$%i', 'tag/{$tag}(/page/{$page}/)', 'UserThemeHandler', 'display_tag', '5', '1', '1', 'Return posts matching specified tag');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('xmlrpc', '%^xmlrpc/?%i', 'xmlrpc', 'XMLRPCServer', 'xmlrpc_call', '8', '1', '0', 'Handle incoming XMLRPC requests.');
CREATE TABLE {$prefix}groups (
Modified: trunk/htdocs/system/schema/sqlite/schema.sql
=========================================================================== ===
--- trunk/htdocs/system/schema/sqlite/schema.sql (original)
+++ trunk/htdocs/system/schema/sqlite/schema.sql Thu Aug 16 19:48:37 2007
@@ -134,18 +134,17 @@
description TEXT NULL
);
-INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_posts_by_date', '%^(?P<year>[1,2]{1}[\d]{3})(?:/(?P<month>[\d]{2}))?(?:/(?P<day>[\d]{2}))?( ?:/page/(?P<page>\d+))?/?$%i', '{$year}/({$month}/)({$day}/)(page/{$page}/)', 'UserThemeHandler', 'display_date', 2, 1, 1, 'Displays posts for a specific date.');
+INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_entries_by_date', '%^(?P<year>[1,2]{1}[\d]{3})(?:/(?P<month>[\d]{2}))?(?:/(?P<day>[\d]{2}))?( ?:/page/(?P<page>\d+))?/?$%i', '{$year}/({$month}/)({$day}/)(page/{$page}/)', 'UserThemeHandler', 'display_date', 2, 1, 1, 'Displays posts for a specific date.');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_feed_by_type', '/^feed\/(?P<feed_type>atom|rs[sd])[\/]?$/i', 'feed/{$feed_type}', 'FeedHandler', 'display_feed', 5, 1, 0, 'Return feed per specified feed type');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('admin', '/^admin[\/]*(?P<page>[^\/]*)[\/]?$/i', 'admin/({$page})', 'AdminHandler', 'admin', 6, 1, 0, 'An admin action');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('userprofile', '/^admin\/(?P<page>user)\/(?P<user>[^\/]+)\/?$/', 'admin/{$page}/{$user}', 'AdminHandler', 'admin', 4, 1, 1, 'The profile page for a specific user');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('user', '/^user\/(?P<page>[^\/]*)[\/]?$/i', 'user/{$page}', 'UserHandler', '{$page}', 7, 1, 0, 'A user action or display, for instance the login screen');
-INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_posts_by_slug', '%^(?P<slug>[^/]+)(?:/page/(?P<page>\d+))?/?$%i', '{$slug}(/page/{$page}/)', 'UserThemeHandler', 'display_post', 99, 1, 1, 'Return post matching specified slug');
-INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_entry_by_slug', '%^(?P<slug>[^/]+)(?:/page/(?P<page>\d+))?/?$%i', '{$slug}(/page/{$page}/)', 'UserThemeHandler', 'display_post', 100, 1, 1, 'Return entry matching specified slug');
-INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_page_by_slug', '%^(?P<slug>[^/]+)(?:/page/(?P<page>\d+))?/?$%i', '{$slug}(/page/{$page}/)', 'UserThemeHandler', 'display_post', 100, 1, 1, 'Return page matching specified slug');
+INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_entry', '%^(?P<slug>[^/]+)(?:/page/(?P<page>\d+))?/?$%i', '{$slug}(/page/{$page}/)', 'UserThemeHandler', 'display_post', 100, 1, 1, 'Return entry matching specified slug');
+INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_page', '%^(?P<slug>[^/]+)(?:/page/(?P<page>\d+))?/?$%i', '{$slug}(/page/{$page}/)', 'UserThemeHandler', 'display_post', 100, 1, 1, 'Return page matching specified slug');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('index_page', '/^(?:|page\/(?P<page>\d+)[\/]?)$/', '(page/{$page})', 'UserThemeHandler', 'display_home', 1000, 1, 1, 'Homepage (index) display');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('rsd', '/^rsd$/i', 'rsd', 'AtomHandler', 'rsd', 1, 1, 0, 'RSD output');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('introspection', '/^atom$/i', 'atom', 'AtomHandler', 'introspection', 1, 1, 0, 'Atom introspection');
-INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('collection', '/^atom\/(?P<index>.+)[\/]?$/i', 'atom/{$index}', 'AtomHandler', 'collection', 1, 1, 0, 'Atom collection');
+INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('collection', '/^atom\/(?P<index>.+)[\/]?$/i', 'atom/{$index}', 'AtomHandler', 'collection', 8, 1, 0, 'Atom collection');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('search', '/^search(?:\/(?P<criteria>[^\/]+))?(?:\/page\/(?P<page>\d+))?$/i', 'search(/{$criteria})(/page/{$page}/)', 'UserThemeHandler', 'search', 8, 1, 1, 'Searches posts');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('comment', '/^(?P<id>[0-9]+)\/feedback[\/]?$/i', '{$id}/feedback', 'FeedbackHandler', 'add_comment', 8, 1, 0, 'Adds a comment to a post');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('ajax', '/^ajax\/(?P<context>[^\/]+)[\/]?$/i', 'ajax/{$context}', 'AjaxHandler', 'ajax', 8, 1, 0, 'Ajax handling');
@@ -154,7 +153,7 @@
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('entry_comments', '/^(?P<slug>[^\/]+)\/atom\/comments$/i', '{$slug}/atom/comments', 'AtomHandler', 'entry_comments', 8, 1, 0, 'Entry comments');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('comments', '/^atom\/comments$/i', 'atom/comments', 'AtomHandler', 'comments', 7, 1, 0, 'Entries comments');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('tag_collection', '/^tag\/(?P<tag>[^\/]+)\/atom$/i', 'tag/{$tag}/atom', 'AtomHandler', 'tag_collection', 8, 1, 0, 'Atom Tag Collection');
-INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_posts_by_tag', '%^tag/(?P<tag>[^/]*)(?:/page/(?P<page>\d+))?[/]?$%i', 'tag/{$tag}(/page/{$page}/)', 'UserThemeHandler', 'display_tag', 5, 1, 1, 'Return posts matching specified tag');
+INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('display_entries_by_tag', '%^tag/(?P<tag>[^/]*)(?:/page/(?P<page>\d+))?[/]?$%i', 'tag/{$tag}(/page/{$page}/)', 'UserThemeHandler', 'display_tag', 5, 1, 1, 'Return posts matching specified tag');
INSERT INTO {$prefix}rewrite_rules (name, parse_regex, build_str, handler, action, priority, is_active, rule_class, description) VALUES ('xmlrpc', '%^xmlrpc/?%i', 'xmlrpc', 'XMLRPCServer', 'xmlrpc_call', 8, 1, 0, 'Handle incoming XMLRPC requests.');
CREATE TABLE {$prefix}crontab (
|
