holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* PHP7/ImportExport: fix different evaluation order of PHP 5 and 7 gives eg. error "Function name must be string" in wizard

Browse Source
This commit is contained in:
Ralf Becker 2016-07-07 20:25:32 +02:00
parent a75c425f57
commit 0b64ced1d1
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Mail.php
View File

@ -3391,7 +3391,7 @@ class Mail
//highest precedence
try
{
$_folderName = $this->icServer->$types[$_type]['profileKey'];
$_folderName = $this->icServer->{$types[$_type]['profileKey']};
}
catch (\Exception $e)
{

2
calendar/inc/class.calendar_export_csv.inc.php
View File

@ -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(

2
calendar/inc/class.calendar_export_ical.inc.php
View File

@ -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(

14
importexport/inc/class.importexport_definitions_ui.inc.php
View File

@ -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';
}

10
resources/inc/class.resources_import_csv.inc.php
View File

@ -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');
}
}