From: jimmacfx
Date: Fri, 25 Nov 2005 22:44:18 +0000 (+0000)
Subject: git-svn-id: https://forgesvn1.novell.com/svn/original/trunk@7 4fa712ea-3c06-0410...
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6429a6080db982bcb37421d9735e25cfec25acec;p=original.git
git-svn-id: https://forgesvn1.novell.com/svn/original/trunk@7 4fa712ea-3c06-0410-9261-c11b4c06c003
---
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index ee84f3b..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Jakub Steiner (original package, zenity-based frontend)
-Tuomas Kuosmanen (Nautilus script)
-Larry Ewing (gdk-pixbuf scaler)
diff --git a/COPYING b/COPYING
deleted file mode 100644
index d60c31a..0000000
--- a/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- 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.
-
- 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.
-
- 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.
-
- 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.
-
- 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.
-
- 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.
-
- 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.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- 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
-
- 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 Library General
-Public License instead of this License.
diff --git a/ChangeLog.old b/ChangeLog.old
deleted file mode 100644
index 4aa5c96..0000000
--- a/ChangeLog.old
+++ /dev/null
@@ -1,411 +0,0 @@
-2005-01-19 Jakub Steiner
-
- * index.php: check for comments dir writability. You can disable
- comments per album by making comments not writable.
- * inc/config.inc.php: add options to specify date segment to show
- - ($yearsince, $yearto)
-
-2005-01-16 Jakub Steiner
-
- Should update more often, or drop this in favour of NEWS, hmm
-
- * convert/imgconv: added unsharp mask & saturation boost
- thumbnails are stripped off EXIF tags. To do this for your
- existing thumbnails, run `mogrify -strip thumbs/*jpg`. You'll gain
- a lot of space if your exif header in the thumbnail includes a
- thumbnail (DOH). Added a world writable flag to comments dir,
- since it's required for the new feature - user comments.
-
- * convert/contrib: moved all the funky scripts there, please help
- me maintain them, patches very welcome.
-
- * www/:
- - Implemented user comments based on a patch by Christian
- Troester. Had to add a simple form check since it was full of
- spam the next day. Eek.
-
- - Added image access log (also needs comments dir writable)
-
- - Added some formatting to the PHP4 EXIF data
-
- - Cleaned up the default theme, now called dark. How original.
- The Previous/Next thumbnails have access keys (Alt+P, Alt+N).
- The previews are top aligned so they don't jump depending on
- the height of the image. If you don't like any of these, feel
- free to use the old stylesheet.
-
- - Moved the javascript to a separate file, wondered why IE
- suddenly prefers not to render page, then used
- instead of
-
- - Made it XHTML 1.0 Strict compilant, Didn't want to get rid of
- the -moz-* CSS extensions, but apart from that and the IE's
- Filter it's CSS2 compilant too. Classic and Gorilla don't use
- them and are compilant.
-
- - info.txt now accepts more date formats (You can even do
- foolish things like "Today")
-
- * info.txt.sample: Sample info.txt file to add metainfo to your
- album as described in the README.
-
-2004-09-28 Jakub Steiner
-
- * README:
- * www/inc/header.inc.php:
- * www/inc/www.class.inc.php:
- * www/inc/config.inc.php: implement meta information loading (see README)
- * www/inc/styles/default: new default style
-
-
-2004-02-16 Jakub Steiner
-
- * www/inc/header.inc.php:
- * www/inc/javascript.inc.php:
- * www/inc/www.class.inc.php:
- * www/inc/config.inc.php: make stylesheet selectable in the
- document (javascript dependent). Set a cookie so it gets stored
- across session.
-
- * www/inc/stylesheet/ie/ie.css: dummy (doesn't crash IE)
- * www/inc/stylesheet/default/default.css: doesn't jump in
- thumbnail view
- * www/inc/stylesheet/gorilla/gorilla.css: implemented centering
- of the image properly. First, I hacked up a gross javascript
- kludge then figured a trivial solution with CSS. ehm
- * www/index.php: solve tall images overlapping description by a
- small inline style="" definition. This breaks CSS2 validity,
- though?
-
-2004-01-10 Colin Marquardt
-
- * convert/webgallery-zenity.pl: Quote $arg in system calls to
- handle filenames with spaces.
-
- * www/index.php,
- www/inc/header.inc.php,
- www/inc/footer.inc.php,
- www/inc/www.class.inc.php,
- www/inc/funkce.inc.php:
- Make it validate with W3C.
- Make resulting HTML more readable.
-
-2003-12-15 Colin Marquardt
-
- * convert/webgallery-zenity.pl: Set mtime of web-gallery directory
- to the mtime of the first image with a good-looking time stamp.
- Skip directories and non-image files.
- Set autoflush for PROGRESS in a more readable way.
- (make_dirs): Better error messages (show them to the user).
-
-2003-12-07 Colin Marquardt
-
- * convert/webgallery-zenity.pl: Use gdk-pixbuf-convert if
- available, otherwise convert. Make error messages more in spirit
- of the HIG (zenity doesn't support Pango markup though?). Some
- cleanup.
-
-2003-11-02 Jakub Steiner
-
- patch from Colin Marquardt :
-
- * convert/gdk-pixbuf-convert.c: Add '-quality' switch.
-
- * convert/webgallery-zenity.pl: Use new '-quality' switch.
- Make error messages nicer.
-
-2003-11-01 Jakub Steiner
-
- * www/index.php
- * www/inc/exif.inc.php
- * www/inc/funkce.inc.php
- * www/inc/www.class.inc.php: stylesheet & $gallery_dir updates
-
- * www/inc/styles/gorilla/left.png
- * www/inc/styles/gorilla/right.png
- * www/inc/styles/gorilla/gorilla.css: stylesheet updates
-
- * www/inc/styles/default/bcg.png
- * www/inc/styles/default/default.css
- * www/inc/styles/default/left-16.png
- * www/inc/styles/default/left.png
- * www/inc/styles/default/logo-mini.png
- * www/inc/styles/default/minus.png
- * www/inc/styles/default/plus.png
- * www/inc/styles/default/right-16.png
- * www/inc/styles/default/right.png
- * www/inc/styles/default/title.png
- * www/inc/styles/default/zip.png: default stylesheet (WIP)
-
-2003-10-27 Jakub Steiner
-
- * www/inc/styles/gorilla/gorilla.css
- * www/inc/styles/gorilla/minus.png
- * www/inc/styles/gorilla/plus.png
- * www/inc/styles/gorilla/title.png
- * www/inc/header.inc.php
- * www/index.php: more stylesheet work. _Some_ issues. Like
- killing IE6 *ehm* ;)
-
- I'll concentrate on doing the original stylesheet first and let
- my gorilla playground there for a while.
-
-2003-10-27 Jakub Steiner
-
- * www/index.php:
- * www/inc/funkce.inc.php: applied a patch from Mark, fixing
- issues with local relative paths
-
- Also fixed archive listing in the gallery thumbnail view.
-
-2003-10-27 Jakub Steiner
-
- * www/index.php: remove legacy style definitions
-
-2003-10-27 Mark Finlay
-
- * www/index.php:
- (Re)Add year sorting when generating the index page.
-
-2003-10-26 Jakub Steiner
-
- * www/index.php
- * www/inc/config.inc.php
- * www/inc/footer.inc.php
- * www/inc/funkce.inc.php
- * www/inc/header.inc.php
- * www/inc/www.class.inc.php: start breaking style and document
- structure apart. There will be multiple styles to choose from,
- including a plaintext one. The navigation and titlebar artwork
- will be implemented in CSS eventually so no php-fu for this
- will be required.
-
- Because of this, the plaintext config option will go, since
- this will all be defined by using a specific stylesheet.
-
- Cleaned up the navigation() function.
-
- Header and footer are unfinished.
-
- * www/inc/stylesheet.inc.css: removed global stylesheet
- * www/inc/styles/gorilla/gorilla.css: sample Gorilla stylesheet.
- It will not be the default. It's just something to start with.
- The existing artwork will go to the stylesheet directory.
-
-2003-10-26 Mark Finlay
-
- * www/index.php:
- Change datefile format in expectance
- of supporting sorting by date of the
- month.
-
-2003-10-26 Mark Finlay
-
- * www/inc/config.inc.php:
- Fix comment for $gallery_dir
-
-2003-10-26 Jakub Steiner
-
- * www/index.php:
- * www/inc/www.class.inc.php:
- * www/inc/funkce.inc.php: implement $gallery_dir correctly
-
-2003-10-26 Jakub Steiner
-
- * www/inc/config.inc.php: get rid of old gallery listing
-
- * www/inc/www.class.inc.php: rename the SortedDir() function to
- be the constructor (easier-to-read code).
-
- * www/index.php: used spaces instead of tabs, the indentation
- looked weird (3 spaces == 1 tab)
-
-2003-10-26 Jakub Steiner
-
- * www/inc/www.class.inc.php:
- * www/index.php: remove old unused classes, start renaming
- cz>en variables
-
- * TODO: prepare for the stylesheet stuff
-
-2003-10-26 Mark Finlay
-
- * www/inc/config.inc.php:
- Remove the trailing / from $gallery_dir
-
- * www/index.php:
- Implement using $gallery_dir preference
-
- * www/galleries:
- Directory Added; new location for galleries
-
-2003-10-26 Mark Finlay
-
- * www/inc/config.inc.php:
- Add gallery directory preference; still need
- to make index.php use this preference.
-
-2003-10-25 Mark Finlay
-
- * www/index.php:
- Fix include() and require() statements so that they work
- on more php configurations.
-
-2003-10-25 Mark Finlay
-
- * www/inc/config.inc.php:
- Turn off EXIF retreival by default
-
-2003-10-25 Colin Marquardt
-
- * www/inc/config.inc.php: Set version to "0.7-cvs".
- Make format more customization friendly.
-
- * www/inc/exif.inc.php: Quote filename given to exec in case there
- are spaces in the path.
-
- * www/inc/config.inc.php: Add examples for jhead.
-
- * www/inc/exif.inc.php: Use trim() for comparisons, this makes it
- work with jhead as EXIF extractor.
-
-2003-10-24 Colin Marquardt
-
- * www/inc/www.class.inc.php: New class SortDir with SortedDir()
- and Read() functions. (patch by Markus Ulbricht, thanks)
-
- * www/index.php: Use SortedDir() function. (patch by Markus Ulbricht)
-
-2003-10-24 Mark Finlay
-
- * www/index.php:
- Fix navigation bar so it works with register_globals off
-
-2003-10-24 Mark Finlay
-
- * www/inc/header.inc.php:
- Use Same header for all pages
-
- * www/index.php:
- Add heirarchy navigation bar
-
-2003-10-24 Mark Finlay
-
- * www/index.php:
- Fix new sorting algorithm to show newest galleries first
-
-2003-10-24 Mark Finlay
-
- * www/index.php:
- Add the ability to use date.txt in each gallery to specify
- the date for that gallery.
-
-2003-10-23 Mark Finlay
-
- * www/inc/footer.inc.php:
- * www/inc/header.inc.php:
- ADDED; Make the header image a link to the root of the site
- instead of the Original Home Page.
-
- * www/index.php:
- Modified to use new header and footer include files;
- Added comments to sepporate different pages
-
-2003-10-22 Colin Marquardt
-
- * www/index.php:
- * www/inc/config.inc.php:
- * www/inc/exif.inc.php:
- * www/inc/funkce.inc.php:
- * www/inc/www.class.inc.php:
-
- Make it work with register_globals = Off in php.ini.
-
-2003-10-22 Colin Marquardt
-
- * convert/Makefile (uninstall): New target.
-
-2003-10-21 Colin Marquardt
-
- * convert/gdk-pixbuf-convert.c: #include
- , not local file.
- (main): Add meaningful usage text.
-
- * convert/Makefile: New file.
-
-2003-10-21 Mark Finlay
-
- Initial Checkin of Original to CVS
-
-2003-08-22 Jakub Steiner
-
- * convert/webgallery-zenity.pl: modification of Tuomas' script.
- Uses gnome2's zenity for progress bars, no gtk-perl magic
- * convert/gdk-pixbuf-convert.c: Larry Ewing's pixbuf-based
- scaler. This thing is fast!
-
-2002-11-19 Jakub Steiner
-
- * convert/imgconv:
- * convert/webgallery.pl: go back to ImageMagcik. It keeps EXIF
- info while scaling, jpeg thumbnails
- * www/index.php, www/inc/config.inc.php, www/inc/exif.inc.php:
- - nicer index
- - jpeg thumbnail support
- - don't show EXIF mode switch when no EXIF info available
- - fix portrait thumbnail scaling (should work fo most aspect
- ratios now)
- - previous/next image thumbnails (in image mode)
- - Mozilla's link navigation (First, Previous, Next, Last, Top)
- * www/left.png, right.png, top.png, plus.png, minus.png: new icons (from
- gorilla)
- * logo.xcf.bz2, www/logo.png, www/logo-mini.png: pretty logo
-
-2002-04-01 Jakub Steiner
-
- * convert/imgconv:
- * convert/webgallery.pl: use netpbm instead of ImageMagick;
- imgconv now uses the same subdir as webgallery.pl
-
- * www/index.php, www/inc/config.inc.php: portrait thumbnails are now the
- same height as the landscape ones. Also incorporated suggestion from
- Eduardo Pérez <100018135@alumnos.uc3m.es> to support ISO 8601
- date format instead of the US format.
-
- And last but not least the imgconv has a commented-out line to
- tar up or zip the HQ or MQ images. index.php links to those in
- the thumbnail view if you have them uploaded. The minithumbnail
- view also has a small floppy icon (zip.png) for the HQ version.
-
-
-2001-10-27 Jakub Steiner
-
- * www/inc/config.inc.php:
- * www/inc/exif.inc.php: php4 exif handling (untested); also added
- config option to have fixed thumbnails (looks better on
- portrait photos)
- * convert/webgallery.pl: use nautilus metafile to get comments
-
-2001-10-16 Jakub Steiner
-
- * www/index.php: mini thumbnails
- * www/inc/exif.inc.php: EXIF stuff (using Metacam), check
- REQUIREMENTS
-
-2001-04-14 Jakub Steiner
-
- * REQUIREMENTS: Imagemagick, perl, gtk-perl, bash ;)
- * convert/webgallery.pl: Tigert's Nautilus web-gallery
- script for Nautilus. It simply rocks!
- * *.png: I accidentaly left the gif images in the
- distribution
- * index.php: check for mq and hq dirs before creating a link
-
-
-16.10.2000 - few configuration addditions
- - dropped nasty GIF format for the navigation
- (1bit mask is screwed under NN4, but its CSS support
- is so crap, so that the default theme is unusable for it)
- also imgconv is using png fro thumbnails (64 colors should
- be enough for everyone (tm))
-15.10.2000 - first public release
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 023cfaf..0000000
--- a/NEWS
+++ /dev/null
@@ -1,76 +0,0 @@
-Version 0.11
-------------
-
- Convert script
- --------------
- - New scripts from Boris de Laage with
- more parameters, interactive mode, help and other goodies
- - iPhoto->Original script (Stephen Gerstacker)
-
- Web script
- ----------
- - Localisation (partial fr and cs locales). Language taken from
- UA's accept language. Based on patch by some good soul I can't
- seem to find the identity for.
- - Security and polishing (Lennart Poettering and Stephan Poehlsen).
-
-
-Version 0.10
-------------
-
- Convert script
- --------------
-
- - I added unsharp mask & saturation boost.
- - Thumbnails are stripped off EXIF tags. To do this for your existing
- thumbnails, run `mogrify -strip thumbs/*jpg`. You'll gain a lot of space if
- your exif header in the thumbnail includes a thumbnail (DOH).
- - Added a world writable flag to comments dir, since it's required for the
- new feature - user comments.
-
- * convert/contrib: moved all the funky scripts there, please help
- me maintain them, patches very welcome.
-
- Web scripts
- -----------
-
- - Implemented user comments based on a patch by Christian
- Troester. Had to add a simple form check since it was full of
- spam the next day. Eek.
-
- - Added image access log (also needs comments dir writable)
-
- - Added some formatting to the PHP4 EXIF data
-
- - Cleaned up the default theme, now called dark. How original.
- The Previous/Next thumbnails have access keys (Alt+P, Alt+N).
- The previews are top aligned so they don't jump depending on
- the height of the image. If you don't like any of these, feel
- free to use the old stylesheet.
-
- - Moved the javascript to a separate file, wondered why IE
- suddenly prefers not to render page, then used
- instead of
-
- - Made it XHTML 1.0 Strict compilant, Didn't want to get rid of
- the -moz-* CSS extensions, but apart from that and the IE's
- Filter it's CSS2 compilant too. Classic and Gorilla don't use
- them and are compilant.
-
- - info.txt now accepts more date formats (You can even do
- foolish things like "Today")
-
- * info.txt.sample: Sample info.txt file to add metainfo to your
- album as described in the README.
-
-
-version 0.9
------------
-* New default stylesheet. Is pwetty and doesn't crash IE, yay!
-* Optional per-gallery meta information. Finally you can now edit a fancy name
- (utf8), add a short description, specify author or override dir date.
- More on this in the README.
-* Restricted Galleries (using info.txt). Note you need to make sure info.txt
- isn't readable (imgconv generated an appropriate .htaccess)
-* Customizable sorting within month. $sortinmonth defines whether you want
- theitems sorted alphabetically or descending date.
diff --git a/README b/README
deleted file mode 100644
index efb7356..0000000
--- a/README
+++ /dev/null
@@ -1,28 +0,0 @@
-This package includes two separate applications. In the www dir, there is the
-PHP frontend app, the convert dir includes a simple (too simple i guess) script
-that converts your wildcard of images into three subdirs in the current
-directory. You can easily create and upload all images using:
-
- mkdir temp
- cd $_
- /path/to/imgconv *.png *.gif *.{jpeg,jpg}
- scp -rp ./web-gallery me@my_server:web_dir/gallery_name
-
-and that's it.
-
-Tuomas Kuosmannen (tigert@gimp.org) has created a Nautilus script to create
-"original" galleries (check the REQUIREMENTS file). Just copy the
-convert/webgallery.pl file to ~/.gnome2/nautilus-scripts and make sure it's got
-the execute bit set.
-
-# UPDATE
-
- Apart from using netpbm package (http://sourceforge.net/projects/netpbm/) for
- scaling images, the new webgallery-zenity.pl script uses Larry Ewing's
- gdk-pixbuf-based scaler. See REQUIREMENTS for details.
-
- Latest versions of the tools can be found at
- http://jimmac.musichall.cz/original.php3
-
---
-Jakub 'Jimmac' Steiner
diff --git a/REQUIREMENTS b/REQUIREMENTS
deleted file mode 100644
index 119c570..0000000
--- a/REQUIREMENTS
+++ /dev/null
@@ -1,44 +0,0 @@
-The web backend requires to have a PHP scripting engine running on
-your web server.
-
-There are two scripts doing the scaling work. convert/imgconv is a plain
-bash script using Imagemagick to generate thumbnails and scaling images.
-You can get Imagemagick at http://www.imagemagick.org/.
-
-# UPDATES #
-
-* netpbm
- ------
- You can use netpbm tools instead of ImageMagick for better speed. You can
- grab netpbm at http://sourceforge.net/projects/netpbm/ but ususally your
- distro ships with it already. My YDL distro has all the toos in netpbm-progs
- package.
-
-* webgallery.pl
- -------------
-
- Tuomas Kuosmannen created a nautilus script that operates on selection
- of images. It's way cooler than the bash script. Because the operation
- can take a while, it has a nifty progressbar. The script itself is in
- Perl, so you obviously need a functiuoning installation of Perl. For the
- progressbar to work, you need gtk-perl bindings. You can get them at
- ftp://ftp.gtk.org. Nautilus is a GUI file manager that rocks for photo
- management. you can grab it at http://www.eazel.com.
-
-* webgallery-zenity.pl
- --------------------
-
- I hacked up Tuomas' script to use only gnome's zenity for the progress bars,
- so there's no more gtk-perl dependency. Also this script uses Larry Ewing's
- cool gdk-pixbuf scaler. It is an alternative to ImageMagick's convert
- (sharing the basic commandline parameters) that discards EXIF information
- (yet), but is 5 to 8 times as fast. You can really tell on large galleries.
- You can find both at the convert/ directory. Instructions how to compile
- gdk-pixbuf-convert.c are included in the file header.
-
-
-If you wan't to have advanced EXIF information for your photos, make sure you
-use a recent ImageMagick so that convert doesn't throw away this info when
-scaling down. Also grab Metacam
-(http://www.cheeseplant.org/~daniel/pages/metacam.html) and configure the path
-to it in inc/config.inc.php.
diff --git a/TODO b/TODO
deleted file mode 100644
index 83b0280..0000000
--- a/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-- editable image comments (in php, not using nautilus metadata as ATM)
-- mysql logging (how many people seen particular picture, rating etc) / optional
-- default setting for quality (LQ/MQ/HQ)
-
-
-Jimmac: * make an XHTML document with external CSS stylesheet(s)
- * get rid of czech comments and variable names
diff --git a/convert/contrib/Original_Script.scpt b/convert/contrib/Original_Script.scpt
deleted file mode 100644
index 5ff3bd5..0000000
Binary files a/convert/contrib/Original_Script.scpt and /dev/null differ
diff --git a/convert/contrib/imgconv.rb b/convert/contrib/imgconv.rb
deleted file mode 100644
index 676ef42..0000000
--- a/convert/contrib/imgconv.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/ruby
-
-require 'fileutils'
-
-if ARGV.size < 2
- puts "Usage: #$0 source_images gallery_name"
- exit 1
-end
-
-class Gallery
-
- CONF = {}
- CONF[:thumbs] = { :target => 'thumbs', :geom => '120x120', :quality => '60' }
- CONF[:lq] = { :target => 'lq', :geom => '640x480', :quality => '90' }
- CONF[:mq] = { :target => 'mq', :geom => '800x600', :quality => '80' }
-
- def initialize(source_dir = '.', gallery = 'web-gallery')
- @source_dir = source_dir
- @gallery = gallery
- end
-
- def setup_dirs
- %w(thumbs lq mq hq zip comments).each do |dir|
- target = File.join(@gallery, dir)
-
- if File.exists? target
- warn "Skipping creation of, #{target}, already exists."
- next
- end
-
- FileUtils.mkdir_p target
- end
- end
-
- def setup_access
- ht = File.join(@gallery, ".htaccess")
-
- open(ht, 'w') do |fp|
- fp.puts ""
- fp.puts " deny from all"
- fp.puts ""
- end
- end
-
- def create_comment(num)
- comment_file = File.join(@gallery, 'comments', "#{num}.txt")
-
- open(comment_file, 'w') do |fp|
- fp.puts "image #{num}"
- end
- end
-
- def convert_image(conf, src, num)
- target = File.join(@gallery, conf[:target], "img-#{num}.jpg")
-
- cmd = "convert -geometry #{conf[:geom]} -unsharp 1x5 "
- cmd += "-quality #{conf[:quality]} #{src} #{target}"
-
- system cmd
- end
-
- def build_zip_files
- puts "Building zip files."
- system("zip -R #@gallery/zip/mq.zip #@gallery/mq/*.jpg");
- system("zip -R #@gallery/zip/hq.zip #@gallery/hq/*.jpg");
- end
-
- def create
- setup_dirs
- setup_access
-
- num = 1
-
- Dir["#@source_dir/*.jpg"].sort.each do |src|
- puts "Working on: #{src}"
-
- FileUtils.cp(src, File.join(@gallery, 'hq', "img-#{num}.jpg"))
-
- convert_image(CONF[:thumbs], src, num)
- convert_image(CONF[:lq], src, num)
- convert_image(CONF[:mq], src, num)
-
- create_comment(num)
-
- num += 1
- end
-
- build_zip_files
- end
-end
-
-gal = Gallery.new ARGV[0], ARGV[1]
-gal.create
-
diff --git a/convert/contrib/web-gallery b/convert/contrib/web-gallery
deleted file mode 100644
index 952f8fe..0000000
--- a/convert/contrib/web-gallery
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/bash
-
-# Nautilus script to generate image galleries for use with original
-# uses Gnome's zenity for user dialogs
-# uses ImageMagick's convert
-# (c) 2005 boris de laage
-# based on imgconv bu Jakub Steiner
-
-set -e
-
-name=`basename $0`
-
-# convert options
-convertor=`which convert`
-extra_ops="-strip"
-
-#default options
-dir=./web-gallery
-
-files=$(echo $@ | sed 's/ /\n/g' | sort)
-numfiles=$#
-
-if [ -z $convertor ]; then
- zenity --title $name --error --error-text "convert not found !"
- exit 1
-fi
-
-if [ $numfiles == 0 ]; then
- zenity --title $name --error --error-text "No input files !"
- exit 1
-fi
-
-#progressbar stuff
-steps=5
-increment=`expr 100 / \( $numfiles \* $steps \) `
-progress=0
-
-
-mkdir -p $dir/thumbs
-mkdir -p $dir/lq
-mkdir -p $dir/mq
-mkdir -p $dir/hq
-mkdir -p $dir/zip
-mkdir -p $dir/comments
-chmod o+w $dir/comments
-
-echo "" > $dir/.htaccess
-echo " deny from all" >> $dir/.htaccess
-echo "" >> $dir/.htaccess
-
-
-i=1
-
-for imagefile in $files
- do
- process="converting $imagefile"
-
- # Thumbnail
- echo "#$process : thumbnail"
- $convertor -geometry 120x120 -modulate 100,140,100 -unsharp 1x20 \
- -quality 60 $extra_opts $imagefile $dir/thumbs/img-$i.jpg
- progress=`expr $progress + $increment`
- echo $progress
-
- # LQ
- echo "#$process : lq"
- $convertor -geometry 640x480 -modulate 100,130,100 -unsharp 1x5 \
- -quality 90 $imagefile $dir/lq/img-$i.jpg
- progress=`expr $progress + $increment`
- echo $progress
-
- # MQ
- echo "#$process : mq"
- $convertor -geometry 1024x768 -modulate 100,130,100 -unsharp 1x5 \
- -quality 80 $imagefile $dir/mq/img-$i.jpg
- progress=`expr $progress + $increment`
- echo $progress
-
- # HQ
- echo "#$process : hq"
- cp $imagefile $dir/hq/img-$i.jpg
- progress=`expr $progress + $increment`
- echo $progress
-
- # Comments
- echo "#$process : comments"
- # template for comment
- echo "Photo $i
" > $dir/comments/$i.txt
- progress=`expr $progress + $increment`
- echo $progress
-
- i=`expr $i + 1`
-
-done | zenity --progress --title="Scaling images, please wait..." --auto-close
-
-
-(
- echo "1"
- echo "#Making archives"
- zip -R $dir/zip/mq.zip web-gallery/mq/*.jpg
- zip -R $dir/zip/hq.zip web-gallery/hq/*.jpg
- echo "100"
-) | zenity --progress --pulsate --auto-close --title="Zipping images"
-
-zenity --title $name --info --info-text "Your O.R.I.G.I.N.A.L gallery is ready."
diff --git a/convert/contrib/webgallery-zenity.pl b/convert/contrib/webgallery-zenity.pl
deleted file mode 100755
index 7f06826..0000000
--- a/convert/contrib/webgallery-zenity.pl
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/perl -w
-
-# little script to generate image galleries for use with original PHP backend
-# uses Gnome's zenity for user dialogs
-# uses gdk-pixbuf-convert if available, otherwise convert (from ImageMagick)
-# (c) 2003-2004 Jakub 'jimmac' Steiner, (c) 2003-2004 Colin Marquardt
-# based on webgallery.pl by Tuomas Kuosmanen
-
-use strict;
-use warnings;
-use FileHandle;
-
-my $num_of_args = scalar @ARGV;
-
-if (!@ARGV or ($num_of_args == 0)) {
- exec("zenity --error --title \"\" --text \"No args\n\nYou have to select images to work on.\"");
- exit;
-}
-
-my $GdkPixbufConvert = "gdk-pixbuf-convert";
-my $Convert = "convert";
-my $dir = "web-gallery";
-
-
-# try to find a scaler program
-my $scaler;
-$scaler = `which $GdkPixbufConvert`;
-if ($scaler eq "") {
- $scaler = `which $Convert`;
-}
-if ($scaler eq "") {
- exec("zenity --error --title \"\" --text \"No scaling program\n\nYou need to have '$GdkPixbufConvert' or '$Convert' available.\"");
- exit;
-}
-chomp $scaler;
-
-my @args = sort(@ARGV);
-my $NumOfIncrements = 5; # 5 increments per file (as we are
- # expecting to create 5 files for each
- # image)
-my $increment = 100 / ($num_of_args * $NumOfIncrements);
-my $progress=0;
-my $reply="";
-
-sub make_dirs {
- my $ErrMsg;
- unless (-d "$dir") {
- mkdir("./$dir") or
- $ErrMsg .= "Could not create './$dir'!\n";
- }
- unless (-d "$dir/thumbs") {
- mkdir("./$dir/thumbs") or
- $ErrMsg .= "Could not create './$dir/thumbs'!\n";
- }
- unless (-d "$dir/lq") {
- mkdir("./$dir/lq") or
- $ErrMsg .= "Could not create './$dir/lq'!\n";
- }
- unless (-d "$dir/mq") {
- mkdir("./$dir/mq") or
- $ErrMsg .= "Could not create './$dir/mq'!\n";
- }
- unless (-d "$dir/hq") {
- mkdir("./$dir/hq") or
- $ErrMsg .= "Could not create './$dir/hq'!\n";
- }
- unless (-d "$dir/comments") {
- mkdir("./$dir/comments") or
- $ErrMsg .= "Could not create './$dir/comments'!\n";
- }
- unless (-d "$dir/zip") {
- mkdir("./$dir/zip") or
- $ErrMsg .= "Could not create './$dir/zip'!\n";
- }
- if ($ErrMsg ne "") {
- exec("zenity --error --title \"Giving Up\" --text \"Fatal Error\n\n$ErrMsg\"");
- die "Errors occurred:\n$ErrMsg";
- }
-}
-make_dirs();
-
-# ------------------------------------------------------------------------
-open(PROGRESS,"| zenity --progress --auto-close --title=\"\" \\
- --text=\"Scaling images, please wait\"");
-PROGRESS->autoflush(1);
-
-my $i=1;
-my $SetDirDate = 0;
-foreach my $arg (@args) {
- if (-d $arg) { # argument is a directory, skip it
- $progress += ($increment * $NumOfIncrements);
- print PROGRESS "$progress\n";
- next;
- }
- my $FileType = `file "$arg"`;
- unless ($FileType =~ /image data/i) { # check for valid file type
- # maybe check for JPEG and PNG explicitly?
- #print $FileType;
- $progress += ($increment * $NumOfIncrements);
- print PROGRESS "$progress\n";
- next;
- }
- if ($SetDirDate == 0) { # we are looking at the first image
- $SetDirDate = (stat $arg)[9]; # get mtime
- if ($SetDirDate > 0) {
- # (can also return -1 if strange mtime, don't use this
- # time stamp then)
- # set mtime of gallery directory to the one of the first
- # image file:
- $reply .= `touch -r "$arg" $dir`;
- print "Setting mtime of $dir to $SetDirDate\n";
- } else {
- # give it another try the next time around:
- $SetDirDate = 0;
- }
- }
- # thumbnails
- $reply .= `$scaler -geometry 120x120 -quality 60 "$arg" $dir/thumbs/img-$i\.jpg 2>&1`;
- $progress += $increment;
- print PROGRESS "$progress\n";
- # LQ size
- $reply .= `$scaler -geometry 640x480 -quality 75 "$arg" $dir/lq/img-$i\.jpg 2>&1`;
- $progress += $increment;
- print PROGRESS "$progress\n";
- # MQ size
- $reply .= `$scaler -geometry 800x600 -quality 75 "$arg" $dir/mq/img-$i\.jpg 2>&1`;
- $progress += $increment;
- print PROGRESS "$progress\n";
- # HQ size (just copy the original)
- $reply .= `cp "$arg" $dir/hq/img-$i\.jpg 2>&1`;
- $progress += $increment;
- print PROGRESS "$progress\n";
- # comment
- open(COMM, ">$dir/comments/$i\.txt");
- print(COMM "image $i\n");
- close(COMM);
- $progress += $increment;
- print PROGRESS "$progress\n";
- $i++;
-
- # an error occurred:
- if ($reply ne "") {
- print PROGRESS "100\n";
- close(PROGRESS);
- exec("zenity --error --title \"\" --text \"Fatal Error\n\n$reply\"");
- die("Error while scaling");
- }
-}
-print PROGRESS "100\n";
-close(PROGRESS);
-
-# ------------------------------------------------------------------------
-open(PROGRESS, "| zenity --progress --pulsate --auto-close \\
---title \"\" --text \"Zipping images\"");
-PROGRESS->autoflush(1);
-print PROGRESS "1";
-system("zip -R $dir/zip/mq.zip $dir/mq/*.jpg");
-system("zip -R $dir/zip/hq.zip $dir/hq/*.jpg");
-print PROGRESS "100\n";
-close(PROGRESS);
diff --git a/convert/contrib/webgallery.pl b/convert/contrib/webgallery.pl
deleted file mode 100755
index d8a7ce7..0000000
--- a/convert/contrib/webgallery.pl
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/usr/bin/perl -w
-#
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# #
-# Web Gallery script for Nautilus - Depends on "original" web backend #
-# for displaying the gallery. #
-# #
-# Written in perl because I suck more with sh scripting. #
-# Also needs gnome-utils for gdialog. #
-# #
-# Hacked together by Tuomas Kuosmanen #
-# Tweaked to use NetPBM by Jakub Steiner #
-# Released under the GPL license. #
-# #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-die "No files to convert" unless @ARGV;
-
-use Gtk;
-init Gtk;
-
-@files = sort(@ARGV);
-
-my $dir = "web-gallery";
-
-sub make_dirs {
-
- unless (-d "$dir") {
- mkdir("./$dir") or die "Aargh.\n";
- }
- unless (-d "$dir/thumbs") {
- mkdir("./$dir/thumbs") or die "Aargh.\n";
- }
- unless (-d "$dir/lq") {
- mkdir("./$dir/lq") or die "Aargh.\n";
- }
- unless (-d "$dir/mq") {
- mkdir("./$dir/mq") or die "Aargh.\n";
- }
- unless (-d "$dir/hq") {
- mkdir("./$dir/hq") or die "Aargh.\n";
- }
- unless (-d "$dir/comments") {
- mkdir("./$dir/comments") or die "Aargh.\n";
- }
-}
-
-sub make_gallery_fake {
- my $foo = shift;
- print ("PARAM: $foo\n");
- sleep 1;
-}
-
-
-$w = new Gtk::Window;
-$label = new Gtk::Label(' Web Gallery generation in progress... ');
-$pbar = new Gtk::ProgressBar;
-$vb = new Gtk::VBox(0, 0);
-$b = new Gtk::Button('Cancel');
-$w->add($vb);
-$vb->add($label);
-$vb->add($pbar);
-$vb->add($b);
-
-$b->signal_connect('clicked', sub {Gtk->exit(0)});
-$w->signal_connect('destroy', sub {Gtk->exit(0)});
-
-$w->show_all();
-$i = 0;
-$pbar->update($i);
-
-@files = sort(@ARGV);
-$num_of_files = scalar @files;
-$increment = 1 / ( 5 * $num_of_files );
-$i = 1;
-$progress = 0;
-
-make_dirs();
-#read nautilus metafile if available
-open(METAXML, "./.nautilus-metafile.xml") or print("no metafile");
-@meta_xml = ;
-close(METAXML);
-
-
-foreach $file (@files) {
-
- $pbar->update($progress);
- $pbar->set_show_text(1);
- $pbar->set_format_string("$i of $num_of_files");
- $progress += $increment;
- while (Gtk->events_pending) {
- Gtk->main_iteration;
- }
-
- # do the stuff, collect error messages to a variable.
- #$reply=`convert -geometry 120x120 -colors 64 -dither $file $dir/thumbs/img-$i\.png 2>&1`;
- $reply=`convert -geometry 120x120 $file $dir/thumbs/img-$i\.jpg 2>&1`;
- #$reply =`jpegtopnm $file | pnmscale -xysize 120 120 | ppmquant -floyd 16 | pnmtopng -interlace -compression 9 > $dir/thumbs/img-$i\.png 2>&1`;
-
- $pbar->update($progress);
- $progress += $increment;
- while (Gtk->events_pending) {
- Gtk->main_iteration;
- }
-
- $reply = $reply . `convert -geometry 640x640 $file $dir/lq/img-$i.jpg 2>&1`;
- #$reply = $reply . `jpegtopnm $file | pnmscale -xysize 640 640 | ppmtojpeg --quality 80 --progressive > $dir/lq/img-$i.jpg 2>&1`;
-
- $pbar->update($progress);
- $progress += $increment;
- while (Gtk->events_pending) {
- Gtk->main_iteration;
- }
-
- $reply = $reply . `convert -geometry 800x800 $file $dir/mq/img-$i.jpg 2>&1`;
- #$reply = $reply . `jpegtopnm $file | pnmscale -xysize 800 800 | ppmtojpeg --quality 80 --progressive > $dir/mq/img-$i.jpg 2>&1`;
-
- $pbar->update($progress);
- $progress += $increment;
- while (Gtk->events_pending) {
- Gtk->main_iteration;
- }
-
- $reply = $reply . `cp $file $dir/hq/img-$i.jpg 2>&1`;
-
- $pbar->update($progress);
- $progress += $increment;
- while (Gtk->events_pending) {
- Gtk->main_iteration;
- }
-
- # comment
- open (COMM, ">$dir/comments/$i\.txt");
- print(COMM "image $i: \n");
- #check for comments in the metafile
- #maybe using a proper XML parser would make sense in future
- foreach $radek (@meta_xml) {
- chomp($radek);
- if ($radek =~ m/.*name="([^"]*)".*annotation="([^"]*).*"/) {
- if ($1 eq $file) {
- print(COMM "$2\n");
- }
- }
- }
- close(COMM);
-
- $i++;
-
- # print possible error messages
- if ($reply ne "") {
- print("There was an error message: $reply\n");
- }
-}
-
diff --git a/convert/imgconv b/convert/imgconv
deleted file mode 100755
index 3ac8bc5..0000000
--- a/convert/imgconv
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-#sem dodelat err
-
-adresar=$@
-
-mkdir ./web-gallery
-mkdir ./web-gallery/thumbs
-mkdir ./web-gallery/lq
-mkdir ./web-gallery/mq
-mkdir ./web-gallery/hq
-mkdir ./web-gallery/zip #used for image tarballs
-mkdir ./web-gallery/comments
-
-i=1
-for soubor in $adresar
- do
- echo "konvertuji $soubor"
-# IMAGEMAGICK
- #convert -geometry 160x120 -colors 16 -dither $soubor ./web-gallery/thumbs/img-$i.png
- convert -geometry 120x120 $soubor ./web-gallery/thumbs/img-$i.jpg
- convert -geometry 640x480 $soubor ./web-gallery/lq/img-$i.jpg
- convert -geometry 800x600 $soubor ./web-gallery/mq/img-$i.jpg
-
-# NETPBM
- #jpegtopnm $soubor > temp.pnm
- ##cat temp.pnm | pnmscale -xysize 120 120 | ppmquant -floyd 16 | pnmtopng -interlace -compression 9 > ./web-gallery/thumbs/img-$i.png
- #cat temp.pnm | pnmscale -xysize 120 120 | ppmtojpeg --quality 80 --progressive > ./web-gallery/thumbs/img-$i.jpg
- #cat temp.pnm | pnmscale -xysize 640 640 | ppmtojpeg --quality 80 --progressive > ./web-gallery/lq/img-$i.jpg
- #cat temp.pnm | pnmscale -xysize 800 800 | ppmtojpeg --quality 80 --progressive > ./web-gallery/mq/img-$i.jpg
- #rm temp.pnm
-
- cp $soubor ./web-gallery/hq/img-$i.jpg
- # template for comment
- echo "image $i
" > ./web-gallery/comments/$i.txt
- i=`expr $i + 1`
-done
-
-#####################
-# Tar-up/zip images #
-#####################
-
-#tar cvjf web-gallery/zip/mq.tar.bz2 mq/*.jpg
-#tar cvjf web-gallery/zip/hq.tar.bz2 hq/*.jpg
-zip -R web-gallery/zip/mq.zip web-gallery/mq/*.jpg
-zip -R web-gallery/zip/hq.zip web-gallery/hq/*.jpg
diff --git a/info.txt.sample b/info.txt.sample
deleted file mode 100644
index 5a5f0e8..0000000
--- a/info.txt.sample
+++ /dev/null
@@ -1,6 +0,0 @@
-name|Sample Gallery
-description|This is a short description
-author|Joe Doe
-date|18.01.2005
-restricted_user|cl3v3r
-restricted_password|44S
diff --git a/logo.xcf.bz2 b/logo.xcf.bz2
deleted file mode 100644
index 73268eb..0000000
Binary files a/logo.xcf.bz2 and /dev/null differ
diff --git a/www/bcg.png b/www/bcg.png
deleted file mode 100644
index d4f7ac8..0000000
Binary files a/www/bcg.png and /dev/null differ
diff --git a/www/favicon.ico b/www/favicon.ico
deleted file mode 100644
index 6d93ef7..0000000
Binary files a/www/favicon.ico and /dev/null differ
diff --git a/www/inc/comment.inc.php b/www/inc/comment.inc.php
deleted file mode 100644
index 627a747..0000000
--- a/www/inc/comment.inc.php
+++ /dev/null
@@ -1,33 +0,0 @@
-\n";
-
-?>
- " . __('Post a Comment') . ":"; ?>
-
- [
- " . __('Show Form') . "" . __('Hide Form') . ""; ?>
- ]
-
-
-
-
-form_start($ThisUrl, "post", NULL);
-$page->input("text", "commentname", $username, __('Name:'), NULL, _('Enter your name.') );
-$page->input("checkbox", "savecommentname", "1", __('Remember Name:'), "yes",
- __('Should the browser remember your name?'));
-$magic_number = random_digits(4);
-//temporary. should generate an image instead
-echo "
-
diff --git a/www/inc/config.inc.php b/www/inc/config.inc.php
deleted file mode 100644
index 5bfb36e..0000000
--- a/www/inc/config.inc.php
+++ /dev/null
@@ -1,71 +0,0 @@
-
-#base dirname
- eregi("^(.*)/[^/]*$", $ScriptFileName, $x);
- $root = $x[1];
-# ===========================================================================
-#images
- $img["left"] = "left.png";
- $img["right"] = "right.png";
- $img["top"] = "top.png";
-# ===========================================================================
-#thumbnail behaviour
- //keep this unset for dynamic thumbnail size
- //$thumbsize = "fixed";
- //How the previous and Next thumbnails should be scaled
- // 1 is 1:1, >1 is smaller, <1 is bigger
- $PNthumbScale = 1;
-# ===========================================================================
-#colors and backgrounds
-# this has been removed in favour of custom CSS stylesheets
-# ===========================================================================
-#app info
- $app["name"] = "Original"; // opensource remote image gallery,
- // initialy not as lovely
- $app["url"] = "http://jimmac.musichall.cz/original.php3";
- $app["version"] = "0.8-cvs";
-# ===========================================================================
-# EXIF metadata app path (helper app for php3 and older php4)
-# uncomment the method you want to use if you want EXIF data reported
-# ---------------------------------------------------------------------------
-## use internal function of PHP 4 (does not seem to work yet):
-# $exif_prog = "php4";
-# ---------------------------------------------------------------------------
-## use metacam (give absolute path to the binary on the server):
-# $exif_prog = "/usr/local/bin/metacam";
-## what EXIF data to show (if unset, all will be shown)
-## some example fields for metacam:
-# $exif_show = array("Image Capture Date", "Make", "Model",
-# "Exposure Program", "Exposure Mode",
-# "Focal Length", "Exposure Time",
-# "Aperture Value", "ISO Speed Rating", "White Balance",
-# "Flash", "Scene Capture Type",
-# "Metering Mode", "Max Aperture Value", "Shutter Speed Value"
-# );
-# ---------------------------------------------------------------------------
-## use jhead (give absolute path to the binary on the server):
-# $exif_prog = "/usr/local/bin/jhead";
-## what EXIF data to show (if unset, all will be shown)
-## some example fields for jhead:
-# $exif_show = array(
-# "Date/Time",
-# "Camera make",
-# "Camera model",
-# "Focal length",
-# "Exposure time",
-# "Aperture Value",
-# "ISO equiv.",
-# "Exposure",
-# );
-# ===========================================================================
-## Gallery Directory
-# This is a path relative to the directory where original is installed
-# eg. it can be "../galleries" to use a galleries dir above the original dir.
- $gallery_dir="galleries";
-
-#css styles
- $themes = array(
- "default" => "inc/styles/default/default.css",
- "ie" => "inc/styles/ie/ie.css",
- "gorilla" => "inc/styles/gorilla/gorilla.css"
- );
-?>
diff --git a/www/inc/exif.inc.php b/www/inc/exif.inc.php
deleted file mode 100644
index be76168..0000000
--- a/www/inc/exif.inc.php
+++ /dev/null
@@ -1,139 +0,0 @@
-\n";
- //co ukazat (podle exif_show
- if ($exif_show) {
- while(list($k,$v)=each($exif_array)) {
- while ($x = current($exif_show)) {
- if ($x==$k) {
- echo "
\n";
- echo "\n";
- echo "";
- } else {
- // in one line
- if ($exif_show) {
- while(list($k,$v)=each($exif_array)) {
- while ($x = current($exif_show)) {
- if ($x==$k) {
- echo "$v | ";
- }
- next($exif_show);
- }
- }
- } else {
- while(list($k,$v)=each($exif_array)) {
- echo "$v | ";
- }
- }
- # only show if EXIF header exists
- if ($exif_array["Make"]) {
- echo "";
- echo "display table\n";
- echo "
\n";
- }
- }
-
-} else {
- // the old code, handles e.g. metacam and jhead as EXIF extractors
- // loading lq means it won't work if the convertor doesn't copy EXIF data
- // (newer ImageMagick can)
- exec("$exif_prog \"$gallery_dir/$galerie/lq/img-$snimek.jpg\"", $exif_data, $exif_status);
- if ($exif_status!="2") {
- if ($exif_style=="descriptive") {
- // fancy table look
- echo "
\n";
- while ($x = current($exif_data)) {
- eregi("^ *([^:]*): *(.*)", $x, $y);
- //filter according to $exif_show array
- if (!$exif_show) { //all fields shown
- echo "