From 614fb44a0f16232e7af9ac91616fb19a2ef01f68 Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Sun, 21 Oct 2012 00:12:10 +0300 Subject: [PATCH 001/175] Update license.txt --- license.txt | 59 +++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/license.txt b/license.txt index 239ade4..5bcefda 100644 --- a/license.txt +++ b/license.txt @@ -28,30 +28,30 @@ The precise terms and conditions for copying, distribution and modification foll TERMS AND CONDITIONS 0. Definitions. -This License refers to version 3 of the GNU General Public License. +�This License� refers to version 3 of the GNU General Public License. -Copyright also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. +�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. +�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. +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. +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 �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. +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. +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. +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. +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 �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� 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. @@ -78,10 +78,10 @@ You may charge any price or no price for each copy that you convey, and you may 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. +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. +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: @@ -93,9 +93,9 @@ d) Convey the object code by offering access from a designated place (gratis or 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. +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. +�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). @@ -104,7 +104,7 @@ The requirement to provide Installation Information does not include a requireme 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. +�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. @@ -116,7 +116,7 @@ c) Prohibiting misrepresentation of the origin of that material, or requiring th 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. +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. @@ -137,24 +137,24 @@ You are not required to accept this License in order to receive or run a copy of 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. +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� 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. +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. +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 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. +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. @@ -167,14 +167,14 @@ Notwithstanding any other provision of this License, you have permission to link 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License or any later version applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License �or any later version� applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. 15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM AS IS WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +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. @@ -187,7 +187,7 @@ 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. +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) @@ -204,6 +204,7 @@ To do so, attach the following notices to the program. It is safest to attach th You should have received a copy of the GNU General Public License along with this program. If not, see . + Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: @@ -213,8 +214,8 @@ If the program does terminal interaction, make it output a short notice like thi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. -The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an about box. +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an �about box�. -You should also get your employer (if you work as a programmer) or school, if any, to sign a copyright disclaimer for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . +You should also get your employer (if you work as a programmer) or school, if any, to sign a �copyright disclaimer� for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . \ No newline at end of file From 1a76d8cd1405da29b9084bb7debd69c02b0e4120 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 13:37:17 +0300 Subject: [PATCH 002/175] Update plugins/box/system/languages/ru.lang.php --- plugins/box/system/languages/ru.lang.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/box/system/languages/ru.lang.php b/plugins/box/system/languages/ru.lang.php index 8ad6e57..ca88916 100644 --- a/plugins/box/system/languages/ru.lang.php +++ b/plugins/box/system/languages/ru.lang.php @@ -16,8 +16,8 @@ 'System settings' => 'Настройки системы', 'Site name' => 'Название сайта', 'Site description' => 'Описание сайта', - 'Site keywords' => 'Ключевые слова сайта', - 'Site slogan' => 'Слоган сайта', + 'Site keywords' => 'Ключевые слова', + 'Site slogan' => 'Слоган', 'Default page' => 'Страница по умолчанию', 'Time zone' => 'Временная зона', 'Language' => 'Язык', @@ -44,11 +44,11 @@ 'View site' => 'Сайт', 'Welcome, :username' => 'Добро пожаловать, :username', 'Reset Password' => 'Сброс пароля', - '< Back to Website' => '< Обратно на сайт', + '< Back to Website' => '< Вернуться на сайт', 'Forgot your password? >' => 'Забыли пароль? >', 'Administration >' => 'Администрирование >', - 'Send New Password' => 'Выслать новый пароль', - 'This user does not exist' => 'Нет такого пользователя', + 'Send New Password' => 'Отправить новый пароль', + 'This user does not exist' => 'Такого пользователя не существует', 'Version' => 'Версия', @@ -65,11 +65,11 @@ 'Apache Mod Rewrite is required' => 'Требуется Apache Mod Rewrite', 'SimpleXML module is required' => 'Требуется SimpleXML модуль', 'Field "Site name" is empty' => 'Поле "Название сайта" пустое', - 'Field "Email" is empty' => 'Поле "Емейл" пустое', - 'Field "Username" is empty' => 'Поле "Имя пользователя" пустое', - 'Field "Password" is empty' => 'Поле "Пароль" пустое', - 'Field "Site url" is empty' => 'Поле "Адрес сайта" пустое', - 'Email not valid' => 'Емейл недействительный', + 'Field "Email" is empty' => 'Поле "Эл. почта" не заполнено', + 'Field "Username" is empty' => 'Поле "Имя пользователя" не заполнено', + 'Field "Password" is empty' => 'Поле "Пароль" не заполнено', + 'Field "Site url" is empty' => 'Поле "Адрес сайта" не заполнено', + 'Email not valid' => 'Эл. почта недействительна', 'Install' => 'Установить', '...Monstra says...' => '...Monstra говорит...', 'Sitemap file writable' => 'Карта сайта доступна для записи', From 20cadf030000572fa77b2682ce2a8a35e3ad89d1 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 13:42:33 +0300 Subject: [PATCH 003/175] Update plugins/box/system/languages/ru.lang.php --- plugins/box/system/languages/ru.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/system/languages/ru.lang.php b/plugins/box/system/languages/ru.lang.php index ca88916..2782260 100644 --- a/plugins/box/system/languages/ru.lang.php +++ b/plugins/box/system/languages/ru.lang.php @@ -64,7 +64,7 @@ 'PHP 5.2 or greater is required' => 'PHP 5.2 или высше', 'Apache Mod Rewrite is required' => 'Требуется Apache Mod Rewrite', 'SimpleXML module is required' => 'Требуется SimpleXML модуль', - 'Field "Site name" is empty' => 'Поле "Название сайта" пустое', + 'Field "Site name" is empty' => 'Поле "Название сайта" не заполнено', 'Field "Email" is empty' => 'Поле "Эл. почта" не заполнено', 'Field "Username" is empty' => 'Поле "Имя пользователя" не заполнено', 'Field "Password" is empty' => 'Поле "Пароль" не заполнено', From e425f5fba63945b6dfa7a4e12aea1c7f75c2fbf9 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 16:45:29 +0300 Subject: [PATCH 004/175] Update plugins/box/themes/languages/en.lang.php --- plugins/box/themes/languages/en.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/themes/languages/en.lang.php b/plugins/box/themes/languages/en.lang.php index eced7e3..3db4502 100644 --- a/plugins/box/themes/languages/en.lang.php +++ b/plugins/box/themes/languages/en.lang.php @@ -39,7 +39,7 @@ 'Your changes to the chunk :name have been saved.' => 'Your changes to the chunk :name have been saved.', 'Your changes to the styles :name have been saved.' => 'Your changes to the styles :name have been saved.', 'Your changes to the template :name have been saved.' => 'Your changes to the template :name have been saved.', - 'This field should not be empty' => 'This field should not be empty', + 'Required field' => 'Required field', 'Scripts' => 'Scripts', 'Create new script' => 'Create new script', 'Script content' => 'Script content', From 59b12832ccea7482fb8b13552f8420ede5225738 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 16:46:20 +0300 Subject: [PATCH 005/175] Update plugins/box/themes/languages/ru.lang.php --- plugins/box/themes/languages/ru.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/themes/languages/ru.lang.php b/plugins/box/themes/languages/ru.lang.php index 5a20ce4..9da11d2 100644 --- a/plugins/box/themes/languages/ru.lang.php +++ b/plugins/box/themes/languages/ru.lang.php @@ -41,7 +41,7 @@ 'Your changes to the chunk :name have been saved.' => 'Ваши изменения к чанку :name были сохранены', 'Your changes to the styles :name have been saved.' => 'Ваши изменения к стилям :name были сохранены', 'Your changes to the template :name have been saved.' => 'Ваши изменения к шаблону :name были сохранены', - 'This field should not be empty' => 'Это поле не должно быть пустым', + 'Required field' => 'Обязательное поле', 'Scripts' => 'Скрипты', 'Create new script' => 'Создать новый скрипт', 'Script content' => 'Содержимое скрипта', From 1c58f9c9d517cb233753c73f70e036c91850a618 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 16:47:00 +0300 Subject: [PATCH 006/175] Update plugins/box/themes/languages/it.lang.php --- plugins/box/themes/languages/it.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/themes/languages/it.lang.php b/plugins/box/themes/languages/it.lang.php index b4213c7..e2ad4f5 100644 --- a/plugins/box/themes/languages/it.lang.php +++ b/plugins/box/themes/languages/it.lang.php @@ -41,7 +41,7 @@ 'Your changes to the chunk :name have been saved.' => 'Le modifiche al chunk :name sono state salvate', 'Your changes to the styles :name have been saved.' => 'Le modifiche ai stili :name sono state salvate', 'Your changes to the template :name have been saved.' => 'Le modifiche al modello :name sono state salvate', - 'This field should not be empty' => 'Campo obbligatorio', + 'Required field' => 'Campo obbligatorio', 'Scripts' => 'Script', 'Create new script' => 'Crea nuovo script', 'Script content' => 'Contenuto dello script', From 33d8af9eec3c5c2aeb6207fb6809dcd5b8d31125 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 21 Oct 2012 19:54:44 +0300 Subject: [PATCH 007/175] Default theme: hook "theme_header" added. --- public/themes/default/header.chunk.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/themes/default/header.chunk.php b/public/themes/default/header.chunk.php index 428f132..4d865ac 100644 --- a/public/themes/default/header.chunk.php +++ b/public/themes/default/header.chunk.php @@ -14,6 +14,8 @@ + + + + From f55e6665ca386889a249425ba031d9be2c2499c5 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 21 Oct 2012 21:48:13 +0300 Subject: [PATCH 010/175] Users Plugin: apply "content" filter for "about_me" field --- plugins/box/users/views/frontend/profile.view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/users/views/frontend/profile.view.php b/plugins/box/users/views/frontend/profile.view.php index 4800fe8..1f6c404 100644 --- a/plugins/box/users/views/frontend/profile.view.php +++ b/plugins/box/users/views/frontend/profile.view.php @@ -9,7 +9,7 @@ : : : -: +:
From c25ef307b78e48d01776195009a43205144911cc Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 22:57:09 +0300 Subject: [PATCH 011/175] Update plugins/box/users/languages/ru.lang.php --- plugins/box/users/languages/ru.lang.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/box/users/languages/ru.lang.php b/plugins/box/users/languages/ru.lang.php index 8be281d..53d6a53 100644 --- a/plugins/box/users/languages/ru.lang.php +++ b/plugins/box/users/languages/ru.lang.php @@ -18,8 +18,7 @@ 'Register new user' => 'Регистрация нового пользователя', 'Delete user: :user' => 'Удалить пользователя: :user', 'User :user have been deleted.' => 'Пользователь :user удален.', - 'This field should not be empty' => 'Это поле не должно быть пустым', - 'This user alredy exist' => 'Такой пользователь уже существует', + 'This user already exists' => 'Такой пользователь уже существует', 'Changes saved' => 'Изменения сохранены', 'Wrong old password' => 'Неправильный старый пароль', 'Admin' => 'Администратор', @@ -42,7 +41,6 @@ 'User email is invalid' => 'Эл. почта является недействительной', 'Reset Password' => 'Сбросить пароль', 'Send New Password' => 'Отправить пароль', - 'This user doesnt alredy exist' => 'Такого пользователя не существует', 'Users - Profile' => 'Пользователи - Профиль', 'Users - Edit Profile' => 'Пользователи - Редактирование профиля', 'Users - Login' => 'Пользователи - Вход', From 8a12299c16aacc1693d2966345ce3c2ee673afe0 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 22:59:44 +0300 Subject: [PATCH 012/175] Update plugins/box/users/users.admin.php --- plugins/box/users/users.admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/box/users/users.admin.php b/plugins/box/users/users.admin.php index 88e33ba..0fbdc1c 100755 --- a/plugins/box/users/users.admin.php +++ b/plugins/box/users/users.admin.php @@ -90,8 +90,8 @@ if ($user_login == '') $errors['users_empty_login'] = __('Required field', 'users'); if ($user_password == '') $errors['users_empty_password'] = __('Required field', 'users'); if ($user_email == '') $errors['users_empty_email'] = __('Required field', 'users'); - if ($users->select("[login='".$user_login."']")) $errors['users_this_user_alredy_exists'] = __('This user alredy exist', 'users'); - if ($users->select("[email='".$user_email."']")) $errors['users_this_email_alredy_exists'] = __('This email alredy exist', 'users'); + if ($users->select("[login='".$user_login."']")) $errors['users_this_user_already_exists'] = __('This user already exists', 'users'); + if ($users->select("[email='".$user_email."']")) $errors['users_this_email_already_exists'] = __('This email already exists', 'users'); if (count($errors) == 0) { $users->insert(array('login' => Security::safeName($user_login), From 26dca8caa12cc858ab4bf587987b14a142ee2d13 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 23:09:42 +0300 Subject: [PATCH 013/175] Update plugins/box/users/languages/ru.lang.php --- plugins/box/users/languages/ru.lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/box/users/languages/ru.lang.php b/plugins/box/users/languages/ru.lang.php index 53d6a53..7573df6 100644 --- a/plugins/box/users/languages/ru.lang.php +++ b/plugins/box/users/languages/ru.lang.php @@ -19,6 +19,7 @@ 'Delete user: :user' => 'Удалить пользователя: :user', 'User :user have been deleted.' => 'Пользователь :user удален.', 'This user already exists' => 'Такой пользователь уже существует', + 'This email already exists' => 'Такая эл. почта уже существует', 'Changes saved' => 'Изменения сохранены', 'Wrong old password' => 'Неправильный старый пароль', 'Admin' => 'Администратор', From 4e76fe86f7168a95d9062bc738a5722383292cca Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 23:11:17 +0300 Subject: [PATCH 014/175] Update plugins/box/users/languages/en.lang.php --- plugins/box/users/languages/en.lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/box/users/languages/en.lang.php b/plugins/box/users/languages/en.lang.php index 4aa15af..f2d3419 100644 --- a/plugins/box/users/languages/en.lang.php +++ b/plugins/box/users/languages/en.lang.php @@ -19,8 +19,8 @@ 'New User Registration' => 'New User Registration', 'Delete user: :user' => 'Delete user: :user', 'User :user have been deleted.' => 'User :user have been deleted.', - 'This field should not be empty' => 'This field should not be empty', - 'This user alredy exist' => 'This user alredy exist', + 'This user already exists' => 'This user already exists', + 'This email already exits' => 'This email already exits', 'Changes saved' => 'Changes saved', 'Wrong old password' => 'Wrong old password', 'Admin' => 'Admin', From 10ec1ec4de56189334793ace117792a1bf634a55 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 23:12:45 +0300 Subject: [PATCH 015/175] Update plugins/box/users/languages/it.lang.php --- plugins/box/users/languages/it.lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/box/users/languages/it.lang.php b/plugins/box/users/languages/it.lang.php index 38a379e..025b61a 100644 --- a/plugins/box/users/languages/it.lang.php +++ b/plugins/box/users/languages/it.lang.php @@ -18,8 +18,8 @@ 'Register new user' => 'Crea un account', 'Delete user: :user' => 'Elimina utente: :user', 'User :user have been deleted.' => 'Utente :user è stato eliminato.', - 'This field should not be empty' => 'Questo campo non può essere vuoto', - 'This user alredy exist' => 'Questo utente è già esistente', + 'This user already exist' => 'Questo utente è già esistente', + 'This email already exits' => 'Questa email è già esistente', 'Changes saved' => 'Le modifiche sono state salvate', 'Wrong old password' => 'Vecchia password errata', 'Admin' => 'Amministratore', From 0d4b6b58341891b7b39a46bde353d03e0197ddb9 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 23:14:00 +0300 Subject: [PATCH 016/175] Update plugins/box/users/languages/it.lang.php --- plugins/box/users/languages/it.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/users/languages/it.lang.php b/plugins/box/users/languages/it.lang.php index 025b61a..8228a2f 100644 --- a/plugins/box/users/languages/it.lang.php +++ b/plugins/box/users/languages/it.lang.php @@ -19,7 +19,7 @@ 'Delete user: :user' => 'Elimina utente: :user', 'User :user have been deleted.' => 'Utente :user è stato eliminato.', 'This user already exist' => 'Questo utente è già esistente', - 'This email already exits' => 'Questa email è già esistente', + 'This email already exists' => 'Questa email è già esistente', 'Changes saved' => 'Le modifiche sono state salvate', 'Wrong old password' => 'Vecchia password errata', 'Admin' => 'Amministratore', From d193c3d7cfe6b2e51ff58df01bc38ef6b0de2195 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 23:14:24 +0300 Subject: [PATCH 017/175] Update plugins/box/users/languages/en.lang.php --- plugins/box/users/languages/en.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/users/languages/en.lang.php b/plugins/box/users/languages/en.lang.php index f2d3419..dc1fd28 100644 --- a/plugins/box/users/languages/en.lang.php +++ b/plugins/box/users/languages/en.lang.php @@ -20,7 +20,7 @@ 'Delete user: :user' => 'Delete user: :user', 'User :user have been deleted.' => 'User :user have been deleted.', 'This user already exists' => 'This user already exists', - 'This email already exits' => 'This email already exits', + 'This email already exists' => 'This email already exists', 'Changes saved' => 'Changes saved', 'Wrong old password' => 'Wrong old password', 'Admin' => 'Admin', From 687b97de0735edfb88809bcc23017996f5064664 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 23:16:45 +0300 Subject: [PATCH 018/175] Update plugins/box/users/languages/it.lang.php --- plugins/box/users/languages/it.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/users/languages/it.lang.php b/plugins/box/users/languages/it.lang.php index 8228a2f..94ca207 100644 --- a/plugins/box/users/languages/it.lang.php +++ b/plugins/box/users/languages/it.lang.php @@ -18,7 +18,7 @@ 'Register new user' => 'Crea un account', 'Delete user: :user' => 'Elimina utente: :user', 'User :user have been deleted.' => 'Utente :user è stato eliminato.', - 'This user already exist' => 'Questo utente è già esistente', + 'This user already exists' => 'Questo utente è già esistente', 'This email already exists' => 'Questa email è già esistente', 'Changes saved' => 'Le modifiche sono state salvate', 'Wrong old password' => 'Vecchia password errata', From 7b8f02aa8af162a09d77c681c88856d49ff1b185 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Mon, 22 Oct 2012 16:46:01 +0300 Subject: [PATCH 019/175] Update plugins/box/themes/languages/ru.lang.php --- plugins/box/themes/languages/ru.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/themes/languages/ru.lang.php b/plugins/box/themes/languages/ru.lang.php index 9da11d2..8e0a159 100644 --- a/plugins/box/themes/languages/ru.lang.php +++ b/plugins/box/themes/languages/ru.lang.php @@ -36,7 +36,7 @@ 'Current admin theme' => 'Текущая тема админки', 'This template already exists' => 'Этот шаблон уже существует', 'This chunk already exists' => 'Этот чанк уже существует', - 'This styles already exists' => 'Эти стили уже существуют', + 'This styles already exist' => 'Эти стили уже существуют', 'Components templates' => 'Шаблоны компонентов', 'Your changes to the chunk :name have been saved.' => 'Ваши изменения к чанку :name были сохранены', 'Your changes to the styles :name have been saved.' => 'Ваши изменения к стилям :name были сохранены', From 94c464c96b46b72e0eeb35067e2bfd6edc1aa3fb Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Mon, 22 Oct 2012 16:46:43 +0300 Subject: [PATCH 020/175] Update plugins/box/themes/languages/en.lang.php --- plugins/box/themes/languages/en.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/themes/languages/en.lang.php b/plugins/box/themes/languages/en.lang.php index 3db4502..ff7192f 100644 --- a/plugins/box/themes/languages/en.lang.php +++ b/plugins/box/themes/languages/en.lang.php @@ -34,7 +34,7 @@ 'Current admin theme' => 'Current admin theme', 'This template already exists' => 'This template already exists', 'This chunk already exists' => 'This chunk already exists', - 'This styles already exists' => 'This styles already exists', + 'This styles already exist' => 'This styles already exists', 'Components templates' => 'Components templates', 'Your changes to the chunk :name have been saved.' => 'Your changes to the chunk :name have been saved.', 'Your changes to the styles :name have been saved.' => 'Your changes to the styles :name have been saved.', From 08514bb033eddbeb69308a61d3e4d234fc46fdf1 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Mon, 22 Oct 2012 16:47:03 +0300 Subject: [PATCH 021/175] Update plugins/box/themes/languages/it.lang.php --- plugins/box/themes/languages/it.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/themes/languages/it.lang.php b/plugins/box/themes/languages/it.lang.php index e2ad4f5..d936031 100644 --- a/plugins/box/themes/languages/it.lang.php +++ b/plugins/box/themes/languages/it.lang.php @@ -36,7 +36,7 @@ 'Current admin theme' => 'Tema corrente del backend', 'This template already exists' => 'Questo modello già esistente', 'This chunk already exists' => 'Questo chunk già esistente', - 'This styles already exists' => 'Questi stili già esistenti', + 'This styles already exist' => 'Questi stili già esistenti', 'Components templates' => 'Modello dei componenti', 'Your changes to the chunk :name have been saved.' => 'Le modifiche al chunk :name sono state salvate', 'Your changes to the styles :name have been saved.' => 'Le modifiche ai stili :name sono state salvate', From 4b6aedab4785e50100eb303ad4cc99eb621629e1 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Mon, 22 Oct 2012 16:48:10 +0300 Subject: [PATCH 022/175] Update plugins/box/snippets/languages/ru.lang.php --- plugins/box/snippets/languages/ru.lang.php | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/box/snippets/languages/ru.lang.php b/plugins/box/snippets/languages/ru.lang.php index 709bae4..2eb4f64 100644 --- a/plugins/box/snippets/languages/ru.lang.php +++ b/plugins/box/snippets/languages/ru.lang.php @@ -13,7 +13,6 @@ 'Edit snippet' => 'Редактирование сниппета', 'Save' => 'Сохранить', 'Save and exit' => 'Сохранить и выйти', - 'This field should not be empty' => 'Это поле не должно быть пустым', 'This snippet already exists' => 'Такой сниппет уже существует', 'This snippet does not exist' => 'Такого сниппета не существует', 'Delete snippet: :block' => 'Удалить сниппет: :snippet', From 85dc7d11cab16e04ef48cc926fad43898a4e723f Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Mon, 22 Oct 2012 16:48:39 +0300 Subject: [PATCH 023/175] Update plugins/box/snippets/languages/en.lang.php --- plugins/box/snippets/languages/en.lang.php | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/box/snippets/languages/en.lang.php b/plugins/box/snippets/languages/en.lang.php index 52c96e8..865c322 100644 --- a/plugins/box/snippets/languages/en.lang.php +++ b/plugins/box/snippets/languages/en.lang.php @@ -13,7 +13,6 @@ 'Edit snippet' => 'Edit snippet', 'Save' => 'Save', 'Save and exit' => 'Save and exit', - 'This field should not be empty' => 'This field should not be empty', 'This snippet already exists' => 'This snippet already exists', 'This snippet does not exist' => 'This snippet does not exist', 'Delete snippet: :snippet' => 'Delete snippet: :snippet', From f37ec07eac4f30f94a6d6b3eca5f0b0af23bc322 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Mon, 22 Oct 2012 16:49:07 +0300 Subject: [PATCH 024/175] Update plugins/box/snippets/languages/it.lang.php --- plugins/box/snippets/languages/it.lang.php | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/box/snippets/languages/it.lang.php b/plugins/box/snippets/languages/it.lang.php index 5c476d7..528763b 100644 --- a/plugins/box/snippets/languages/it.lang.php +++ b/plugins/box/snippets/languages/it.lang.php @@ -13,7 +13,6 @@ 'Edit snippet' => 'Modifica snippet', 'Save' => 'Salva', 'Save and exit' => 'Salva ed esci', - 'This field should not be empty' => 'Campo obbligatorio', 'This snippet already exists' => 'Tale snippet già esistente', 'This snippet does not exist' => 'Tale snippet non esiste', 'Delete snippet: :block' => 'Elimina snippet: :snippet', From 13f3fdbff2a7952840b38d91bd4cb96d22e98e10 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Mon, 22 Oct 2012 16:54:30 +0300 Subject: [PATCH 025/175] Update plugins/box/plugins/languages/ru.lang.php --- plugins/box/plugins/languages/ru.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/plugins/languages/ru.lang.php b/plugins/box/plugins/languages/ru.lang.php index a0cd8c7..2f2d0b8 100644 --- a/plugins/box/plugins/languages/ru.lang.php +++ b/plugins/box/plugins/languages/ru.lang.php @@ -10,7 +10,7 @@ 'Description' => 'Описание', 'Delete' => 'Удалить', 'Delete plugin :plugin' => 'Удалить плагин :plugin', - 'This plugins does not exist' => 'Такой плагин не существует', + 'This plugin does not exist' => 'Такого плагина не существует', 'Version' => 'Версия', 'Author' => 'Автор', 'Get More Plugins' => 'Скачать другие плагины', From 7fdbaa2d3deeb43ebed965045a8450b1a70282f4 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Mon, 22 Oct 2012 16:54:56 +0300 Subject: [PATCH 026/175] Update plugins/box/plugins/languages/it.lang.php --- plugins/box/plugins/languages/it.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/plugins/languages/it.lang.php b/plugins/box/plugins/languages/it.lang.php index 22c6d53..6298628 100644 --- a/plugins/box/plugins/languages/it.lang.php +++ b/plugins/box/plugins/languages/it.lang.php @@ -10,7 +10,7 @@ 'Description' => 'Descrizione', 'Delete' => 'Elimina', 'Delete plugin :plugin' => 'Elimina plugin :plugin', - 'This plugins does not exist' => 'Tale plugin non esiste', + 'This plugin does not exist' => 'Tale plugin non esiste', 'Version' => 'Versione', 'Author' => 'Autore', 'Get More Plugins' => 'Scarica altri plugin', From 01a2adbdb7578bf097f5114ca03f376316e62d9c Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Mon, 22 Oct 2012 16:55:24 +0300 Subject: [PATCH 027/175] Update plugins/box/plugins/languages/en.lang.php --- plugins/box/plugins/languages/en.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/plugins/languages/en.lang.php b/plugins/box/plugins/languages/en.lang.php index 804a02f..f4d8585 100644 --- a/plugins/box/plugins/languages/en.lang.php +++ b/plugins/box/plugins/languages/en.lang.php @@ -10,7 +10,7 @@ 'Install New' => 'Install New', 'Delete' => 'Delete', 'Delete plugin :plugin' => 'Delete plugin :plugin', - 'This plugins does not exist' => 'This plugins does not exist', + 'This plugin does not exist' => 'This plugin does not exist', 'Version' => 'Version', 'Author' => 'Author', 'Get More Plugins' => 'Get More Plugins', From 4a92b95ffba4c735aea77141c21b9164b789f487 Mon Sep 17 00:00:00 2001 From: All Unser Miranda Date: Mon, 22 Oct 2012 14:26:07 -0200 Subject: [PATCH 028/175] Updated the method to get the server protocol This edit will make the HTTP protocol to be automatic, so if you have a SSL Certificate, the Monstra will know and will make your urls more friendly. --- monstra/helpers/url.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/monstra/helpers/url.php b/monstra/helpers/url.php index 66a3d71..c25faea 100644 --- a/monstra/helpers/url.php +++ b/monstra/helpers/url.php @@ -93,7 +93,8 @@ * @return string */ public static function find($url) { - $pos = strpos($url, 'http://'); + $https = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == strtolower('on')) ? 'https://' : 'http://'; + $pos = strpos($url, $https); if ($pos === false) { $url_output = Option::get('siteurl') . $url; } else { $url_output = $url; } return $url_output; } @@ -109,7 +110,7 @@ * @return string */ public static function base() { - return 'http://' . rtrim(rtrim($_SERVER['HTTP_HOST'], '\\/') . dirname($_SERVER['PHP_SELF']), '\\/'); + $https = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == strtolower('on')) ? 'https://' : 'http://'; + return $https . rtrim(rtrim($_SERVER['HTTP_HOST'], '\\/') . dirname($_SERVER['PHP_SELF']), '\\/'); } - } \ No newline at end of file From 704721a96bf313f35fead0937bd7e9eab4b5a341 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 22 Oct 2012 22:26:19 +0300 Subject: [PATCH 029/175] Box Plugins: translates updates --- plugins/box/information/languages/ru.lang.php | 2 +- plugins/box/system/languages/en.lang.php | 1 + plugins/box/system/languages/ru.lang.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/box/information/languages/ru.lang.php b/plugins/box/information/languages/ru.lang.php index 4b7c7c5..0402b40 100644 --- a/plugins/box/information/languages/ru.lang.php +++ b/plugins/box/information/languages/ru.lang.php @@ -3,7 +3,7 @@ return array( 'information' => array( 'Information' => 'Информация', - 'Debuging' => 'Дебаггинг', + 'Debugging' => 'Дебаггинг', 'Name' => 'Название', 'Value' => 'Значение', 'Security' => 'Безопасность', diff --git a/plugins/box/system/languages/en.lang.php b/plugins/box/system/languages/en.lang.php index d76496e..f8a74dd 100644 --- a/plugins/box/system/languages/en.lang.php +++ b/plugins/box/system/languages/en.lang.php @@ -50,6 +50,7 @@ 'Send New Password' => 'Send New Password', 'This user does not exist' => 'This user does not exist', 'Version' => 'Version', + 'Plugin does not exist' => 'Plugin does not exist', 'Install script writable' => 'Install script writable', 'Install script not writable' => 'Install script not writable', diff --git a/plugins/box/system/languages/ru.lang.php b/plugins/box/system/languages/ru.lang.php index 2782260..0f2ca57 100644 --- a/plugins/box/system/languages/ru.lang.php +++ b/plugins/box/system/languages/ru.lang.php @@ -50,7 +50,7 @@ 'Send New Password' => 'Отправить новый пароль', 'This user does not exist' => 'Такого пользователя не существует', 'Version' => 'Версия', - + 'Plugin does not exist' => 'Такого плагина не существует', 'Install script writable' => 'Установочный скрипт доступен для записи', 'Install script not writable' => 'Установочный скрипт не доступен для записи', From 1359f640d713fa89c6d5ac1557225ee9d777da00 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 22 Oct 2012 23:06:31 +0300 Subject: [PATCH 030/175] Sandbox Plugin: small fixes --- plugins/sandbox/sandbox.admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/sandbox/sandbox.admin.php b/plugins/sandbox/sandbox.admin.php index 5ca9538..6b714dd 100644 --- a/plugins/sandbox/sandbox.admin.php +++ b/plugins/sandbox/sandbox.admin.php @@ -83,10 +83,10 @@ echo ( Form::open(). Form::hidden('csrf', Security::token()). - Form::label('sandbox_form_template', __('Sandbox template')). + Form::label('sandbox_form_template', __('Sandbox template', 'sandbox')). Form::select('sandbox_form_template', $templates, Option::get('sandbox_template')). Html::br(). - Form::submit('sandbox_component_save', __('Save'), array('class' => 'btn')). + Form::submit('sandbox_component_save', __('Save', 'sandbox'), array('class' => 'btn')). Form::close() ); } From 3a78c0fd16768daefbe17ee0ce7c45e27a98a862 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 22 Oct 2012 23:13:45 +0300 Subject: [PATCH 031/175] Sandbox Plugin: small fixes --- plugins/sandbox/sandbox.admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/sandbox/sandbox.admin.php b/plugins/sandbox/sandbox.admin.php index 6b714dd..1c65a41 100644 --- a/plugins/sandbox/sandbox.admin.php +++ b/plugins/sandbox/sandbox.admin.php @@ -77,7 +77,7 @@ $_templates = Themes::getTemplates(); foreach($_templates as $template) { - $templates[] = basename($template, '.template.php'); + $templates[basename($template, '.template.php')] = basename($template, '.template.php'); } echo ( From d1897038a931b95c46ee4e56afc60f9f7d4328e8 Mon Sep 17 00:00:00 2001 From: All Unser Miranda Date: Mon, 22 Oct 2012 23:53:48 -0200 Subject: [PATCH 032/175] Updated the method to get the server protocol This is the same commit as before, but in this one i've fixed an idiot error on the 'if' statement. --- monstra/helpers/url.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monstra/helpers/url.php b/monstra/helpers/url.php index c25faea..8e3581b 100644 --- a/monstra/helpers/url.php +++ b/monstra/helpers/url.php @@ -93,7 +93,7 @@ * @return string */ public static function find($url) { - $https = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == strtolower('on')) ? 'https://' : 'http://'; + $https = (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://'; $pos = strpos($url, $https); if ($pos === false) { $url_output = Option::get('siteurl') . $url; } else { $url_output = $url; } return $url_output; @@ -110,7 +110,7 @@ * @return string */ public static function base() { - $https = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == strtolower('on')) ? 'https://' : 'http://'; + $https = (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://'; return $https . rtrim(rtrim($_SERVER['HTTP_HOST'], '\\/') . dirname($_SERVER['PHP_SELF']), '\\/'); } } \ No newline at end of file From 7285e7a959726dc24676ab3dc0ec90e6e5b848ec Mon Sep 17 00:00:00 2001 From: Stanislav Date: Tue, 23 Oct 2012 14:32:09 +0200 Subject: [PATCH 033/175] Updated favicon.ico Fixed to 16x16 pixels, reduced size --- favicon.ico | Bin 32038 -> 1150 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/favicon.ico b/favicon.ico index 8fc932dcf3619b04846b0559707bddccbfe465c6..de0db7e7cd00bc0bb820172416f0fd9660d3f01b 100644 GIT binary patch literal 1150 zcmbtSODjZS82*$WU}b}hOH45sw=4`ZMp#JhMJ~;_M7dK$q9p!=B$6zcy%Y=9>?zDF z*fG;=re+@J`Rbg$b54_m_w=6cJd@ z2(QLj1C}^FIYqV0jpwIlgJDgK++Q&~I0Q#dJ}S#9;BuD3?W#h(yG~-k@nBkcI2=Y_ zcc1K|K3y)&E#l|<$K><=_Kw=hnzS0LS4)!*U!PynBbiL1v!m0d^*8&mwXrFawbi4y zs|VDEu0tlSAlHH8qhq8}DN_<7r}~7ht`Qgun6SOwJ(EuLA*brchDUAh9sc-``glB! z`Pn&{tm#8e)$`vJ=NB1RVP1hT`}XG6z*+12V2|!WEj{#Su8~MY_Qql{Ob4fAvZkJ# z+Usd(#OTn72|L_BFlOm9^_85eUte3t<;A55;w9 z-QR}Y?H!q{)w!&B4)u6_c|}b{wXMgh(Vsal8jb35x$^uE^z{GfF&UV!oqyHn{_Y;D gODphsyl@tmqO`CC{Lae@%XoZvR9j^&1n{5y1#O9xNdN!< literal 32038 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 i{+}uIvA0{2+P Date: Tue, 23 Oct 2012 15:25:16 +0200 Subject: [PATCH 034/175] Updated italian language files --- plugins/box/system/languages/it.lang.php | 6 +++--- plugins/box/users/languages/it.lang.php | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/plugins/box/system/languages/it.lang.php b/plugins/box/system/languages/it.lang.php index f52843a..6699708 100644 --- a/plugins/box/system/languages/it.lang.php +++ b/plugins/box/system/languages/it.lang.php @@ -8,15 +8,15 @@ 'Create sitemap' => 'Crea sitemap', 'on' => 'on', 'off'=> 'off', - 'Site url' => 'URL del sito', + 'Site url' => 'URL', 'Maintenance Mode' => 'Modalità manutenzione', 'Maintenance Mode On' => 'Abilita modalità manutenzione', 'Maintenance Mode Off' => 'Disabilita modalità manutenzione', 'Site settings' => 'Impostazioni del sito', 'System settings' => 'Impostazioni di sistema', 'Site name' => 'Nome del sito', - 'Site description' => 'Descrizione del sito', - 'Site keywords' => 'Parole chiavi del sito', + 'Site description' => 'Descrizione', + 'Site keywords' => 'Parole chiavi', 'Site slogan' => 'Slogan', 'Default page' => 'Pagina predefinita', 'Time zone' => 'Fuso orario', diff --git a/plugins/box/users/languages/it.lang.php b/plugins/box/users/languages/it.lang.php index 94ca207..b61bf1f 100644 --- a/plugins/box/users/languages/it.lang.php +++ b/plugins/box/users/languages/it.lang.php @@ -26,7 +26,7 @@ 'User' => 'Utente', 'Editor' => 'Editore', 'Register' => 'Registrazione', - 'Edit profile' => 'Modifica del profilo utente', + 'Edit profile' => 'Modifica profilo', 'Save' => 'Salva', 'Firstname' => 'Nome', 'Lastname' => 'Cognome', @@ -36,27 +36,26 @@ 'Wrong login or password' => 'Login o password errata', 'Your changes have been saved.' => 'Le modifiche sono state salvate.', 'New user have been registered.' => 'Nuovo utente è stato registrato.', - 'Captcha' => 'Captcha', + 'Captcha' => 'Codice captcha', 'Registration' => 'Registrazione', 'Username' => 'Nome utente', 'User email is invalid' => 'E-mail non valido', 'Reset Password' => 'Resetta la password', 'Send New Password' => 'Invia la password', - 'This user doesnt alredy exist' => 'Questo utente non esiste', 'Users - Profile' => 'Utenti - Profilo', 'Users - Edit Profile' => 'Utenti - Modifica profilo', 'Users - Login' => 'Utenti - Login', 'Users - Registration' => 'Utenti - Registrazione', 'Users - Password Recover' => 'Utenti - Password Recovery', 'New Password' => 'Nuova password', - 'Forgot your password?' => 'Dimenticato la password?', - 'New password has been sent' => 'La nuova password è stata inviata', + 'Forgot your password?' => 'Password dimenticata?', + 'New password has been sent' => 'Nuova password è stata inviata', 'Monstra says: This is not your profile...' => 'Monstra dice: Questo non è il tuo profilo.', 'User registration is closed.' => 'Registrazione utenti è chiusa.', 'Allow user registration' => 'Consenti registrazione utenti.', 'Required field' => 'Campo obbligatorio', 'This user doesnt exist' => 'Questo utente non esiste', - 'Captcha code is wrong' => 'Captcha errato', + 'Captcha code is wrong' => 'Codice captcha errato', 'Your login details for :site_name has been sent' => 'I tuoi dati di accesso :site_name sono stati inviati', 'Your new password for :site_name' => 'La tua nuova password per :site_name', 'Your login details for :site_name' => 'I tuoi dati di accesso per :site_name', From 47d016af7770c3c18b735af0579556c6afb6274e Mon Sep 17 00:00:00 2001 From: Stanislav Date: Tue, 23 Oct 2012 15:50:20 +0200 Subject: [PATCH 035/175] Updated italian language files --- plugins/box/system/languages/it.lang.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/box/system/languages/it.lang.php b/plugins/box/system/languages/it.lang.php index 6699708..b0ca1b0 100644 --- a/plugins/box/system/languages/it.lang.php +++ b/plugins/box/system/languages/it.lang.php @@ -24,7 +24,7 @@ 'Save' => 'Salva', 'Site' => 'Sito', 'System version' => 'Versione del sistema', - 'System version ID' => 'Versione del sistema ID', + 'System version ID' => 'ID del sistema', 'GZIP' => 'Compressione GZIP', 'Debugging' => 'Debugging', 'Plugin API' => 'Plugin API', @@ -52,8 +52,8 @@ 'Version' => 'Versione', - 'Install script writable' => 'Lo script d’installazione è scrivibile', - 'Install script not writable' => 'Lo script d’installazione non è scrivibile', + 'Install script writable' => 'Script d’installazione è scrivibile', + 'Install script not writable' => 'Script d’installazione non è scrivibile', 'Directory: :dir writable' => 'Directory :dir è scrivibile', 'Directory: :dir not writable' => 'Directory :dir non è scrivibile', 'PHP Version' => 'Versione PHP', From 5cc32bfebe736a3de82a5010a7d37098bb7bac7d Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 23 Oct 2012 18:44:21 +0300 Subject: [PATCH 036/175] Plugin API: Stylesheet and Javascript load() methods - fixed --- monstra/engine/plugins.php | 154 ++++++++++++++++++++----------------- 1 file changed, 83 insertions(+), 71 deletions(-) diff --git a/monstra/engine/plugins.php b/monstra/engine/plugins.php index 1747027..c97ead2 100644 --- a/monstra/engine/plugins.php +++ b/monstra/engine/plugins.php @@ -951,50 +951,56 @@ // Sort stylesheets by priority $stylesheets = Arr::subvalSort(Stylesheet::$stylesheets, 'priority'); - // Build backend site stylesheets - foreach ($stylesheets as $stylesheet) { - if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'backend') or ($stylesheet['load'] == 'both')) ) { - if ( ! file_exists($backend_site_css_path) or filemtime(ROOT . DS . $stylesheet['file']) > filemtime($backend_site_css_path)) { - $backend_regenerate = true; - break; - } - } - } + if (BACKEND) { - // Regenerate site stylesheet - if ($backend_regenerate) { - foreach ($stylesheets as $stylesheet) { + // Build backend site stylesheets + foreach ($stylesheets as $stylesheet) { if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'backend') or ($stylesheet['load'] == 'both')) ) { - $backend_buffer .= file_get_contents(ROOT . DS . $stylesheet['file']); - } + if ( ! file_exists($backend_site_css_path) or filemtime(ROOT . DS . $stylesheet['file']) > filemtime($backend_site_css_path)) { + $backend_regenerate = true; + break; + } + } } - $backend_buffer = Stylesheet::parseVariables($backend_buffer); - file_put_contents($backend_site_css_path, Minify::css($backend_buffer)); - $backend_regenerate = false; - } - - // Build frontend site stylesheets - foreach ($stylesheets as $stylesheet) { - if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'frontend') or ($stylesheet['load'] == 'both')) ) { - if ( ! file_exists($frontend_site_css_path) or filemtime(ROOT . DS . $stylesheet['file']) > filemtime($frontend_site_css_path)) { - $frontend_regenerate = true; - break; + // Regenerate site stylesheet + if ($backend_regenerate) { + foreach ($stylesheets as $stylesheet) { + if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'backend') or ($stylesheet['load'] == 'both')) ) { + $backend_buffer .= file_get_contents(ROOT . DS . $stylesheet['file']); + } } - } - } + $backend_buffer = Stylesheet::parseVariables($backend_buffer); + file_put_contents($backend_site_css_path, Minify::css($backend_buffer)); + $backend_regenerate = false; + } - // Regenerate site stylesheet - if ($frontend_regenerate) { - foreach ($stylesheets as $stylesheet) { + + } else { + + // Build frontend site stylesheets + foreach ($stylesheets as $stylesheet) { if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'frontend') or ($stylesheet['load'] == 'both')) ) { - $frontend_buffer .= file_get_contents(ROOT . DS . $stylesheet['file']); - } + if ( ! file_exists($frontend_site_css_path) or filemtime(ROOT . DS . $stylesheet['file']) > filemtime($frontend_site_css_path)) { + $frontend_regenerate = true; + break; + } + } } - $frontend_buffer = Stylesheet::parseVariables($frontend_buffer); - file_put_contents($frontend_site_css_path, Minify::css($frontend_buffer)); - $frontend_regenerate = false; - } + + // Regenerate site stylesheet + if ($frontend_regenerate) { + foreach ($stylesheets as $stylesheet) { + if ((file_exists(ROOT . DS . $stylesheet['file'])) and (($stylesheet['load'] == 'frontend') or ($stylesheet['load'] == 'both')) ) { + $frontend_buffer .= file_get_contents(ROOT . DS . $stylesheet['file']); + } + } + $frontend_buffer = Stylesheet::parseVariables($frontend_buffer); + file_put_contents($frontend_site_css_path, Minify::css($frontend_buffer)); + $frontend_regenerate = false; + } + + } // Render if (BACKEND) { @@ -1089,47 +1095,53 @@ // Sort javascripts by priority $javascripts = Arr::subvalSort(Javascript::$javascripts, 'priority'); - // Build backend site javascript - foreach ($javascripts as $javascript) { - if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'backend') or ($javascript['load'] == 'both')) ) { - if ( ! file_exists($backend_site_js_path) or filemtime(ROOT . DS . $javascript['file']) > filemtime($backend_site_js_path)) { - $backend_regenerate = true; - break; - } - } - } - // Regenerate site javascript - if ($backend_regenerate) { - foreach ($javascripts as $javascript) { + if (BACKEND) { + + // Build backend site javascript + foreach ($javascripts as $javascript) { if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'backend') or ($javascript['load'] == 'both')) ) { - $backend_buffer .= file_get_contents(ROOT . DS . $javascript['file']); - } + if ( ! file_exists($backend_site_js_path) or filemtime(ROOT . DS . $javascript['file']) > filemtime($backend_site_js_path)) { + $backend_regenerate = true; + break; + } + } } - file_put_contents($backend_site_js_path, $backend_buffer); - $backend_regenerate = false; - } - - // Build frontend site javascript - foreach ($javascripts as $javascript) { - if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'frontend') or ($javascript['load'] == 'both')) ) { - if ( ! file_exists($frontend_site_js_path) or filemtime(ROOT . DS . $javascript['file']) > filemtime($frontend_site_js_path)) { - $frontend_regenerate = true; - break; - } - } - } - - // Regenerate site javascript - if ($frontend_regenerate) { - foreach ($javascripts as $javascript) { - if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'frontend') or ($javascript['load'] == 'both')) ) { - $frontend_buffer .= file_get_contents(ROOT . DS . $javascript['file']); + // Regenerate site javascript + if ($backend_regenerate) { + foreach ($javascripts as $javascript) { + if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'backend') or ($javascript['load'] == 'both')) ) { + $backend_buffer .= file_get_contents(ROOT . DS . $javascript['file']); + } } + file_put_contents($backend_site_js_path, $backend_buffer); + $backend_regenerate = false; } - file_put_contents($frontend_site_js_path, $frontend_buffer); - $frontend_regenerate = false; + + } else { + + // Build frontend site javascript + foreach ($javascripts as $javascript) { + if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'frontend') or ($javascript['load'] == 'both')) ) { + if ( ! file_exists($frontend_site_js_path) or filemtime(ROOT . DS . $javascript['file']) > filemtime($frontend_site_js_path)) { + $frontend_regenerate = true; + break; + } + } + } + + // Regenerate site javascript + if ($frontend_regenerate) { + foreach ($javascripts as $javascript) { + if ((file_exists(ROOT . DS . $javascript['file'])) and (($javascript['load'] == 'frontend') or ($javascript['load'] == 'both')) ) { + $frontend_buffer .= file_get_contents(ROOT . DS . $javascript['file']); + } + } + file_put_contents($frontend_site_js_path, $frontend_buffer); + $frontend_regenerate = false; + } + } // Render From 8ff3002b2e98f3b63402e10ffa0153f2826e1523 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 23 Oct 2012 18:57:16 +0300 Subject: [PATCH 037/175] Update Install script and update logo --- install.php | 2 +- public/assets/img/monstra-logo.png | Bin 0 -> 6941 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 public/assets/img/monstra-logo.png diff --git a/install.php b/install.php index 83f9f66..1e731ce 100644 --- a/install.php +++ b/install.php @@ -243,7 +243,7 @@
-
+
diff --git a/public/assets/img/monstra-logo.png b/public/assets/img/monstra-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..a0a462c070954318727005e5ef63b2062ea3d376 GIT binary patch literal 6941 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 Date: Tue, 23 Oct 2012 19:13:34 +0300 Subject: [PATCH 038/175] Update logo --- public/assets/img/monstra-logo-black.png | Bin 2820 -> 0 bytes public/assets/img/monstra-logo.png | Bin 6941 -> 6844 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/assets/img/monstra-logo-black.png diff --git a/public/assets/img/monstra-logo-black.png b/public/assets/img/monstra-logo-black.png deleted file mode 100644 index ae4d7e25344a576c4d5b2ffa33022c8937d966dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2820 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 R{Y$ri(T&@B6kS}{{{gPWc$feH diff --git a/public/assets/img/monstra-logo.png b/public/assets/img/monstra-logo.png index a0a462c070954318727005e5ef63b2062ea3d376..2e88b32b89b08fbeae98716d2c4a94d428afc076 100644 GIT binary patch delta 4170 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 Us3YFTlK=n!07*qoM6N<$f;Dyxy#N3J delta 4268 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 Date: Tue, 23 Oct 2012 19:15:41 +0300 Subject: [PATCH 039/175] Update install script --- install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.php b/install.php index 1e731ce..3c363e8 100644 --- a/install.php +++ b/install.php @@ -243,7 +243,7 @@
-
+
From b01e165e3609211ea6b3086d4842c06a4db2462d Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 23 Oct 2012 19:16:32 +0300 Subject: [PATCH 040/175] Default Theme: use new logo --- admin/themes/default/css/default.css | 4 ++-- admin/themes/default/index.template.php | 2 +- admin/themes/default/login.template.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/themes/default/css/default.css b/admin/themes/default/css/default.css index 1f27d41..667806a 100644 --- a/admin/themes/default/css/default.css +++ b/admin/themes/default/css/default.css @@ -113,8 +113,8 @@ h6 { .monstra-header h3 a, .monstra-header .brand { float: left; display: block; - padding-top:6px; - padding-left:1px; + padding-top:15px; + padding-left:10px; margin-left: 0px; color: #fdfdfd; font-family: arial; diff --git a/admin/themes/default/index.template.php b/admin/themes/default/index.template.php index 71ec085..dff8454 100644 --- a/admin/themes/default/index.template.php +++ b/admin/themes/default/index.template.php @@ -33,7 +33,7 @@
- +

diff --git a/admin/themes/default/login.template.php b/admin/themes/default/login.template.php index 93b0476..66bbd97 100644 --- a/admin/themes/default/login.template.php +++ b/admin/themes/default/login.template.php @@ -53,7 +53,7 @@
-
+
From c7b69998458335bf39d38f25072eb53f5084aeaf Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 23 Oct 2012 23:40:39 +0300 Subject: [PATCH 041/175] Pages Plugin: issue #30 done. --- plugins/box/pages/pages.admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/pages/pages.admin.php b/plugins/box/pages/pages.admin.php index 5dff735..83bfda9 100755 --- a/plugins/box/pages/pages.admin.php +++ b/plugins/box/pages/pages.admin.php @@ -387,7 +387,7 @@ if (Request::post('status')) $status = Request::post('status'); else $status = $page['status']; // Generate date - $date = Date::format(time(), 'Y-m-d H:i:s'); + $date = Request::post('date') ? Request::post('date') : Date::format($page['date'], 'Y-m-d H:i:s'); Notification::setNow('page', 'page'); From b93e03ed3f4b46f91901fd426505b0e9f3552d53 Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Wed, 24 Oct 2012 11:42:17 +0300 Subject: [PATCH 042/175] Update plugins/box/system/views/backend/index.view.php --- plugins/box/system/views/backend/index.view.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/box/system/views/backend/index.view.php b/plugins/box/system/views/backend/index.view.php index 9f643ce..77eab12 100755 --- a/plugins/box/system/views/backend/index.view.php +++ b/plugins/box/system/views/backend/index.view.php @@ -22,9 +22,9 @@ Form::open(). Form::hidden('csrf', Security::token()). Form::label('site_name', __('Site name', 'system')). - Form::input('site_name', Option::get('sitename'), array('class' => 'span7')). Html::br(). + Form::input('site_name', Option::get('sitename'), array('class' => 'span7')). Html::br(). Form::label('site_description', __('Site description', 'system')). - Form::input('site_description', Option::get('description'), array('class' => 'span7')). Html::br(). + Form::textarea('site_description', Option::get('description', array('class' => 'span7')). Html::br(). Form::label('site_keywords', __('Site keywords', 'system')). Form::input('site_keywords', Option::get('keywords'), array('class' => 'span7')). Html::br(). Form::label('site_slogan', __('Site slogan', 'system')). From fb8c2cc5e59aea7dfbdf7d202c2e7affa14097d2 Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Wed, 24 Oct 2012 14:12:08 +0300 Subject: [PATCH 043/175] Update plugins/box/users/users.plugin.php --- plugins/box/users/users.plugin.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/box/users/users.plugin.php b/plugins/box/users/users.plugin.php index b34bcf8..2ec228c 100644 --- a/plugins/box/users/users.plugin.php +++ b/plugins/box/users/users.plugin.php @@ -416,12 +416,12 @@ */ public static function title(){ switch (Users::route()) { - case 'list': return __('Users'); break; - case 'profile': return __('Users - Profile'); break; - case 'edit': return __('Users - Edit Profile'); break; - case 'login': return __('Users - Login'); break; - case 'registration': return __('Users - Registration'); break; - case 'password-reset': return __('Users - Password Recover'); break; + case 'list': return __('Users', 'users'); break; + case 'profile': return __('Users - Profile', 'users'); break; + case 'edit': return __('Users - Edit Profile', 'users'); break; + case 'login': return __('Users - Login', 'users'); break; + case 'registration': return __('Users - Registration', 'users'); break; + case 'password-reset': return __('Users - Password Recover', 'users'); break; } } From 41ca48503c853b4e226a41419081e02b96340943 Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Wed, 24 Oct 2012 14:13:30 +0300 Subject: [PATCH 044/175] Update plugins/box/users/languages/ru.lang.php --- plugins/box/users/languages/ru.lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/box/users/languages/ru.lang.php b/plugins/box/users/languages/ru.lang.php index 7573df6..839b539 100644 --- a/plugins/box/users/languages/ru.lang.php +++ b/plugins/box/users/languages/ru.lang.php @@ -60,5 +60,6 @@ 'Your new password for :site_name' => 'Ваш новый пароль для :site_name', 'Your login details for :site_name' => 'Ваши данные для доступа к :site_name', 'About Me' => 'Обо мне', + 'Profile' => 'Профиль', ) ); \ No newline at end of file From ffe397f323f9f9588555c1ab94700efd91b0ffee Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Wed, 24 Oct 2012 14:13:50 +0300 Subject: [PATCH 045/175] Update plugins/box/users/languages/en.lang.php --- plugins/box/users/languages/en.lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/box/users/languages/en.lang.php b/plugins/box/users/languages/en.lang.php index dc1fd28..113b53e 100644 --- a/plugins/box/users/languages/en.lang.php +++ b/plugins/box/users/languages/en.lang.php @@ -62,5 +62,6 @@ 'Your new password for :site_name' => 'Your new password for :site_name', 'Your login details for :site_name' => 'Your login details for :site_name', 'About Me' => 'About Me', + 'Profile' => 'Profile', ) ); \ No newline at end of file From 16d636bfd67dc323e1b4d0901736bde6042a374a Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Wed, 24 Oct 2012 14:14:27 +0300 Subject: [PATCH 046/175] Update plugins/box/users/languages/de.lang.php --- plugins/box/users/languages/de.lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/box/users/languages/de.lang.php b/plugins/box/users/languages/de.lang.php index 13c7829..a7ecb71 100644 --- a/plugins/box/users/languages/de.lang.php +++ b/plugins/box/users/languages/de.lang.php @@ -62,5 +62,6 @@ 'Your new password for :site_name' => 'Dein neues Passwort für :site_name', 'Your login details for :site_name' => 'Deine Login-Daten für :site_name', 'About Me' => 'Über Mich', + 'Profile' => 'Profil', ) ); \ No newline at end of file From 58e82747def2960e65dbecfb075161b75ee5e83e Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Wed, 24 Oct 2012 14:15:18 +0300 Subject: [PATCH 047/175] Update plugins/box/users/languages/it.lang.php --- plugins/box/users/languages/it.lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/box/users/languages/it.lang.php b/plugins/box/users/languages/it.lang.php index b61bf1f..743cee0 100644 --- a/plugins/box/users/languages/it.lang.php +++ b/plugins/box/users/languages/it.lang.php @@ -60,5 +60,6 @@ 'Your new password for :site_name' => 'La tua nuova password per :site_name', 'Your login details for :site_name' => 'I tuoi dati di accesso per :site_name', 'About Me' => 'Su di me', + 'Profile' => 'Profilo', ) ); \ No newline at end of file From 7e273cd8bd004d8520bb3c8f8a9abb4b2e317758 Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Wed, 24 Oct 2012 14:15:41 +0300 Subject: [PATCH 048/175] Update plugins/box/users/languages/lt.lang.php --- plugins/box/users/languages/lt.lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/box/users/languages/lt.lang.php b/plugins/box/users/languages/lt.lang.php index 3793b38..3bf1c18 100644 --- a/plugins/box/users/languages/lt.lang.php +++ b/plugins/box/users/languages/lt.lang.php @@ -61,5 +61,6 @@ 'Your new password for :site_name' => 'Naujas :site_name slaptažodis', 'Your login details for :site_name' => 'Prisijungimo prie :site_name detalės', 'About Me' => 'Apie mane', + 'Profile' => 'Profilis', ) ); \ No newline at end of file From adc1aa9237b8372c9da6709e945380d94b1fa721 Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Wed, 24 Oct 2012 14:16:03 +0300 Subject: [PATCH 049/175] Update plugins/box/users/languages/pt-br.lang.php --- plugins/box/users/languages/pt-br.lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/box/users/languages/pt-br.lang.php b/plugins/box/users/languages/pt-br.lang.php index a7b08d2..f42e0f0 100644 --- a/plugins/box/users/languages/pt-br.lang.php +++ b/plugins/box/users/languages/pt-br.lang.php @@ -62,5 +62,6 @@ 'Your new password for :site_name' => 'Sua nova senha para o site :site_name', 'Your login details for :site_name' => 'Seu novo login para o site :site_name', 'About Me' => 'Sobre mim', + 'Profile' => 'Perfil', ) ); \ No newline at end of file From 0dc43c1c822840ee6092fafdc02732fdde756549 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Wed, 24 Oct 2012 15:19:08 +0300 Subject: [PATCH 050/175] Update plugins/box/system/languages/it.lang.php --- plugins/box/system/languages/it.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/system/languages/it.lang.php b/plugins/box/system/languages/it.lang.php index b0ca1b0..86c3116 100644 --- a/plugins/box/system/languages/it.lang.php +++ b/plugins/box/system/languages/it.lang.php @@ -8,7 +8,7 @@ 'Create sitemap' => 'Crea sitemap', 'on' => 'on', 'off'=> 'off', - 'Site url' => 'URL', + 'Site url' => 'URL del sito', 'Maintenance Mode' => 'Modalità manutenzione', 'Maintenance Mode On' => 'Abilita modalità manutenzione', 'Maintenance Mode Off' => 'Disabilita modalità manutenzione', From 5d3213af2a3ff7186e7c6abbb9bceabbb9617d70 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Wed, 24 Oct 2012 15:19:48 +0300 Subject: [PATCH 051/175] Update plugins/box/pages/languages/it.lang.php --- plugins/box/pages/languages/it.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/pages/languages/it.lang.php b/plugins/box/pages/languages/it.lang.php index aae1769..fc9f1c8 100644 --- a/plugins/box/pages/languages/it.lang.php +++ b/plugins/box/pages/languages/it.lang.php @@ -40,7 +40,7 @@ 'Published' => 'Pubblicato', 'Draft' => 'Bozza', 'Published on' => 'Pubblicato il', - 'Edit 404 page' => 'Modifica la pagina 404', + 'Edit 404 page' => 'Modifica pagina 404', 'Page :page deleted' => 'Pagina :page è stata cancellata', 'Search Engines Robots' => 'Robot dei motori di ricerca', 'Page' => 'Pagina', From 745a9fbecafc99f0a918fdde02ebc70bccf7f968 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Wed, 24 Oct 2012 15:22:26 +0300 Subject: [PATCH 052/175] Update plugins/box/menu/languages/it.lang.php --- plugins/box/menu/languages/it.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/menu/languages/it.lang.php b/plugins/box/menu/languages/it.lang.php index 7ee4a8f..93b1b70 100644 --- a/plugins/box/menu/languages/it.lang.php +++ b/plugins/box/menu/languages/it.lang.php @@ -13,7 +13,7 @@ 'New item' => 'Nuova voce', 'Item name' => 'Nome', 'Item order' => 'Ordine', - 'Item target' => 'Scopo', + 'Item target' => 'Target', 'Item link' => 'Collegamento', 'Item category' => 'Categoria', 'Save' => 'Salva', From c1f2725be985c4ea929a8cccf280ea635fad5613 Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Wed, 24 Oct 2012 15:24:36 +0300 Subject: [PATCH 053/175] Shortcodes API: delete() clear() exist() methods added --- monstra/engine/shortcodes.php | 55 ++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/monstra/engine/shortcodes.php b/monstra/engine/shortcodes.php index 9222f28..dbccc5a 100644 --- a/monstra/engine/shortcodes.php +++ b/monstra/engine/shortcodes.php @@ -56,7 +56,7 @@ /** - * Add shortcode + * Add new shortcode * * * function returnSiteUrl() { @@ -79,6 +79,59 @@ if (is_callable($callback_function)) Shortcode::$shortcode_tags[$shortcode] = $callback_function; } + + /** + * Remove a specific registered shortcode. + * + * + * Shortcode::delete('shortcode_name'); + * + * + * @param string $shortcode Shortcode tag. + */ + pubic static function delete($shortcode) { + + // Redefine vars + $shortcode = (string) $shortcode; + + // Delete shortcode + if (Shortcode::exist($shortcode)) unset(Shortcode::$shortcode_tags[$shortcode]); + } + + + /** + * Remove all registered shortcodes. + * + * + * Shortcode::clear(); + * + * + */ + public static function clear() { + Shortcode::$shortcode_tags = array(); + } + + + /** + * Check if a shortcode has been registered. + * + * + * if (Shortcode::exist('shortcode_name')) { + * // do something... + * } + * + * + * @param string $shortcode Shortcode tag. + */ + pulbic static function exist($shortcode) { + + // Redefine vars + $shortcode = (string) $shortcode; + + // Check shortcode + return array_key_exists($shortcode, Shortcode::$shortcode_tags); + } + /** * Parse a string, and replace any registered shortcodes within it with the result of the mapped callback. From 4979682c712050b5ce8e469b2a610c68af1b353f Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Thu, 25 Oct 2012 13:04:00 +0300 Subject: [PATCH 054/175] Options API: add exist() method --- monstra/engine/options.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/monstra/engine/options.php b/monstra/engine/options.php index c68c7a5..68a8524 100644 --- a/monstra/engine/options.php +++ b/monstra/engine/options.php @@ -164,4 +164,26 @@ return Option::$options->deleteWhere('[name="'.$option.'"]'); } + + /** + * Check if option exist + * + * + * if (Option::exist('pages_limit')) { + * // do something... + * } + * + * + * @param string $option Name of option to check. + * @return boolean + */ + public static function exist($option) { + + // Redefine vars + $option = (string) $option; + + // Check if option exist + return (count(Option::$options->select('[name="'.$option.'"]', null)) > 0) ? true : false; + } + } \ No newline at end of file From 7e6b02a96c549d57bd885cc383cebdbcf5ea2574 Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Thu, 25 Oct 2012 13:08:45 +0300 Subject: [PATCH 055/175] Options API: renamed exist() to exists() method --- monstra/engine/options.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/monstra/engine/options.php b/monstra/engine/options.php index 68a8524..8f26e06 100644 --- a/monstra/engine/options.php +++ b/monstra/engine/options.php @@ -169,7 +169,7 @@ * Check if option exist * * - * if (Option::exist('pages_limit')) { + * if (Option::exists('pages_limit')) { * // do something... * } * @@ -177,12 +177,12 @@ * @param string $option Name of option to check. * @return boolean */ - public static function exist($option) { + public static function exists($option) { // Redefine vars $option = (string) $option; - // Check if option exist + // Check if option exists return (count(Option::$options->select('[name="'.$option.'"]', null)) > 0) ? true : false; } From ef0aca85c27df1d64fc38033685767ba89457ecb Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Thu, 25 Oct 2012 13:09:52 +0300 Subject: [PATCH 056/175] Shortcodes API: renamed exist() to exists() method --- monstra/engine/shortcodes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/monstra/engine/shortcodes.php b/monstra/engine/shortcodes.php index dbccc5a..6679a3e 100644 --- a/monstra/engine/shortcodes.php +++ b/monstra/engine/shortcodes.php @@ -95,7 +95,7 @@ $shortcode = (string) $shortcode; // Delete shortcode - if (Shortcode::exist($shortcode)) unset(Shortcode::$shortcode_tags[$shortcode]); + if (Shortcode::exists($shortcode)) unset(Shortcode::$shortcode_tags[$shortcode]); } @@ -116,14 +116,14 @@ * Check if a shortcode has been registered. * * - * if (Shortcode::exist('shortcode_name')) { + * if (Shortcode::exists('shortcode_name')) { * // do something... * } * * * @param string $shortcode Shortcode tag. */ - pulbic static function exist($shortcode) { + pulbic static function exists($shortcode) { // Redefine vars $shortcode = (string) $shortcode; From f18fe8108a7d0db39a86317c34a2ef76fb6770a2 Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Thu, 25 Oct 2012 13:34:47 +0300 Subject: [PATCH 057/175] Core: IDIORM optimization #28 --- monstra/engine/core.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/monstra/engine/core.php b/monstra/engine/core.php index 7cc0e32..1e9a78e 100644 --- a/monstra/engine/core.php +++ b/monstra/engine/core.php @@ -85,9 +85,11 @@ Session::start(); // Init ORM - ORM::configure(MONSTRA_DB_DSN); - ORM::configure('username', MONSTRA_DB_USER); - ORM::configure('password', MONSTRA_DB_PASSWORD); + if (defined('MONSTRA_DB_DSN')) { + ORM::configure(MONSTRA_DB_DSN); + ORM::configure('username', MONSTRA_DB_USER); + ORM::configure('password', MONSTRA_DB_PASSWORD); + } // Auto cleanup if MONSTRA_DEBUG is true if (Core::$environment == Core::DEVELOPMENT) { From beb24728d904d288652f5ae9321b98e9f73b3eca Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Thu, 25 Oct 2012 13:35:28 +0300 Subject: [PATCH 058/175] Core: IDIORM optimization #28 --- monstra/boot/defines.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/monstra/boot/defines.php b/monstra/boot/defines.php index 89dcb23..9879c22 100644 --- a/monstra/boot/defines.php +++ b/monstra/boot/defines.php @@ -143,6 +143,6 @@ /** * Monstra database settings */ - define('MONSTRA_DB_DSN', 'mysql:dbname=monstra;host=localhost;port=3306'); - define('MONSTRA_DB_USER', 'root'); - define('MONSTRA_DB_PASSWORD', 'password'); \ No newline at end of file + //define('MONSTRA_DB_DSN', 'mysql:dbname=monstra;host=localhost;port=3306'); + //define('MONSTRA_DB_USER', 'root'); + //define('MONSTRA_DB_PASSWORD', 'password'); \ No newline at end of file From c9a2cbd7c8e27448eb202ca79c63f83797235054 Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Thu, 25 Oct 2012 14:15:08 +0300 Subject: [PATCH 059/175] Core: new constant VERSION - added. --- monstra/engine/core.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/monstra/engine/core.php b/monstra/engine/core.php index 1e9a78e..ae45c2d 100644 --- a/monstra/engine/core.php +++ b/monstra/engine/core.php @@ -42,6 +42,12 @@ const DEVELOPMENT = 4; + /** + * The version of Monstra + */ + const VERSION = '1.2.1'; + + /** * Monstra environment * From f42330f90f61b9772d417a01b8fd6de906c79c81 Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Thu, 25 Oct 2012 14:29:03 +0300 Subject: [PATCH 060/175] Installer: use version_compare() function to compare php versions. --- install.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/install.php b/install.php index 3c363e8..b6aebf3 100644 --- a/install.php +++ b/install.php @@ -15,14 +15,7 @@ // Load bootstrap file require_once(ROOT . DS . 'monstra' . DS . 'bootstrap.php'); - - // Setting error display depending on debug mode or not - // Get php version id - if ( ! defined('PHP_VERSION_ID')){ - $version = PHP_VERSION; - define('PHP_VERSION_ID', ($version{0} * 10000 + $version{2} * 100 + $version{4})); - } - + // Get array with the names of all modules compiled and loaded $php_modules = get_loaded_extensions(); @@ -182,7 +175,8 @@
  • '.__('PHP 5.2 or greater is required', 'system').'
    • '; } else { echo '
  • '.__('PHP Version', 'system').' '.PHP_VERSION.'
    • '; From b067c87ab265f6d72b9e94f06e0fb103b1f97bb2 Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Thu, 25 Oct 2012 14:30:04 +0300 Subject: [PATCH 061/175] try to fix code format --- monstra/bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monstra/bootstrap.php b/monstra/bootstrap.php index 3e5f560..eab1504 100644 --- a/monstra/bootstrap.php +++ b/monstra/bootstrap.php @@ -28,7 +28,7 @@ /** * Monstra requires PHP 5.2.0 or greater */ - if (version_compare(PHP_VERSION, "5.2.0", "<")) { + if (version_compare(PHP_VERSION, "5.2.0", "<")) { exit("Monstra requires PHP 5.2.0 or greater."); } From 420d50615e4c14a8cfd2b2adba9f29cb8e8d2b6f Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Thu, 25 Oct 2012 14:32:32 +0300 Subject: [PATCH 062/175] try to fix code format --- monstra/bootstrap.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/monstra/bootstrap.php b/monstra/bootstrap.php index eab1504..06f49f3 100644 --- a/monstra/bootstrap.php +++ b/monstra/bootstrap.php @@ -28,9 +28,9 @@ /** * Monstra requires PHP 5.2.0 or greater */ - if (version_compare(PHP_VERSION, "5.2.0", "<")) { - exit("Monstra requires PHP 5.2.0 or greater."); - } + if (version_compare(PHP_VERSION, "5.2.0", "<")) { + exit("Monstra requires PHP 5.2.0 or greater."); + } /** From 0bfd4be7127d853298b084a4e31ea58618032e2a Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Thu, 25 Oct 2012 14:35:38 +0300 Subject: [PATCH 063/175] InformationPlugin: Use Core::VERSION instead of MONSTRA_VERSION constant. --- plugins/box/information/views/backend/index.view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/information/views/backend/index.view.php b/plugins/box/information/views/backend/index.view.php index 2dc3be2..e33a6cd 100644 --- a/plugins/box/information/views/backend/index.view.php +++ b/plugins/box/information/views/backend/index.view.php @@ -22,7 +22,7 @@ - + From 5ccdcdb4be8ac530e0214c38b512fd30454506e5 Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Thu, 25 Oct 2012 14:43:28 +0300 Subject: [PATCH 064/175] SystemPlugin: use Core::VERSION to compare Monstra CMS version. --- plugins/box/system/system.admin.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/box/system/system.admin.php b/plugins/box/system/system.admin.php index 44bf110..b2922a5 100755 --- a/plugins/box/system/system.admin.php +++ b/plugins/box/system/system.admin.php @@ -12,11 +12,11 @@ function checkMonstraVersion() { echo (' - + + From c59a1637dc14d48f662a145cac762b8dccdbfb4b Mon Sep 17 00:00:00 2001 From: Sergey Romaneko Date: Thu, 25 Oct 2012 15:37:48 +0300 Subject: [PATCH 066/175] UsersPlugin: profile editing #32 --- plugins/box/users/users.plugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/users/users.plugin.php b/plugins/box/users/users.plugin.php index 2ec228c..83f45a1 100644 --- a/plugins/box/users/users.plugin.php +++ b/plugins/box/users/users.plugin.php @@ -242,7 +242,7 @@ } Notification::set('success', __('Your changes have been saved.', 'users')); - Request::redirect(Site::url().'users/'.$user['id'].'/edit'); + Request::redirect(Site::url().'users/'.$user['id']); } } else { } From 954ef7af7018225538f3301b5c6ff7fc2f8faecc Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 25 Oct 2012 18:42:52 +0300 Subject: [PATCH 067/175] Shortcodes API: fixes --- monstra/engine/shortcodes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monstra/engine/shortcodes.php b/monstra/engine/shortcodes.php index 6679a3e..df0cddb 100644 --- a/monstra/engine/shortcodes.php +++ b/monstra/engine/shortcodes.php @@ -89,7 +89,7 @@ * * @param string $shortcode Shortcode tag. */ - pubic static function delete($shortcode) { + public static function delete($shortcode) { // Redefine vars $shortcode = (string) $shortcode; @@ -123,7 +123,7 @@ * * @param string $shortcode Shortcode tag. */ - pulbic static function exists($shortcode) { + public static function exists($shortcode) { // Redefine vars $shortcode = (string) $shortcode; From e823b546186ee97175ba54e2153eda07bd52d956 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 25 Oct 2012 18:45:19 +0300 Subject: [PATCH 068/175] Installer: pt-br locale added. --- install.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install.php b/install.php index b6aebf3..5f98e54 100644 --- a/install.php +++ b/install.php @@ -33,7 +33,7 @@ // Select Monstra language if (Request::get('language')) { - if (in_array(Request::get('language'), array('en', 'ru', 'lt', 'it', 'de'))) { + if (in_array(Request::get('language'), array('en', 'ru', 'lt', 'it', 'de', 'pt-br'))) { if (Option::update('language', Request::get('language'))) { Request::redirect($site_url); } @@ -232,6 +232,7 @@ it | lt | de | + pt | ru
    From f68b041cc37cde0dedc3902f9f7d8e95d33c5ea1 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 25 Oct 2012 18:47:24 +0300 Subject: [PATCH 069/175] Core: fix monstra version --- monstra/engine/core.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monstra/engine/core.php b/monstra/engine/core.php index ae45c2d..1a26358 100644 --- a/monstra/engine/core.php +++ b/monstra/engine/core.php @@ -45,7 +45,7 @@ /** * The version of Monstra */ - const VERSION = '1.2.1'; + const VERSION = '2.0.1'; /** From 283ca65789e604979f450625ac109ed926eef12c Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 25 Oct 2012 18:50:06 +0300 Subject: [PATCH 070/175] SystemPlugin: fix index view --- plugins/box/system/views/backend/index.view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/system/views/backend/index.view.php b/plugins/box/system/views/backend/index.view.php index 77eab12..7208b43 100755 --- a/plugins/box/system/views/backend/index.view.php +++ b/plugins/box/system/views/backend/index.view.php @@ -24,7 +24,7 @@ Form::label('site_name', __('Site name', 'system')). Form::input('site_name', Option::get('sitename'), array('class' => 'span7')). Html::br(). Form::label('site_description', __('Site description', 'system')). - Form::textarea('site_description', Option::get('description', array('class' => 'span7')). Html::br(). + Form::textarea('site_description', Option::get('description'), array('class' => 'span7')). Html::br(). Form::label('site_keywords', __('Site keywords', 'system')). Form::input('site_keywords', Option::get('keywords'), array('class' => 'span7')). Html::br(). Form::label('site_slogan', __('Site slogan', 'system')). From a3a02149b87e3ccb4d122b241596405e1ad59266 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 25 Oct 2012 19:15:57 +0300 Subject: [PATCH 071/175] SystemPlugin: fixes --- plugins/box/system/system.admin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/box/system/system.admin.php b/plugins/box/system/system.admin.php index b2922a5..f561e83 100755 --- a/plugins/box/system/system.admin.php +++ b/plugins/box/system/system.admin.php @@ -14,8 +14,9 @@ '); + } + /** * Pages admin function @@ -19,6 +72,8 @@ $errors = array(); $pages = new Table('pages'); + PagesAdmin::$pages = $pages; + $users = new Table('users'); $user = $users->select('[id='.Session::get('user_id').']', null); @@ -428,7 +483,12 @@ // Delete page and update fields if ($pages->deleteWhere('[slug="'.$page['slug'].'" ]')) { - $pages->updateWhere('[parent="'.$page['slug'].'"]', array('parent' => '')); + + $_pages = $pages->select('[parent="'.$page['slug'].'"]', 'all'); + foreach($_pages as $_page) { + $pages->updateWhere('[slug="'.$_page['slug'].'"]', array('parent' => '')); + } + File::delete(STORAGE . DS . 'pages' . DS . $page['id'] . '.page.txt'); Notification::set('success', __('Page :page deleted', 'pages', array(':page' => Html::toText($page['title'])))); } @@ -458,7 +518,7 @@ $count = 0; // Get pages - $pages_list = $pages->select(null, 'all', null, array('slug', 'title', 'status', 'date', 'author', 'parent')); + $pages_list = $pages->select(null, 'all', null, array('slug', 'title', 'status', 'date', 'author', 'expand', 'parent')); // Loop foreach ($pages_list as $page) { @@ -468,6 +528,7 @@ $pages_array[$count]['status'] = $status_array[$page['status']]; $pages_array[$count]['date'] = $page['date']; $pages_array[$count]['author'] = $page['author']; + $pages_array[$count]['expand'] = $page['expand']; $pages_array[$count]['slug'] = $page['slug']; if (isset($page['parent'])) { diff --git a/plugins/box/pages/views/backend/index.view.php b/plugins/box/pages/views/backend/index.view.php index ce7687c..e99609f 100755 --- a/plugins/box/pages/views/backend/index.view.php +++ b/plugins/box/pages/views/backend/index.view.php @@ -18,6 +18,7 @@ + @@ -32,12 +33,28 @@ if ($page['parent'] != '') { $dash = Html::arrow('right').'  '; } else { $dash = ""; } ?> - + select('[slug="'.(string)$page['parent'].'"]', null); + if ($page['parent'] !== '' && isset($expand['expand']) && $expand['expand'] == '1') { $visibility = 'style="display:none;"'; } else { $visibility = ''; } + ?> + rel="children_" > + + Date: Thu, 1 Nov 2012 18:56:05 +0200 Subject: [PATCH 086/175] Admin Default Theme: #27 add .btn-expand class --- admin/themes/default/css/default.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/admin/themes/default/css/default.css b/admin/themes/default/css/default.css index 667806a..15c715f 100644 --- a/admin/themes/default/css/default.css +++ b/admin/themes/default/css/default.css @@ -450,4 +450,11 @@ td, th { .error-none {display:none;} .error-field {border:1px solid red!important;} .container-fluid {padding-left:0px;} -img {max-width:none;} \ No newline at end of file +img {max-width:none;} + +a.btn-expand{ + color: #333; + text-decoration: none; + padding-left:4px; + padding-right:4px; +} \ No newline at end of file From edb260c9ac93639c2a4196b3cfec8c330c8a5574 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 1 Nov 2012 19:19:42 +0200 Subject: [PATCH 087/175] Pages Table: expand field added --- storage/database/pages.table.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/database/pages.table.xml b/storage/database/pages.table.xml index a39ab0e..5f39323 100644 --- a/storage/database/pages.table.xml +++ b/storage/database/pages.table.xml @@ -1,2 +1,2 @@ -2
    + select('[parent="'.(string)$page['slug'].'"]', 'all')) > 0) { + if (isset($page['expand']) && $page['expand'] == '1') { + echo '+'; + } else { + echo '-'; + } + } + ?> + '_blank')); + echo $dash.Html::anchor(Html::toText($page['title']), $site_url.$parent.$page['slug'], array('target' => '_blank', 'rel' => 'children_'.$_parent)); ?> @@ -68,6 +85,7 @@