Commit cac96e26 authored by bmortier's avatar bmortier

Merge branch '1.0.9.1-fixes'

parents 991510a0 60e08b6f

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

...@@ -177,11 +177,6 @@ file_filter = repository/locale/<lang>/fusiondirectory.po ...@@ -177,11 +177,6 @@ file_filter = repository/locale/<lang>/fusiondirectory.po
source_file = repository/locale/en/fusiondirectory.po source_file = repository/locale/en/fusiondirectory.po
source_lang = en source_lang = en
[FusionDirectory-109.rsyslog]
file_filter = rsyslog/locale/<lang>/fusiondirectory.po
source_file = rsyslog/locale/en/fusiondirectory.po
source_lang = en
[FusionDirectory-109.samba] [FusionDirectory-109.samba]
file_filter = samba/locale/<lang>/fusiondirectory.po file_filter = samba/locale/<lang>/fusiondirectory.po
source_file = samba/locale/en/fusiondirectory.po source_file = samba/locale/en/fusiondirectory.po
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
This code is part of FusionDirectory (http://www.fusiondirectory.org/) This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier Copyright (C) 2003 Cajus Pollmeier
Copyright (C) 2011-2015 FusionDirectory Copyright (C) 2011-2016 FusionDirectory
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -79,12 +79,6 @@ class addressbook extends plugin ...@@ -79,12 +79,6 @@ class addressbook extends plugin
$this->base = $this->config->current['BASE']; $this->base = $this->config->current['BASE'];
/* Check if there is a special ldap-sub-tree specified, instead of dc=addressbook, */
$aoc = $this->config->search("addressbook", "addressbookBaseDN",array('menu'));
if ($aoc != "") {
$this->abobjectclass = $aoc;
}
/* Get global filter config */ /* Get global filter config */
if (!session::is_set("phonefilter")) { if (!session::is_set("phonefilter")) {
$ui = get_userinfo(); $ui = get_userinfo();
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
This code is part of FusionDirectory (http://www.fusiondirectory.org/) This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier Copyright (C) 2003 Cajus Pollmeier
Copyright (C) 2011-2015 FusionDirectory Copyright (C) 2011-2016 FusionDirectory
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
This code is part of FusionDirectory (http://www.fusiondirectory.org/) This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2008 GONICUS GmbH Copyright (C) 2003-2008 GONICUS GmbH
Copyright (C) 2011 FusionDirectory Copyright (C) 2011-2016 FusionDirectory
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
......
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: FusionDirectory-109\n" "Project-Id-Version: FusionDirectory-109\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n" "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2015-09-11 22:18+0200\n" "POT-Creation-Date: 2016-01-02 22:39+0100\n"
"PO-Revision-Date: 2015-05-30 14:12+0000\n" "PO-Revision-Date: 2015-05-30 14:12+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n" "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/ar/)\n" "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/ar/)\n"
...@@ -17,102 +17,102 @@ msgstr "" ...@@ -17,102 +17,102 @@ msgstr ""
"Language: ar\n" "Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: addons/addressbook/class_addressbook.inc:195 #: addons/addressbook/class_addressbook.inc:189
#, php-format #, php-format
msgid "Dial from %s to %s now?" msgid "Dial from %s to %s now?"
msgstr "" msgstr ""
#: addons/addressbook/class_addressbook.inc:198 #: addons/addressbook/class_addressbook.inc:192
msgid "Error" msgid "Error"
msgstr "خطأ" msgstr "خطأ"
#: addons/addressbook/class_addressbook.inc:198 #: addons/addressbook/class_addressbook.inc:192
msgid "" msgid ""
"You need to set your personal phone number in order to perform direct dials." "You need to set your personal phone number in order to perform direct dials."
msgstr "" msgstr ""
#: addons/addressbook/class_addressbook.inc:227 #: addons/addressbook/class_addressbook.inc:221
#: addons/addressbook/class_addressbook.inc:797 #: addons/addressbook/class_addressbook.inc:791
msgid "LDAP error" msgid "LDAP error"
msgstr "" msgstr ""
#: addons/addressbook/class_addressbook.inc:235 #: addons/addressbook/class_addressbook.inc:229
#: addons/addressbook/class_addressbook.inc:343 #: addons/addressbook/class_addressbook.inc:337
msgid "Permission" msgid "Permission"
msgstr "" msgstr ""
#: addons/addressbook/class_addressbook.inc:465 #: addons/addressbook/class_addressbook.inc:459
#: addons/addressbook/class_addressbook.inc:472 #: addons/addressbook/class_addressbook.inc:466
#: addons/addressbook/class_addressbook.inc:476 #: addons/addressbook/class_addressbook.inc:470
#: addons/addressbook/class_addressbook.inc:597 #: addons/addressbook/class_addressbook.inc:591
#: addons/addressbook/dial.tpl.c:5 #: addons/addressbook/dial.tpl.c:5
msgid "Dial" msgid "Dial"
msgstr "" msgstr ""
#: addons/addressbook/class_addressbook.inc:482 #: addons/addressbook/class_addressbook.inc:476
#, php-format #, php-format
msgid "Save contact for %s as vcard" msgid "Save contact for %s as vcard"
msgstr "" msgstr ""
#: addons/addressbook/class_addressbook.inc:488 #: addons/addressbook/class_addressbook.inc:482
#, php-format #, php-format
msgid "Send mail to %s" msgid "Send mail to %s"
msgstr "" msgstr ""
#: addons/addressbook/class_addressbook.inc:611 #: addons/addressbook/class_addressbook.inc:605
msgid "global addressbook" msgid "global addressbook"
msgstr "" msgstr ""
#: addons/addressbook/class_addressbook.inc:614 #: addons/addressbook/class_addressbook.inc:608
msgid "user database" msgid "user database"
msgstr "" msgstr ""
#: addons/addressbook/class_addressbook.inc:618 #: addons/addressbook/class_addressbook.inc:612
#, php-format #, php-format
msgid "Contact stored in '%s'" msgid "Contact stored in '%s'"
msgstr "" msgstr ""
#: addons/addressbook/class_addressbook.inc:620 #: addons/addressbook/class_addressbook.inc:614
msgid "Creating new entry in" msgid "Creating new entry in"
msgstr "" msgstr ""
#: addons/addressbook/class_addressbook.inc:657 #: addons/addressbook/class_addressbook.inc:651
msgid "All" msgid "All"
msgstr "الكل" msgstr "الكل"
#: addons/addressbook/class_addressbook.inc:657 #: addons/addressbook/class_addressbook.inc:651
#: addons/addressbook/class_addressbook.inc:696 #: addons/addressbook/class_addressbook.inc:690
#: addons/addressbook/class_addressbook.inc:706 #: addons/addressbook/class_addressbook.inc:700
#: addons/addressbook/class_addressbook.inc:733 #: addons/addressbook/class_addressbook.inc:727
#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2 #: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
msgid "Name" msgid "Name"
msgstr "الإسم" msgstr "الإسم"
#: addons/addressbook/class_addressbook.inc:657 #: addons/addressbook/class_addressbook.inc:651
#: addons/addressbook/class_addressbook.inc:700 #: addons/addressbook/class_addressbook.inc:694
#: addons/addressbook/class_addressbook.inc:709 #: addons/addressbook/class_addressbook.inc:703
#: addons/addressbook/class_addressbook.inc:730 #: addons/addressbook/class_addressbook.inc:724
#: addons/addressbook/class_addressbook.inc:858 #: addons/addressbook/class_addressbook.inc:852
msgid "Given name" msgid "Given name"
msgstr "" msgstr ""
#: addons/addressbook/class_addressbook.inc:658 #: addons/addressbook/class_addressbook.inc:652
msgid "Work phone" msgid "Work phone"
msgstr "هاتف العمل" msgstr "هاتف العمل"
#: addons/addressbook/class_addressbook.inc:658 #: addons/addressbook/class_addressbook.inc:652
msgid "Cell phone" msgid "Cell phone"
msgstr "الهاتف المحمول" msgstr "الهاتف المحمول"
#: addons/addressbook/class_addressbook.inc:65