use if/then instead of die

Author: simonLeary42

webroot/panel/ajax/get_group_members.php

@@ -20,25 +20,23 @@
     }
 }
 
-if (!$found) {
-    die();
-}
-
-$count = count($members);
-foreach ($members as $key => $member) {
-    if ($member->getUID() == $group->getOwner()->getUID()) {
-        continue;
+if ($found) {
+    $count = count($members);
+    foreach ($members as $key => $member) {
+        if ($member->getUID() == $group->getOwner()->getUID()) {
+            continue;
+        }
+
+        if ($key >= $count - 1) {
+            echo "<tr class='expanded $key last'>";
+        } else {
+            echo "<tr class='expanded $key'>";
+        }
+
+        echo "<td>" . $member->getFullname() . "</td>";
+        echo "<td>" . $member->getUID() . "</td>";
+        echo "<td><a href='mailto:" . $member->getMail() . "'>" . $member->getMail() . "</a></td>";
+        echo "<td><input type='hidden' name='uid' value='" . $member->getUID() . "'></td>";
+        echo "</tr>";
     }
-
-    if ($key >= $count - 1) {
-        echo "<tr class='expanded $key last'>";
-    } else {
-        echo "<tr class='expanded $key'>";
-    }
-
-    echo "<td>" . $member->getFullname() . "</td>";
-    echo "<td>" . $member->getUID() . "</td>";
-    echo "<td><a href='mailto:" . $member->getMail() . "'>" . $member->getMail() . "</a></td>";
-    echo "<td><input type='hidden' name='uid' value='" . $member->getUID() . "'></td>";
-    echo "</tr>";
 }

webroot/panel/modal/pi_search.php

@@ -4,34 +4,34 @@
 
 $search_query = $_GET["search"];  // Search is passed as a get var
 if (empty($search_query)) {
-    die("<span>No Results</span>");
-}
-
-$assocs = $LDAP->getAllPIGroups($SQL, $MAILER, $REDIS, $WEBHOOK);
+    echo "<span>No Results</span>";
+} else {
+    $assocs = $LDAP->getAllPIGroups($SQL, $MAILER, $REDIS, $WEBHOOK);
 
-$MAX_COUNT = 10;  // Max results of PI search
+    $MAX_COUNT = 10;  // Max results of PI search
 
-$out = array();
-foreach ($assocs as $assoc_obj) {
-    $assoc = $assoc_obj->getPIUID();
-    // loop through each association
-    if (strpos($assoc, $search_query) !== false) {
-        array_push($out, $assoc);
-        if (count($out) >= $MAX_COUNT) {
-            break;
-        }
-    }
-    $fn = strtolower($assoc_obj->getOwner()->getFullName());
-    if (strpos($fn, strtolower($search_query)) !== false) {
-        if (!in_array($assoc, $out)) {
+    $out = array();
+    foreach ($assocs as $assoc_obj) {
+        $assoc = $assoc_obj->getPIUID();
+        // loop through each association
+        if (strpos($assoc, $search_query) !== false) {
             array_push($out, $assoc);
             if (count($out) >= $MAX_COUNT) {
                 break;
             }
         }
+        $fn = strtolower($assoc_obj->getOwner()->getFullName());
+        if (strpos($fn, strtolower($search_query)) !== false) {
+            if (!in_array($assoc, $out)) {
+                array_push($out, $assoc);
+                if (count($out) >= $MAX_COUNT) {
+                    break;
+                }
+            }
+        }
     }
-}
 
-foreach ($out as $pi_acct) {
-    echo "<span>$pi_acct</span>";
+    foreach ($out as $pi_acct) {
+        echo "<span>$pi_acct</span>";
+    }
 }