Merge pull request #526 from bbannon/foreach

Author: craigk5n

access.php

@@ -183,18 +183,20 @@
         <option value="__default__"'
    . ( $guser == '__default__' ? $selected : '' )
    . '>' . $defConfigStr . '</option>';
-  for( $i = 0, $cnt = count( $userlist ); $i < $cnt; $i++ ) {
+
+  foreach ( $userlist as $i ) {
     echo '
-        <option value="' . $userlist[$i]['cal_login'] . '"'
-     . ( $guser == $userlist[$i]['cal_login'] ? $selected : '' )
-     . '>' . $userlist[$i]['cal_fullname'] . '</option>';
+        <option value="' . $i['cal_login'] .
+      ( $guser === $i['cal_login'] ? '" selected>' : '">' ) .
+      $i['cal_fullname'] . '</option>';
   }
-  for( $i = 0, $cnt = count( $nonuserlist ); $i < $cnt; $i++ ) {
+
+  foreach ( $nonuserlist as $i ) {
     echo '
-        <option value="' . $nonuserlist[$i]['cal_login'] . '"'
-     . ( $guser == $nonuserlist[$i]['cal_login'] ? $selected : '' )
-     . '>' . $nonuserlist[$i]['cal_fullname'] . ' '
-     . ( $nonuserlist[$i]['cal_is_public'] == 'Y' ? '*' : '' ) . '</option>';
+        <option value="' . $i['cal_login'] .
+      ( $guser === $i['cal_login'] ? '" selected>' : '">' ) .
+      $i['cal_fullname'] . ' ' .
+      ( $i['cal_is_public'] === 'Y' ? '*' : '' ) . '</option>';
   }
 
   echo $goStr;
@@ -294,14 +296,15 @@
      . ( $otheruser == '__default__' ? $selected : '' )
      . '>' . $defConfigStr . '</option>';
 
-    for( $i = 0, $cnt = count( $userlist ); $i < $cnt; $i++ ) {
-      if( $userlist[$i]['cal_login'] != $guser )
+    foreach ( $userlist as $i ) {
+      if ( $i['cal_login'] !== $guser )
         echo '
-        <option value="' . $userlist[$i]['cal_login'] . '"'
-         . ( ! empty( $otheruser ) && $otheruser == $userlist[$i]['cal_login']
-          ? $selected : '' )
-         . '>' . $userlist[$i]['cal_fullname'] . '</option>';
+        <option value="' . $i['cal_login'] .
+          ( ! empty ( $otheruser ) && $otheruser === $i['cal_login']
+            ? '" selected>' : '">' ) .
+          $i['cal_fullname'] . '</option>';
     }
+
     echo $goStr;
   }
 }
@@ -475,4 +478,4 @@ function get_list_of_users( $user ) {
   return $u;
 }
 
-?>
+?>