Only in /var/www/coder/sites/default/files/coder_upgrade/old/vppr: .git
diff -up -r vppr.admin.inc vppr.admin.inc
--- vppr.admin.inc	2012-01-17 22:43:37.250484855 +0200
+++ vppr.admin.inc	2012-01-17 22:45:21.002484724 +0200
@@ -5,7 +5,11 @@
  * Vocabulary Permissions Per Role - administration UI
  */
 
-function vppr_form_admin_settings_vppr() {
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
+function vppr_form_admin_settings_vppr($form, &$form_state) {
   $form = array();
   $vocabs = taxonomy_get_vocabularies();
   $roles = user_roles(TRUE); // List of roles without 'anonymous'.
@@ -41,7 +45,8 @@ function vppr_form_admin_settings_vppr()
 /**
  * Theme helper for vppr_form_admin_settings_vppr().
  */
-function theme_vppr_form_admin_settings_vppr($form) {
+function theme_vppr_form_admin_settings_vppr($variables) {
+  $form = $variables['form'];
   $header = array(FALSE);
   foreach (element_children($form['vppr_roles']) as $rid) {
     $header[$rid] = drupal_render($form['vppr_roles'][$rid]);
@@ -55,7 +60,7 @@ function theme_vppr_form_admin_settings_
     $rows[$vid] = $row;
   }
   $buttons = drupal_render($form['buttons']);
-  return theme('table', $header, $rows) . drupal_render($form) . $buttons;
+  return theme('table', array('header' => $header, 'rows' => $rows)) . drupal_render_children($form) . $buttons;
 }
 
 /**
diff -up -r vppr.info vppr.info
--- vppr.info	2012-01-17 22:43:37.250484855 +0200
+++ vppr.info	2012-01-17 22:45:21.006484724 +0200
@@ -1,5 +1,5 @@
 name = Vocabulary Permissions Per Role
 description = "Allow adding to/editing terms of/removing terms from vocabularies per role."
-core = 6.x
+core = 7.x
 dependencies[] = taxonomy
 
diff -up -r vppr.install vppr.install
--- vppr.install	2012-01-17 22:43:37.246484856 +0200
+++ vppr.install	2012-01-17 22:45:21.018484721 +0200
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implementation of hook_uninstall().
+ * Implements hook_uninstall().
  */
 function vppr_uninstall() {
   variable_del('vppr_perms');
diff -up -r vppr.module vppr.module
--- vppr.module	2012-01-17 22:43:37.246484856 +0200
+++ vppr.module	2012-01-17 22:45:21.290484723 +0200
@@ -8,21 +8,21 @@
  */
 
 /**
- * Implementation of hook_menu_alter().
+ * Implements hook_menu_alter().
  */
 function vppr_menu_alter(&$items) {
   // Taxonomy overview page: http://d6.l/admin/content/taxonomy
-  $items['admin/content/taxonomy']['access callback'] = '_vppr_access_taxonomy';
-  $items['admin/content/taxonomy']['page callback'] = '_vppr_page_taxonomy_overview';
+  $items['admin/structure/taxonomy']['access callback'] = '_vppr_access_taxonomy';
+  $items['admin/structure/taxonomy']['page callback'] = '_vppr_page_taxonomy_overview';
   // Add terms: http://d6.l/admin/content/taxonomy/$vid/add/term
-  $items['admin/content/taxonomy/%taxonomy_vocabulary/add/term']['access callback'] = '_vppr_access_vocabulary';
-  $items['admin/content/taxonomy/%taxonomy_vocabulary/add/term']['access arguments'] = array(3);
+  $items['admin/structure/taxonomy/%taxonomy_vocabulary/add/term']['access callback'] = '_vppr_access_vocabulary';
+  $items['admin/structure/taxonomy/%taxonomy_vocabulary/add/term']['access arguments'] = array(3);
   // Reorder terms: http://d6.l/admin/content/taxonomy/$vid
-  $items['admin/content/taxonomy/%taxonomy_vocabulary']['access callback'] = '_vppr_access_vocabulary';
-  $items['admin/content/taxonomy/%taxonomy_vocabulary']['access arguments'] = array(3);
+  $items['admin/structure/taxonomy/%taxonomy_vocabulary']['access callback'] = '_vppr_access_vocabulary';
+  $items['admin/structure/taxonomy/%taxonomy_vocabulary']['access arguments'] = array(3);
   // Edit and delete terms: http://d6.l/admin/content/taxonomy/edit/term/$tid - warning: there's only a tid arg!
-  $items['admin/content/taxonomy/edit/term']['access callback'] = '_vppr_access_term';
-  $items['admin/content/taxonomy/edit/term']['access arguments'] = array(5);
+  $items['admin/structure/taxonomy/edit/term']['access callback'] = '_vppr_access_term';
+  $items['admin/structure/taxonomy/edit/term']['access arguments'] = array(5);
 }
 
 /**
@@ -70,7 +70,7 @@ function _vppr_access_term($tid) {
   if (user_access('administer taxonomy')) {
     return TRUE;
   }
-  $term = taxonomy_get_term($tid);
+  $term = taxonomy_term_load($tid);
   // Speed up things if there is no such term.
   if (!$term) {
     return FALSE;
@@ -86,18 +86,23 @@ function _vppr_access_term($tid) {
 }
 
 /**
- * Implementation of hook_perm().
+ * Implements hook_permission().
  */
-function vppr_perm() {
-  return array('administer VPPR');
+function vppr_permission() {
+  return array(
+    'administer VPPR' => array(
+      'title' => t('administer VPPR'),
+      'description' => t('TODO Add a description for \'administer VPPR\''),
+    ),
+  );
 }
 
 /**
- * Implementation of hook_menu().
+ * Implements hook_menu().
  */
 function vppr_menu() {
   $items = array();
-  $items['admin/settings/vppr'] = array(
+  $items['admin/config/vppr'] = array(
     'title' => 'Vocabulary permissions',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('vppr_form_admin_settings_vppr'),
@@ -109,12 +114,12 @@ function vppr_menu() {
 }
 
 /**
- * Implementation of hook_theme().
+ * Implements hook_theme().
  */
 function vppr_theme() {
   return array(
     'vppr_form_admin_settings_vppr' => array(
-      'arguments' => array('form' => array()),
+      'render element' => 'form',
       'file' => 'vppr.admin.inc',
     ),
   );
@@ -134,6 +139,7 @@ function _vppr_page_taxonomy_overview($f
   // If $user has 'administer taxonomy', then do not do anything, just bail
   // out early with the untouched form.
   if (user_access('administer taxonomy')) {
+    // TODO  needs to have $form as its first parameter.
     return drupal_get_form($form_id);
   }
   $header = array(
@@ -152,18 +158,21 @@ function _vppr_page_taxonomy_overview($f
     }
     $types = array();
     foreach ($vocabulary->nodes as $type) {
-      $node_type = node_get_types('name', $type);
+      $node_type = node_type_get_name($type);
       $types[] = $node_type ? check_plain($node_type) : check_plain($type);
     }
     $rows[] = array(
       check_plain($vocabulary->name),
       implode(', ', $types),
-      l(t('list terms'), "admin/content/taxonomy/$vocabulary->vid"),
-      l(t('add terms'), "admin/content/taxonomy/$vocabulary->vid/add/term"),
+      l(t('list terms'), "admin/structure/taxonomy/$vocabulary->vid"),
+      l(t('add terms'), "admin/structure/taxonomy/$vocabulary->vid/add/term"),
     );
   }
   if (empty($rows)) {
-    $rows[] = array(array('data' => t('No vocabularies available.'), 'colspan' => '4'));
+    $rows[] = array(array(
+        'data' => t('No vocabularies available.'),
+        'colspan' => '4',
+      ));
   }
-  return theme('table', $header, $rows);
+  return theme('table', array('header' => $header, 'rows' => $rows));
 }

