cabele/thunderbird-mcd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4 from kpdwrk/h6262-add-check-field

Browse source 
HELPDESK-6262 add check field facsimiletelephonenumber
This commit is contained in:
kpdwrk 2023-06-06 18:05:08 +07:00 • committed by GitHub
commit b882c33530
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ldap.siga.php
View file

@ -1,10 +1,10 @@
<?php <?php
function getSignatureAll($siga_start_html, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $main_telnumber, $ldap_extention, $ldap_pager, $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_start_html . $siga_prefix . $ldap_givenname_exploded . " " . $ldap_sn . ",<br>" . $ldap_title . $siga_url . $main_telnumber . " " . $ldap_extention . $ldap_pager . $siga_postfix; return $siga_prefix . $ldap_givenname_exploded . " " . $ldap_sn . ",<br>" . $ldap_title . $siga_url . $main_telnumber . " " . $ldap_extention . $ldap_pager . $siga_postfix;
} }
function getSignatureManager($siga_start_html, $siga_marketing_start, $ldap_facs_to_webaskio, $siga_marketing_end, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $ldap_support_mail, $siga_url, $main_telnumber, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix) { function getSignatureManager($siga_marketing_start, $ldap_facs_to_webaskio, $siga_marketing_end, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $ldap_support_mail, $siga_url, $main_telnumber, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix, $siga_postfix_end_with_marketing) {
return $siga_start_html . $siga_marketing_start . $ldap_facs_to_webaskio . $siga_marketing_end . $siga_prefix . $ldap_givenname_exploded . " " . $ldap_sn . ",<br>" . $ldap_title . $ldap_support_mail . $siga_url . $main_telnumber . " " . $ldap_extention . $ldap_pager . $ldap_im . $siga_postfix; return $siga_marketing_start . $ldap_facs_to_webaskio . $siga_marketing_end . $siga_prefix . $ldap_givenname_exploded . " " . $ldap_sn . ",<br>" . $ldap_title . $ldap_support_mail . $siga_url . $main_telnumber . " " . $ldap_extention . $ldap_pager . $ldap_im . $siga_postfix . $siga_postfix_end_with_marketing;
} }
?> ?>

16
thunderbird.php
View file

@ -85,17 +85,25 @@ $entry_manager = ldap_first_entry($link, $result_manager);
if($entry_manager == false) { if($entry_manager == false) {
if($ldap_gid == $ldap_target_gid) { if($ldap_gid == $ldap_target_gid) {
$signature = getSignatureManager($siga_start_html, $siga_marketing_start, $ldap_facs_to_webaskio, $siga_marketing_end, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $ldap_support_mail, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix); if (isset($info[0]["facsimiletelephonenumber"][0])) {
$signature = getSignatureManager($siga_marketing_start, $ldap_facs_to_webaskio, $siga_marketing_end, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $ldap_support_mail, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix, $siga_postfix_end_with_marketing);
} else { } else {
$signature = getSignatureAll($siga_start_html, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $siga_postfix); $signature = getSignatureManager("", "", "", $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $ldap_support_mail, $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);
} }
} else { } else {
$ldap_attributes = ldap_get_attributes($link, $entry_manager); $ldap_attributes = ldap_get_attributes($link, $entry_manager);
$counter = $ldap_attributes["count"]; $counter = $ldap_attributes["count"];
if($counter < 1) { if($counter < 1) {
$signature = getSignatureAll($siga_start_html, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $siga_postfix); $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_start_html, $siga_marketing_start, $ldap_facs_to_webaskio, $siga_marketing_end, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, "", $siga_url, $telnumber_manager, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix); if (isset($info[0]["facsimiletelephonenumber"][0])) {
$signature = getSignatureManager($siga_marketing_start, $ldap_facs_to_webaskio, $siga_marketing_end, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, "", $siga_url, $telnumber_manager, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix, $siga_postfix_end_with_marketing);
} else {
$signature = getSignatureManager("", "", "", $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, "", $siga_url, $telnumber_manager, $ldap_extention, $ldap_pager, $ldap_im, $siga_postfix, "");
}
} }
} }