diff --git a/api/src/Mail.php b/api/src/Mail.php index 24bfe313a2..a576075c40 100644 --- a/api/src/Mail.php +++ b/api/src/Mail.php @@ -3391,7 +3391,7 @@ class Mail //highest precedence try { - $_folderName = $this->icServer->$types[$_type]['profileKey']; + $_folderName = $this->icServer->{$types[$_type]['profileKey']}; } catch (\Exception $e) { diff --git a/calendar/inc/class.calendar_export_csv.inc.php b/calendar/inc/class.calendar_export_csv.inc.php index 4d334f9bb9..72eff6edf4 100644 --- a/calendar/inc/class.calendar_export_csv.inc.php +++ b/calendar/inc/class.calendar_export_csv.inc.php @@ -103,7 +103,7 @@ class calendar_export_csv implements importexport_iface_export_plugin { if(method_exists($ui, $states['view'])) { ob_start(); - $ui->$states['view'](); + $ui->{$states['view']}(); ob_end_clean(); } $query += array( diff --git a/calendar/inc/class.calendar_export_ical.inc.php b/calendar/inc/class.calendar_export_ical.inc.php index 265dadaf2e..7e5b271eb8 100644 --- a/calendar/inc/class.calendar_export_ical.inc.php +++ b/calendar/inc/class.calendar_export_ical.inc.php @@ -95,7 +95,7 @@ class calendar_export_ical extends calendar_export_csv { if(method_exists($ui, $states['view'])) { ob_start(); - $ui->$states['view'](); + $ui->{$states['view']}(); ob_end_clean(); } $query += array( diff --git a/importexport/inc/class.importexport_definitions_ui.inc.php b/importexport/inc/class.importexport_definitions_ui.inc.php index e93d22dc7a..806699daaf 100644 --- a/importexport/inc/class.importexport_definitions_ui.inc.php +++ b/importexport/inc/class.importexport_definitions_ui.inc.php @@ -58,7 +58,7 @@ class importexport_definitions_ui error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING); Api\Translation::add_app(self::_appname); $GLOBALS['egw_info']['flags']['currentapp'] = self::_appname; - + $this->etpl = new Etemplate(); $this->clock = Api\Html::image(self::_appname,'clock'); $this->steps = array( @@ -544,11 +544,11 @@ class importexport_definitions_ui } if(!key_exists($content['step'],$this->steps)) { - $next_step = $this->plugin->$content['step']($content,$sel_options,$readonlys,$preserv); + $next_step = $this->plugin->{$content['step']}($content,$sel_options,$readonlys,$preserv); } else { - $next_step = $this->$content['step']($content,$sel_options,$readonlys,$preserv); + $next_step = $this->{$content['step']}($content,$sel_options,$readonlys,$preserv); } } else @@ -578,15 +578,15 @@ class importexport_definitions_ui { if(!key_exists($content['step'],$this->steps)) { - $next_step = $this->plugin->$content['step']($content); + $next_step = $this->plugin->{$content['step']}($content); } else { - $next_step = $this->$content['step']($content); + $next_step = $this->{$content['step']}($content); } } } while($this->wizard_content_template == self::SKIP); - + if(!$this->can_edit($content)) { $readonlys[$this->wizard_content_template] = true; @@ -868,7 +868,7 @@ class importexport_definitions_ui $content['no_all_users'] = true; } unset ($preserv['button']); - + $readonlys['button[next]'] = true; return 'importexport.wizard_chooseallowedusers'; } diff --git a/resources/inc/class.resources_import_csv.inc.php b/resources/inc/class.resources_import_csv.inc.php index 8a126282be..1901600e1b 100644 --- a/resources/inc/class.resources_import_csv.inc.php +++ b/resources/inc/class.resources_import_csv.inc.php @@ -107,15 +107,15 @@ class resources_import_csv extends importexport_basic_import_csv { if(!$record->accessory_of) $record->accessory_of = -1; //error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions'])); if ($this->definition->plugin_options['conditions']) { - + foreach ( $this->definition->plugin_options['conditions'] as $condition ) { $results = array(); switch ( $condition['type'] ) { // exists case 'exists' : - if($record->$condition['string']) { + if($record->{$condition['string']}) { $results = $this->bo->so->search( - array( $condition['string'] => $record->$condition['string']), + array( $condition['string'] => $record->{$condition['string']}), False ); } @@ -170,7 +170,7 @@ class resources_import_csv extends importexport_basic_import_csv { // Merge to deal with fields not in import record $_data = array_merge($old, $_data); - + // Fall through case 'insert' : if($_action == 'insert') { @@ -193,7 +193,7 @@ class resources_import_csv extends importexport_basic_import_csv { } default: throw new Api\Exception('Unsupported action'); - + } }