diff --git a/addressbook/inc/class.addressbook_display.inc.php b/addressbook/inc/class.addressbook_display.inc.php index d0079b7c97..2271ddb898 100755 --- a/addressbook/inc/class.addressbook_display.inc.php +++ b/addressbook/inc/class.addressbook_display.inc.php @@ -18,10 +18,10 @@ use EGroupware\Api; */ class addressbook_display extends addressbook_ui { - function get_rows(&$query,&$rows,&$readonlys) + function get_rows(&$query,&$rows,&$readonlys,$id_only=false) { $query['sitemgr_display'] = ($readonlys['sitemgr_display'] ?$readonlys['sitemgr_display']:'addressbook.display'); - $total = parent::get_rows($query,$rows,$readonlys); + $total = parent::get_rows($query,$rows,$readonlys, $id_only); $query['template'] = $query['sitemgr_display'].'.rows'; if (is_array($query['fields'])) foreach($query['fields'] as $name) diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php index d0e6db1894..c8f9bd0589 100644 --- a/addressbook/inc/class.addressbook_vcal.inc.php +++ b/addressbook/inc/class.addressbook_vcal.inc.php @@ -524,7 +524,7 @@ class addressbook_vcal extends addressbook_bo return $result; } - function search($_vcard, $contentID=null, $relax=false, $charset=null) + function iCalSearch($_vcard, $contentID=null, $relax=false, $charset=null) { $result = array(); diff --git a/api/src/Etemplate/Widget.php b/api/src/Etemplate/Widget.php index 4d7dfdd66d..6c27a3ec19 100644 --- a/api/src/Etemplate/Widget.php +++ b/api/src/Etemplate/Widget.php @@ -690,6 +690,7 @@ class Widget eval('$name = "' . str_replace('"', '\\"', $name) . '";'); } catch(\Throwable $e) { + error_log(__METHOD__."() eval('\$name = \"".str_replace('"', '\\"', $name) . "\";)"); _egw_log_exception($e); } unset($col_, $row_, $row_cont, $col_row_cont); // quieten IDE warning about used vars, they might be used in above eval! diff --git a/calendar/inc/class.calendar_tracking.inc.php b/calendar/inc/class.calendar_tracking.inc.php index 9261886f1d..6d6b0c2add 100644 --- a/calendar/inc/class.calendar_tracking.inc.php +++ b/calendar/inc/class.calendar_tracking.inc.php @@ -121,7 +121,7 @@ class calendar_tracking extends Api\Storage\Tracking * Tracks the changes in one entry $data, by comparing it with the last version in $old * Overrides parent to reformat participants into a format parent can handle */ - public function track(array $data,array $old=null,$user=null,$deleted=null,array $changed_fields=null) + public function track(array $data,array $old=null,$user=null,$deleted=null,array $changed_fields=null, $skip_notification = false) { // Don't try to track dates on recurring events. // It won't change for the base event, and any change to the time creates an exception @@ -162,13 +162,13 @@ class calendar_tracking extends Api\Storage\Tracking $data[$date] = $data[$date]->format('ts'); } } - parent::track($data,$old,$user,$deleted, $changed_fields); + parent::track($data,$old,$user,$deleted, $changed_fields, $skip_notification); } /** * Overrides parent because calendar_boupdates handles the notifications */ - public function do_notifications($data,$old,$deleted=null) + public function do_notifications($data,$old,$deleted=null, &$email_notified = null) { unset($data, $old, $deleted); // unused, but required by function signature return true; diff --git a/calendar/inc/class.calendar_wizard_import_ical.inc.php b/calendar/inc/class.calendar_wizard_import_ical.inc.php index c778c10e24..2d00a7268b 100644 --- a/calendar/inc/class.calendar_wizard_import_ical.inc.php +++ b/calendar/inc/class.calendar_wizard_import_ical.inc.php @@ -39,13 +39,14 @@ class calendar_wizard_import_ical ); } + /* fix PHP 8 error: Cannot use "parent" when current class scope has no parent function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv) { $result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv); $content['msg'] .= "\n*" ; return $result; - } + }*/ // Conditions function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv) diff --git a/filemanager/inc/class.filemanager_shares.inc.php b/filemanager/inc/class.filemanager_shares.inc.php index 3224a8489f..1ef8247288 100644 --- a/filemanager/inc/class.filemanager_shares.inc.php +++ b/filemanager/inc/class.filemanager_shares.inc.php @@ -58,8 +58,9 @@ class filemanager_shares extends filemanager_ui * @param array &$readonlys eg. to disable buttons based on acl, not use here, maybe in a derived class * @return int total number of rows */ - public function get_rows($query, &$rows) + public function get_rows(&$query_in, &$rows) { + $query = $query_in; switch ($query['col_filter']['type']) { case Sharing::LINK: @@ -160,7 +161,7 @@ class filemanager_shares extends filemanager_ui * @param array $content=null * @param string $msg='' */ - public function index(array $content=null) + public function index(array $content=null, $msg = null) { if (!is_array($content)) {