Fix Empty Steam3 ID and FAQ Link #104

sarabveer · sarabveer · commit 26062824b1c0 · 2016-01-11T16:08:43.000-05:00
diff --git a/web_upload/includes/sb-callback.php b/web_upload/includes/sb-callback.php
@@ -1369,7 +1369,7 @@ function ServerHostPlayers($sid, $type="servers", $obId="", $tplsid="", $open=""
 			}
 		}else{
 			if($userbank->HasAccess(ADMIN_OWNER))
-				$objResponse->addAssign("host_$sid", "innerHTML", "<b>Error connecting</b> (<i>" . $res[1] . ":" . $res[2]. "</i>) <small><a href=\"http://sourcebans.net/node/25\" title=\"Which ports does the SourceBans webpanel require to be open?\">Help</a></small>");
+				$objResponse->addAssign("host_$sid", "innerHTML", "<b>Error connecting</b> (<i>" . $res[1] . ":" . $res[2]. "</i>) <small><a href=\"https://sarabveer.github.io/SourceBans-Fork/faq\" title=\"Which ports does the SourceBans webpanel require to be open?\">Help</a></small>");
 			else
 				$objResponse->addAssign("host_$sid", "innerHTML", "<b>Error connecting</b> (<i>" . $res[1] . ":" . $res[2]. "</i>)");
 			$objResponse->addAssign("players_$sid", "innerHTML", "N/A");
diff --git a/web_upload/init.php b/web_upload/init.php
@@ -84,7 +84,7 @@
 define('SB_GIT', true);
 if(!defined('SB_VERSION')){
 	define('SB_VERSION', '1.5.4-dev');
-	define('SB_GITRev', '$Git: 321 $');
+	define('SB_GITRev', '$Git: 324 $');
 }
 define('LOGIN_COOKIE_LIFETIME', (60*60*24*7)*2);
 define('COOKIE_PATH', '/');
diff --git a/web_upload/pages/page.banlist.php b/web_upload/pages/page.banlist.php
@@ -435,8 +435,7 @@ function setPostKey()
 	$data['communityid'] = $res->fields['community_id'];
 	$steam2id = $data['steamid'];
 	$steam3parts = explode(':', $steam2id);
-	$steamid3 = '[U:1:' . ($steam3parts[2] * 2 + $steam3parts[1]) . ']';
-	$data['steamid3'] = $steamid3;
+	$data['steamid3'] = '[U:1:' . ($steam3parts[2] * 2 + $steam3parts[1]) . ']';
 
 	if(isset($GLOBALS['config']['banlist.hideadminname']) && $GLOBALS['config']['banlist.hideadminname'] == "1" && !$userbank->is_admin())
 		$data['admin'] = false;
diff --git a/web_upload/pages/page.commslist.php b/web_upload/pages/page.commslist.php
@@ -417,8 +417,7 @@ function setPostKey()
 	$data['communityid'] = $res->fields['community_id'];
 	$steam2id = $data['steamid'];
 	$steam3parts = explode(':', $steam2id);
-	$steamid3 = '[U:1:' . ($steam3parts[2] * 2 + $steam3parts[1]) . ']';
-	$data['steamid3'] = $steamid3;
+	$data['steamid3'] = '[U:1:' . ($steam3parts[2] * 2 + $steam3parts[1]) . ']';
 
 	if(isset($GLOBALS['config']['banlist.hideadminname']) && $GLOBALS['config']['banlist.hideadminname'] == "1" && !$userbank->is_admin())
 		$data['admin'] = false;
diff --git a/web_upload/themes/default/page_bans.tpl b/web_upload/themes/default/page_bans.tpl
@@ -184,7 +184,7 @@
               <tr align="left">
                 <td width="20%" height="16" class="listtable_1">Steam3 ID</td>
                 <td height="16" class="listtable_1">
-                  {if empty($ban.steamid3)}
+                  {if empty($ban.steamid)}
                     <i><font color="#677882">No Steam3 ID present</font></i>
                   {else}
                     <a href="http://steamcommunity.com/profiles/{$ban.steamid3}" target="_blank">{$ban.steamid3}</a>
diff --git a/web_upload/themes/default/page_comms.tpl b/web_upload/themes/default/page_comms.tpl
@@ -165,7 +165,7 @@
               <tr align="left">
                 <td width="20%" height="16" class="listtable_1">Steam3 ID</td>
                 <td height="16" class="listtable_1">
-                  {if empty($ban.steamid3)}
+                  {if empty($ban.steamid)}
                     <i><font color="#677882">No Steam3 ID present</font></i>
                   {else}
                     <a href="http://steamcommunity.com/profiles/{$ban.steamid3}" target="_blank">{$ban.steamid3}</a>
diff --git a/web_upload/themes/sb_default/page_bans.tpl b/web_upload/themes/sb_default/page_bans.tpl
@@ -187,7 +187,7 @@
               <tr align="left">
                 <td width="20%" height="16" class="listtable_1">Steam3 ID</td>
                 <td height="16" class="listtable_1">
-                  {if empty($ban.steamid3)}
+                  {if empty($ban.steamid)}
                     <i><font color="#677882">No Steam3 ID present</font></i>
                   {else}
                     <a href="http://steamcommunity.com/profiles/{$ban.steamid3}" target="_blank">{$ban.steamid3}</a>
diff --git a/web_upload/themes/sb_default/page_comms.tpl b/web_upload/themes/sb_default/page_comms.tpl
@@ -165,7 +165,7 @@
               <tr align="left">
                 <td width="20%" height="16" class="listtable_1">Steam3 ID</td>
                 <td height="16" class="listtable_1">
-                  {if empty($ban.steamid3)}
+                  {if empty($ban.steamid)}
                     <i><font color="#677882">No Steam3 ID present</font></i>
                   {else}
                     <a href="http://steamcommunity.com/profiles/{$ban.steamid3}" target="_blank">{$ban.steamid3}</a>
diff --git a/web_upload/themes/sourcebans_dark/page_bans.tpl b/web_upload/themes/sourcebans_dark/page_bans.tpl
@@ -187,7 +187,7 @@
               <tr align="left">
                 <td width="20%" height="16" class="listtable_1">Steam3 ID</td>
                 <td height="16" class="listtable_1">
-                  {if empty($ban.steamid3)}
+                  {if empty($ban.steamid)}
                     <i><font color="#677882">No Steam3 ID present</font></i>
                   {else}
                     <a href="http://steamcommunity.com/profiles/{$ban.steamid3}" target="_blank">{$ban.steamid3}</a>
diff --git a/web_upload/themes/sourcebans_dark/page_comms.tpl b/web_upload/themes/sourcebans_dark/page_comms.tpl
@@ -165,7 +165,7 @@
               <tr align="left">
                 <td width="20%" height="16" class="listtable_1">Steam3 ID</td>
                 <td height="16" class="listtable_1">
-                  {if empty($ban.steamid3)}
+                  {if empty($ban.steamid)}
                     <i><font color="#677882">No Steam3 ID present</font></i>
                   {else}
                     <a href="http://steamcommunity.com/profiles/{$ban.steamid3}" target="_blank">{$ban.steamid3}</a>

Original file line number	Diff line number	Diff line change
`@@ -1369,7 +1369,7 @@ function ServerHostPlayers($sid, $type="servers", $obId="", $tplsid="", $open=""`
`1369`	`1369`	`}`
`1370`	`1370`	`}else{`
`1371`	`1371`	`if($userbank->HasAccess(ADMIN_OWNER))`
`1372`		`- $objResponse->addAssign("host_$sid", "innerHTML", "<b>Error connecting</b> (<i>" . $res[1] . ":" . $res[2]. "</i>) <small><a href=\"http://sourcebans.net/node/25\" title=\"Which ports does the SourceBans webpanel require to be open?\">Help</a></small>");`
	`1372`	`+ $objResponse->addAssign("host_$sid", "innerHTML", "<b>Error connecting</b> (<i>" . $res[1] . ":" . $res[2]. "</i>) <small><a href=\"https://sarabveer.github.io/SourceBans-Fork/faq\" title=\"Which ports does the SourceBans webpanel require to be open?\">Help</a></small>");`
`1373`	`1373`	`else`
`1374`	`1374`	`$objResponse->addAssign("host_$sid", "innerHTML", "<b>Error connecting</b> (<i>" . $res[1] . ":" . $res[2]. "</i>)");`
`1375`	`1375`	`$objResponse->addAssign("players_$sid", "innerHTML", "N/A");`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@`
`84`	`84`	`define('SB_GIT', true);`
`85`	`85`	`if(!defined('SB_VERSION')){`
`86`	`86`	`define('SB_VERSION', '1.5.4-dev');`
`87`		`- define('SB_GITRev', '$Git: 321 $');`
	`87`	`+ define('SB_GITRev', '$Git: 324 $');`
`88`	`88`	`}`
`89`	`89`	`define('LOGIN_COOKIE_LIFETIME', (6060247)2);`
`90`	`90`	`define('COOKIE_PATH', '/');`