diff --git a/LICENSE b/LICENSE index e3d9a581..94a9ed02 100644 --- a/LICENSE +++ b/LICENSE @@ -1,315 +1,674 @@ -OPEN AGILEBILL LICENSE V1.4 - -1.0 DEFINITIONS - -1.1 "Commercial Use" means distribution or otherwise making the -Original Code available to a third party. - -1.2 "Contributor Version" means the combination of the Original -Code, and the Modifications made by that particular Contributor. - -1.3 "Electronic Distribution Mechanism" means a mechanism generally -accepted in the software development community for the electronic transfer -of data. - -1.4 "Executable" means Original Code in any form other than Source -Code. - -1.5 "Initial Developer" means the individual or entity identified -as the Initial Developer in the Source Code notice required by Exhibit -A. - -1.6 "Larger Work" means a work which combines Original Code or -portions thereof with code not governed by the terms of this License. - -1.7 "License" means this document. - -1.8 "Licensable" means having the right to grant, to the maximum -extent possible, whether at the time of the initial grant or subsequently -acquired, any and all of the rights conveyed herein. - -1.9 "Modifications" means any addition to or deletion from the -substance or structure of either the Original Code or any previous -Modifications. - -A Modification is: - - A. Any addition to or deletion from the contents of a file containing - Original Code or previous Modifications. - - B. Any new file that contains any part of the Original - Code or previous Modifications. - -1.10 "Original Code" means Source Code of computer software code -which is described in the Source Code notice required by Exhibit A as Original -Code. - -1.11 "Patent Claims" means any patent claim(s), now owned or -hereafter acquired, including without limitation, method, process, and -apparatus claims, in any patent Licensable by grantor. - -1.12 "Source Code" means the preferred form of the Original Code -for making modifications to it, including all modules it contains, plus -any associated interface definition files, or scripts used to control -compilation and installation of an Executable. - -1.13 "Standards" means the standards identified in Exhibit B. - -1.14 "You" (or "Your") means an individual or a legal entity -exercising rights under, and complying with all of the terms of, this License -or a future version of this License issued under Section 6.1. For legal -entities, "You" includes any entity which controls, is controlled by, -or is under common control with You. For purposes of this definition, "control" -means (a) the power, direct or indirect, to cause the direction or management -of such entity, whether by contract or otherwise, or (b) ownership of more -than fifty percent (50%) of the outstanding shares or beneficial ownership -of such entity. - -2.0 SOURCE CODE LICENSE - -2.1 The Initial Developer Grant - -The Initial Developer hereby grants You a world-wide, royalty-free, -non-exclusive license, subject to third party intellectual property -claims: - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, modify, display, - perform, sublicense and distribute the Original Code (or portions thereof) - with or without Modifications, and/or as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or selling - of Original Code, to make, have made, use, practice, sell, and offer for - sale, and/or otherwise dispose of the Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are effective - on the date Initial Developer first distributes Original Code under the - terms of this License. - - (d) Notwithstanding Section - 2.1(b) above, no patent license is granted: 1) for code that You delete from - the Original Code; 2) separate from the Original Code; or 3) for infringements - caused by: i) the modification of the Original Code or ii) the combination of - the Original Code with other software or devices, including but not limited to - Modifications. - -3.0 DISTRIBUTION OBLIGATIONS - -3.1 Application of License. - -The Source Code version of Original Code may be distributed only under -the terms of this License or a future version of this License released -under Section 6.1, and You must include a copy of this License with every -copy of the Source Code You distribute. You may not offer or impose any -terms on any Source Code version that alters or restricts the applicable -version of this License or the recipients' rights hereunder. Your license -for shipment of the Contributor Version is conditioned upon Your full compliance -with this Section. The Modifications which You create must comply with -all requirements set out by the Standards body in effect one hundred twenty -(120) days before You ship the Contributor Version. In the event that the -Modifications do not meet such requirements, You agree to publish either -(i) any deviation from the Standards protocol resulting from implementation -of Your Modifications and a reference implementation of Your Modifications -or (ii) Your Modifications in Source Code form, and to make any such deviation -and reference implementation or Modifications available to all third parties -under the same terms as this license on a royalty free basis within thirty -(30) days of Your first customer shipment of Your Modifications. - -3.2 Required Notices. - -You must duplicate the notice in Exhibit A in each file of the -Source Code. If it is not possible to put such notice in a particular Source -Code file due to its structure, then You must include such notice in a -location (such as a relevant directory) where a user would be likely to -look for such a notice. If You created one or more Modification(s) You -may add Your name as a Contributor to the notice described in Exhibit -A. You must also duplicate this License in any documentation for the -Source Code where You describe recipients' rights or ownership rights relating -to Initial Code. You may choose to offer, and to charge a fee for, warranty, -support, indemnity or liability obligations to one or more recipients of -Your version of the Code. However, You may do so only on Your own behalf, -and not on behalf of the Initial Developer. You must make it absolutely -clear than any such warranty, support, indemnity or liability obligation -is offered by You alone, and You hereby agree to indemnify the Initial -Developer for any liability incurred by the Initial Developer as a result -of warranty, support, indemnity or liability terms You offer. - -The copyright notices and links must remain visible and functional in each -HTML of every installed copy of the Code, in this format: - -Billing Software Powered by AgileBill. -Copyright 2004-2008 Agileco, LLC - -These notices and links cannot be removed, disabled, or caused to be hidden or obscured -from view from by modifying any part of the Source Code. The font size for the -notices may not be modified to a font size smaller than 10pt. The font color, -background colors, or any other attributes of the font text, background, or links may not be -modified in any way that renders them illegible, invisble, or unreadable to the -human eye, or causes the links to point to any URL other than shown in the format -above. No attributes may be added to the A HREF tags. - - -3.3 Distribution of Original Code. - -You may distribute Original Code only in Source form (not Executable), -and You must include a notice stating that the Source Code version of the -Original Code is available under the terms of this License. The notice -must be conspicuously included in any notice in an distributed versions, -related documentation or collateral in which You describe -recipients' rights relating to the Original Code. You may distribute the -Source versions of Your version of the Code or ownership -rights under a license of Your choice, which may contain terms different -from this License, provided that You are in compliance with the terms of -this License. If You distribute the Source versions under -a different license You must make it absolutely clear that any terms which -differ from this License are offered by You alone, not by the Initial Developer. - -You hereby agree to indemnify the Initial Developer for any liability incurred -by the Initial Developer as a result of any such terms You offer. - -3.4 Larger Works. - -You may create a Larger Work by combining Original Code with other -code not governed by the terms of this License and distribute the Larger -Work as a single product. In such a case, You must make sure the requirements -of this License are fulfilled for the Original Code. - -4.0 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Original Code due to statute, -judicial order, or regulation then You must: (a) comply with the terms -of this License to the maximum extent possible; and (b) describe the limitations -and the code they affect. Such description must be included in the LEGAL -file described in Section 3.2 and must be included with all distributions -of the Source Code. Except to the extent prohibited by statute or regulation, -such description must be sufficiently detailed for a recipient of ordinary -skill to be able to understand it. - -5.0 APPLICATION OF THIS LICENSE - -This License applies to code to which the Initial Developer has attached -the notice in Exhibit A and to related Modifications as set out in Section -3.1. - -6.0 VERSIONS OF THE LICENSE - -6.1 New Versions. - -Agileco may publish revised and/or new versions of the License from time -to time. Each version will be given a distinguishing version number. - -6.2 Effect of New Versions. - -Once Original Code has been published under a particular version of -the License, You may always continue to use it under the terms of that -version. You may also choose to use such Original Code under the terms -of any subsequent version of the License published by Agile. No one other -than Agileco has the right to modify the terms applicable to Original Code. - -7.0 DISCLAIMER OF WARRANTY - -ORIGINAL CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT -WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT -LIMITATION, -WARRANTIES THAT THE ORIGINAL CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT -FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY -AND PERFORMANCE OF THE ORIGINAL CODE IS WITH YOU. SHOULD ANY ORIGINAL CODE -PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER) ASSUME -THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER -OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY -ORIGINAL CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8.0 TERMINATION - -8.1 This License and the rights granted hereunder will terminate -automatically if You fail to comply with terms herein and fail to cure -such breach within 30 days of becoming aware of the breach. All sublicenses -to the Original Code which are properly granted shall survive any termination -of this License. Provisions which, by their nature, must remain in effect -beyond the termination of this License shall survive. - -8.2 In the event of termination under Section 8.1 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or any distributor hereunder prior to -termination shall survive termination. - -9.0 LIMIT OF LIABILITY - -UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING -NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, -ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF ORIGINAL CODE, OR ANY SUPPLIER -OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, -INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT -LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE -OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN -IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. -THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR -PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE -LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION -OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION -AND LIMITATION MAY NOT APPLY TO YOU. - -10.0 U.S. GOVERNMENT END USERS - -U.S. Government: If this Software is being acquired by or on behalf -of the U.S. Government or by a U.S. Government prime contractor or subcontractor -(at any tier), then the Government's rights in the Software and accompanying -documentation shall be only as set forth in this license; this is in accordance -with 48 C.F.R. 227.7201 through 227.7202-4 (for Department of Defense (DoD) -acquisitions) and with 48 C.F.R. 2.101 and 12.212 (for non-DoD acquisitions). - -11.0 MISCELLANEOUS - -This License represents the complete agreement concerning subject matter -hereof. If any provision of this License is held to be unenforceable, such -provision shall be reformed only to the extent necessary to make it enforceable. - -This License shall be governed by South Carolina law provisions (except to -the extent applicable law, if any, provides otherwise), excluding its -conflict-of-law -provisions. With respect to disputes in which at least one party is a citizen -of, or an entity chartered or registered to do business in the United States -of America, any litigation relating to this License shall be subject to -the jurisdiction of the Federal Courts of South Carolina, -with venue lying in Greenville, South Carolina, with the losing party -responsible for costs, including without limitation, court costs and reasonable -attorneys' fees and expenses. The application of the United Nations Convention -on Contracts for the International Sale of Goods is expressly excluded. -Any law or regulation which provides that the language of a contract shall -be construed against the drafter shall not apply to this License. - -EXHIBIT A - Open AgileBill License - -"The contents of this file are subject to the Open AgileBill License v1.4 (the "License"); -You may not use this file except in compliance with the License. You may obtain -a copy of the License at http://www.agileco.com/agilebill/license1-4.txt - -Software distributed under the License is distributed on -an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either -express or implied. See the License for the specific -language governing rights and limitations under the License. - -The Original Code is ______________________________________. - -The Initial Developer of the Original Code is: -Agileco, LLC - -Portions created by: _______________________________________ - -are Copyright (C): _______________________________________ - -All Rights Reserved. - -Contributor(s): _______________________________________ - - - -EXHIBIT B - Standards - -The Standard is defined as the following: - -OpenOffice.org XML File Format Specification, located at http://xml.openoffice.org - -OpenOffice.org Application Programming Interface Specification, located -at http://api.openoffice.org \ No newline at end of file + 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/application/bootstrap.php b/application/bootstrap.php index e49c28d1..0a9ff83b 100644 --- a/application/bootstrap.php +++ b/application/bootstrap.php @@ -82,6 +82,8 @@ if (isset($_SERVER['KOHANA_ENV'])) Kohana::init(array( 'base_url' => '/osb', 'index_file' => '', + 'caching' => TRUE, + 'cache_dir' => '/dev/shm/lnapp', )); /** @@ -124,16 +126,6 @@ Route::set('sections', '/(/(/(/)))', 'directory' => '('.implode('|',Kohana::config('config.method_directory')).')' )); -/** - * Set the routes. Each route must have a minimum of a name, a URI and a set of - * defaults for the URI. - */ -Route::set('default', '((/(/)))') - ->defaults(array( - 'controller' => 'welcome', - 'action' => 'index', - )); - // Static file serving (CSS, JS, images) Route::set('default/media', 'media(/)', array('file' => '.+')) ->defaults(array( @@ -141,3 +133,14 @@ Route::set('default/media', 'media(/)', array('file' => '.+')) 'action' => 'media', 'file' => NULL, )); + +/** + * Set the routes. Each route must have a minimum of a name, a URI and a set of + * defaults for the URI. + */ +Route::set('default', '((/(/)))', array('id' => '[a-zA-Z0-9_.-]+')) + ->defaults(array( + 'controller' => 'welcome', + 'action' => 'index', + )); +?> diff --git a/application/classes/auth/orm.php b/application/classes/auth/orm.php index 38b15baa..02e3ac30 100644 --- a/application/classes/auth/orm.php +++ b/application/classes/auth/orm.php @@ -3,9 +3,9 @@ /** * This class overrides Kohana's Auth * - * @package OSB/Modifications - * @category Classes - * @category Helpers + * @package lnApp/Modifications + * @subpackage Auth + * @category Overrides * @author Deon George * @copyright (c) 2010 Deon George * @license http://dev.leenooks.net/license.html @@ -13,10 +13,11 @@ class Auth_ORM extends Kohana_Auth_ORM { // Override Kohana Auth requirement to have a hash_key public function hash($str) { - if ($this->_config['hash_method'] == 'md5') - return md5($str); - else - return hash_hmac($this->_config['hash_method'], $str, $this->_config['hash_key']); + switch ($this->_config['hash_method']) { + case '' : return $str; + case 'md5': return md5($str); + default: return hash_hmac($this->_config['hash_method'], $str, $this->_config['hash_key']); + } } } ?> diff --git a/application/classes/controller/lnapp/default.php b/application/classes/controller/lnapp/default.php index 59563de9..b0040785 100644 --- a/application/classes/controller/lnapp/default.php +++ b/application/classes/controller/lnapp/default.php @@ -79,5 +79,12 @@ abstract class Controller_lnApp_Default extends Controller { } } } + + public function after() { + parent::after(); + + // Generate and check the ETag for this file + $this->response->check_cache(NULL,$this->request); + } } ?> diff --git a/application/classes/controller/lnapp/login.php b/application/classes/controller/lnapp/login.php index 0ccdc064..4c8405d5 100644 --- a/application/classes/controller/lnapp/login.php +++ b/application/classes/controller/lnapp/login.php @@ -12,6 +12,8 @@ * @also [logout] */ class Controller_lnApp_Login extends Controller_TemplateDefault { + protected $auth_required = FALSE; + public function action_index() { // If user already signed-in if (Auth::instance()->logged_in()!= 0) { @@ -21,6 +23,10 @@ class Controller_lnApp_Login extends Controller_TemplateDefault { // If there is a post and $_POST is not empty if ($_POST) { + // Store our details in a session key + Session::instance()->set(Kohana::config('auth.session_key'),$_POST['username']); + Session::instance()->set('password',$_POST['password']); + // If the post data validates using the rules setup in the user model if (Auth::instance()->login($_POST['username'],$_POST['password'])) { // Redirect to the user account @@ -46,8 +52,6 @@ class Controller_lnApp_Login extends Controller_TemplateDefault { 'style'=>array('css/login.css'=>'screen'), )); - $this->template->control = HTML::anchor($this->request->uri(),'Login',array('id'=>'ajxbody')); - Script::add(array('type'=>'stdin','data'=>' $(document).ready(function() { $("#ajxbody").click(function() {$("#ajBODY").load("'.$this->request->uri().'/"); return false;}); @@ -71,7 +75,7 @@ class Controller_lnApp_Login extends Controller_TemplateDefault { $status = $account->values($_POST)->check(); if (! $status) { - foreach ($account->validate()->errors() as $f=>$r) { + foreach ($account->validation()->errors('form/register') as $f => $r) { // $r[0] has our reason for validation failure switch ($r[0]) { // Generic validation reason @@ -79,7 +83,7 @@ class Controller_lnApp_Login extends Controller_TemplateDefault { SystemMessage::add(array( 'title'=>_('Validation failed'), 'type'=>'error', - 'body'=>sprintf(_('The defaults on your submission were not valid for field %s (%s).'),$f,$r[0]) + 'body'=>sprintf(_('The defaults on your submission were not valid for field %s (%s).'),$f,$r) )); } } @@ -108,7 +112,6 @@ class Controller_lnApp_Login extends Controller_TemplateDefault { ->set('errors',$account->validation()->errors('form/register')), )); - $this->template->control = HTML::anchor($this->request->uri(),'Register',array('id'=>'ajxbody')); $this->template->left = HTML::anchor('login','Login').'...'; } diff --git a/application/classes/controller/lnapp/templatedefault.php b/application/classes/controller/lnapp/templatedefault.php index 09370c1a..83620d1b 100644 --- a/application/classes/controller/lnapp/templatedefault.php +++ b/application/classes/controller/lnapp/templatedefault.php @@ -144,6 +144,9 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template { } public function after() { + if (! is_string($this->template) AND empty($this->template->content)) + $this->template->content = Block::factory(); + if ($this->auto_render) { // Application Title $this->meta->title = 'Application Title'; @@ -189,10 +192,10 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template { $this->response->bodyadd(sprintf('
%s
',$this->template->content)); } - if (isset($this->template->content) AND ! $this->template->content) - $this->template->content = Block::factory(); - parent::after(); + + // Generate and check the ETag for this file + $this->response->check_cache(NULL,$this->request); } /** @@ -240,9 +243,6 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template { * @return void */ final public function action_media() { - // Generate and check the ETag for this file - $this->response->check_cache(NULL,$this->request); - // Get the file path from the request $file = $this->request->param('file'); @@ -251,9 +251,14 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template { // Remove the extension from the filename $file = substr($file, 0, -(strlen($ext) + 1)); + $f = ''; + + // If our file is pathed with session, our file is in our session. + if ($fd = Session::instance()->get_once($this->request->param('file'))) { + $this->response->body($fd); // First try and find media files for the site_id - if ($f = Kohana::find_file(sprintf('media/%s',Config::siteid()), $file, $ext)) { + } elseif ($f = Kohana::find_file(sprintf('media/%s',Config::siteid()), $file, $ext)) { // Send the file content as the response $this->response->body(file_get_contents($f)); @@ -267,10 +272,13 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template { $this->response->status(404); } + // Generate and check the ETag for this file + $this->response->check_cache(NULL,$this->request); + // Set the proper headers to allow caching $this->response->headers('Content-Type',File::mime_by_ext($ext)); - $this->response->headers('Content-Length',(string)filesize($f)); - $this->response->headers('Last-Modified',date('r', filemtime($f))); + $this->response->headers('Content-Length',(string)$this->response->content_length()); + $this->response->headers('Last-Modified',date('r', $f ? filemtime($f) : time())); } } ?> diff --git a/application/classes/controller/lnapp/tree.php b/application/classes/controller/lnapp/tree.php index 9d1ca72d..bc04e004 100644 --- a/application/classes/controller/lnapp/tree.php +++ b/application/classes/controller/lnapp/tree.php @@ -83,20 +83,18 @@ $(function () { * * @param id */ - public function action_json($id=null) { - #if (! Auth::instance()->logged_in()) { - if ($this->_auth_required()) { - $this->treedata = array('attr'=>array('id'=>'a_login'), + public function action_json($id=null,array $data=array()) { + if ($this->_auth_required() AND ! Auth::instance()->logged_in()) { + $this->output = array('attr'=>array('id'=>'a_login'), 'data'=>array('title'=>_('Please Login').'...','attr'=>array('id'=>'N_login','href'=>URL::site('/login')))); return; } - $this->treedata = array(); - $data = array(); + $this->output = array(); foreach ($data as $branch) { - array_push($this->treedata,array( + array_push($this->output,array( 'attr'=>array('id'=>sprintf('B_%s',$branch['id'])), 'state'=>$branch['state'], 'data'=>array('title'=>$branch['name']), diff --git a/application/classes/controller/tree.php b/application/classes/controller/tree.php index 3bc97306..709f77bf 100644 --- a/application/classes/controller/tree.php +++ b/application/classes/controller/tree.php @@ -21,14 +21,7 @@ class Controller_Tree extends Controller_lnApp_Tree { * * @param id */ - public function action_json($id=null) { - if ($this->_auth_required()) { - $this->output = array('attr'=>array('id'=>'a_login'), - 'data'=>array('title'=>_('Please Login').'...','attr'=>array('id'=>'N_login','href'=>URL::site('/login')))); - - return; - } - + public function action_json($id=null,array $data=array()) { // Get the user details $id = (is_null($id) && isset($_REQUEST['id'])) ? substr($_REQUEST['id'],2) : $id; $user = Auth::instance()->get_user(); @@ -85,6 +78,8 @@ class Controller_Tree extends Controller_lnApp_Tree { ) ); } + + return parent::action_json($id,$data); } } ?> diff --git a/application/classes/controller/welcome.php b/application/classes/controller/welcome.php index d32a8136..4000793f 100644 --- a/application/classes/controller/welcome.php +++ b/application/classes/controller/welcome.php @@ -1,9 +1,9 @@ 'Welcome to lnApp (public)!', diff --git a/application/classes/form.php b/application/classes/form.php index 7091ae2e..cabca21f 100644 --- a/application/classes/form.php +++ b/application/classes/form.php @@ -3,7 +3,7 @@ /** * This class overrides Kohana's Form * - * @package OSB/Modifications + * @package lnApp/Modifications * @category Classes * @category Helpers * @author Deon George diff --git a/application/classes/html.php b/application/classes/html.php new file mode 100644 index 00000000..8cad46f7 --- /dev/null +++ b/application/classes/html.php @@ -0,0 +1,4 @@ + diff --git a/application/classes/http/exception/404.php b/application/classes/http/exception/404.php index 45c70027..a72b75d6 100644 --- a/application/classes/http/exception/404.php +++ b/application/classes/http/exception/404.php @@ -3,7 +3,7 @@ /** * This class overrides Kohana's 404 Exception * - * @package OSB/Modifications + * @package lnApp/Modifications * @category Classes * @category Helpers * @author Deon George @@ -25,6 +25,6 @@ class HTTP_Exception_404 extends Kohana_HTTP_Exception_404 { 'body'=>sprintf(_('The page [%s] you requested was not found?'),Request::detect_uri()), )); - Request::factory()->redirect('/welcome'); + Request::factory()->redirect('welcome'); } } diff --git a/application/classes/lnapp/html.php b/application/classes/lnapp/html.php new file mode 100644 index 00000000..7c433172 --- /dev/null +++ b/application/classes/lnapp/html.php @@ -0,0 +1,21 @@ + diff --git a/application/classes/lnapp/sort.php b/application/classes/lnapp/sort.php new file mode 100644 index 00000000..7fe62591 --- /dev/null +++ b/application/classes/lnapp/sort.php @@ -0,0 +1,105 @@ +$key)) {\n"; + $code .= " asort(\$a->$key);\n"; + $code .= " \$aa = array_shift(\$a->$key);\n"; + $code .= " } else\n"; + $code .= " \$aa = \$a->$key;\n"; + + $code .= " if (is_array(\$b->$key)) {\n"; + $code .= " asort(\$b->$key);\n"; + $code .= " \$bb = array_shift(\$b->$key);\n"; + $code .= " } else\n"; + $code .= " \$bb = \$b->$key;\n"; + + $code .= " if (\$aa != \$bb)"; + if ($rev) + $code .= " return (\$aa < \$bb ? 1 : -1);\n"; + else + $code .= " return (\$aa > \$bb ? 1 : -1);\n"; + + $code .= "} else {\n"; + + $code .= " \$a = array_change_key_case(\$a);\n"; + $code .= " \$b = array_change_key_case(\$b);\n"; + + $key = strtolower($key); + + $code .= " if ((! isset(\$a['$key'])) && isset(\$b['$key'])) return 1;\n"; + $code .= " if (isset(\$a['$key']) && (! isset(\$b['$key']))) return -1;\n"; + + $code .= " if ((isset(\$a['$key'])) && (isset(\$b['$key']))) {\n"; + $code .= " if (is_array(\$a['$key'])) {\n"; + $code .= " asort(\$a['$key']);\n"; + $code .= " \$aa = array_shift(\$a['$key']);\n"; + $code .= " } else\n"; + $code .= " \$aa = \$a['$key'];\n"; + + $code .= " if (is_array(\$b['$key'])) {\n"; + $code .= " asort(\$b['$key']);\n"; + $code .= " \$bb = array_shift(\$b['$key']);\n"; + $code .= " } else\n"; + $code .= " \$bb = \$b['$key'];\n"; + + $code .= " if (\$aa != \$bb)\n"; + $code .= " if (is_numeric(\$aa) && is_numeric(\$bb)) {\n"; + + if ($rev) + $code .= " return (\$aa < \$bb ? 1 : -1);\n"; + else + $code .= " return (\$aa > \$bb ? 1 : -1);\n"; + + $code .= " } else {\n"; + + if ($rev) + $code .= " if ( (\$c = strcasecmp(\$bb,\$aa)) != 0 ) return \$c;\n"; + else + $code .= " if ( (\$c = strcasecmp(\$aa,\$bb)) != 0 ) return \$c;\n"; + + $code .= " }\n"; + $code .= " }\n"; + $code .= "}\n"; + } + + $code .= 'return $c;'; + + $MASORT_CACHE[$sortby] = create_function('$a, $b',$code); + } + + uasort($data,$MASORT_CACHE[$sortby]); + } +} +?> diff --git a/application/classes/orm.php b/application/classes/orm.php index bd44924c..27d8554b 100644 --- a/application/classes/orm.php +++ b/application/classes/orm.php @@ -12,6 +12,7 @@ */ class ORM extends Kohana_ORM { protected $_table_names_plural = false; + protected $_model_names_plural = false; private $_object_formated = array(); private $_formated = FALSE; // Our filters used to display values in a friendly format @@ -70,7 +71,7 @@ class ORM extends Kohana_ORM { if (isset($this->_object_formated[$column])) return $this->_object_formated[$column]; else - return $value; + return HTML::nbsp($value); } } ?> diff --git a/application/classes/response.php b/application/classes/response.php index be5debcd..62f0e8c5 100644 --- a/application/classes/response.php +++ b/application/classes/response.php @@ -3,7 +3,7 @@ /** * This class overrides Kohana's Response * - * @package OSB/Modifications + * @package lnApp/Modifications * @category Classes * @category Helpers * @author Deon George diff --git a/application/classes/sort.php b/application/classes/sort.php new file mode 100644 index 00000000..cccb437e --- /dev/null +++ b/application/classes/sort.php @@ -0,0 +1,4 @@ + diff --git a/application/classes/valid.php b/application/classes/valid.php index a4046c30..fa0d3ecb 100644 --- a/application/classes/valid.php +++ b/application/classes/valid.php @@ -3,7 +3,7 @@ /** * Array and variable validation. * - * @package OSB/Modifications + * @package lnApp/Modifications * @category Classes * @author Deon George * @copyright (c) 2010 Deon George diff --git a/application/config/auth.php b/application/config/auth.php index 749377ab..c061cf37 100644 --- a/application/config/auth.php +++ b/application/config/auth.php @@ -16,5 +16,6 @@ return array( 'hash_key' => '', 'lifetime' => 1209600, 'session_key' => 'auth_user', + 'forced_key' => 'auth_forced', ); ?> diff --git a/application/config/cache.php b/application/config/cache.php index 9a083da9..c7946c3e 100644 --- a/application/config/cache.php +++ b/application/config/cache.php @@ -1,10 +1,23 @@ array ( 'driver' => 'file', - 'cache_dir' => '/dev/shm/osb', + 'cache_dir' => Kohana::$cache_dir ? Kohana::$cache_dir : '/dev/shm/lnapp', 'default_expire' => 3600, ) ); +?> diff --git a/application/media/css/default.css b/application/media/css/default.css index 1f76b7c9..2a4dc0b0 100644 --- a/application/media/css/default.css +++ b/application/media/css/default.css @@ -4,9 +4,13 @@ table.box-left { border: 1px solid #AAAACC; margin-right: auto; } table.box-center { border: 1px solid #AAAACC; margin-left: auto; margin-right: auto; } table.box-full { border: 1px solid #AAAACC; margin-right: auto; width: 100%; } tr.head { font-weight: bold; } +tr.subhead { background-color: #BBBBDD; } td.head { font-weight: bold; } td.bold { font-weight: bold; } td.bold-right { font-weight: bold; text-align: right; } +td.data { font-weight: bold; } +span.data { font-weight: bold; } +td.data-right { font-weight: bold; text-align: right; } td.right { text-align: right; } tr.odd { background-color: #FCFCFE; } tr.even { background-color: #F6F6F8; } diff --git a/includes/kohana/modules/database/classes/kohana/database/query.php b/includes/kohana/modules/database/classes/kohana/database/query.php index 96db0939..f08f3c1b 100644 --- a/includes/kohana/modules/database/classes/kohana/database/query.php +++ b/includes/kohana/modules/database/classes/kohana/database/query.php @@ -214,7 +214,7 @@ class Kohana_Database_Query { // Set the cache key based on the database instance name and SQL $cache_key = 'Database::query("'.$db.'", "'.$sql.'")'; - if ($result = Kohana::cache($cache_key, NULL, $this->_lifetime)) + if (! is_null($result = Kohana::cache($cache_key, NULL, $this->_lifetime))) { // Return a cached result return new Database_Result_Cached($result, $sql, $this->_as_object, $this->_object_params); diff --git a/includes/kohana/modules/database/classes/kohana/database/query/builder.php b/includes/kohana/modules/database/classes/kohana/database/query/builder.php index 89fbbd89..8d36e790 100644 --- a/includes/kohana/modules/database/classes/kohana/database/query/builder.php +++ b/includes/kohana/modules/database/classes/kohana/database/query/builder.php @@ -110,6 +110,10 @@ abstract class Kohana_Database_Query_Builder extends Database_Query { // Quote the min and max value $value = $min.' AND '.$max; } + elseif ($op === 'IN' AND is_array($value)) + { + $value = $db->quote($value); + } elseif ((is_string($value) AND array_key_exists($value, $this->_parameters)) === FALSE) { // Quote the value, it is not a parameter diff --git a/includes/kohana/modules/orm/classes/kohana/orm.php b/includes/kohana/modules/orm/classes/kohana/orm.php index c51bdebc..b5ef1e29 100644 --- a/includes/kohana/modules/orm/classes/kohana/orm.php +++ b/includes/kohana/modules/orm/classes/kohana/orm.php @@ -235,6 +235,15 @@ class Kohana_ORM extends Model implements serializable { */ protected $_table_names_plural = TRUE; + // Suppress ORMs inclusion of .* + protected $_disable_wild_select = FALSE; + + // Suppress ORMs inclusion of . to column joins + protected $_disable_join_table_name = FALSE; + + // Suppress ORMs use of limit + protected $_disable_limit = FALSE; + /** * Model configuration, reload on wakeup? * @var bool @@ -314,7 +323,7 @@ class Kohana_ORM extends Model implements serializable { else { // Passing the primary key - $this->where($this->_table_name.'.'.$this->_primary_key, '=', $id)->find(); + $this->where(($this->_disable_join_table_name ? '' : $this->_table_name.'.').$this->_primary_key, '=', $id)->find(); } } elseif ( ! empty($this->_cast_data)) @@ -368,13 +377,14 @@ class Kohana_ORM extends Model implements serializable { { $defaults['model'] = $alias; $defaults['foreign_key'] = $this->_object_name.$this->_foreign_key_suffix; + $defaults['far_key'] = Inflector::singular($alias).$this->_foreign_key_suffix; $this->_has_one[$alias] = array_merge($defaults, $details); } foreach ($this->_has_many as $alias => $details) { - $defaults['model'] = Inflector::singular($alias); + $defaults['model'] = $this->_model_names_plural ? Inflector::singular($alias) : $alias; $defaults['foreign_key'] = $this->_object_name.$this->_foreign_key_suffix; $defaults['through'] = NULL; $defaults['far_key'] = Inflector::singular($alias).$this->_foreign_key_suffix; @@ -630,7 +640,7 @@ class Kohana_ORM extends Model implements serializable { $model = $this->_related($column); // Use this model's column and foreign model's primary key - $col = $model->_table_name.'.'.$model->_primary_key; + $col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$model->_primary_key; $val = $this->_object[$this->_belongs_to[$column]['foreign_key']]; $model->where($col, '=', $val)->find(); @@ -641,9 +651,23 @@ class Kohana_ORM extends Model implements serializable { { $model = $this->_related($column); - // Use this model's primary key value and foreign model's column - $col = $model->_table_name.'.'.$this->_has_one[$column]['foreign_key']; - $val = $this->pk(); + if (! is_array($this->_has_one[$column]['foreign_key'])) + { + // Use this model's primary key value and foreign model's column + $col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$this->_has_one[$column]['foreign_key']; + $val = $this->_object[$this->_has_one[$column]['far_key']]; + } + else + { + foreach ($this->_has_one[$column]['foreign_key'] as $fk) + { + // Simple has_many relationship, search where target model's foreign key is this model's primary key + $col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$fk; + $val = $this->_object[$fk]; + + $model = $model->where($col, '=', $val); + } + } $model->where($col, '=', $val)->find(); @@ -653,29 +677,52 @@ class Kohana_ORM extends Model implements serializable { { $model = ORM::factory($this->_has_many[$column]['model']); - if (isset($this->_has_many[$column]['through'])) + if (! is_array($this->_has_many[$column]['foreign_key'])) { - // Grab has_many "through" relationship table - $through = $this->_has_many[$column]['through']; + if (isset($this->_has_many[$column]['through'])) + { + // Grab has_many "through" relationship table + $through = $this->_has_many[$column]['through']; - // Join on through model's target foreign key (far_key) and target model's primary key - $join_col1 = $through.'.'.$this->_has_many[$column]['far_key']; - $join_col2 = $model->_table_name.'.'.$model->_primary_key; + // Join on through model's target foreign key (far_key) and target model's primary key + $join_col1 = ($this->_disable_join_table_name ? '' : $through.'.').$this->_has_many[$column]['far_key']; + $join_col2 = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$model->_primary_key; - $model->join($through)->on($join_col1, '=', $join_col2); + $model->join($through)->on($join_col1, '=', $join_col2); - // Through table's source foreign key (foreign_key) should be this model's primary key - $col = $through.'.'.$this->_has_many[$column]['foreign_key']; - $val = $this->pk(); + // Through table's source foreign key (foreign_key) should be this model's primary key + $col = ($this->_disable_join_table_name ? '' : $through.'.').$this->_has_many[$column]['foreign_key']; + $val = $this->pk(); + } + else + { + // Simple has_many relationship, search where target model's foreign key is this model's primary key + $col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$this->_has_many[$column]['foreign_key']; + $val = $this->_object[$this->_has_many[$column]['far_key']]; + } + + return $model->where($col, '=', $val); } else { - // Simple has_many relationship, search where target model's foreign key is this model's primary key - $col = $model->_table_name.'.'.$this->_has_many[$column]['foreign_key']; - $val = $this->pk(); - } + foreach ($this->_has_many[$column]['foreign_key'] as $mk => $fk) + { + if (isset($this->_has_many[$column]['through'])) + { + throw new Kohana_Exception('This code hasnt been written yet!'); + } + else + { + // Simple has_many relationship, search where target model's foreign key is this model's primary key + $col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$fk; + $val = $this->_object[$mk]; + } - return $model->where($col, '=', $val); + $model = $model->where($col, '=', $val); + } + + return $model; + } } else { @@ -999,14 +1046,15 @@ class Kohana_ORM extends Model implements serializable { { $this->_db_builder->from($this->_table_name); - if ($multiple === FALSE) + if ($multiple === FALSE AND ! $this->_disable_limit) { // Only fetch 1 record $this->_db_builder->limit(1); } // Select all columns by default - $this->_db_builder->select($this->_table_name.'.*'); + if (! $this->_disable_wild_select) + $this->_db_builder->select($this->_table_name.'.*'); if ( ! isset($this->_db_applied['order_by']) AND ! empty($this->_sorting)) { @@ -1015,7 +1063,7 @@ class Kohana_ORM extends Model implements serializable { if (strpos($column, '.') === FALSE) { // Sorting column for use in JOINs - $column = $this->_table_name.'.'.$column; + $column = ($this->_disable_join_table_name ? '' : $this->_table_name.'.').$column; } $this->_db_builder->order_by($column, $direction); diff --git a/modules/account/classes/auth/osb.php b/modules/account/classes/auth/osb.php index d5868c8a..61fbe12d 100644 --- a/modules/account/classes/auth/osb.php +++ b/modules/account/classes/auth/osb.php @@ -246,21 +246,6 @@ class Auth_OSB extends Auth_ORM { return FALSE; } - /** - * Override the supplied find_salt() to enable disabling salt keys - */ - public function find_salt($password) { - $salt = ''; - - foreach ($this->_config['salt_pattern'] as $i => $offset) { - // Find salt characters, take a good long look... - if (is_numeric($offset)) - $salt .= substr($password, $offset + $i, 1); - } - - return $salt; - } - /** * Determine if a user is authorised to view an account * @@ -280,12 +265,5 @@ class Auth_OSB extends Auth_ORM { return TRUE; } - - /** - * Disable KO3 hash_password function - */ - public function hash_password($password,$salt = FALSE) { - return md5($password); - } } ?> diff --git a/modules/account/classes/model/account.php b/modules/account/classes/model/account.php index 106b93e3..1cebeea4 100644 --- a/modules/account/classes/model/account.php +++ b/modules/account/classes/model/account.php @@ -13,7 +13,7 @@ class Model_Account extends Model_Auth_UserDefault { protected $_has_many = array( 'user_tokens' => array('model' => 'user_token'), 'group' => array('through' => 'account_group'), - 'invoice' => array(), + 'invoice' => array('far_key'=>'id'), 'payment'=>array(), 'service' => array(), ); diff --git a/modules/invoice/classes/model/invoice.php b/modules/invoice/classes/model/invoice.php index 780413ed..80156450 100644 --- a/modules/invoice/classes/model/invoice.php +++ b/modules/invoice/classes/model/invoice.php @@ -17,7 +17,7 @@ class Model_Invoice extends ORMOSB { 'account'=>array() ); protected $_has_many = array( - 'invoice_item'=>array(), + 'invoice_item'=>array('far_key'=>'id'), 'invoice_item_tax'=>array(), 'service'=>array('through'=>'invoice_item'), 'payment'=>array('through'=>'payment_item'), diff --git a/modules/invoice/classes/model/invoice/item.php b/modules/invoice/classes/model/invoice/item.php index 7c757dbe..1be5c864 100644 --- a/modules/invoice/classes/model/invoice/item.php +++ b/modules/invoice/classes/model/invoice/item.php @@ -17,7 +17,7 @@ class Model_Invoice_Item extends ORMOSB { 'service'=>array() ); protected $_has_many = array( - 'invoice_item_tax'=>array() + 'invoice_item_tax'=>array('far_key'=>'id') ); protected $_updated_column = FALSE; // @todo No update columns @@ -52,7 +52,7 @@ class Model_Invoice_Item extends ORMOSB { return ($this->price_base+$this->price_setup)*$this->quantity+$this->tax_amt-$this->discount_amt; } - public function save() { + public function save(Validation $validation = NULL) { // Save the invoice item parent::save(); diff --git a/modules/product/classes/model/product.php b/modules/product/classes/model/product.php index af3463ad..0d9765ce 100644 --- a/modules/product/classes/model/product.php +++ b/modules/product/classes/model/product.php @@ -13,7 +13,7 @@ class Model_Product extends ORMOSB { // @todo this doesnt have our site_id when getting the translation protected $_has_many = array( - 'product_translate'=>array(), + 'product_translate'=>array('far_key'=>'id'), ); protected $_sorting = array( diff --git a/modules/service/classes/controller/admin/service.php b/modules/service/classes/controller/admin/service.php index 3c2bb007..7dae0257 100644 --- a/modules/service/classes/controller/admin/service.php +++ b/modules/service/classes/controller/admin/service.php @@ -276,18 +276,16 @@ GROUP BY DATE_FORMAT(DATE,"%%Y-%%m"),SID // Process upload // @todo This should be separated out by supplier in case each supplier has a different format - $files = Validate::factory($_FILES); - $files->rules('csv',array( - 'Upload::valid'=>array(), - 'Upload::not_empty'=>array(), - 'Upload::type'=>array('Upload::type' => array('csv')), - 'Upload::size'=>array('10M')) - ); + if ($_FILES) { + $files = Validation::factory($_FILES) + ->rule('csv','Upload::valid') + ->rule('csv','Upload::not_empty') + ->rule('csv','Upload::type',array(':value',array('csv'))) + ->rule('csv','Upload::size',array(':value','10M')); - if ($files->check()) { - foreach ($files as $file) { - $csv = $this->process($file); - } + if ($files->check()) + foreach ($files as $file) + $csv = $this->process($file); } // @todo add a display if there are no items diff --git a/modules/service/classes/model/service.php b/modules/service/classes/model/service.php index 2314a13e..0b66271e 100644 --- a/modules/service/classes/model/service.php +++ b/modules/service/classes/model/service.php @@ -17,7 +17,7 @@ class Model_Service extends ORMOSB { 'adsl_plan'=>array('through'=>'service__adsl'), ); protected $_has_one = array( - 'service_adsl'=>array(), + 'service_adsl'=>array('far_key'=>'id'), ); protected $_belongs_to = array( 'product'=>array(),