cleanup

Author: MCvarial

resources/irc/logs.html

@@ -19,4 +19,4 @@
 		fileClose(file) 
 		*>
 	</body>
-		
+</html>		

resources/irc/meta.xml

@@ -103,17 +103,17 @@
 	</settings>
 
 	<!-- Don't touch anything below! -->
-	<info author="MCvarial" version="1.0.5" type="misc" name="irc" description="Echobot to be used on irc" />
+	<info author="MCvarial" version="1.0.6" type="misc" name="irc" description="Echobot to be used on irc" />
 
 	<export function="ircGetChannelFromName"       type="server" http="false" />
 	<export function="ircGetEchoChannels"          type="server" http="false" />
 	<export function="ircGetChannelServer"         type="server" http="false" />
 	<export function="ircGetChannels"              type="server" http="false" />
 	<export function="ircSetChannelMode"           type="server" http="false" />
 	<export function="ircGetChannelName"           type="server" http="false" />
-	<export function="ircGetChannelMode"           type="server" http="false" />
 	<export function="ircGetChannelUsers"          type="server" http="false" />
 	<export function="ircGetChannelTopic"          type="server" http="false" />
+	<export function="ircGetChannelPassword"       type="server" http="false" />
 	<export function="ircIsEchoChannel"            type="server" http="false" />
 	<export function="ircRaw"                      type="server" http="false" />
 	<export function="ircHop"                      type="server" http="false" />
@@ -136,7 +136,6 @@
 	<export function="ircIsServerSecure"           type="server" http="false" />
 	<export function="ircGetServerChannels"        type="server" http="false" />
 	<export function="ircSetUserMode"              type="server" http="false" />
-	<export function="ircGetUserMode"              type="server" http="false" />
 	<export function="ircGetUserChannels"          type="server" http="false" />
 	<export function="ircGetUserNick"              type="server" http="false" />
 	<export function="ircGetUserServer"            type="server" http="false" />
@@ -159,7 +158,6 @@
 	<script src="scripts/users.lua"                type="server" />
 	<script src="scripts/handling.lua"             type="server" />
 	<script src="scripts/commands.lua"             type="server" />
-	<script src="scripts/levels.lua"               type="server" />
 	<script src="scripts/acl.lua"                  type="server" />
 	<script src="scripts/ads.lua"                  type="client" />
 	<script src="scripts/echo.lua"                 type="server" />

resources/irc/scripts/acl.lua

@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: [email protected]
--- Version: 1.0.3
+-- Version: 1.0.6
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 

resources/irc/scripts/ads.lua

@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: [email protected]
--- Version: 1.0.3
+-- Version: 1.0.6
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 

resources/irc/scripts/channels.lua

@@ -2,25 +2,25 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: [email protected]
--- Version: 1.0.3
+-- Version: 1.0.6
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
 -- everything is saved here
-channels = {} -- syntax: [channel] = {string name,string mode,string topic,table users,string password,bool joined,bool echo}
+channels = {} -- syntax: [channel] = {name=string, topic=string, users=table, password=string, echochannel=bool}
 
 ------------------------------------
 -- Channels
 ------------------------------------
-function func_ircGetChannelFromName (channel)
+function func_ircGetChannelFromName (channel,server)
 	for i,chan in ipairs (ircGetChannels()) do
-		if string.lower(ircGetChannelName(chan)) == string.lower(channel) then
+		if string.lower(ircGetChannelName(chan)) == string.lower(channel) and (getElementParent(chan) == server or not server) then
 			return chan
 		end
 	end
 	return false
 end
-registerFunction("ircGetChannelFromName","func_ircGetChannelFromName","string")
+registerFunction("ircGetChannelFromName","func_ircGetChannelFromName","string","(irc-server)")
 
 function func_ircGetEchoChannels ()
 	local channels = {}
@@ -58,26 +58,30 @@ end
 registerFunction("ircSetChannelMode","func_ircSetChannelMode","irc-channel","string")
 
 function func_ircGetChannelName (channel)
-	return channels[channel][1]
+	return channels[channel].name
 end
 registerFunction("ircGetChannelName","func_ircGetChannelName","irc-channel")
 
-function func_ircGetChannelMode (channel)
-	return channels[channel][2]
-end
-registerFunction("ircGetChannelMode","func_ircGetChannelMode","irc-channel")
-
 function func_ircGetChannelUsers (channel)
-	return channels[channel][4]
+	local t = {}
+	for user,level in pairs (channels[channel].users) do
+		table.insert(t,user)
+	end
+	return t
 end
 registerFunction("ircGetChannelUsers","func_ircGetChannelUsers","irc-channel")
 
 function func_ircGetChannelTopic (channel)
-	return channels[channel][3]
+	return channels[channel].topic
 end
 registerFunction("ircGetChannelTopic","func_ircGetChannelTopic","irc-channel")
 
+function func_ircGetChannelPassword (channel)
+	return channels[channel].password
+end
+registerFunction("ircGetChannelPassword","func_ircGetChannelPassword","irc-channel")
+
 function func_ircIsEchoChannel (channel)
-	return channels[channel][7]
+	return channels[channel].echochannel
 end
 registerFunction("ircIsEchoChannel","func_ircIsEchoChannel","irc-channel")

resources/irc/scripts/commands.lua

@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: [email protected]
--- Version: 1.0.3
+-- Version: 1.0.6
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 

resources/irc/scripts/echo.lua

@@ -2,7 +2,7 @@
 -- Project: irc
 -- Author: MCvarial
 -- Contact: [email protected]
--- Version: 1.0.3
+-- Version: 1.0.6
 -- Date: 31.10.2010
 ---------------------------------------------------------------------