Added new option to echo teamchat, updated version, dates & added more plain searches

MCvarial · MCvarial · commit d57c9d74c0b7 · 2012-09-23T15:42:08.000Z
diff --git a/resources/irc/acl.xml b/resources/irc/acl.xml
@@ -50,5 +50,6 @@
     <command name="!zone" level="0" echoChannelOnly="false" />
     <command name="!refreshall" level="4" echoChannelOnly="false" />
     <command name="!refresh" level="4" echoChannelOnly="false" />
+    <command name="!checkmap" level="2" echoChannelOnly="false" />
     <command name="!country" level="2" echoChannelOnly="false" />
 </acl>
diff --git a/resources/irc/meta.xml b/resources/irc/meta.xml
@@ -53,6 +53,15 @@
 			examples="true,false"
 			desc="Should irc stuff be outputted to the console (server log)?"
 		/>
+		
+		<!-- Should team messages be sent to the echo channel? -->
+		<setting 
+			name="*irc-logteammessages" 
+			value="true"
+			friendlyname="Log team messages"
+			examples="true,false"
+			desc="Should team messages be sent to the echo channel?"
+		/>
 	</settings>
 	
 	<!-- Don't touch anything below! -->
diff --git a/resources/irc/scripts/acl.lua b/resources/irc/scripts/acl.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
diff --git a/resources/irc/scripts/ads.lua b/resources/irc/scripts/ads.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
diff --git a/resources/irc/scripts/channels.lua b/resources/irc/scripts/channels.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
diff --git a/resources/irc/scripts/commands.lua b/resources/irc/scripts/commands.lua
@@ -2,8 +2,8 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.0
--- Date: 31.10.2012
+-- Version: 1.0.3
+-- Date: 31.10.2010
 ---------------------------------------------------------------------
 
 ------------------------------------
diff --git a/resources/irc/scripts/echo.lua b/resources/irc/scripts/echo.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
@@ -92,6 +92,7 @@ addEventHandler("onPlayerChat",root,
 		elseif type == 1 then
 			outputIRC("06* "..getPlayerName(source).." "..message)
 		elseif type == 2 then
+			if get("*irc-logteammessages") == "false" then return end
 			outputIRC("07(TEAM)"..getPlayerName(source)..": "..message)
 		end
 	end
diff --git a/resources/irc/scripts/handling.lua b/resources/irc/scripts/handling.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
diff --git a/resources/irc/scripts/ircclient_client.lua b/resources/irc/scripts/ircclient_client.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
diff --git a/resources/irc/scripts/ircclient_server.lua b/resources/irc/scripts/ircclient_server.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
diff --git a/resources/irc/scripts/irccommands.lua b/resources/irc/scripts/irccommands.lua
@@ -2,8 +2,8 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
--- Date: 31.10.2012
+-- Version: 1.0.3
+-- Date: 31.10.2010
 ---------------------------------------------------------------------
 
 ------------------------------------
@@ -514,13 +514,13 @@ addEventHandler("onIRCResourceStart",root,
 		addIRCCommandHandler("!checkmap",
 			function (server,channel,user,command,...)
 				local map = table.concat({...}," ")
-				if not map then ircNotice(user,"syntax is !changemap <name>") return end
+				if not map or map == "" then ircNotice(user,"syntax is !changemap <name>") return end
 				local maps = {}
 				for i,resource in ipairs (getResources()) do
 					if getResourceInfo(resource,"type") == "map" then
-						if string.find(string.lower(getResourceName(resource)),string.lower(map),0,false) then
+						if string.find(string.lower(getResourceName(resource)),string.lower(map),0,true) then
 							table.insert(maps,resource)
-						elseif string.find(string.lower(getResourceInfo(resource,"name")),string.lower(map),0,false) then
+						elseif string.find(string.lower(getResourceInfo(resource,"name")),string.lower(map),0,true) then
 							table.insert(maps,resource)
 						end
 					end
@@ -543,9 +543,9 @@ addEventHandler("onIRCResourceStart",root,
 				local maps = {}
 				for i,resource in ipairs (getResources()) do
 					if getResourceInfo(resource,"type") == "map" then
-						if string.find(string.lower(getResourceName(resource)),string.lower(map),0,false) then
+						if string.find(string.lower(getResourceName(resource)),string.lower(map),0,true) then
 							table.insert(maps,resource)
-						elseif string.find(string.lower(getResourceInfo(resource,"name")),string.lower(map),0,false) then
+						elseif string.find(string.lower(getResourceInfo(resource,"name")),string.lower(map),0,true) then
 							table.insert(maps,resource)
 						end
 					end
diff --git a/resources/irc/scripts/levels.lua b/resources/irc/scripts/levels.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
@@ -49,7 +49,7 @@ addEventHandler("onIRCRaw",root,
 				if mode == "b" then
 					triggerEvent("onIRCBan",channel,positive,nick,setter)
 				else
-					triggerEvent("onIRCUserMode",ircGetUserFromNick(nick),channel,positive,mode,setter)
+					triggerEvent("onIRCUserMode",ircGetUserFromNick(nick) or root,channel,positive,mode,setter)
 				end
 			end
 			if #t == 0 and channel then
diff --git a/resources/irc/scripts/loading.lua b/resources/irc/scripts/loading.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
@@ -212,7 +212,7 @@ function registerFunction (name,ft,...)
 	for i,arg in ipairs (arguments) do
 		if string.sub(arg,1,1) == "(" and string.sub(arg,-1) == ")" then
 			arguments[i] = "if args["..i.."] and type(args["..i.."]) ~= '"..string.sub(arg,2,-2).."' then return not outputDebugString('bad argument #"..i.." at "..name.." "..arg.." expected, got '..type(args["..i.."])) end"
-		elseif string.find(arg,"/") then
+		elseif string.find(arg,"/",0,true) then
 			local args = split(arg,"/")
 			local str = ""
 			for k,arg in ipairs (args) do
diff --git a/resources/irc/scripts/logging.lua b/resources/irc/scripts/logging.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
diff --git a/resources/irc/scripts/mutes.lua b/resources/irc/scripts/mutes.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
diff --git a/resources/irc/scripts/servers.lua b/resources/irc/scripts/servers.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
diff --git a/resources/irc/scripts/socketerrors.lua b/resources/irc/scripts/socketerrors.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
diff --git a/resources/irc/scripts/users.lua b/resources/irc/scripts/users.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
diff --git a/resources/irc/scripts/utility.lua b/resources/irc/scripts/utility.lua
@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: mcvarial@gmail.com
--- Version: 1.0.2
+-- Version: 1.0.3
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
