Overview

Request 2623 (accepted)

Check in 3.2.15

Submit package Kolab:Winterfell / kolab-webadmin to package Kolab:16 / kolab-webadmin

kolab-webadmin.spec Changed
x
 
1
@@ -34,7 +34,7 @@
2
 %global kolabr_group_id 414
3
 
4
 Name:           kolab-webadmin
5
-Version:        3.2.14
6
+Version:        3.2.15
7
 Release:        1%{?dist}
8
 Summary:        Kolab Groupware Server Web Administration Interface
9
 License:        AGPLv3+
10
@@ -163,6 +163,9 @@
11
 %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
12
 
13
 %changelog
14
+* Mon Oct 21 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.2.15-1
15
+- Release 3.2.15
16
+
17
 * Tue Jul  2 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.2.14-1
18
 - Release 3.2.14
19
 
20
debian.changelog Changed
11
 
1
@@ -1,3 +1,9 @@
2
+kolab-webadmin (3.2.15-0~kolab1) unstable; urgency=low
3
+
4
+  * Release 3.2.15
5
+
6
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 21 Oct 2019 22:08:00 +0100
7
+
8
 kolab-webadmin (3.2.14-0~kolab2) unstable; urgency=low
9
 
10
   * Release 3.2.14
11
kolab-webadmin-3.2.14.tar.gz/lib/Auth/LDAP.php -> kolab-webadmin-3.2.15.tar.gz/lib/Auth/LDAP.php Changed
21
 
1
@@ -1339,8 +1339,8 @@
2
         }
3
 
4
         $rights = array(
5
-            'entryLevelRights' => $standard_rights,
6
-            'attributeLevelRights' => array(),
7
+            'entrylevelrights' => $standard_rights,
8
+            'attributelevelrights' => array(),
9
         );
10
 
11
         $subject = $this->search($subject_dn);
12
@@ -1354,7 +1354,7 @@
13
         $attributes = array_merge((array)$attributes['may'], (array)$attributes['must']);
14
 
15
         foreach ($attributes as $attribute) {
16
-            $rights['attributeLevelRights'][$attribute] = $standard_rights;
17
+            $rights['attributelevelrights'][$attribute] = $standard_rights;
18
         }
19
 
20
         return $rights;
21
kolab-webadmin-3.2.14.tar.gz/lib/api/kolab_api_service_domain.php -> kolab-webadmin-3.2.15.tar.gz/lib/api/kolab_api_service_domain.php Changed
208
 
1
@@ -50,19 +50,19 @@
2
         $effective_rights = $auth->list_rights($domain_base_dn);
3
         $rights           = array();
4
 
5
-        if (in_array('add', $effective_rights['entryLevelRights'])) {
6
+        if (in_array('add', $effective_rights['entrylevelrights'])) {
7
             $rights['add'] = "w";
8
         }
9
 
10
-        if (in_array('delete', $effective_rights['entryLevelRights'])) {
11
+        if (in_array('delete', $effective_rights['entrylevelrights'])) {
12
             $rights['delete'] = "w";
13
         }
14
 
15
-        if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
16
+        if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
17
             $rights['edit'] = "w";
18
         }
19
 
20
-        if (in_array('read', $effective_rights['entryLevelRights'])) {
21
+        if (in_array('read', $effective_rights['entrylevelrights'])) {
22
             $rights['find'] = "r";
23
             $rights['info'] = "r";
24
         }
25
@@ -95,6 +95,8 @@
26
         $attributes[$dna] = (array) $attributes[$dna];
27
         $domain           = array_shift($attributes[$dna]);
28
 
29
+        $this->_mod_domain_attrs($domain, $attributes);
30
+
31
         $result = $auth->domain_add($domain, $attributes);
32
 
33
         if ($result) {
34
@@ -102,6 +104,9 @@
35
                 $attributes['id'] = $id;
36
             }
37
 
38
+
39
+            $this->_after_domain_created($attributes, $domain);
40
+
41
             return $attributes;
42
         }
43
 
44
@@ -167,8 +172,11 @@
45
             }
46
         }
47
 
48
-        $attributes = $this->parse_input_attributes('domain', $postdata);
49
-        $result     = $auth->domain_edit($postdata['id'], $attributes, $postdata['type_id']);
50
+        $attributes = $this->parse_input_attributes('domain', $postdata, $postdata['type_id']);
51
+
52
+        $this->_mod_domain_attrs(null, $attributes);
53
+
54
+        $result = $auth->domain_edit($postdata['id'], $attributes, $postdata['type_id']);
55
 
56
         if ($result) {
57
             return $result;
58
@@ -266,4 +274,149 @@
59
 
60
         return false;
61
     }
62
+
63
+    /**
64
+     * Modify hosted domain attributes
65
+     */
66
+    protected function _mod_domain_attrs($domain, &$attributes)
67
+    {
68
+        // Generate attributes (aci, inetdomainbasedn) for hosted domains
69
+        $conf = Conf::get_instance();
70
+        if ($conf->get('kolab_wap', 'hosted_root_dn')) {
71
+
72
+            $domain_name_attribute = $conf->get('ldap', 'domain_name_attribute');
73
+            $hosted_root_dn        = $conf->get('kolab_wap', 'hosted_root_dn');
74
+            $mgmt_root_dn          = $conf->get('kolab_wap', 'mgmt_root_dn');
75
+
76
+            if (empty($mgmt_root_dn)) {
77
+                $mgmt_root_dn = $conf->get('root_dn');
78
+            }
79
+
80
+            if (empty($domain_name_attribute)) {
81
+                $domain_name_attribute = 'associateddomain';
82
+            }
83
+
84
+            if (!is_array($attributes[$domain_name_attribute])) {
85
+                $attributes[$domain_name_attribute] = (array) $attributes[$domain_name_attribute];
86
+            }
87
+
88
+            if (empty($domain)) {
89
+                $domain = $attributes[$domain_name_attribute][0];
90
+            }
91
+
92
+            if (!in_array($domain, $attributes[$domain_name_attribute])) {
93
+                array_unshift($attributes[$domain_name_attribute], $domain);
94
+            }
95
+
96
+            $domain_root_dn = 'ou=' . $domain . ',' . $hosted_root_dn;
97
+
98
+            $aci  = array(
99
+                '(targetattr = "*")'
100
+                . '(version 3.0; acl "Deny Unauthorized"; deny (all)'
101
+                . '(userdn != "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . ' || '
102
+                . 'ldap:///ou=People,' . $domain_root_dn . '??sub?(objectclass=inetorgperson)") AND NOT '
103
+                . 'roledn = "ldap:///cn=kolab-admin,' . $mgmt_root_dn . '";)',
104
+
105
+                '(targetattr != "userPassword")'
106
+                . '(version 3.0;acl "Search Access";allow (read,compare,search)'
107
+                . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . ' || '
108
+                . 'ldap:///ou=People,' . $domain_root_dn . '??sub?(objectclass=inetorgperson)");)',
109
+
110
+                '(targetattr = "*")'
111
+                . '(version 3.0;acl "Kolab Administrators";allow (all)'
112
+                . '(roledn = "ldap:///cn=kolab-admin,' . $domain_root_dn . ' || '
113
+                . 'ldap:///cn=kolab-admin,' . $mgmt_root_dn . '");)'
114
+            );
115
+
116
+            $attributes['aci']              = $aci;
117
+            $attributes['inetdomainbasedn'] = $domain_root_dn;
118
+
119
+            $this->is_hosted = true;
120
+        }
121
+    }
122
+
123
+    /**
124
+     * Create LDAP object related to the new hosted domain
125
+     */
126
+    protected function _after_domain_created($attributes, $domain)
127
+    {
128
+        if (!$this->is_hosted) {
129
+            return;
130
+        }
131
+
132
+        $conf         = Conf::get_instance();
133
+        $ou_service   = $this->controller->get_service('ou');
134
+        $role_service = $this->controller->get_service('role');
135
+
136
+        $hosted_root_dn = $conf->get('kolab_wap', 'hosted_root_dn');
137
+        $mgmt_root_dn   = $conf->get('kolab_wap', 'mgmt_root_dn');
138
+        $domain_root_dn = 'ou=' . $domain . ',' . $hosted_root_dn;
139
+
140
+        if (empty($mgmt_root_dn)) {
141
+            $mgmt_root_dn = $conf->get('root_dn');
142
+        }
143
+
144
+        $ou_domain = array(
145
+            'ou'            => $domain,
146
+            'base_dn'       => $hosted_root_dn,
147
+            'description'   => $domain,
148
+            'type_id'       => 1,
149
+        );
150
+
151
+        $ou_domain['aci'] = array(
152
+            '(targetattr = "*")'
153
+            . '(version 3.0;acl "Deny Unauthorized"; deny (all)'
154
+            . '(userdn != "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . ' || '
155
+            . 'ldap:///ou=People,' . $domain_root_dn . '??sub?(objectclass=inetorgperson)") AND NOT '
156
+            . 'roledn = "ldap:///cn=kolab-admin,' . $mgmt_root_dn . '";)',
157
+
158
+            '(targetattr != "userPassword")'
159
+            . '(version 3.0;acl "Search Access";allow (read,compare,search,write)'
160
+            . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . ' || '
161
+            . 'ldap:///ou=People,' . $domain_root_dn . '??sub?(objectclass=inetorgperson)");)',
162
+
163
+            '(targetattr = "*")'
164
+            . '(version 3.0;acl "Kolab Administrators";allow (all)'
165
+            . '(roledn = "ldap:///cn=kolab-admin,' . $domain_root_dn . ' || '
166
+            . 'ldap:///cn=kolab-admin,' . $mgmt_root_dn . '");)',
167
+
168
+            '(target = "ldap:///ou=*,' . $domain_root_dn . '")(targetattr="objectclass || aci || ou")'
169
+            . '(version 3.0;acl "Allow Domain sub-OU Registration"; allow (add)'
170
+            . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . '");)',
171
+
172
+            '(target = "ldap:///uid=*,ou=People,' . $domain_root_dn . '")(targetattr="*")'
173
+            . '(version 3.0;acl "Allow Domain First User Registration"; allow (add)'
174
+            . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . '");)',
175
+
176
+            '(target = "ldap:///cn=*,' . $domain_root_dn . '")(targetattr="objectclass || cn")'
177
+            . '(version 3.0;acl "Allow Domain Role Registration"; allow (add)'
178
+            . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . '");)',
179
+        );
180
+
181
+        $ou_service->ou_add(null, $ou_domain);
182
+
183
+        // Add OU trees
184
+
185
+        foreach (array('Groups', 'People', 'Resources', 'Shared Folders') as $item) {
186
+            $ou = array(
187
+                'ou'            => $item,
188
+                'base_dn'       => $domain_root_dn,
189
+                'type_id'       => 1,
190
+                'description'   => $item,
191
+            );
192
+
193
+            $ou_service->ou_add(null, $ou);
194
+        }
195
+
196
+        // Add an admin role
197
+
198
+        $role = array(
199
+            'cn'            => 'kolab-admin',
200
+            'description'   => 'Domain Administrator',
201
+            'type_id'       => 1,
202
+            'base_dn'       => $domain_root_dn,
203
+        );
204
+
205
+        $role_service->role_add(null, $role);
206
+    }
207
 }
208
kolab-webadmin-3.2.14.tar.gz/lib/api/kolab_api_service_domain_types.php -> kolab-webadmin-3.2.15.tar.gz/lib/api/kolab_api_service_domain_types.php Changed
63
 
1
@@ -57,6 +57,33 @@
2
         ),
3
     );
4
 
5
+    public static $HOSTED_TYPE_ATTRS = array(
6
+        'auto_form_fields' => array(),
7
+        'form_fields' => array(
8
+            'associateddomain' => array(
9
+                'type' => 'list'
10
+            ),
11
+//            'inetdomainbasedn' => array(
12
+//                'optional' => true,
13
+//            ),
14
+            'inetdomainstatus' => array(
15
+                'optional' => true,
16
+                'type'     => 'select',
17
+                'values'   => array(
18
+                    '', 'active', 'suspended', 'deleted',
19
+                ),
20
+            ),
21
+        ),
22
+        'fields' => array(
23
+            'domainrelatedobject_only' => 1,
24
+            'objectclass' => array(
25
+                'top',
26
+                'domainrelatedobject',
27
+                'inetdomain',
28
+            ),
29
+        ),
30
+    );
31
+
32
 
33
     /**
34
      * Returns service capabilities.
35
@@ -83,14 +110,23 @@
36
     public function domain_types_list($get, $post)
37
     {
38
         // @TODO: move to database
39
-        $types = array(
40
-            1 => array(
41
+        $types = array();
42
+
43
+        if ($this->conf->get('kolab_wap', 'hosted_root_dn')) {
44
+            $types[1] = array(
45
+                'key'         => 'hosted',
46
+                'name'        => 'Hosted domain',
47
+                'description' => 'A hosted domain name space',
48
+                'attributes'  => self::$HOSTED_TYPE_ATTRS,
49
+            );
50
+        } else {
51
+            $types[1] = array(
52
                 'key'         => 'standard',
53
                 'name'        => 'Standard domain',
54
                 'description' => 'A standard domain name space',
55
                 'attributes'  => self::$DEFAULT_TYPE_ATTRS,
56
-            ),
57
-        );
58
+            );
59
+        }
60
 
61
         return array(
62
             'list'  => $types,
63
kolab-webadmin-3.2.14.tar.gz/lib/api/kolab_api_service_domains.php -> kolab-webadmin-3.2.15.tar.gz/lib/api/kolab_api_service_domains.php Changed
25
 
1
@@ -58,19 +58,19 @@
2
 
3
         $rights = array();
4
 
5
-        if (in_array('add', $effective_rights['entryLevelRights'])) {
6
+        if (in_array('add', $effective_rights['entrylevelrights'])) {
7
             $rights['list'] = "r";
8
         }
9
 
10
-        if (in_array('delete', $effective_rights['entryLevelRights'])) {
11
+        if (in_array('delete', $effective_rights['entrylevelrights'])) {
12
             $rights['list'] = "r";
13
         }
14
 
15
-        if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
16
+        if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
17
             $rights['list'] = "r";
18
         }
19
 
20
-        if (in_array('read', $effective_rights['entryLevelRights'])) {
21
+        if (in_array('read', $effective_rights['entrylevelrights'])) {
22
             $rights['list'] = "r";
23
         }
24
 
25
kolab-webadmin-3.2.14.tar.gz/lib/api/kolab_api_service_group.php -> kolab-webadmin-3.2.15.tar.gz/lib/api/kolab_api_service_group.php Changed
25
 
1
@@ -43,19 +43,19 @@
2
         $effective_rights = $auth->list_rights('group');
3
         $rights           = array();
4
 
5
-        if (in_array('add', $effective_rights['entryLevelRights'])) {
6
+        if (in_array('add', $effective_rights['entrylevelrights'])) {
7
             $rights['add'] = "w";
8
         }
9
 
10
-        if (in_array('delete', $effective_rights['entryLevelRights'])) {
11
+        if (in_array('delete', $effective_rights['entrylevelrights'])) {
12
             $rights['delete'] = "w";
13
         }
14
 
15
-        if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
16
+        if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
17
             $rights['edit'] = "w";
18
         }
19
 
20
-        if (in_array('read', $effective_rights['entryLevelRights'])) {
21
+        if (in_array('read', $effective_rights['entrylevelrights'])) {
22
             $rights['info'] = "r";
23
             $rights['find'] = "r";
24
             $rights['members_list'] = "r";
25
kolab-webadmin-3.2.14.tar.gz/lib/api/kolab_api_service_ou.php -> kolab-webadmin-3.2.15.tar.gz/lib/api/kolab_api_service_ou.php Changed
25
 
1
@@ -41,19 +41,19 @@
2
         $effective_rights = $auth->list_rights('ou');
3
         $rights           = array();
4
 
5
-        if (in_array('add', $effective_rights['entryLevelRights'])) {
6
+        if (in_array('add', $effective_rights['entrylevelrights'])) {
7
             $rights['add'] = "w";
8
         }
9
 
10
-        if (in_array('delete', $effective_rights['entryLevelRights'])) {
11
+        if (in_array('delete', $effective_rights['entrylevelrights'])) {
12
             $rights['delete'] = "w";
13
         }
14
 
15
-        if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
16
+        if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
17
             $rights['edit'] = "w";
18
         }
19
 
20
-        if (in_array('read', $effective_rights['entryLevelRights'])) {
21
+        if (in_array('read', $effective_rights['entrylevelrights'])) {
22
             $rights['info'] = "r";
23
             $rights['find'] = "r";
24
             $rights['members_list'] = "r";
25
kolab-webadmin-3.2.14.tar.gz/lib/api/kolab_api_service_resource.php -> kolab-webadmin-3.2.15.tar.gz/lib/api/kolab_api_service_resource.php Changed
25
 
1
@@ -43,19 +43,19 @@
2
         $effective_rights = $auth->list_rights('resource');
3
         $rights           = array();
4
 
5
-        if (in_array('add', $effective_rights['entryLevelRights'])) {
6
+        if (in_array('add', $effective_rights['entrylevelrights'])) {
7
             $rights['add'] = "w";
8
         }
9
 
10
-        if (in_array('delete', $effective_rights['entryLevelRights'])) {
11
+        if (in_array('delete', $effective_rights['entrylevelrights'])) {
12
             $rights['delete'] = "w";
13
         }
14
 
15
-        if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
16
+        if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
17
             $rights['edit'] = "w";
18
         }
19
 
20
-        if (in_array('read', $effective_rights['entryLevelRights'])) {
21
+        if (in_array('read', $effective_rights['entrylevelrights'])) {
22
             $rights['info'] = "r";
23
             $rights['find'] = "r";
24
         }
25
kolab-webadmin-3.2.14.tar.gz/lib/api/kolab_api_service_role.php -> kolab-webadmin-3.2.15.tar.gz/lib/api/kolab_api_service_role.php Changed
25
 
1
@@ -43,19 +43,19 @@
2
         $effective_rights = $auth->list_rights('role');
3
         $rights           = array();
4
 
5
-        if (in_array('add', $effective_rights['entryLevelRights'])) {
6
+        if (in_array('add', $effective_rights['entrylevelrights'])) {
7
             $rights['add'] = "w";
8
         }
9
 
10
-        if (in_array('delete', $effective_rights['entryLevelRights'])) {
11
+        if (in_array('delete', $effective_rights['entrylevelrights'])) {
12
             $rights['delete'] = "w";
13
         }
14
 
15
-        if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
16
+        if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
17
             $rights['edit'] = "w";
18
         }
19
 
20
-        if (in_array('read', $effective_rights['entryLevelRights'])) {
21
+        if (in_array('read', $effective_rights['entrylevelrights'])) {
22
             $rights['info'] = "r";
23
             $rights['find'] = "r";
24
             $rights['members_list'] = "r";
25
kolab-webadmin-3.2.14.tar.gz/lib/api/kolab_api_service_sharedfolder.php -> kolab-webadmin-3.2.15.tar.gz/lib/api/kolab_api_service_sharedfolder.php Changed
25
 
1
@@ -43,19 +43,19 @@
2
         $effective_rights = $auth->list_rights('sharedfolder');
3
         $rights           = array();
4
 
5
-        if (in_array('add', $effective_rights['entryLevelRights'])) {
6
+        if (in_array('add', $effective_rights['entrylevelrights'])) {
7
             $rights['add'] = "w";
8
         }
9
 
10
-        if (in_array('delete', $effective_rights['entryLevelRights'])) {
11
+        if (in_array('delete', $effective_rights['entrylevelrights'])) {
12
             $rights['delete'] = "w";
13
         }
14
 
15
-        if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
16
+        if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
17
             $rights['edit'] = "w";
18
         }
19
 
20
-        if (in_array('read', $effective_rights['entryLevelRights'])) {
21
+        if (in_array('read', $effective_rights['entrylevelrights'])) {
22
             $rights['info'] = "r";
23
             $rights['find'] = "r";
24
         }
25
kolab-webadmin-3.2.14.tar.gz/lib/api/kolab_api_service_type.php -> kolab-webadmin-3.2.15.tar.gz/lib/api/kolab_api_service_type.php Changed
65
 
1
@@ -40,19 +40,19 @@
2
         $effective_rights = $this->type_effective_rights();
3
         $rights           = array();
4
 
5
-        if (in_array('add', (array)$effective_rights['entryLevelRights'])) {
6
+        if (in_array('add', (array)$effective_rights['entrylevelrights'])) {
7
             $rights['add'] = "w";
8
         }
9
 
10
-        if (in_array('delete', (array)$effective_rights['entryLevelRights'])) {
11
+        if (in_array('delete', (array)$effective_rights['entrylevelrights'])) {
12
             $rights['delete'] = "w";
13
         }
14
 
15
-        if (in_array('modrdn', (array)$effective_rights['entryLevelRights'])) {
16
+        if (in_array('modrdn', (array)$effective_rights['entrylevelrights'])) {
17
             $rights['edit'] = "w";
18
         }
19
 
20
-        if (in_array('read', (array)$effective_rights['entryLevelRights'])) {
21
+        if (in_array('read', (array)$effective_rights['entrylevelrights'])) {
22
             $rights['info'] = "r";
23
         }
24
 
25
@@ -84,7 +84,7 @@
26
         }
27
 
28
         $effective_rights = $this->type_effective_rights();
29
-        if (!in_array('add', (array)$effective_rights['entryLevelRights'])) {
30
+        if (!in_array('add', (array)$effective_rights['entrylevelrights'])) {
31
             return false;
32
         }
33
 
34
@@ -146,7 +146,7 @@
35
         $object_id        = $postdata['id'];
36
         $effective_rights = $this->type_effective_rights();
37
 
38
-        if (!in_array('delete', (array)$effective_rights['entryLevelRights'])) {
39
+        if (!in_array('delete', (array)$effective_rights['entrylevelrights'])) {
40
             return false;
41
         }
42
 
43
@@ -178,7 +178,7 @@
44
         }
45
 
46
         $effective_rights = $this->type_effective_rights();
47
-        if (!in_array('modrdn', (array)$effective_rights['entryLevelRights'])) {
48
+        if (!in_array('modrdn', (array)$effective_rights['entrylevelrights'])) {
49
             return false;
50
         }
51
 
52
@@ -224,10 +224,10 @@
53
         if (strtolower($_SESSION['user']->get_userid()) == 'cn=directory manager') {
54
             $attr_acl = array('read', 'write', 'delete');
55
             $effective_rights = array(
56
-                'entryLevelRights' => array(
57
+                'entrylevelrights' => array(
58
                     'read', 'add', 'delete', 'modrdn',
59
                 ),
60
-                'attributeLevelRights' => array(
61
+                'attributelevelrights' => array(
62
                     'key'         => $attr_acl,
63
                     'name'        => $attr_acl,
64
                     'description' => $attr_acl,
65
kolab-webadmin-3.2.14.tar.gz/lib/api/kolab_api_service_user.php -> kolab-webadmin-3.2.15.tar.gz/lib/api/kolab_api_service_user.php Changed
26
 
1
@@ -43,20 +43,20 @@
2
 
3
         $rights = array();
4
 
5
-        if (in_array('add', $effective_rights['entryLevelRights'])) {
6
+        if (in_array('add', $effective_rights['entrylevelrights'])) {
7
             $rights['add'] = "w";
8
         }
9
 
10
-        if (in_array('delete', $effective_rights['entryLevelRights'])) {
11
+        if (in_array('delete', $effective_rights['entrylevelrights'])) {
12
             $rights['delete'] = "w";
13
         }
14
 
15
-        if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
16
+        if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
17
             $rights['edit']     = "w";
18
             $rights['password'] = "w";
19
         }
20
 
21
-        if (in_array('read', $effective_rights['entryLevelRights'])) {
22
+        if (in_array('read', $effective_rights['entrylevelrights'])) {
23
             $rights['info'] = "r";
24
             $rights['find'] = "r";
25
         }
26
kolab-webadmin-3.2.14.tar.gz/lib/client/kolab_client_task_settings.php -> kolab-webadmin-3.2.15.tar.gz/lib/client/kolab_client_task_settings.php Changed
10
 
1
@@ -162,7 +162,7 @@
2
         $user_task   = new kolab_client_task_user($this->output);
3
         $user_task->action_info();
4
 
5
-        $this->output->set_object('content', $this->output->get_object('taskcontent'));
6
+        $this->output->set_object('content', '<div id="taskcontent">' . $this->output->get_object('taskcontent') . '</div>');
7
     }
8
 
9
     /**
10
kolab-webadmin-3.2.14.tar.gz/lib/kolab_api_service.php -> kolab-webadmin-3.2.15.tar.gz/lib/kolab_api_service.php Changed
26
 
1
@@ -266,12 +266,20 @@
2
 
3
         // get list of object types
4
         if ($object_name == 'domain') {
5
-            $object_types = array(
6
-                '1' => array(
7
+            $object_types = array();
8
+
9
+            if ($this->conf->get('kolab_wap', 'hosted_root_dn')) {
10
+                $object_types['1'] = array(
11
+                    'key'        => 'hosted',
12
+                    'attributes' => kolab_api_service_domain_types::$HOSTED_TYPE_ATTRS,
13
+                );
14
+            } else {
15
+                $object_types['1'] = array(
16
                     'key'        => 'default',
17
                     'attributes' => kolab_api_service_domain_types::$DEFAULT_TYPE_ATTRS,
18
-                ),
19
-            );
20
+                );
21
+            }
22
+
23
             $object_types['1']['attributes']['form_fields']['aci'] = array(
24
                 'type'     => 'list',
25
                 'optional' => true,
26
kolab-webadmin-3.2.14.tar.gz/lib/kolab_client_task.php -> kolab-webadmin-3.2.15.tar.gz/lib/kolab_client_task.php Changed
12
 
1
@@ -767,8 +767,8 @@
2
         $result = $this->api_get($type . '.effective_rights', array('id' => $id));
3
 
4
         $result = array(
5
-            'attribute' => $result->get('attributeLevelRights'),
6
-            'entry'     => $result->get('entryLevelRights'),
7
+            'attribute' => $result->get('attributelevelrights'),
8
+            'entry'     => $result->get('entrylevelrights'),
9
         );
10
 
11
         return $result;
12
kolab-webadmin-3.2.14.tar.gz/lib/locale/bg_BG.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/bg_BG.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.';
4
 $LANG['about.technology'] = 'Technology';
5
-$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
6
+$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.';
7
 
8
 $LANG['aci.new'] = 'New...';
9
 $LANG['aci.edit'] = 'Edit...';
10
kolab-webadmin-3.2.14.tar.gz/lib/locale/cs_CZ.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/cs_CZ.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.';
4
 $LANG['about.technology'] = 'Technology';
5
-$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
6
+$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.';
7
 
8
 $LANG['aci.new'] = 'New...';
9
 $LANG['aci.edit'] = 'Edit...';
10
kolab-webadmin-3.2.14.tar.gz/lib/locale/de_CH.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/de_CH.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.';
4
 $LANG['about.technology'] = 'Technology';
5
-$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
6
+$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.';
7
 
8
 $LANG['aci.new'] = 'New...';
9
 $LANG['aci.edit'] = 'Edit...';
10
kolab-webadmin-3.2.14.tar.gz/lib/locale/de_DE.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/de_DE.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = 'Professionelle Unterstützung ist erhältlich bei <a href="http://kolabsys.com">Kolab Systems</a>.';
4
 $LANG['about.technology'] = 'Technologie';
5
-$LANG['about.warranty'] = 'Sie kommt mit <b>keinen Garantien</b> und wird normalerweise ohne professionelle Unterstützung eingesetzt. Hilfe und weitere Informationen finden Sie auf der <a href="http://kolab.org">Web-Seite</a> und im <a href="http://wiki.kolab.org">Wiki</a>.';
6
+$LANG['about.warranty'] = 'Sie kommt mit <b>keinen Garantien</b> und wird normalerweise ohne professionelle Unterstützung eingesetzt. Hilfe und weitere Informationen finden Sie auf der <a href="http://kolab.org">Web-Seite</a>.';
7
 
8
 $LANG['aci.new'] = 'Neu...';
9
 $LANG['aci.edit'] = 'Bearbeiten...';
10
kolab-webadmin-3.2.14.tar.gz/lib/locale/en_US.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/en_US.php Changed
46
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.';
4
 $LANG['about.technology'] = 'Technology';
5
-$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
6
+$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.';
7
 
8
 $LANG['aci.new'] = 'New...';
9
 $LANG['aci.edit'] = 'Edit...';
10
@@ -142,7 +142,7 @@
11
 $LANG['domain.o'] = 'Organization';
12
 $LANG['domain.other'] = 'Other';
13
 $LANG['domain.system'] = 'System';
14
-$LANG['domain.type_id'] = 'Standard Domain';
15
+$LANG['domain.type_id'] = 'Domain type';
16
 
17
 $LANG['edit'] = 'Edit';
18
 $LANG['error'] = 'Error';
19
@@ -226,7 +226,7 @@
20
 $LANG['ou.delete.success'] = 'Unit deleted successfully.';
21
 $LANG['ou.description'] = 'Unit Description';
22
 $LANG['ou.edit.success'] = 'Unit updated successfully.';
23
-$LANG['ou.list'] = 'Organizational Unit List';
24
+$LANG['ou.list'] = 'Organizational Units List';
25
 $LANG['ou.norecords'] = 'No organizational unit records found!';
26
 $LANG['ou.system'] = 'Details';
27
 $LANG['ou.type_id'] = 'Unit Type';
28
@@ -244,7 +244,7 @@
29
 $LANG['resource.kolabtargetfolder'] = 'Target Folder';
30
 $LANG['resource.kolabinvitationpolicy'] = 'Invitation Policy';
31
 $LANG['resource.kolabdescattribute'] = 'Attributes';
32
-$LANG['resource.list'] = 'Resource (Collection) List';
33
+$LANG['resource.list'] = 'Resources (Collections) List';
34
 $LANG['resource.mail'] = 'Mail Address';
35
 $LANG['resource.member'] = 'Collection Members';
36
 $LANG['resource.norecords'] = 'No resource records found!';
37
@@ -263,7 +263,7 @@
38
 $LANG['role.delete.success'] = 'Role deleted successfully.';
39
 $LANG['role.description'] = 'Role Description';
40
 $LANG['role.edit.success'] = 'Role updated successfully.';
41
-$LANG['role.list'] = 'Role List';
42
+$LANG['role.list'] = 'Roles List';
43
 $LANG['role.norecords'] = 'No role records found!';
44
 $LANG['role.system'] = 'Details';
45
 $LANG['role.type_id'] = 'Role Type';
46
kolab-webadmin-3.2.14.tar.gz/lib/locale/es_ES.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/es_ES.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.';
4
 $LANG['about.technology'] = 'Tecnología';
5
-$LANG['about.warranty'] = 'Viene absolutamente <b>sin ninguna garantia</b> y normalmente se ejecuta sin ningun tipo de soporte. Puedes obetner ayuda y más información en el <a href="http://kolab.org">sitio web</a> de la comunidad y en el <a href="http://wiki.kolab.org">wiki</a>.';
6
+$LANG['about.warranty'] = 'Viene absolutamente <b>sin ninguna garantia</b> y normalmente se ejecuta sin ningun tipo de soporte. Puedes obetner ayuda y más información en el <a href="http://kolab.org">sitio web</a>.';
7
 
8
 $LANG['aci.new'] = 'New...';
9
 $LANG['aci.edit'] = 'Edit...';
10
kolab-webadmin-3.2.14.tar.gz/lib/locale/et_EE.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/et_EE.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.';
4
 $LANG['about.technology'] = 'Tehnoloogia';
5
-$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
6
+$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.';
7
 
8
 $LANG['aci.new'] = 'New...';
9
 $LANG['aci.edit'] = 'Edit...';
10
kolab-webadmin-3.2.14.tar.gz/lib/locale/fi_FI.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/fi_FI.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = 'Kaupallista tukea tarjoaa <a href="http://kolabsys.com">Kolab Systems</a>.';
4
 $LANG['about.technology'] = 'Technology';
5
-$LANG['about.warranty'] = 'Se ei sisällä <b>minkäänlaista takuuta</b>, ja tuki on yleensä hoidettava itse. Apua ja ohjeita on saatavilla yhteisön <a href="http://kolab.org">verkkosivustolta</a> sekä <a href="http://wiki.kolab.org">wikistä</a>.';
6
+$LANG['about.warranty'] = 'Se ei sisällä <b>minkäänlaista takuuta</b>, ja tuki on yleensä hoidettava itse. Apua ja ohjeita on saatavilla yhteisön <a href="http://kolab.org">verkkosivustolta</a>.';
7
 
8
 $LANG['aci.new'] = 'New...';
9
 $LANG['aci.edit'] = 'Edit...';
10
kolab-webadmin-3.2.14.tar.gz/lib/locale/fr_FR.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/fr_FR.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = 'Un support professionnel est disponible au près de <a href="http://kolabsys.com">Kolab Systems</a>.';
4
 $LANG['about.technology'] = 'Technologie';
5
-$LANG['about.warranty'] = 'Il est livré <b>sans aucune garantie</b> et généralement exécuté sous votre responsabilité. Vous pouvez trouver de l\'aide et des informations sur <a href="http://kolab.org">le site web communautaire</a> et sur <a href="http://wiki.kolab.org">le wiki</a>.';
6
+$LANG['about.warranty'] = 'Il est livré <b>sans aucune garantie</b> et généralement exécuté sous votre responsabilité. Vous pouvez trouver de l\'aide et des informations sur <a href="http://kolab.org">le site web communautaire</a>.';
7
 
8
 $LANG['aci.new'] = 'New...';
9
 $LANG['aci.edit'] = 'Edit...';
10
kolab-webadmin-3.2.14.tar.gz/lib/locale/it_IT.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/it_IT.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = 'È disponibile il supporto professionale di <a href="http://kolabsys.com">Kolab Systems</a>.';
4
 $LANG['about.technology'] = 'Technology';
5
-$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
6
+$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.';
7
 
8
 $LANG['aci.new'] = 'New...';
9
 $LANG['aci.edit'] = 'Edit...';
10
kolab-webadmin-3.2.14.tar.gz/lib/locale/ja_JP.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/ja_JP.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = '有償サポートは<a href="http://kolabsys.com">Kolab Systems</a>にて受付けております。';
4
 $LANG['about.technology'] = 'Technology';
5
-$LANG['about.warranty'] = '動作保証は全くなく、ユーザの自己責任により実行されます。 <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>にてヘルプやコミュニティの情報を得ることができます。';
6
+$LANG['about.warranty'] = '動作保証は全くなく、ユーザの自己責任により実行されます。 <a href="http://kolab.org">web site</a>にてヘルプやコミュニティの情報を得ることができます。';
7
 
8
 $LANG['aci.new'] = 'New...';
9
 $LANG['aci.edit'] = 'Edit...';
10
kolab-webadmin-3.2.14.tar.gz/lib/locale/nl_NL.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/nl_NL.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = 'Professionele ondersteuning is beschikbaar bij <a href="http://kolabsys.com">Kolab Systems</a>';
4
 $LANG['about.technology'] = 'Technologie';
5
-$LANG['about.warranty'] = 'Het komt <b>zonder enige garanties</b> en wordt typisch geheel zelf ondersteund. U kunt help & informatie vinden in de community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
6
+$LANG['about.warranty'] = 'Het komt <b>zonder enige garanties</b> en wordt typisch geheel zelf ondersteund. U kunt help & informatie vinden in de community <a href="http://kolab.org">web site</a>.';
7
 
8
 $LANG['aci.new'] = 'nieuw...';
9
 $LANG['aci.edit'] = 'Wijzigen...';
10
kolab-webadmin-3.2.14.tar.gz/lib/locale/pl_PL.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/pl_PL.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = 'Profesjonalne wsparcie techniczne jest dostępne ze strony <a href="http://kolabsys.com">Kolab Systems</a>.';
4
 $LANG['about.technology'] = 'Technologia';
5
-$LANG['about.warranty'] = 'Oprogramowanie to dostarczane jest bez <b>żadnych gwarancji</b> ani wsparcia. Pomoc i niezbędne informacje można znaleźć na <a href=http://kolab.org">stronie społeczności</a> oraz <a href="http://wiki.kolab.org">wiki</a>.';
6
+$LANG['about.warranty'] = 'Oprogramowanie to dostarczane jest bez <b>żadnych gwarancji</b> ani wsparcia. Pomoc i niezbędne informacje można znaleźć na <a href=http://kolab.org">stronie społeczności</a>.';
7
 
8
 $LANG['aci.new'] = 'Nowy...';
9
 $LANG['aci.edit'] = 'Edytuj...';
10
kolab-webadmin-3.2.14.tar.gz/lib/locale/pt_BR.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/pt_BR.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Sistemas Kolab';
3
 $LANG['about.support'] = 'Suporte profissional está disponível a partir da <a href="http://kolabsys.com">Kolab Systems</a>.';
4
 $LANG['about.technology'] = 'Tecnologia ';
5
-$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
6
+$LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a>.';
7
 
8
 $LANG['aci.new'] = 'New...';
9
 $LANG['aci.edit'] = 'Edit...';
10
kolab-webadmin-3.2.14.tar.gz/lib/locale/ru_RU.php -> kolab-webadmin-3.2.15.tar.gz/lib/locale/ru_RU.php Changed
10
 
1
@@ -5,7 +5,7 @@
2
 $LANG['about.kolabsys'] = 'Kolab Systems';
3
 $LANG['about.support'] = 'Профессиональную поддержку можно получить от <a href="http://kolabsys.com">Kolab Systems</a>.';
4
 $LANG['about.technology'] = 'Технология';
5
-$LANG['about.warranty'] = 'Она распространяется абсолютно <b>без гарантий</b> и обычно поддерживается силами сообщества. Помощь и информацию можно найти на сайте <a href="http://kolab.org">сообщества</a> и <a href="http://wiki.kolab.org">wiki</a>.';
6
+$LANG['about.warranty'] = 'Она распространяется абсолютно <b>без гарантий</b> и обычно поддерживается силами сообщества. Помощь и информацию можно найти на сайте <a href="http://kolab.org">сообщества</a>.';
7
 
8
 $LANG['aci.new'] = 'Новый...';
9
 $LANG['aci.edit'] = 'Редактировать...';
10
kolab-webadmin-3.2.14.tar.gz/public_html/skins/default/style.css -> kolab-webadmin-3.2.15.tar.gz/public_html/skins/default/style.css Changed
59
 
1
@@ -73,6 +73,7 @@
2
   border: 1px solid #d0d0d0;
3
   border-spacing: 0;
4
   width: 100%;
5
+  margin: 0;
6
 }
7
 
8
 table.list thead tr {
9
@@ -100,6 +101,7 @@
10
   height: 150px;
11
   color: #f3a628;
12
   text-align: center;
13
+  vertical-align: middle;
14
 }
15
 
16
 table.list tbody tr.deleted td {
17
@@ -338,10 +340,11 @@
18
 
19
 #content {
20
   min-height: 400px;
21
-  padding: 10px;
22
+  padding: 15px 10px;
23
   background-color: #fff;
24
   border: 1px solid #d0d0d0;
25
   border-width: 1px 0 1px 0;
26
+  display: flex;
27
 }
28
 
29
 #footer {
30
@@ -439,12 +442,13 @@
31
   padding: 0 10px;
32
   display: flex;
33
   flex-direction: column;
34
+  flex: 1;
35
 }
36
 
37
 #toc {
38
-  float: left;
39
-  width: 260px;
40
+  width: 280px;
41
   min-height: 380px;
42
+  margin: 0 10px 0 5px;
43
 }
44
 
45
 #search {
46
@@ -475,12 +479,6 @@
47
   border-top: 0;
48
 }
49
 
50
-div.vsplitter {
51
-  float: left;
52
-  width: 10px;
53
-  min-height: 400px;
54
-}
55
-
56
 /**** Common classes ****/
57
 
58
 .nowrap {
59
kolab-webadmin-3.2.14.tar.gz/public_html/skins/default/templates/about_kolab.html -> kolab-webadmin-3.2.15.tar.gz/public_html/skins/default/templates/about_kolab.html Changed
11
 
1
@@ -43,9 +43,7 @@
2
 
3
 <ul>
4
     <li><a href="https://kolab.org">Kolab Community Web Site</a></li>
5
-    <li><a href="http://wiki.kolab.org">Kolab Community Wiki</a></li>
6
     <li><a href="http://blogs.fsfe.org/greve/?p=431">Article: 'The Kolab Story' by Georg Greve</a></li>
7
-    <li><a href="http://files.kolabsys.com/Public/Handouts/">Handouts for the Kolab Groupware Solution by Kolab Systems</a></li>
8
 </ul>
9
 
10
 <h2>Warranties &amp; Professional Support</h2>
11
kolab-webadmin-3.2.14.tar.gz/public_html/skins/default/templates/about_kolabsys.html -> kolab-webadmin-3.2.15.tar.gz/public_html/skins/default/templates/about_kolabsys.html Changed
11
 
1
@@ -48,8 +48,6 @@
2
     <b>Thank you for being part of this awesome community!</b>
3
 </p>
4
 
5
-<p>If <b>you</b> want to join the community, please go to
6
-    <a href="https://kolab.org">kolab.org</a> and <a href="http://wiki.kolab.org">wiki.kolab.org</a>.
7
-</p>
8
+<p>If <b>you</b> want to join the community, please go to <a href="https://kolab.org">kolab.org</a>.</p>
9
 
10
 </div>
11
kolab-webadmin-3.2.14.tar.gz/public_html/skins/default/templates/about_technology.html -> kolab-webadmin-3.2.15.tar.gz/public_html/skins/default/templates/about_technology.html Changed
11
 
1
@@ -56,8 +56,7 @@
2
 </p>
3
 
4
 <p>
5
-If you want to join the community, please visit <a href="http://wiki.kolab.org">http://wiki.kolab.org</a>
6
-and <a href="http://kolab.org">http://kolab.org</a>.
7
+If you want to join the community, please visit <a href="http://kolab.org">http://kolab.org</a>.
8
 </p>
9
 
10
 <h3>History before 2010</h3>
11
kolab-webadmin-3.2.14.tar.gz/public_html/skins/default/templates/domain.html -> kolab-webadmin-3.2.15.tar.gz/public_html/skins/default/templates/domain.html Changed
7
 
1
@@ -2,5 +2,4 @@
2
     {include file="search.html" list="domain.list"}
3
     <div id="domainlist"></div>
4
 </div>
5
-<div class="vsplitter">&nbsp;</div>
6
 <div id="taskcontent" class="domain"></div>
7
kolab-webadmin-3.2.14.tar.gz/public_html/skins/default/templates/group.html -> kolab-webadmin-3.2.15.tar.gz/public_html/skins/default/templates/group.html Changed
7
 
1
@@ -2,5 +2,4 @@
2
     {include file="search.html" list="group.list"}
3
     <div id="grouplist"></div>
4
 </div>
5
-<div class="vsplitter">&nbsp;</div>
6
 <div id="taskcontent" class="group"></div>
7
kolab-webadmin-3.2.14.tar.gz/public_html/skins/default/templates/main.html -> kolab-webadmin-3.2.15.tar.gz/public_html/skins/default/templates/main.html Changed
24
 
1
@@ -28,14 +28,16 @@
2
     <div id="navigation">{$main_menu}</div>
3
     <div id="task_navigation">{$task_menu}</div>
4
     <div id="content">
5
+        <div id="taskcontent">
6
         <h1>{$engine->translate('welcome')}</h1>
7
-        <div id="main">
8
-            {foreach $tasks as $link => $label}
9
-            <div class="{preg_replace('/\..*$/', '', $link)}" onclick="kadm.command('{$link}', '', this)">
10
-                <span class="image font-icon"></span>
11
-                <span class="label">{$engine->translate($label)}</span>
12
+            <div id="main">
13
+                {foreach $tasks as $link => $label}
14
+                <div class="{preg_replace('/\..*$/', '', $link)}" onclick="kadm.command('{$link}', '', this)">
15
+                    <span class="image font-icon"></span>
16
+                    <span class="label">{$engine->translate($label)}</span>
17
+                </div>
18
+                {/foreach}
19
             </div>
20
-            {/foreach}
21
         </div>
22
     </div>
23
     <div id="footer">
24
kolab-webadmin-3.2.14.tar.gz/public_html/skins/default/templates/ou.html -> kolab-webadmin-3.2.15.tar.gz/public_html/skins/default/templates/ou.html Changed
7
 
1
@@ -2,5 +2,4 @@
2
     {include file="search.html" list="ou.list"}
3
     <div id="oulist"></div>
4
 </div>
5
-<div class="vsplitter">&nbsp;</div>
6
 <div id="taskcontent" class="ou"></div>
7
kolab-webadmin-3.2.14.tar.gz/public_html/skins/default/templates/resource.html -> kolab-webadmin-3.2.15.tar.gz/public_html/skins/default/templates/resource.html Changed
7
 
1
@@ -2,5 +2,4 @@
2
     {include file="search.html" list="resource.list"}
3
     <div id="resourcelist"></div>
4
 </div>
5
-<div class="vsplitter">&nbsp;</div>
6
 <div id="taskcontent" class="resource"></div>
7
kolab-webadmin-3.2.14.tar.gz/public_html/skins/default/templates/role.html -> kolab-webadmin-3.2.15.tar.gz/public_html/skins/default/templates/role.html Changed
7
 
1
@@ -2,5 +2,4 @@
2
     {include file="search.html" list="role.list"}
3
     <div id="rolelist"></div>
4
 </div>
5
-<div class="vsplitter">&nbsp;</div>
6
 <div id="taskcontent" class="role"></div>
7
kolab-webadmin-3.2.14.tar.gz/public_html/skins/default/templates/sharedfolder.html -> kolab-webadmin-3.2.15.tar.gz/public_html/skins/default/templates/sharedfolder.html Changed
7
 
1
@@ -2,5 +2,4 @@
2
     {include file="search.html" list="sharedfolder.list"}
3
     <div id="sharedfolderlist"></div>
4
 </div>
5
-<div class="vsplitter">&nbsp;</div>
6
 <div id="taskcontent" class="sharedfolder"></div>
7
kolab-webadmin-3.2.14.tar.gz/public_html/skins/default/templates/type.html -> kolab-webadmin-3.2.15.tar.gz/public_html/skins/default/templates/type.html Changed
7
 
1
@@ -16,5 +16,4 @@
2
     </div>
3
     <div id="typelist"></div>
4
 </div>
5
-<div class="vsplitter">&nbsp;</div>
6
 <div id="taskcontent" class="type"></div>
7
kolab-webadmin-3.2.14.tar.gz/public_html/skins/default/templates/user.html -> kolab-webadmin-3.2.15.tar.gz/public_html/skins/default/templates/user.html Changed
7
 
1
@@ -2,5 +2,4 @@
2
     {include file="search.html" list="user.list"}
3
     <div id="userlist"></div>
4
 </div>
5
-<div class="vsplitter">&nbsp;</div>
6
 <div id="taskcontent" class="user"></div>
7
kolab-webadmin.dsc Changed
17
 
1
@@ -2,7 +2,7 @@
2
 Source: kolab-webadmin
3
 Binary: kolab-webadmin
4
 Architecture: all
5
-Version: 3.2.14-0~kolab2
6
+Version: 3.2.15-0~kolab1
7
 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
8
 Uploaders: Paul Klos <kolab@klos2day.nl>
9
 Homepage: http://www.kolab.org/
10
@@ -13,5 +13,5 @@
11
 Package-List:
12
  kolab-webadmin deb admin extra
13
 Files:
14
- 00000000000000000000000000000000 0 kolab-webadmin-3.2.14.tar.gz
15
+ 00000000000000000000000000000000 0 kolab-webadmin-3.2.15.tar.gz
16
  00000000000000000000000000000000 0 debian.tar.gz
17
Refresh


Request History
Jeroen van Meeuwen's avatar

vanmeeuwen created request over 5 years ago

Check in 3.2.15


Jeroen van Meeuwen's avatar

vanmeeuwen accepted review over 5 years ago

Accept


Jeroen van Meeuwen's avatar

vanmeeuwen accepted review over 5 years ago

Accept


Jeroen van Meeuwen's avatar

vanmeeuwen approved review over 5 years ago

Accept


Jeroen van Meeuwen's avatar

vanmeeuwen accepted request over 5 years ago

Accept