Fixed bug with SteamID format

Fix #316

Author: Groruk

web/includes/sb-callback.php

@@ -3188,28 +3188,26 @@ function PasteBlock($sid, $name)
     global $userbank, $username;
 
     $sid = (int)$sid;
-    if(!$userbank->HasAccess(ADMIN_OWNER|ADMIN_ADD_BAN))
-    {
-    $objResponse->redirect("index.php?p=login&m=no_access", 0);
-    $log = new CSystemLog("w", "Hacking Attempt", $username . " tried paste a block, but doesn't have access.");
-    return $objResponse;
+    if (!$userbank->HasAccess(ADMIN_OWNER|ADMIN_ADD_BAN)) {
+        $objResponse->redirect("index.php?p=login&m=no_access", 0);
+        $log = new CSystemLog("w", "Hacking Attempt", $username . " tried paste a block, but doesn't have access.");
+        return $objResponse;
     }
     require INCLUDES_PATH.'/CServerRcon.php';
     //get the server data
     $data = $GLOBALS['db']->GetRow("SELECT ip, port, rcon FROM ".DB_PREFIX."_servers WHERE sid = ?;", array($sid));
     if(empty($data['rcon'])) {
-    $objResponse->addScript("$('dialog-control').setStyle('display', 'block');");
-    $objResponse->addScript("ShowBox('Error', 'No RCON password for server ".$data['ip'].":".$data['port']."!', 'red', '', true);");
-    return $objResponse;
+        $objResponse->addScript("$('dialog-control').setStyle('display', 'block');");
+        $objResponse->addScript("ShowBox('Error', 'No RCON password for server ".$data['ip'].":".$data['port']."!', 'red', '', true);");
+        return $objResponse;
     }
 
     $r = new CServerRcon($data['ip'], $data['port'], $data['rcon']);
-    if(!$r->Auth())
-    {
-    $GLOBALS['db']->Execute("UPDATE ".DB_PREFIX."_servers SET rcon = '' WHERE sid = ?;", array($sid));
-    $objResponse->addScript("$('dialog-control').setStyle('display', 'block');");
-    $objResponse->addScript("ShowBox('Error', 'Wrong RCON password for server ".$data['ip'].":".$data['port']."!', 'red', '', true);");
-    return $objResponse;
+    if (!$r->Auth()) {
+        $GLOBALS['db']->Execute("UPDATE ".DB_PREFIX."_servers SET rcon = '' WHERE sid = ?;", array($sid));
+        $objResponse->addScript("$('dialog-control').setStyle('display', 'block');");
+        $objResponse->addScript("ShowBox('Error', 'Wrong RCON password for server ".$data['ip'].":".$data['port']."!', 'red', '', true);");
+        return $objResponse;
     }
 
     $ret = $r->rconCommand("status");
@@ -3218,26 +3216,29 @@ function PasteBlock($sid, $name)
     $found = false;
     $index = -1;
     foreach($matches[2] AS $match) {
-    if($match == $name) {
-    $found = true;
-    $index = $i;
-    break;
-    }
-    $i++;
+        if($match == $name) {
+            $found = true;
+            $index = $i;
+            break;
+        }
+        $i++;
     }
     if($found) {
-    $steam = $matches[3][$index];
-    $name = $matches[2][$index];
-    $objResponse->addScript("$('nickname').value = '" . addslashes($name) . "'");
-    $objResponse->addScript("$('steam').value = '" . $steam . "'");
+        $steam = $matches[3][$index];
+        if (!preg_match(STEAM_FORMAT, $steam)) {
+            $steam = explode(':', $steam);
+            $steam = steam2to3(rtrim($steam[2], ']'));
+        }
+        $name = $matches[2][$index];
+        $objResponse->addScript("$('nickname').value = '" . addslashes($name) . "'");
+        $objResponse->addScript("$('steam').value = '" . $steam . "'");
     } else {
-    $objResponse->addScript("ShowBox('Error', 'Can\'t get player info for ".addslashes(htmlspecialchars($name)).". Player is not on the server (".$data['ip'].":".$data['port'].") anymore!', 'red', '', true);");
-    $objResponse->addScript("$('dialog-control').setStyle('display', 'block');");
-    return $objResponse;
+        $objResponse->addScript("ShowBox('Error', 'Can\'t get player info for ".addslashes(htmlspecialchars($name)).". Player is not on the server (".$data['ip'].":".$data['port'].") anymore!', 'red', '', true);");
+        $objResponse->addScript("$('dialog-control').setStyle('display', 'block');");
+        return $objResponse;
     }
     $objResponse->addScript("SwapPane(0);");
     $objResponse->addScript("$('dialog-control').setStyle('display', 'block');");
     $objResponse->addScript("$('dialog-placement').setStyle('display', 'none');");
     return $objResponse;
 }
-?>

web/version.json

@@ -1,4 +1,4 @@
 {
     "version": "1.6.2",
-    "git": "514"
+    "git": "516"
 }