includes/interface/Feather.php @@ -1,7 +1,7 @@ <?php /** * Class: Query - * Handles a query based on the <SQL.interface>. + * Handles a query based on the <SQL.method>. */ class Query { # Variable: $query includes/class/Query.php @@ -6,7 +6,7 @@ class SQL { # Array: $yaml # An associative array of YAML-parsed settings. - # This is what gets altered/added to when using <SQL.set. + # This is what gets altered/added to when using <SQL.set>. public $yaml = array(); # Array: $debug @@ -37,6 +37,10 @@ $this->connected = false; } + /** + * Function: method + * Returns the proper method of connecting and interacting with the database. + */ public function method() { # We really don't need PDO anymore, since we have the two we supported with it hardcoded (kinda). # Keeping this here for when/if we decide to add support for more database engines, like Postgres and MSSQL. includes/class/SQL.php @@ -43,6 +43,7 @@ $twig_filters = array( 'normalize' => 'normalize', 'truncate' => 'truncate', 'replace' => 'twig_replace_filter', + 'match' => 'twig_match_filter', 'linebreaks' => 'nl2br', 'camelize' => 'camelize', 'strip_tags' => 'strip_tags', @@ -273,7 +274,13 @@ function twig_is_odd_filter($value) function twig_replace_filter($str, $search, $replace) { - return str_replace($search, $replace, $str); + $func = ($str[0] == "/") ? "preg_replace" : "str_replace" ; + return $func($search, $replace, $str); +} + +function twig_match_filter($str, $match) +{ + return preg_match($match, $str); } includes/class/Twig/runtime.php @@ -174,11 +174,6 @@ # <Module> require_once INCLUDES_DIR."/class/Modules.php"; - # File: Feather - # See Also: - # <Feather> - require_once INCLUDES_DIR."/class/Feather.php"; - # File: Feathers # See Also: # <Feathers> @@ -208,6 +203,11 @@ # <Admin Controller> require_once INCLUDES_DIR."/controller/Admin.php"; + # File: Feather + # See Also: + # <Feather> + require_once INCLUDES_DIR."/interface/Feather.php"; + timer_start(); $flash = Flash::current(); @@ -322,9 +322,9 @@ $route->check_viewing_post(); $route->check_viewing_page(true); } - } - $trigger->call("runtime"); + $trigger->call("runtime"); + } # Array: $statuses # An array of post statuses that <Visitor> can view. includes/common.php @@ -172,7 +172,7 @@ /** * Function: pluralize - * Returns a pluralized string. This is a port of Rails' pluralizer. + * Returns a pluralized string. This is a port of Rails's pluralizer. * * Parameters: * $string - The string to pluralize. @@ -183,6 +183,10 @@ return $pluralizations[$string]; else { $uncountable = array("moose", "sheep", "fish", "series", "species", "rice", "money", "information", "equipment", "piss"); + + if (in_array($string, $uncountable)) + return $string; + $replacements = array("/person/i" => "people", "/man/i" => "men", "/child/i" => "children", @@ -191,6 +195,7 @@ "/(penis)$/i" => "\\1es", # Take that, Rails! "/(ax|test)is$/i" => "\\1es", "/(octop|vir)us$/i" => "\\1ii", + "/(cact)us$/i" => "\\1i", "/(alias|status)$/i" => "\\1es", "/(bu)s$/i" => "\\1ses", "/(buffal|tomat)o$/i" => "\\1oes", @@ -204,18 +209,9 @@ "/([m|l])ouse$/i" => "\\1ice", "/(quiz)$/i" => "\\1zes"); - $replaced = $string; - foreach ($replacements as $key => $val) { - if (in_array($string, $uncountable)) - break; - - $replaced = preg_replace($key, $val, $string); - - if ($replaced != $string) - break; - } + $replaced = preg_replace(array_keys($replacements), array_values($replacements), $string, 1); - if ($replaced == $string and !in_array($string, $uncountable)) + if ($replaced == $string) return $string."s"; else return $replaced; @@ -239,7 +235,6 @@ if (isset($reversed[$string])) return $reversed[$string]; else { - $uncountable = array("moose", "sheep", "fish", "series", "species", "rice", "money", "information", "equipment", "piss"); $replacements = array("/people/i" => "person", "/^men/i" => "man", "/children/i" => "child", @@ -247,7 +242,7 @@ "/geese/i" => "goose", "/(penis)es$/i" => "\\1", "/(ax|test)es$/i" => "\\1is", - "/(octop|vir)ii$/i" => "\\1us", + "/(octopi|viri|cact)i$/i" => "\\1us", "/(alias|status)es$/i" => "\\1", "/(bu)ses$/i" => "\\1s", "/(buffal|tomat)oes$/i" => "\\1o", @@ -262,18 +257,9 @@ "/([m|l])ice$/i" => "\\1ouse", "/(quiz)zes$/i" => "\\1"); - $replaced = $string; - foreach ($replacements as $key => $val) { - if (in_array($string, $uncountable)) - break; - - $replaced = preg_replace($key, $val, $string, 1); - - if ($replaced != $string) - break; - } + $replaced = preg_replace(array_keys($replacements), array_values($replacements), $string, 1); - if ($replaced == $string and !in_array($string, $uncountable) and substr($string, -1) == "s") + if ($replaced == $string and substr($string, -1) == "s") return substr($string, 0, -1); else return $replaced; includes/helpers.php @@ -1,6 +1,8 @@ <?php require_once "includes/common.php"; + $trigger->call("top"); + switch($route->action) { case "index": case "search": case "drafts": case "feather": $context = array("posts" => $posts); index.php @@ -6,4 +6,4 @@ author: name: Alex Suraci url: http://i.am.toogeneric.com/ notifications: - - Please make sure that /includes/cache is writable by the server. If you are not certain whether it is or not, CHMOD it to 777. + - Please make sure that /includes/caches is writable by the server. If you are not certain whether it is or not, CHMOD it to 777. modules/cacher/info.yaml includes/class/Feather.php 7ec872a10a4e88fccdc1e45a1f75570d0db7ab75 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/10325041c602fd9c9d19b20be17810975b6f3917 10325041c602fd9c9d19b20be17810975b6f3917 2008-07-22T22:50:18-07:00 2008-07-22T22:50:18-07:00 * Added a "match" Twig filter. * Modified the "replace" Twig filter to use preg_replace if the search begins with "/". * Documentation updates. * Moved the "Feather" interface to its own folder. * Improved pluralize() and depluralize() * Added the "top" Trigger back in. * Only call the "runtime" filter if INDEX is true. b0ebc8df4a9b79d1fa270fae04a8d5dfac678918 Alex Suraci i.am@toogeneric.com