Request 2623 (accepted)

kolab-webadmin.spec Changed

debian.changelog Changed

kolab-webadmin-3.2.14.tar.gz/lib/Auth/LDAP.php -> kolab-webadmin-3.2.15.tar.gz/lib/Auth/LDAP.php Changed

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

@@ -50,19 +50,19 @@
         $effective_rights = $auth->list_rights($domain_base_dn);
         $rights           = array();
 
-        if (in_array('add', $effective_rights['entryLevelRights'])) {
+        if (in_array('add', $effective_rights['entrylevelrights'])) {
             $rights['add'] = "w";
         }
 
-        if (in_array('delete', $effective_rights['entryLevelRights'])) {
+        if (in_array('delete', $effective_rights['entrylevelrights'])) {
             $rights['delete'] = "w";
         }
 
-        if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
+        if (in_array('modrdn', $effective_rights['entrylevelrights'])) {
             $rights['edit'] = "w";
         }
 
-        if (in_array('read', $effective_rights['entryLevelRights'])) {
+        if (in_array('read', $effective_rights['entrylevelrights'])) {
             $rights['find'] = "r";
             $rights['info'] = "r";
         }
@@ -95,6 +95,8 @@
         $attributes[$dna] = (array) $attributes[$dna];
         $domain           = array_shift($attributes[$dna]);
 
+        $this->_mod_domain_attrs($domain, $attributes);
+
         $result = $auth->domain_add($domain, $attributes);
 
         if ($result) {
@@ -102,6 +104,9 @@
                 $attributes['id'] = $id;
             }
 
+
+            $this->_after_domain_created($attributes, $domain);
+
             return $attributes;
         }
 
@@ -167,8 +172,11 @@
             }
         }
 
-        $attributes = $this->parse_input_attributes('domain', $postdata);
-        $result     = $auth->domain_edit($postdata['id'], $attributes, $postdata['type_id']);
+        $attributes = $this->parse_input_attributes('domain', $postdata, $postdata['type_id']);
+
+        $this->_mod_domain_attrs(null, $attributes);
+
+        $result = $auth->domain_edit($postdata['id'], $attributes, $postdata['type_id']);
 
         if ($result) {
             return $result;
@@ -266,4 +274,149 @@
 
         return false;
     }
+
+    /**
+     * Modify hosted domain attributes
+     */
+    protected function _mod_domain_attrs($domain, &$attributes)
+    {
+        // Generate attributes (aci, inetdomainbasedn) for hosted domains
+        $conf = Conf::get_instance();
+        if ($conf->get('kolab_wap', 'hosted_root_dn')) {
+
+            $domain_name_attribute = $conf->get('ldap', 'domain_name_attribute');
+            $hosted_root_dn        = $conf->get('kolab_wap', 'hosted_root_dn');
+            $mgmt_root_dn          = $conf->get('kolab_wap', 'mgmt_root_dn');
+
+            if (empty($mgmt_root_dn)) {
+                $mgmt_root_dn = $conf->get('root_dn');
+            }
+
+            if (empty($domain_name_attribute)) {
+                $domain_name_attribute = 'associateddomain';
+            }
+
+            if (!is_array($attributes[$domain_name_attribute])) {
+                $attributes[$domain_name_attribute] = (array) $attributes[$domain_name_attribute];
+            }
+
+            if (empty($domain)) {
+                $domain = $attributes[$domain_name_attribute][0];
+            }
+
+            if (!in_array($domain, $attributes[$domain_name_attribute])) {
+                array_unshift($attributes[$domain_name_attribute], $domain);
+            }
+
+            $domain_root_dn = 'ou=' . $domain . ',' . $hosted_root_dn;
+
+            $aci  = array(
+                '(targetattr = "*")'
+                . '(version 3.0; acl "Deny Unauthorized"; deny (all)'
+                . '(userdn != "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . ' || '
+                . 'ldap:///ou=People,' . $domain_root_dn . '??sub?(objectclass=inetorgperson)") AND NOT '
+                . 'roledn = "ldap:///cn=kolab-admin,' . $mgmt_root_dn . '";)',
+
+                '(targetattr != "userPassword")'
+                . '(version 3.0;acl "Search Access";allow (read,compare,search)'
+                . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . ' || '
+                . 'ldap:///ou=People,' . $domain_root_dn . '??sub?(objectclass=inetorgperson)");)',
+
+                '(targetattr = "*")'
+                . '(version 3.0;acl "Kolab Administrators";allow (all)'
+                . '(roledn = "ldap:///cn=kolab-admin,' . $domain_root_dn . ' || '
+                . 'ldap:///cn=kolab-admin,' . $mgmt_root_dn . '");)'
+            );
+
+            $attributes['aci']              = $aci;
+            $attributes['inetdomainbasedn'] = $domain_root_dn;
+
+            $this->is_hosted = true;
+        }
+    }
+
+    /**
+     * Create LDAP object related to the new hosted domain
+     */
+    protected function _after_domain_created($attributes, $domain)
+    {
+        if (!$this->is_hosted) {
+            return;
+        }
+
+        $conf         = Conf::get_instance();
+        $ou_service   = $this->controller->get_service('ou');
+        $role_service = $this->controller->get_service('role');
+
+        $hosted_root_dn = $conf->get('kolab_wap', 'hosted_root_dn');
+        $mgmt_root_dn   = $conf->get('kolab_wap', 'mgmt_root_dn');
+        $domain_root_dn = 'ou=' . $domain . ',' . $hosted_root_dn;
+
+        if (empty($mgmt_root_dn)) {
+            $mgmt_root_dn = $conf->get('root_dn');
+        }
+
+        $ou_domain = array(
+            'ou'            => $domain,
+            'base_dn'       => $hosted_root_dn,
+            'description'   => $domain,
+            'type_id'       => 1,
+        );
+
+        $ou_domain['aci'] = array(
+            '(targetattr = "*")'
+            . '(version 3.0;acl "Deny Unauthorized"; deny (all)'
+            . '(userdn != "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . ' || '
+            . 'ldap:///ou=People,' . $domain_root_dn . '??sub?(objectclass=inetorgperson)") AND NOT '
+            . 'roledn = "ldap:///cn=kolab-admin,' . $mgmt_root_dn . '";)',
+
+            '(targetattr != "userPassword")'
+            . '(version 3.0;acl "Search Access";allow (read,compare,search,write)'
+            . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . ' || '
+            . 'ldap:///ou=People,' . $domain_root_dn . '??sub?(objectclass=inetorgperson)");)',
+
+            '(targetattr = "*")'
+            . '(version 3.0;acl "Kolab Administrators";allow (all)'
+            . '(roledn = "ldap:///cn=kolab-admin,' . $domain_root_dn . ' || '
+            . 'ldap:///cn=kolab-admin,' . $mgmt_root_dn . '");)',
+
+            '(target = "ldap:///ou=*,' . $domain_root_dn . '")(targetattr="objectclass || aci || ou")'
+            . '(version 3.0;acl "Allow Domain sub-OU Registration"; allow (add)'
+            . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . '");)',
+
+            '(target = "ldap:///uid=*,ou=People,' . $domain_root_dn . '")(targetattr="*")'
+            . '(version 3.0;acl "Allow Domain First User Registration"; allow (add)'
+            . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . '");)',
+
+            '(target = "ldap:///cn=*,' . $domain_root_dn . '")(targetattr="objectclass || cn")'
+            . '(version 3.0;acl "Allow Domain Role Registration"; allow (add)'
+            . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmt_root_dn . '");)',
+        );
+
+        $ou_service->ou_add(null, $ou_domain);
+
+        // Add OU trees
+
+        foreach (array('Groups', 'People', 'Resources', 'Shared Folders') as $item) {
+            $ou = array(
+                'ou'            => $item,
+                'base_dn'       => $domain_root_dn,
+                'type_id'       => 1,
+                'description'   => $item,
+            );
+
+            $ou_service->ou_add(null, $ou);
+        }
+
+        // Add an admin role
+
+        $role = array(
+            'cn'            => 'kolab-admin',
+            'description'   => 'Domain Administrator',
+            'type_id'       => 1,
+            'base_dn'       => $domain_root_dn,
+        );
+
+        $role_service->role_add(null, $role);
+    }
 }

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

@@ -57,6 +57,33 @@
         ),
     );
 
+    public static $HOSTED_TYPE_ATTRS = array(
+        'auto_form_fields' => array(),
+        'form_fields' => array(
+            'associateddomain' => array(
+                'type' => 'list'
+            ),
+//            'inetdomainbasedn' => array(
+//                'optional' => true,
+//            ),
+            'inetdomainstatus' => array(
+                'optional' => true,
+                'type'     => 'select',
+                'values'   => array(
+                    '', 'active', 'suspended', 'deleted',
+                ),
+            ),
+        ),
+        'fields' => array(
+            'domainrelatedobject_only' => 1,
+            'objectclass' => array(
+                'top',
+                'domainrelatedobject',
+                'inetdomain',
+            ),
+        ),
+    );
+
 
     /**
      * Returns service capabilities.
@@ -83,14 +110,23 @@
     public function domain_types_list($get, $post)
     {
         // @TODO: move to database
-        $types = array(
-            1 => array(
+        $types = array();
+
+        if ($this->conf->get('kolab_wap', 'hosted_root_dn')) {
+            $types[1] = array(
+                'key'         => 'hosted',
+                'name'        => 'Hosted domain',
+                'description' => 'A hosted domain name space',
+                'attributes'  => self::$HOSTED_TYPE_ATTRS,
+            );
+        } else {
+            $types[1] = array(
                 'key'         => 'standard',
                 'name'        => 'Standard domain',
                 'description' => 'A standard domain name space',
                 'attributes'  => self::$DEFAULT_TYPE_ATTRS,
-            ),
-        );
+            );
+        }
 
         return array(
             'list'  => $types,

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

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

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

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

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

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

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

@@ -40,19 +40,19 @@
         $effective_rights = $this->type_effective_rights();
         $rights           = array();
 
-        if (in_array('add', (array)$effective_rights['entryLevelRights'])) {
+        if (in_array('add', (array)$effective_rights['entrylevelrights'])) {
             $rights['add'] = "w";
         }
 
-        if (in_array('delete', (array)$effective_rights['entryLevelRights'])) {
+        if (in_array('delete', (array)$effective_rights['entrylevelrights'])) {
             $rights['delete'] = "w";
         }
 
-        if (in_array('modrdn', (array)$effective_rights['entryLevelRights'])) {
+        if (in_array('modrdn', (array)$effective_rights['entrylevelrights'])) {
             $rights['edit'] = "w";
         }
 
-        if (in_array('read', (array)$effective_rights['entryLevelRights'])) {
+        if (in_array('read', (array)$effective_rights['entrylevelrights'])) {
             $rights['info'] = "r";
         }
 
@@ -84,7 +84,7 @@
         }
 
         $effective_rights = $this->type_effective_rights();
-        if (!in_array('add', (array)$effective_rights['entryLevelRights'])) {
+        if (!in_array('add', (array)$effective_rights['entrylevelrights'])) {
             return false;
         }
 
@@ -146,7 +146,7 @@
         $object_id        = $postdata['id'];
         $effective_rights = $this->type_effective_rights();
 
-        if (!in_array('delete', (array)$effective_rights['entryLevelRights'])) {
+        if (!in_array('delete', (array)$effective_rights['entrylevelrights'])) {
             return false;
         }
 
@@ -178,7 +178,7 @@
         }
 
         $effective_rights = $this->type_effective_rights();
-        if (!in_array('modrdn', (array)$effective_rights['entryLevelRights'])) {
+        if (!in_array('modrdn', (array)$effective_rights['entrylevelrights'])) {
             return false;
         }
 
@@ -224,10 +224,10 @@
         if (strtolower($_SESSION['user']->get_userid()) == 'cn=directory manager') {
             $attr_acl = array('read', 'write', 'delete');
             $effective_rights = array(
-                'entryLevelRights' => array(
+                'entrylevelrights' => array(
                     'read', 'add', 'delete', 'modrdn',
                 ),
-                'attributeLevelRights' => array(
+                'attributelevelrights' => array(
                     'key'         => $attr_acl,
                     'name'        => $attr_acl,
                     'description' => $attr_acl,

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@
 $LANG['about.kolabsys'] = 'Kolab Systems';
 $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.';
 $LANG['about.technology'] = 'Technology';
-$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>.';
+$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>.';
 
 $LANG['aci.new'] = 'New...';
 $LANG['aci.edit'] = 'Edit...';
@@ -142,7 +142,7 @@
 $LANG['domain.o'] = 'Organization';
 $LANG['domain.other'] = 'Other';
 $LANG['domain.system'] = 'System';
-$LANG['domain.type_id'] = 'Standard Domain';
+$LANG['domain.type_id'] = 'Domain type';
 
 $LANG['edit'] = 'Edit';
 $LANG['error'] = 'Error';
@@ -226,7 +226,7 @@
 $LANG['ou.delete.success'] = 'Unit deleted successfully.';
 $LANG['ou.description'] = 'Unit Description';
 $LANG['ou.edit.success'] = 'Unit updated successfully.';
-$LANG['ou.list'] = 'Organizational Unit List';
+$LANG['ou.list'] = 'Organizational Units List';
 $LANG['ou.norecords'] = 'No organizational unit records found!';
 $LANG['ou.system'] = 'Details';
 $LANG['ou.type_id'] = 'Unit Type';
@@ -244,7 +244,7 @@
 $LANG['resource.kolabtargetfolder'] = 'Target Folder';
 $LANG['resource.kolabinvitationpolicy'] = 'Invitation Policy';
 $LANG['resource.kolabdescattribute'] = 'Attributes';
-$LANG['resource.list'] = 'Resource (Collection) List';
+$LANG['resource.list'] = 'Resources (Collections) List';
 $LANG['resource.mail'] = 'Mail Address';
 $LANG['resource.member'] = 'Collection Members';
 $LANG['resource.norecords'] = 'No resource records found!';
@@ -263,7 +263,7 @@
 $LANG['role.delete.success'] = 'Role deleted successfully.';
 $LANG['role.description'] = 'Role Description';
 $LANG['role.edit.success'] = 'Role updated successfully.';
-$LANG['role.list'] = 'Role List';
+$LANG['role.list'] = 'Roles List';
 $LANG['role.norecords'] = 'No role records found!';
 $LANG['role.system'] = 'Details';
 $LANG['role.type_id'] = 'Role Type';

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -28,14 +28,16 @@
     <div id="navigation">{$main_menu}</div>
     <div id="task_navigation">{$task_menu}</div>
     <div id="content">
+        <div id="taskcontent">
         <h1>{$engine->translate('welcome')}</h1>
-        <div id="main">
-            {foreach $tasks as $link => $label}
-            <div class="{preg_replace('/\..*$/', '', $link)}" onclick="kadm.command('{$link}', '', this)">
-                <span class="image font-icon"></span>
-                <span class="label">{$engine->translate($label)}</span>
+            <div id="main">
+                {foreach $tasks as $link => $label}
+                <div class="{preg_replace('/\..*$/', '', $link)}" onclick="kadm.command('{$link}', '', this)">
+                    <span class="image font-icon"></span>
+                    <span class="label">{$engine->translate($label)}</span>
+                </div>
+                {/foreach}
             </div>
-            {/foreach}
         </div>
     </div>
     <div id="footer">

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

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

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

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

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

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

kolab-webadmin.dsc Changed

Overview

Request 2623 (accepted)

Request History