@@ -82,8 +82,7 @@ */ static function add($name, $permissions) { $sql = SQL::current(); - $sql->insert("groups", array("name" => ":name", "permissions" => ":permissions"), - array(":name" => $name, ":permissions" => YAML::dump($permissions))); + $sql->insert("groups", array("name" => $name, "permissions" => YAML::dump($permissions))); $group = new self($sql->latest()); includes/model/Group.php @@ -65,30 +65,16 @@ $sql = SQL::current(); $visitor = Visitor::current(); $sql->insert("pages", - array( - "title" => ":title", - "body" => ":body", - "user_id" => ":user_id", - "parent_id" => ":parent_id", - "show_in_list" => ":show_in_list", - "list_order" => ":list_order", - "clean" => ":clean", - "url" => ":url", - "created_at" => ":created_at", - "updated_at" => ":updated_at" - ), - array( - ":title" => $title, - ":body" => $body, - ":user_id" => fallback($user_id, $visitor->id), - ":parent_id" => $parent_id, - ":show_in_list" => $show_in_list, - ":list_order" => $list_order, - ":clean" => $clean, - ":url" => $url, - ":created_at" => fallback($created_at, datetime()), - ":updated_at" => fallback($updated_at, "0000-00-00 00:00:00") - )); + array("title" => $title, + "body" => $body, + "user_id" => fallback($user_id, $visitor->id), + "parent_id" => $parent_id, + "show_in_list" => $show_in_list, + "list_order" => $list_order, + "clean" => $clean, + "url" => $url, + "created_at" => fallback($created_at, datetime()), + "updated_at" => fallback($updated_at, "0000-00-00 00:00:00"))); $page = new self($sql->latest()); includes/model/Page.php @@ -162,24 +162,15 @@ $sql = SQL::current(); $visitor = Visitor::current(); $sql->insert("posts", - array("xml" => ":xml", - "feather" => ":feather", - "user_id" => ":user_id", - "pinned" => ":pinned", - "status" => ":status", - "clean" => ":clean", - "url" => ":url", - "created_at" => ":created_at", - "updated_at" => ":updated_at"), - array(":xml" => $xml->asXML(), - ":feather" => $feather, - ":user_id" => $user, - ":pinned" => (int) $pinned, - ":status" => $status, - ":clean" => $clean, - ":url" => $url, - ":created_at" => $created_at, - ":updated_at" => $updated_at)); + array("xml" => $xml->asXML(), + "feather" => $feather, + "user_id" => $user, + "pinned" => (int) $pinned, + "status" => $status, + "clean" => $clean, + "url" => $url, + "created_at" => $created_at, + "updated_at" => $updated_at)); $id = $sql->latest(); if (empty($clean) or empty($url)) @@ -547,17 +538,15 @@ if ($this->no_results) return false; - $where = array("(created_at > :created_at OR id > :id)"); + $where = array("created_at > :created_at OR id > :id"); - $statuses = array("public"); + $where["status"] = array("public"); if ($this->status == "draft") - $statuses[] = "draft"; + $where["status"][] = "draft"; if (logged_in()) - $statuses[] = "registered_only"; + $where["status"][] = "registered_only"; if (Visitor::current()->group()->can("view_private")) - $statuses[] = "private"; - - $where[] = "status IN ('".implode("', '", $statuses)."')"; + $where["status"][] = "private"; return new self(null, array("where" => $where, "order" => "created_at ASC, id ASC", includes/model/Post.php @@ -67,23 +67,13 @@ $config = Config::current(); $sql = SQL::current(); $sql->insert("users", - array( - "login" => ":login", - "password" => ":password", - "email" => ":email", - "full_name" => ":full_name", - "website" => ":website", - "group_id" => ":group_id", - "joined_at" => ":joined_at"), - array( - ":login" => strip_tags($login), - ":password" => md5($password), - ":email" => strip_tags($email), - ":full_name" => strip_tags($full_name), - ":website" => strip_tags($website), - ":group_id" => ($group_id) ? intval($group_id) : $config->default_group, - ":joined_at" => fallback($joined_at, datetime()) - )); + array("login" => strip_tags($login), + "password" => md5($password), + "email" => strip_tags($email), + "full_name" => strip_tags($full_name), + "website" => strip_tags($website), + "group_id" => ($group_id) ? intval($group_id) : $config->default_group, + "joined_at" => fallback($joined_at, datetime()))); $user = new self($sql->latest()); includes/model/User.php @@ -265,9 +265,7 @@ "delete_group" => "Delete Groups"); foreach ($permissions as $permission => $name) - $sql->replace("permissions", - array("id" => ":permission", "name" => ":name"), - array(":permission" => $permission, ":name" => $name)); + $sql->replace("permissions", array("id" => $permission, "name" => $name)); $groups = array("admin" => YAML::dump(array_keys($permissions)), "member" => YAML::dump(array("view_site")), @@ -278,9 +276,7 @@ # Insert the default groups (see above) $group_id = array(); foreach($groups as $name => $permissions) { - $sql->replace("groups", - array("name" => ":name", "permissions" => ":permissions"), - array(":name" => ucfirst($name), ":permissions" => $permissions)); + $sql->replace("groups", array("name" => ucfirst($name), "permissions" => $permissions)); $group_id[$name] = $sql->latest(); } install.php @@ -169,31 +169,18 @@ $sql = SQL::current(); $sql->insert("comments", - array("body" => ":body", - "author" => ":author", - "author_url" => ":author_url", - "author_email" => ":author_email", - "author_ip" => ":author_ip", - "author_agent" => ":author_agent", - "status" => ":status", - "signature" => ":signature", - "post_id" => ":post_id", - "user_id" => ":user_id", - "created_at" => ":created_at", - "updated_at" => ":updated_at"), - array(":body" => $body, - ":author" => strip_tags($author), - ":author_url" => strip_tags($url), - ":author_email" => strip_tags($email), - ":author_ip" => $ip, - ":author_agent" => $agent, - ":status" => $status, - ":signature" => $signature, - ":post_id" => $post->id, - ":user_id"=> $user_id, - ":created_at" => fallback($created_at, datetime()), - ":updated_at" => fallback($updated_at, "0000-00-00 00:00:00") - )); + array("body" => $body, + "author" => strip_tags($author), + "author_url" => strip_tags($url), + "author_email" => strip_tags($email), + "author_ip" => $ip, + "author_agent" => $agent, + "status" => $status, + "signature" => $signature, + "post_id" => $post->id, + "user_id"=> $user_id, + "created_at" => fallback($created_at, datetime()), + "updated_at" => fallback($updated_at, "0000-00-00 00:00:00"))); $new = new self($sql->latest());; Trigger::current()->call("add_comment", $new); modules/comments/model.Comment.php @@ -94,11 +94,7 @@ $tags_cleaned_string = "{{".implode("}},{{", $tags_cleaned)."}}"; $sql = SQL::current(); - $sql->insert("tags", array("tags" => ":tags", "clean" => ":clean", "post_id" => ":post_id"), array( - ":tags" => $tags_string, - ":clean" => $tags_cleaned_string, - ":post_id" => $post->id - )); + $sql->insert("tags", array("tags" => $tags_string, "clean" => $tags_cleaned_string, "post_id" => $post->id)); } public function update_post($post) { @@ -120,11 +116,7 @@ if (empty($tags_string) and empty($tags_cleaned_string)) $sql->delete("tags", array("post_id" => $post->id)); else - $sql->insert("tags", array("tags" => ":tags", "clean" => ":clean", "post_id" => ":post_id"), array( - ":tags" => $tags_string, - ":clean" => $tags_cleaned_string, - ":post_id" => $post->id - )); + $sql->insert("tags", array("tags" => $tags_string, "clean" => $tags_cleaned_string, "post_id" => $post->id)); } public function delete_post($post) { @@ -226,10 +218,12 @@ "tags.*", array(Post::$private, Post::$enabled_feathers), null, - array(":tag" => "%{{".$_GET['name']."}}%"), - null, null, null, + array(), + null, + null, + null, array(array("table" => "tags", - "where" => array("post_id = posts.id", "clean LIKE :tag"))))->fetchAll() as $tag) { + "where" => array("post_id = posts.id", array("clean like" => "%{{".$_GET['name']."}}%"))))->fetchAll() as $tag) { if ($tag["id"] == null) continue; @@ -277,9 +271,7 @@ $clean = array(); foreach($sql->select("tags", "*", - "clean LIKE :tag", - null, - array(":tag" => "%{{".$_POST['clean']."}}%"))->fetchAll() as $tag) { + array("clean like" => "%{{".$_POST['clean']."}}%"))->fetchAll() as $tag) { $names = str_replace("{{".$_POST['clean']."}}", "{{".$_POST['name']."}}", $tag["tags"]); $clean = str_replace("{{".$_POST['clean']."}}", "{{".sanitize($_POST['name'])."}}", $tag["clean"]); $sql->update("tags", @@ -369,12 +361,9 @@ if (!empty($tags) and !empty($cleaned)) SQL::current()->insert("tags", - array("tags" => ":tags", - "clean" => ":clean", - "post_id" => ":post_id"), - array(":tags" => rtrim($tags, ","), - ":clean" => rtrim($cleaned, ","), - ":post_id" => $post->id)); + array("tags" => rtrim($tags, ","), + "clean" => rtrim($cleaned, ","), + "post_id" => $post->id)); } public function import_wordpress_post($item, $post) { @@ -389,12 +378,9 @@ if (!empty($tags) and !empty($cleaned)) SQL::current()->insert("tags", - array("tags" => ":tags", - "clean" => ":clean", - "post_id" => ":post_id"), - array(":tags" => rtrim($tags, ","), - ":clean" => rtrim($cleaned, ","), - ":post_id" => $post->id)); + array("tags" => rtrim($tags, ","), + "clean" => rtrim($cleaned, ","), + "post_id" => $post->id)); } public function import_movabletype_post($array, $post, $link) { @@ -426,11 +412,7 @@ $clean_string = "{{".implode("}},{{", array_values($tags))."}}"; $sql = SQL::current(); - $sql->insert("tags", array("tags" => ":tags", "clean" => ":clean", "post_id" => ":post_id"), array( - ":tags" => $dirty_string, - ":clean" => $clean_string, - ":post_id" => $post->id - )); + $sql->insert("tags", array("tags" => $dirty_string, "clean" => $clean_string, "post_id" => $post->id)); } public function metaWeblog_getPost($struct, $post) { modules/tags/tags.php @@ -33,12 +33,9 @@ foreach ($tags as $post => $tag) echo _f("Inserting tags for post #%s...", array($post), "tags"). test(SQL::current()->insert("tags", - array("tags" => ":tags", - "clean" => ":clean", - "post_id" => ":post_id"), - array(":tags" => implode(",", $tag["normal"]), - ":clean" => implode(",", $tag["clean"]), - ":post_id" => $post))); + array("tags" => implode(",", $tag["normal"]), + "clean" => implode(",", $tag["clean"]), + "post_id" => $post))); } update_tags_structure(); modules/tags/upgrades.php @@ -352,12 +352,9 @@ foreach($groups as $name => $values) echo _f("Restoring group \"%s\"...", array($name)). test(SQL::current()->insert("groups", - array("id" => ":id", - "name" => ":name", - "permissions" => ":permissions"), - array(":id" => $values["id"], - ":name" => $name, - ":permissions" => $values["permissions"]))); + array("id" => $values["id"], + "name" => $name, + "permissions" => $values["permissions"]))); } function add_permissions_table() { @@ -399,10 +396,8 @@ foreach ($permissions as $id => $name) echo _f("Inserting permission \"%s\"...", array($name)). test(SQL::current()->insert("permissions", - array("id" => ":id", - "name" => ":name"), - array(":id" => $id, - ":name" => $name))); + array("id" => $id, + "name" => $name))); } function add_sessions_table() { @@ -474,10 +469,8 @@ $name = isset($permissions[$id]) ? $permissions[$id] : camelize($id, true); echo _f("Restoring permission \"%s\"...", array($name)). test(SQL::current()->insert("permissions", - array("id" => ":id", - "name" => ":name"), - array(":id" => $id, - ":name" => $name))); + array("id" => $id, + "name" => $name))); } } upgrade.php e32209c7141f2f645a35b6d7c1504aa021090540 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/91c8953ce1899035f5c572aa74ea6d4af54510a3 91c8953ce1899035f5c572aa74ea6d4af54510a3 2008-09-01T20:47:05-07:00 2008-09-01T20:47:05-07:00 More SQL interfacing refactoring. 7f42f66386346dab559ff742a3db858d8a1a635f Alex Suraci i.am@toogeneric.com