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

Minor variables fixes (make php 7.3 happy)

Browse source
This commit is contained in:
Konstantin Shalygin 2018-12-26 16:36:24 +07:00
parent 6a8c76159a
commit e8fa4cbd42
No known key found for this signature in database
GPG key ID: DAB31F3D3E5BCB69
3 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -1,4 +1,4 @@
thunderbird-mcd # thunderbird-mcd
=====================
###### Thunderbird Mission Critical Desktop
Provides automated configuration for Thunderbird via PHP + OpenLDAP. Provides automated configuration for Thunderbird via PHP + OpenLDAP.

7
ldap.cfg.example
View file

@ -20,6 +20,7 @@ $ldap_target_gid = '1100';
$exten_prefix = ' доб. 1-'; $exten_prefix = ' доб. 1-';
$telnumber_all = '8-800-2000-600'; $telnumber_all = '8-800-2000-600';
$telnumber_manager = '8-800-2000-666'; $telnumber_manager = '8-800-2000-666';
$im_enabled = true;
$im_default = '<br>Telegram channel: @support'; $im_default = '<br>Telegram channel: @support';
$im_prefix = 'Telegram: '; $im_prefix = 'Telegram: ';
// Thunderbird // Thunderbird
@ -35,9 +36,13 @@ $quicktext_default_import = '/home/exchange/quicktext.xml';
$messenger_save_dir = '/tmp'; $messenger_save_dir = '/tmp';
//Caldav //Caldav
$caldav_enable = true; $caldav_enable = true;
$caldav_settings = "";
$caldav_base_url = 'https://calendar.example.com/remote.php/dav/calendars/'; $caldav_base_url = 'https://calendar.example.com/remote.php/dav/calendars/';
$caldav_entries = array ( $caldav_entries = array (
array (name => 'Personal', id => 'personal', color => '#3300ff', uuid => uniqid()) array ('name' => 'Personal',
'id' => 'personal',
'color' => '#3300ff',
'uuid' => uniqid())
); );
// Signature // Signature
$siga_marketing = "Marketing bullshit<br>"; $siga_marketing = "Marketing bullshit<br>";

20
thunderbird.php
View file

@ -1,6 +1,6 @@
<?php <?php
// (c) 2015-2017, Konstantin Shalygin <k0ste@k0ste.ru> // (c) 2015-2018, Konstantin Shalygin <k0ste@k0ste.ru>
require_once 'ldap.cfg.php'; require_once 'ldap.cfg.php';
require_once 'ldap.defaults.php'; require_once 'ldap.defaults.php';
@ -34,8 +34,7 @@ $info = ldap_get_entries($link, $result_uid);
if (isset($info[0]["telephonenumber"])) { if (isset($info[0]["telephonenumber"])) {
$ldap_extention = $info[0]["telephonenumber"][0]; $ldap_extention = $info[0]["telephonenumber"][0];
$ldap_extention = "$exten_prefix$ldap_extention"; $ldap_extention = "$exten_prefix$ldap_extention";
} } else {
else {
$ldap_extention = ''; $ldap_extention = '';
} }
@ -43,8 +42,7 @@ if($im_enabled == true) {
if (isset($info[0]["telexnumber"])) { if (isset($info[0]["telexnumber"])) {
$ldap_im = $info[0]["telexnumber"][0]; $ldap_im = $info[0]["telexnumber"][0];
$ldap_im = "<br>$im_prefix$ldap_im"; $ldap_im = "<br>$im_prefix$ldap_im";
} } else {
else {
$ldap_im = $im_default; $ldap_im = $im_default;
} }
} }
@ -56,8 +54,7 @@ if (isset($info[0]["pager"])) {
elseif (isset($info[0]["homephone"])) { elseif (isset($info[0]["homephone"])) {
$ldap_pager = $info[0]["homephone"][0]; $ldap_pager = $info[0]["homephone"][0];
$ldap_pager = "<br>+$ldap_pager"; $ldap_pager = "<br>+$ldap_pager";
} } else {
else {
$ldap_pager = ''; $ldap_pager = '';
} }
@ -69,18 +66,15 @@ $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_marketing, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_all, $ldap_extention, $ldap_pager, $ldap_im, $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 {
else {
$signature = getSignatureAll($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 {
$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_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_marketing, $siga_prefix, $ldap_givenname_exploded, $ldap_sn, $ldap_title, $siga_url, $telnumber_manager, $ldap_extention, $ldap_pager, $ldap_im, $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);
} }
} }