From e544c17fb38bed3708f447741ae5488e79e89b0e Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Thu, 14 Sep 2017 22:58:01 +0200 Subject: [PATCH 01/20] chore: initial commit --- .editorconfig | 9 + Config.lua | 2 + LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++ README.md | 11 + __resource.lua | 10 + esx_whitelist.sql | 6 + locales/fr.lua | 6 + server/commands.lua | 23 ++ server/main.lua | 42 +++ 9 files changed, 783 insertions(+) create mode 100644 .editorconfig create mode 100644 Config.lua create mode 100644 LICENSE.txt create mode 100644 README.md create mode 100644 __resource.lua create mode 100644 esx_whitelist.sql create mode 100644 locales/fr.lua create mode 100644 server/commands.lua create mode 100644 server/main.lua diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..4bfca33b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 2 +indent_style = space +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/Config.lua b/Config.lua new file mode 100644 index 00000000..56a8b5e9 --- /dev/null +++ b/Config.lua @@ -0,0 +1,2 @@ +Config = {} +Config.Locale = 'fr' diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..9cecc1d4 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 00000000..90d6350b --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# ESX Whitelist + +## Installation + +1. CD in your resources/[esx] folder. +2. Clone the repository. + ```bash + git clone https://github.com/FXServer-ESX/fxserver-esx_whitelist.git + ``` +3. Import esx_whitelist.sql in your database. +4. Add `start esx_whitelist` in your server.cfg. diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..1e09a7bd --- /dev/null +++ b/__resource.lua @@ -0,0 +1,10 @@ +description 'ESX Whitelist' + +server_scripts { + '@mysql-async/lib/MySQL.lua', + '@es_extended/locale.lua', + 'Config.lua', + 'locales/fr.lua', + 'server/main.lua', + 'server/commands.lua', +} diff --git a/esx_whitelist.sql b/esx_whitelist.sql new file mode 100644 index 00000000..f0cf5821 --- /dev/null +++ b/esx_whitelist.sql @@ -0,0 +1,6 @@ +USE `essentialmode`; + +CREATE TABLE `whitelist` ( + `identifier` varchar(60) NOT NULL, + PRIMARY KEY (`identifier`) +); diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..27673b68 --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,6 @@ +Locales['fr'] = { + ['not_whitelisted'] = 'ceci est un serveur avec whitelist', + ['steamid_error'] = 'nous n\'arrivons pas à lire votre SteamID', + ['help_whitelist_add'] = 'ajouter quelqu\'un dans la Whitelist', + ['help_whitelist_load'] = 'recharger la Whitelist', +} diff --git a/server/commands.lua b/server/commands.lua new file mode 100644 index 00000000..1564b0d8 --- /dev/null +++ b/server/commands.lua @@ -0,0 +1,23 @@ +function displayPermissionIssue () + TriggerClientEvent('chatMessage', source, 'SYSTEM', { 255, 0, 0 }, 'Insufficienct permissions!') +end + +TriggerEvent('es:addGroupCommand', 'whitelist:load', 'admin', function (source, args, user) + loadWhiteList() +end, function (source, args, user) + displayPermissionIssue(source) +end, { help = _U('help_whitelist_load') }) + +TriggerEvent('es:addGroupCommand', 'whitelist:add', 'admin', function (source, args, user) + local steamID = 'steam:' .. args[2] + + MySQL.Async.execute( + 'INSERT INTO whitelist (identifier) VALUES (@identifier)', + { ['@identifier'] = tostring(steamID) }, + function () + loadWhiteList() + end + ) +end, function (source, args, user) + displayPermissionIssue(source) +end, { help = _U('help_whitelist_add'), params = { steam = 'SteamID', help = 'SteamID formated to hex' }}) diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..51a62aac --- /dev/null +++ b/server/main.lua @@ -0,0 +1,42 @@ +WhiteList = {} + +function loadWhiteList () + MySQL.Async.fetchAll( + 'SELECT * FROM whitelist', + {}, + function (identifiers) + for i=1, #identifiers, 1 do + table.insert(WhiteList, tostring(identifiers[i].identifier)) + end + end + ) +end + +MySQL.ready(function () + loadWhiteList() +end) + +AddEventHandler('playerConnecting', function (playerName, setKickReason) + if (WhiteList == {}) then + Citizen.Wait(1000) + end + + local whitelisted = false + local steamID = GetPlayerIdentifiers(source)[1] or false + + if steamID == false then + setKickReason(_U('steamid_error')) + CancelEvent() + end + + for i = 1, #WhiteList, 1 do + if (tostring(WhiteList[i]) == tostring(steamID)) then + whitelisted = true + end + end + + if whitelisted == false then + setKickReason(_U('not_whitelisted')) + CancelEvent() + end +end) From 8b3b0c4bcb1fa5563031bf905cd94c72488a526b Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Thu, 14 Sep 2017 22:58:52 +0200 Subject: [PATCH 02/20] chore(readme): correct installation step --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 90d6350b..af36ac10 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ 1. CD in your resources/[esx] folder. 2. Clone the repository. ```bash - git clone https://github.com/FXServer-ESX/fxserver-esx_whitelist.git + git clone https://github.com/FXServer-ESX/fxserver-esx_whitelist.git esx_whitelist ``` 3. Import esx_whitelist.sql in your database. 4. Add `start esx_whitelist` in your server.cfg. From f426c0208fedda0bd1a2d73bcb0f339d7a63c2b6 Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Fri, 15 Sep 2017 09:52:51 +0200 Subject: [PATCH 03/20] chore(cache): clear the cache before filling it Closes https://github.com/FXServer-ESX/fxserver-esx_whitelist/issues/2 --- server/main.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/main.lua b/server/main.lua index 51a62aac..65185a32 100644 --- a/server/main.lua +++ b/server/main.lua @@ -5,6 +5,8 @@ function loadWhiteList () 'SELECT * FROM whitelist', {}, function (identifiers) + Whitelist = {} + for i=1, #identifiers, 1 do table.insert(WhiteList, tostring(identifiers[i].identifier)) end From 5e93c2585fe069b8260369ce06a7855e75536126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:43:54 +0200 Subject: [PATCH 04/20] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 1e09a7bd..f491a8e0 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,5 +1,7 @@ description 'ESX Whitelist' +version '1.0.0' + server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', From ab51d046f787d3516ab52ffb5cd22f52caad99d1 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Sun, 17 Sep 2017 20:55:01 -0400 Subject: [PATCH 05/20] feat(locale): English Translation --- __resource.lua | 7 ++++--- Config.lua => config.lua | 0 locales/en.lua | 6 ++++++ 3 files changed, 10 insertions(+), 3 deletions(-) rename Config.lua => config.lua (100%) create mode 100644 locales/en.lua diff --git a/__resource.lua b/__resource.lua index f491a8e0..c6fe559b 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,12 +1,13 @@ description 'ESX Whitelist' -version '1.0.0' +version '1.0.1' server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', - 'Config.lua', + 'config.lua', + 'locales/en.lua', 'locales/fr.lua', 'server/main.lua', - 'server/commands.lua', + 'server/commands.lua' } diff --git a/Config.lua b/config.lua similarity index 100% rename from Config.lua rename to config.lua diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..b4795312 --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,6 @@ +Locales['en'] = { + ['not_whitelisted'] = 'you are not whitelisted on this server', + ['steamid_error'] = 'there seems to be a problem with your SteamID', + ['help_whitelist_add'] = 'add someone to the whitelist', + ['help_whitelist_load'] = 'reload the whitelist', +} From 796bdfdf7496e6ceb28da551e790328eecf96ef0 Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Mon, 18 Sep 2017 18:51:34 +0200 Subject: [PATCH 06/20] perf: early return when whitlisted found Closes https://github.com/ESX-Org/esx_whitelist/issues/3 --- server/main.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/server/main.lua b/server/main.lua index 65185a32..1f36f6df 100644 --- a/server/main.lua +++ b/server/main.lua @@ -34,6 +34,7 @@ AddEventHandler('playerConnecting', function (playerName, setKickReason) for i = 1, #WhiteList, 1 do if (tostring(WhiteList[i]) == tostring(steamID)) then whitelisted = true + break end end From d231d9285ca746287851e70218ed880d45fd1e39 Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Mon, 18 Sep 2017 18:52:39 +0200 Subject: [PATCH 07/20] chore: bump version --- __resource.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/__resource.lua b/__resource.lua index c6fe559b..b0fc096a 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,6 +1,6 @@ description 'ESX Whitelist' -version '1.0.1' +version '1.0.2' server_scripts { '@mysql-async/lib/MySQL.lua', @@ -9,5 +9,5 @@ server_scripts { 'locales/en.lua', 'locales/fr.lua', 'server/main.lua', - 'server/commands.lua' + 'server/commands.lua', } From 29117bbd1b3b6b61943b16792c1b5df126dd323a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9n?= Date: Thu, 30 Nov 2017 17:34:27 +0100 Subject: [PATCH 08/20] Update commands.lua ESSENTIAL 5.0 COMPATIBILITY --- server/commands.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/commands.lua b/server/commands.lua index 1564b0d8..11daa53b 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -9,7 +9,7 @@ end, function (source, args, user) end, { help = _U('help_whitelist_load') }) TriggerEvent('es:addGroupCommand', 'whitelist:add', 'admin', function (source, args, user) - local steamID = 'steam:' .. args[2] + local steamID = 'steam:' .. args[1] MySQL.Async.execute( 'INSERT INTO whitelist (identifier) VALUES (@identifier)', From 421826abcf0e9dc4a2bac6c772365b7267682bfc Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:56:40 -0400 Subject: [PATCH 09/20] Repo Update --- .editorconfig | 8 ++++---- LICENSE.txt => LICENSE | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename LICENSE.txt => LICENSE (100%) diff --git a/.editorconfig b/.editorconfig index 4bfca33b..9b425256 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,9 +1,9 @@ root = true [*] -indent_size = 2 -indent_style = space -end_of_line = lf +indent_size = 4 +indent_style = tab +end_of_line = crlf charset = utf-8 trim_trailing_whitespace = true -insert_final_newline = true +insert_final_newline = true \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From 29f64dd9283d1179242261b41a02ba64aeb9d8e0 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 28 Aug 2018 19:33:20 +0200 Subject: [PATCH 10/20] Use proper deferarals, endless improvements - 4 tab indents - Commands reworked - now supports source 0 (console) - toLower, and duplicate checks in db - Fixed error messages - added seperate error message when `WhiteList` table is empty - fixed steam id check --- README.md | 43 ++++++++++++++++---- __resource.lua | 19 +++++---- esx_whitelist.sql | 5 ++- locales/en.lua | 4 +- locales/fr.lua | 2 + locales/sv.lua | 8 ++++ server/commands.lua | 55 ++++++++++++++++--------- server/main.lua | 99 ++++++++++++++++++++++++++++----------------- 8 files changed, 161 insertions(+), 74 deletions(-) create mode 100644 locales/sv.lua diff --git a/README.md b/README.md index af36ac10..a1c2d105 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,38 @@ -# ESX Whitelist +# esx_whitelist + +## Download & Installation + +### Using [fvm](https://github.com/qlaffont/fvm-installer) +``` +fvm install --save --folder=esx esx-org/esx_whitelist +``` + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_whitelist [esx]/esx_whitelist +``` + +### Manually +- Download https://github.com/ESX-Org/esx_whitelist/archive/master.zip +- Put it in the `[esx]` directory ## Installation +- Import `esx_whitelist.sql` to your database +- Add this in your `server.cfg`: -1. CD in your resources/[esx] folder. -2. Clone the repository. - ```bash - git clone https://github.com/FXServer-ESX/fxserver-esx_whitelist.git esx_whitelist - ``` -3. Import esx_whitelist.sql in your database. -4. Add `start esx_whitelist` in your server.cfg. +``` +start esx_whitelist +``` + +# Legal +### License +esx_whitelist - Whitelist script + +Copyright (C) 2015-2018 Jérémie N'gadi + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. \ No newline at end of file diff --git a/__resource.lua b/__resource.lua index b0fc096a..35ea7766 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,13 +1,16 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + description 'ESX Whitelist' -version '1.0.2' +version '1.1.0' server_scripts { - '@mysql-async/lib/MySQL.lua', - '@es_extended/locale.lua', - 'config.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'server/main.lua', - 'server/commands.lua', + '@mysql-async/lib/MySQL.lua', + '@es_extended/locale.lua', + 'config.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/sv.lua', + 'server/main.lua', + 'server/commands.lua' } diff --git a/esx_whitelist.sql b/esx_whitelist.sql index f0cf5821..2798b56a 100644 --- a/esx_whitelist.sql +++ b/esx_whitelist.sql @@ -1,6 +1,7 @@ USE `essentialmode`; CREATE TABLE `whitelist` ( - `identifier` varchar(60) NOT NULL, - PRIMARY KEY (`identifier`) + `identifier` varchar(60) NOT NULL, + + PRIMARY KEY (`identifier`) ); diff --git a/locales/en.lua b/locales/en.lua index b4795312..ad20b913 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,6 +1,8 @@ Locales['en'] = { + ['whitelist_check'] = 'making sure you\'re whitelisted on this server . . .', ['not_whitelisted'] = 'you are not whitelisted on this server', - ['steamid_error'] = 'there seems to be a problem with your SteamID', + ['steamid_error'] = 'your Steam ID was not found, is Steam running?', + ['whitelist_empty'] = 'the whitelist hasn\'t been loaded yet, or alternatively no one has been whitelisted!', ['help_whitelist_add'] = 'add someone to the whitelist', ['help_whitelist_load'] = 'reload the whitelist', } diff --git a/locales/fr.lua b/locales/fr.lua index 27673b68..59a3f71e 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,6 +1,8 @@ Locales['fr'] = { + ['whitelist_check'] = 'making sure you\'re whitelisted on this server . . .', ['not_whitelisted'] = 'ceci est un serveur avec whitelist', ['steamid_error'] = 'nous n\'arrivons pas à lire votre SteamID', + ['whitelist_empty'] = 'the whitelist hasn\'t been loaded yet, or alternatively no one has been whitelisted!', ['help_whitelist_add'] = 'ajouter quelqu\'un dans la Whitelist', ['help_whitelist_load'] = 'recharger la Whitelist', } diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..918f1461 --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,8 @@ +Locales['sv'] = { + ['whitelist_check'] = 'making sure you\'re whitelisted on this server . . .', + ['not_whitelisted'] = 'du är inte whitelistad på denna server!', + ['steamid_error'] = 'ditt Steam ID kunde ej hittas, är Steam påslaget?', + ['whitelist_empty'] = 'whitelisten har ännu inte laddats in, eller så är ingen whitelitad!', + ['help_whitelist_add'] = 'lägg till någon till whitelisten', + ['help_whitelist_load'] = 'ladda om whitelist', +} diff --git a/server/commands.lua b/server/commands.lua index 11daa53b..c05873bb 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -1,23 +1,42 @@ -function displayPermissionIssue () - TriggerClientEvent('chatMessage', source, 'SYSTEM', { 255, 0, 0 }, 'Insufficienct permissions!') -end - -TriggerEvent('es:addGroupCommand', 'whitelist:load', 'admin', function (source, args, user) - loadWhiteList() +TriggerEvent('es:addGroupCommand', 'wlrefresh', 'admin', function (source, args, user) + loadWhiteList(function() + TriggerEvent('esx_whitelist:sendMessage', source, 'Whitelist', 'Whitelist reloaded') + end) end, function (source, args, user) - displayPermissionIssue(source) + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficienct permissions!' } }) end, { help = _U('help_whitelist_load') }) -TriggerEvent('es:addGroupCommand', 'whitelist:add', 'admin', function (source, args, user) - local steamID = 'steam:' .. args[1] +TriggerEvent('es:addGroupCommand', 'wladd', 'admin', function (source, args, user) + local steamID = 'steam:' .. args[1]:lower() - MySQL.Async.execute( - 'INSERT INTO whitelist (identifier) VALUES (@identifier)', - { ['@identifier'] = tostring(steamID) }, - function () - loadWhiteList() - end - ) + if string.len(steamID) ~= 21 then + TriggerEvent('esx_whitelist:sendMessage', source, '^1SYSTEM', 'Invalid steam ID length!') + return + end + + MySQL.Async.fetchAll('SELECT * FROM whitelist WHERE identifier = @identifier', { + ['@identifier'] = steamID + }, function(result) + if result[1] ~= nil then + TriggerEvent('esx_whitelist:sendMessage', source, '^1SYSTEM', 'The player is already whitelisted on this server!') + else + MySQL.Async.execute('INSERT INTO whitelist (identifier) VALUES (@identifier)', { + ['@identifier'] = steamID + }, function (rowsChanged) + table.insert(WhiteList, steamID) + TriggerEvent('esx_whitelist:sendMessage', source, 'Whitelist', 'The player has been whitelisted!') + end) + end + end) end, function (source, args, user) - displayPermissionIssue(source) -end, { help = _U('help_whitelist_add'), params = { steam = 'SteamID', help = 'SteamID formated to hex' }}) + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficienct permissions!' } }) +end, { help = _U('help_whitelist_add'), params = { steam = 'SteamID', help = 'SteamID formated to hex, begins with 11' }}) + +-- console / rcon can also utilize es:command events, but breaks since the source isn't a connected player, ending up in error messages +AddEventHandler('esx_whitelist:sendMessage', function(source, title, message) + if source ~= 0 then + TriggerClientEvent('chat:addMessage', source, { args = { title, message } }) + else + print('esx_whitelist: ' .. message) + end +end) \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index 1f36f6df..247966aa 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,45 +1,70 @@ -WhiteList = {} +WhiteList = {} +local hasSqlRun = false -function loadWhiteList () - MySQL.Async.fetchAll( - 'SELECT * FROM whitelist', - {}, - function (identifiers) - Whitelist = {} +function loadWhiteList(cb) + Whitelist = {} - for i=1, #identifiers, 1 do - table.insert(WhiteList, tostring(identifiers[i].identifier)) - end - end - ) + MySQL.Async.fetchAll('SELECT * FROM whitelist', {}, function (identifiers) + for i=1, #identifiers, 1 do + table.insert(WhiteList, tostring(identifiers[i].identifier):lower()) + end + + hasSqlRun = true + + if cb ~= nil then + cb() + end + end) end -MySQL.ready(function () - loadWhiteList() +AddEventHandler('onMySQLReady', function() + loadWhiteList() end) -AddEventHandler('playerConnecting', function (playerName, setKickReason) - if (WhiteList == {}) then - Citizen.Wait(1000) - end +Citizen.CreateThread(function() + Citizen.Wait(10000) - local whitelisted = false - local steamID = GetPlayerIdentifiers(source)[1] or false - - if steamID == false then - setKickReason(_U('steamid_error')) - CancelEvent() - end - - for i = 1, #WhiteList, 1 do - if (tostring(WhiteList[i]) == tostring(steamID)) then - whitelisted = true - break - end - end - - if whitelisted == false then - setKickReason(_U('not_whitelisted')) - CancelEvent() - end + if not hasSqlRun then + loadWhiteList() + end end) + +AddEventHandler('playerConnecting', function(name, setCallback, deferrals) + -- Mark this connection as deferred, this is to prevent problems while checking player identifiers. + deferrals.defer() + + local _source = source + + -- Letting the user know what's going on. + deferrals.update(_U('whitelist_check')) + + -- Needed, not sure why. + Citizen.Wait(100) + + local whitelisted, kickReason, steamID = false, nil, GetPlayerIdentifiers(_source)[1] + + if #WhiteList == 0 then + kickReason = _U('whitelist_empty') + elseif not string.match(steamID, 'steam:1') then + kickReason = _U('steamid_error') + else + + for i = 1, #WhiteList, 1 do + if tostring(WhiteList[i]) == tostring(steamID) then + whitelisted = true + break + end + end + + if not whitelisted then + kickReason = _U('not_whitelisted') + end + + end + + if whitelisted then + deferrals.done() + else + deferrals.done(kickReason) + end +end) \ No newline at end of file From f108cecbbbf8f9c2fc67d8ffd2cd7bf2f9e504db Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 24 Sep 2018 17:36:50 +0200 Subject: [PATCH 11/20] mysql-async v3.0.1 support --- server/main.lua | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/server/main.lua b/server/main.lua index 247966aa..33a6c76c 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,5 +1,4 @@ WhiteList = {} -local hasSqlRun = false function loadWhiteList(cb) Whitelist = {} @@ -9,26 +8,16 @@ function loadWhiteList(cb) table.insert(WhiteList, tostring(identifiers[i].identifier):lower()) end - hasSqlRun = true - if cb ~= nil then cb() end end) end -AddEventHandler('onMySQLReady', function() +MySQL.ready(function() loadWhiteList() end) -Citizen.CreateThread(function() - Citizen.Wait(10000) - - if not hasSqlRun then - loadWhiteList() - end -end) - AddEventHandler('playerConnecting', function(name, setCallback, deferrals) -- Mark this connection as deferred, this is to prevent problems while checking player identifiers. deferrals.defer() @@ -67,4 +56,4 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals) else deferrals.done(kickReason) end -end) \ No newline at end of file +end) From 6d3919cb9f7963d73a2fdcff7a1e2f04b8e61bd1 Mon Sep 17 00:00:00 2001 From: RedAlex Date: Mon, 12 Nov 2018 10:03:40 -0500 Subject: [PATCH 12/20] Add min player before activate option Solve https://github.com/ESX-Org/esx_whitelist/issues/8 --- config.lua | 1 + server/main.lua | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config.lua b/config.lua index 56a8b5e9..fd4ba92e 100644 --- a/config.lua +++ b/config.lua @@ -1,2 +1,3 @@ Config = {} Config.Locale = 'fr' +Config.MinPlayer = 0 --Set how many players need to be connect before whitelist start, 0-32 \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index 33a6c76c..3eb2c50a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,4 +1,7 @@ -WhiteList = {} +ESX = nil +WhiteList = {} + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) function loadWhiteList(cb) Whitelist = {} @@ -19,6 +22,8 @@ MySQL.ready(function() end) AddEventHandler('playerConnecting', function(name, setCallback, deferrals) + local xPlayers = ESX.GetPlayers() + -- Mark this connection as deferred, this is to prevent problems while checking player identifiers. deferrals.defer() @@ -51,7 +56,7 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals) end - if whitelisted then + if whitelisted or #xPlayers < Config.MinPlayer then deferrals.done() else deferrals.done(kickReason) From d76f9352816546cc7557b1925bfc7e552f0151e8 Mon Sep 17 00:00:00 2001 From: maiconkkl Date: Wed, 15 Jan 2020 16:45:50 -0300 Subject: [PATCH 13/20] Added Portuguese translation (#13) * Correcting and improving translation * Correcting and improving translation * Update br.lua --- __resource.lua | 1 + locales/br.lua | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 locales/br.lua diff --git a/__resource.lua b/__resource.lua index 35ea7766..75959689 100644 --- a/__resource.lua +++ b/__resource.lua @@ -8,6 +8,7 @@ server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', 'config.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', 'locales/sv.lua', diff --git a/locales/br.lua b/locales/br.lua new file mode 100644 index 00000000..0f442a3c --- /dev/null +++ b/locales/br.lua @@ -0,0 +1,9 @@ +Locales['br'] = { + ['whitelist_check'] = 'certificando-se de que você está na lista de permitidos(whitelist) neste servidor. . .', + ['not_whitelisted'] = 'você não está na lista de permitidos(whitelist) neste servidor', + ['steamid_error'] = 'seu ID do Steam não foi encontrado, o Steam está aberto?', + ['whitelist_empty'] = 'a lista de permitidos(whitelist) ainda não foi carregada ou ninguém foi incluído!', + ['help_whitelist_add'] = 'adicionar alguém à lista de permitidos(whitelist) no servidor', + ['help_whitelist_load'] = 'recarregar a lista de permitidos(whitelist)', +} + From 39e31b40b0a285e662369d5978b0874b14376952 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:04:54 +0100 Subject: [PATCH 14/20] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (80%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 80% rename from __resource.lua rename to fxmanifest.lua index 75959689..f3754627 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX Whitelist' From c73b222a1e3d04f8f1b87a79e7a6e006190d601c Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 17 Feb 2020 22:12:33 +0100 Subject: [PATCH 15/20] Code cleanup --- README.md | 2 +- esx_whitelist.sql | 2 +- locales/en.lua | 2 +- locales/fr.lua | 2 +- locales/sv.lua | 2 +- server/commands.lua | 48 +++++++++++++++------------------------------ server/main.lua | 48 ++++++++++++++++++++------------------------- 7 files changed, 42 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index a1c2d105..c4acb4fb 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ start esx_whitelist ### License esx_whitelist - Whitelist script -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2020 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/esx_whitelist.sql b/esx_whitelist.sql index 2798b56a..bcdddb77 100644 --- a/esx_whitelist.sql +++ b/esx_whitelist.sql @@ -1,7 +1,7 @@ USE `essentialmode`; CREATE TABLE `whitelist` ( - `identifier` varchar(60) NOT NULL, + `identifier` varchar(40) NOT NULL, PRIMARY KEY (`identifier`) ); diff --git a/locales/en.lua b/locales/en.lua index ad20b913..8b7443c6 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,8 +1,8 @@ Locales['en'] = { ['whitelist_check'] = 'making sure you\'re whitelisted on this server . . .', ['not_whitelisted'] = 'you are not whitelisted on this server', - ['steamid_error'] = 'your Steam ID was not found, is Steam running?', ['whitelist_empty'] = 'the whitelist hasn\'t been loaded yet, or alternatively no one has been whitelisted!', + ['license_missing'] = 'your license could not be found', ['help_whitelist_add'] = 'add someone to the whitelist', ['help_whitelist_load'] = 'reload the whitelist', } diff --git a/locales/fr.lua b/locales/fr.lua index 59a3f71e..028ba663 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,8 +1,8 @@ Locales['fr'] = { ['whitelist_check'] = 'making sure you\'re whitelisted on this server . . .', ['not_whitelisted'] = 'ceci est un serveur avec whitelist', - ['steamid_error'] = 'nous n\'arrivons pas à lire votre SteamID', ['whitelist_empty'] = 'the whitelist hasn\'t been loaded yet, or alternatively no one has been whitelisted!', + ['license_missing'] = 'your license could not be found', ['help_whitelist_add'] = 'ajouter quelqu\'un dans la Whitelist', ['help_whitelist_load'] = 'recharger la Whitelist', } diff --git a/locales/sv.lua b/locales/sv.lua index 918f1461..6270ffb0 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,8 +1,8 @@ Locales['sv'] = { ['whitelist_check'] = 'making sure you\'re whitelisted on this server . . .', ['not_whitelisted'] = 'du är inte whitelistad på denna server!', - ['steamid_error'] = 'ditt Steam ID kunde ej hittas, är Steam påslaget?', ['whitelist_empty'] = 'whitelisten har ännu inte laddats in, eller så är ingen whitelitad!', + ['license_missing'] = 'din licens kunde ej hittas', ['help_whitelist_add'] = 'lägg till någon till whitelisten', ['help_whitelist_load'] = 'ladda om whitelist', } diff --git a/server/commands.lua b/server/commands.lua index c05873bb..ef87f319 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -1,42 +1,26 @@ -TriggerEvent('es:addGroupCommand', 'wlrefresh', 'admin', function (source, args, user) +ESX.RegisterCommand('wlrefresh', 'admin', function(xPlayer, args, showError) loadWhiteList(function() - TriggerEvent('esx_whitelist:sendMessage', source, 'Whitelist', 'Whitelist reloaded') + showError('Whitelist reloaded') end) -end, function (source, args, user) - TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficienct permissions!' } }) -end, { help = _U('help_whitelist_load') }) +end, true, {help = _U('help_whitelist_load')}) -TriggerEvent('es:addGroupCommand', 'wladd', 'admin', function (source, args, user) - local steamID = 'steam:' .. args[1]:lower() +ESX.RegisterCommand('wladd', 'admin', function(xPlayer, args, showError) + args.license = args.license:lower() - if string.len(steamID) ~= 21 then - TriggerEvent('esx_whitelist:sendMessage', source, '^1SYSTEM', 'Invalid steam ID length!') - return - end - - MySQL.Async.fetchAll('SELECT * FROM whitelist WHERE identifier = @identifier', { - ['@identifier'] = steamID - }, function(result) - if result[1] ~= nil then - TriggerEvent('esx_whitelist:sendMessage', source, '^1SYSTEM', 'The player is already whitelisted on this server!') + if string.len(args.license) == 40 then + if WhiteList[args.license] then + showError('The player is already whitelisted on this server!') else MySQL.Async.execute('INSERT INTO whitelist (identifier) VALUES (@identifier)', { - ['@identifier'] = steamID - }, function (rowsChanged) - table.insert(WhiteList, steamID) - TriggerEvent('esx_whitelist:sendMessage', source, 'Whitelist', 'The player has been whitelisted!') + ['@identifier'] = args.license + }, function(rowsChanged) + WhiteList[args.license] = true + showError('The player has been whitelisted!') end) end - end) -end, function (source, args, user) - TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficienct permissions!' } }) -end, { help = _U('help_whitelist_add'), params = { steam = 'SteamID', help = 'SteamID formated to hex, begins with 11' }}) - --- console / rcon can also utilize es:command events, but breaks since the source isn't a connected player, ending up in error messages -AddEventHandler('esx_whitelist:sendMessage', function(source, title, message) - if source ~= 0 then - TriggerClientEvent('chat:addMessage', source, { args = { title, message } }) else - print('esx_whitelist: ' .. message) + showError('Invalid steam ID length!') end -end) \ No newline at end of file +end, true, {help = _U('help_whitelist_add'), validate = true, arguments = { + {name = 'license', help = 'the player license', type = 'string'} +}}) diff --git a/server/main.lua b/server/main.lua index 33a6c76c..d239c7c6 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,14 +1,14 @@ -WhiteList = {} +WhiteList = {} function loadWhiteList(cb) Whitelist = {} - MySQL.Async.fetchAll('SELECT * FROM whitelist', {}, function (identifiers) - for i=1, #identifiers, 1 do - table.insert(WhiteList, tostring(identifiers[i].identifier):lower()) + MySQL.Async.fetchAll('SELECT identifier FROM whitelist', {}, function(result) + for k,v in ipairs(result) do + WhiteList[v.identifier] = true end - if cb ~= nil then + if cb then cb() end end) @@ -22,7 +22,7 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals) -- Mark this connection as deferred, this is to prevent problems while checking player identifiers. deferrals.defer() - local _source = source + local playerId, kickReason, identifier = source -- Letting the user know what's going on. deferrals.update(_U('whitelist_check')) @@ -30,30 +30,24 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals) -- Needed, not sure why. Citizen.Wait(100) - local whitelisted, kickReason, steamID = false, nil, GetPlayerIdentifiers(_source)[1] - - if #WhiteList == 0 then - kickReason = _U('whitelist_empty') - elseif not string.match(steamID, 'steam:1') then - kickReason = _U('steamid_error') - else - - for i = 1, #WhiteList, 1 do - if tostring(WhiteList[i]) == tostring(steamID) then - whitelisted = true - break - end + for k,v in ipairs(GetPlayerIdentifiers(playerId)) do + if string.match(v, 'license:') then + identifier = string.sub(v, 9) + break end - - if not whitelisted then - kickReason = _U('not_whitelisted') - end - end - if whitelisted then - deferrals.done() - else + if ESX.Table.SizeOf(WhiteList) == 0 then + kickReason = _U('whitelist_empty') + elseif not identifier then + kickReason = _U('license_missing') + elseif not WhiteList[identifier] then + kickReason = _U('not_whitelisted') + end + + if kickReason then deferrals.done(kickReason) + else + deferrals.done() end end) From c2e63b08009665f131ffa22dd7b2f5d44a7e7643 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 17 Feb 2020 22:47:25 +0100 Subject: [PATCH 16/20] Fixed commands not registering --- server/commands.lua | 2 +- server/main.lua | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/commands.lua b/server/commands.lua index ef87f319..70bfd3e0 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -19,7 +19,7 @@ ESX.RegisterCommand('wladd', 'admin', function(xPlayer, args, showError) end) end else - showError('Invalid steam ID length!') + showError('Invalid license ID length!') end end, true, {help = _U('help_whitelist_add'), validate = true, arguments = { {name = 'license', help = 'the player license', type = 'string'} diff --git a/server/main.lua b/server/main.lua index d239c7c6..54c693a1 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,4 +1,6 @@ -WhiteList = {} +ESX, WhiteList = nil, {} + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) function loadWhiteList(cb) Whitelist = {} From 544e0e0dc3b54d7a8bb131215effb86f8f605da4 Mon Sep 17 00:00:00 2001 From: Minikeysi <43723896+Minikeys@users.noreply.github.com> Date: Thu, 2 Apr 2020 20:24:53 +0200 Subject: [PATCH 17/20] Update fr.lua Better translate for FR. --- locales/fr.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/locales/fr.lua b/locales/fr.lua index 028ba663..0693361f 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,8 +1,8 @@ Locales['fr'] = { - ['whitelist_check'] = 'making sure you\'re whitelisted on this server . . .', - ['not_whitelisted'] = 'ceci est un serveur avec whitelist', - ['whitelist_empty'] = 'the whitelist hasn\'t been loaded yet, or alternatively no one has been whitelisted!', - ['license_missing'] = 'your license could not be found', - ['help_whitelist_add'] = 'ajouter quelqu\'un dans la Whitelist', - ['help_whitelist_load'] = 'recharger la Whitelist', + ['whitelist_check'] = 'Etes vous sûr d\'être whitelisté sur ce serveur ...', + ['not_whitelisted'] = 'Ce serveur utilise une whitelist', + ['whitelist_empty'] = 'La whitelist n\'a pas été rechargé ou vous n\'avez pas été whitelisté', + ['license_missing'] = 'Votre license est introuvable', + ['help_whitelist_add'] = 'Ajouter un joueur à la Whitelist', + ['help_whitelist_load'] = 'Recharger la Whitelist', } From a6bdce89f3430099e8234cf88816f01006df81ff Mon Sep 17 00:00:00 2001 From: userMacieG Date: Sat, 25 Apr 2020 22:16:59 +0200 Subject: [PATCH 18/20] Update database name Update database name from `essentialmode` to `es_extended` --- esx_whitelist.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esx_whitelist.sql b/esx_whitelist.sql index bcdddb77..b1ecd6e5 100644 --- a/esx_whitelist.sql +++ b/esx_whitelist.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; CREATE TABLE `whitelist` ( `identifier` varchar(40) NOT NULL, From 8e8e189972e91244e9b1e0c1980ce167fc72db80 Mon Sep 17 00:00:00 2001 From: HypeLevels <61633775+HypeLevels@users.noreply.github.com> Date: Tue, 1 Dec 2020 21:44:57 +0000 Subject: [PATCH 19/20] Update config.lua Changed default language to english as its the universal language --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 56a8b5e9..5290495d 100644 --- a/config.lua +++ b/config.lua @@ -1,2 +1,2 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'en' From 98341ef8e7952997f76cb50978b102c87c9ada4f Mon Sep 17 00:00:00 2001 From: Tuna <65562418+TunaSayin@users.noreply.github.com> Date: Wed, 24 Mar 2021 23:08:02 +0300 Subject: [PATCH 20/20] Create tr.lua Added Turkish language support. --- locales/tr.lua | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 locales/tr.lua diff --git a/locales/tr.lua b/locales/tr.lua new file mode 100644 index 00000000..2523fe63 --- /dev/null +++ b/locales/tr.lua @@ -0,0 +1,8 @@ +Locales['tr'] = { + ['whitelist_check'] = 'bu sunucuda beyaz listede olduğunuzdan emin olunuluyor . . .', + ['not_whitelisted'] = 'bu sunucuda beyaz listede değilsiniz', + ['whitelist_empty'] = 'beyaz liste henüz yüklenmedi yada beyaz listede kimse bulunmuyor', + ['license_missing'] = 'lisansınız bulunamadı', + ['help_whitelist_add'] = 'beyaz listeye birini ekle', + ['help_whitelist_load'] = 'beyaz listeyi tekrardan yükle', +}