diff --git a/README.md b/README.md
index 08ebbac..2791673 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-thunderbird-mcd
-=====================
+# thunderbird-mcd
+###### Thunderbird Mission Critical Desktop
Provides automated configuration for Thunderbird via PHP + OpenLDAP.
diff --git a/ldap.cfg.example b/ldap.cfg.example
index 81e8f55..71e0b98 100644
--- a/ldap.cfg.example
+++ b/ldap.cfg.example
@@ -20,6 +20,7 @@ $ldap_target_gid = '1100';
$exten_prefix = ' доб. 1-';
$telnumber_all = '8-800-2000-600';
$telnumber_manager = '8-800-2000-666';
+$im_enabled = true;
$im_default = '
Telegram channel: @support';
$im_prefix = 'Telegram: ';
// Thunderbird
@@ -35,9 +36,13 @@ $quicktext_default_import = '/home/exchange/quicktext.xml';
$messenger_save_dir = '/tmp';
//Caldav
$caldav_enable = true;
+$caldav_settings = "";
$caldav_base_url = 'https://calendar.example.com/remote.php/dav/calendars/';
$caldav_entries = array (
- array (name => 'Personal', id => 'personal', color => '#3300ff', uuid => uniqid())
+ array ('name' => 'Personal',
+ 'id' => 'personal',
+ 'color' => '#3300ff',
+ 'uuid' => uniqid())
);
// Signature
$siga_marketing = "Marketing bullshit
";
diff --git a/thunderbird.php b/thunderbird.php
index 54d4c2c..30b3e43 100644
--- a/thunderbird.php
+++ b/thunderbird.php
@@ -1,6 +1,6 @@
+// (c) 2015-2018, Konstantin Shalygin
require_once 'ldap.cfg.php';
require_once 'ldap.defaults.php';
@@ -34,8 +34,7 @@ $info = ldap_get_entries($link, $result_uid);
if (isset($info[0]["telephonenumber"])) {
$ldap_extention = $info[0]["telephonenumber"][0];
$ldap_extention = "$exten_prefix$ldap_extention";
-}
-else {
+} else {
$ldap_extention = '';
}
@@ -43,8 +42,7 @@ if($im_enabled == true) {
if (isset($info[0]["telexnumber"])) {
$ldap_im = $info[0]["telexnumber"][0];
$ldap_im = "
$im_prefix$ldap_im";
- }
- else {
+ } else {
$ldap_im = $im_default;
}
}
@@ -56,8 +54,7 @@ if (isset($info[0]["pager"])) {
elseif (isset($info[0]["homephone"])) {
$ldap_pager = $info[0]["homephone"][0];
$ldap_pager = "
+$ldap_pager";
-}
-else {
+} else {
$ldap_pager = '';
}
@@ -69,18 +66,15 @@ $entry_manager = ldap_first_entry($link, $result_manager);
if($entry_manager == false) {
if($ldap_gid == $ldap_target_gid) {
$signature = getSignatureManager($siga_marketing, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix);
-}
- else {
+} else {
$signature = getSignatureAll($siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $siga_postfix);
}
-}
-else {
+} else {
$ldap_attributes = ldap_get_attributes($link, $entry_manager);
$counter = $ldap_attributes["count"];
if($counter < 1) {
$signature = getSignatureAll($siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $siga_postfix);
- }
- else {
+ } else {
$signature = getSignatureManager($siga_marketing, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_manager, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix);
}
}