? .nmoderation.module.swp
Index: nmoderation.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nmoderation/nmoderation.module,v
retrieving revision 1.31
diff -u -r1.31 nmoderation.module
--- nmoderation.module	2 Apr 2007 06:30:24 -0000	1.31
+++ nmoderation.module	21 Mar 2008 20:14:17 -0000
@@ -10,16 +10,6 @@
 define('NMODERATION_CACHE_TYPE', 'points');
 define('NMODERATION_TAG', 'vote');
 
-/**
- * Implementation of hook_help().
- */
-function nmoderation_help($section = "admin/help#nmoderation") {
-  switch ($section) {
-    case 'admin/modules#description':
-      return t('Enables users to vote nodes onto the home page.');
-   }
-}
-
 function nmoderation_menu($may_cache) {
 
 $items[] = array(
@@ -34,17 +24,17 @@
    
   if ($may_cache) {
     $access = user_access('administer node moderation votes');
-    $items[] = array('path' => 'admin/nmoderation', 'title' => t('node moderation'),
+    $items[] = array('path' => 'admin/content/nmoderation', 'title' => t('node moderation'),
       'callback' => 'nmoderation_list_all', 'access' => $access);
-    $items[] = array('path' => 'admin/nmoderation/list', 'title' => t('list'),
+    $items[] = array('path' => 'admin/content/nmoderation/list', 'title' => t('list'),
       'access' => $access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
 
     $access = user_access('administer node moderation configuration');
-    $items[] = array('path' => 'admin/nmoderation/matrix', 'title' => t('moderation matrix'),
+    $items[] = array('path' => 'admin/settings/nmoderation/matrix', 'title' => t('moderation matrix'),
       'callback' => 'nmoderation_matrix_settings', 'access' => $access, 'type' => MENU_LOCAL_TASK);
-    $items[] = array('path' => 'admin/nmoderation/roles', 'title' => t('moderation roles'),
+    $items[] = array('path' => 'admin/settings/nmoderation/roles', 'title' => t('moderation roles'),
       'callback' => 'nmoderation_role_settings', 'access' => $access, 'type' => MENU_LOCAL_TASK);
-    $items[] = array('path' => 'admin/nmoderation/votes', 'title' => t('moderation votes'),
+    $items[] = array('path' => 'admin/settings/nmoderation/votes', 'title' => t('moderation votes'),
       'callback' => 'nmoderation_vote_settings', 'access' => $access,'type' => MENU_LOCAL_TASK);
 
     $access = user_access('moderate nodes');
@@ -67,11 +57,12 @@
       $items[] = array('path' => 'node/'. arg(1). '/nmoderation', 'title' => t('votes'),
         'type' => MENU_LOCAL_TASK, 'callback' => 'nmoderation_list_node', 'weight' => 5, 'access' => $access, 'callback arguments' => array(arg(1)));
     }
-    theme('add_style', drupal_get_path('module','nmoderation') . '/nmoderation.css');
   }
   return $items;
 }
 
+drupal_add_css(drupal_get_path('module', 'nmoderation') .'/nmoderation.css');
+
 /**
  * Implementation of hook_perm().
  */
@@ -124,7 +115,7 @@
 
 function nmoderation_matrix_settings() {
   $output .= '<h3>Node Moderation vote/value matrix</h3>';
-  $output .= drupal_get_form('nmoderation_matrix_settings_form', $form_id);
+  $output .= drupal_get_form('nmoderation_matrix_settings_form');
   return $output;
 }
 
@@ -184,7 +175,7 @@
   drupal_set_message(t('the vote values have been saved.'));
 }
 
-function theme_nmoderation_matrix__settings_form(&$form) {
+function theme_nmoderation_matrix_settings_form(&$form) {
   $role_names = $form['role_names']['#value'];
   $header = array_merge(array(t('votes')), array_values($role_names));
 
@@ -350,7 +341,7 @@
   }
 
   drupal_set_message(t('the changes have been saved.'));
-  drupal_goto('admin/nmoderation/votes'); // do this because we want the form completely rebuilt.
+  drupal_goto('admin/settings/nmoderation/votes'); // do this because we want the form completely rebuilt.
 }
 
 function theme_nmoderation_vote_settings_form(&$form) {
@@ -709,8 +700,8 @@
 
 function nmoderation_admin_settings() {
   $promote = drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 20, 25, 30, 35, 40, 45, 50, 60, 70, 80, 90, 100));
-  $unpublish = drupal_map_assoc(array(-1, -2, -3, -4, -5, -6, -7, -8, -8, -10, -11, -12, -13, -14, -15, -20, -25, -30, -100));
-  $interval = drupal_map_assoc(range(1,60));
+  $unpublish = drupal_map_assoc(array(-1, -2, -3, -4, -5, -6, -7, -8, -8, -10, -11, -12, -13, -14, -15, -20, -25, -30, -35, -40, -45, -50, -60, -70, -80, -90, -100));
+  $interval = drupal_map_assoc(range(1,365));
 
   $form['nmoderation_node_types'] = array(
     '#type' => 'select',