diff --git a/ldap.cfg.php b/ldap.cfg.example
similarity index 74%
rename from ldap.cfg.php
rename to ldap.cfg.example
index 52d2579..8cc4c6c 100644
--- a/ldap.cfg.php
+++ b/ldap.cfg.example
@@ -1,12 +1,12 @@
ICQ (Public): 911911, 119199';
+$icq_prefix = 'ICQ: ';
// Thunderbird
-$mail_domain = 'mx.company.local';
+$mail_domain = 'mail.example.com';
$mail_server_type = 'imap';
$mail_server_port = '143';
$mail_smtp_desc = 'SMTP server of our company';
$mail_smtp_port = '25';
-$mail_identity_org = 'Damage, Inc.';
+$mail_identity_org = 'Example, Inc.';
$ldap_nonascii_desc = 'Domain';
$ldap_nonascii_uri = "ldap://$ldap_host/$ldap_base??sub?(objectClass=posixAccount)";
$quicktext_default_import = '/home/exchange/quicktext.xml';
@@ -35,5 +37,5 @@ $messenger_save_dir = '/tmp';
$siga_marketing = "Marketing bullshit
";
$siga_prefix = "Best regards, ";
$siga_url = "
URL";
-$siga_postfix = "Some spam";
+$siga_postfix = "
Some spam";
?>
diff --git a/ldap.siga.php b/ldap.siga.php
index 4ae4b5d..97ac2e7 100644
--- a/ldap.siga.php
+++ b/ldap.siga.php
@@ -1,7 +1,7 @@
" . $ldap_title . $siga_url . $main_telnumber . $ldap_extention . $siga_postfix;
+function getSignatureAll($siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $main_telnumber, $ldap_extention, $ldap_pager, $siga_postfix) {
+ 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) {
diff --git a/thunderbird.php b/thunderbird.php
index 8f7b4f7..cad396d 100644
--- a/thunderbird.php
+++ b/thunderbird.php
@@ -30,28 +30,32 @@ if($entry_uid == false) {
$info = ldap_get_entries($link, $result_uid);
-if (isset($info[0]["telephonenumber"]) == false) {
+if (isset($info[0]["telephonenumber"])) {
+ $ldap_extention = $info[0]["telephonenumber"][0];
+ $ldap_extention = "$exten_prefix$ldap_extention";
+}
+else {
$ldap_extention = '';
}
-else {
- $ldap_extention = ($info[0]["telephonenumber"][0]);
- $ldap_extention = " exten. 1-$ldap_extention
";
-}
-if (isset($info[0]["telexnumber"]) == false) {
+if (isset($info[0]["telexnumber"])) {
+ $ldap_icq = $info[0]["telexnumber"][0];
+ $ldap_icq = "
$icq_prefix$ldap_icq";
+}
+else {
$ldap_icq = $icq_default;
}
-else {
- $ldap_icq = ($info[0]["telexnumber"][0]);
- $ldap_icq = "ICQ: $ldap_icq";
-}
-if (isset($info[0]["pager"]) == false) {
- $ldap_pager = '';
+if (isset($info[0]["pager"])) {
+ $ldap_pager = $info[0]["pager"][0];
+ $ldap_pager = "
+$ldap_pager";
+}
+elseif (isset($info[0]["homephone"])) {
+ $ldap_pager = $info[0]["homephone"][0];
+ $ldap_pager = "
+$ldap_pager";
}
else {
- $ldap_pager = ($info[0]["pager"][0]);
- $ldap_pager = "+$ldap_pager
";
+ $ldap_pager = '';
}
require_once 'ldap.vars.php';
@@ -64,14 +68,14 @@ if($entry_manager == false) {
$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);
}
else {
- $signature = getSignatureAll($siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $siga_postfix);
+ $signature = getSignatureAll($siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $siga_postfix);
}
-}
+}
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, $siga_postfix);
+ $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);