Use foreach rather than /etc/profile.d/*.sh

Author: jamesl1001

php/getWolframData.php

@@ -42,31 +42,27 @@ function parsePlainText($key, $pod) {
         switch($key) {
             case 'nearbyCities2':
                 $replaceWith = '</li><li>';
-                $i           = 0;
 
                 $plaintext = preg_replace('/\(straight-line distance to city centers\)/', '', $plaintext);
                 preg_match_all('/people/', $plaintext, $matches, PREG_OFFSET_CAPTURE);
 
-                foreach($matches[0] as $match) {
-                    if($i == count($matches[0]) - 1) { continue; }
-                    $plaintext = substr_replace($plaintext, $replaceWith, strlen($match[0]) + $match[1] + 1 + $i * strlen($replaceWith), 0);
-                    $i++;
+                foreach($matches[0] as $key => $match) {
+                    if($key == count($matches[0]) - 1) { continue; }
+                    $plaintext = substr_replace($plaintext, $replaceWith, strlen($match[0]) + $match[1] + 1 + $key * strlen($replaceWith), 0);
                 }
 
                 return '<ul><li>' . $plaintext . '</li></ul>';
                 break;
 
             case 'nearbyFeatures':
                 $replaceWith = '</li><li>';
-                $i           = 0;
 
                 $plaintext = preg_replace('/\(straight-line distance to feature center\)/', '', $plaintext);
                 preg_match_all('/miles [a-zA-Z0-9\-]+/', $plaintext, $matches, PREG_OFFSET_CAPTURE);
 
-                foreach($matches[0] as $match) {
-                    if($i == count($matches[0]) - 1) { continue; }
-                    $plaintext = substr_replace($plaintext, $replaceWith, strlen($match[0]) + $match[1] + 1 + $i * strlen($replaceWith), 0);
-                    $i++;
+                foreach($matches[0] as $key => $match) {
+                    if($key == count($matches[0]) - 1) { continue; }
+                    $plaintext = substr_replace($plaintext, $replaceWith, strlen($match[0]) + $match[1] + 1 + $key * strlen($replaceWith), 0);
                 }
 
                 return '<ul><li>' . $plaintext . '</li></ul>';
@@ -81,7 +77,7 @@ function parsePlainText($key, $pod) {
         }
     }
 
-    foreach($dataCategories as $key=>$categoryPods) {
+    foreach($dataCategories as $key => $categoryPods) {
         switch($key) {
             case 'categoryNearby':
                 $class = 'env-data-pod--nearby';
@@ -104,7 +100,7 @@ function parsePlainText($key, $pod) {
 
             echo '<h1><i class=" '. $icon .' "></i>' . $title . '</h1>';
 
-        foreach($categoryPods as $key=>$pod) {
+        foreach($categoryPods as $key => $pod) {
             echo '<h2>' . $pod[0]->attributes()->title . '</h2><p>' . parsePlainText($key, $pod) . '</p>';
         }