From 9f90720208e92c2186f5f41d0b502e76854a6f0b Mon Sep 17 00:00:00 2001 From: Michael A Mayer Date: Tue, 21 Feb 2012 22:38:39 -0500 Subject: [PATCH] Dropped 3.1 branch and LICENSE file --- 3.0/modules/emboss/LICENSE | 674 ------------------ .../social_share/views/google.html.php | 9 +- .../social_share/views/twitter.html.php | 20 +- 3.1/modules/emboss/LICENSE | 674 ------------------ .../emboss/controllers/admin_emboss.php | 71 -- 3.1/modules/emboss/helpers/emboss.php | 459 ------------ 3.1/modules/emboss/helpers/emboss_event.php | 121 ---- .../emboss/helpers/emboss_installer.php | 67 -- 3.1/modules/emboss/helpers/emboss_task.php | 150 ---- 3.1/modules/emboss/models/emboss_mapping.php | 3 - 3.1/modules/emboss/models/emboss_overlay.php | 83 --- 3.1/modules/emboss/module.info | 7 - .../emboss/views/admin_emboss.html.php | 125 ---- 13 files changed, 25 insertions(+), 2438 deletions(-) delete mode 100644 3.0/modules/emboss/LICENSE delete mode 100644 3.1/modules/emboss/LICENSE delete mode 100644 3.1/modules/emboss/controllers/admin_emboss.php delete mode 100644 3.1/modules/emboss/helpers/emboss.php delete mode 100644 3.1/modules/emboss/helpers/emboss_event.php delete mode 100644 3.1/modules/emboss/helpers/emboss_installer.php delete mode 100644 3.1/modules/emboss/helpers/emboss_task.php delete mode 100644 3.1/modules/emboss/models/emboss_mapping.php delete mode 100644 3.1/modules/emboss/models/emboss_overlay.php delete mode 100644 3.1/modules/emboss/module.info delete mode 100644 3.1/modules/emboss/views/admin_emboss.html.php diff --git a/3.0/modules/emboss/LICENSE b/3.0/modules/emboss/LICENSE deleted file mode 100644 index 94a9ed02..00000000 --- a/3.0/modules/emboss/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/3.0/modules/social_share/views/google.html.php b/3.0/modules/social_share/views/google.html.php index 1f45994e..f928a358 100644 --- a/3.0/modules/social_share/views/google.html.php +++ b/3.0/modules/social_share/views/google.html.php @@ -1,12 +1,17 @@
-
" annotation="">
+
" + annotation=""> +
+ +
\ No newline at end of file diff --git a/3.1/modules/emboss/LICENSE b/3.1/modules/emboss/LICENSE deleted file mode 100644 index 94a9ed02..00000000 --- a/3.1/modules/emboss/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/3.1/modules/emboss/controllers/admin_emboss.php b/3.1/modules/emboss/controllers/admin_emboss.php deleted file mode 100644 index 0254f86e..00000000 --- a/3.1/modules/emboss/controllers/admin_emboss.php +++ /dev/null @@ -1,71 +0,0 @@ -. * - *************************************************************************/ -class Admin_Emboss_Controller extends Admin_Controller { - public function index() { - $view = new Admin_View('admin.html'); - $view->page_title = t('Emboss'); - $view->content = new View('admin_emboss.html'); - - $images = ORM::factory('emboss_overlay')->find_all(); - - $view->content->images = $images; - $view->content->emboss_thumbs = module::get_var('emboss','thumbs',0); - $view->content->emboss_resize = module::get_var('emboss','resize',1); - $view->content->emboss_full = module::get_var('emboss','full',1); - - print $view; - } - - static function update() { - access::verify_csrf(); - emboss::update_overlay_options($_POST); - emboss::evaluate_overlays(); - emboss::check_for_dirty(); - url::redirect('admin/emboss'); - } - - static function new_overlay() { - access::verify_csrf(); - $file = $_FILES['overlay']; - emboss::upload_new_overlay($file); - emboss::check_for_dirty(); - url::redirect('admin/emboss'); - } - - static function delete_overlay() { - access::verify_csrf(); - emboss::_delete_overlay($_REQUEST['name']); - emboss::check_for_dirty(); - url::redirect('admin/emboss'); - } - - static function clear_log() { - db::build() - ->delete() - ->from('logs') - ->where('category','=','emboss') - ->execute(); - url::redirect('admin/emboss'); - } - - static function uninstall() { - access::verify_csrf(); - emboss::uninstall(); - url::redirect('admin/modules'); - } -} \ No newline at end of file diff --git a/3.1/modules/emboss/helpers/emboss.php b/3.1/modules/emboss/helpers/emboss.php deleted file mode 100644 index 84c50aa2..00000000 --- a/3.1/modules/emboss/helpers/emboss.php +++ /dev/null @@ -1,459 +0,0 @@ -. * - *************************************************************************/ -class emboss_Core { - - static function reconcile() - { - emboss::copy_new(VARPATH . 'albums', VARPATH . 'originals'); - emboss::remove_old(VARPATH . 'albums', VARPATH . 'originals'); - } - - private function error($msg) - { - log::error('emboss',$msg); - message::error($msg); - } - - private function success($msg) - { - log::success('emboss',$msg); - message::success($msg); - } - - private function info($msg) - { - log::info('emboss',$msg); - message::info($msg); - } - - private function copy_new($src,$dst) - { - if( ! is_dir($src) ) - return; - - if(! file_exists($dst) ) - { - log::info('emboss',"Creating directory $dst"); - if(! @mkdir($dst) ) - { - emboss::error("Failed to create $dst"); - return; - } - } - if(! is_dir($dst) ) - { - emboss::error("Existing $dst is not a directory"); - return; - } - - if( ! ($dh = opendir($src)) ) - { - emboss::error("Failed to open $src for reading"); - return; - } - - while( $file = readdir($dh) ) - { - if($file=='.'||$file=='..') - continue; - - $srcpath = $src . '/' . $file; - $dstpath = $dst . '/' . $file; - - if( is_dir($srcpath) ) - { - emboss::copy_new($srcpath, $dstpath); - } - else - { - if(! file_exists($dstpath) ) - { - log::info('emboss',"Copying $file to $dst"); - if(! @copy($srcpath,$dstpath) ) - { - emboss::error("Failed to copy $file to $dst"); - } - } - } - } - - closedir($dh); - } - - private function remove_old($src,$archive) - { - if( ! is_dir($archive) ) - return; - - if(! (file_exists($src) && is_dir($src)) ) - { - log::info('emboss',"Removing directory $src"); - emboss::rmdir_recursive($archive); - return; - } - - if( ! ($dh = opendir($archive)) ) - { - emboss::error("Failed to open $archive for reading"); - return; - } - - while( $file = readdir($dh) ) - { - if($file=='.' || $file=='..') - continue; - - $srcpath = $src . '/' . $file; - $archivepath = $archive . '/' . $file; - - if( is_dir($archivepath) ) - { - emboss::remove_old($srcpath,$archivepath); - } - else - { - if( ! file_exists($srcpath) ) - { - log::info('emboss',"Removing $file from $archive"); - if(! @unlink($archivepath) ) - emboss::error("Failed to remove $file from $archive"); - } - } - } - - closedir($dh); - } - - private function rmdir_recursive($dir) { - if(!$dh = @opendir($dir)) - return; - - while ( $obj = readdir($dh)) - { - if($obj=='.' || $obj=='..') continue; - if (!@unlink($dir.'/'.$obj)) - emboss::rmdir_recursive($dir.'/'.$obj); - } - - closedir($dh); - @rmdir($dir); - } - - static function mkdir_recursive($dir) { - $dirs = explode('/', $dir); - $newdir = ''; - for($i=1; $iselect('id') - ->from('emboss_overlays') - ->where('name','=',$name) - ->execute() - ->count(); - - if($n>0) { - emboss::error(t("Overlay named $name already exists.")); - @unlink($tmp); - return; - } - - $width = $image_info[0]; - $height = $image_info[1]; - $where1 = array('width','=',$width); - $where2 = array('height','=',$height); - $where = array($where1,$where2); - - $n = db::build() - ->select('id') - ->from('emboss_overlays') - ->where('width','=',$width) - ->where('height','=',$height) - ->execute() - ->count(); - - if($n>0) { - emboss::error(t("Overlay with dimensions $width x $height already exists.")); - @unlink($tmp); - return; - } - - @rename($tmp, VARPATH . 'modules/emboss/' . $name); - - $overlay = ORM::factory('emboss_overlay'); - $overlay->name = $name; - $overlay->width = $width; - $overlay->height = $height; - $overlay->active = 1; - $overlay->save(); - - emboss::success('Succesfully uploaded overlay ' . $file['name']); - emboss::evaluate_overlays(); - } - - static function _delete_overlay($overlay) - { - $query = db::build() - ->select('id') - ->from('emboss_overlays') - ->where('name','=',$overlay) - ->execute(); - $n = $query->count(); - - $qual = '(database table: g3_emboss_overlay)'; - if($n<1) { - message::error("Internal error... $overlay missing $qual"); - return; - } - if($n>1) { - message::error("Internal error... $overlay has multiple entries $qual"); - return; - } - - $overlay_id = $query[0]->id; - - $q = db::build() - ->from('emboss_overlays') - ->where('id','=',$overlay_id) - ->delete() - ->execute(); - - @unlink(VARPATH . 'modules/emboss/' . $overlay); - - $query = db::build() - ->update('emboss_mappings') - ->where('cur_overlay_id','=',$overlay_id) - ->set('cur_overlay_id',-1) - ->execute(); - - $query = db::build() - ->update('emboss_mappings') - ->where('best_overlay_id','=',$overlay_id) - ->set('best_overlay_id',-1) - ->execute(); - - emboss::success("Succesfully deleted $overlay"); - emboss::evaluate_overlays(); - } - - public function usage_count($overlay_id) - { - $n = db::build() - ->select() - ->from('emboss_mappings') - ->where('best_overlay_id','=',$overlay_id) - ->execute() - ->count(); - return ($n>0 ? $n : ''); - } - - static function update_overlay_options($post) - { - $options = array('method','size','gravity','transparency'); - foreach ($options as $option) { - module::set_var('emboss',$option,$post["$option"]); - } - - db::build()->update('emboss_overlays')->set('active',0)->execute(); - $activeOverlays = $post['active_overlays']; - if(is_array($activeOverlays)) { - foreach ($activeOverlays as $overlay) { - $q = ORM::factory('emboss_overlay')->where('name','=',$overlay)->find(); - $q->active=1; - $q->save(); - } - } - } - - static function evaluate_overlays() - { - $overlays = ORM::factory('emboss_overlay')->where('active','=',1)->find_all(); - $images = ORM::factory('item')->where('type','=','photo')->find_all(); - - $n_new = 0; - $n_update = 0; - $n_none = 0; - - $has_changes=0; - foreach ($images as $image) { - $overlay_id = emboss::determine_best_overlay($image,$overlays); - if($overlay_id < 0) { - $n_none++; - } - - $q = ORM::factory('emboss_mapping')->where('image_id','=',$image->id)->find(); - if( ! $q->loaded() ) { - if($overlay_id>0) { - $n_new++; - } - $q->image_id = $image->id; - $q->best_overlay_id = $overlay_id; - $q->cur_overlay_id = -1; - $q->cur_gravity = 'unset'; - $q->cur_transparency = -1; - $q->save(); - } else if($q->best_overlay_id != $overlay_id) { - if($overlay_id>0) { - $n_update++; - } - $q->best_overlay_id = $overlay_id; - $q->save(); - } - } - - if($n_none) { - emboss::info('Cannot find an overlay for '.$n_none . t2(' image',' images')); - } - if($n_new) { - emboss::info($n_new . t2(' image needs',' images need',$n_new) . - ' now have an overlay available'); - } - if($n_update) { - emboss::info(t2('This changes the overlay for 1 image', - "This changes the overlay for $n_update images", - $n_update)); - } - - if($n_none || $n_new || $n_update) { - - } else{ - message::info('All photos are being embossed with the correct overlay'); - } - } - - static function determine_best_overlay($image,$overlays=NULL) - { - if(!$overlays) { - $overlays = ORM::factory('emboss_overlay')->where('active','=',1)->find_all(); - } - - $method = module::get_var('emboss','method'); - $size = 0.01 * module::get_var('emboss','size'); - - $W = $size * $image->width; - $H = $size * $image->height; - - $bestID = -1; - $bestScore=0; - foreach ($overlays as $overlay) { - $score = $overlay->score($W,$H,$method); - if ( $score>0 && $score>$bestScore ) { - $bestScore = $score; - $bestID = $overlay->id; - } - } - return $bestID; - } - - static function check_for_dirty() - { - $q = emboss::find_dirty(); - $n = $q->count(); - if($n>0) { - $url = url::site('admin/maintenance/start/emboss_task::update_overlays?csrf=__CSRF__'); - site_status::warning( - t2("One of your photos needs to be (re)embossed. Click here to fix it", - "%count of your photos need to be (re)embossed. Click here to fix them", - $n, - array('attrs' => html::mark_clean(sprintf('href="%s" class="g-dialog-link"',$url)))), - 'emboss_dirty'); - } else { - site_status::clear('emboss_dirty'); - } - } - - public function find_dirty() - { - $gravity = module::get_var('emboss','gravity'); - $transparency = module::get_var('emboss','transparency'); - - $q = db::build() - ->select() - ->from('emboss_mappings') - ->or_where('cur_overlay_id','!=',db::expr('best_overlay_id')) - ->or_where('cur_gravity','!=',$gravity) - ->or_where('cur_transparency','!=',$transparency) - ->execute(); - - return $q; - } - - public function uninstall() - { - $items = ORM::factory('item')->find_all(); - foreach($items as $item) { - $path = $item->file_path() . $name; - $orig = str_replace(VARPATH.'albums/',VARPATH.'originals/',$path); - if(file_exists($orig)) { - @unlink($path); - @rename($orig,$path); - } - } - graphics::mark_dirty(1,1); - - Database::instance()->query('DROP TABLE {emboss_overlays}'); - Database::instance()->query('DROP TABLE {emboss_mappings}'); - Database::instancs()->query("delete from {modules} where name='emboss'"); - - log::info('emboss','module uninstalled (database dropped/overlays removed)'); - } - - -} diff --git a/3.1/modules/emboss/helpers/emboss_event.php b/3.1/modules/emboss/helpers/emboss_event.php deleted file mode 100644 index c09c8f5d..00000000 --- a/3.1/modules/emboss/helpers/emboss_event.php +++ /dev/null @@ -1,121 +0,0 @@ -. * - *************************************************************************/ -class emboss_event_Core { - static function admin_menu($menu,$theme) { - module::set_var('emboss','admin_menu',1); - $menu->get('content_menu') - ->append( - Menu::factory('link') - ->id('emboss') - ->label(t('Emboss')) - ->url(url::site('admin/emboss'))); - } - - static function item_moved($item,$olddir) - { - if( ! ($item->is_photo() || $item->is_album()) ) { - return; - } - - $name = $item->name; - $old_path = $olddir->file_path() . '/' . $name; - $new_path = $item->file_path(); - - if( $new_path == $old_path) { - return; - } - - $old_orig = str_replace(VARPATH . 'albums/', VARPATH . 'originals/', $old_path); - $new_orig = str_replace(VARPATH . 'albums/', VARPATH . 'originals/', $new_path); - $new_dir = str_replace('/'.$name , '',$new_orig); - - if( file_exists($old_orig)) - { - emboss::mkdir_recursive($new_dir); - @rename($old_orig,$new_orig); - log::info('emboss','Moved '.$item->name.' to '.str_replace(VARPATH,'',$new_dir)); - } - } - - static function item_updated($original,$item) - { - if( ! ($item->is_photo() || $item->is_album()) ) { - return; - } - $oldpath = $original->file_path(); - $newpath = $item->file_path(); - if( $oldpath != $newpath ) { - $oldorig = str_replace(VARPATH.'albums/',VARPATH.'originals/',$oldpath); - $neworig = str_replace(VARPATH.'albums/',VARPATH.'originals/',$newpath); - log::info('emboss',"rename $oldorig to $neworig"); - @rename($oldorig,$neworig); - } - } - - static function item_deleted($item) - { - if( ! $item->is_photo() ) { - return; - } - - $name = $item->name; - $id = $item->id; - $path = $item->file_path(); - $orig = str_replace(VARPATH.'albums/',VARPATH.'originals/',$path); - - @unlink($orig); - - db::build() - ->from('emboss_mappings') - ->where('image_id','=',$id) - ->delete() - ->execute(); - - log::info('emboss',"item_deleted: $name"); - } - - static function item_created($item) - { - if( ! $item->is_photo() ) { - return; - } - - $path = $item->file_path(); - $dirs = explode('/',$path); - array_pop($dirs); - $dir = implode('/',$dirs); - - $orig = str_replace(VARPATH.'albums/',VARPATH.'originals/',$path); - $origdir = str_replace(VARPATH.'albums/',VARPATH.'originals/',$dir); - - emboss::mkdir_recursive($origdir); - @copy($path,$orig); - - $q = ORM::factory('emboss_mapping'); - $q->image_id = $item->id; - $q->best_overlay_id = emboss::determine_best_overlay($item); - $q->cur_overlay_id = -1; - $q->cur_gravity = ''; - $q->cur_transparency = -1; - $q->save(); - - emboss::check_for_dirty(); - } - -} - diff --git a/3.1/modules/emboss/helpers/emboss_installer.php b/3.1/modules/emboss/helpers/emboss_installer.php deleted file mode 100644 index 663d671f..00000000 --- a/3.1/modules/emboss/helpers/emboss_installer.php +++ /dev/null @@ -1,67 +0,0 @@ -. * - *************************************************************************/ -class emboss_installer { - static function install() { - $db = Database::instance(); - $db->query("CREATE TABLE IF NOT EXISTS {emboss_overlays} ( - `id` int(9) NOT NULL auto_increment, - `active` tinyint(4) NOT NULL DEFAULT 1, - `name` varchar(64) NOT NULL, - `width` int(9) NOT NULL, - `height` int(9) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY(`name`))"); - - $db->query("CREATE TABLE IF NOT EXISTS {emboss_mappings} ( - `id` int(9) NOT NULL auto_increment, - `image_id` int(9) NOT NULL, - `best_overlay_id` int(9) NOT NULL, - `cur_overlay_id` int(9), - `cur_gravity` varchar(16), - `cur_transparency` tinyint(4), - PRIMARY KEY (`id`), - UNIQUE KEY(`image_id`))"); - - @mkdir(VARPATH . 'originals'); - @mkdir(VARPATH . 'modules'); - @mkdir(VARPATH . 'modules/emboss'); - module::set_version('emboss',1); - log::success('emboss','Emboss Installed'); - } - - static function upgrade($version) - { - module::set_version('emboss',$verion=1); - log::info('emboss',"Upgrade to version $version / No action taken"); - } - - static function activate() - { - log::info('emboss','Emboss Activated'); - emboss::reconcile(); - } - - static function deactivate() - { - log::info('emboss','Emboss Deactivated'); - } - - static function uninstall() { - emboss::uninstall(); - } -} diff --git a/3.1/modules/emboss/helpers/emboss_task.php b/3.1/modules/emboss/helpers/emboss_task.php deleted file mode 100644 index b0673b26..00000000 --- a/3.1/modules/emboss/helpers/emboss_task.php +++ /dev/null @@ -1,150 +0,0 @@ -. * - *************************************************************************/ -class emboss_task_Core { - - static function available_tasks() { - $q = emboss::find_dirty(); - $n = $q->count(); - - $description = ( ($n==0) - ? (t('All photo overlays are up to date') ) - : t2('one Photo needs its emboss overlay updated', - "$n Photos need their emboss overlay updated", $n) ); - - $tasks[] = Task_Definition::factory() - ->callback('emboss_task::update_overlays') - ->name(t('Update photo embossing')) - ->description($description) - ->severity($n>0 ? log::WARNING : log::SUCCESS); - return $tasks; - } - - static function update_overlays($task) - { - $errors = array(); - try { - $mode = $task->get('mode','init'); - switch($mode) { - case 'init': - $q = emboss::find_dirty(); - foreach ($q as $item) { - $ids[] = array('id'=>$item->id, - 'image_id'=>$item->image_id, - 'overlay_id'=>$item->best_overlay_id); - } - $count = count($ids); - - if($count>0) { - $task->set('ids',$ids); - $task->set('count',$count); - $task->set('current',0); - $task->set('mode','continue'); - } else { - $task->done = true; - $task->state = 'success'; - $task->percent_complete = 100; - site_status::clear('emboss_dirty'); - return; - } - break; - - case 'continue': - $ids = $task->get('ids'); - $count = $task->get('count'); - $current = $task->get('current'); - break; - } - - $i = 1*$current; - $id = $ids[$i]; - $current++; - $task->set('current',$current); - - emboss_task::do_embossing($id['id'],$id['image_id'],$id['overlay_id']); - - if($current>=$count) { - $task->done = true; - $task->state = 'success'; - $task->percent_complete = 100; - $task->status = 'Complete'; - site_status::clear('emboss_dirty'); - } else { - $task->percent_complete = $current/$count * 100; - $task->status = t("Reembossed $current of $count photos"); - } - - - } catch (Exception $e) { - Kohana_Log::add('error',(string)$e); - $task->done = true; - $task->state = 'error'; - $task->status = $e->getMessage(); - $errors[] = (string)$e; - } - if ($errors) { - $task->log($errors); - } - } - - static function do_embossing($id,$image_id,$overlay_id) - { - $gravity = module::get_var('emboss','gravity'); - $transparency = module::get_var('emboss','transparency'); - - $item = ORM::factory('item')->where('id','=',$image_id)->find(); - $path = $item->file_path() . $name; - $orig = str_replace(VARPATH.'albums/',VARPATH.'originals/',$path); - - @unlink($path); - - if($overlay_id<0) { - log::info('emboss','Remove embossing from '.$item->name); - @copy($orig,$path); - - } else { - $overlay = ORM::factory('emboss_overlay')->where('id','=',$overlay_id)->find(); - $overlay_path = VARPATH.'modules/emboss/'.$overlay->name; - - $opts['file'] = $overlay_path; - $opts['position'] = $gravity; - $opts['transparency'] = 100-$transparency; - - log::info('emboss','Embossing '.$item->name.' with '.$overlay->name); - - gallery_graphics::composite($orig,$path,$opts); - } - - $item->thumb_dirty = 1; - $item->resize_dirty = 1; - $item->save(); - - graphics::generate($item); - - db::build()->update('emboss_mappings') - ->where('id','=',$id) - ->set('cur_overlay_id',$overlay_id) - ->set('cur_gravity',$gravity) - ->set('cur_transparency',$transparency) - ->execute(); - } - - - -} - - diff --git a/3.1/modules/emboss/models/emboss_mapping.php b/3.1/modules/emboss/models/emboss_mapping.php deleted file mode 100644 index 1037c269..00000000 --- a/3.1/modules/emboss/models/emboss_mapping.php +++ /dev/null @@ -1,3 +0,0 @@ -. * - *************************************************************************/ -class Emboss_Overlay_Model_Core extends ORM { - protected $sorting = array('width' => 'desc', 'height' => 'desc'); - - public function score($W,$H,$function) - { - /************************************************************* - * (W,H) = Image (Width,Height) - * (w,h) = Overlay (width,height) - *************************************************************/ - - $w = $this->width; - $h = $this->height; - if( ($w>$W) || ($h>$H) ) { return 0; } - - /************************************************************* - * Minimize Margin Method - ************************************************************* - * Score = (W^2 + H^2) - ((W-w)^2 + (H-h)^2) - * = (W^2 - (W-w)^2) + (H^2 - (H-h)^2) - * = (2Ww - w^2) + (2Hh - h^2) - * = (2W-w)w + (2H-h)h - *************************************************************/ - - if($function == 'margin') { - $score = ( (2*$W - $w)*$w + (2*$H - $h)*$h ); - } - - /************************************************************* - * Aspect Ratio Weighted - ************************************************************* - * if h < w*(H/W) - * peak value = area on diagonal (w*h) - * null value = 0 on w axis (h=0) - * quadratic fit between: - * Score = W/H h^2 - * if w < h*(W/H) - * Score = H/W w^2 (by symmetry) - *************************************************************/ - - else if($function == 'diag') { - if($h*$W < $w*$H) { - $score = $h*$h*($W/$H); - } else { - $score = $w*$w*($H/$W); - } - } - - /************************************************************* - * Area Method (Default if no match to $function) - ************************************************************* - * Score = w * h - *************************************************************/ - - else { - $score = $w * $h; - } - - return $score; - } - - public function area() - { - return $this->width * $this->height; - } - -} \ No newline at end of file diff --git a/3.1/modules/emboss/module.info b/3.1/modules/emboss/module.info deleted file mode 100644 index 14bb7231..00000000 --- a/3.1/modules/emboss/module.info +++ /dev/null @@ -1,7 +0,0 @@ -name = "Emboss" -description = "A different watermarking module" -version = 1 -author_name = "mikemayer67" -author_url = "http://www.vmwishes.com" -info_url = "http://codex.gallery2.org/Gallery3:Modules:emboss" -discuss_url = "http://gallery.menalto.com/node/105339" diff --git a/3.1/modules/emboss/views/admin_emboss.html.php b/3.1/modules/emboss/views/admin_emboss.html.php deleted file mode 100644 index 86745948..00000000 --- a/3.1/modules/emboss/views/admin_emboss.html.php +++ /dev/null @@ -1,125 +0,0 @@ - -/************************************************************************* - * Copyright (C) 2012 Michel A. Mayer * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *************************************************************************/ - - -
-
-

Upload New Overlay

- - -'overlay','style'=>'margin: .5em 0 .5em 0'))?> -'Upload','style'=>'display:block; float:none'),'Upload')?> - -
-
-
-'options'))?> - -

Available Overlays

- - - - - - - - - name; - $data['checked'] = $image->active; - ?> - - - - - - - - -
ActiveImageSizeUsage
name?>width?> x height?>id)?>name.'&csrf='.access::csrf_token(), 'delete')?>
-Check All / -Uncheck All -
-'Update','style'=>'display:block; float:none'),'Update')?> -
-

Embossing Parameters

- - - - - - - - -0; $i-=5) { $sizes["$i"]="$i%"; } ?> - - - - - - - -
Best Fit Method:'Maximum Overlay Area', - 'margin'=>'Minimize Borders', - 'diag' =>'Aspect Ratio Weighted'), - module::get_var('emboss','method','area')) ?>
Location: 'Northwest', - 'north' => 'North', - 'northeast' => 'Northeast', - 'east' => 'East', - 'southeast' => 'Southeast', - 'south' => 'South', - 'southwest' => 'Southwest', - 'south' => 'South', - 'center' => 'Center'), - module::get_var('emboss','gravity','Center')) ?>
Desired Size:
Transparency:
-
-'Update','style'=>'display:block; float:none'),'Update')?> -
-
-
- - - -