? nice-menus-d7.patch
Index: nice_menus.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nice_menus/nice_menus.info,v
retrieving revision 1.6
diff -u -p -r1.6 nice_menus.info
--- nice_menus.info	14 Nov 2007 04:30:26 -0000	1.6
+++ nice_menus.info	29 Mar 2010 05:06:58 -0000
@@ -2,4 +2,7 @@
 name = Nice Menus
 description = CSS/jQuery drop-down, drop-right and drop-left menus to be placed in blocks
 dependencies[] = menu
-core = 6.x
+core = 7.x
+files[] = nice_menus.info
+files[] = nice_menus.install
+files[] = nice_menus.module
\ No newline at end of file
Index: nice_menus.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nice_menus/nice_menus.module,v
retrieving revision 1.62
diff -u -p -r1.62 nice_menus.module
--- nice_menus.module	6 May 2009 15:33:49 -0000	1.62
+++ nice_menus.module	29 Mar 2010 05:06:58 -0000
@@ -28,7 +28,7 @@ function nice_menus_help($path, $arg) {
 /**
  * Implementation of hook_form_alter().
  */
-function nice_menus_form_alter(&$form, $form_state, $form_id) {
+function nice_menus_form_alter(&$form, &$form_state, $form_id) {
   switch ($form_id) {
     case 'system_theme_settings':
 
@@ -135,23 +135,62 @@ function nice_menus_settings_validate($f
   }
 }
 
+
+
+
+
+
 /**
- * Implementation of hook_block().
+ * Implementation of hook_block_view().
  */
-function nice_menus_block($op = 'list', $delta = 0, $edit = array()) {
+
+function nice_menus_block_view($delta) {
   global $user;
+  
+  // Build the Nice menu for the block.
+  list($menu_name, $mlid) = explode(':', variable_get('nice_menus_menu_'. $delta, 'navigation:0'));
+  $direction = variable_get('nice_menus_type_'. $delta, 'right');
+  $depth = variable_get('nice_menus_depth_'. $delta, '-1');
+  if ($output = theme('nice_menus', $delta, $menu_name, $mlid, $direction, $depth)) {
+    $block['content'] = $output['content'];
+    if (variable_get('nice_menus_type_'. $delta, 'right') == 'down') {
+      $class = 'nice-menu-hide-title';
+    }
+    else {
+      $class = 'nice-menu-show-title';
+    }
+    // If we're building the navigation block
+    // use the same block title logic as menu module.
+    if ($output['subject'] == t('Navigation') && $user->uid) {
+      $subject = $user->name;
+    }
+    else {
+      $subject = $output['subject'];
+    }
+    $block['subject'] = '<span class="'. $class .'">'. check_plain($subject) .'</span>';
+  }
+  else {
+    $block['content'] = FALSE;
+  }
+  return $block;
+}
+
+/**
+ *Implementation of hook_block_save().
+ */
+function nice_menus_block_save ($delta, $edit) {
+      variable_set('nice_menus_name_'. $delta, $edit['nice_menus_name_'. $delta]);
+      variable_set('nice_menus_menu_'. $delta, $edit['nice_menus_menu_'. $delta]);
+      variable_set('nice_menus_depth_'. $delta, $edit['nice_menus_depth_'. $delta]);
+      variable_set('nice_menus_type_'. $delta, $edit['nice_menus_type_'. $delta]);
+}
+
 
-  switch ($op) {
-    case 'list':
-      for ($i = 1; $i <= variable_get('nice_menus_number', '2'); $i++) {
-        $blocks[$i]['info'] = variable_get('nice_menus_name_'. $i, 'Nice menu '. $i) .' (Nice menu)';
-        // We have too many things changing per user, per page to cache.
-        $blocks[$i]['cache'] = BLOCK_NO_CACHE;
-      }
-      return $blocks;
-    break;
 
-    case 'configure':
+/**
+ *Implementation of hook_block_configure().
+ */
+function nimce_menus_block_configure($delta) {
       $form['nice_menus_name_'. $delta] = array(
         '#type' => 'textfield',
         '#title' => t('Menu Name'),
@@ -179,46 +218,23 @@ function nice_menus_block($op = 'list', 
         '#options' => drupal_map_assoc(array('right', 'left', 'down')),
       );
       return $form;
-    break;
+}
 
-    case 'save':
-      variable_set('nice_menus_name_'. $delta, $edit['nice_menus_name_'. $delta]);
-      variable_set('nice_menus_menu_'. $delta, $edit['nice_menus_menu_'. $delta]);
-      variable_set('nice_menus_depth_'. $delta, $edit['nice_menus_depth_'. $delta]);
-      variable_set('nice_menus_type_'. $delta, $edit['nice_menus_type_'. $delta]);
-    break;
 
-    case 'view':
-      // Build the Nice menu for the block.
-      list($menu_name, $mlid) = explode(':', variable_get('nice_menus_menu_'. $delta, 'navigation:0'));
-      $direction = variable_get('nice_menus_type_'. $delta, 'right');
-      $depth = variable_get('nice_menus_depth_'. $delta, '-1');
-      if ($output = theme('nice_menus', $delta, $menu_name, $mlid, $direction, $depth)) {
-        $block['content'] = $output['content'];
-        if (variable_get('nice_menus_type_'. $delta, 'right') == 'down') {
-          $class = 'nice-menu-hide-title';
-        }
-        else {
-          $class = 'nice-menu-show-title';
-        }
-        // If we're building the navigation block
-        // use the same block title logic as menu module.
-        if ($output['subject'] == t('Navigation') && $user->uid) {
-          $subject = $user->name;
-        }
-        else {
-          $subject = $output['subject'];
-        }
-        $block['subject'] = '<span class="'. $class .'">'. check_plain($subject) .'</span>';
-      }
-      else {
-        $block['content'] = FALSE;
-      }
-      return $block;
-    break;
+
+/**
+ * Implementation of hook_block_info().
+ */
+function nice_menus_block_info() {
+  for ($i = 1; $i <= variable_get('nice_menus_number', '2'); $i++) {
+    $blocks[$i]['info'] = variable_get('nice_menus_name_'. $i, 'Nice menu '. $i) .' (Nice menu)';
+    // We have too many things changing per user, per page to cache.
+    $blocks[$i]['cache'] = DRUPAL_NO_CACHE;
   }
+  return $blocks;
 }
 
+
 /**
  * Implementation of hook_theme().
  */
@@ -370,7 +386,7 @@ function theme_nice_menus_tree($menu_nam
   // Otherwise just set a title and move on.
   else {
     // Get the title from the DB since we don't have it in the $menu.
-    $result = db_result(db_query("SELECT title FROM {menu_custom} WHERE menu_name = '%s'", $menu_name));
+    $result = db_query("SELECT title FROM {menu_custom} WHERE menu_name = :menu_name", array(':menu_name' => $menu_name))->fetchField();
     $title = check_plain($result);
   }
 
@@ -460,7 +476,7 @@ function theme_nice_menus_build($menu, $
  * @return
  *   An HTML string of Nice menu links.
  */
-function theme_nice_menus($id, $menu_name, $mlid, $direction = 'right', $depth = -1, $menu = NULL) {
+function theme_nice_menus($id = '', $menu_name = '', $mlid ='', $direction = 'right', $depth = -1, $menu = NULL) {
   $output = array();
 
   if ($menu_tree = theme('nice_menus_tree', $menu_name, $mlid, $depth, $menu)) {