0
@@ -82,8 +82,7 @@
0
      */
0
     static function add($name, $permissions) {
0
       $sql = SQL::current();
0
-      $sql->insert("groups", array("name" => ":name", "permissions" => ":permissions"),
0
-                             array(":name"  => $name,   ":permissions"  => YAML::dump($permissions)));
0
+      $sql->insert("groups", array("name" => $name, "permissions" => YAML::dump($permissions)));
0
 
0
       $group = new self($sql->latest());
0
 

0
@@ -65,30 +65,16 @@
0
       $sql = SQL::current();
0
       $visitor = Visitor::current();
0
       $sql->insert("pages",
0
-                   array(
0
-                       "title" => ":title",
0
-                       "body" => ":body",
0
-                       "user_id" => ":user_id",
0
-                       "parent_id" => ":parent_id",
0
-                       "show_in_list" => ":show_in_list",
0
-                       "list_order" => ":list_order",
0
-                       "clean" => ":clean",
0
-                       "url" => ":url",
0
-                       "created_at" => ":created_at",
0
-                       "updated_at" => ":updated_at"
0
-                   ),
0
-                   array(
0
-                       ":title" => $title,
0
-                       ":body" => $body,
0
-                       ":user_id" => fallback($user_id, $visitor->id),
0
-                       ":parent_id" => $parent_id,
0
-                       ":show_in_list" => $show_in_list,
0
-                       ":list_order" => $list_order,
0
-                       ":clean" => $clean,
0
-                       ":url" => $url,
0
-                       ":created_at" => fallback($created_at, datetime()),
0
-                       ":updated_at" => fallback($updated_at, "0000-00-00 00:00:00")
0
-                   ));
0
+                   array("title" => $title,
0
+                         "body" => $body,
0
+                         "user_id" => fallback($user_id, $visitor->id),
0
+                         "parent_id" => $parent_id,
0
+                         "show_in_list" => $show_in_list,
0
+                         "list_order" => $list_order,
0
+                         "clean" => $clean,
0
+                         "url" => $url,
0
+                         "created_at" => fallback($created_at, datetime()),
0
+                         "updated_at" => fallback($updated_at, "0000-00-00 00:00:00")));
0
 
0
       $page = new self($sql->latest());
0
 

0
@@ -162,24 +162,15 @@
0
       $sql = SQL::current();
0
       $visitor = Visitor::current();
0
       $sql->insert("posts",
0
-                   array("xml" => ":xml",
0
-                         "feather" => ":feather",
0
-                         "user_id" => ":user_id",
0
-                         "pinned" => ":pinned",
0
-                         "status" => ":status",
0
-                         "clean" => ":clean",
0
-                         "url" => ":url",
0
-                         "created_at" => ":created_at",
0
-                         "updated_at" => ":updated_at"),
0
-                   array(":xml" => $xml->asXML(),
0
-                         ":feather" => $feather,
0
-                         ":user_id" => $user,
0
-                         ":pinned" => (int) $pinned,
0
-                         ":status" => $status,
0
-                         ":clean" => $clean,
0
-                         ":url" => $url,
0
-                         ":created_at" => $created_at,
0
-                         ":updated_at" => $updated_at));
0
+                   array("xml" => $xml->asXML(),
0
+                         "feather" => $feather,
0
+                         "user_id" => $user,
0
+                         "pinned" => (int) $pinned,
0
+                         "status" => $status,
0
+                         "clean" => $clean,
0
+                         "url" => $url,
0
+                         "created_at" => $created_at,
0
+                         "updated_at" => $updated_at));
0
       $id = $sql->latest();
0
 
0
       if (empty($clean) or empty($url))
0
@@ -547,17 +538,15 @@
0
       if ($this->no_results)
0
         return false;
0
 
0
-      $where = array("(created_at > :created_at OR id > :id)");
0
+      $where = array("created_at > :created_at OR id > :id");
0
 
0
-      $statuses = array("public");
0
+      $where["status"] = array("public");
0
       if ($this->status == "draft")
0
-        $statuses[] = "draft";
0
+        $where["status"][] = "draft";
0
       if (logged_in())
0
-        $statuses[] = "registered_only";
0
+        $where["status"][] = "registered_only";
0
       if (Visitor::current()->group()->can("view_private"))
0
-        $statuses[] = "private";
0
-
0
-      $where[] = "status IN ('".implode("', '", $statuses)."')";
0
+        $where["status"][] = "private";
0
 
0
       return new self(null, array("where" => $where,
0
                                   "order" => "created_at ASC, id ASC",

0
@@ -67,23 +67,13 @@
0
       $config = Config::current();
0
       $sql = SQL::current();
0
       $sql->insert("users",
0
-                   array(
0
-                       "login" => ":login",
0
-                       "password" => ":password",
0
-                       "email" => ":email",
0
-                       "full_name" => ":full_name",
0
-                       "website" => ":website",
0
-                       "group_id" => ":group_id",
0
-                       "joined_at" => ":joined_at"),
0
-                   array(
0
-                       ":login" => strip_tags($login),
0
-                       ":password" => md5($password),
0
-                       ":email" => strip_tags($email),
0
-                       ":full_name" => strip_tags($full_name),
0
-                       ":website" => strip_tags($website),
0
-                       ":group_id" => ($group_id) ? intval($group_id) : $config->default_group,
0
-                       ":joined_at" => fallback($joined_at, datetime())
0
-                  ));
0
+                   array("login" => strip_tags($login),
0
+                         "password" => md5($password),
0
+                         "email" => strip_tags($email),
0
+                         "full_name" => strip_tags($full_name),
0
+                         "website" => strip_tags($website),
0
+                         "group_id" => ($group_id) ? intval($group_id) : $config->default_group,
0
+                         "joined_at" => fallback($joined_at, datetime())));
0
 
0
       $user = new self($sql->latest());
0
 

0
@@ -265,9 +265,7 @@
0
                            "delete_group" => "Delete Groups");
0
 
0
       foreach ($permissions as $permission => $name)
0
-        $sql->replace("permissions",
0
-                      array("id" => ":permission", "name" => ":name"),
0
-                      array(":permission" => $permission, ":name" => $name));
0
+        $sql->replace("permissions", array("id" => $permission, "name" => $name));
0
 
0
       $groups = array("admin" => YAML::dump(array_keys($permissions)),
0
                       "member" => YAML::dump(array("view_site")),
0
@@ -278,9 +276,7 @@
0
       # Insert the default groups (see above)
0
       $group_id = array();
0
       foreach($groups as $name => $permissions) {
0
-        $sql->replace("groups",
0
-                      array("name" => ":name", "permissions" => ":permissions"),
0
-                      array(":name" => ucfirst($name), ":permissions" => $permissions));
0
+        $sql->replace("groups", array("name" => ucfirst($name), "permissions" => $permissions));
0
 
0
         $group_id[$name] = $sql->latest();
0
       }

0
@@ -169,31 +169,18 @@
0
 
0
       $sql = SQL::current();
0
       $sql->insert("comments",
0
-                   array("body" => ":body",
0
-                         "author" => ":author",
0
-                         "author_url" => ":author_url",
0
-                         "author_email" => ":author_email",
0
-                         "author_ip" => ":author_ip",
0
-                         "author_agent" => ":author_agent",
0
-                         "status" => ":status",
0
-                         "signature" => ":signature",
0
-                         "post_id" => ":post_id",
0
-                         "user_id" => ":user_id",
0
-                         "created_at" => ":created_at",
0
-                         "updated_at" => ":updated_at"),
0
-                   array(":body" => $body,
0
-                         ":author" => strip_tags($author),
0
-                         ":author_url" => strip_tags($url),
0
-                         ":author_email" => strip_tags($email),
0
-                         ":author_ip" => $ip,
0
-                         ":author_agent" => $agent,
0
-                         ":status" => $status,
0
-                         ":signature" => $signature,
0
-                         ":post_id" => $post->id,
0
-                         ":user_id"=> $user_id,
0
-                         ":created_at" => fallback($created_at, datetime()),
0
-                         ":updated_at" => fallback($updated_at, "0000-00-00 00:00:00")
0
-                   ));
0
+                   array("body" => $body,
0
+                         "author" => strip_tags($author),
0
+                         "author_url" => strip_tags($url),
0
+                         "author_email" => strip_tags($email),
0
+                         "author_ip" => $ip,
0
+                         "author_agent" => $agent,
0
+                         "status" => $status,
0
+                         "signature" => $signature,
0
+                         "post_id" => $post->id,
0
+                         "user_id"=> $user_id,
0
+                         "created_at" => fallback($created_at, datetime()),
0
+                         "updated_at" => fallback($updated_at, "0000-00-00 00:00:00")));
0
       $new = new self($sql->latest());;
0
 
0
       Trigger::current()->call("add_comment", $new);

0
@@ -94,11 +94,7 @@
0
       $tags_cleaned_string = "{{".implode("}},{{", $tags_cleaned)."}}";
0
 
0
       $sql = SQL::current();
0
-      $sql->insert("tags", array("tags" => ":tags", "clean" => ":clean", "post_id" => ":post_id"), array(
0
-                       ":tags"    => $tags_string,
0
-                       ":clean"   => $tags_cleaned_string,
0
-                       ":post_id" => $post->id
0
-                   ));
0
+      $sql->insert("tags", array("tags" => $tags_string, "clean" => $tags_cleaned_string, "post_id" => $post->id));
0
     }
0
 
0
     public function update_post($post) {
0
@@ -120,11 +116,7 @@
0
       if (empty($tags_string) and empty($tags_cleaned_string))
0
         $sql->delete("tags", array("post_id" => $post->id));
0
       else
0
-        $sql->insert("tags", array("tags" => ":tags", "clean" => ":clean", "post_id" => ":post_id"), array(
0
-                         ":tags"    => $tags_string,
0
-                         ":clean"   => $tags_cleaned_string,
0
-                         ":post_id" => $post->id
0
-                     ));
0
+        $sql->insert("tags", array("tags" => $tags_string, "clean" => $tags_cleaned_string, "post_id" => $post->id));
0
     }
0
 
0
     public function delete_post($post) {
0
@@ -226,10 +218,12 @@
0
                          "tags.*",
0
                          array(Post::$private, Post::$enabled_feathers),
0
                          null,
0
-                         array(":tag" => "%{{".$_GET['name']."}}%"),
0
-                         null, null, null,
0
+                         array(),
0
+                         null,
0
+                         null,
0
+                         null,
0
                          array(array("table" => "tags",
0
-                                     "where" => array("post_id = posts.id", "clean LIKE :tag"))))->fetchAll() as $tag) {
0
+                                     "where" => array("post_id = posts.id", array("clean like" => "%{{".$_GET['name']."}}%"))))->fetchAll() as $tag) {
0
         if ($tag["id"] == null)
0
           continue;
0
 
0
@@ -277,9 +271,7 @@
0
       $clean = array();
0
       foreach($sql->select("tags",
0
                          "*",
0
-                         "clean LIKE :tag",
0
-                         null,
0
-                         array(":tag" => "%{{".$_POST['clean']."}}%"))->fetchAll() as $tag) {
0
+                         array("clean like" => "%{{".$_POST['clean']."}}%"))->fetchAll() as $tag) {
0
         $names = str_replace("{{".$_POST['clean']."}}", "{{".$_POST['name']."}}", $tag["tags"]);
0
         $clean = str_replace("{{".$_POST['clean']."}}", "{{".sanitize($_POST['name'])."}}", $tag["clean"]);
0
         $sql->update("tags",
0
@@ -369,12 +361,9 @@
0
 
0
       if (!empty($tags) and !empty($cleaned))
0
         SQL::current()->insert("tags",
0
-                               array("tags"     => ":tags",
0
-                                     "clean"    => ":clean",
0
-                                     "post_id"  => ":post_id"),
0
-                               array(":tags"    => rtrim($tags, ","),
0
-                                     ":clean"   => rtrim($cleaned, ","),
0
-                                     ":post_id" => $post->id));
0
+                               array("tags" => rtrim($tags, ","),
0
+                                     "clean" => rtrim($cleaned, ","),
0
+                                     "post_id" => $post->id));
0
     }
0
 
0
     public function import_wordpress_post($item, $post) {
0
@@ -389,12 +378,9 @@
0
 
0
       if (!empty($tags) and !empty($cleaned))
0
         SQL::current()->insert("tags",
0
-                               array("tags"     => ":tags",
0
-                                     "clean"    => ":clean",
0
-                                     "post_id"  => ":post_id"),
0
-                               array(":tags"    => rtrim($tags, ","),
0
-                                     ":clean"   => rtrim($cleaned, ","),
0
-                                     ":post_id" => $post->id));
0
+                               array("tags" => rtrim($tags, ","),
0
+                                     "clean" => rtrim($cleaned, ","),
0
+                                     "post_id" => $post->id));
0
     }
0
 
0
     public function import_movabletype_post($array, $post, $link) {
0
@@ -426,11 +412,7 @@
0
       $clean_string = "{{".implode("}},{{", array_values($tags))."}}";
0
 
0
       $sql = SQL::current();
0
-      $sql->insert("tags", array("tags" => ":tags", "clean" => ":clean", "post_id" => ":post_id"), array(
0
-                       ":tags"    => $dirty_string,
0
-                       ":clean"   => $clean_string,
0
-                       ":post_id" => $post->id
0
-                   ));
0
+      $sql->insert("tags", array("tags" => $dirty_string, "clean" => $clean_string, "post_id" => $post->id));
0
     }
0
 
0
     public function metaWeblog_getPost($struct, $post) {

0
@@ -33,12 +33,9 @@
0
     foreach ($tags as $post => $tag)
0
       echo _f("Inserting tags for post #%s...", array($post), "tags").
0
            test(SQL::current()->insert("tags",
0
-                                       array("tags" => ":tags",
0
-                                             "clean" => ":clean",
0
-                                             "post_id" => ":post_id"),
0
-                                       array(":tags" => implode(",", $tag["normal"]),
0
-                                             ":clean" => implode(",", $tag["clean"]),
0
-                                             ":post_id" => $post)));
0
+                                       array("tags" => implode(",", $tag["normal"]),
0
+                                             "clean" => implode(",", $tag["clean"]),
0
+                                             "post_id" => $post)));
0
   }
0
 
0
   update_tags_structure();

0
@@ -352,12 +352,9 @@
0
     foreach($groups as $name => $values)
0
       echo _f("Restoring group \"%s\"...", array($name)).
0
            test(SQL::current()->insert("groups",
0
-                                       array("id" => ":id",
0
-                                             "name" => ":name",
0
-                                             "permissions" => ":permissions"),
0
-                                       array(":id" => $values["id"],
0
-                                             ":name" => $name,
0
-                                             ":permissions" => $values["permissions"])));
0
+                                       array("id" => $values["id"],
0
+                                             "name" => $name,
0
+                                             "permissions" => $values["permissions"])));
0
   }
0
 
0
   function add_permissions_table() {
0
@@ -399,10 +396,8 @@
0
     foreach ($permissions as $id => $name)
0
       echo _f("Inserting permission \"%s\"...", array($name)).
0
            test(SQL::current()->insert("permissions",
0
-                                       array("id" => ":id",
0
-                                             "name" => ":name"),
0
-                                       array(":id" => $id,
0
-                                             ":name" => $name)));
0
+                                       array("id" => $id,
0
+                                             "name" => $name)));
0
   }
0
 
0
   function add_sessions_table() {
0
@@ -474,10 +469,8 @@
0
       $name = isset($permissions[$id]) ? $permissions[$id] : camelize($id, true);
0
       echo _f("Restoring permission \"%s\"...", array($name)).
0
            test(SQL::current()->insert("permissions",
0
-                                       array("id" => ":id",
0
-                                             "name" => ":name"),
0
-                                       array(":id" => $id,
0
-                                             ":name" => $name)));
0
+                                       array("id" => $id,
0
+                                             "name" => $name)));
0
     }
0
 
0
   }