From ec6b80609b87ca69672264f6d0ea809ce032139f Mon Sep 17 00:00:00 2001 From: jim Date: Wed, 21 Jun 2006 23:48:34 +0000 Subject: [PATCH] Incorporated an OSS license: The GNU General Public License (GPL) Version 2, June 1991 git-svn-id: file:///Users/jimeh/Desktop/dlist/trunk@24 a5845835-ea0f-0410-a762-dd0bfe9bfde8 --- LICENSE | 240 ------------------------------- LICENSE.txt | 216 ++++++++++++++++++++++++++++ config.php | 5 +- exec/core.exec.php | 32 ++++- exec/icons.exec.php | 52 +++++-- exec/language.exec.php | 32 ++++- exec/output.exec.php | 34 ++++- index.php | 18 ++- languages/english.lang.php | 36 ++++- languages/finnish.lang.php | 33 ++++- languages/swedish.lang.php | 36 ++++- libs/config.lib.php | 18 ++- libs/dirlist.lib.php | 18 ++- libs/exechandler.lib.php | 25 +++- libs/imagethumb.lib.php | 18 ++- libs/speedometer.lib.php | 18 ++- resources/init.php | 18 ++- templates/simple/_icons.phtml | 2 +- templates/simple/render.exec.php | 30 +++- thumb.php | 25 ++++ 20 files changed, 611 insertions(+), 295 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.txt diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 2f5149a..0000000 --- a/LICENSE +++ /dev/null @@ -1,240 +0,0 @@ -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE -COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY -COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS -AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE -TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE -RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS -AND CONDITIONS. - - -1. Definitions - - a. "Collective Work" means a work, such as a periodical issue, - anthology or encyclopedia, in which the Work in its entirety in - unmodified form, along with a number of other contributions, - constituting separate and independent works in themselves, are - assembled into a collective whole. A work that constitutes - Collective Work will not be considered a Derivative Work (as - defined below) for the purposes of this License. - - b. "Derivative Work" means a work based upon the Work or upon the - Work and other pre-existing works, such as a translation, musical - arrangement, dramatization, fictionalization, motion picture - version, sound recording, art reproduction, abridgment, - condensation, or any other form in which the Work may be recast, - transformed, or adapted, except that a work that constitutes a - Collective Work will not be considered a Derivative Work for the - purpose of this License. For the avoidance of doubt, where the - Work is a musical composition or sound recording, the - synchronization of the Work in timed-relation with a moving image - ("synching") will be considered a Derivative Work for the purpose - of this License. - - c. "Licensor" means the individual or entity that offers the Work - under the terms of this License. - - d. "Original Author" means the individual or entity who created the - Work. - - e. "Work" means the copyrightable work of authorship offered under - the terms of this License. - - f. "You" means an individual or entity exercising rights under this - License who has not previously violated the terms of this License - with respect to the Work, or who has received express permission - from the Licensor to exercise rights under this License despite a - previous violation. - - -2. Fair Use Rights. - - Nothing in this license is intended to reduce, limit, or restrict any - rights arising from fair use, first sale or other limitations on the - exclusive rights of the copyright owner under copyright law or other - applicable laws. - - -3. License Grant. - - Subject to the terms and conditions of this License, Licensor hereby - grants You a worldwide, royalty-free, non-exclusive, perpetual (for - the duration of the applicable copyright) license to exercise the - rights in the Work as stated below: - - a. to reproduce the Work, to incorporate the Work into one or more - Collective Works, and to reproduce the Work as incorporated in the - Collective Works; - - b. to create and reproduce Derivative Works; - - c. to distribute copies or phonorecords of, display publicly, perform - publicly, and perform publicly by means of a digital audio - transmission the Work including as incorporated in Collective - Works; - - d. to distribute copies or phonorecords of, display publicly, perform - publicly, and perform publicly by means of a digital audio - transmission Derivative Works. - - e. For the avoidance of doubt, where the work is a musical - composition: - - i. Performance Royalties Under Blanket Licenses. Licensor waives - the exclusive right to collect, whether individually or via a - performance rights society (e.g. ASCAP, BMI, SESAC), royalties - for the public performance or public digital performance (e.g. - webcast) of the Work. - - ii. Mechanical Rights and Statutory Royalties. Licensor waives the - exclusive right to collect, whether individually or via a - music rights agency or designated agent (e.g. Harry Fox - Agency), royalties for any phonorecord You create from the - Work ("cover version") and distribute, subject to the - compulsory license created by 17 USC Section 115 of the US - Copyright Act (or the equivalent in other jurisdictions). - - f. Webcasting Rights and Statutory Royalties. For the avoidance of - doubt, where the Work is a sound recording, Licensor waives the - exclusive right to collect, whether individually or via a - performance-rights society (e.g. SoundExchange), royalties for the - public digital performance (e.g. webcast) of the Work, subject to - the compulsory license created by 17 USC Section 114 of the US - Copyright Act (or the equivalent in other jurisdictions). - - The above rights may be exercised in all media and formats whether - now known or hereafter devised. The above rights include the right to - make such modifications as are technically necessary to exercise the - rights in other media and formats. All rights not expressly granted - by Licensor are hereby reserved. - - -4. Restrictions. - - The license granted in Section 3 above is expressly made subject to - and limited by the following restrictions: - - a. You may distribute, publicly display, publicly perform, or - publicly digitally perform the Work only under the terms of this - License, and You must include a copy of, or the Uniform Resource - Identifier for, this License with every copy or phonorecord of the - Work You distribute, publicly display, publicly perform, or - publicly digitally perform. You may not offer or impose any terms - on the Work that alter or restrict the terms of this License or - the recipients' exercise of the rights granted hereunder. You may - not sublicense the Work. You must keep intact all notices that - refer to this License and to the disclaimer of warranties. You may - not distribute, publicly display, publicly perform, or publicly - digitally perform the Work with any technological measures that - control access or use of the Work in a manner inconsistent with - the terms of this License Agreement. The above applies to the Work - as incorporated in a Collective Work, but this does not require - the Collective Work apart from the Work itself to be made subject - to the terms of this License. If You create a Collective Work, - upon notice from any Licensor You must, to the extent practicable, - remove from the Collective Work any credit as required by clause - 4(b), as requested. If You create a Derivative Work, upon notice - from any Licensor You must, to the extent practicable, remove from - the Derivative Work any credit as required by clause 4(b), as - requested. - - b. If you distribute, publicly display, publicly perform, or publicly - digitally perform the Work or any Derivative Works or Collective - Works, You must keep intact all copyright notices for the Work and - provide, reasonable to the medium or means You are utilizing: (i) - the name of the Original Author (or pseudonym, if applicable) if - supplied, and/or (ii) if the Original Author and/or Licensor - designate another party or parties (e.g. a sponsor institute, - publishing entity, journal) for attribution in Licensor's - copyright notice, terms of service or by other reasonable means, - the name of such party or parties; the title of the Work if - supplied; to the extent reasonably practicable, the Uniform - Resource Identifier, if any, that Licensor specifies to be - associated with the Work, unless such URI does not refer to the - copyright notice or licensing information for the Work; and in the - case of a Derivative Work, a credit identifying the use of the - Work in the Derivative Work (e.g., "French translation of the Work - by Original Author," or "Screenplay based on original Work by - Original Author"). Such credit may be implemented in any - reasonable manner; provided, however, that in the case of a - Derivative Work or Collective Work, at a minimum such credit will - appear where any other comparable authorship credit appears and in - a manner at least as prominent as such other comparable authorship - credit. - - -5. Representations, Warranties and Disclaimer - - UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, - LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR - WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, - STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF - TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, - NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, - OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. - SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, - SO SUCH EXCLUSION MAY NOT APPLY TO YOU. - - -6. Limitation on Liability. - - EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL - LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, - INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT - OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN - ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - -7. Termination - - a. This License and the rights granted hereunder will terminate - automatically upon any breach by You of the terms of this License. - Individuals or entities who have received Derivative Works or - Collective Works from You under this License, however, will not - have their licenses terminated provided such individuals or - entities remain in full compliance with those licenses. Sections - 1, 2, 5, 6, 7, and 8 will survive any termination of this License. - - b. Subject to the above terms and conditions, the license granted - here is perpetual (for the duration of the applicable copyright in - the Work). Notwithstanding the above, Licensor reserves the right - to release the Work under different license terms or to stop - distributing the Work at any time; provided, however that any such - election will not serve to withdraw this License (or any other - license that has been, or is required to be, granted under the - terms of this License), and this License will continue in full - force and effect unless terminated as stated above. - - -8. Miscellaneous - - a. Each time You distribute or publicly digitally perform the Work or - a Collective Work, the Licensor offers to the recipient a license - to the Work on the same terms and conditions as the license - granted to You under this License. - - b. Each time You distribute or publicly digitally perform a - Derivative Work, Licensor offers to the recipient a license to the - original Work on the same terms and conditions as the license - granted to You under this License. - - c. If any provision of this License is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability - of the remainder of the terms of this License, and without further - action by the parties to this agreement, such provision shall be - reformed to the minimum extent necessary to make such provision - valid and enforceable. - - d. No term or provision of this License shall be deemed waived and no - breach consented to unless such waiver or consent shall be in - writing and signed by the party to be charged with such waiver or - consent. - - e. This License constitutes the entire agreement between the parties - with respect to the Work licensed here. There are no - understandings, agreements or representations with respect to the - Work not specified here. Licensor shall not be bound by any - additional provisions that may appear in any communication from - You. This License may not be modified without the mutual written - agreement of the Licensor and You. \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..ace84bf --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,216 @@ +The GNU General Public License (GPL) + Version 2, June 1991 + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +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". + + 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. + +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. + + 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. + +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: + + a) You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + + 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. + + 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.) + + 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. + +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, + + 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.) + + 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. + + 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. + +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. + +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. + + 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. + +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. + + 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. + +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. + +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 \ No newline at end of file diff --git a/config.php b/config.php index b892c67..2567f02 100644 --- a/config.php +++ b/config.php @@ -50,6 +50,7 @@ $config = array( # show thumbnails for JPEG and PNG images? 'thumbnails' => true, + 'thumb_pattern' => '/jpg|jpeg|jpe|png$/i', # Smart Date shows relative time stamps ("Yesterday, 09:34") when applicable 'smartdate' => true, @@ -60,7 +61,7 @@ $config = array( // Template & Icon settings - 'template' => 'simple', + 'template' => 'slik', 'iconset' => 'osx', 'allow_override' => true, @@ -72,7 +73,7 @@ $config = array( 'path_plugins' => array('plugins'), 'path_cache' => 'cache', - 'req_lang_ver' => '1.0.7', + 'req_lang_ver' => '1.0.8', diff --git a/exec/core.exec.php b/exec/core.exec.php index ad11f7e..19bcd2e 100644 --- a/exec/core.exec.php +++ b/exec/core.exec.php @@ -1,11 +1,31 @@ icons_large; + $sizew = $config->icons_large_w; + $sizeh = $config->icons_large_h; } else { $size = $config->icons_small; } @@ -34,8 +56,8 @@ class Icon { $icons_path = ICONS_PATH.$size.'/'; $icons_url = ICONS_URL.$size.'/'; if ( $type == 'file' ) { - if ( preg_match("/jpg|jpeg|jpe|png/i", $ext) && $thumbnail && $config->thumbnails ) { - return DLIST_URL.'thumb.php?src='.rawurlencode(DIR_URL.$file).'&w=48&h=48'; + if ( preg_match($config->thumb_pattern, $ext) && $thumbnail && $config->thumbnails ) { + return DLIST_URL.'thumb.php?src='.rawurlencode(DIR_URL.$file).'&w='.$sizew.'&h='.$sizeh; } elseif ( file_exists($icons_path.$ext.$config->icons_ext) ) { return $icons_url.$ext.$config->icons_ext; } else { @@ -50,6 +72,11 @@ class Icon { } } +//>Section> get_thumbnail + function get_thumbnail_url ($file, $sizew, $sizeh) { + return DLIST_URL.'thumb.php?src='.rawurlencode(DIR_URL.$file).'&w='.$sizew.'&h='.$sizeh; + } + //>Section> get_parent function get_parent ($size) { global $config; @@ -63,12 +90,9 @@ class Icon { //>Section> is_image function is_image ($file) { - if ( preg_match("/.*\.(jpg|jpeg|png|gif|bmp)/", $file) ) { - return true; - } elseif ( preg_match("/jpg|jpeg|png|gif|bmp/", $file) ) { - return true; - } - return false; + global $config; + if ( preg_match($config->thumb_pattern, $file) ) return true; + else return false; } //> class.end } diff --git a/exec/language.exec.php b/exec/language.exec.php index 5a1d3f4..30126d1 100644 --- a/exec/language.exec.php +++ b/exec/language.exec.php @@ -1,11 +1,31 @@ $value ) { - $return .= ($key != $last) ? ''.$value.'/' : $value.'/'; + $return .= ($key != $last) ? ''.$value.'/' : $value.'/'; $previous .= $value.'/'; } return $return; diff --git a/index.php b/index.php index 8fc3231..a7e4cc0 100644 --- a/index.php +++ b/index.php @@ -4,8 +4,24 @@ dList v2.2.5 beta - Copyright © 2006 Jim Myhrberg. All rights reserved. + Copyright © 2006 Jim Myhrberg. zynode@gmail.com + + ---------- + This program is free software; you can redistributeit 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., 59 + Temple Place, Suite 330, Boston, MA 02111-1307 USA + ---------- */ diff --git a/languages/english.lang.php b/languages/english.lang.php index abfa26e..6f708c9 100644 --- a/languages/english.lang.php +++ b/languages/english.lang.php @@ -1,10 +1,35 @@ $value ) $result = array_merge($result, glob($value)); + foreach( $input as $key => $value ) { + $glob = glob($value); + if (is_array($glob)) $result = array_merge($result, $glob); + } } elseif( is_string($input) ) { $result = glob($input); } diff --git a/libs/imagethumb.lib.php b/libs/imagethumb.lib.php index 424f246..e4b05df 100644 --- a/libs/imagethumb.lib.php +++ b/libs/imagethumb.lib.php @@ -6,8 +6,24 @@ class imageThumb { Class: imageThumb v0.2 beta - Copyright © 2006 Jim Myhrberg. All rights reserved. + Copyright © 2006 Jim Myhrberg. zynode@gmail.com + + ---------- + This program is free software; you can redistributeit 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., 59 + Temple Place, Suite 330, Boston, MA 02111-1307 USA + ---------- */ diff --git a/libs/speedometer.lib.php b/libs/speedometer.lib.php index 0ad38a7..cae7f8b 100644 --- a/libs/speedometer.lib.php +++ b/libs/speedometer.lib.php @@ -7,8 +7,24 @@ class speedometer { Class: Speedometer v0.2 Created to simplify script execution statistics & debugging... - Copyright © 2006 Jim Myhrberg. All rights reserved. + Copyright © 2006 Jim Myhrberg. zynode@gmail.com + + ---------- + This program is free software; you can redistributeit 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., 59 + Temple Place, Suite 330, Boston, MA 02111-1307 USA + ---------- */ diff --git a/resources/init.php b/resources/init.php index 2c5fed7..3cf2d83 100644 --- a/resources/init.php +++ b/resources/init.php @@ -4,8 +4,24 @@ dList Intialization - Copyright © 2006 Jim Myhrberg. All rights reserved. + Copyright © 2006 Jim Myhrberg. zynode@gmail.com + + ---------- + This program is free software; you can redistributeit 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., 59 + Temple Place, Suite 330, Boston, MA 02111-1307 USA + ---------- */ diff --git a/templates/simple/_icons.phtml b/templates/simple/_icons.phtml index 0e962c9..fa5f31b 100644 --- a/templates/simple/_icons.phtml +++ b/templates/simple/_icons.phtml @@ -10,7 +10,7 @@

  • ..

    parent_dir?>

    • list as $key => $item): $info = ($item['type'] == 'file') ? $item['size'] : $item['mtime'] ;?> -

    • +

    • \ No newline at end of file diff --git a/templates/simple/render.exec.php b/templates/simple/render.exec.php index 5a8fd31..36619c6 100644 --- a/templates/simple/render.exec.php +++ b/templates/simple/render.exec.php @@ -1,11 +1,29 @@