0
@@ -1,7 +1,7 @@
0
 <?php
0
   /**
0
    * Class: Query
0
-   * Handles a query based on the <SQL.interface>.
0
+   * Handles a query based on the <SQL.method>.
0
    */
0
   class Query {
0
     # Variable: $query

0
@@ -6,7 +6,7 @@
0
   class SQL {
0
     # Array: $yaml
0
     # An associative array of YAML-parsed settings.
0
-    # This is what gets altered/added to when using <SQL.set.
0
+    # This is what gets altered/added to when using <SQL.set>.
0
     public $yaml = array();
0
 
0
     # Array: $debug
0
@@ -37,6 +37,10 @@
0
       $this->connected = false;
0
     }
0
 
0
+    /**
0
+     * Function: method
0
+     * Returns the proper method of connecting and interacting with the database.
0
+     */
0
     public function method() {
0
       # We really don't need PDO anymore, since we have the two we supported with it hardcoded (kinda).
0
       # Keeping this here for when/if we decide to add support for more database engines, like Postgres and MSSQL.

0
@@ -43,6 +43,7 @@ $twig_filters = array(
0
   'normalize' =>        'normalize',
0
   'truncate' =>         'truncate',
0
   'replace' =>          'twig_replace_filter',
0
+  'match' =>            'twig_match_filter',
0
   'linebreaks' =>       'nl2br',
0
   'camelize' =>         'camelize',
0
   'strip_tags' =>       'strip_tags',
0
@@ -273,7 +274,13 @@ function twig_is_odd_filter($value)
0
 
0
 function twig_replace_filter($str, $search, $replace)
0
 {
0
-  return str_replace($search, $replace, $str);
0
+  $func = ($str[0] == "/") ? "preg_replace" : "str_replace" ;
0
+  return $func($search, $replace, $str);
0
+}
0
+
0
+function twig_match_filter($str, $match)
0
+{
0
+  return preg_match($match, $str);
0
 }
0
 
0
 

0
@@ -174,11 +174,6 @@
0
   #     <Module>
0
   require_once INCLUDES_DIR."/class/Modules.php";
0
 
0
-  # File: Feather
0
-  # See Also:
0
-  #     <Feather>
0
-  require_once INCLUDES_DIR."/class/Feather.php";
0
-
0
   # File: Feathers
0
   # See Also:
0
   #     <Feathers>
0
@@ -208,6 +203,11 @@
0
   #     <Admin Controller>
0
   require_once INCLUDES_DIR."/controller/Admin.php";
0
 
0
+  # File: Feather
0
+  # See Also:
0
+  #     <Feather>
0
+  require_once INCLUDES_DIR."/interface/Feather.php";
0
+
0
   timer_start();
0
 
0
   $flash = Flash::current();
0
@@ -322,9 +322,9 @@
0
       $route->check_viewing_post();
0
       $route->check_viewing_page(true);
0
     }
0
-  }
0
 
0
-  $trigger->call("runtime");
0
+    $trigger->call("runtime");
0
+  }
0
 
0
   # Array: $statuses
0
   # An array of post statuses that <Visitor> can view.

0
@@ -172,7 +172,7 @@
0
 
0
   /**
0
    * Function: pluralize
0
-   * Returns a pluralized string. This is a port of Rails' pluralizer.
0
+   * Returns a pluralized string. This is a port of Rails's pluralizer.
0
    *
0
    * Parameters:
0
    *     $string - The string to pluralize.
0
@@ -183,6 +183,10 @@
0
       return $pluralizations[$string];
0
     else {
0
       $uncountable = array("moose", "sheep", "fish", "series", "species", "rice", "money", "information", "equipment", "piss");
0
+
0
+      if (in_array($string, $uncountable))
0
+        return $string;
0
+
0
       $replacements = array("/person/i" => "people",
0
                             "/man/i" => "men",
0
                             "/child/i" => "children",
0
@@ -191,6 +195,7 @@
0
                             "/(penis)$/i" => "\\1es", # Take that, Rails!
0
                             "/(ax|test)is$/i" => "\\1es",
0
                             "/(octop|vir)us$/i" => "\\1ii",
0
+                            "/(cact)us$/i" => "\\1i",
0
                             "/(alias|status)$/i" => "\\1es",
0
                             "/(bu)s$/i" => "\\1ses",
0
                             "/(buffal|tomat)o$/i" => "\\1oes",
0
@@ -204,18 +209,9 @@
0
                             "/([m|l])ouse$/i" => "\\1ice",
0
                             "/(quiz)$/i" => "\\1zes");
0
 
0
-      $replaced = $string;
0
-      foreach ($replacements as $key => $val) {
0
-        if (in_array($string, $uncountable))
0
-          break;
0
-
0
-        $replaced = preg_replace($key, $val, $string);
0
-
0
-        if ($replaced != $string)
0
-          break;
0
-      }
0
+      $replaced = preg_replace(array_keys($replacements), array_values($replacements), $string, 1);
0
 
0
-      if ($replaced == $string and !in_array($string, $uncountable))
0
+      if ($replaced == $string)
0
         return $string."s";
0
       else
0
         return $replaced;
0
@@ -239,7 +235,6 @@
0
     if (isset($reversed[$string]))
0
       return $reversed[$string];
0
     else {
0
-      $uncountable = array("moose", "sheep", "fish", "series", "species", "rice", "money", "information", "equipment", "piss");
0
       $replacements = array("/people/i" => "person",
0
                             "/^men/i" => "man",
0
                             "/children/i" => "child",
0
@@ -247,7 +242,7 @@
0
                             "/geese/i" => "goose",
0
                             "/(penis)es$/i" => "\\1",
0
                             "/(ax|test)es$/i" => "\\1is",
0
-                            "/(octop|vir)ii$/i" => "\\1us",
0
+                            "/(octopi|viri|cact)i$/i" => "\\1us",
0
                             "/(alias|status)es$/i" => "\\1",
0
                             "/(bu)ses$/i" => "\\1s",
0
                             "/(buffal|tomat)oes$/i" => "\\1o",
0
@@ -262,18 +257,9 @@
0
                             "/([m|l])ice$/i" => "\\1ouse",
0
                             "/(quiz)zes$/i" => "\\1");
0
 
0
-      $replaced = $string;
0
-      foreach ($replacements as $key => $val) {
0
-        if (in_array($string, $uncountable))
0
-          break;
0
-
0
-        $replaced = preg_replace($key, $val, $string, 1);
0
-
0
-        if ($replaced != $string)
0
-          break;
0
-      }
0
+      $replaced = preg_replace(array_keys($replacements), array_values($replacements), $string, 1);
0
 
0
-      if ($replaced == $string and !in_array($string, $uncountable) and substr($string, -1) == "s")
0
+      if ($replaced == $string and substr($string, -1) == "s")
0
         return substr($string, 0, -1);
0
       else
0
         return $replaced;

0
@@ -1,6 +1,8 @@
0
 <?php
0
   require_once "includes/common.php";
0
 
0
+  $trigger->call("top");
0
+
0
   switch($route->action) {
0
     case "index": case "search": case "drafts": case "feather":
0
       $context = array("posts" => $posts);

0
@@ -6,4 +6,4 @@ author:
0
   name: Alex Suraci
0
   url: http://i.am.toogeneric.com/
0
 notifications:
0
-  - 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.
0
+  - 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.