@@ -5,6 +5,47 @@ */ class QueryBuilder { /** + * Function: build_insert + * Creates a full insert query. + */ + public static function build_insert($table, $data) { + return "INSERT INTO __$table\n". + self::build_insert_header($data)."\n". + "VALUES\n". + self::build_insert_values($data); + } + + /** + * Function: build_replace + * Creates a full replace query. + */ + public static function build_replace($table, $data) { + return "REPLACE INTO __$table\n". + self::build_insert_header($data)."\n". + "VALUES\n". + self::build_insert_values($data); + } + + /** + * Function: build_update + * Creates a full update query. + */ + public static function build_update($table, $conds, $data, &$params = array()) { + return "UPDATE __$table\n". + "SET ".self::build_update_values($data, $params)."\n". + ($conds ? "WHERE ".self::build_where($conds, $table, $params) : ""); + } + + /** + * Function: build_delete + * Creates a full delete query. + */ + public static function build_delete($table, $conds, &$params = array()) { + return "DELETE FROM __$table\n". + ($conds ? "WHERE ".self::build_where($conds, $table, $params) : ""); + } + + /** * Function: build_update_values * Creates an update data part. */ @@ -35,64 +76,17 @@ } /** - * Function: build_insert - * Creates a full insert query. - */ - public static function build_insert($table, $data) { - return " - INSERT INTO __$table - ".self::build_insert_header($data)." - VALUES - ".self::build_insert_values($data)." - "; - } - - /** - * Function: build_replace - * Creates a full replace query. - */ - public static function build_replace($table, $data) { - return " - REPLACE INTO __$table - ".self::build_insert_header($data)." - VALUES - ".self::build_insert_values($data)." - "; - } - - /** - * Function: build_update - * Creates a full update query. - */ - public static function build_update($table, $conds, $data, &$params = array()) { - return " - UPDATE __$table - SET ".self::build_update_values($data, $params)." - ".($conds ? "WHERE ".self::build_where($conds, $table, $params) : "")." - "; - } - - /** - * Function: build_delete - * Creates a full delete query. - */ - public static function build_delete($table, $conds, &$params = array()) { - return " - DELETE FROM __$table - ".($conds ? "WHERE ".self::build_where($conds, $table, $params) : "")." - "; - } - - /** * Function: build_limits * Creates a LIMIT part for a query. */ public static function build_limits($offset, $limit) { if ($limit === null) return ""; + if ($offset !== null) - return "LIMIT $offset, $limit"; - return "LIMIT $limit"; + return "LIMIT ".$offset.", ".$limit; + + return "LIMIT ".$limit; } /** @@ -115,11 +109,9 @@ * Creates a SELECT COUNT(1) query. */ public static function build_count($tables, $conds, &$params = array()) { - $query = " - SELECT COUNT(1) AS count - FROM ".self::build_from($tables); - $query.= "\n\t\t\t\t".($conds ? "WHERE ".self::build_where($conds, $tables, $params) : ""); - return $query; + return "SELECT COUNT(1) AS count\n". + "FROM ".self::build_from($tables)."\n". + ($conds ? "WHERE ".self::build_where($conds, $tables, $params) : ""); } /** @@ -148,7 +140,7 @@ $conditions = self::build_conditions($conds, $params, $tables); - return implode(" AND ", array_filter($conditions)); + return (empty($conditions)) ? "" : "(".implode(") AND (", array_filter($conditions)).")"; } /** @@ -231,8 +223,10 @@ public static function build_in($vals) { $return = array(); + foreach ($vals as $val) $return[] = SQL::current()->escape($val); + return "(".join(",", $return).")"; } @@ -240,19 +234,18 @@ * Function: build_select * Creates a full SELECT query. */ - public static function build_select($tables, $fields, $conds, $order = null, $limit = null, $offset = null, $group = null, $left_join = null, &$params = array()) { - $query = " - SELECT ".self::build_select_header($fields, $tables)." - FROM ".self::build_from($tables); - if (isset($left_join)) - foreach ($left_join as $join) - $query.= "\n\t\t\t\tLEFT JOIN __".$join["table"]." ON ".self::build_where($join["where"], $join["table"], $params); - $query.= " - ".($conds ? "WHERE ".self::build_where($conds, $tables, $params) : "")." - ".($group ? "GROUP BY ".self::build_group($group, $tables) : "")." - ".($order ? "ORDER BY ".self::build_order($order, $tables) : "")." - ".self::build_limits($offset, $limit)." - "; + public static function build_select($tables, $fields, $conds, $order = null, $limit = null, $offset = null, $group = null, $left_join = array(), &$params = array()) { + $query = "SELECT ".self::build_select_header($fields, $tables)."\n". + "FROM ".self::build_from($tables)."\n"; + + foreach ($left_join as $join) + $query.= "LEFT JOIN __".$join["table"]." ON ".self::build_where($join["where"], $join["table"], $params)."\n"; + + $query.= ($conds ? "WHERE ".self::build_where($conds, $tables, $params) : "")."\n". + ($group ? "GROUP BY ".self::build_group($group, $tables) : "")."\n". + ($order ? "ORDER BY ".self::build_order($order, $tables) : "")."\n". + self::build_limits($offset, $limit); + return $query; } includes/class/QueryBuilder.php @@ -192,6 +192,7 @@ * $tables - An array (or string) of tables to count results on. * $conds - An array (or string) of conditions to match. * $params - An associative array of parameters used in the query. + * $throw_exceptions - Should exceptions be thrown on error? */ public function count($tables, $conds = null, $params = array(), $throw_exceptions = false) { return $this->query(QueryBuilder::build_count($tables, $conds, $params), $params, $throw_exceptions)->fetchColumn(); @@ -211,8 +212,9 @@ * $offset - Offset for the select statement. * $group - GROUP BY statement. Can be an array. * $left_join - An array of additional LEFT JOINs. + * $throw_exceptions - Should exceptions be thrown on error? */ - public function select($tables, $fields = "*", $conds = null, $order = null, $params = array(), $limit = null, $offset = null, $group = null, $left_join = null, $throw_exceptions = false) { + public function select($tables, $fields = "*", $conds = null, $order = null, $params = array(), $limit = null, $offset = null, $group = null, $left_join = array(), $throw_exceptions = false) { return $this->query(QueryBuilder::build_select($tables, $fields, $conds, $order, $limit, $offset, $group, $left_join, $params), $params, $throw_exceptions); } @@ -224,6 +226,7 @@ * $table - Table to insert to. * $data - An associative array of data to insert. * $params - An associative array of parameters used in the query. + * $throw_exceptions - Should exceptions be thrown on error? */ public function insert($table, $data, $params = array(), $throw_exceptions = false) { return $this->query(QueryBuilder::build_insert($table, $data), $params, $throw_exceptions); @@ -237,6 +240,7 @@ * $table - Table to insert to. * $data - An associative array of data to insert. * $params - An associative array of parameters used in the query. + * $throw_exceptions - Should exceptions be thrown on error? */ public function replace($table, $data, $params = array(), $throw_exceptions = false) { return $this->query(QueryBuilder::build_replace($table, $data), $params, $throw_exceptions); @@ -251,6 +255,7 @@ * $conds - Rows to update. * $data - An associative array of data to update. * $params - An associative array of parameters used in the query. + * $throw_exceptions - Should exceptions be thrown on error? */ public function update($table, $conds, $data, $params = array(), $throw_exceptions = false) { return $this->query(QueryBuilder::build_update($table, $conds, $data, $params), $params, $throw_exceptions); @@ -264,6 +269,7 @@ * $table - Table to delete from. * $conds - Rows to delete.. * $params - An associative array of parameters used in the query. + * $throw_exceptions - Should exceptions be thrown on error? */ public function delete($table, $conds, $params = array(), $throw_exceptions = false) { return $this->query(QueryBuilder::build_delete($table, $conds, $params), $params, $throw_exceptions); includes/class/SQL.php @@ -23,7 +23,7 @@ # Constant: DEBUG # Should Chyrp use debugging processes? - define('DEBUG', false); + define('DEBUG', true); # Fallback all these definitions. if (!defined('JAVASCRIPT')) define('JAVASCRIPT', false); includes/common.php @@ -430,23 +430,19 @@ if ($post->latest_comment > $_POST['last_comment']) { $new_comments = $sql->select("comments", "id", - array("post_id = :post_id", + array("post_id" => $_POST['post_id'], "id > :last_comment", - "status != 'spam'", - "(status != 'denied' OR ( - status = 'denied' AND ( - ( - author_ip != 0 AND - author_ip = :current_ip - ) OR ( - user_id != 0 AND - user_id = :visitor_id - ) + "status not" => "spam", + "status != 'denied' OR ( + ( + user_id != 0 AND + user_id = :visitor_id + ) OR ( + id IN ".self::visitor_comments()." ) - ))"), + )"), "created_at ASC", - array(":post_id" => $_POST['post_id'], - ":last_comment" => $_POST['last_comment'], + array(":last_comment" => $_POST['last_comment'], ":current_ip" => ip2long($_SERVER['REMOTE_ADDR']), ":visitor_id" => $visitor->id )); @@ -627,24 +623,20 @@ if (isset($route->action) and $route->action == "view") { $get_comments = $sql->select("comments", # table "*", # fields - array("post_id = :post_id", + array("post_id" => $post->id, "status != 'spam'", - "(status != 'denied' OR ( - status = 'denied' AND ( - ( - author_ip != 0 AND - author_ip = :current_ip - ) OR ( - user_id != 0 AND - user_id = :visitor_id - ) + "status != 'denied' OR ( + ( + user_id != 0 AND + user_id = :visitor_id + ) OR ( + id IN ".self::visitor_comments()." ) - ))"), + )"), "created_at ASC", # order - array( - ":post_id" => $post->id, - ":current_ip" => ip2long($_SERVER['REMOTE_ADDR']), - ":visitor_id" => $visitor->id + array(":post_id" => $post->id, + ":current_ip" => ip2long($_SERVER['REMOTE_ADDR']), + ":visitor_id" => $visitor->id )); $post->comments = array(); @@ -671,17 +663,14 @@ $options["left_join"][] = array("table" => "comments", "where" => array("post_id = posts.id", "status != 'spam'", - "(status != 'denied' OR ( - status = 'denied' AND ( - ( - author_ip != 0 AND - author_ip = :current_ip - ) OR ( - user_id != 0 AND - user_id = :visitor_id - ) + "status != 'denied' OR ( + ( + user_id != 0 AND + user_id = :visitor_id + ) OR ( + id IN ".self::visitor_comments()." ) - ))")); + )")); $options["params"][":current_ip"] = ip2long($_SERVER['REMOTE_ADDR']); $options["params"][":visitor_id"] = Visitor::current()->id; @@ -742,4 +731,11 @@ header("HTTP/1.1 301 Moved Permanently"); redirect("comments_feed/"); } + + static function visitor_comments() { + if (empty($_SESSION['comments'])) + return "(0)"; + else + return QueryBuilder::build_in($_SESSION['comments']); + } } modules/comments/comments.php @@ -107,6 +107,9 @@ $post, $visitor->id); + fallback($_SESSION['comments'], array()); + $_SESSION['comments'][] = $comment->id; + if (isset($_POST['ajax'])) exit("{ comment_id: ".$comment->id." }"); @@ -126,6 +129,9 @@ $post, $visitor->id); + fallback($_SESSION['comments'], array()); + $_SESSION['comments'][] = $comment->id; + if (isset($_POST['ajax'])) exit("{ comment_id: ".$comment->id." }"); modules/comments/model.Comment.php 79592f602d99c0782f4cdbcc834728df075026cc Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/0a83e618df461db5a1dc6aedf397251ee67fcbf7 0a83e618df461db5a1dc6aedf397251ee67fcbf7 2008-09-01T11:22:48-07:00 2008-09-01T11:22:48-07:00 * Prettified some QueryBuilder code. * Store user comments in their session. [#199 state:resolved] 88fe6c2ba8c44a2998291b924865107f3573566d Alex Suraci i.am@toogeneric.com