--- zzzz_ajax.module.orig	2008-10-13 23:33:54.000000000 +0200
+++ zzzz_ajax.module	2008-10-16 16:37:13.000000000 +0200
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 /**
  * Automatic ajax validation
  * Drupal 6
@@ -11,71 +11,80 @@
 function zzzz_ajax_menu() {
   $items['admin/settings/ajax'] = array(
     'title' => t('Ajax Forms Settings'),
-    'description' => t('Controls which forms should use AJAX Submissions.'),
+    'description' => t('Controls which forms should use AJAX submission.'),
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('zzzz_ajax_admin'),
+    'page arguments' => array('zzzz_ajax_admin_form'),
     'access arguments' => array('access administration pages'),
     'type' => MENU_NORMAL_ITEM,
   );
   return $items;
 }
 
-function zzzz_ajax_types() {
+function zzzz_ajax_forms() {
   return array_merge(
-    zzzz_ajax_types_node(),
-    zzzz_ajax_types_module());
+    zzzz_ajax_node_type_forms(),
+    zzzz_ajax_module_forms());
 }
 
-function zzzz_ajax_types_node() {
+function zzzz_ajax_node_type_forms() {
   $out = array();
   $types = node_get_types();
-  foreach ($types as $k => $v) {
-    $out[$k . '_node_form'] = ucwords('Content Type ' . $v->name);
+//   drupal_set_message('node_get_types() = <pre>'.print_r($types, TRUE).'</pre>');
+  foreach ($types as $machinename => $type) {
+    $out[$machinename .'_node_form'] = ucwords('Content Type '. $type->name);
   }
+  asort($out);
+//   drupal_set_message('zzzz_ajax_node_type_forms() = <pre>'.print_r($out, TRUE).'</pre>');
   return $out;
 }
 
-function zzzz_ajax_types_module() {
+function zzzz_ajax_module_forms() {
   $out = array();
   $funcs = get_defined_functions();
-  foreach ($funcs['user'] as $f) {
-    if (preg_match("/^([a-zA-Z0-9_]+?)_submit$/", $f, $func_name)) {
-      $out[$func_name[1]] = ucwords(str_replace('_', ' ', $func_name[1]));
+//   drupal_set_message('get_defined_functions() = <pre>'.print_r($funcs, TRUE).'</pre>');
+  $func_name = array();
+  foreach ($funcs['user'] as $function) {
+//     if (preg_match("/^([a-zA-Z0-9_]+?)_submit$/", $function, $func_name)) {
+    if (preg_match("/^([\w\d_]+?)_submit$/", $function, $func_name)) {
+//       $out[$func_name[1]] = ucwords(str_replace('_', ' ', $func_name[1]));
+      $out[$func_name[1]] = $func_name[1];
     }
   }
+  asort($out);
+//   drupal_set_message('zzzz_ajax_module_forms() = <pre>'.print_r($out, TRUE).'</pre>');
   return $out;
 }
 
-function zzzz_ajax_admin() {
+function zzzz_ajax_admin_form() {
   $form = array();
-  $form['ajax_types'] = array(
+  $form['ajax_forms'] = array(
     '#type' => 'select',
-    '#multiple' => true,
-    '#options' => zzzz_ajax_types(),
+    '#multiple' => TRUE,
+    '#options' => zzzz_ajax_forms(),
     '#title' => t('Forms to Use AJAX Submissions'),
-    '#default_value' => variable_get('ajax_types', array()),
+    '#default_value' => variable_get('ajax_forms', array()),
     '#size' => 20,
-    '#description' => t(
-      "Select the forms you wish to use AJAX submissions.")
+    '#description' => t('Select the forms you wish to use AJAX submissions on.')
   );
   return system_settings_form($form);
 }
 
 function zzzz_ajax_init() {
   drupal_add_js(drupal_get_path('module', 'zzzz_ajax') .
-    '/Ajax.js', 'module');
+    '/ajax.js', 'module');
 }
 
 
-function zzzz_ajax_istype($form_id) {
+function zzzz_ajax_form_is_ajax($form_id) {
   return array_key_exists($form_id,
-    variable_get('ajax_types', array()));
+    variable_get('ajax_forms', array()));
 }
 
 
 function zzzz_ajax_form_alter(&$form, $form_state, $form_id) {
-  if (zzzz_ajax_isType($form_id)) {
-    $found = false;
+// drupal_set_message("zzzz_ajax_form_alter::zzzz_ajax_form_is_ajax($form_id) = <pre>".print_r(zzzz_ajax_form_is_ajax($form_id), TRUE).'</pre>');
+  if (zzzz_ajax_form_is_ajax($form_id)) {
+    $found = FALSE;
     zzzz_ajax_setvalidator($form);
     zzzz_ajax_findsubmitter($form, $found);
     zzzz_ajax_setsubmitter($form, $found);
@@ -83,7 +92,7 @@ function zzzz_ajax_form_alter(&$form, $f
     //print_r($form);
     //print "</pre>";
   }
-  return true;
+  return TRUE;
 }
 
 
@@ -109,7 +118,7 @@ function zzzz_ajax_findsubmitter(&$form,
         if (array_key_exists('#submit', $form[$form_key]) &&
             !empty($form[$form_key]['#submit'])) {
           $form[$form_key]['#submit'][] = 'zzzz_ajax_submitter';
-          $found = true;
+          $found = TRUE;
         }
       }
       //nested
@@ -118,7 +127,7 @@ function zzzz_ajax_findsubmitter(&$form,
       }
     }
   }
-  return true;
+  return TRUE;
 }
 
 function zzzz_ajax_submitter($form, &$form_state) {
@@ -129,7 +138,7 @@ function zzzz_ajax_submitter($form, &$fo
   }
   // Display messages internally without redirect
   else {
-    $messages = drupal_get_messages(null, true);
+    $messages = drupal_get_messages(NULL, TRUE);
     if (array_key_exists('status', $messages)) {
       $data['messages_status'] = $messages['status'];
     }
@@ -137,14 +146,14 @@ function zzzz_ajax_submitter($form, &$fo
       $data['messages_warning'] = $messages['warning'];
     }
   }
-  $out = zzzz_ajax_buildOutput($data);
+  $out = zzzz_ajax_build_output($data);
   zzzz_ajax_out($out);
 }
 
 function zzzz_ajax_validator() {
   if (array_key_exists('ajax', $_REQUEST)) {
-    drupal_get_messages(null, true);
-    $data = zzzz_ajax_buildOutput(array(
+    drupal_get_messages(NULL, TRUE);
+    $data = zzzz_ajax_build_output(array(
       'messages_error' => form_get_errors()
     ));
     if (!$data['status']) {
@@ -159,33 +168,33 @@ function zzzz_ajax_out($data) {
   exit;
 }
 
-function zzzz_ajax_cleanid($field_id) {
+function zzzz_ajax_clean_fieldid($field_id) {
   //taken from form_clean_id
   return str_replace(array('][', '_', ' '), '-', $field_id);
 }
 
-function zzzz_ajax_buildOutput($data) {
+function zzzz_ajax_build_output($data) {
   $out = array(
-    'status' => true,
+    'status' => TRUE,
     'messages_error' => array(),
     'messages_status' => array(),
     'messages_warning' => array(),
-    'redirect' => null
+    'redirect' => NULL
   );
   // MESSAGE:ERROR
   if (array_key_exists('messages_error', $data) &&
-      $data['messages_error'] !== null) {
-    $out['status'] = false;
+      $data['messages_error'] !== NULL) {
+    $out['status'] = FALSE;
     foreach ($data['messages_error'] as $k => $v) {
       $out['messages_error'][] = array(
-        'id' => zzzz_ajax_cleanid("edit-" . $k),
+        'id' => zzzz_ajax_clean_fieldid("edit-" . $k),
         'value' => $v
       );
     }
   }
   // MESSAGE:STATUS
   if (array_key_exists('messages_status', $data) &&
-      $data['messages_status'] !== null) {
+      $data['messages_status'] !== NULL) {
     foreach ($data['messages_status'] as $k => $v) {
       $out['messages_status'][] = array(
         'id' => (int)$k,
@@ -195,7 +204,7 @@ function zzzz_ajax_buildOutput($data) {
   }
   // MESSAGE:WARNING
   if (array_key_exists('messages_warning', $data) &&
-      $data['messages_warning'] !== null) {
+      $data['messages_warning'] !== NULL) {
     foreach ($data['messages_warning'] as $k => $v) {
       $out['messages_warning'][] = array(
         'id' => (int)$k,
@@ -204,12 +213,8 @@ function zzzz_ajax_buildOutput($data) {
     }
   }
   // Redirect
-  if (array_key_exists('redirect', $data) && $data['redirect'] !== null) {
+  if (array_key_exists('redirect', $data) && $data['redirect'] !== NULL) {
     $out['redirect'] = $data['redirect'];
   }
   return $out;
 }
-
-
-
-?>
\ No newline at end of file