Index: custom_username_validation.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/custom_username_validation/custom_username_validation.info,v
retrieving revision 1.1
diff -u -u -r1.1 custom_username_validation.info
--- custom_username_validation.info	22 Nov 2008 16:33:50 -0000	1.1
+++ custom_username_validation.info	22 Mar 2009 13:30:53 -0000
@@ -1,6 +1,5 @@
-<?php
 ; $Id: custom_username_validation.info,v 1.1 2008/11/22 16:33:50 schneck Exp $
 name = Custom Username Validation
 description = "Allows to validate the username by a regular expression on registration"
-version = "5.x-1.0"
-?>
\ No newline at end of file
+version = "6.x-1.0"
+core = 6.x
Index: custom_username_validation.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/custom_username_validation/custom_username_validation.module,v
retrieving revision 1.1
diff -u -u -r1.1 custom_username_validation.module
--- custom_username_validation.module	22 Nov 2008 16:33:50 -0000	1.1
+++ custom_username_validation.module	22 Mar 2009 13:30:53 -0000
@@ -15,7 +15,7 @@
 
   /** Get username from form elements */
   $username = $element['#post']['name'];
-  
+
   /** If username not set, do not validate */
   if (!$username)
     return;
@@ -64,9 +64,9 @@
 * Implementation of hook_form_alter().
 */
 
-function custom_username_validation_form_alter($form_id, &$form) {
+function custom_username_validation_form_alter(&$form, &$form_state, $form_id) {
   if ($form_id == 'user_register' || $form_id == 'user_edit') {
-    $form['name']['#validate'] = array('custom_username_validation_username_validate' =>array());
+    $form['#validate'] = array('custom_username_validation_username_validate');
   }
 }
 
@@ -76,15 +76,15 @@
 function custom_username_validation_menu() {
   $items = array();
 
-  $items[] = array(
-    'path' => 'admin/settings/custom_username_validation',
+  $items['admin/settings/custom_username_validation'] = array(
     'title' => t('Custom username validation'),
     'description' => t('Set username pattern to match and an error message on matching fail'),
-    'callback' => 'drupal_get_form',
-    'callback arguments' => 'custom_username_validation_admin',
-    'access' => user_access('access administration pages'),
+    'access callback' => 'user_access',
+    'access arguments' => array('access administration pages'),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('custom_username_validation_admin'),
     'type' => MENU_NORMAL_ITEM,
-   );
+  );
 
   return $items;
 }