Merge branch 'master' into stable

1 files changed, 0 insertions, 4 deletions

diff --git a/data.php b/data.php
index a41d896..005267c 100644
--- a/data.php
+++ b/data.php
@@ -240,12 +240,10 @@ foreach ($lines as $num => $line)
       } else{
           $links[$jot]->channel ="undef";
           $links[$jot]->frequency ="undef";
-  //        echo "keine IP\n";
       }
       if (array_key_exists($ipfromLoc,$routerhash)){
          if($conf['acl']['auth']){
             if (strpos($links[$jot]->dnsto,$routerhash[$ipfromLoc][1])===false){
-//              echo "C\n";
               $links[$jot]->dnsto =($routerhash[$ipfromLoc][1].' (Kanal: '.$links[$jot]->channel.' / '.$links[$jot]->frequency.' GHz)'.';'.($links[$jot]->dnsto));
             }
          }
@@ -256,7 +254,6 @@ foreach ($lines as $num => $line)
       if (array_key_exists($iptoLoc,$routerhash)){
          if($conf['acl']['auth']){
           if (strpos($links[$jot]->dnsfrom,$routerhash[$iptoLoc][1])===false){
-//              echo "D\n";
               $links[$jot]->dnsfrom =($routerhash[$iptoLoc][1].' (Kanal: '.$links[$jot]->channel.' / '.$links[$jot]->frequency.' GHz)'.';'.($links[$jot]->dnsfrom));
               }
          }
@@ -293,7 +290,6 @@ foreach ($lines as $num => $line)
       } else{
           $links[$i]->channel ="undef";
           $links[$i]->frequency ="undef";
-  //        echo "keine IP\n";
     }
     $links[$i]->defaultroute = "0";