diff --git a/ldap.cfg.example b/ldap.cfg.example
index 5c4931a..81e8f55 100644
--- a/ldap.cfg.example
+++ b/ldap.cfg.example
@@ -20,8 +20,8 @@ $ldap_target_gid = '1100';
$exten_prefix = ' доб. 1-';
$telnumber_all = '8-800-2000-600';
$telnumber_manager = '8-800-2000-666';
-$icq_default = '
ICQ (Public): 911911, 119199';
-$icq_prefix = 'ICQ: ';
+$im_default = '
Telegram channel: @support';
+$im_prefix = 'Telegram: ';
// Thunderbird
$mail_domain = 'mail.example.com';
$mail_server_type = 'imap';
diff --git a/ldap.siga.php b/ldap.siga.php
index 97ac2e7..9997e4b 100644
--- a/ldap.siga.php
+++ b/ldap.siga.php
@@ -4,7 +4,7 @@ function getSignatureAll($siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap
return $siga_prefix . $ldap_givenname_exploded . " " . $ldap_sn . ",
" . $ldap_title . $siga_url . $main_telnumber . " " . $ldap_extention . $ldap_pager . $siga_postfix;
}
-function getSignatureManager($siga_marketing, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $main_telnumber, $ldap_extention, $ldap_pager, $ldap_icq, $siga_postfix) {
- return $siga_marketing . $siga_prefix . $ldap_givenname_exploded . " " . $ldap_sn . ",
" . $ldap_title . $siga_url . $main_telnumber . " " . $ldap_extention . $ldap_pager . $ldap_icq . $siga_postfix;
+function getSignatureManager($siga_marketing, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $main_telnumber, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix) {
+ return $siga_marketing . $siga_prefix . $ldap_givenname_exploded . " " . $ldap_sn . ",
" . $ldap_title . $siga_url . $main_telnumber . " " . $ldap_extention . $ldap_pager . $ldap_im . $siga_postfix;
}
?>
diff --git a/thunderbird.php b/thunderbird.php
index e3540f7..54d4c2c 100644
--- a/thunderbird.php
+++ b/thunderbird.php
@@ -1,6 +1,6 @@
+// (c) 2015-2017, Konstantin Shalygin
require_once 'ldap.cfg.php';
require_once 'ldap.defaults.php';
@@ -39,12 +39,14 @@ else {
$ldap_extention = '';
}
-if (isset($info[0]["telexnumber"])) {
- $ldap_icq = $info[0]["telexnumber"][0];
- $ldap_icq = "
$icq_prefix$ldap_icq";
-}
-else {
- $ldap_icq = $icq_default;
+if($im_enabled == true) {
+ if (isset($info[0]["telexnumber"])) {
+ $ldap_im = $info[0]["telexnumber"][0];
+ $ldap_im = "
$im_prefix$ldap_im";
+ }
+ else {
+ $ldap_im = $im_default;
+ }
}
if (isset($info[0]["pager"])) {
@@ -66,7 +68,7 @@ $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_icq, $siga_postfix);
+ $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 {
$signature = getSignatureAll($siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $siga_postfix);
@@ -79,7 +81,7 @@ else {
$signature = getSignatureAll($siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $siga_postfix);
}
else {
- $signature = getSignatureManager($siga_marketing, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_manager, $ldap_extention, $ldap_pager, $ldap_icq, $siga_postfix);
+ $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);
}
}