diff --git a/uc_views/.DS_Store b/uc_views/.DS_Store new file mode 100644 index 0000000..ee357bd Binary files /dev/null and b/uc_views/.DS_Store differ diff --git a/uc_views/LICENSE.txt b/uc_views/LICENSE.txt index d159169..2c095c8 100644 --- a/uc_views/LICENSE.txt +++ b/uc_views/LICENSE.txt @@ -1,339 +1,274 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +GNU GENERAL PUBLIC LICENSE - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. + Version 2, June 1991 - Preamble +Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, +Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute +verbatim copies of this license document, but changing it is not allowed. - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. + Preamble - 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 -this service 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. +The licenses for most software are designed to take away your freedom to +share and change it. By contrast, the GNU General Public License is +intended to guarantee your freedom to share and change free software--to +make sure the software is free for all its users. This General Public License +applies to most of the Free Software Foundation's software and to any other +program whose authors commit to using it. (Some other Free Software +Foundation software is covered by the GNU Library General Public License +instead.) You can apply it to your programs, too. - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. +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 this service 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. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. 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. +To protect your rights, we need to make restrictions that forbid anyone to +deny you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must give the recipients all the rights that you have. 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. - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients +to know that what they have is not the original, so that any problems +introduced by others will not reflect on the original authors' reputations. - The precise terms and conditions for copying, distribution and -modification follow. +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +The precise terms and conditions for copying, distribution and modification +follow. - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND + MODIFICATION -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms +of this General Public License. The "Program", below, refers to any such +program or work, and a "work based on the Program" means either the +Program or any derivative work under copyright law: that is to say, a work +containing the Program or a portion of it, either verbatim or with +modifications and/or translated into another language. (Hereinafter, translation +is included without limitation in the term "modification".) Each licensee is +addressed as "you". - 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. +Activities other than copying, distribution and modification are not covered +by this License; they are outside its scope. The act of running the Program is +not restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made +by running the Program). Whether that is true depends on what the Program +does. -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. +1. You may copy and distribute 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 and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the +Program a copy of this License along with the Program. - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: +You may charge a fee for the physical act of transferring a copy, and you +may at your option offer warranty protection in exchange for a fee. - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. +2. You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such +modifications or work under the terms of Section 1 above, provided that you +also meet all of these conditions: - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. +a) You must cause the modified files to carry prominent notices stating that +you changed the files and the date of any change. - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) +b) You must cause any work that you distribute or publish, that in whole or in +part contains or is derived from the Program or any part thereof, to be +licensed as a whole at no charge to all third parties under the terms of this +License. -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. +c) If the modified program normally reads commands interactively when run, +you must cause it, when started running for such interactive use in the most +ordinary way, to print or display an announcement including an appropriate +copyright notice and a notice that there is no warranty (or else, saying that +you provide a warranty) and that users may redistribute the program under +these conditions, and telling the user how to view a copy of this License. +(Exception: if the Program itself is interactive but does not normally print such +an announcement, your work based on the Program is not required to print +an announcement.) -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be +reasonably considered independent and separate works in themselves, then +this License, and its terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same sections as part +of a whole which is a work based on the Program, the distribution of the +whole must be on the terms of this License, whose permissions for other +licensees extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to +work written entirely by you; rather, the intent is to exercise the right to +control the distribution of derivative or collective works based on the +Program. In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. +with the Program (or with a work based on the Program) on a volume of a +storage or distribution medium does not bring the other work under the scope +of this License. - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: +3. You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 +and 2 above provided that you also do one of the following: - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, +a) Accompany it with the complete corresponding machine-readable source +code, which must be distributed under the terms of Sections 1 and 2 above +on a medium customarily used for software interchange; or, - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, +b) Accompany it with a written offer, valid for at least three years, to give +any third party, for a charge no more than your cost of physically performing +source distribution, a complete machine-readable copy of the corresponding +source code, to be distributed under the terms of Sections 1 and 2 above on +a medium customarily used for software interchange; or, - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) +c) Accompany it with the information you received as to the offer to distribute +corresponding source code. (This alternative is allowed only for +noncommercial distribution and only if you received the program in object +code or executable form with such an offer, in accord with Subsection b +above.) The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. +making modifications to it. For an executable work, complete source code +means all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation and +installation of the executable. However, as a special exception, the source +code distributed need not include anything that is normally distributed (in +either source or binary form) with the major components (compiler, kernel, +and so on) of the operating system on which the executable runs, unless that +component itself accompanies the executable. -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. +If distribution of executable or object code is made by offering access to +copy from a designated place, then offering equivalent access to copy the +source code from the same place counts as distribution of the source code, +even though third parties are not compelled to copy the source along with the +object code. - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. +4. You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, +modify, sublicense or distribute the Program is void, and will automatically +terminate your rights under this License. However, parties who have received +copies, or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. +5. You are not required to accept this License, since you have not signed it. +However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or distributing the +Program (or any work based on the Program), you indicate your acceptance +of this License to do so, and all its terms and conditions for copying, +distributing or modifying the Program or works based on it. - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. +6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these terms and +conditions. You may not impose any further restrictions on the recipients' +exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties to this License. - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), 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 distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution +of the Program by all those who receive copies directly or indirectly through +you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose +that choice. -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In such +case, this License incorporates the limitation as if written in the body of this +License. - 9. The Free Software Foundation may publish revised and/or new versions -of the 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. +9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that +version or of any later version published by the Free Software Foundation. If +the Program does not specify a version number of this License, you may +choose any version ever published by the Free Software Foundation. - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we sometimes make +exceptions for this. Our decision will be guided by the two goals of +preserving the free status of all derivatives of our free software and of +promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, +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. - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE 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. +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR +AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR +ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. - 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 -convey 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 2 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, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision 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, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This 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. + END OF TERMS AND CONDITIONS diff --git a/uc_views/README.txt b/uc_views/README.txt index a8615c4..8f62248 100644 --- a/uc_views/README.txt +++ b/uc_views/README.txt @@ -1,8 +1,9 @@ +// $Id: README.txt,v 1.3.2.1.2.2 2010/11/28 22:00:17 longwave Exp $ Welcome to Ubercart Views. -------------------------- -If you're having trouble installing this module, please ensure that your +If you're having trouble installing this module, please ensure that your tar program is not flattening the directory tree, truncating filenames or losing files. diff --git a/uc_views/theme/theme.inc b/uc_views/theme/theme.inc index 94bf7a3..8426b6d 100644 --- a/uc_views/theme/theme.inc +++ b/uc_views/theme/theme.inc @@ -1,4 +1,5 @@ {$vars['field_alias']}; - - if (module_exists('uc_credit')) { - // Clear credit cache, otherwise the load function below will return - // the same cached credit information for all the subsequent orders - // invoices - uc_credit_cache('clear'); - } + // Clear credit cache, otherwise the load function below will return + // the same cached credit information for all the subsequent orders inovoices + uc_credit_cache('clear'); $order = uc_order_load($order_id); $invoice = uc_order_invoice($order); $vars['invoice'] = $invoice; -} +} \ No newline at end of file diff --git a/uc_views/theme/uc-views-view-row-invoice.tpl.php b/uc_views/theme/uc-views-view-row-invoice.tpl.php index 5d1df31..95a2ed0 100644 --- a/uc_views/theme/uc-views-view-row-invoice.tpl.php +++ b/uc_views/theme/uc-views-view-row-invoice.tpl.php @@ -1,4 +1,5 @@ array( - 'file' => 'draggableviews_handler_ubercart.inc', - 'title' => t('Ubercart'), - 'description' => 'Ubercart product list position.', - 'handler' => 'draggableviews_handler_ubercart', - ), - ); -} diff --git a/uc_views/uc_views_addresses/uc_views_addresses.info b/uc_views/uc_views_addresses/uc_views_addresses.info index 8aa8a27..6d5dced 100644 --- a/uc_views/uc_views_addresses/uc_views_addresses.info +++ b/uc_views/uc_views_addresses/uc_views_addresses.info @@ -1,3 +1,4 @@ +; $Id: uc_views_addresses.info,v 1.1.2.2 2010/11/18 20:59:38 longwave Exp $ name = Ubercart Views Addresses description = Views definitions for Ubercart Addresses module. dependencies[] = views @@ -5,9 +6,9 @@ dependencies[] = uc_addresses package = "Ubercart - views" core = 6.x -; Information added by drupal.org packaging script on 2013-10-19 -version = "6.x-3.3+0-dev" +; Information added by drupal.org packaging script on 2010-12-23 +version = "6.x-3.1" core = "6.x" project = "uc_views" -datestamp = "1382149712" +datestamp = "1293106023" diff --git a/uc_views/uc_views_addresses/uc_views_addresses.module b/uc_views/uc_views_addresses/uc_views_addresses.module index 625c4f0..cbcc544 100644 --- a/uc_views/uc_views_addresses/uc_views_addresses.module +++ b/uc_views/uc_views_addresses/uc_views_addresses.module @@ -1,4 +1,5 @@ 'uid', ); - + return $data; } diff --git a/uc_views/uc_views_addresses/views/uc_views_addresses_handler_filter_default_address.inc b/uc_views/uc_views_addresses/views/uc_views_addresses_handler_filter_default_address.inc index 0382f54..61b4c81 100644 --- a/uc_views/uc_views_addresses/views/uc_views_addresses_handler_filter_default_address.inc +++ b/uc_views/uc_views_addresses/views/uc_views_addresses_handler_filter_default_address.inc @@ -1,4 +1,5 @@ '2.0', - 'path' => drupal_get_path('module', 'uc_views_attribute') .'/views', + 'path' => drupal_get_path('module', 'uc_views_attribute') . '/views', ); } diff --git a/uc_views/uc_views_attribute/views/uc_views_attribute.views.inc b/uc_views/uc_views_attribute/views/uc_views_attribute.views.inc index 6be3fdd..40bd1fc 100644 --- a/uc_views/uc_views_attribute/views/uc_views_attribute.views.inc +++ b/uc_views/uc_views_attribute/views/uc_views_attribute.views.inc @@ -1,35 +1,26 @@ aid] = array( - 'title' => 'Attribute: '.$row->name, - 'help' => 'Attribute desc: '.$row->description, +foreach($result as $row) { + $data['uc_order_products']['attr_' . $row->aid] = array( + 'title' => 'Attribute: ' . $row->name, + 'help' => 'Attribute desc: ' . $row->description, 'filter' => array( 'handler' => 'uc_views_attribute_handler_filter_attr', ), 'aid' => $row->aid, ); - - // Create a filter for each product attribute - $data['uc_product_adjustments']['pattr_'.$row->aid] = array( - 'title' => /*'Attribute: '.*/ $row->name, - 'help' => 'Attribute desc: '.$row->description, - 'filter' => array( - 'handler' => 'uc_views_attribute_handler_filter_product_attr', - ), - ); } // Patch by hanoii @@ -38,8 +29,8 @@ function uc_views_attribute_views_data() { $uc_product_adjustments = drupal_get_schema('uc_product_adjustments'); $data['uc_product_adjustments']['table']['join']['node'] = array( - 'left_field' => 'nid', - 'field' => 'nid', + 'left_field' => 'nid', + 'field' => 'nid', ); $data['uc_product_adjustments']['model'] = array( @@ -54,7 +45,7 @@ function uc_views_attribute_views_data() { 'relationship field' => 'model', 'handler' => 'views_handler_relationship', 'label' => t('Model'), - ) + ), ); $data['uc_product_adjustments']['combination'] = array( @@ -64,7 +55,6 @@ function uc_views_attribute_views_data() { 'handler' => 'uc_views_attribute_handler_field_combination', ), ); - $data['uc_product_adjustments']['combination_sell_price'] = array( 'title' => t('Sell price w/attributes adjustment'), 'help' => t('The sell price of the product with all the price adjustments from its combination of attributes.'), @@ -102,7 +92,7 @@ function uc_views_attribute_views_data() { // Add viewhandler for uc_order_product attributes $data['uc_order_products']['attributes'] = array( - 'title' => t('Ordered product attributes'), + 'title' => t('Product attributes'), 'help' => t('List of attribute selection for the ordered product.'), 'group' => t('Ubercart order product'), 'field' => array( @@ -116,7 +106,7 @@ function uc_views_attribute_views_data() { } /** - * Implementation of hook_views_handlers(). + * Implements hook_views_handlers(). */ function uc_views_attribute_views_handlers() { return array( @@ -128,9 +118,8 @@ function uc_views_attribute_views_handlers() { 'uc_views_attribute_handler_field_combination' => array('parent' => 'views_handler_field'), 'uc_views_attribute_handler_field_order_product_attribute' => array('parent' => 'views_handler_field'), 'uc_views_attribute_handler_field_combination_price' => array('parent' => 'uc_views_handler_field_money_amount'), - // filters + //fiters 'uc_views_attribute_handler_filter_attr' => array('parent' => 'views_handler_filter_in_operator'), - 'uc_views_attribute_handler_filter_product_attr' => array('parent' => 'views_handler_filter_in_operator'), ), ); } @@ -138,8 +127,7 @@ function uc_views_attribute_views_handlers() { /** * Conditionally add editablefields support. */ -function uc_views_attribute_views_tables_alter(&$tables) { -} +function uc_views_attribute_views_tables_alter(&$tables) { } /** * Load all attributes. @@ -147,7 +135,7 @@ function uc_views_attribute_views_tables_alter(&$tables) { function uc_get_attributes() { $result = db_query("SELECT aid FROM {uc_attributes} ORDER BY ordering"); $chosen_attr = array(); - while ($attr = db_fetch_object($result)){ + while ($attr = db_fetch_object($result)) { $chosen_attr[$attr->aid] = uc_attribute_load($attr->aid); } return $chosen_attr; diff --git a/uc_views/uc_views_attribute/views/uc_views_attribute_handler_field_combination.inc b/uc_views/uc_views_attribute/views/uc_views_attribute_handler_field_combination.inc index 2b52703..a58e3de 100644 --- a/uc_views/uc_views_attribute/views/uc_views_attribute_handler_field_combination.inc +++ b/uc_views/uc_views_attribute/views/uc_views_attribute_handler_field_combination.inc @@ -1,4 +1,5 @@ 0 ORDER BY pa.ordering, a.ordering", $nid, $nid); + $result = db_query("SELECT pa.nid, pa.aid, pa.ordering, a.name, a.ordering, ao.aid, COUNT(po.oid) FROM {uc_product_attributes} AS pa LEFT JOIN {uc_attributes} AS a ON pa.aid = a.aid LEFT JOIN {uc_attribute_options} AS ao ON a.aid = ao.aid LEFT JOIN {uc_product_options} AS po ON ao.oid = po.oid AND po.nid = %d WHERE pa.nid = :pa.nid GROUP BY ao.aid, pa.aid, a.name, pa.ordering, a.ordering, pa.nid HAVING count(po.oid) > :count(po.oid) ORDER BY pa.ordering, a.ordering", array(':pa.nid' => $nid, ':count(po.oid)' => 0, '' => $nid)); $i = 1; $values = array(); @@ -34,7 +35,7 @@ class uc_views_attribute_handler_field_combination extends views_handler_field { $query_select .= " ao$i.aid AS aid$i, ao$i.name AS name$i, ao$i.oid AS oid$i, po$i.ordering,"; $query_from .= " ({uc_product_options} AS po$i LEFT JOIN {uc_attribute_options} AS ao$i ON po$i.oid = ao$i.oid AND po$i.nid = %d),"; $values[] = $nid; - $query_where .= " ao$i.aid = ". $prod_attr->aid ." AND"; + $query_where .= " ao$i.aid = " . $prod_attr->aid . " AND"; $query_order .= " po$i.ordering, ao$i.name,"; ++$i; $attribute_ids[] = $prod_attr->aid; @@ -48,16 +49,17 @@ class uc_views_attribute_handler_field_combination extends views_handler_field { $query_order = rtrim($query_order, ','); if ($num_prod_attr) { + // TODO Please convert this statement to the D7 database API syntax. $result = db_query($query_select . $query_from . $query_where . $query_order, $values); while ($row = db_fetch_object($result)) { $attrs_info = array(); $attrs = array(); - for ($i = 1 ; $i <= $num_prod_attr ; $i++) { + for ($i = 1; $i <= $num_prod_attr; $i++) { $aid_key = "aid$i"; $oid_key = "oid$i"; $name_key = "name$i"; $aid = $row->$aid_key; - $attr = db_result(db_query("SELECT name FROM {uc_attributes} WHERE aid = %d", $aid)); + $attr = db_query("SELECT name FROM {uc_attributes} WHERE aid = :aid", array(':aid' => $aid))->fetchField(); $attrs_info[$attr] = $row->$name_key; $attrs[$aid] = $row->$oid_key; } @@ -67,7 +69,7 @@ class uc_views_attribute_handler_field_combination extends views_handler_field { } // Exclude configured combinations - $result = db_query("SELECT * FROM {uc_product_adjustments} WHERE nid = %d", $nid); + $result = db_query("SELECT * FROM {uc_product_adjustments} WHERE nid = :nid", array(':nid' => $nid)); while ($row = db_fetch_object($result)) { // TODO: Remove unserialize/asort/serialize because rc6+ already sorts it $c = unserialize($row->combination); @@ -125,13 +127,13 @@ class uc_views_attribute_handler_field_combination extends views_handler_field { if (is_string($combination)) { $combination = unserialize($combination); $attributes = array(); - foreach($combination as $aid => $oid) { + foreach ($combination as $aid => $oid) { $attribute = uc_attribute_load($aid); $option = uc_attribute_option_load($oid); $attributes[] = "$attribute->name: $option->name"; } $items[] = implode($attributes, ', '); - return theme('item_list', $items); + return theme('item_list', array('items' => $items)); } // combination information is not found, render other node's attribute and options else if ($this->options['fetch_if_null']) { @@ -145,7 +147,7 @@ class uc_views_attribute_handler_field_combination extends views_handler_field { } $items[] = implode($attributes, ', '); } - return theme('item_list', $items); + return theme('item_list', array('items' => $items)); } } return parent::render($values); diff --git a/uc_views/uc_views_attribute/views/uc_views_attribute_handler_field_combination_price.inc b/uc_views/uc_views_attribute/views/uc_views_attribute_handler_field_combination_price.inc index 85af92e..b93a83b 100644 --- a/uc_views/uc_views_attribute/views/uc_views_attribute_handler_field_combination_price.inc +++ b/uc_views/uc_views_attribute/views/uc_views_attribute_handler_field_combination_price.inc @@ -1,4 +1,5 @@ aliases['vid'] = $this->query->add_field('node', 'vid'); } - + function render($values) { switch ($this->definition['price']) { case 'sell_price': @@ -37,14 +38,16 @@ class uc_views_attribute_handler_field_combination_price extends uc_views_handle // I did try to add it through // additional_fields => array('product_price' => array('table' => 'uc_products', 'field' => 'sell_price')) // but it didn't work. - $price = db_result(db_query("SELECT $uc_products_field FROM {uc_products} WHERE nid = %d AND vid = %d", $values->nid, $values->{$this->aliases['vid']})); + // TODO Please convert this statement to the D7 database API syntax. $offset_total = 0; + $price = db_query("SELECT $uc_products_field FROM {uc_products} WHERE nid = %d AND vid = %d", $values->nid, $values->{$this->aliases['vid']})->fetchField(); $offset_total = 0; - - $combination =$values->{$this->aliases['combination']}; + + $combination = $values->{$this->aliases['combination']}; if ($combination) { $combination = unserialize($combination); foreach ($combination as $aid => $oid) { - $offset = db_result(db_query("SELECT $uc_product_options_field FROM {uc_product_options} WHERE nid = %d AND oid = %d", $values->nid, $oid)); + // TODO Please convert this statement to the D7 database API syntax. + $offset = db_query("SELECT $uc_product_options_field FROM {uc_product_options} WHERE nid = %d AND oid = %d", $values->nid, $oid)->fetchField(); $offset_total += $offset; } } diff --git a/uc_views/uc_views_attribute/views/uc_views_attribute_handler_field_order_product_attribute.inc b/uc_views/uc_views_attribute/views/uc_views_attribute_handler_field_order_product_attribute.inc index be3268b..3a04b06 100644 --- a/uc_views/uc_views_attribute/views/uc_views_attribute_handler_field_order_product_attribute.inc +++ b/uc_views/uc_views_attribute/views/uc_views_attribute_handler_field_order_product_attribute.inc @@ -1,10 +1,11 @@ $option) { - $rows[] = t('@attribute: @option', array('@attribute' => $attribute, '@option' => implode(', ', (array)$option))); + $rows[] = t('@attribute: @option', array('@attribute' => $attribute, '@option' => implode(', ', (array) $option))); if (count($rows)) { - $result = theme('item_list', $rows, NULL, 'ul', array('class' => 'product-description')); + $result = theme('item_list', array('items' => $rows, 'title' => NULL, 'type' => 'ul', 'attributes' => array('class' => 'product-description'))); } } } diff --git a/uc_views/uc_views_attribute/views/uc_views_attribute_handler_filter_attr.inc b/uc_views/uc_views_attribute/views/uc_views_attribute_handler_filter_attr.inc index d399f19..350cf84 100644 --- a/uc_views/uc_views_attribute/views/uc_views_attribute_handler_filter_attr.inc +++ b/uc_views/uc_views_attribute/views/uc_views_attribute_handler_filter_attr.inc @@ -1,10 +1,13 @@ value_options)) { - $aid = explode('_',$this->field); + $aid = explode('_', $this->field); $aid = $aid[1]; - + $this->value_title = t('Options'); - $result = db_query("SELECT name, oid FROM {uc_attribute_options} WHERE aid = %d ORDER BY ordering", $aid); + $result = db_query("SELECT name, oid FROM {uc_attribute_options} WHERE aid = :aid ORDER BY ordering", array(':aid' => $aid)); while ($row = db_fetch_object($result)) { $options[$row->oid] = $row->name; @@ -30,66 +33,69 @@ class uc_views_attribute_handler_filter_attr extends views_handler_filter_in_ope $this->value_options = $options; } } - + function extra_options_form(&$form, &$form_state) { $form['type'] = array( '#type' => 'radios', '#title' => t('Selection type'), - '#options' => array('select' => t('Checkboxes/Dropdown'), 'textfield' => t('Textfield')), + '#options' => array( + 'select' => t('Checkboxes/Dropdown'), + 'textfield' => t('Textfield'), + ), '#default_value' => $this->options['type'], ); } - + function value_form(&$form, &$form_state) { parent::value_form($form, $form_state); if ($this->options['type'] == 'textfield') { - $form['value'] = array ( + $form['value'] = array( '#type' => 'textfield', '#title' => 'Text search', ); } } - + function query() { - $aid = explode('_',$this->field); + $aid = explode('_', $this->field); $aid = $aid[1]; - - $key = db_result(db_query('SELECT name FROM {uc_attributes} WHERE aid = %d', $aid)); - + + $key = db_query('SELECT name FROM {uc_attributes} WHERE aid = :aid', array(':aid' => $aid))->fetchField(); + $this->ensure_my_table(); $this->real_field = 'data'; $field = "$this->table_alias.$this->real_field"; $upper = ''; - if($this->operator == 'not in') { + if ($this->operator == 'not in') { $not = 'NOT'; } - if(!is_array($this->value)) { + if (!is_array($this->value)) { $this->value = array($this->value); } foreach ($this->value as &$value) { - if($this->options['type'] == 'textfield') { - $optval = $value; - } - else { - $optval = db_result(db_query('SELECT name FROM {uc_attribute_options} WHERE oid = %d', $value)); - } - if(!$optval) { - //If we let the query get added, only products with the attribute enabled & with the value of that attribute empty - //will return. By default, I think it makes more sense to allow any product to return despite whether or not it - //has the attribute if the user put nothing in to search for. - //Adding a new type of filter that merely captures whether or not the attribute exists at all for the product may - //be the best way to capture the alternative. Or, perhaps a config option could be added to this filter : - //"Show products only if they have this attribute enabled". If this option is unchecked, a blank value returns all - //products. If checked, a blank value at least filters out products that dont have this attribute available. - continue; - } - $var = array($key => array(0 => $optval)); - $servar = serialize($var); - $l = strpos($servar,'{')+1; - $r = strpos($servar,'}')-$l; - $value = substr($servar,$l,$r); - //@todo - this method of building the query does allow for partial text matching (i.e. 'foo' matches in 'foobar'). - $this->query->add_where($this->options['group'], "$upper(%s) $not LIKE $upper('%%%s%%')", $field, $value); +if ($this->options['type'] == 'textfield') { + $optval = $value; + } + else { + $optval = db_query('SELECT name FROM {uc_attribute_options} WHERE oid = :oid', array(':oid' => $value))->fetchField(); + } + if (!$optval) { + //If we let the query get added, only products with the attribute enabled & with the value of that attribute empty + //will return. By default, I think it makes more sense to allow any product to return despite whether or not it + //has the attribute if the user put nothing in to search for. + //Adding a new type of filter that merely captures whether or not the attribute exists at all for the product may + //be the best way to capture the alternative. Or, perhaps a config option could be added to this filter : + //"Show products only if they have this attribute enabled". If this option is unchecked, a blank value returns all + //products. If checked, a blank value at least filters out products that dont have this attribute available. + continue; + } + $var = array($key => array(0 => $optval)); + $servar = serialize($var); + $l = strpos($servar, '{') + 1; + $r = strpos($servar, '}') -$l; + $value = substr($servar, $l, $r); + //@todo - this method of building the query does allow for partial text matching (i.e. 'foo' matches in 'foobar'). + $this->query->add_where($this->options['group'], "$upper(%s) $not LIKE $upper('%%%s%%')", $field, $value); } } } diff --git a/uc_views/uc_views_bulk_operations/README.txt b/uc_views/uc_views_bulk_operations/README.txt index 78e1713..ef542f8 100644 --- a/uc_views/uc_views_bulk_operations/README.txt +++ b/uc_views/uc_views_bulk_operations/README.txt @@ -1,3 +1,4 @@ +// $Id: README.txt,v 1.1.2.1 2009/06/22 10:37:55 madsph Exp $ Welcome to Ubercart Views with Bulk operations. ----------------------------------------------- diff --git a/uc_views/uc_views_bulk_operations/uc_views_bulk_operations.info b/uc_views/uc_views_bulk_operations/uc_views_bulk_operations.info index 360d9c4..5083aa4 100644 --- a/uc_views/uc_views_bulk_operations/uc_views_bulk_operations.info +++ b/uc_views/uc_views_bulk_operations/uc_views_bulk_operations.info @@ -1,3 +1,4 @@ +; $Id: uc_views_bulk_operations.info,v 1.1.2.2.2.1 2010/11/18 21:03:58 longwave Exp $ name = Ubercart Views Bulk Operations description = Print, delete or change the status of multiple orders, or add multiple nodes to the cart at once. dependencies[] = uc_views @@ -5,9 +6,9 @@ dependencies[] = views_bulk_operations package = "Ubercart - views" core = 6.x -; Information added by drupal.org packaging script on 2013-10-19 -version = "6.x-3.3+0-dev" +; Information added by drupal.org packaging script on 2010-12-23 +version = "6.x-3.1" core = "6.x" project = "uc_views" -datestamp = "1382149712" +datestamp = "1293106023" diff --git a/uc_views/uc_views_bulk_operations/uc_views_bulk_operations.module b/uc_views/uc_views_bulk_operations/uc_views_bulk_operations.module index 08668df..eaa4caf 100644 --- a/uc_views/uc_views_bulk_operations/uc_views_bulk_operations.module +++ b/uc_views/uc_views_bulk_operations/uc_views_bulk_operations.module @@ -1,4 +1,5 @@ override_option('access', array( - 'type' => 'perm', - 'perm' => 'view all orders', + 'type' => 'none', )); $handler->override_option('cache', array( 'type' => 'none', @@ -237,7 +237,7 @@ function uc_views_bulk_operations_views_default_views() { 'description' => '', 'weight' => 0, )); - + $views[$view->name] = $view; return $views; diff --git a/uc_views/uc_views_marketing/uc_views_marketing.info b/uc_views/uc_views_marketing/uc_views_marketing.info index 34c5a7d..eb5ffb0 100644 --- a/uc_views/uc_views_marketing/uc_views_marketing.info +++ b/uc_views/uc_views_marketing/uc_views_marketing.info @@ -1,12 +1,13 @@ +; $Id: uc_views_marketing.info,v 1.1.2.1.2.2 2010/11/18 14:20:40 longwave Exp $ name = Ubercart Views Marketing description = Create views on Ubercart data for marketing purposes, such as a block for new products, lists of a users purchased products, most popular products, etc. dependencies[] = uc_views package = "Ubercart - views" core = 6.x -; Information added by drupal.org packaging script on 2013-10-19 -version = "6.x-3.3+0-dev" +; Information added by drupal.org packaging script on 2010-12-23 +version = "6.x-3.1" core = "6.x" project = "uc_views" -datestamp = "1382149712" +datestamp = "1293106023" diff --git a/uc_views/uc_views_marketing/uc_views_marketing.install b/uc_views/uc_views_marketing/uc_views_marketing.install index 3182355..e9b1ff4 100644 --- a/uc_views/uc_views_marketing/uc_views_marketing.install +++ b/uc_views/uc_views_marketing/uc_views_marketing.install @@ -1,4 +1,5 @@ array( 'handler' => 'views_handler_filter_numeric', ), - 'argument' => array( - 'handler' => 'views_handler_argument_numeric', - 'name field' => 'title', - 'numeric' => TRUE, - 'validate type' => 'order_product_id', - ), ); - + $data['uc_order_products']['model'] = array( 'title' => t('SKU'), 'help' => $order_products['fields']['model']['description'], @@ -433,7 +428,7 @@ function uc_views_views_data() { ), ); } - + $data['uc_orders'][$prefix.'_full_name'] = array( 'title' => t('!titleprefix full name', $args), 'help' => $prefix == 'delivery' ? t('The full name (first and last) of the person receiving shipment.') : t('The full name (first and last) of the person paying for the order.'), @@ -529,7 +524,7 @@ function uc_views_views_data() { // join to the uc_order_products, if used as base, via uc_orders $data[$key]['table']['join']['uc_order_products'] = $data[$key]['table']['join']['uc_orders']; $data[$key]['table']['join']['uc_order_products']['left_table'] = 'uc_orders'; - + $data[$key]['country_id'] = array( 'title' => t($value['prefix'].' country id'), 'help' => $order_schema['fields'][$value['field']]['description'], @@ -640,7 +635,7 @@ function uc_views_views_data() { // join to the uc_order_products, if used as base, via uc_orders $data[$key]['table']['join']['uc_order_products'] = $data[$key]['table']['join']['uc_orders']; $data[$key]['table']['join']['uc_order_products']['left_table'] = 'uc_orders'; - + $data[$key]['zone_id'] = array( 'title' => t($value['prefix'].' zone id'), 'help' => $order_schema['fields'][$value['field']]['description'], @@ -666,7 +661,7 @@ function uc_views_views_data() { ); $data[$key]['zone_name'] = array( 'title' => t($value['prefix'].' zone name'), - 'help' => t(preg_replace('/id|ID/i', ' ', $order_schema['fields'][$value['field']]['description'])), + 'help' => t(ereg_replace(' (id|ID) ', ' ', $order_schema['fields'][$value['field']]['description'])), 'field' => array( 'handler' => 'views_handler_field', 'click sortable' => TRUE, @@ -702,7 +697,7 @@ function uc_views_views_data() { // line items $line_items = array(); foreach (_line_item_list() as $line_item) { - if (!in_array($line_item['id'], array('subtotal', 'tax_subtotal', 'total')) && $line_item['stored']) { + if (!in_array($line_item['id'], array('subtotal', 'tax_subtotal', 'total', 'generic')) && $line_item['stored']) { $line_items[$line_item['id']] = $line_item['title']; } } @@ -744,7 +739,7 @@ function uc_views_views_data() { 'float' => TRUE, ), 'filter' => array( - 'handler' => 'views_handler_filter_float', + 'handler' => 'views_handler_filter_amount', ), ); } @@ -1002,9 +997,5 @@ function uc_views_views_plugins() { * Implementation of hook_views_query_substitutions(). */ function uc_views_views_query_substitutions($view) { - if (module_exists('uc_cart')) { - if ($cart_id = uc_cart_get_id(FALSE)) { - return array('***CURRENT_CART_ID***' => $cart_id); - } - } + return array('***CURRENT_CART_ID***' => uc_cart_get_id()); } diff --git a/uc_views/views/uc_views.views_default.inc b/uc_views/views/uc_views.views_default.inc index 94f36fe..66ab2ed 100644 --- a/uc_views/views/uc_views.views_default.inc +++ b/uc_views/views/uc_views.views_default.inc @@ -1,4 +1,5 @@ override_option('access', array( - 'type' => 'perm', - 'perm' => 'view all orders', - )); - $handler->override_option('cache', array( 'type' => 'none', )); $handler->override_option('title', 'Orders'); @@ -161,275 +158,5 @@ function uc_views_views_default_views() { $views[$view->name] = $view; - if (module_exists('draggableviews')) { - $view = new view; - $view->name = 'product_order'; - $view->description = ''; - $view->tag = 'Ubercart'; - $view->view_php = ''; - $view->base_table = 'node'; - $view->is_cacheable = FALSE; - $view->api_version = 2; - $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */ - $handler = $view->new_display('default', 'Defaults', 'default'); - $handler->override_option('fields', array( - 'title' => array( - 'label' => 'Title', - 'alter' => array( - 'alter_text' => 0, - 'text' => '', - 'make_link' => 0, - 'path' => '', - 'link_class' => '', - 'alt' => '', - 'prefix' => '', - 'suffix' => '', - 'target' => '', - 'help' => '', - 'trim' => 0, - 'max_length' => '', - 'word_boundary' => 1, - 'ellipsis' => 1, - 'html' => 0, - 'strip_tags' => 0, - ), - 'empty' => '', - 'hide_empty' => 0, - 'empty_zero' => 0, - 'link_to_node' => 1, - 'exclude' => 0, - 'id' => 'title', - 'table' => 'node', - 'field' => 'title', - 'relationship' => 'none', - ), - 'sell_price' => array( - 'label' => 'Sell price', - 'alter' => array( - 'alter_text' => 0, - 'text' => '', - 'make_link' => 0, - 'path' => '', - 'link_class' => '', - 'alt' => '', - 'prefix' => '', - 'suffix' => '', - 'target' => '', - 'help' => '', - 'trim' => 0, - 'max_length' => '', - 'word_boundary' => 1, - 'ellipsis' => 1, - 'html' => 0, - 'strip_tags' => 0, - ), - 'empty' => '', - 'hide_empty' => 0, - 'empty_zero' => 0, - 'set_precision' => 0, - 'precision' => '0', - 'decimal' => '.', - 'separator' => ',', - 'prefix' => '', - 'suffix' => '', - 'format' => 'uc_price', - 'revision' => 'themed', - 'exclude' => 0, - 'id' => 'sell_price', - 'table' => 'uc_products', - 'field' => 'sell_price', - 'relationship' => 'none', - ), - 'ordering' => array( - 'label' => 'List position', - 'alter' => array( - 'alter_text' => 0, - 'text' => '', - 'make_link' => 0, - 'path' => '', - 'link_class' => '', - 'alt' => '', - 'prefix' => '', - 'suffix' => '', - 'target' => '', - 'help' => '', - 'trim' => 0, - 'max_length' => '', - 'word_boundary' => 1, - 'ellipsis' => 1, - 'html' => 0, - 'strip_tags' => 0, - ), - 'empty' => '', - 'hide_empty' => 0, - 'empty_zero' => 0, - 'set_precision' => FALSE, - 'precision' => 0, - 'decimal' => '.', - 'separator' => ',', - 'prefix' => '', - 'suffix' => '', - 'exclude' => 0, - 'id' => 'ordering', - 'table' => 'uc_products', - 'field' => 'ordering', - 'relationship' => 'none', - ), - )); - $handler->override_option('sorts', array( - 'ordering' => array( - 'order' => 'ASC', - 'id' => 'ordering', - 'table' => 'uc_products', - 'field' => 'ordering', - 'relationship' => 'none', - ), - )); - $handler->override_option('filters', array( - 'is_product' => array( - 'operator' => '=', - 'value' => '1', - 'group' => '0', - 'exposed' => FALSE, - 'expose' => array( - 'operator' => FALSE, - 'label' => '', - ), - 'id' => 'is_product', - 'table' => 'uc_products', - 'field' => 'is_product', - 'relationship' => 'none', - ), - 'status' => array( - 'operator' => '=', - 'value' => '1', - 'group' => '0', - 'exposed' => FALSE, - 'expose' => array( - 'operator' => FALSE, - 'label' => '', - ), - 'id' => 'status', - 'table' => 'node', - 'field' => 'status', - 'relationship' => 'none', - ), - 'tid' => array( - 'operator' => 'or', - 'value' => array(), - 'group' => '0', - 'exposed' => TRUE, - 'expose' => array( - 'use_operator' => 0, - 'operator' => 'tid_op', - 'identifier' => 'tid', - 'label' => 'Taxonomy term', - 'optional' => 1, - 'single' => 1, - 'remember' => 0, - 'reduce' => 0, - ), - 'type' => 'select', - 'limit' => TRUE, - 'vid' => variable_get('uc_catalog_vid', 0), - 'id' => 'tid', - 'table' => 'term_node', - 'field' => 'tid', - 'hierarchy' => 1, - 'relationship' => 'none', - 'reduce_duplicates' => 0, - ), - )); - $handler->override_option('access', array( - 'type' => 'perm', - 'perm' => 'administer products', - )); - $handler->override_option('cache', array( - 'type' => 'none', - )); - $handler->override_option('title', 'Product display order'); - $handler->override_option('items_per_page', 30); - $handler->override_option('use_pager', '1'); - $handler->override_option('style_plugin', 'draggabletable'); - $handler->override_option('style_options', array( - 'override' => 1, - 'sticky' => 0, - 'order' => 'asc', - 'columns' => array( - 'title' => 'title', - 'sell_price' => 'sell_price', - 'ordering' => 'ordering', - ), - 'info' => array( - 'title' => array( - 'sortable' => 0, - 'separator' => '', - ), - 'sell_price' => array( - 'sortable' => 0, - 'separator' => '', - ), - 'ordering' => array( - 'separator' => '', - ), - ), - 'default' => -1, - 'tabledrag_order' => array( - 'field' => 'ordering', - 'handler' => 'ubercart', - ), - 'tabledrag_order_visible' => array( - 'visible' => 0, - ), - 'tabledrag_hierarchy' => array( - 'field' => 'none', - 'handler' => 'native', - ), - 'tabledrag_hierarchy_visible' => array( - 'visible' => 0, - ), - 'draggableviews_depth_limit' => '0', - 'draggableviews_repair' => array( - 'repair' => 0, - ), - 'tabledrag_types_add' => 'Add type', - 'tabledrag_expand' => array( - 'expand_links' => 0, - 'collapsed' => 0, - 'by_uid' => 0, - ), - 'draggableviews_extensions' => array( - 'extension_top' => '3', - 'extension_bottom' => '3', - ), - 'tabledrag_lock' => array( - 'lock' => 0, - ), - 'draggableviews_default_on_top' => '1', - 'draggableviews_button_text' => 'Save order', - 'draggableviews_arguments' => array( - 'use_args' => 0, - ), - )); - $handler = $view->new_display('page', 'Page', 'page_1'); - $handler->override_option('path', 'admin/store/products/order'); - $handler->override_option('menu', array( - 'type' => 'none', - 'title' => '', - 'description' => '', - 'weight' => 0, - 'name' => 'navigation', - )); - $handler->override_option('tab_options', array( - 'type' => 'none', - 'title' => '', - 'description' => '', - 'weight' => 0, - 'name' => 'navigation', - )); - - $views[$view->name] = $view; - } - return $views; } \ No newline at end of file diff --git a/uc_views/views/uc_views_handler_field_cart_user.inc b/uc_views/views/uc_views_handler_field_cart_user.inc index 4f6a454..4a17353 100644 --- a/uc_views/views/uc_views_handler_field_cart_user.inc +++ b/uc_views/views/uc_views_handler_field_cart_user.inc @@ -1,4 +1,5 @@ {$this->field_alias}); $cc_data = $data['cc_data']; - - // In recent ubercart versions, they base64_encode() the payment details - // before encrypting. We can detect encoded data by the lack of colons, - // due to base64's limited character set. - // see uc_credit_cache() - $decrypted_data = $crypt->decrypt($key, $cc_data); - if (strpos($decrypted_data, ':') === FALSE) { - $decrypted_data = base64_decode($decrypted_data); - } - $cc_data = unserialize($decrypted_data); + $cc_data = unserialize($crypt->decrypt($key, $cc_data)); return $cc_data[$this->definition['cc field']]; } diff --git a/uc_views/views/uc_views_handler_field_order_cost.inc b/uc_views/views/uc_views_handler_field_order_cost.inc index 1d06a9c..aed7939 100644 --- a/uc_views/views/uc_views_handler_field_order_cost.inc +++ b/uc_views/views/uc_views_handler_field_order_cost.inc @@ -1,4 +1,5 @@ field_alias = 'order_cost'; - $cost = db_result(db_query("SELECT SUM(qty * cost) FROM {uc_order_products} WHERE order_id = %d", $values->{$this->aliases['order_id']})); + $cost = db_result(db_query("SELECT SUM(cost) FROM {uc_order_products} WHERE order_id = %d", $values->{$this->aliases['order_id']})); $values->{$this->field_alias} = $cost; return parent::render($values); } diff --git a/uc_views/views/uc_views_handler_field_order_fullname.inc b/uc_views/views/uc_views_handler_field_order_fullname.inc index e017682..62591ba 100644 --- a/uc_views/views/uc_views_handler_field_order_fullname.inc +++ b/uc_views/views/uc_views_handler_field_order_fullname.inc @@ -1,4 +1,5 @@ $this->options['format'], ); } - + function query() { $this->ensure_my_table(); $this->add_additional_fields(); } - + function render($values) { $prefix = $this->definition['prefix']; - $first = check_plain($values->{$this->aliases[$prefix . '_first_name']}); - $last = check_plain($values->{$this->aliases[$prefix . '_last_name']}); + $first = $values->{$this->aliases[$prefix . '_first_name']}; + $last = $values->{$this->aliases[$prefix . '_last_name']}; switch ($this->options['format']) { case 'last_first': return "$last $first"; @@ -49,4 +50,4 @@ class uc_views_handler_field_order_fullname extends views_handler_field { return "$first $last"; } } -} +} \ No newline at end of file diff --git a/uc_views/views/uc_views_handler_field_order_id.inc b/uc_views/views/uc_views_handler_field_order_id.inc index 787f3a0..08b6fb2 100644 --- a/uc_views/views/uc_views_handler_field_order_id.inc +++ b/uc_views/views/uc_views_handler_field_order_id.inc @@ -1,4 +1,5 @@ payment_methods] = $pm->payment_methods; - } - - return $methods; + + $methods = array(); + + $result = db_query("SELECT DISTINCT payment_method AS payment_methods FROM {uc_orders}"); + while($pm = db_fetch_object($result)) { + + $methods[$pm->payment_methods] = $pm->payment_methods; + + } + + return $methods; + } \ No newline at end of file diff --git a/uc_views/views/uc_views_handler_filter_zone.inc b/uc_views/views/uc_views_handler_filter_zone.inc index fc5cd37..d53036b 100644 --- a/uc_views/views/uc_views_handler_filter_zone.inc +++ b/uc_views/views/uc_views_handler_filter_zone.inc @@ -1,4 +1,5 @@