The method for retrieving settings returns now an Generator

Author: dspasic

share/templates/layout.php

@@ -210,8 +210,13 @@ function toggleVisible(head, row) {
             <label for="tab-config">Configuration</label>
             <div class="content">
                 <table>
-                    <?php echo $dataModel->getConfigDataRows(); ?>
-                </table>
+                    <?php foreach ($dataModel->getSettings() as $row): ?>
+                        <tr>
+                            <th><?php echo $row['config'] ?></th>
+                            <td><?php echo $row['value'] ?></td>
+                        </tr>
+                    <?php endforeach ?>
+                    </table>
             </div>
         </div>
 

web/index.php

@@ -40,45 +40,42 @@ public function getStatusDataRows()
                         $value = 'true';
                     }
                     if ($k === 'used_memory' || $k === 'free_memory' || $k === 'wasted_memory') {
-                        $v = $this->_size_for_humans(
+                        $value = $this->_size_for_humans(
                             $v
                         );
-                    }
-                    if ($k === 'current_wasted_percentage' || $k === 'opcache_hit_rate') {
-                        $v = number_format(
+                    } elseif ($k === 'current_wasted_percentage' || $k === 'opcache_hit_rate') {
+                        $value = number_format(
                                 $v,
                                 2
                             ) . '%';
+                    } elseif ($k === 'blacklist_miss_ratio') {
+                        $value = number_format($v, 2) . '%';
+                    } elseif ($k === 'start_time' || $k === 'last_restart_time') {
+                        $value = ($v ? date(DATE_RFC822, $v) : 'never');
                     }
-                    if ($k === 'blacklist_miss_ratio') {
-                        $v = number_format($v, 2) . '%';
-                    }
-                    if ($k === 'start_time' || $k === 'last_restart_time') {
-                        $v = ($v ? date(DATE_RFC822, $v) : 'never');
-                    }
+
                     if (THOUSAND_SEPARATOR === true && is_int($v)) {
-                        $v = number_format($v);
+                        $value = number_format($v);
                     }
 
-                    $rows[] = "<tr><th>$k</th><td>$v</td></tr>\n";
+                    $rows[] = "<tr><th>$k</th><td>$value</td></tr>\n";
                 }
-                continue;
-            }
-            if ($value === false) {
-                $value = 'false';
-            }
-            if ($value === true) {
-                $value = 'true';
+            } else {
+                if ($value === false) {
+                    $value = 'false';
+                }
+                if ($value === true) {
+                    $value = 'true';
+                }
+                $rows[] = "<tr><th>$key</th><td>$value</td></tr>\n";
             }
-            $rows[] = "<tr><th>$key</th><td>$value</td></tr>\n";
         }
 
         return implode("\n", $rows);
     }
 
-    public function getConfigDataRows()
+    public function getSettings()
     {
-        $rows = array();
         foreach ($this->configuration['directives'] as $key => $value) {
             if ($value === false) {
                 $value = 'false';
@@ -89,10 +86,8 @@ public function getConfigDataRows()
             if ($key == 'opcache.memory_consumption') {
                 $value = $this->_size_for_humans($value);
             }
-            $rows[] = "<tr><th>$key</th><td>$value</td></tr>\n";
+            yield ["config" => $key, "value" => $value];
         }
-
-        return implode("\n", $rows);
     }
 
     public function getScriptStatusRows()