Added acl requests

MCvarial · MCvarial · commit 2a2bcfaf5342 · 2013-07-15T11:13:06.000Z
diff --git a/resources/irc/meta.xml b/resources/irc/meta.xml
@@ -145,4 +145,22 @@
 	<script src="scripts/runcode/client_util.lua"  type="client" />
 	
 	<html src="logs.html" />
+	
+	<!-- ACL -->
+    <aclrequest>
+	    <right name="function.kickPlayer"          access="true" />
+	    <right name="function.addBan"              access="true" />
+	    <right name="function.removeBan"           access="true" />
+	    <right name="function.getPlayerIP"         access="true" />
+	    <right name="function.getPlayerSerial"     access="true" />
+	    <right name="function.setPlayerFrozen"     access="true" />
+	    <right name="function.setPlayerMuted"      access="true" />
+	    <right name="function.killPed"             access="true" />
+	    <right name="function.startResource"       access="true" />
+	    <right name="function.stopResource"        access="true" />
+	    <right name="function.restartResource"     access="true" />
+	    <right name="function.callRemote"          access="true" />
+	    <right name="function.fileOpen"            access="true" />
+	    <right name="function.fileRead"            access="true" />
+    </aclrequest>
 </meta>
diff --git a/resources/irc/scripts/loading.lua b/resources/irc/scripts/loading.lua
@@ -31,8 +31,10 @@ addEventHandler("onResourceStart",resourceRoot,
 	function ()
 		-- Is the sockets module loaded?
 		if not sockOpen then
-			outputServerLog("IRC: could not start resource, the sockets module isn't loaded!")
-			outputServerLog("IRC: restart the resource to retry")
+			outputDebugString("could not start the irc resource, the sockets module isn't loaded!")
+			outputDebugString("try to start the resource again to retry")
+			startupCancelled = true
+			cancelEvent()
 			return
 		end
 		
@@ -44,20 +46,22 @@ addEventHandler("onResourceStart",resourceRoot,
 			end
 		end
 		if #missingRights ~= 0 then
-			outputServerLog("IRC: "..#missingRights.." missing rights: ")
+			outputDebugString("IRC: "..#missingRights.." missing rights: ")
 			for i,missingRight in ipairs (missingRights) do
-				outputServerLog("	- "..missingRight)
+				outputDebugString("	- "..missingRight)
 			end
-			outputServerLog("IRC: could not start resource, the resource is missing rights!")
-			outputServerLog("IRC: restart the resource to retry")
+			outputDebugString("the irc resource does not have sufficient rights, type 'aclrequest allow irc all'")
+			outputDebugString("try to start the resource again to retry")
+			startupCancelled = true
+			cancelEvent()
 			return
 		end
 		
 		-- Is the resource up-to-date?
 		function checkVersion (res,version)
 			if res ~= "ERROR" and version then
 				if getNumberFromVersion(version) > getNumberFromVersion(getResourceInfo(getThisResource(),"version")) then
-					outputServerLog("IRC: resource is outdated, newest version: "..version)
+					outputDebugString("the irc resource is outdated, newest version: "..version)
 					setTimer(outputIRC,10000,1,"The irc resource is outdated, newest version: "..version)
 				end
 			end
diff --git a/resources/irc/scripts/logging.lua b/resources/irc/scripts/logging.lua
@@ -13,7 +13,7 @@ local logfile
 ------------------------------------
 addEventHandler("onResourceStart",resourceRoot,
 	function ()
-		if getMaximumLogSize() == 0 then return end
+		if getMaximumLogSize() == 0 or startupCancelled then return end
 		
 		if fileExists("irc.log") then
 			logfile = fileOpen("irc.log")
@@ -37,6 +37,7 @@ addEventHandler("onIRCRaw",root,
 
 addEventHandler("onResourceStop",resourceRoot,
 	function ()
+		if startupCancelled then return end
 		fileFlush(logfile)
 		fileClose(logfile)
 	end
