keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

New class function to fetch items

Browse source
This commit is contained in:
Michael 2018-06-07 06:03:12 +00:00
parent b53e74d989
commit 4874e589f1
2 changed files with 72 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
include/dba.php
View file

@ -1148,29 +1148,9 @@ class dba {
$condition_string = self::buildCondition($condition);
$order_string = '';
if (isset($params['order'])) {
$order_string = " ORDER BY ";
foreach ($params['order'] AS $fields => $order) {
if (!is_int($fields)) {
$order_string .= "`" . $fields . "` " . ($order ? "DESC" : "ASC") . ", ";
} else {
$order_string .= "`" . $order . "`, ";
}
}
$order_string = substr($order_string, 0, -2);
}
$param_string = self::buildParameter($params);
$limit_string = '';
if (isset($params['limit']) && is_int($params['limit'])) {
$limit_string = " LIMIT " . $params['limit'];
}
if (isset($params['limit']) && is_array($params['limit'])) {
$limit_string = " LIMIT " . intval($params['limit'][0]) . ", " . intval($params['limit'][1]);
}
$sql = "SELECT " . $select_fields . " FROM `" . $table . "`" . $condition_string . $order_string . $limit_string;
$sql = "SELECT " . $select_fields . " FROM `" . $table . "`" . $condition_string . $param_string;
$result = self::p($sql, $condition);
@ -1227,14 +1207,14 @@ class dba {
* @param array $condition
* @return string
*/
private static function buildCondition(array &$condition = [])
public static function buildCondition(array &$condition = [])
{
$condition_string = '';
if (count($condition) > 0) {
reset($condition);
$first_key = key($condition);
if (is_int($first_key)) {
$condition_string = " WHERE ".array_shift($condition);
$condition_string = " WHERE (" . array_shift($condition) . ")";
} else {
$new_values = [];
$condition_string = "";
@ -1251,7 +1231,7 @@ class dba {
$condition_string .= "`" . $field . "` = ?";
}
}
$condition_string = " WHERE " . $condition_string;
$condition_string = " WHERE (" . $condition_string . ")";
$condition = $new_values;
}
}
@ -1259,6 +1239,39 @@ class dba {
return $condition_string;
}
/**
* @brief Returns the SQL parameter string built from the provided parameter array
*
* @param array $params
* @return string
*/
public static function buildParameter(array $params = [])
{
$order_string = '';
if (isset($params['order'])) {
$order_string = " ORDER BY ";
foreach ($params['order'] AS $fields => $order) {
if (!is_int($fields)) {
$order_string .= "`" . $fields . "` " . ($order ? "DESC" : "ASC") . ", ";
} else {
$order_string .= "`" . $order . "`, ";
}
}
$order_string = substr($order_string, 0, -2);
}
$limit_string = '';
if (isset($params['limit']) && is_int($params['limit'])) {
$limit_string = " LIMIT " . $params['limit'];
}
if (isset($params['limit']) && is_array($params['limit'])) {
$limit_string = " LIMIT " . intval($params['limit'][0]) . ", " . intval($params['limit'][1]);
}
return $order_string.$limit_string;
}
/**
* @brief Fills an array with data from a query
*

34
src/Model/Item.php
View file

@ -33,6 +33,40 @@ require_once 'include/text.php';
class Item extends BaseObject
{
public static function select(array $fields = [], array $condition = [], $params = [], $uid = null)
{
require_once 'include/conversation.php';
$item_fields = ['id', 'guid'];
$select_fields = item_fieldlists();
$condition_string = dba::buildCondition($condition);
foreach ($item_fields as $field) {
$search = [" `" . $field . "`", "(`" . $field . "`"];
$replace = [" `item`.`" . $field . "`", "(`item`.`" . $field . "`"];
$condition_string = str_replace($search, $replace, $condition_string);
}
$condition_string = $condition_string . ' AND ' . item_condition();
if (!empty($uid)) {
$condition_string .= " AND `item`.`uid` = ?";
$condition['uid'] = $uid;
}
$param_string = dba::buildParameter($params);
$table = "`item` " . item_joins($uid);
$sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string;
echo $sql;
$result = dba::p($sql, $condition);
return dba::inArray($result);
}
/**
* @brief Update existing item entries
*