@@ -199,6 +199,6 @@ if (Trigger::current()->exists("delete_".$model)) Trigger::current()->call("delete_".$model, new $class($id)); - SQL::current()->delete(pluralize($model), "id = :id", array(":id" => $id)); + SQL::current()->delete(pluralize($model), array("id" => $id)); } } includes/class/Model.php @@ -46,7 +46,7 @@ $sql = SQL::current(); - if ($sql->count("sessions", "id = :id", array(":id" => $id))) + if ($sql->count("sessions", array("id" => $id))) $sql->update("sessions", array("id" => $id), array("data" => $data, includes/class/Session.php @@ -471,10 +471,8 @@ Post::delete($post->id); elseif ($_POST['posts'] == "move") $sql->update("posts", - "user_id = :deleting_id", - array("user_id" => ":user_id"), - array(":user_id" => $_POST['move_posts'], - ":deleting_id" => $user->id)); + array("user_id" => $user->id), + array("user_id" => $_POST['move_posts'])); } if (isset($_POST['pages'])) { @@ -483,10 +481,8 @@ Page::delete($page->id); elseif ($_POST['pages'] == "move") $sql->update("pages", - "user_id = :deleting_id", - array("user_id" => ":user_id"), - array(":user_id" => $_POST['move_pages'], - ":deleting_id" => $user->id)); + array("user_id" => $user->id), + array("user_id" => $_POST['move_pages'])); } User::delete($_POST['id']); @@ -883,26 +879,23 @@ $import = YAML::load($_FILES['groups_file']['tmp_name']); foreach ($import["groups"] as $name => $permissions) - if (!$sql->count("groups", "name = :name", array(":name" => $name))) + if (!$sql->count("groups", array("name" => $name))) $trigger->call("import_chyrp_group", Group::add($name, (array) $permissions)); foreach ($import["permissions"] as $id => $name) - if (!$sql->count("permissions", "id = :id", array(":id" => $id))) - $sql->insert("permissions", - array("id" => ":id", "name" => ":name"), - array(":id" => $id, ":name" => $name)); + if (!$sql->count("permissions", array("id" => $id))) + $sql->insert("permissions", array("id" => $id, "name" => $name)); } if (isset($_FILES['users_file']) and $_FILES['users_file']['error'] == 0) { $users = YAML::load($_FILES['users_file']['tmp_name']); foreach ($users as $login => $user) { - $group_id = $sql->select("groups", "id", "name = :name", "id DESC", - array(":name" => $user["group"]))->fetchColumn(); + $group_id = $sql->select("groups", "id", array("name" => $user["group"]), "id DESC")->fetchColumn(); $group = ($group_id) ? $group_id : $config->default_group ; - if (!$sql->count("users", "login = :login", array(":login" => $login))) + if (!$sql->count("users", array("login" => $login))) $user = User::add($login, $user["password"], $user["email"], @@ -920,8 +913,7 @@ $chyrp = $entry->children("http://chyrp.net/export/1.0/"); $login = $entry->author->children("http://chyrp.net/export/1.0/")->login; - $user_id = $sql->select("users", "id", "login = :login", "id DESC", - array(":login" => $login))->fetchColumn(); + $user_id = $sql->select("users", "id", array("login" => $login), "id DESC")->fetchColumn(); $data = Post::xml2arr($entry->content); @@ -951,8 +943,7 @@ $attr = $entry->attributes("http://chyrp.net/export/1.0/"); $login = $entry->author->children("http://chyrp.net/export/1.0/")->login; - $user_id = $sql->select("users", "id", "login = :login", "id DESC", - array(":login" => $login))->fetchColumn(); + $user_id = $sql->select("users", "id", array("login" => $login), "id DESC")->fetchColumn(); $page = Page::add($entry->title, $entry->content, includes/controller/Admin.php @@ -246,7 +246,7 @@ "/(vert|ind)ices$/i" => "\\1ex", "/(matr)ices$/i" => "\\1ix", "/(x|ch|ss|sh)es$/i" => "\\1", - "/([m|l])ice$/i" => "\\1ouse", + "/([ml])ice$/i" => "\\1ouse", "/(quiz)zes$/i" => "\\1"); $replaced = preg_replace(array_keys($replacements), array_values($replacements), $string, 1); includes/helpers.php @@ -106,9 +106,9 @@ return false; $sql = SQL::current(); - $sql->update("groups", "id = :id", - array("name" => ":name", "permissions" => ":permissions"), - array(":name" => $name, ":permissions" => YAML::dump($permissions), ":id" => $this->id)); + $sql->update("groups", + array("id" => $this->id), + array("name" => $name, "permissions" => YAML::dump($permissions))); Trigger::current()->call("update_group", $this, $name, $permissions); } @@ -135,11 +135,11 @@ static function add_permission($id, $name = null) { $sql = SQL::current(); - if ($sql->count("permissions", "id = :id", array(":id" => $id))) + if ($sql->count("permissions", array("id" => $id))) return; # Permission already exists. fallback($name, camelize($id, true)); - $sql->insert("permissions", array("id" => ":id", "name" => ":name"), array(":id" => $id, ":name" => $name)); + $sql->insert("permissions", array("id" => $id, "name" => $name)); } /** @@ -150,7 +150,7 @@ * $id - The ID of the permission to remove. */ static function remove_permission($id) { - SQL::current()->delete("permissions", "id = :id", array(":id" => $id)); + SQL::current()->delete("permissions", array("id" => $id)); } /** @@ -163,8 +163,7 @@ return (isset($this->size)) ? $this->size : $this->size = SQL::current()->count("users", - "group_id = :group_id", - array(":group_id" => $this->id)) ; + array("group_id" => $this->id)) ; } /** includes/model/Group.php @@ -114,26 +114,14 @@ $sql = SQL::current(); $sql->update("pages", - "id = :id", - array( - "title" => ":title", - "body" => ":body", - "parent_id" => ":parent_id", - "show_in_list" => ":show_in_list", - "list_order" => ":list_order", - "updated_at" => ":updated_at", - "url" => ":url" - ), - array( - ":title" => $title, - ":body" => $body, - ":parent_id" => $parent_id, - ":show_in_list" => $show_in_list, - ":list_order" => $list_order, - ":updated_at" => ($update_timestamp) ? datetime() : $this->updated_at, - ":url" => $url, - ":id" => $this->id - )); + array("id" => $this->id), + array("title" => $title, + "body" => $body, + "parent_id" => $parent_id, + "show_in_list" => $show_in_list, + "list_order" => $list_order, + "updated_at" => ($update_timestamp) ? datetime() : $this->updated_at, + "url" => $url)); $trigger = Trigger::current(); $trigger->call("update_page", $this, $title, $body, $parent_id, $show_in_list, $list_order, $url, $update_timestamp); @@ -167,7 +155,7 @@ * true - if a page with that ID is in the database. */ static function exists($page_id) { - return SQL::current()->count("pages", "id = :id", array(":id" => $post_id)); + return SQL::current()->count("pages", array("id" => $post_id)); } /** @@ -181,11 +169,7 @@ * $url - The unique version of the passed clean URL. If it's not used, it's the same as $clean. If it is, a number is appended. */ static function check_url($clean) { - $sql = SQL::current(); - $count = $sql->count("pages", - "clean = :clean", - array(":clean" => $clean)); - + $count = SQL::current()->count("pages", array("clean" => $clean)); return (!$count or empty($clean)) ? $clean : $clean."-".($count + 1) ; } includes/model/Page.php @@ -184,12 +184,9 @@ if (empty($clean) or empty($url)) $sql->update("posts", - "id = :id", - array("clean" => ":clean", - "url" => ":url"), - array(":clean" => $feather.".".$id, - ":url" => $feather.".".$id, - ":id" => $id)); + array("id" => $id), + array("clean" => $feather.".".$id, + "url" => $feather.".".$id)); if ($trackbacks !== "") { $trackbacks = explode(",", $trackbacks); @@ -269,22 +266,14 @@ $sql = SQL::current(); $sql->update("posts", - "id = :id", - array("xml" => ":xml", - "pinned" => ":pinned", - "status" => ":status", - "clean" => ":clean", - "url" => ":url", - "created_at" => ":created_at", - "updated_at" => ":updated_at"), - array(":xml" => $xml->asXML(), - ":pinned" => $pinned, - ":status" => $status, - ":clean" => $slug, - ":url" => $slug, - ":created_at" => $created_at, - ":updated_at" => $updated_at, - ":id" => $this->id)); + array("id" => $this->id), + array("xml" => $xml->asXML(), + "pinned" => $pinned, + "status" => $status, + "clean" => $slug, + "url" => $slug, + "created_at" => $created_at, + "updated_at" => $updated_at)); $trigger = Trigger::current(); $trigger->call("update_post", $this, $values, $user, $pinned, $status, $slug, $created_at, $updated_at, $options); @@ -402,7 +391,7 @@ * true - if a post with that ID is in the database. */ static function exists($post_id) { - return SQL::current()->count("posts", "id = :id", array(":id" => $post_id)); + return SQL::current()->count("posts", array("id" => $post_id)); } /** @@ -416,11 +405,7 @@ * $url - The unique version of the passed clean URL. If it's not used, it's the same as $clean. If it is, a number is appended. */ static function check_url($clean) { - $sql = SQL::current(); - $count = $sql->count("posts", - "clean = :clean", - array(":clean" => $clean)); - + $count = SQL::current()->count("posts", array("clean" => $clean)); return (!$count or empty($clean)) ? $clean : $clean."-".($count + 1) ; } @@ -712,14 +697,21 @@ */ static function arr2xml(&$object, $data) { foreach ($data as $key => $val) { - if (is_int($key) and (empty($val) or trim($val) == "")) { + if (is_int($key) and (empty($val) or (is_string($val) and trim($val) == ""))) { unset($data[$key]); continue; } if (is_array($val)) { - $xml = $object->addChild($key); - self::arr2xml($xml, $val); + if (in_array(0, array_keys($val))) { # Numeric-indexed things need to be added as duplicates + foreach ($val as $dup) { + $xml = $object->addChild($key); + arr2xml($xml, $dup); + } + } else { + $xml = $object->addChild($key); + arr2xml($xml, $val); + } } else $object->addChild($key, fix($val, false, false)); } @@ -770,15 +762,10 @@ if (in_array($attr, $times)) { $where[] = strtoupper($attr)."(created_at) = :created_".$attr; $params[':created_'.$attr] = $get[$attr]; - } elseif ($attr == "author") - $where["user_id"] = SQL::current()->select("users", - "id", - "login = :login", - "id", - array( - ":login" => $get['author'] - ), 1)->fetchColumn(); - elseif ($attr == "feathers") + } elseif ($attr == "author") { + $user = new User(array("where" => array("login" => $get['author']))); + $where["user_id"] = $user->id; + } elseif ($attr == "feathers") $where["feather"] = depluralize($get['feathers']); else { $tokens = array($where, $params, $attr); @@ -789,8 +776,7 @@ if (!isset($get[$attr])) continue; - $where[] = $attr." = :attr".$attr; - $params[":attr".$attr] = $get[$attr]; + $where[$attr] = $get[$attr]; } } includes/model/Post.php @@ -115,23 +115,13 @@ $sql = SQL::current(); $sql->update("users", - "id = :id", - array( - "login" => ":login", - "password" => ":password", - "email" => ":email", - "full_name" => ":full_name", - "website" => ":website", - "group_id" => ":group_id"), - array( - ":login" => strip_tags($login), - ":password" => $password, - ":email" => strip_tags($email), - ":full_name" => strip_tags($full_name), - ":website" => strip_tags($website), - ":group_id" => $group_id, - ":id" => $this->id - )); + array("id" => $this->id), + array("login" => strip_tags($login), + "password" => $password, + "email" => strip_tags($email), + "full_name" => strip_tags($full_name), + "website" => strip_tags($website), + "group_id" => $group_id)); Trigger::current()->call("update_user", $this, $login, $password, $full_name, $email, $website, $group_id); } includes/model/User.php @@ -288,21 +288,14 @@ $config->set("default_group", $group_id["member"]); $config->set("guest_group", $group_id["guest"]); - if (!$sql->select("users", "id", "login = :login", null, array(":login" => $_POST['login']))->fetchColumn()) + if (!$sql->select("users", "id", array("login" => $_POST['login']))->fetchColumn()) $sql->insert("users", - array("login" => ":login", - "password" => ":password", - "email" => ":email", - "website" => ":website", - "group_id" => ":group_id", - "joined_at" => ":joined_at"), - array(":login" => $_POST['login'], - ":password" => md5($_POST['password_1']), - ":email" => $_POST['email'], - ":website" => $config->url, - ":group_id" => $group_id["admin"], - ":joined_at" => datetime() - )); + array("login" => $_POST['login'], + "password" => md5($_POST['password_1']), + "email" => $_POST['email'], + "website" => $config->url, + "group_id" => $group_id["admin"], + "joined_at" => datetime())); $installed = true; } install.php @@ -198,10 +198,8 @@ static function trackback_receive($url, $title, $excerpt, $blog_name) { $sql = SQL::current(); $count = $sql->count("comments", - array("post_id = :id", - "author_url = :url"), - array(":id" => $_GET['id'], - ":url" => $_POST['url'])); + array("post_id" => $_GET['id'], + "author_url" => $_POST['url'])); if ($count) trackback_respond(true, __("A ping from that URL is already registered.", "comments")); @@ -216,10 +214,8 @@ static function pingback($id, $to, $from, $title, $excerpt) { $sql = SQL::current(); $count = $sql->count("comments", - array("post_id = :id", - "author_url = :url"), - array(":id" => $id, - ":url" => $from)); + array("post_id" => $id, + "author_url" => $from)); if ($count) return new IXR_Error(48, __("A ping from that URL is already registered.", "comments")); @@ -232,11 +228,11 @@ } static function delete_post($post) { - SQL::current()->delete("comments", "post_id = :id", array(":id" => $post->id)); + SQL::current()->delete("comments", array("post_id" => $post->id)); } static function delete_user($user) { - SQL::current()->update("comments", "user_id = :id", array("user_id" => 0), array(":id" => $user->id)); + SQL::current()->update("comments", array("user_id" => $user->id), array("user_id" => 0)); } static function admin_comment_settings() { @@ -317,10 +313,8 @@ $where[] = "status != 'spam'"; $visitor = Visitor::current(); - if (!$visitor->group()->can("edit_comment", "delete_comment", true)) { - $where[] = "user_id = :visitor_id"; - $params[":visitor_id"] = $visitor->id; - } + if (!$visitor->group()->can("edit_comment", "delete_comment", true)) + $where["user_id"] = $visitor->id; AdminController::current()->context["comments"] = new Paginator(Comment::find(array("placeholders" => true, "where" => $where, "params" => $params)), 25); } @@ -358,7 +352,7 @@ if ($comment->status == "spam") $false_positives[] = $comment->signature; - $sql->update("comments", "id = :id", array("status" => ":status"), array(":id" => $comment->id, ":status" => "denied")); + $sql->update("comments", array("id" => $comment->id), array("status" => "denied")); } Flash::notice(__("Selected comments denied.", "comments")); @@ -372,7 +366,7 @@ if ($comment->status == "spam") $false_positives[] = $comment->signature; - $sql->update("comments", "id = :id", array("status" => ":status"), array(":id" => $comment->id, ":status" => "approved")); + $sql->update("comments", array("id" => $comment->id), array("status" => "approved")); } Flash::notice(__("Selected comments approved.", "comments")); @@ -383,7 +377,7 @@ if (!$comment->editable()) continue; - $sql->update("comments", "id = :id", array("status" => ":status"), array(":id" => $comment->id, ":status" => "spam")); + $sql->update("comments", array("id" => $comment->id), array("status" => "spam")); $false_negatives[] = $comment->signature; } @@ -443,9 +437,7 @@ )"), "created_at ASC", array(":last_comment" => $_POST['last_comment'], - ":current_ip" => ip2long($_SERVER['REMOTE_ADDR']), - ":visitor_id" => $visitor->id - )); + ":visitor_id" => $visitor->id)); $ids = array(); while ($the_comment = $new_comments->fetchObject()) @@ -493,8 +485,7 @@ $comment = $comment->children("http://www.w3.org/2005/Atom"); $login = $comment->author->children("http://chyrp.net/export/1.0/")->login; - $user_id = $sql->select("users", "id", "login = :login", "id DESC", - array(":login" => $login))->fetchColumn(); + $user_id = $sql->select("users", "id", array("login" => $login), "id DESC")->fetchColumn(); Comment::add(unfix($comment->content), unfix($comment->author->name), @@ -634,10 +625,7 @@ ) )"), "created_at ASC", # order - array(":post_id" => $post->id, - ":current_ip" => ip2long($_SERVER['REMOTE_ADDR']), - ":visitor_id" => $visitor->id - )); + array(":visitor_id" => $visitor->id)); $post->comments = array(); foreach ($get_comments->fetchAll() as $comment) @@ -672,7 +660,6 @@ ) )")); - $options["params"][":current_ip"] = ip2long($_SERVER['REMOTE_ADDR']); $options["params"][":visitor_id"] = Visitor::current()->id; $options["group"][] = "id"; modules/comments/comments.php @@ -203,22 +203,14 @@ public function update($author, $author_email, $author_url, $body, $status, $timestamp, $update_timestamp = true) { $sql = SQL::current(); $sql->update("comments", - "id = :id", - array("body" => ":body", - "author" => ":author", - "author_email" => ":author_email", - "author_url" => ":author_url", - "status" => ":status", - "created_at" => ":created_at", - "updated_at" => ":updated_at"), - array(":body" => $body, - ":author" => strip_tags($author), - ":author_email" => strip_tags($author_email), - ":author_url" => strip_tags($author_url), - ":status" => $status, - ":created_at" => $timestamp, - ":updated_at" => ($update_timestamp) ? datetime() : $this->updated_at, - ":id" => $this->id)); + array("id" => $this->id), + array("body" => $body, + "author" => strip_tags($author), + "author_email" => strip_tags($author_email), + "author_url" => strip_tags($author_url), + "status" => $status, + "created_at" => $timestamp, + "updated_at" => ($update_timestamp) ? datetime() : $this->updated_at)); Trigger::current()->call("update_comment", $this, $author, $author_email, $author_url, $body, $status, $timestamp, $update_timestamp); } @@ -228,7 +220,7 @@ if ($trigger->exists("delete_comment")) $trigger->call("delete_comment", new self($comment_id)); - SQL::current()->delete("comments", "id = :id", array(":id" => $comment_id)); + SQL::current()->delete("comments", array("id" => $comment_id)); } public function editable() { @@ -314,9 +306,7 @@ } static function user_count($user_id) { - $sql = SQL::current(); - $count = $sql->count("comments", "user_id = :user_id", - array(":user_id" => $user_id)); + $count = SQL::current()->count("comments", array("user_id" => $user_id)); return $count; } modules/comments/model.Comment.php @@ -105,7 +105,7 @@ if (!isset($_POST['tags'])) return; $sql = SQL::current(); - $sql->delete("tags", "post_id = :post_id", array(":post_id" => $post->id)); + $sql->delete("tags", array("post_id" => $post->id)); $tags = explode(",", $_POST['tags']); // Split at the comma $tags = array_map('trim', $tags); // Remove whitespace @@ -118,7 +118,7 @@ $tags_cleaned_string = (!empty($tags_cleaned)) ? "{{".implode("}},{{", $tags_cleaned)."}}" : "" ; if (empty($tags_string) and empty($tags_cleaned_string)) - $sql->delete("tags", "post_id = :post_id", array(":post_id" => $post->id)); + $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, @@ -128,7 +128,7 @@ } public function delete_post($post) { - SQL::current()->delete("tags", "post_id = :post_id", array(":post_id" => $post->id)); + SQL::current()->delete("tags", array("post_id" => $post->id)); } public function parse_urls($urls) { @@ -283,12 +283,9 @@ $names = str_replace("{{".$_POST['clean']."}}", "{{".$_POST['name']."}}", $tag["tags"]); $clean = str_replace("{{".$_POST['clean']."}}", "{{".sanitize($_POST['name'])."}}", $tag["clean"]); $sql->update("tags", - "id = :id", - array("tags" => ":tags", - "clean" => ":clean"), - array(":id" => $tag["id"], - ":tags" => $names, - ":clean" => $clean)); + array("id" => $tag["id"]), + array("id" => $tag["id"], + "tags" => $names)); } Flash::notice(__("Tag renamed.", "tags"), "/admin/?action=manage_tags"); @@ -595,7 +592,7 @@ } public function posts_export($atom, $post) { - $tags = SQL::current()->select("tags", "tags", "post_id = :post_id", "id DESC", array(":post_id" => $post->id))->fetchColumn(); + $tags = SQL::current()->select("tags", "tags", array("post_id" => $post->id), "id DESC")->fetchColumn(); if (empty($tags)) return; $atom.= " <chyrp:tags>".fix(implode(", ", self::unlinked_tags($tags)))."</chyrp:tags>\r"; modules/tags/tags.php @@ -309,10 +309,8 @@ echo _f("Sanitizing XML data of post #%d...", array($post->id)). test(SQL::current()->update("posts", - "id = :post_id", - array("xml" => ":xml"), - array(":xml" => $new_xml->asXML(), - ":post_id" => $post->id))); + array("id" => $post->id), + array("xml" => $new_xml->asXML()))); } } upgrade.php 812ffc472cb0d101b869c5476b5aefb3d5c04999 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/e32209c7141f2f645a35b6d7c1504aa021090540 e32209c7141f2f645a35b6d7c1504aa021090540 2008-09-01T20:36:23-07:00 2008-09-01T20:36:23-07:00 * SQL interfacing cleanups * Fixed arr2xml improperly handling numerically-indexed arrays aa88d638881a452ba6d92df6bb2a9e8d3334b444 Alex Suraci i.am@toogeneric.com