Commit 85b643e3 authored by Pierre.Vriens's avatar Pierre.Vriens
Browse files

#2359229 Correct info/error messages in configuration (admin)

parent d915dd49
...@@ -191,19 +191,19 @@ function forena_settings_validate($form, &$form_state) { ...@@ -191,19 +191,19 @@ function forena_settings_validate($form, &$form_state) {
try { try {
mkdir($path); mkdir($path);
if (file_exists($path)) { if (file_exists($path)) {
drupal_set_message(t('Created Report Repository %s', array('%s' => $path))) ; drupal_set_message(t('Created Report Directory %s', array('%s' => $path))) ;
} }
} catch (Exception $e) { } catch (Exception $e) {
Frx::error(t('Unable to create Report Repository'), $e->getMessage()); Frx::error(t('Unable to create Report Directory'), $e->getMessage());
} }
} }
} }
if (!file_exists($path)) { if (!file_exists($path)) {
form_set_error('forena_report_repos', t('Report Repository (') . $path . t(') does not exist')); form_set_error('forena_report_repos', t('Report Directory (') . $path . t(') does not exist'));
} }
else { else {
if (!is_writable($path)) { if (!is_writable($path)) {
form_set_error('forena_report_repos', t('Report Repository (') . $path . t(') must be writable by the web user')); form_set_error('forena_report_repos', t('Report Directory (') . $path . t(') must be writable by the web user'));
} }
} }
if (isset($values['forena_query_data_path'])) { if (isset($values['forena_query_data_path'])) {
...@@ -213,19 +213,19 @@ function forena_settings_validate($form, &$form_state) { ...@@ -213,19 +213,19 @@ function forena_settings_validate($form, &$form_state) {
try { try {
mkdir($path); mkdir($path);
if (file_exists($path)) { if (file_exists($path)) {
drupal_set_message(t('Created Custom Data Block Repository %s', array('%s' => $path))) ; drupal_set_message(t('Created Custom Data Block Directory %s', array('%s' => $path))) ;
} }
} catch (Exception $e) { } catch (Exception $e) {
Frx::error(t('Unable to create Custom Data Block Repository'), $e->getMessage()); Frx::error(t('Unable to create Custom Data Block Directory'), $e->getMessage());
} }
} }
} }
if (!file_exists($path)) { if (!file_exists($path)) {
form_set_error('forena_query_data_path', t('Custom Data Block Repository (') . $path . t(') does not exist')); form_set_error('forena_query_data_path', t('Custom Data Block Directory (') . $path . t(') does not exist'));
} }
else { else {
if (!is_writable($path)) { if (!is_writable($path)) {
form_set_error('forena_query_data_path', t('Custom Data Block Repository (') . $path . t(') must be writable by the web user')); form_set_error('forena_query_data_path', t('Custom Data Block Directory (') . $path . t(') must be writable by the web user'));
} }
} }
} }
......
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