Commit 56e25c8e authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch '6152-add-subscription-screen' into '1.3-fixes'

Resolve "Add subscription screen"

See merge request fusiondirectory/fd!892
Showing with 8 additions and 8 deletions
+8 -8
...@@ -171,18 +171,18 @@ class subscriptionInfo extends simplePlugin ...@@ -171,18 +171,18 @@ class subscriptionInfo extends simplePlugin
$data = $this->import_file; $data = $this->import_file;
if (empty($data)) { if (empty($data)) {
/* No file or empty file */ /* No file or empty file */
$error = new SimplePluginError( msg_dialog::display(
$this->attributesAccess['import_file'], _('Import error'),
htmlescape(_('No data. Did you forgot to upload a file?')) htmlescape(_('No data. Did you forgot to upload a file?')),
ERROR_DIALOG
); );
$error->display();
} elseif (($data = parse_ini_string($data)) === FALSE) { } elseif (($data = parse_ini_string($data)) === FALSE) {
/* Import of INI failed */ /* Import of INI failed */
$error = new SimplePluginError( msg_dialog::display(
$this->attributesAccess['import_file'], _('Import error'),
htmlescape(_('Failed to parse imported file')) htmlescape(_('Failed to parse imported file')),
ERROR_DIALOG
); );
$error->display();
} else { } else {
/* Import data and save it to the LDAP */ /* Import data and save it to the LDAP */
foreach (static::$subscriptionAttributes as $attr => $iniVar) { foreach (static::$subscriptionAttributes as $attr => $iniVar) {
......
Supports Markdown
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