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

Try to catch some errors

Browse Source
This commit is contained in:
Nathan Gray 2013-01-03 15:53:31 +00:00
parent 21fdd9abf2
commit 3a1c4fb7fb
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
importexport/inc/class.importexport_arrayxml.inc.php
View File

@ -79,7 +79,8 @@ class importexport_arrayxml {
$n = &$_xml; $n = &$_xml;
} else { } else {
$n = new DOMDocument; $n = new DOMDocument;
$n->loadXML($_xml); $loaded = $n->loadXML($_xml);
if(!$loaded) return array();
} }
$xml_array = array(); $xml_array = array();

15
importexport/inc/class.importexport_definition.inc.php
View File

@ -78,10 +78,17 @@ class importexport_definition implements importexport_iface_egw_record {
if ( !( importexport_definitions_bo::is_permitted($this->get_record_array()) || $this->is_admin)) { if ( !( importexport_definitions_bo::is_permitted($this->get_record_array()) || $this->is_admin)) {
throw new Exception('Error: User "'.$this->user.'" is not permitted to get definition with identifier "'.$_identifier.'"!'); throw new Exception('Error: User "'.$this->user.'" is not permitted to get definition with identifier "'.$_identifier.'"!');
} }
$options_data = importexport_arrayxml::xml2array( $this->definition['plugin_options'] ); try
$this->definition['plugin_options'] = $options_data['root']; {
if($this->definition['filter']) $filter = importexport_arrayxml::xml2array( $this->definition['filter'] ); $options_data = importexport_arrayxml::xml2array( $this->definition['plugin_options'] );
$this->definition['filter'] = $filter['root']; $this->definition['plugin_options'] = $options_data['root'];
if($this->definition['filter']) $filter = importexport_arrayxml::xml2array( $this->definition['filter'] );
$this->definition['filter'] = $filter['root'];
}
catch (Exception $e)
{
error_log($e->getMessage());
}
} }
} }