Index: coder_tough_love.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder_tough_love/Attic/coder_tough_love.info,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 coder_tough_love.info
--- coder_tough_love.info	19 Nov 2008 16:26:31 -0000	1.1.2.1
+++ coder_tough_love.info	28 Feb 2010 23:24:27 -0000
@@ -2,5 +2,6 @@
 name = Coder Tough Love
 description = Supplementary Coder module to provide Morbus' style complaints.
 package = Development
-dependencies[] = coder
-core = 6.x
+dependencies[] = coder_review
+core = 7.x
+files[] = coder_tough_love.module
Index: coder_tough_love.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder_tough_love/Attic/coder_tough_love.module,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 coder_tough_love.module
--- coder_tough_love.module	16 Jul 2009 12:08:55 -0000	1.1.2.6
+++ coder_tough_love.module	28 Feb 2010 23:24:28 -0000
@@ -168,30 +168,30 @@ function _coder_tough_love_admin_menu_de
     }

     // if we're inside, look at the line and check for an admin path.
-    if ($potentially_inside_a_hook_menu && preg_match('/\[[\'"]admin\//', $line)) {
+    if (isset($potentially_inside_a_hook_menu) && preg_match('/\[[\'"]admin\//', $line)) {
       $potentially_found_an_admin_path = $line_number; // used in the error.
     }

     // now, keep looking for a 'description' element for this admin path.
-    if ($potentially_inside_a_hook_menu && $potentially_found_an_admin_path) {
+    if (isset($potentially_inside_a_hook_menu) && isset($potentially_found_an_admin_path)) {
       if (preg_match('/[\'"]description[\'"]\s*=>/', $line)) {
         $saw_a_description = 1;
       }
     }

     // if we've found any sort of ");", we assume the menu's array is done.
-    if ($potentially_inside_a_hook_menu && $potentially_found_an_admin_path && preg_match("/\);/", $line)) {
-      if (!$saw_a_description) { // if there's no description for an admin path, yell. loudly. HORSE HEAD!
-        _coder_error($results, $rule, _coder_severity_name($coder_args, $review, $rule), $potentially_found_an_admin_path);
+    if (isset($potentially_inside_a_hook_menu) && isset($potentially_found_an_admin_path) && preg_match("/\);/", $line)) {
+      if (!isset($saw_a_description)) { // if there's no description for an admin path, yell. loudly. HORSE HEAD!
+        _coder_review_error($results, $rule, _coder_review_severity_name($coder_args, $review, $rule), $potentially_found_an_admin_path);
       }

       // reset for the next iteration, bub.
-      $saw_a_description = $potentially_found_an_admin_path = 0;
+      unset($saw_a_description, $potentially_found_an_admin_path);
     }

     // are we inside a function that ends in _menu?
     if (preg_match('/^(function .*?[^_menu]\(\)|\/\*\*)/', $line)) {
-      $potentially_inside_a_hook_menu = 0;
+      unset($potentially_inside_a_hook_menu);
     }
   }
 }
@@ -205,7 +205,7 @@ function _coder_tough_love_doxygen_param
     if (preg_match('/^ \* (@param|@return)/', $line)) {
       // check the next line to see if there's SOMETHING written.
       if (!preg_match('/^ \*   .*/', implode(' ', $lines[$line_number + 1]))) {
-        _coder_error($results, $rule, _coder_severity_name($coder_args, $review, $rule), $line_number, $line);
+        _coder_review_error($results, $rule, _coder_review_severity_name($coder_args, $review, $rule), $line_number, $line);
       }
     }
   }
@@ -221,7 +221,7 @@ function _coder_tough_love_doxygen_funct
     if (preg_match('/^ \*\/$/', $line)) {
       $previous_line = implode(' ', $lines[$line_number - 1]);
       if (preg_match('/^ \*(\s*)$/', $previous_line)) {
-        _coder_error($results, $rule, _coder_severity_name($coder_args, $review, $rule), $line_number - 1);
+        _coder_review_error($results, $rule, _coder_review_severity_name($coder_args, $review, $rule), $line_number - 1);
       }
     }
   }
@@ -235,7 +235,7 @@ function _coder_tough_love_doxygen_funct
     $line = implode(' ', $line); // concat'd parts.

     if (preg_match('/^ \*/', $line) && drupal_strlen($line) > 80) {
-      _coder_error($results, $rule, _coder_severity_name($coder_args, $review, $rule), $line_number);
+      _coder_review_error($results, $rule, _coder_review_severity_name($coder_args, $review, $rule), $line_number);
     }
   }
 }
@@ -251,12 +251,12 @@ function _coder_tough_love_doxygen_funct

       // check the next line to see if there's SOMETHING written.
       if (preg_match('/^ \* (\w+)/', implode(' ', $lines[$line_number + 1]))) {
-        $first_line_exists = $line_number + 1; // used in _coder_error().
+        $first_line_exists = $line_number + 1; // used in _coder_review_error().
       }

       // if the line after THAT is NOT a blank line or end of Doxygen, there's a problem.
       if ($first_line_exists && !preg_match('/^ (\*\/|\*)$/', implode(' ', $lines[$line_number + 2]))) {
-        _coder_error($results, $rule, _coder_severity_name($coder_args, $review, $rule), $first_line_exists);
+        _coder_review_error($results, $rule, _coder_review_severity_name($coder_args, $review, $rule), $first_line_exists);
         $first_line_exists = 0; // reset for the next iteration.
       }
     }
@@ -317,7 +317,7 @@ function _coder_tough_love_pspell_check(
       }

       if ($found_unknown_word) { // ...we spit the error here so we report just once per line.
-        _coder_error($results, $rule, _coder_severity_name($coder_args, $review, $rule), $line_number, $line);
+        _coder_review_error($results, $rule, _coder_review_severity_name($coder_args, $review, $rule), $line_number, $line);
       }
     }
   }
@@ -370,7 +370,7 @@ function _coder_tough_love_sentence_styl
     $num_capitalized_words = preg_match_all('/(^| )[A-Z]/', $line, $matches);

     if ($num_words == $num_capitalized_words) {
-      _coder_error($results, $rule, _coder_severity_name($coder_args, $review, $rule), $line_number);
+      _coder_review_error($results, $rule, _coder_review_severity_name($coder_args, $review, $rule), $line_number);
     }
   }
 }