1
1
Fork 0

Some more places ...

This commit is contained in:
Michael 2018-07-08 12:58:43 +00:00
commit 1d745c25a7
6 changed files with 73 additions and 42 deletions

View file

@ -31,7 +31,7 @@ function poco_init(App $a) {
$system_mode = true;
}
$format = (($_GET['format']) ? $_GET['format'] : 'json');
$format = defaults($_GET, 'format', 'json');
$justme = false;
$global = false;
@ -76,11 +76,11 @@ function poco_init(App $a) {
if ($justme) {
$sql_extra = " AND `contact`.`self` = 1 ";
} else {
$sql_extra = "";
}
// else
// $sql_extra = " AND `contact`.`self` = 0 ";
if ($cid) {
if (!empty($cid)) {
$sql_extra = sprintf(" AND `contact`.`id` = %d ", intval($cid));
}
if (x($_GET, 'updatedSince')) {
@ -112,8 +112,9 @@ function poco_init(App $a) {
} else {
$totalResults = 0;
}
$startIndex = intval($_GET['startIndex']);
if (! $startIndex) {
if (!empty($_GET['startIndex'])) {
$startIndex = intval($_GET['startIndex']);
} else {
$startIndex = 0;
}
$itemsPerPage = ((x($_GET, 'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
@ -204,6 +205,10 @@ function poco_init(App $a) {
if (is_array($contacts)) {
if (DBM::is_result($contacts)) {
foreach ($contacts as $contact) {
if (!isset($contact['updated'])) {
$contact['updated'] = '';
}
if (! isset($contact['generation'])) {
if ($global) {
$contact['generation'] = 3;