Commit e4bc0f15 authored by benoit manager's avatar benoit manager

Merge branch '1.3-fixes' into 'master'

1.3 fixes

See merge request fusiondirectory/fd!627
parents b9db3c88 f45af29d
## %"FusionDirectory 1.3.1" - 2019-07-04
### Added
#### fusiondirectory
- fd#5985 We don't have LDAP tab on FusionDirectory configuration
#### fusiondirectory-plugins
- fd-plugins#5911 supannRefId field is missing for "etablissement"
- fd-plugins#5938 Make %passwordClear% available to sambaAccount hooks
- fd-plugins#5939 create icons for ipmi and weblink
- fd-plugins#5940 We don't have LDAP tab on FusionDirectory configuration
- fd-plugins#5957 creating icons for the sinaps plugin
### Changed
#### fusiondirectory-plugins
- fd-plugins#5913 Avoid mass acquistion when editing group gidNumber
- fd-plugins#5948 description of a user should'nt be updated from SINAPS
### Removed
#### fusiondirectory-plugins
- fd-plugins#5901 Remove Google+ from personal social accounts tab
### Fixed
#### fusiondirectory
- fd#5942 PHP >= 7.2 triggering error when count() is called with invalid countable
- fd#5967 Systems dashboard crashes
- fd#5978 when renaming branch aka department roles are not updated correctly
- fd#5983 Write ACL on user/userRoles/groupsMembership not working when not having full user/user read right
- fd#5987 ImagickException are not catched when showing an ImageAttribute
- fd#5997 Incorrect error message when the mail cannot be sent by recovery
- fd#6006 expiration date in dashboard is 02.01.1970
#### fusiondirectory-plugins
- fd-plugins#5917 flag_ownmailbox cannot be used with partage mail method
- fd-plugins#5918 SINAPS : acquisition couldn't be sent because primary affectation isn't set
- fd-plugins#5923 cname record appear on another domain when they contain the machine cn
- fd-plugins#5935 Crash when I try to create a server with argonaut plugin and without dns plugin
- fd-plugins#5941 Error when identity is spread from SINAPS "Cannot delete non-existing user {LDAPUUID}"
- fd-plugins#5942 Error for user-reminder about smarty
- fd-plugins#5944 add addvalues/delvalues documentation
- fd-plugins#5945 unable to add SINAPS Structure
- fd-plugins#5949 Systems dashboard crashes
## %"FusionDirectory 1.3" - 2019-03-04
### Added
......
......@@ -3215,6 +3215,52 @@ if you are using the weblink plugin you have to update is schema
fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/weblink-fd.schema
```
Migrate FusionDirectory from 1.3 to 1.3.1
=========================================
**The gpg keys for FusionDirectory and Argonaut have been renewed so you
need to install the new keys for the packages to install correctly**
Upgrade FusionDirectory first
-----------------------------
Upgrade FusionDirectory core package before other ones to avoid
dependencies errors:
``` {.sourceCode .shell}
apt-get install fusiondirectory
```
Upgrade FusionDirectory schema package too.
``` {.sourceCode .shell}
apt-get install fusiondirectory-schema
```
Upgrade of LDAP directory
-------------------------
if you are using the sinaps plugin you have to update is schema
``` {.sourceCode .shell}
fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/sinaps-fd-conf.schema
```
Fonctionality Added
-------------------
- The macro **%passwordClear%** is now available in the sambaAccount
so that in can be used in hooks for AD sync.
- The ldapdump fonctionality is now available on the configuration
- The supann etablissment objects is now equal to entite objects
except for the attribute ou
Fonctionality removed
---------------------
- The google+ account storage has been removed from personal social
accounts tab
[php-cas]: http://packages.ubuntu.com/trusty/all/php-cas/download
......
.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32)
.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
......@@ -54,16 +54,20 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
.if !\nF .nr F 0
.if \nF>0 \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
.nr rF 0
.if \n(.g .if rF .nr rF 1
.if (\n(rF:(\n(.g==0)) \{\
. if \nF \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
..
. if !\nF==2 \{\
. nr % 0
. nr F 2
. if !\nF==2 \{\
. nr % 0
. nr F 2
. \}
. \}
.\}
.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
......@@ -129,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-INSERT-SCHEMA 1"
.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2019-01-22" "FusionDirectory 1.3" "FusionDirectory Documentation"
.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2019-05-20" "FusionDirectory 1.3.1" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
......@@ -209,5 +213,5 @@ This code is part of FusionDirectory <http://www.fusiondirectory.org>
.PP
This program is distributed in the hope that it will be useful,
but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE. \s0 See the
\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0 See the
\&\s-1GNU\s0 General Public License for more details.
.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32)
.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
......@@ -54,16 +54,20 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
.if !\nF .nr F 0
.if \nF>0 \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
.nr rF 0
.if \n(.g .if rF .nr rF 1
.if (\n(rF:(\n(.g==0)) \{\
. if \nF \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
..
. if !\nF==2 \{\
. nr % 0
. nr F 2
. if !\nF==2 \{\
. nr % 0
. nr F 2
. \}
. \}
.\}
.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
......@@ -129,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-SETUP 1"
.TH FUSIONDIRECTORY-SETUP 1 "2019-03-04" "FusionDirectory 1.3" "FusionDirectory Documentation"
.TH FUSIONDIRECTORY-SETUP 1 "2019-06-27" "FusionDirectory 1.3.1" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
......@@ -264,5 +268,5 @@ This code is part of FusionDirectory (http://www.fusiondirectory.org/)
.PP
This program is distributed in the hope that it will be useful,
but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE. \s0 See the
\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0 See the
\&\s-1GNU\s0 General Public License for more details.
.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32)
.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
......@@ -54,16 +54,20 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
.if !\nF .nr F 0
.if \nF>0 \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
.nr rF 0
.if \n(.g .if rF .nr rF 1
.if (\n(rF:(\n(.g==0)) \{\
. if \nF \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
..
. if !\nF==2 \{\
. nr % 0
. nr F 2
. if !\nF==2 \{\
. nr % 0
. nr F 2
. \}
. \}
.\}
.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
......@@ -129,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY.CONF 1"
.TH FUSIONDIRECTORY.CONF 1 "2019-02-07" "FusionDirectory 1.3" "FusionDirectory Documentation"
.TH FUSIONDIRECTORY.CONF 1 "2019-05-20" "FusionDirectory 1.3.1" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
......@@ -218,25 +222,25 @@ The config statement defines the \s-1LDAP\s0 base, where FusionDirectory stores
.IX Item "debuglevel integer"
The debuglevel value tells FusionDirectory to display certain information on each page load. Value is an \s-1OR\s0 combination of the following byte values :
.Sp
\&\s-1DEBUG_TRACE \s0 = 1
\&\s-1DEBUG_TRACE\s0 = 1
.Sp
\&\s-1DEBUG_LDAP \s0 = 2
\&\s-1DEBUG_LDAP\s0 = 2
.Sp
\&\s-1DEBUG_DB \s0 = 4
\&\s-1DEBUG_DB\s0 = 4
.Sp
\&\s-1DEBUG_SHELL \s0 = 8
\&\s-1DEBUG_SHELL\s0 = 8
.Sp
\&\s-1DEBUG_POST \s0 = 16
\&\s-1DEBUG_POST\s0 = 16
.Sp
\&\s-1DEBUG_SESSION \s0 = 32
\&\s-1DEBUG_SESSION\s0 = 32
.Sp
\&\s-1DEBUG_CONFIG \s0 = 64
\&\s-1DEBUG_CONFIG\s0 = 64
.Sp
\&\s-1DEBUG_ACL \s0 = 128
\&\s-1DEBUG_ACL\s0 = 128
.Sp
\&\s-1DEBUG_ARGONAUT\s0 = 256
.Sp
\&\s-1DEBUG_MAIL \s0 = 512
\&\s-1DEBUG_MAIL\s0 = 512
.SS "\s-1LDAP\s0 options"
.IX Subsection "LDAP options"
.IP "\fBldapTLS\fR \fIbool\fR" 4
......@@ -272,4 +276,4 @@ This code is part of FusionDirectory <http://www.fusiondirectory.org>
.IX Item "Copyright (C) 2011-2018 FusionDirectory project"
.PD
.PP
This program is distributed in the hope that it will be useful, but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of \s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE. \s0 See the \s-1GNU\s0 General Public License for more details.
This program is distributed in the hope that it will be useful, but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of \s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0 See the \s-1GNU\s0 General Public License for more details.
......@@ -580,7 +580,7 @@ class passwordRecovery extends standAlonePage {
if (mail_utf8($this->email_address, FALSE, $this->from_mail, $this->mail_subject, $mail_body)) {
$this->step = 3;
} else {
$this->message[] = msgPool::invalid(_("Contact your administrator, there was a problem with mail server"));
$this->message[] = _('Contact your administrator, there was a problem with mail server');
}
$smarty = get_smarty();
......@@ -657,7 +657,7 @@ class passwordRecovery extends standAlonePage {
$this->step = 5;
$smarty->assign('changed', TRUE);
} else {
$this->message[] = msgPool::invalid(_("There was a problem with mail server, confirmation email not sent"));
$this->message[] = _('There was a problem with mail server, confirmation email not sent');
}
}
}
......
......@@ -803,7 +803,7 @@ class config
if (isset($plInfo['plObjectType'])) {
$entry = array('CLASS' => $class,'NAME' => $plInfo['plShortName']);
if (isset($plInfo['plSubTabs'])) {
$entry['SUBTABS'] = strtoupper($plInfo['plSubTabs']).'TABS';
$entry['SUBTABS'] = strtoupper($plInfo['plSubTabs']);
}
foreach ($plInfo['plObjectType'] as $key => $value) {
if (is_numeric($key)) {
......
......@@ -1029,21 +1029,23 @@ class userinfo
if (is_array($type)) {
/* Used for recursion through subtabs */
$tabs = $type;
$prefix = '';
$tabs = $type;
} else {
/* Usual workflow */
$infos = objects::infos($type);
$prefix = $infos['aclCategory'].'/';
$tabs = $config->data['TABS'][$infos['tabGroup']];
}
foreach ($tabs as $tab) {
$acls = pluglist::pluginInfos($tab['CLASS'])['plProvidedAcls'];
if (isset($acls[$attribute])) {
return $infos['aclCategory'].'/'.$tab['CLASS'];
return $prefix.$tab['CLASS'];
}
if (isset($tab['SUBTABS'])) {
$acl = $this->getAttributeCategory($config->data['TABS'][$tab['SUBTABS']], $attribute);
if ($acl !== FALSE) {
return $acl;
return $prefix.$acl;
}
}
}
......
......@@ -102,7 +102,11 @@ class FileAttribute extends Attribute
return sprintf(_('Attribute %s is disabled, its value could not be set'), $this->getLdapName());
}
if ($this->binary) {
$this->setValue(base64_decode($value));
$data = base64_decode($value);
if ($data === FALSE) {
return sprintf(_('Invalid base64 data for attribute %s'), $this->getLdapName());
}
$this->setValue($data);
} else {
$this->setValue($value);
}
......@@ -278,6 +282,8 @@ class ImageAttribute extends FileAttribute
protected $forceSize;
protected $placeholder;
protected $imagickException;
function __construct ($label, $description, $ldapName, $required = FALSE, $width = 48, $height = 48, $format = 'png', $forceSize = FALSE, $defaultValue = "", $acl = "")
{
parent::__construct($label, $description, $ldapName, $required, $defaultValue, $acl);
......@@ -316,40 +322,55 @@ class ImageAttribute extends FileAttribute
function setValue ($value)
{
if ($value == "") {
$this->value = "";
$this->imagickException = NULL;
if ($value == '') {
$this->value = '';
return;
}
if (class_exists('Imagick')) {
$im = new Imagick();
$modify = FALSE;
$im->readImageBlob($value);
$size = $im->getImageGeometry();
if (
($size['width'] > 0 && $size['height'] > 0) &&
(
($size['width'] < $this->width && $size['height'] < $this->height) ||
($size['width'] > $this->width) ||
($size['height'] > $this->height)
)
) {
$modify = TRUE;
$im->resizeImage($this->width, $this->height, Imagick::FILTER_GAUSSIAN, 1, !$this->forceSize);
}
if ($modify || !preg_match('/^'.$this->format.'$/i', $im->getImageFormat())) {
if ($this->format == 'jpeg') {
$im->setImageCompression(Imagick::COMPRESSION_JPEG);
$im->setImageCompressionQuality(90);
try {
$im = new Imagick();
$modify = FALSE;
$im->readImageBlob($value);
$size = $im->getImageGeometry();
if (
($size['width'] > 0 && $size['height'] > 0) &&
(
($size['width'] < $this->width && $size['height'] < $this->height) ||
($size['width'] > $this->width) ||
($size['height'] > $this->height)
)
) {
$modify = TRUE;
$im->resizeImage($this->width, $this->height, Imagick::FILTER_GAUSSIAN, 1, !$this->forceSize);
}
$im->setImageFormat($this->format);
/* Save attribute */
$this->value = $im->getImageBlob();
} else {
$this->value = $value;
if ($modify || !preg_match('/^'.$this->format.'$/i', $im->getImageFormat())) {
if ($this->format == 'jpeg') {
$im->setImageCompression(Imagick::COMPRESSION_JPEG);
$im->setImageCompressionQuality(90);
}
$im->setImageFormat($this->format);
/* Save attribute */
$this->value = $im->getImageBlob();
} else {
$this->value = $value;
}
} catch (ImagickException $e) {
/* Store the exception to return it in deserializeValue() */
$this->imagickException = $e;
msg_dialog::display(
_('Error'),
sprintf(
_('Cannot set "%s" value, it contains invalid data: %s'),
($this->getLabel() != '' ? $this->getLabel() : $this->getLdapName()),
$e->getMessage()
),
ERROR_DIALOG
);
}
} else {
msg_dialog::display(
......@@ -360,6 +381,21 @@ class ImageAttribute extends FileAttribute
}
}
/*! \brief Apply value from RPC requests
*
* \param mixed $value the value
*/
function deserializeValue ($value)
{
$error = parent::deserializeValue($value);
if (!empty($error)) {
return $error;
}
if ($this->imagickException !== NULL) {
return sprintf(_('Invalid data, Imagick error: "%s"'), $this->imagickException->getMessage());
}
}
function renderFormInput ()
{
$this->setValue($this->inputValue($this->getValue()));
......
......@@ -63,7 +63,7 @@ define("FPDF_FONTPATH", "/usr/share/php/fpdf/font/"); /*! Define fpdf font path
/*!
* \brief FusionDirectory Version
*/
define ("FD_VERSION", "1.3"); /*! Define FusionDirectory version */
define ("FD_VERSION", "1.3.1"); /*! Define FusionDirectory version */
/*!
* \brief FusionDirectory config object RDN
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory VERSION\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2019-02-18 11:05+0000\n"
"POT-Creation-Date: 2019-06-27 14:00+0000\n"
"PO-Revision-Date: 2016-08-29 14:52+0000\n"
"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
"MIME-Version: 1.0\n"
......@@ -30,7 +30,8 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:33
#: include/simpleplugin/attributes/class_FileAttribute.inc:36
#: include/simpleplugin/attributes/class_FileAttribute.inc:39
#: include/simpleplugin/attributes/class_FileAttribute.inc:356
#: include/simpleplugin/attributes/class_FileAttribute.inc:366
#: include/simpleplugin/attributes/class_FileAttribute.inc:377
#: include/simpleplugin/class_simplePlugin.inc:697
#: include/simpleplugin/class_simpleTabs.inc:73
#: include/simpleplugin/class_multiPlugin.inc:78
......@@ -1372,25 +1373,40 @@ msgstr ""
msgid "Attribute %s is disabled, its value could not be set"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:161
#: include/simpleplugin/attributes/class_FileAttribute.inc:382
#: include/simpleplugin/attributes/class_FileAttribute.inc:383
#: include/simpleplugin/attributes/class_FileAttribute.inc:107
#, php-format
msgid "Invalid base64 data for attribute %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:165
#: include/simpleplugin/attributes/class_FileAttribute.inc:418
#: include/simpleplugin/attributes/class_FileAttribute.inc:419
msgid "Upload"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:167
#: include/simpleplugin/attributes/class_FileAttribute.inc:168
#: include/simpleplugin/attributes/class_FileAttribute.inc:171
#: include/simpleplugin/attributes/class_FileAttribute.inc:172
msgid "Download"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:357
#: include/simpleplugin/attributes/class_FileAttribute.inc:368
#, php-format
msgid "Cannot set \"%s\" value, it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:378
msgid ""
"Cannot save user picture, FusionDirectory requires the PHP module "
"\"imagick\" to be installed!"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:392
#: include/simpleplugin/attributes/class_FileAttribute.inc:393
#: include/simpleplugin/attributes/class_FileAttribute.inc:395
#, php-format
msgid "Invalid data, Imagick error: \"%s\""
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:428
#: include/simpleplugin/attributes/class_FileAttribute.inc:429
#: include/simpleplugin/class_dialogAttributes.inc:780
#: include/simpleplugin/class_dialogAttributes.inc:781
#: include/simpleplugin/simple-list.xml:75
......
......@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory VERSION\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2019-02-18 11:05+0000\n"
"POT-Creation-Date: 2019-06-27 14:00+0000\n"
"PO-Revision-Date: 2016-08-29 14:52+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
......@@ -34,7 +34,8 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:33
#: include/simpleplugin/attributes/class_FileAttribute.inc:36
#: include/simpleplugin/attributes/class_FileAttribute.inc:39
#: include/simpleplugin/attributes/class_FileAttribute.inc:356
#: include/simpleplugin/attributes/class_FileAttribute.inc:366
#: include/simpleplugin/attributes/class_FileAttribute.inc:377
#: include/simpleplugin/class_simplePlugin.inc:697
#: include/simpleplugin/class_simpleTabs.inc:73
#: include/simpleplugin/class_multiPlugin.inc:78
......@@ -1376,25 +1377,40 @@ msgstr ""
msgid "Attribute %s is disabled, its value could not be set"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:161
#: include/simpleplugin/attributes/class_FileAttribute.inc:382
#: include/simpleplugin/attributes/class_FileAttribute.inc:383
#: include/simpleplugin/attributes/class_FileAttribute.inc:107
#, php-format
msgid "Invalid base64 data for attribute %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:165
#: include/simpleplugin/attributes/class_FileAttribute.inc:418
#: include/simpleplugin/attributes/class_FileAttribute.inc:419
msgid "Upload"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:167
#: include/simpleplugin/attributes/class_FileAttribute.inc:168
#: include/simpleplugin/attributes/class_FileAttribute.inc:171
#: include/simpleplugin/attributes/class_FileAttribute.inc:172
msgid "Download"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:357
#: include/simpleplugin/attributes/class_FileAttribute.inc:368
#, php-format
msgid "Cannot set \"%s\" value, it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:378
msgid ""
"Cannot save user picture, FusionDirectory requires the PHP module "
"\"imagick\" to be installed!"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:392
#: include/simpleplugin/attributes/class_FileAttribute.inc:393
#: include/simpleplugin/attributes/class_FileAttribute.inc:395
#, php-format
msgid "Invalid data, Imagick error: \"%s\""
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:428
#: include/simpleplugin/attributes/class_FileAttribute.inc:429
#: include/simpleplugin/class_dialogAttributes.inc:780
#: include/simpleplugin/class_dialogAttributes.inc:781
#: include/simpleplugin/simple-list.xml:75
......
......@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory VERSION\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2019-02-18 11:05+0000\n"
"POT-Creation-Date: 2019-06-27 14:00+0000\n"
"PO-Revision-Date: 2016-08-29 14:52+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
......@@ -34,7 +34,8 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:33
#: include/simpleplugin/attributes/class_FileAttribute.inc:36
#: include/simpleplugin/attributes/class_FileAttribute.inc:39
#: include/simpleplugin/attributes/class_FileAttribute.inc:356
#: include/simpleplugin/attributes/class_FileAttribute.inc:366
#: include/simpleplugin/attributes/class_FileAttribute.inc:377
#: include/simpleplugin/class_simplePlugin.inc:697
#: include/simpleplugin/class_simpleTabs.inc:73
#: include/simpleplugin/class_multiPlugin.inc:78
......@@ -1378,25 +1379,40 @@ msgstr ""
msgid "Attribute %s is disabled, its value could not be set"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:161
#: include/simpleplugin/attributes/class_FileAttribute.inc:382
#: include/simpleplugin/attributes/class_FileAttribute.inc:383
#: include/simpleplugin/attributes/class_FileAttribute.inc:107
#, php-format
msgid "Invalid base64 data for attribute %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:165
#: include/simpleplugin/attributes/class_FileAttribute.inc:418
#: include/simpleplugin/attributes/class_FileAttribute.inc:419
msgid "Upload"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:167
#: include/simpleplugin/attributes/class_FileAttribute.inc:168
#: include/simpleplugin/attributes/class_FileAttribute.inc:171
#: include/simpleplugin/attributes/class_FileAttribute.inc:172
msgid "Download"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:357
#: include/simpleplugin/attributes/class_FileAttribute.inc:368
#, php-format
msgid "Cannot set \"%s\" value, it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:378
msgid ""
"Cannot save user picture, FusionDirectory requires the PHP module "
"\"imagick\" to be installed!"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:392
#: include/simpleplugin/attributes/class_FileAttribute.inc:393
#: include/simpleplugin/attributes/class_FileAttribute.inc:395
#, php-format
msgid "Invalid data, Imagick error: \"%s\""
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:428
#: include/simpleplugin/attributes/class_FileAttribute.inc:429
#: include/simpleplugin/class_dialogAttributes.inc:780
#: include/simpleplugin/class_dialogAttributes.inc:781
#: include/simpleplugin/simple-list.xml:75
......
......@@ -5,16 +5,16 @@
#
# Translators:
# fusiondirectory <contact@fusiondirectory.org>, 2018
# Pavel Borecki <pavel.borecki@gmail.com>, 2018
# Pavel Borecki <pavel.borecki@gmail.com>, 2019
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory VERSION\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2019-02-18 11:05+0000\n"
"POT-Creation-Date: 2019-06-27 14:00+0000\n"
"PO-Revision-Date: 2016-08-29 14:52+0000\n"
"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2019\n"
"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -35,7 +35,8 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:33
#: include/simpleplugin/attributes/class_FileAttribute.inc:36
#: include/simpleplugin/attributes/class_FileAttribute.inc:39
#: include/simpleplugin/attributes/class_FileAttribute.inc:356
#: include/simpleplugin/attributes/class_FileAttribute.inc:366
#: include/simpleplugin/attributes/class_FileAttribute.inc:377
#: include/simpleplugin/class_simplePlugin.inc:697
#: include/simpleplugin/class_simpleTabs.inc:73
#: include/simpleplugin/class_multiPlugin.inc:78
......@@ -1434,18 +1435,28 @@ msgstr "%s (%d bajtů)"
msgid "Attribute %s is disabled, its value could not be set"
msgstr "Atribut %s je vypnutý, jeho hodnotu nelze nastavit"
#: include/simpleplugin/attributes/class_FileAttribute.inc:161
#: include/simpleplugin/attributes/class_FileAttribute.inc:382
#: include/simpleplugin/attributes/class_FileAttribute.inc:383
#: include/simpleplugin/attributes/class_FileAttribute.inc:107
#, php-format
msgid "Invalid base64 data for attribute %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:165