PR - tariqbuilds#11: changed response type to be application/json per tariqbuilds#10

Author: tariqbuilds

index.html

@@ -323,6 +323,7 @@ <h3> Processes </h3>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.9.4/jquery.dataTables.min.js"></script>
 <script src="js/odometer.js"></script>
 <script src="js/magic_happens_here.js"></script>
+<script src="js/base.js"></script>
 
 </body>
 </html>

sh/df.php

@@ -1,7 +1,8 @@
 <?php 
 
     exec('df -h|awk \'{print $1","$2","$3","$4","$5","$6}\'',$result);
-    
+    header('Content-Type: application/json; charset=UTF-8');
+
     echo "[";
     $x = 0;
     $max = count($result)-1;

sh/hostname.php

@@ -1 +1,4 @@
-<?php echo shell_exec('hostname');
+<?php 
+
+header('Content-Type: application/json; charset=UTF-8');
+echo shell_exec('hostname');

sh/ip.php

@@ -5,6 +5,8 @@
 
     exec('curl http://ipecho.net/plain; echo',$result2);
 
+    header('Content-Type: application/json; charset=UTF-8');
+
     echo '[[','"external ip","',$result2[0],'"]';
     $x = 0;
     $max = count($result)-1;
@@ -16,4 +18,3 @@
         $x++;
     }
     echo ']';
-    //echo json_encode($r);

sh/issue.php

@@ -1 +1,3 @@
-<?php echo shell_exec('lsb_release -ds;uname -r') ;
+<?php 
+header('Content-Type: application/json; charset=UTF-8');
+echo shell_exec('lsb_release -ds;uname -r') ;

sh/mem.php

@@ -2,5 +2,8 @@
 
     //exec('cat /proc/meminfo|awk \'{print $1","$2}\'',$result);
     //exec('free -m|awk \'{print $1","$2","$3","$4}\'',$result);
+
     exec('free -tmo|awk \'{print $1","$2","$3-$6-$7","$4+$6+$7}\'',$result);
-    echo json_encode( explode(',',$result[1]) );
+    header('Content-Type: application/json; charset=UTF-8');
+	echo json_encode( explode(',',$result[1]) );
+	

sh/online.php

@@ -8,4 +8,5 @@
     {
         $result[] = explode(",", $user);
     }
+	header('Content-Type: application/json; charset=UTF-8');
     echo json_encode($result);

sh/ps.php

@@ -3,6 +3,8 @@
     // each row (including header) is in csv format
     exec('ps -aux|awk '."'{print ".'$1","$2","$3","$4","$5","$6","$7","$8","$9","$10","$11'."}'", $result);
 
+    header('Content-Type: application/json; charset=UTF-8');
+
     echo "[";
     $x = 0;
     $max = count($result)-1;

sh/test.php

@@ -2,4 +2,6 @@
 
 $milli = shell_exec('awk \'{print $1*1000}\' /proc/uptime');
 
+header('Content-Type: application/json; charset=UTF-8');
+
 echo (int)($milli)/(1000*60*60);

sh/top.php

@@ -17,6 +17,8 @@
     
     */
 
+    header('Content-Type: application/json; charset=UTF-8');
+
     $final = '[';
 
     // Extract the first row of results
@@ -56,6 +58,4 @@
 
     $final .= ']';  
 
-    echo($final);  
-  
-  
+    echo($final); 

sh/uptime.php

@@ -1 +1,4 @@
-<?php echo (int) (shell_exec('cat /proc/uptime')/(60*60));
+<?php
+
+header('Content-Type: application/json; charset=UTF-8'); 
+echo (int) (shell_exec('cat /proc/uptime')/(60*60));

sh/users.php

@@ -2,6 +2,7 @@
 
     exec('awk -F: \'{ if ($3<=499) print "system,"$1","$6; else print "user,"$1","$6; }\' < /etc/passwd',$result);
 
+    header('Content-Type: application/json; charset=UTF-8');
     echo "[";
     $x = 0;
     $max = count($result)-1;
@@ -13,4 +14,4 @@
         echo json_encode( $line );
         echo ($x-1==$max)?'':',';
     }
-    echo ']';
+    echo ']';

sh/whereis.php

@@ -3,7 +3,8 @@
     exec('whereis php node mysql vim python ruby java apache2 nginx openssl vsftpd make'.
           '|awk \'{ split($1, a, ":");if (length($2)==0) print a[1]",Not Installed"; else print a[1]","$2;}\'',$result);
 
-    
+    header('Content-Type: application/json; charset=UTF-8');
+
     echo "[";
     $x = 0;
     $max = count($result)-1;