Kolab Groupware OBS

kolab-webadmin.spec Changed

kolab-webadmin-3.2.16.tar.gz/lib/api/kolab_api_service_user.php Changed

@@ -180,6 +180,28 @@
     }
 
     /**
+     * Reset user passwordRetryCount.
+     *
+     * @param array $get  GET parameters
+     * @param array $post POST parameters
+     *
+     * @return bool True on success, False on failure
+     */
+    public function user_reset_password_retry_count($getdata, $postdata)
+    {
+        $user_id = $postdata'id';
+
+        if (empty($user_id)) {
+            return false;
+        }
+
+        $auth   = Auth::get_instance();
+        $result = $auth->user_edit($user_id, array('passwordretrycount' => 0));
+
+        return $result !== false;
+    }
+
+    /**
      * Effective rights on user record.
      *
      * @param array $get  GET parameters
@@ -209,12 +231,14 @@
             return false;
         }
 
-        $auth   = Auth::get_instance();
-        $attrs  = $this->object_attributes('user');
+        $auth    = Auth::get_instance();
+        $attrs   = $this->object_attributes('user');
+        $attrs = 'passwordRetryCount';
+
         $result = $auth->user_info($getdata'id', $attrs);
 
         // normalize result
-        $result = $this->parse_result_attributes('user', $result);
+        $result = $this->parse_result_attributes('user', $result, array('passwordretrycount'));
 
         Log::trace("user.info on " . $getdata'id' . " parsed result: " . var_export($result, TRUE));

kolab-webadmin-3.2.16.tar.gz/lib/client/kolab_client_task_user.php Changed

@@ -172,8 +172,18 @@
             'astvoicemailpassword'      => 'asterisk',
         );
 
+        // Special attributes/functionality
+        $custom_fields = array();
+        if (!empty($data'id') && isset($data'passwordretrycount')) {
+            $custom_fields'passwordretrycount' = array(
+                'section' => 'system',
+                'type' => kolab_form::INPUT_CUSTOM,
+                'value' => (int) $data'passwordretrycount',
+            );
+        }
+
         // Prepare fields
-        $form = $this->form_prepare('user', $data, array('userpassword2'), null, $fields_map'type_id');
+        $form = $this->form_prepare('user', $data, array('userpassword2'), null, $fields_map'type_id', $custom_fields);
         list($fields, $types, $type, $add_mode) = $form;
 
         // Add password confirmation
@@ -208,6 +218,19 @@
 
             // remove password
             $data'userpassword' = '';
+
+            // Add Reset button for passwordRetyCount attribute, if user has permissions
+            if (!empty($fields'passwordretrycount') && empty($fields'passwordretrycount''readonly')
+                && $data'passwordretrycount' > 0
+            ) {
+                $fields'passwordretrycount''suffix' = kolab_html::a(array(
+                        'content' => $this->translate('search.reset'),
+                        'href'    => '#',
+                        'id'      => 'passwordretrycountreset',
+                        'onclick' => "kadm.reset_password_retry_count()",
+                        'class'   => 'btn-sm',
+                ));
+            }
         }
 
         // Create form object and populate with fields

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

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

@@ -1040,10 +1040,11 @@
      * @param array  $extra_fields Extra field names
      * @param string $used_for     Object types filter
      * @param string $id_section   Name of section for type_id field
+     * @param array  $custom_fields Extra fields definitions
      *
      * @return array Fields list, Object types list, Current type ID
      */
-    protected function form_prepare($name, &$data, $extra_fields = array(), $used_for = null, $id_section = null)
+    protected function form_prepare($name, &$data, $extra_fields = array(), $used_for = null, $id_section = null, $custom_fields = array())
     {
         $types        = (array) $this->object_types($name, $used_for);
         $add_mode     = empty($data'id');
@@ -1156,6 +1157,8 @@
             }
         }
 
+        $fields += $custom_fields;
+
         // Get the rights on the entry and attribute level
         $data'effective_rights' = $this->effective_rights($name, $data'id');
         $attribute_rights         = (array) $data'effective_rights''attribute';

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

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

kolab-webadmin-3.2.16.tar.gz/vendor/autoload.php Changed

kolab-webadmin-3.2.16.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit0016beb2f0c3d197ddcaa17ced2bbbfa
+class ComposerAutoloaderInitb76906ee33a551633cc7a80993be3579
 {
     private static $loader;
 
@@ -24,9 +24,9 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit0016beb2f0c3d197ddcaa17ced2bbbfa', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitb76906ee33a551633cc7a80993be3579', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit0016beb2f0c3d197ddcaa17ced2bbbfa', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitb76906ee33a551633cc7a80993be3579', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths = get_include_path();
@@ -36,7 +36,7 @@
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit0016beb2f0c3d197ddcaa17ced2bbbfa::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitb76906ee33a551633cc7a80993be3579::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {

kolab-webadmin-3.2.16.tar.gz/vendor/composer/autoload_static.php Changed

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit0016beb2f0c3d197ddcaa17ced2bbbfa
+class ComposerStaticInitb76906ee33a551633cc7a80993be3579
 {
     public static $prefixesPsr0 = array (
         'N' => 
@@ -237,9 +237,9 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixesPsr0 = ComposerStaticInit0016beb2f0c3d197ddcaa17ced2bbbfa::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit0016beb2f0c3d197ddcaa17ced2bbbfa::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit0016beb2f0c3d197ddcaa17ced2bbbfa::$classMap;
+            $loader->prefixesPsr0 = ComposerStaticInitb76906ee33a551633cc7a80993be3579::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInitb76906ee33a551633cc7a80993be3579::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInitb76906ee33a551633cc7a80993be3579::$classMap;
 
         }, null, ClassLoader::class);
     }

kolab-webadmin-3.2.16.tar.gz/vendor/composer/installed.php Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/index Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/logs/HEAD Changed

@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a Christian Mollekopf <mollekopf@apheleia-it.ch> 1682347660 +0200	clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
-6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a 6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a Christian Mollekopf <mollekopf@apheleia-it.ch> 1682347660 +0200	checkout: moving from master to master
-6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a 6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a Christian Mollekopf <mollekopf@apheleia-it.ch> 1682347660 +0200	reset: moving to 6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a
+0000000000000000000000000000000000000000 6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a Christian Mollekopf <mollekopf@apheleia-it.ch> 1682502294 +0200	clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a 6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a Christian Mollekopf <mollekopf@apheleia-it.ch> 1682502295 +0200	checkout: moving from master to master
+6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a 6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a Christian Mollekopf <mollekopf@apheleia-it.ch> 1682502295 +0200	reset: moving to 6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads/master Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin/HEAD Changed

Changes of Revision 3