Kolab Groupware OBS

kolab-webadmin-3.2.12.tar.gz/lib/client/kolab_client_task_settings.php Changed

@@ -166,7 +166,7 @@
     }
 
     /**
-     * Groups list action.
+     * Object types list action.
      */
     public function action_type_list()
     {
@@ -342,12 +342,50 @@
     }
 
     /**
-     * Group information (form) action.
+     * Object type information (form) action.
      */
     public function action_type_info()
     {
-        $id   = $this->get_input('id', 'POST');
-        $data = array();
+        $id      = $this->get_input('id', 'POST');
+        $result  = $this->read_type_data($id);
+
+        $output = $this->type_form($result'attribs', $result'data');
+
+        $this->output->set_object('taskcontent', $output);
+    }
+
+    /**
+     * Object type adding (form) action.
+     */
+    public function action_type_add()
+    {
+        if ($clone_id = $this->get_input('clone_id', 'POST')) {
+            $result = $this->read_type_data($clone_id);
+            $data   = $result'data';
+
+            unset($data'id', $data'is_default', $data'key', $data'name');
+        }
+
+        if (empty($data)) {
+            $data = $this->get_input('data', 'POST');
+
+            if (empty($data'type')) {
+                $data'type' = self::get_input('type', 'POST');
+                if (empty($data'type') || !in_array($data'type', $this->object_types)) {
+                    $data'type' = 'user';
+                }
+            }
+        }
+
+        $output = $this->type_form(null, $data, true);
+
+        $this->output->set_object('taskcontent', $output);
+    }
+
+    private function read_type_data($id, $clone = false)
+    {
+        $data    = array();
+        $attribs = array();
 
         list($type, $idx) = explode(':', $id);
 
@@ -364,30 +402,20 @@
 
             $data'objectclass' = $data'attributes''fields''objectclass';
             unset($data'attributes''fields''objectclass');
-        }
-
-        $output = $this->type_form(null, $data);
-
-        $this->output->set_object('taskcontent', $output);
-    }
-
-    /**
-     * Groups adding (form) action.
-     */
-    public function action_type_add()
-    {
-        $data = $this->get_input('data', 'POST');
 
-        if (empty($data'type')) {
-            $data'type' = self::get_input('type', 'POST');
-            if (empty($data'type') || !in_array($data'type', $this->object_types)) {
-                $data'type' = 'user';
+            // enable Clone button
+            if (!$clone) {
+                $caps_actions = $this->get_capability('actions');
+                if (!empty($caps_actions'type.add')) {
+                    $attribs = array('clone-button' => 'settings.type_clone');
+                }
             }
         }
 
-        $output = $this->type_form(null, $data, true);
-
-        $this->output->set_object('taskcontent', $output);
+        return array(
+            'data'    => $data,
+            'attribs' => $attribs,
+        );
     }
 
     /**
@@ -395,6 +423,10 @@
      */
     private function type_form($attribs, $data = array())
     {
+        if (!is_array($attribs)) {
+            $attribs = array();
+        }
+
         if (empty($attribs'id')) {
             $attribs'id' = 'type-form';
         }

kolab-webadmin-3.2.12.tar.gz/lib/kolab_api_service.php Changed

kolab-webadmin-3.2.12.tar.gz/lib/kolab_client_task.php Changed

@@ -1474,10 +1474,11 @@
             $form->add_button(array(
                 'value'   => kolab_html::escape($this->translate('button.submit')),
                 'onclick' => "kadm.command('{$name}.save')",
+                'class'   => 'submit',
             ));
         }
 
-        // add delete button
+        // add Delete button
         if ($this->is_deletable($data)) {
             $id = $data'id';
             $form->add_button(array(
@@ -1486,6 +1487,15 @@
             ));
         }
 
+        // add Clone button
+        if (!empty($attribs'clone-button')) {
+            $id = $data'id';
+            $form->add_button(array(
+                'value'   => kolab_html::escape($this->translate('button.clone')),
+                'onclick' => "kadm.command('{$attribs'clone-button'}', '{$id}')",
+            ));
+        }
+
         $ac_min_len = $this->config_get('autocomplete_min_length', 1, Conf::INT);
 
         $this->output->set_env('form_id', $attribs'id');
@@ -1631,12 +1641,42 @@
             $attrs  = $this->get_search_attribs($field);
             $search_request = array();
 
-            foreach ($attrs as $attr) {
-                $search_request$attr = array(
-                    'value' => $search,
-                    'type'  => $method,
+            // Support attribute=value searches
+            if ($task != 'settings' && preg_match('/^(a-z0-9+)(~<>*=)(.+)$/i', $search, $m)) {
+                $search_attr  = $m1;
+                $search_type  = $m2;
+                $search_value = $m3;
+
+                if ($search_value === '*') {
+                    $search_type  = 'exists';
+                    $search_value = '';
+                }
+                else if ($search_value0 === '*' && $search_valuestrlen($search_value)-1 === '*') {
+                    $search_type  = 'both';
+                    $search_value = substr($search_value, 1, -1);
+                }
+                else if ($search_value0 === '*') {
+                    $search_type  = 'suffix';
+                    $search_value = substr($search_value, 1);
+                }
+                else if ($search_valuestrlen($search_value)-1 === '*') {
+                    $search_type  = 'prefix';
+                    $search_value = substr($search_value, 0, -1);
+                }
+
+                $search_request$search_attr = array(
+                    'value' => $search_value,
+                    'type'  => $search_type,
                 );
             }
+            else {
+                foreach ($attrs as $attr) {
+                    $search_request$attr = array(
+                        'value' => $search,
+                        'type'  => $method,
+                    );
+                }
+            }
         }
         else if (!empty($_POST'search_request')) {
             $search_request = self::get_input('search_request', 'POST');

kolab-webadmin-3.2.12.tar.gz/lib/locale/en_US.php Changed

kolab-webadmin-3.2.12.tar.gz/public_html/js/kolab_admin.js Changed

kolab-webadmin-3.2.12.tar.gz/public_html/skins/default/style.css Changed

Changes of Revision 4