Browse Source

Merge pull request #1260 from causefx/v2-develop

V2 develop
causefx 6 years ago
parent
commit
0f6c4b6824

+ 674 - 0
LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ 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 <http://www.gnu.org/licenses/>.
+
+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
+<http://www.gnu.org/licenses/>.
+
+  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
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

+ 12 - 2
api/config/default.php

@@ -12,6 +12,7 @@ return array(
 	'authBackendDomain' => '',
 	'authBackendDomain' => '',
 	'ldapType' => '1',
 	'ldapType' => '1',
 	'logo' => 'plugins/images/organizr/logo-wide.png',
 	'logo' => 'plugins/images/organizr/logo-wide.png',
+	'loginLogo' => 'plugins/images/organizr/logo-wide.png',
 	'loginWallpaper' => '',
 	'loginWallpaper' => '',
 	'title' => 'Organizr V2',
 	'title' => 'Organizr V2',
 	'useLogo' => false,
 	'useLogo' => false,
@@ -156,7 +157,8 @@ return array(
 	'homepageOrderrTorrent' => '15',
 	'homepageOrderrTorrent' => '15',
 	'homepageOrderdownloader' => '16',
 	'homepageOrderdownloader' => '16',
 	'homepageOrderhealthchecks' => '17',
 	'homepageOrderhealthchecks' => '17',
-    "homepageOrderjdownloader" => '18',
+	'homepageOrderjdownloader' => '18',
+	'homepageOrderunifi' => '19',
 	'homepageShowStreamNames' => false,
 	'homepageShowStreamNames' => false,
 	'homepageShowStreamNamesAuth' => '1',
 	'homepageShowStreamNamesAuth' => '1',
 	'homepageStreamRefresh' => '60000',
 	'homepageStreamRefresh' => '60000',
@@ -242,5 +244,13 @@ return array(
 	'authProxyEnabled' => false,
 	'authProxyEnabled' => false,
 	'authProxyHeaderName' => '',
 	'authProxyHeaderName' => '',
 	'authProxyWhitelist' => '',
 	'authProxyWhitelist' => '',
-	'ignoreTFALocal' => false
+	'ignoreTFALocal' => false,
+	'unifiURL' => '',
+	'unifiUsername' => '',
+	'unifiPassword' => '',
+	'unifiSiteName' => '',
+	'unifiCookie' => '',
+	'homepageUnifiEnabled' => 'false',
+	'homepageUnifiAuth' => '1',
+	'homepageUnifiRefresh' => '600000'
 );
 );

+ 80 - 2
api/functions/homepage-connect-functions.php

@@ -57,6 +57,9 @@ function homepageConnect($array)
 		case 'getHealthChecks':
 		case 'getHealthChecks':
 			return (qualifyRequest($GLOBALS['homepageHealthChecksAuth'])) ? getHealthChecks($array['data']['tags']) : false;
 			return (qualifyRequest($GLOBALS['homepageHealthChecksAuth'])) ? getHealthChecks($array['data']['tags']) : false;
 			break;
 			break;
+		case 'getUnifi':
+			return unifiConnect();
+			break;
 		default:
 		default:
 			# code...
 			# code...
 			break;
 			break;
@@ -522,7 +525,7 @@ function resolvePlexItem($item)
 		$plexItem['nowPlayingOriginalImage'] = $plexItem['nowPlayingImageURL'] = "plugins/images/cache/no-np.png";
 		$plexItem['nowPlayingOriginalImage'] = $plexItem['nowPlayingImageURL'] = "plugins/images/cache/no-np.png";
 		$plexItem['nowPlayingKey'] = "no-np";
 		$plexItem['nowPlayingKey'] = "no-np";
 	}
 	}
-	if (!$plexItem['thumb']) {
+	if (!$plexItem['thumb'] || $plexItem['addedAt'] >= (time() - 300)) {
 		$plexItem['originalImage'] = $plexItem['imageURL'] = "plugins/images/cache/no-list.png";
 		$plexItem['originalImage'] = $plexItem['imageURL'] = "plugins/images/cache/no-list.png";
 		$plexItem['key'] = "no-list";
 		$plexItem['key'] = "no-list";
 	}
 	}
@@ -1436,7 +1439,12 @@ function getCalenderRepeatUntil($value)
 {
 {
 	$first = explode('UNTIL=', $value);
 	$first = explode('UNTIL=', $value);
 	if (count($first) > 1) {
 	if (count($first) > 1) {
-		return $first[1];
+		if(strpos($first[1], ';') !== false){
+			$check = explode(';', $first[1]);
+			return $check[0];
+		}else{
+			return $first[1];
+		}
 	} else {
 	} else {
 		return false;
 		return false;
 	}
 	}
@@ -2323,9 +2331,79 @@ function getOmbiRequests($type = "both", $limit = 50)
 	return $api;
 	return $api;
 }
 }
 
 
+function unifiConnect()
+{
+	if ($GLOBALS['homepageUnifiEnabled'] && !empty($GLOBALS['unifiURL']) && !empty($GLOBALS['unifiSiteName']) && !empty($GLOBALS['unifiCookie']) && !empty($GLOBALS['unifiUsername']) && !empty($GLOBALS['unifiPassword']) && qualifyRequest($GLOBALS['homepageUnifiAuth'])) {
+		$api['content']['unifi'] = array();
+		$url = qualifyURL($GLOBALS['unifiURL']);
+		$urlStat = $url . '/api/s/' . $GLOBALS['unifiSiteName'] . '/stat/health';
+		try {
+			$options = array('verify' => false, 'verifyname' => false, 'follow_redirects' => false);
+			$data = array(
+				'username' => $GLOBALS['unifiUsername'],
+				'password' => decrypt($GLOBALS['unifiPassword']),
+				'remember' => true,
+				'strict' => true
+			);
+			$response = Requests::post($url . '/api/login', array(), json_encode($data), $options);
+			if ($response->success) {
+				$cookie['unifises'] = ($response->cookies['unifises']->value) ?? false;
+				$cookie['csrf_token'] = ($response->cookies['csrf_token']->value) ?? false;
+			}else{
+				return false;
+			}
+			$headers = array(
+				'cookie' => 'unifises=' . $cookie['unifises'] . ';' . 'csrf_token=' . $cookie['csrf_token'] . ';'
+			);
+			$response = Requests::get($urlStat, $headers, $options);
+			if ($response->success) {
+				$api['content']['unifi'] = json_decode($response->body, true);
+			}
+		} catch (Requests_Exception $e) {
+			writeLog('error', 'Unifi Connect Function - Error: ' . $e->getMessage(), 'SYSTEM');
+		};
+		$api['content']['unifi'] = isset($api['content']['unifi']) ? $api['content']['unifi'] : false;
+		return $api;
+	}
+	return false;
+}
+
 function testAPIConnection($array)
 function testAPIConnection($array)
 {
 {
 	switch ($array['data']['action']) {
 	switch ($array['data']['action']) {
+		case 'unifiSite':
+			if (!empty($GLOBALS['unifiURL'])  && !empty($GLOBALS['unifiCookie']) && !empty($GLOBALS['unifiUsername'])  && !empty($GLOBALS['unifiPassword'])) {
+				$url = qualifyURL($GLOBALS['unifiURL']);
+				try {
+					$options = array('verify' => false, 'verifyname' => false, 'follow_redirects' => false);
+					$data = array(
+						'username' => $GLOBALS['unifiUsername'],
+						'password' => decrypt($GLOBALS['unifiPassword']),
+						'remember' => true,
+						'strict' => true
+					);
+					$response = Requests::post($url . '/api/login', array(), json_encode($data), $options);
+					if ($response->success) {
+						$cookie['unifises'] = ($response->cookies['unifises']->value) ?? false;
+						$cookie['csrf_token'] = ($response->cookies['csrf_token']->value) ?? false;
+					}else{
+						return false;
+					}
+					$headers = array(
+						'cookie' => 'unifises=' . $cookie['unifises'] . ';' . 'csrf_token=' . $cookie['csrf_token'] . ';'
+					);
+					$response = Requests::get($url . '/api/self/sites', $headers, $options);
+					if ($response->success) {
+						$body = json_decode($response->body, true);
+						return $body;
+					}else{
+						return false;
+					}
+				} catch (Requests_Exception $e) {
+					writeLog('error', 'Unifi Connect Function - Error: ' . $e->getMessage(), 'SYSTEM');
+				};
+			}
+			break;
 		case 'ombi':
 		case 'ombi':
 			if (!empty($GLOBALS['ombiURL']) && !empty($GLOBALS['ombiToken'])) {
 			if (!empty($GLOBALS['ombiURL']) && !empty($GLOBALS['ombiToken'])) {
 				$url = qualifyURL($GLOBALS['ombiURL']);
 				$url = qualifyURL($GLOBALS['ombiURL']);

+ 106 - 0
api/functions/homepage-functions.php

@@ -21,6 +21,7 @@ function homepageOrder()
 		"homepageOrderrTorrent" => $GLOBALS['homepageOrderrTorrent'],
 		"homepageOrderrTorrent" => $GLOBALS['homepageOrderrTorrent'],
 		"homepageOrderdownloader" => $GLOBALS['homepageOrderdownloader'],
 		"homepageOrderdownloader" => $GLOBALS['homepageOrderdownloader'],
 		"homepageOrderhealthchecks" => $GLOBALS['homepageOrderhealthchecks'],
 		"homepageOrderhealthchecks" => $GLOBALS['homepageOrderhealthchecks'],
+		"homepageOrderunifi" => $GLOBALS['homepageOrderunifi'],
 	);
 	);
 	asort($homepageOrder);
 	asort($homepageOrder);
 	return $homepageOrder;
 	return $homepageOrder;
@@ -318,6 +319,18 @@ function buildHomepageItem($homepageItem)
 				';
 				';
 			}
 			}
 			break;
 			break;
+		case 'homepageOrderunifi':
+			if ($GLOBALS['homepageUnifiEnabled'] && qualifyRequest($GLOBALS['homepageUnifiAuth'])) {
+				$item .= '<div class="white-box"><h2 class="text-center" lang="en">Loading Unifi...</h2></div>';
+				$item .= '
+				<script>
+				// Unifi
+				homepageUnifi("' . $GLOBALS['homepageHealthChecksRefresh'] . '");
+				// End Unifi
+				</script>
+				';
+			}
+			break;
 		default:
 		default:
 			# code...
 			# code...
 			break;
 			break;
@@ -2201,6 +2214,92 @@ function getHomepageList()
 				)
 				)
 			)
 			)
 		),
 		),
+		array(
+			'name' => 'Unifi',
+			'enabled' => true,
+			'image' => 'plugins/images/tabs/ubnt.png',
+			'category' => 'Monitor',
+			'settings' => array(
+				'Enable' => array(
+					array(
+						'type' => 'switch',
+						'name' => 'homepageUnifiEnabled',
+						'label' => 'Enable',
+						'value' => $GLOBALS['homepageUnifiEnabled']
+					),
+					array(
+						'type' => 'select',
+						'name' => 'homepageUnifiAuth',
+						'label' => 'Minimum Authentication',
+						'value' => $GLOBALS['homepageUnifiAuth'],
+						'options' => $groups
+					)
+				),
+				'Connection' => array(
+					array(
+						'type' => 'input',
+						'name' => 'unifiURL',
+						'label' => 'URL',
+						'value' => $GLOBALS['unifiURL'],
+						'help' => 'URL for Unifi',
+						'placeholder' => 'Unifi API URL'
+					),
+					array(
+						'type' => 'blank',
+						'label' => ''
+					),
+					array(
+						'type' => 'input',
+						'name' => 'unifiUsername',
+						'label' => 'Username',
+						'value' => $GLOBALS['unifiUsername']
+					),
+					array(
+						'type' => 'password',
+						'name' => 'unifiPassword',
+						'label' => 'Password',
+						'value' => $GLOBALS['unifiPassword']
+					),
+					array(
+						'type' => 'input',
+						'name' => 'unifiSiteName',
+						'label' => 'Site Name',
+						'value' => $GLOBALS['unifiSiteName'],
+						'help' => 'Site Name - not Site ID nor Site Description',
+					),
+					array(
+						'type' => 'button',
+						'label' => 'Grab Unifi Site',
+						'icon' => 'fa fa-building',
+						'text' => 'Get Unifi Site',
+						'attr' => 'onclick="getUnifiSite(\'unifiSite\')"'
+					),
+				),
+				'Misc Options' => array(
+					array(
+						'type' => 'select',
+						'name' => 'homepageUnifiRefresh',
+						'label' => 'Refresh Seconds',
+						'value' => $GLOBALS['homepageUnifiRefresh'],
+						'options' => optionTime()
+					),
+				),
+				'Test Connection' => array(
+					array(
+						'type' => 'blank',
+						'label' => 'Please Save before Testing'
+					),
+					array(
+						'type' => 'button',
+						'label' => '',
+						'icon' => 'fa fa-flask',
+						'class' => 'pull-right',
+						'text' => 'Test Connection',
+						'attr' => 'onclick="testAPIConnection(\'unifi\')"'
+					),
+				)
+			)
+		),
 		array(
 		array(
 			'name' => 'HealthChecks',
 			'name' => 'HealthChecks',
 			'enabled' => true,
 			'enabled' => true,
@@ -2451,6 +2550,13 @@ function buildHomepageSettings()
 					$class .= ' faded';
 					$class .= ' faded';
 				}
 				}
 				break;
 				break;
+			case 'homepageOrderunifi':
+				$class = 'bg-info';
+				$image = 'plugins/images/tabs/ubnt.png';
+				if (!$GLOBALS['homepageUnifiEnabled']) {
+					$class .= ' faded';
+				}
+				break;
 			default:
 			default:
 				$class = 'blue-bg';
 				$class = 'blue-bg';
 				$image = '';
 				$image = '';

+ 8 - 1
api/functions/organizr-functions.php

@@ -1100,6 +1100,7 @@ function loadAppearance()
 	$appearance['buttonTextHoverColor'] = $GLOBALS['buttonTextHoverColor'];
 	$appearance['buttonTextHoverColor'] = $GLOBALS['buttonTextHoverColor'];
 	$appearance['buttonHoverColor'] = $GLOBALS['buttonHoverColor'];
 	$appearance['buttonHoverColor'] = $GLOBALS['buttonHoverColor'];
 	$appearance['loginWallpaper'] = $GLOBALS['loginWallpaper'];
 	$appearance['loginWallpaper'] = $GLOBALS['loginWallpaper'];
+	$appearance['loginLogo'] = $GLOBALS['loginLogo'];
 	$appearance['customCss'] = $GLOBALS['customCss'];
 	$appearance['customCss'] = $GLOBALS['customCss'];
 	$appearance['customThemeCss'] = $GLOBALS['customThemeCss'];
 	$appearance['customThemeCss'] = $GLOBALS['customThemeCss'];
 	$appearance['customJava'] = $GLOBALS['customJava'];
 	$appearance['customJava'] = $GLOBALS['customJava'];
@@ -1140,6 +1141,12 @@ function getCustomizeAppearance()
 				),
 				),
 			),
 			),
 			'Login Page' => array(
 			'Login Page' => array(
+				array(
+					'type' => 'input',
+					'name' => 'loginLogo',
+					'label' => 'Login Logo',
+					'value' => $GLOBALS['loginLogo'],
+				),
 				array(
 				array(
 					'type' => 'input',
 					'type' => 'input',
 					'name' => 'loginWallpaper',
 					'name' => 'loginWallpaper',
@@ -1636,7 +1643,7 @@ function logoOrText()
 	if ($GLOBALS['useLogo'] == false) {
 	if ($GLOBALS['useLogo'] == false) {
 		return '<h1>' . $GLOBALS['title'] . '</h1>';
 		return '<h1>' . $GLOBALS['title'] . '</h1>';
 	} else {
 	} else {
-		return '<img class="loginLogo" src="' . $GLOBALS['logo'] . '" alt="Home" />';
+		return '<img class="loginLogo" src="' . $GLOBALS['loginLogo'] . '" alt="Home" />';
 	}
 	}
 }
 }
 
 

+ 1 - 1
api/functions/static-globals.php

@@ -1,7 +1,7 @@
 <?php
 <?php
 // ===================================
 // ===================================
 // Organizr Version
 // Organizr Version
-$GLOBALS['installedVersion'] = '2.0.307';
+$GLOBALS['installedVersion'] = '2.0.320';
 // ===================================
 // ===================================
 // Quick php Version check
 // Quick php Version check
 $GLOBALS['minimumPHP'] = '7.1.3';
 $GLOBALS['minimumPHP'] = '7.1.3';

+ 1 - 1
api/pages/lockscreen.php

@@ -3,7 +3,7 @@ if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
 	$pageLockScreen = '
 	$pageLockScreen = '
 <script>
 <script>
 </script>
 </script>
-<section id="lockScreen" class="lock-screen" oncontextmenu="return false;" onkeydown="blockDev">
+<section id="lockScreen" class="lock-screen" onkeydown="blockDev">
   <div class="login-box">
   <div class="login-box">
     <div class="white-box">
     <div class="white-box">
       <form class="form-horizontal form-material" id="form-lockscreen" onsubmit="return false;">
       <form class="form-horizontal form-material" id="form-lockscreen" onsubmit="return false;">

+ 1 - 1
index.php

@@ -245,7 +245,7 @@
 <?php echo "<script>languageList = " . languagePacks(true) . ";\n</script>"; ?>
 <?php echo "<script>languageList = " . languagePacks(true) . ";\n</script>"; ?>
 <script src="js/jquery-2.2.4.min.js"></script>
 <script src="js/jquery-2.2.4.min.js"></script>
 <script src="bootstrap/dist/js/bootstrap.min.js"></script>
 <script src="bootstrap/dist/js/bootstrap.min.js"></script>
-<script src="plugins/bower_components/sidebar-nav/dist/sidebar-nav.js"></script>
+<script src="plugins/bower_components/sidebar-nav/dist/sidebar-nav.min.js"></script>
 <script src="js/jquery.slimscroll.js"></script>
 <script src="js/jquery.slimscroll.js"></script>
 <script src="js/waves.js"></script>
 <script src="js/waves.js"></script>
 <script src="plugins/bower_components/styleswitcher/jQuery.style.switcher.js"></script>
 <script src="plugins/bower_components/styleswitcher/jQuery.style.switcher.js"></script>

+ 5 - 0
js/custom.js

@@ -1977,4 +1977,9 @@ $(document).on('click', ".ipInfo", function(){
             className: 'bg-org'
             className: 'bg-org'
         });
         });
     });
     });
+});
+
+$(document).on('click', '.allGroupsList', function() {
+    console.log($(this));
+    $(this).toggleClass('active');
 });
 });

File diff suppressed because it is too large
+ 0 - 0
js/custom.min.js


+ 180 - 7
js/functions.js

@@ -1005,7 +1005,7 @@ function buildPluginsItem(array){
                 </div>
                 </div>
                 <div class="panel-wrapper collapse in" aria-expanded="true">
                 <div class="panel-wrapper collapse in" aria-expanded="true">
                     <div class="panel-body bg-org">
                     <div class="panel-body bg-org">
-                    <fieldset id="`+v.idPrefix+`-settings-items" style="border:0;" class=""></fieldset>
+                        <fieldset id="`+v.idPrefix+`-settings-items" style="border:0;" class=""><h2>Loading...</h2></fieldset>
                     </div>
                     </div>
                     <div class="clearfix"></div>
                     <div class="clearfix"></div>
                 </div>
                 </div>
@@ -2418,12 +2418,12 @@ function accountManager(user){
                                                                     <label class="control-label" lang="en">Email</label>
                                                                     <label class="control-label" lang="en">Email</label>
                                                                     <input `+twoFADisable+` type="text" id="accountEmail" class="form-control" value="`+activeInfo.user.email+`"></div>
                                                                     <input `+twoFADisable+` type="text" id="accountEmail" class="form-control" value="`+activeInfo.user.email+`"></div>
                                                             </div>
                                                             </div>
-                                                            <div class="col-md-6">
+                                                            <div class="col-md-6 userManagementPassword">
                                                                 <div class="form-group">
                                                                 <div class="form-group">
                                                                     <label class="control-label" lang="en">Password</label>
                                                                     <label class="control-label" lang="en">Password</label>
                                                                     <input type="password" id="accountPassword1" class="form-control"></div>
                                                                     <input type="password" id="accountPassword1" class="form-control"></div>
                                                             </div>
                                                             </div>
-                                                            <div class="col-md-6">
+                                                            <div class="col-md-6 userManagementPassword">
                                                                 <div class="form-group">
                                                                 <div class="form-group">
                                                                     <label class="control-label" lang="en">Verify Password</label>
                                                                     <label class="control-label" lang="en">Verify Password</label>
                                                                     <input type="password" id="accountPassword2" class="form-control"></div>
                                                                     <input type="password" id="accountPassword2" class="form-control"></div>
@@ -2523,7 +2523,7 @@ function categoryProcess(arrayItems){
 		$.each(arrayItems['data']['categories'], function(i,v) {
 		$.each(arrayItems['data']['categories'], function(i,v) {
 			if(v.count !== 0 && v.category_id !== 0){
 			if(v.count !== 0 && v.category_id !== 0){
 				menuList += `
 				menuList += `
-					<li>
+					<li class="allGroupsList" data-group-name="`+cleanClass(v.category)+`">
 						<a class="waves-effect" href="javascript:void(0)">`+iconPrefix(v.image)+`<span class="hide-menu">`+v.category+` <span class="fa arrow"></span> <span class="label label-rouded label-inverse pull-right">`+v.count+`</span></span><div class="menu-category-ping" data-good="0" data-bad="0"></div></a>
 						<a class="waves-effect" href="javascript:void(0)">`+iconPrefix(v.image)+`<span class="hide-menu">`+v.category+` <span class="fa arrow"></span> <span class="label label-rouded label-inverse pull-right">`+v.count+`</span></span><div class="menu-category-ping" data-good="0" data-bad="0"></div></a>
 						<ul class="nav nav-second-level category-`+v.category_id+` collapse"></ul>
 						<ul class="nav nav-second-level category-`+v.category_id+` collapse"></ul>
 					</li>
 					</li>
@@ -2547,10 +2547,10 @@ function buildFrameContainer(name,url,type){
 function buildInternalContainer(name,url,type){
 function buildInternalContainer(name,url,type){
 	return `<div id="internal-`+cleanClass(name)+`" data-type="`+type+`" class="internal-container frame-`+cleanClass(name)+` hidden" data-url="`+url+`" data-name="`+cleanClass(name)+`"></div>`;
 	return `<div id="internal-`+cleanClass(name)+`" data-type="`+type+`" class="internal-container frame-`+cleanClass(name)+` hidden" data-url="`+url+`" data-name="`+cleanClass(name)+`"></div>`;
 }
 }
-function buildMenuList(name,url,type,icon,ping=null){
+function buildMenuList(name,url,type,icon,ping=null,category_id = null,group_id = null){
     var ping = (ping !== null) ? `<small class="menu-`+cleanClass(ping)+`-ping-ms hidden-xs label label-rouded label-inverse pull-right pingTime hidden">
     var ping = (ping !== null) ? `<small class="menu-`+cleanClass(ping)+`-ping-ms hidden-xs label label-rouded label-inverse pull-right pingTime hidden">
 </small><div class="menu-`+cleanClass(ping)+`-ping" data-tab-name="`+name+`" data-previous-state=""></div>` : '';
 </small><div class="menu-`+cleanClass(ping)+`-ping" data-tab-name="`+name+`" data-previous-state=""></div>` : '';
-	return `<li class="allTabsList" id="menu-`+cleanClass(name)+`" data-tab-name="`+cleanClass(name)+`" type="`+type+`" data-url="`+url+`"><a class="waves-effect"  onclick="tabActions(event,'`+cleanClass(name)+`',`+type+`);">`+iconPrefix(icon)+`<span class="hide-menu elip sidebar-tabName">`+name+`</span>`+ping+`</a></li>`;
+	return `<li class="allTabsList" id="menu-`+cleanClass(name)+`" data-tab-name="`+cleanClass(name)+`" type="`+type+`" data-group-id="`+group_id+`" data-category-id="`+category_id+`" data-url="`+url+`"><a class="waves-effect"  onclick="tabActions(event,'`+cleanClass(name)+`',`+type+`);">`+iconPrefix(icon)+`<span class="hide-menu elip sidebar-tabName">`+name+`</span>`+ping+`</a></li>`;
 }
 }
 function tabProcess(arrayItems) {
 function tabProcess(arrayItems) {
 	var iFrameList = '';
 	var iFrameList = '';
@@ -2577,7 +2577,7 @@ function tabProcess(arrayItems) {
                     defaultTabName = cleanClass(v.name);
                     defaultTabName = cleanClass(v.name);
                     defaultTabType = v.type;
                     defaultTabType = v.type;
                 }
                 }
-                var menuList = buildMenuList(v.name,v.access_url,v.type,v.image,v.ping_url);
+                var menuList = buildMenuList(v.name,v.access_url,v.type,v.image,v.ping_url, v.category_id, v.group_id);
                 if(v.category_id === 0){
                 if(v.category_id === 0){
                     if(activeInfo.settings.misc.unsortedTabs === 'top'){
                     if(activeInfo.settings.misc.unsortedTabs === 'top'){
                         $(menuList).prependTo($('#side-menu'));
                         $(menuList).prependTo($('#side-menu'));
@@ -5671,6 +5671,104 @@ function buildHealthChecks(array){
 	<div class="clearfix"></div>
 	<div class="clearfix"></div>
 	` : '';
 	` : '';
 }
 }
+function buildUnifi(array){
+    if(array === false){ return ''; }
+    var items = (typeof array.content.unifi.data !== 'undefined') ? array.content.unifi.data.length : false;
+    return (items) ? `
+	<div id="allUnifi">
+		<div class="row">
+		    <div class="col-md-12">
+		        <h4 class="pull-left"><span lang="en">Unifi</span> : </h4><h4 class="pull-left">&nbsp;</h4>
+		        <hr class="hidden-xs">
+		    </div>
+			<div class="clearfix"></div>
+		    <!-- .cards -->
+		    <div class="unifiCards">
+		        `+buildUnifiItem(array.content.unifi.data)+`
+			</div>
+		    <!-- /.cards-->
+		</div>
+	</div>
+	<div class="clearfix"></div>
+	` : '';
+}
+function buildUnifiItem(array){
+    var items = '';
+    $.each(array, function(i,v) {
+        console.log(v);
+        var name = (typeof v.subsystem !== 'undefined') ? v.subsystem : '';
+        var stats = {};
+        var panelColor = '';
+        switch (name) {
+            case 'wlan':
+                panelColor = 'info';
+                stats['clients'] = v.num_user;
+                stats['tx'] = v['tx_bytes-r'];
+                stats['rx'] = v['rx_bytes-r'];
+                break;
+            case 'wan':
+                panelColor = 'success';
+                stats['IP'] = v.wan_ip;
+                stats['tx'] = v['tx_bytes-r'];
+                stats['rx'] = v['rx_bytes-r'];
+                break;
+            case 'lan':
+                panelColor = 'primary';
+                stats['clients'] = v.num_user;
+                stats['tx'] = v['tx_bytes-r'];
+                stats['rx'] = v['rx_bytes-r'];
+                break;
+            case 'www':
+                panelColor = 'warning';
+                stats['drops'] = v.drops;
+                stats['latency'] = v.latency;
+                stats['uptime'] = v.uptime;
+                stats['tx'] = v['tx_bytes-r'];
+                stats['rx'] = v['rx_bytes-r'];
+                break;
+            case 'vpn':
+                panelColor = 'inverse';
+                stats['clients'] = v.remote_user_num_active;
+                stats['tx'] = v.remote_user_tx_bytes;
+                stats['rx'] = v.remote_user_rx_bytes;
+                break;
+            default:
+        }
+        var statItems = '';
+       console.log(statItems);
+        $.each(stats, function(istat,vstat) {
+            statItems += `
+                <div class="stat-item">
+                    <h6 class="text-uppercase">`+istat+`</h6>
+                    <b>`+vstat+`</b>
+                </div>
+                `;
+        });
+        items += `
+            <!--<div class="col-lg-4 col-md-6">
+                <div class="white-box">
+                    <h3 class="box-title">`+name+`</h3>
+                    <div class="stats-row">
+                        `+statItems+`
+                    </div>
+                </div>
+            </div>-->
+            <div class="col-lg-4 col-md-6 col-center">
+                <div class="panel panel-`+panelColor+`">
+                    <div class="panel-heading"> <span class="text-uppercase">`+name+`</span>
+                        <div class="pull-right"><a href="#" data-perform="panel-collapse"><i class="ti-minus"></i></a> <a href="#" data-perform="panel-dismiss"><i class="ti-close"></i></a> </div>
+                    </div>
+                    <div class="panel-wrapper collapse in" aria-expanded="true">
+                        <div class="panel-body">
+                           `+statItems+`
+                        </div>
+                    </div>
+                </div>
+            </div>
+        `;
+    });
+    return items;
+}
 function healthCheckIcon(tags){
 function healthCheckIcon(tags){
     var allTags = tags.split(' ');
     var allTags = tags.split(' ');
     var useIcon = '';
     var useIcon = '';
@@ -5774,6 +5872,28 @@ function homepageHealthChecks(tags, timeout){
     if(typeof timeouts[timeoutTitle] !== 'undefined'){ clearTimeout(timeouts[timeoutTitle]); }
     if(typeof timeouts[timeoutTitle] !== 'undefined'){ clearTimeout(timeouts[timeoutTitle]); }
     timeouts[timeoutTitle] = setTimeout(function(){ homepageHealthChecks(tags,timeout); }, timeout);
     timeouts[timeoutTitle] = setTimeout(function(){ homepageHealthChecks(tags,timeout); }, timeout);
 }
 }
+function homepageUnifi(timeout){
+    var timeout = (typeof timeout !== 'undefined') ? timeout : activeInfo.settings.homepage.refresh.homepageUnifiRefresh;
+    organizrAPI('POST','api/?v1/homepage/connect',{action:'getUnifi'}).success(function(data) {
+        try {
+            var response = JSON.parse(data);
+        }catch(e) {
+            console.log(e + ' error: ' + data);
+            orgErrorAlert('<h4>' + e + '</h4>' + formatDebug(data));
+            return false;
+        }
+        document.getElementById('homepageOrderunifi').innerHTML = '';
+        console.log(response.data);
+        if(response.data !== null){
+            $('#homepageOrderunifi').html(buildUnifi(response.data));
+        }
+    }).fail(function(xhr) {
+        console.error("Organizr Function: API Connection Failed");
+    });
+    var timeoutTitle = 'Unifi-Homepage';
+    if(typeof timeouts[timeoutTitle] !== 'undefined'){ clearTimeout(timeouts[timeoutTitle]); }
+    timeouts[timeoutTitle] = setTimeout(function(){ homepageUnifi(timeout); }, timeout);
+}
 function homepageDownloader(type, timeout){
 function homepageDownloader(type, timeout){
 	var timeout = (typeof timeout !== 'undefined') ? timeout : activeInfo.settings.homepage.refresh.homepageDownloadRefresh;
 	var timeout = (typeof timeout !== 'undefined') ? timeout : activeInfo.settings.homepage.refresh.homepageDownloadRefresh;
 	//if(isHidden()){ return; }
 	//if(isHidden()){ return; }
@@ -5984,6 +6104,59 @@ function testAPIConnection(service, data = ''){
         message('',' Organizr Error',activeInfo.settings.notifications.position,'#FFF','error','10000');
         message('',' Organizr Error',activeInfo.settings.notifications.position,'#FFF','error','10000');
     });
     });
 }
 }
+function getUnifiSite(service, data = ''){
+    messageSingle('',' Grabbing now...',activeInfo.settings.notifications.position,'#FFF','info','10000');
+    organizrAPI('POST','api/?v1/test/api/connection',{action:service, data:data}).success(function(data) {
+        try {
+            var response = JSON.parse(data);
+        }catch(e) {
+            console.log(e + ' error: ' + data);
+            orgErrorAlert('<h4>' + e + '</h4>' + formatDebug(data));
+            return false;
+        }
+        if(response.data !== false){
+            var sites = '';
+            if(response.data.data){
+                $.each(response.data.data, function(i,v) {
+                    sites += '<div class="form-group row"><div class="col-sm-12"><h4 class="mouse" onclick="unifiSiteApply(\''+v.name+'\')">'+v.desc+'</h4></div></div>';
+                });
+            }else{
+                console.log('no');
+            }
+            var div = `
+                <div class="row">
+                    <div class="col-12">
+                        <div class="card m-b-0">
+                            <div class="form-horizontal">
+                                <div class="card-body">
+                                    <h4 class="card-title" lang="en">Choose Unifi Site</h4>
+                                    `+sites+`
+                                </div>				
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            `;
+            swal({
+                content: createElementFromHTML(div),
+                buttons: false,
+                className: 'bg-org'
+            })
+        }else{
+            messageSingle('API Connection Failed',response.data,activeInfo.settings.notifications.position,'#FFF','error','10000');
+        }
+        console.log(response);
+    }).fail(function(xhr) {
+        console.error("Organizr Function: API Connection Failed");
+        message('',' Organizr Error',activeInfo.settings.notifications.position,'#FFF','error','10000');
+    });
+}
+function unifiSiteApply(name){
+    $('#homepage-Unifi-form [name=unifiSiteName]').val(name);
+    $('#homepage-Unifi-form [name=unifiSiteName]').change();
+    swal.close();
+    messageSingle('', ' Grabbed Site - Please Save Now',activeInfo.settings.notifications.position,'#FFF','success','10000');
+}
 function homepageCalendar(timeout){
 function homepageCalendar(timeout){
 	var timeout = (typeof timeout !== 'undefined') ? timeout : activeInfo.settings.homepage.refresh.calendarRefresh;
 	var timeout = (typeof timeout !== 'undefined') ? timeout : activeInfo.settings.homepage.refresh.calendarRefresh;
     if(activeInfo.settings.homepage.options.alternateHomepageHeaders){
     if(activeInfo.settings.homepage.options.alternateHomepageHeaders){

File diff suppressed because it is too large
+ 2 - 185
js/jquery.serializeToJSON.js


+ 2 - 2
js/langpack/de[German].json

@@ -506,9 +506,9 @@
         "http(s)://hostname:port/xmlrpc": "http(s)://hostname:port/xmlrpc",
         "http(s)://hostname:port/xmlrpc": "http(s)://hostname:port/xmlrpc",
         "rTorrent API URL Override": "rTorrent API URL überschreiben",
         "rTorrent API URL Override": "rTorrent API URL überschreiben",
         "Enable Notify Sounds": "aktiviere Sounds für Meldungen",
         "Enable Notify Sounds": "aktiviere Sounds für Meldungen",
-        "Remember Me Length": "Remember Me Length",
+        "Remember Me Length": "Eri",
         "Minimum Authentication for Debug Area": "minimale Authentifizierung für Debug Area",
         "Minimum Authentication for Debug Area": "minimale Authentifizierung für Debug Area",
-        "Account DN": "Account DN",
+        "Account DN": "Konto DN",
         "Bind Username": "binde Benutzername",
         "Bind Username": "binde Benutzername",
         "Account suffix - start with comma - ,ou=people,dc=domain,dc=tld": "Account Anhang - startet mit einem Komma - ,ou=people,dc=domain,dc=tld",
         "Account suffix - start with comma - ,ou=people,dc=domain,dc=tld": "Account Anhang - startet mit einem Komma - ,ou=people,dc=domain,dc=tld",
         "Account Suffix": "Account Anhang",
         "Account Suffix": "Account Anhang",

+ 38 - 38
js/langpack/hu[Hungarian].json

@@ -7,67 +7,67 @@
         "Username": "Felhasználónév",
         "Username": "Felhasználónév",
         "Message": "Üzenet",
         "Message": "Üzenet",
         "My Profile": "Profilom",
         "My Profile": "Profilom",
-        "Account Settings": "Felhasználói fiók beállításai",
+        "Account Settings": "Fiók beállítások",
         "Login/Register": "Belépés/Regisztráció",
         "Login/Register": "Belépés/Regisztráció",
-        "Logout": "Kilép",
+        "Logout": "Kilépés",
         "Inbox": "Beérkező üzenetek",
         "Inbox": "Beérkező üzenetek",
-        "Go Back": "Visszalép",
-        "Reset": "Reset",
+        "Go Back": "Visszalépés",
+        "Reset": "Visszaállítás",
         "Email": "E-mail",
         "Email": "E-mail",
-        "Enter your Email and instructions will be sent to you!": "Írja be e-mail címét, és az utasításokat elküldjük Önnek!",
-        "Register": "Regisztráció",
-        "Registration Password": "Regisztrációs Jelszó",
-        "Recover Password": "Elfelejtett Jelszó",
+        "Enter your Email and instructions will be sent to you!": "Írd be e-mail címéd, és megkapod az utasításokat!",
+        "Register": "Regisztrálás",
+        "Registration Password": "Regisztrációs jelszó",
+        "Recover Password": "Elfelejtett jelszó",
         "Password": "Jelszó",
         "Password": "Jelszó",
         "Sign Up": "Feliratkozas",
         "Sign Up": "Feliratkozas",
-        "Don't have an account?": "Nem rendelkezik hozzáféréssel ?",
-        "Forgot pwd?": "Elfelejtette a jelszót?",
-        "Remember Me": "Emlékezz Rám",
+        "Don't have an account?": "Nem rendelkezel fiókkal?",
+        "Forgot pwd?": "Elfelejtetted a jelszót?",
+        "Remember Me": "Emlékezz rám",
         "Login": "Belépés",
         "Login": "Belépés",
         "Installed": "Telepített",
         "Installed": "Telepített",
         "Install Update": "Frissítés telepítése",
         "Install Update": "Frissítés telepítése",
         "Organizr Versions": "Organizr Verziók",
         "Organizr Versions": "Organizr Verziók",
-        "About": "Rólunk",
-        "Organizr Logs": "Organizr Logok",
-        "Main Settings": "Fő Beállítások",
-        "Updates": "Frissítés",
-        "Logs": "Logok",
+        "About": "Információ",
+        "Organizr Logs": "Organizr naplók",
+        "Main Settings": "Fő beállítások",
+        "Updates": "Frissítések",
+        "Logs": "Naplók",
         "Main": "Fő",
         "Main": "Fő",
         "Plugins": "Pluginok",
         "Plugins": "Pluginok",
-        "Manage Users": "Felhasználó kezelés",
-        "Customize Organizr": "Testreszabás",
-        "Edit Categories": "Kategóriák Szerkesztése",
-        "Edit Tabs": "Lapok Szerkesztése",
+        "Manage Users": "Felhasználók kezelése",
+        "Customize Organizr": "Organizr testreszabása",
+        "Edit Categories": "Kategóriák szerkesztése",
+        "Edit Tabs": "Lapok szerkesztése",
         "Tabs": "Lapok",
         "Tabs": "Lapok",
         "System Settings": "Rendszerbeállítások",
         "System Settings": "Rendszerbeállítások",
         "User Management": "Felhasználó kezelés",
         "User Management": "Felhasználó kezelés",
         "Customize": "Tetreszabás",
         "Customize": "Tetreszabás",
         "Tab Editor": "Lap szerkesztő",
         "Tab Editor": "Lap szerkesztő",
         "Settings": "Beállítások",
         "Settings": "Beállítások",
-        "Organizr Settings": "Organizr Beállítások",
+        "Organizr Settings": "Organizr beállítások",
         "Categories": "Kategóriák",
         "Categories": "Kategóriák",
-        "Login Logs": "Belépési Logok",
-        "Login Log": "Belépések",
-        "Organizr Log": "Organizr Log",
+        "Login Logs": "Belépési naplók",
+        "Login Log": "Belépési napló",
+        "Organizr Log": "Organizr napló",
         "FIXED": "JAVÍTVA",
         "FIXED": "JAVÍTVA",
         "NEW": "ÚJ",
         "NEW": "ÚJ",
-        "NOTE": "Megjegyzés",
-        "Update Available": "Frissítés Kapható",
+        "NOTE": "MEGJEGYZÉS",
+        "Update Available": "Frissítés elérhető",
         "is available, goto": "elérhető, itt",
         "is available, goto": "elérhető, itt",
-        "Update Tab": "Frissítés",
-        "Database Name:": "Adatbázis Név:",
-        "Database Name": "Adatbázis Név",
-        "Database Location:": "Adatbázis Helye:",
-        "Database Location": "Adatbázis Helye",
-        "Hover to show": "Átmenet",
-        "API Key:": "API Kulcs:",
-        "API Key": "API Kulcs",
-        "Registration Password:": "Regisztráció Jelszó:",
-        "Hash Key:": "Hash Kulcs:",
-        "Hash Key": "Hash Kulcs",
+        "Update Tab": "Lap frissítése",
+        "Database Name:": "Adatbázis név:",
+        "Database Name": "Adatbázis név",
+        "Database Location:": "Adatbázis helye:",
+        "Database Location": "Adatbázis helye",
+        "Hover to show": "Húzd az egeret fölé",
+        "API Key:": "API kulcs:",
+        "API Key": "API kulcs",
+        "Registration Password:": "Regisztrációs jelszó:",
+        "Hash Key:": "Hash kulcs:",
+        "Hash Key": "Hash kulcs",
         "Password:": "Jelszó:",
         "Password:": "Jelszó:",
         "Attention": "Figyelem",
         "Attention": "Figyelem",
-        "The Hash Key will be used to decrypt all passwords etc... on the server.": "Hash például: minden jelszó kikódolásához felhasználásra kerül a szerveren",
+        "The Hash Key will be used to decrypt all passwords etc... on the server.": "A Hash kulcs oldja fel a pl. a jelszavakat a szerveren.",
         "The API Key will be used for all calls to organizr for the UI. [Auto-Generated]": "API kulcsot az organizr használja UI hívásokra [Automatikusan generált]",
         "The API Key will be used for all calls to organizr for the UI. [Auto-Generated]": "API kulcsot az organizr használja UI hívásokra [Automatikusan generált]",
         "Notice": "Értesítés",
         "Notice": "Értesítés",
         "Business": "Üzleti",
         "Business": "Üzleti",

+ 7 - 0
js/version.json

@@ -201,5 +201,12 @@
     "new": "Added Auth Proxy - Accept X-Forwarded-User (#1215)|Ombi default sort option|JDownloader Actions|Set of wallpapers for login page (#1214)|Logging to help with email debug|HTTP codes to API|IPInfo in settings logs|Plex oauth update - thanks swifty|Disable Google Authenticator for Local Access (#1232)",
     "new": "Added Auth Proxy - Accept X-Forwarded-User (#1215)|Ombi default sort option|JDownloader Actions|Set of wallpapers for login page (#1214)|Logging to help with email debug|HTTP codes to API|IPInfo in settings logs|Plex oauth update - thanks swifty|Disable Google Authenticator for Local Access (#1232)",
     "fixed": "Upgraded Simplebar|Homepage downloader variable being overwritten|Timeout on Docker update|Radarr Calendar Image URL",
     "fixed": "Upgraded Simplebar|Homepage downloader variable being overwritten|Timeout on Docker update|Radarr Calendar Image URL",
     "notes": "Please report bugs in GitHub issues page|Updated language translations"
     "notes": "Please report bugs in GitHub issues page|Updated language translations"
+  },
+  "2.0.320": {
+    "date": "2019-10-11 16:25",
+    "title": "Super small update",
+    "new": "Unifi Homepage Item|Login and Top Bar Logo (#1029)|Add 5 minute buffer to plex thumbs",
+    "fixed": "Quick and dirty fix for Google iCal Not working (#1233)|Forgot to add License back (#1247)|Fix context menu disabled on lock screen (#1243)|Dropdown arrows on Tab Groups not animating (#1239)|Fix Unifi cookie to be loaded on first api call|Cannot re-order new tabs from bottom upwards in Settings after adding many (#1175)",
+    "notes": "Add a class and data-tab-name to sidenav groups (#1249)|Please report bugs in GitHub issues page|Updated language translations"
   }
   }
 }
 }

Some files were not shown because too many files changed in this diff