Corrected dependency of message_private_og to og (2.x)

Ensured there was a function_exists check in hook_requirements for og_get_all_group_bundle
Removed some unsused variable declarations found by parview script.

message_private.install

@@ -372,9 +372,9 @@ function message_private_uninstall() {
   // Check if there are message types on the system. Get the message types and
   // get the id of the private_message type and remove it and set the indicator
   // to state removed.
-  if ($entity_type = entity_get_info('message_type')) {
+  if (entity_get_info('message_type')) {
     $message_types = entity_load('message_type');
-    foreach ($message_types as $id => $message_type) {
+    foreach ($message_types as $message_type) {
       if ($message_type->name == 'private_message') {
         entity_delete('message_type', $message_type->id);
         $removed = TRUE;

message_private_og/message_private_og.info

@@ -3,6 +3,6 @@ description = Private messages with message access based on OG message reference
 core = 7.x
 
 dependencies[] = message_private
-dependencies[] = og
+dependencies[] = og (2.x)
 
 package = Message

message_private_og/message_private_og.install

@@ -14,14 +14,16 @@ function message_private_og_requirements($phase) {
   $t = get_t();
 
   if ($phase == 'install' || $phase == 'runtime') {
-    $bundles = og_get_all_group_bundle();
-    if (!isset($bundles['node'])) {
-      $requirements['message_private_og_bundle'] = array(
-        'title' => $t('Message Private OG'),
-        'description' => $t('You need a bundle that is a group type to send group messages'),
-        'severity' => REQUIREMENT_WARNING,
-        'value' => $t('No group bundle'),
-      );
+    if(function_exists('og_get_all_group_bundle')) {
+      $bundles = og_get_all_group_bundle();
+      if (!isset($bundles['node'])) {
+        $requirements['message_private_og_bundle'] = array(
+          'title' => $t('Message Private OG'),
+          'description' => $t('You need a bundle that is a group type to send group messages'),
+          'severity' => REQUIREMENT_WARNING,
+          'value' => $t('No group bundle'),
+        );
+      }
     }
   }