DD

@@ -2,7 +2,7 @@
 use Tz\WordPress\Tools;
 use Tz\WordPress\Tools\Notifications;
 use Tz\WordPress\Tools\Notifications\Settings;
-
+use Tz\WordPress\UAM;
 
     $user_ID = get_current_user_id();
     $AAL = get_user_meta($user_ID, '_AAL', false);
@@ -75,7 +75,7 @@ use Tz\WordPress\Tools\Notifications\Settings;
 			 <?php foreach ($notifications['newsletter'] as $entry):
                 $sendto = $entry->sendto;
                 if (is_numeric($sendto)) {
-                    $sendto = Notifications\getGroups($sendto)." Group";
+                    $sendto = UAM\getGroups($sendto)." Group";
                 } else {
                     $sendto = Notifications\get_field_lookup($sendto);
                 }

@@ -3,6 +3,7 @@
 use Tz\WordPress\Tools;
 use Tz\WordPress\Tools\Notifications;
 use Tz\WordPress\Tools\Notifications\Settings;
+use Tz\WordPress\UAM;
 
 function getInputFormValues($validation, $name)
 {
@@ -93,12 +94,14 @@ $newsletterFr = get_post($newsletterFrId);
 ? 'selected="selected"' : ""; ?>>All Users
                             </option>
                             <optgroup label="By Group:">
-                                <?php foreach (Notifications\getGroups() as $group_id => $group_name): ?>
-                                    <option value="<?php echo $group_id ?>" <?php echo ($validation->set_value(
+                            <?php       $groups = UAM\getGroups();
+                        foreach ($groups as $group){
+                          ?>
+                                    <option value="<?php echo $group->getID(); ?>" <?php echo ($validation->set_value(
     'sendto'
-) == $group_id) ? 'selected="selected"'
-: ""; ?>><?php echo $group_name; ?></option>
-                                <?php endforeach;?>
+) ==  $group->getID()) ? 'selected="selected"'
+: ""; ?>><?php echo  $group->getName(); ?></option>
+                                <?php };?>
                             </optgroup>
                         </select>
                         <?php echo $validation->form_error('sendto'); ?>