Merge pull request #285 from ZerBytes/v1.x

Multiple bug fixes

Author: Groruk

web/includes/sb-callback.php

@@ -1738,7 +1738,7 @@ function AddBan($nickname, $type, $steam, $ip, $length, $dfile, $dname, $reason,
 	if($error > 0)
 		return $objResponse;
 
-	$nickname = RemoveCode($nickname);
+	$nickname = htmlspecialchars_decode($nickname, ENT_QUOTES);
 	$ip = preg_replace('#[^\d\.]#', '', $ip);//strip ip of all but numbers and dots
 	$dname = RemoveCode($dname);
 	$reason = RemoveCode($reason);
@@ -1972,7 +1972,7 @@ function AddMod($name, $folder, $icon, $steam_universe, $enabled)
 	$icon = htmlspecialchars(strip_tags($icon));
 	$folder = htmlspecialchars(strip_tags($folder));
 	$steam_universe = (int)$steam_universe;
-	$enabled = (int)$enabled;
+	$enabled = (int)(bool)$enabled;
 
 	// Already there?
 	$check = $GLOBALS['db']->GetRow("SELECT * FROM `" . DB_PREFIX . "_mods` WHERE modfolder = ? OR name = ?;", array($folder, $name));

web/pages/admin.edit.mod.php

@@ -135,7 +135,7 @@
 ?>
 <div id="admin-page-content">
 <div id="1">
-<?php$theme->display('page_admin_edit_mod.tpl');?>
+<?php $theme->display('page_admin_edit_mod.tpl');?>
 <script>
 $('enabled').checked = <?=(int) $res['enabled']?>;
 </script>

web/pages/admin.edit.server.php

@@ -181,7 +181,7 @@
 $theme->assign('edit_server', true);
 $theme->assign('submit_text', "Update Server");
 ?>
-    <form action="" method="post" name="editserver">';
+    <form action="" method="post" name="editserver">
 <?php $theme->display('page_admin_servers_add.tpl'); ?>
 </form>
 <script>

web/themes/default/page_admin_servers_list.tpl

@@ -2,7 +2,7 @@
 	Access Denied
 {else}
 	<h3>Servers (<span id="srvcount">{$server_count}</span>)</h3>
-	
+
 	<table width="100%" cellpadding="1">
 	<tr>
 		<td class="front-module-header" width="3%" height='16'><strong>ID</strong></td>
@@ -12,30 +12,30 @@
 		<td class="front-module-header" height='16'><strong>Action</strong></td>
 	</tr>
 	{foreach from="$server_list" item="server"}
-	
+
 	<script>xajax_ServerHostPlayers({$server.sid});</script>
 	<tr id="sid_{$server.sid}" {if $server.enabled==0}style="background-color:#eaeaea" title="Disabled"{/if}>
 		<td style="border-bottom: solid 1px #ccc" height='16'>{$server.sid}</td>
 		<td style="border-bottom: solid 1px #ccc" height='16' id="host_{$server.sid}"><i>Querying Server Data...</i></td>
 		<td style="border-bottom: solid 1px #ccc" height='16' id="players_{$server.sid}">N/A</td>
-		<td style="border-bottom: solid 1px #ccc" height='16'><img src="images/games/{$server.icon}"></td>
+		<td style="border-bottom: solid 1px #ccc" height='16'><img width="16px" height="16px" src="images/games/{$server.icon}"></td>
 		<td style="border-bottom: solid 1px #ccc" height='16'>
 		{if $server.rcon_access}
-			<a href="index.php?p=admin&c=servers&o=rcon&id={$server.sid}">RCON</a> - 
+			<a href="index.php?p=admin&c=servers&o=rcon&id={$server.sid}">RCON</a> -
 		{/if}
-		
+
 		<a href="index.php?p=admin&c=servers&o=admincheck&id={$server.sid}">Admins</a>
-	
+
 		{if $permission_editserver}
 		 	- <a href="index.php?p=admin&c=servers&o=edit&id={$server.sid}">Edit</a>
 		{/if}
-		
+
 		{if $pemission_delserver}
 		 	- <a href="#" onclick="RemoveServer({$server.sid}, '{$server.ip}:{$server.port}');">Delete</a>
 		{/if}
 	 	</td>
 	</tr>
-	
+
 	{/foreach}
 </table>
 {if $permission_addserver}

web/themes/default/page_servers.tpl

@@ -14,7 +14,7 @@
 			 <tbody>
 			{foreach from=$server_list item=server}
 				  <tr id="opener_{$server.sid}" class="opener tbl_out" style="cursor:pointer;" onmouseout="this.className='tbl_out'" onmouseover="this.className='tbl_hover'"{if !$IN_SERVERS_PAGE} onclick="{$server.evOnClick}"{/if}>
-		            <td height="16" align="center" class="listtable_1"><img src="images/games/{$server.icon}" border="0" /></td>
+		            <td height="16" align="center" class="listtable_1"><img height="16px" width="16px" src="images/games/{$server.icon}" border="0" /></td>
 		            <td height="16" align="center" class="listtable_1" id="os_{$server.sid}"></td>
 		            <td height="16" align="center" class="listtable_1" id="vac_{$server.sid}"></td>
 		            <td height="16" class="listtable_1" id="host_{$server.sid}"><i>Querying Server Data...</i></td>
@@ -23,7 +23,7 @@
 		          </tr>
 				  <tr>
 		          	<td colspan="7" align="center">
-		          	
+
 		       			{if $IN_SERVERS_PAGE}
 			       			<div class="opener">
 								<div id="serverwindow_{$server.sid}">
@@ -51,15 +51,15 @@
 								  <div id="noplayer_{$server.sid}" name="noplayer_{$server.sid}" style="display:none;"><br />
 									<h2 style="color: #333;">No players in the server</h2><br />
 									<div align='center'>
-										<p style="font-size: 13px;">{$server.ip}:{$server.port}</p> 
+										<p style="font-size: 13px;">{$server.ip}:{$server.port}</p>
 										<input type='submit' onclick="document.location = 'steam://connect/{$server.ip}:{$server.port}'" name='button' class='btn game' style='margin:0;' id='button' value='Join game' />
 										<input type='button' onclick="ShowBox('Reloading..','<b>Refreshing the Serverdata...</b><br><i>Please Wait!</i>', 'blue', '', true);document.getElementById('dialog-control').setStyle('display', 'none');xajax_RefreshServer({$server.sid});" name='button' class='btn refresh' style='margin:0;' id='button' value='Refresh' /><br /><br />
 									</div>
 								  </div>
 							  </div>
 							</div>
 						{/if}
-						
+
 						</td>
 					</tr>
 				{/foreach}

web/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "1.6.0",
-    "git": "478"
+    "version": "1.6.1",
+    "git": "485"
 }