Skip to content
GitLab
Commit 80be6dac authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Merge branch '1.0.19-fixes'

parents 71c831dd aca451c6
Hide whitespace changes
Inline Side-by-side
applications/locale/id/fusiondirectory.po
View file @ 80be6dac
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-01-22 15:31+0000\n"
"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
"Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
......
applications/locale/it_IT/fusiondirectory.po
View file @ 80be6dac
......@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Paola Penati <penati@avaya.com>, 2015
# Paola Penati <penati@avaya.com>, 2015
# Paola Penati <paola.penati@opensides.be>, 2015
# Paola Penati <paola.penati@opensides.be>, 2015
# Paola Penati <paola.penati@opensides.be>, 2015
msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-09-02 15:23+0000\n"
"Last-Translator: Paola Penati <penati@avaya.com>\n"
"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......
applications/locale/lv/fusiondirectory.po
View file @ 80be6dac
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-01-22 16:06+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
......
applications/locale/nb/fusiondirectory.po
View file @ 80be6dac
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-01-22 16:06+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
......
applications/locale/nl/fusiondirectory.po
View file @ 80be6dac
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-01-22 16:06+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
......
applications/locale/pl/fusiondirectory.po
View file @ 80be6dac
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-01-22 16:06+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
......@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
#: config/applications/class_applicationsPluginConfig.inc:28
#: config/applications/class_applicationsPluginConfig.inc:40
......
applications/locale/pt/fusiondirectory.po
View file @ 80be6dac
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-01-22 16:05+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
......
applications/locale/pt_BR/fusiondirectory.po
View file @ 80be6dac
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-01-22 16:04+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
......
applications/locale/ru/fusiondirectory.po
View file @ 80be6dac
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-09-08 09:58+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
......
applications/locale/ru@petr1708/fusiondirectory.po
View file @ 80be6dac
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-01-22 15:31+0000\n"
"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
"Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
......
applications/locale/sv/fusiondirectory.po
View file @ 80be6dac
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-01-22 16:06+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
......
applications/locale/ug/fusiondirectory.po
View file @ 80be6dac
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-01-22 15:31+0000\n"
"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
"Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
......
applications/locale/vi_VN/fusiondirectory.po
View file @ 80be6dac
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-01-22 16:05+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
......
applications/locale/zh/fusiondirectory.po
View file @ 80be6dac
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"POT-Creation-Date: 2017-03-30 18:10+0200\n"
"PO-Revision-Date: 2016-01-22 16:05+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
......
argonaut/addons/argonaut/class_argonautEventTypes.inc
View file @ 80be6dac
......@@ -100,3 +100,16 @@ class argonautEventDeployment extends argonautEventTypes
);
}
}
class argonautEventLdap2zone extends argonautEventTypes
{
static public function get_event_types_list()
{
return array(
'Ldap2Zone.slaves' => array(
'name' => _('Refresh slave files (ldap2zone)'),
'img' => 'geticon.php?context=actions&icon=view-refresh&size=16'
)
);
}
}
argonaut/addons/argonaut/import_events.tpl
View file @ 80be6dac
......@@ -3,7 +3,7 @@
{$section}
</span>
<div>
{if $attributes.events|@count == 0}
{if $attributes.events|@count < 1}
<p>
{t}You can import a list of jobs into the FusionDirectory job queue. This should be a semicolon seperated list of items in the following format:{/t}<br/><br/>
<i>{t}timestamp{/t};{t}MAC-address{/t};{t}job type{/t};[{t}object group{/t}]</i><br/><br/>
......
argonaut/admin/systems/services/argonaut/class_argonautDNSConfig.inc
View file @ 80be6dac
......@@ -42,45 +42,19 @@ class argonautDNSConfig extends simpleService
static function getAttributesInfo ()
{
return array (
'section1' => array (
'name' => _('Argonaut Ldap2zone settings:'),
'main' => array (
'name' => _('Ldap2zone global settings'),
'attrs' => array (
new StringAttribute (
_('Bind directory'),
_('The directory in which conf file must be created'),
'argonautLdap2zoneBindDir',
TRUE,
_('Bind directory'), _('The directory in which conf file must be created'),
'argonautLdap2zoneBindDir', TRUE,
'/etc/bind'
),
new StringAttribute (
_('Bind cache directory'),
_('The directory in which zone files must be created'),
'argonautLdap2zoneBindCacheDir',
TRUE,
_('Bind cache directory'), _('The directory in which zone files must be created'),
'argonautLdap2zoneBindCacheDir', TRUE,
'/var/cache/bind'
),
new BooleanAttribute (
_('Ignore reverse zone'), _('Do not write reverse zone'),
'argonautLdap2zoneNoReverse', FALSE
),
new BooleanAttribute (
_('Allow notify'),
'',
'argonautLdap2zoneAllowNotify',
FALSE
),
new StringAttribute (
_('Allow update (semicolon separated and ended)'),
'',
'argonautLdap2zoneAllowUpdate',
FALSE
),
new StringAttribute (
_('Allow transfer (semicolon separated and ended)'),
'',
'argonautLdap2zoneAllowTransfer',
FALSE
),
new IntAttribute (
_('TTL'),
_('Time to live'),
......@@ -96,6 +70,69 @@ class argonautDNSConfig extends simpleService
'argonautLdap2zoneRndc',
FALSE,
'/usr/sbin/rndc'
),
new StringAttribute (
_('Search base'), _('LDAP base in which ldap2zone should search. Only usefull if you got several nodes for the same zone.'),
'argonautLdap2zoneSearchBase', FALSE
),
)
),
'master' => array (
'name' => _('Ldap2zone master settings'),
'attrs' => array (
new BooleanAttribute (
_('Ignore reverse zone'), _('Do not write reverse zone'),
'argonautLdap2zoneNoReverse', FALSE
),
new BooleanAttribute (
_('Allow notify'), '',
'argonautLdap2zoneAllowNotify', FALSE
),
new StringAttribute (
_('Allow update'), _('Allow update (semicolon separated and ended)'),
'argonautLdap2zoneAllowUpdate', FALSE
),
new StringAttribute (
_('Allow transfer'), _('Allow transfer (semicolon separated and ended)'),
'argonautLdap2zoneAllowTransfer', FALSE
),
new SelectAttribute (
_('Check names'), _('Cause any host name for the zone to be checked for compliance with RFC 952 and RFC 1123 and take the defined action'),
'argonautLdap2zoneCheckNames', FALSE,
array('','warn','fail','ignore'), ''
),
)
),
'slave' => array (
'name' => _('Ldap2zone slave settings'),
'class' => array('fullwidth'),
'attrs' => array (
new OrderedArrayAttribute(
new PipeSeparatedCompositeAttribute(
_('Manage DNS Slaves'),
'argonautLdap2zoneSlaveZones',
array(
new StringAttribute(
_('zone'), _('DNS zone(s) to be stored as a slave on this server'),
'Ldap2zoneSlaveZone', TRUE
),
new StringAttribute(
_('master'), _('Master IP(s) for this zone'),
'Ldap2zoneSlaveMaster', TRUE
),
new BooleanAttribute(
_('reverses'), _('This server should be slave of reverses zones as well'),
'Ldap2zoneSlaveReverses', TRUE,
TRUE, '',
'reverse', 'noreverse'
)
),
'',
_('DNS slaves')
),
FALSE,
array(),
TRUE
)
)
)
......
argonaut/contrib/openldap/argonaut-fd.schema
View file @ 80be6dac
......@@ -245,6 +245,25 @@ attributetype ( 1.3.6.1.4.1.38414.2.13.8 NAME 'argonautLdap2zoneNoReverse'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.2.13.9 NAME 'argonautLdap2zoneCheckNames'
DESC 'Fusion Directory - Argonaut, check-names directive ( fail | warn | ignore ).'
EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.2.13.10 NAME 'argonautLdap2zoneSearchBase'
DESC 'FusionDirectory - dn of LDAP base to use for search'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.2.13.11 NAME 'argonautLdap2zoneSlaveZones'
DESC 'FusionDirectory - Zones names and associated masters'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( 1.3.6.1.4.1.38414.2.14.1 NAME 'argonautFuseDefaultMode'
DESC 'Fusion Directory - Argonaut, fuse default mode.'
EQUALITY caseExactIA5Match
......@@ -367,7 +386,9 @@ objectclass ( 1.3.6.1.4.1.38414.2.2.4 NAME 'argonautDNSConfig'
MUST (
argonautLdap2zoneBindDir $ argonautLdap2zoneBindCacheDir $ argonautLdap2zoneAllowNotify $
argonautLdap2zoneTTL $ argonautLdap2zoneRndc )
MAY ( argonautLdap2zoneAllowUpdate $ argonautLdap2zoneAllowTransfer $ argonautLdap2zoneNoReverse ) )
MAY ( argonautLdap2zoneAllowUpdate $ argonautLdap2zoneAllowTransfer $
argonautLdap2zoneNoReverse $ argonautLdap2zoneCheckNames $ argonautLdap2zoneSearchBase $
argonautLdap2zoneSlaveZones ) )
objectclass ( 1.3.6.1.4.1.38414.2.2.5 NAME 'argonautFuseConfig'
DESC 'An argonaut config for fuse'
......
argonaut/include/class_supportDaemon.inc
View file @ 80be6dac
......@@ -143,7 +143,7 @@ class supportDaemon
return $this->new_state(FALSE);
}
} catch (Exception $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
return $this->new_state(FALSE);
}
}
......@@ -222,12 +222,12 @@ class supportDaemon
$this->new_state(TRUE);
return $status[0];
} catch (jsonRPCClient_RequestErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
/* connection is OK */
$this->new_state(TRUE);
return FALSE;
} catch (jsonRPCClient_NetworkErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
return $this->new_state(FALSE);
}
}
......@@ -278,11 +278,11 @@ class supportDaemon
$ret = $str;
} else {
foreach ($str as $msg) {
$ret .= $msg." ";
$ret .= $msg."\n";
}
}
$ret = str_replace(" ", "&nbsp;", $ret);
return $ret;
return nl2br($ret);
}
/*!
......@@ -344,7 +344,7 @@ class supportDaemon
$client = new jsonRPCClient($this->s_host, $this->http_options, $this->ssl_options);
$entries = $client->get_entries();
} catch (Exception $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
return $this->new_state(FALSE);
}
$entries = $this->format_entries($entries);
......@@ -392,12 +392,12 @@ class supportDaemon
$this->reset_error();
return $this->new_state(TRUE);
} catch (jsonRPCClient_RequestErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
/* connection is OK */
$this->new_state(TRUE);
return FALSE;
} catch (jsonRPCClient_NetworkErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
return $this->new_state(FALSE);
}
}
......@@ -453,12 +453,12 @@ class supportDaemon
$this->reset_error();
return $this->new_state(TRUE);
} catch (jsonRPCClient_RequestErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
/* connection is OK */
$this->new_state(TRUE);
return FALSE;
} catch (jsonRPCClient_NetworkErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
return $this->new_state(FALSE);
}
}
......@@ -528,12 +528,12 @@ class supportDaemon
$this->new_state(TRUE);
return $entries;
} catch (jsonRPCClient_RequestErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
/* connection is OK */
$this->new_state(TRUE);
return FALSE;
} catch (jsonRPCClient_NetworkErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
return $this->new_state(FALSE);
}
}
......@@ -630,12 +630,12 @@ class supportDaemon
$this->new_state(TRUE);
return $client->ping($mac);
} catch (jsonRPCClient_RequestErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
/* connection is OK */
$this->new_state(TRUE);
return FALSE;
} catch (jsonRPCClient_NetworkErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
return $this->new_state(FALSE);
}
}
......@@ -703,12 +703,12 @@ class supportDaemon
$this->new_state(TRUE);
return $to_return;
} catch (jsonRPCClient_RequestErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
/* connection is OK */
$this->new_state(TRUE);
return array();
} catch (jsonRPCClient_NetworkErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
$this->new_state(FALSE);
return array();
}
......@@ -768,12 +768,12 @@ class supportDaemon
$client->remove_entries($taskids);
return $this->new_state(TRUE);
} catch (jsonRPCClient_RequestErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
/* connection is OK */
$this->new_state(TRUE);
return FALSE;
} catch (jsonRPCClient_NetworkErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
$this->set_error($e->getMessage());
return $this->new_state(FALSE);
}
}
......
argonaut/include/jsonRPCClient.php
View file @ 80be6dac
......@@ -181,7 +181,8 @@ class jsonRPCClient {
);
$context = stream_context_create($opts);
if ($fp = @fopen($this->url, 'r', false, $context)) {
$fp = fopenWithErrorHandling($this->url, 'r', false, $context);
if (!is_array($fp)) {
$response = '';
while($row = fgets($fp)) {
$response.= trim($row)."\n";
......@@ -189,7 +190,12 @@ class jsonRPCClient {
$this->debug && $debug.='***** Server response *****'."\n".$response.'***** End of server response *****'."\n";
$response = json_decode($response,true);
} else {
throw new jsonRPCClient_NetworkErrorException('Unable to connect to '.$this->url);
if (!empty($fp)) {
$errormsg = implode("\n", $fp);
} else {
$errormsg = 'Unable to connect to '.$this->url;
}
throw new jsonRPCClient_NetworkErrorException($errormsg);
}
// debug output
......
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