Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
forena
Commits
e2a39ac4
Commit
e2a39ac4
authored
May 01, 2014
by
David Metzler
Browse files
Fixed missing error reporting function.
parent
25bd5117
Changes
3
Hide whitespace changes
Inline
Side-by-side
FrxEditor.inc
View file @
e2a39ac4
...
...
@@ -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.
...
...
@@ -1124,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>"
;
...
...
forena.admin.inc
View file @
e2a39ac4
...
...
@@ -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
());
}
}
}
...
...
renderers/FrxRenderer.inc
View file @
e2a39ac4
...
...
@@ -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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment