Commit 9de5e36d authored by metzlerd's avatar metzlerd
Browse files

Unlock configuration of connection string for module delivered reports.

parent ea1e3ba4
......@@ -599,7 +599,6 @@ function forena_data_settings_edit($form, &$form_state, $source=-1) {
'#descripton' => t('Connection string: see appropriate php documentation for more details.'),
'#default_value' => @$config['uri'],
'#required' => TRUE,
'#disabled' => $locked,
);
$user = array(
......@@ -661,7 +660,7 @@ function forena_data_settings_edit($form, &$form_state, $source=-1) {
'#title' => t('Oracle native XML'),
'#disabled' => $locked,
'#description' => t('Use the function provided with Forena to generate XML. Requires installing a function into the database'),
'#default_value' => $config['oracle_xml'],
'#default_value' => @$config['oracle_xml'],
);
break;
case 'FrxPDO':
......
......@@ -25,10 +25,10 @@ class FrxOracle extends FrxDataSource {
parent::__construct($conf, $repos_path, $name);
$this->db_type = 'oracle';
$this->use_oracle_xml = FALSE;
$uri = $conf['uri'];
$this->debug = $conf['debug'];
$uri = @$conf['uri'];
$this->debug = @$conf['debug'];
if (isset($conf['schema'])) $this->schema = $conf['schema'];
if ($conf['oracle_xml']) $this->use_oracle_xml = TRUE;
if (@$conf['oracle_xml']) $this->use_oracle_xml = TRUE;
if ($uri) {
// Test for postgres suport
if (!is_callable('oci_connect')) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment