extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-16 01:58:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Try to catch some errors

Browse Source
This commit is contained in:
Nathan Gray
2013-01-03 17:00:56 +00:00
parent 61ff62f899
commit a40dda009e
2 changed files with 11 additions and 3 deletions
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();

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

@ -77,9 +77,16 @@ 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.'"!');
} }
try
{
$options_data = importexport_arrayxml::xml2array( $this->definition['plugin_options'] ); $options_data = importexport_arrayxml::xml2array( $this->definition['plugin_options'] );
$this->definition['plugin_options'] = $options_data['root']; $this->definition['plugin_options'] = $options_data['root'];
} }
catch (Exception $e)
{
error_log($e->getMessage());
}
}
} }
/** /**