@@ -191,7 +191,7 @@ public static function build_conditions($conds, &$params, $tables = null) { foreach ($conds as $key => $val) { - if (is_numeric($key)) # Full expression + if (is_int($key)) # Full expression $cond = $val; else { # Key => Val expression if (is_string($val) and $val[0] == ":") @@ -199,30 +199,34 @@ else { if (substr($key, -4) == " not") { # Negation $key = substr($key, 0, -4); + $param = str_replace(array("(", ")"), "_", $key); if (is_array($val)) $cond = $key." NOT IN ".self::build_in($val); elseif ($val === null) $cond = $key." IS NOT NULL"; else { - $cond = $key." != :".$key; - $params[":".$key] = $val; + $cond = $key." != :".$param; + $params[":".$param] = $val; } } elseif (substr($key, -5) == " like") { # LIKE $key = substr($key, 0, -5); - $cond = $key." LIKE :".$key; - $params[":".$key] = $val; + $param = str_replace(array("(", ")"), "_", $key); + $cond = $key." LIKE :".$param; + $params[":".$param] = $val; } elseif (substr($key, -9) == " not like") { # NOT LIKE $key = substr($key, 0, -9); - $cond = $key." NOT LIKE :".$key; - $params[":".$key] = $val; + $param = str_replace(array("(", ")"), "_", $key); + $cond = $key." NOT LIKE :".$param; + $params[":".$param] = $val; } else { # Equation if (is_array($val)) $cond = $key." IN ".self::build_in($val); elseif ($val === null) $cond = $key." IS NULL"; else { - $cond = $key." = :".$key; - $params[":".$key] = $val; + $param = str_replace(array("(", ")"), "_", $key); + $cond = $key." = :".$param; + $params[":".$param] = $val; } } } includes/class/QueryBuilder.php @@ -1106,10 +1106,9 @@ foreach ($matches as $match) { list($test, $equals,) = explode(":", $match); - if (in_array($test, $times)) { - $where[] = strtoupper($test)."(created_at) = :created_".$test; - $params[":created_".$test] = $equals; - } elseif ($test == "author") { + if (in_array($test, $times)) + $where[strtoupper($test)."(created_at)"] = $equals; + elseif ($test == "author") { $user = new User(null, array("where" => array("login" => $equals))); $where["user_id"] = $user->id; } elseif ($test == "group") { includes/helpers.php @@ -748,10 +748,9 @@ preg_match_all("/\(([^\)]+)\)/", Config::current()->post_url, $matches); $params = array(); foreach ($matches[1] as $attr) - if (in_array($attr, $times)) { - $where[] = strtoupper($attr)."(created_at) = :created_".$attr; - $params[':created_'.$attr] = $get[$attr]; - } elseif ($attr == "author") { + if (in_array($attr, $times)) + $where[strtoupper($attr)."(created_at)"] = $get[$attr]; + elseif ($attr == "author") { $user = new User(array("where" => array("login" => $get['author']))); $where["user_id"] = $user->id; } elseif ($attr == "feathers") includes/model/Post.php @@ -446,25 +446,21 @@ if (!in_array(XML_RPC_FEATHER, Config::current()->enabled_feathers)) throw new Exception(_f("The %s feather is not enabled.", array(XML_RPC_FEATHER))); - $where = array('feather = :feather'); - $params = array(':feather' => XML_RPC_FEATHER); + $where = array('feather' => XML_RPC_FEATHER); if ($user->group()->can('view_own_draft', 'view_draft')) - $where[] = 'status IN ( "public", "draft" )'; + $where['status'] = array('public', 'draft'); else - $where[] = 'status = "public"'; + $where['status'] = 'public'; - if (!$user->group()->can('view_draft', 'edit_draft', 'edit_post', 'delete_draft', 'delete_post')) { - $where[] = 'user_id = :user_id'; - $params[':user_id'] = $user->id; - } + if (!$user->group()->can('view_draft', 'edit_draft', 'edit_post', 'delete_draft', 'delete_post')) + $where['user_id'] = $user->id; return Post::find( array( 'where' => $where, 'order' => 'created_at DESC, id DESC', - 'limit' => $limit, - 'params' => $params), + 'limit' => $limit), array('filter' => false)); } @@ -492,11 +488,8 @@ null, array( 'where' => array( - 'login = :login', - 'password = :password'), - 'params' => array( - ':login' => $login, - ':password' => md5($password)))); + 'login' => $login, + 'password' => md5($password)))); if ($user->no_results) throw new Exception(__("Login incorrect.")); includes/xmlrpc.php @@ -60,10 +60,11 @@ "MONTH(created_at) AS month", "created_at AS created_at", "COUNT(id) AS posts"), - array("YEAR(created_at) = :year"), + array("YEAR(created_at)" => $_GET['year']), "created_at DESC, id DESC", - array(":year" => $_GET['year']), - null, null, + array(), + null, + null, array("YEAR(created_at)", "MONTH(created_at)")); else $timestamps = $sql->select("posts", @@ -74,7 +75,8 @@ null, "created_at DESC, id DESC", array(), - null, null, + null, + null, array("YEAR(created_at)", "MONTH(created_at)")); $archives = array(); @@ -101,8 +103,7 @@ "month" => strftime("%B", $timestamp), "day" => strftime("%e", $timestamp), "timestamp" => $timestamp, - "depth" => $depth) - )); + "depth" => $depth))); } break; case "login": index.php af7fc7e2ca49b0d56dfb023d164259831e87d0c4 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/303cba317d4ec3af39c8b45a66a761da0369bb4b 303cba317d4ec3af39c8b45a66a761da0369bb4b 2008-09-02T14:28:18-07:00 2008-09-02T14:28:18-07:00 More SQL interfacing touch-ups. 1d2503685eb52649d4f290dfb7bbeed3a8d88afd Alex Suraci i.am@toogeneric.com