Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'spidev' into 'master'

Browse Source 
Kalender

See merge request fronk/thetool!706
This commit is contained in:
Daniel Spitzer
2024-11-10 20:49:29 +00:00
parent 73b8ed545c 9633d7e4ec
commit 986168e1d3
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/Address/AddressModel.php
View File

@@ -225,7 +225,6 @@ class AddressModel {
$sql .= " LIMIT " . $limit['count'];
}
}
mfLoghandler::singleton()->debug($sql);
$res = $db->query($sql);
@@ -484,7 +483,16 @@ class AddressModel {
$where .= " " . $filter['add-where'];
}
//var_dump($filter, $where);exit;
if (array_key_exists("Controller!", $filter)) {
$termstring = trim($filter['search_term!']);
$termExplode = explode(" ", $termstring);
foreach ($termExplode as $term) {
$wherestring .= " AND (`customer_number` LIKE '%" . $term . "%' OR `company` LIKE '%" . $term . "%' OR `firstname` LIKE '%" . $term . "%' OR `lastname` LIKE '%" . $term . "%' OR `street` LIKE '%" . $term . "%' OR `zip` LIKE '%" . $term . "%' OR `city` LIKE '%" . $term . "%') ";
}
$where .= " AND customer_number > 0 $wherestring";
}
// var_dump($filter, $where);exit;
return $where;
}

1
application/Calendar/CalendarModel.php
View File

@@ -249,6 +249,7 @@ class CalendarModel
$Allcalendar[$value->user->name] = $key;
}
$Allcalendar['Daniel Whoknows'] = 2;
$Allcalendar['Stefan Plaschg'] = 26;
$res = $dbcal->select("cal_events", "id, uuid, calendar_id, user_id, start_time, end_time, timezone, all_day_event, name, description, location, repeat_end_time, reminder, ctime, mtime, muser_id, busy, status, resource_event_id, private, rrule, background, files_folder_id, read_only, category_id, exception_for_event_id, recurrence_id, is_organizer,event_type,customer,customer_info,customer_info_send,customer_info_reminder,busy,attendees,organizer,is_organizer,accepted", "1=1 AND id='" . $id . "' ORDER BY id");
if ($dbcal->num_rows($res)) {
$data = $dbcal->fetch_array($res);