Changeset 13510

Timestamp:

11/20/07 13:44:23 (1 year ago)

Author:

adrenalin

Message:

Added batch processing for new passwords

Files:

• trunk/midcom/midcom.admin.user/config/config.inc (modified) (1 diff)
• trunk/midcom/midcom.admin.user/documentation (added)
• trunk/midcom/midcom.admin.user/documentation/CHANGES (added)
• trunk/midcom/midcom.admin.user/handler/list.php (modified) (2 diffs)
• trunk/midcom/midcom.admin.user/handler/user/edit.php (modified) (5 diffs)
• trunk/midcom/midcom.admin.user/locale/default.en.txt (modified) (14 diffs)
• trunk/midcom/midcom.admin.user/locale/default.fi.txt (modified) (14 diffs)
• trunk/midcom/midcom.admin.user/plugin.php (modified) (3 diffs)
• trunk/midcom/midcom.admin.user/static/usermgmt.css (modified) (1 diff)
• trunk/midcom/midcom.admin.user/style/midcom-admin-user-generate-passwords.php (modified) (3 diffs)
• trunk/midcom/midcom.admin.user/style/midcom-admin-user-password-email.php (added)
• trunk/midcom/midcom.admin.user/style/midcom-admin-user-password-nonajax-header.php (added)
• trunk/midcom/midcom.admin.user/style/midcom-admin-user-passwords-list.php (added)
• trunk/midcom/midcom.admin.user/style/midcom-admin-user-personlist-footer.php (modified) (4 diffs)
• trunk/midcom/midcom.admin.user/style/midcom-admin-user-personlist-header.php (modified) (1 diff)

trunk/midcom/midcom.admin.user/config/config.inc

@@ -22 +22 @@
-    'city', 
-),
+'message_subject' => 'your password has been changed',
+'message_body' => "Your password has been changed. Your new password is __PASSWORD__
+
+-- 
+__FROM__ - __LONGDATE__
+",
+'message_sender' => 'www-data@kaktus.cc',

trunk/midcom/midcom.admin.user/handler/list.php

@@ -111 +111 @@
-        $data['search_fields'] = $this->_config->get('search_fields');
-        $data['list_fields'] = $this->_config->get('list_fields');
+        
+        // Set the passwords elsewhere, but check the request first
+        if (   isset($_POST['midcom_admin_user_action'])
+            && $_POST['midcom_admin_user_action'] === 'passwords')
+        {
+            if (   !isset($_POST['midcom_admin_user'])
+                || count($_POST['midcom_admin_user']) === 0)
+            {
+                $_MIDCOM->uimessages->add($this->_l10n->get('midcom.admin.user'), $this->_l10n->get('empty selection'));
+            }
+            else
+            {
+                $get = implode('&midcom_admin_user[]=', $_POST['midcom_admin_user']);
+                
+                $_MIDCOM->relocate("__mfa/asgard_midcom.admin.user/password/batch/?midcom_admin_user[]={$get}");
+                // This will exit
+            }
+        }
-        
-        if (   isset($_POST['midcom_admin_user'])
@@ -147 +165 @@
-                            }
-                        }
+                        break;
-                }
-            }

trunk/midcom/midcom.admin.user/handler/user/edit.php

@@ -30 +30 @@
-    function _on_initialize()
-    {
-
-        $this->_l10n = $_MIDCOM->i18n->get_l10n('midcom.admin.user');
-        $this->_request_data['l10n'] = $this->_l10n;
@@ -45 +44 @@
-
-        midgard_admin_asgard_plugin::prepare_plugin($this->_l10n->get('midcom.admin.user'),$this->_request_data);
-
-    }
-    
@@ -77 +75 @@
-    function _prepare_toolbar(&$data,$handler_id)
-    {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-            $data['asgard_toolbar']->add_item
@@ -94 +104 @@
-    }
-
-
-
-    /**
-     * Loads and prepares the schema database.
@@ -228 +236 @@
-        midcom_show_style('midcom-admin-user-generate-passwords');
-    }
+    
+    /** 
+     * Internal helper for processing the batch change of passwords
+     * 
+     * @access private
+     */
+    function _process_batch_change()
+    {
+        if (   !isset($_POST['midcom_admin_user'])
+            || count($_POST['midcom_admin_user']) === 0)
+        {
+            return;
+        }
+        
+        if (isset($_POST['f_cancel']))
+        {
+            $_MIDCOM->uimessages->add($this->_l10n->get('midcom.admin.user'), $_MIDCOM->i18n->get_string('cancelled', 'midcom'));
+            $_MIDCOM->relocate('__mfa/asgard_midcom.admin.user/');
+            // This will exit
+        }
+        
+        // Load the org.openpsa.mail class
+        $_MIDCOM->componentloader->load('org.openpsa.mail');
+        
+        // Set the mail commo parts
+        $mail = new org_openpsa_mail();
+        $mail->from = $this->_config->get('message_sender');
+        $mail->encoding = 'UTF-8';
+        
+        // Success switch
+        $success = true;
+        
+        // Get the context prefix
+        $prefix = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX);
+        
+        // Change every user or continue to next on failure - failures will show UI messages
+        foreach ($_POST['midcom_admin_user'] as $id)
+        {
+            $person = new midcom_db_person($id);
+            
+            // Check integrity
+            if (   !$person
+                || !$person->guid)
+            {
+                $_MIDCOM->uimessages->add($this->_l10n->get('midcom.admin.user'), sprintf($this->_l10n->get('failed to get the user with id %s'), $id), 'error');
+                $success = false;
+                continue;
+            }
+            
+            // This shortcut is used in case of errors
+            $person_edit_url = "<a href=\"{$prefix}__mfa/asgard_midcom.admin.user/edit/{$person->guid}\">{$person->name}</a>";
+            
+            // Cannot send the email if address is not specified
+            if (!$person->email)
+            {
+                $_MIDCOM->uimessages->add($this->_l10n->get('midcom.admin.user'), sprintf($this->_l10n->get('no email address defined for %s'), $person_edit_url), 'error');
+                continue;
+            }
+            
+            // Recipient
+            $mail->to = $person->email;
+            
+            // Clean, unchanged message
+            $body = $_POST['body'];
+            $subject = $_POST['subject'];
+            
+            // Store the old password
+            $person->set_parameter('midcom.admin.user', 'old_password', $person->password);
+            
+            // Get a new password
+            $password = midcom_admin_user_plugin::generate_password(8);
+            
+            // Replace the variables
+            foreach ($this->_request_data['variables'] as $key => $value)
+            {
+                // Replace the variables with personalized values
+                switch ($key)
+                {
+                    case '__PASSWORD__':
+                        $subject = str_replace($key, $password, $subject);
+                        $body = str_replace($key, $password, $body);
+                        break;
+                    
+                    case '__FROM__':
+                        $subject = str_replace($key, $this->_config->get('message_sender'), $subject);
+                        $body = str_replace($key, $this->_config->get('message_sender'), $body);
+                        break;
+                    
+                    case '__LONGDATE__':
+                        $subject = str_replace($key, strftime('%c'), $subject);
+                        $body = str_replace($key, strftime('%c'), $body);
+                        break;
+                    
+                    case '__SHORTDATE__':
+                        $subject = str_replace($key, strftime('%x'), $subject);
+                        $body = str_replace($key, strftime('%x'), $body);
+                        break;
+                    
+                    case '__TIME__':
+                        $subject = str_replace($key, strftime('%X'), $subject);
+                        $body = str_replace($key, strftime('%X'), $body);
+                        break;
+                    
+                    default:
+                        if (!isset($person->$key))
+                        {
+                            continue;
+                        }
+                        $subject = str_replace($key, $person->$key, $subject);
+                        $body = str_replace($key, $person->$key, $body);
+                }
+            }
+            
+            // After the tedious replacing, strings are placed to the mailer
+            $mail->body = $body;
+            $mail->subject = $subject;
+            
+            // Send the message
+            if ($mail->send())
+            {
+                // Set the password
+                $person->password = "**{$password}";
+                
+                if (!$person->update())
+                {
+                    $_MIDCOM->uimessages->add($this->_l10n->get('midcom.admin.user'), sprintf($this->_l10n->get('failed to update the password for %s'), $person_edit_url));
+                    $success = false;
+                }
+            }
+            else
+            {
+//                $_MIDCOM->uimessages->add($this->_l10n->get('midcom.admin.user'), sprintf($this->_l10n->get('failed to send the message to %s'), $person_edit_url), 'error');
+                $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Failed to send the mail, SMTP returned error {$mail->get_error_message()}");
+                // This will exit
+            }
+        }
+        
+        // Show UI message on success
+        if ($success)
+        {
+            $_MIDCOM->uimessages->add($this->_l10n->get('midcom.admin.user'), $this->_l10n->get('passwords updated and mail sent'));
+        }
+        
+        // Relocate to the user administration front page
+        $_MIDCOM->relocate('__mfa/asgard_midcom.admin.user/');
+        // This will exit
+    }
+    
+    /**
+     * Batch process password change
+     * 
+     * @access public
+     */
+    function _handler_batch($handler_id, $args, &$data)
+    {
+        $_MIDCOM->auth->require_admin_user();
+        
+        // Set page title and default variables
+        $data['view_title'] = $this->_l10n->get('batch generate passwords');
+        $data['variables'] = array
+        (
+            '__FIRSTNAME__' => $this->_l10n->get('firstname'),
+            '__LASTNAME__' => $this->_l10n->get('lastname'),
+            '__USERNAME__' => $this->_l10n->get('username'),
+            '__EMAIL__' => $this->_l10n->get('email'),
+            '__PASSWORD__' => $this->_l10n->get('password'),
+            '__FROM__' => $this->_l10n->get('sender'),
+            '__LONGDATE__' => sprintf($this->_l10n->get('long dateformat (%s)'), strftime('%c')),
+            '__SHORTDATE__' => sprintf($this->_l10n->get('short dateformat (%s)'), strftime('%x')),
+            '__TIME__' => sprintf($this->_l10n->get('current time (%s)'), strftime('%X')),
+        );
+        
+        $this->_process_batch_change();
+        
+        
+        if(isset($_GET['ajax']))
+        {
+            return true;
+        }
+        
+        // Prepare the toolbar and breadcrumb
+        midgard_admin_asgard_plugin::get_common_toolbar($data);
+        $this->_prepare_toolbar(&$data, $handler_id);
+        
+        // Populate breadcrumb
+        $tmp = Array();
+        $tmp[] = Array
+        (
+            MIDCOM_NAV_URL => "__mfa/asgard_midcom.admin.user/",
+            MIDCOM_NAV_NAME => $this->_l10n->get('midcom.admin.user'),
+        );
+        $tmp[] = Array
+        (
+            MIDCOM_NAV_URL => '__mfa/asgard_midcom.admin.user/password/batch/',
+            MIDCOM_NAV_NAME => $this->_request_data['view_title'],
+        );
+        $_MIDCOM->set_custom_context_data('midcom.helper.nav.breadcrumb', $tmp);
+        
+        
+        return true;
+    }
+    
+    /**
+     * Show the batch password change form
+     * 
+     * @access public
+     */
+    function _show_batch($handler_id, &$data)
+    {
+        if (!isset($_GET['ajax']))
+        {
+            midgard_admin_asgard_plugin::asgard_header();
+            midcom_show_style('midcom-admin-user-password-nonajax-header');
+        }
+        
+        $data['message_subject'] = $this->_l10n->get($this->_config->get('message_subject'));
+        $data['message_body'] = $this->_l10n->get($this->_config->get('message_body'));
+        
+        midcom_show_style('midcom-admin-user-password-email');
+        
+        if (!isset($_GET['ajax']))
+        {
+            midcom_show_style('midcom-admin-user-passwords-list');
+            midgard_admin_asgard_plugin::asgard_footer();
+        }
+    }
-}
-?>

trunk/midcom/midcom.admin.user/locale/default.en.txt

@@ -4 +4 @@
----LANGUAGE en
-
+---STRING Your password has been changed. Your new password is __PASSWORD__
+Your password has been changed. Your new password is __PASSWORD__
+---STRINGEND
+
----STRING add to group
-Add to group
@@ -16 +20 @@
----STRINGEND
-
+---STRING batch generate passwords
+Batch generate passwords
+---STRINGEND
+
+---STRING change passwords
+Change passwords
+---STRINGEND
+
----STRING choose action
-Choose action
@@ -32 +44 @@
----STRINGEND
-
+---STRING current time (%s)
+Current time (%s)
+---STRINGEND
+
----STRING edit %s
-Edit %s
@@ -44 +60 @@
----STRINGEND
-
+---STRING empty selection
+Empty selection
+---STRINGEND
+
----STRING enable ajax in toolbar
-Enable AJAX features of centralized toolbar
@@ -60 +80 @@
----STRINGEND
-
+---STRING failed to send the message to %s
+Failed to send the message to %s
+---STRINGEND
+
+---STRING failed to update the password for %s
+Failed to update the password for %s
+---STRINGEND
+
----STRING firstname
-Firstname
@@ -76 +104 @@
----STRINGEND
-
+---STRING generate new passwords
+Generate new passwords
+---STRINGEND
+
----STRING generate passwords
-Generate passwords
@@ -96 +128 @@
----STRINGEND
-
+---STRING long dateformat
+Long dateformat
+---STRINGEND
+
+---STRING long dateformat (%s)
+Long dateformat (%s)
+---STRINGEND
+
----STRING maximum %s
-Maximum %s
@@ -104 +144 @@
----STRINGEND
-
+---STRING message
+Message
+---STRINGEND
+
----STRING midcom.admin.user
-User management
@@ -116 +160 @@
----STRINGEND
-
+---STRING no email address defined for %s
+No email address defined for %s
+---STRINGEND
+
----STRING official
-Official name
@@ -124 +172 @@
----STRINGEND
-
+---STRING password
+Password
+---STRINGEND
+
----STRING password length
-Password length
@@ -132 +184 @@
----STRINGEND
-
+---STRING passwords updated and mail sent
+Passwords updated and mail sent
+---STRINGEND
+
----STRING person %s saved
-User %s saved
----STRINGEND
-
+---STRING personalized equal
+Personalized equal
+---STRINGEND
+
----STRING postcode
-Postcode
@@ -144 +204 @@
----STRINGEND
-
+---STRING prevent repeating characters
+Prevent repeating characters
+---STRINGEND
+
----STRING prevent similar characters
-Prevent similar characters
@@ -156 +220 @@
----STRINGEND
-
+---STRING sender
+Sender
+---STRINGEND
+
+---STRING short dateformat (%s)
+Short dateformat (%s)
+---STRINGEND
+
+---STRING string
+String
+---STRINGEND
+
+---STRING subject
+Subject
+---STRINGEND
+
----STRING the following fields will be searched: %s
-The following fields will be searched: %s
@@ -172 +252 @@
----STRINGEND
-
+---STRING variable
+Variable
+---STRINGEND
+
----STRING workphone
-Work phone
----STRINGEND
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+

trunk/midcom/midcom.admin.user/locale/default.fi.txt

@@ -4 +4 @@
----LANGUAGE fi
-
+---STRING Your password has been changed. Your new password is __PASSWORD__
+Salasanasi on vaihdettu. Uusi salasanasi on __PASSWORD__
+---STRINGEND
+
----STRING add to group
-LisÀÀ ryhmÀÀn
@@ -16 +20 @@
----STRINGEND
-
+---STRING batch generate passwords
+Massamuutokset salasanoihin
+---STRINGEND
+
+---STRING change passwords
+Muuta salasanat
+---STRINGEND
+
----STRING choose action
-Valitse toiminto
@@ -32 +44 @@
----STRINGEND
-
+---STRING current time (%s)
+Kellonaika (%s)
+---STRINGEND
+
----STRING edit %s
-Muokkaa kohdetta %s
@@ -44 +60 @@
----STRINGEND
-
+---STRING empty selection
+TyhjÀ valinta
+---STRINGEND
+
----STRING enable ajax in toolbar
-KÀytÀ työkalupalkin AJAX-ominaisuuksia
@@ -60 +80 @@
----STRINGEND
-
+---STRING failed to send the message to %s
+Viestin lÀhettÀminen kÀyttÀjÀlle %s epÀonnistui
+---STRINGEND
+
+---STRING failed to update the password for %s
+Salasanan tallentaminen henkilölle %s epÀonnistui
+---STRINGEND
+
----STRING firstname
-Etunimi
@@ -76 +104 @@
----STRINGEND
-
+---STRING generate new passwords
+Luo uudet salasanat
+---STRINGEND
+
+---STRING generate passwords
+Luo salasanoja
+---STRINGEND
+
----STRING go
-Hae
@@ -92 +128 @@
----STRINGEND
-
+---STRING long dateformat
+PitkÀ aikamuoto
+---STRINGEND
+
+---STRING long dateformat (%s)
+PitkÀ aikamuoto (%s)
+---STRINGEND
+
----STRING maximum %s
-Korkeintaan %s
@@ -100 +144 @@
----STRINGEND
-
+---STRING message
+Viesti
+---STRINGEND
+
----STRING midcom.admin.user
-KÀyttÀjien hallinta
@@ -112 +160 @@
----STRINGEND
-
+---STRING no email address defined for %s
+SÀhköpostiosoitetta ei ole mÀÀritetty kÀyttÀjÀlle %s
+---STRINGEND
+
----STRING official
-Virallinen nimi
@@ -120 +172 @@
----STRINGEND
-
+---STRING password
+Salasana
+---STRINGEND
+
----STRING password length
-Salasanan pituus
@@ -128 +184 @@
----STRINGEND
-
+---STRING passwords updated and mail sent
+Salasanat on pÀivitetty ja posti lÀhetetty
+---STRINGEND
+
----STRING person %s saved
-KÀyttÀjÀ %s tallennettu
----STRINGEND
-
+---STRING personalized equal
+Personoitu vastine
+---STRINGEND
+
----STRING postcode
-Postinumero
@@ -140 +204 @@
----STRINGEND
-
+---STRING prevent repeating characters
+EstÀ samojen merkkien toistuminen
+---STRINGEND
+
----STRING prevent similar characters
-EstÀ samanlaiset merkit
@@ -152 +220 @@
----STRINGEND
-
+---STRING sender
+LÀhettÀjÀ
+---STRINGEND
+
+---STRING short dateformat (%s)
+Lyhyt aikamuoto
+---STRINGEND
+
+---STRING string
+Merkkiketju
+---STRINGEND
+
+---STRING subject
+Otsikko
+---STRINGEND
+
----STRING the following fields will be searched: %s
-Haku tehdÀÀn seuraavista kentistÀ: %s
@@ -168 +252 @@
----STRINGEND
-
+---STRING variable
+Muuttuja
+---STRINGEND
+
----STRING workphone
-Työpuhelin
----STRINGEND
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+

trunk/midcom/midcom.admin.user/plugin.php

@@ -68 +68 @@
-             * Generate random passwords
-             * 
-/
+
-             */
-            'user_passwords' => array
@@ -74 +74 @@
-                'handler' => array ('midcom_admin_user_handler_user_edit', 'passwords'),
-                'fixed_args' => array ('password'),
+            ),
+            /**
+             * Generate random passwords
+             * 
+             * Match /user-editor/password/email/
+             */
+            'user_passwords_batch' => array
+            (
+                'handler' => array ('midcom_admin_user_handler_user_edit', 'batch'),
+                'fixed_args' => array ('password', 'batch'),
-            ),
-            /**
@@ -153 +163 @@
-        );
-    }
+    
+    /**
+     * Static method for generating one password
+     * 
+     * @access static public
+     * @param int $length
+     */
+    function generate_password($length, $no_similars = true, $strong = true)
+    {
+        $similars = array
+        (
+            'I', 'l', '1', '0', 'O',
+        );
+        
+        $string = '';
+        for ($x = 0; $x < $length; $x++)
+        {
+            $rand = (int) rand(48, 122);
+            $char = chr($rand);
+            
+            $k = 0;
+            
+            while (   !ereg('[a-zA-Z0-9]', $char)
+                   || (   $strong
+                       && strlen($string) > 0
+                       && strstr($string, $char))
+                   || (   $no_similars
+                       && in_array($char, $similars)))
+            {
+                $rand = (int) rand(48, 122);
+                $char = chr($rand);
+                
+                $k++;
+            }
+            $string .= $char;
+        }
+        
+        return $string;
+    }
-}
-?>

trunk/midcom/midcom.admin.user/static/usermgmt.css

@@ -54 +54 @@
-}
-
-
+
+
-{
+  font-weight: bold;
-  display: block;
+  margin-top: 1em;
-}
+
+#midcom_admin_user_action_passwords h1
+{
+  font-size: 120%;
+}
+
+#midcom_admin_user_email_body
+{
+  width: 20em;
+  height: 15em;
+}

trunk/midcom/midcom.admin.user/style/midcom-admin-user-generate-passwords.php

@@ -5 +5 @@
-$max_amount = 100;
-$max_length = 16;
-
-$similars = array
-(
-    'I', 'l', '1', '0', 'O',
-);
-
-if (isset($_GET['f_submit']))
@@ -40 +35 @@
-            <label for="similar_characters">
-                <input type="checkbox" id="similar_characters" name="no_similars" value="1" <?php if ($no_similars) { echo ' checked="checked"'; } ?> />
-<?php echo implode(', ', $similars); ?>
+I, l, 1, 0, O
-            </label>
-            <input type="submit" name="f_submit" value="<?php echo $data['l10n']->get('generate'); ?>" />
@@ -73 +68 @@
-    for ($i = 0; $i < $n; $i++)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        echo "\n";
-    }

trunk/midcom/midcom.admin.user/style/midcom-admin-user-personlist-footer.php

@@ -1 +1 @@
-<?php
+$prefix = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX);
+
-if (count($data['persons']) > 0)
-{
@@ -16 +18 @@
-                <td>&nbsp;</td>
-                <td colspan="<?php echo count($data['list_fields']); ?>">
-
+id="midcom_admin_user_action" 
-                        <option value=""><?php echo $_MIDCOM->i18n->get_string('choose action', 'midcom.admin.user'); ?></option>
-                        <?php
@@ -27 +29 @@
-                        ?>
-                        <option value="groupadd" onclick="javascript:document.getElementById('midcom_admin_user_group').style.display='inline';"><?php echo $_MIDCOM->i18n->get_string('add to group', 'midcom.admin.user'); ?></option>
+                        <option value="passwords"><?php echo $_MIDCOM->i18n->get_string('generate new passwords', 'midcom.admin.user'); ?></option>
-                    </select>
-                    <select name="midcom_admin_user_group" id="midcom_admin_user_group" style="display: none;"<?php echo $disabled; ?>>
@@ -46 +49 @@
-    </table>
-    </form>
+    <script type="text/javascript">
+        // <![CDATA[
+            $j('#midcom_admin_user_action').change(function()
+            {
+                if (this.value == 'passwords')
+                {
+                    $j('<div></div>')
+                        .attr('id', 'midcom_admin_user_action_passwords')
+                        .appendTo('#midcom_admin_user_batch_process');
+                    
+                    // Load the form for outputting the style
+                    $j('#midcom_admin_user_action_passwords').load('&(prefix);__mfa/asgard_midcom.admin.user/password/batch/?ajax&timestamp=<?php echo time(); ?>');
+                    
+                    $j('#midcom_admin_user_batch_process').submit(function()
+                    {
+                        var action = '&(prefix);__mfa/asgard_midcom.admin.user/password/batch/?ajax';
+                        $j(this).attr('action', action);
+                    });
+                }
+                else
+                {
+                    $j('#midcom_admin_user_action_passwords').css('display', 'none');
+                    
+                    // Return the original submit functionality
+                    $j('#midcom_admin_user_batch_process').submit(function()
+                    {
+                        var action = '&(prefix);__mfa/asgard_midcom.admin.user/';
+                        $j(this).attr('action', action);
+                        
+                        return true;
+                    });
+                }
+            });
+        // ]]>
+    </script>
-    <?php
-}

trunk/midcom/midcom.admin.user/style/midcom-admin-user-personlist-header.php

@@ -22 +22 @@
-    $data['enabled'] = 0;
-    ?>
-
+ id="midcom_admin_user_batch_process" action="&(_MIDGARD['uri']);"
-    <table class="midcom_admin_user_search_results">
-        <thead>