Commit 1d870075 authored by David Metzler's avatar David Metzler
Browse files

Merge branch '7.x-4.x' of metzlerd@git.drupal.org:project/forena.git into 7.x-4.x

parents 92354f3f cfc53734
<?xml version="1.0" encoding="UTF-8"?>
<buildpath>
<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
<buildpathentry kind="src" path=""/>
<buildpathentry combineaccessrules="false" kind="prj" path="/D7 Core"/>
</buildpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>D7 Forena</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.dltk.core.scriptbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.php.core.PHPNature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="">
<attributes>
<attribute name="provider" value="org.eclipse.wst.jsdt.web.core.internal.project.ModuleSourcePathProvider"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="con" path="com.zend.jsdt.support.jquery.LIBRARY"/>
<classpathentry kind="output" path=""/>
</classpath>
eclipse.preferences.version=1
include_path=0;/D7 Forena\u00052;/D7 Core
use_asp_tags_as_php=false
eclipse.preferences.version=1
org.eclipse.php.debug.core.use-project-settings=true
org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
......@@ -111,11 +111,11 @@ class FrxEditor {
$this->xpq = new DOMXPath($dom);
}
catch (Exception $e) {
forena_error('Invalid or malformed report document', '<pre>' .
Frx::error('Invalid or malformed report document', '<pre>' .
$e->getMessage() . $e->getTraceAsString() . '</pre>');
}
if (!$this->dom->documentElement) {
forena_error(t('Invalid or malformed report document'));
Frx::error(t('Invalid or malformed report document'));
return;
}
......@@ -223,7 +223,7 @@ class FrxEditor {
}
catch (Exception $e) {
forena_error('Malformed report body', '<pre>' . $e->getMessage() .
Frx::error('Malformed report body', '<pre>' . $e->getMessage() .
$e->getTraceAsString() . '</pre>');
}
// If there are no frx attributes in the body then replace them with the old values.
......@@ -898,7 +898,8 @@ class FrxEditor {
$parms = array_merge($_GET, $_POST);
unset($parms['q']);
}
else $parms = (array)$parms;
// Removed this becuase we don't want it to nuke xml.
//else $parms = (array)$parms;
// Allow other modules to alter paramters.
$this->alterParameters($parms);
......@@ -1123,7 +1124,7 @@ class FrxEditor {
if (!$this->edit && user_access('design any report')) {
// Add the block or ID link
$o .= '<div class="forena-editor-links">'
. $this->l_icon("$report_link/edit", 'doc-option-edit.png', 'Edit', Frx::Data()->getContext('parm'));
. $this->l_icon("$report_link/edit", 'doc-option-edit.png', 'Edit', (array)Frx::Data()->getContext('parm'));
if (module_exists('locale')) $o .= $this->l_icon("$report_link/translations", 'doc-option-tab.png', 'Translations');
if (!$this->cache->include) $o .= $this->l_icon("$report_link/delete", 'doc-option-remove.png', 'Delete');
$o .= "</div>";
......
......@@ -196,7 +196,7 @@ function forena_settings_validate($form, &$form_state) {
mkdir($path);
} catch (Exception $e) {
forena_error(t('Unable to create report directory'), $e->getMessage());
Frx::error(t('Unable to create report directory'), $e->getMessage());
}
}
}
......@@ -215,7 +215,7 @@ function forena_settings_validate($form, &$form_state) {
}
} catch (Exception $e) {
forena_error(t('Unable to create data directory'), $e->getMessage());
Frx::error(t('Unable to create data directory'), $e->getMessage());
}
}
}
......
......@@ -929,9 +929,6 @@ function forena_report($name_in, $parms = NULL, $print = TRUE) {
$forena_js['report'] = preg_replace('/[^\w\-]+/u', '_', $name_in);
if ($print) drupal_add_js(array('forena' => $forena_js), 'setting');
}
if (!$print) {
return drupal_render($content['content']);
}
return $content;
......
......@@ -622,7 +622,7 @@ class FrxRenderer {
}
catch (Exception $e) {
forena_error('Malformed report body', '<pre>' . $e->getMessage() .
Frx::error('Malformed report body', '<pre>' . $e->getMessage() .
$e->getTraceAsString() . '</pre>');
}
$body = $temp_dom->getElementsByTagName('body')->item(0);
......
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