From aa5d3fc89d67cb97b4b0f5c48ef32c39dd193975 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Wed, 31 Aug 2022 18:15:45 +0000 Subject: [PATCH] Road to the MIT --- .docker/nginx/ssl.sh | 0 .eslintrc.js | 1 - .github/workflows/builder.yml | 1 - CONTRIBUTING.md | 4 - LICENSE | 682 +----------------- Makefile | 2 - README.md | 8 +- dev/App/Admin.js | 40 +- dev/Common/Globals.js | 5 - dev/Screen/Admin/Settings.js | 19 +- dev/Settings/Admin/About.js | 7 +- dev/Settings/Admin/Branding.js | 85 ++- dev/Settings/Admin/Plugins.js | 3 - dev/Settings/Admin/Prem/Branding.js | 97 --- dev/Settings/Admin/Prem/Licensing.js | 66 -- dev/Stores/AbstractApp.js | 6 - dev/Stores/Admin/License.js | 15 - dev/View/Admin/Settings/Pane.js | 3 - dev/View/Popup/Activate.js | 120 --- gulpfile.js | 2 +- index.php | 1 - makedeb.sh | 2 +- package.json | 15 +- .../app/libraries/MailSo/Base/HtmlUtils.php | 5 +- .../0.0.0/app/libraries/RainLoop/Actions.php | 180 ++--- .../libraries/RainLoop/Config/Application.php | 2 +- .../libraries/RainLoop/Enumerations/Capa.php | 1 - .../app/libraries/RainLoop/Providers/Prem.php | 390 ---------- .../libraries/RainLoop/Providers/Version.php | 188 +++++ .../0.0.0/app/libraries/RainLoop/Service.php | 9 - .../app/localization/admin/_source.en.yml | 18 - .../v/0.0.0/app/localization/admin/ca.yml | 18 - .../v/0.0.0/app/localization/admin/ca_ES.yml | 18 - .../v/0.0.0/app/localization/admin/cs_CZ.yml | 19 - .../v/0.0.0/app/localization/admin/da_DK.yml | 18 - .../v/0.0.0/app/localization/admin/de_DE.yml | 18 - .../v/0.0.0/app/localization/admin/en_US.yml | 18 - .../v/0.0.0/app/localization/admin/es_ES.yml | 18 - .../v/0.0.0/app/localization/admin/eu.yml | 18 - .../v/0.0.0/app/localization/admin/fa_IR.yml | 17 - .../v/0.0.0/app/localization/admin/fi_FI.yml | 18 - .../v/0.0.0/app/localization/admin/fr_FR.yml | 18 - .../v/0.0.0/app/localization/admin/hu_HU.yml | 17 - .../v/0.0.0/app/localization/admin/id_ID.yml | 18 - .../v/0.0.0/app/localization/admin/it_IT.yml | 18 - .../v/0.0.0/app/localization/admin/ja_JP.yml | 18 - .../v/0.0.0/app/localization/admin/lt_LT.yml | 18 - .../v/0.0.0/app/localization/admin/nb_NO.yml | 18 - .../v/0.0.0/app/localization/admin/nl_NL.yml | 17 - .../v/0.0.0/app/localization/admin/pl_PL.yml | 18 - .../v/0.0.0/app/localization/admin/pt_BR.yml | 18 - .../v/0.0.0/app/localization/admin/ru_RU.yml | 18 - .../v/0.0.0/app/localization/admin/sk_SK.yml | 10 - .../v/0.0.0/app/localization/admin/sl_SI.yml | 18 - .../v/0.0.0/app/localization/admin/sv_SE.yml | 18 - .../v/0.0.0/app/localization/admin/zh_CN.yml | 17 - .../app/templates/Views/Admin/AdminPane.html | 3 +- .../Views/Admin/AdminSettingsAbout.html | 10 +- .../Views/Admin/AdminSettingsBranding.html | 43 +- .../Views/Admin/AdminSettingsLicensing.html | 87 --- .../Views/Admin/AdminSettingsSocial.html | 2 +- .../templates/Views/Admin/PopupsActivate.html | 50 -- .../0.0.0/app/templates/Views/User/About.html | 2 +- rainloop/v/0.0.0/include.php | 3 - tasks/assets.js | 2 +- tasks/common.js | 4 +- tasks/config.js | 7 +- tasks/css.js | 2 +- tasks/js.js | 2 +- tasks/owncloud.js | 12 +- tasks/rainloop.js | 19 +- tasks/vendors.js | 2 +- tasks/watch.js | 2 +- tasks/webpack.js | 4 +- webpack.config.builder.js | 3 +- 75 files changed, 392 insertions(+), 2283 deletions(-) mode change 100644 => 100755 .docker/nginx/ssl.sh delete mode 100644 dev/Settings/Admin/Prem/Branding.js delete mode 100644 dev/Settings/Admin/Prem/Licensing.js delete mode 100644 dev/Stores/Admin/License.js delete mode 100644 dev/View/Popup/Activate.js delete mode 100644 rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Prem.php create mode 100644 rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Version.php delete mode 100644 rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsLicensing.html delete mode 100644 rainloop/v/0.0.0/app/templates/Views/Admin/PopupsActivate.html diff --git a/.docker/nginx/ssl.sh b/.docker/nginx/ssl.sh old mode 100644 new mode 100755 diff --git a/.eslintrc.js b/.eslintrc.js index 1ca1d4a76..160540b69 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -12,7 +12,6 @@ module.exports = { es6: true }, globals: { - 'RL_COMMUNITY': true, 'RL_ES6': true }, // http://eslint.org/docs/rules/ diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 1fdc4a80d..155fd638c 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -26,7 +26,6 @@ jobs: - run: yarn install --frozen-lockfile --check-files - run: yarn build - - run: yarn build-pro - name: Move all assets to release folder run: | diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 55d294ec9..a735073c6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,7 +29,3 @@ 1. Edit data/\_data_/\_default_/configs/application.ini 2. Set 'cache_system_data' to Off - ---- - -If you have any questions, open an issue or email support@rainloop.net. diff --git a/LICENSE b/LICENSE index 2def0e883..1a6999c1a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,661 +1,21 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 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 Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are 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. - - 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. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - 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 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 work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero 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 Affero 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 Affero 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 Affero 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. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero 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 Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - 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 AGPL, see -. \ No newline at end of file +MIT License + +Copyright (c) 2022 RainLoopTeam + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/Makefile b/Makefile index 22871b0e8..bc1bc3eab 100644 --- a/Makefile +++ b/Makefile @@ -61,8 +61,6 @@ rl-watch-js: rl-build: @docker compose run --no-deps --rm node gulp all -rl-build-pro: - @docker compose run --no-deps --rm node gulp all --pro yarn-install: @docker compose run --no-deps --rm node yarn install diff --git a/README.md b/README.md index 9b4ec1fb2..c2956fbc2 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ Information about installing the product, check the [documentation page](http:// ## License -**RainLoop Webmail (Community edition)** is released under -**GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**. -http://www.gnu.org/licenses/agpl-3.0.html +**RainLoop Webmail (Legacy edition)** is released under +**MIT License**. +https://choosealicense.com/licenses/mit/ -Copyright (c) 2019 Rainloop Team +Copyright (c) 2022 Rainloop Team diff --git a/dev/App/Admin.js b/dev/App/Admin.js index 16e52eee2..0a6f4a215 100644 --- a/dev/App/Admin.js +++ b/dev/App/Admin.js @@ -4,9 +4,8 @@ import ko from 'ko'; import progressJs from 'progressJs'; import { root } from 'Common/Links'; -import { getNotification } from 'Common/Translator'; -import { StorageResultType, Notification } from 'Common/Enums'; -import { pInt, isNormal, isArray, inArray, isUnd } from 'Common/Utils'; +import { StorageResultType } from 'Common/Enums'; +import { pInt, isArray, isUnd } from 'Common/Utils'; import * as Settings from 'Storage/Settings'; @@ -14,7 +13,6 @@ import AppStore from 'Stores/Admin/App'; import CapaStore from 'Stores/Admin/Capa'; import DomainStore from 'Stores/Admin/Domain'; import PluginStore from 'Stores/Admin/Plugin'; -import LicenseStore from 'Stores/Admin/License'; import PackageStore from 'Stores/Admin/Package'; import CoreStore from 'Stores/Admin/Core'; import Remote from 'Remote/Admin/Ajax'; @@ -150,40 +148,6 @@ class AdminApp extends AbstractApp { }); } - /** - * @param {boolean=} force = false - */ - reloadLicensing(force = false) { - LicenseStore.licensingProcess(true); - LicenseStore.licenseError(''); - Remote.licensing((result, data) => { - LicenseStore.licensingProcess(false); - if (StorageResultType.Success === result && data && data.Result && isNormal(data.Result.Expired)) { - LicenseStore.licenseValid(true); - LicenseStore.licenseExpired(pInt(data.Result.Expired)); - LicenseStore.licenseError(''); - LicenseStore.licensing(true); - AppStore.prem(true); - } else { - if ( - data && - data.ErrorCode && - -1 < inArray(pInt(data.ErrorCode), [Notification.LicensingServerIsUnavailable, Notification.LicensingExpired]) - ) { - LicenseStore.licenseError(getNotification(pInt(data.ErrorCode))); - LicenseStore.licensing(true); - } else { - if (StorageResultType.Abort === result) { - LicenseStore.licenseError(getNotification(Notification.LicensingServerIsUnavailable)); - LicenseStore.licensing(true); - } else { - LicenseStore.licensing(false); - } - } - } - }, force); - } - bootend(bootendCallback = null) { if (progressJs) { progressJs.end(); diff --git a/dev/Common/Globals.js b/dev/Common/Globals.js index 18aa68187..709db0ac2 100644 --- a/dev/Common/Globals.js +++ b/dev/Common/Globals.js @@ -26,11 +26,6 @@ $hcont export const startMicrotime = new window.Date().getTime(); -/** - * @type {boolean} - */ -export const community = RL_COMMUNITY; - /** * @type {?} */ diff --git a/dev/Screen/Admin/Settings.js b/dev/Screen/Admin/Settings.js index 4ee1489d2..b3a60588a 100644 --- a/dev/Screen/Admin/Settings.js +++ b/dev/Screen/Admin/Settings.js @@ -12,6 +12,7 @@ import { SocialAdminSettings } from 'Settings/Admin/Social'; import { PluginsAdminSettings } from 'Settings/Admin/Plugins'; import { PackagesAdminSettings } from 'Settings/Admin/Packages'; import { AboutAdminSettings } from 'Settings/Admin/About'; +import { BrandingAdminSettings } from 'Settings/Admin/Branding'; import { getApp } from 'Helper/Apps/Admin'; @@ -27,16 +28,6 @@ class SettingsAdminScreen extends AbstractSettingsScreen { * @param {Function=} fCallback = null */ setupSettings(fCallback = null) { - let branding = null, - licensing = null; - - if (RL_COMMUNITY) { - branding = require('Settings/Admin/Branding').default; - } else { - branding = require('Settings/Admin/Prem/Branding').default; - licensing = require('Settings/Admin/Prem/Licensing').default; - } - addSettingsViewModel( GeneralAdminSettings, 'AdminSettingsGeneral', @@ -49,9 +40,7 @@ class SettingsAdminScreen extends AbstractSettingsScreen { addSettingsViewModel(LoginAdminSettings, 'AdminSettingsLogin', 'TABS_LABELS/LABEL_LOGIN_NAME', 'login'); - if (branding) { - addSettingsViewModel(branding, 'AdminSettingsBranding', 'TABS_LABELS/LABEL_BRANDING_NAME', 'branding'); - } + addSettingsViewModel(BrandingAdminSettings, 'AdminSettingsBranding', 'TABS_LABELS/LABEL_BRANDING_NAME', 'branding'); addSettingsViewModel(ContactsAdminSettings, 'AdminSettingsContacts', 'TABS_LABELS/LABEL_CONTACTS_NAME', 'contacts'); @@ -68,10 +57,6 @@ class SettingsAdminScreen extends AbstractSettingsScreen { addSettingsViewModel(PackagesAdminSettings, 'AdminSettingsPackages', 'TABS_LABELS/LABEL_PACKAGES_NAME', 'packages'); - if (licensing) { - addSettingsViewModel(licensing, 'AdminSettingsLicensing', 'TABS_LABELS/LABEL_LICENSING_NAME', 'licensing'); - } - addSettingsViewModel(AboutAdminSettings, 'AdminSettingsAbout', 'TABS_LABELS/LABEL_ABOUT_NAME', 'about'); runSettingsViewModelHooks(true); diff --git a/dev/Settings/Admin/About.js b/dev/Settings/Admin/About.js index f12fa3828..22268ab07 100644 --- a/dev/Settings/Admin/About.js +++ b/dev/Settings/Admin/About.js @@ -3,7 +3,6 @@ import ko from 'ko'; import { i18n, trigger as translatorTrigger } from 'Common/Translator'; import { appSettingsGet, settingsGet } from 'Storage/Settings'; -import AppStore from 'Stores/Admin/App'; import CoreStore from 'Stores/Admin/Core'; import { getApp } from 'Helper/Apps/Admin'; @@ -27,8 +26,6 @@ class AboutAdminSettings { this.coreRemoteRelease = CoreStore.coreRemoteRelease; this.coreVersionCompare = CoreStore.coreVersionCompare; - this.community = RL_COMMUNITY || AppStore.community(); - this.coreRemoteVersionHtmlDesc = ko.computed(() => { translatorTrigger(); return i18n('TAB_ABOUT/HTML_NEW_VERSION', { 'VERSION': this.coreRemoteVersion() }); @@ -59,13 +56,13 @@ class AboutAdminSettings { } onBuild() { - if (this.access() && !this.community) { + if (this.access()) { getApp().reloadCoreData(); } } updateCoreData() { - if (!this.coreUpdating() && !this.community) { + if (!this.coreUpdating()) { getApp().updateCoreData(); } } diff --git a/dev/Settings/Admin/Branding.js b/dev/Settings/Admin/Branding.js index 54f8fe82f..c83cdde2a 100644 --- a/dev/Settings/Admin/Branding.js +++ b/dev/Settings/Admin/Branding.js @@ -6,14 +6,11 @@ import { settingsSaveHelperSimpleFunction, trim } from 'Common/Utils'; import { i18n, trigger as translatorTrigger } from 'Common/Translator'; import Remote from 'Remote/Admin/Ajax'; -import AppStore from 'Stores/Admin/App'; import { settingsGet } from 'Storage/Settings'; class BrandingAdminSettings { constructor() { - this.capa = AppStore.prem; - this.title = ko.observable(settingsGet('Title')).idleTrigger(); this.loadingDesc = ko.observable(settingsGet('LoadingDescription')).idleTrigger(); this.faviconUrl = ko.observable(settingsGet('FaviconUrl')).idleTrigger(); @@ -36,8 +33,6 @@ class BrandingAdminSettings { { optValue: 'always', optText: i18n('TAB_BRANDING/OPTION_WELCOME_PAGE_DISPLAY_ALWAYS') } ]; }); - - this.community = RL_COMMUNITY || AppStore.community(); } onBuild() { @@ -64,6 +59,86 @@ class BrandingAdminSettings { }); }); }, Magics.Time50ms); + + _.delay(() => { + const f1 = settingsSaveHelperSimpleFunction(this.loginLogo.trigger, this), + f2 = settingsSaveHelperSimpleFunction(this.loginDescription.trigger, this), + f3 = settingsSaveHelperSimpleFunction(this.loginCss.trigger, this), + f4 = settingsSaveHelperSimpleFunction(this.userLogo.trigger, this), + f5 = settingsSaveHelperSimpleFunction(this.userLogoTitle.trigger, this), + f6 = settingsSaveHelperSimpleFunction(this.loginBackground.trigger, this), + f7 = settingsSaveHelperSimpleFunction(this.userCss.trigger, this), + f8 = settingsSaveHelperSimpleFunction(this.welcomePageUrl.trigger, this), + f9 = settingsSaveHelperSimpleFunction(this.welcomePageDisplay.trigger, this), + f10 = settingsSaveHelperSimpleFunction(this.userLogoMessage.trigger, this), + f11 = settingsSaveHelperSimpleFunction(this.userIframeMessage.trigger, this); + + this.loginLogo.subscribe((value) => { + Remote.saveAdminConfig(f1, { + 'LoginLogo': trim(value) + }); + }); + + this.loginDescription.subscribe((value) => { + Remote.saveAdminConfig(f2, { + 'LoginDescription': trim(value) + }); + }); + + this.loginCss.subscribe((value) => { + Remote.saveAdminConfig(f3, { + 'LoginCss': trim(value) + }); + }); + + this.userLogo.subscribe((value) => { + Remote.saveAdminConfig(f4, { + 'UserLogo': trim(value) + }); + }); + + this.userLogoTitle.subscribe((value) => { + Remote.saveAdminConfig(f5, { + 'UserLogoTitle': trim(value) + }); + }); + + this.userLogoMessage.subscribe((value) => { + Remote.saveAdminConfig(f10, { + 'UserLogoMessage': trim(value) + }); + }); + + this.userIframeMessage.subscribe((value) => { + Remote.saveAdminConfig(f11, { + 'UserIframeMessage': trim(value) + }); + }); + + this.loginBackground.subscribe((value) => { + Remote.saveAdminConfig(f6, { + 'LoginBackground': trim(value) + }); + }); + + this.userCss.subscribe((value) => { + Remote.saveAdminConfig(f7, { + 'UserCss': trim(value) + }); + }); + + this.welcomePageUrl.subscribe((value) => { + Remote.saveAdminConfig(f8, { + 'WelcomePageUrl': trim(value) + }); + }); + + this.welcomePageDisplay.subscribe((value) => { + Remote.saveAdminConfig(f9, { + 'WelcomePageDisplay': trim(value) + }); + }); + }, Magics.Time50ms); } } diff --git a/dev/Settings/Admin/Plugins.js b/dev/Settings/Admin/Plugins.js index 2729be672..74498e97b 100644 --- a/dev/Settings/Admin/Plugins.js +++ b/dev/Settings/Admin/Plugins.js @@ -8,7 +8,6 @@ import { boolToAjax } from 'Common/Utils'; import { settingsGet } from 'Storage/Settings'; import { showScreenPopup } from 'Knoin/Knoin'; -import AppStore from 'Stores/Admin/App'; import PluginStore from 'Stores/Admin/Plugin'; import Remote from 'Remote/Admin/Ajax'; @@ -22,8 +21,6 @@ class PluginsAdminSettings { this.plugins = PluginStore.plugins; this.pluginsError = PluginStore.plugins.error; - this.community = RL_COMMUNITY || AppStore.community(); - this.visibility = ko.computed(() => (PluginStore.plugins.loading() ? 'visible' : 'hidden')); this.onPluginLoadRequest = _.bind(this.onPluginLoadRequest, this); diff --git a/dev/Settings/Admin/Prem/Branding.js b/dev/Settings/Admin/Prem/Branding.js deleted file mode 100644 index c245f85b4..000000000 --- a/dev/Settings/Admin/Prem/Branding.js +++ /dev/null @@ -1,97 +0,0 @@ -import _ from '_'; -import { settingsSaveHelperSimpleFunction, trim } from 'Common/Utils'; -import { Magics } from 'Common/Enums'; - -import Remote from 'Remote/Admin/Ajax'; - -import { BrandingAdminSettings } from 'Settings/Admin/Branding'; - -class BrandingPremAdminSettings extends BrandingAdminSettings { - onBuild(dom) { - super.onBuild(dom); - - if (this.capa && this.capa() && !this.community) { - _.delay(() => { - const f1 = settingsSaveHelperSimpleFunction(this.loginLogo.trigger, this), - f2 = settingsSaveHelperSimpleFunction(this.loginDescription.trigger, this), - f3 = settingsSaveHelperSimpleFunction(this.loginCss.trigger, this), - f4 = settingsSaveHelperSimpleFunction(this.userLogo.trigger, this), - f5 = settingsSaveHelperSimpleFunction(this.userLogoTitle.trigger, this), - f6 = settingsSaveHelperSimpleFunction(this.loginBackground.trigger, this), - f7 = settingsSaveHelperSimpleFunction(this.userCss.trigger, this), - f8 = settingsSaveHelperSimpleFunction(this.welcomePageUrl.trigger, this), - f9 = settingsSaveHelperSimpleFunction(this.welcomePageDisplay.trigger, this), - f10 = settingsSaveHelperSimpleFunction(this.userLogoMessage.trigger, this), - f11 = settingsSaveHelperSimpleFunction(this.userIframeMessage.trigger, this); - - this.loginLogo.subscribe((value) => { - Remote.saveAdminConfig(f1, { - 'LoginLogo': trim(value) - }); - }); - - this.loginDescription.subscribe((value) => { - Remote.saveAdminConfig(f2, { - 'LoginDescription': trim(value) - }); - }); - - this.loginCss.subscribe((value) => { - Remote.saveAdminConfig(f3, { - 'LoginCss': trim(value) - }); - }); - - this.userLogo.subscribe((value) => { - Remote.saveAdminConfig(f4, { - 'UserLogo': trim(value) - }); - }); - - this.userLogoTitle.subscribe((value) => { - Remote.saveAdminConfig(f5, { - 'UserLogoTitle': trim(value) - }); - }); - - this.userLogoMessage.subscribe((value) => { - Remote.saveAdminConfig(f10, { - 'UserLogoMessage': trim(value) - }); - }); - - this.userIframeMessage.subscribe((value) => { - Remote.saveAdminConfig(f11, { - 'UserIframeMessage': trim(value) - }); - }); - - this.loginBackground.subscribe((value) => { - Remote.saveAdminConfig(f6, { - 'LoginBackground': trim(value) - }); - }); - - this.userCss.subscribe((value) => { - Remote.saveAdminConfig(f7, { - 'UserCss': trim(value) - }); - }); - - this.welcomePageUrl.subscribe((value) => { - Remote.saveAdminConfig(f8, { - 'WelcomePageUrl': trim(value) - }); - }); - - this.welcomePageDisplay.subscribe((value) => { - Remote.saveAdminConfig(f9, { - 'WelcomePageDisplay': trim(value) - }); - }); - }, Magics.Time50ms); - } - } -} - -export { BrandingPremAdminSettings, BrandingPremAdminSettings as default }; diff --git a/dev/Settings/Admin/Prem/Licensing.js b/dev/Settings/Admin/Prem/Licensing.js deleted file mode 100644 index b1224baa6..000000000 --- a/dev/Settings/Admin/Prem/Licensing.js +++ /dev/null @@ -1,66 +0,0 @@ -import ko from 'ko'; -import moment from 'moment'; - -import { settingsGet } from 'Storage/Settings'; -import { showScreenPopup } from 'Knoin/Knoin'; - -import LicenseStore from 'Stores/Admin/License'; - -import { getApp } from 'Helper/Apps/Admin'; - -class LicensingPremAdminSettings { - constructor() { - this.licensing = LicenseStore.licensing; - this.licensingProcess = LicenseStore.licensingProcess; - this.licenseValid = LicenseStore.licenseValid; - this.licenseExpired = LicenseStore.licenseExpired; - this.licenseError = LicenseStore.licenseError; - this.licenseTrigger = LicenseStore.licenseTrigger; - - this.adminDomain = ko.observable(''); - this.subscriptionEnabled = ko.observable(!!settingsGet('SubscriptionEnabled')); - - this.licenseTrigger.subscribe(() => { - if (this.subscriptionEnabled()) { - getApp().reloadLicensing(true); - } - }); - } - - onBuild() { - if (this.subscriptionEnabled()) { - getApp().reloadLicensing(false); - } - } - - onShow() { - this.adminDomain(settingsGet('AdminDomain')); - } - - showActivationForm() { - showScreenPopup(require('View/Popup/Activate')); - } - - showTrialForm() { - showScreenPopup(require('View/Popup/Activate'), [true]); - } - - /** - * @returns {boolean} - */ - licenseIsUnlim() { - return 1898625600 === this.licenseExpired() || 1898625700 === this.licenseExpired(); // eslint-disable-line no-magic-numbers - } - - /** - * @returns {string} - */ - licenseExpiredMomentValue() { - const time = this.licenseExpired(), - momentUnix = moment.unix(time); - - return this.licenseIsUnlim() ? 'Never' : time && momentUnix.format('LL') + ' (' + momentUnix.from(moment()) + ')'; - } -} - -export { LicensingPremAdminSettings, LicensingPremAdminSettings as default }; diff --git a/dev/Stores/AbstractApp.js b/dev/Stores/AbstractApp.js index f4e2e8ee6..43dd0fc0a 100644 --- a/dev/Stores/AbstractApp.js +++ b/dev/Stores/AbstractApp.js @@ -16,9 +16,6 @@ class AbstractAppStore { }); this.interfaceAnimation.valueHasMutated(); - - this.prem = ko.observable(false); - this.community = ko.observable(true); } populate() { @@ -27,9 +24,6 @@ class AbstractAppStore { this.newMoveToFolder(!!Settings.settingsGet('NewMoveToFolder')); this.interfaceAnimation(!!Settings.settingsGet('InterfaceAnimation')); - - this.prem(!!Settings.settingsGet('PremType')); - this.community(!!Settings.settingsGet('Community')); } } diff --git a/dev/Stores/Admin/License.js b/dev/Stores/Admin/License.js deleted file mode 100644 index d86abde2d..000000000 --- a/dev/Stores/Admin/License.js +++ /dev/null @@ -1,15 +0,0 @@ -import ko from 'ko'; - -class LicenseAdminStore { - constructor() { - this.licensing = ko.observable(false); - this.licensingProcess = ko.observable(false); - this.licenseValid = ko.observable(false); - this.licenseExpired = ko.observable(0); - this.licenseError = ko.observable(''); - - this.licenseTrigger = ko.observable(false); - } -} - -export default new LicenseAdminStore(); diff --git a/dev/View/Admin/Settings/Pane.js b/dev/View/Admin/Settings/Pane.js index 2c8b853d8..9b6fa2aa4 100644 --- a/dev/View/Admin/Settings/Pane.js +++ b/dev/View/Admin/Settings/Pane.js @@ -25,9 +25,6 @@ class PaneSettingsAdminView extends AbstractViewNext { this.adminDomain = ko.observable(Settings.settingsGet('AdminDomain')); this.version = ko.observable(Settings.appSettingsGet('version')); - this.capa = !!Settings.settingsGet('PremType'); - this.community = RL_COMMUNITY; - this.adminManLoading = ko.computed( () => '000' !== diff --git a/dev/View/Popup/Activate.js b/dev/View/Popup/Activate.js deleted file mode 100644 index fbaee33ea..000000000 --- a/dev/View/Popup/Activate.js +++ /dev/null @@ -1,120 +0,0 @@ -import ko from 'ko'; - -import { StorageResultType, Notification } from 'Common/Enums'; -import { trim, isUnd } from 'Common/Utils'; -import { RAINLOOP_TRIAL_KEY } from 'Common/Consts'; -import { i18n, getNotification } from 'Common/Translator'; - -import * as Settings from 'Storage/Settings'; - -import Remote from 'Remote/Admin/Ajax'; -import LicenseStore from 'Stores/Admin/License'; - -import { popup, command } from 'Knoin/Knoin'; -import { AbstractViewNext } from 'Knoin/AbstractViewNext'; - -@popup({ - name: 'View/Popup/Activate', - templateID: 'PopupsActivate' -}) -class ActivatePopupView extends AbstractViewNext { - constructor() { - super(); - - this.domain = ko.observable(''); - this.key = ko.observable(''); - this.key.focus = ko.observable(false); - this.activationSuccessed = ko.observable(false); - - this.licenseTrigger = LicenseStore.licenseTrigger; - - this.activateProcess = ko.observable(false); - this.activateText = ko.observable(''); - this.activateText.isError = ko.observable(false); - - this.htmlDescription = ko.computed(() => i18n('POPUPS_ACTIVATE/HTML_DESC', { 'DOMAIN': this.domain() })); - - this.key.subscribe(() => { - this.activateText(''); - this.activateText.isError(false); - }); - - this.activationSuccessed.subscribe((value) => { - if (value) { - this.licenseTrigger(!this.licenseTrigger()); - } - }); - } - - @command( - (self) => !self.activateProcess() && '' !== self.domain() && '' !== self.key() && !self.activationSuccessed() - ) - activateCommand() { - this.activateProcess(true); - if (this.validateSubscriptionKey()) { - Remote.licensingActivate( - (sResult, oData) => { - this.activateProcess(false); - if (StorageResultType.Success === sResult && oData.Result) { - if (true === oData.Result) { - this.activationSuccessed(true); - this.activateText(i18n('POPUPS_ACTIVATE/SUBS_KEY_ACTIVATED')); - this.activateText.isError(false); - } else { - this.activateText(oData.Result); - this.activateText.isError(true); - this.key.focus(true); - } - } else if (oData.ErrorCode) { - this.activateText(getNotification(oData.ErrorCode)); - this.activateText.isError(true); - this.key.focus(true); - } else { - this.activateText(getNotification(Notification.UnknownError)); - this.activateText.isError(true); - this.key.focus(true); - } - }, - this.domain(), - this.key().replace(/[^A-Z0-9-]/gi, '') - ); - } else { - this.activateProcess(false); - this.activateText(i18n('POPUPS_ACTIVATE/ERROR_INVALID_SUBS_KEY')); - this.activateText.isError(true); - this.key.focus(true); - } - } - - onShow(isTrial) { - this.domain(Settings.settingsGet('AdminDomain')); - if (!this.activateProcess()) { - isTrial = isUnd(isTrial) ? false : !!isTrial; - - this.key(isTrial ? RAINLOOP_TRIAL_KEY : ''); - this.activateText(''); - this.activateText.isError(false); - this.activationSuccessed(false); - } - } - - onShowWithDelay() { - if (!this.activateProcess()) { - this.key.focus(true); - } - } - - /** - * @returns {boolean} - */ - validateSubscriptionKey() { - const value = this.key(); - return ( - '' === value || - RAINLOOP_TRIAL_KEY === value || - !!/^RL[\d]+-[A-Z0-9-]+Z$/.test(trim(value).replace(/[^A-Z0-9-]/gi, '')) - ); - } -} - -export { ActivatePopupView, ActivatePopupView as default }; diff --git a/gulpfile.js b/gulpfile.js index e78aabdef..cb15fb217 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,4 +1,4 @@ -/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */ +/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */ const gulp = require('gulp'); const { cleanStatic } = require('./tasks/common'); diff --git a/index.php b/index.php index 59e5087c2..7050b5ff5 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,6 @@ if (!defined('APP_VERSION')) { define('APP_VERSION', '0.0.0'); - define('APP_VERSION_TYPE', 'source'); define('APP_INDEX_ROOT_FILE', __FILE__); define('APP_INDEX_ROOT_PATH', str_replace('\\', '/', rtrim(dirname(__FILE__), '\\/').'/')); } diff --git a/makedeb.sh b/makedeb.sh index 7e576bb52..1b293ed1e 100755 --- a/makedeb.sh +++ b/makedeb.sh @@ -12,7 +12,7 @@ mkdir rainloop-deb-build; cd rainloop-deb-build; #Prepare zip file -unzip ../rainloop-community-latest.zip; +unzip ../rainloop-legacy-latest.zip; find . -type d -exec chmod 755 {} \; find . -type f -exec chmod 644 {} \; diff --git a/package.json b/package.json index b80b9090c..405a46395 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "title": "RainLoop Webmail", "description": "Simple, modern & fast web-based email client", "private": true, - "version": "1.16.0", - "ownCloudVersion": "5.4.0", + "version": "1.17.0", + "ownCloudVersion": "5.5.0", "homepage": "https://www.rainloop.net", "author": { "name": "RainLoop Team", @@ -18,18 +18,13 @@ "scripts": { "watch-css": "gulp watchCss", "watch-js": "webpack --color --watch", - "build": "gulp all", - "build-pro": "gulp all --pro" + "build": "gulp all" }, "license": "SEE LICENSE IN LICENSE", "licenses": [ { - "type": "AGPL 3.0", - "ulr": "http://www.gnu.org/licenses/agpl-3.0.html" - }, - { - "type": "RainLoop Software License", - "ulr": "https://www.rainloop.net/licensing/" + "type": "MIT", + "ulr": "https://choosealicense.com/licenses/mit/" } ], "bugs": { diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php index 21776274b..e81367565 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php @@ -239,7 +239,8 @@ class HtmlUtils $oWrapHtml->setAttribute($sKey, $sValue); } - $oWrapDom = $oDom->createElement('div', '___xxx___'); + $sRndId = '__wrp__'.md5(APP_START.rand(10000, 99999).APP_START).'__'; + $oWrapDom = $oDom->createElement('div', $sRndId); $oWrapDom->setAttribute('data-x-div-type', 'body'); foreach ($aBodylAttrs as $sKey => $sValue) { @@ -250,7 +251,7 @@ class HtmlUtils $sWrp = $oDom->saveHTML($oWrapHtml); - $sResult = \str_replace('___xxx___', $sResult, $sWrp); + $sResult = \str_replace($sRndId, $sResult, $sWrp); } $sResult = \str_replace(\MailSo\Base\HtmlUtils::$KOS, ':', $sResult); diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index 7cfa02c53..84df57d0d 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -112,9 +112,9 @@ class Actions private $oTwoFactorAuthProvider; /** - * @var \RainLoop\Providers\Prem + * @var \RainLoop\Providers\Version */ - private $oPremProvider; + private $oVersionProvider; /** * @var \RainLoop\Config\Application @@ -157,7 +157,7 @@ class Actions $this->oSuggestionsProvider = null; $this->oChangePasswordProvider = null; $this->oTwoFactorAuthProvider = null; - $this->oPremProvider = null; + $this->oVersionProvider = null; $this->sSpecAuthToken = ''; $this->sUpdateAuthToken = ''; @@ -841,25 +841,18 @@ class Actions } /** - * @return \RainLoop\Providers\Prem + * @return \RainLoop\Providers\Version */ - public function PremProvider() + public function VersionProvider() { - if (null === $this->oPremProvider) + if (null === $this->oVersionProvider) { - if (\file_exists(APP_VERSION_ROOT_PATH.'app/libraries/RainLoop/Providers/Prem.php')) - { - $this->oPremProvider = new \RainLoop\Providers\Prem( - $this->Config(), $this->Logger(), $this->Cacher(null, true) - ); - } - else - { - $this->oPremProvider = false; - } + $this->oVersionProvider = new \RainLoop\Providers\Version( + $this->Config(), $this->Logger() + ); } - return $this->oPremProvider; + return $this->oVersionProvider; } /** @@ -1428,14 +1421,6 @@ class Actions return $this->GetAccountFromCustomToken($this->getLocalAuthToken(), $bThrowExceptionOnFalse, true, true); } - /** - * @return bool - */ - public function IsOpen() - { - return !$this->PremProvider(); - } - /** * @param bool $bAdmin = false * @param bool $bMobile = false @@ -1482,7 +1467,7 @@ class Actions 'customLogoutLink' => $oConfig->Get('labs', 'custom_logout_link', ''), 'forgotPasswordLinkUrl' => \trim($oConfig->Get('login', 'forgot_password_link_url', '')), 'registrationLinkUrl' => \trim($oConfig->Get('login', 'registration_link_url', '')), - 'hideSubmitButton' => (bool) $oConfig->Get('login', 'hide_submit_button', true), + 'hideSubmitButton' => (bool) $oConfig->Get('login', 'hide_submit_button', false), 'jsHash' => \md5(\RainLoop\Utils::GetConnectionToken()), 'useImapThread' => (bool) $oConfig->Get('labs', 'use_imap_thread', false), 'useImapSubscribe' => (bool) $oConfig->Get('labs', 'use_imap_list_subscribe', true), @@ -1496,7 +1481,6 @@ class Actions 'themes' => $this->GetThemes($bMobile, false), 'languages' => $this->GetLanguages(false), 'languagesAdmin' => $this->GetLanguages(true), - 'appVersionType' => APP_VERSION_TYPE, 'attachmentsActions' => $aAttachmentsActions ), $bAdmin ? array( 'adminHostUse' => '' !== $oConfig->Get('security', 'admin_panel_host', ''), @@ -1561,8 +1545,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins 'ContactsIsAllowed' => false, 'ChangePasswordIsAllowed' => false, 'RequireTwoFactor' => false, - 'Community' => true, - 'PremType' => false, 'Admin' => array(), 'Capa' => array(), 'Plugins' => array(), @@ -1574,11 +1556,17 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aResult['AuthAccountHash'] = $sAuthAccountHash; } - $oPremProvider = $this->PremProvider(); - if ($oPremProvider) - { - $oPremProvider->PopulateAppData($aResult); - } + $aResult['LoginLogo'] = $oConfig->Get('branding', 'login_logo', ''); + $aResult['LoginBackground'] = $oConfig->Get('branding', 'login_background', ''); + $aResult['LoginCss'] = $oConfig->Get('branding', 'login_css', ''); + $aResult['LoginDescription'] = $oConfig->Get('branding', 'login_desc', ''); + $aResult['UserLogo'] = $oConfig->Get('branding', 'user_logo', ''); + $aResult['UserLogoTitle'] = $oConfig->Get('branding', 'user_logo_title', ''); + $aResult['UserLogoMessage'] = $oConfig->Get('branding', 'user_logo_message', ''); + $aResult['UserIframeMessage'] = $oConfig->Get('branding', 'user_iframe_message', ''); + $aResult['UserCss'] = $oConfig->Get('branding', 'user_css', ''); + $aResult['WelcomePageUrl'] = $oConfig->Get('branding', 'welcome_page_url', ''); + $aResult['WelcomePageDisplay'] = \strtolower($oConfig->Get('branding', 'welcome_page_display', 'none')); if ('' !== $aResult['LoadingDescription'] && 'RainLoop' !== $aResult['LoadingDescription']) { @@ -1811,9 +1799,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $aResult['AllowDropboxSocial'] = (bool) $oConfig->Get('social', 'dropbox_enable', false); $aResult['DropboxApiKey'] = (string) $oConfig->Get('social', 'dropbox_api_key', ''); - $aResult['SubscriptionEnabled'] = (bool) \MailSo\Base\Utils::ValidateDomain($aResult['AdminDomain'], true); -// || \MailSo\Base\Utils::ValidateIP($aResult['AdminDomain']); - $aResult['WeakPassword'] = (bool) $oConfig->ValidatePassword('12345'); $aResult['CoreAccess'] = (bool) $this->rainLoopCoreAccess(); @@ -3638,11 +3623,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } else if ($bVersionsCache) { - $oPremProvider = $this->PremProvider(); - if ($oPremProvider) - { - $oPremProvider->ClearOldVersion(); - } + $this->VersionProvider()->ClearOldVersion(); } $this->Plugins()->RunHook('service.app-delay-start-end'); @@ -3884,11 +3865,19 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $this->setConfigFromParams($oConfig, 'DropboxEnable', 'social', 'dropbox_enable', 'bool'); $this->setConfigFromParams($oConfig, 'DropboxApiKey', 'social', 'dropbox_api_key', 'string'); - $oPremProvider = $this->PremProvider(); - if ($oPremProvider) - { - $oPremProvider->PremSection($this, $oConfig); - } + $this->setConfigFromParams($oConfig, 'LoginLogo', 'branding', 'login_logo', 'string'); + $this->setConfigFromParams($oConfig, 'LoginBackground', 'branding', 'login_background', 'string'); + $this->setConfigFromParams($oConfig, 'LoginDescription', 'branding', 'login_desc', 'string'); + $this->setConfigFromParams($oConfig, 'LoginCss', 'branding', 'login_css', 'string'); + + $this->setConfigFromParams($oConfig, 'UserLogo', 'branding', 'user_logo', 'string'); + $this->setConfigFromParams($oConfig, 'UserLogoTitle', 'branding', 'user_logo_title', 'string'); + $this->setConfigFromParams($oConfig, 'UserLogoMessage', 'branding', 'user_logo_message', 'string'); + $this->setConfigFromParams($oConfig, 'UserIframeMessage', 'branding', 'user_iframe_message', 'string'); + $this->setConfigFromParams($oConfig, 'UserCss', 'branding', 'user_css', 'string'); + + $this->setConfigFromParams($oConfig, 'WelcomePageUrl', 'branding', 'welcome_page_url', 'string'); + $this->setConfigFromParams($oConfig, 'WelcomePageDisplay', 'branding', 'welcome_page_display', 'string'); return $this->DefaultResponse(__FUNCTION__, $oConfig->Save()); } @@ -3971,48 +3960,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins public function DoAdminLicensing() { $this->IsAdminLoggined(); - - $bForce = '1' === (string) $this->GetActionParam('Force', '0'); - - $mResult = false; - $iErrorCode = -1; - - $oPremProvider = $this->PremProvider(); - - if ($oPremProvider && 2 < \strlen(APP_SITE)) - { - $sValue = $oPremProvider->Fetcher($bForce); - - $this->requestSleep(); - - $iExpired = 0; - if ($oPremProvider->Parser($sValue, $iExpired)) - { - $mResult = array( - 'Banned' => false, - 'Expired' => $iExpired, - ); - } - else if ($sValue === 'NO' || \preg_match('/^EXPIRED:[\d]+$/', $sValue)) - { - $iErrorCode = -1; - } - else if ($sValue === 'TOO_MANY_CONNECTIONS') - { - $iErrorCode = -1; - } - else - { - $iErrorCode = \RainLoop\Notifications::LicensingServerIsUnavailable; - } - } - - if (0 < $iErrorCode && !$mResult) - { - throw new \RainLoop\Exceptions\ClientException($iErrorCode); - } - - return $this->DefaultResponse(__FUNCTION__, $mResult); + throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::LicensingServerIsUnavailable); } /** @@ -4021,50 +3969,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins public function DoAdminLicensingActivate() { $this->IsAdminLoggined(); - - $sDomain = (string) $this->GetActionParam('Domain', ''); - $sKey = (string) $this->GetActionParam('Key', ''); - - $mResult = false; - $iErrorCode = -1; - - $oPrem = $this->PremProvider(); - - if ($oPrem && 2 < \strlen($sDomain) && 2 < \strlen($sKey) && $sDomain === APP_SITE) - { - $iCode = 0; - $sValue = $oPrem->Activate($sDomain, $sKey, $iCode); - - $this->requestSleep(); - - $aMatch = array(); - if ('OK' === $sValue) - { - $mResult = true; - } - else if ('TOO_MANY_CONNECTIONS' === $sValue) - { - $mResult = 'Too many connections. Please try again later.'; - } - else if (\preg_match('/^ERROR:(.+)$/', $sValue, $aMatch) && !empty($aMatch[1])) - { - $mResult = trim($aMatch[1]); - - $this->Logger()->Write('Activation error for: '.$sKey.' ('.$sDomain.')', \MailSo\Log\Enumerations\Type::ERROR); - $this->Logger()->Write($mResult, \MailSo\Log\Enumerations\Type::ERROR); - } - else - { - $iErrorCode = \RainLoop\Notifications::LicensingServerIsUnavailable; - } - } - - if (0 < $iErrorCode && !$mResult) - { - throw new \RainLoop\Exceptions\ClientException($iErrorCode); - } - - return $this->DefaultResponse(__FUNCTION__, $mResult); + throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::LicensingServerIsUnavailable); } /** @@ -4670,7 +4575,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins $bRainLoopUpdatable = $this->rainLoopUpdatable(); $bRainLoopAccess = $this->rainLoopCoreAccess(); - $oPremProvider = $this->PremProvider(); $aData = array(); if ($bRainLoopUpdatable && $bRainLoopAccess) @@ -4679,9 +4583,9 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins } $bResult = false; - if ($bReal && $oPremProvider && !empty($aData['file'])) + if ($bReal && !empty($aData['file'])) { - $bResult = $oPremProvider->UpdateCore($this, $aData['file']); + $bResult = $this->VersionProvider()->UpdateCore($this, $aData['file']); } return $this->DefaultResponse(__FUNCTION__, $bResult); @@ -9701,9 +9605,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins */ public function StaticPath($sPath) { - $sKey = defined('APP_VERSION_TYPE') && 0 < strlen(APP_VERSION_TYPE) ? APP_VERSION_TYPE : - ($this->IsOpen() ? 'community' : 'standard'); - + $sKey = 'legacy'; $sResult = \RainLoop\Utils::WebStaticPath().$sPath; return $sResult.(false === \strpos($sResult, '?') ? '?' : '&').$sKey; } diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php index 374264a5d..ff590775b 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -269,7 +269,7 @@ class Application extends \RainLoop\Config\AbstractConfig 'welcome_page' => array(false, ''), - 'hide_submit_button' => array(true), + 'hide_submit_button' => array(false), 'forgot_password_link_url' => array('', ''), 'registration_link_url' => array('', ''), diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php index 56912b5e2..a4b16351a 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php @@ -4,7 +4,6 @@ namespace RainLoop\Enumerations; class Capa { - const PREM = 'PREM'; const TWO_FACTOR = 'TWO_FACTOR'; const TWO_FACTOR_FORCE = 'TWO_FACTOR_FORCE'; const OPEN_PGP = 'OPEN_PGP'; diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Prem.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Prem.php deleted file mode 100644 index c3098738d..000000000 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Prem.php +++ /dev/null @@ -1,390 +0,0 @@ -oConfig = $oConfig; - $this->oLogger = $oLogger; - $this->oCacher = $oCacher; - } - - /** - * @return bool - */ - public function Type() - { - static $bResult = null; - if (null === $bResult) - { - $bResult = $this->Parser($this->Fetcher(false, true)); - } - - return $bResult; - } - - /** - * @return bool - */ - public function IsActive() - { - return true; - } - - /** - * @param string $sInput - * @param int $iExpired = 0 - * - * @return bool - */ - public function Parser($sInput, &$iExpired = 0) - { - $aMatch = array(); - if (\preg_match('/^EXPIRED:([\d]+)$/', $sInput, $aMatch)) - { - $iExpired = (int) $aMatch[1]; - return \time() < $iExpired; - } - - return false; - } - - /** - * @param array $aAppData - */ - public function PopulateAppData(&$aAppData) - { - if (\is_array($aAppData)) - { - $aAppData['Community'] = false; - - $oConfig = $this->oConfig; - if ($oConfig && $this->Type()) - { - $aAppData['PremType'] = true; - $aAppData['LoginLogo'] = $oConfig->Get('branding', 'login_logo', ''); - $aAppData['LoginBackground'] = $oConfig->Get('branding', 'login_background', ''); - $aAppData['LoginCss'] = $oConfig->Get('branding', 'login_css', ''); - $aAppData['LoginDescription'] = $oConfig->Get('branding', 'login_desc', ''); - $aAppData['UserLogo'] = $oConfig->Get('branding', 'user_logo', ''); - $aAppData['UserLogoTitle'] = $oConfig->Get('branding', 'user_logo_title', ''); - $aAppData['UserLogoMessage'] = $oConfig->Get('branding', 'user_logo_message', ''); - $aAppData['UserIframeMessage'] = $oConfig->Get('branding', 'user_iframe_message', ''); - $aAppData['UserCss'] = $oConfig->Get('branding', 'user_css', ''); - $aAppData['WelcomePageUrl'] = $oConfig->Get('branding', 'welcome_page_url', ''); - $aAppData['WelcomePageDisplay'] = \strtolower($oConfig->Get('branding', 'welcome_page_display', 'none')); - } - } - } - - public function PremSection(&$oActions, &$oConfig) - { - if ($oActions && $oActions->HasOneOfActionParams(array( - 'LoginLogo', 'LoginBackground', 'LoginDescription', 'LoginCss', - 'UserLogo', 'UserLogoTitle', 'UserLogoMessage', 'UserIframeMessage', 'UserCss', - 'WelcomePageUrl', 'WelcomePageDisplay' - )) && $this->Type()) - { - $oActions->setConfigFromParams($oConfig, 'LoginLogo', 'branding', 'login_logo', 'string'); - $oActions->setConfigFromParams($oConfig, 'LoginBackground', 'branding', 'login_background', 'string'); - $oActions->setConfigFromParams($oConfig, 'LoginDescription', 'branding', 'login_desc', 'string'); - $oActions->setConfigFromParams($oConfig, 'LoginCss', 'branding', 'login_css', 'string'); - - $oActions->setConfigFromParams($oConfig, 'UserLogo', 'branding', 'user_logo', 'string'); - $oActions->setConfigFromParams($oConfig, 'UserLogoTitle', 'branding', 'user_logo_title', 'string'); - $oActions->setConfigFromParams($oConfig, 'UserLogoMessage', 'branding', 'user_logo_message', 'string'); - $oActions->setConfigFromParams($oConfig, 'UserIframeMessage', 'branding', 'user_iframe_message', 'string'); - $oActions->setConfigFromParams($oConfig, 'UserCss', 'branding', 'user_css', 'string'); - - $oActions->setConfigFromParams($oConfig, 'WelcomePageUrl', 'branding', 'welcome_page_url', 'string'); - $oActions->setConfigFromParams($oConfig, 'WelcomePageDisplay', 'branding', 'welcome_page_display', 'string'); - } - } - - /** - * @return string - */ - public function Activate($sDomain, $sKey, &$iCode) - { - $iCode = 0; - $sContentType = ''; - - $oHttp = \MailSo\Base\Http::SingletonInstance(); - - $sResult = $oHttp->GetUrlAsString(APP_API_PATH.'activate/'.\urlencode($sDomain).'/'.\urlencode($sKey), - 'RainLoop/'.APP_VERSION, $sContentType, $iCode, $this->oLogger, 10, - $this->oConfig->Get('labs', 'curl_proxy', ''), $this->oConfig->Get('labs', 'curl_proxy_auth', ''), - array(), false - ); - - if (200 !== $iCode) - { - $sResult = ''; - } - - return $sResult; - } - - /** - * @return string - */ - public function Fetcher($sForce = false, $bLongCache = false, $iFastCacheTimeInMin = 10, $iLongCacheTimeInDays = 3) - { - $sDomain = \trim(APP_SITE); - - $oConfig = $this->oConfig; - $oLogger = $this->oLogger; - $oCacher = $this->oCacher; - - $oHttp = \MailSo\Base\Http::SingletonInstance(); - - if (0 === \strlen($sDomain) || $oHttp->CheckLocalhost($sDomain) || !$oCacher || !$oConfig || !$oCacher->Verify(true)) - { - return 'NO'; - } - - $sDomainKeyValue = \RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain); - $sDomainLongKeyValue = \RainLoop\KeyPathHelper::LicensingDomainKeyOtherValue($sDomain); - - $sValue = ''; - if (!$sForce) - { - if ($bLongCache) - { - $bLock = $oCacher->GetLock($sDomainLongKeyValue); - $iTime = $bLock ? 0 : $oCacher->GetTimer($sDomainLongKeyValue); - - if ($bLock || (0 < $iTime && \time() < $iTime + (60 * 60 * 24) * $iLongCacheTimeInDays)) - { - $sValue = $oCacher->Get($sDomainLongKeyValue); - } - } - else - { - $iTime = $oCacher->GetTimer($sDomainKeyValue); - if (0 < $iTime && \time() < $iTime + 60 * $iFastCacheTimeInMin) - { - $sValue = $oCacher->Get($sDomainKeyValue); - } - } - } - - if (0 === \strlen($sValue)) - { - if ($bLongCache) - { - if (!$oCacher->SetTimer($sDomainLongKeyValue)) - { - return 'NO'; - } - - $oCacher->SetLock($sDomainLongKeyValue); - } - - $iCode = 0; - $sContentType = ''; - - $sValue = $oHttp->GetUrlAsString(APP_API_PATH.'status/'.\urlencode($sDomain), - 'RainLoop/'.APP_VERSION, $sContentType, $iCode, $oLogger, 5, - $oConfig->Get('labs', 'curl_proxy', ''), $oConfig->Get('labs', 'curl_proxy_auth', ''), - array(), false - ); - - if ($oLogger) - { - $oLogger->Write($sValue); - } - - if (404 === $iCode) - { - $sValue = 'NO'; - } - else if (200 !== $iCode) - { - $sValue = ''; - } - - $oCacher->SetTimer($sDomainKeyValue); - - $oCacher->Set($sDomainKeyValue, $sValue); - $oCacher->Set($sDomainLongKeyValue, $sValue); - - if ($bLongCache) - { - $oCacher->RemoveLock($sDomainLongKeyValue); - } - } - - return $sValue; - } - - public function ClearOldVersion() - { - $sVPath = APP_INDEX_ROOT_PATH.'rainloop/v/'; - - if ($this->oLogger) - { - $this->oLogger->Write('Versions GC: Begin'); - } - - $aDirs = @\array_map('basename', @\array_filter(@\glob($sVPath.'*'), 'is_dir')); - - if ($this->oLogger) - { - $this->oLogger->Write('Versions GC: Count:'.(\is_array($aDirs) ? \count($aDirs) : 0)); - } - - if (\is_array($aDirs) && 5 < \count($aDirs)) - { - \uasort($aDirs, 'version_compare'); - - foreach ($aDirs as $sName) - { - if (APP_DEV_VERSION !== $sName && APP_VERSION !== $sName) - { - if ($this->oLogger) - { - $this->oLogger->Write('Versions GC: Begin to remove "'.$sVPath.$sName.'" version'); - } - - if (@\unlink($sVPath.$sName.'/index.php')) - { - @\MailSo\Base\Utils::RecRmDir($sVPath.$sName); - } - else - { - if ($this->oLogger) - { - $this->oLogger->Write('Versions GC (Error): index file cant be removed from"'.$sVPath.$sName.'"', - \MailSo\Log\Enumerations\Type::ERROR); - } - } - - if ($this->oLogger) - { - $this->oLogger->Write('Versions GC: End to remove "'.$sVPath.$sName.'" version'); - } - - break; - } - } - } - - if ($this->oLogger) - { - $this->oLogger->Write('Versions GC: End'); - } - } - - public function UpdateCore($oActions, $sFile) - { - $bResult = false; - - $sNewVersion = ''; - $sTmp = $oActions->downloadRemotePackageByUrl($sFile); - if (!empty($sTmp)) - { - include_once APP_VERSION_ROOT_PATH.'app/libraries/pclzip/pclzip.lib.php'; - - $oArchive = new \PclZip($sTmp); - $sTmpFolder = APP_PRIVATE_DATA.\md5($sTmp); - - \mkdir($sTmpFolder); - if (\is_dir($sTmpFolder)) - { - $bResult = 0 !== $oArchive->extract(PCLZIP_OPT_PATH, $sTmpFolder); - if (!$bResult) - { - if ($this->oLogger) - { - $this->oLogger->Write('Cannot extract package files: '.$oArchive->errorInfo(), \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); - } - } - - if ($bResult && \file_exists($sTmpFolder.'/index.php') && - \is_writable(APP_INDEX_ROOT_PATH.'rainloop/') && - \is_writable(APP_INDEX_ROOT_PATH.'index.php') && - \is_dir($sTmpFolder.'/rainloop/')) - { - $aMatch = array(); - $sIndexFile = \file_get_contents($sTmpFolder.'/index.php'); - if (\preg_match('/\'APP_VERSION\', \'([^\']+)\'/', $sIndexFile, $aMatch) && !empty($aMatch[1])) - { - $sNewVersion = \trim($aMatch[1]); - } - - if (empty($sNewVersion)) - { - if ($this->oLogger) - { - $this->oLogger->Write('Unknown version', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); - } - } - else if (!\is_dir(APP_INDEX_ROOT_PATH.'rainloop/v/'.$sNewVersion)) - { - \MailSo\Base\Utils::CopyDir($sTmpFolder.'/rainloop/', APP_INDEX_ROOT_PATH.'rainloop/'); - - if (\is_dir(APP_INDEX_ROOT_PATH.'rainloop/v/'.$sNewVersion) && - \is_file(APP_INDEX_ROOT_PATH.'rainloop/v/'.$sNewVersion.'/index.php')) - { - $bResult = \copy($sTmpFolder.'/index.php', APP_INDEX_ROOT_PATH.'index.php'); - - if ($bResult) - { - if (\MailSo\Base\Utils::FunctionExistsAndEnabled('opcache_invalidate')) - { - @\opcache_invalidate(APP_INDEX_ROOT_PATH.'index.php', true); - } - - if (\MailSo\Base\Utils::FunctionExistsAndEnabled('apc_delete_file')) - { - @\apc_delete_file(APP_INDEX_ROOT_PATH.'index.php'); - } - } - } - else - { - if ($this->oLogger) - { - $this->oLogger->Write('Cannot copy new package files', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); - $this->oLogger->Write($sTmpFolder.'/rainloop/ -> '.APP_INDEX_ROOT_PATH.'rainloop/', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); - } - } - } - else if (!empty($sNewVersion)) - { - if ($this->oLogger) - { - $this->oLogger->Write('"'.$sNewVersion.'" version already installed', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); - } - } - } - else if ($bResult) - { - if ($this->oLogger) - { - $this->oLogger->Write('Cannot validate package files', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); - } - } - - \MailSo\Base\Utils::RecRmDir($sTmpFolder); - } - else - { - if ($this->oLogger) - { - $this->oLogger->Write('Cannot create tmp folder: '.$sTmpFolder, \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); - } - } - - @\unlink($sTmp); - } - - return $bResult; - } -} diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Version.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Version.php new file mode 100644 index 000000000..978d92e2d --- /dev/null +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Version.php @@ -0,0 +1,188 @@ +oConfig = $oConfig; + $this->oLogger = $oLogger; + } + + /** + * @return bool + */ + public function IsActive() + { + return true; + } + + public function ClearOldVersion() + { + $sVPath = APP_INDEX_ROOT_PATH.'rainloop/v/'; + + if ($this->oLogger) + { + $this->oLogger->Write('Versions GC: Begin'); + } + + $aDirs = @\array_map('basename', @\array_filter(@\glob($sVPath.'*'), 'is_dir')); + + if ($this->oLogger) + { + $this->oLogger->Write('Versions GC: Count:'.(\is_array($aDirs) ? \count($aDirs) : 0)); + } + + if (\is_array($aDirs) && 5 < \count($aDirs)) + { + \uasort($aDirs, 'version_compare'); + + foreach ($aDirs as $sName) + { + if (APP_DEV_VERSION !== $sName && APP_VERSION !== $sName) + { + if ($this->oLogger) + { + $this->oLogger->Write('Versions GC: Begin to remove "'.$sVPath.$sName.'" version'); + } + + if (@\unlink($sVPath.$sName.'/index.php')) + { + @\MailSo\Base\Utils::RecRmDir($sVPath.$sName); + } + else + { + if ($this->oLogger) + { + $this->oLogger->Write('Versions GC (Error): index file cant be removed from"'.$sVPath.$sName.'"', + \MailSo\Log\Enumerations\Type::ERROR); + } + } + + if ($this->oLogger) + { + $this->oLogger->Write('Versions GC: End to remove "'.$sVPath.$sName.'" version'); + } + + break; + } + } + } + + if ($this->oLogger) + { + $this->oLogger->Write('Versions GC: End'); + } + } + + public function UpdateCore($oActions, $sFile) + { + $bResult = false; + + $sNewVersion = ''; + $sTmp = $oActions->downloadRemotePackageByUrl($sFile); + if (!empty($sTmp)) + { + include_once APP_VERSION_ROOT_PATH.'app/libraries/pclzip/pclzip.lib.php'; + + $oArchive = new \PclZip($sTmp); + $sTmpFolder = APP_PRIVATE_DATA.\md5($sTmp); + + \mkdir($sTmpFolder); + if (\is_dir($sTmpFolder)) + { + $bResult = 0 !== $oArchive->extract(PCLZIP_OPT_PATH, $sTmpFolder); + if (!$bResult) + { + if ($this->oLogger) + { + $this->oLogger->Write('Cannot extract package files: '.$oArchive->errorInfo(), \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); + } + } + + if ($bResult && \file_exists($sTmpFolder.'/index.php') && + \is_writable(APP_INDEX_ROOT_PATH.'rainloop/') && + \is_writable(APP_INDEX_ROOT_PATH.'index.php') && + \is_dir($sTmpFolder.'/rainloop/')) + { + $aMatch = array(); + $sIndexFile = \file_get_contents($sTmpFolder.'/index.php'); + if (\preg_match('/\'APP_VERSION\', \'([^\']+)\'/', $sIndexFile, $aMatch) && !empty($aMatch[1])) + { + $sNewVersion = \trim($aMatch[1]); + } + + if (empty($sNewVersion)) + { + if ($this->oLogger) + { + $this->oLogger->Write('Unknown version', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); + } + } + else if (!\is_dir(APP_INDEX_ROOT_PATH.'rainloop/v/'.$sNewVersion)) + { + \MailSo\Base\Utils::CopyDir($sTmpFolder.'/rainloop/', APP_INDEX_ROOT_PATH.'rainloop/'); + + if (\is_dir(APP_INDEX_ROOT_PATH.'rainloop/v/'.$sNewVersion) && + \is_file(APP_INDEX_ROOT_PATH.'rainloop/v/'.$sNewVersion.'/index.php')) + { + $bResult = \copy($sTmpFolder.'/index.php', APP_INDEX_ROOT_PATH.'index.php'); + + if ($bResult) + { + if (\MailSo\Base\Utils::FunctionExistsAndEnabled('opcache_invalidate')) + { + @\opcache_invalidate(APP_INDEX_ROOT_PATH.'index.php', true); + } + + if (\MailSo\Base\Utils::FunctionExistsAndEnabled('apc_delete_file')) + { + @\apc_delete_file(APP_INDEX_ROOT_PATH.'index.php'); + } + } + } + else + { + if ($this->oLogger) + { + $this->oLogger->Write('Cannot copy new package files', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); + $this->oLogger->Write($sTmpFolder.'/rainloop/ -> '.APP_INDEX_ROOT_PATH.'rainloop/', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); + } + } + } + else if (!empty($sNewVersion)) + { + if ($this->oLogger) + { + $this->oLogger->Write('"'.$sNewVersion.'" version already installed', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); + } + } + } + else if ($bResult) + { + if ($this->oLogger) + { + $this->oLogger->Write('Cannot validate package files', \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); + } + } + + \MailSo\Base\Utils::RecRmDir($sTmpFolder); + } + else + { + if ($this->oLogger) + { + $this->oLogger->Write('Cannot create tmp folder: '.$sTmpFolder, \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER'); + } + } + + @\unlink($sTmp); + } + + return $bResult; + } +} diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php index e23a9b270..c46ee266a 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php @@ -230,16 +230,7 @@ class Service $sResult .= ' - - - - \ No newline at end of file diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSocial.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSocial.html index 7fece3d3a..091b5a769 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSocial.html +++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSocial.html @@ -3,7 +3,7 @@
  - http://rainloop.net/docs/social/ + https://www.rainloop.net/docs/social/
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsActivate.html b/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsActivate.html deleted file mode 100644 index a50fe6dfb..000000000 --- a/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsActivate.html +++ /dev/null @@ -1,50 +0,0 @@ -
-
-
-
- -

- - -

-
-
-
-
- -
-

-
-
-
- -
- - -

-
-
-
-
-
-
-

-
-
-
- - -    - - - -     - -    - - -
-
-
-
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/About.html b/rainloop/v/0.0.0/app/templates/Views/User/About.html index 9c3cbce8f..e1b57af09 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/About.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/About.html @@ -2,5 +2,5 @@

RainLoop Webmail

   

()

-

http://rainloop.net

+

https://www.rainloop.net

\ No newline at end of file diff --git a/rainloop/v/0.0.0/include.php b/rainloop/v/0.0.0/include.php index 9d7fdc2e9..605fd6e05 100644 --- a/rainloop/v/0.0.0/include.php +++ b/rainloop/v/0.0.0/include.php @@ -40,9 +40,6 @@ define('APP_DUMMY', '********'); define('APP_DEV_VERSION', '0.0.0'); define('APP_GOOGLE_ACCESS_TOKEN_PREFIX', ':GAT:'); - define('APP_WEB_SITE', 'http://www.rainloop.net/'); - define('APP_API_PATH', 'http://api.rainloop.net/'); - define('APP_STATUS_PATH', 'http://status.rainloop.net/'); define('APP_REPOSITORY_PATH', 'http://repository.rainloop.net/v1/'); define('APP_REPO_CORE_FILE', 'http://repository.rainloop.net/v2/core.{{channel}}.json'); diff --git a/tasks/assets.js b/tasks/assets.js index bf8759635..0f967dc84 100644 --- a/tasks/assets.js +++ b/tasks/assets.js @@ -1,4 +1,4 @@ -/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */ +/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */ const gulp = require('gulp'); const { config } = require('./config'); diff --git a/tasks/common.js b/tasks/common.js index df934a3d2..62e2ea20c 100644 --- a/tasks/common.js +++ b/tasks/common.js @@ -1,4 +1,4 @@ -/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */ +/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */ const gulp = require('gulp'); const rimraf = require('gulp-rimraf'); const fs = require('node-fs'); @@ -18,6 +18,6 @@ exports.zip = (srcDir, destDir, fileName) => .pipe(require('gulp-zip')(fileName)) .pipe(gulp.dest(destDir)); -exports.getHead = () => (!config.community ? config.head.rainloop : config.head.agpl); +exports.getHead = () => config.head.mit; exports.cleanStatic = () => exports.del(config.paths.static); diff --git a/tasks/config.js b/tasks/config.js index b03841cc1..ddc137fa0 100644 --- a/tasks/config.js +++ b/tasks/config.js @@ -1,15 +1,13 @@ -/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */ +/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */ const path = require('path'); const { argv } = require('yargs'); const config = { head: { - rainloop: '/* RainLoop Webmail (c) RainLoop Team | Licensed under RainLoop Software License */', - agpl: '/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL v3 */' + mit: '/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */' }, devVersion: '0.0.0', releasesPath: 'build/dist/releases', - community: !argv.pro, source: !!argv.source, watch: false, watchInterval: 1000, @@ -20,7 +18,6 @@ const config = { cleanPath: '', zipSrcPath: '', zipFile: '', - // zipFileShort: '', paths: {} }; diff --git a/tasks/css.js b/tasks/css.js index 5a2d3e1ff..f178e3cb7 100644 --- a/tasks/css.js +++ b/tasks/css.js @@ -1,4 +1,4 @@ -/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */ +/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */ const gulp = require('gulp'); const concat = require('gulp-concat-util'); diff --git a/tasks/js.js b/tasks/js.js index 66542b36e..e32295d90 100644 --- a/tasks/js.js +++ b/tasks/js.js @@ -1,4 +1,4 @@ -/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */ +/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */ const gulp = require('gulp'); const concat = require('gulp-concat-util'), diff --git a/tasks/owncloud.js b/tasks/owncloud.js index 864b4eb9e..2d418771e 100644 --- a/tasks/owncloud.js +++ b/tasks/owncloud.js @@ -1,4 +1,4 @@ -/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */ +/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */ /* eslint-disable consistent-return */ const gulp = require('gulp'); @@ -48,7 +48,7 @@ const owncloudSetup = (done) => { .replace('0.0', '' + versionFull + '') .replace( '', - '' + (config.community ? 'AGPLv3' : 'RainLoop Software License') + '' + 'MIT' ) ); @@ -58,8 +58,7 @@ const owncloudSetup = (done) => { config.destPath = config.releasesPath + '/owncloud/' + versionFull + '/'; config.cleanPath = dist; config.zipSrcPath = dist; - config.zipFile = 'rainloop-owncloud-app-' + (config.community ? '' : 'standard-') + versionFull + '.zip'; - // config.zipFileShort = 'rainloop' + (config.community ? '' : '-standard') + '.zip'; + config.zipFile = 'rainloop-owncloud-app-legacy-' + versionFull + '.zip'; done(); }; @@ -80,10 +79,6 @@ const owncloudClean = (done) => { done(); }; -// const owncloudShortname = (done) => { -// copy(config.destPath + config.zipFile, config.destPath + config.zipFileShort, done); -// }; - exports.owncloud = gulp.series( owncloudCopy, rainloopBuild, @@ -92,5 +87,4 @@ exports.owncloud = gulp.series( owncloudSetup, owncloudZip, owncloudClean - // owncloudShortname ); diff --git a/tasks/rainloop.js b/tasks/rainloop.js index 814882a8e..76f7929e4 100644 --- a/tasks/rainloop.js +++ b/tasks/rainloop.js @@ -1,4 +1,4 @@ -/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */ +/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */ /* eslint-disable consistent-return */ const gulp = require('gulp'); const fs = require('node-fs'); @@ -6,7 +6,7 @@ const chmod = require('gulp-chmod'); const pkg = require('../package.json'); const { config } = require('./config'); -const { copy, zip, del } = require('./common'); +const { zip, del } = require('./common'); const rainloopCopy = () => { const versionFull = pkg.version, @@ -32,23 +32,14 @@ const rainloopSetup = (done) => { fs .readFileSync('index.php', 'utf8') .replace("'APP_VERSION', '0.0.0'", "'APP_VERSION', '" + versionFull + "'") - .replace( - "'APP_VERSION_TYPE', 'source'", - "'APP_VERSION_TYPE', '" + (config.community ? 'community' : 'standard') + "'" - ) ); fs.writeFileSync(dist + 'rainloop/v/' + versionFull + '/index.php.root', fs.readFileSync(dist + 'index.php')); - if (config.community) { - require('rimraf').sync(dist + 'rainloop/v/' + versionFull + '/app/libraries/RainLoop/Providers/Prem.php'); - } - config.destPath = config.releasesPath + '/webmail/' + versionFull + '/'; config.cleanPath = dist; config.zipSrcPath = dist; - config.zipFile = 'rainloop-' + (config.community ? 'community-' : '') + versionFull + '.zip'; - // config.zipFileShort = 'rainloop-' + (config.community ? 'community-' : '') + 'latest.zip'; + config.zipFile = 'rainloop-legacy-' + versionFull + '.zip'; config.rainloopBuilded = true; @@ -71,8 +62,6 @@ const rainloopClean = (done) => { done(); }; -// const rainloopShortName = (done) => copy(config.destPath + config.zipFile, config.destPath + config.zipFileShort, done); - exports.rainloopBuild = gulp.series(rainloopCopy, rainloopSetup); -exports.rainloop = gulp.series(exports.rainloopBuild, rainloopZip, rainloopClean /*, rainloopShortName*/); +exports.rainloop = gulp.series(exports.rainloopBuild, rainloopZip, rainloopClean); diff --git a/tasks/vendors.js b/tasks/vendors.js index 41a26f172..ee3668696 100644 --- a/tasks/vendors.js +++ b/tasks/vendors.js @@ -1,4 +1,4 @@ -/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */ +/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */ const gulp = require('gulp'); const header = require('gulp-header'); const stripbom = require('gulp-stripbom'); diff --git a/tasks/watch.js b/tasks/watch.js index bba3a4431..33e65f06b 100644 --- a/tasks/watch.js +++ b/tasks/watch.js @@ -1,4 +1,4 @@ -/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */ +/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */ const gulp = require('gulp'); const { config } = require('./config'); diff --git a/tasks/webpack.js b/tasks/webpack.js index 4452dfd21..3327cc8cf 100644 --- a/tasks/webpack.js +++ b/tasks/webpack.js @@ -1,4 +1,4 @@ -/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */ +/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */ const webpack = require('webpack'); const gutil = require('gulp-util'); @@ -34,5 +34,5 @@ const webpackCallback = (done) => (err, stats) => { }; exports.webpack = (done) => { - webpack(webpackCfgBuilder(config.paths.staticJS, !config.community, 'production'), webpackCallback(done)); + webpack(webpackCfgBuilder(config.paths.staticJS, 'production'), webpackCallback(done)); }; diff --git a/webpack.config.builder.js b/webpack.config.builder.js index 9d88f56f3..e67612c68 100644 --- a/webpack.config.builder.js +++ b/webpack.config.builder.js @@ -55,7 +55,7 @@ const babelLoaderOptions = function() { }; process.noDeprecation = true; -module.exports = function(publicPath, pro, mode) { +module.exports = function(publicPath, mode) { return { mode: mode || 'development', devtool: 'inline-source-map', @@ -80,7 +80,6 @@ module.exports = function(publicPath, pro, mode) { }, plugins: [ new webpack.DefinePlugin({ - 'RL_COMMUNITY': !pro, 'process.env.NODE_ENV': JSON.stringify('production'), 'process.env': { NODE_ENV: JSON.stringify('production')