Merge pull request benedmunds#1462 from kgkanatsios/edit-user-code-re…

…factoring User Edit: Code refactoring
ar-rohman · Jul 23, 2020 · 491d0d2 · 491d0d2
2 parents cca1882 + 4a9b7f8
commit 491d0d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/controllers/Auth.php b/controllers/Auth.php
@@ -593,7 +593,7 @@ public function edit_user($id)
 
 		$user = $this->ion_auth->user($id)->row();
 		$groups = $this->ion_auth->groups()->result_array();
-		$currentGroups = $this->ion_auth->get_users_groups($id)->result();
+		$currentGroups = $this->ion_auth->get_users_groups($id)->result_array();
 
 		//USAGE NOTE - you can do more complicated queries like this
 		//$groups = $this->ion_auth->where(['field' => 'value'])->groups()->result_array();

diff --git a/views/auth/edit_user.php b/views/auth/edit_user.php
@@ -40,18 +40,7 @@
           <h3><?php echo lang('edit_user_groups_heading');?></h3>
           <?php foreach ($groups as $group):?>
               <label class="checkbox">
-              <?php
-                  $gID=$group['id'];
-                  $checked = null;
-                  $item = null;
-                  foreach($currentGroups as $grp) {
-                      if ($gID == $grp->id) {
-                          $checked= ' checked="checked"';
-                      break;
-                      }
-                  }
-              ?>
-              <input type="checkbox" name="groups[]" value="<?php echo $group['id'];?>"<?php echo $checked;?>>
+              <input type="checkbox" name="groups[]" value="<?php echo $group['id'];?>" <?php echo (in_array($group, $currentGroups)) ? 'checked="checked"' : null; ?>>
               <?php echo htmlspecialchars($group['name'],ENT_QUOTES,'UTF-8');?>
               </label>
           <?php endforeach?>