Skip to content

Commit 9fc94ec

Browse files
authored
Add files via upload
1 parent 2680a63 commit 9fc94ec

File tree

2 files changed

+41
-7
lines changed

2 files changed

+41
-7
lines changed

lkk_abk.js

+19-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ var lkk_local_groups = {};
1010
var lkk_local_addrs = [];
1111

1212
(function () {
13+
var globaladdressbook = false;
14+
1315
var lkk_groups = lkk_global_groups;
1416
var lkk_addrs = lkk_global_addrs;
1517

@@ -77,7 +79,10 @@ var lkk_local_addrs = [];
7779
}
7880

7981
function get_area_html() {
80-
var options = '<option value="global">' + rcmail.gettext('global', 'lkk_addressbook') + '</option>';
82+
var options = '';
83+
if (globaladdressbook) {
84+
options += '<option value="global">' + rcmail.gettext('global', 'lkk_addressbook') + '</option>';
85+
}
8186
options += '<option value="local">' + rcmail.gettext('local', 'lkk_addressbook') + '</option>';
8287
return '<select id="lkk_area">' + options + '</select>';
8388
}
@@ -105,6 +110,12 @@ var lkk_local_addrs = [];
105110
function lkk_init() {
106111
// console.log("lkk_init");
107112

113+
if (Object.keys(lkk_global_addrs).length == 0 && Object.keys(lkk_global_groups).length == 0) {
114+
globaladdressbook = false;
115+
} else {
116+
globaladdressbook = true;
117+
}
118+
108119
Address["to"] = $('textarea[name="_to"]').val();
109120
Address["to_array"] = Address["to"].split(/\s*,\s*/);
110121
Address["cc"] = $('textarea[name="_cc"]').val();
@@ -119,8 +130,13 @@ var lkk_local_addrs = [];
119130
return;
120131
}
121132

122-
lkk_groups = lkk_global_groups;
123-
lkk_addrs = lkk_global_addrs;
133+
if (globaladdressbook) {
134+
lkk_groups = lkk_global_groups;
135+
lkk_addrs = lkk_global_addrs;
136+
} else {
137+
lkk_groups = lkk_local_groups;
138+
lkk_addrs = lkk_local_addrs;
139+
}
124140

125141
$('body').append('<div class="lkk_addressbook">' +
126142
'<header>' +

lkk_addressbook.php

+22-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22

33
class lkk_addressbook extends rcube_plugin {
44

5+
private $globaladdressbook = false;
6+
57
function init() {
68
// echo 'lkk_addressbook init';
79

810
$rcmail = rcmail::get_instance();
11+
12+
$this->globaladdressbook = $this->globaladdressbook_exists($rcmail);
13+
914
if ($rcmail->action == 'compose') {
1015
$this->api->add_content($this->get_user_group_array(), "toolbar");
1116
$this->include_script('lkk_abk.js');
@@ -18,11 +23,24 @@ function init() {
1823
// $rcmail->output->add_footer($this->get_user_group_array());
1924
}
2025

26+
function globaladdressbook_exists($rcmail) {
27+
// use this address book for autocompletion queries
28+
if ($rcmail->config->get('globaladdressbook_autocomplete')) {
29+
$sources = $rcmail->config->get('autocomplete_addressbooks', array('sql'));
30+
if (in_array('global', $sources)) {
31+
return true;
32+
} else {
33+
return false;
34+
}
35+
}
36+
}
37+
2138
function get_user_group_array() {
2239
$ret = "<script>\n";
23-
$ret .= 'lkk_global_groups = '.json_encode($this->get_global_groups()).";\n";
24-
$ret .= 'lkk_global_addrs = '.json_encode($this->get_global_address()).";\n";
25-
//
40+
if ($this->globaladdressbook) {
41+
$ret .= 'lkk_global_groups = '.json_encode($this->get_global_groups()).";\n";
42+
$ret .= 'lkk_global_addrs = '.json_encode($this->get_global_address()).";\n";
43+
}
2644
$ret .= 'lkk_local_groups = '.json_encode($this->get_local_groups()).";\n";
2745
$ret .= 'lkk_local_addrs = '.json_encode($this->get_local_address()).";\n";
2846
$ret .= "</script>\n";
@@ -34,7 +52,7 @@ function get_user_group_array() {
3452
*/
3553
function get_global_address() {
3654
// Global AddressBook
37-
$addr=rcmail::get_instance()->get_address_book('global');
55+
$addr = rcmail::get_instance()->get_address_book('global');
3856
$addr->set_pagesize(9999);
3957
//$rt=$addr->list_records(array('name','email','contact_id'));
4058
$rt=$addr->list_records(array('name','email'));

0 commit comments

Comments
 (0)