ditch use of xml2array, related to opnsense/plugins#269

opnsense · Sep 16, 2017 · 73e31ca · 73e31ca
1 parent c945095
commit 73e31ca
Showing 1 changed file with 29 additions and 38 deletions.
diff --git a/src/www/getserviceproviders.php b/src/www/getserviceproviders.php
@@ -33,15 +33,15 @@
 
 $serviceproviders_xml = "/usr/local/opnsense/contrib/mobile-broadband-provider-info/serviceproviders.xml";
 $serviceproviders_contents = file_get_contents($serviceproviders_xml);
-$serviceproviders_attr = xml2array($serviceproviders_contents,1,"attr");
-$serviceproviders = &$serviceproviders_attr['serviceproviders']['country'];
+$serviceproviders = simplexml_load_string($serviceproviders_contents);
+
 
 function get_country_providers($country)
 {
     global $serviceproviders;
     foreach($serviceproviders as $sp) {
-        if ($sp['attr']['code'] == strtolower($country)) {
-            return is_array($sp['provider'][0]) ? $sp['provider'] : array($sp['provider']);
+        if ($sp->attributes()['code'] == strtolower($country)) {
+            return $sp;
         }
     }
     return array();
@@ -51,10 +51,10 @@ function country_list()
 {
     global $serviceproviders;
     $country_list = get_country_codes();
-    foreach($serviceproviders as $sp) {
+    foreach ($serviceproviders as $sp) {
         foreach($country_list as $code => $country) {
-            if (strtoupper($sp['attr']['code']) == $code) {
-                echo $country . ":" . $code . "\n";
+            if ($sp->attributes()['code'] == strtolower($code)) {
+                  echo $country . ":" . $code . "\n";
             }
         }
     }
@@ -64,7 +64,7 @@ function providers_list($country)
 {
     $serviceproviders = get_country_providers($country);
     foreach($serviceproviders as $sp) {
-        echo $sp['name']['value'] . "\n";
+        echo (string)$sp->name . "\n";
     }
 }
 
@@ -73,30 +73,24 @@ function provider_plan_data($country,$provider,$connection) {
     echo "<?xml version=\"1.0\" ?>\n";
     echo "<connection>\n";
     $serviceproviders = get_country_providers($country);
+    $conndata = null;
     foreach($serviceproviders as $sp) {
-        if (strtolower($sp['name']['value']) == strtolower($provider)) {
+        if (strtolower((string)$sp->name) == strtolower($provider)) {
             if (strtoupper($connection) == "CDMA") {
-                $conndata = $sp['cdma'];
+                $conndata = $sp->cdma;
             } else {
-                if (!is_array($sp['gsm']['apn'][0])) {
-                    $conndata = $sp['gsm']['apn'];
-                } else {
-                    foreach($sp['gsm']['apn'] as $apn) {
-                        if ($apn['attr']['value'] == $connection) {
-                            $conndata = $apn;
-                            break;
-                        }
+                foreach ($sp->gsm->apn as $apn) {
+                    if ($apn->attributes()['value'] == $connection) {
+                        $conndata = $apn;
                     }
                 }
             }
-            if (is_array($conndata)) {
+            if (!empty($conndata)) {
                 echo "<apn>" . $connection . "</apn>\n";
-                echo "<username>" . $conndata['username']['value'] . "</username>\n";
-                echo "<password>" . $conndata['password']['value'] . "</password>\n";
-
-                $dns_arr = is_array($conndata['dns'][0]) ? $conndata['dns'] : array( $conndata['dns'] );
-                foreach($dns_arr as $dns) {
-                    echo '<dns>' . $dns['value'] . "</dns>\n";
+                echo "<username>" . (string)$conndata->username . "</username>\n";
+                echo "<password>" . (string)$conndata->password . "</password>\n";
+                foreach($conndata->dns as $dns) {
+                    echo '<dns>' . $dns . "</dns>\n";
                 }
             }
             break;
@@ -108,21 +102,18 @@ function provider_plan_data($country,$provider,$connection) {
 function provider_plans_list($country,$provider) {
     $serviceproviders = get_country_providers($country);
     foreach($serviceproviders as $sp) {
-        if (strtolower($sp['name']['value']) == strtolower($provider)) {
-            if (array_key_exists('gsm',$sp)) {
-                if (array_key_exists('attr',$sp['gsm']['apn'])) {
-                    $name = ($sp['gsm']['apn']['name'] ? $sp['gsm']['apn']['name'] : $sp['name']['value']);
-                    echo $name . ":" . $sp['gsm']['apn']['attr']['value'];
-                } else {
-                    foreach($sp['gsm']['apn'] as $apn_info) {
-                        $name = ($apn_info['name']['value'] ? $apn_info['name']['value'] : $apn_info['gsm']['apn']['name']);
-                        echo $name . ":" . $apn_info['attr']['value'] . "\n";
-                    }
+        if (strtolower((string)$sp->name) == strtolower($provider)) {
+            if (!empty($sp->gsm)) {
+                foreach ($sp->gsm->apn as $apn) {
+                    $apn_name = !empty((string)$apn->name) ? (string)$apn->name : (string)$apn ;
+                    echo $apn_name . ":". (string)$apn->attributes()['value'] ."\n";
                 }
             }
-            if (array_key_exists('cdma',$sp)) {
-                $name = $sp['cdma']['name']['value'] ? $sp['cdma']['name']['value']:$sp['name']['value'];
-                echo $name . ":" . "CDMA";
+            if (!empty($sp->cdma)) {
+                foreach ($sp->cdma as $apn) {
+                    $apn_name = !empty($apn->name) ? (string)$apn->name : (string)$sp->name ;
+                    echo $apn_name . ":CDMA" ."\n";
+                }
             }
         }
     }