From 04899040fe20721c19115780225a1e90fe2bca5f Mon Sep 17 00:00:00 2001 From: RaidMax Date: Sat, 10 Oct 2015 18:31:24 -0500 Subject: [PATCH] Sql syntax fix and onelog fix --- Admin/Plugins.cs | 39 +++++++++++++++++----------- Admin/Server.cs | 37 ++++++++++++++++++++------ Admin/config/maps.cfg | 1 + Admin/plugins/SimpleStatsPlugin.dll | Bin 12800 -> 12288 bytes Admin/plugins/WebfrontPlugin.dll | Bin 28160 -> 26624 bytes Admin/version.txt | 8 +++++- IW4M Admin.sln | 14 +++++----- SharedLibrary/Database.cs | 1 + SharedLibrary/Utilities.cs | 10 ++++--- 9 files changed, 76 insertions(+), 34 deletions(-) diff --git a/Admin/Plugins.cs b/Admin/Plugins.cs index 03c6a8eb..b255ec9f 100644 --- a/Admin/Plugins.cs +++ b/Admin/Plugins.cs @@ -10,6 +10,7 @@ namespace IW4MAdmin { public static List potentialCommands = new List(); public static List potentialPlugins = new List(); + public static Plugin webFront = null; public static bool Load() { @@ -50,23 +51,26 @@ namespace IW4MAdmin { Object notifyObject = Activator.CreateInstance(assemblyType); Plugin newNotify = (Plugin)notifyObject; - potentialPlugins.Add(newNotify); - - try + if (potentialPlugins.Find(x => x.Name == newNotify.Name) == null) { - newNotify.onLoad(); - } + potentialPlugins.Add(newNotify); - catch (Exception E) - { - Program.getManager().mainLog.Write("There was an error starting \"" + newNotify.Name + "\" plugin", Log.Level.Debug); - Program.getManager().mainLog.Write("Error Message: " + E.Message, Log.Level.Debug); - Program.getManager().mainLog.Write("Error Trace: " + E.StackTrace, Log.Level.Debug); - continue; + try + { + newNotify.onLoad(); + } + + catch (Exception E) + { + Program.getManager().mainLog.Write("There was an error starting \"" + newNotify.Name + "\" plugin", Log.Level.Debug); + Program.getManager().mainLog.Write("Error Message: " + E.Message, Log.Level.Debug); + Program.getManager().mainLog.Write("Error Trace: " + E.StackTrace, Log.Level.Debug); + continue; + } + + Program.getManager().mainLog.Write("Loaded plugin \"" + newNotify.Name + "\"" + " [" + newNotify.Version + "]", Log.Level.Debug); + totalLoaded++; } - - Program.getManager().mainLog.Write("Loaded plugin \"" + newNotify.Name + "\"" + " [" + newNotify.Version + "]", Log.Level.Debug); - totalLoaded++; } else if (assemblyType.IsClass && assemblyType.BaseType.Name == "Command") @@ -91,7 +95,10 @@ namespace IW4MAdmin { try { - P.onUnload(); + if (P.Name != "Webfront") + P.onUnload(); + else + webFront = P; } catch (Exception E) @@ -105,6 +112,8 @@ namespace IW4MAdmin potentialCommands = new List(); potentialPlugins = new List(); + if (webFront != null) + potentialPlugins.Add(webFront); } } diff --git a/Admin/Server.cs b/Admin/Server.cs index 73e7385b..782f2915 100644 --- a/Admin/Server.cs +++ b/Admin/Server.cs @@ -574,7 +574,9 @@ namespace IW4MAdmin override public bool intializeBasics() { +#if DEBUG == false try +#endif { // clear out any lingering instances Utilities.shutdownInterface(PID); @@ -587,8 +589,12 @@ namespace IW4MAdmin } // basic info dvars - hostname = SharedLibrary.Utilities.stripColors(getDvar("sv_hostname").current); - mapname = getDvar("mapname").current; + do + { + hostname = SharedLibrary.Utilities.stripColors(getDvar("sv_hostname").current); + mapname = getDvar("mapname").current; + } while (hostname == "0" || mapname == "0"); + Map localizedMapName = maps.Find(x => x.Name.Equals(mapname)); if (localizedMapName != null) @@ -608,11 +614,25 @@ namespace IW4MAdmin Gametype = getDvar("g_gametype").current; // important log variables - Basepath = getDvar("fs_basepath").current; - Mod = getDvar("fs_game").current; - logPath = getDvar("g_log").current; + do + { + Basepath = getDvar("fs_basepath").current; + Mod = getDvar("fs_game").current; + logPath = getDvar("g_log").current; + } while (Basepath == "0" || Mod == "0" || logPath == "0"); int oneLog = -1; - Int32.TryParse(getDvar("iw4m_onelog").current, out oneLog); + logPath = logPath.Replace("/", "\\"); + Mod = Mod.Replace("/", "\\"); + + int count = 0; + + while(count < 15) + { + Int32.TryParse(getDvar("iw4m_onelog").current, out oneLog); + if (oneLog == 1) + break; + count++; + } if (oneLog == -1) { @@ -626,7 +646,7 @@ namespace IW4MAdmin if (Website == "0" || Website == null) Website = "this server's website"; - + int logSync = -1; Int32.TryParse(getDvar("g_logSync").current, out oneLog); @@ -657,12 +677,13 @@ namespace IW4MAdmin Bans = clientDB.getBans(); return true; } - +#if DEBUG == false catch (Exception E) { Log.Write("Error during initialization - " + E.Message + "--" + E.StackTrace, Log.Level.All); return false; } +#endif } //Process any server event diff --git a/Admin/config/maps.cfg b/Admin/config/maps.cfg index e58d9666..194a917a 100644 --- a/Admin/config/maps.cfg +++ b/Admin/config/maps.cfg @@ -27,5 +27,6 @@ mp_fuel2:Fuel mp_storm:Storm mp_complex:Bailout mp_compact:Salvage +mp_nuked:Nuketown iw4_credits:IW4 Credits mp_raidmax:^1L^23^33^4T^5M^6A^75^8T^93^0R \ No newline at end of file diff --git a/Admin/plugins/SimpleStatsPlugin.dll b/Admin/plugins/SimpleStatsPlugin.dll index 1b7646a4800f11138fae604db1735a59211d6daa..b37634519008642ca2225a2b44810fc341f954d4 100644 GIT binary patch delta 2716 zcmZ8jYitzP6+ZXQ&YjuW_2SvZ`>@w#)>j*Sh@f-!btaCkplpfrXW2p|Y$%-Tqx zjbgh2lD0v$bAhy#(mJhB(v*}S(>5teLK+1%ZIXue2a$?sP^qdaZ4pz7``vRN>#+yM1}7e?`Pugp8>#TTPrN$70z?)F;gLV?n|y9#Xt0lHg+mMy zRVkCzk>D6n5ZGEul$6yxBR8`K<9q|CDupwo9(#@mPu|(&D2l2w_B~k`EIZneFl$Jh?QeN5d?y6Zsx5hx_|_4A6fE z#sLinR=C~-ASN;ctq3w1=|TA+9}Fq^*+9ZBflcj_UsmFy7@5jiR66adBhyk*06Pj} z48t1rUZ31HMni5tVaGrhrMHC@D~?t`$zw7`z7!_RtTKE`>?CYZ&nzl*K8nt|4fRe0 zWE!6fR#=$HfG@EO*{a}ZI(01+R>(RN2)at~vr)u~RyW_Mf5VTP#+KIVSi z3CvfB@Mp@SzQzqoz7BokZ6@~=*!6%GiY7cyMcV;SwvBZ&Y^=HwQPaI))oMi35Sc6& z7D_I-xYJcOsrAhWX+}uXG<2%BqNr9urh*o#cujP3~Ue>DQIT4kY#e9Y51#pdQ(t7+}x@7nB@)2#hd`H{0 z7$x#5w3XJK^(qv>lAgtQK4&*Iv6Q>4ijCzL2G4`_DelBhz$Yj5R+f>!(zA*d)}-+F zDR+V0;_qf{@)>`Yb;v*a@8_w%%cVwVaim3Yw=!mKMvZirJY_5x6|pZGqB1=9<&=P! zNDHSf%mfF?%-NiV3?-nIHEUX>(QKqcxdRTB7P(iQuP>;>r59X&#d95Yz9Lnc`#l<| z(wev5TG<8kPY02L{2Sa_VOvy&j|({&Sks-V;fmFPIu;aQ4-&SA$@6!Ew6e~sg>s4y ziLtl~0P9oEWPXG=EVU_{g0U`XU0#R5iBKOo4B88j^M&(n% zgd%dKZu@dDqMt>6>^xKcEm#`KjytOC9%Q!ffr+*b%etamc?#NbQUyNF8l_M}l`hUG zd%38*-4im4-#Pk)Q5`v;4XkP0nunZsBuO(=F7Lv-Dij;#xs0G8kvj&f*qsQp7CWX7 zrao2H;-?HY4APjnDTI_BM*&&HXZoU*hIjLrzF5^MXqrLs%FdZ)qHLz+T{x(4Ht*Lg< zvG_@pjMF|Bc|J}pHIDC;{zICLJE_A(lln`P0P1$pB}%XmPUi{SQ$*urF$+HpYZ^S% z#hP(=9(U0tTFDG-mpCK zpH6>{)+6!-FOuHG2nN09`RE-;GiahQ?VCjZDNh|jM|PKXTX^3B{j?DkWalp8Fv(u{Zd^A@4JQgO`|N!{-kbU z88>MweW31St@JN-FI&a}Vg&7^_$JzEwAZm7@g(dL@f0)388`vE9(ILzg>7a##A_@; zd&MQz?s~KIsK`<~O^7StPl!K2A|`B~j~-?pi$->U2~FqYu(SBrSWKG@ zTd5^@f-KGAK{wrD=2PeKNfuTY^6Ru(bE>9ZIuBDEHc!>c6h+t^cG0!hU3;1s zJH&p#&a)TUuh|Ezf-jMmqYDFP=?%J0_n>OOk+Imu=?7zyrD$(;jSV1bi!{uh& zdF8E!icGQQH{*Jd^O$3&@uz4^S2ZQ1>s*9<#CXV8#q<#9kX&o6G5qj_$9@tXdrh9P z%411QbKrjs2@j z^3@m5YlzvgV4yc=4{f&(4Xn-Cdw1>_86H@+seM&b&jVlCvwxs}WZTGa)!KarcLUhl z_YSPzxo_vT;hnN2^>+BNKIe3J&v%`6)ns*)PxQ&<=_Avj%%=)}p<~)?`H)SvX#WA3 CirPs4 delta 3157 zcmZ`*dvH`&8UN0?&%L|3$=%Is$!@X%Yuo84GJ~Dk`k)zgsE&oPgVLc)akQht&_Jt$`bT5wAJSohzjN z48b=LTEjCy!rZOEt0Wx*EeHTm=@g4-j@HOicjufv24{hEoJKtJO1ae{QV(Oru-_9P zyS~7!fDMmEJ(?Lfi^8*U3sW_mHviq0vX zFJmq7VMSCLiE0Y-+F=BsmaYAke1-WiQlr8!XDb@?yHuF#Fs~6$=w0YNA5d)Cru_to z3;HrfqQcnrCE3`13BO6(Ch{fJXcDLqKH5B&LBlbC_Y%Zj$0}(Aq+5I#WmFX}n@{I( z_?EB1Qk*hcObJbj#79P(SZ@ZzT(hfaN`m&pTI)X%ve;*KT0TV2_N3WnOlkhU>*jiu zk{^-i3v}SnNV7t{*n(@op;9Z=N#eyo`v~b}Yc0JhJf#MW#$P8fanh6%t^q>pIh09r z8nTp-SA@5kNw2>#Dun#Q=f#{ZdDpZ8 z6>+HM?Q_c)d7VEk_cvV6Zy*KWR*N2M{RkzSxZ=)7_2D-MyBbTd4vN`|mD>h_z=|lN zsDOn=Zil2!n&Sk8#_Ks zil~m-_zei5}VlXm9uMNvQHZ+)e@NL+e6`@*aidjPK%N^)A%X zD$BD!=4fS!XMrovl~;A-m(hy+N^CADS^Qbi>yF<37kEH#`q}9L$cWK;1QN$cF9Wxy z8OIioc%>kFzb9NFP2|Q+w{G3K9CwVpvm`LnF)^Z2(THXKW+oHg3v$$?KirSdOZ5zO zCVY6rX1hrov1cuuzzEHJm}oiXV;`QG{d+Py2Dk5)W^dX=2c&GEpE~hf!YxlTmk#uF zD=gq6LkURf4E=~~d>c2)-lfOOpF!7gI^c1>j?>y2se9IZnTqj+ z81%R?^CU&V?en-Z6lFF(4)@~bCmJP}xwweBU7uUTnlSi}dfXXW&MeIKdm}lv-(x?> znQmZnplq#|8_$@#SR0|TIc_go2=1#nZq(CdJ;Sd@@MM~~Ba zK(lBfnPdOT)?fsGk@A&S*hWmjqYXaydD@2DOg4`14C`#JzyYVVT6=4lrx zMvEYcvM*@YsEs7t81-o%(hWMNehm9BYB#Bxr8SG{nar%ip3+*_4SGSF$Li@Ntpht= zg~VYewJtV`RPA+qmE|c8`=hoF+IMpHUmjs?>>t{Ltif~ILjTde&RXcEmSH_Cs2{*O zray;u3hM`0mwpuV9{tD6A$f2VbS3D0`gyjFeMP^(qO?w2u%akV6;SkmlPf|heV?EQODM?q+ z0{Rz3OFU7(N7oa>wy#kNbT_qv4pWzMlp^?_c*>(!JbD}>*TAyuRrVWpik)F^v5V{` z`y5{<7L+Uq{*2zF30j7HO^DHw)#HCFxo#J&8GP;M2UqRy{{GJ3bL@MUTybgEal4o=?75?xT{z=f*_6_~L11p!@v!Q>_<~_R; zeY^H<-!Zr$y=CWy?gzK*-7bXtw&-MKc1MpKEdRH$M-0}_;C($~)y3ke`UB#W+c|D0 RKT-Hl+ql#8AscHp{ts}*5RL!< diff --git a/Admin/plugins/WebfrontPlugin.dll b/Admin/plugins/WebfrontPlugin.dll index 6d31dbe707c20e56a35d1e4e72c4fe2f124777da..8b9a4ec5fac3b2a5ecf14ce3261196921004b8a6 100644 GIT binary patch delta 8245 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 X;#t) findPlayers(String name) { + name = name.Replace("'", "''"); String Query = String.Format("SELECT * FROM CLIENTS WHERE Name LIKE '%{0}%' LIMIT 32", name); DataTable Result = GetDataTable(Query); diff --git a/SharedLibrary/Utilities.cs b/SharedLibrary/Utilities.cs index bff5200f..d00bdd38 100644 --- a/SharedLibrary/Utilities.cs +++ b/SharedLibrary/Utilities.cs @@ -1,4 +1,5 @@ -using System; +#define REPZ_BUILD +using System; using System.Threading; using System.Text; using System.Text.RegularExpressions; @@ -45,8 +46,11 @@ namespace SharedLibrary public static Player.Permission matchPermission(String str) { String lookingFor = str.ToLower(); - +#if REPZ_BUILD + for (Player.Permission Perm = Player.Permission.User; Perm <= Player.Permission.Owner; Perm++) +#else for (Player.Permission Perm = Player.Permission.User; Perm < Player.Permission.Owner; Perm++) +#endif { if (lookingFor.Contains(Perm.ToString().ToLower())) return Perm; @@ -58,7 +62,7 @@ namespace SharedLibrary public static String removeNastyChars(String str) { if (str != null) - return str.Replace("`", "").Replace("\\", "").Replace("\"", "").Replace(""", "''").Replace("&", "&").Replace("\"", "''"); + return str.Replace("`", "").Replace("\\", "").Replace("\"", "").Replace(""", "").Replace("&", "&").Replace("\"", "''").Replace("'", ""); else return String.Empty; }