diff --git a/index.php b/index.php index 08a0e38f..13dd1251 100755 --- a/index.php +++ b/index.php @@ -219,6 +219,7 @@ else if(isset($_GET['do'])) if(is_dir("mtm_db/worlds/$userid")) { if(!is_dir("mtm_db/worlds/$userid/bin")) { echo "Pending: Server is pending creation, this process shouldn't take longer than 30 seconds..."; + echo ""; } else { $serverstatus = file_get_contents("mtm_db/users/$userid.pid.statuscode"); if($serverstatus == "false") { @@ -246,6 +247,7 @@ else if(isset($_GET['do'])) if(is_dir("mtm_db/worlds/$userid")) { if(!is_dir("mtm_db/worlds/$userid/bin")) { echo "Pending: Server is pending creation, this process shouldn't take longer than 30 seconds..."; + echo ""; } else { $serverstatus = file_get_contents("mtm_db/users/$userid.pid.statuscode"); if($serverstatus == "false") { @@ -320,6 +322,7 @@ else if(isset($_GET['do'])) if(is_dir("mtm_db/worlds/$userid")) { if(!is_dir("mtm_db/worlds/$userid/bin")) { echo "Pending: Server is pending creation, this process shouldn't take longer than 30 seconds..."; + echo ""; } else { $serverstatus = file_get_contents("mtm_db/users/$userid.pid.statuscode"); if($serverstatus == "false") { @@ -356,6 +359,7 @@ else if(isset($_GET['do'])) if(is_dir("mtm_db/worlds/$userid")) { if(!is_dir("mtm_db/worlds/$userid/bin")) { echo "Pending: Server is pending creation, this process shouldn't take longer than 30 seconds..."; + echo ""; } else { $serverstatus = file_get_contents("mtm_db/users/$userid.pid.statuscode"); if($serverstatus == "false") { @@ -393,6 +397,7 @@ else if(isset($_GET['do'])) if(is_dir("mtm_db/worlds/$userid")) { if(!is_dir("mtm_db/worlds/$userid/bin")) { echo "Pending: Server is pending creation, this process shouldn't take longer than 30 seconds..."; + echo ""; } else { $serverstatus = file_get_contents("mtm_db/users/$userid.pid.statuscode"); if($serverstatus == "false" || !file_exists("mtm_db/users/$userid.pid")) { @@ -419,6 +424,7 @@ else if(isset($_GET['do'])) if(is_dir("mtm_db/worlds/$userid")) { if(!is_dir("mtm_db/worlds/$userid/bin")) { echo "Pending: Server is pending creation, this process shouldn't take longer than 30 seconds..."; + echo ""; } else { $serverstatus = file_get_contents("mtm_db/users/$userid.pid.statuscode"); if($serverstatus == "true") { @@ -465,8 +471,8 @@ else if(isset($_GET['do'])) if(is_dir("mtm_db/worlds/$userid")) { if(!is_dir("mtm_db/worlds/$userid/bin")) { echo "Please wait: Server is being created, this process shouldn't take longer than 30 seconds..."; - // Refresh the page every 5 seconds for updates on the VM status. - echo ""; + // Refresh the page every 3 seconds for updates on the VM status. + echo ""; } else { echo $username . "'s Server
Server status: "; $serverstatus = file_get_contents("mtm_db/users/$userid.pid.status"); @@ -494,8 +500,8 @@ else if(isset($_GET['do'])) if(is_dir("mtm_db/worlds/$userid")) { if(!is_dir("mtm_db/worlds/$userid/bin")) { echo "Please wait: Server is being created, this process shouldn't take longer than 30 seconds..."; - // Refresh the page every 5 seconds for updates on the VM status. - echo ""; + // Refresh the page every 3 seconds for updates on the VM status. + echo ""; } else { // Check if usermods folder exists, create if not! @@ -565,7 +571,7 @@ else if(isset($_GET['do'])) if(!is_dir("mtm_db/worlds/$userid/bin")) { echo "Please wait: Server is being created, this process shouldn't take longer than 30 seconds..."; // Refresh the page every 5 seconds for updates on the VM status. - echo ""; + echo ""; } else { // Lets checkout what's being uploaded if(isset($_POST['upload-btn'])) { @@ -610,7 +616,7 @@ else if(isset($_GET['do'])) if(!is_dir("mtm_db/worlds/$userid/bin")) { echo "Please wait: Server is being created, this process shouldn't take longer than 30 seconds..."; // Refresh the page every 5 seconds for updates on the VM status. - echo ""; + echo ""; } else { echo $username . "'s Server
Server status: "; $serverstatus = file_get_contents("mtm_db/users/$userid.pid.status"); @@ -653,7 +659,7 @@ else if(isset($_GET['do'])) if(!is_dir("mtm_db/worlds/$userid/bin")) { echo "Please wait: Server is being created, this process shouldn't take longer than 30 seconds..."; // Refresh the page every 5 seconds for updates on the VM status. - echo ""; + echo ""; } else { if(is_dir("mtm_db/worlds/$userid/worlds/world/worldmods")) { $serverstatus = file_get_contents("mtm_db/users/$userid.pid.statuscode"); @@ -682,7 +688,7 @@ else if(isset($_GET['do'])) if(!is_dir("mtm_db/worlds/$userid/bin")) { echo "Please wait: Server is being created, this process shouldn't take longer than 30 seconds..."; // Refresh the page every 5 seconds for updates on the VM status. - echo ""; + echo ""; } else { if(is_dir("mtm_db/usermods/$username")) { file_put_contents("mtm_db/events/$userid", "rm -r mtm_db/usermods/$username/*"); @@ -709,7 +715,7 @@ else if(isset($_GET['do'])) // Lets setup a default configuration script $config_contents = "port = 30" . $userid . "\n"; $config_contents .= "name = " . $username . "\n"; - $config_contents .= "max_users = 25\n"; + $config_contents .= "max_users = $max_slot_count\n"; $config_contents .= "default_game = minetest_game\n"; $config_contents .= "default_privs = shout, interact\n"; $config_contents .= "secure.trusted_mods = irc\n"; @@ -735,7 +741,7 @@ else if(isset($_GET['do'])) if(!is_dir("mtm_db/worlds/$userid/bin")) { echo "Server doesn't exist... unable to remove debug.txt"; // Refresh the page every 5 seconds for updates on the VM status. - echo ""; + echo ""; } else { // Lets setup a default configuration script if(!file_exists("mtm_db/users/$userid.slog")) { @@ -911,13 +917,46 @@ else include_once("mtm_db/token.php"); echo "

Current registration token: $reg_token

"; + echo "

Server information

"; + // Open system meminfo + $fhmem = fopen('/proc/meminfo','r'); + // Open system loadavg + $fhcpu = fopen('/proc/loadavg','r'); + // Set to 0 for population + $memavail = 0; + $memfree = 0; + + while ($line = fgets($fhmem)) { + $piecesavail = array(); + $piecesfree = array(); + if (preg_match('/^MemTotal:\s+(\d+)\skB$/', $line, $piecesavail)) { + $memavail = $piecesavail[1]; + } + + if (preg_match('/^MemAvailable:\s+(\d+)\skB$/', $line, $piecesfree)) { + $memfree = $piecesfree[1]; + break; + } + } + + fclose($fhmem); + + echo round(($memavail/1024)) . " MB RAM found, " . round(($memfree/1024)) . " MB RAM free
\n"; + + while ($line = fgets($fhcpu)) { + echo "Load: " . $line; + } + + fclose($fhcpu); + // To be continued! chdir("mtm_db/users"); - echo ""; + echo "
UsernameFull NameEmailServer-Type/PortUser ID
"; foreach(glob("*.php") as $user_account_file) { include_once($user_account_file); $servertype = file_get_contents("$userid.type"); - echo ""; + $serverstatus = file_get_contents("$userid.pid.status"); + echo ""; } echo "
UsernameFull NameEmailServer-Type/PortUser IDServer Stat
$user_handle$user_fullname$user_email$servertype/$portrange$userid$userid
$user_handle$user_fullname$user_email$servertype/$portrange$userid$userid$serverstatus
"; } diff --git a/version.php b/version.php index 32ec6867..bbda97d0 100644 --- a/version.php +++ b/version.php @@ -1,5 +1,5 @@