diff -Naur gallery-1.5.2/ChangeLog gallery-1.5.2-pl2/ChangeLog --- gallery-1.5.2/ChangeLog 2006-01-19 19:51:52.000000000 +0100 +++ gallery-1.5.2-pl2/ChangeLog 2006-02-07 03:32:38.000000000 +0100 @@ -1,3 +1,50 @@ +2006-02-06 Chris Kelly 1.5.2-pl2 + +* Release: 1.5.2-pl2 + +2006-02-07 Jens Tkotz 1.5.2-pl2-cvs-b1 + + * FIX: If zipdownload is enabled and zipping failed, + gallery regardless tried to delete the parentfolder of the non existing file. + This deletes A LOT MORE then we want. + +2006-02-06 Chris Kelly 1.5.2-pl1 + + * Release: 1.5.2-pl1 + +2006-02-06 Jens Tkotz 1.5.2-pl1-cvs-b6 + + * SECURITY-FIX: + If you trick an admin or a ser who has owner privs in a gallery into + clicking on prepared link and it will cause them to insert a bad file path + into their album data which could then cause a local file execution bug. + + The Team would like to thank + Tom Saville (seregon@bughunter.net) and his team from http://digitalarmaments.com + +2006-02-02 Jens Tkotz 1.5.2-pl1-cvs-b5 + +* Fix: Typo in lib/imageManipulation (netPPM instead netPBM). + This causes watermarking to fail when watermark is a gif. + +2006-02-02 Jens Tkotz 1.5.2-pl1-cvs-b4 + +* Fix: adminOtherChangesEmail was not working. + Thanks to rbeuker from forums. + +2006-02-02 Jens Tkotz 1.5.2-pl1-cvs-b3 + + * Fix: setup/session_test.php didnt work correct with register globals off. + +2006-02-02 Jens Tkotz 1.5.2-pl1-cvs-b2 + +* Fix: "move" and "copy" an item was restricted to admins. + Reverted to people who have permissions to edit an album. + +2006-02-02 Jens Tkotz 1.5.2-pl1-cvs-b1 + + * Fix: Pierres Fix from 1.5.2-RC3-cvs-b7 was only in HEAD. + 2006-01-19 Chris Kelly 1.5.2 * Release: 1.5.2 Final diff -Naur gallery-1.5.2/classes/Album.php gallery-1.5.2-pl2/classes/Album.php --- gallery-1.5.2/classes/Album.php 2006-01-09 03:47:03.000000000 +0100 +++ gallery-1.5.2-pl2/classes/Album.php 2006-02-02 01:37:09.000000000 +0100 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: Album.php,v 1.280.2.3 2006/01/09 02:47:03 jenst Exp $ + * $Id: Album.php,v 1.280.2.4 2006/02/02 00:37:09 jenst Exp $ */ ?> getEmailMeList('other'); if (!empty($to)) { - $to = $this->getEmailMeList('other'); $text = ''; $msg_str = call_user_func_array('sprintf', $msg); $subject = sprintf(_("Changes to Album: %s"), $this->fields['name']); diff -Naur gallery-1.5.2/docs/g1package/gallery1-install.faq.a.html gallery-1.5.2-pl2/docs/g1package/gallery1-install.faq.a.html --- gallery-1.5.2/docs/g1package/gallery1-install.faq.a.html 2006-01-19 19:57:25.000000000 +0100 +++ gallery-1.5.2-pl2/docs/g1package/gallery1-install.faq.a.html 2006-02-07 03:36:21.000000000 +0100 @@ -2,7 +2,7 @@ How can I get the latest version of Gallery?
A.2. How can I get the latest CVS version of Gallery? -
A.1.

+ A.1.

How can I get the latest version of Gallery?

There are two different 'latest' versions of Gallery. There is the version @@ -14,7 +14,7 @@ more current bugfixes and neat modifications. The version in CVS is typically pretty stable, since the developers use it to power their own personal Galleries, but it is bound to have the occasional major glitch. -

A.2.

+

A.2.

How can I get the latest CVS version of Gallery?

The CVS binaries are a prerequisite. You can get them from cvshome.org. diff -Naur gallery-1.5.2/docs/g1package/gallery1-install.faq.b.html gallery-1.5.2-pl2/docs/g1package/gallery1-install.faq.b.html --- gallery-1.5.2/docs/g1package/gallery1-install.faq.b.html 2006-01-19 19:57:25.000000000 +0100 +++ gallery-1.5.2-pl2/docs/g1package/gallery1-install.faq.b.html 2006-02-07 03:36:21.000000000 +0100 @@ -10,7 +10,7 @@

B.5. Where can I find the unzip and zipinfo binaries? -
B.1.

+ B.1.

The setup page tells me that mod_rewrite is not installed. Since mod_rewrite is optional, how do I configure this option?

@@ -25,13 +25,13 @@ For more information on mod_rewrite check out the Apache module mod_rewrite page. -

B.2.

+

B.2.

Does Gallery work under Windows?

Many people have gotten Gallery to work under Windows using Apache. However, Gallery does not interact well with IIS, because PHP still has some issues with executing programs like NetPBM and ImageMagick. -

B.3.

+

B.3.

How do I run PHP as a CGI?

Running PHP as a CGI is usually done when PHP is not available on your @@ -79,7 +79,7 @@ directory. It is extremely difficult to provide support for this, because there are many things that can go wrong and it's hard to diagnose the problem. -

B.4.

+

B.4.

How do I force .php files to use PHP4?

In the rare case that your ISP has PHP3 and PHP4 installed on the same server, @@ -91,7 +91,7 @@ ForceType application/x-httpd-php </Files>

-

B.5.

+

B.5.

Where can I find the unzip and zipinfo binaries?

diff -Naur gallery-1.5.2/docs/g1package/gallery1-install.faq.c.html gallery-1.5.2-pl2/docs/g1package/gallery1-install.faq.c.html --- gallery-1.5.2/docs/g1package/gallery1-install.faq.c.html 2006-01-19 19:57:26.000000000 +0100 +++ gallery-1.5.2-pl2/docs/g1package/gallery1-install.faq.c.html 2006-02-07 03:36:22.000000000 +0100 @@ -116,7 +116,7 @@

C.42. When I open Gallery inside Mambo, i get "Gallery seems to be inside Mambo, but we couldn't get the necessary info." What am i or my visitors doing wrong? -
C.1.

+ C.1.

When I try to access the configuration wizard, I get a 500 Internal Server Error. What's up?

@@ -134,7 +134,7 @@ If you don't have access to your httpd.conf, delete the .htaccess file in the setup/ directory. -

C.2.

+

C.2.

I've installed Gallery and all seems well. But when I try to upload an image it says Unable to make thumbnail(0) or Invalid image. What gives? @@ -215,7 +215,7 @@

If you still can't find a solution, try asking in the Gallery Support Forums. -

C.3.

+

C.3.

My ISP has a really old version of PHP, something before 4.0.4pl1, which Gallery can't work with. What do I do?

@@ -224,14 +224,14 @@ probably contains security problems. Your only other good option is to install PHP as a CGI, as in FAQ B.3 -

C.4.

+

C.4.

Whenever I try to upload grayscale JPEG images I get a Unable to make thumbnail error. Why?

This is a bug in some versions of NetPBM that cause it to choke on grayscale images. This is fixed in the version of NetPBM available on the Gallery download page. -

C.5.

+

C.5.

Whenever I try to upload an image in Gallery, I get all these errors about safe mode. How can I fix this?

@@ -249,7 +249,7 @@ Find another host that doesn't use safe mode. Some are listed in the Gallery Hosting Referrals Page -

C.6.

+

C.6.

Why can't I upload big files (over a megabyte or two)?

Craig Goranson wrote a very informative @@ -271,14 +271,14 @@ you want (until you hit upload_max_filesize and/or post_max_size -- see the above email link for more information). -

C.7.

+

C.7.

When I try to run configure.sh, I get an error like this: chmod: getting attributes of `setup\r': No such file or directory How do I fix that?

The answer is to simply upload the configure.sh file in ASCII FTP mode -

C.8.

+

C.8.

When I try to click on the "[login]" link on the Gallery page, nothing happens (no window pops up). What's wrong?

@@ -299,7 +299,7 @@ (note the "www" is missing), you'll still see your Gallery, but you'll experience this problem. The solution is to pick one hostname and stick with it. -

C.9.

+

C.9.

When I try to login, everything seems to go correctly, but Gallery doesn't log me in?

@@ -346,7 +346,7 @@ you need to use the one that is specified in your configuration. If you use the one that's not specified, you may be unable to login. Another remedy for this issue is to follow the instructions in FAQ C.22 -

C.10.

+

C.10.

Why do I see Warning: Undefined variable: GALLERY_BASEDIR... at the top of the page?

@@ -367,7 +367,7 @@ 

         php_value error_reporting 2039

-

C.11.

+

C.11.

I can successfully upload photos, but when I look in my album all I see are broken image icons. Why?

@@ -375,7 +375,7 @@ wizard. You can fix this by re-running the config wizard and correcting the Albums URL value or you can edit the config.php file and fix the $gallery->app->albumDirURL variable. -

C.12.

+

C.12.

Why do I get Failed opening 'html_wrap/inline_albumthumb.header.default'

If you unzipped/untarred the Gallery script on a Mac running OS 9.2.1 @@ -389,7 +389,7 @@ will solve this. This is only a problem if its untarred/gzipped on a Mac. If they are unzipped on the server they will work fine. [Thanks James O'Donnell] -

C.13.

+

C.13.

Why do I see this error: 

         jpegtopnm: WRITING PPM FILE
@@ -403,7 +403,7 @@
         
  • 
          Your NetPBM binaries have a bug.  Please use the NetPBM binaries found
          on the Gallery Download Page.
-        
    • C.14.
    
+        
    C.14.
    
        Why, when I try to upload images, does it say No images uploaded
        ?
       
    
@@ -417,7 +417,7 @@
          file_uploads isn't enabled, then you won't be able
          to upload images to Gallery, and you should talk to your system
          administrator.
-        
    C.15.
    
+        
    C.15.
    
        Why do I get this error: Warning: fopen(".../albums/team/album.dat.lock","a+")
        or Your Userfile is not writeable?
       
    
@@ -440,7 +440,7 @@
        directory 777.  Make sure you chmod the .users
        directory, which can sometimes be hidden from view.  See 
        FAQ C.19 for more details
-      
    C.16.
    
+      
    C.16.
    
        Why do I get the error Allowed memory size of Xxx bytes exhausted
        ?
       
    
@@ -459,7 +459,7 @@
          When adding that line to .htaccess, you must use a 
          number, in bytes.  For example, 8MB would be about 8000000 bytes.
         
    
-      
    C.17.
    
+      
    C.17.
    
        Why do I get pnmtojpeg: No such file or directory when uploading
        images?
       
    
@@ -483,7 +483,7 @@
         
  • 
          Upgrade to Gallery v1.3.4 which lets you specify which one you have in
          the config wizard.
-        
    • C.18.
    
+        
    C.18.
    
        Why do I get this warning: Your script possibly relies on a
        session side-effect which existed until PHP 4.2.3?
       
    
@@ -504,7 +504,7 @@

    This should be fixed in future versions of Gallery. -

    C.19.

    +

    C.19.

    Why, when I try to upload a .htaccess and chmod it with my FTP client, it "disappears"?

    @@ -517,7 +517,7 @@ for Chmod with WS_FTP. If you use CuteFTP, see this thread in the forums. -

    C.20.

    +

    C.20.

    Why does uploading pictures on my RedHat 8.0 system result in an error or scewed picture?

    @@ -530,7 +530,7 @@ this thread in the forums. Keep in mind that these are merely workarounds. The best option is to upgrade your PHP version to the latest from http://www.php.net/ -

    C.21.

    +

    C.21.

    Why doesn't Gallery work correctly on my RedHat 9.0 system?

    As in Red Hat Linux versions since 8.0, the default web server is Apache @@ -542,7 +542,7 @@ http://www.php.net/. See this forum post for information on how to compile PHP. -

    C.22.

    +

    C.22.

    How do I use Gallery both from inside my LAN and the internet?

    Note

    There is a fix planned for future versions of Gallery to allow the config @@ -598,7 +598,7 @@ Linux/Unix /etc/hosts

    -

    C.23.

    +

    C.23.

    I'm running Gallery 1.3.4, PHP 4.0.4 and I get Call to undefined function: array_search() in view_photo.php?

    @@ -622,7 +622,7 @@

    Note

    This has been fixed in Gallery 1.4.0 -

    C.24.

    +

    C.24.

    Why, when I edit an album or photo's text, do quotation marks appear as \' (e.g. John Doe\'s Album)?

    @@ -634,7 +634,7 @@

    Note

    As of Gallery 1.4.0, Gallery will strip the slashes from fields so that this does not happen, even if magic_quotes_gpc is on. -

    C.25.

    +

    C.25.

    I can't extract a .tar.gz file on my Windows machine. Why not?

    @@ -650,12 +650,12 @@

  • Unzip once more

    • -

    C.26.

    +

    C.26.

    Why do I get an EOF / read error reading magic number error when uploading pictures with NetPBM?

    Please see FAQ c.2 -

    C.27.

    +

    C.27.

    Why do I get errors like this: Warning: open_basedir restriction in effect. File is in wrong directory in /home/johndoe/public_html/gallery/platform/fs_unix.php on line 53?

    @@ -664,20 +664,20 @@ Basically, your host has misconfigured this directive and not added the directory where Gallery is located to the directories where PHP can access and modify files. You'll need to contact them and ask them to add the directory where your website files are located. -

    C.28.

    +

    C.28.

    Why do I get this error: Warning: write failed: No space left on device (28) in Unknown on line 0?

    Your host setup a quota for the web server user. Though your account may still have space left, the quota for the web server user has been overrun. Basically, you'll need to contact your host and ask them to cleanup the filesystem and/or adjust the quota. If you are your host, adjust the quota using edquota. -

    C.29.

    +

    C.29.

    Why do I get this error: Warning: exec() has been disabled for security reasons?

    Basically, this is a form of safe mode. Gallery requires functions like exec() to perform operations on images. The steps to "fix" this problem are the same as in FAQ C.5. -

    C.30.

    +

    C.30.

    Why can't I upload images using ImageMagick on FreeBSD?

    The default install of ImageMagick on FreeBSD doesn't seem to compile with some @@ -699,7 +699,7 @@ Then uninstall ImageMagick via ports (make deinstall clean) and reinstall it (make install clean)

    -

    C.31.

    +

    C.31.

    How do I put my Gallery into debug mode?

    There are two ways, each pretty much equal in simplicity. @@ -725,7 +725,7 @@

    And change "no" to "yes" This will enable some extra debugging features and turn up PHP's error reporting level. -

    C.32.

    +

    C.32.

    I have uploaded the NetPBM or ImageMagick binaries to my site, but I don't know the absolute path to specify in the configuration wizard. What do I do? @@ -742,7 +742,7 @@

    View this file via the web (for example: http://www.example.com/gallery/ netpbm/test.php). It will tell you the absolute path to specify. -

    C.33.

    +

    C.33.

    When I try to enter an album, I get a 404 error. What's up?

    One of two things in happening @@ -762,7 +762,7 @@

    Voila! The URLs should work correctly now.

    -

    C.34.

    +

    C.34.

    I changed a value on Step 3 of the configuration wizard (or in config.php), but the change isn't taking effect. What's going on?

    @@ -774,7 +774,7 @@ Select "properties" from the <<admin options>> pulldown. Then, in the popup window you will be able to change the properties for that album. -

    C.35.

    +

    C.35.

    Can I host images on another server to conserve space?

    The straight answer is no. Gallery must have the images on the local @@ -789,7 +789,7 @@ will attempt to use the images on the server with lots of bandwidth, so that the local server doesn't suffer so much. More information is available in the mirroring tutorial. -

    C.36.

    +

    C.36.

    Why do I get errors with email on Windows?

    If you go to http://www.example.com/gallery/setup/check_mail.php and it gives you the following @@ -824,7 +824,7 @@ SMTP = smtp.server.com sendmail_from = youremail@server.com

    -

    C.37.

    +

    C.37.

    I've forgotten my admin password! How can I reset it?

    Version 1.4.3 or below: Resetting your admin password is easy; @@ -837,7 +837,7 @@ and you will be required to edit the resetadmin file, add the string, save, and refresh your browser. This is a security measure to prove that you are an administrator. -

    C.38.

    +

    C.38.

    Why are my picture frames screwed up?

    If you have a file called gallery/css/embedded_style.css (ie @@ -863,7 +863,7 @@ If you didn't touch the CSS or frame files, this probably means that you didn't override the files upon upgrade. Make sure that your FTP client overrides the old files and upgrades to the new ones. -

    C.39.

    +

    C.39.

    Why do I get this error: Fatal error: session_start(): Failed to initialize storage module: user...?

    @@ -876,7 +876,7 @@

    This should fix it if you host allows you to edit PHP directives in .htaccess. If not, you may need to contact them to get it changed globally. -

    C.40.

    +

    C.40.

    I need to remove my albums directory, but I can't since the webserver user owns the files. What can I do?

    @@ -885,7 +885,7 @@ here: Gallery Utilities ("Bharat's Cleanup Script"). Instructions are included in the top of the file. -

    C.41.

    +

    C.41.

    Why is my Gallery blue?!

    As of Gallery 1.5, the CSS system has changed. There is a base.css @@ -894,7 +894,7 @@ Finally, there is embedded.css which loads when your gallery is embedded in another program. To change the color of your gallery, you can edit the appropriate CSS file or select a skin in the configuration wizard. -

    C.42.

    +

    C.42.

    When I open Gallery inside Mambo, i get "Gallery seems to be inside Mambo, but we couldn't get the necessary info." What am i or my visitors doing wrong?

    diff -Naur gallery-1.5.2/docs/g1package/gallery1-install.faq.d.html gallery-1.5.2-pl2/docs/g1package/gallery1-install.faq.d.html --- gallery-1.5.2/docs/g1package/gallery1-install.faq.d.html 2006-01-19 19:57:26.000000000 +0100 +++ gallery-1.5.2-pl2/docs/g1package/gallery1-install.faq.d.html 2006-02-07 03:36:22.000000000 +0100 @@ -8,7 +8,7 @@ (comment, images, etc..)?

    D.4. Something went wrong, it's not working! What do I do? -
    D.1.

    + D.1.

    How can I migrate my Gallery from one host to another?

    Warning

    If you are moving between a Windows and non-Windows host, please @@ -52,14 +52,14 @@ the albums directory you just uploaded, not a blank directory, as you would on a clean install of Gallery. After you secure Gallery, all your data should show up intact! -

    D.2.

    +

    D.2.

    Why do I get this error after migration: Warning: fopen ('.../albums/foo/album.dat.lock', 'a+')?

    This is caused by not recursively chmodding the new albums directory 0777. See FAQ C.15 for information on how to fix this. -

    D.3.

    +

    D.3.

    Will moving my Gallery to another host cause me to lose data (comment, images, etc..)?

    @@ -67,7 +67,7 @@ , there should be no lose of data whatsoever. However, because of Murphy's law, it's a good idea not to delete your albums directory on your old host before you know everything is working on the new host. -

    D.4.

    +

    D.4.

    Something went wrong, it's not working! What do I do?

    First, try again. Make sure you follow all the instructions in diff -Naur gallery-1.5.2/docs/g1package/index.html gallery-1.5.2-pl2/docs/g1package/index.html --- gallery-1.5.2/docs/g1package/index.html 2006-01-19 19:57:27.000000000 +0100 +++ gallery-1.5.2-pl2/docs/g1package/index.html 2006-02-07 03:36:25.000000000 +0100 @@ -1,6 +1,6 @@ -Gallery Manual

    Gallery Manual
       Next

    Authors

    Bharat Mediratta
    Gaile Elliott
    Christian Mohn
    Andrew Lindeman
    Joan McGalliard
    Pierre-Luc Paour
    Beckett Madden-Woods
    Jens Tkotz

    Edited by

    Michael Schultheiss

    Copyright © 2003-2005 Gallery Documentation Group

    +Gallery Manual

    Gallery Manual
       Next

    Authors

    Bharat Mediratta
    Gaile Elliott
    Christian Mohn
    Andrew Lindeman
    Joan McGalliard
    Pierre-Luc Paour
    Beckett Madden-Woods
    Jens Tkotz

    Edited by

    Michael Schultheiss

    Copyright © 2003-2005 Gallery Documentation Group

    This guide is distributed under the terms of the GNU General Public License.

    Table of Contents

    1. Gallery 1.x Installation Guide
    Overview
    Features
    Credits
    Installation Requirements
    Installing on a Unix/Linux Server with FTP
    Installing on a Unix/Linux Server with Shell Access
    Installing on a Windows Server (Apache)
    Installing on a Windows Server (IIS)
    Upgrading a Previous Gallery Installation
    Getting Additional Help
    Installing Required Programs
    Installing (or updating) Gallery Remote Applets
    Installing Language Packs
    The Configuration Wizard
    Frequently Asked Questions
    2. Gallery 1.x Administration Guide
    Basics
    Users and Permissions
    Embedding Gallery
    Securing Gallery
    Performance Tips
    Backup and Restore
    Creating an Offline Copy
    Patching your Gallery
    Mirroring Gallery
    3. Gallery 1.x User's Guide
    Importing into gallery
    Watermarking

    - Documentation last generated on: Thu Jan 19 13:57:19 EST 2006 + Documentation last generated on: Mon Feb 6 21:36:14 EST 2006

       Next
       Chapter 1. Gallery 1.x Installation Guide
    diff -Naur gallery-1.5.2/download.php gallery-1.5.2-pl2/download.php --- gallery-1.5.2/download.php 2006-01-06 07:31:30.000000000 +0100 +++ gallery-1.5.2-pl2/download.php 2006-02-07 03:21:42.000000000 +0100 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * -* $Id: download.php,v 1.3.2.1 2006/01/06 06:31:30 jenst Exp $ +* $Id: download.php,v 1.3.2.2 2006/02/07 02:21:42 jenst Exp $ */ ?> album->getAlbumItemNames($gallery->user, $full, false, true); $albumcopyName = createTempAlbum($albumItemNames); + if($albumcopyName) { $zipfileName = createZip($albumcopyName, $gallery->album->fields['name']); + if($zipfileName) { + if(!isDebugging()) { downloadFile($zipfileName); -} else { + } + else { + echo gallery_error('
    '. _("Zipdownload would work, but is disabled when debugging.")); + } + } + } +} +else { list($numItems, $numAlbums, $numPhotos) = $gallery->album->numItems($gallery->user, true); $albumSize = $gallery->album->getAlbumSize($gallery->user, $full, false, true); diff -Naur gallery-1.5.2/html_wrap/inline_imagewrap.inc gallery-1.5.2-pl2/html_wrap/inline_imagewrap.inc --- gallery-1.5.2/html_wrap/inline_imagewrap.inc 2005-10-25 15:30:02.000000000 +0200 +++ gallery-1.5.2-pl2/html_wrap/inline_imagewrap.inc 2006-02-06 22:26:55.000000000 +0100 @@ -1,5 +1,5 @@ $tag"; } -switch ($frame) { +if (!in_array($frame, array('none', 'dots', 'solid')) && + !fs_file_exists(dirname(__FILE__) . "/frames/$frame/frame.def")) { + $frame = 'none'; +} +switch ($frame) { // special cases case "none": echo $href_tag; break; case "dots": ?> - - - - -
    +
    "> -
    +
    - - - - - - - - - - - - -
    +
    "> + +
    " border="0" width="" height="" alt=""> - + diff -Naur gallery-1.5.2/includes/definitions/albumProperties.php gallery-1.5.2-pl2/includes/definitions/albumProperties.php --- gallery-1.5.2/includes/definitions/albumProperties.php 2006-01-06 07:31:36.000000000 +0100 +++ gallery-1.5.2-pl2/includes/definitions/albumProperties.php 2006-02-06 22:26:55.000000000 +0100 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: albumProperties.php,v 1.10.2.1 2006/01/06 06:31:36 jenst Exp $ + * $Id: albumProperties.php,v 1.10.2.2 2006/02/06 21:26:55 jenst Exp $ */ ?> gTranslate('common', "Album Frame"), 'desc' => '', 'choices' => available_frames(), - 'value' => $gallery->album->fields["album_frame"] + 'value' => $gallery->album->fields["album_frame"], + 'vartype' => 'pictureFrame' ), 'thumb_frame' => array( 'prompt' => gTranslate('common', "Thumb Frame"), 'desc' => '', 'choices' => available_frames(), - 'value' => $gallery->album->fields["thumb_frame"] + 'value' => $gallery->album->fields["thumb_frame"], + 'vartype' => 'pictureFrame' ), 'image_frame' => array( 'prompt' => gTranslate('common', "Image Frame"), 'desc' => '', 'choices' => available_frames(), - 'value' => $gallery->album->fields["image_frame"] + 'value' => $gallery->album->fields["image_frame"], + 'vartype' => 'pictureFrame' ), 'group_layout_end' => array ( 'type' => "group_end" diff -Naur gallery-1.5.2/lib/albumItem.php gallery-1.5.2-pl2/lib/albumItem.php --- gallery-1.5.2/lib/albumItem.php 2006-01-09 03:47:03.000000000 +0100 +++ gallery-1.5.2-pl2/lib/albumItem.php 2006-02-02 01:29:09.000000000 +0100 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: albumItem.php,v 1.14.2.3 2006/01/09 02:47:03 jenst Exp $ + * $Id: albumItem.php,v 1.14.2.4 2006/02/02 00:29:09 jenst Exp $ */ /** @@ -136,6 +136,12 @@ } } + $options[] = array( + 'pure_text' => _("Move"), + 'text' => getIconText('tab_duplicate.gif', _("Move"), $override, $withIcons), + 'value' => showChoice2("move_photo.php", array("index" => $i, 'reorder' => 0)) + ); + /* ----- Item is subalbum ----- */ if ($isAlbum) { $options[] = array( @@ -189,11 +195,18 @@ ); } } + if (! $isAlbum) { + $options[] = array( + 'pure_text' => _("Copy"), + 'text' => getIconText('editcopy.gif', _("Copy"), $override, $withIcons), + 'value' => showChoice2("copy_photo.php", array("index" => $i)) + ); + } } if ($gallery->user->canWriteToAlbum($gallery->album)) { $options[] = array( - 'pure_text' => _("Move"), + 'pure_text' => _("Reorder"), 'text' => getIconText('tab_duplicate.gif',_("Reorder"), $override, $withIcons), 'value' => showChoice2("move_photo.php", array("index" => $i, 'reorder' => 1)) ); @@ -209,26 +222,12 @@ } if (isset($isAdmin)) { - $options[] = array( - 'pure_text' => _("Move"), - 'text' => getIconText('tab_duplicate.gif', _("Move"), $override, $withIcons), - 'value' => showChoice2("move_photo.php", array("index" => $i, 'reorder' => 0)) - ); - - if (! $isAlbum) { - $options[] = array( - 'pure_text' => _("Copy"), - 'text' => getIconText('editcopy.gif', _("Copy"), $override, $withIcons), - 'value' => showChoice2("copy_photo.php", array("index" => $i)) - ); - $options[] = array( 'pure_text' => _("Change Owner"), 'text' => getIconText('yast_kuser.gif', _("Change Owner"), $override, $withIcons), 'value' => showChoice2("photo_owner.php", array("id" => $id)) ); } - } if (isset($isOwner)) { if ($gallery->album->isHidden($i)) { diff -Naur gallery-1.5.2/lib/content.php gallery-1.5.2-pl2/lib/content.php --- gallery-1.5.2/lib/content.php 2006-01-13 18:38:10.000000000 +0100 +++ gallery-1.5.2-pl2/lib/content.php 2006-02-02 01:27:39.000000000 +0100 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * -* $Id: content.php,v 1.14.2.3 2006/01/13 17:38:10 jenst Exp $ +* $Id: content.php,v 1.14.2.4 2006/02/02 00:27:39 jenst Exp $ */ /** @@ -182,8 +182,19 @@ break; case 'mambo': case 'joomla': - $cookie1_name = 'sessioncookie'; - $cookie1_value = $_COOKIE[$cookie1_name]; + if (!empty($_COOKIE['sessioncookie'])) { + // really mambo + $cookie1_name = 'sessioncookie'; + $cookie1_value = $_COOKIE[$cookie1_name]; + } else { + // try to find Joomla cookie (this is shaky) + foreach ($_COOKIE as $cookie1_name => $cookie1_value) { + if (strlen($cookie1_name) == 32 && strlen($cookie1_value) == 32) { + // this is probably the right cookie... + break; + } + } + } break; } } diff -Naur gallery-1.5.2/lib/imageManipulation.php gallery-1.5.2-pl2/lib/imageManipulation.php --- gallery-1.5.2/lib/imageManipulation.php 2006-01-11 11:29:42.000000000 +0100 +++ gallery-1.5.2-pl2/lib/imageManipulation.php 2006-02-02 01:39:04.000000000 +0100 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: imageManipulation.php,v 1.7.2.4 2006/01/11 10:29:42 jenst Exp $ + * $Id: imageManipulation.php,v 1.7.2.5 2006/02/02 00:39:04 jenst Exp $ */ /** @@ -157,7 +157,7 @@ $getAlpha = netPBM("pngtopnm", "-alpha $input > $alpha"); break; case "gif": - $getOverlay = netPPM("giftopnm", "--alphaout=$alpha $input > $overlay"); + $getOverlay = netPBM("giftopnm", "--alphaout=$alpha $input > $overlay"); break; case "tif": $getOverlay = netPBM("tifftopnm", "-alphaout=$alpha $input > $overlay"); diff -Naur gallery-1.5.2/lib/valchecks.php gallery-1.5.2-pl2/lib/valchecks.php --- gallery-1.5.2/lib/valchecks.php 2006-01-06 07:31:37.000000000 +0100 +++ gallery-1.5.2-pl2/lib/valchecks.php 2006-02-06 22:26:55.000000000 +0100 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: valchecks.php,v 1.3.2.1 2006/01/06 06:31:37 jenst Exp $ + * $Id: valchecks.php,v 1.3.2.2 2006/02/06 21:26:55 jenst Exp $ */ ?> # @package Languagepack @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: gallery-translations@lists.sourceforge.net\n" -"POT-Creation-Date: 2006-01-19 18:31+0100\n" +"POT-Creation-Date: 2006-01-22 00:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Naur gallery-1.5.2/po/gallery-config.pot gallery-1.5.2-pl2/po/gallery-config.pot --- gallery-1.5.2/po/gallery-config.pot 2006-01-19 18:43:19.000000000 +0100 +++ gallery-1.5.2-pl2/po/gallery-config.pot 2006-01-22 00:45:16.000000000 +0100 @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. # -# $Id: gallery-config.pot,v 1.128.2.10 2006/01/19 17:43:19 jenst Exp $ +# $Id: gallery-config.pot,v 1.128.2.11 2006/01/21 23:45:16 jenst Exp $ # # @version # @package Languagepack @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: gallery-translations@lists.sourceforge.net\n" -"POT-Creation-Date: 2006-01-19 18:31+0100\n" +"POT-Creation-Date: 2006-01-22 00:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Naur gallery-1.5.2/po/gallery-core.pot gallery-1.5.2-pl2/po/gallery-core.pot --- gallery-1.5.2/po/gallery-core.pot 2006-01-19 18:43:20.000000000 +0100 +++ gallery-1.5.2-pl2/po/gallery-core.pot 2006-01-22 00:45:17.000000000 +0100 @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. # -# $Id: gallery-core.pot,v 1.128.2.10 2006/01/19 17:43:20 jenst Exp $ +# $Id: gallery-core.pot,v 1.128.2.11 2006/01/21 23:45:17 jenst Exp $ # # @version # @package Languagepack @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: gallery-translations@lists.sourceforge.net\n" -"POT-Creation-Date: 2006-01-19 18:31+0100\n" +"POT-Creation-Date: 2006-01-22 00:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Naur gallery-1.5.2/setup/session_test.php gallery-1.5.2-pl2/setup/session_test.php --- gallery-1.5.2/setup/session_test.php 2006-01-06 07:32:46.000000000 +0100 +++ gallery-1.5.2-pl2/setup/session_test.php 2006-02-02 01:32:48.000000000 +0100 @@ -17,27 +17,23 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: session_test.php,v 1.29.2.1 2006/01/06 06:32:46 jenst Exp $ + * $Id: session_test.php,v 1.29.2.2 2006/02/02 00:32:48 jenst Exp $ */ ?> $value) { - $$key =& $_SESSION[$key]; -} -session_register("count"); - - if (isset($_REQUEST['destroy'])) { session_destroy(); header("Location: session_test.php"); exit; } -$count++; + +if(!isset($_SESSION['count'])) { + $_SESSION['count'] = 0; +} + +$_SESSION['count']++; ?> @@ -70,7 +66,7 @@ - + diff -Naur gallery-1.5.2/util.php gallery-1.5.2-pl2/util.php --- gallery-1.5.2/util.php 2006-01-13 12:48:15.000000000 +0100 +++ gallery-1.5.2-pl2/util.php 2006-02-07 03:21:42.000000000 +0100 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: util.php,v 1.563.2.5 2006/01/13 11:48:15 jenst Exp $ + * $Id: util.php,v 1.563.2.7 2006/02/07 02:21:42 jenst Exp $ */ /** @@ -89,7 +89,6 @@ return $value; } - function getBlacklistFilename() { global $gallery; return sprintf("%s/blacklist.dat", $gallery->app->albumDir); @@ -919,6 +918,7 @@ } else { echo debugMessage(sprintf(_("%s with extension %s is not an supported archive.", $archive, $ext)),__FILE__, __LINE__); + return false; } } @@ -953,25 +953,21 @@ $gallery->app->tmpDir)); return false; } + /* Keep Current Dir in mind */ $currentDir = getcwd(); + /* Switch to the folder that content is going to be zipped */ chdir($folderName); - switch($tool) { - case 'zip': $cmd = fs_import_filename($gallery->app->zip) ." -r $fullZipName *"; - break; - - case 'rar': - $cmd = ''; - break; - } if (! exec_wrapper($cmd)) { echo gallery_error("Zipping failed"); + /* Go back */ chdir($currentDir); return false; } else { + /* Go back */ chdir($currentDir); if($deleteSource) { rmdirRecursive($folderName); @@ -1590,12 +1586,17 @@ $divCellAdd = $borderwidth +3; break; - - default: // use frames directory + default: // use frames directory or fallback to none. + if(array_key_exists($frame, available_frames())) { require(dirname(__FILE__) . "/html_wrap/frames/$frame/frame.def"); $divCellWidth = $thumbsize + $widthTL + $widthTR; $divCellAdd = $heightTT + $heightBB; + } + else { + $divCellWidth = $thumbsize + 3; + $divCellAdd = 3; + } break; } // end of switch @@ -1830,22 +1831,17 @@ if(! fs_mkdir($dir)) { echo gallery_error( - sprintf(_("Your tempfolder is not writeable! Please check permissions of this dir: %s"), + sprintf(_("Gallery was unable to create a tempory subfolder in your tempdir. Please check permissions of this dir: %s"), $gallery->app->tmpDir)); return false; } - //echo "

    Created dir: $dir

    "; - foreach($albumItemNames as $possibleAlbumName => $filename) { if(is_array($filename)) { - //echo "\n
      "; createTempAlbum($filename, "$dir/$possibleAlbumName"); - //echo "\n
    "; } else { $destination = $dir .'/'. basename ($filename); - //echo "\n\t
  • $filename --> $destination
    • "; if(! fs_copy($filename, $destination)) { echo gallery_error("Copy Failed"); } @@ -1870,6 +1866,27 @@ } function downloadFile($filename) { + global $gallery; + + /* Verify its really a file */ + if(!fs_is_file($filename) || broken_link($filename)) { + echo gallery_error(sprintf(_("'%s' seems not to be a valid file. Download aborted."), + $filename)); + return false; + } + + /* Verify $filename is inside the temp dir */ + $validFileName = strncmp($filename, $gallery->app->tmpDir, strlen($filename)); + if($validFileName < 0) { + echo gallery_error(sprintf(_("The file '%s' seems not inside Gallery tempdir %s, download aborted."), + $filename, $gallery->app->tmpDir)); + return false; + } + elseif ($validFileName == 0 || dirname($filename) == $gallery->app->tmpDir) { + echo gallery_error(_("We are trying to download the tempdir itself ?! Download aborted.")); + return false; + } + $contentType = getMimeType($filename); $size = fs_filesize($filename); @@ -1889,7 +1906,9 @@ echo $filedata; - /* Now delete the file */ + /* As downloadable files are always created in a subfolder of the tempdir, + * we delete this folder and its content + */ rmdirRecursive(dirname($filename)); return true; diff -Naur gallery-1.5.2/Version.php gallery-1.5.2-pl2/Version.php --- gallery-1.5.2/Version.php 2006-01-19 19:51:52.000000000 +0100 +++ gallery-1.5.2-pl2/Version.php 2006-02-07 03:32:39.000000000 +0100 @@ -17,19 +17,19 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: Version.php,v 1.1542.2.28 2006/01/19 18:51:52 ckdake Exp $ + * $Id: Version.php,v 1.1542.2.37 2006/02/07 02:32:39 ckdake Exp $ */ ?> version = '1.5.2'; +$gallery->version = '1.5.2-pl2'; $gallery->config_version = 96; $gallery->album_version = 37; $gallery->user_version = 6; $gallery->url = "http://gallery.sourceforge.net"; /* do not edit the date!! modified by CVS */ -$gallery->last_change = strtotime(substr('$Date: 2006/01/19 18:51:52 $', 7, -1)); +$gallery->last_change = strtotime(substr('$Date: 2006/02/07 02:32:39 $', 7, -1)); /* * PostNuke version info */