Index: scripts/coder_format/coder_format-uninstall.reg
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/scripts/coder_format/Attic/coder_format-uninstall.reg,v
retrieving revision 1.1.4.2
diff -u -p -r1.1.4.2 coder_format-uninstall.reg
--- scripts/coder_format/coder_format-uninstall.reg	16 Jan 2008 13:54:31 -0000	1.1.4.2
+++ scripts/coder_format/coder_format-uninstall.reg	26 Jan 2008 17:57:58 -0000
@@ -1,6 +1,7 @@
 Windows Registry Editor Version 5.00
 
 [-HKEY_CLASSES_ROOT\phpfile\shell\coder_format]
+[-HKEY_CLASSES_ROOT\phpfile\shell\coder_format_undo]
 
 [-HKEY_CLASSES_ROOT\Directory\shell\coder_format]
 [-HKEY_CLASSES_ROOT\Directory\shell\coder_format_undo]
Index: scripts/coder_format/coder_format.cmd
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/scripts/coder_format/Attic/coder_format.cmd,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 coder_format.cmd
--- scripts/coder_format/coder_format.cmd	16 Jan 2008 13:54:31 -0000	1.1.2.1
+++ scripts/coder_format/coder_format.cmd	26 Jan 2008 17:54:44 -0000
@@ -3,50 +3,25 @@ rem $Id: coder_format.cmd,v 1.1.2.1 2008
 
 rem Define Coder Format shell invocation script path.
 set coderFormatPath=c:\program files\coder_format
-rem Define location of Drupal's file.inc.
-set fileInc=c:\program files\coder_format\file.inc
 
 
 :: ----- You should not need to edit anything below. ----- ::
 
+if "%~1"=="" goto error
 set oldpwd=%CD%
 cd /d "%coderFormatPath%"
 
-rem Simple file extension check, won't work with directories containing a dot.
-if '%1'=='--undo' goto undo-directory
-if '%~x1'=='' goto directory
-goto file
-
-:undo-directory
-rem Undo source code formattings performed by --batch-replace
-rem Process directory.
-if "%~2"=="" goto :EOF
-start "coder_format" /D "%coderFormatPath%" /B /WAIT php coder_format.php --undo "%~2" --file-inc "%fileInc%"
-goto processed
-
-:directory
-rem Recursively format all source code files in a directory.
-rem Process directory.
-if "%~1"=="" goto :EOF
-start "coder_format" /D "%coderFormatPath%" /B /WAIT php coder_format.php --batch-replace "%~1" --file-inc "%fileInc%"
-goto processed
-
-:file
-rem Format a single source code file.
-rem Define source and target files by command line arguments.
-set sourcefile=%~1
-if not '%~2'=='' (
-	set targetfile=%~2
-) else (
-	set targetfile=%~1
-)
-rem Process file.
-if "%sourcefile%"=="" goto :EOF
-if "%targetfile%"=="" goto :EOF
-start "coder_format" /D "%coderFormatPath%" /B /WAIT php coder_format.php "%sourcefile%" "%targetfile%" --file-inc "%fileInc%"
+rem Check if at least one argument follows a --undo parameter.
+if "%~1"=="--undo" if "%~2"=="" goto error
 
+start "coder_format" /D "%coderFormatPath%" /B /WAIT php coder_format.php %*
+goto done
 
-:processed
+:error
+echo ERROR: Wrong arguments supplied. Please see usage in coder_format.php.
+goto :EOF
+
+:done
 rem Jump back to original working directory.
 cd /d "%oldpwd%"
 
Index: scripts/coder_format/coder_format.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/scripts/coder_format/coder_format.inc,v
retrieving revision 1.2.4.11
diff -u -p -r1.2.4.11 coder_format.inc
--- scripts/coder_format/coder_format.inc	22 Jan 2008 22:30:23 -0000	1.2.4.11
+++ scripts/coder_format/coder_format.inc	26 Jan 2008 17:39:54 -0000
@@ -5,83 +5,77 @@
 /**
  * Recursively process .module and .inc files in directory with coder_format_file().
  *
- * @param $root
- *   Path to root directory for Drupal installation.
+ * @param $directory
+ *   Path to a directory to process recursively.
  * @param $undo
  *   Boolean whether or not to undo batch replacements.
- * @param $file_inc
- *   Path to Drupal's file.inc, default is $root/includes/file.inc
  */
-function coder_format_recursive($root, $undo = false, $file_inc = null) {
-  // Convert Windows paths.
-  $root = str_replace("\\", '/', $root);
+function coder_format_recursive($directory, $undo = false) {
+  // Convert Windows paths (only cosmetical).
+  $directory = str_replace('\\', '/', $directory);
 
   // Check if directory exists.
-  if (!file_exists($root)) {
-    echo 'ERROR: '. $root .' does not exist!';
-    return;
+  if (!file_check_directory($directory)) {
+    drupal_set_message(t('%directory not found.', array('%directory' => $directory)), 'error');
+    return FALSE;
   }
 
-  // Trim root directory.
-  if (substr($root, -1) == '/') {
-    $root = substr($root, 0, -1);
+  // Fetch files to process.
+  $mask   = '\.php$|\.module$|\.inc$|\.install|\.profile$';
+  $nomask = array('.', '..', 'CVS', '.svn');
+  $files  = file_scan_directory($directory, $mask, $nomask, 0, true);
+  foreach ($files as $file) {
+    coder_format_file($file->filename, $undo);
   }
+}
 
-  // Include Drupal's file.inc.
-  if (!isset($file_inc)) {
-    if (!file_exists($root .'/includes/file.inc')) {
-      echo 'ERROR: '. $root .'/includes/file.inc not found!';
-      return;
-    }
-  }
-  else {
-    if (!file_exists($file_inc)) {
-      echo 'ERROR: '. $file_inc .' not found!';
+/**
+ * Reads, backups, processes and writes the source code from and to a file.
+ *
+ * @param $filename
+ *   Path to a file to process or restore. Pass original filename to restore an
+ *   already processed file.
+ * @param $undo
+ *   Whether to restore a processed file. Always restores the last backup.
+ *
+ * @return
+ *   TRUE on success.
+ */
+function coder_format_file($filename, $undo = FALSE) {
+  // Restore a processed file.
+  if ($undo) {
+    // Do nothing if no backup file exists at all.
+    if (!file_exists($filename .'.coder.orig')) {
       return;
     }
-  }
-  require_once (!isset($file_inc) ? $root .'/includes/file.inc' : $file_inc);
-
-  if (!$undo) {
-    // Fetch files to process.
-    $mask   = '\.php$|\.module$|\.inc$|\.install|\.profile$';
+    // Save original filename.
+    $original = $filename;
+    // Retrieve the file's directory.
+    $basename = file_check_path($filename);
+    // Find all backups.
+    $mask  = '^'. preg_quote($basename) .'(\.coder\.orig)+$';
     $nomask = array('.', '..', 'CVS', '.svn');
-    $files  = file_scan_directory($root, $mask, $nomask, 0, true);
-    foreach ($files as $file) {
-      // file_copy() assigns $file->filename by reference.
-      $sourcefile = $file->filename;
-      echo $file->filename ."\n";
-      file_copy($file->filename, $file->filename .'.coder.orig');
-      coder_format_file($sourcefile, $sourcefile);
+    $backups = file_scan_directory($filename, $mask, $nomask, 0, FALSE);
+    // Find the latest backup to restore.
+    ksort($backups);
+    $latest = array_pop($backups);
+    // Restore latest backup.
+    if (file_move($latest->filename, $original, FILE_EXISTS_REPLACE)) {
+      drupal_set_message(t('%file restored.', array('%file' => $original)));
+      return TRUE;
     }
-  }
-  else {
-    // Fetch files to process.
-    $mask   = '.coder.orig$';
-    $nomask = array('.', '..', 'CVS', '.svn');
-    $files  = file_scan_directory($root, $mask, $nomask, 0, true);
-    foreach ($files as $file) {
-      $file->origname = str_replace('.coder.orig', '', $file->filename);
-      echo $file->origname ."\n";
-      file_move($file->filename, $file->origname, FILE_EXISTS_REPLACE);
+    else {
+      drupal_set_message(t('%file could not be restored.', array('%file' => $original)), 'error');
+      return FALSE;
     }
   }
-}
 
-/**
- * Reads, processes and writes the source code from and to a file.
- *
- * @param $sourcefile
- *   Path to source file to read code from.
- * @param $targetfile
- *   Target path to write formatted source code to.
- *
- * @return
- *   TRUE if successful.
- */
-function coder_format_file($sourcefile = null, $targetfile = null) {
-  if (!isset($sourcefile) || !isset($targetfile)) {
-    return;
+  // Backup original file.
+  // file_copy() replaces source filepath with target filepath.
+  $sourcefile = $filename;
+  if (!file_copy($filename, $filename .'.coder.orig', FILE_EXISTS_RENAME)) {
+    drupal_set_message(t('%file could not be backup.', array('%file' => $filename)), 'error');
+    return FALSE;
   }
 
   // Read source code from source file.
@@ -94,14 +88,22 @@ function coder_format_file($sourcefile =
 
     if ($code !== false) {
       // Write formatted source code to target file.
-      $fd = fopen($targetfile, 'w');
+      $fd = fopen($sourcefile, 'w');
       $status = fwrite($fd, $code);
       fclose($fd);
+
+      drupal_set_message(t('%file processed.', array('%file' => $sourcefile)));
       return $status;
     }
+    else {
+      drupal_set_message(t('An error occurred while processing %file.', array('%file' => $sourcefile)), 'error');
+      return FALSE;
+    }
+  }
+  else {
+    drupal_set_message(t('%file could not be opened.', array('%file' => $sourcefile)), 'error');
+    return FALSE;
   }
-
-  return false;
 }
 
 /**
@@ -1353,56 +1355,3 @@ function coder_postprocessor_if_curly_br
  * @} End of "defgroup coder_postprocessor".
  */
 
-/**
- * @defgroup coder_format_stub_functions
- * @{
- */
-if (!function_exists('variable_get')) {
-  function variable_get($name, $default) {
-    global $conf;
-
-    return isset($conf[$name]) ? $conf[$name] : $default;
-  }
-}
-if (!function_exists('variable_set')) {
-  function variable_set($name, $value) {
-    global $conf;
-
-    $conf[$name] = $value;
-  }
-}
-if (!function_exists('t')) {
-  function t($string, $args = 0) {
-    if (!$args) {
-      return $string;
-    }
-    else {
-      return strtr($string, $args);
-    }
-  }
-}
-if (!function_exists('drupal_set_message')) {
-  function drupal_set_message($message = NULL, $type = 'status') {
-    echo $message;
-  }
-}
-if (!function_exists('watchdog')) {
-  function watchdog($type, $message, $severity = 0, $link = null) {
-    return;
-  }
-}
-if (!function_exists('check_plain')) {
-  function check_plain($text) {
-    return htmlspecialchars($text, ENT_QUOTES);
-  }
-}
-if (!function_exists('conf_path')) {
-  function conf_path() {
-    return "sites/default";
-  }
-}
-
-/**
- * @} End of "defgroup coder_format_stub_functions".
- */
-
Index: scripts/coder_format/coder_format.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/scripts/coder_format/coder_format.php,v
retrieving revision 1.2.4.4
diff -u -p -r1.2.4.4 coder_format.php
--- scripts/coder_format/coder_format.php	21 Jan 2008 21:41:12 -0000	1.2.4.4
+++ scripts/coder_format/coder_format.php	26 Jan 2008 17:43:55 -0000
@@ -6,42 +6,33 @@
  * @file
  * Coder format shell invocation script.
  *
- * @param string $sourcefile
- * 	 The file containing the source code to process, optionally including a
- *   filepath.
- * @param string $targetfile
- * 	 The file to save the formatted source code to, optionally including a
- *   filepath.
- * @param string --batch-replace $path
- * 	 A path to process recursively. Each file in the given path will be replaced
- *   with the formatted source code. Each original file is automatically backed
- * 	 up to <filename>.coder.orig.
- * @param string --undo $path
- *   A path to search for *.coder.orig files and revert changes. Each formatted
- *   file (without extension .coder.orig) is replaced with its backup file.
- * @param string --file-inc $file_inc
- *   The full path to file.inc in a Drupal installation. Only needed if the
- *   path provided for --batch-replace or --undo is not the root directory of a
- *   Drupal installation. Allows to recursively format a CVS checkout folder.
+ * @param $filepath
+ * 	 One or more files or directories containing the source code to process. If
+ *   a directory is given, all files in that directory are processed recursively.
+ *   Each file will be replaced with the formatted source code. Each original
+ *   file is automatically backup to <filename>.coder.orig.
+ * @param --undo
+ *   If the optional --undo argument is given, processed files are restored from
+ *   their backups. Coder format automatically searches for the latest backup
+ *   file (*.coder.orig) and each filename (without extension .coder.orig) is
+ *   replaced with its backup file.
  *
  * @usage
- *   php coder_format.php <sourcefile> <targetfile>
- *   php coder_format.php --batch-replace <path> [--file-inc <path_to_file.inc>]
- *   php coder_format.php --undo <path> [--file-inc <path_to_file.inc>]
+ *   php coder_format.php <filepath> [filepath] ...
+ *   php coder_format.php <path> [path] ...
+ *   php coder_format.php --undo <filepath> ...
+ *   php coder_format.php --undo <path> ...
  *
  * @example
- *   php coder_format.php node.module node.module.formatted
- *   php coder_format.php node.module node.module
- *   php coder_format.php --batch-replace /home/drupal
+ *   php coder_format.php modules/node/node.module
+ *   php coder_format.php index.php modules/node/node.module
+ *   php coder_format.php /home/drupal
+ *   php coder_format.php /home/drupal/includes /home/drupal/modules
+ *   php coder_format.php --undo modules/node/node.module
  *   php coder_format.php --undo /home/drupal
  *
- * If either --batch-replace or --undo parameter is given, Coder Format assumes
- * that the specified path is the root of a Drupal installation. Coder Format
- * needs includes/file.inc for batch processing. You can optionally specify the
- * location of file.inc with the --file-inc parameter.
- *
- * Notes:
- * - Encapsulate file and path arguments with double quotes on Windows.
+ * Important note for Windows users:
+ * - Ensure to encapsulate filename arguments with double quotes.
  */
 
 // We are on the command line, so output only real errors.
@@ -53,43 +44,371 @@ if (!empty($_SERVER['argv'])) {
   // Remove self-reference.
   array_shift($_SERVER['argv']);
 
+  // Process command-line arguments.
   $files    = array();
   $undo     = false;
-  $file_inc = null;
 
   for ($c = 0, $cc = count($_SERVER['argv']); $c < $cc; ++$c) {
     switch ($_SERVER['argv'][$c]) {
       case '--undo':
-        ++$c;
-        $root = $_SERVER['argv'][$c];
         $undo = true;
         break;
 
-      case '--batch-replace':
-        ++$c;
-        $root = $_SERVER['argv'][$c];
+      default:
+        $files[] = $_SERVER['argv'][$c];
         break;
+    }
+  }
 
-      case '--file-inc':
-        ++$c;
-        $file_inc = $_SERVER['argv'][$c];
-        break;
+  foreach ($files as $file) {
+    // If argument is a directory, process it recursively.
+    if (is_dir($file)) {
+      coder_format_recursive($file, $undo);
+    }
+    else {
+      coder_format_file($file, $undo);
+    }
+  }
+}
 
-      default:
-        $files[] = $_SERVER['argv'][$c];
+/**
+ * @defgroup coder_format_file_functions
+ * @{
+ * These functions are copied from Drupal's file.inc. Almost all function calls
+ * to other Drupal functions have been removed since they would always return
+ * FALSE.
+ */
+
+define('FILE_CREATE_DIRECTORY', 1);
+define('FILE_EXISTS_RENAME', 0);
+define('FILE_EXISTS_REPLACE', 1);
+define('FILE_EXISTS_ERROR', 2);
+
+/**
+ * Check that the directory exists and is writable. Directories need to
+ * have execute permissions to be considered a directory by FTP servers, etc.
+ *
+ * @param $directory A string containing the name of a directory path.
+ * @param $mode A Boolean value to indicate if the directory should be created
+ *   if it does not exist or made writable if it is read-only.
+ * @param $form_item An optional string containing the name of a form item that
+ *   any errors will be attached to. This is useful for settings forms that
+ *   require the user to specify a writable directory. If it can't be made to
+ *   work, a form error will be set preventing them from saving the settings.
+ * @return FALSE when directory not found, or TRUE when directory exists.
+ */
+function file_check_directory(&$directory, $mode = 0, $form_item = NULL) {
+  $directory = rtrim($directory, '/\\');
+
+  // Check if directory exists.
+  if (!is_dir($directory)) {
+    // coder_format does not alter the filesystem. 23/01/2008 sun
+    if (!file_exists($directory)) {
+      drupal_set_message(t('The directory %directory does not exist.', array('%directory' => $directory)));
+      return FALSE;
+    }
+  }
+
+  // Check to see if the directory is writable.
+  if (!is_writable($directory)) {
+    // coder_format does not alter the filesystem. 23/01/2008 sun
+    drupal_set_message(t('The directory %directory is not writable', array('%directory' => $directory)));
+    return FALSE;
+  }
+
+  // coder_format is applied outside of Drupal in most cases. 23/01/2008 sun
+
+  return TRUE;
+}
+
+/**
+ * Checks path to see if it is a directory, or a dir/file.
+ *
+ * @param $path A string containing a file path. This will be set to the
+ *   directory's path.
+ * @return If the directory is not in a Drupal writable directory, FALSE is
+ *   returned. Otherwise, the base name of the path is returned.
+ */
+function file_check_path(&$path) {
+  // Check if path is a directory.
+  // coder_format uses file_check_path() to check for files only. 26/01/2008 sun
+
+  // Check if path is a possible dir/file.
+  $filename = basename($path);
+  $path = dirname($path);
+  if (file_check_directory($path)) {
+    return $filename;
+  }
+
+  return FALSE;
+}
+
+/**
+ * Copies a file to a new location. This is a powerful function that in many ways
+ * performs like an advanced version of copy().
+ * - Checks if $source and $dest are valid and readable/writable.
+ * - Performs a file copy if $source is not equal to $dest.
+ * - If file already exists in $dest either the call will error out, replace the
+ *   file or rename the file based on the $replace parameter.
+ *
+ * @param $source A string specifying the file location of the original file.
+ *   This parameter will contain the resulting destination filename in case of
+ *   success.
+ * @param $dest A string containing the directory $source should be copied to.
+ *   If this value is omitted, Drupal's 'files' directory will be used.
+ * @param $replace Replace behavior when the destination file already exists.
+ *   - FILE_EXISTS_REPLACE - Replace the existing file
+ *   - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is unique
+ *   - FILE_EXISTS_ERROR - Do nothing and return FALSE.
+ * @return True for success, FALSE for failure.
+ */
+function file_copy(&$source, $dest = 0, $replace = FILE_EXISTS_RENAME) {
+  // $dest is almost always outside of Drupal. 23/01/2008 sun
+  // $dest = file_create_path($dest);
+
+  $directory = $dest;
+  $basename = file_check_path($directory);
+
+  // Make sure we at least have a valid directory.
+  if ($basename === FALSE) {
+    $source = is_object($source) ? $source->filepath : $source;
+    drupal_set_message(t('The selected file %file could not be uploaded, because the destination %directory is not properly configured.', array('%file' => $source, '%directory' => $dest)), 'error');
+    return 0;
+  }
+
+  // Removed upload handling. coder_format does not deal with uploads. 23/01/2008 sun
+
+  $source = realpath($source);
+  if (!file_exists($source)) {
+    drupal_set_message(t('The selected file %file could not be copied, because no file by that name exists. Please check that you supplied the correct filename.', array('%file' => $source)), 'error');
+    return 0;
+  }
+
+  // If the destination file is not specified then use the filename of the source file.
+  $basename = $basename ? $basename : basename($source);
+  $dest = $directory .'/'. $basename;
+
+  // Make sure source and destination filenames are not the same, makes no sense
+  // to copy it if they are. In fact copying the file will most likely result in
+  // a 0 byte file. Which is bad. Real bad.
+  if ($source != realpath($dest)) {
+    if (!$dest = file_destination($dest, $replace)) {
+      drupal_set_message(t('The selected file %file could not be copied, because a file by that name already exists in the destination.', array('%file' => $source)), 'error');
+      return FALSE;
+    }
+
+    if (!@copy($source, $dest)) {
+      drupal_set_message(t('The selected file %file could not be copied.', array('%file' => $source)), 'error');
+      return 0;
+    }
+
+    // Give everyone read access so that FTP'd users or
+    // non-webserver users can see/read these files,
+    // and give group write permissions so group members
+    // can alter files uploaded by the webserver.
+    @chmod($dest, 0664);
+  }
+
+  // Removed upload handling. coder_format does not deal with uploads. 23/01/2008 sun
+  $source = $dest;
+
+  return 1; // Everything went ok.
+}
+
+/**
+ * Determines the destination path for a file depending on how replacement of
+ * existing files should be handled.
+ *
+ * @param $destination A string specifying the desired path.
+ * @param $replace Replace behavior when the destination file already exists.
+ *   - FILE_EXISTS_REPLACE - Replace the existing file
+ *   - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is
+ *     unique
+ *   - FILE_EXISTS_ERROR - Do nothing and return FALSE.
+ * @return The destination file path or FALSE if the file already exists and
+ *   FILE_EXISTS_ERROR was specified.
+ */
+function file_destination($destination, $replace) {
+  if (file_exists($destination)) {
+    switch ($replace) {
+      case FILE_EXISTS_RENAME:
+        $basename = basename($destination);
+        $directory = dirname($destination);
+        $destination = file_create_filename($basename, $directory);
         break;
+
+      case FILE_EXISTS_ERROR:
+        drupal_set_message(t('The selected file %file could not be copied, because a file by that name already exists in the destination.', array('%file' => $destination)), 'error');
+        return FALSE;
+    }
+  }
+  return $destination;
+}
+
+/**
+ * Moves a file to a new location.
+ * - Checks if $source and $dest are valid and readable/writable.
+ * - Performs a file move if $source is not equal to $dest.
+ * - If file already exists in $dest either the call will error out, replace the
+ *   file or rename the file based on the $replace parameter.
+ *
+ * @param $source A string specifying the file location of the original file.
+ *   This parameter will contain the resulting destination filename in case of
+ *   success.
+ * @param $dest A string containing the directory $source should be copied to.
+ *   If this value is omitted, Drupal's 'files' directory will be used.
+ * @param $replace Replace behavior when the destination file already exists.
+ *   - FILE_EXISTS_REPLACE - Replace the existing file
+ *   - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is unique
+ *   - FILE_EXISTS_ERROR - Do nothing and return FALSE.
+ * @return True for success, FALSE for failure.
+ */
+function file_move(&$source, $dest = 0, $replace = FILE_EXISTS_RENAME) {
+  $path_original = is_object($source) ? $source->filepath : $source;
+
+  if (file_copy($source, $dest, $replace)) {
+    $path_current = is_object($source) ? $source->filepath : $source;
+
+    if ($path_original == $path_current || file_delete($path_original)) {
+      return 1;
+    }
+    drupal_set_message(t('The removal of the original file %file has failed.', array('%file' => $path_original)), 'error');
+  }
+  return 0;
+}
+
+/**
+ * Create a full file path from a directory and filename. If a file with the
+ * specified name already exists, an alternative will be used.
+ *
+ * @param $basename string filename
+ * @param $directory string directory
+ * @return
+ */
+function file_create_filename($basename, $directory) {
+  $dest = $directory .'/'. $basename;
+
+  if (file_exists($dest)) {
+    // Destination file already exists, generate an alternative.
+    // Always append '.coder.orig' (allows multiple undos). 23/01/2008 sun
+    $name = $basename;
+
+    $counter = 0;
+    do {
+      $dest = $directory .'/'. $name . str_repeat('.coder.orig', $counter++);
+    } while (file_exists($dest));
+  }
+
+  return $dest;
+}
+
+/**
+ * Delete a file.
+ *
+ * @param $path A string containing a file path.
+ * @return TRUE for success, FALSE for failure.
+ */
+function file_delete($path) {
+  if (is_file($path)) {
+    return unlink($path);
+  }
+}
+
+/**
+ * Finds all files that match a given mask in a given directory.
+ * Directories and files beginning with a period are excluded; this
+ * prevents hidden files and directories (such as SVN working directories)
+ * from being scanned.
+ *
+ * @param $dir
+ *   The base directory for the scan, without trailing slash.
+ * @param $mask
+ *   The regular expression of the files to find.
+ * @param $nomask
+ *   An array of files/directories to ignore.
+ * @param $callback
+ *   The callback function to call for each match.
+ * @param $recurse
+ *   When TRUE, the directory scan will recurse the entire tree
+ *   starting at the provided directory.
+ * @param $key
+ *   The key to be used for the returned array of files. Possible
+ *   values are "filename", for the path starting with $dir,
+ *   "basename", for the basename of the file, and "name" for the name
+ *   of the file without an extension.
+ * @param $min_depth
+ *   Minimum depth of directories to return files from.
+ * @param $depth
+ *   Current depth of recursion. This parameter is only used internally and should not be passed.
+ *
+ * @return
+ *   An associative array (keyed on the provided key) of objects with
+ *   "path", "basename", and "name" members corresponding to the
+ *   matching files.
+ */
+function file_scan_directory($dir, $mask, $nomask = array('.', '..', 'CVS'), $callback = 0, $recurse = TRUE, $key = 'filename', $min_depth = 0, $depth = 0) {
+  $key = (in_array($key, array('filename', 'basename', 'name')) ? $key : 'filename');
+  $files = array();
+
+  if (is_dir($dir) && $handle = opendir($dir)) {
+    while ($file = readdir($handle)) {
+      if (!in_array($file, $nomask) && $file[0] != '.') {
+        if (is_dir("$dir/$file") && $recurse) {
+          // Give priority to files in this folder by merging them in after any subdirectory files.
+          $files = array_merge(file_scan_directory("$dir/$file", $mask, $nomask, $callback, $recurse, $key, $min_depth, $depth + 1), $files);
+        }
+        elseif ($depth >= $min_depth && ereg($mask, $file)) {
+          // Always use this match over anything already set in $files with the same $$key.
+          $filename = "$dir/$file";
+          $basename = basename($file);
+          $name = substr($basename, 0, strrpos($basename, '.'));
+          $files[$$key] = new stdClass();
+          $files[$$key]->filename = $filename;
+          $files[$$key]->basename = $basename;
+          $files[$$key]->name = $name;
+          if ($callback) {
+            $callback($filename);
+          }
+        }
+      }
     }
+
+    closedir($handle);
   }
 
-  if (isset($root)) {
-    coder_format_recursive($root, $undo, $file_inc);
+  return $files;
+}
+
+/**
+ * @} End of "defgroup coder_format_file_functions".
+ */
+
+/**
+ * @defgroup coder_format_stub_functions
+ * @{
+ */
+function t($string, $args = 0) {
+  if (!$args) {
+    return $string;
   }
   else {
-    // Process a single file
-    $sourcefile = $files[0];
-    $targetfile = $files[1];
+    return strtr($string, $args);
+  }
+}
 
-    coder_format_file($sourcefile, $targetfile);
+function drupal_set_message($message = NULL, $type = 'status') {
+  if ($type == 'error') {
+    echo str_repeat('-', 80);
+    echo "\nERROR: $message\n";
+    echo str_repeat('-', 80);
+    echo "\n";
+  }
+  else {
+    echo "$message\n";
   }
 }
 
+/**
+ * @} End of "defgroup coder_format_stub_functions".
+ */
+
Index: scripts/coder_format/coder_format.reg
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/scripts/coder_format/Attic/coder_format.reg,v
retrieving revision 1.1.4.2
diff -u -p -r1.1.4.2 coder_format.reg
--- scripts/coder_format/coder_format.reg	16 Jan 2008 13:54:31 -0000	1.1.4.2
+++ scripts/coder_format/coder_format.reg	26 Jan 2008 17:59:24 -0000
@@ -6,6 +6,12 @@ Windows Registry Editor Version 5.00
 [HKEY_CLASSES_ROOT\phpfile\shell\coder_format\command]
 @="c:\\program files\\coder_format\\coder_format.cmd \"%1\""
 
+[HKEY_CLASSES_ROOT\phpfile\shell\coder_format_undo]
+@="&Unclean Coding Style..."
+
+[HKEY_CLASSES_ROOT\phpfile\shell\coder_format_undo\command]
+@="c:\\program files\\coder_format\\coder_format.cmd --undo \"%1\""
+
 [HKEY_CLASSES_ROOT\Directory\shell\coder_format]
 @="&Clean Coding Style..."